im.pidgin.pidgin: aab0dda196931e533796cb4e70bb504faa473c98

Thu Feb 28 10:53:34 EST 2008

-----------------------------------------------------------------
Revision: aab0dda196931e533796cb4e70bb504faa473c98
Ancestor: 1eec23b74b283a44ec413439f0f69155847b319a
Author: nosnilmot at pidgin.im
Date: 2008-02-28T15:24:34
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/aab0dda196931e533796cb4e70bb504faa473c98

Modified files:
        po/ChangeLog po/es.po

ChangeLog: 

Spanish translation updated (Javier FernÃ¡ndez-Sanguino)
Closes #4256

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

--- po/ChangeLog	6165d73ccfc20ced942dcd60414687707e7eca66
+++ po/ChangeLog	44c2a809aeee167455c65a75e52a7e18273827d9
@@ -1,8 +1,9 @@ version 2.4.0
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.4.0
 	* Sinhala translation added (Danishka Navin)
 	* Slovenian transalation updated (Martin Srebotnjak)
+	* Spanish translation updated (Javier FernÃ¡ndez-Sanguino)
 
 version 2.3.1
 	* German translation updated (Jochen Kemnade, BjÃ¶rn Voigt)
============================================================
--- po/es.po	31f92cac7e8a7b968bcab6a281d2a3d7f6c33a4e
+++ po/es.po	8fb036e7a4fb3ed23bd4ad068c898cf7a9b17933
@@ -53,8 +53,8 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2007-09-12 01:29+0200\n"
+"POT-Creation-Date: 2007-12-03 03:21-0500\n"
+"PO-Revision-Date: 2007-12-05 03:18+0100\n"
 "Last-Translator: Javier FernÃ¡ndez-Sanguino <jfs at debian.org>\n"
 "Language-Team:  Spanish team <es at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -62,8 +62,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
-#: ../finch/finch.c:418
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:417
 msgid "Finch"
 msgstr "Finch"
 
@@ -95,7 +97,7 @@ msgstr ""
 "  -n, --nologin        no conectarse de forma automÃ¡tica\n"
 "  -v, --version        mostrar la versiÃ³n actual y salir\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:730
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -106,18 +108,18 @@ msgstr ""
 "el problema y complete la migraciÃ³n de forma manual. Por favor, informe de "
 "este error en http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../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/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/jabber/jabber.c:1546
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Error"
@@ -146,8 +148,8 @@ msgstr "(Posiblemente se olvido de ejecu
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Posiblemente se olvido de ejecutar 'make install'.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1478 ../pidgin/gtkblist.c:4533
 msgid "Modify Account"
 msgstr "Modificar cuenta"
 
@@ -175,34 +177,38 @@ msgstr "Apodo:"
 #. Cancel button
 #. Cancel
 #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/gg/gg.c:884
+#: ../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:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../libpurple/protocols/jabber/buddy.c:2426
+#: ../libpurple/protocols/jabber/buddy.c:2462
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1737
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/jabber.c:1026
+#: ../libpurple/protocols/jabber/jabber.c:1035
+#: ../libpurple/protocols/jabber/jabber.c:1739
+#: ../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:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../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/oscar/peer.c:1048
+#: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
@@ -213,60 +219,60 @@ msgstr "Apodo:"
 #: ../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:3388
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../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/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc/ops.c:1816
-#: ../libpurple/protocols/silc/silc.c:823
-#: ../libpurple/protocols/silc/silc.c:1031
+#: ../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/silc.c:966
+#: ../libpurple/protocols/silc/silc.c:1174
 #: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/buddy.c:1087
+#: ../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:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
+#: ../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:1101
+#: ../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:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../pidgin/gtkrequest.c:272 ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../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:1297 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/account.c:1428 ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
+#: ../pidgin/gtkrequest.c:278
 msgid "Save"
 msgstr "Guardar"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1905
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Â¿Seguro que quiere borrar a %s?"
@@ -277,16 +283,16 @@ msgstr "Borrar cuenta"
 
 #. Delete button
 #: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
+#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:679 ../finch/gntpounce.c:742
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../pidgin/gtkaccount.c:1912 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2168 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2331 ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "Cuentas"
 
@@ -295,326 +301,338 @@ msgstr "Puede (desh)habilitar cuentas de
 msgstr "Puede (desh)habilitar cuentas de la lista a continuaciÃ³n."
 
 #. Add button
-#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../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:5486
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
-#: ../pidgin/gtkrequest.c:275
+#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../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
 msgid "Add"
 msgstr "AÃ±adir"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
+#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:734
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2447
 #, 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:2493
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "Â¿Desea aÃ±adir el amigo a su lista?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2557
 #, 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:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2580
+#: ../pidgin/gtkaccount.c:2586
 msgid "Authorize buddy?"
 msgstr "Â¿Autorizar al amigo?"
 
 #: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
 msgid "Authorize"
 msgstr "Autorizar"
 
 #: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../pidgin/gtkaccount.c:2582 ../pidgin/gtkaccount.c:2588
 msgid "Deny"
 msgstr "Denegar"
 
-#: ../finch/gntblist.c:289
+#: ../finch/gntblist.c:323
 msgid "You must provide a screename for the buddy."
 msgstr "Debe dar un nombre de usuario para el amigo."
 
-#: ../finch/gntblist.c:291
+#: ../finch/gntblist.c:325
 msgid "You must provide a group."
 msgstr "Debe indicar un grupo."
 
-#: ../finch/gntblist.c:293
+#: ../finch/gntblist.c:327
 msgid "You must select an account."
 msgstr "Debe seleccionar una cuenta."
 
-#: ../finch/gntblist.c:295
+#: ../finch/gntblist.c:329
 msgid "The selected account is not online."
 msgstr "La cuenta seleccionada no estÃ¡ conectada."
 
-#: ../finch/gntblist.c:300
+#: ../finch/gntblist.c:334
 msgid "Error adding buddy"
 msgstr "Error al aÃ±adir al amigo"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:359 ../libpurple/protocols/oscar/oscar.c:2893
+#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:986
 msgid "Screen Name"
 msgstr "Nombre de usuario"
 
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
-#: ../libpurple/protocols/silc/chat.c:606
+#: ../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:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkrequest.c:278
+#: ../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:331 ../finch/gntblist.c:413
+#: ../finch/gntblist.c:365 ../finch/gntblist.c:447
 msgid "Group"
 msgstr "Grupo"
 
-#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../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
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
+#: ../finch/gntblist.c:375 ../finch/gntblist.c:885
 #: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/buddy.c:1072
-#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1185
 #: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../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
 msgid "Add Buddy"
 msgstr "AÃ±adir amigo"
 
-#: ../finch/gntblist.c:341
+#: ../finch/gntblist.c:375
 msgid "Please enter buddy information."
 msgstr "Introduzca la informaciÃ³n del amigo."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+#: ../finch/gntblist.c:404 ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
+#: ../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
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nombre"
 
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
+#: ../finch/gntblist.c:450 ../finch/gntblist.c:852
 msgid "Auto-join"
 msgstr "Conectarse automÃ¡ticamente"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:453 ../finch/gntblist.c:887 ../pidgin/gtkblist.c:6620
 msgid "Add Chat"
 msgstr "AÃ±adir chat"
 
-#: ../finch/gntblist.c:420
+#: ../finch/gntblist.c:454
 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:433 ../finch/gntblist.c:446
+#: ../finch/gntblist.c:467 ../finch/gntblist.c:480
 msgid "Error adding group"
 msgstr "Error al aÃ±adir al grupo"
 
-#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:468
 msgid "You must give a name for the group to add."
 msgstr "Debe dar un nombre al grupo a aÃ±adir."
 
-#: ../finch/gntblist.c:447
+#: ../finch/gntblist.c:481
 msgid "A group with the name already exists."
 msgstr "Ya existe un grupo con ese nombre"
 
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../finch/gntblist.c:488 ../finch/gntblist.c:889
+#: ../libpurple/protocols/sametime/sametime.c:5442
+#: ../libpurple/protocols/sametime/sametime.c:5530 ../pidgin/gtkblist.c:6732
 msgid "Add Group"
 msgstr "AÃ±adir grupo"
 
-#: ../finch/gntblist.c:454
+#: ../finch/gntblist.c:488
 msgid "Enter the name of the group"
 msgstr "Introduzca el nombre del grupo"
 
-#: ../finch/gntblist.c:802
+#: ../finch/gntblist.c:835
 msgid "Edit Chat"
 msgstr "Editar chat"
 
-#: ../finch/gntblist.c:802
+#: ../finch/gntblist.c:835
 msgid "Please Update the necessary fields."
 msgstr "Por favor Actualice los campos necesarios."
 
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
+#: ../finch/gntblist.c:836 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Editar"
 
-#: ../finch/gntblist.c:828
+#: ../finch/gntblist.c:861
 msgid "Edit Settings"
 msgstr "Editar configuraciÃ³n"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:897 ../pidgin/gtkutils.c:931
 msgid "Information"
 msgstr "InformaciÃ³n"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:897 ../pidgin/gtkutils.c:931
 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:904 ../finch/gntconv.c:507
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../finch/gntblist.c:937 ../finch/gntconv.c:535
+#: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Info"
 
-#: ../finch/gntblist.c:908
+#: ../finch/gntblist.c:941
 msgid "Add Buddy Pounce"
 msgstr "AÃ±adir aviso de amigo"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../finch/gntblist.c:948 ../finch/gntconv.c:547
+#: ../libpurple/protocols/jabber/si.c:1109
+#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1614
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: ../finch/gntblist.c:919
+#: ../finch/gntblist.c:952
 msgid "View Log"
 msgstr "Ver registro"
 
-#: ../finch/gntblist.c:1000
+#: ../finch/gntblist.c:1033
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Introduzca el nuevo nombre para %s"
 
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
+#: ../finch/gntblist.c:1035 ../finch/gntblist.c:1283
 msgid "Rename"
 msgstr "Renombrar"
 
-#: ../finch/gntblist.c:1002
+#: ../finch/gntblist.c:1035
 msgid "Set Alias"
 msgstr "Fijar el apodo"
 
-#: ../finch/gntblist.c:1003
+#: ../finch/gntblist.c:1036
 msgid "Enter empty string to reset the name."
 msgstr "Introduzca una cadena vacÃa para resetear el nombre."
 
-#: ../finch/gntblist.c:1079
+#: ../finch/gntblist.c:1112
 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:1087
+#: ../finch/gntblist.c:1120
 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:1092
+#: ../finch/gntblist.c:1125
 #, 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:1095
+#: ../finch/gntblist.c:1128
 msgid "Confirm Remove"
 msgstr "Confirmar borrado"
 
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../finch/gntblist.c:1133 ../finch/gntblist.c:1285 ../finch/gntft.c:227
+#: ../pidgin/gtkconv.c:1663 ../pidgin/gtkrequest.c:277
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Quitar"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1259 ../finch/gntblist.c:2479 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2927 ../pidgin/gtkblist.c:4961
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
-#: ../finch/gntblist.c:1257
+#: ../finch/gntblist.c:1290
 msgid "Place tagged"
 msgstr "Lugares marcados"
 
-#: ../finch/gntblist.c:1262
+#: ../finch/gntblist.c:1295
 msgid "Toggle Tag"
 msgstr "Cambiar marca"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/gg/gg.c:2207
+#: ../finch/gntblist.c:1331 ../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:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1544
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../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/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/buddy.c:1538
 #: ../libpurple/protocols/silc/ops.c:1002
 #: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1324
+#: ../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:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3271
 msgid "Nickname"
 msgstr "Apodo"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../finch/gntblist.c:1353 ../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:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../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/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
 msgid "Idle"
 msgstr "EstÃ¡ inactivo"
 
 # El latinoamÃ©rica se prefiere 'Celular', creo, jfs
-#: ../finch/gntblist.c:1334
+#: ../finch/gntblist.c:1367
 msgid "On Mobile"
 msgstr "En el mÃ³vil"
 
-#: ../finch/gntblist.c:1415
+#: ../finch/gntblist.c:1448
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -623,12 +641,12 @@ msgstr ""
 "En lÃnea: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:1424
+#: ../finch/gntblist.c:1457
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Cuenta: %s (%s)"
 
-#: ../finch/gntblist.c:1436
+#: ../finch/gntblist.c:1469
 #, c-format
 msgid ""
 "\n"
@@ -637,36 +655,24 @@ msgstr ""
 "\n"
 "Visto por Ãºltima vez: hace %s"
 
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../finch/gntblist.c:1738 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Nuevo..."
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1073
+#: ../finch/gntblist.c:1745 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Guardado..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2136 ../finch/gntplugin.c:345 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:548
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "_Nombre"
-
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "_Cuenta"
-
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2265 ../pidgin/gtkdialogs.c:774
 msgid "New Instant Message"
 msgstr "Mensaje instantÃ¡neo nuevo"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+#: ../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 ""
@@ -676,71 +682,101 @@ msgstr ""
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1736
+#: ../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:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../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
 #: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:745
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1815
-#: ../libpurple/protocols/silc/silc.c:822
+#: ../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/silc.c:965
 #: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1191
 #: ../libpurple/protocols/silc10/chat.c:425
 #: ../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:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkrequest.c:270
+#: ../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
 msgid "OK"
 msgstr "Aceptar"
 
+#: ../finch/gntblist.c:2317
+msgid "Channel"
+msgstr "Canal"
+
+#: ../finch/gntblist.c:2329 ../pidgin/gtkblist.c:958
+msgid "Join a Chat"
+msgstr "Unirse a un chat"
+
+#: ../finch/gntblist.c:2331
+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
+msgid "Join"
+msgstr "Unirse"
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2371 ../finch/gntpounce.c:460 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "Opciones"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2377
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
-msgstr "Mostrar grupos vacÃos"
+#: ../finch/gntblist.c:2382
+msgid "Join Chat..."
+msgstr "Unirse a un chat..."
 
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "Mostrar amigos desconectados"
+#: ../finch/gntblist.c:2387
+msgid "Show"
+msgstr "Mostrar"
 
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "Ordenar por estado"
+#: ../finch/gntblist.c:2392
+msgid "Empty groups"
+msgstr "Grupos vacÃos"
 
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "Ordenar alfabÃ©ticamente"
+#: ../finch/gntblist.c:2399
+msgid "Offline buddies"
+msgstr "Amigos desconectados"
 
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "Ordenar por tamaÃ±o de registro"
+#: ../finch/gntblist.c:2406
+msgid "Sort"
+msgstr "Ordenar"
 
+#: ../finch/gntblist.c:2411
+msgid "By Status"
+msgstr "Por estado"
+
+#: ../finch/gntblist.c:2416 ../pidgin/gtkblist.c:4196
+msgid "Alphabetically"
+msgstr "AlfabÃ©ticamente"
+
+#: ../finch/gntblist.c:2421
+msgid "By Log Size"
+msgstr "Por tamaÃ±o de registro"
+
 #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "ImportaciÃ³n de certificado"
@@ -832,38 +868,39 @@ msgstr "Gestor de certificados"
 msgstr "Gestor de certificados"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:693
+#: ../libpurple/protocols/silc/silc.c:1150
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Servidor"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1642
 #: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "Info"
 
 #. Close button
 #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
-#: ../pidgin/gtkrequest.c:273
+#: ../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
+#: ../libpurple/protocols/silc/util.c:388
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
+#: ../pidgin/gtkrequest.c:274
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s se ha desconectado."
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
@@ -876,50 +913,56 @@ msgstr ""
 "Finch no intentarÃ¡ reconectarse a esta cuenta hasta que corrija el error y "
 "reactive la cuenta."
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+#: ../finch/gntconn.c:138
 msgid "Re-enable Account"
 msgstr "Reactivar cuenta"
 
-#: ../finch/gntconv.c:139
+#: ../finch/gntconn.c:155
+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
 msgid "No such command."
 msgstr "No existe esa orden."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:480
 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:148 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:486
 msgid "Your command failed for an unknown reason."
 msgstr "Su orden ha fallado por motivos desconocidos."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:158 ../pidgin/gtkconv.c:493
 msgid "That command only works in chats, not IMs."
 msgstr "Esa orden sÃ³lo funciona en chats, no en MIs."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:161 ../pidgin/gtkconv.c:496
 msgid "That command only works in IMs, not chats."
 msgstr "Esa orden sÃ³lo funciona en MIs, no en chats."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:165 ../pidgin/gtkconv.c:501
 msgid "That command doesn't work on this protocol."
 msgstr "Esa orden no funciona en este protocolo."
 
-#: ../finch/gntconv.c:168
+#: ../finch/gntconv.c:173
 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:251
+#: ../finch/gntconv.c:252
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:274
+#: ../finch/gntconv.c:275
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:280 ../finch/gntconv.c:813
 #, c-format
 msgid ""
 "\n"
@@ -928,69 +971,69 @@ msgstr ""
 "\n"
 "%s estÃ¡ escribiendo..."
 
-#: ../finch/gntconv.c:298
+#: ../finch/gntconv.c:299
 msgid "You have left this chat."
 msgstr "Ha dejado este chat"
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:415 ../pidgin/gtkconv.c:1369
 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:393 ../pidgin/gtkconv.c:1370
+#: ../finch/gntconv.c:421 ../pidgin/gtkconv.c:1377
 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:442
+#: ../finch/gntconv.c:470
 msgid "Send To"
 msgstr "Enviar a"
 
-#: ../finch/gntconv.c:486
+#: ../finch/gntconv.c:514
 msgid "Conversation"
 msgstr "ConversaciÃ³n"
 
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:520
 msgid "Clear Scrollback"
 msgstr "Limpiar histÃ³rico"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:524 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Mostrar marcas de tiempo"
 
-#: ../finch/gntconv.c:512
+#: ../finch/gntconv.c:540
 msgid "Add Buddy Pounce..."
 msgstr "AÃ±adir aviso de amigo..."
 
-#: ../finch/gntconv.c:527
+#: ../finch/gntconv.c:555
 msgid "Enable Logging"
 msgstr "Habilitar registro"
 
-#: ../finch/gntconv.c:533
+#: ../finch/gntconv.c:561
 msgid "Enable Sounds"
 msgstr "Habilitar sonidos"
 
-#: ../finch/gntconv.c:739
+#: ../finch/gntconv.c:769
 msgid "<AUTO-REPLY> "
 msgstr "<RESPUESTA AUTOMÃTICA> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:901
 msgid "List of users:\n"
 msgstr "Lista de usuarios:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:1063 ../pidgin/gtkconv.c:332
 msgid "Supported debug options are:  version"
 msgstr "Las opciones de depuraciÃ³n soportadas son:  version"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:1099 ../pidgin/gtkconv.c:384
 msgid "No such command (in this context)."
 msgstr "No existe esa orden (en este contexto)."
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1102 ../pidgin/gtkconv.c:387
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -998,7 +1041,7 @@ msgstr ""
 "Utilice \"/help &lt;orden&gt;\" para obtener ayuda de una orden concreta.\n"
 "Las siguientes Ã³rdenes estÃ¡n disponibles en este contexto:\n"
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
+#: ../finch/gntconv.c:1175 ../pidgin/gtkconv.c:7733
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -1006,12 +1049,12 @@ msgstr ""
 "say &lt;mensaje;gt;:  Enviar un mensaje como si no se estuviera utilizando "
 "una orden."
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1178 ../pidgin/gtkconv.c:7736
 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:1126 ../pidgin/gtkconv.c:7566
+#: ../finch/gntconv.c:1181 ../pidgin/gtkconv.c:7739
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -1019,43 +1062,48 @@ msgstr ""
 "debug &lt;opciÃ³n&gt;: Enviar informaciÃ³n de depuraciÃ³n sobre la conversaciÃ³n "
 "actual."
 
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1184 ../pidgin/gtkconv.c:7742
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: limpia el histÃ³rico de la ventana de conversaciÃ³n."
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1187 ../pidgin/gtkconv.c:7748
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;orden&gt;:  Recibir ayuda sobre una orden concreta."
 
-#: ../finch/gntconv.c:1135
+#: ../finch/gntconv.c:1190
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Muestra la lista de usuarios en el chat."
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1195
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Mostrar la ventana de complementos."
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1198
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostrar la lista de amigos."
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1201
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Muestra la ventana de cuentas."
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1204
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Muestra la ventana de depuraciÃ³n."
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1207
 msgid "prefs: Show the preference window."
 msgstr "prefs: Muestra la ventana de preferencias."
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1210
 msgid "statuses: Show the savedstatuses window."
 msgstr "status: Muestra la ventana Â«savedstatusesÂ»."
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2616
+#: ../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
 msgid "Debug Window"
 msgstr "Ventana de depuraciÃ³n"
 
@@ -1063,15 +1111,15 @@ msgstr "Ventana de depuraciÃ³n"
 #. * 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:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "Limpiar"
 
-#: ../finch/gntdebug.c:262
-msgid "Filter: "
-msgstr "Filtro: "
+#: ../finch/gntdebug.c:303
+msgid "Filter:"
+msgstr "Filtro:"
 
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "Pausar"
 
@@ -1108,25 +1156,27 @@ 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
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1584
+#: ../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:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
+#: ../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/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
 msgid "Status"
 msgstr "Estado"
 
@@ -1169,7 +1219,8 @@ msgstr "Terminado"
 msgid "Finished"
 msgstr "Terminado"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Transferring"
 msgstr "Transfiriendo"
 
@@ -1177,72 +1228,68 @@ msgstr "Correos"
 msgid "Emails"
 msgstr "Correos"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Â¡Tiene correo!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:519
 msgid "Sender"
 msgstr "Remitente"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:526
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../finch/gntnotify.c:201
+#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) tiene %d mensaje nuevo."
 msgstr[1] "%s (%s) tiene %d nuevos mensajes."
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:342
 msgid "New Mail"
 msgstr "Nuevo correo"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:949
 #, c-format
 msgid "Info for %s"
 msgstr "InformaciÃ³n sobre %s:"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:950
 msgid "Buddy Information"
 msgstr "InformaciÃ³n de amigos"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1603
 msgid "IM"
 msgstr "MI"
 
-#: ../finch/gntnotify.c:389
-msgid "Join"
-msgstr "Unirse"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../finch/gntnotify.c:395
+#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:77 ../finch/gntplugin.c:86
 msgid "ERROR"
 msgstr "ERROR"
 
-#: ../finch/gntplugin.c:75
+#: ../finch/gntplugin.c:77
 msgid "loading plugin failed"
 msgstr "fallÃ³ la carga del complemento"
 
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:86
 msgid "unloading plugin failed"
 msgstr "fallÃ³ la descarga del complemento"
 
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:132
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1259,19 +1306,40 @@ msgstr ""
 "Sitio web: %s\n"
 "Nombre de fichero: %s\n"
 
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:190
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Debe cargar el complemento antes de poder configurarlo."
 
-#: ../finch/gntplugin.c:235
+#: ../finch/gntplugin.c:238
 msgid "No configuration options for this plugin."
 msgstr "No hay opciones de configuraciÃ³n para este complemento."
 
+#: ../finch/gntplugin.c:259
+msgid "Error loading plugin"
+msgstr "Error al cargar el complemento"
+
 #: ../finch/gntplugin.c:260
+msgid "The selected file is not a valid plugin."
+msgstr "El fichero seleccionado no es un complemento vÃ¡lido."
+
+#: ../finch/gntplugin.c:261
+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
+msgid "Select plugin to install"
+msgstr "Seleccione el complemento a instalar"
+
+#: ../finch/gntplugin.c:350
 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:315
+#: ../finch/gntplugin.c:401
+msgid "Install Plugin..."
+msgstr "Instalar complemento..."
+
+#: ../finch/gntplugin.c:411
 msgid "Configure Plugin"
 msgstr "Configurar complemento"
 
@@ -1280,187 +1348,186 @@ msgstr "Configurar complemento"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:467 ../finch/gntplugin.c:474 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2169
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:194 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Indique el amigo del que avisar."
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Nuevo aviso de amigo"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Editar aviso de amigo"
 
-#: ../finch/gntpounce.c:333
+#: ../finch/gntpounce.c:344
 msgid "Pounce Who"
 msgstr "Avisar a quiÃ©n"
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:347 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Cuenta:"
 
-#: ../finch/gntpounce.c:358
+#: ../finch/gntpounce.c:369
 msgid "Buddy name:"
 msgstr "Nombre del amigo:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:387 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "Avisar cuando un amigo..."
 
-#: ../finch/gntpounce.c:376
+#: ../finch/gntpounce.c:389
 msgid "Signs on"
 msgstr "Se conecta"
 
-#: ../finch/gntpounce.c:377
+#: ../finch/gntpounce.c:390
 msgid "Signs off"
 msgstr "Se desconecta"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:391
 msgid "Goes away"
 msgstr "Se ausenta"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:392
 msgid "Returns from away"
 msgstr "Deja de estar ausente"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:393
 msgid "Becomes idle"
 msgstr "EstÃ¡ inactivo"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:394
 msgid "Is no longer idle"
 msgstr "Ya no estÃ¡ inactivo."
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:395
 msgid "Starts typing"
 msgstr "Empieza a escribir"
 
-#: ../finch/gntpounce.c:383
+#: ../finch/gntpounce.c:396
 msgid "Pauses while typing"
 msgstr "Hace una pausa mientras escribe"
 
-#: ../finch/gntpounce.c:384
+#: ../finch/gntpounce.c:397
 msgid "Stops typing"
 msgstr "Deja de escribir"
 
-#: ../finch/gntpounce.c:385
+#: ../finch/gntpounce.c:398
 msgid "Sends a message"
 msgstr "EnvÃa un mensaje"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:427 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "AcciÃ³n"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:429
 msgid "Open an IM window"
 msgstr "Abrir una ventana de MI"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:430
 msgid "Pop up a notification"
 msgstr "NotificaciÃ³n con una ventana emergente"
 
-#: ../finch/gntpounce.c:418
+#: ../finch/gntpounce.c:431
 msgid "Send a message"
 msgstr "Enviar un mensaje"
 
-#: ../finch/gntpounce.c:419
+#: ../finch/gntpounce.c:432
 msgid "Execute a command"
 msgstr "Ejecutar una orden"
 
-#: ../finch/gntpounce.c:420
+#: ../finch/gntpounce.c:433
 msgid "Play a sound"
 msgstr "Reproducir un sonido"
 
-#: ../finch/gntpounce.c:448
+#: ../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:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:463 ../pidgin/gtkpounce.c:1293
 msgid "Recurring"
 msgstr "Recurrente"
 
-#: ../finch/gntpounce.c:618
+#: ../finch/gntpounce.c:631
 msgid "Cannot create pounce"
 msgstr "No se puede crear el aviso"
 
-#: ../finch/gntpounce.c:619
+#: ../finch/gntpounce.c:632
 msgid "You do not have any accounts."
 msgstr "No tiene ninguna cuenta."
 
-#: ../finch/gntpounce.c:620
+#: ../finch/gntpounce.c:633
 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:662 ../pidgin/gtkpounce.c:1096
+#: ../finch/gntpounce.c:675 ../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:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:709 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "Avisos de amigos"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ha comenzado a escribirle algo (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s ha parado mientras le escribÃa algo (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se ha conectado (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s volviÃ³ de su inactividad (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:831 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ha dejado de estar ausente (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:833 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha dejado de escribirle (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:835 ../pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se ha desconectado (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:837 ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s estÃ¡ inactivo (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:839 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se ha marchado. (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:841 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s le ha enviado un mensaje. (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
-#, c-format
+#: ../finch/gntpounce.c:842 ../pidgin/gtkpounce.c:1483
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de aviso desconocido. Â¡Por favor, informe de esto! "
 
@@ -1468,12 +1535,12 @@ msgstr "Basado en el uso del teclado"
 msgid "Based on keyboard use"
 msgstr "Basado en el uso del teclado"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2031
 msgid "From last sent message"
 msgstr "Del Ãºltimo mensaje enviado"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:899 ../pidgin/gtkprefs.c:907
+#: ../pidgin/gtkprefs.c:2030 ../pidgin/gtkprefs.c:2044
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nunca"
@@ -1490,15 +1557,15 @@ msgstr "Notificar a los amigos cuando le
 msgid "Notify buddies when you are typing"
 msgstr "Notificar a los amigos cuando les estÃ© escribiendo"
 
-#: ../finch/gntprefs.c:198
+#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:156
 msgid "Log format"
 msgstr "Formato de registro"
 
-#: ../finch/gntprefs.c:199
+#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:146
 msgid "Log IMs"
 msgstr "Registrar MIs"
 
-#: ../finch/gntprefs.c:200
+#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:147
 msgid "Log chats"
 msgstr "Registrar chats"
 
@@ -1523,79 +1590,80 @@ msgstr "Cambiar estado a"
 msgstr "Cambiar estado a"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:994 ../pidgin/gtkprefs.c:2135
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversaciones"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:154
+#: ../pidgin/gtkprefs.c:1563 ../pidgin/gtkprefs.c:2146
 msgid "Logging"
 msgstr "Registro"
 
-#: ../finch/gntrequest.c:583
+#: ../finch/gntrequest.c:585
 msgid "Not implemented yet."
 msgstr "No implementado aÃºn."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Save File..."
 msgstr "Enviar archivo.."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1557
+#: ../pidgin/gtkrequest.c:1603
 msgid "Open File..."
 msgstr "Abrir archivo..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Se conecta un amigo"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Se desconecta un amigo"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Se recibe un mensaje"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100 ../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:68
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Se envÃa un mensaje"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Alguien entra al chat"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Alguien deja el chat"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Usted habla en el chat"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Otros hablan en el chat"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+#: ../finch/gntsound.c:107 ../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:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "Fallo de gstreamer"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "No se pudo inicializar gstreamer."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1687
+#: ../pidgin/gtkprefs.c:1776 ../pidgin/gtkprefs.c:1972
 msgid "(default)"
 msgstr "(por omisiÃ³n)"
 
@@ -1611,7 +1679,7 @@ msgstr "Perfiles"
 msgid "Profiles"
 msgstr "Perfiles"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1817
 msgid "Automatic"
 msgstr "AutomÃ¡tico"
 
@@ -1619,7 +1687,7 @@ msgstr "Timbre de la consola"
 msgid "Console Beep"
 msgstr "Timbre de la consola"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1821
 msgid "Command"
 msgstr "Comando"
 
@@ -1627,7 +1695,7 @@ msgstr "Sin sonido"
 msgid "No Sound"
 msgstr "Sin sonido"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1812
 msgid "Sound Method"
 msgstr "MÃ©todo para reproducir sonidos"
 
@@ -1645,7 +1713,7 @@ msgstr ""
 "(%s para nombre de archivo)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1856
 msgid "Sound Options"
 msgstr "Opciones de sonido"
 
@@ -1654,17 +1722,17 @@ msgstr "Suena cuando la conversaciÃ³n ob
 msgstr "Suena cuando la conversaciÃ³n obtiene el foco"
 
 #: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/gtkprefs.c:1863 ../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:1761
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1861
 msgid "Only when available"
 msgstr "SÃ³lo cuando estoy disponible"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1862
 msgid "Only when not available"
 msgstr "SÃ³lo cuando no estoy disponible"
 
@@ -1673,11 +1741,11 @@ msgstr "Volumen(0-100):"
 msgstr "Volumen(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1898
 msgid "Sound Events"
 msgstr "Eventos de sonido"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1957
 msgid "Event"
 msgstr "Acontecimiento"
 
@@ -1685,15 +1753,15 @@ msgstr "Archivo"
 msgid "File"
 msgstr "Archivo"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1976
 msgid "Test"
 msgstr "Probar"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1980
 msgid "Reset"
 msgstr "Restablecer"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1984
 msgid "Choose..."
 msgstr "Seleccionar..."
 
@@ -1713,7 +1781,8 @@ 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/novell/novell.c:1484
+#: ../libpurple/protocols/msn/msn.c:725
+#: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "TÃtulo"
@@ -1731,41 +1800,44 @@ msgstr "Tipo"
 #. not independent
 #. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/bonjour/bonjour.c:292
+#: ../libpurple/protocols/bonjour/bonjour.c:299
+#: ../libpurple/protocols/bonjour/bonjour.c:382
+#: ../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/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
-#: ../libpurple/protocols/sametime/sametime.c:3286
-#: ../libpurple/protocols/sametime/sametime.c:3292
-#: ../libpurple/protocols/sametime/sametime.c:3298
-#: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../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/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:1010
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1016
 msgid "Message"
 msgstr "Mensaje"
 
@@ -1819,7 +1891,7 @@ msgstr "Certificados"
 msgid "Certificates"
 msgstr "Certificados"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2137
 msgid "Sounds"
 msgstr "Sonidos"
 
@@ -1922,16 +1994,16 @@ msgstr "Complemento Â«toasterÂ»"
 msgid "Toaster plugin"
 msgstr "Complemento Â«toasterÂ»"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:117 ../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:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:175 ../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:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:176 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1943,17 +2015,17 @@ msgstr ""
 "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:179
+#: ../finch/plugins/gnthistory.c:220
 msgid "GntHistory"
 msgstr "HistÃ³ricoGnt"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:222 ../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:182 ../pidgin/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:223 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1978,89 +2050,88 @@ msgstr "Complemento Â«LastlogÂ»."
 msgid "Lastlog plugin."
 msgstr "Complemento Â«LastlogÂ»."
 
-#: ../libpurple/account.c:791
+#: ../libpurple/account.c:875
 msgid "accounts"
 msgstr "cuentas"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
+#: ../libpurple/account.c:1050 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "Para conectarse se necesita una contraseÃ±a."
 
-#: ../libpurple/account.c:992
+#: ../libpurple/account.c:1084
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Introduzca la contraseÃ±a para %s (%s)"
 
-#: ../libpurple/account.c:999
+#: ../libpurple/account.c:1091
 msgid "Enter Password"
 msgstr "Introduzca la contraseÃ±a"
 
-#: ../libpurple/account.c:1004
+#: ../libpurple/account.c:1096
 msgid "Save password"
 msgstr "Guardar la contraseÃ±a"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
+#: ../libpurple/account.c:1131 ../libpurple/connection.c:105
 #: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Falta el complemento de protocolo para %s"
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../libpurple/account.c:1133 ../libpurple/connection.c:108
 msgid "Connection Error"
 msgstr "Error de conexiÃ³n"
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
+#: ../libpurple/account.c:1330 ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1691
 msgid "New passwords do not match."
 msgstr "Las nuevas contraseÃ±as no coinciden."
 
-#: ../libpurple/account.c:1208
+#: ../libpurple/account.c:1339
 msgid "Fill out all fields completely."
 msgstr "Rellene todos los campos completamente."
 
-#: ../libpurple/account.c:1231
+#: ../libpurple/account.c:1362
 msgid "Original password"
 msgstr "ContraseÃ±a original"
 
-#: ../libpurple/account.c:1238
+#: ../libpurple/account.c:1369
 msgid "New password"
 msgstr "Nueva contraseÃ±a"
 
-#: ../libpurple/account.c:1245
+#: ../libpurple/account.c:1376
 msgid "New password (again)"
 msgstr "Nueva contraseÃ±a (otra vez)"
 
-#: ../libpurple/account.c:1251
+#: ../libpurple/account.c:1382
 #, c-format
 msgid "Change password for %s"
 msgstr "Cambiar la contraseÃ±a de %s"
 
-#: ../libpurple/account.c:1259
+#: ../libpurple/account.c:1390
 msgid "Please enter your current password and your new password."
 msgstr "Introduzca su contraseÃ±a actual y la contraseÃ±a nueva."
 
-#: ../libpurple/account.c:1290
+#: ../libpurple/account.c:1421
 #, c-format
 msgid "Change user information for %s"
 msgstr "Cambiar la informaciÃ³n del usuario %s"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1424 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Establecer su informaciÃ³n de usuario"
 
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/account.c:1895 ../libpurple/protocols/gg/gg.c:1019
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
+#: ../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
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../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
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2070,19 +2141,19 @@ msgstr "lista de amigos"
 msgid "buddy list"
 msgstr "lista de amigos"
 
-#: ../libpurple/certificate.c:545
+#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr "(NO COINCIDE)"
 
 #. Make messages
-#: ../libpurple/certificate.c:549
+#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr ""
 "%s ha presentado el certificado mostrado a continuaciÃ³n para este uso de una "
 "sola vez:"
 
-#: ../libpurple/certificate.c:550
+#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2092,39 +2163,39 @@ msgstr ""
 "Huella (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
+#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
 msgstr "VerificaciÃ³n de certificado de un solo uso"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
+#: ../libpurple/certificate.c:885
 msgid "Certificate Authorities"
 msgstr "Autoridades de certificaciÃ³n"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
+#: ../libpurple/certificate.c:1053
 msgid "SSL Peers Cache"
 msgstr "CachÃ© de servidores SSL"
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
+#: ../libpurple/certificate.c:1184
 #, 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:1177
+#: ../libpurple/certificate.c:1190
 msgid "SSL Certificate Verification"
 msgstr "VerificaciÃ³n de certificado SSL"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
+#: ../libpurple/certificate.c:1199
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1200 ../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
@@ -2132,7 +2203,7 @@ msgstr "Rechazar"
 msgid "Reject"
 msgstr "Rechazar"
 
-#: ../libpurple/certificate.c:1188
+#: ../libpurple/certificate.c:1201
 msgid "_View Certificate..."
 msgstr "_Ver certificado..."
 
@@ -2140,7 +2211,7 @@ msgstr "_Ver certificado..."
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
+#: ../libpurple/certificate.c:1301
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
@@ -2152,7 +2223,7 @@ msgstr ""
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
+#: ../libpurple/certificate.c:1326
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
@@ -2161,7 +2232,7 @@ msgstr ""
 "El certificado presentado por Â«%sÂ» es autofirmado. No puede comprobarse de "
 "forma automÃ¡tica."
 
-#: ../libpurple/certificate.c:1331
+#: ../libpurple/certificate.c:1344
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "La cadena de certificados presentada por %s no es vÃ¡lida."
@@ -2171,16 +2242,16 @@ msgstr "La cadena de certificados presen
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+#: ../libpurple/certificate.c:1352 ../libpurple/certificate.c:1422
 msgid "SSL Certificate Error"
 msgstr "Error de certificado SSL"
 
-#: ../libpurple/certificate.c:1340
+#: ../libpurple/certificate.c:1353
 msgid "Invalid certificate chain"
 msgstr "Cadena de certificado invÃ¡lida"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
+#: ../libpurple/certificate.c:1374
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2189,14 +2260,14 @@ msgstr ""
 "validar este certificado."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
+#: ../libpurple/certificate.c:1397
 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:1408
+#: ../libpurple/certificate.c:1414
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2206,12 +2277,12 @@ msgstr ""
 "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:1417
+#: ../libpurple/certificate.c:1423
 msgid "Invalid certificate authority signature"
 msgstr "Firma de autoridad de certificaciÃ³n invÃ¡lida"
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1882
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2229,7 +2300,7 @@ msgstr ""
 "Fecha de expiraciÃ³n: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
+#: ../libpurple/certificate.c:1891
 msgid "Certificate Information"
 msgstr "InformaciÃ³n del certificado"
 
@@ -2238,24 +2309,26 @@ msgstr "Error de registro"
 msgstr "Error de registro"
 
 #: ../libpurple/connection.c:180
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "Error de registro"
+msgstr "Error de deregistro"
 
-#: ../libpurple/connection.c:350
+#: ../libpurple/connection.c:334
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s se ha conectado"
 
-#: ../libpurple/connection.c:380
+#: ../libpurple/connection.c:364
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s se ha desconectado"
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/connection.c:509 ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2350
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:377
+#: ../libpurple/protocols/msnp9/servconn.c:139
+#: ../libpurple/protocols/msnp9/session.c:330
+#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -2272,8 +2345,8 @@ msgstr "El mensaje es demasiado largo"
 msgid "The message is too large."
 msgstr "El mensaje es demasiado largo"
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
-#: ../libpurple/protocols/bonjour/jabber.c:298
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:278
+#: ../libpurple/protocols/bonjour/jabber.c:321
 msgid "Unable to send message."
 msgstr "No se pudo enviar el mensaje."
 
@@ -2330,7 +2403,7 @@ msgstr "No se pudo obtener el nombre del
 msgid "Failed to get serv name: %s"
 msgstr "No se pudo obtener el nombre del servidor: %s"
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""
 "El servidor D-BUS de Purple no estÃ¡ ejecutÃ¡ndose por la razÃ³n indicada a "
@@ -2348,7 +2421,7 @@ msgstr "No se pudo enviar una solicitud 
 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:697
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2357,8 +2430,8 @@ msgstr ""
 "Error al resolver %s: \n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Error al resolver %s: %d"
@@ -2373,16 +2446,15 @@ msgstr ""
 "%s"
 
 #: ../libpurple/dnsquery.c:578
-#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "Fin de fichero mientras se leÃa del proceso de resoluciÃ³n"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "FallÃ³ en la creaciÃ³n de hilos: %s"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "RazÃ³n desconocida"
 
@@ -2482,36 +2554,34 @@ msgstr "Se ha completado la transferenci
 msgstr "Se ha completado la transferencia de %s"
 
 #: ../libpurple/ft.c:685
-#, c-format
 msgid "File transfer complete"
 msgstr "Transferencia de archivos completa"
 
-#: ../libpurple/ft.c:1103
+#: ../libpurple/ft.c:1108
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Vd. cancelÃ³ la transferencia de %s"
 
-#: ../libpurple/ft.c:1108
-#, c-format
+#: ../libpurple/ft.c:1113
 msgid "File transfer cancelled"
 msgstr "Transferencia de archivos cancelada"
 
-#: ../libpurple/ft.c:1166
+#: ../libpurple/ft.c:1171
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelÃ³ la transferencia de %s"
 
-#: ../libpurple/ft.c:1171
+#: ../libpurple/ft.c:1176
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s cancelÃ³ la transferencia de archivos"
 
-#: ../libpurple/ft.c:1228
+#: ../libpurple/ft.c:1233
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "FallÃ³ la transferencia del archivo a %s."
 
-#: ../libpurple/ft.c:1230
+#: ../libpurple/ft.c:1235
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "FallÃ³ la transferencia del archivo de %s."
@@ -2746,33 +2816,32 @@ msgstr "(%s) %s <RESPUESTA AUTOMÃTICA>:
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPUESTA AUTOMÃTICA>: %s\n"
 
-#: ../libpurple/plugin.c:365
+#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "EstÃ¡ utilizando %s, pero este complemento requiere %s."
 
-#: ../libpurple/plugin.c:380
-#, c-format
+#: ../libpurple/plugin.c:375
 msgid "This plugin has not defined an ID."
 msgstr "No se ha definido un identificador para este complemento."
 
-#: ../libpurple/plugin.c:448
+#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr ""
 "No hubo coincidencia en el nÃºmero mÃ¡gico del complemento %d (necesitaba %d)"
 
-#: ../libpurple/plugin.c:465
+#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr ""
 "No hubo coincidencia en el nÃºmero de versiÃ³n ABI %d.%d.x (necesitaba %d.%d.x)"
 
-#: ../libpurple/plugin.c:482
+#: ../libpurple/plugin.c:477
 msgid "Plugin does not implement all required functions"
 msgstr "El complemento no implementa todas las funciones necesarias"
 
-#: ../libpurple/plugin.c:547
+#: ../libpurple/plugin.c:542
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -2781,28 +2850,24 @@ msgstr ""
 "No se encontrÃ³ el complemento necesario %s. Por favor, instale este "
 "complemento e intÃ©ntelo de nuevo."
 
-#: ../libpurple/plugin.c:552
+#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "No se pudo cargar el complemento"
 
-#: ../libpurple/plugin.c:574
+#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "No se pudo cargar el complemento necesario %s."
 
-#: ../libpurple/plugin.c:578
+#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "No se pudo cargar su complemento."
 
-#: ../libpurple/plugin.c:677
+#: ../libpurple/plugin.c:663
 #, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "No se pudo cargar el complemento dependiente %s."
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s necesita %s, pero no se pudo descargar."
 
-#: ../libpurple/plugin.c:681
-msgid "There were errors unloading the plugin."
-msgstr "Se produjeron errores mientras se descargaba el complemento."
-
 #: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Autoaceptar"
@@ -2839,14 +2904,14 @@ msgstr "_Guardar"
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../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
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -2890,8 +2955,10 @@ msgstr ""
 "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:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../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
 msgid "Notes"
 msgstr "Notas"
 
@@ -3117,34 +3184,34 @@ msgstr ""
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:493
+#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(TCU)"
 
-#: ../libpurple/plugins/log_reader.c:1577
+#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "El usuario no estÃ¡ conectado."
 
-#: ../libpurple/plugins/log_reader.c:1583
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "_Enviar respuesta automÃ¡tica:"
 
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
+#: ../libpurple/plugins/log_reader.c:1570
+#: ../libpurple/plugins/log_reader.c:1573
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s se ha desconectado."
 
-#: ../libpurple/plugins/log_reader.c:1610
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Uno o mÃ¡s mensajes puede no haber llegado a destino."
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Ha sido desconectado del servidor."
 
-#: ../libpurple/plugins/log_reader.c:1628
+#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -3152,78 +3219,86 @@ msgstr ""
 "Actualmente estÃ¡ desconectado. No podrÃ¡ recibir mensajes a menos que se "
 "conecte."
 
-#: ../libpurple/plugins/log_reader.c:1643
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "No se pudo enviar el mensaje porque excede la longitud mÃ¡xima permitida."
 
-#: ../libpurple/plugins/log_reader.c:1648
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "No se enviÃ³ su mensaje."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2349
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2699
+#: ../libpurple/plugins/log_reader.c:2835
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2362
-#: ../libpurple/plugins/log_reader.c:2477
+#: ../libpurple/plugins/log_reader.c:2712
+#: ../libpurple/plugins/log_reader.c:2840
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2374
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2724
+#: ../libpurple/plugins/log_reader.c:2844
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2388
-#: ../libpurple/plugins/log_reader.c:2486
+#: ../libpurple/plugins/log_reader.c:2738
+#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2400
-#: ../libpurple/plugins/log_reader.c:2490
+#: ../libpurple/plugins/log_reader.c:2750
+#: ../libpurple/plugins/log_reader.c:2853
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2412
-#: ../libpurple/plugins/log_reader.c:2494
+#: ../libpurple/plugins/log_reader.c:2762
+#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2774
+#: ../libpurple/plugins/log_reader.c:2861
+msgid "aMSN"
+msgstr "aMSN"
+
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
+#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr "ConfiguraciÃ³n general de lectura del registro"
 
-#: ../libpurple/plugins/log_reader.c:2458
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "CÃ¡lculos de tamaÃ±o rÃ¡pido"
 
-#: ../libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "Utilizar heurÃsticos de nombres"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "Directorio de registro"
 
@@ -3233,19 +3308,19 @@ msgstr "Directorio de registro"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "Lector de registro"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
+#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Incluir otros registros de clientes de MI en el visor de registro."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
+#: ../libpurple/plugins/log_reader.c:2898
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3269,6 +3344,14 @@ msgstr "Cargar complementos .NET con Mon
 msgid "Loads .NET plugins with Mono."
 msgstr "Cargar complementos .NET con Mono."
 
+#: ../libpurple/plugins/newline.c:57
+msgid "Add new line in IMs"
+msgstr "AÃ±adir una lÃnea nueva en los MIs"
+
+#: ../libpurple/plugins/newline.c:61
+msgid "Add new line in Chats"
+msgstr "AÃ±adir una nueva lÃnea en los chats"
+
 #. *< magic
 #. *< major version
 #. *< minor version
@@ -3278,19 +3361,19 @@ msgstr "Cargar complementos .NET con Mon
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:68
+#: ../libpurple/plugins/newline.c:104
 msgid "New Line"
 msgstr "Nueva lÃnea"
 
 # Antecede una lÃnea al mensaje mostrado.
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:70
+#: ../libpurple/plugins/newline.c:106
 msgid "Prepends a newline to displayed message."
 msgstr "No se pudo enviar el mensaje."
 
 #. *< summary
-#: ../libpurple/plugins/newline.c:71
+#: ../libpurple/plugins/newline.c:107
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
@@ -3332,26 +3415,32 @@ msgstr "Puede editar y borrar los avisos
 msgstr "Puede editar y borrar los avisos del diÃ¡logo Â«Avisos de amigoÂ»"
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../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/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../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:304 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:269
 msgid "Yes"
 msgstr "SÃ"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../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/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../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:305 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:270
 msgid "No"
 msgstr "No"
 
@@ -3423,7 +3512,7 @@ msgstr "Activar conversaciones psÃquica
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
+#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "Prueba de seÃ±ales"
 
@@ -3431,8 +3520,8 @@ msgstr "Prueba de seÃ±ales"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
+#: ../libpurple/plugins/signals-test.c:756
+#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "Probar para ver si todas las seÃ±ales funcionan correctamente."
 
@@ -3455,8 +3544,8 @@ msgstr "Hace pruebas para determinar si 
 msgstr "Hace pruebas para determinar si la mayor parte de las cosas funcionan."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:910
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "Certificados X.509"
 
@@ -3466,7 +3555,7 @@ msgstr "Certificados X.509"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:994
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3474,8 +3563,8 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:997
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:999
 msgid "Provides SSL support through GNUTLS."
 msgstr "Proporciona soporte SSL a travÃ©s de GNUTLS."
 
@@ -3485,7 +3574,7 @@ msgstr "Proporciona soporte SSL a travÃ©
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3493,8 +3582,8 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Proporciona soporte SSL a travÃ©s del NSS de Mozilla."
 
@@ -3581,15 +3670,15 @@ msgstr ""
 "Notifica en una ventana de conversaciÃ³n cuando un amigo se ausenta o vuelve "
 "o estÃ¡ inactivo."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Cargador de complementos Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Provee soporte para cargar complementos Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
+#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3597,12 +3686,18 @@ msgstr ""
 "No se pudo detectar la instalaciÃ³n de ActiveTCL. Debe instalar ActiveTCL de "
 "http://www.activestate.com si desea utilizar los complementos TCL\n"
 
-#. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+#: ../libpurple/protocols/bonjour/bonjour.c:101
+msgid ""
+"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."
+
+#: ../libpurple/protocols/bonjour/bonjour.c:120
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "No se pudieron escuchar las conexiones MI entrantes\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
+#: ../libpurple/protocols/bonjour/bonjour.c:147
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
@@ -3610,40 +3705,40 @@ msgstr ""
 "arrancado?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/bonjour/bonjour.c:392
+#: ../libpurple/protocols/bonjour/bonjour.c:697
+#: ../libpurple/protocols/gg/gg.c:633
+#: ../libpurple/protocols/jabber/jabber.c:969
 msgid "First name"
 msgstr "Nombre:"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:947
+#: ../libpurple/protocols/bonjour/bonjour.c:394
+#: ../libpurple/protocols/bonjour/bonjour.c:700
+#: ../libpurple/protocols/gg/gg.c:628
+#: ../libpurple/protocols/jabber/jabber.c:973
 msgid "Last name"
 msgstr "Apellidos:"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../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:2216
+#: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "E-Mail"
 msgstr "Correo electrÃ³nico"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:401
+#: ../libpurple/protocols/bonjour/bonjour.c:706
 msgid "AIM Account"
 msgstr "Cuenta AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
+#: ../libpurple/protocols/bonjour/bonjour.c:404
+#: ../libpurple/protocols/bonjour/bonjour.c:709
 msgid "XMPP Account"
 msgstr "Cuenta XMPP"
 
@@ -3657,20 +3752,20 @@ msgstr "Cuenta XMPP"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:508
+#: ../libpurple/protocols/bonjour/bonjour.c:510
 msgid "Bonjour Protocol Plugin"
 msgstr "Complemento de protocolo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:651
 msgid "Purple Person"
 msgstr "Persona morada"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/bonjour/bonjour.c:703
+#: ../libpurple/protocols/gg/gg.c:478
+#: ../libpurple/protocols/jabber/jabber.c:961
+#: ../libpurple/protocols/silc/silc.c:913
+#: ../libpurple/protocols/silc/silc.c:1154
 #: ../libpurple/protocols/silc10/silc.c:681
 #: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
@@ -3680,38 +3775,39 @@ msgstr "Bonjour"
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
+#: ../libpurple/protocols/bonjour/jabber.c:410
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s ha cerrado la conversaciÃ³n."
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:453
+#: ../libpurple/protocols/bonjour/jabber.c:548
+#: ../libpurple/protocols/bonjour/jabber.c:725
+#: ../libpurple/protocols/bonjour/jabber.c:743
 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:583
+#: ../libpurple/protocols/bonjour/jabber.c:642
 msgid "Cannot open socket"
 msgstr "No se pudo abrir el socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:652
 msgid "Error setting socket options"
 msgstr "Error al establecer las opciones del socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Could not bind socket to port"
 msgstr "No se pudo vincular el socket al puerto"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:688
 msgid "Could not listen on socket"
 msgstr "No se pudo escuchar en el socket"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
 msgstr "ConfiguraciÃ³n invÃ¡lida de proxy"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1845
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3729,40 +3825,42 @@ msgstr "No se pudo obtener el token.\n"
 msgid "Unable to fetch the token.\n"
 msgstr "No se pudo obtener el token.\n"
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:267 ../libpurple/protocols/gg/gg.c:274
+#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "Guardar la lista de amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr ""
 "No se escribiÃ³ nada en el fichero ya que su lista de amigos esta vacÃa."
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
-msgid "Couldn't open file"
-msgstr "No se pudo abrir el archivo"
-
-#: ../libpurple/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "Â¡Se guardÃ³ con Ã©xito la lista de amigos!"
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:278
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "No se pudo escribir la lista de amigos de %s a %s"
+
+#: ../libpurple/protocols/gg/gg.c:303 ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "No se pudo cargar la lista de amigos"
 
-#: ../libpurple/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "Cargar lista de amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "Â¡Ã‰xito en la carga de la lista de amigos!"
 
-#: ../libpurple/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "Guardar lista de amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:384
+#: ../libpurple/protocols/gg/gg.c:382
 msgid "Fill in the registration fields."
 msgstr "Rellene los campos de registro."
 
@@ -3770,305 +3868,310 @@ msgstr "Las contraseÃ±as no coinciden."
 msgid "Passwords do not match."
 msgstr "Las contraseÃ±as no coinciden."
 
-#: ../libpurple/protocols/gg/gg.c:398
+#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "No se pudo registrar la cuenta nueva. Se produjo un error.\n"
 
-#: ../libpurple/protocols/gg/gg.c:411
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Se ha registrado una nueva cuenta Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:412
+#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "Â¡Se completÃ³ el registro con Ã©xito!"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:913
-#: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1722
+#: ../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
 msgid "Password"
 msgstr "ContraseÃ±a"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:488 ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "ContraseÃ±a (escribir de nuevo)"
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "Introduzca el token actual"
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/gg/gg.c:499 ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "Token actual"
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
+#: ../libpurple/protocols/gg/gg.c:503 ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrando cuenta nueva de Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:504
+#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "Por favor, rellene los siguientes campos"
 
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../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/qq/buddy_info.c:49
 msgid "City"
 msgstr "Ciudad"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "AÃ±o de nacimiento"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../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/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../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
 msgid "Gender"
 msgstr "Sexo"
 
-#: ../libpurple/protocols/gg/gg.c:651
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "Hombre o mujer"
 
-#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3713
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:226
+#: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "Hombre"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:654
+#: ../libpurple/protocols/oscar/oscar.c:3713
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "Mujer"
 
-#: ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "Solamente conectado"
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:662 ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "Encontrar amigos"
 
-#: ../libpurple/protocols/gg/gg.c:663
+#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr "Por favor, introduzca a continuaciÃ³n su criterio de bÃºsqueda"
 
-#: ../libpurple/protocols/gg/gg.c:701
+#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr "Rellene los campos."
 
-#: ../libpurple/protocols/gg/gg.c:713
+#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "Su contraseÃ±a actual es diferente de la que ha especificado."
 
-#: ../libpurple/protocols/gg/gg.c:727
+#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr "No se pudo cambiar la contraseÃ±a. Se produjo un error.\n"
 
-#: ../libpurple/protocols/gg/gg.c:736
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Cambiar la contraseÃ±a de la cuenta Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:737
+#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "Â¡Se cambiÃ³ con Ã©xito la contraseÃ±a!"
 
-#: ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "ContraseÃ±a actual"
 
-#: ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduzca su contraseÃ±a actual y la contraseÃ±a nueva para UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
+#: ../libpurple/protocols/gg/gg.c:800 ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "Cambiar la contraseÃ±a Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:876
+#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Seleccione un chat para el amigo: %s"
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
+#: ../libpurple/protocols/gg/gg.c:881 ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "AÃ±adir al chat"
 
-#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
+#: ../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:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/gg/gg.c:1013
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../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/novell/novell.c:2816
-#: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../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/qq/qq.c:281
+#: ../libpurple/protocols/yahoo/yahoo.c:3111 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
 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:1014 ../libpurple/protocols/irc/irc.c:528
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
-#: ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:537
+#: ../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/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
-#, c-format
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
+#: ../libpurple/protocols/oscar/oscar.c:2704
+#: ../libpurple/protocols/oscar/oscar.c:3680
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../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/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nombre"
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
+#: ../libpurple/protocols/gg/gg.c:1061 ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "AÃ±o de nacimiento"
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
+#: ../libpurple/protocols/oscar/oscar.c:3892
 msgid "Unable to display the search results."
 msgstr "No se pueden mostrar los resultados de la bÃºsqueda."
 
-#: ../libpurple/protocols/gg/gg.c:1171
+#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Directorio pÃºblico Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1172
+#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "Resultados de la bÃºsqueda"
 
-#: ../libpurple/protocols/gg/gg.c:1215
+#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "No se encontraron usuarios que coincidan"
 
-#: ../libpurple/protocols/gg/gg.c:1216
+#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
 msgstr "No hay usuarios que coincidan con sus criterios de bÃºsqueda."
 
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
+#: ../libpurple/protocols/gg/gg.c:1314 ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "No se pudo leer el socket"
 
-#: ../libpurple/protocols/gg/gg.c:1395
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr "Lista de amigos descargada"
 
-#: ../libpurple/protocols/gg/gg.c:1396
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
 msgstr "Su lista de amigos fue descargada del servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1403
+#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
 msgstr "Lista de amigos exportada"
 
-#: ../libpurple/protocols/gg/gg.c:1404
+#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
 msgstr "Su lista de amigos fue almacenada en el servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
+#: ../libpurple/protocols/gg/gg.c:1517 ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "FallÃ³ la conexiÃ³n."
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+#: ../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:1644
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "AÃ±adir al chat"
 
-#: ../libpurple/protocols/gg/gg.c:1653
+#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../libpurple/protocols/gg/gg.c:1657
+#: ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../libpurple/protocols/gg/gg.c:1674
+#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "_Nombre de chat:"
 
-#: ../libpurple/protocols/gg/gg.c:1914
+#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "Error de chat"
 
-#: ../libpurple/protocols/gg/gg.c:1915
+#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "Ya existe un chat con ese nombre"
 
-#: ../libpurple/protocols/gg/gg.c:1998
+#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr "No estÃ¡ conectado al servidor."
 
-#: ../libpurple/protocols/gg/gg.c:2021
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "Encontrar amigos... "
 
-#: ../libpurple/protocols/gg/gg.c:2027
+#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "Cambiar su contraseÃ±a..."
 
-#: ../libpurple/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr "Subir la lista de amigos al servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2037
+#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr "Descargar la lista de amigos del servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2041
+#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr "Borrar la lista de amigos del servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr "Guardar lista de amigos a archivo..."
 
-#: ../libpurple/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2070
 msgid "Load buddylist from file..."
 msgstr "Cargar la lista de amigos desde archivo..."
 
@@ -4083,51 +4186,51 @@ msgstr "Cargar la lista de amigos desde 
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
+#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Complemento de protocolo Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
+#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr "MensajerÃa instantÃ¡nea polaca muy popular"
 
-#: ../libpurple/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc/silc.c:1780
 #: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Orden desconocida: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:503
+#: ../libpurple/protocols/irc/cmds.c:506
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc/silc.c:1488
 #: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "el tema actual es: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:507
+#: ../libpurple/protocols/irc/cmds.c:510
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc/silc.c:1492
 #: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "No hay tema establecido"
 
-#: ../libpurple/protocols/irc/dcc_send.c:296
-#: ../libpurple/protocols/irc/dcc_send.c:337
+#: ../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
 msgid "File Transfer Failed"
 msgstr "FallÃ³ la transferencia de archivos"
 
-#: ../libpurple/protocols/irc/dcc_send.c:297
-#: ../libpurple/protocols/irc/dcc_send.c:338
+#: ../libpurple/protocols/irc/dcc_send.c:294
+#: ../libpurple/protocols/irc/dcc_send.c:335
 msgid "Could not open a listening port."
 msgstr "No se pudo abrir un puerto de escucha."
 
@@ -4148,83 +4251,81 @@ msgstr "MOTD para %s"
 msgid "MOTD for %s"
 msgstr "MOTD para %s"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../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
 msgid "Server has disconnected"
 msgstr "El servidor se ha desconectado"
 
-#: ../libpurple/protocols/irc/irc.c:249
+#: ../libpurple/protocols/irc/irc.c:253
 msgid "View MOTD"
 msgstr "Ver MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:265 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Canal:"
 
-#: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
+#: ../libpurple/protocols/irc/irc.c:271
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:527
 msgid "_Password:"
 msgstr "Contra_seÃ±a:"
 
-#: ../libpurple/protocols/irc/irc.c:298
+#: ../libpurple/protocols/irc/irc.c:304
 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:319
-#: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/irc/irc.c:325
+#: ../libpurple/protocols/jabber/jabber.c:1304
+#: ../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/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
+#: ../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
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
+#: ../libpurple/protocols/irc/irc.c:335
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:1117
 msgid "SSL support unavailable"
 msgstr "Soporte SSL no disponible"
 
-#. TODO: try other ports if in auto mode, then save
-#. * working port and try that first next time.
-#: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/irc/irc.c:348
+#: ../libpurple/protocols/myspace/myspace.c:320
+#: ../libpurple/protocols/simple/simple.c:469
+#: ../libpurple/protocols/simple/simple.c:1803
 msgid "Couldn't create socket"
 msgstr "No se pudo crear el socket"
 
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/irc/irc.c:430
+#: ../libpurple/protocols/oscar/oscar.c:1284
 msgid "Couldn't connect to host"
 msgstr "No se pudo conectar al servidor"
 
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+#: ../libpurple/protocols/irc/irc.c:620 ../libpurple/protocols/irc/irc.c:649
+#: ../libpurple/protocols/myspace/myspace.c:2394
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: ../libpurple/protocols/irc/irc.c:773
-#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/irc/irc.c:790
+#: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../libpurple/protocols/irc/irc.c:776
-#: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1415
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/irc/irc.c:793
+#: ../libpurple/protocols/sametime/sametime.c:3416
+#: ../libpurple/protocols/silc/chat.c:1401
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1506
@@ -4239,55 +4340,57 @@ msgstr "Tema"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
+#: ../libpurple/protocols/irc/irc.c:931
 msgid "IRC Protocol Plugin"
 msgstr "Complemento de protocolo IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:932
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Complemento de protocolo IRC menos malo"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
-#: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../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/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5773
 #: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
+#: ../libpurple/protocols/simple/simple.c:2083
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
-#: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1918
+#: ../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/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5778
+#: ../libpurple/protocols/silc/silc.c:2061
 #: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Puerto"
 
-#: ../libpurple/protocols/irc/irc.c:946
+#: ../libpurple/protocols/irc/irc.c:963
 msgid "Encodings"
 msgstr "Codificaciones"
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:904
-#: ../libpurple/protocols/jabber/jabber.c:907
-#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../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/silc/buddy.c:1542
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1334
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1336
+#: ../libpurple/protocols/silc/ops.c:1339
+#: ../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
@@ -4296,8 +4399,8 @@ msgstr "Nombre de usuario"
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/irc/irc.c:969 ../libpurple/protocols/irc/msgs.c:319
+#: ../libpurple/protocols/silc/silc.c:1152
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Nombre real"
@@ -4306,159 +4409,159 @@ msgstr "Nombre real"
 #. 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:960
+#: ../libpurple/protocols/irc/irc.c:977
 msgid "Use SSL"
 msgstr "Usar SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:187
+#: ../libpurple/protocols/irc/msgs.c:189
 msgid "Bad mode"
 msgstr "Modo errÃ³neo"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../libpurple/protocols/irc/msgs.c:198
+#: ../libpurple/protocols/irc/msgs.c:200
 #, c-format
 msgid "You are banned from %s."
 msgstr "Ha sido expulsado de %s."
 
-#: ../libpurple/protocols/irc/msgs.c:199
+#: ../libpurple/protocols/irc/msgs.c:201
 msgid "Banned"
 msgstr "Expulsado"
 
-#: ../libpurple/protocols/irc/msgs.c:216
+#: ../libpurple/protocols/irc/msgs.c:218
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "No se puede expulsar a %s: la lista de expulsados estÃ¡ llena"
 
-#: ../libpurple/protocols/irc/msgs.c:301
+#: ../libpurple/protocols/irc/msgs.c:303
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:302
+#: ../libpurple/protocols/irc/msgs.c:304
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/irc/msgs.c:305
+#: ../libpurple/protocols/oscar/oscar.c:3681
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Apodo"
 
-#: ../libpurple/protocols/irc/msgs.c:329
+#: ../libpurple/protocols/irc/msgs.c:331
 #: ../libpurple/protocols/silc/ops.c:1268
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Actualmente en"
 
-#: ../libpurple/protocols/irc/msgs.c:334
+#: ../libpurple/protocols/irc/msgs.c:336
 msgid "Idle for"
 msgstr "Inactivo durante"
 
-#: ../libpurple/protocols/irc/msgs.c:337
+#: ../libpurple/protocols/irc/msgs.c:339
 msgid "Online since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/irc/msgs.c:341
+#: ../libpurple/protocols/irc/msgs.c:343
 msgid "<b>Defining adjective:</b>"
 msgstr "<br><b>Adjetivo que lo define:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:341
+#: ../libpurple/protocols/irc/msgs.c:343
 msgid "Glorious"
 msgstr "Glorioso"
 
-#: ../libpurple/protocols/irc/msgs.c:420
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ha cambiado el tema a: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:422
+#: ../libpurple/protocols/irc/msgs.c:424
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s ha borrado el tema."
 
-#: ../libpurple/protocols/irc/msgs.c:430
+#: ../libpurple/protocols/irc/msgs.c:432
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "El tema de %s es: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:448
+#: ../libpurple/protocols/irc/msgs.c:450
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensaje desconocido '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:449
+#: ../libpurple/protocols/irc/msgs.c:451
 msgid "Unknown message"
 msgstr "Mensaje desconocido"
 
-#: ../libpurple/protocols/irc/msgs.c:449
+#: ../libpurple/protocols/irc/msgs.c:451
 msgid "The IRC server received a message it did not understand."
 msgstr "El servidor IRC ha recibido un mensaje que no pudo entender."
 
-#: ../libpurple/protocols/irc/msgs.c:470
+#: ../libpurple/protocols/irc/msgs.c:472
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuarios en %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:575
+#: ../libpurple/protocols/irc/msgs.c:577
 msgid "Time Response"
 msgstr "Respuesta de hora"
 
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:578
 msgid "The IRC server's local time is:"
 msgstr "La hora local del servidor de IRC es:"
 
-#: ../libpurple/protocols/irc/msgs.c:587
+#: ../libpurple/protocols/irc/msgs.c:589
 msgid "No such channel"
 msgstr "No existe ese canal"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:600
 msgid "no such channel"
 msgstr "no existe el canal"
 
-#: ../libpurple/protocols/irc/msgs.c:601
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "User is not logged in"
 msgstr "El usuario no estÃ¡ conectado"
 
-#: ../libpurple/protocols/irc/msgs.c:606
+#: ../libpurple/protocols/irc/msgs.c:608
 msgid "No such nick or channel"
 msgstr "No existe el apodo o canal"
 
-#: ../libpurple/protocols/irc/msgs.c:626
+#: ../libpurple/protocols/irc/msgs.c:628
 msgid "Could not send"
 msgstr "No se pudo enviar"
 
-#: ../libpurple/protocols/irc/msgs.c:682
+#: ../libpurple/protocols/irc/msgs.c:684
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Para unirse a %s es necesaria una invitaciÃ³n."
 
-#: ../libpurple/protocols/irc/msgs.c:683
+#: ../libpurple/protocols/irc/msgs.c:685
 msgid "Invitation only"
 msgstr "SÃ³lo con invitaciÃ³n"
 
-#: ../libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:800
 #, 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:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:805 ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/irc/msgs.c:828
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modo (%s %s) por %s"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:913 ../libpurple/protocols/irc/msgs.c:914
 msgid "Invalid nickname"
 msgstr "Apodo invÃ¡lido"
 
-#: ../libpurple/protocols/irc/msgs.c:910
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4466,7 +4569,7 @@ msgstr ""
 "El servidor rechazÃ³ el nombre que escogiÃ³ para su cuenta. Es posible que "
 "incluya caracteres invÃ¡lidos."
 
-#: ../libpurple/protocols/irc/msgs.c:915
+#: ../libpurple/protocols/irc/msgs.c:920
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4474,44 +4577,44 @@ msgstr ""
 "El servidor rechazÃ³ el nombre que escogiÃ³ para su cuenta. Es posible que "
 "incluya caracteres invÃ¡lidos."
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:959
 msgid "Cannot change nick"
 msgstr "No se puede cambiar el alias"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:959
 msgid "Could not change nick"
 msgstr "No se pudo cambiar el alias"
 
-#: ../libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:980
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Ha abandonado el canal %s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1022
 msgid "Error: invalid PONG from server"
 msgstr "Error: PONG invÃ¡lido del servidor"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1024
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Respuesta PING -- Retraso: %lu segundos"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1115
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "No se pudo unir a %s: es necesario registrarse"
 
-#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/irc/msgs.c:1116
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "No se puede unir al canal"
 
-#: ../libpurple/protocols/irc/msgs.c:1145
+#: ../libpurple/protocols/irc/msgs.c:1150
 msgid "Nick or channel is temporarily unavailable."
 msgstr "El apodo o el canal estÃ¡n temporalmente no disponibles."
 
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1162
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mensajes globales de %s"
@@ -4620,7 +4723,7 @@ msgstr ""
 "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:2261
+#: ../libpurple/protocols/jabber/jabber.c:2314
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo."
 
@@ -4732,53 +4835,53 @@ msgstr ""
 "whowas &lt;apodo&gt;:  Obtiene informaciÃ³n de un usuario que se ha "
 "desconectado."
 
-#: ../libpurple/protocols/irc/parse.c:465
+#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tiempo de respuesta de %s: %lu segundos"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "CTCP PING reply"
 msgstr "Respuesta a PING CTCP"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:633
+#: ../libpurple/protocols/irc/parse.c:640 ../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:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/adhoccommands.c:143
+#: ../libpurple/protocols/jabber/jabber.c:698
+#: ../libpurple/protocols/jabber/jabber.c:728
+#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Unknown Error"
 msgstr "Error desconocido"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
+#: ../libpurple/protocols/jabber/adhoccommands.c:145
+#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
 msgstr "FallÃ³ la orden ad-hoc"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
+#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
 msgstr "ejecutar"
 
-#: ../libpurple/protocols/jabber/auth.c:53
+#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "El servidor requiere SSL para conectarse. No se dispone de soporte TLS/SSL."
 
-#: ../libpurple/protocols/jabber/auth.c:116
+#: ../libpurple/protocols/jabber/auth.c:120
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "El servidor solicita autenticaciÃ³n en claro sobre un canal no cifrado"
 
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:323
+#: ../libpurple/protocols/jabber/auth.c:518
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4787,33 +4890,32 @@ msgstr ""
 "%s solicita autenticaciÃ³n en claro sobre un canal no cifrado. Â¿Desea "
 "permitir Ã©sto y continuar con el proceso de autenticaciÃ³n?"
 
-#: ../libpurple/protocols/jabber/auth.c:321
-#: ../libpurple/protocols/jabber/auth.c:322
-#: ../libpurple/protocols/jabber/auth.c:510
-#: ../libpurple/protocols/jabber/auth.c:511
-#: ../libpurple/protocols/jabber/auth.c:598
-#: ../libpurple/protocols/jabber/auth.c:599
+#: ../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
 msgid "Plaintext Authentication"
 msgstr "AutenticaciÃ³n en claro"
 
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth.c:523
-#: ../libpurple/protocols/jabber/auth.c:610
+#: ../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"
 
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:462
-#: ../libpurple/protocols/jabber/auth.c:561
-#: ../libpurple/protocols/jabber/auth.c:776
-#: ../libpurple/protocols/jabber/auth.c:917
-#: ../libpurple/protocols/jabber/auth.c:942
-#: ../libpurple/protocols/jabber/auth.c:961
-#: ../libpurple/protocols/jabber/jabber.c:123
+#: ../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/jabber.c:127
 msgid "Invalid response from server."
 msgstr "Respuesta invÃ¡lida del servidor."
 
-#: ../libpurple/protocols/jabber/auth.c:600
+#: ../libpurple/protocols/jabber/auth.c:616
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4821,18 +4923,18 @@ msgstr ""
 "El servidor solicita autenticaciÃ³n en claro sobre un canal no cifrado. "
 "Â¿Permitir Ã©sto y continuar con el proceso de autenticaciÃ³n?"
 
-#: ../libpurple/protocols/jabber/auth.c:797
-#: ../libpurple/protocols/jabber/auth.c:820
+#: ../libpurple/protocols/jabber/auth.c:818
+#: ../libpurple/protocols/jabber/auth.c:843
 msgid "Invalid challenge from server"
 msgstr "DesafÃo invÃ¡lido del servidor"
 
-#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/auth.c:917
 msgid "SASL error"
 msgstr "Error de SASL"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/sametime/sametime.c:4174
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
@@ -4851,7 +4953,7 @@ msgstr "Nombre propio"
 msgstr "Nombre propio"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
+#: ../libpurple/protocols/jabber/jabber.c:997
 msgid "URL"
 msgstr "URL"
 
@@ -4882,7 +4984,7 @@ msgstr "CÃ³digo postal"
 
 #: ../libpurple/protocols/jabber/buddy.c:293
 #: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc/silc.c:1158
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "PaÃs"
@@ -4910,15 +5012,16 @@ msgstr "Rol"
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3730
 msgid "Birthday"
 msgstr "CumpleaÃ±os"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3355
 #: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "DescripciÃ³n"
@@ -4963,26 +5066,23 @@ msgstr "Elementos de descubrimiento de s
 
 #: ../libpurple/protocols/jabber/buddy.c:821
 #: ../libpurple/protocols/jabber/buddy.c:981
-#, fuzzy
 msgid "Extended Stanza Addressing"
-msgstr "DirecciÃ³n extendida"
+msgstr "DirecciÃ³n de grupo extendida"
 
 #: ../libpurple/protocols/jabber/buddy.c:823
 #: ../libpurple/protocols/jabber/buddy.c:983
-#, fuzzy
 msgid "Multi-User Chat"
-msgstr "Apodo en el chat"
+msgstr "Chat multiusuario"
 
 #: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/jabber/buddy.c:985
-#, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
-msgstr "El usuario no tiene informaciÃ³n en el directorio."
+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 ""
+msgstr "Flujos de bytes en banda"
 
 #: ../libpurple/protocols/jabber/buddy.c:829
 #: ../libpurple/protocols/jabber/buddy.c:989
@@ -4992,12 +5092,12 @@ msgid "PubSub Service"
 #: ../libpurple/protocols/jabber/buddy.c:831
 #: ../libpurple/protocols/jabber/buddy.c:991
 msgid "PubSub Service"
-msgstr ""
+msgstr "Servicio PubSub"
 
 #: ../libpurple/protocols/jabber/buddy.c:833
 #: ../libpurple/protocols/jabber/buddy.c:993
 msgid "SOCKS5 Bytestreams"
-msgstr ""
+msgstr "Flujos de bytes SOCKS5"
 
 #: ../libpurple/protocols/jabber/buddy.c:835
 #: ../libpurple/protocols/jabber/buddy.c:995
@@ -5011,9 +5111,8 @@ msgstr "XHTML-IM"
 
 #: ../libpurple/protocols/jabber/buddy.c:839
 #: ../libpurple/protocols/jabber/buddy.c:999
-#, fuzzy
 msgid "In-Band Registration"
-msgstr "Error de registro"
+msgstr "Registro en lÃnea"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
 #: ../libpurple/protocols/jabber/buddy.c:1001
@@ -5027,9 +5126,8 @@ msgstr "Avatar del usuario"
 
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
-#, fuzzy
 msgid "Chat State Notifications"
-msgstr "NotificaciÃ³n de estado de amigos"
+msgstr "Notificaciones de estado de chat"
 
 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
@@ -5038,21 +5136,19 @@ msgstr "VersiÃ³n del programa"
 
 #: ../libpurple/protocols/jabber/buddy.c:849
 #: ../libpurple/protocols/jabber/buddy.c:1009
-#, fuzzy
 msgid "Stream Initiation"
-msgstr "OrientaciÃ³n"
+msgstr "Origen del flujo"
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
+#: ../libpurple/protocols/sametime/sametime.c:3277
 msgid "File Transfer"
 msgstr "Transferencia de archivo"
 
 #: ../libpurple/protocols/jabber/buddy.c:853
 #: ../libpurple/protocols/jabber/buddy.c:1013
-#, fuzzy
 msgid "User Mood"
-msgstr "Modos de usuario"
+msgstr "Estado de Ã¡nimo del usuario"
 
 #: ../libpurple/protocols/jabber/buddy.c:855
 #: ../libpurple/protocols/jabber/buddy.c:1015
@@ -5061,48 +5157,44 @@ msgstr "Actividad de usuario"
 
 #: ../libpurple/protocols/jabber/buddy.c:857
 #: ../libpurple/protocols/jabber/buddy.c:1017
-#, fuzzy
 msgid "Entity Capabilities"
-msgstr "Capacidades"
+msgstr "Capacidades de la entidad"
 
 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Encrypted Session Negotiations"
-msgstr ""
+msgstr "Negociaciones de sesiones cifradas"
 
 #: ../libpurple/protocols/jabber/buddy.c:861
 #: ../libpurple/protocols/jabber/buddy.c:1021
-#, fuzzy
 msgid "User Tune"
-msgstr "Nombre de usuario"
+msgstr "MÃºsica del usuario"
 
 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
-#, fuzzy
 msgid "Roster Item Exchange"
-msgstr "MI con intercambio de claves"
+msgstr "Intercambio de elementos de la lista"
 
 #: ../libpurple/protocols/jabber/buddy.c:865
 #: ../libpurple/protocols/jabber/buddy.c:1025
-#, fuzzy
 msgid "Reachability Address"
-msgstr "Correo electrÃ³nico"
+msgstr "DirecciÃ³n alcanzable"
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
 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
-#, fuzzy
 msgid "Jingle"
-msgstr "Unirse"
+msgstr "Jingle"
 
 #: ../libpurple/protocols/jabber/buddy.c:871
 #: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Jingle Audio"
-msgstr ""
+msgstr "Audio Jingle"
 
 #: ../libpurple/protocols/jabber/buddy.c:873
 #: ../libpurple/protocols/jabber/buddy.c:1033
@@ -5112,28 +5204,27 @@ msgid "Jingle ICE UDP"
 #: ../libpurple/protocols/jabber/buddy.c:875
 #: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "Jingle ICE UDP"
-msgstr ""
+msgstr "Jingle ICE UDP"
 
 #: ../libpurple/protocols/jabber/buddy.c:877
 #: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Jingle ICE TCP"
-msgstr ""
+msgstr "Jingle ICE TCP"
 
 #: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Jingle Raw UDP"
-msgstr ""
+msgstr "Jingle UDP en crudo"
 
 #: ../libpurple/protocols/jabber/buddy.c:881
 #: ../libpurple/protocols/jabber/buddy.c:1041
-#, fuzzy
 msgid "Jingle Video"
-msgstr "VÃdeo en tiempo real"
+msgstr "VÃdeo Jingle"
 
 #: ../libpurple/protocols/jabber/buddy.c:883
 #: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle DTMF"
-msgstr ""
+msgstr "DTMF Jingle"
 
 #: ../libpurple/protocols/jabber/buddy.c:885
 #: ../libpurple/protocols/jabber/buddy.c:1045
@@ -5167,8 +5258,8 @@ msgstr "Ver usuarios"
 
 #: ../libpurple/protocols/jabber/buddy.c:897
 #: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1600
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
@@ -5176,63 +5267,62 @@ msgstr "Ping"
 
 #: ../libpurple/protocols/jabber/buddy.c:899
 #: ../libpurple/protocols/jabber/buddy.c:1059
-#, fuzzy
 msgid "Stanza Encryption"
-msgstr "Cifrado Trillian"
+msgstr "Cifrado de grupo"
 
 #: ../libpurple/protocols/jabber/buddy.c:901
 #: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Entity Time"
-msgstr ""
+msgstr "Tiempo de entidad"
 
 #: ../libpurple/protocols/jabber/buddy.c:903
 #: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "Delayed Delivery"
-msgstr ""
+msgstr "EnvÃo con demora"
 
 #: ../libpurple/protocols/jabber/buddy.c:905
 #: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "Collaborative Data Objects"
-msgstr ""
+msgstr "Objetods de datos colaborativos"
 
 #: ../libpurple/protocols/jabber/buddy.c:907
 #: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "File Repository and Sharing"
-msgstr ""
+msgstr "Repositorio de archivos y comparticiÃ³n"
 
 #: ../libpurple/protocols/jabber/buddy.c:909
 #: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "STUN Service Discovery for Jingle"
-msgstr ""
+msgstr "Servidor de descubrimiento STUN para Jingle"
 
 #: ../libpurple/protocols/jabber/buddy.c:911
 #: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
+msgstr "NegociaciÃ³n de sesiÃ³n cifrada simplificada"
 
 #: ../libpurple/protocols/jabber/buddy.c:913
 #: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Hop Check"
-msgstr ""
+msgstr "ComprobaciÃ³n de saltos"
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2911
 msgid "Capabilities"
 msgstr "Capacidades"
 
 #: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
-#: ../libpurple/protocols/jabber/si.c:859
+#: ../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:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
+#: ../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
 msgid "Priority"
 msgstr "Prioridad"
 
@@ -5243,9 +5333,9 @@ msgstr "Nombre medio"
 msgstr "Nombre medio"
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/jabber/jabber.c:977
+#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/oscar/oscar.c:3782
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5264,72 +5354,71 @@ msgstr "Logotipo"
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "No ocultarse de"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "Ocultarse temporalmente de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificaciÃ³n de presencia"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1964
 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:1970
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "De-suscribir"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
+#: ../libpurple/protocols/jabber/buddy.c:1988
 msgid "Log In"
 msgstr "Conectarse"
 
-#: ../libpurple/protocols/jabber/buddy.c:1989
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log Out"
 msgstr "Desconectarse"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
-#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Chatty"
 msgstr "Hablador"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
-#: ../libpurple/protocols/jabber/jabber.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
-#: ../libpurple/protocols/sametime/sametime.c:3297
-#, c-format
+#: ../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
 msgid "Do Not Disturb"
 msgstr "No molestar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:3692
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:2247
 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:2319
+#: ../libpurple/protocols/jabber/buddy.c:2332
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5337,70 +5426,70 @@ msgstr ""
 "Encuentra un contacto al introducir los criterios de bÃºsqueda en los campos "
 "proporcionados. Nota: puede hacer bÃºsquedas con comodines (%) en cada campo."
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
+#: ../libpurple/protocols/jabber/buddy.c:2352
 msgid "Directory Query Failed"
 msgstr "FallÃ³ la consulta al directorio"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2353
 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:2374
+#: ../libpurple/protocols/jabber/buddy.c:2387
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instrucciones del servidor: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:2394
 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:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/novell/novell.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:3695
+#: ../libpurple/protocols/oscar/oscar.c:3704
 msgid "E-Mail Address"
 msgstr "DirecciÃ³n de correo electrÃ³nico"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2423
+#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search for XMPP users"
 msgstr "Buscar un usuario XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:2425
 #: ../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:5611
+#: ../libpurple/protocols/sametime/sametime.c:5657
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2440
 msgid "Invalid Directory"
 msgstr "Directorio invÃ¡lido"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2457
 msgid "Enter a User Directory"
 msgstr "Introduzca un directorio de usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:2458
 msgid "Select a user directory to search"
 msgstr "Selecciona un directorio de usuario donde buscar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Search Directory"
 msgstr "Buscar en el directorio"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/oscar/oscar.c:5313
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Sala:"
@@ -5470,7 +5559,7 @@ msgstr "El cambio de apodo no estÃ¡ sopo
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Error al obtener la lista de salas"
@@ -5491,29 +5580,25 @@ msgstr "Buscar salas"
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-#: ../libpurple/protocols/jabber/jabber.c:92
-msgid "Error initializing session"
-msgstr "Error al inicializar la sesiÃ³n"
-
-#: ../libpurple/protocols/jabber/jabber.c:145
+#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
-msgstr ""
+msgstr "Necesita cifrado, pero no estÃ¡ disponible esa opciÃ³n en este servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:259
-#: ../libpurple/protocols/jabber/jabber.c:312
-#: ../libpurple/protocols/jabber/jabber.c:340
+#: ../libpurple/protocols/jabber/jabber.c:269
+#: ../libpurple/protocols/jabber/jabber.c:324
+#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "Error de escritura"
 
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
+#: ../libpurple/protocols/jabber/jabber.c:424
+#: ../libpurple/protocols/jabber/jabber.c:463
 msgid "Read Error"
 msgstr "Error de lectura"
 
-#: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/jabber/jabber.c:500
+#: ../libpurple/protocols/oscar/flap_connection.c:398
+#: ../libpurple/protocols/yahoo/yahoo.c:2561
+#: ../libpurple/protocols/yahoo/yahoo.c:2593
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5522,302 +5607,263 @@ msgstr ""
 "No se pudo establecer una conexiÃ³n con el servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:529
+#: ../libpurple/protocols/jabber/jabber.c:550
 msgid "Unable to create socket"
 msgstr "No se pudo crear el socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
+#: ../libpurple/protocols/jabber/jabber.c:598
+#: ../libpurple/protocols/jabber/jabber.c:1083
 msgid "Invalid XMPP ID"
 msgstr "XMPP ID no vÃ¡lido"
 
-#: ../libpurple/protocols/jabber/jabber.c:580
+#: ../libpurple/protocols/jabber/jabber.c:605
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP ID invÃ¡lido. Debe establecerse el dominio."
 
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:683
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s efectuado con Ã©xito"
 
-#: ../libpurple/protocols/jabber/jabber.c:662
+#: ../libpurple/protocols/jabber/jabber.c:689
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Registro a %s efectuado con Ã©xito"
 
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:691
+#: ../libpurple/protocols/jabber/jabber.c:692
 msgid "Registration Successful"
 msgstr "Ã‰xito en el registro"
 
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:700
+#: ../libpurple/protocols/jabber/jabber.c:701
 msgid "Registration Failed"
 msgstr "FallÃ³ el registro"
 
-#: ../libpurple/protocols/jabber/jabber.c:692
+#: ../libpurple/protocols/jabber/jabber.c:719
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Registro de %s efectuado con Ã©xito"
 
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:721
+#: ../libpurple/protocols/jabber/jabber.c:722
 msgid "Unregistration Successful"
 msgstr "Ã‰xito en el deregistro"
 
-#: ../libpurple/protocols/jabber/jabber.c:703
-#: ../libpurple/protocols/jabber/jabber.c:704
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:730
+#: ../libpurple/protocols/jabber/jabber.c:731
 msgid "Unregistration Failed"
-msgstr "FallÃ³ el registro"
+msgstr "FallÃ³ el deregistro"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:897
+#: ../libpurple/protocols/jabber/jabber.c:898
 msgid "Already Registered"
 msgstr "Ya estÃ¡ registrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/jabber.c:985
+#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/oscar/oscar.c:3784
 msgid "State"
 msgstr "Estado"
 
-#: ../libpurple/protocols/jabber/jabber.c:967
+#: ../libpurple/protocols/jabber/jabber.c:989
 msgid "Postal code"
 msgstr "CÃ³digo postal"
 
-#: ../libpurple/protocols/jabber/jabber.c:972
+#: ../libpurple/protocols/jabber/jabber.c:993
 #: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/ops.c:1069
 #: ../libpurple/protocols/silc10/silc.c:683
 #: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "TelÃ©fono"
 
-#: ../libpurple/protocols/jabber/jabber.c:982
+#: ../libpurple/protocols/jabber/jabber.c:1001
 msgid "Date"
 msgstr "Fecha"
 
-#: ../libpurple/protocols/jabber/jabber.c:987
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1005
 msgid "Unregister"
-msgstr "Registrar"
+msgstr "Deregistrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:994
+#: ../libpurple/protocols/jabber/jabber.c:1012
 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:997
+#: ../libpurple/protocols/jabber/jabber.c:1015
 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:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1023
+#: ../libpurple/protocols/jabber/jabber.c:1024
 msgid "Register New XMPP Account"
 msgstr "Registrando cuenta nueva de XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:1025
+#: ../libpurple/protocols/jabber/jabber.c:1034
 msgid "Register"
 msgstr "Registrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
+#: ../libpurple/protocols/jabber/jabber.c:1030
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Cambiar la cuenta de registro en %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1031
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Registrar una cuenta nueva en %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:1034
 msgid "Change Registration"
 msgstr "Cambiar registro"
 
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1142
+#: ../libpurple/protocols/jabber/jabber.c:1143
 msgid "Error unregistering account"
-msgstr "Error cambiando la informaciÃ³n de la cuenta"
+msgstr "Error al deregistrar la cuenta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1148
+#: ../libpurple/protocols/jabber/jabber.c:1149
 msgid "Account successfully unregistered"
-msgstr "Ha creado un Qun con Ã©xito"
+msgstr "La cuenta se ha deregistrado con Ã©xito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1308
 msgid "Initializing Stream"
 msgstr "Inicializando flujo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289
+#: ../libpurple/protocols/jabber/jabber.c:1313
 msgid "Initializing SSL/TLS"
 msgstr "Inicializando SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/jabber/jabber.c:1317
+#: ../libpurple/protocols/msn/session.c:408
+#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1326
 msgid "Re-initializing Stream"
 msgstr "Reinicializando flujo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1865
-#: ../libpurple/protocols/jabber/jabber.c:1909
-#: ../libpurple/protocols/jabber/jabber.c:1945
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../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
 msgid "Not Authorized"
 msgstr "No autorizado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1442
+#: ../libpurple/protocols/jabber/jabber.c:1468
 msgid "Both"
 msgstr "Ambos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1444
+#: ../libpurple/protocols/jabber/jabber.c:1470
 msgid "From (To pending)"
 msgstr "Desde (Destino pendiente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1446
+#: ../libpurple/protocols/jabber/jabber.c:1472
 msgid "From"
 msgstr "De"
 
-#: ../libpurple/protocols/jabber/jabber.c:1449
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "To"
 msgstr "A"
 
-#: ../libpurple/protocols/jabber/jabber.c:1451
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "None (To pending)"
 msgstr "Nadie (Destino pendiente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
+#: ../libpurple/protocols/jabber/jabber.c:1479
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ninguno"
 
-#: ../libpurple/protocols/jabber/jabber.c:1456
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Subscription"
 msgstr "SubscripciÃ³n"
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
-#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../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/usermood.c:184
+#: ../libpurple/protocols/silc/buddy.c:1560
 #: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/buddy.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
-msgstr "Ãnimo"
+msgstr "Estado de Ã¡nimo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../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
 msgid "Mood Text"
-msgstr "Texto de estado"
+msgstr "Texto de estado de Ã¡nimo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1567
 #: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1627
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1623
+msgid "Allow Buzz"
+msgstr "Permitir codazos"
+
+#: ../libpurple/protocols/jabber/jabber.c:1641
 msgid "Tune Artist"
-msgstr "Artistas"
+msgstr "Artista de mÃºsica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/jabber/jabber.c:1559
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1642
 msgid "Tune Title"
-msgstr "TÃtulo"
+msgstr "TÃtulo de mÃºsica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1560
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/jabber/jabber.c:1643
 msgid "Tune Album"
-msgstr ""
+msgstr "Album de mÃºsica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1630
+#: ../libpurple/protocols/jabber/jabber.c:1644
 msgid "Tune Genre"
-msgstr ""
+msgstr "GÃ©nero de mÃºsica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1631
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1645
 msgid "Tune Comment"
-msgstr "Comentario de amigo"
+msgstr "Comentario de mÃºsica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/jabber/jabber.c:1646
 msgid "Tune Track"
-msgstr ""
+msgstr "Pista de mÃºsica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1633
+#: ../libpurple/protocols/jabber/jabber.c:1647
 msgid "Tune Time"
-msgstr ""
+msgstr "Tiempo de mÃºsica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
+#: ../libpurple/protocols/jabber/jabber.c:1648
 msgid "Tune Year"
-msgstr ""
+msgstr "AÃ±o de mÃºsica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
+#: ../libpurple/protocols/jabber/jabber.c:1649
 msgid "Tune URL"
-msgstr ""
+msgstr "URL de mÃºsica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-#, fuzzy
-msgid "Allow Buzz"
-msgstr "Permitir"
-
 #: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Password Changed"
 msgstr "ContraseÃ±a modificada"
@@ -5826,320 +5872,337 @@ msgstr "Su contraseÃ±a ha sido modificad
 msgid "Your password has been changed."
 msgstr "Su contraseÃ±a ha sido modificada."
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
+#: ../libpurple/protocols/jabber/jabber.c:1672
+#: ../libpurple/protocols/jabber/jabber.c:1673
 msgid "Error changing password"
 msgstr "Error al cambiar la contraseÃ±a"
 
-#: ../libpurple/protocols/jabber/jabber.c:1728
+#: ../libpurple/protocols/jabber/jabber.c:1730
 msgid "Password (again)"
 msgstr "ContraseÃ±a (de nuevo)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1736
+#: ../libpurple/protocols/jabber/jabber.c:1737
 msgid "Change XMPP Password"
 msgstr "Cambiar contraseÃ±a XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1737
 msgid "Please enter your new password"
 msgstr "Por favor, indique su nueva contraseÃ±a"
 
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
-#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/jabber/jabber.c:1751
+#: ../libpurple/protocols/oscar/oscar.c:6413
+#: ../libpurple/protocols/silc/silc.c:1236
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Establecer su informaciÃ³n de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
-#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/jabber/jabber.c:1756
+#: ../libpurple/protocols/oscar/oscar.c:6424
+#: ../libpurple/protocols/silc/silc.c:1232
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Cambiar su contraseÃ±a..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1761
 msgid "Search for Users..."
 msgstr "Buscar usuarios..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1845
+#: ../libpurple/protocols/jabber/jabber.c:1852
 msgid "Bad Request"
 msgstr "Solicitud errÃ³nea"
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1854
 msgid "Conflict"
 msgstr "Conflicto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
+#: ../libpurple/protocols/jabber/jabber.c:1856
 msgid "Feature Not Implemented"
 msgstr "Funcionalidad no implementada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1858
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1860
 msgid "Gone"
 msgstr "Se fue"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1862
+#: ../libpurple/protocols/jabber/jabber.c:1943
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1864
 msgid "Item Not Found"
 msgstr "Elemento no encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1866
 msgid "Malformed XMPP ID"
 msgstr "ID de XMPP malformado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1868
 msgid "Not Acceptable"
 msgstr "No aceptable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid "Not Allowed"
 msgstr "No permitido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
+#: ../libpurple/protocols/jabber/jabber.c:1874
 msgid "Payment Required"
 msgstr "Pago necesario"
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1876
 msgid "Recipient Unavailable"
 msgstr "Destinatario no disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
+#: ../libpurple/protocols/jabber/jabber.c:1880
 msgid "Registration Required"
 msgstr "Registro necesario"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
+#: ../libpurple/protocols/jabber/jabber.c:1882
 msgid "Remote Server Not Found"
 msgstr "No se encontrÃ³ el servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
+#: ../libpurple/protocols/jabber/jabber.c:1884
 msgid "Remote Server Timeout"
 msgstr "ExpirÃ³ el tiempo del servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1886
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#: ../libpurple/protocols/jabber/jabber.c:1888
 msgid "Service Unavailable"
 msgstr "Servicio no disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#: ../libpurple/protocols/jabber/jabber.c:1890
 msgid "Subscription Required"
 msgstr "SubscripciÃ³n necesaria"
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
+#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Unexpected Request"
 msgstr "Solicitud no esperada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
+#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Authorization Aborted"
 msgstr "AutorizaciÃ³n interrumpida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Incorrect encoding in authorization"
 msgstr "CodificaciÃ³n incorrecta en la autorizaciÃ³n"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Invalid authzid"
 msgstr "Authzid invÃ¡lido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
+#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorizaciÃ³n invÃ¡lido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
+#: ../libpurple/protocols/jabber/jabber.c:1909
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorizaciÃ³n demasiado dÃ©bil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
+#: ../libpurple/protocols/jabber/jabber.c:1917
 msgid "Temporary Authentication Failure"
 msgstr "FallÃ³ temporal de la autenticaciÃ³n"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
+#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Authentication Failure"
 msgstr "FallÃ³ de autenticaciÃ³n"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Bad Format"
 msgstr "Formato errÃ³neo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Bad Namespace Prefix"
 msgstr "Prefijo del espacio de nombres errÃ³neo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1925
+#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "Resource Conflict"
 msgstr "Conflicto de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/silc/silc.c:350
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "ExpirÃ³ la conexiÃ³n"
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Host Gone"
 msgstr "Servidor desaparecido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
+#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Host Unknown"
 msgstr "Servidor desconocido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
+#: ../libpurple/protocols/jabber/jabber.c:1941
 msgid "Improper Addressing"
 msgstr "Direccionamiento incorrecto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1945
 msgid "Invalid ID"
 msgstr "ID no vÃ¡lido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
+#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Invalid Namespace"
 msgstr "Espacio de nombres no vÃ¡lido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
+#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Invalid XML"
 msgstr "XML invÃ¡lido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1943
+#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Non-matching Hosts"
 msgstr "No existen servidores coincidentes"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
+#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "Policy Violation"
 msgstr "ViolaciÃ³n de la polÃtica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
+#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "Remote Connection Failed"
 msgstr "FallÃ³ la conexiÃ³n remota"
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
+#: ../libpurple/protocols/jabber/jabber.c:1959
 msgid "Resource Constraint"
 msgstr "RestricciÃ³n de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1961
 msgid "Restricted XML"
 msgstr "XML restringido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
+#: ../libpurple/protocols/jabber/jabber.c:1963
 msgid "See Other Host"
 msgstr "Ver otros servidores"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
+#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "System Shutdown"
 msgstr "Parada del sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:1959
+#: ../libpurple/protocols/jabber/jabber.c:1967
 msgid "Undefined Condition"
 msgstr "CondiciÃ³n no definida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
+#: ../libpurple/protocols/jabber/jabber.c:1969
 msgid "Unsupported Encoding"
 msgstr "CodificaciÃ³n no soportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1963
+#: ../libpurple/protocols/jabber/jabber.c:1971
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de Â«stanzaÂ» no soportado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
+#: ../libpurple/protocols/jabber/jabber.c:1973
 msgid "Unsupported Version"
 msgstr "VersiÃ³n no soportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
+#: ../libpurple/protocols/jabber/jabber.c:1975
 msgid "XML Not Well Formed"
 msgstr "XML malformado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/jabber.c:1977
 msgid "Stream Error"
 msgstr "Error de flujo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
+#: ../libpurple/protocols/jabber/jabber.c:2062
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "No puede echar al usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2072
+#: ../libpurple/protocols/jabber/jabber.c:2082
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "AfiliaciÃ³n desconocida: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2077
+#: ../libpurple/protocols/jabber/jabber.c:2087
 #, 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:2096
+#: ../libpurple/protocols/jabber/jabber.c:2106
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol desconocido: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2101
+#: ../libpurple/protocols/jabber/jabber.c:2111
 #, 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:2154
+#: ../libpurple/protocols/jabber/jabber.c:2164
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "No puede expulsar al usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2185
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:2195
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "No puede echar al usuario %s"
+msgstr "No puede hacer un ping al usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
+#: ../libpurple/protocols/jabber/jabber.c:2213
+#: ../libpurple/protocols/jabber/jabber.c:2224
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+msgstr "No se pudo dar el codazo porque no se sabe nada del usuario %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
+#: ../libpurple/protocols/jabber/jabber.c:2219
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+msgstr "No se pudo dar el codazo porque puede que el usuario %s estÃ© desconectado."
 
-#: ../libpurple/protocols/jabber/jabber.c:2239
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:2250
+#, c-format
 msgid "Unable to buzz, because the user %s does not support it."
-msgstr ""
-"No fue posible reproducir el sonido porque el archivo elegido (%s) no existe."
+msgstr "No se pudo dar un codazo porque el usuario %s no tiene soporte para ello."
 
-#: ../libpurple/protocols/jabber/jabber.c:2253
+#: ../libpurple/protocols/jabber/jabber.c:2272
+#: ../libpurple/protocols/yahoo/yahoo.c:4129
+msgid "Buzz"
+msgstr "Codazo"
+
+#: ../libpurple/protocols/jabber/jabber.c:2273
+#: ../libpurple/protocols/jabber/message.c:308
+#: ../libpurple/protocols/yahoo/yahoo.c:4130
+#, 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
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Dando un codazo a %s..."
+
+#: ../libpurple/protocols/jabber/jabber.c:2306
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar una sala de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2310
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar una sala de chat"
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:2319
 msgid "part [room]:  Leave the room."
 msgstr "part [habitaciÃ³n]:  Abandonar la habitaciÃ³n."
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:2324
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrarse en una sala de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:2330
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuevo tema]:  Mostrar o cambiar el tema."
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:2336
 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:2289
+#: ../libpurple/protocols/jabber/jabber.c:2342
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6147,7 +6210,7 @@ msgstr ""
 "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:2295
+#: ../libpurple/protocols/jabber/jabber.c:2348
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6155,32 +6218,32 @@ msgstr ""
 "rol &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Definir el "
 "rol de un usuario en la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
+#: ../libpurple/protocols/jabber/jabber.c:2354
 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:2307
+#: ../libpurple/protocols/jabber/jabber.c:2360
 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:2313
+#: ../libpurple/protocols/jabber/jabber.c:2366
 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:2318
+#: ../libpurple/protocols/jabber/jabber.c:2371
 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:2324
+#: ../libpurple/protocols/jabber/jabber.c:2377
 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:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
+#: ../libpurple/protocols/jabber/jabber.c:2382
+#: ../libpurple/protocols/yahoo/yahoo.c:4155
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Dar un codazo a un usuario para llamar su atenciÃ³n"
 
@@ -6200,92 +6263,90 @@ msgstr "Complemento de protocolo XMPP"
 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:202 ../pidgin/gtkaccount.c:506
+#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:509
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
 msgstr "Requiere SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "Forzar SSL antiguo (puerto 5323)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:219
+#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticaciÃ³n en claro sobre canales no cifrados"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3327
+#: ../libpurple/protocols/simple/simple.c:2089
 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:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
+#: ../libpurple/protocols/jabber/libxmpp.c:231
+#: ../libpurple/protocols/myspace/myspace.c:3324
+#: ../libpurple/protocols/silc/silc.c:2057
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:840
 msgid "Connect server"
 msgstr "Conectar con el servidor"
 
+#: ../libpurple/protocols/jabber/libxmpp.c:236
+msgid "File transfer proxies"
+msgstr "Pasarelas de transferencia de archivos"
+
 #: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s ha abandonado la conversaciÃ³n."
 
-#: ../libpurple/protocols/jabber/message.c:161
+#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "Mensaje de %s"
 
-#: ../libpurple/protocols/jabber/message.c:225
+#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s ha cambiado el tema a: %s"
 
-#: ../libpurple/protocols/jabber/message.c:227
+#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "El tema es: %s"
 
-#: ../libpurple/protocols/jabber/message.c:275
+#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "FallÃ³ el envÃo de mensaje a %s: %s"
 
-#: ../libpurple/protocols/jabber/message.c:278
+#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "Mensaje de error de XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s le ha aÃ±adido [%s]"
-
-#: ../libpurple/protocols/jabber/message.c:407
+#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
 msgid " (Code %s)"
 msgstr " (CÃ³digo %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:196
+#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "Error de tratamiento XML"
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:441
 msgid "Unknown Error in presence"
 msgstr "Error desconocido en presencia"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:522
+#: ../libpurple/protocols/jabber/presence.c:523
 msgid "Create New Room"
 msgstr "Crear una sala nueva"
 
-#: ../libpurple/protocols/jabber/presence.c:510
+#: ../libpurple/protocols/jabber/presence.c:524
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6293,92 +6354,88 @@ msgstr ""
 "Va a crear una sala nueva. Â¿Desea configurarla o aceptar los valores por "
 "omisiÃ³n?"
 
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:530
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:531
 msgid "_Accept Defaults"
 msgstr "_Aceptar valores por omisiÃ³n"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:573
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error en el chat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:577
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error al unirse al chat %s"
 
-#: ../libpurple/protocols/jabber/si.c:775
+#: ../libpurple/protocols/jabber/si.c:1009
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "No se pudo enviar el archivo a %s, el usuario no soporta transferencias de "
 "archivos"
 
-#: ../libpurple/protocols/jabber/si.c:776
-#: ../libpurple/protocols/jabber/si.c:777
-#: ../libpurple/protocols/jabber/si.c:845
+#: ../libpurple/protocols/jabber/si.c:1010
+#: ../libpurple/protocols/jabber/si.c:1011
+#: ../libpurple/protocols/jabber/si.c:1080
 msgid "File Send Failed"
 msgstr "Fallo en el envÃo del archivo"
 
-#: ../libpurple/protocols/jabber/si.c:838
+#: ../libpurple/protocols/jabber/si.c:1073
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "No se pudo enviar el archivo a %s, JID invÃ¡lido"
 
-#: ../libpurple/protocols/jabber/si.c:840
+#: ../libpurple/protocols/jabber/si.c:1075
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "No se pudo enviar el archivo a %s, el usuario no estÃ¡ conectado"
 
-#: ../libpurple/protocols/jabber/si.c:842
+#: ../libpurple/protocols/jabber/si.c:1077
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "No se pudo enviar el archivo a %s, no estÃ¡ suscrito a la presencia del "
 "usuario"
 
-#: ../libpurple/protocols/jabber/si.c:857
+#: ../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"
 
-#: ../libpurple/protocols/jabber/si.c:873
+#: ../libpurple/protocols/jabber/si.c:1108
 msgid "Select a Resource"
 msgstr "Seleccione un recurso"
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
-#, fuzzy
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
-msgstr "Modos de usuario"
+msgstr "Editar estados de Ã¡nimo del usuario"
 
-#: ../libpurple/protocols/jabber/usermood.c:181
+#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
 msgstr "Escoja un estado de Ã¡nimo de la lista."
 
-#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usermood.c:201
 #: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Configurar"
 
-#: ../libpurple/protocols/jabber/usermood.c:191
-#, fuzzy
+#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
-msgstr "Enviar MI..."
+msgstr "Fijar estado de Ã¡nimo..."
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Set User Nickname"
-msgstr "Establecer lÃmite de usuarios"
+msgstr "Establecer apodo de usuario"
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "Introduzca el nuevo nombre para %s"
+msgstr "Introduzca su nuevo apodo."
 
 #: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
@@ -6388,10 +6445,9 @@ msgstr ""
 "Escoja algo apropiado, la informaciÃ³n serÃ¡ visible a todos los contactos en "
 "su lista de contactos."
 
-#: ../libpurple/protocols/jabber/usernick.c:99
-#, fuzzy
+#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
-msgstr "Apodo"
+msgstr "Establecer apodo..."
 
 #: ../libpurple/protocols/jabber/xdata.c:378
 msgid "Actions"
@@ -6401,12 +6457,18 @@ msgstr "Seleccione una acciÃ³n"
 msgid "Select an action"
 msgstr "Seleccione una acciÃ³n"
 
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/contact.c:712
+msgid "Unable to retrieve MSN Address Book"
+msgstr "No se pudo obtener el libro de direcciones de MSN"
+
+#: ../libpurple/protocols/msn/dialog.c:118
+#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problema de sincronizaciÃ³n de la lista de amigos en %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msnp9/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6415,7 +6477,8 @@ msgstr ""
 "%s estÃ¡ en la lista local dentro del grupo Â«%sÂ» pero no estÃ¡ en la lista del "
 "servidor. Â¿Desea aÃ±adir a este amigo?"
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msnp9/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6425,335 +6488,339 @@ msgstr ""
 "aÃ±adir a este amigo?"
 
 #: ../libpurple/protocols/msn/error.c:36
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:36
 msgid "Unable to parse message"
 msgstr "No se pudo interpretar el mensaje"
 
 #: ../libpurple/protocols/msn/error.c:41
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:41
 msgid "Syntax Error (probably a client bug)"
 msgstr "Error de sintaxis (probablemente un error del cliente)"
 
 #: ../libpurple/protocols/msn/error.c:46
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:46
 msgid "Invalid e-mail address"
 msgstr "DirecciÃ³n de correo electrÃ³nico invÃ¡lida"
 
 #: ../libpurple/protocols/msn/error.c:49
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:49
 msgid "User does not exist"
 msgstr "El usuario no existe"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr "Falta un nombre de dominio totalmente cualificado"
 
 #: ../libpurple/protocols/msn/error.c:56
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:56
 msgid "Already logged in"
 msgstr "Ya estÃ¡ conectado"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:59
 msgid "Invalid screen name"
 msgstr "Nombre de usuario no vÃ¡lido"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:62
 msgid "Invalid friendly name"
 msgstr "Nombre de amigo no vÃ¡lido"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:65
 msgid "List full"
 msgstr "Lista llena"
 
 #: ../libpurple/protocols/msn/error.c:68
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:68
 msgid "Already there"
 msgstr "Ya estÃ¡ en lista"
 
 #: ../libpurple/protocols/msn/error.c:72
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:72
 msgid "Not on list"
 msgstr "No estÃ¡ en la lista"
 
 #: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/msnp9/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
 msgid "User is offline"
 msgstr "El usuario no estÃ¡ conectado"
 
 #: ../libpurple/protocols/msn/error.c:78
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:78
 msgid "Already in the mode"
 msgstr "Ya estÃ¡ en ese modo"
 
 #: ../libpurple/protocols/msn/error.c:82
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:82
 msgid "Already in opposite list"
 msgstr "Ya estÃ¡ en la lista contraria"
 
 #: ../libpurple/protocols/msn/error.c:86
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:86
 msgid "Too many groups"
 msgstr "Demasiados grupos"
 
 #: ../libpurple/protocols/msn/error.c:89
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:89
 msgid "Invalid group"
 msgstr "Grupo invÃ¡lido"
 
 #: ../libpurple/protocols/msn/error.c:92
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:92
 msgid "User not in group"
 msgstr "El usuario no estÃ¡ en el grupo"
 
 #: ../libpurple/protocols/msn/error.c:95
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:95
 msgid "Group name too long"
 msgstr "Nombre de grupo demasiado largo"
 
 #: ../libpurple/protocols/msn/error.c:98
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:98
 msgid "Cannot remove group zero"
 msgstr "No se puede eliminar el grupo cero"
 
 #: ../libpurple/protocols/msn/error.c:103
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "IntentÃ³ aÃ±adir un contacto a un grupo que no existe"
 
 #: ../libpurple/protocols/msn/error.c:107
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:107
 msgid "Switchboard failed"
 msgstr "FallÃ³ el servidor Switchboard"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:111
 msgid "Notify transfer failed"
 msgstr "FallÃ³ la notificaciÃ³n de la transferencia"
 
 #: ../libpurple/protocols/msn/error.c:116
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:116
 msgid "Required fields missing"
 msgstr "Faltan campos obligatorios"
 
 #: ../libpurple/protocols/msn/error.c:120
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:120
 msgid "Too many hits to a FND"
 msgstr "Demasiados resultados de un FND"
 
 #: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/msnp9/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
-#, c-format
 msgid "Not logged in"
 msgstr "No ha iniciado sesiÃ³n"
 
 #: ../libpurple/protocols/msn/error.c:128
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "Servicio no disponible temporalmente"
 
 #: ../libpurple/protocols/msn/error.c:131
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:131
 msgid "Database server error"
 msgstr "Error del servidor de base de datos"
 
 #: ../libpurple/protocols/msn/error.c:135
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:135
 msgid "Command disabled"
 msgstr "Orden deshabilitada"
 
 #: ../libpurple/protocols/msn/error.c:139
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:139
 msgid "File operation error"
 msgstr "Error de operaciÃ³n de archivos"
 
 #: ../libpurple/protocols/msn/error.c:143
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:143
 msgid "Memory allocation error"
 msgstr "Error al asignar memoria"
 
 #: ../libpurple/protocols/msn/error.c:147
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr "Valor CHL errÃ³neo enviado al servidor"
 
 #: ../libpurple/protocols/msn/error.c:152
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:152
 msgid "Server busy"
 msgstr "Servidor ocupado"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:155
+#: ../libpurple/protocols/msnp9/error.c:170
+#: ../libpurple/protocols/msnp9/error.c:230
 msgid "Server unavailable"
 msgstr "Servidor no disponible"
 
 # Â«PeerÂ» no tiene una traducciÃ³n fÃ¡cil, he elegido 'pares' (de par, o igual)
 # Acepto otras alternativas (pero no dejarlo igual) jfs.
 #: ../libpurple/protocols/msn/error.c:158
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:158
 msgid "Peer notification server down"
 msgstr "Servidor de notificaciÃ³n de pares caÃdo"
 
 #: ../libpurple/protocols/msn/error.c:162
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:162
 msgid "Database connect error"
 msgstr "Error de conexiÃ³n con la base de datos"
 
 #: ../libpurple/protocols/msn/error.c:167
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr "El servidor estÃ¡ apagÃ¡ndose (SÃ¡lvese quien pueda)"
 
 #: ../libpurple/protocols/msn/error.c:174
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:174
 msgid "Error creating connection"
 msgstr "Error al crear la conexiÃ³n"
 
 #: ../libpurple/protocols/msn/error.c:179
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Los parÃ¡metros CVR no se conocen o no estÃ¡n permitidos"
 
 #: ../libpurple/protocols/msn/error.c:183
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:183
 msgid "Unable to write"
 msgstr "No se pudo escribir"
 
 # En verdad traduje el error como figura en
 # "http://www.hypothetic.org/docs/msn/basics.php" -NL.
 #: ../libpurple/protocols/msn/error.c:186
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:186
 msgid "Session overload"
 msgstr "Sobrecarga de sesiÃ³n"
 
 #: ../libpurple/protocols/msn/error.c:190
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:190
 msgid "User is too active"
 msgstr "El usuario estÃ¡ demasiado activo"
 
 #: ../libpurple/protocols/msn/error.c:193
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:193
 msgid "Too many sessions"
 msgstr "Demasiadas sesiones"
 
 #: ../libpurple/protocols/msn/error.c:196
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:196
 msgid "Passport not verified"
 msgstr "Pasaporte no verificado"
 
 #: ../libpurple/protocols/msn/error.c:199
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:199
 msgid "Bad friend file"
 msgstr "Fichero de amigos incorrecto"
 
 #: ../libpurple/protocols/msn/error.c:203
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:203
 msgid "Not expected"
 msgstr "No se esperaba"
 
 #: ../libpurple/protocols/msn/error.c:209
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr "Los nombres de amigos cambian demasiado rÃ¡pido"
 
 #: ../libpurple/protocols/msn/error.c:218
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:218
 msgid "Server too busy"
 msgstr "Servidor muy ocupado"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
-#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/msnp9/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1375
+#: ../libpurple/protocols/silc/silc.c:338
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
 msgid "Authentication failed"
 msgstr "FallÃ³ la autenticaciÃ³n"
 
 #: ../libpurple/protocols/msn/error.c:225
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:225
 msgid "Not allowed when offline"
 msgstr "No puede mandar mensajes fuera de lÃnea"
 
 #: ../libpurple/protocols/msn/error.c:233
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:233
 msgid "Not accepting new users"
 msgstr "No se aceptan usuarios nuevos"
 
 #: ../libpurple/protocols/msn/error.c:237
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:237
 msgid "Kids Passport without parental consent"
 msgstr "Pasaporte de menores sin consentimiento paterno"
 
 #: ../libpurple/protocols/msn/error.c:241
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:241
 msgid "Passport account not yet verified"
 msgstr "Cuenta Passport no verificada aÃºn"
 
 #: ../libpurple/protocols/msn/error.c:244
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:244
 msgid "Bad ticket"
 msgstr "Ticket errÃ³neo"
 
 #: ../libpurple/protocols/msn/error.c:249
+#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "CÃ³digo de error desconocido %d"
 
 #: ../libpurple/protocols/msn/error.c:263
+#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Error MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:130 ../libpurple/protocols/msnp9/msn.c:130
 msgid "Nudge"
 msgstr "Codazo"
 
-#: ../libpurple/protocols/msn/msn.c:131
+#: ../libpurple/protocols/msn/msn.c:131 ../libpurple/protocols/msnp9/msn.c:131
 #, c-format
 msgid "%s has nudged you!"
 msgstr "Â¡Le ha dado un codazo %s!"
 
-#: ../libpurple/protocols/msn/msn.c:132
+#: ../libpurple/protocols/msn/msn.c:132 ../libpurple/protocols/msnp9/msn.c:132
 #, c-format
 msgid "Nudging %s..."
 msgstr "Dando un codazo a %s..."
 
-#: ../libpurple/protocols/msn/msn.c:174
+#: ../libpurple/protocols/msn/msn.c:174 ../libpurple/protocols/msnp9/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "El nuevo nombre de amigo MSN es demasiado largo."
 
-#: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msnp9/msn.c:282
 msgid "Set your friendly name."
 msgstr "Establecer su nombre de amigo."
 
-#: ../libpurple/protocols/msn/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msnp9/msn.c:283
 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:301
+#: ../libpurple/protocols/msn/msn.c:305 ../libpurple/protocols/msnp9/msn.c:301
 msgid "Set your home phone number."
 msgstr "Establezca el nÃºmero de telÃ©fono de su domicilio."
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:322 ../libpurple/protocols/msnp9/msn.c:318
 msgid "Set your work phone number."
 msgstr "Establezca el nÃºmero de telÃ©fono de su trabajo."
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:339 ../libpurple/protocols/msnp9/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Establezca su nÃºmero de telÃ©fono mÃ³vil."
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:354 ../libpurple/protocols/msnp9/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Â¿Permitir los envÃos de MSN Mobile?"
 
-#: ../libpurple/protocols/msn/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:355 ../libpurple/protocols/msnp9/msn.c:351
 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?"
@@ -6761,325 +6828,394 @@ msgstr ""
 "Â¿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:357
+#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msnp9/msn.c:357
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:362 ../libpurple/protocols/msnp9/msn.c:358
 msgid "Disallow"
 msgstr "Rechazar"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:378 ../libpurple/protocols/msnp9/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "Puede que esta cuenta de Hotmail no estÃ© activa."
 
-#: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:404 ../libpurple/protocols/msnp9/msn.c:400
 msgid "Send a mobile message."
 msgstr "Enviar un mensaje a un mÃ³vil."
 
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:406 ../libpurple/protocols/msnp9/msn.c:402
 msgid "Page"
 msgstr "Buscapersonas"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "Le tiene"
-
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:688 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:583
+#: ../libpurple/protocols/msnp9/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3771
 msgid "Be Right Back"
 msgstr "Vuelvo enseguida"
 
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/msn/msn.c:694 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:587
+#: ../libpurple/protocols/msnp9/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2839
+#: ../libpurple/protocols/novell/novell.c:2969
+#: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3774
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msnp9/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3097
+#: ../libpurple/protocols/yahoo/yahoo.c:3786
 msgid "On the Phone"
 msgstr "Al telÃ©fono"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:704 ../libpurple/protocols/msnp9/msn.c:595
+#: ../libpurple/protocols/yahoo/yahoo.c:3101
+#: ../libpurple/protocols/yahoo/yahoo.c:3792
 msgid "Out to Lunch"
 msgstr "SalÃ a comer"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:723
+msgid "Artist"
+msgstr "Artista"
+
+#: ../libpurple/protocols/msn/msn.c:724
+msgid "Album"
+msgstr "Album"
+
+#: ../libpurple/protocols/msn/msn.c:742 ../libpurple/protocols/msnp9/msn.c:623
 msgid "Set Friendly Name..."
 msgstr "Establecer su nombre de amigo..."
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:747 ../libpurple/protocols/msnp9/msn.c:628
 msgid "Set Home Phone Number..."
 msgstr "Establecer el nÃºmero de telÃ©fono de su domicilio..."
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:751 ../libpurple/protocols/msnp9/msn.c:632
 msgid "Set Work Phone Number..."
 msgstr "Establecer el nÃºmero de telÃ©fono de su trabajo..."
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:636
 msgid "Set Mobile Phone Number..."
 msgstr "Establecer su nÃºmero de telÃ©fono mÃ³vil..."
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:761 ../libpurple/protocols/msnp9/msn.c:642
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Permitir/Rechazar dispositivos mÃ³viles..."
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:766 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permitir/Rechazar pÃ¡ginas Mobile"
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Open Hotmail Inbox"
 msgstr "Abrir bandeja de entrada de Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:801 ../libpurple/protocols/msnp9/msn.c:682
 msgid "Send to Mobile"
 msgstr "Enviar a un mÃ³vil"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:811 ../libpurple/protocols/msnp9/msn.c:692
+#: ../libpurple/protocols/novell/novell.c:3425
 msgid "Initiate _Chat"
 msgstr "Iniciar _chat"
 
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:849 ../libpurple/protocols/msnp9/msn.c:731
 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:754
+#: ../libpurple/protocols/msn/msn.c:879 ../libpurple/protocols/msnp9/msn.c:761
 msgid "Failed to connect to server."
 msgstr "No se pudo conectar al servidor."
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../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/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Error al obtener el perfil"
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1582 ../pidgin/plugins/convcolors.c:366
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "General"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../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/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/qq/qq.c:222
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Edad"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1738
+#: ../libpurple/protocols/msnp9/msn.c:1591
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "OcupaciÃ³n"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/msn/msn.c:1739
+#: ../libpurple/protocols/msnp9/msn.c:1592
+#: ../libpurple/protocols/myspace/user.c:123
+#: ../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
 msgid "Location"
 msgstr "UbicaciÃ³n"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../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
 msgid "Hobbies and Interests"
 msgstr "Aficiones e intereses"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../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
 msgid "A Little About Me"
 msgstr "Un poco sobre mÃ"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1767
+#: ../libpurple/protocols/msnp9/msn.c:1620
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msnp9/msn.c:1622
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msnp9/msn.c:1623
 msgid "Interests"
 msgstr "Aficiones"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msnp9/msn.c:1624
 msgid "Pets"
 msgstr "Mascotas"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msnp9/msn.c:1625
 msgid "Hometown"
 msgstr "Ciudad donde vive"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1626
 msgid "Places Lived"
 msgstr "Lugares donde he vivido"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1774
+#: ../libpurple/protocols/msnp9/msn.c:1627
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msnp9/msn.c:1628
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1776
+#: ../libpurple/protocols/msnp9/msn.c:1629
 msgid "Music"
 msgstr "MÃºsica"
 
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+#: ../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:1646
+#: ../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:1647
+#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1648
 msgid "Personal"
 msgstr "Personal"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msnp9/msn.c:1651
 msgid "Significant Other"
 msgstr "Otra persona importante"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/msnp9/msn.c:1652
 msgid "Home Phone"
 msgstr "TelÃ©fono de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/protocols/msnp9/msn.c:1653
 msgid "Home Phone 2"
 msgstr "TelÃ©fono de casa (2)"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msnp9/msn.c:1654
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Home Address"
 msgstr "Domicilio"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msnp9/msn.c:1655
 msgid "Personal Mobile"
 msgstr "MÃ³vil personal"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msnp9/msn.c:1656
 msgid "Home Fax"
 msgstr "Fax personal"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Personal E-Mail"
 msgstr "Correo-e personal"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal IM"
 msgstr "MI personal"
 
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msnp9/msn.c:1660
 msgid "Anniversary"
 msgstr "Aniversario"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1823
+#: ../libpurple/protocols/msnp9/msn.c:1676
 msgid "Work"
 msgstr "Trabajo"
 
 # Prefiero esto a "TÃtulo laboral" que puede ser ambiguo, jfs
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1825
+#: ../libpurple/protocols/msnp9/msn.c:1678
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1826
+#: ../libpurple/protocols/msnp9/msn.c:1679
+#: ../libpurple/protocols/oscar/oscar.c:3795
 msgid "Company"
 msgstr "CompaÃ±Ãa"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msnp9/msn.c:1680
+#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Departamento"
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msnp9/msn.c:1681
 msgid "Profession"
 msgstr "ProfesiÃ³n"
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msnp9/msn.c:1682
 msgid "Work Phone"
 msgstr "TelÃ©fono del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1830
+#: ../libpurple/protocols/msnp9/msn.c:1683
 msgid "Work Phone 2"
 msgstr "TelÃ©fono del trabajo (2)"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1831
+#: ../libpurple/protocols/msnp9/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3787
 msgid "Work Address"
 msgstr "DirecciÃ³n del trabajo"
 
 # El latinoamÃ©rica se prefiere 'Celular', creo, jfs
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msnp9/msn.c:1685
 msgid "Work Mobile"
 msgstr "MÃ³vil del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work Pager"
 msgstr "Buscapersonas del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1834
+#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work Fax"
 msgstr "Fax del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msnp9/msn.c:1688
 msgid "Work E-Mail"
 msgstr "Correo-e del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1836
+#: ../libpurple/protocols/msnp9/msn.c:1689
 msgid "Work IM"
 msgstr "MI del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1837
+#: ../libpurple/protocols/msnp9/msn.c:1690
 msgid "Start Date"
 msgstr "Fecha inicial"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../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
 msgid "Favorite Things"
 msgstr "Cosas preferidas"
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1972
+#: ../libpurple/protocols/msnp9/msn.c:1825
 msgid "Last Updated"
 msgstr "Actualizado por Ãºltima vez"
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1983
+#: ../libpurple/protocols/msnp9/msn.c:1836
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "PÃ¡gina personal"
 
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:2007
+#: ../libpurple/protocols/msnp9/msn.c:1860
 msgid "The user has not created a public profile."
 msgstr "El usuario no ha creado un perfil pÃºblico."
 
-#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:2008
+#: ../libpurple/protocols/msnp9/msn.c:1861
 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 "
@@ -7089,7 +7225,8 @@ msgstr ""
 "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:1864
+#: ../libpurple/protocols/msn/msn.c:2012
+#: ../libpurple/protocols/msnp9/msn.c:1865
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7097,7 +7234,8 @@ msgstr ""
 "No se pudo encontrar informaciÃ³n en el perfil de usuario. Es probable que el "
 "usuario no exista."
 
-#: ../libpurple/protocols/msn/msn.c:1872
+#: ../libpurple/protocols/msn/msn.c:2020
+#: ../libpurple/protocols/msnp9/msn.c:1873
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL del perfil"
@@ -7112,101 +7250,128 @@ msgstr "URL del perfil"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-msgid "MSN Protocol Plugin"
-msgstr "Complemento de protocolo MSN"
+#: ../libpurple/protocols/msn/msn.c:2307 ../libpurple/protocols/msn/msn.c:2309
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Complemento de protocolo de Windows Live Messenger"
 
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2344
+#: ../libpurple/protocols/msnp9/msn.c:2195
 msgid "Use HTTP Method"
 msgstr "Usar mÃ©todo HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2199
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:2349
+#: ../libpurple/protocols/msnp9/msn.c:2200
 msgid "HTTP Method Server"
-msgstr "Servidor de prueba IPC"
+msgstr "Servidor de mÃ©todo HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2204
+#: ../libpurple/protocols/msn/msn.c:2354
+#: ../libpurple/protocols/msnp9/msn.c:2205
 msgid "Show custom smileys"
 msgstr "Mostrar emoticonos a medida"
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msnp9/msn.c:2213
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para llamar su atenciÃ³n"
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "No se pudo conectar"
+#: ../libpurple/protocols/msn/nexus.c:70
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "AutenticaciÃ³n Windows Live ID: No fue posible conectarse"
 
-#: ../libpurple/protocols/msn/notification.c:178
+#. we must have failed!
+#: ../libpurple/protocols/msn/nexus.c:126
+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"
+
+#: ../libpurple/protocols/msn/nexus.c:172
+msgid "Windows Live ID authentication Failed"
+msgstr "Â¡FallÃ³ la autenticaciÃ³n Windows Live!"
+
+#: ../libpurple/protocols/msn/notification.c:185
+#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s no es un nombre de grupo vÃ¡lido."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/notification.c:931
+#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msnp9/notification.c:184
+#: ../libpurple/protocols/msnp9/notification.c:534
+#: ../libpurple/protocols/msnp9/session.c:340
 msgid "Unknown error."
 msgstr "Error desconocido."
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:194
+#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s en %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:509
 #, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "Â¡%s le acaba de dar un codazo!"
+
+#: ../libpurple/protocols/msn/notification.c:836
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Error desconocido (%d)"
+
+#: ../libpurple/protocols/msn/notification.c:837
+#: ../libpurple/protocols/sametime/sametime.c:4471
+msgid "Unable to add user"
+msgstr "No puede aÃ±adir al usuario"
+
+#: ../libpurple/protocols/msn/notification.c:897
+#: ../libpurple/protocols/msnp9/notification.c:500
+#, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "No se pudo aÃ±adir al usuario a %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:901
+#: ../libpurple/protocols/msnp9/notification.c:504
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "No puede expulsar al usuario en %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:905
+#: ../libpurple/protocols/msnp9/notification.c:508
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "No se pudo invitar al usuario a %s (%s)."
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:913
+#: ../libpurple/protocols/msnp9/notification.c:516
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "No se pudo aÃ±adir a %s porque su lista de amigos estÃ¡ llena."
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:922
+#: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s no es un nombre de cuenta Â«passportÂ» vÃ¡lida."
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:927
+#: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "Servicio no disponible temporalmente."
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1276
+#: ../libpurple/protocols/msnp9/notification.c:866
 msgid "Unable to rename group"
 msgstr "No se pudo cambiar el nombre del grupo"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1331
+#: ../libpurple/protocols/msnp9/notification.c:921
 msgid "Unable to delete group"
 msgstr "No se pudo borrar el grupo"
 
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1944
+#: ../libpurple/protocols/msnp9/notification.c:1340
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7237,15 +7402,39 @@ msgstr[1] ""
 "DespuÃ©s de que se hayan realizado las tareas de mantenimiento deberÃa poder "
 "conectarse con Ã©xito de nuevo."
 
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msnp9/nexus.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:324
+#: ../libpurple/protocols/qq/qq_proxy.c:369
+#: ../libpurple/protocols/qq/qq_proxy.c:402
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
+#: ../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
+msgid "Unable to connect"
+msgstr "No se pudo conectar"
+
 #: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "Error de escritura"
 
 #: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "Error de lectura"
 
 #: ../libpurple/protocols/msn/servconn.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7254,98 +7443,120 @@ msgstr ""
 "Error de conexiÃ³n del servidor %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msnp9/session.c:302
 msgid "Our protocol is not supported by the server."
 msgstr "El servidor no soporta nuestro protocolo."
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msnp9/session.c:307
 msgid "Error parsing HTTP."
 msgstr "Error en el anÃ¡lisis HTTP."
 
-#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/msn/session.c:358
+#: ../libpurple/protocols/msnp9/session.c:311
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "Ha conectado desde otra ubicaciÃ³n."
 
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msnp9/session.c:317
 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:315
+#: ../libpurple/protocols/msn/session.c:370
+#: ../libpurple/protocols/msnp9/session.c:323
 msgid "The MSN servers are going down temporarily."
 msgstr "Los servidores de MSN van a sufrir un apagado temporal."
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:375
+#: ../libpurple/protocols/msnp9/session.c:328
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "No se pudo autenticar: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
+#: ../libpurple/protocols/msn/session.c:381
+#: ../libpurple/protocols/msnp9/session.c:334
 msgid ""
 "Your MSN buddy list is 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:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:403
+#: ../libpurple/protocols/msn/session.c:405
+#: ../libpurple/protocols/msnp9/session.c:356
+#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Handshaking"
 msgstr "NegociaciÃ³n"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:406
+#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Starting authentication"
 msgstr "Empezando la autenticaciÃ³n"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:407
+#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Getting cookie"
 msgstr "Obteniendo una cookie"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:409
+#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Sending cookie"
 msgstr "Enviando cookie"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:410
+#: ../libpurple/protocols/msnp9/session.c:363
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
 #: ../libpurple/protocols/msn/state.c:34
+#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "Ausente"
 
 #: ../libpurple/protocols/msn/state.c:35
+#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "Al telÃ©fono"
 
 #: ../libpurple/protocols/msn/state.c:36
+#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "SalÃ a comer"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:398
+#: ../libpurple/protocols/msnp9/switchboard.c:400
 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:408
+#: ../libpurple/protocols/msn/switchboard.c:406
+#: ../libpurple/protocols/msnp9/switchboard.c:408
 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:412
+#: ../libpurple/protocols/msn/switchboard.c:410
+#: ../libpurple/protocols/msnp9/switchboard.c:412
 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:416
+#: ../libpurple/protocols/msn/switchboard.c:414
+#: ../libpurple/protocols/msnp9/switchboard.c:416
 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:420
+#: ../libpurple/protocols/msn/switchboard.c:418
+#: ../libpurple/protocols/msnp9/switchboard.c:420
 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:424
+#: ../libpurple/protocols/msn/switchboard.c:422
+#: ../libpurple/protocols/msnp9/switchboard.c:424
 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:"
@@ -7354,35 +7565,63 @@ msgstr ""
 "servidor. Es posible que se trate de un error del servidor, vuelva a "
 "intentarlo en unos minutos."
 
-#: ../libpurple/protocols/msn/switchboard.c:431
+#: ../libpurple/protocols/msn/switchboard.c:429
+#: ../libpurple/protocols/msnp9/switchboard.c:431
 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:439
+#: ../libpurple/protocols/msn/switchboard.c:437
+#: ../libpurple/protocols/msnp9/switchboard.c:439
 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:"
 
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/msn/userlist.c:243
+#: ../libpurple/protocols/msnp9/userlist.c:262
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "El usuario %s lo ha aÃ±adido a su lista de amigos."
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
+#: ../libpurple/protocols/msnp9/userlist.c:331
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "El usuario %s lo ha quitado de su lista de amigos."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. 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/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "No se pudo aÃ±adir a \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
+#: ../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
+msgid "Has you"
+msgstr "Le tiene"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/msnp9/msn.c:2159
+#: ../libpurple/protocols/msnp9/msn.c:2161
+msgid "MSN Protocol Plugin"
+msgstr "Complemento de protocolo MSN"
+
 #: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
 msgstr "Falta un mecanismo de cifrado"
@@ -7410,23 +7649,23 @@ msgstr ""
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
+#: ../libpurple/protocols/myspace/myspace.c:1842
 msgid "MySpaceIM Error"
 msgstr "Error MySpaceIM"
 
-#: ../libpurple/protocols/myspace/myspace.c:349
+#: ../libpurple/protocols/myspace/myspace.c:352
 msgid "Reading challenge"
 msgstr "Leyendo el desafÃo"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
+#: ../libpurple/protocols/myspace/myspace.c:360
 msgid "Unexpected challenge length from server"
 msgstr "Longitud de desafÃo inesperada recibida del servidor"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
+#: ../libpurple/protocols/myspace/myspace.c:364
 msgid "Logging in"
 msgstr "Accediendo"
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
+#: ../libpurple/protocols/myspace/myspace.c:1318
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr ""
@@ -7434,44 +7673,44 @@ msgstr ""
 "segundos)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
+#: ../libpurple/protocols/myspace/myspace.c:1361
 msgid "New mail messages"
 msgstr "Mensajes de correo nuevos"
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
+#: ../libpurple/protocols/myspace/myspace.c:1362
 msgid "New blog comments"
 msgstr "Nuevos comentarios de bitÃ¡cora"
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:1363
 msgid "New profile comments"
 msgstr "Nuevos comentarios de perfil"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#: ../libpurple/protocols/myspace/myspace.c:1364
 msgid "New friend requests!"
 msgstr "Â¡Nuevas solicitudes de amigos!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:1365
 msgid "New picture comments"
 msgstr "Nuevos comentarios de fotos"
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
+#: ../libpurple/protocols/myspace/myspace.c:1393
 msgid "MySpace"
 msgstr "MySpace"
 
 #. 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:1543
-#: ../libpurple/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/myspace/myspace.c:1576
+#: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
+#: ../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:1555
+#: ../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."
@@ -7480,72 +7719,71 @@ msgstr ""
 "fuseaction=profile.username, escoja un nombre de usuario e intente "
 "conectarse de nuevo."
 
-#: ../libpurple/protocols/myspace/myspace.c:1782
+#: ../libpurple/protocols/myspace/myspace.c:1816
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Error de prÃ³tocolo, cÃ³digo %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:2012
+#: ../libpurple/protocols/myspace/myspace.c:2046
 msgid "Failed to add buddy"
 msgstr "No se pudo aÃ±adir al amigo"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:2012
 msgid "'addbuddy' command failed."
 msgstr "FallÃ³ la orden 'addbudy'."
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2046
+#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "persist command failed"
 msgstr "FallÃ³ la orden 'persist'"
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
+#: ../libpurple/protocols/myspace/myspace.c:2151
 #, c-format
 msgid "No such user: %s"
 msgstr "No existe el usuario: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
+#: ../libpurple/protocols/myspace/myspace.c:2152
 msgid "User lookup"
 msgstr "BÃºsqueda de usuario"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2264
+#: ../libpurple/protocols/myspace/myspace.c:2283
+#: ../libpurple/protocols/myspace/myspace.c:2305
 msgid "Failed to remove buddy"
 msgstr "No se pudo eliminar al amigo"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2264
 msgid "'delbuddy' command failed"
 msgstr "FallÃ³ la orden 'delbuddy'"
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2305
 msgid "blocklist command failed"
 msgstr "FallÃ³ la orden 'blocklist'"
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
+#: ../libpurple/protocols/myspace/myspace.c:2353
 msgid "Invalid input condition"
 msgstr "CondiciÃ³n de entrada invÃ¡lida"
 
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
+#: ../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:2402
+#: ../libpurple/protocols/myspace/myspace.c:2452
 msgid "Unparseable message"
 msgstr "No se pudo interpretar el mensaje"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
+#: ../libpurple/protocols/myspace/myspace.c:2521
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "No se pudo conectar al servidor: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2642
+#: ../libpurple/protocols/myspace/myspace.c:2692
 msgid "IM Friends"
 msgstr "Amigos MI"
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
+#: ../libpurple/protocols/myspace/myspace.c:2791
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
@@ -7554,59 +7792,59 @@ msgstr ""
 "Se aÃ±adiero o actualizaron %d amigos del servidor (incluyendo a los amigos "
 "que ya estaban en la lista del lado del servidor)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2742
+#: ../libpurple/protocols/myspace/myspace.c:2792
 msgid "Add contacts from server"
 msgstr "AÃ±adir contactos del servidor"
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+#: ../libpurple/protocols/myspace/myspace.c:2844
+#: ../libpurple/protocols/myspace/myspace.c:2909
 msgid "Add friends from MySpace.com"
 msgstr "AÃ±adir amigos de MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
+#: ../libpurple/protocols/myspace/myspace.c:2845
 msgid "Importing friends failed"
 msgstr "FallÃ³ la carga de los amigos"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
+#: ../libpurple/protocols/myspace/myspace.c:2901
 msgid "Find people..."
 msgstr "Encontrar gente... "
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
+#: ../libpurple/protocols/myspace/myspace.c:2904
 msgid "Change IM name..."
 msgstr "Cambiar mi nombre MI..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3206
 msgid "myim URL handler"
 msgstr "gestor de URL myim"
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
+#: ../libpurple/protocols/myspace/myspace.c:3207
 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:3158
+#: ../libpurple/protocols/myspace/myspace.c:3208
 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:3281
+#: ../libpurple/protocols/myspace/myspace.c:3331
 msgid "Show display name in status text"
 msgstr "Mostrar el nombre visible en el texto de estado"
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
+#: ../libpurple/protocols/myspace/myspace.c:3334
 msgid "Show headline in status text"
 msgstr "Mostrar titulares en los textos de estado"
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
+#: ../libpurple/protocols/myspace/myspace.c:3339
 msgid "Send emoticons"
 msgstr "Enviar emoticonos"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
+#: ../libpurple/protocols/myspace/myspace.c:3344
 msgid "Screen resolution (dots per inch)"
 msgstr "ResoluciÃ³n de pantalla (puntos por pulgada)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
+#: ../libpurple/protocols/myspace/myspace.c:3347
 msgid "Base font size (points)"
 msgstr "TamaÃ±o de tipografÃa base (puntos)"
 
@@ -7616,176 +7854,194 @@ msgstr "Usuario"
 msgid "User"
 msgstr "Usuario"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/oscar/oscar.c:2969
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libpurple/protocols/myspace/user.c:124
+#: ../libpurple/protocols/myspace/user.c:128
 msgid "Headline"
 msgstr "Titular"
 
-#: ../libpurple/protocols/myspace/user.c:129
+#: ../libpurple/protocols/myspace/user.c:133
 msgid "Song"
 msgstr "CanciÃ³n"
 
-#: ../libpurple/protocols/myspace/user.c:134
+#: ../libpurple/protocols/myspace/user.c:141
 msgid "Total Friends"
 msgstr "Amigos en total"
 
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
+#: ../libpurple/protocols/myspace/user.c:159
 msgid "Client Version"
 msgstr "VersiÃ³n del cliente"
 
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. 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
 msgid "Zap"
 msgstr "Zapear"
 
-#: ../libpurple/protocols/myspace/zap.c:44
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s le ha aÃ±adido [%s]"
+msgstr "Â¡%s le ha zapeado!"
 
-#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "Zapping %s..."
 msgstr "Zapeando a %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:45
-#, fuzzy
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:54
 msgid "Whack"
-msgstr "golpear"
+msgstr "Golpear"
 
-#: ../libpurple/protocols/myspace/zap.c:45
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:54
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s le ha aÃ±adido [%s]"
+msgstr "Â¡%s le ha golpeado!"
 
-#: ../libpurple/protocols/myspace/zap.c:45
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:54
+#, c-format
 msgid "Whacking %s..."
-msgstr "Golpeando"
+msgstr "Golpeando a %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy
+#. 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
 msgid "Torch"
-msgstr "Tema"
+msgstr "Encender"
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
 msgid "%s has torched you!"
-msgstr "El usuario le ha bloqueado"
+msgstr "Â¡%s le ha encendido!"
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "Encendiendo a %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
-msgstr ""
+msgstr "Besar"
 
-#: ../libpurple/protocols/myspace/zap.c:47
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:62
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s se ha conectado."
+msgstr "Â¡%s le ha besado!"
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "Besando a %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:48
-#, fuzzy
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:65
 msgid "Hug"
-msgstr "abrazar"
+msgstr "Abrazar"
 
-#: ../libpurple/protocols/myspace/zap.c:48
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:65
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s se ha conectado."
+msgstr "Â¡%s le ha abrazado!"
 
-#: ../libpurple/protocols/myspace/zap.c:48
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:65
+#, c-format
 msgid "Hugging %s..."
-msgstr "Abrazando"
+msgstr "Abrazando a %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:68
 msgid "Slap"
-msgstr "Dormido"
+msgstr "Abofetear"
 
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:68
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s le ha aÃ±adido [%s]"
+msgstr "Â¡%s le ha abofeteado!"
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "Abofeteando a %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:71
 msgid "Goose"
-msgstr "Se fue"
+msgstr "Pellizcar el trasero"
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s se ha marchado."
+msgstr "Â¡%s le ha pellizcado el trasero!"
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
 msgid "Goosing %s..."
-msgstr "Buscando %s"
+msgstr "Pellizcando el trasero de %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#. 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
 msgid "High-five"
-msgstr "Chocar cinco"
+msgstr "Chocar los cinco"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "Â¡%s le ha chocado los cinco!"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "High-fiving %s..."
 msgstr "Chocando los cinco con %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#. 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
 msgid "Punk"
-msgstr ""
+msgstr "Tomar el pelo"
 
-#: ../libpurple/protocols/myspace/zap.c:52
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:81
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s se ha conectado."
+msgstr "Â¡%s le ha tomado el pelo!"
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "Punking %s..."
-msgstr ""
+msgstr "Tomando el pelo a %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * 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
 msgid "Raspberry"
-msgstr ""
+msgstr "Pedorreta"
 
-#: ../libpurple/protocols/myspace/zap.c:53
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:90
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s se ha conectado."
+msgstr "Â¡%s le ha hecho una pedorreta!"
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "Haciendo una pedorreta a %s..."
 
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
@@ -7921,42 +8177,42 @@ msgstr "Fallo en la conexiÃ³n (%s)."
 msgid "Login failed (%s)."
 msgstr "Fallo en la conexiÃ³n (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "No se pudo enviar el mensaje. No se pudieron obtener los detalles del "
 "usuario (%s)"
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Incapaz de aÃ±adir Â«%sÂ» a su lista de amigos (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "No se pudo enviar el mensaje (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:501
+#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "No se pudo invitar al usuario (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "No se pudo enviar un mensaje a %s. No se pudo crear la conferencia (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "No se pudo enviar el mensaje. No se pudo crear la conferencia (%s)"
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7965,7 +8221,7 @@ msgstr ""
 "No se pudo mover al usuario %s a la carpeta %s en la lista del servidor. Se "
 "produjo un error al crear la carpeta (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7974,62 +8230,62 @@ msgstr ""
 "No se pudo aÃ±adir en su lista de amigos a %s. Se produjo un error al crear "
 "la carpeta en la lista del servidor (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "No se pudieron obtener los detalles del usuario %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:759
+#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "No se pudo aÃ±adir al usuario a su lista de privacidad (%s)"
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "No se pudo aÃ±adir Â«%sÂ» a su lista de rechazados (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "No se pudo aÃ±adir Â«%sÂ» a su lista de permitidos (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "No se pudo eliminar Â«%sÂ» de su lista de privacidad (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:950
+#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "No se pudieron cambiar las opciones de privacidad del servidor (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "No se pudo crear la conferencia (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1131
+#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr "Error comunicÃ¡ndose con el servidor. Se cerrarÃ¡ la conexiÃ³n."
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "NÃºmero de telÃ©fono"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "TÃtulo"
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "BuzÃ³n de correo"
 
-#: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4122
+#: ../libpurple/protocols/novell/novell.c:1511
+#: ../libpurple/protocols/sametime/sametime.c:4168
 msgid "User ID"
 msgstr "ID de usuario"
 
@@ -8039,41 +8295,37 @@ msgstr "ID de usuario"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferencia GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
-msgid "Unable to make SSL connection to server."
-msgstr "No se pudo establecer una conexiÃ³n SSL con el servidor."
-
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "No se pudo conectar al servidor."
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "Esperando respuesta..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "Se ha invitado a %s a esta conversaciÃ³n."
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "InvitaciÃ³n a una conversaciÃ³n"
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8084,17 +8336,16 @@ msgstr ""
 "\n"
 "Enviada: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "Â¿Desea unirse a la conversaciÃ³n?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2027
 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:2069
+#: ../libpurple/protocols/novell/novell.c:2084
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8102,11 +8353,7 @@ msgstr ""
 "No parece que %s estÃ© conectado y no ha recibido el mensaje que acaba de "
 "enviar."
 
-#. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2184
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8114,12 +8361,11 @@ msgstr ""
 "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:2195
+#: ../libpurple/protocols/novell/novell.c:2213
 msgid "Error. SSL support is not installed."
 msgstr "Error. El soporte de SSL no estÃ¡ instalado."
 
-#: ../libpurple/protocols/novell/novell.c:2504
-#, c-format
+#: ../libpurple/protocols/novell/novell.c:2521
 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."
 
@@ -8133,33 +8379,41 @@ msgstr "Se ha cerrado esta conferencia. 
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3537
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de MensajerÃa de Grupos de Novell"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "DirecciÃ³n del servidor"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "Puerto del servidor"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/oscar/family_chatnav.c:62
+msgid "Could not join chat room"
+msgstr "No se pudo conectar a la sala de chat"
+
+#: ../libpurple/protocols/oscar/family_chatnav.c:63
+msgid "Invalid chat room name"
+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
 msgid "Server closed the connection."
 msgstr "El servidor ha cerrado la conexiÃ³n."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../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
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8168,10 +8422,10 @@ msgstr ""
 "Se perdiÃ³ la conexiÃ³n con el servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../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
 msgid "Received invalid data on connection with server."
 msgstr "Se recibieron datos invÃ¡lidos al conectarse al servidor."
 
@@ -8206,36 +8460,43 @@ msgstr "Complemento de protocolo ICQ"
 msgstr "Complemento de protocolo ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4420
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "CodificaciÃ³n"
 
-#: ../libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "El usuario remoto ha cerrado la conexiÃ³n."
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "El usuario remoto ha rechazado su solicitud."
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Se perdiÃ³ la conexiÃ³n con el usuario remoto:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "Se recibieron datos invÃ¡lidos en la conexiÃ³n con el usuario remoto."
 
-#: ../libpurple/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "No se pudo establecer una conexiÃ³n con el usuario remoto."
 
-#: ../libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "MI directo establecido"
 
+#: ../libpurple/protocols/oscar/odc.c:600
+#, c-format
+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"
+
 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -8337,7 +8598,7 @@ msgstr "No mientras estÃ© en AOL"
 msgid "Not while on AOL"
 msgstr "No mientras estÃ© en AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
+#: ../libpurple/protocols/oscar/oscar.c:347
 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 "
@@ -8349,7 +8610,7 @@ msgstr ""
 "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:457
+#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8360,153 +8621,147 @@ msgstr ""
 "defectuosa.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2392
+#: ../pidgin/gtkutils.c:2422
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Icono de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Voz"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr "MI Directo AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
+#: ../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:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:6035
 msgid "Get File"
 msgstr "Recibir archivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Juegos"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "Extensiones"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "ConexiÃ³n directa ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr "Usuario de AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "Antiguo ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Cifrado Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr "Seguridad activada"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "Video chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "VÃdeo en tiempo real"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "CÃ¡mara"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5805
 msgid "Free For Chat"
 msgstr "Disponible para conversar"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5840
 msgid "Not Available"
 msgstr "No disponible"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5826
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr "Capacidad web"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:736 ../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
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:738
 msgid "Online"
 msgstr "Conectado"
 
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1153
 msgid "IP Address"
 msgstr "DirecciÃ³n IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2896
 msgid "Warning Level"
 msgstr "Niveles de aviso"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "Comentario de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8515,7 +8770,7 @@ msgstr ""
 "No se pudo conectar al servidor de autenticaciÃ³n:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8524,16 +8779,16 @@ msgstr ""
 "No se pudo conectar al servidor BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr "Se ha enviado el nombre de usuario"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr "ConexiÃ³n establecida, cookie enviada"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "Terminando la conexiÃ³n"
 
@@ -8549,30 +8804,34 @@ msgstr ""
 "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:2105
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
 msgid "Invalid screen name."
 msgstr "Nombre de usuario no vÃ¡lido"
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/oscar/oscar.c:1351
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1112
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 msgid "Incorrect password."
 msgstr "ContraseÃ±a incorrecta."
 
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#. Suspended account
+#: ../libpurple/protocols/oscar/oscar.c:1355
 msgid "Your account is currently suspended."
 msgstr "Su cuenta estÃ¡ deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1359
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servicio de MensajerÃa InstantÃ¡neo AOL estÃ¡ temporalmente no disponible."
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#. screen name connecting too frequently
+#. IP address connecting too frequently
+#: ../libpurple/protocols/oscar/oscar.c:1363
+#: ../libpurple/protocols/oscar/oscar.c:1372
 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."
@@ -8581,46 +8840,47 @@ msgstr ""
 "intÃ©ntelo de nuevo. Si sigue intentÃ¡ndolo, necesitarÃ¡ esperar incluso mÃ¡s "
 "tiempo."
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#. client too old
+#: ../libpurple/protocols/oscar/oscar.c:1367
 #, 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:1410
+#: ../libpurple/protocols/oscar/oscar.c:1405
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1409
 msgid "Received authorization"
 msgstr "Se recibiÃ³ la autorizaciÃ³n"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1432
 msgid "The SecurID key entered is invalid."
 msgstr "La clave SecurID que se ha introducido no es vÃ¡lida."
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1445
 msgid "Enter SecurID"
 msgstr "Introduzca SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1446
 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:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#: ../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
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1487
+#: ../libpurple/protocols/oscar/oscar.c:1530
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8629,53 +8889,53 @@ msgstr ""
 "QuizÃ¡ sea desconectado en breve.  Puede querer usar TOC hasta que esto se "
 "resuelva.  Compruebe %s para novedades."
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1490
+#: ../libpurple/protocols/oscar/oscar.c:1533
 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:1622
+#: ../libpurple/protocols/oscar/oscar.c:1618
 #, 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:1625
+#: ../libpurple/protocols/oscar/oscar.c:1621
 msgid "Unable to get a valid login hash."
 msgstr "No se pudo un Â«hashÂ» de conexiÃ³n vÃ¡lido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1651
 msgid "Password sent"
 msgstr "ContraseÃ±a enviada"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1707
 msgid "Unable to initialize connection"
 msgstr "No se pudo inicializar la conexiÃ³n"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2195
 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:2230
+#: ../libpurple/protocols/oscar/oscar.c:2235
 msgid "Authorization Request Message:"
 msgstr "Mensaje de solicitud de autorizaciÃ³n:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2236
 msgid "Please authorize me!"
 msgstr "Â¡Por favor, autorÃceme!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../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
 msgid "No reason given."
 msgstr "No se indicÃ³ una razÃ³n."
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2284
 msgid "Authorization Denied Message:"
 msgstr "Mensaje de autorizaciÃ³n denegada:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2412
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8686,18 +8946,18 @@ msgstr ""
 "la siguiente razÃ³n:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2413
 msgid "ICQ authorization denied."
 msgstr "AutorizaciÃ³n ICQ denegada."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2420
 #, 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:2423
+#: ../libpurple/protocols/oscar/oscar.c:2428
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8710,7 +8970,7 @@ msgstr ""
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2436
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8723,7 +8983,7 @@ msgstr ""
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2444
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8736,38 +8996,38 @@ msgstr ""
 "El mensaje es:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2465
 #, 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:2466
+#: ../libpurple/protocols/oscar/oscar.c:2471
 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:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2476 ../pidgin/gtkroomlist.c:318
 msgid "_Add"
 msgstr "_AÃ±adir"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2477
 msgid "_Decline"
 msgstr "_Rehusar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2601
 #, 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:2605
+#: ../libpurple/protocols/oscar/oscar.c:2610
 #, 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:2614
+#: ../libpurple/protocols/oscar/oscar.c:2619
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8777,21 +9037,21 @@ msgstr[1] ""
 msgstr[1] ""
 "Se perdieron %hu mensajes de %s porque fueron mandados demasiado rÃ¡pido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2628
 #, 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:2632
+#: ../libpurple/protocols/oscar/oscar.c:2637
 #, 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:2641
+#: ../libpurple/protocols/oscar/oscar.c:2646
 #, 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."
@@ -8799,47 +9059,47 @@ msgstr[1] "Se perdieron %hu mensajes de 
 msgstr[1] "Se perdieron %hu mensajes de %s por motivos desconocidos."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2801
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No se pudo enviar el mensaje: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
 #: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2806
+#: ../libpurple/protocols/oscar/oscar.c:2870
 msgid "Unknown reason."
 msgstr "RazÃ³n desconocida."
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
-#: ../libpurple/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2804
+#: ../libpurple/protocols/sametime/sametime.c:2451
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "No se pudo enviar el mensaje a %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2870
 #, c-format
 msgid "User information not available: %s"
 msgstr "InformaciÃ³n de usuario de no disponible: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2906
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Miembro desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2941
 msgid "Available Message"
 msgstr "Mensajes disponibles"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3049
 msgid "Your AIM connection may be lost."
 msgstr "Su conexiÃ³n AIM puede haberse perdido."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
+#: ../libpurple/protocols/oscar/oscar.c:3237
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8847,7 +9107,7 @@ msgstr ""
 "[No se pudo mostrar un mensaje de este usuario porque contenÃa caracteres "
 "invÃ¡lidos.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3401
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8856,83 +9116,82 @@ msgstr ""
 "lÃmite en la tasa de envÃo de mensajes. Por favor, espere 10 segundos y "
 "vuelva a intentarlo."
 
-#: ../libpurple/protocols/oscar/oscar.c:3479
+#: ../libpurple/protocols/oscar/oscar.c:3486
 #: ../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:3729
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "TelÃ©fono mÃ³vil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3740
 msgid "Personal Web Page"
 msgstr "PÃ¡gina web personal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3764
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "InformaciÃ³n adicional"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3785
 msgid "Zip Code"
 msgstr "CÃ³digo postal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "Division"
 msgstr "SecciÃ³n"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3797
 msgid "Position"
 msgstr "Cargo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "Web Page"
 msgstr "PÃ¡gina web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Work Information"
 msgstr "InformaciÃ³n de trabajo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3858
 msgid "Pop-Up Message"
 msgstr "Mensaje emergente"
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../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"
 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:3922
+#: ../libpurple/protocols/oscar/oscar.c:3903
 msgid "Screen name"
 msgstr "Nombre de usuario"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3929
 #, 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:3969
+#: ../libpurple/protocols/oscar/oscar.c:3950
 #, 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:3971
+#: ../libpurple/protocols/oscar/oscar.c:3952
 msgid "Account Confirmation Requested"
 msgstr "ConfirmaciÃ³n de cuenta solicitada"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
+#: ../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:4005
+#: ../libpurple/protocols/oscar/oscar.c:3986
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8941,14 +9200,14 @@ msgstr ""
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado difiere del original."
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../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:4011
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8957,7 +9216,7 @@ msgstr ""
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado es demasiado largo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -8966,7 +9225,7 @@ msgstr ""
 "Error 0x%04x: No se puede cambiar la direcciÃ³n de correo electrÃ³nico porque "
 "ya existe una solicitud pendiente para este nombre de usuario."
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -8975,7 +9234,7 @@ msgstr ""
 "Error 0x%04x: No se puede cambiar la direcciÃ³n de correo electrÃ³nico porque "
 "la direcciÃ³n dada ya tiene demasiados nombres de usuarios asociados."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -8984,32 +9243,32 @@ msgstr ""
 "Error 0x%04x: No se puede cambiar la direcciÃ³n de correo electrÃ³nico porque "
 "la direcciÃ³n dada es invÃ¡lida."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Error desconocido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "La direcciÃ³n de correo electrÃ³nico para %s es %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4016
 msgid "Account Info"
 msgstr "InformaciÃ³n de la cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
+#: ../libpurple/protocols/oscar/oscar.c:4199
 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:4489
+#: ../libpurple/protocols/oscar/oscar.c:4470
 msgid "Unable to set AIM profile."
 msgstr "No se pudo establecer el perfil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:4471
 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 "
@@ -9019,7 +9278,7 @@ msgstr ""
 "conexiÃ³n se haya completado.  Su perfil quedarÃ¡ sin cambiar, intÃ©ntelo "
 "nuevamente cuando ya estÃ© conectado completamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4485
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9032,11 +9291,11 @@ msgstr[1] ""
 msgstr[1] ""
 "Se ha excedido el tamaÃ±o mÃ¡ximo de perfil de %d bytes. Se ha truncado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4490
 msgid "Profile too long."
 msgstr "Perfil demasiado largo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4535
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9051,11 +9310,11 @@ msgstr[1] ""
 "Se excediÃ³ el lÃmite de %d bytes de longitud en el mensaje de ausencia. Se "
 "ha truncado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4540
 msgid "Away message too long."
 msgstr "Mensaje de ausencia demasiado largo"
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:4613
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9066,34 +9325,31 @@ msgstr ""
 "nombres de usuario deben ser direcciones de correo vÃ¡lidas o empezar con una "
 "letra y contener sÃ³lo letras, nÃºmeros y espacios, o contener sÃ³lo nÃºmeros."
 
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4615
+#: ../libpurple/protocols/oscar/oscar.c:5068
+#: ../libpurple/protocols/oscar/oscar.c:5083
 msgid "Unable To Add"
 msgstr "No se pudo aÃ±adir"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4734
 msgid "Unable To Retrieve Buddy List"
 msgstr "No se ha podido obtener la lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
+#: ../libpurple/protocols/oscar/oscar.c:4735
 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 hours."
-msgstr ""
-"No se ha podido obtener en este momento la lista de amigos de los servidores "
-"de AIM. No se ha perdido la lista de amigos, seguramente volverÃ¡ a estar "
-"disponible en unas horas."
+"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:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+#: ../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
 msgid "Orphans"
 msgstr "HuÃ©rfanos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5066
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9102,17 +9358,17 @@ msgstr ""
 "No se ha podido aÃ±adir al amigo %s porque hay demasiados contactos en la "
 "lista de amigos. Por favor, elimine uno y vuelva a probar."
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5066
+#: ../libpurple/protocols/oscar/oscar.c:5081
 msgid "(no name)"
 msgstr "(sin nombre)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5080
 #, 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:5178
+#: ../libpurple/protocols/oscar/oscar.c:5197
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9121,23 +9377,23 @@ msgstr ""
 "El usuario %s le ha dado a usted permiso para aÃ±adirle a su lista de "
 "amigos.  Â¿Desea hacerlo?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#: ../libpurple/protocols/oscar/oscar.c:5205
 msgid "Authorization Given"
 msgstr "AutorizaciÃ³n otorgada"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5278
 #, 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:5260
+#: ../libpurple/protocols/oscar/oscar.c:5279
 msgid "Authorization Granted"
 msgstr "AutorizaciÃ³n aceptada"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5282
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9148,52 +9404,48 @@ msgstr ""
 "la siguiente razÃ³n:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5283
 msgid "Authorization Denied"
 msgstr "AutorizaciÃ³n denegada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5319
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Intercambio:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
-msgid "Invalid chat name specified."
-msgstr "Se especificÃ³ un nombre de chat no vÃ¡lido."
-
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5432
 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:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5594
+#: ../libpurple/protocols/oscar/oscar.c:5599
 msgid "Away Message"
 msgstr "Mensajes de ausencia"
 
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5599
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obteniendo)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "iTunes Music Store Link"
 msgstr "Enlace a la tienda de mÃºsica de iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5907
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5908
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5955
 #, 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:5934
+#: ../libpurple/protocols/oscar/oscar.c:5959
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9201,67 +9453,67 @@ msgstr ""
 "Puede considerarse como un riesgo a su privacidad  ya que hacer Ã©sto revela "
 "su direcciÃ³n IP. Â¿Quiere continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:5965
+#: ../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:5975
+#: ../libpurple/protocols/oscar/oscar.c:6000
 msgid "Get AIM Info"
 msgstr "Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:6006
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6014
 msgid "Get Status Msg"
 msgstr "Obtener msj de estado"
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:6027
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6049
 msgid "Re-request Authorization"
 msgstr "Solicitar autorizaciÃ³n otra vez"
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
+#: ../libpurple/protocols/oscar/oscar.c:6108
 msgid "Require authorization"
 msgstr "Solicitar autorizaciÃ³n"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6111
 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:6091
+#: ../libpurple/protocols/oscar/oscar.c:6116
 msgid "ICQ Privacy Options"
 msgstr "Opciones de privacidad de ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6135
 msgid "The new formatting is invalid."
 msgstr "El nuevo formato es invÃ¡lido."
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6136
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "El formato del nombre de usuario sÃ³lo puede cambiar en la capitalizaciÃ³n y "
 "espacios en blanco."
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "Change Address To:"
 msgstr "Cambiar direcciÃ³n a:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6235
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>usted no estÃ¡ esperando autorizaciÃ³n</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6238
 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:6214
+#: ../libpurple/protocols/oscar/oscar.c:6239
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9269,103 +9521,104 @@ msgstr ""
 "Puede volver a pedir autorizaciÃ³n a estos amigos apretando el botÃ³n derecho "
 "del ratÃ³n sobre ellos y escogiendo Â«Solicitar autorizaciÃ³n otra vez.Â»"
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6256
 msgid "Find Buddy by E-Mail"
 msgstr "Buscar un amigo en base a su correo electrÃ³nico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6257
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar amigo por la direcciÃ³n correo electrÃ³nico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6258
 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:6236
+#: ../libpurple/protocols/oscar/oscar.c:6261
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6419
 msgid "Set User Info (URL)..."
 msgstr "Establecer su informaciÃ³n de usuario (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Change Password (URL)"
 msgstr "Cambiar su contraseÃ±a (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6434
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar reenvÃo de MI (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6444
 msgid "Set Privacy Options..."
 msgstr "Configurar las opciones de privacidad..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6451
 msgid "Confirm Account"
 msgstr "Confirmar cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6455
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostrar direcciones de correo registradas actualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6459
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Cambiar la direcciÃ³n de correo registrada actualmente..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6466
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos pendientes de autorizaciÃ³n"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6472
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Buscar un amigo por correo electrÃ³nico..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6477
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a travÃ©s de su informaciÃ³n"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
+#: ../libpurple/protocols/oscar/oscar.c:6545
 msgid "Use recent buddies group"
 msgstr "Usar grupo de amigos reciente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
+#: ../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:6678
+#: ../libpurple/protocols/oscar/oscar.c:6703
 msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
 msgstr ""
-"Utilizar un servidor proxy de ICQ para transferencias de ficheros\n"
+"Utilizar siempre un servidor proxy de AIM/ICQ\n"
+"para transferencias de ficheros y conexiones MI\n"
 "(lento, pero no descubre su direcciÃ³n IP)"
 
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 "Solicitando a %s que se conecte con nosotros en %s:%hu para MI directo."
 
-#: ../libpurple/protocols/oscar/peer.c:782
+#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Intentando conectarse a %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:856
-#, c-format
+#: ../libpurple/protocols/oscar/peer.c:858
 msgid "Attempting to connect via proxy server."
 msgstr "Intentando la conexiÃ³n a travÃ©s de un servidor proxy."
 
-#: ../libpurple/protocols/oscar/peer.c:1033
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s pide conectarse directamente a %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
+#: ../libpurple/protocols/oscar/peer.c:1039
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -9527,20 +9780,20 @@ msgstr "Otro"
 msgid "Other"
 msgstr "Otro"
 
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:522
+#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Modificar mi informaciÃ³n"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Actualizar mi informaciÃ³n"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Se ha modificado su informaciÃ³n."
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
+#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
@@ -9548,8 +9801,8 @@ msgstr ""
 msgstr ""
 "No se puede fijar una cara a medida. Por favor, escoja una imagen de %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
+#: ../libpurple/protocols/qq/buddy_info.c:618
+#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "Cara QQ invÃ¡lida"
 
@@ -9815,7 +10068,7 @@ msgstr "No se pudo enviar MI."
 msgid "Failed to send IM."
 msgstr "No se pudo enviar MI."
 
-#: ../libpurple/protocols/qq/keep_alive.c:87
+#: ../libpurple/protocols/qq/keep_alive.c:88
 msgid "Keep alive error"
 msgstr "Error de comprobaciÃ³n de conexiÃ³n"
 
@@ -9823,100 +10076,100 @@ msgstr "Error al solicitar un testigo de
 msgid "Error requesting login token"
 msgstr "Error al solicitar un testigo de conexiÃ³n"
 
-#: ../libpurple/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:489
 msgid "Unable to login, check debug log"
 msgstr "No pudo conectarse, compruebe el registro de depuraciÃ³n"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../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/ycht.c:549
+#: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "No se pudo conectar."
 
-#: ../libpurple/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:187
 #, c-format
 msgid "Unknown-%d"
 msgstr "Desconocido-%d"
 
-#: ../libpurple/protocols/qq/qq.c:211
+#: ../libpurple/protocols/qq/qq.c:212
 msgid "TCP Address"
 msgstr "DirecciÃ³n TCP"
 
-#: ../libpurple/protocols/qq/qq.c:213
+#: ../libpurple/protocols/qq/qq.c:214
 msgid "UDP Address"
 msgstr "DirecciÃ³n UDP"
 
-#: ../libpurple/protocols/qq/qq.c:242
+#: ../libpurple/protocols/qq/qq.c:243
 msgid "Level"
 msgstr "Nivel"
 
-#: ../libpurple/protocols/qq/qq.c:373
+#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "Nombre invÃ¡lido"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Conectados actualmente</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:440
+#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Ãšltima actualizaciÃ³n</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Modo de conexiÃ³n</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>IP del servidor</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
+#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<B>Mi IP pÃºblica</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Hora de conexiÃ³n</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Ãšltima IP de conexiÃ³n</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
+#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Ãšltimo hora de conexiÃ³n</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "InformaciÃ³n de conexiÃ³n"
 
-#: ../libpurple/protocols/qq/qq.c:533
+#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
 msgstr "Fijar mi informaciÃ³n"
 
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Cambiar contraseÃ±a"
 
-#: ../libpurple/protocols/qq/qq.c:539
+#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "Mostrar la informaciÃ³n de conexiÃ³n"
 
-#: ../libpurple/protocols/qq/qq.c:560
+#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "Salir de este Qun QQ"
 
-#: ../libpurple/protocols/qq/qq.c:584
+#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "Bloquear a este amigo"
 
@@ -9930,19 +10183,19 @@ msgstr "Bloquear a este amigo"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
+#: ../libpurple/protocols/qq/qq.c:726 ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "Complemento de protocolo QQ"
 
-#: ../libpurple/protocols/qq/qq.c:752
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
 msgstr "Conectando utilizando TCP"
 
-#: ../libpurple/protocols/qq/recv_core.c:309
+#: ../libpurple/protocols/qq/recv_core.c:310
 msgid "Socket error"
 msgstr "Error de socket"
 
-#: ../libpurple/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:321
 msgid "Unable to read from socket"
 msgstr "No se pudo leer del socket"
 
@@ -9961,12 +10214,11 @@ msgstr "%d cancelÃ³ la transferencia de 
 msgid "%d canceled the transfer of %s"
 msgstr "%d cancelÃ³ la transferencia de %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
+#: ../libpurple/protocols/qq/sendqueue.c:124
 msgid "Connection lost"
 msgstr "ConexiÃ³n perdida"
 
-#. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
+#: ../libpurple/protocols/qq/sendqueue.c:133
 msgid "Login failed, no reply"
 msgstr "Fallo en la conexiÃ³n, no ha habido respuesta"
 
@@ -10016,70 +10268,70 @@ msgstr "%s no estÃ¡ en su lista de amigo
 msgid "%s is not in your buddy list"
 msgstr "%s no estÃ¡ en su lista de amigos"
 
-#: ../libpurple/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:419
 msgid "Connection closed (writing)"
 msgstr "ConexiÃ³n cerrada (escribiendo)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1292
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>TÃtulo de grupo:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Identificador de grupo Â«NotesÂ»:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "Info for Group %s"
 msgstr "InformaciÃ³n sobre el grupo %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1297
 msgid "Notes Address Book Information"
 msgstr "InformaciÃ³n de la libreta de direcciones Â«NotesÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1329
 msgid "Invite Group to Conference..."
 msgstr "Invitar grupo a la conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1339
 msgid "Get Notes Address Book Info"
 msgstr "Obtener la informaciÃ³n de la libreta de direcciones Â«NotesÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:1506
 msgid "Sending Handshake"
 msgstr "Enviando negociaciÃ³n"
 
-#: ../libpurple/protocols/sametime/sametime.c:1509
+#: ../libpurple/protocols/sametime/sametime.c:1511
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Esperando a la aceptaciÃ³n del saludo inicial"
 
-#: ../libpurple/protocols/sametime/sametime.c:1514
+#: ../libpurple/protocols/sametime/sametime.c:1516
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Se aceptÃ³ el saludo inicial. Enviando la identificaciÃ³n"
 
-#: ../libpurple/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1521
 msgid "Waiting for Login Acknowledgement"
 msgstr "Esperando a la aceptaciÃ³n de la identificaciÃ³n"
 
-#: ../libpurple/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1526
 msgid "Login Redirected"
 msgstr "IdentificaciÃ³n redirigida"
 
-#: ../libpurple/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1532
 msgid "Forcing Login"
 msgstr "Forzando la identificaciÃ³n"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Login Acknowledged"
 msgstr "IdentificaciÃ³n aceptada"
 
-#: ../libpurple/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Starting Services"
 msgstr "Arrancando servicios"
 
-#: ../libpurple/protocols/sametime/sametime.c:1645
+#: ../libpurple/protocols/sametime/sametime.c:1678
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
@@ -10087,69 +10339,69 @@ msgstr ""
 "Un administrador de Â«SametimeÂ» ha enviado el siguiente anuncio en el "
 "servidor %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1650
+#: ../libpurple/protocols/sametime/sametime.c:1683
 msgid "Sametime Administrator Announcement"
 msgstr "Anuncio del administrador Â«SametimeÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1734
 msgid "Connection reset"
 msgstr "ConexiÃ³n rehusada"
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1746
 #, 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:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
+#: ../libpurple/protocols/sametime/sametime.c:1771
+#: ../libpurple/protocols/sametime/sametime.c:3772
 msgid "Unable to connect to host"
 msgstr "No se pudo conectar al servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1812
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aviso de %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1986
 msgid "Conference Closed"
 msgstr "Conferencia cerrada"
 
-#: ../libpurple/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2445
 msgid "Unable to send message: "
 msgstr "No se pudo enviar el mensaje:"
 
-#: ../libpurple/protocols/sametime/sametime.c:2959
+#: ../libpurple/protocols/sametime/sametime.c:3001
 msgid "Place Closed"
 msgstr "Lugar cerrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
+#: ../libpurple/protocols/sametime/sametime.c:3271
 msgid "Microphone"
 msgstr "MicrÃ³fono"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3272
 msgid "Speakers"
 msgstr "Altavoces"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3273
 msgid "Video Camera"
 msgstr "VÃdeo cÃ¡mara"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3311
+#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Supports"
 msgstr "Soporta"
 
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
+#: ../libpurple/protocols/sametime/sametime.c:3316
+#: ../libpurple/protocols/sametime/sametime.c:4165
 msgid "External User"
 msgstr "Usuario externo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
+#: ../libpurple/protocols/sametime/sametime.c:3422
 msgid "Create conference with user"
 msgstr "Crear conferencia con el usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3423
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10158,27 +10410,27 @@ msgstr ""
 "Por favor ingrese tema para la nueva conferencia, y un mensaje de invitaciÃ³n "
 "que se enviarÃ¡ a %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3385
+#: ../libpurple/protocols/sametime/sametime.c:3427
 msgid "New Conference"
 msgstr "Nueva conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
+#: ../libpurple/protocols/sametime/sametime.c:3429
 msgid "Create"
 msgstr "Crear"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
+#: ../libpurple/protocols/sametime/sametime.c:3494
 msgid "Available Conferences"
 msgstr "Conferencias disponibles"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
+#: ../libpurple/protocols/sametime/sametime.c:3500
 msgid "Create New Conference..."
 msgstr "Crear nueva conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3465
+#: ../libpurple/protocols/sametime/sametime.c:3507
 msgid "Invite user to a conference"
 msgstr "Invitar a un usuario a una conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3508
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10189,27 +10441,27 @@ msgstr ""
 "Seleccione \"Crear nueva conferencia\" si quiere crear una nueva conferencia "
 "para invitar a este usuario tambiÃ©n."
 
-#: ../libpurple/protocols/sametime/sametime.c:3471
+#: ../libpurple/protocols/sametime/sametime.c:3513
 msgid "Invite to Conference"
 msgstr "Invitar a conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
+#: ../libpurple/protocols/sametime/sametime.c:3604
 msgid "Invite to Conference..."
 msgstr "Invitar a conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3567
+#: ../libpurple/protocols/sametime/sametime.c:3609
 msgid "Send TEST Announcement"
 msgstr "Enviar anuncio de prueba"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3628 ../pidgin/gtkconv.c:4382
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: ../libpurple/protocols/sametime/sametime.c:3656
 msgid "No Sametime Community Server specified"
 msgstr "No se ha especificado el servidor de comunidad Â«SametimeÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
+#: ../libpurple/protocols/sametime/sametime.c:3681
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10218,42 +10470,42 @@ msgstr ""
 "No se ha configurado ninguna direcciÃ³n IP o nombre de equipo para la cuenta "
 "Â«MeanwhileÂ» %s. Introduzca uno mÃ¡s abajo para continuar el registro."
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3686
 msgid "Meanwhile Connection Setup"
 msgstr "ConfiguraciÃ³n de la conexiÃ³n Â«MeanwhileÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3687
 msgid "No Sametime Community Server Specified"
 msgstr "No se ha especificado un servidor de comunidad Â«SametimeÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+#: ../libpurple/protocols/sametime/sametime.c:3689
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
+#: ../libpurple/protocols/sametime/sametime.c:4181
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "(0x%04x) desconocido<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4137
+#: ../libpurple/protocols/sametime/sametime.c:4183
 msgid "Last Known Client"
 msgstr "Ãšltimo cliente conocido:"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
+#: ../libpurple/protocols/sametime/sametime.c:4347
+#: ../libpurple/protocols/sametime/sametime.c:5552
 msgid "User Name"
 msgstr "Nombre de usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: ../libpurple/protocols/sametime/sametime.c:4350
+#: ../libpurple/protocols/sametime/sametime.c:5555
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4374
 msgid "An ambiguous user ID was entered"
 msgstr "Se ha introducido un identificador de usuario ambiguo"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4375
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10263,15 +10515,15 @@ msgstr ""
 "usuarios. Por favor seleccione el usuario de la lista mostrada para aÃ±adirlo "
 "a su lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:4334
+#: ../libpurple/protocols/sametime/sametime.c:4380
 msgid "Select User"
 msgstr "Seleccionar usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#: ../libpurple/protocols/sametime/sametime.c:4464
 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:4420
+#: ../libpurple/protocols/sametime/sametime.c:4466
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10280,11 +10532,7 @@ msgstr ""
 "El identificador Â«%sÂ» no coincide con ningÃºn usuario en la comunidad "
 "Â«SametimeÂ». Se ha eliminado esta entrada de la lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "No puede aÃ±adir al usuario"
-
-#: ../libpurple/protocols/sametime/sametime.c:5011
+#: ../libpurple/protocols/sametime/sametime.c:5057
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10293,65 +10541,65 @@ msgstr ""
 "Error al leer el archivo %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
+#: ../libpurple/protocols/sametime/sametime.c:5192
 msgid "Remotely Stored Buddy List"
 msgstr "Lista de amigos remotamente almacenada"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
+#: ../libpurple/protocols/sametime/sametime.c:5197
 msgid "Buddy List Storage Mode"
 msgstr "Modo de almacenamiento de la lista de amigos"
 
 # Usar empotrable? (jfs)
-#: ../libpurple/protocols/sametime/sametime.c:5154
+#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Local Buddy List Only"
 msgstr "Solamente lista de amigos local"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
+#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Merge List from Server"
 msgstr "Fusionar lista desde el servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
+#: ../libpurple/protocols/sametime/sametime.c:5204
 msgid "Merge and Save List to Server"
 msgstr "Fusionar y guardar lista en el servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
+#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Synchronize List with Server"
 msgstr "Sincronizar la lista con el servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: ../libpurple/protocols/sametime/sametime.c:5261
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importar la lista Â«SametimeÂ» para la cuenta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
+#: ../libpurple/protocols/sametime/sametime.c:5301
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportar la lista Â«SametimeÂ» para la cuenta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
+#: ../libpurple/protocols/sametime/sametime.c:5355
 msgid "Unable to add group: group exists"
 msgstr "No se pudo aÃ±adir el grupo: el grupo ya existe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5356
 #, 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:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5359
+#: ../libpurple/protocols/sametime/sametime.c:5489
 msgid "Unable to add group"
 msgstr "No se pudo aÃ±adir el grupo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
+#: ../libpurple/protocols/sametime/sametime.c:5418
 msgid "Possible Matches"
 msgstr "Posibles coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5434
 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:5389
+#: ../libpurple/protocols/sametime/sametime.c:5435
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10362,15 +10610,15 @@ msgstr ""
 "de la libreta de direcciones Â«NotesÂ». Escoja el grupo mÃ¡s apropiado de la "
 "lista que se muestra abajo para aÃ±adirlo a su lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5394
+#: ../libpurple/protocols/sametime/sametime.c:5440
 msgid "Select Notes Address Book"
 msgstr "Seleccionar libro de direcciones Â«NotesÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5483
 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:5439
+#: ../libpurple/protocols/sametime/sametime.c:5485
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10379,11 +10627,11 @@ msgstr ""
 "El identificador Â«%sÂ» no coincide con ninguno de los grupos de la libreta de "
 "direcciones Â«NotesÂ» en su comunidad Â«SametimeÂ»."
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/sametime/sametime.c:5526
 msgid "Notes Address Book Group"
 msgstr "Libreta de direcciones de grupos Â«NotesÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5527
 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."
@@ -10392,12 +10640,12 @@ msgstr ""
 "campo a continuaciÃ³n para aÃ±adir al grupo y a sus miembros en su lista de "
 "amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5530
+#: ../libpurple/protocols/sametime/sametime.c:5576
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados de la bÃºsqueda '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5577
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10408,30 +10656,30 @@ msgstr ""
 "a continuaciÃ³n. Puede aÃ±adir estos usuarios a su lista de amigos o enviarles "
 "mensajes con los botones de acciones mostrados abajo."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5584 ../pidgin/gtknotify.c:763
 msgid "Search Results"
 msgstr "Resultados de la bÃºsqueda"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "No matches"
 msgstr "No hubo coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5610
 #, 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:5568
+#: ../libpurple/protocols/sametime/sametime.c:5614
 msgid "No Matches"
 msgstr "No hubo coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5651
 msgid "Search for a user"
 msgstr "Buscar un usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5652
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10439,32 +10687,32 @@ msgstr ""
 "Introduzca el nombre o identificador parcial en el campo mostrado a "
 "continuaciÃ³n para buscar usuarios coincidentes en su comunidad Â«SametimeÂ»."
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5655
 msgid "User Search"
 msgstr "BÃºsqueda de usuarios"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5668
 msgid "Import Sametime List..."
 msgstr "Importar la lista Â«SametimeÂ»..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
+#: ../libpurple/protocols/sametime/sametime.c:5672
 msgid "Export Sametime List..."
 msgstr "Exportar la lista Â«SametimeÂ»..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
+#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Add Notes Address Book Group..."
 msgstr "AÃ±adir a la libreta de direcciones de grupos Â«NotesÂ»..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "User Search..."
 msgstr "BÃºsqueda de los usuarios..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5786
 msgid "Force login (ignore server redirects)"
 msgstr "Forzar conexiÃ³n (ignorar redirecciones del servidor)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Hide client identity"
 msgstr "Ocultar identidad de cliente"
 
@@ -10595,8 +10843,8 @@ msgstr "Establecer contraseÃ±a MI"
 #: ../libpurple/protocols/silc/buddy.c:496
 #: ../libpurple/protocols/silc/buddy.c:507
 #: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1499
-#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc/ops.c:1503
+#: ../libpurple/protocols/silc/ops.c:1514
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -10605,8 +10853,8 @@ msgstr "Obtener clave pÃºblica"
 msgstr "Obtener clave pÃºblica"
 
 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc/ops.c:1504
+#: ../libpurple/protocols/silc/ops.c:1515
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -10614,17 +10862,17 @@ msgstr "No se pudo obtener la clave pÃºb
 msgstr "No se pudo obtener la clave pÃºblica"
 
 #: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc/buddy.c:1658
 #: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
+#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "Mostrar clave pÃºblica"
 
 #: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/chat.c:239
 #: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "No se pudo cargar la clave pÃºblica"
@@ -10632,9 +10880,9 @@ msgstr "No se pudo cargar la clave pÃºbl
 #: ../libpurple/protocols/silc/buddy.c:701
 #: ../libpurple/protocols/silc/ops.c:1053
 #: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1288
-#: ../libpurple/protocols/silc/ops.c:1289
-#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc/ops.c:1290
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1309
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -10646,7 +10894,7 @@ msgstr "InformaciÃ³n de usuario"
 
 #: ../libpurple/protocols/silc/buddy.c:702
 #: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc/ops.c:1310
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -10669,19 +10917,19 @@ msgstr ""
 "pÃºblica. Puede utilizar la orden \"Obtener clave pÃºblica\" para importarla."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1062
+#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "No se encuentra al amigo %s en la red"
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -10689,18 +10937,18 @@ msgstr ""
 "Para aÃ±adir al amigo debe importar su clave pÃºblica. Pulse Â«ImportarÂ» para "
 "importar una clave pÃºblica."
 
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1186
+#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Seleccione el usuario correcto"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1186
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -10708,8 +10956,8 @@ msgstr ""
 "Se ha encontrado mÃ¡s de un usuario con la misma clave pÃºblica. Seleccione el "
 "usuario que desea aÃ±adir a su lista de amigos de la lista mostrada."
 
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc10/buddy.c:1188
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -10717,208 +10965,208 @@ msgstr ""
 "Se ha encontrado mÃ¡s de un usuario con el mismo nombre. Seleccione el "
 "usuario que desea aÃ±adir a su lista de amigos de la listas mostrada."
 
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
+#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "Desligado"
 
-#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/buddy.c:1481
 #: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/buddy.c:1481
 #: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Indispuesto"
 
-#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/buddy.c:1485
 #: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/buddy.c:1485
 #: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "DespiÃ©rtame"
 
-#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/buddy.c:1487
 #: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/buddy.c:1487
 #: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiper-activo"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/silc.c:886
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1496
 #: ../libpurple/protocols/silc10/silc.c:654
 #: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Feliz"
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/silc.c:888
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:656
 #: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Triste"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/silc.c:890
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:658
 #: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Furioso"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/silc.c:892
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Celoso"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/silc.c:894
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Avergonzado"
 
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/silc.c:896
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1506
 #: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Invencible"
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1508
 #: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Enamorado"
 
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/silc.c:900
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1510
 #: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Dormido"
 
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc/buddy.c:1512
+#: ../libpurple/protocols/silc/silc.c:902
+#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc10/buddy.c:1512
 #: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Aburrido"
 
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/silc.c:904
+#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc10/buddy.c:1514
 #: ../libpurple/protocols/silc10/silc.c:672
 #: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Excitado"
 
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/silc.c:906
+#: ../libpurple/protocols/silc/util.c:542
+#: ../libpurple/protocols/silc10/buddy.c:1516
 #: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/buddy.c:1548
 #: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/buddy.c:1548
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Modos de usuario"
 
-#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/buddy.c:1565
 #: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Contacto preferido"
 
-#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/buddy.c:1570
 #: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/buddy.c:1570
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Idioma preferido"
 
-#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/buddy.c:1575
 #: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/buddy.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/buddy.c:1580
 #: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:722
 #: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Zona horaria"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/buddy.c:1585
 #: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "LocalizaciÃ³n"
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1641
+#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "Borrar la clave MI"
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1646
+#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "MI con intercambio de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1651
+#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "MI con contraseÃ±a"
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1664
+#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "Obtener clave pÃºblica..."
 
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc/buddy.c:1671
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Matar usuario"
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc/buddy.c:1681
+#: ../libpurple/protocols/silc/chat.c:997
+#: ../libpurple/protocols/silc10/buddy.c:1680
 #: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Escribir en la pizarra"
@@ -10935,7 +11183,7 @@ msgstr "No existe el canal %s en la red"
 msgstr "No existe el canal %s en la red"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc/chat.c:177
 #: ../libpurple/protocols/silc10/chat.c:81
 #: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
@@ -10985,46 +11233,44 @@ msgstr "<br><b>Tema del canal:</b><br>%s
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
-#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modos del canal:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
 #: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Huella dactilar del fundador:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc/chat.c:168
 #: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Huella Babble del fundador:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:238
 #: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "AÃ±adir clave pÃºblica del canal"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc/chat.c:306
 #: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Abrir clave pÃºblica..."
 
-#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "ContraseÃ±a del canal"
 
-#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc/chat.c:432
 #: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Lista de claves pÃºblicas del canal"
 
-#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc/chat.c:437
 #: ../libpurple/protocols/silc10/chat.c:413
-#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -11038,11 +11284,11 @@ msgstr ""
 "conectarse los usuarios que estÃ©n en la lista de claves pÃºblicas si se "
 "utilizan claves pÃºblicas para el acceso."
 
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:483
+#: ../libpurple/protocols/silc/chat.c:484
+#: ../libpurple/protocols/silc/chat.c:931
 #: ../libpurple/protocols/silc10/chat.c:422
 #: ../libpurple/protocols/silc10/chat.c:423
 #: ../libpurple/protocols/silc10/chat.c:461
@@ -11051,28 +11297,28 @@ msgstr "AutenticaciÃ³n de canal"
 msgid "Channel Authentication"
 msgstr "AutenticaciÃ³n de canal"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc/chat.c:448
+#: ../libpurple/protocols/silc/chat.c:485
 #: ../libpurple/protocols/silc10/chat.c:424
 #: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "AÃ±adir / Quitar"
 
-#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc/chat.c:601
 #: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Nombre de grupo"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc/chat.c:605
+#: ../libpurple/protocols/silc/ops.c:1817
+#: ../libpurple/protocols/silc/silc.c:1163
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1901
 #: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "ContraseÃ±a"
 
-#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc/chat.c:616
 #: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
@@ -11080,116 +11326,116 @@ msgstr ""
 "Por favor, indique el nombre del grupo de canales privados %s y una "
 "contraseÃ±a."
 
-#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc/chat.c:618
 #: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "AÃ±adir grupo de canales privados"
 
-#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc/chat.c:746
 #: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "LÃmite de usuarios"
 
-#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc/chat.c:747
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Fijar un limite de usuarios en el canal. Poner a cero para quitar el lÃmite "
 "de usuarios."
 
-#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc/chat.c:911
 #: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Lista de invitados"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:916
 #: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Lista de expulsados"
 
-#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc/chat.c:924
 #: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "AÃ±adir grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc/chat.c:937
 #: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Borrado permanente"
 
-#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc/chat.c:942
 #: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Fijar permanente"
 
-#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc/chat.c:950
 #: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Establecer lÃmite de usuarios"
 
-#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc/chat.c:956
 #: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Quitar restricciones de temas"
 
-#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc/chat.c:961
 #: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Establecer restricciones de tema"
 
-#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc/chat.c:968
 #: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Limpiar canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc/chat.c:973
 #: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Establecer canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc/chat.c:980
 #: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Limpiar canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc/chat.c:985
 #: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Establecer canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc/chat.c:1046
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Tiene que unirse al canal %s antes de poder unirse al grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc/chat.c:1048
 #: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Unirse a un grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc/chat.c:1049
 #: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "No se pudo unir a un grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
 #: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Orden de llamada"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1361
 #: ../libpurple/protocols/silc10/chat.c:1299
 #: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "No se pudo llamar la orden"
 
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc/chat.c:1246
+#: ../libpurple/protocols/silc/silc.c:1362
 #: ../libpurple/protocols/silc10/chat.c:1300
 #: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
@@ -11351,7 +11597,7 @@ msgstr "Rol laboral"
 msgstr "Rol laboral"
 
 #: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
@@ -11386,7 +11632,7 @@ msgstr "El fundador del canal en <I>%s</
 msgstr "El fundador del canal en <I>%s</I> es <I>%s</I>"
 
 #: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc/ops.c:1328
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
@@ -11398,90 +11644,90 @@ msgstr "Texto de estado"
 msgid "Status Text"
 msgstr "Texto de estado"
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1354
 #: ../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:1280
-#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/ops.c:1281
+#: ../libpurple/protocols/silc/ops.c:1355
 #: ../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:1292
+#: ../libpurple/protocols/silc/ops.c:1294
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_MÃ¡s..."
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
 #: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Desligar del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "No se puede desligar"
 
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "No se puede cambiar el tema"
 
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "No se pudo cambiar el alias"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../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:1468
+#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
 msgstr "La red estÃ¡ vacÃa"
 
-#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc/ops.c:1516
 #: ../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:1524
-#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc/ops.c:1528
+#: ../libpurple/protocols/silc/ops.c:1541
 #: ../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:1525
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../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:1548
+#: ../libpurple/protocols/silc/ops.c:1552
 #: ../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:1549
+#: ../libpurple/protocols/silc/ops.c:1553
 #: ../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:1556
+#: ../libpurple/protocols/silc/ops.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -11517,54 +11763,54 @@ msgstr ""
 "Operadores de servidor en total: %d\n"
 "Operadores de encaminadores en total: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc/ops.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "EstadÃsticas de red"
 
-#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1600
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "FallÃ³ el ping"
 
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../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:1609
+#: ../libpurple/protocols/silc/ops.c:1613
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "No se pudo expulsar al usuario"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
 msgstr "AÃ‘ADIR"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "Cannot watch user"
 msgstr "No se puede aÃ±adir al usuario"
 
-#: ../libpurple/protocols/silc/ops.c:1724
-#: ../libpurple/protocols/silc/ops.c:1775
-#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc/ops.c:1728
+#: ../libpurple/protocols/silc/ops.c:1779
+#: ../libpurple/protocols/silc/silc.c:385
 #: ../libpurple/protocols/silc10/ops.c:1811
 #: ../libpurple/protocols/silc10/ops.c:1858
 #: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Reanudando la sesiÃ³n"
 
-#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc/ops.c:1730
 #: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Autenticando la conexiÃ³n"
 
-#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc/ops.c:1781
 #: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Comprobando la clave pÃºblica del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc/ops.c:1818
 #: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Se necesita una contraseÃ±a"
@@ -11610,22 +11856,22 @@ msgstr "Tipo de clave pÃºblica no soport
 msgid "Unsupported public key type"
 msgstr "Tipo de clave pÃºblica no soportada"
 
-#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc/silc.c:319
 #: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "Desconectado por el servidor"
 
-#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc/silc.c:327
 #: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "Se produjo un error durante la conexiÃ³n al servidor SILC"
 
-#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc/silc.c:333
 #: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "FallÃ³ el intercambio de claves"
 
-#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc/silc.c:343
 #: ../libpurple/protocols/silc10/ops.c:1714
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
@@ -11633,64 +11879,62 @@ msgstr ""
 "Se produjo un fallo al retomar la sesiÃ³n desligada. Pulse Â«ReconectarÂ» para "
 "crear una nueva conexiÃ³n."
 
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc/silc.c:373
+#: ../libpurple/protocols/silc/silc.c:420
 #: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "FallÃ³ la conexiÃ³n"
 
-#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc/silc.c:388
 #: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Realizando intercambio de claves"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc/silc.c:445
 #: ../libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
 msgstr "Conectando con el servidor SILC"
 
-#: ../libpurple/protocols/silc/silc.c:352
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:455
 msgid "Could not load SILC key pair"
 msgstr "No se pudo cargar la clave pÃºblica SILC"
 
-#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc/silc.c:469
 #: ../libpurple/protocols/silc10/silc.c:355
 msgid "Unable to create connection"
 msgstr "No se pudo crear la conexiÃ³n"
 
-#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc/silc.c:499
 #: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Sin memoria"
 
-#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc/silc.c:550
 #: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "No se pudo inicializar el protocolo SILC"
 
-#: ../libpurple/protocols/silc/silc.c:445
+#: ../libpurple/protocols/silc/silc.c:559
 msgid "Error loading SILC key pair"
 msgstr "Error al cargar el par de claves SILC"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:882
 #: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Su estado de Ã¡nimo actual"
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:884
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1741
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc/silc.c:898
 #: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Enamorado"
 
-#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc/silc.c:909
 #: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
@@ -11699,62 +11943,62 @@ msgstr ""
 "\n"
 "Sus mÃ©todos de contacto preferidos"
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/util.c:569
 #: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc/silc.c:921
 #: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Video conferencia"
 
-#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc/silc.c:926
 #: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Su estado actual"
 
-#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc/silc.c:933
 #: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Servicios en lÃnea"
 
-#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc/silc.c:936
 #: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Permitir que otros consulten quÃ© servicios estÃ¡ utilizando"
 
-#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc/silc.c:942
 #: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Permitir que otros consulten quÃ© ordenador estÃ¡ utilizando"
 
-#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc/silc.c:949
 #: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Su archivo VCard"
 
-#: ../libpurple/protocols/silc/silc.c:812
+#: ../libpurple/protocols/silc/silc.c:955
 msgid "Timezone (UTC)"
 msgstr "Zona horaria (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc/silc.c:959
+#: ../libpurple/protocols/silc/silc.c:960
 #: ../libpurple/protocols/silc10/silc.c:729
 #: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Atributos del estado del usuario en lÃnea"
 
-#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc/silc.c:961
 #: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
@@ -11765,31 +12009,31 @@ msgstr ""
 "lÃnea asÃ como su informaciÃ³n personal. Por favor, rellene la informaciÃ³n "
 "que desea que otros usuarios vean de vd."
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
+#: ../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
 msgid "Message of the Day"
 msgstr "Mensaje del dÃa"
 
-#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:1002
 #: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "No hay disponible un mensaje del dÃa"
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1624
 #: ../libpurple/protocols/silc10/silc.c:773
 #: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "No hay un mensaje del dÃa asociado con esta conexiÃ³n"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc/silc.c:1054
+#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc/silc.c:1171
+#: ../libpurple/protocols/silc/silc.c:1172
 #: ../libpurple/protocols/silc10/silc.c:824
 #: ../libpurple/protocols/silc10/silc.c:868
 #: ../libpurple/protocols/silc10/silc.c:939
@@ -11797,184 +12041,184 @@ msgstr "Crear nuevo par de claves SILC"
 msgid "Create New SILC Key Pair"
 msgstr "Crear nuevo par de claves SILC"
 
-#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:1054
 #: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Las contraseÃ±as no coinciden."
 
-#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1100
 #: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "FallÃ³ la generaciÃ³n de claves"
 
-#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1139
 #: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Longitud de clave"
 
-#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:1141
 #: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Fichero de clave pÃºblica"
 
-#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc/silc.c:1143
 #: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Fichero de clave privada"
 
-#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc/silc.c:1166
 #: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "ContraseÃ±a (escribir de nuevo)"
 
-#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc/silc.c:1173
 #: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Generar par de claves"
 
-#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc/silc.c:1216
 #: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Estado en lÃnea"
 
-#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc/silc.c:1224
 #: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "Mostrar mensaje del dÃa"
 
-#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc/silc.c:1228
 #: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "Crear par de claves SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc/silc.c:1320
 #: ../libpurple/protocols/silc10/silc.c:1095
 #, 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:1357
+#: ../libpurple/protocols/silc/silc.c:1500
 #: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Tema demasiado largo"
 
-#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc/silc.c:1581
 #: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Debe especificar un apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc/silc.c:1683
 #: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "no se ha encontrado el canal %s"
 
-#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc/silc.c:1688
 #: ../libpurple/protocols/silc10/silc.c:1474
 #, 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:1547
+#: ../libpurple/protocols/silc/silc.c:1690
 #: ../libpurple/protocols/silc10/silc.c:1476
 #, 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:1560
+#: ../libpurple/protocols/silc/silc.c:1703
 #: ../libpurple/protocols/silc10/silc.c:1489
 #, 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:1590
+#: ../libpurple/protocols/silc/silc.c:1733
 #: ../libpurple/protocols/silc10/silc.c:1519
 #, 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:1653
+#: ../libpurple/protocols/silc/silc.c:1796
 #: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]:  Abandonar un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc/silc.c:1800
 #: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canal]:  Abandonar un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc/silc.c:1804
 #: ../libpurple/protocols/silc10/silc.c:1590
 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:1666
+#: ../libpurple/protocols/silc/silc.c:1809
 #: ../libpurple/protocols/silc10/silc.c:1595
 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:1670
+#: ../libpurple/protocols/silc/silc.c:1813
 #: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list:  Mostrar los canales en esta red"
 
-#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc/silc.c:1817
 #: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;apodo&gt;:  Mostrar informaciÃ³n del apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc/silc.c:1821
 #: ../libpurple/protocols/silc10/silc.c:1607
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario"
 
-#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc/silc.c:1825
 #: ../libpurple/protocols/silc10/silc.c:1611
 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:1686
+#: ../libpurple/protocols/silc/silc.c:1829
 #: ../libpurple/protocols/silc10/silc.c:1615
 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:1690
+#: ../libpurple/protocols/silc/silc.c:1833
 #: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Desligar esta sesiÃ³n"
 
-#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1837
 #: ../libpurple/protocols/silc10/silc.c:1623
 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:1698
+#: ../libpurple/protocols/silc/silc.c:1841
 #: ../libpurple/protocols/silc10/silc.c:1627
 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:1704
+#: ../libpurple/protocols/silc/silc.c:1847
 #: ../libpurple/protocols/silc10/silc.c:1633
 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:1708
+#: ../libpurple/protocols/silc/silc.c:1851
 #: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc/silc.c:1855
 #: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;apodo&gt;:  Mostrar informaciÃ³n del apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc/silc.c:1859
 #: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
@@ -11983,7 +12227,7 @@ msgstr ""
 "cmode &lt;canal&gt; [+|&lt;modos-&gt;] [argumentos]:  Cambia o muestra los "
 "modos del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc/silc.c:1863
 #: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
@@ -11992,17 +12236,17 @@ msgstr ""
 "cumode &lt;canal&gt; +|-&lt;modos&gt &lt;apodo&gt;:  Cambia los modos del "
 "usuario o del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc/silc.c:1867
 #: ../libpurple/protocols/silc10/silc.c:1653
 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:1728
+#: ../libpurple/protocols/silc/silc.c:1871
 #: ../libpurple/protocols/silc10/silc.c:1657
 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:1732
+#: ../libpurple/protocols/silc/silc.c:1875
 #: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
@@ -12011,46 +12255,46 @@ msgstr ""
 "invite &lt;canal&gt; [-|+]&lt;apodo&gt;:   invita a un apodo o aÃ±ade/elimina "
 "el apodo de la lista de invitados para el canal"
 
-#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc/silc.c:1879
 #: ../libpurple/protocols/silc10/silc.c:1665
 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:1740
+#: ../libpurple/protocols/silc/silc.c:1883
 #: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]:  Consulta detalles administrativos del servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc/silc.c:1887
 #: ../libpurple/protocols/silc10/silc.c:1673
 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:1748
+#: ../libpurple/protocols/silc/silc.c:1891
 #: ../libpurple/protocols/silc10/silc.c:1677
 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:1752
+#: ../libpurple/protocols/silc/silc.c:1895
 #: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Muestra las estadÃsticas del servidor y de la red"
 
-#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc/silc.c:1899
 #: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Enviar un PING al servidor al que estÃ¡ conectado"
 
-#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc/silc.c:1904
 #: ../libpurple/protocols/silc10/silc.c:1690
 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:1765
+#: ../libpurple/protocols/silc/silc.c:1908
 #: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
@@ -12068,141 +12312,141 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc/silc.c:2019
 #: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "Complemento de protocolo SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc/silc.c:2021
 #: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocolo de Conferencia segura en vivo en Internet (SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc/silc.c:2053
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2138
 msgid "Network"
 msgstr "Red"
 
-#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc/silc.c:2064
 #: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Fichero de clave pÃºblica"
 
-#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc/silc.c:2068
 #: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Fichero de clave privada"
 
-#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc/silc.c:2078
 #: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Cifrado"
 
-#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc/silc.c:2088
 #: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
 #
-#: ../libpurple/protocols/silc/silc.c:1948
+#: ../libpurple/protocols/silc/silc.c:2091
 msgid "Use Perfect Forward Secrecy"
 msgstr "Utilizar Â«Confidencialidad directa perfectaÂ»"
 
-#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc/silc.c:2095
 #: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "AutenticaciÃ³n de clave pÃºblica"
 
-#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc/silc.c:2098
 #: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear MIs que no hagan un intercambio de claves"
 
-#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc/silc.c:2101
 #: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Bloquear mensajes a la pizarra"
 
-#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc/silc.c:2104
 #: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Abrir la pizarra automÃ¡ticamente"
 
-#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc/silc.c:2107
 #: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Firmar digitalmente todos los mensajes instantÃ¡neos"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc/util.c:250
 #: ../libpurple/protocols/silc10/util.c:207
 #: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Creando el par de claves SILC..."
 
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
+#: ../libpurple/protocols/silc/util.c:216
+#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
 msgstr "No se pudo crear el par de claves SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nombre real: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc/util.c:366
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nombre de usuario: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "Correo electrÃ³nico:     %s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc/util.c:370
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nombre de servidor: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:372
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "OrganizaciÃ³n: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "PaÃs: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:375
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmo:      %s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:376
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Longitud de clave: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:372
+#: ../libpurple/protocols/silc/util.c:378
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "VersiÃ³n: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:380
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -12214,7 +12458,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:381
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -12224,44 +12468,44 @@ msgstr ""
 "Huella babble de la clave pÃºblica:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc/util.c:385
+#: ../libpurple/protocols/silc/util.c:386
 #: ../libpurple/protocols/silc10/util.c:374
 #: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "InformaciÃ³n de clave pÃºblica"
 
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Enviar"
 
-#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc/util.c:571
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Video conferencia"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:589
 #: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Ordenador"
 
-#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:593
 #: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc/util.c:595
 #: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s enviÃ³ un mensaje a la pizarra. Â¿Quiere abrir la pizarra?"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -12269,7 +12513,7 @@ msgstr ""
 msgstr ""
 "%s enviÃ³ un mensaje a la pizarra del canal %s. Â¿Quiere abrir la pizarra?"
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "Pizarra"
 
@@ -12278,55 +12522,45 @@ msgstr "No se disponen de estadÃsticas 
 msgstr "No se disponen de estadÃsticas del servidor"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
 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
-#, c-format
 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
-#, c-format
 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
-#, c-format
 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
-#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fallo: El servidor remoto no soporta los PKCS propuestos"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
 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
-#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fallo: El servidor remoto no soporta el HMAC propuesto"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Fallo: Firma incorrecta"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Fallo: Cookie invÃ¡lida"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Fallo: FallÃ³ la autenticaciÃ³n"
 
@@ -12347,37 +12581,35 @@ msgstr "No se pudo cargar la clave pÃºbl
 msgid "Could not load SILC key pair: %s"
 msgstr "No se pudo cargar la clave pÃºblica SILC: %s"
 
-#. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "No se pudo escribir"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:443
+#: ../libpurple/protocols/simple/simple.c:1691
 msgid "Could not connect"
 msgstr "No se pudo conectar"
 
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
-msgstr "Error desconocido del servidor."
+msgstr "Respuesta desconocida del servidor."
 
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/simple/simple.c:1727
+#: ../libpurple/protocols/simple/simple.c:1773
+#: ../libpurple/protocols/simple/simple.c:1788
+#: ../libpurple/protocols/simple/simple.c:1843
 msgid "Could not create listen socket"
 msgstr "No se pudo crear el socket de escucha"
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1752
 msgid "Couldn't resolve host"
 msgstr "No se pudo resolver el nombre"
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Could not resolve hostname"
 msgstr "No se pudo resolver el nombre de sistema"
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1871
 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 @"
@@ -12390,36 +12622,36 @@ msgstr ""
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:2057
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Complemento de protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:2058
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "El complemento de protocolo SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:2086
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Estatus pÃºblico (nota: todos podrÃ¡n verlo)"
 
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:2092
 msgid "Use UDP"
 msgstr "Utilizar UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:2094
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:2096
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:2098
 msgid "Auth User"
 msgstr "Usuario de autenticaciÃ³n"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:2100
 msgid "Auth Domain"
 msgstr "Dominio de autenticaciÃ³n"
 
@@ -12464,7 +12696,6 @@ msgstr "No se permiten advertencias de %
 msgstr "No se permiten advertencias de %s."
 
 #: ../libpurple/protocols/toc/toc.c:503
-#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "El mensaje ha sido descartado, usted esta excediendo el lÃmite de velocidad "
@@ -12491,47 +12722,38 @@ msgstr "Usted perdiÃ³ un MI de %s porque
 msgstr "Usted perdiÃ³ un MI de %s porque fue mandado demasiado rÃ¡pido."
 
 #: ../libpurple/protocols/toc/toc.c:518
-#, c-format
 msgid "Failure."
 msgstr "Fallo."
 
 #: ../libpurple/protocols/toc/toc.c:521
-#, c-format
 msgid "Too many matches."
 msgstr "Demasiados resultados."
 
 #: ../libpurple/protocols/toc/toc.c:524
-#, c-format
 msgid "Need more qualifiers."
 msgstr "Necesito mÃ¡s calificadores."
 
 #: ../libpurple/protocols/toc/toc.c:527
-#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Servicio de directorio temporalmente no disponible."
 
 #: ../libpurple/protocols/toc/toc.c:530
-#, c-format
 msgid "E-mail lookup restricted."
 msgstr "BÃºsqueda de direcciones de correo electrÃ³nico restringida."
 
 #: ../libpurple/protocols/toc/toc.c:533
-#, c-format
 msgid "Keyword ignored."
 msgstr "Palabra clave ignorada."
 
 #: ../libpurple/protocols/toc/toc.c:536
-#, c-format
 msgid "No keywords."
 msgstr "Sin palabras clave."
 
 #: ../libpurple/protocols/toc/toc.c:539
-#, c-format
 msgid "User has no directory information."
 msgstr "El usuario no tiene informaciÃ³n en el directorio."
 
 #: ../libpurple/protocols/toc/toc.c:543
-#, c-format
 msgid "Country not supported."
 msgstr "PaÃs no soportado."
 
@@ -12541,22 +12763,18 @@ msgstr "Fallo desconocido: %s."
 msgstr "Fallo desconocido: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, c-format
 msgid "Incorrect screen name or password."
 msgstr "Nombre de cuenta o contraseÃ±a incorrecta."
 
 #: ../libpurple/protocols/toc/toc.c:552
-#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Servicio temporalmente no disponible."
 
 #: ../libpurple/protocols/toc/toc.c:555
-#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Su nivel de advertencias es demasiado alto para conectarse."
 
 #: ../libpurple/protocols/toc/toc.c:558
-#, c-format
 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."
@@ -12595,8 +12813,8 @@ msgstr "La contraseÃ±a se ha cambiado co
 msgid "Password Change Successful"
 msgstr "La contraseÃ±a se ha cambiado con Ã©xito"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6325
+#: ../pidgin/gtkblist.c:6696
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -12659,27 +12877,27 @@ msgstr "Complemento de protocolo TOC"
 msgid "TOC Protocol Plugin"
 msgstr "Complemento de protocolo TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+#: ../libpurple/protocols/yahoo/yahoo.c:784
 #, 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:838
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "Su mensaje Yahoo! no se enviÃ³."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+#: ../libpurple/protocols/yahoo/yahoo.c:961
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaje del sistema Yahoo! para %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:1030
 msgid "Authorization denied message:"
 msgstr "Mensaje de autorizaciÃ³n denegada:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:1048
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12688,18 +12906,18 @@ msgstr ""
 "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:1050
+#: ../libpurple/protocols/yahoo/yahoo.c:1051
 #, 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:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1053
 msgid "Add buddy rejected"
 msgstr "Se rechazÃ³ la adiciÃ³n del amigo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1995
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12710,11 +12928,11 @@ msgstr ""
 "desconocido. Posiblemente no sea capaz de conectarse a Yahoo. Compruebe %s "
 "para ver si existe una actualizaciÃ³n."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:1998
 msgid "Failed Yahoo! Authentication"
 msgstr "FallÃ³ la autenticaciÃ³n en Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2064
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12723,53 +12941,53 @@ msgstr ""
 "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:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2067
 msgid "Ignore buddy?"
 msgstr "Â¿Ignorar amigo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 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:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2135
 #, 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:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, 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:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
 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:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+#: ../libpurple/protocols/yahoo/yahoo.c:2656
 msgid "Received unexpected HTTP response from server."
 msgstr "Se recibiÃ³ una respuesta HTTP del servidor que no se esperaba."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
+#: ../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/ycht.c:585
+#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Error de conexiÃ³n"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
+#: ../libpurple/protocols/yahoo/yahoo.c:2707
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12778,7 +12996,7 @@ msgstr ""
 "Se perdiÃ³ la conexiÃ³n con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
+#: ../libpurple/protocols/yahoo/yahoo.c:2732
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12787,114 +13005,103 @@ msgstr ""
 "No se pudo establecer una conexiÃ³n con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3777
 msgid "Not at Home"
 msgstr "Fuera de casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3780
 msgid "Not at Desk"
 msgstr "Lejos del escritorio"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3783
 msgid "Not in Office"
 msgstr "Fuera de la oficina"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
+#: ../libpurple/protocols/yahoo/yahoo.c:3789
 msgid "On Vacation"
 msgstr "De vacaciones"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3103
+#: ../libpurple/protocols/yahoo/yahoo.c:3795
 msgid "Stepped Out"
 msgstr "Ha abandonado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../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:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3243
+#: ../libpurple/protocols/yahoo/yahoo.c:3301
 msgid "Appear Online"
 msgstr "Parecer conectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../libpurple/protocols/yahoo/yahoo.c:3246
+#: ../libpurple/protocols/yahoo/yahoo.c:3322
 msgid "Appear Permanently Offline"
 msgstr "Parecer siempre desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3264
 msgid "Presence"
 msgstr "Presencia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3307
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#: ../libpurple/protocols/yahoo/yahoo.c:3316
 msgid "Don't Appear Permanently Offline"
 msgstr "No parecer siempre desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../libpurple/protocols/yahoo/yahoo.c:3364
 msgid "Join in Chat"
 msgstr "Unirse a un chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+#: ../libpurple/protocols/yahoo/yahoo.c:3370
 msgid "Initiate Conference"
 msgstr "Iniciar conferencia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3398
 msgid "Presence Settings"
 msgstr "Usar configuraciÃ³n del entorno"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3404
 msgid "Start Doodling"
 msgstr "Comenzar una sesiÃ³n de Doodle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
 msgid "Activate which ID?"
 msgstr "Â¿QuÃ© ID quiere activar?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3516
 msgid "Join whom in chat?"
-msgstr "Â¿Juntarse con quiÃ©n en un chat?"
+msgstr "Â¿Con quiÃ©n quiere juntarse en un chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+#: ../libpurple/protocols/yahoo/yahoo.c:3528
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3532
 msgid "Join User in Chat..."
 msgstr "Juntarse con un usuario en un chat..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
+#: ../libpurple/protocols/yahoo/yahoo.c:3537
 msgid "Open Inbox"
 msgstr "Abrir bandeja de entrada"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-#, fuzzy
-msgid "Buzz"
-msgstr "Â¡Â¡Codazo!!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+#: ../libpurple/protocols/yahoo/yahoo.c:4146
 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:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4151
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Mostrar los canales de la red Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4159
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Solicitar al usuario el comienzo de una sesiÃ³n Doodle"
 
@@ -12908,56 +13115,56 @@ msgstr "doodle: Solicitar al usuario el 
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4368
+#: ../libpurple/protocols/yahoo/yahoo.c:4370
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4393
 msgid "Yahoo Japan"
 msgstr "Yahoo JapÃ³n"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4396
 msgid "Pager server"
 msgstr "Servidor buscapersonas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4399
 msgid "Japan Pager server"
 msgstr "Servidor de buscapersonas japonÃ©s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4402
 msgid "Pager port"
 msgstr "Puerto del buscapersonas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4405
 msgid "File transfer server"
 msgstr "Servidor de transferencia de archivos"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4408
 msgid "Japan file transfer server"
 msgstr "Servidor de transferencia de archivos japonÃ©s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4411
 msgid "File transfer port"
 msgstr "Puerto de transferencia de archivos"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4414
 msgid "Chat room locale"
 msgstr "LocalizaciÃ³n de la sala de chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar las invitaciones a salas de conferencias o chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4425
 msgid "Chat room list URL"
 msgstr "Url de lista de salas de chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4428
 msgid "Yahoo Chat server"
 msgstr "Servidor de chat de Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4431
 msgid "Yahoo Chat port"
 msgstr "Puerto de chat de Yahoo"
 
@@ -12974,7 +13181,6 @@ msgstr "No se pudo establecer el descrip
 msgid "Unable to establish file descriptor."
 msgstr "No se pudo establecer el descriptor de archivo."
 
-#. TODO: what to do here - do we really have to disconnect?
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Error de escritura"
@@ -13144,11 +13350,11 @@ msgstr "Salas de usuarios"
 msgid "User Rooms"
 msgstr "Salas de usuarios"
 
-#: ../libpurple/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "Se produjo un problema al conectarse con el servidor YCHT."
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13318,8 +13524,8 @@ msgstr "ExposiciÃ³n"
 msgid "Exposure"
 msgstr "ExposiciÃ³n"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
+#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13328,29 +13534,29 @@ msgstr ""
 "No se pudo crear el socket:\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
+#: ../libpurple/proxy.c:662
 #, 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:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
+#: ../libpurple/proxy.c:798
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Error de conexiÃ³n en el proxy HTTP %d"
 
-#: ../libpurple/proxy.c:788
+#: ../libpurple/proxy.c:794
 #, 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:1012
+#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr "Error al resolver %s"
 
-#: ../libpurple/proxy.c:1714
+#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr "No se pudo resolver el nombre de equipo"
 
@@ -13389,16 +13595,16 @@ msgstr "%s ahora se llama %s.\n"
 msgstr "%s ahora se llama %s.\n"
 
 #: ../libpurple/server.c:302
-#, fuzzy, c-format
+#, c-format
 msgid "Requesting %s's attention..."
-msgstr "Solicitando mÃ©todo de autenticaciÃ³n"
+msgstr "Solicitando la atenciÃ³n de %s..."
 
 #: ../libpurple/server.c:347
-#, fuzzy, c-format
+#, c-format
 msgid "%s has requested your attention!"
-msgstr "%s solicitÃ³ su informaciÃ³n de usuario"
+msgstr "Â¡%s ha solicitado su atenciÃ³n!"
 
-#: ../libpurple/server.c:796
+#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13407,19 +13613,18 @@ msgstr ""
 "%s ha invitado a %s a la sala de chat %s:\n"
 "%s"
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:798
 #, 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:805
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "Â¿Aceptar la invitaciÃ³n de chat?"
 
 #: ../libpurple/sslconn.c:164
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "FallÃ³ la conexiÃ³n"
+msgstr "FallÃ³ la conexiÃ³n SSL"
 
 #: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
@@ -13430,15 +13635,15 @@ msgstr "El servidor SSL presentÃ³ un cer
 msgstr "El servidor SSL presentÃ³ un certificado invÃ¡lido"
 
 #: ../libpurple/sslconn.c:171
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "Error desconocido"
+msgstr "Error SSL desconocido"
 
 #: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Desactivado"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "No molestar"
 
@@ -13451,52 +13656,71 @@ msgstr "MÃ³vil"
 msgid "Mobile"
 msgstr "MÃ³vil"
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:161
+msgid "Listening to music"
+msgstr "Escuchando mÃºsica"
+
+#: ../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:619
+#: ../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:624
+#: ../libpurple/status.c:626
 #, 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:1234
+#: ../libpurple/status.c:634
 #, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) ya no estÃ¡ %s"
+
+#: ../libpurple/status.c:1247
+#, c-format
 msgid "%s became idle"
 msgstr "%s ahora estÃ¡ inactivo"
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1264
 #, c-format
 msgid "%s became unidle"
 msgstr "%s ahora estÃ¡ activo"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1327
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s ahora estÃ¡ inactivo"
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s ahora estÃ¡ activo"
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:721
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2798
 #, c-format
 msgid "Error Reading %s"
 msgstr "Error al leer %s"
 
-#: ../libpurple/util.c:2723
+#: ../libpurple/util.c:2799
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13505,67 +13729,67 @@ msgstr ""
 "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:3223
+#: ../libpurple/util.c:3298
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3301
 msgid "Unknown."
 msgstr "Desconocido."
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3327
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3339
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dÃa"
 msgstr[1] "%d dÃas"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3347
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3353
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3361
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3367
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3627
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "No se pudo abrir %s: se produjeron demasiadas redirecciones"
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3664 ../libpurple/util.c:3960
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "No se pudo conectar a %s"
 
-#: ../libpurple/util.c:3712
+#: ../libpurple/util.c:3787
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13574,17 +13798,17 @@ msgstr ""
 "No se pudo obtener suficiente memoria para mantener los contenidos de %s. Es "
 "posible que el servidor web estÃ© intentando algo con malas intenciones."
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3822
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Error al leer de %s: %s"
 
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3853
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Error al escribir a %s: %s"
 
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3878
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "No se pudo conectar a %s: %s"
@@ -13601,80 +13825,80 @@ msgstr "Cliente de mensajerÃa instantÃ¡
 msgid "Send instant messages over multiple protocols"
 msgstr "Cliente de mensajerÃa instantÃ¡nea multiprotocolo"
 
-#: ../pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "OrientaciÃ³n"
 
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "La orientaciÃ³n en el Ã¡rea de notificaciÃ³n."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
+#: ../pidgin/gtkaccount.c:410
 msgid "Login Options"
 msgstr "Opciones de conexiÃ³n"
 
-#: ../pidgin/gtkaccount.c:428
+#: ../pidgin/gtkaccount.c:431
 msgid "Pro_tocol:"
 msgstr "Pro_tocolo:"
 
-#: ../pidgin/gtkaccount.c:439
+#: ../pidgin/gtkaccount.c:442
 msgid "Screen _name:"
 msgstr "_Nombre de usuario:"
 
-#: ../pidgin/gtkaccount.c:529
+#: ../pidgin/gtkaccount.c:532
 msgid "_Local alias:"
 msgstr "Apodo _local:"
 
-#: ../pidgin/gtkaccount.c:533
+#: ../pidgin/gtkaccount.c:536
 msgid "Remember pass_word"
 msgstr "Recordar _contraseÃ±a"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
+#: ../pidgin/gtkaccount.c:594
 msgid "User Options"
 msgstr "Opciones de usuario"
 
-#: ../pidgin/gtkaccount.c:604
+#: ../pidgin/gtkaccount.c:607
 msgid "New _mail notifications"
 msgstr "Notificaciones de _correo nuevo"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:609
+#: ../pidgin/gtkaccount.c:612
 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:731
+#: ../pidgin/gtkaccount.c:734
 #, c-format
 msgid "%s Options"
 msgstr "Opciones de %s"
 
-#: ../pidgin/gtkaccount.c:936
+#: ../pidgin/gtkaccount.c:939
 msgid "Use GNOME Proxy Settings"
 msgstr "Usar configuraciÃ³n del proxy de GNOME"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:940
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuraciÃ³n global del proxy"
 
-#: ../pidgin/gtkaccount.c:943
+#: ../pidgin/gtkaccount.c:946
 msgid "No Proxy"
 msgstr "Sin proxy"
 
-#: ../pidgin/gtkaccount.c:949
+#: ../pidgin/gtkaccount.c:952
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
+#: ../pidgin/gtkaccount.c:958
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
+#: ../pidgin/gtkaccount.c:964
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:970 ../pidgin/gtkprefs.c:1283
 msgid "Use Environmental Settings"
 msgstr "Usar configuraciÃ³n del entorno"
 
@@ -13683,73 +13907,73 @@ msgstr "Usar configuraciÃ³n del entorno"
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1009
 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:1009
+#: ../pidgin/gtkaccount.c:1012
 msgid "you can see the butterflies mating"
 msgstr "puedes ver a las mariposas apareÃ¡ndose"
 
-#: ../pidgin/gtkaccount.c:1030
+#: ../pidgin/gtkaccount.c:1033
 msgid "Proxy Options"
 msgstr "Opciones del proxy"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1047 ../pidgin/gtkprefs.c:1277
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1056 ../pidgin/gtkprefs.c:1298
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1060 ../pidgin/gtkprefs.c:1316
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../pidgin/gtkaccount.c:1065
+#: ../pidgin/gtkaccount.c:1068
 msgid "_Username:"
 msgstr "Nombre de _usuario:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1075 ../pidgin/gtkprefs.c:1353
 msgid "Pa_ssword:"
 msgstr "_ContraseÃ±a:"
 
-#: ../pidgin/gtkaccount.c:1195
-#, fuzzy
+#: ../pidgin/gtkaccount.c:1199
 msgid "Unable to save new account"
-msgstr "No se pudo crear una nueva conexiÃ³n."
+msgstr "No se pudo guardar la nueva cuenta"
 
-#: ../pidgin/gtkaccount.c:1196
+#: ../pidgin/gtkaccount.c:1200
 msgid "An account already exists with the specified criteria."
 msgstr "Ya existe una cuenta con los criterios especificados."
 
-#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkaccount.c:1478
 msgid "Add Account"
 msgstr "AÃ±adir cuenta"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1497
 msgid "_Basic"
 msgstr "_BÃ¡sica"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1504
 msgid "Create this new account on the server"
 msgstr "Crear esta nueva cuenta en el servidor"
 
-#: ../pidgin/gtkaccount.c:1515
+#: ../pidgin/gtkaccount.c:1520
 msgid "_Advanced"
 msgstr "_Avanzadas"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:586
+#: ../pidgin/plugins/convcolors.c:322
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:2006
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2207
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13769,249 +13993,274 @@ msgstr ""
 "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:767
-msgid "Join a Chat"
-msgstr "Unirse a un chat"
+#: ../pidgin/gtkblist.c:543
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "Tiene %d contacto llamado %s. Â¿DesearÃa fusionarlo?"
+msgstr[1] "Tiene %d contactos llamados %s. Â¿DesearÃa fusionarlos?"
 
-#: ../pidgin/gtkblist.c:788
+#: ../pidgin/gtkblist.c:544
 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
+msgid "Room _List"
+msgstr "_Lista de salas"
+
+#: ../pidgin/gtkblist.c:980
+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"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:991 ../pidgin/gtkblist.c:6657
+#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:709
 msgid "_Account:"
 msgstr "_Cuenta:"
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkblist.c:1280 ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1280
 msgid "Un_block"
 msgstr "Des_bloquear"
 
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1323
+msgid "Move to"
+msgstr "Mover a"
+
+#: ../pidgin/gtkblist.c:1363
 msgid "Get _Info"
 msgstr "Obtener _informaciÃ³n"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1366 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "Enviar archivo"
+#: ../pidgin/gtkblist.c:1372
+msgid "_Send File..."
+msgstr "_Enviar archivo..."
 
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "AÃ±adir _aviso de amigo"
+#: ../pidgin/gtkblist.c:1379
+msgid "Add Buddy _Pounce..."
+msgstr "AÃ±adir _aviso de amigo..."
 
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1384 ../pidgin/gtkblist.c:1388
+#: ../pidgin/gtkblist.c:1503 ../pidgin/gtkblist.c:1526
 msgid "View _Log"
 msgstr "Ver _registro"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1394
+msgid "Hide when offline"
+msgstr "Ocultar cuando se estÃ© desconectado"
+
+#: ../pidgin/gtkblist.c:1394
+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
 msgid "_Alias..."
 msgstr "_Apodo..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1411 ../pidgin/gtkblist.c:1419
+#: ../pidgin/gtkblist.c:1513 ../pidgin/gtkblist.c:1534
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "AÃ±adir un _amigo"
+#: ../pidgin/gtkblist.c:1469
+msgid "Add _Buddy..."
+msgstr "AÃ±adir _amigo..."
 
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "AÃ±adir un _chat"
+#: ../pidgin/gtkblist.c:1472
+msgid "Add C_hat..."
+msgstr "AÃ±adir c_hat..."
 
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1475
 msgid "_Delete Group"
 msgstr "_Eliminar grupo"
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1477
 msgid "_Rename"
 msgstr "_Renombrar"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1497 ../pidgin/gtkroomlist.c:316
+#: ../pidgin/gtkroomlist.c:773 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1499
 msgid "Auto-Join"
 msgstr "Conectarse automÃ¡ticamente"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+#: ../pidgin/gtkblist.c:1501
+msgid "Persistent"
+msgstr "Persistente"
+
+#: ../pidgin/gtkblist.c:1539 ../pidgin/gtkblist.c:1562
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1567
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1818 ../pidgin/gtkblist.c:1830
+#: ../pidgin/gtkblist.c:5285 ../pidgin/gtkblist.c:5298
 msgid "/Tools/Mute Sounds"
 msgstr "/Herramientas/Sin sonido"
 
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
+#: ../pidgin/gtkblist.c:2290 ../pidgin/gtkconv.c:4849
+#: ../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."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3108
 msgid "/_Buddies"
 msgstr "/A_migos"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3109
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Mensaje _instantÃ¡neo nuevo..."
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3110
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Unirse a un _chat..."
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3111
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Obtener _informaciÃ³n del usuario..."
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:3112
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _registro del usuario..."
 
-#: ../pidgin/gtkblist.c:2875
-#, fuzzy
-msgid "/Buddies/Show"
-msgstr "/Amigos/_Desconectar"
+#: ../pidgin/gtkblist.c:3114
+msgid "/Buddies/Sh_ow"
+msgstr "/Amigos/M_ostrar"
 
-#: ../pidgin/gtkblist.c:2876
-#, fuzzy
+#: ../pidgin/gtkblist.c:3115
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Amigos/Mostrar amigos _desconectados"
+msgstr "/Amigos/Mostrar/Amigos desc_onectados"
 
-#: ../pidgin/gtkblist.c:2877
-#, fuzzy
+#: ../pidgin/gtkblist.c:3116
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Amigos/Mostrar grupos _vacÃos"
+msgstr "/Amigos/Mostrar/Grupos _vacÃos"
 
-#: ../pidgin/gtkblist.c:2878
-#, fuzzy
+#: ../pidgin/gtkblist.c:3117
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/Amigos/Mostrar _detalles de amigo"
+msgstr "/Amigos/Mostrar/_Detalles de amigo"
 
-#: ../pidgin/gtkblist.c:2879
-#, fuzzy
+#: ../pidgin/gtkblist.c:3118
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/Amigos/Mostrar _tiempo de inactividad"
+msgstr "/Amigos/Mostrar/_Tiempo de inactividad"
 
-#: ../pidgin/gtkblist.c:2880
-#, fuzzy
+#: ../pidgin/gtkblist.c:3119
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Amigos/Mostrar grupos _vacÃos"
+msgstr "/Amigos/Mostrar/Iconos de _protocolo"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:3120
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/_Ordenar amigos"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3122
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_AÃ±adir un amigo..."
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3123
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/AÃ±adir un _chat..."
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3124
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/AÃ±adir _grupo..."
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3126
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Salir"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3129
 msgid "/_Accounts"
 msgstr "/_Cuentas"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Cuentas/AÃ±adir\\/Editar"
+#: ../pidgin/gtkblist.c:3130 ../pidgin/gtkblist.c:7359
+msgid "/Accounts/Manage"
+msgstr "/Cuentas/Gestionar"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3133
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:3134
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Herramientas/_Aviso de amigo"
 
-#: ../pidgin/gtkblist.c:2896
-#, fuzzy
+#: ../pidgin/gtkblist.c:3135
 msgid "/Tools/_Certificates"
-msgstr "/Herramientas/Pr_eferencias"
+msgstr "/Herramientas/_Certificados"
 
-#: ../pidgin/gtkblist.c:2897
+#: ../pidgin/gtkblist.c:3136
 msgid "/Tools/Plu_gins"
 msgstr "/Herramientas/Com_plementos"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:3137
 msgid "/Tools/Pr_eferences"
 msgstr "/Herramientas/Pr_eferencias"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3138
 msgid "/Tools/Pr_ivacy"
 msgstr "/Herramientas/Pri_vacidad"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3140
 msgid "/Tools/_File Transfers"
 msgstr "/Herramientas/_Transferencias de archivos"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3141
 msgid "/Tools/R_oom List"
 msgstr "/Herramientas/_Lista de salas"
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:3142
 msgid "/Tools/System _Log"
 msgstr "/Herramientas/_Registro del sistema"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:3144
 msgid "/Tools/Mute _Sounds"
 msgstr "/Herramientas/_Sin sonido"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3146
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:3147
 msgid "/Help/Online _Help"
 msgstr "/Ayuda/Ayuda en _lÃnea"
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:3148
 msgid "/Help/_Debug Window"
 msgstr "/Ayuda/Ventana de _depuraciÃ³n"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3150 ../pidgin/gtkblist.c:3152
 msgid "/Help/_About"
 msgstr "/Ayuda/_Acerca de"
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -14020,172 +14269,181 @@ msgstr ""
 "\n"
 "<b>Cuenta:</b> %s"
 
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3259
 msgid "Buddy Alias"
 msgstr "Apodo de amigo"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3288
 msgid "Logged In"
 msgstr "Conectado"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3334
 msgid "Last Seen"
 msgstr "Visto por Ãºltima vez"
 
-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3355
 msgid "Spooky"
 msgstr "Asustadizo"
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3357
 msgid "Awesome"
 msgstr "Genial"
 
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3359
 msgid "Rockin'"
 msgstr "Rock'n'roleando"
 
-#: ../pidgin/gtkblist.c:3453
+#: ../pidgin/gtkblist.c:3698
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inactivo %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3455
+#: ../pidgin/gtkblist.c:3700
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactivo %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3702
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactivo %dm"
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nuevo mensaje instantÃ¡neo..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3857 ../pidgin/gtkblist.c:3890
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un chat..."
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3858
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Obtener informaciÃ³n del usuario..."
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3859
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/AÃ±adir un amigo..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3860 ../pidgin/gtkblist.c:3893
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/AÃ±adir un chat..."
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3861
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/AÃ±adir un grupo..."
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3896
 msgid "/Tools/Privacy"
 msgstr "/Herramientas/Privacidad"
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3899
 msgid "/Tools/Room List"
 msgstr "/Herramientas/Lista de salas"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d mensaje sin leer de %s\n"
 msgstr[1] "%d mensajes sin leer de %s\n"
 
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:4194
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "AlfabÃ©ticamente"
-
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:4197
 msgid "By status"
 msgstr "Por estado"
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:4198
 msgid "By log size"
 msgstr "Por tamaÃ±o de registro"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkblist.c:4524
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se ha desconectado"
 
-#: ../pidgin/gtkblist.c:4067
+#: ../pidgin/gtkblist.c:4526
 #, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s se ha desconectado: %s</span>"
+msgid "%s disabled"
+msgstr "%s deshabilitado"
 
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4530
+msgid "Reconnect"
+msgstr "Reconectar"
+
+#: ../pidgin/gtkblist.c:4530 ../pidgin/gtkblist.c:4629
+msgid "Re-enable"
+msgstr "Reactivar"
+
+#: ../pidgin/gtkblist.c:4627
+msgid "Welcome back!"
+msgstr "Â¡Bienvenido!"
+
+#: ../pidgin/gtkblist.c:4657
+#, 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
 msgid "<b>Username:</b>"
 msgstr "<b>Nombre de usuario:</b>"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4902
 msgid "<b>Password:</b>"
 msgstr "<b>ContraseÃ±a:</b>"
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4913
 msgid "_Login"
 msgstr "_Entrada"
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:4997
 msgid "/Accounts"
 msgstr "/Cuentas"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:5011
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span size='larger' weight='bold'>Â¡Bienvenido a %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->AÃ±adir/Editar</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:4597
-#, fuzzy
+#: ../pidgin/gtkblist.c:5279
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Amigos/Mostrar amigos desconectados"
+msgstr "/Amigos/Mostrar/Amigos desconectados"
 
-#: ../pidgin/gtkblist.c:4600
-#, fuzzy
+#: ../pidgin/gtkblist.c:5282
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Amigos/Mostrar grupos vacÃos"
+msgstr "/Amigos/Mostrar/Grupos vacÃos"
 
-#: ../pidgin/gtkblist.c:4606
-#, fuzzy
+#: ../pidgin/gtkblist.c:5288
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/Amigos/Mostrar detalles de amigo"
+msgstr "/Amigos/Mostrar/Detalles de amigo"
 
-#: ../pidgin/gtkblist.c:4609
-#, fuzzy
+#: ../pidgin/gtkblist.c:5291
 msgid "/Buddies/Show/Idle Times"
-msgstr "/Amigos/Mostrar tiempos de inactividad"
+msgstr "/Amigos/Mostrar/Tiempos de inactividad"
 
-#: ../pidgin/gtkblist.c:4612
-#, fuzzy
+#: ../pidgin/gtkblist.c:5294
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Amigos/Mostrar grupos vacÃos"
+msgstr "/Amigos/Mostrar/Iconos de protocolo"
 
-#: ../pidgin/gtkblist.c:5507
+#: ../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. "
@@ -14196,20 +14454,25 @@ msgstr ""
 "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:5542
+#: ../pidgin/gtkblist.c:6285
 msgid "_Screen name:"
 msgstr "Nombre de _usuario:"
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
+#: ../pidgin/gtkblist.c:6307 ../pidgin/gtkblist.c:6678
 msgid "A_lias:"
 msgstr "_Apodo:"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:6587
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo no estÃ¡ soportado en las habitaciones de chats."
 
-#: ../pidgin/gtkblist.c:5842
+#: ../pidgin/gtkblist.c:6603
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -14217,7 +14480,7 @@ msgstr ""
 "No estÃ¡ conectado con ninguna cuenta que tenga la capacidad de acceder a "
 "chats."
 
-#: ../pidgin/gtkblist.c:5883
+#: ../pidgin/gtkblist.c:6647
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14225,81 +14488,75 @@ msgstr ""
 "Introduzca el apodo, y la informaciÃ³n que crea conveniente del chat que "
 "desearÃa aÃ±adir en la lista de amigos.\n"
 
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6706
+msgid "Auto_join when account becomes online."
+msgstr "Reconec_tarse cuando la cuenta se pone en lÃnea."
+
+#: ../pidgin/gtkblist.c:6707
+msgid "_Hide chat when the window is closed."
+msgstr "_Ocultar el chat cuando se cierra la ventana."
+
+#: ../pidgin/gtkblist.c:6733
 msgid "Please enter the name of the group to be added."
 msgstr "Introduzca el nombre del grupo a aÃ±adir."
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:7379
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Cuentas/"
 
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:7403
 msgid "_Edit Account"
 msgstr "_Editar cuenta"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#: ../pidgin/gtkblist.c:7416 ../pidgin/gtkconv.c:3097
 msgid "No actions available"
 msgstr "No hay acciones disponibles"
 
-#: ../pidgin/gtkblist.c:6654
+#: ../pidgin/gtkblist.c:7424
 msgid "_Disable"
 msgstr "_Deshabilitar"
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:7436
 msgid "Enable Account"
 msgstr "Habilitar cuenta"
 
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:7442
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Cuentas/Activar cuenta"
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:7491
 msgid "/Tools"
 msgstr "/Herramientas"
 
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:7561
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
 #. Widget creation function
 #: ../pidgin/gtkcertmgr.c:530
-#, fuzzy
 msgid "SSL Servers"
-msgstr "Servidor"
+msgstr "Servidores SSL"
 
-#: ../pidgin/gtkconn.c:180
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-msgstr ""
-"%s\n"
-"\n"
-"%s no intentarÃ¡ reconectarse a esta cuenta hasta que corrija el error y "
-"reactive la cuenta."
-
-#: ../pidgin/gtkconv.c:482
+#: ../pidgin/gtkconv.c:473
 msgid "Unknown command."
 msgstr "Orden desconocida."
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:743 ../pidgin/gtkconv.c:769
 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:774
+#: ../pidgin/gtkconv.c:763
 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:827
+#: ../pidgin/gtkconv.c:816
 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:857
+#: ../pidgin/gtkconv.c:846
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14307,188 +14564,183 @@ msgstr ""
 "Introduzca el nombre de usuario al que desea invitar, junto con un mensaje "
 "de invitaciÃ³n opcional."
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:867
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
+#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1200
+#: ../pidgin/gtksavedstatuses.c:1536
 msgid "_Message:"
 msgstr "_Mensaje:"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "No se pudo leer el archivo."
-
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:942
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversaciones con %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:980
 msgid "Save Conversation"
 msgstr "Guardar conversaciÃ³n"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1126 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Buscar"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1152 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "TÃ©rmino a _buscar:"
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1629
 msgid "Un-Ignore"
 msgstr "No ignorar"
 
-#: ../pidgin/gtkconv.c:1625
+#: ../pidgin/gtkconv.c:1632
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1652
 msgid "Get Away Message"
 msgstr "Mensaje de ausencia"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1675
 msgid "Last said"
 msgstr "Dicho la Ãºltima vez"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2624
 msgid "Unable to save icon file to disk."
 msgstr "No se pudo salvar el archivo de iconos al disco."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2675
 msgid "Save Icon"
 msgstr "Guardar icono"
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2727
 msgid "Animate"
 msgstr "Animar"
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2732
 msgid "Hide Icon"
 msgstr "Ocultar icono"
 
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2735
 msgid "Save Icon As..."
 msgstr "Guardar icono como..."
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2739
 msgid "Set Custom Icon..."
 msgstr "Configurar icono personalizado..."
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2752
 msgid "Remove Custom Icon"
 msgstr "Eliminar icono personalizado"
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2882
 msgid "Show All"
 msgstr "Mostrar todo"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2901
 msgid "/_Conversation"
 msgstr "/_ConversaciÃ³n"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/New Instant _Message..."
 msgstr "/ConversaciÃ³n/Mensaje _instantÃ¡neo nuevo..."
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2908
 msgid "/Conversation/_Find..."
 msgstr "/ConversaciÃ³n/_Buscar..."
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2910
 msgid "/Conversation/View _Log"
 msgstr "/ConversaciÃ³n/Ver _historial"
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Save As..."
 msgstr "/ConversaciÃ³n/_Guardar como..."
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2913
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/ConversaciÃ³n/Limpia_r deslizable"
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2917
 msgid "/Conversation/Se_nd File..."
 msgstr "/ConversaciÃ³n/_Enviar archivo..."
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2918
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/ConversaciÃ³n/AÃ±adir _aviso de amigo..."
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2920
 msgid "/Conversation/_Get Info"
 msgstr "/ConversaciÃ³n/_Obtener informaciÃ³n"
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2922
 msgid "/Conversation/In_vite..."
 msgstr "/ConversaciÃ³n/In_vitar..."
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2924
 msgid "/Conversation/M_ore"
 msgstr "/ConversaciÃ³n/_MÃ¡s"
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2928
 msgid "/Conversation/Al_ias..."
 msgstr "/ConversaciÃ³n/A_podo..."
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2930
 msgid "/Conversation/_Block..."
 msgstr "/ConversaciÃ³n/_Bloquear..."
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2932
 msgid "/Conversation/_Unblock..."
 msgstr "/ConversaciÃ³n/_Desbloquear..."
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2934
 msgid "/Conversation/_Add..."
 msgstr "/ConversaciÃ³n/_AÃ±adir..."
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2936
 msgid "/Conversation/_Remove..."
 msgstr "/ConversaciÃ³n/Elimina_r..."
 
-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2941
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/ConversaciÃ³n/Insertar en_lace..."
 
-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2943
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/ConversaciÃ³n/Insertar imag_en..."
 
-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2949
 msgid "/Conversation/_Close"
 msgstr "/ConversaciÃ³n/_Cerrar"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:2953
 msgid "/_Options"
 msgstr "/_Opciones"
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:2954
 msgid "/Options/Enable _Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:2955
 msgid "/Options/Enable _Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:2957
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opciones/Mostrar _barras de formato"
 
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:2958
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opciones/Mostrar _marcas de tiempo"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3085
 msgid "/Conversation/More"
 msgstr "/ConversaciÃ³n/MÃ¡s"
 
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3141
 msgid "/Options"
 msgstr "/Opciones"
 
@@ -14497,172 +14749,172 @@ msgstr "/Opciones"
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3176 ../pidgin/gtkconv.c:3208
 msgid "/Conversation"
 msgstr "/ConversaciÃ³n"
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3216
 msgid "/Conversation/View Log"
 msgstr "/ConversaciÃ³n/Ver registro"
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3222
 msgid "/Conversation/Send File..."
 msgstr "/ConversaciÃ³n/Enviar archivo..."
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3226
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/ConversaciÃ³n/AÃ±adir aviso de amigo..."
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3232
 msgid "/Conversation/Get Info"
 msgstr "/ConversaciÃ³n/Obtener informaciÃ³n"
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3236
 msgid "/Conversation/Invite..."
 msgstr "/ConversaciÃ³n/Invitar..."
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3242
 msgid "/Conversation/Alias..."
 msgstr "/ConversaciÃ³n/Apodo..."
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3246
 msgid "/Conversation/Block..."
 msgstr "/ConversaciÃ³n/Bloquear..."
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3250
 msgid "/Conversation/Unblock..."
 msgstr "/ConversaciÃ³n/Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3254
 msgid "/Conversation/Add..."
 msgstr "/ConversaciÃ³n/AÃ±adir..."
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3258
 msgid "/Conversation/Remove..."
 msgstr "/ConversaciÃ³n/Eliminar..."
 
-#: ../pidgin/gtkconv.c:3240
+#: ../pidgin/gtkconv.c:3264
 msgid "/Conversation/Insert Link..."
 msgstr "/Opciones/Insertar enlace..."
 
-#: ../pidgin/gtkconv.c:3244
+#: ../pidgin/gtkconv.c:3268
 msgid "/Conversation/Insert Image..."
 msgstr "/Opciones/Insertar imagen..."
 
-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3274
 msgid "/Options/Enable Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3277
 msgid "/Options/Enable Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3290
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opciones/Mostrar barras de formato"
 
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3293
 msgid "/Options/Show Timestamps"
 msgstr "/Opciones/Mostrar marcas de tiempo"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3370 ../pidgin/gtkconv.c:3412
 msgid "User is typing..."
 msgstr "El usuario estÃ¡ escribiendo..."
 
-#: ../pidgin/gtkconv.c:3391
+#: ../pidgin/gtkconv.c:3415
 msgid "User has typed something and stopped"
 msgstr "El usuario ha escrito algo y ha parado"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
+#: ../pidgin/gtkconv.c:3599 ../pidgin/gtkconv.c:8264
+msgid "S_end To"
 msgstr "_Enviar a"
 
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:4311
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4418
 msgid "0 people in room"
 msgstr "0 personas en la conversaciÃ³n"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5775 ../pidgin/gtkconv.c:5896
 #, 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:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6523 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Tecleando"
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6527
 msgid "Stopped Typing"
 msgstr "Deja de escribi_r"
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6530
 msgid "Nick Said"
 msgstr "Apodo dijo"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6533 ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "Mensajes sin leer"
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6539
 msgid "New Event"
 msgstr "Nuevo acontecimiento"
 
-#: ../pidgin/gtkconv.c:7572
+#: ../pidgin/gtkconv.c:7745
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: limpia todos los histÃ³ricos de las ventanas de conversaciÃ³n."
 
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7946
 msgid "Confirm close"
 msgstr "Confirmar cierre"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7978
 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:8355
+#: ../pidgin/gtkconv.c:8597
 msgid "Close other tabs"
 msgstr "Cerrar otras solapas"
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8603
 msgid "Close all tabs"
 msgstr "Cerrar todas las solapas"
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8611
 msgid "Detach this tab"
 msgstr "Despegar esta solapa"
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8617
 msgid "Close this tab"
 msgstr "Cerrar esta solapa"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:9133
 msgid "Close conversation"
 msgstr "Cerrar conversaciÃ³n"
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9736
 msgid "Last created window"
 msgstr "Ãšltima ventana creada"
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9738
 msgid "Separate IM and Chat windows"
 msgstr "Separar ventanas de MIs y chats"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9740 ../pidgin/gtkprefs.c:1510
 msgid "New window"
 msgstr "Ventana nueva"
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9742
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9744
 msgid "By account"
 msgstr "Por cuenta"
 
@@ -14737,20 +14989,20 @@ msgstr "desarrollador principal"
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:92
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
 msgid "developer"
 msgstr "desarrollador"
 
-#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:88
 msgid "support"
 msgstr "soporte"
 
-#: ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "soporte/QA"
 
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "desarrollador y webmaster"
 
@@ -14788,16 +15040,16 @@ msgstr "Afrikaans"
 msgstr "Afrikaans"
 
 # Amhario
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:228
 msgid "Arabic"
 msgstr "Ãrabe"
 
 #: ../pidgin/gtkdialogs.c:135
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "LatÃn bieloruso"
 
 #: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:229
 msgid "Bulgarian"
 msgstr "BÃºlgaro"
 
@@ -14810,8 +15062,8 @@ msgstr "Bosnio"
 msgid "Bosnian"
 msgstr "Bosnio"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231
 msgid "Catalan"
 msgstr "CatalÃ¡n"
 
@@ -14819,7 +15071,7 @@ msgstr "Valenciano-CatalÃ¡n"
 msgid "Valencian-Catalan"
 msgstr "Valenciano-CatalÃ¡n"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:232
 msgid "Czech"
 msgstr "Checo"
 
@@ -14828,7 +15080,7 @@ msgstr "DanÃ©s"
 msgstr "DanÃ©s"
 
 #: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:233
 msgid "German"
 msgstr "AlemÃ¡n"
 
@@ -14857,9 +15109,9 @@ msgstr "Esperanto"
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Spanish"
 msgstr "EspaÃ±ol"
 
@@ -14876,19 +15128,19 @@ msgstr "Persa"
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239
 msgid "Finnish"
 msgstr "FinlandÃ©s"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243
 msgid "French"
 msgstr "FrancÃ©s"
 
 #: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:244
 msgid "Galician"
 msgstr "Gallego"
 
@@ -14900,7 +15152,7 @@ msgstr "Grupo de traducciÃ³n al Gujarati
 msgid "Gujarati Language Team"
 msgstr "Grupo de traducciÃ³n al Gujarati"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:245
 msgid "Hebrew"
 msgstr "Hebreo"
 
@@ -14908,7 +15160,7 @@ msgstr "HindÃº"
 msgid "Hindi"
 msgstr "HindÃº"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:246
 msgid "Hungarian"
 msgstr "HÃºngaro"
 
@@ -14916,16 +15168,16 @@ msgstr "Indonesio"
 msgid "Indonesian"
 msgstr "Indonesio"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:247
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:250
 msgid "Japanese"
 msgstr "JaponÃ©s"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:251
 msgid "Georgian"
 msgstr "Georgiano"
 
@@ -14941,8 +15193,8 @@ msgstr "Grupo de traducciÃ³n al kannada"
 msgid "Kannada Translation team"
 msgstr "Grupo de traducciÃ³n al kannada"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:253
 msgid "Korean"
 msgstr "Coreano"
 
@@ -14952,22 +15204,21 @@ msgstr "Kurdo"
 msgstr "Kurdo"
 
 #: ../pidgin/gtkdialogs.c:185
-#, fuzzy
 msgid "Lao"
-msgstr "Leo"
+msgstr "Laosiano"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Lithuanian"
 msgstr "Lituano"
 
 #: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:256
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "BokmÃ¥l Norwegian"
 msgstr "Noruego BokmÃ¥l"
 
@@ -14983,106 +15234,114 @@ msgstr "Noruego Nynorsk"
 msgid "Norwegian Nynorsk"
 msgstr "Noruego Nynorsk"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:194
+msgid "Punjabi"
+msgstr "PunjabÃ"
+
+#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:259
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "Portuguese"
 msgstr "PortuguÃ©s"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:199
 msgid "Portuguese-Brazil"
 msgstr "PortuguÃ©s brasileÃ±o"
 
-#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:200
 msgid "Pashto"
 msgstr "Afgano"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:201
 msgid "Romanian"
 msgstr "Rumano"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:261
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:262 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:264
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:265
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:206
 msgid "Albanian"
 msgstr "AlbanÃ©s"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:266 ../pidgin/gtkdialogs.c:267
 msgid "Serbian"
 msgstr "Serbio"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:269
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:210
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:212
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:213 ../pidgin/gtkdialogs.c:270
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:214
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../pidgin/gtkdialogs.c:215
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:215
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh y el equipo Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:271
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Hong Kong Chinese"
 msgstr "Chino de Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:220 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:272
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
 # Amhario
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:227
 msgid "Amharic"
 msgstr "AmhÃ¡rico"
 
-#: ../pidgin/gtkdialogs.c:357
+#: ../pidgin/gtkdialogs.c:360
 #, c-format
 msgid "About %s"
 msgstr "Acerca de %s"
 
-#: ../pidgin/gtkdialogs.c:400
-#, fuzzy, c-format
+#: ../pidgin/gtkdialogs.c:403
+#, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
@@ -15093,60 +15352,59 @@ msgid ""
 "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 de mensajerÃa modular basado en libpurple capaz de "
-"conectarse a AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
-"GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu y QQ todos al mismo "
-"tiempo. EstÃ¡ escrito utilizando GTK+.<BR><BR>Puede modificar y redistribuir "
-"este programa bajo los tÃ©rminos de la GPL (versiÃ³n 2 o posterior). Se "
-"incluye una copia de la licencia GPL en el archivo Â«COPYINGÂ» que se "
-"distribuye con %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>"
+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:418
-#, c-format
+#: ../pidgin/gtkdialogs.c:421
 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:423
+#: ../pidgin/gtkdialogs.c:426
 msgid "Current Developers"
 msgstr "Desarrolladores actuales"
 
-#: ../pidgin/gtkdialogs.c:438
+#: ../pidgin/gtkdialogs.c:441
 msgid "Crazy Patch Writers"
 msgstr "Locos escritores de parches"
 
-#: ../pidgin/gtkdialogs.c:453
+#: ../pidgin/gtkdialogs.c:456
 msgid "Retired Developers"
 msgstr "Desarrolladores retirados"
 
-#: ../pidgin/gtkdialogs.c:468
+#: ../pidgin/gtkdialogs.c:471
 msgid "Retired Crazy Patch Writers"
 msgstr "Locos escritores de parches retirados"
 
-#: ../pidgin/gtkdialogs.c:483
+#: ../pidgin/gtkdialogs.c:486
 msgid "Artists"
 msgstr "Artistas"
 
-#: ../pidgin/gtkdialogs.c:498
+#: ../pidgin/gtkdialogs.c:501
 msgid "Current Translators"
 msgstr "Traductores actuales"
 
-#: ../pidgin/gtkdialogs.c:518
+#: ../pidgin/gtkdialogs.c:521
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-#: ../pidgin/gtkdialogs.c:536
+#: ../pidgin/gtkdialogs.c:539
 msgid "Debugging Information"
 msgstr "InformaciÃ³n de depuraciÃ³n"
 
-#: ../pidgin/gtkdialogs.c:906
+#: ../pidgin/gtkdialogs.c:761 ../pidgin/gtkdialogs.c:900
+#: ../pidgin/gtkdialogs.c:981
+msgid "_Name"
+msgstr "_Nombre"
+
+#: ../pidgin/gtkdialogs.c:766 ../pidgin/gtkdialogs.c:905
+#: ../pidgin/gtkdialogs.c:986
+msgid "_Account"
+msgstr "_Cuenta"
+
+#: ../pidgin/gtkdialogs.c:913
 msgid "Get User Info"
 msgstr "Obtener datos del usuario"
 
-#: ../pidgin/gtkdialogs.c:908
+#: ../pidgin/gtkdialogs.c:915
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -15154,11 +15412,11 @@ msgstr ""
 "Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
 "ver informaciÃ³n."
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1005
 msgid "View User Log"
 msgstr "Ver registro de usuario"
 
-#: ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:1007
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -15166,32 +15424,32 @@ msgstr ""
 "Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
 "ver informaciÃ³n de registro."
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1027
 msgid "Alias Contact"
 msgstr "Apodo para contacto"
 
-#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1028
 msgid "Enter an alias for this contact."
 msgstr "Introduzca un apodo para este contacto."
 
-#: ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1050
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduzca un alias para %s."
 
-#: ../pidgin/gtkdialogs.c:1045
+#: ../pidgin/gtkdialogs.c:1052
 msgid "Alias Buddy"
 msgstr "Apodo de amigo"
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1073
 msgid "Alias Chat"
 msgstr "Apodo en el chat"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1074
 msgid "Enter an alias for this chat."
 msgstr "Introduzca un apodo para este chat."
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1113
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15206,15 +15464,15 @@ msgstr[1] ""
 "EstÃ¡ a punto de borrar los contactos que contiene a %s y a otros %d amigos "
 "de su lista de amigos. Â¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1121
 msgid "Remove Contact"
 msgstr "Eliminar contacto"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1124
 msgid "_Remove Contact"
 msgstr "_Eliminar contacto"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1155
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15223,15 +15481,15 @@ msgstr ""
 "EstÃ¡ a punto de fusionar el grupo llamado %s con el grupo llamado %s. Â¿Desea "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1155
+#: ../pidgin/gtkdialogs.c:1162
 msgid "Merge Groups"
 msgstr "Fusionar grupos"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1165
 msgid "_Merge Groups"
 msgstr "_Fusionar grupos"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1215
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15240,29 +15498,29 @@ msgstr ""
 "EstÃ¡ a punto de borrar el grupo %s junto con todos sus miembros de la lista "
 "de amigos. Â¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1218
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1221
 msgid "_Remove Group"
 msgstr "_Eliminar grupo"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1254
 #, 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:1250
+#: ../pidgin/gtkdialogs.c:1257
 msgid "Remove Buddy"
 msgstr "Eliminar amigo"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1260
 msgid "_Remove Buddy"
 msgstr "_Eliminar amigo"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1281
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15270,40 +15528,39 @@ msgstr ""
 msgstr ""
 "EstÃ¡ a punto de eliminar el chat %s de su lista de amigos. Â¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1277
+#: ../pidgin/gtkdialogs.c:1284
 msgid "Remove Chat"
 msgstr "Eliminar chat"
 
-#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkdialogs.c:1287
 msgid "_Remove Chat"
 msgstr "_Eliminar chat"
 
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Pulse el botÃ³n derecho para ver mÃ¡s mensajes sin leer...\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "Cambiar estado:"
 
-#: ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
 msgstr "Mostrar la lista de amigos"
 
-#: ../pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
 msgstr "Mensaje nuevo..."
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:721
 msgid "Mute Sounds"
 msgstr "Sin sonido"
 
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
+#: ../pidgin/gtkdocklet.c:728
+msgid "Blink on New Message"
 msgstr "Parpadear con nuevo mensaje"
 
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:738
 msgid "Quit"
 msgstr "Salir"
 
@@ -15394,43 +15651,58 @@ msgstr "_Continuar"
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../pidgin/gtkimhtml.c:816
+#: ../pidgin/gtkimhtml.c:817
 msgid "Paste as Plain _Text"
 msgstr "Pe_gar como texto en claro"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:834 ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "_Reset formatting"
 msgstr "_Limpiar formato"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../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
 msgid "Hyperlink color"
 msgstr "Color de hiperenlace"
 
-#: ../pidgin/gtkimhtml.c:1374
+#: ../pidgin/gtkimhtml.c:1416
 msgid "Color to draw hyperlinks."
 msgstr "Color para dibujar hiperenlaces."
 
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1419
 msgid "Hyperlink prelight color"
 msgstr "Color de hiperenlace pre-iluminado"
 
-#: ../pidgin/gtkimhtml.c:1378
+#: ../pidgin/gtkimhtml.c:1420
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Color para dibujar hiperenlaces cuando el ratÃ³n estÃ© encima."
 
-#: ../pidgin/gtkimhtml.c:1598
+#: ../pidgin/gtkimhtml.c:1637
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar direcciÃ³n de correo electrÃ³nico"
 
-#: ../pidgin/gtkimhtml.c:1610
+#: ../pidgin/gtkimhtml.c:1649
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"
 
-#: ../pidgin/gtkimhtml.c:1620
+#: ../pidgin/gtkimhtml.c:1659
 msgid "_Copy Link Location"
 msgstr "_Copiar destino del enlace"
 
-#: ../pidgin/gtkimhtml.c:3369
+#: ../pidgin/gtkimhtml.c:3414
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15440,7 +15712,7 @@ msgstr ""
 "\n"
 "Tomando PNG por omisiÃ³n."
 
-#: ../pidgin/gtkimhtml.c:3372
+#: ../pidgin/gtkimhtml.c:3417
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15450,7 +15722,7 @@ msgstr ""
 "\n"
 "Tomando PNG por omisiÃ³n."
 
-#: ../pidgin/gtkimhtml.c:3401
+#: ../pidgin/gtkimhtml.c:3446
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15462,7 +15734,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
+#: ../pidgin/gtkimhtml.c:3449
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15473,12 +15745,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3527 ../pidgin/gtkimhtml.c:3539
 msgid "Save Image"
 msgstr "Guardar imagen"
 
-#: ../pidgin/gtkimhtml.c:3522
-#, c-format
+#: ../pidgin/gtkimhtml.c:3567
 msgid "_Save Image..."
 msgstr "_Guardar imagen..."
 
@@ -15514,14 +15785,10 @@ msgstr "Introduzca el URL del enlace que
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduzca el URL del enlace que quiere insertar."
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert Link"
 msgstr "Insertar enlace"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
-msgid "_Insert"
-msgstr "_Insertar"
-
 #: ../pidgin/gtkimhtmltoolbar.c:514
 #, c-format
 msgid "Failed to store image: %s\n"
@@ -15540,125 +15807,115 @@ msgstr "Â¡SonrÃa!"
 msgid "Smile!"
 msgstr "Â¡SonrÃa!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
-msgid "_Font"
-msgstr "_TipografÃa"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Group Items"
-msgstr "ID de grupo:"
+msgstr "Elementos de grupo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Ungroup Items"
 msgstr "Desagrupar items"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:337
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:346
 msgid "Italic"
 msgstr "Cursiva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:355
 msgid "Underline"
 msgstr "Subrayado"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Strikethrough"
-msgstr "_Tachado"
+msgstr "Tachado"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Increase Font Size"
 msgstr "Incrementa tamaÃ±o de tipografÃa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
+#: ../pidgin/gtkimhtmltoolbar.c:1096
 msgid "Decrease Font Size"
 msgstr "Reducir tamaÃ±o de tipografÃa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1096
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Font Face"
 msgstr "Estilo de tipografÃa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
+#: ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Background Color"
 msgstr "Color del fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
+#: ../pidgin/gtkimhtmltoolbar.c:1100
 msgid "Foreground Color"
 msgstr "Color del primer plano"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Reset Formatting"
 msgstr "Limpiar formato"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1103
+#: ../pidgin/gtkimhtmltoolbar.c:1105
 msgid "Insert IM Image"
 msgstr "Insertar imagen MI"
 
 # No estoy muy seguro de usar emoticono, quizÃ¡s Â«smileyÂ» serÃa mÃ¡s apropiado
-#: ../pidgin/gtkimhtmltoolbar.c:1104
+#: ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Smiley"
 msgstr "Insertar emoticono"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<b>_Bold</b>"
 msgstr "<b> Negrita</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<i>_Italic</i>"
 msgstr "<i>_Cursiva</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<u>_Underline</u>"
 msgstr "<u>S_ubrayado</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Tachado</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size=\"larger\">MÃ¡s _grande</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>MÃ¡s _pequeÃ±o</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Font face"
 msgstr "_Estilo de tipografÃa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "Foreground _color"
 msgstr "_Color del primer plano"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "Bac_kground color"
 msgstr "Color del _fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-msgid "_Smiley"
-msgstr "_Emoticono"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
+#: ../pidgin/gtkimhtmltoolbar.c:1273
 msgid "_Image"
 msgstr "_Imagen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1282
+#: ../pidgin/gtkimhtmltoolbar.c:1279
 msgid "_Link"
 msgstr "_Enlace"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+#: ../pidgin/gtkimhtmltoolbar.c:1285
 msgid "_Horizontal rule"
 msgstr "Regla _horizontal"
 
@@ -15739,27 +15996,27 @@ msgstr "TamaÃ±o total del registro:"
 msgid "Total log size:"
 msgstr "TamaÃ±o total del registro:"
 
-#: ../pidgin/gtklog.c:709
+#: ../pidgin/gtklog.c:710
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversaciones en %s"
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+#: ../pidgin/gtklog.c:718 ../pidgin/gtklog.c:785
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversaciones con %s"
 
-#: ../pidgin/gtklog.c:804
+#: ../pidgin/gtklog.c:810
 msgid "System Log"
 msgstr "Registro del Sistema"
 
-#: ../pidgin/gtkmain.c:386
+#: ../pidgin/gtkmain.c:398
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Intente `%s -h' para mÃ¡s informaciÃ³n.\n"
 
-#: ../pidgin/gtkmain.c:388
-#, fuzzy, c-format
+#: ../pidgin/gtkmain.c:400
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -15771,27 +16028,26 @@ msgid ""
 "  -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"
+"  --display=DISPLAY   X display to use\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"
+"  -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 opciÃ³n "
-"NOMBRE\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"
 "  -v, --version        mostrar la versiÃ³n actual y salir\n"
 
-#: ../pidgin/gtkmain.c:512
-#, fuzzy, c-format
+#: ../pidgin/gtkmain.c:528
+#, c-format
 msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+"%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
@@ -15809,7 +16065,7 @@ msgstr ""
 "on other protocols is at\n"
 "%swiki/DeveloperPages\n"
 msgstr ""
-"%s ha tenido un fallo y ha intentado generar un fichero Â«coreÂ»\n"
+"%s %s ha tenido un fallo y ha intentado generar un fichero Â«coreÂ»\n"
 "Esto es una errata en el programa y no se ha producido por\n"
 "algo que haya hecho.\n"
 "\n"
@@ -15829,48 +16085,48 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:718 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:349
+#: ../pidgin/gtknotify.c:350
 msgid "Open All Messages"
 msgstr "Abrir todos los mensajes"
 
-#: ../pidgin/gtknotify.c:402
+#: ../pidgin/gtknotify.c:403
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Â¡Tiene correo!</span>"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:546
 #, 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:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+#: ../pidgin/gtknotify.c:570
+#, 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:989
+#: ../pidgin/gtknotify.c:998
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "La orden de navegador Â«%sÂ» no es vÃ¡lida."
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:1000 ../pidgin/gtknotify.c:1012
+#: ../pidgin/gtknotify.c:1025 ../pidgin/gtknotify.c:1153
 msgid "Unable to open URL"
 msgstr "No se pudo abrir la URL"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1023
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Error al lanzar Â«%sÂ»: %s"
 
-#: ../pidgin/gtknotify.c:1145
+#: ../pidgin/gtknotify.c:1154
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -15889,7 +16145,17 @@ msgstr "Desactivar complementos"
 msgid "Unload Plugins"
 msgstr "Desactivar complementos"
 
-#: ../pidgin/gtkplugin.c:400
+#: ../pidgin/gtkplugin.c:308
+msgid "Could not unload plugin"
+msgstr "No se pudo descargar el complemente"
+
+#: ../pidgin/gtkplugin.c:309
+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
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -15900,7 +16166,7 @@ msgstr ""
 "<span weight=\"bold\">Sitio Web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nombre del archivo:</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:410
+#: ../pidgin/gtkplugin.c:427
 #, c-format
 msgid ""
 "%s\n"
@@ -15911,11 +16177,11 @@ msgstr ""
 "<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\\n\n"
 "Compruebe el sitio web del complemento para obtener una actualizaciÃ³n.</span>"
 
-#: ../pidgin/gtkplugin.c:536
+#: ../pidgin/gtkplugin.c:553
 msgid "Configure Pl_ugin"
 msgstr "Configurar _complemento"
 
-#: ../pidgin/gtkplugin.c:599
+#: ../pidgin/gtkplugin.c:616
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalles del complemento</b>"
 
@@ -15924,97 +16190,97 @@ msgstr "Seleccione un archivo"
 msgstr "Seleccione un archivo"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "A quiÃ©n avisar"
 
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "Nombre del _amigo:"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "Se _conecta"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "Se _desconecta"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "Se _ausenta"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "_Deja de estar ausente"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "EstÃ¡ _inactivo"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "Ya no estÃ¡ i_nactivo."
 
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "Empieza a _escribir"
 
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "Se _pausa mientras escribe"
 
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "Deja de escribi_r"
 
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "EnvÃa un _mensaje"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "_Abrir una ventana de MI"
 
-#: ../pidgin/gtkpounce.c:656
+#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "_NotificaciÃ³n con una ventana emergente"
 
-#: ../pidgin/gtkpounce.c:658
+#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "Enviar un _mensaje"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "E_jecutar una orden"
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "Re_producir un sonido"
 
 # Examinar puede ser tambiÃ©n vÃ¡lido, comprobar, jfs.
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "_Navegar..."
 
 # Examinar puede ser tambiÃ©n vÃ¡lido, comprobar, jfs.
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "_Navegar..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "Pre_visualizar"
 
-#: ../pidgin/gtkpounce.c:798
+#: ../pidgin/gtkpounce.c:810
 msgid "P_ounce only when my status is not Available"
 msgstr "SÃ³lo _avisar cuando mi estado no sea Disponible"
 
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:815
 msgid "_Recurring"
 msgstr "_Recurrente"
 
-#: ../pidgin/gtkpounce.c:1246
+#: ../pidgin/gtkpounce.c:1258
 msgid "Pounce Target"
 msgstr "Objetivo a avisar"
 
@@ -16051,7 +16317,7 @@ msgstr "_Mostrar icono del Ã¡rea de noti
 msgid "_Show system tray icon:"
 msgstr "_Mostrar icono del Ã¡rea de notificaciÃ³n del sistema:"
 
-#: ../pidgin/gtkprefs.c:899
+#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Si hay mensajes sin leer"
 
@@ -16063,7 +16329,7 @@ msgstr "_Ocultar nuevas conversaciones M
 msgid "_Hide new IM conversations:"
 msgstr "_Ocultar nuevas conversaciones MI:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:2045
 msgid "When away"
 msgstr "Cuando estoy fuera"
 
@@ -16112,59 +16378,59 @@ msgstr "_Nuevas conversaciones:"
 msgid "N_ew conversations:"
 msgstr "_Nuevas conversaciones:"
 
-#: ../pidgin/gtkprefs.c:995
+#: ../pidgin/gtkprefs.c:996
 msgid "Show _formatting on incoming messages"
 msgstr "Mostrar el _formato de los mensajes entrantes"
 
-#: ../pidgin/gtkprefs.c:998
+#: ../pidgin/gtkprefs.c:999
 msgid "Show _detailed information"
 msgstr "Mostrar informaciÃ³n _detallada"
 
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:1001
 msgid "Enable buddy ic_on animation"
 msgstr "Habilitar animaciones en los i_conos de amigos"
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1008
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar a los amigos cuando les estÃ© escribiendo"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1011
 msgid "Highlight _misspelled words"
 msgstr "_Resaltar las faltas de ortografÃa"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:1015
 msgid "Use smooth-scrolling"
 msgstr "Utilizar paginado suave"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1018
 msgid "F_lash window when IMs are received"
 msgstr "_Destello de ventana cuando se reciben MIs"
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1020
 msgid "Minimi_ze new conversation windows"
 msgstr "Minimi_zar las nuevas ventana de conversaciÃ³n"
 
-#: ../pidgin/gtkprefs.c:1023
+#: ../pidgin/gtkprefs.c:1024
 msgid "Font"
 msgstr "TipografÃa"
 
-#: ../pidgin/gtkprefs.c:1025
+#: ../pidgin/gtkprefs.c:1026
 msgid "Use document font from _theme"
 msgstr "Utilizar la tipografÃa de documento del _tema"
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:1028
 msgid "Use font from _theme"
 msgstr "Utilizar la tipografÃa del _tema"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1030
 msgid "Conversation _font:"
 msgstr "TipografÃa para las conversaciones:"
 
-#: ../pidgin/gtkprefs.c:1043
+#: ../pidgin/gtkprefs.c:1044
 msgid "Default Formatting"
 msgstr "Formato por omisiÃ³n"
 
-#: ../pidgin/gtkprefs.c:1062
+#: ../pidgin/gtkprefs.c:1063
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16172,119 +16438,159 @@ msgstr ""
 "AsÃ se verÃ¡ el texto de los mensajes que envÃe cuando utilice protocolos que "
 "soportan el formateo."
 
-#: ../pidgin/gtkprefs.c:1128
+#: ../pidgin/gtkprefs.c:1123
+msgid "Cannot start proxy configuration program."
+msgstr "No se pudo iniciar el programa de configuraciÃ³n de proxy."
+
+#: ../pidgin/gtkprefs.c:1135
+msgid "Cannot start browser configuration program."
+msgstr "No se pudo iniciar el programa de configuraciÃ³n del navegador."
+
+#: ../pidgin/gtkprefs.c:1155
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1167
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ejemplo: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1171
 msgid "_Autodetect IP address"
 msgstr "_Auto detectar la direcciÃ³n IP"
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1180
 msgid "Public _IP:"
 msgstr "_IP pÃºblica:"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1211
 msgid "Ports"
 msgstr "Puertos"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1214
+msgid "_Enable automatic router port forwarding"
+msgstr "_Activar reenvÃo de puertos automÃ¡tico"
+
+#: ../pidgin/gtkprefs.c:1217
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente el rango de puertos en el que se escucharÃ¡"
 
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1220
 msgid "_Start port:"
 msgstr "Puerto _inicial:"
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1227
 msgid "_End port:"
 msgstr "Puerto _final:"
 
-#: ../pidgin/gtkprefs.c:1203
+#: ../pidgin/gtkprefs.c:1235
+msgid "Proxy Server &amp; Browser"
+msgstr "Servidor proxy y navegador"
+
+#: ../pidgin/gtkprefs.c:1243
+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
+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
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr ""
+"Puede configurar las preferencias del proxy y del navegador\n"
+"en las preferencias de GNOME."
+
+#: ../pidgin/gtkprefs.c:1263
+msgid "Configure _Proxy"
+msgstr "Configurar _proxy"
+
+#: ../pidgin/gtkprefs.c:1268
+msgid "Configure _Browser"
+msgstr "Configurar _navegador"
+
+#: ../pidgin/gtkprefs.c:1274
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkprefs.c:1279
 msgid "No proxy"
 msgstr "Sin proxy"
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1335
 msgid "_User:"
 msgstr "_Usuario:"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1423
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1424
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1425
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1426
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1427
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1428
 msgid "GNOME Default"
 msgstr "Valores por omisiÃ³n de Gnome"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1429
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1430
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1431
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1432
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1441
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1494
 msgid "Browser Selection"
 msgstr "SelecciÃ³n de navegador"
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1498
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1506
 msgid "_Open link in:"
 msgstr "_Abrir enlace en:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1508
 msgid "Browser default"
 msgstr "Navegador por omisiÃ³n"
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1509
 msgid "Existing window"
 msgstr "Ventana existente"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1511
 msgid "New tab"
 msgstr "Nueva solapa"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1525
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16293,69 +16599,63 @@ msgstr ""
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1566
 msgid "Log _format:"
 msgstr "Formato de _registro:"
 
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1571
 msgid "Log all _instant messages"
 msgstr "Registrar todos los mensajes _instantÃ¡neos"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1573
 msgid "Log all c_hats"
 msgstr "Registrar todas las _charlas"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1575
 msgid "Log all _status changes to system log"
 msgstr "Registrar todos los cambios de _estado en el registro del sistema"
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1725
 msgid "Sound Selection"
 msgstr "SelecciÃ³n de sonido"
 
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
+#: ../pidgin/gtkprefs.c:1735
 msgid "Quietest"
 msgstr "El mÃ¡s silencioso"
 
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
+#: ../pidgin/gtkprefs.c:1737
 msgid "Quieter"
 msgstr "MÃ¡s silencioso"
 
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
+#: ../pidgin/gtkprefs.c:1739
 msgid "Quiet"
 msgstr "Silencio"
 
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
+#: ../pidgin/gtkprefs.c:1743
 msgid "Loud"
 msgstr "Ruidoso"
 
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
+#: ../pidgin/gtkprefs.c:1745
 msgid "Louder"
 msgstr "MÃ¡s ruidoso"
 
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
+#: ../pidgin/gtkprefs.c:1747
 msgid "Loudest"
 msgstr "El mÃ¡s ruidoso"
 
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1813
 msgid "_Method:"
 msgstr "_MÃ©todo:"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1815
 msgid "Console beep"
 msgstr "Timbre de la consola"
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1822
 msgid "No sounds"
 msgstr "Sin sonido"
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1830
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16364,81 +16664,81 @@ msgstr ""
 "_Comando para sonido:\n"
 "(%s para nombre de archivo)"
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1857
 msgid "Sounds when conversation has _focus"
 msgstr "Suena cuando la conversaciÃ³n obtiene el _foco"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1859
 msgid "Enable sounds:"
 msgstr "Habilitar sonidos:"
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1870
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1950
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:2028
 msgid "_Report idle time:"
 msgstr "Mostrar el _tiempo de inactividad"
 
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:2033
 msgid "Based on keyboard or mouse use"
 msgstr "Basado en teclado o en uso de ratÃ³n"
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:2042
 msgid "_Auto-reply:"
 msgstr "Respuesta _automÃ¡tica:"
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:2046
 msgid "When both away and idle"
 msgstr "Cuando estÃ¡ ausente e inactivo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:2052
 msgid "Auto-away"
 msgstr "Auto-ausencia"
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:2054
 msgid "Change status when _idle"
 msgstr "Cambiar el estado cuando estÃ© _inactivo"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:2058
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de pasar a inactivo:"
 
-#: ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:2066
 msgid "Change _status to:"
 msgstr "Cambiar _estado a:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:2087
 msgid "Status at Startup"
 msgstr "Estado al arrancar"
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:2089
 msgid "Use status from last _exit at startup"
 msgstr "Utilizar el estado de mi Ãºltima _salida al empezar"
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:2095
 msgid "Status to a_pply at startup:"
 msgstr "Estado a _aplicar al empezar:"
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2134
 msgid "Interface"
 msgstr "Interfaz"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2136
 msgid "Smiley Themes"
 msgstr "Temas de emoticonos"
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2143
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2147
 msgid "Status / Idle"
 msgstr "Estado / Inactivo"
 
@@ -16525,42 +16825,42 @@ msgstr "Â¿EstÃ¡ seguro de que quiere blo
 msgid "Are you sure you want to block %s?"
 msgstr "Â¿EstÃ¡ seguro de que quiere bloquear a %s?"
 
-#: ../pidgin/gtkrequest.c:272
+#: ../pidgin/gtkrequest.c:273
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../pidgin/gtkrequest.c:1507
+#: ../pidgin/gtkrequest.c:1508
 msgid "That file already exists"
 msgstr "Ese archivo ya existe"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1509
 msgid "Would you like to overwrite it?"
 msgstr "Â¿Quiere sobreescribirlo?"
 
-#: ../pidgin/gtkrequest.c:1511
+#: ../pidgin/gtkrequest.c:1512
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: ../pidgin/gtkrequest.c:1512
+#: ../pidgin/gtkrequest.c:1513
 msgid "Choose New Name"
 msgstr "Elegir un nuevo nombre"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+#: ../pidgin/gtkrequest.c:1651 ../pidgin/gtkrequest.c:1665
 msgid "Select Folder..."
 msgstr "Seleccionar carpeta..."
 
 #. Create the window.
-#: ../pidgin/gtkroomlist.c:375
+#: ../pidgin/gtkroomlist.c:518 ../pidgin/gtkroomlist.c:688
 msgid "Room List"
 msgstr "Lista de salas"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:443
+#: ../pidgin/gtkroomlist.c:756
 msgid "_Get List"
 msgstr "_Obtener la lista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:451
+#: ../pidgin/gtkroomlist.c:764
 msgid "_Add Chat"
 msgstr "_AÃ±adir chat"
 
@@ -16569,7 +16869,7 @@ msgstr "Â¿EstÃ¡ seguro que desea borrar 
 msgstr "Â¿EstÃ¡ seguro que desea borrar los estados guardados y seleccionados?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
+#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1273
 msgid "_Use"
 msgstr "_Usar"
 
@@ -16577,29 +16877,29 @@ msgstr "Ya se estÃ¡ utilizando ese tÃtu
 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:970
+#: ../pidgin/gtksavedstatuses.c:976
 msgid "Different"
 msgstr "Diferente"
 
-#: ../pidgin/gtksavedstatuses.c:1159
+#: ../pidgin/gtksavedstatuses.c:1165
 msgid "_Title:"
 msgstr "_TÃtulo:"
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
+#: ../pidgin/gtksavedstatuses.c:1184 ../pidgin/gtksavedstatuses.c:1505
 msgid "_Status:"
 msgstr "E_stado:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
+#: ../pidgin/gtksavedstatuses.c:1217
 msgid "Use a _different status for some accounts"
 msgstr "Usar un estado _diferente para algunas cuentas"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
+#: ../pidgin/gtksavedstatuses.c:1281
 msgid "Sa_ve & Use"
 msgstr "Gua_rdar y usar"
 
-#: ../pidgin/gtksavedstatuses.c:1480
+#: ../pidgin/gtksavedstatuses.c:1488
 #, c-format
 msgid "Status for %s"
 msgstr "Estado de %s"
@@ -16608,25 +16908,33 @@ msgstr "Esperando la conexiÃ³n a la red"
 msgid "Waiting for network connection"
 msgstr "Esperando la conexiÃ³n a la red"
 
-#: ../pidgin/gtkutils.c:632
+#: ../pidgin/gtkstatusbox.c:1072
+msgid "New status..."
+msgstr "Nuevo estado..."
+
+#: ../pidgin/gtkstatusbox.c:1073
+msgid "Saved statuses..."
+msgstr "Estados guardados..."
+
+#: ../pidgin/gtkutils.c:634
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1424
 #, 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:1402 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1404 ../pidgin/gtkutils.c:1426
 msgid "Failed to load image"
 msgstr "No se pudo cargar la imagen"
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1500
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "No se puede enviar la carpeta %s."
 
-#: ../pidgin/gtkutils.c:1499
+#: ../pidgin/gtkutils.c:1501
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -16635,12 +16943,12 @@ msgstr ""
 "%s no puede transferir una carpeta. TendrÃ¡ que enviar los archivos que "
 "contiene individualmente."
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1535 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1554
 msgid "You have dragged an image"
 msgstr "Ha arrastrado una imagen"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1536
 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."
@@ -16648,23 +16956,23 @@ msgstr ""
 "Puede enviar esta imagen como una transferencia de archivo, introducirla en "
 "el mensaje, o usarla como icono de amigo para este usuario."
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
 msgid "Set as buddy icon"
 msgstr "Establecer como icono de amigo"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1563
 msgid "Send image file"
 msgstr "Enviar archivo de imagen"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1544 ../pidgin/gtkutils.c:1563
 msgid "Insert in message"
 msgstr "Insertar en el mensaje"
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1548
 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:1551
+#: ../pidgin/gtkutils.c:1555
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -16672,7 +16980,7 @@ msgstr ""
 "Puede enviar esta imagen como una transferencia de archivo, o usarla como "
 "icono de amigo para este usuario."
 
-#: ../pidgin/gtkutils.c:1552
+#: ../pidgin/gtkutils.c:1556
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16685,11 +16993,11 @@ msgstr ""
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1615
 msgid "Cannot send launcher"
 msgstr "No se puede enviar un lanzador"
 
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1615
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -16697,7 +17005,7 @@ msgstr ""
 "Vd. arrastrÃ³ un lanzador de escritorio. Lo mÃ¡s probable es que quiera enviar "
 "a lo que apunta el lanzador mÃ¡s que el lanzador en sÃ."
 
-#: ../pidgin/gtkutils.c:2345
+#: ../pidgin/gtkutils.c:2350
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16708,27 +17016,27 @@ msgstr ""
 "<b>TamaÃ±o de archivo:</b> %s\n"
 "<b>TamaÃ±o de imagen:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2641
+#: ../pidgin/gtkutils.c:2646
 #, 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:2643
+#: ../pidgin/gtkutils.c:2648
 msgid "Icon Error"
 msgstr "Error en icono"
 
-#: ../pidgin/gtkutils.c:2644
+#: ../pidgin/gtkutils.c:2649
 msgid "Could not set icon"
 msgstr "No se pudo fijar el icono"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2749
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "No se pudo abrir el archivo Â«%sÂ»: %s"
 
-#: ../pidgin/gtkutils.c:2793
+#: ../pidgin/gtkutils.c:2798
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -16784,35 +17092,35 @@ msgstr "ninguno"
 msgid "none"
 msgstr "ninguno"
 
-#: ../pidgin/plugins/cap/cap.c:450
+#: ../pidgin/plugins/cap/cap.c:451
 msgid "Display Statistics"
 msgstr "Mostrar estadÃsticas"
 
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
+#: ../pidgin/plugins/cap/cap.c:464 ../pidgin/plugins/cap/cap.c:467
 msgid "Response Probability:"
 msgstr "Probabilidad de respuesta"
 
-#: ../pidgin/plugins/cap/cap.c:811
+#: ../pidgin/plugins/cap/cap.c:813
 msgid "Statistics Configuration"
 msgstr "ConfiguraciÃ³n de estadÃsticas"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
+#: ../pidgin/plugins/cap/cap.c:816
 msgid "Maximum response timeout:"
 msgstr "Tiempo de espera mÃ¡ximo para respuestas:"
 
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:819 ../pidgin/plugins/cap/cap.c:826
+#: ../pidgin/plugins/cap/cap.c:833 ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "minutos"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
+#: ../pidgin/plugins/cap/cap.c:823
 msgid "Maximum last-seen difference:"
 msgstr "Diferencia mÃ¡xima de Â«visto por Ãºltima vezÂ»:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
+#: ../pidgin/plugins/cap/cap.c:830
 msgid "Threshold:"
 msgstr "Umbral:"
 
@@ -16822,18 +17130,18 @@ msgstr "Umbral:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction"
 msgstr "PredicciÃ³n de disponibilidad de contactos"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:940
 msgid "Contact Availability Prediction plugin."
 msgstr "Complemento de predicciÃ³n de disponibilidad de contactos."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
+#: ../pidgin/plugins/cap/cap.c:941
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -16889,14 +17197,14 @@ msgstr "Valores a utilizar para la cuent
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "Prioridad del contacto"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
+#: ../pidgin/plugins/contact_priority.c:191
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
@@ -16904,7 +17212,7 @@ msgstr ""
 "amigos."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:192
+#: ../pidgin/plugins/contact_priority.c:193
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -16920,40 +17228,40 @@ msgstr "Personaliza los colores de la ve
 msgid "Customize colors in the conversation window"
 msgstr "Personaliza los colores de la ventana de conversaciÃ³n"
 
-#: ../pidgin/plugins/convcolors.c:82
+#: ../pidgin/plugins/convcolors.c:87
 msgid "Error Messages"
 msgstr "Mensajes de error"
 
-#: ../pidgin/plugins/convcolors.c:83
+#: ../pidgin/plugins/convcolors.c:88
 msgid "Highlighted Messages"
 msgstr "Mensajes resaltados"
 
-#: ../pidgin/plugins/convcolors.c:84
+#: ../pidgin/plugins/convcolors.c:89
 msgid "System Messages"
 msgstr "Mensaje del sistema"
 
-#: ../pidgin/plugins/convcolors.c:85
+#: ../pidgin/plugins/convcolors.c:90
 msgid "Sent Messages"
 msgstr "Mensajes enviados"
 
-#: ../pidgin/plugins/convcolors.c:86
+#: ../pidgin/plugins/convcolors.c:91
 msgid "Received Messages"
 msgstr "Mensajes recibidos"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:218 ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "Seleccionar el color para %s"
 
-#: ../pidgin/plugins/convcolors.c:310
+#: ../pidgin/plugins/convcolors.c:367
 msgid "Ignore incoming format"
 msgstr "Ignorar formato entrante"
 
-#: ../pidgin/plugins/convcolors.c:311
+#: ../pidgin/plugins/convcolors.c:368
 msgid "Apply in Chats"
 msgstr "Aplicar en los chats"
 
-#: ../pidgin/plugins/convcolors.c:312
+#: ../pidgin/plugins/convcolors.c:369
 msgid "Apply in IMs"
 msgstr "Aplicar en los MIs"
 
@@ -17220,7 +17528,7 @@ msgstr ""
 "\n"
 "<b>Nota de amigo:</b> %s"
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "HistÃ³rico"
 
@@ -17480,45 +17788,36 @@ msgstr "SeparaciÃ³n horizontal GtkTreeVi
 msgid "GtkTreeView Horizontal Separation"
 msgstr "SeparaciÃ³n horizontal GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "Entrada de conversaciones"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "Historial de conversaciones"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "Visor del registro"
-
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "DiÃ¡logo de solicitud"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "DiÃ¡logo de notificaciÃ³n"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "Seleccionar el color"
 
-#: ../pidgin/plugins/pidginrc.c:300
-#, c-format
+#: ../pidgin/plugins/pidginrc.c:294
 msgid "Select Interface Font"
 msgstr "Seleccionar tipografÃa de la interfaz"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "Seleccionar tipografÃa para %s"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "TipografÃa de la interfaz GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atajos de teclado GTK+"
 
@@ -17542,36 +17841,36 @@ msgstr "Tema de atajos de teclado GTK+"
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "Colores de la interfaz"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "TamaÃ±o de los controles"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "TipografÃa"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
 msgstr "Herramientas de ficheros Gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:502
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Escribir la configuraciÃ³n en %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "Volver a leer archivos de configuraciÃ³n gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:543
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Control de tema GTK+ de Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:545 ../pidgin/plugins/pidginrc.c:546
 msgid "Provides access to commonly used gtkrc settings."
 msgstr ""
 "Da acceso a los parÃ¡metros de configuraciÃ³n de gtkrc que se utilizan "
@@ -17697,11 +17996,11 @@ msgstr "Habilitar la sustituciÃ³n de la 
 msgid "Enable replacement of last word on send"
 msgstr "Habilitar la sustituciÃ³n de la Ãºltima palabra al enviar"
 
-#: ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2372
 msgid "Text replacement"
 msgstr "Reemplazo de texto"
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2374 ../pidgin/plugins/spellchk.c:2375
 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 "
@@ -17713,7 +18012,7 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Deslizante de amigos"
 
@@ -17721,11 +18020,11 @@ msgstr "Deslizante de amigos"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Una versiÃ³n horizontal deslizante de la lista de amigos."
 
-#: ../pidgin/plugins/timestamp.c:137
+#: ../pidgin/plugins/timestamp.c:135
 msgid "Display Timestamps Every"
 msgstr "Mostrar marcas de tiempo cada"
 
@@ -17735,19 +18034,19 @@ msgstr "Mostrar marcas de tiempo cada"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:202
+#: ../pidgin/plugins/timestamp.c:200
 msgid "Timestamp"
 msgstr "Marca temporal"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:205
+#: ../pidgin/plugins/timestamp.c:203
 msgid "Display iChat-style timestamps"
 msgstr "Mostrar marcas de tiempo al estilo iChat"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:207
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Mostrar una marca de tiempo al estilo iChat cada N minutos."
 
@@ -17757,7 +18056,6 @@ msgstr "Opciones de formato de marca de 
 
 # JFS: Is this complete? REVIEW
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Forzar formato de tiempo de 24 horas"
 
@@ -17929,7 +18227,7 @@ msgstr ""
 "Contiene las opciones especÃficas al Pidgin de Windows como el apilado de la "
 "lista de amigos."
 
-#: ../pidgin/plugins/xmppconsole.c:667
+#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Desconectado.</font>"
 
@@ -17939,158 +18237,112 @@ msgstr "<font color='#777777'>Desconecta
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:749 ../pidgin/plugins/xmppconsole.c:844
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "Consola XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "Cuenta: "
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>No conectado a XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "Introducir una entrada <iq/>."
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "Introducir una entrada <presence/>."
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "Insertar una entrada <messag/>."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Enviar y recibir entradas XMPP en crudo."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento es Ãºtil para depurar clientes o servidores XMPP."
 
-#, fuzzy
-#~ msgid "Show"
-#~ msgstr "Mostrar todo"
+#~ msgid "Sort by status"
+#~ msgstr "Ordenar por estado"
 
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "Mostrar amigos desconectados"
+#~ msgid "Sort alphabetically"
+#~ msgstr "Ordenar alfabÃ©ticamente"
 
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "Puerto"
+#~ msgid "Sort by log size"
+#~ msgstr "Ordenar por tamaÃ±o de registro"
 
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "Por estado"
+#~ msgid "There were errors unloading the plugin."
+#~ msgstr "Se produjeron errores mientras se descargaba el complemento."
 
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "Por tamaÃ±o de registro"
+#~ msgid "Couldn't open file"
+#~ msgstr "No se pudo abrir el archivo"
 
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "No se pudo conectar al servidor."
+#~ msgid "Error initializing session"
+#~ msgstr "Error al inicializar la sesiÃ³n"
 
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Seleccionar libro de direcciones Â«NotesÂ»"
+#~ msgid "Unable to make SSL connection to server."
+#~ msgstr "No se pudo establecer una conexiÃ³n SSL con el servidor."
 
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "Token actual"
+#~ msgid "Invalid chat name specified."
+#~ msgstr "Se especificÃ³ un nombre de chat no vÃ¡lido."
 
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Complemento de protocolo de MensajerÃa de Grupos de Novell"
+#~ msgid ""
+#~ "Always use ICQ proxy server for file transfers\n"
+#~ "(slower, but does not reveal your IP address)"
+#~ msgstr ""
+#~ "Utilizar un servidor proxy de ICQ para transferencias de ficheros\n"
+#~ "(lento, pero no descubre su direcciÃ³n IP)"
 
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Â¡FallÃ³ la autenticaciÃ³n habitual!"
+#~ msgid "Add Buddy _Pounce"
+#~ msgstr "AÃ±adir _aviso de amigo"
 
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "Â¡%s le acaba de dar un codazo!"
+#~ msgid "Add a _Buddy"
+#~ msgstr "AÃ±adir un _amigo"
 
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Error desconocido"
+#~ msgid "Add a C_hat"
+#~ msgstr "AÃ±adir un _chat"
 
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "No se pudo conectar al servidor."
+#~ msgid "/Accounts/Add\\/Edit"
+#~ msgstr "/Cuentas/AÃ±adir\\/Editar"
 
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "el estado de %s cambiÃ³ de %s a %s"
+#~ msgid "<span color=\"red\">%s disconnected: %s</span>"
+#~ msgstr "<span color=\"red\">%s se ha desconectado: %s</span>"
 
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s es ahora %s"
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "%s will not attempt to reconnect the account until you correct the error "
+#~ "and re-enable the account."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "%s no intentarÃ¡ reconectarse a esta cuenta hasta que corrija el error y "
+#~ "reactive la cuenta."
 
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s ya no estÃ¡ %s "
+#~ msgid "_Send To"
+#~ msgstr "_Enviar a"
 
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_Mensaje:"
+#~ msgid "_Smiley"
+#~ msgstr "_Emoticono"
 
-#, fuzzy
-#~ msgid "Move to"
-#~ msgstr "MÃ¡s informaciÃ³n"
+#~ msgid "Conversation History"
+#~ msgstr "Historial de conversaciones"
 
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "_Enviar archivo"
+#~ msgid "Log Viewer"
+#~ msgstr "Visor del registro"
 
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "AÃ±adir aviso de amigo..."
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "No puede mandar mensajes fuera de lÃnea"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "No puede mandar mensajes fuera de lÃnea"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "AÃ±adir amigo"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "AÃ±adir chat"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "Persa"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/Cuentas"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Cuenta:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "Enviar a"
-
-#, fuzzy
-#~ msgid "_Smile!"
-#~ msgstr "Â¡SonrÃa!"
-
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "Â¡Acaba de dar un codazo!"
 
@@ -18472,13 +18724,6 @@ msgstr "Este complemento es Ãºtil para d
 #~ msgid "Gaim User"
 #~ msgstr "Usuario de Gaim"
 
-#~ msgid ""
-#~ "Always use AIM/ICQ proxy server for file transfers\n"
-#~ "(slower, but does not reveal your IP address)"
-#~ msgstr ""
-#~ "Utilizar un servidor proxy de AIM/ICQ para transferencias de ficheros "
-#~ "(lento, pero no descubre su direcciÃ³n IP)"
-
 #~ msgid "SNAC threw error: %s\n"
 #~ msgstr "SNAC enviÃ³ el error: %s\n"
 
@@ -18858,9 +19103,6 @@ msgstr "Este complemento es Ãºtil para d
 #~ msgid "Feature Calibration"
 #~ msgstr "Ajuste de la funciÃ³n"
 
-#~ msgid "Disabled"
-#~ msgstr "Deshabilitado"
-
 #~ msgid "Displays an icon for Gaim in the system tray."
 #~ msgstr "Muestra un icono para Gaim en el Ã¡rea de notificaciÃ³n del sistema."
 
@@ -19119,18 +19361,12 @@ msgstr "Este complemento es Ãºtil para d
 #~ msgid "YCHT port"
 #~ msgstr "Puerto YCHT"
 
-#~ msgid "%s came back"
-#~ msgstr "%s ha vuelto"
-
 #~ msgid "%s went away"
 #~ msgstr "%s se ha marchado"
 
 #~ msgid "g003: Error opening connection.\n"
 #~ msgstr "g003: Error abriendo la conexiÃ³n.\n"
 
-#~ msgid "Join A Chat..."
-#~ msgstr "Unirse a un chat..."
-
 #~ msgid "(+%d more)"
 #~ msgstr "(+%d mÃ¡s)"
 
@@ -19232,9 +19468,6 @@ msgstr "Este complemento es Ãºtil para d
 #~ msgid "Permit"
 #~ msgstr "Permitir"
 
-#~ msgid "Configure Room"
-#~ msgstr "Configurar sala"
-
 #~ msgid "Accept Defaults"
 #~ msgstr "Aceptar valores por omisiÃ³n"
 
@@ -19783,9 +20016,6 @@ msgstr "Este complemento es Ãºtil para d
 #~ msgid "Cancel All"
 #~ msgstr "Cancelar todo"
 
-#~ msgid "_Reconnect"
-#~ msgstr "_Reconectar"
-
 #~ msgid "Reason Unknown."
 #~ msgstr "RazÃ³n desconocida."
 
@@ -19837,9 +20067,6 @@ msgstr "Este complemento es Ãºtil para d
 #~ msgid "Burmese"
 #~ msgstr "Birmano"
 
-#~ msgid "Punjabi"
-#~ msgstr "PunjabÃ"
-
 #~ msgid "Ukrainian"
 #~ msgstr "Ucraniano"
 
@@ -20281,9 +20508,6 @@ msgstr "Este complemento es Ãºtil para d
 #~ msgid "ICQ UIN"
 #~ msgstr "ICQ UIN"
 
-#~ msgid "MSN"
-#~ msgstr "MSN"
-
 #~ msgid "Yahoo"
 #~ msgstr "Yahoo"
 
@@ -20453,9 +20677,6 @@ msgstr "Este complemento es Ãºtil para d
 #~ msgid "<font sml=\"msn\">%s</font><br>"
 #~ msgstr "<font sml=\"msn\">%s</font><br>"
 
-#~ msgid "Userid"
-#~ msgstr "ID de usuario"
-
 #~ msgid "Your message to %s did not get sent:"
 #~ msgstr "Su mensaje a %s no fue enviado:"
 
@@ -20484,9 +20705,6 @@ msgstr "Este complemento es Ãºtil para d
 #~ msgid "User Count:\t\t%d\n"
 #~ msgstr "Cuenta de usuarios:\t\t%d\n"
 
-#~ msgid "Channels"
-#~ msgstr "Canales"
-
 #~ msgid "_Browse"
 #~ msgstr "_Navegador"
 
@@ -20850,9 +21068,6 @@ msgstr "Este complemento es Ãºtil para d
 #~ msgid "Changing info for %s:"
 #~ msgstr "Cambiando los datos de %s:"
 
-#~ msgid "Couldn't write to %s."
-#~ msgstr "No se pudo escribir en %s."
-
 #~ msgid "Save Log File"
 #~ msgstr "Guardar archivo de registro"
 
