changeset 23815:4a5b10c4d154

Updated Spanish translation from Javier Fernandez-Sanguino. Fixes #6552
author Daniel Atallah <daniel.atallah@gmail.com>
date Fri, 15 Aug 2008 15:50:22 +0000 (2008-08-15)
parents e983cdd73eda
children 7964a902964f
files po/ChangeLog po/es.po
diffstat 2 files changed, 713 insertions(+), 5497 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Fri Aug 15 15:39:54 2008 +0000
+++ b/po/ChangeLog	Fri Aug 15 15:50:22 2008 +0000
@@ -13,6 +13,7 @@
 	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
 	* Sinhala translation update (Yajith Ajantha Dayarathna)
 	* Slovenian translation updated (Martin Srebotnjak)
+	* Spanish translation updated (Javier Fern叩ndez-Sanguino)
 	* Vietnamese translation updated (Clytie Siddall)
 
 version 2.4.2
--- a/po/es.po	Fri Aug 15 15:39:54 2008 +0000
+++ b/po/es.po	Fri Aug 15 15:50:22 2008 +0000
@@ -53,8 +53,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 03:22-0400\n"
-"PO-Revision-Date: 2008-05-13 23:08+0200\n"
+"POT-Creation-Date: 2008-08-15 11:42-0400\n"
+"PO-Revision-Date: 2008-08-10 00:10+0200\n"
 "Last-Translator: Javier Fern叩ndez-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -64,17 +64,13 @@
 
 #. 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"
 
-#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Intente `%s -h' para m叩s informaci坦n.\n"
 
-#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -97,7 +93,6 @@
 "  -n, --nologin        no conectarse de forma autom叩tica\n"
 "  -v, --version        mostrar la versi坦n actual y salir\n"
 
-#: ../finch/finch.c:327 ../pidgin/gtkmain.c:738
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -108,253 +103,104 @@
 "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:595
-#: ../finch/gntblist.c:759 ../finch/gntblist.c:772 ../finch/gntplugin.c:196
-#: ../finch/gntplugin.c:244 ../finch/gntrequest.c:380 ../finch/gntstatus.c:301
-#: ../finch/gntstatus.c:310 ../finch/plugins/gntclipboard.c:115
-#: ../finch/plugins/gntclipboard.c:121 ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2080
-#: ../libpurple/protocols/jabber/chat.c:682
-#: ../libpurple/protocols/jabber/chat.c:693
-#: ../libpurple/protocols/jabber/jabber.c:1594
-#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:76
-#: ../libpurple/protocols/silc/ops.c:1473
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Error"
 
-#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "No se ha a単adido la cuenta"
 
-#: ../finch/gntaccount.c:125
 msgid "Username of an account must be non-empty."
 msgstr "El nombre de usuario de una cuenta no puede estar vac鱈o."
 
-#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "Notificaciones de correo nuevo"
 
-#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "Recordar contrase単a"
 
-#: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
 msgstr "No se han instalado complementos de protocolo."
 
-#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Posiblemente se olvido de ejecutar 'make install'.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1449 ../pidgin/gtkblist.c:4671
 msgid "Modify Account"
 msgstr "Modificar cuenta"
 
-#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "Nueva cuenta"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:294
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "Contrase単a:"
 
-#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "Apodo:"
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "Crear esta cuenta en el servidor"
+
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:639
-#: ../finch/gntaccount.c:890 ../finch/gntblist.c:641 ../finch/gntblist.c:747
-#: ../finch/gntblist.c:782 ../finch/gntblist.c:1134 ../finch/gntblist.c:1360
-#: ../finch/gntblist.c:1494 ../finch/gntblist.c:2661 ../finch/gntblist.c:2712
-#: ../finch/gntblist.c:2776 ../finch/gntblist.c:2838 ../finch/gntcertmgr.c:90
-#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:471 ../finch/gntpounce.c:679
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1064 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../finch/plugins/gnthistory.c:178 ../libpurple/account.c:1118
-#: ../libpurple/account.c:1437 ../libpurple/account.c:1472
-#: ../libpurple/conversation.c:1235 ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:508 ../libpurple/protocols/gg/gg.c:667
-#: ../libpurple/protocols/gg/gg.c:804 ../libpurple/protocols/gg/gg.c:886
-#: ../libpurple/protocols/jabber/buddy.c:759
-#: ../libpurple/protocols/jabber/buddy.c:2474
-#: ../libpurple/protocols/jabber/buddy.c:2510
-#: ../libpurple/protocols/jabber/chat.c:791
-#: ../libpurple/protocols/jabber/jabber.c:1063
-#: ../libpurple/protocols/jabber/jabber.c:1072
-#: ../libpurple/protocols/jabber/jabber.c:1787
-#: ../libpurple/protocols/jabber/si.c:1113
-#: ../libpurple/protocols/jabber/usermood.c:199
-#: ../libpurple/protocols/jabber/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:403
-#: ../libpurple/protocols/msn/msn.c:301 ../libpurple/protocols/msn/msn.c:318
-#: ../libpurple/protocols/msn/msn.c:335 ../libpurple/protocols/msn/msn.c:352
-#: ../libpurple/protocols/msn/msn.c:373 ../libpurple/protocols/msnp9/msn.c:284
-#: ../libpurple/protocols/msnp9/msn.c:301
-#: ../libpurple/protocols/msnp9/msn.c:318
-#: ../libpurple/protocols/msnp9/msn.c:335
-#: ../libpurple/protocols/msnp9/msn.c:356
-#: ../libpurple/protocols/myspace/user.c:582
-#: ../libpurple/protocols/myspace/user.c:676
-#: ../libpurple/protocols/oscar/oscar.c:6209
-#: ../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
-#: ../libpurple/protocols/qq/group_join.c:140
-#: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:120
-#: ../libpurple/protocols/qq/group_opt.c:375
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:269
-#: ../libpurple/protocols/sametime/sametime.c:3440
-#: ../libpurple/protocols/sametime/sametime.c:3526
-#: ../libpurple/protocols/sametime/sametime.c:3700
-#: ../libpurple/protocols/sametime/sametime.c:5453
-#: ../libpurple/protocols/sametime/sametime.c:5543
-#: ../libpurple/protocols/sametime/sametime.c:5668
-#: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1079
-#: ../libpurple/protocols/silc/buddy.c:1194
-#: ../libpurple/protocols/silc/chat.c:619
-#: ../libpurple/protocols/silc/chat.c:753
-#: ../libpurple/protocols/silc/ops.c:1833
-#: ../libpurple/protocols/silc/silc.c:1039
-#: ../libpurple/protocols/silc/silc.c:1247
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1087
-#: ../libpurple/protocols/silc10/buddy.c:1192
-#: ../libpurple/protocols/silc10/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1910
-#: ../libpurple/protocols/silc10/silc.c:742
-#: ../libpurple/protocols/silc10/silc.c:948
-#: ../libpurple/protocols/yahoo/yahoo.c:993
-#: ../libpurple/protocols/yahoo/yahoo.c:3564
-#: ../libpurple/protocols/yahoo/yahoo.c:3575 ../pidgin/gtkaccount.c:1843
-#: ../pidgin/gtkaccount.c:2404 ../pidgin/gtkblist.c:684
-#: ../pidgin/gtkblist.c:6879 ../pidgin/gtkcertmgr.c:197
-#: ../pidgin/gtkdialogs.c:768 ../pidgin/gtkdialogs.c:907
-#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1019
-#: ../pidgin/gtkdialogs.c:1043 ../pidgin/gtkdialogs.c:1065
-#: ../pidgin/gtkdialogs.c:1113 ../pidgin/gtkdialogs.c:1154
-#: ../pidgin/gtkdialogs.c:1210 ../pidgin/gtkdialogs.c:1249
-#: ../pidgin/gtkdialogs.c:1276 ../pidgin/gtkimhtmltoolbar.c:438
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:302 ../pidgin/gtkpounce.c:1113
-#: ../pidgin/gtkprivacy.c:509 ../pidgin/gtkprivacy.c:525
-#: ../pidgin/gtkprivacy.c:550 ../pidgin/gtkprivacy.c:564
-#: ../pidgin/gtkrequest.c:273 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1619
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:310 ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:477 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1061 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1471 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:758 ../pidgin/gtkblist.c:684
-#: ../pidgin/gtkdebug.c:746 ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "Guardar"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1834
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1613
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "多Seguro que quiere borrar a %s?"
 
-#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr "Borrar cuenta"
 
 #. Delete button
-#: ../finch/gntaccount.c:638 ../finch/gntaccount.c:708
-#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:678 ../finch/gntpounce.c:741
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1842 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1618
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2528 ../finch/gntui.c:94
-#: ../pidgin/gtkaccount.c:2263 ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../finch/gntaccount.c:676
 msgid "You can enable/disable accounts from the following list."
 msgstr "Puede (desh)habilitar cuentas de la lista a continuaci坦n."
 
 #. Add button
-#: ../finch/gntaccount.c:699 ../finch/gntaccount.c:889 ../finch/gntblist.c:640
-#: ../finch/gntblist.c:747 ../finch/gntblist.c:782 ../finch/gntblist.c:2947
-#: ../finch/gntcertmgr.c:305 ../finch/gntnotify.c:385 ../finch/gntpounce.c:725
-#: ../finch/gntroomlist.c:274 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:885 ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5542
-#: ../libpurple/protocols/silc/chat.c:618
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2403
-#: ../pidgin/gtkblist.c:6878 ../pidgin/gtkconv.c:1721
-#: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "A単adir"
 
 #. Modify button
-#: ../finch/gntaccount.c:704 ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2350
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s ha hecho a %s su amigo o amiga%s%s"
 
-#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2402
 msgid "Add buddy to your list?"
 msgstr "多Desea a単adir el amigo a su lista?"
 
-#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2460
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s quiere a単adir a %s a su lista de amigos%s%s."
 
-#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:973
-#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2483
-#: ../pidgin/gtkaccount.c:2490
 msgid "Authorize buddy?"
 msgstr "多Autorizar al amigo?"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2484 ../pidgin/gtkaccount.c:2491
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../finch/gntaccount.c:978 ../finch/gntaccount.c:1005
-#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkaccount.c:2492
 msgid "Deny"
 msgstr "Denegar"
 
-#: ../finch/gntblist.c:265
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -363,12 +209,10 @@
 "En l鱈nea: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:274
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Cuenta: %s (%s)"
 
-#: ../finch/gntblist.c:286
 #, c-format
 msgid ""
 "\n"
@@ -377,349 +221,188 @@
 "\n"
 "Visto por 炭ltima vez: hace %s"
 
-#: ../finch/gntblist.c:306 ../pidgin/gtkprefs.c:327
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "(por omisi坦n)"
 
-#: ../finch/gntblist.c:584
 msgid "You must provide a username for the buddy."
 msgstr "Debe dar un nombre de usuario para el amigo."
 
-#: ../finch/gntblist.c:586
 msgid "You must provide a group."
 msgstr "Debe indicar un grupo."
 
-#: ../finch/gntblist.c:588
 msgid "You must select an account."
 msgstr "Debe seleccionar una cuenta."
 
-#: ../finch/gntblist.c:590
 msgid "The selected account is not online."
 msgstr "La cuenta seleccionada no est叩 conectada."
 
-#: ../finch/gntblist.c:595
 msgid "Error adding buddy"
 msgstr "Error al a単adir al amigo"
 
-#: ../finch/gntblist.c:622 ../libpurple/protocols/irc/irc.c:974
-#: ../libpurple/protocols/irc/msgs.c:364
-#: ../libpurple/protocols/jabber/jabber.c:974
-#: ../libpurple/protocols/jabber/jabber.c:976
-#: ../libpurple/protocols/oscar/oscar.c:2944
-#: ../libpurple/protocols/oscar/oscar.c:3961
-#: ../libpurple/protocols/silc/buddy.c:1542
-#: ../libpurple/protocols/silc/ops.c:1210
-#: ../libpurple/protocols/silc/ops.c:1213
-#: ../libpurple/protocols/silc/ops.c:1349
-#: ../libpurple/protocols/silc/ops.c:1352
-#: ../libpurple/protocols/silc/silc.c:1221
-#: ../libpurple/protocols/silc10/buddy.c:1542
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:922 ../pidgin/gtkaccount.c:1916
-#: ../pidgin/gtksavedstatuses.c:971
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ../finch/gntblist.c:625
 msgid "Alias (optional)"
 msgstr "Apodo (opcional)"
 
-#: ../finch/gntblist.c:628
 msgid "Add in group"
 msgstr "A単adir a un grupo"
 
-#: ../finch/gntblist.c:632 ../finch/gntblist.c:726 ../finch/gntblist.c:1705
-#: ../finch/gntblist.c:2642 ../finch/gntblist.c:2698 ../finch/gntblist.c:2763
-#: ../finch/gntblist.c:2823 ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3319 ../pidgin/gtknotify.c:530
-#: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:447
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../finch/gntblist.c:638 ../finch/gntblist.c:1183
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/buddy.c:1083
-#: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3400 ../pidgin/gtkblist.c:6427
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:449
 msgid "Add Buddy"
 msgstr "A単adir amigo"
 
-#: ../finch/gntblist.c:638
 msgid "Please enter buddy information."
 msgstr "Introduzca la informaci坦n del amigo."
 
-#: ../finch/gntblist.c:694 ../libpurple/blist.c:1237
 msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:732 ../finch/gntblist.c:2637 ../finch/gntblist.c:2693
-#: ../finch/gntblist.c:2818 ../finch/gntroomlist.c:298
-#: ../libpurple/protocols/jabber/jabber.c:991
-#: ../libpurple/protocols/jabber/jabber.c:994
-#: ../libpurple/protocols/msn/msn.c:1754 ../libpurple/protocols/msn/msn.c:1819
-#: ../libpurple/protocols/msn/msn.c:1846
-#: ../libpurple/protocols/msnp9/msn.c:1595
-#: ../libpurple/protocols/msnp9/msn.c:1660
-#: ../libpurple/protocols/msnp9/msn.c:1687
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:766
-#: ../pidgin/gtkroomlist.c:749
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nombre"
 
-#: ../finch/gntblist.c:735 ../finch/gntblist.c:1646
-#: ../libpurple/protocols/msn/msn.c:1573
-#: ../libpurple/protocols/msnp9/msn.c:1413
-#: ../libpurple/protocols/silc/chat.c:609
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:792
-#: ../libpurple/protocols/zephyr/zephyr.c:1167 ../pidgin/gtkdialogs.c:1018
-#: ../pidgin/gtkdialogs.c:1042 ../pidgin/gtkdialogs.c:1064
-#: ../pidgin/gtkrequest.c:280
 msgid "Alias"
 msgstr "Apodo"
 
-#: ../finch/gntblist.c:738 ../finch/gntblist.c:2963
 msgid "Group"
 msgstr "Grupo"
 
-#: ../finch/gntblist.c:742 ../finch/gntblist.c:1150
 msgid "Auto-join"
 msgstr "Conectarse autom叩ticamente"
 
-#: ../finch/gntblist.c:745 ../finch/gntblist.c:1185 ../pidgin/gtkblist.c:6792
 msgid "Add Chat"
 msgstr "A単adir chat"
 
-#: ../finch/gntblist.c:746
 msgid "You can edit more information from the context menu later."
 msgstr ""
 "Puede editar m叩s informaci坦n m叩s adelante a trav辿s del men炭 contextual."
 
-#: ../finch/gntblist.c:759 ../finch/gntblist.c:772
 msgid "Error adding group"
 msgstr "Error al a単adir al grupo"
 
-#: ../finch/gntblist.c:760
 msgid "You must give a name for the group to add."
 msgstr "Debe dar un nombre al grupo a a単adir."
 
-#: ../finch/gntblist.c:773
 msgid "A group with the name already exists."
 msgstr "Ya existe un grupo con ese nombre"
 
-#: ../finch/gntblist.c:780 ../finch/gntblist.c:1187
-#: ../libpurple/protocols/sametime/sametime.c:5452
-#: ../libpurple/protocols/sametime/sametime.c:5540 ../pidgin/gtkblist.c:6875
 msgid "Add Group"
 msgstr "A単adir grupo"
 
-#: ../finch/gntblist.c:780
 msgid "Enter the name of the group"
 msgstr "Introduzca el nombre del grupo"
 
-#: ../finch/gntblist.c:1133 ../pidgin/gtkblist.c:683
 msgid "Edit Chat"
 msgstr "Editar chat"
 
-#: ../finch/gntblist.c:1133
 msgid "Please Update the necessary fields."
 msgstr "Por favor Actualice los campos necesarios."
 
-#: ../finch/gntblist.c:1134 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Editar"
 
-#: ../finch/gntblist.c:1159
 msgid "Edit Settings"
 msgstr "Editar configuraci坦n"
 
-#: ../finch/gntblist.c:1195 ../pidgin/gtkutils.c:982
 msgid "Information"
 msgstr "Informaci坦n"
 
-#: ../finch/gntblist.c:1195 ../pidgin/gtkutils.c:982
 msgid "Retrieving..."
 msgstr "Obteniendo..."
 
 # No se traduce como 束Obtener Informaci坦n損 porque sino hace muy grande el 
 # bot坦n que utiliza este texto y, consecuentemente, la pantalla de Gaim, jfs
-#: ../finch/gntblist.c:1249 ../finch/gntconv.c:591
-#: ../libpurple/protocols/silc/chat.c:906
-#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Info"
 
-#: ../finch/gntblist.c:1253
 msgid "Add Buddy Pounce"
 msgstr "A単adir aviso de amigo"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:1260 ../finch/gntconv.c:603
-#: ../libpurple/protocols/jabber/si.c:1113
-#: ../libpurple/protocols/oscar/oscar.c:655 ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1669
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: ../finch/gntblist.c:1267 ../libpurple/protocols/gg/gg.c:1629
-#: ../libpurple/protocols/msn/msn.c:674 ../libpurple/protocols/msnp9/msn.c:562
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../finch/gntblist.c:1273 ../finch/gntblist.c:1662 ../finch/gntblist.c:2832
 msgid "View Log"
 msgstr "Ver registro"
 
-#: ../finch/gntblist.c:1355
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Introduzca el nuevo nombre para %s"
 
-#: ../finch/gntblist.c:1357 ../finch/gntblist.c:1646
 msgid "Rename"
 msgstr "Renombrar"
 
-#: ../finch/gntblist.c:1357
 msgid "Set Alias"
 msgstr "Fijar el apodo"
 
-#: ../finch/gntblist.c:1358
 msgid "Enter empty string to reset the name."
 msgstr "Introduzca una cadena vac鱈a para resetear el nombre."
 
-#: ../finch/gntblist.c:1472
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
 "Si elimina este contacto tambi辿n eliminar叩 a todos los amigos en el contacto"
 
-#: ../finch/gntblist.c:1480
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Si elimina este grupo tambi辿n eliminar叩 a todos los amigos en el grupo"
 
-#: ../finch/gntblist.c:1485
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "多Est叩 seguro que quiere borrar a %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1488
 msgid "Confirm Remove"
 msgstr "Confirmar borrado"
 
-#: ../finch/gntblist.c:1493 ../finch/gntblist.c:1648 ../finch/gntft.c:243
-#: ../pidgin/gtkconv.c:1718 ../pidgin/gtkrequest.c:278
-#: ../pidgin/gtkstatusbox.c:268
 msgid "Remove"
 msgstr "Quitar"
 
 #. Buddy List
-#: ../finch/gntblist.c:1622 ../finch/gntblist.c:3004 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5166
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
-#: ../finch/gntblist.c:1653
 msgid "Place tagged"
 msgstr "Lugares marcados"
 
-#: ../finch/gntblist.c:1658
 msgid "Toggle Tag"
 msgstr "Cambiar marca"
 
 #. General
-#: ../finch/gntblist.c:1698 ../libpurple/protocols/gg/gg.c:638
-#: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
-#: ../libpurple/protocols/gg/gg.c:2228
-#: ../libpurple/protocols/jabber/buddy.c:309
-#: ../libpurple/protocols/jabber/buddy.c:1285
-#: ../libpurple/protocols/jabber/buddy.c:2265
-#: ../libpurple/protocols/jabber/buddy.c:2457
-#: ../libpurple/protocols/jabber/jabber.c:1002
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#: ../libpurple/protocols/jabber/jabber.c:1642
-#: ../libpurple/protocols/jabber/jabber.c:1656
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msnp9/msn.c:1421
-#: ../libpurple/protocols/msnp9/msn.c:1598
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1016
-#: ../libpurple/protocols/silc/ops.c:1199
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc10/buddy.c:1538
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1073 ../pidgin/gtkblist.c:3343
 msgid "Nickname"
 msgstr "Apodo"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
-#: ../finch/gntblist.c:1720 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:377
-#: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:982
-#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:639
-#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/msnp9/msn.c:541
-#: ../libpurple/protocols/msnp9/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/oscar/oscar.c:2968
-#: ../libpurple/protocols/yahoo/yahoo.c:3154
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3371
-#: ../pidgin/gtkblist.c:3831 ../pidgin/gtkprefs.c:2056
 msgid "Idle"
 msgstr "Est叩 inactivo"
 
 # El latinoam辿rica se prefiere 'Celular', creo, jfs
-#: ../finch/gntblist.c:1734
 msgid "On Mobile"
 msgstr "En el m坦vil"
 
-#: ../finch/gntblist.c:2035 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Nuevo..."
 
-#: ../finch/gntblist.c:2042 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Guardado..."
 
-#: ../finch/gntblist.c:2496 ../finch/gntplugin.c:352 ../finch/gntui.c:100
-#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:715
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../finch/gntblist.c:2650 ../finch/gntblist.c:2655
 msgid "Block/Unblock"
 msgstr "Bloquear/Desbloquear"
 
-#: ../finch/gntblist.c:2651 ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../finch/gntblist.c:2652 ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../finch/gntblist.c:2657
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
@@ -730,71 +413,29 @@
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2660 ../finch/gntblist.c:2711 ../finch/gntblist.c:2837
-#: ../finch/gntcertmgr.c:89 ../finch/gntconn.c:137 ../finch/gntnotify.c:80
-#: ../finch/plugins/gnthistory.c:177 ../libpurple/account.c:1117
-#: ../libpurple/account.c:1436 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1786
-#: ../libpurple/protocols/jabber/xdata.c:402
-#: ../libpurple/protocols/msn/msn.c:300 ../libpurple/protocols/msn/msn.c:317
-#: ../libpurple/protocols/msn/msn.c:334 ../libpurple/protocols/msn/msn.c:351
-#: ../libpurple/protocols/msnp9/msn.c:283
-#: ../libpurple/protocols/msnp9/msn.c:300
-#: ../libpurple/protocols/msnp9/msn.c:317
-#: ../libpurple/protocols/msnp9/msn.c:334
-#: ../libpurple/protocols/myspace/user.c:581
-#: ../libpurple/protocols/myspace/user.c:675
-#: ../libpurple/protocols/oscar/oscar.c:6208
-#: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1193
-#: ../libpurple/protocols/silc/chat.c:448
-#: ../libpurple/protocols/silc/chat.c:485
-#: ../libpurple/protocols/silc/chat.c:752
-#: ../libpurple/protocols/silc/ops.c:1306
-#: ../libpurple/protocols/silc/ops.c:1832
-#: ../libpurple/protocols/silc/silc.c:1038
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1191
-#: ../libpurple/protocols/silc10/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:464
-#: ../libpurple/protocols/silc10/chat.c:729
-#: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1909
-#: ../libpurple/protocols/silc10/silc.c:741
-#: ../libpurple/protocols/yahoo/yahoo.c:992
-#: ../libpurple/protocols/yahoo/yahoo.c:3563
-#: ../libpurple/protocols/yahoo/yahoo.c:3574 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:767 ../pidgin/gtkdialogs.c:906
-#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../finch/gntblist.c:2706 ../pidgin/gtkdialogs.c:762
 msgid "New Instant Message"
 msgstr "Mensaje instant叩neo nuevo"
 
-#: ../finch/gntblist.c:2708 ../pidgin/gtkdialogs.c:764
 msgid "Please enter the username or alias of the person you would like to IM."
-msgstr "Introduzca el nombre de usuario o apodo de la persona con la que quiere comunicarse."
-
-#: ../finch/gntblist.c:2759
+msgstr ""
+"Introduzca el nombre de usuario o apodo de la persona con la que quiere "
+"comunicarse."
+
 msgid "Channel"
 msgstr "Canal"
 
-#: ../finch/gntblist.c:2771 ../pidgin/gtkblist.c:1036
 msgid "Join a Chat"
 msgstr "Unirse a un chat"
 
-#: ../finch/gntblist.c:2773
 msgid "Please enter the name of the chat you want to join."
 msgstr "Introduzca el nombre del chat al que quiere unirse."
 
-#: ../finch/gntblist.c:2775 ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "Unirse"
 
-#: ../finch/gntblist.c:2834 ../pidgin/gtkdialogs.c:995
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
@@ -803,84 +444,64 @@
 "ver informaci坦n de registro."
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2882 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "Opciones"
 
-#: ../finch/gntblist.c:2888
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../finch/gntblist.c:2893
 msgid "Block/Unblock..."
 msgstr "Bloquear/Desbloquear..."
 
-#: ../finch/gntblist.c:2898
 msgid "Join Chat..."
 msgstr "Unirse a un chat..."
 
-#: ../finch/gntblist.c:2903 ../finch/gntconv.c:611
 msgid "View Log..."
 msgstr "Ver registro..."
 
-#: ../finch/gntblist.c:2908
+msgid "View All Logs"
+msgstr "Mostrar todos los registros"
+
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../finch/gntblist.c:2913
 msgid "Empty groups"
 msgstr "Grupos vac鱈os"
 
-#: ../finch/gntblist.c:2920
 msgid "Offline buddies"
 msgstr "Amigos desconectados"
 
-#: ../finch/gntblist.c:2927
 msgid "Sort"
 msgstr "Ordenar"
 
-#: ../finch/gntblist.c:2932
 msgid "By Status"
 msgstr "Por estado"
 
-#: ../finch/gntblist.c:2937 ../pidgin/gtkblist.c:4322
 msgid "Alphabetically"
 msgstr "Alfab辿ticamente"
 
-#: ../finch/gntblist.c:2942
 msgid "By Log Size"
 msgstr "Por tama単o de registro"
 
-#: ../finch/gntblist.c:2953
 msgid "Buddy"
 msgstr "Amigo"
 
-#: ../finch/gntblist.c:2958 ../libpurple/protocols/oscar/oscar.c:649
-#: ../libpurple/protocols/silc/silc.c:984
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:553
 msgid "Chat"
 msgstr "Charlar"
 
-#: ../finch/gntblist.c:2968 ../finch/plugins/grouping.c:255
 msgid "Grouping"
 msgstr "Agrupar"
 
-#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "Importaci坦n de certificado"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "Especifique un nombre de sistema"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr ""
 "Especifique el nombre de sistema para el que se utilizar叩 este certificado."
 
-#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -889,19 +510,15 @@
 "No se pudo importar el archivo %s.\n"
 "Aseg炭rese de que el fichero puede leerse y que est叩 en formato PEM.\n"
 
-#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "Error en la importaci坦n de certificado"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "Fall坦 la importaci坦n del certificado X.509"
 
-#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "Seleccione un certificado PEM"
 
-#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -910,24 +527,19 @@
 "Fall坦 la exportaci坦n al fichero %s.\n"
 "Aseg炭rese de que tiene permisos de escritura en la ruta destino\n"
 
-#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "Error en la exportaci坦n de certificado"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "Fall坦 la exportaci坦n del certificado X.509"
 
-#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
 msgstr "Exportaci坦n de certificado PEM X.509"
 
-#: ../finch/gntcertmgr.c:187
 #, c-format
 msgid "Certificate for %s"
 msgstr "Certificado para %s"
 
-#: ../finch/gntcertmgr.c:194
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -940,57 +552,38 @@
 "Huella SHA1:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:197
 msgid "SSL Host Certificate"
 msgstr "Certificado de equipo SSL"
 
-#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "多Seguro que desea borrar el certificado para %s?"
 
-#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
 msgstr "Confirme el borrado del certificado"
 
-#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
 msgstr "Gestor de certificados"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:695
-#: ../libpurple/protocols/silc/silc.c:1223
-#: ../libpurple/protocols/silc10/silc.c:924 ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "Servidor"
 
-#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1697
-#: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "Info"
 
 #. Close button
-#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:253 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:220 ../finch/gntplugin.c:413 ../finch/gntpounce.c:750
-#: ../finch/gntroomlist.c:275 ../finch/gntstatus.c:216
-#: ../libpurple/protocols/msn/msn.c:417 ../libpurple/protocols/msnp9/msn.c:400
-#: ../libpurple/protocols/silc/util.c:385
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2377
-#: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "%s se ha desconectado."
 
-#: ../finch/gntconn.c:130
 #, c-format
 msgid ""
 "%s\n"
@@ -1003,11 +596,9 @@
 "Finch no intentar叩 reconectarse a esta cuenta hasta que corrija el error y "
 "reactive la cuenta."
 
-#: ../finch/gntconn.c:139
 msgid "Re-enable Account"
 msgstr "Reactivar cuenta"
 
-#: ../finch/gntconn.c:156
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
@@ -1015,46 +606,36 @@
 "Se ha desconectado la cuenta y ya no est叩 en el chat. Se unir叩 "
 "autom叩ticamenet al chat cuando se vuelva a conectar la cuenta."
 
-#: ../finch/gntconv.c:159
 msgid "No such command."
 msgstr "No existe esa orden."
 
-#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:494
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Error sint叩ctico:  Vd. no escribi坦 suficientes argumentos para esa orden."
 
-#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:500
 msgid "Your command failed for an unknown reason."
 msgstr "Su orden ha fallado por motivos desconocidos."
 
-#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:507
 msgid "That command only works in chats, not IMs."
 msgstr "Esa orden s坦lo funciona en chats, no en MIs."
 
-#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:510
 msgid "That command only works in IMs, not chats."
 msgstr "Esa orden s坦lo funciona en MIs, no en chats."
 
-#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:515
 msgid "That command doesn't work on this protocol."
 msgstr "Esa orden no funciona en este protocolo."
 
-#: ../finch/gntconv.c:188
 msgid "Message was not sent, because you are not signed on."
 msgstr "No se pudo enviar el mensaje porque no se ha conectado."
 
-#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:291
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:296 ../finch/gntconv.c:882 ../pidgin/gtkconv.c:3566
 #, c-format
 msgid ""
 "\n"
@@ -1063,69 +644,72 @@
 "\n"
 "%s est叩 escribiendo..."
 
-#: ../finch/gntconv.c:315
 msgid "You have left this chat."
 msgstr "Ha dejado este chat"
 
-#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1403
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Se inici坦 el registro. A partir de ahora se registrar叩n todos los mensajes "
 "de esta conversaci坦n."
 
-#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1411
 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:523
 msgid "Send To"
 msgstr "Enviar a"
 
-#: ../finch/gntconv.c:568
+msgid "Invite message"
+msgstr "Mensaje de invitacio"
+
+msgid "Invite"
+msgstr "Invitar"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+"Introduzca el nombre de usuario al que desea invitar,\\n\n"
+"junto con un mensaje de invitaci坦n opcional."
+
 msgid "Conversation"
 msgstr "Conversaci坦n"
 
-#: ../finch/gntconv.c:574
 msgid "Clear Scrollback"
 msgstr "Limpiar hist坦rico"
 
-#: ../finch/gntconv.c:578 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Mostrar marcas de tiempo"
 
-#: ../finch/gntconv.c:596
 msgid "Add Buddy Pounce..."
 msgstr "A単adir aviso de amigo..."
 
-#: ../finch/gntconv.c:615
+msgid "Invite..."
+msgstr "Invitar..."
+
 msgid "Enable Logging"
 msgstr "Habilitar registro"
 
-#: ../finch/gntconv.c:621
 msgid "Enable Sounds"
 msgstr "Habilitar sonidos"
 
-#: ../finch/gntconv.c:835
 msgid "<AUTO-REPLY> "
 msgstr "<RESPUESTA AUTOM�TICA> "
 
-#. Print the list of users in the room
-#: ../finch/gntconv.c:970
-msgid "List of users:\n"
-msgstr "Lista de usuarios:\n"
-
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:339
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "Lista de %d usuario:\n"
+msgstr[1] "Lista de %d usuario:\n"
+
 msgid "Supported debug options are:  version"
 msgstr "Las opciones de depuraci坦n soportadas son:  version"
 
-#: ../finch/gntconv.c:1168 ../pidgin/gtkconv.c:391
 msgid "No such command (in this context)."
 msgstr "No existe esa orden (en este contexto)."
 
-#: ../finch/gntconv.c:1171 ../pidgin/gtkconv.c:394
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1133,7 +717,20 @@
 "Utilice \"/help &lt;orden&gt;\" para obtener ayuda de una orden concreta.\n"
 "Las siguientes 坦rdenes est叩n disponibles en este contexto:\n"
 
-#: ../finch/gntconv.c:1244 ../pidgin/gtkconv.c:7932
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s no es una clase de mensajes v叩lida. Consulte 束/help msgcolor損 para ver las "
+"clases de mensaje v叩lidas."
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+"%s no es un color v叩lido. Consulte 束/help msgcolor損 para ver los colores "
+"v叩lidos."
+
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -1141,12 +738,10 @@
 "say &lt;mensaje;gt;:  Enviar un mensaje como si no se estuviera utilizando "
 "una orden."
 
-#: ../finch/gntconv.c:1247 ../pidgin/gtkconv.c:7935
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;acci坦n&gt;: enviar una acci坦n estilo IRC a un amigo o a un chat."
 
-#: ../finch/gntconv.c:1250 ../pidgin/gtkconv.c:7938
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -1154,48 +749,52 @@
 "debug &lt;opci坦n&gt;: Enviar informaci坦n de depuraci坦n sobre la conversaci坦n "
 "actual."
 
-#: ../finch/gntconv.c:1253 ../pidgin/gtkconv.c:7941
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: limpia el hist坦rico de la ventana de conversaci坦n."
 
-#: ../finch/gntconv.c:1256 ../pidgin/gtkconv.c:7947
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;orden&gt;:  Recibir ayuda sobre una orden concreta."
 
-#: ../finch/gntconv.c:1259
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Muestra la lista de usuarios en el chat."
 
-#: ../finch/gntconv.c:1264
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Mostrar la ventana de complementos."
 
-#: ../finch/gntconv.c:1267
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostrar la lista de amigos."
 
-#: ../finch/gntconv.c:1270
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Muestra la ventana de cuentas."
 
-#: ../finch/gntconv.c:1273
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Muestra la ventana de depuraci坦n."
 
-#: ../finch/gntconv.c:1276
 msgid "prefs: Show the preference window."
 msgstr "prefs: Muestra la ventana de preferencias."
 
-#: ../finch/gntconv.c:1279
 msgid "statuses: Show the savedstatuses window."
 msgstr "status: Muestra la ventana 束savedstatuses損."
 
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:967 ../pidgin/gtkconv.c:2707
-#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
+# TODO - Can colors and clases be translated here?
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;clase&gt; &lt;primer plano&gt; &lt;segundo plano&gt;: Fija el "
+"color para distintas clases de mensajes en la ventana de conversaci坦n."
+"<br>    &lt;clase&gt;: send (enviar), receive (recibir), highlight (marcar), "
+"action (acci坦n), timestamp (marca de tiempo)<br>    &lt;primer plano/segundo "
+"plano&gt;: negro, rojo, verde, az炭l, blanco, gris, gris oscuro, magenta, "
+"cian, 束default損 (por omisi坦n)<br><br>EJEMPLO:<br>    msgcolor send cian "
+"default"
+
 msgid "Unable to open file."
 msgstr "No se pudo leer el archivo."
 
-#: ../finch/gntdebug.c:271 ../finch/gntui.c:98 ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "Ventana de depuraci坦n"
 
@@ -1203,144 +802,96 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:751
 msgid "Clear"
 msgstr "Limpiar"
 
-#: ../finch/gntdebug.c:303
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:760
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../finch/gntft.c:120 ../pidgin/gtkft.c:229
-#, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Trasferencias de archivo - %d%% de %d archivos"
+#, c-format
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "Trasferencias de archivo - %d%% de %d archivo"
+msgstr[1] "Trasferencias de archivo - %d%% de %d archivos"
 
 #. Create the window.
-#: ../finch/gntft.c:125 ../finch/gntft.c:212 ../finch/gntui.c:99
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Transferencia de archivos"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Tama単o"
 
-#: ../finch/gntft.c:217
 msgid "Speed"
 msgstr "Velocidad"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Restante"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:217 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:381
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/jabber/buddy.c:809
-#: ../libpurple/protocols/jabber/buddy.c:813
-#: ../libpurple/protocols/jabber/buddy.c:972
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/msn/msn.c:631 ../libpurple/protocols/msn/msn.c:641
-#: ../libpurple/protocols/msn/msn.c:646 ../libpurple/protocols/msn/msn.c:649
-#: ../libpurple/protocols/msnp9/msn.c:540
-#: ../libpurple/protocols/novell/novell.c:2853
-#: ../libpurple/protocols/oscar/oscar.c:822
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:829
-#: ../libpurple/protocols/oscar/oscar.c:2756
-#: ../libpurple/protocols/oscar/oscar.c:3819
-#: ../libpurple/protocols/sametime/sametime.c:3315
-#: ../libpurple/protocols/sametime/sametime.c:4206
-#: ../libpurple/protocols/yahoo/yahoo.c:3305 ../pidgin/gtkblist.c:3415
-#: ../pidgin/gtkblist.c:3429 ../pidgin/gtkblist.c:3431
-#: ../pidgin/gtksavedstatuses.c:990 ../pidgin/gtksavedstatuses.c:1134
 msgid "Status"
 msgstr "Estado"
 
-#: ../finch/gntft.c:227
 msgid "Close this window when all transfers finish"
 msgstr "Cerrar esta ventana cuando todas las transferencias terminen"
 
-#: ../finch/gntft.c:234
 msgid "Clear finished transfers"
 msgstr "Limpiar transferencias terminadas"
 
-#: ../finch/gntft.c:248 ../finch/gntroomlist.c:272
 msgid "Stop"
 msgstr "Parar"
 
-#: ../finch/gntft.c:321 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:934
 msgid "Waiting for transfer to begin"
 msgstr "Esperando el comienzo de la transferencia"
 
-#: ../finch/gntft.c:388 ../pidgin/gtkft.c:163 ../pidgin/gtkft.c:1015
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: ../finch/gntft.c:390 ../pidgin/gtkft.c:1017
 msgid "Failed"
 msgstr "Fall坦"
 
-#: ../finch/gntft.c:436 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:447
 msgid "Sent"
 msgstr "Enviado"
 
-#: ../finch/gntft.c:447
 msgid "Received"
 msgstr "Recibido:"
 
-#: ../finch/gntft.c:448 ../pidgin/gtkft.c:160 ../pidgin/gtkft.c:1080
 msgid "Finished"
 msgstr "Terminado"
 
-#: ../finch/gntft.c:450
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Se guard坦 el archivo como %s."
 
-#: ../finch/gntft.c:457
 msgid "Sending"
 msgstr "Enviando"
 
-#: ../finch/gntft.c:457
 msgid "Receiving"
 msgstr "Recibiendo"
 
-#: ../finch/gntlog.c:184
 #, c-format
 msgid "Conversation in %s on %s"
 msgstr "Conversaciones en %s sobre %s"
 
-#: ../finch/gntlog.c:187
 #, c-format
 msgid "Conversation with %s on %s"
 msgstr "Conversaci坦n con %s sobre %s"
 
-#: ../finch/gntlog.c:230 ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../finch/gntlog.c:270 ../pidgin/gtklog.c:550
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -1348,7 +899,6 @@
 "S坦lo se registrar叩n los eventos del sistema cuando est辿 habilitada la opci坦n "
 "束Registrar todos los cambios de estado en el registro del sistema損."
 
-#: ../finch/gntlog.c:274 ../pidgin/gtklog.c:554
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -1356,111 +906,85 @@
 "S坦lo se registrar叩n los mensajes instant叩neos si est叩 habilitada la "
 "preferencia 束Registrar todos los mensajes instant叩neos損."
 
-#: ../finch/gntlog.c:277 ../pidgin/gtklog.c:557
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Los chats s坦lo ser叩n registrados si la opci坦n \"Registrar todos los chats\" "
 "est叩 habilitada en las preferencias."
 
-#: ../finch/gntlog.c:283 ../pidgin/gtklog.c:566
 msgid "No logs were found"
 msgstr "No se encontraron registros"
 
-#: ../finch/gntlog.c:330 ../pidgin/gtklog.c:646
 msgid "Total log size:"
 msgstr "Tama単o total del registro:"
 
 #. Search box *********
-#: ../finch/gntlog.c:338
 msgid "Scroll/Search: "
 msgstr "Deslizar/Buscar: "
 
-#: ../finch/gntlog.c:382 ../pidgin/gtklog.c:716
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversaciones en %s"
 
-#: ../finch/gntlog.c:390 ../finch/gntlog.c:448 ../pidgin/gtklog.c:724
-#: ../pidgin/gtklog.c:799
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversaciones con %s"
 
-#: ../finch/gntlog.c:473 ../pidgin/gtklog.c:824
+msgid "All Conversations"
+msgstr "Todas las conversaciones"
+
 msgid "System Log"
 msgstr "Registro del Sistema"
 
-#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "Correos"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "臓Tiene correo!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:537
 msgid "Sender"
 msgstr "Remitente"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:544
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../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:226 ../pidgin/gtknotify.c:352
 msgid "New Mail"
 msgstr "Nuevo correo"
 
-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:984
 #, c-format
 msgid "Info for %s"
 msgstr "Informaci坦n sobre %s:"
 
-#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:985
 msgid "Buddy Information"
 msgstr "Informaci坦n de amigos"
 
-#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1658
 msgid "IM"
 msgstr "MI"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3525
-msgid "Invite"
-msgstr "Invitar"
-
-#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: ../finch/gntnotify.c:426
 msgid "URI"
 msgstr "URI"
 
-#: ../finch/gntplugin.c:84 ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "ERROR"
 
-#: ../finch/gntplugin.c:84
 msgid "loading plugin failed"
 msgstr "fall坦 la carga del complemento"
 
-#: ../finch/gntplugin.c:93
 msgid "unloading plugin failed"
 msgstr "fall坦 la descarga del complemento"
 
-#: ../finch/gntplugin.c:139
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1477,42 +1001,33 @@
 "Sitio web: %s\n"
 "Nombre de fichero: %s\n"
 
-#: ../finch/gntplugin.c:197
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Debe cargar el complemento antes de poder configurarlo."
 
-#: ../finch/gntplugin.c:245
 msgid "No configuration options for this plugin."
 msgstr "No hay opciones de configuraci坦n para este complemento."
 
-#: ../finch/gntplugin.c:266
 msgid "Error loading plugin"
 msgstr "Error al cargar el complemento"
 
-#: ../finch/gntplugin.c:267
 msgid "The selected file is not a valid plugin."
 msgstr "El fichero seleccionado no es un complemento v叩lido."
 
-#: ../finch/gntplugin.c:268
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
 "Para ver el mensaje exacto consulte la ventana de depuraci坦n y vuelva a "
 "intentarlo de nuevo."
 
-#: ../finch/gntplugin.c:331
 msgid "Select plugin to install"
 msgstr "Seleccione el complemento a instalar"
 
-#: ../finch/gntplugin.c:357
 msgid "You can (un)load plugins from the following list."
 msgstr "Puede (des)cargar complementos de la lista mostrada a continuaci坦n."
 
-#: ../finch/gntplugin.c:408
 msgid "Install Plugin..."
 msgstr "Instalar complemento..."
 
-#: ../finch/gntplugin.c:418
 msgid "Configure Plugin"
 msgstr "Configurar complemento"
 
@@ -1521,387 +1036,290 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:524 ../finch/gntplugin.c:531 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2180
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../finch/gntpounce.c:193 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Indique el amigo del que avisar."
 
-#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Nuevo aviso de amigo"
 
-#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Editar aviso de amigo"
 
-#: ../finch/gntpounce.c:343
 msgid "Pounce Who"
 msgstr "Avisar a qui辿n"
 
 #. Account:
-#: ../finch/gntpounce.c:346 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Cuenta:"
 
-#: ../finch/gntpounce.c:368
 msgid "Buddy name:"
 msgstr "Nombre del amigo:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:386 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "Avisar cuando un amigo..."
 
-#: ../finch/gntpounce.c:388
 msgid "Signs on"
 msgstr "Se conecta"
 
-#: ../finch/gntpounce.c:389
 msgid "Signs off"
 msgstr "Se desconecta"
 
-#: ../finch/gntpounce.c:390
 msgid "Goes away"
 msgstr "Se ausenta"
 
-#: ../finch/gntpounce.c:391
 msgid "Returns from away"
 msgstr "Deja de estar ausente"
 
-#: ../finch/gntpounce.c:392
 msgid "Becomes idle"
 msgstr "Est叩 inactivo"
 
-#: ../finch/gntpounce.c:393
 msgid "Is no longer idle"
 msgstr "Ya no est叩 inactivo."
 
-#: ../finch/gntpounce.c:394
 msgid "Starts typing"
 msgstr "Empieza a escribir"
 
-#: ../finch/gntpounce.c:395
 msgid "Pauses while typing"
 msgstr "Hace una pausa mientras escribe"
 
-#: ../finch/gntpounce.c:396
 msgid "Stops typing"
 msgstr "Deja de escribir"
 
-#: ../finch/gntpounce.c:397
 msgid "Sends a message"
 msgstr "Env鱈a un mensaje"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:426 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "Acci坦n"
 
-#: ../finch/gntpounce.c:428
 msgid "Open an IM window"
 msgstr "Abrir una ventana de MI"
 
-#: ../finch/gntpounce.c:429
 msgid "Pop up a notification"
 msgstr "Notificaci坦n con una ventana emergente"
 
-#: ../finch/gntpounce.c:430
 msgid "Send a message"
 msgstr "Enviar un mensaje"
 
-#: ../finch/gntpounce.c:431
 msgid "Execute a command"
 msgstr "Ejecutar una orden"
 
-#: ../finch/gntpounce.c:432
 msgid "Play a sound"
 msgstr "Reproducir un sonido"
 
-#: ../finch/gntpounce.c:460
 msgid "Pounce only when my status is not Available"
 msgstr "S坦lo avisar cuando mi estado no sea Disponible"
 
-#: ../finch/gntpounce.c:462 ../pidgin/gtkpounce.c:1294
 msgid "Recurring"
 msgstr "Recurrente"
 
-#: ../finch/gntpounce.c:630
 msgid "Cannot create pounce"
 msgstr "No se puede crear el aviso"
 
-#: ../finch/gntpounce.c:631
 msgid "You do not have any accounts."
 msgstr "No tiene ninguna cuenta."
 
-#: ../finch/gntpounce.c:632
 msgid "You must create an account first before you can create a pounce."
 msgstr "Antes de poder crear un aviso debe crear primero una cuenta."
 
-#: ../finch/gntpounce.c:674 ../pidgin/gtkpounce.c:1108
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "多Est叩 seguro que desea borrar el aviso en %s para %s?"
 
-#: ../finch/gntpounce.c:708 ../finch/gntui.c:96 ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "Avisos de amigos"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1436
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ha comenzado a escribirle algo (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1438
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s ha parado mientras le escrib鱈a algo (%s)"
 
-#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1440
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se ha conectado (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1442
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s volvi坦 de su inactividad (%s)"
 
-#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1444
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ha dejado de estar ausente (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1446
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha dejado de escribirle (%s)"
 
-#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1448
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se ha desconectado (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1450
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s est叩 inactivo (%s)"
 
-#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se ha marchado. (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s le ha enviado un mensaje. (%s)"
 
-#: ../finch/gntpounce.c:845 ../pidgin/gtkpounce.c:1455
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de aviso desconocido. 臓Por favor, informe de esto! "
 
-#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "Basado en el uso del teclado"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2061
 msgid "From last sent message"
 msgstr "Del 炭ltimo mensaje enviado"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:948 ../pidgin/gtkprefs.c:956
-#: ../pidgin/gtkprefs.c:2060 ../pidgin/gtkprefs.c:2074
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nunca"
 
-#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "Mostrar tiempos de inactividad"
 
-#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "Mostrar amigos desconectados"
 
-#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "Notificar a los amigos cuando les est辿 escribiendo"
 
-#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:153
 msgid "Log format"
 msgstr "Formato de registro"
 
-#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:143
 msgid "Log IMs"
 msgstr "Registrar MIs"
 
-#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:144
 msgid "Log chats"
 msgstr "Registrar chats"
 
-#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "Registrar los eventos de cambios de estado"
 
-#: ../finch/gntprefs.c:207
 msgid "Report Idle time"
 msgstr "Mostrar el tiempo de inactividad"
 
-#: ../finch/gntprefs.c:208
 msgid "Change status when idle"
 msgstr "Cambiar el estado cuando est辿 inactivo"
 
-#: ../finch/gntprefs.c:209
 msgid "Minutes before changing status"
 msgstr "Minutos antes de cambiar el estado"
 
-#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr "Cambiar estado a"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1046 ../pidgin/gtkprefs.c:2147
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversaciones"
 
-#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:151
-#: ../pidgin/gtkprefs.c:1617 ../pidgin/gtkprefs.c:2158
 msgid "Logging"
 msgstr "Registro"
 
-#: ../finch/gntrequest.c:381
 msgid "You must fill all the required fields."
 msgstr "Debe completar todos los campos obligatorios."
 
-#: ../finch/gntrequest.c:382
 msgid "The required fields are underlined."
 msgstr "Los campos obligatorios est叩n subrayados."
 
-#: ../finch/gntrequest.c:640
 msgid "Not implemented yet."
 msgstr "No implementado a炭n."
 
-#: ../finch/gntrequest.c:745 ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
 msgid "Save File..."
 msgstr "Enviar archivo.."
 
-#: ../finch/gntrequest.c:745 ../pidgin/gtkrequest.c:1554
-#: ../pidgin/gtkrequest.c:1600
 msgid "Open File..."
 msgstr "Abrir archivo..."
 
-#: ../finch/gntrequest.c:762
 msgid "Choose Location..."
 msgstr "Escojer ubicaci坦n..."
 
-#: ../finch/gntroomlist.c:208
 msgid "Hit 'Enter' to find more rooms of this category."
 msgstr "Pulse 束Intro損 para buscar m叩s salas en esta categor鱈a."
 
-#: ../finch/gntroomlist.c:273
 msgid "Get"
 msgstr "Obtener"
 
 #. Create the window.
-#: ../finch/gntroomlist.c:285 ../finch/gntui.c:101 ../pidgin/gtkroomlist.c:530
 msgid "Room List"
 msgstr "Lista de salas"
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Se conecta un amigo"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Se desconecta un amigo"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Se recibe un mensaje"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Se recibe un mensaje que comienza una conversaci坦n"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Se env鱈a un mensaje"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Alguien entra al chat"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Alguien deja el chat"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Usted habla en el chat"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Otros hablan en el chat"
 
-#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:73
 msgid "Someone says your username in chat"
 msgstr "Alguien dice su nombre en el chat"
 
-#: ../finch/gntsound.c:367 ../pidgin/gtksound.c:309
 msgid "GStreamer Failure"
 msgstr "Fallo de gstreamer"
 
-#: ../finch/gntsound.c:368 ../pidgin/gtksound.c:310
 msgid "GStreamer failed to initialize."
 msgstr "No se pudo inicializar gstreamer."
 
-#: ../finch/gntsound.c:722 ../finch/gntsound.c:808 ../pidgin/gtkprefs.c:1741
-#: ../pidgin/gtkprefs.c:1830 ../pidgin/gtkprefs.c:2003
 msgid "(default)"
 msgstr "(por omisi坦n)"
 
-#: ../finch/gntsound.c:735
 msgid "Select Sound File ..."
 msgstr "Seleccione un archivo de sonido..."
 
-#: ../finch/gntsound.c:910
 msgid "Sound Preferences"
 msgstr "Preferencias de sonido"
 
-#: ../finch/gntsound.c:921
 msgid "Profiles"
 msgstr "Perfiles"
 
-#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1868
 msgid "Automatic"
 msgstr "Autom叩tico"
 
-#: ../finch/gntsound.c:963
 msgid "Console Beep"
 msgstr "Timbre de la consola"
 
-#: ../finch/gntsound.c:964 ../pidgin/gtkprefs.c:1872
 msgid "Command"
 msgstr "Comando"
 
-#: ../finch/gntsound.c:965
 msgid "No Sound"
 msgstr "Sin sonido"
 
-#: ../finch/gntsound.c:967 ../pidgin/gtkprefs.c:1863
 msgid "Sound Method"
 msgstr "M辿todo para reproducir sonidos"
 
-#: ../finch/gntsound.c:972
 msgid "Method: "
 msgstr "M辿todo:"
 
-#: ../finch/gntsound.c:979
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1911,82 +1329,56 @@
 "(%s para nombre de archivo)"
 
 #. Sound options
-#: ../finch/gntsound.c:987 ../pidgin/gtkprefs.c:1894
 msgid "Sound Options"
 msgstr "Opciones de sonido"
 
-#: ../finch/gntsound.c:988
 msgid "Sounds when conversation has focus"
 msgstr "Suena cuando la conversaci坦n obtiene el foco"
 
-#: ../finch/gntsound.c:996 ../pidgin/gtkprefs.c:946 ../pidgin/gtkprefs.c:958
-#: ../pidgin/gtkprefs.c:1901 ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Siempre"
 
-#: ../finch/gntsound.c:997 ../pidgin/gtkprefs.c:1899
 msgid "Only when available"
 msgstr "S坦lo cuando estoy disponible"
 
-#: ../finch/gntsound.c:998 ../pidgin/gtkprefs.c:1900
 msgid "Only when not available"
 msgstr "S坦lo cuando no estoy disponible"
 
-#: ../finch/gntsound.c:1005
 msgid "Volume(0-100):"
 msgstr "Volumen(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1024 ../pidgin/gtkprefs.c:1929
 msgid "Sound Events"
 msgstr "Eventos de sonido"
 
-#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1988
 msgid "Event"
 msgstr "Acontecimiento"
 
-#: ../finch/gntsound.c:1026
 msgid "File"
 msgstr "Archivo"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:2007
 msgid "Test"
 msgstr "Probar"
 
-#: ../finch/gntsound.c:1048 ../pidgin/gtkprefs.c:2011
 msgid "Reset"
 msgstr "Restablecer"
 
-#: ../finch/gntsound.c:1051 ../pidgin/gtkprefs.c:2015
 msgid "Choose..."
 msgstr "Seleccionar..."
 
-#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "多Est叩 seguro que quiere borrar a 束%s損?"
 
-#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "Borrar estado"
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Estados guardados"
 
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:321
-#: ../libpurple/protocols/jabber/buddy.c:1397
-#: ../libpurple/protocols/msn/msn.c:747
-#: ../libpurple/protocols/myspace/myspace.c:171
-#: ../libpurple/protocols/novell/novell.c:1493
-#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "T鱈tulo"
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Tipo"
 
@@ -1998,133 +1390,72 @@
 #. user_settable
 #. 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:293
-#: ../libpurple/protocols/bonjour/bonjour.c:300
-#: ../libpurple/protocols/bonjour/bonjour.c:383
-#: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
-#: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
-#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:245
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/jabber.c:1639
-#: ../libpurple/protocols/jabber/jabber.c:1653
-#: ../libpurple/protocols/jabber/jabber.c:1667
-#: ../libpurple/protocols/jabber/jabber.c:1683
-#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msn/msn.c:705
-#: ../libpurple/protocols/msn/msn.c:711 ../libpurple/protocols/msn/msn.c:717
-#: ../libpurple/protocols/msn/msn.c:722 ../libpurple/protocols/msn/msn.c:727
-#: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2856
-#: ../libpurple/protocols/novell/novell.c:2959
-#: ../libpurple/protocols/novell/novell.c:2965
-#: ../libpurple/protocols/novell/novell.c:2971
-#: ../libpurple/protocols/oscar/oscar.c:5669
-#: ../libpurple/protocols/oscar/oscar.c:5887
-#: ../libpurple/protocols/oscar/oscar.c:5901
-#: ../libpurple/protocols/oscar/oscar.c:5917
-#: ../libpurple/protocols/oscar/oscar.c:5924
-#: ../libpurple/protocols/oscar/oscar.c:5931
-#: ../libpurple/protocols/sametime/sametime.c:3338
-#: ../libpurple/protocols/sametime/sametime.c:3344
-#: ../libpurple/protocols/sametime/sametime.c:3350
-#: ../libpurple/protocols/sametime/sametime.c:3429
-#: ../libpurple/protocols/silc/buddy.c:1554
-#: ../libpurple/protocols/silc10/buddy.c:1554
-#: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3817
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
-#: ../libpurple/protocols/zephyr/zephyr.c:2352
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
 msgstr "Mensaje"
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Usar"
 
-#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr "T鱈tulo no v叩lido"
 
-#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "Introduzca un t鱈tulo no vac鱈o para el estado."
 
-#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "T鱈tulo duplicado"
 
-#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "Introduzca un t鱈tulo distinto para el estado."
 
-#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Sub-estado"
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "Mensaje:"
 
-#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "Editar estado"
 
-#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "Usar un estado diferente para las siguientes cuentas"
 
 #. Save & Use
-#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "Guardar y usar"
 
-#: ../finch/gntui.c:97
 msgid "Certificates"
 msgstr "Certificados"
 
-#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2149
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: ../finch/gntui.c:104
 msgid "Statuses"
 msgstr "Estados"
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
 msgstr "Erro al cargar el complemento."
 
-#: ../finch/plugins/gntclipboard.c:116
 msgid "Couldn't find X display"
 msgstr "No se pudo encontrar la pantalla X"
 
-#: ../finch/plugins/gntclipboard.c:122
 msgid "Couldn't find window"
 msgstr "No se pudo encontrar la ventana"
 
-#: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr ""
 "No se pudo cargar este complemento porque no se construy坦 con soporte de X11."
 
-#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "PortapapelesGnt"
 
-#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Complemento de portapapeles"
 
-#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -2132,77 +1463,60 @@
 "El entorno de X tiene acceso a Los contenidos del portapapeles de gnt cuando "
 "estos cambian, si es posible."
 
-#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s se acaba de conectar"
 
-#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s se acaba de desconectar"
 
-#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s le env鱈o un mensaje"
 
-#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s dijo su apodo en %s"
 
-#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s envi坦 un mensaje en %s"
 
-#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Un amigo se conecta/desconecta"
 
-#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Recibe un MI"
 
-#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Alguien habla5~e en el chat"
 
-#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Alguien dice su nombre en el chat"
 
-#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Notificar con un 束toaster損 cuando"
 
-#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "臓Pitar tambi辿n!"
 
-#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "Fija la ventana de terminal como URGENTE."
 
-#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntFg"
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Complemento 束toaster損"
 
-#: ../finch/plugins/gnthistory.c:114 ../pidgin/plugins/history.c:132
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Conversaci坦n con %s sobre %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:172 ../pidgin/plugins/history.c:159
 msgid "History Plugin Requires Logging"
 msgstr "Debe estar conectad para utilizar el complemento de hist坦rico"
 
-#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:160
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -2214,17 +1528,14 @@
 "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:217
 msgid "GntHistory"
 msgstr "Hist坦ricoGnt"
 
-#: ../finch/plugins/gnthistory.c:219 ../pidgin/plugins/history.c:203
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
 "Muestra las conversaciones registradas previamente en las nuevas "
 "conversaciones."
 
-#: ../finch/plugins/gnthistory.c:220 ../pidgin/plugins/history.c:204
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -2232,170 +1543,115 @@
 "Cuando se abre una nueva conversaci坦n este complemento introduce la 炭ltima "
 "conversaci坦n en la conversaci坦n actual."
 
-#: ../finch/plugins/grouping.c:42 ../libpurple/protocols/oscar/oscar.c:740
+#, c-format
 msgid "Online"
 msgstr "Conectado"
 
-#: ../finch/plugins/grouping.c:44 ../finch/plugins/grouping.c:145
-#: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2082
-#: ../libpurple/protocols/novell/novell.c:2846
-#: ../libpurple/protocols/oscar/oscar.c:829
-#: ../libpurple/protocols/oscar/oscar.c:5719
-#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
-#: ../libpurple/protocols/qq/qq.c:293
-#: ../libpurple/protocols/yahoo/yahoo.c:3156 ../libpurple/status.c:155
-#: ../pidgin/gtkblist.c:3415 ../pidgin/gtkblist.c:3807
-#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1090
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3451
 msgid "Online Buddies"
 msgstr "Amigos conectados"
 
-#: ../finch/plugins/grouping.c:117
 msgid "Offline Buddies"
 msgstr "Amigos desconectados"
 
-#: ../finch/plugins/grouping.c:127
 msgid "Online/Offline"
 msgstr "Conectado/Desconectado"
 
-#: ../finch/plugins/grouping.c:168
 msgid "Meebo"
 msgstr "Meebo"
 
-#: ../finch/plugins/grouping.c:217
 msgid "No Grouping"
 msgstr "No agrupar"
 
-#: ../finch/plugins/grouping.c:257 ../finch/plugins/grouping.c:258
 msgid "Provides alternate buddylist grouping options."
 msgstr "Ofrece opciones adicionales para agrupar las listas de amigos."
 
-#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Lastlog"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: Busca sub-cadenas en el registro pasado."
 
-#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Complemento 束Lastlog損."
 
-#: ../libpurple/account.c:887
 msgid "accounts"
 msgstr "cuentas"
 
-#: ../libpurple/account.c:1063 ../libpurple/protocols/jabber/auth.c:204
-#: ../libpurple/protocols/silc/silc.c:473
 msgid "Password is required to sign on."
 msgstr "Para conectarse se necesita una contrase単a."
 
-#: ../libpurple/account.c:1097
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Introduzca la contrase単a para %s (%s)"
 
-#: ../libpurple/account.c:1104
 msgid "Enter Password"
 msgstr "Introduzca la contrase単a"
 
-#: ../libpurple/account.c:1109
 msgid "Save password"
 msgstr "Guardar la contrase単a"
 
-#: ../libpurple/account.c:1144 ../libpurple/connection.c:118
-#: ../libpurple/connection.c:191
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Falta el complemento de protocolo para %s"
 
-#: ../libpurple/account.c:1146 ../libpurple/connection.c:121
 msgid "Connection Error"
 msgstr "Error de conexi坦n"
 
-#: ../libpurple/account.c:1357 ../libpurple/protocols/gg/gg.c:708
-#: ../libpurple/protocols/jabber/jabber.c:1739
 msgid "New passwords do not match."
 msgstr "Las nuevas contrase単as no coinciden."
 
-#: ../libpurple/account.c:1370
 msgid "Fill out all fields completely."
 msgstr "Rellene todos los campos completamente."
 
-#: ../libpurple/account.c:1402
 msgid "Original password"
 msgstr "Contrase単a original"
 
-#: ../libpurple/account.c:1410
 msgid "New password"
 msgstr "Nueva contrase単a"
 
-#: ../libpurple/account.c:1418
 msgid "New password (again)"
 msgstr "Nueva contrase単a (otra vez)"
 
-#: ../libpurple/account.c:1425
 #, c-format
 msgid "Change password for %s"
 msgstr "Cambiar la contrase単a de %s"
 
-#: ../libpurple/account.c:1433
 msgid "Please enter your current password and your new password."
 msgstr "Introduzca su contrase単a actual y la contrase単a nueva."
 
-#: ../libpurple/account.c:1464
 #, c-format
 msgid "Change user information for %s"
 msgstr "Cambiar la informaci坦n del usuario %s"
 
-#: ../libpurple/account.c:1467 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Establecer su informaci坦n de usuario"
 
-#: ../libpurple/account.c:1938 ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:813
-#: ../libpurple/protocols/jabber/buddy.c:2078
-#: ../libpurple/protocols/jabber/buddy.c:2095
-#: ../libpurple/protocols/novell/novell.c:2849
-#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:166
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1348
-#: ../libpurple/blist.c:1558 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3442 ../pidgin/gtkblist.c:6317
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
-#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Amigos"
 
-#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "lista de amigos"
 
-#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr "(NO COINCIDE)"
 
 #. Make messages
-#: ../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:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2405,53 +1661,40 @@
 "Huella (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../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:894
 msgid "Certificate Authorities"
 msgstr "Autoridades de certificaci坦n"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1062
 msgid "SSL Peers Cache"
 msgstr "Cach辿 de servidores SSL"
 
 #. Make messages
-#: ../libpurple/certificate.c:1193
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "多Desea aceptar el certificado para %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1199
 msgid "SSL Certificate Verification"
 msgstr "Verificaci坦n de certificado SSL"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1208
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../libpurple/certificate.c:1209 ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:103
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Rechazar"
 
-#: ../libpurple/certificate.c:1210
 msgid "_View Certificate..."
 msgstr "_Ver certificado..."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1311
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
@@ -2460,7 +1703,6 @@
 "El certificado presentado por 束%s損 es autofirmado. No puede comprobarse de "
 "forma autom叩tica."
 
-#: ../libpurple/certificate.c:1329
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "La cadena de certificados presentada por %s no es v叩lida."
@@ -2470,16 +1712,13 @@
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1337 ../libpurple/certificate.c:1407
 msgid "SSL Certificate Error"
 msgstr "Error de certificado SSL"
 
-#: ../libpurple/certificate.c:1338
 msgid "Invalid certificate chain"
 msgstr "Cadena de certificado inv叩lida"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1359
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2488,14 +1727,12 @@
 "validar este certificado."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
 "Pidgin no conoce el certificado ra鱈z bajo el que este certificado dice "
 "haberse generado."
 
-#: ../libpurple/certificate.c:1399
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2505,7 +1742,6 @@
 "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:1408
 msgid "Invalid certificate authority signature"
 msgstr "Firma de autoridad de certificaci坦n inv叩lida"
 
@@ -2513,7 +1749,6 @@
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1434
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
@@ -2524,7 +1759,6 @@
 "piensa que se est叩 conectado."
 
 #. Make messages
-#: ../libpurple/certificate.c:1896
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2542,128 +1776,95 @@
 "Fecha de expiraci坦n: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1905
 msgid "Certificate Information"
 msgstr "Informaci坦n del certificado"
 
-#: ../libpurple/connection.c:120
 msgid "Registration Error"
 msgstr "Error de registro"
 
-#: ../libpurple/connection.c:193
 msgid "Unregistration Error"
 msgstr "Error de deregistro"
 
-#: ../libpurple/connection.c:347
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s se ha conectado"
 
-#: ../libpurple/connection.c:377
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s se ha desconectado"
 
-#: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2398
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:377
-#: ../libpurple/protocols/msnp9/servconn.c:139
-#: ../libpurple/protocols/msnp9/session.c:329
-#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "No se pudo enviar el mensaje: es demasiado grande."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "No se pudo enviar el mensaje a %s."
 
-#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "El mensaje es demasiado largo"
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:296
-#: ../libpurple/protocols/bonjour/jabber.c:339
 msgid "Unable to send message."
 msgstr "No se pudo enviar el mensaje."
 
-#: ../libpurple/conversation.c:1231
 msgid "Send Message"
 msgstr "Enviar un mensaje"
 
-#: ../libpurple/conversation.c:1234
 msgid "_Send Message"
 msgstr "Enviar un _mensaje"
 
-#: ../libpurple/conversation.c:1640
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ha entrado en la sala."
 
-#: ../libpurple/conversation.c:1643
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] ha entrado en la sala."
 
-#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "You are now known as %s"
 msgstr "Vd. ahora se llama %s"
 
-#: ../libpurple/conversation.c:1773
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ahora se llama %s"
 
-#: ../libpurple/conversation.c:1848
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha salido de la sala."
 
-#: ../libpurple/conversation.c:1851
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha salido de la sala (%s)."
 
-#: ../libpurple/dbus-server.c:586
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "No se pudo obtener la conexi坦n: %s"
 
-#: ../libpurple/dbus-server.c:598
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "No se pudo obtener un nombre: %s"
 
-#: ../libpurple/dbus-server.c:612
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "No se pudo obtener el nombre del servidor: %s"
 
-#: ../libpurple/dbus-server.h:86
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""
 "El servidor D-BUS de Purple no est叩 ejecut叩ndose por la raz坦n indicada a "
 "continuaci坦n"
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Sin nombre"
 
-#: ../libpurple/dnsquery.c:532
 msgid "Unable to create new resolver process\n"
 msgstr "No se pudo crear un proceso nuevo de resoluci坦n\n"
 
-#: ../libpurple/dnsquery.c:537
 msgid "Unable to send request to resolver process\n"
 msgstr "No se pudo enviar una solicitud al proceso de resoluci坦n\n"
 
-#: ../libpurple/dnsquery.c:570 ../libpurple/dnsquery.c:719
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2672,13 +1873,10 @@
 "Error al resolver %s: \n"
 "%s"
 
-#: ../libpurple/dnsquery.c:573 ../libpurple/dnsquery.c:733
-#: ../libpurple/dnsquery.c:851
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Error al resolver %s: %d"
 
-#: ../libpurple/dnsquery.c:595
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2687,20 +1885,17 @@
 "Error al leer del proceso de resoluci坦n:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:599
+#, 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:783
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Fall坦 en la creaci坦n de hilos: %s"
 
-#: ../libpurple/dnsquery.c:784
 msgid "Unknown reason"
 msgstr "Raz坦n desconocida"
 
-#: ../libpurple/ft.c:210
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2709,7 +1904,6 @@
 "Error al leer %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:214
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2718,7 +1912,6 @@
 "Error al escribir %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:218
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2727,39 +1920,31 @@
 "Error al acceder a %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:254
 msgid "Directory is not writable."
 msgstr "No se puede escribir en el directorio."
 
-#: ../libpurple/ft.c:269
 msgid "Cannot send a file of 0 bytes."
 msgstr "No se puede enviar un archivo de 0 bytes."
 
-#: ../libpurple/ft.c:279
 msgid "Cannot send a directory."
 msgstr "No se puede enviar un directorio."
 
-#: ../libpurple/ft.c:288
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s no es un archivo normal. No se sobreescribir叩.\n"
 
-#: ../libpurple/ft.c:348
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s quiere enviarle %s (%s)"
 
-#: ../libpurple/ft.c:355
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s quiere enviarle un fichero"
 
-#: ../libpurple/ft.c:398
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "多Aceptar solicitud de transferencia de archivo de %s?"
 
-#: ../libpurple/ft.c:402
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2770,133 +1955,105 @@
 "Servidor remoto: %s\n"
 "Puerto remoto: %d"
 
-#: ../libpurple/ft.c:437
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s se ofrece a enviarle el archivo %s"
 
-#: ../libpurple/ft.c:490
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s no es un nombre de archivo v叩lido.\n"
 
-#: ../libpurple/ft.c:511
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Se ofrece enviar %s a %s"
 
-#: ../libpurple/ft.c:523
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Comienza la transferencia de %s de %s"
 
-#: ../libpurple/ft.c:700
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Se ha completado la transferencia de %s"
 
-#: ../libpurple/ft.c:703
+#, c-format
 msgid "File transfer complete"
 msgstr "Transferencia de archivos completa"
 
-#: ../libpurple/ft.c:1138
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Vd. cancel坦 la transferencia de %s"
 
-#: ../libpurple/ft.c:1143
+#, c-format
 msgid "File transfer cancelled"
 msgstr "Transferencia de archivos cancelada"
 
-#: ../libpurple/ft.c:1201
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancel坦 la transferencia de %s"
 
-#: ../libpurple/ft.c:1206
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s cancel坦 la transferencia de archivos"
 
-#: ../libpurple/ft.c:1263
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Fall坦 la transferencia del archivo a %s."
 
-#: ../libpurple/ft.c:1265
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Fall坦 la transferencia del archivo de %s."
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Ejecutar la orden en un terminal"
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "La orden para gestionar URLs 束aim損, si se activan."
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "La orden para gestionar URLs 束gg損, si se activan."
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "La orden para gestionar URLs 束icq損, si se activan."
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "La orden para gestionar URLs 束irc損, si se activan."
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "La orden para gestionar URLs 束msnim損, si se activan."
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "La orden para gestionar URLs 束sip損, si se activan."
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "La orden para gestionar URLs 束xmpp損, si se activan."
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "La orden para gestionar URLs 束ymsgr損, si se activan."
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "El manejador para URLs 束aim損"
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "El manejador para URLs 束gg損"
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "El manejador para URLs 束icq損"
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "El manejador para URLs 束irc損"
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "El manejador para URLs 束msnim損"
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "El manejador para URLs 束sip損"
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "El manejador para URLs 束xmpp損"
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "El manejador para URLs 束ymsgr損"
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
@@ -2904,7 +2061,6 @@
 "Cierto si la orden especificada en la tecla 束command損 deber鱈a gestionar URLs "
 "束aim損."
 
-#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
@@ -2912,7 +2068,6 @@
 "Cierto si la orden especificada en la tecla 束command損 deber鱈a gestionar URLs "
 "束gg損."
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
@@ -2920,7 +2075,6 @@
 "Cierto si la orden especificada en la tecla 束command損 deber鱈a gestionar URLs "
 "束icq損."
 
-#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
@@ -2928,7 +2082,6 @@
 "Cierto si la orden especificada en la tecla 束command損 deber鱈a gestionar URLs "
 "束irc損."
 
-#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
@@ -2936,7 +2089,6 @@
 "Cierto si la orden especificada en la tecla 束command損 deber鱈a gestionar URLs "
 "束msnim損."
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
@@ -2944,7 +2096,6 @@
 "Cierto si la orden especificada en la tecla 束command損 deber鱈a gestionar URLs "
 "束sip損."
 
-#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
@@ -2952,7 +2103,6 @@
 "Cierto si la orden especificada en la tecla 束command損 deber鱈a gestionar URLs "
 "束xmpp損."
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
@@ -2960,7 +2110,6 @@
 "Cierto si la orden especificada en la tecla 束command損 deber鱈a gestionar URLs "
 "束ymsgr損."
 
-#: ../libpurple/gconf/purple.schemas.in.h:26
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
@@ -2968,64 +2117,49 @@
 "Cierto si la orden especifica para gestionar este tipo de URLs deber鱈a "
 "ejecutarse en un terminal."
 
-#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Si la orden deber鱈a gestionar URLs 束aim損"
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Si la orden deber鱈a gestionar URLs 束gg損"
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Si la orden deber鱈a gestionar URLs 束icq損"
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Si la orden deber鱈a gestionar URLs 束irc損"
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Si la orden deber鱈a gestionar URLs 束msnim損"
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Si la orden deber鱈a gestionar URLs 束sip損"
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Si la orden deber鱈a gestionar URLs 束xmpp損"
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Si la orden deber鱈a gestionar URLs 束ymsgr損"
 
-#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">El registro no tiene funci坦n de lectura</font></b>"
 
-#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "En claro"
 
-#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Formato antiguo plano"
 
-#: ../libpurple/log.c:850
 msgid "Logging of this conversation failed."
 msgstr "No se pudo registrar esta conversaci坦n."
 
-#: ../libpurple/log.c:1293
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1377
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -3034,7 +2168,6 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOM�TICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1379
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -3043,47 +2176,42 @@
 "<font color=\"#A82F2f\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOM�TICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1437 ../libpurple/log.c:1570
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>臓No se pudo encontrar la ruta del registro!</b></font>"
 
-#: ../libpurple/log.c:1449 ../libpurple/log.c:1579
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>No se pudo leer el archivo: %s</b></font>"
 
-#: ../libpurple/log.c:1511
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPUESTA AUTOM�TICA>: %s\n"
 
-#: ../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:375
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "No se ha definido un identificador para este complemento."
 
-#: ../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: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:477
-msgid "Plugin does not implement all required functions"
-msgstr "El complemento no implementa todas las funciones necesarias"
-
-#: ../libpurple/plugin.c:542
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+"El complemento no implementa todas las funciones necesarias (束list_icon損, "
+"束login損 y 束close損)"
+
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -3092,89 +2220,63 @@
 "No se encontr坦 el complemento necesario %s. Por favor, instale este "
 "complemento e int辿ntelo de nuevo."
 
-#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "No se pudo cargar el complemento"
 
-#: ../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:573
 msgid "Unable to load your plugin."
 msgstr "No se pudo cargar su complemento."
 
-#: ../libpurple/plugin.c:663
 #, c-format
 msgid "%s requires %s, but it failed to unload."
 msgstr "%s necesita %s, pero no se pudo descargar."
 
-#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Autoaceptar"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr ""
 "Autoaceptar las solicitud de transferencia de archivo de los usuarios "
 "seleccionados."
 
-#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr ""
 "Se complet坦 la solicitud autoaceptada de transferencia de archivo de 束%s損 "
 "enviado por 束%s損."
 
-#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr "Completada autoaceptada"
 
-#: ../libpurple/plugins/autoaccept.c:171
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Cuando llega una solicitud de transferencia de %s?"
 
-#: ../libpurple/plugins/autoaccept.c:173
 msgid "Set Autoaccept Setting"
 msgstr "Configurar la autoaceptaci坦n"
 
-#: ../libpurple/plugins/autoaccept.c:175
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../libpurple/plugins/autoaccept.c:176 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1496
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:2338
-#: ../libpurple/protocols/oscar/oscar.c:6001
-#: ../libpurple/protocols/oscar/oscar.c:6056
-#: ../libpurple/protocols/oscar/oscar.c:6283
-#: ../libpurple/protocols/oscar/oscar.c:6353 ../libpurple/request.h:1401
-#: ../libpurple/request.h:1411
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../libpurple/plugins/autoaccept.c:179
 msgid "Ask"
 msgstr "Preguntar"
 
-#: ../libpurple/plugins/autoaccept.c:180
 msgid "Auto Accept"
 msgstr "Autoaceptar"
 
-#: ../libpurple/plugins/autoaccept.c:181
 msgid "Auto Reject"
 msgstr "Rechazo autom叩tica"
 
-#: ../libpurple/plugins/autoaccept.c:196
 msgid "Autoaccept File Transfers..."
 msgstr "Autoaceptar transferencia de archivos..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:226
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -3182,13 +2284,11 @@
 "Ruta donde se guardar叩n los ficheros\n"
 "(Debe dar la ruta completa)"
 
-#: ../libpurple/plugins/autoaccept.c:231
 msgid "Automatically reject from users not in buddy list"
 msgstr ""
 "Rechazar autom叩ticamente las transferencias de usuarios que no est叩n en mi "
 "lista de amigos"
 
-#: ../libpurple/plugins/autoaccept.c:235
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -3197,18 +2297,15 @@
 "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:1830
-#: ../libpurple/protocols/msn/msn.c:1860
-#: ../libpurple/protocols/msnp9/msn.c:1671
-#: ../libpurple/protocols/msnp9/msn.c:1701
+msgid "Create a new directory for each user"
+msgstr "Crear un directorio para cada usuario"
+
 msgid "Notes"
 msgstr "Notas"
 
-#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "Introduzca sus notas a continuaci坦n..."
 
-#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Editar las notas..."
 
@@ -3220,18 +2317,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Notas de amigos"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Guardar las notas de amigos concretos."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 "A単ade la opci坦n de guardar notas sobre los amigos en su lista de amigos."
@@ -3242,7 +2336,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Prueba de cifrado"
 
@@ -3250,7 +2343,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Prueba los cifrados que se incluyen en libpurple."
 
@@ -3260,7 +2352,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "Ejemplo DBus"
 
@@ -3268,8 +2359,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "Ejemplo de complemento DBus"
 
@@ -3279,7 +2368,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
 msgid "File Control"
 msgstr "Control de archivos"
 
@@ -3287,50 +2375,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "Permite controlar el programa introduciendo 坦rdenes en un archivo."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "minutos"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "Generador de ausencia"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Establecer tiempo de inactividad de la cuenta"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Guardar"
 
-#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Ninguna de sus cuentas est叩 inactiva."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Desactivar tiempo de inactividad de la cuenta"
 
-#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Desactivar"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Fijar tiempo de inactividad para todas las cuentas"
 
-#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Desactivar tiempo de inactividad para todas las cuentas inactivas"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Permite configurar manualmente cu叩nto tiempo ha estado inactivo"
 
@@ -3340,19 +2416,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Cliente de prueba IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Complemento de prueba con soporte IPC, como cliente."
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -3366,33 +2439,27 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Servidor de prueba IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Complemento de soporte IPC de prueba, como servidor."
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 "Complemento de soporte IPC de prueba, como servidor. �ste registra las "
 "坦rdenes IPC."
 
-#: ../libpurple/plugins/joinpart.c:228
 msgid "Join/Part Hiding Configuration"
 msgstr "Configuraci坦n de la ocultaci坦n de Unir/Salir"
 
-#: ../libpurple/plugins/joinpart.c:232
 msgid "Minimum Room Size"
 msgstr "Tama単o m鱈nimo de sala"
 
-#: ../libpurple/plugins/joinpart.c:238
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Tiempo de inactividad de usuario (en minutos)"
 
@@ -3402,19 +2469,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:269
 msgid "Join/Part Hiding"
 msgstr "Esconder Unir/Dejar"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:272
 msgid "Hides extraneous join/part messages."
 msgstr "Oculta los mensajes de unir/salir ajenos"
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:274
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -3426,34 +2490,25 @@
 #. * 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:499
 msgid "(UTC)"
 msgstr "(TCU)"
 
-#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "El usuario no est叩 conectado."
 
-#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "_Enviar respuesta autom叩tica:"
 
-#: ../libpurple/plugins/log_reader.c:1570
-#: ../libpurple/plugins/log_reader.c:1573
-#: ../libpurple/plugins/statenotify.c:84
 #, c-format
 msgid "%s has signed off."
 msgstr "%s se ha desconectado."
 
-#: ../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:1597
 msgid "You were disconnected from the server."
 msgstr "Ha sido desconectado del servidor."
 
-#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -3461,86 +2516,66 @@
 "Actualmente est叩 desconectado. No podr叩 recibir mensajes a menos que se "
 "conecte."
 
-#: ../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: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:2699
-#: ../libpurple/plugins/log_reader.c:2855
 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:2712
-#: ../libpurple/plugins/log_reader.c:2860
 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:2724
-#: ../libpurple/plugins/log_reader.c:2864
 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:2738
-#: ../libpurple/plugins/log_reader.c:2869
 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:2750
-#: ../libpurple/plugins/log_reader.c:2873
 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:2762
-#: ../libpurple/plugins/log_reader.c:2877
 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:2881
 msgid "aMSN"
 msgstr "aMSN"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2837
 msgid "General Log Reading Configuration"
 msgstr "Configuraci坦n general de lectura del registro"
 
-#: ../libpurple/plugins/log_reader.c:2841
 msgid "Fast size calculations"
 msgstr "C叩lculos de tama単o r叩pido"
 
-#: ../libpurple/plugins/log_reader.c:2845
 msgid "Use name heuristics"
 msgstr "Utilizar heur鱈sticos de nombres"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2851
 msgid "Log Directory"
 msgstr "Directorio de registro"
 
@@ -3550,19 +2585,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2910
 msgid "Log Reader"
 msgstr "Lector de registro"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2914
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Incluir otros registros de clientes de MI en el visor de registro."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2918
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3577,20 +2609,15 @@
 "AVISO: Este complemento a炭n es c坦digo en 束alpha損 y puede bloquearse con "
 "frecuencia. 臓Uselo bajo su propia responsabilidad!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Cargador de complementos Mono"
 
-#: ../libpurple/plugins/mono/loader/mono.c:219
-#: ../libpurple/plugins/mono/loader/mono.c:220
 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"
 
@@ -3603,33 +2630,29 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../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:106
 msgid "Prepends a newline to displayed message."
 msgstr "No se pudo enviar el mensaje."
 
 #. *< summary
-#: ../libpurple/plugins/newline.c:107
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
-msgstr "A単ade una l鱈nea en blanco a los mensajes para que el resto del mensaje se muestre por debajo del nombre de usuario en la ventana de conversaci坦n."
-
-#: ../libpurple/plugins/offlinemsg.c:23
+msgstr ""
+"A単ade una l鱈nea en blanco a los mensajes para que el resto del mensaje se "
+"muestre por debajo del nombre de usuario en la ventana de conversaci坦n."
+
 msgid "Offline Message Emulation"
 msgstr "Emulaci坦n de mensaje de desconectado"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Guardar los mensajes enviados como un aviso."
 
-#: ../libpurple/plugins/offlinemsg.c:95
 msgid ""
 "The rest of the messages will be saved as pounce. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
@@ -3637,7 +2660,6 @@
 "El resto de los mensajes se guardar叩n como un aviso. Puede editar y eliminar "
 "los avisos en el di叩logo 束Aviso de amigo損."
 
-#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -3646,49 +2668,21 @@
 "束%s損 est叩 actualmente desconectado. 多Desea guardar el resto del mensaje como "
 "un aviso y enviarlo de forma autom叩tica cuando 束%s損 se vuelva a conectar?"
 
-#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Mensaje desconectado"
 
-#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "Puede editar y borrar los avisos del di叩logo 束Avisos de amigo損"
 
-#: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:675
-#: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:547
-#: ../libpurple/protocols/msnp9/msn.c:563
-#: ../libpurple/protocols/novell/novell.c:1929
-#: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:270
 msgid "Yes"
 msgstr "S鱈"
 
-#: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:675
-#: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:547
-#: ../libpurple/protocols/msnp9/msn.c:563
-#: ../libpurple/protocols/novell/novell.c:1930
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:271
 msgid "No"
 msgstr "No"
 
-#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Guardar los mensajes de desconexi坦n como un aviso"
 
-#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "No preguntar. Siempre guardar como un aviso."
 
@@ -3698,26 +2692,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Cargador de complementos Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Provee soporte para cargar complementos en perl."
 
-#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Modo ps鱈quico"
 
-#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Modo ps鱈quico para conversaciones entrantes"
 
-#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
@@ -3726,23 +2715,18 @@
 "enviarle un mensaje. Esto funciona con AIM, ICQ, Jabber, XMPP, Sametime y "
 "Yahoo!"
 
-#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "Sientes una perturbaci坦n en la fuerza..."
 
-#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Permitir s坦lo a los usuarios en mi lista de amigos"
 
-#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Deshabilitar cuando ausente"
 
-#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Muestra el mensaje de notificaci坦n en las conversaciones"
 
-#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Activar conversaciones ps鱈quicas"
 
@@ -3752,7 +2736,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "Prueba de se単ales"
 
@@ -3760,8 +2743,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../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."
 
@@ -3771,7 +2752,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Complemento sencillo"
 
@@ -3779,13 +2759,10 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Hace pruebas para determinar si la mayor parte de las cosas funcionan."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:910
-#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "Certificados X.509"
 
@@ -3795,7 +2772,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:994
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3803,8 +2779,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../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."
 
@@ -3814,7 +2788,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3822,8 +2795,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../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."
 
@@ -3833,7 +2804,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -3841,49 +2811,39 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr ""
 "Proporciona un recubrimiento a trav辿s de las bibliotecas de soporte de SSL."
 
-#: ../libpurple/plugins/statenotify.c:54
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s ya no est叩 ausente."
 
-#: ../libpurple/plugins/statenotify.c:56
 #, c-format
 msgid "%s has gone away."
 msgstr "%s se ha marchado."
 
-#: ../libpurple/plugins/statenotify.c:66
 #, c-format
 msgid "%s has become idle."
 msgstr "%s est叩 ahora inactivo."
 
-#: ../libpurple/plugins/statenotify.c:68
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s ya no est叩 inactivo."
 
-#: ../libpurple/plugins/statenotify.c:77
 #, c-format
 msgid "%s has signed on."
 msgstr "%s se ha conectado."
 
-#: ../libpurple/plugins/statenotify.c:95
 msgid "Notify When"
 msgstr "Notificar cuando"
 
-#: ../libpurple/plugins/statenotify.c:98
 msgid "Buddy Goes _Away"
 msgstr "El amigo se _ausenta"
 
-#: ../libpurple/plugins/statenotify.c:101
 msgid "Buddy Goes _Idle"
 msgstr "El amigo est叩 _inactivo"
 
-#: ../libpurple/plugins/statenotify.c:104
 msgid "Buddy _Signs On/Off"
 msgstr "Un amigo _se conecta/desconecta"
 
@@ -3893,7 +2853,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:152
 msgid "Buddy State Notification"
 msgstr "Notificaci坦n de estado de amigos"
 
@@ -3901,8 +2860,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:155
-#: ../libpurple/plugins/statenotify.c:158
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -3910,15 +2867,12 @@
 "Notifica en una ventana de conversaci坦n cuando un amigo se ausenta o vuelve "
 "o est叩 inactivo."
 
-#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Cargador de complementos Tcl"
 
-#: ../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:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3926,21 +2880,17 @@
 "No se pudo detectar la instalaci坦n de ActiveTCL. Debe instalar ActiveTCL de "
 "http://www.activestate.com si desea utilizar los complementos TCL\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:102
-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."
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows 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:121
+"m叩s informaci坦n consulte las preguntas frecuentas (FAQ) en http://d.pidgin."
+"im/wiki/BonjourWindows."
+
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "No se pudieron escuchar las conexiones MI entrantes\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
@@ -3948,40 +2898,18 @@
 "arrancado?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:393
-#: ../libpurple/protocols/bonjour/bonjour.c:699
-#: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:1006
 msgid "First name"
 msgstr "Nombre:"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:395
-#: ../libpurple/protocols/bonjour/bonjour.c:702
-#: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:1010
 msgid "Last name"
 msgstr "Apellidos:"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:399
-#: ../libpurple/protocols/jabber/buddy.c:318
-#: ../libpurple/protocols/jabber/buddy.c:1363
-#: ../libpurple/protocols/jabber/buddy.c:1373
-#: ../libpurple/protocols/jabber/buddy.c:2267
-#: ../libpurple/protocols/silc/ops.c:1055
-#: ../libpurple/protocols/silc/util.c:561
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:555
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
 msgid "Email"
 msgstr "Correo electr坦nico"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:402
-#: ../libpurple/protocols/bonjour/bonjour.c:708
 msgid "AIM Account"
 msgstr "Cuenta AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:405
-#: ../libpurple/protocols/bonjour/bonjour.c:711
 msgid "XMPP Account"
 msgstr "Cuenta XMPP"
 
@@ -3995,57 +2923,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:509
-#: ../libpurple/protocols/bonjour/bonjour.c:511
 msgid "Bonjour Protocol Plugin"
 msgstr "Complemento de protocolo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:652
 msgid "Purple Person"
 msgstr "Persona morada"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:431
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s ha cerrado la conversaci坦n."
 
-#: ../libpurple/protocols/bonjour/jabber.c:481
-#: ../libpurple/protocols/bonjour/jabber.c:546
-#: ../libpurple/protocols/bonjour/jabber.c:591
-#: ../libpurple/protocols/bonjour/jabber.c:768
-#: ../libpurple/protocols/bonjour/jabber.c:786
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "No se pudo enviar el mensaje, no se pudo iniciar la conversaci坦n."
 
-#: ../libpurple/protocols/bonjour/jabber.c:685
 msgid "Cannot open socket"
 msgstr "No se pudo abrir el socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:695
-msgid "Error setting socket options"
-msgstr "Error al establecer las opciones del socket"
-
-#: ../libpurple/protocols/bonjour/jabber.c:721
 msgid "Could not bind socket to port"
 msgstr "No se pudo vincular el socket al puerto"
 
-#: ../libpurple/protocols/bonjour/jabber.c:731
 msgid "Could not listen on socket"
 msgstr "No se pudo escuchar en el socket"
 
-#: ../libpurple/protocols/bonjour/mdns_win32.c:110
 msgid "Error communicating with local mDNSResponder."
 msgstr "Error comunic叩ndose con el servicio 束mDNSResponder損 local."
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1908
 msgid "Invalid proxy settings"
 msgstr "Configuraci坦n inv叩lida de proxy"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1908
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -4053,339 +2961,217 @@
 "El nombre de servidor o el puerto especificados no son v叩lidos para su tipo "
 "de proxy."
 
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
-#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Error de token"
 
-#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
-#: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "No se pudo obtener el token.\n"
 
-#: ../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: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:275
 msgid "Buddylist saved successfully!"
 msgstr "臓Se guard坦 con 辿xito la lista de amigos!"
 
-#: ../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:320
 msgid "Load Buddylist..."
 msgstr "Cargar lista de amigos..."
 
-#: ../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:332
 msgid "Save buddylist..."
 msgstr "Guardar lista de amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:382
+msgid "Load buddylist from file..."
+msgstr "Cargar la lista de amigos desde archivo..."
+
 msgid "Fill in the registration fields."
 msgstr "Rellene los campos de registro."
 
-#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Las contrase単as no coinciden."
 
-#: ../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:412
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Se ha registrado una nueva cuenta Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "臓Se complet坦 el registro con 辿xito!"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:981
-#: ../libpurple/protocols/jabber/jabber.c:984
-#: ../libpurple/protocols/jabber/jabber.c:1772
 msgid "Password"
 msgstr "Contrase単a"
 
-#: ../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:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "Introduzca el token actual"
 
-#: ../libpurple/protocols/gg/gg.c:499 ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "Token actual"
 
-#: ../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:505
 msgid "Please, fill in the following fields"
 msgstr "Por favor, rellene los siguientes campos"
 
-#: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
-#: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1018
-#: ../libpurple/protocols/oscar/oscar.c:3828
-#: ../libpurple/protocols/oscar/oscar.c:3841
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Ciudad"
 
-#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "A単o de nacimiento"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1759
-#: ../libpurple/protocols/msnp9/msn.c:1600
-#: ../libpurple/protocols/myspace/user.c:129
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
-#: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1098
 msgid "Gender"
 msgstr "Sexo"
 
-#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "Hombre o mujer"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "Hombre"
 
-#: ../libpurple/protocols/gg/gg.c:654
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "Mujer"
 
-#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "Solamente conectado"
 
-#: ../libpurple/protocols/gg/gg.c:662 ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "Encontrar amigos"
 
-#: ../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:702
 msgid "Fill in the fields."
 msgstr "Rellene los campos."
 
-#: ../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: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:737
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Cambiar la contrase単a de la cuenta Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "臓Se cambi坦 con 辿xito la contrase単a!"
 
-#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "Contrase単a actual"
 
-#: ../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:800 ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "Cambiar la contrase単a Gadu-Gadu"
 
-#: ../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:881 ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "A単adir al chat"
 
-#: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2084
-#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
-#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/msnp9/state.c:29
-#: ../libpurple/protocols/msnp9/state.c:30
-#: ../libpurple/protocols/msnp9/state.c:37
-#: ../libpurple/protocols/msnp9/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2834
-#: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3158 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1086
 msgid "Available"
 msgstr "Disponible"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:544
-#: ../libpurple/protocols/irc/msgs.c:358
-#: ../libpurple/protocols/jabber/buddy.c:2088
-#: ../libpurple/protocols/novell/novell.c:2837
-#: ../libpurple/protocols/oscar/oscar.c:734
-#: ../libpurple/protocols/oscar/oscar.c:5747
-#: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
-#: ../libpurple/protocols/silc/buddy.c:1479
-#: ../libpurple/protocols/silc10/buddy.c:1479
-#: ../libpurple/protocols/yahoo/yahoo.c:3719
-#: ../libpurple/protocols/yahoo/yahoo.c:3793 ../libpurple/status.c:159
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2070
-#: ../pidgin/gtkstatusbox.c:1087
+#, c-format
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2755
-#: ../libpurple/protocols/oscar/oscar.c:3738
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2261
-#: ../libpurple/protocols/jabber/buddy.c:2447
-#: ../libpurple/protocols/oscar/oscar.c:3749
-#: ../libpurple/protocols/silc/ops.c:1004
-#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nombre"
 
-#: ../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:1113 ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3950
 msgid "Unable to display the search results."
 msgstr "No se pueden mostrar los resultados de la b炭squeda."
 
-#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Directorio p炭blico Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "Resultados de la b炭squeda"
 
-#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "No se encontraron usuarios que coincidan"
 
-#: ../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:1314 ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "No se pudo leer el socket"
 
-#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr "Lista de amigos descargada"
 
-#: ../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:1407
 msgid "Buddy list uploaded"
 msgstr "Lista de amigos exportada"
 
-#: ../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:1517 ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "Fall坦 la conexi坦n."
 
-#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "A単adir al chat"
 
-#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "_Nombre de chat:"
 
-#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "Error de chat"
 
-#: ../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:2019
 msgid "Not connected to the server."
 msgstr "No est叩 conectado al servidor."
 
-#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "Encontrar amigos... "
 
-#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "Cambiar su contrase単a..."
 
-#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr "Subir la lista de amigos al servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr "Descargar la lista de amigos del servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr "Borrar la lista de amigos del servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr "Guardar lista de amigos a archivo..."
 
-#: ../libpurple/protocols/gg/gg.c:2070
-msgid "Load buddylist from file..."
-msgstr "Cargar la lista de amigos desde archivo..."
-
 #. magic
 #. major_version
 #. minor_version
@@ -4397,152 +3183,81 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Complemento de protocolo Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr "Mensajer鱈a instant叩nea polaca muy popular"
 
-#: ../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:1853
-#: ../libpurple/protocols/silc10/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Orden desconocida: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:509
-#: ../libpurple/protocols/jabber/chat.c:596
-#: ../libpurple/protocols/silc/silc.c:1561
-#: ../libpurple/protocols/silc10/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "el tema actual es: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:513
-#: ../libpurple/protocols/jabber/chat.c:600
-#: ../libpurple/protocols/silc/silc.c:1565
-#: ../libpurple/protocols/silc10/silc.c:1284
 msgid "No topic is set"
 msgstr "No hay tema establecido"
 
-#: ../libpurple/protocols/irc/dcc_send.c:298
-#: ../libpurple/protocols/irc/dcc_send.c:339
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:318
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1110
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1514
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1565
 msgid "File Transfer Failed"
 msgstr "Fall坦 la transferencia de archivos"
 
-#: ../libpurple/protocols/irc/dcc_send.c:299
-#: ../libpurple/protocols/irc/dcc_send.c:340
 msgid "Could not open a listening port."
 msgstr "No se pudo abrir un puerto de escucha."
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Error al mostrar el MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "No hay MOTD disponible"
 
-#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "No hay MOTD asociado con esta conexi坦n."
 
-#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD para %s"
 
-#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
-#: ../libpurple/protocols/myspace/myspace.c:2539
 msgid "Server has disconnected"
 msgstr "El servidor se ha desconectado"
 
-#: ../libpurple/protocols/irc/irc.c:260
 msgid "View MOTD"
 msgstr "Ver MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:272 ../libpurple/protocols/silc/chat.c:33
-#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Canal:"
 
-#: ../libpurple/protocols/irc/irc.c:278
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:496
 msgid "_Password:"
 msgstr "Contra_se単a:"
 
-#: ../libpurple/protocols/irc/irc.c:311
 msgid "IRC nicks may not contain whitespace"
 msgstr "Los apodos de IRC no pueden tener espacios en blanco"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:332
-#: ../libpurple/protocols/jabber/jabber.c:1346
-#: ../libpurple/protocols/msn/session.c:402
-#: ../libpurple/protocols/msnp9/session.c:354
-#: ../libpurple/protocols/myspace/myspace.c:295
-#: ../libpurple/protocols/novell/novell.c:2199
-#: ../libpurple/protocols/oscar/oscar.c:1335
-#: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3778
-#: ../libpurple/protocols/simple/simple.c:1915
-#: ../libpurple/protocols/yahoo/yahoo.c:2984
-#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:686
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../libpurple/protocols/irc/irc.c:342
-#: ../libpurple/protocols/jabber/jabber.c:674
-#: ../libpurple/protocols/jabber/jabber.c:1155
 msgid "SSL support unavailable"
 msgstr "Soporte SSL no disponible"
 
-#: ../libpurple/protocols/irc/irc.c:355
-#: ../libpurple/protocols/myspace/myspace.c:313
-#: ../libpurple/protocols/simple/simple.c:469
-#: ../libpurple/protocols/simple/simple.c:1825
 msgid "Couldn't create socket"
 msgstr "No se pudo crear el socket"
 
-#: ../libpurple/protocols/irc/irc.c:437
-#: ../libpurple/protocols/oscar/oscar.c:1331
 msgid "Couldn't connect to host"
 msgstr "No se pudo conectar al servidor"
 
-#: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
-#: ../libpurple/protocols/myspace/myspace.c:2533
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: ../libpurple/protocols/irc/irc.c:798
-#: ../libpurple/protocols/silc/chat.c:1401
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../libpurple/protocols/irc/irc.c:801
-#: ../libpurple/protocols/sametime/sametime.c:3426
-#: ../libpurple/protocols/silc/chat.c:1404
-#: ../libpurple/protocols/silc/ops.c:1406
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1517
 msgid "Topic"
 msgstr "Tema"
 
@@ -4554,50 +3269,27 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:939
 msgid "IRC Protocol Plugin"
 msgstr "Complemento de protocolo IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:940
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Complemento de protocolo IRC menos malo"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:371
-#: ../libpurple/protocols/msn/msn.c:2357
-#: ../libpurple/protocols/msnp9/msn.c:2197
-#: ../libpurple/protocols/oscar/oscar.c:6749
-#: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5783
-#: ../libpurple/protocols/silc/ops.c:1262
-#: ../libpurple/protocols/silc/ops.c:1356
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2099
-#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:968 ../libpurple/protocols/msn/msn.c:2362
-#: ../libpurple/protocols/msnp9/msn.c:2202
-#: ../libpurple/protocols/oscar/oscar.c:6752
-#: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5788
-#: ../libpurple/protocols/silc/silc.c:2143
-#: ../libpurple/protocols/silc10/silc.c:1867
-#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Puerto"
 
-#: ../libpurple/protocols/irc/irc.c:971
 msgid "Encodings"
 msgstr "Codificaciones"
 
-#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:365
-#: ../libpurple/protocols/silc/silc.c:1225
-#: ../libpurple/protocols/silc10/silc.c:926
+msgid "Auto-detect incoming UTF-8"
+msgstr "Detectar de forma autom叩tica caracteres UTF-8"
+
 msgid "Real name"
 msgstr "Nombre real"
 
@@ -4605,173 +3297,130 @@
 #. 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:985
 msgid "Use SSL"
 msgstr "Usar SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:192
 msgid "Bad mode"
 msgstr "Modo err坦neo"
 
-#: ../libpurple/protocols/irc/msgs.c:214
-#, c-format
-msgid "Ban on %s by %s, set %ld seconds ago"
-msgstr "Explusado %s por %s, hace %ld segundos"
-
-#: ../libpurple/protocols/irc/msgs.c:217
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr "Explusado de %s por %s, hace %s"
+
 #, c-format
 msgid "Ban on %s"
 msgstr "Prohibir en %s"
 
-#: ../libpurple/protocols/irc/msgs.c:232
 msgid "End of ban list"
 msgstr "Fin de la lista de prohibiciones"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../libpurple/protocols/irc/msgs.c:246
 #, c-format
 msgid "You are banned from %s."
 msgstr "Ha sido expulsado de %s."
 
-#: ../libpurple/protocols/irc/msgs.c:247
 msgid "Banned"
 msgstr "Expulsado"
 
-#: ../libpurple/protocols/irc/msgs.c:264
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "No se puede expulsar a %s: la lista de expulsados est叩 llena"
 
-#: ../libpurple/protocols/irc/msgs.c:349
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:350
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:351
-#: ../libpurple/protocols/oscar/oscar.c:3739
-#: ../libpurple/protocols/silc/ops.c:1435
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Apodo"
 
-#: ../libpurple/protocols/irc/msgs.c:377
-#: ../libpurple/protocols/silc/ops.c:1281
-#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Actualmente en"
 
-#: ../libpurple/protocols/irc/msgs.c:382
 msgid "Idle for"
 msgstr "Inactivo durante"
 
-#: ../libpurple/protocols/irc/msgs.c:385
 msgid "Online since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/irc/msgs.c:389
 msgid "<b>Defining adjective:</b>"
 msgstr "<br><b>Adjetivo que lo define:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:389
 msgid "Glorious"
 msgstr "Glorioso"
 
-#: ../libpurple/protocols/irc/msgs.c:473
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ha cambiado el tema a: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:475
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s ha borrado el tema."
 
-#: ../libpurple/protocols/irc/msgs.c:483
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "El tema de %s es: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:501
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensaje desconocido '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:502
 msgid "Unknown message"
 msgstr "Mensaje desconocido"
 
-#: ../libpurple/protocols/irc/msgs.c:502
 msgid "The IRC server received a message it did not understand."
 msgstr "El servidor IRC ha recibido un mensaje que no pudo entender."
 
-#: ../libpurple/protocols/irc/msgs.c:523
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuarios en %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:630
 msgid "Time Response"
 msgstr "Respuesta de hora"
 
-#: ../libpurple/protocols/irc/msgs.c:631
 msgid "The IRC server's local time is:"
 msgstr "La hora local del servidor de IRC es:"
 
-#: ../libpurple/protocols/irc/msgs.c:642
 msgid "No such channel"
 msgstr "No existe ese canal"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:653
 msgid "no such channel"
 msgstr "no existe el canal"
 
-#: ../libpurple/protocols/irc/msgs.c:656
 msgid "User is not logged in"
 msgstr "El usuario no est叩 conectado"
 
-#: ../libpurple/protocols/irc/msgs.c:661
 msgid "No such nick or channel"
 msgstr "No existe el apodo o canal"
 
-#: ../libpurple/protocols/irc/msgs.c:681
 msgid "Could not send"
 msgstr "No se pudo enviar"
 
-#: ../libpurple/protocols/irc/msgs.c:737
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Para unirse a %s es necesaria una invitaci坦n."
 
-#: ../libpurple/protocols/irc/msgs.c:738
 msgid "Invitation only"
 msgstr "S坦lo con invitaci坦n"
 
-#: ../libpurple/protocols/irc/msgs.c:854
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Ha sido expulsado por %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:859 ../libpurple/protocols/silc/ops.c:714
-#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:882
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modo (%s %s) por %s"
 
-#: ../libpurple/protocols/irc/msgs.c:970 ../libpurple/protocols/irc/msgs.c:971
 msgid "Invalid nickname"
 msgstr "Apodo inv叩lido"
 
-#: ../libpurple/protocols/irc/msgs.c:972
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4779,7 +3428,6 @@
 "El servidor rechaz坦 el nombre que escogi坦 para su cuenta. Es posible que "
 "incluya caracteres inv叩lidos."
 
-#: ../libpurple/protocols/irc/msgs.c:977
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4787,53 +3435,40 @@
 "El servidor rechaz坦 el nombre que escogi坦 para su cuenta. Es posible que "
 "incluya caracteres inv叩lidos."
 
-#: ../libpurple/protocols/irc/msgs.c:1016
 msgid "Cannot change nick"
 msgstr "No se puede cambiar el alias"
 
-#: ../libpurple/protocols/irc/msgs.c:1016
 msgid "Could not change nick"
 msgstr "No se pudo cambiar el alias"
 
-#: ../libpurple/protocols/irc/msgs.c:1041
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Ha abandonado el canal %s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1085
 msgid "Error: invalid PONG from server"
 msgstr "Error: PONG inv叩lido del servidor"
 
-#: ../libpurple/protocols/irc/msgs.c:1087
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Respuesta PING -- Retraso: %lu segundos"
 
-#: ../libpurple/protocols/irc/msgs.c:1178
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "No se pudo unir a %s: es necesario registrarse"
 
-#: ../libpurple/protocols/irc/msgs.c:1179
-#: ../libpurple/protocols/silc/ops.c:1106
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "No se puede unir al canal"
 
-#: ../libpurple/protocols/irc/msgs.c:1213
 msgid "Nick or channel is temporarily unavailable."
 msgstr "El apodo o el canal est叩n temporalmente no disponibles."
 
-#: ../libpurple/protocols/irc/msgs.c:1225
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mensajes globales de %s"
 
-#: ../libpurple/protocols/irc/parse.c:124
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;acci坦n a realizar&gt;: Realiza una acci坦n."
 
-#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -4841,11 +3476,12 @@
 "away [mensaje]:  Fija el mensaje cuando se est叩 ausente, o no utilizar un "
 "mensaje al dejar de estar ausente."
 
-#: ../libpurple/protocols/irc/parse.c:126
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp <alias> <msj>: env鱈a un mensaje ctcp al alias."
+
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Enviar un comando al servidor"
 
-#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -4853,7 +3489,6 @@
 "deop &lt;apodo1&gt; [apodo2] ....: Quitarle a alguien el estado de operador "
 "de canal. S坦lo un operador de canal puede hacerlo."
 
-#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -4863,7 +3498,6 @@
 "hablar en el canal si 辿ste est叩 moderado (+m). S坦lo lo puede hacer un "
 "operador de canal."
 
-#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -4871,7 +3505,6 @@
 "invite %lt;apodo&gt; [sala]:  Invitar a alguien a unirse al canal "
 "especificado o al canal actual."
 
-#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -4879,7 +3512,6 @@
 "j &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar en un o m叩s "
 "canales utilizando, opcionalmente, una clave de canal si fuera necesario."
 
-#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -4887,7 +3519,6 @@
 "join &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar en un o "
 "m叩s canales utilizando, opcionalmente, una clave de canal si fuera necesario."
 
-#: ../libpurple/protocols/irc/parse.c:132
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -4895,7 +3526,6 @@
 "kick &lt;apodo&gt; [mensaje]:  Echar a alguien del canal. S坦lo lo pueden "
 "hacer los operadores de canal."
 
-#: ../libpurple/protocols/irc/parse.c:133
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -4903,15 +3533,12 @@
 "list:  Mostrar una lista de las salas de chat disponibles en la red. "
 "<i>Aviso: algunos servidores puede que le desconecten si hace 辿sto.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:134
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;acci坦n a realizar&gt;:  Realizar una acci坦n."
 
-#: ../libpurple/protocols/irc/parse.c:135
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Enviar un comando al servidor"
 
-#: ../libpurple/protocols/irc/parse.c:136
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -4919,7 +3546,6 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;apodo|canal&gt;:  Fija o elimina un modo "
 "de canal o de usuario."
 
-#: ../libpurple/protocols/irc/parse.c:137
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4927,25 +3553,19 @@
 "msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario "
 "(lo opuesto a un canal)."
 
-#: ../libpurple/protocols/irc/parse.c:138
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 "names [canal]:  Obtener la lista de los usuarios que est叩n en el canal."
 
-#: ../libpurple/protocols/irc/parse.c:139
-#: ../libpurple/protocols/jabber/jabber.c:2358
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo."
 
-#: ../libpurple/protocols/irc/parse.c:140
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Enviar un comando al servidor."
 
-#: ../libpurple/protocols/irc/parse.c:141
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
 msgstr "notice &lt;objetivo&gt;: enviar un aviso a un usuario o a un canal."
 
-#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -4953,7 +3573,6 @@
 "op &lt;apodo1&gt; [apodo2] ...:  Dar estado de operador de canal a otra "
 "persona. S坦lo lo puede hacer un operador de canal."
 
-#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -4961,11 +3580,9 @@
 "operwall &lt;mensaje&gt;:  Si no sabe lo que es probablemente no puede "
 "utilizarlo."
 
-#: ../libpurple/protocols/irc/parse.c:144
 msgid "operserv: Send a command to operserv"
 msgstr "openserv: Enviar un comando al servidor"
 
-#: ../libpurple/protocols/irc/parse.c:145
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4973,7 +3590,6 @@
 "part [sala] [mensaje]:  Abandonar el canal actual, o un canal espec鱈fico, "
 "con el mensaje opcional."
 
-#: ../libpurple/protocols/irc/parse.c:146
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4981,7 +3597,6 @@
 "ping [apodo]:  Pregunta cuanta latencia tiene un usuario (o el servidor si "
 "no se especifica un usuario)."
 
-#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4989,17 +3604,14 @@
 "query &lt;apodo&gt; &lt;mensaje&gt;:  Env鱈a un mensaje privado a un usuario "
 "(lo opuesto a un canal)."
 
-#: ../libpurple/protocols/irc/parse.c:148
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [mensaje]:  Desconecta del servidor actual indicando un mensaje "
 "(opcional)."
 
-#: ../libpurple/protocols/irc/parse.c:149
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Enviar un comando en crudo al servidor."
 
-#: ../libpurple/protocols/irc/parse.c:150
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5007,24 +3619,19 @@
 "remove &lt;apodo&gt; [mensaje]:  Eliminar a alguien de una sala. S坦lo puede "
 "hacerlo un operador de canal."
 
-#: ../libpurple/protocols/irc/parse.c:151
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Muestra la hora local en el servidor IRC."
 
-#: ../libpurple/protocols/irc/parse.c:152
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nuevo tema]:  Muestra o cambia el tema del canal."
 
-#: ../libpurple/protocols/irc/parse.c:153
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Establece o elimina un modo de usuario."
 
-#: ../libpurple/protocols/irc/parse.c:154
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [apodo]: env鱈a una solicitud CTCP VERSION al usuario"
 
-#: ../libpurple/protocols/irc/parse.c:155
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5032,75 +3639,52 @@
 "voice &lt;apodo1&gt; [apodo2] ...:  Dar la posibilidad de hablar en el canal "
 "a alguien. S坦lo lo puede hacer un operador de canal."
 
-#: ../libpurple/protocols/irc/parse.c:156
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 "wallops &lt;mensaje&gt;:  Si no sabe lo que es probablemente no pueda usarlo."
 
-#: ../libpurple/protocols/irc/parse.c:157
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [servidor] &lt;apodo&gt;:  Obtiene informaci坦n de un usuario."
 
-#: ../libpurple/protocols/irc/parse.c:158
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr ""
 "whowas &lt;apodo&gt;:  Obtiene informaci坦n de un usuario que se ha "
 "desconectado."
 
-#: ../libpurple/protocols/irc/parse.c:523
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tiempo de respuesta de %s: %lu segundos"
 
-#: ../libpurple/protocols/irc/parse.c:524
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:524
 msgid "CTCP PING reply"
 msgstr "Respuesta a PING CTCP"
 
-#: ../libpurple/protocols/irc/parse.c:636
-#: ../libpurple/protocols/irc/parse.c:643 ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
-#: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Desconectado."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:735
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Unknown Error"
 msgstr "Error desconocido"
 
-#: ../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:182
 msgid "execute"
 msgstr "ejecutar"
 
-#: ../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:60
 msgid "You require encryption, but no TLS/SSL support found."
 msgstr "Vd. solicita cifrado, pero no se dispone de soporte TLS/SSL."
 
-#: ../libpurple/protocols/jabber/auth.c:125
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "El servidor solicita autenticaci坦n en claro sobre un canal no cifrado"
 
-#: ../libpurple/protocols/jabber/auth.c:328
-#: ../libpurple/protocols/jabber/auth.c:535
-#: ../libpurple/protocols/jabber/auth.c:729
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -5109,139 +3693,74 @@
 "%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:330
-#: ../libpurple/protocols/jabber/auth.c:331
-#: ../libpurple/protocols/jabber/auth.c:537
-#: ../libpurple/protocols/jabber/auth.c:538
-#: ../libpurple/protocols/jabber/auth.c:731
-#: ../libpurple/protocols/jabber/auth.c:732
 msgid "Plaintext Authentication"
 msgstr "Autenticaci坦n en claro"
 
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:662
-#: ../libpurple/protocols/jabber/auth.c:913
-#: ../libpurple/protocols/jabber/auth.c:1064
-#: ../libpurple/protocols/jabber/auth.c:1091
-#: ../libpurple/protocols/jabber/auth.c:1137
-#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "Respuesta inv叩lida del servidor."
 
-#: ../libpurple/protocols/jabber/auth.c:551
-#: ../libpurple/protocols/jabber/auth.c:745
 msgid "Server does not use any supported authentication method"
 msgstr "El servidor no usa un m辿todo de autenticaci坦n conocido"
 
-#: ../libpurple/protocols/jabber/auth.c:936
-#: ../libpurple/protocols/jabber/auth.c:961
 msgid "Invalid challenge from server"
 msgstr "Desaf鱈o inv叩lido del servidor"
 
-#: ../libpurple/protocols/jabber/auth.c:1037
 msgid "SASL error"
 msgstr "Error de SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:306
-#: ../libpurple/protocols/jabber/buddy.c:1257
-#: ../libpurple/protocols/sametime/sametime.c:4184
-#: ../libpurple/protocols/silc/ops.c:1000
-#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: ../libpurple/protocols/jabber/buddy.c:307
-#: ../libpurple/protocols/jabber/buddy.c:1269
-#: ../libpurple/protocols/silc/ops.c:1012
-#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Apellidos"
 
-#: ../libpurple/protocols/jabber/buddy.c:308
-#: ../libpurple/protocols/jabber/buddy.c:1272
 msgid "Given Name"
 msgstr "Nombre propio"
 
-#: ../libpurple/protocols/jabber/buddy.c:310
-#: ../libpurple/protocols/jabber/jabber.c:1034
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:311
-#: ../libpurple/protocols/jabber/buddy.c:1320
 msgid "Street Address"
 msgstr "Calle"
 
-#: ../libpurple/protocols/jabber/buddy.c:312
-#: ../libpurple/protocols/jabber/buddy.c:1317
 msgid "Extended Address"
 msgstr "Direcci坦n extendida"
 
-#: ../libpurple/protocols/jabber/buddy.c:313
-#: ../libpurple/protocols/jabber/buddy.c:1323
 msgid "Locality"
 msgstr "Localidad"
 
-#: ../libpurple/protocols/jabber/buddy.c:314
-#: ../libpurple/protocols/jabber/buddy.c:1326
 msgid "Region"
 msgstr "Regi坦n"
 
-#: ../libpurple/protocols/jabber/buddy.c:315
-#: ../libpurple/protocols/jabber/buddy.c:1329
 msgid "Postal Code"
 msgstr "C坦digo postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:316
-#: ../libpurple/protocols/jabber/buddy.c:1333
-#: ../libpurple/protocols/silc/silc.c:1231
-#: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "Pa鱈s"
 
-#: ../libpurple/protocols/jabber/buddy.c:317
-#: ../libpurple/protocols/jabber/buddy.c:1344
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "Tel辿fono"
 
-#: ../libpurple/protocols/jabber/buddy.c:319
-#: ../libpurple/protocols/jabber/buddy.c:1388
 msgid "Organization Name"
 msgstr "Nombre de la organizaci坦n"
 
-#: ../libpurple/protocols/jabber/buddy.c:320
-#: ../libpurple/protocols/jabber/buddy.c:1391
 msgid "Organization Unit"
 msgstr "Grupo de trabajo"
 
-#: ../libpurple/protocols/jabber/buddy.c:322
-#: ../libpurple/protocols/jabber/buddy.c:1400
 msgid "Role"
 msgstr "Rol"
 
-#: ../libpurple/protocols/jabber/buddy.c:323
-#: ../libpurple/protocols/jabber/buddy.c:1288
-#: ../libpurple/protocols/msn/msn.c:1828
-#: ../libpurple/protocols/msnp9/msn.c:1669
-#: ../libpurple/protocols/oscar/oscar.c:3788
 msgid "Birthday"
 msgstr "Cumplea単os"
 
-#: ../libpurple/protocols/jabber/buddy.c:324
-#: ../libpurple/protocols/jabber/buddy.c:1403
-#: ../libpurple/protocols/jabber/chat.c:780
-#: ../libpurple/protocols/jabber/usermood.c:190 ../pidgin/gtkblist.c:3427
-#: ../pidgin/gtkplugin.c:582 ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "Descripci坦n"
 
-#: ../libpurple/protocols/jabber/buddy.c:753
-#: ../libpurple/protocols/jabber/buddy.c:754
 msgid "Edit XMPP vCard"
 msgstr "Editar vCard de XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:755
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5249,386 +3768,232 @@
 "Todos los campos siguientes son opcionales. Introduzca s坦lo la informaci坦n "
 "con la que se sienta c坦modo."
 
-#: ../libpurple/protocols/jabber/buddy.c:826
-#: ../libpurple/protocols/jabber/buddy.c:991
 msgid "Client"
 msgstr "Cliente"
 
-#: ../libpurple/protocols/jabber/buddy.c:830
-#: ../libpurple/protocols/jabber/buddy.c:995
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-#: ../libpurple/protocols/jabber/buddy.c:846
-#: ../libpurple/protocols/jabber/buddy.c:1006
 msgid "Last Activity"
 msgstr "�ltima actividad"
 
-#: ../libpurple/protocols/jabber/buddy.c:848
-#: ../libpurple/protocols/jabber/buddy.c:1008
 msgid "Service Discovery Info"
 msgstr "Informaci坦n de descubrimiento de servicio"
 
-#: ../libpurple/protocols/jabber/buddy.c:850
-#: ../libpurple/protocols/jabber/buddy.c:1010
 msgid "Service Discovery Items"
 msgstr "Elementos de descubrimiento de servicio"
 
-#: ../libpurple/protocols/jabber/buddy.c:852
-#: ../libpurple/protocols/jabber/buddy.c:1012
 msgid "Extended Stanza Addressing"
 msgstr "Direcci坦n de grupo extendida"
 
-#: ../libpurple/protocols/jabber/buddy.c:854
-#: ../libpurple/protocols/jabber/buddy.c:1014
 msgid "Multi-User Chat"
 msgstr "Chat multiusuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1016
 msgid "Multi-User Chat Extended Presence Information"
 msgstr "Informaci坦n de presencia extendida en chat multiusuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:858
-#: ../libpurple/protocols/jabber/buddy.c:1018
 msgid "In-Band Bytestreams"
 msgstr "Flujos de bytes en banda"
 
-#: ../libpurple/protocols/jabber/buddy.c:860
-#: ../libpurple/protocols/jabber/buddy.c:1020
 msgid "Ad-Hoc Commands"
 msgstr "�rdenes ad-hoc"
 
-#: ../libpurple/protocols/jabber/buddy.c:862
-#: ../libpurple/protocols/jabber/buddy.c:1022
 msgid "PubSub Service"
 msgstr "Servicio PubSub"
 
-#: ../libpurple/protocols/jabber/buddy.c:864
-#: ../libpurple/protocols/jabber/buddy.c:1024
 msgid "SOCKS5 Bytestreams"
 msgstr "Flujos de bytes SOCKS5"
 
-#: ../libpurple/protocols/jabber/buddy.c:866
-#: ../libpurple/protocols/jabber/buddy.c:1026
 msgid "Out of Band Data"
 msgstr "Datos fuera de banda"
 
-#: ../libpurple/protocols/jabber/buddy.c:868
-#: ../libpurple/protocols/jabber/buddy.c:1028
 msgid "XHTML-IM"
 msgstr "XHTML-IM"
 
-#: ../libpurple/protocols/jabber/buddy.c:870
-#: ../libpurple/protocols/jabber/buddy.c:1030
 msgid "In-Band Registration"
 msgstr "Registro en l鱈nea"
 
-#: ../libpurple/protocols/jabber/buddy.c:872
-#: ../libpurple/protocols/jabber/buddy.c:1032
 msgid "User Location"
 msgstr "Ubicaci坦n del usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:874
-#: ../libpurple/protocols/jabber/buddy.c:1034
 msgid "User Avatar"
 msgstr "Avatar del usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/jabber/buddy.c:1036
 msgid "Chat State Notifications"
 msgstr "Notificaciones de estado de chat"
 
-#: ../libpurple/protocols/jabber/buddy.c:878
-#: ../libpurple/protocols/jabber/buddy.c:1038
 msgid "Software Version"
 msgstr "Versi坦n del programa"
 
-#: ../libpurple/protocols/jabber/buddy.c:880
-#: ../libpurple/protocols/jabber/buddy.c:1040
 msgid "Stream Initiation"
 msgstr "Origen del flujo"
 
-#: ../libpurple/protocols/jabber/buddy.c:882
-#: ../libpurple/protocols/jabber/buddy.c:1042
-#: ../libpurple/protocols/sametime/sametime.c:3287
 msgid "File Transfer"
 msgstr "Transferencia de archivo"
 
-#: ../libpurple/protocols/jabber/buddy.c:884
-#: ../libpurple/protocols/jabber/buddy.c:1044
 msgid "User Mood"
 msgstr "Estado de 叩nimo del usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:886
-#: ../libpurple/protocols/jabber/buddy.c:1046
 msgid "User Activity"
 msgstr "Actividad de usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:888
-#: ../libpurple/protocols/jabber/buddy.c:1048
 msgid "Entity Capabilities"
 msgstr "Capacidades de la entidad"
 
-#: ../libpurple/protocols/jabber/buddy.c:890
-#: ../libpurple/protocols/jabber/buddy.c:1050
 msgid "Encrypted Session Negotiations"
 msgstr "Negociaciones de sesiones cifradas"
 
-#: ../libpurple/protocols/jabber/buddy.c:892
-#: ../libpurple/protocols/jabber/buddy.c:1052
 msgid "User Tune"
 msgstr "M炭sica del usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:894
-#: ../libpurple/protocols/jabber/buddy.c:1054
 msgid "Roster Item Exchange"
 msgstr "Intercambio de elementos de la lista"
 
-#: ../libpurple/protocols/jabber/buddy.c:896
-#: ../libpurple/protocols/jabber/buddy.c:1056
 msgid "Reachability Address"
 msgstr "Direcci坦n alcanzable"
 
-#: ../libpurple/protocols/jabber/buddy.c:898
-#: ../libpurple/protocols/jabber/buddy.c:1058
 msgid "User Profile"
 msgstr "Perfil de usuario"
 
 # JFS: Jingle es un protocolo de transporte, no se traduce
-#: ../libpurple/protocols/jabber/buddy.c:900
-#: ../libpurple/protocols/jabber/buddy.c:1060
 msgid "Jingle"
 msgstr "Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:902
-#: ../libpurple/protocols/jabber/buddy.c:1062
 msgid "Jingle Audio"
 msgstr "Audio Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:904
-#: ../libpurple/protocols/jabber/buddy.c:1064
 msgid "User Nickname"
 msgstr "Nombre de usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:906
-#: ../libpurple/protocols/jabber/buddy.c:1066
 msgid "Jingle ICE UDP"
 msgstr "Jingle ICE UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:908
-#: ../libpurple/protocols/jabber/buddy.c:1068
 msgid "Jingle ICE TCP"
 msgstr "Jingle ICE TCP"
 
-#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1070
 msgid "Jingle Raw UDP"
 msgstr "Jingle UDP en crudo"
 
-#: ../libpurple/protocols/jabber/buddy.c:912
-#: ../libpurple/protocols/jabber/buddy.c:1072
 msgid "Jingle Video"
 msgstr "V鱈deo Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:914
-#: ../libpurple/protocols/jabber/buddy.c:1074
 msgid "Jingle DTMF"
 msgstr "DTMF Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:916
-#: ../libpurple/protocols/jabber/buddy.c:1076
 msgid "Message Receipts"
 msgstr "Recibos de mensajes"
 
-#: ../libpurple/protocols/jabber/buddy.c:918
-#: ../libpurple/protocols/jabber/buddy.c:1078
 msgid "Public Key Publishing"
 msgstr "Publicaci坦n de la clave p炭blica"
 
-#: ../libpurple/protocols/jabber/buddy.c:920
-#: ../libpurple/protocols/jabber/buddy.c:1080
 msgid "User Chatting"
 msgstr "Chatear con usuarios"
 
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:1082
 msgid "User Browsing"
 msgstr "Navegar usuarios"
 
-#: ../libpurple/protocols/jabber/buddy.c:924
-#: ../libpurple/protocols/jabber/buddy.c:1084
 msgid "User Gaming"
 msgstr "Jugar con usuarios"
 
-#: ../libpurple/protocols/jabber/buddy.c:926
-#: ../libpurple/protocols/jabber/buddy.c:1086
 msgid "User Viewing"
 msgstr "Ver usuarios"
 
-#: ../libpurple/protocols/jabber/buddy.c:928
-#: ../libpurple/protocols/jabber/buddy.c:1088
-#: ../libpurple/protocols/silc/ops.c:1613
-#: ../libpurple/protocols/silc/ops.c:1618
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:930
-#: ../libpurple/protocols/jabber/buddy.c:1090
 msgid "Stanza Encryption"
 msgstr "Cifrado de grupo"
 
-#: ../libpurple/protocols/jabber/buddy.c:932
-#: ../libpurple/protocols/jabber/buddy.c:1092
 msgid "Entity Time"
 msgstr "Tiempo de entidad"
 
-#: ../libpurple/protocols/jabber/buddy.c:934
-#: ../libpurple/protocols/jabber/buddy.c:1094
 msgid "Delayed Delivery"
 msgstr "Env鱈o con demora"
 
-#: ../libpurple/protocols/jabber/buddy.c:936
-#: ../libpurple/protocols/jabber/buddy.c:1096
 msgid "Collaborative Data Objects"
 msgstr "Objetods de datos colaborativos"
 
-#: ../libpurple/protocols/jabber/buddy.c:938
-#: ../libpurple/protocols/jabber/buddy.c:1098
 msgid "File Repository and Sharing"
 msgstr "Repositorio de archivos y compartici坦n"
 
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:1100
 msgid "STUN Service Discovery for Jingle"
 msgstr "Servidor de descubrimiento STUN para Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:942
-#: ../libpurple/protocols/jabber/buddy.c:1102
 msgid "Simplified Encrypted Session Negotiation"
 msgstr "Negociaci坦n de sesi坦n cifrada simplificada"
 
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/buddy.c:1104
 msgid "Hop Check"
 msgstr "Comprobaci坦n de saltos"
 
-#: ../libpurple/protocols/jabber/buddy.c:952
-#: ../libpurple/protocols/jabber/buddy.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2962
 msgid "Capabilities"
 msgstr "Capacidades"
 
-#: ../libpurple/protocols/jabber/buddy.c:964
-#: ../libpurple/protocols/jabber/libxmpp.c:209
-#: ../libpurple/protocols/jabber/si.c:1098
+msgid "Priority"
+msgstr "Prioridad"
+
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../libpurple/protocols/jabber/buddy.c:966
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1638
-#: ../libpurple/protocols/jabber/jabber.c:1652
-#: ../libpurple/protocols/jabber/jabber.c:1666
-msgid "Priority"
-msgstr "Prioridad"
-
-#: ../libpurple/protocols/jabber/buddy.c:1275
-#: ../libpurple/protocols/silc/ops.c:1008
-#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Nombre medio"
 
-#: ../libpurple/protocols/jabber/buddy.c:1308
-#: ../libpurple/protocols/jabber/jabber.c:1014
-#: ../libpurple/protocols/oscar/oscar.c:3827
-#: ../libpurple/protocols/oscar/oscar.c:3840
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1044
-#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Direcci坦n"
 
-#: ../libpurple/protocols/jabber/buddy.c:1314
 msgid "P.O. Box"
 msgstr "C坦digo postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:1424
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1424
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1993
 msgid "Un-hide From"
 msgstr "No ocultarse de"
 
-#: ../libpurple/protocols/jabber/buddy.c:1997
 msgid "Temporarily Hide From"
 msgstr "Ocultarse temporalmente de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:2005
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificaci坦n de presencia"
 
-#: ../libpurple/protocols/jabber/buddy.c:2012
 msgid "(Re-)Request authorization"
 msgstr "Volver a pedir autorizaci坦n"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:2021
 msgid "Unsubscribe"
 msgstr "De-suscribir"
 
-#: ../libpurple/protocols/jabber/buddy.c:2036
 msgid "Log In"
 msgstr "Conectarse"
 
-#: ../libpurple/protocols/jabber/buddy.c:2040
 msgid "Log Out"
 msgstr "Desconectarse"
 
-#: ../libpurple/protocols/jabber/buddy.c:2086
-#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Chatty"
 msgstr "Hablador"
 
-#: ../libpurple/protocols/jabber/buddy.c:2090
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: ../libpurple/protocols/jabber/buddy.c:2092
-#: ../libpurple/protocols/jabber/jabber.c:1665
-#: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5923
-#: ../libpurple/protocols/sametime/sametime.c:3349
+#, c-format
 msgid "Do Not Disturb"
 msgstr "No molestar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2259
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2263
-#: ../libpurple/protocols/jabber/buddy.c:2452
-#: ../libpurple/protocols/oscar/oscar.c:3750
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: ../libpurple/protocols/jabber/buddy.c:2295
 msgid "The following are the results of your search"
 msgstr "�stos son los resultados de su b炭squeda"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2380
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5636,183 +4001,120 @@
 "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:2400
 msgid "Directory Query Failed"
 msgstr "Fall坦 la consulta al directorio"
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
 msgid "Could not query the directory server."
 msgstr "No se pudo consultar con el servidor de directorio."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2435
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instrucciones del servidor: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2442
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Rellene uno o m叩s de los campos mostrados a continuaci坦n para buscar a un "
 "usuario XMPP cuyos datos coincidan."
 
-#: ../libpurple/protocols/jabber/buddy.c:2462
-#: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3753
-#: ../libpurple/protocols/oscar/oscar.c:3762
 msgid "Email Address"
 msgstr "Direcci坦n de correo electr坦nico"
 
-#: ../libpurple/protocols/jabber/buddy.c:2471
-#: ../libpurple/protocols/jabber/buddy.c:2472
 msgid "Search for XMPP users"
 msgstr "Buscar un usuario XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2473
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:177
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5667
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:474
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2488
 msgid "Invalid Directory"
 msgstr "Directorio inv叩lido"
 
-#: ../libpurple/protocols/jabber/buddy.c:2505
 msgid "Enter a User Directory"
 msgstr "Introduzca un directorio de usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:2506
 msgid "Select a user directory to search"
 msgstr "Selecciona un directorio de usuario donde buscar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2509
 msgid "Search Directory"
 msgstr "Buscar en el directorio"
 
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5403
-#: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_Sala:"
 
-#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "S_ervidor:"
 
-#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Manipulador:"
 
-#: ../libpurple/protocols/jabber/chat.c:226
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s no es un nombre de sala v叩lido"
 
-#: ../libpurple/protocols/jabber/chat.c:227
 msgid "Invalid Room Name"
 msgstr "Nombre de sala inv叩lido"
 
-#: ../libpurple/protocols/jabber/chat.c:232
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s no es un nombre de servidor v叩lido"
 
-#: ../libpurple/protocols/jabber/chat.c:233
-#: ../libpurple/protocols/jabber/chat.c:234
 msgid "Invalid Server Name"
 msgstr "Nombre de servidor no v叩lido"
 
-#: ../libpurple/protocols/jabber/chat.c:238
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s no es un indicador de sala v叩lido"
 
-#: ../libpurple/protocols/jabber/chat.c:239
-#: ../libpurple/protocols/jabber/chat.c:240
 msgid "Invalid Room Handle"
 msgstr "Indicador de sala inv叩lido"
 
-#: ../libpurple/protocols/jabber/chat.c:401
 msgid "Configuration error"
 msgstr "Error de configuraci坦n"
 
-#: ../libpurple/protocols/jabber/chat.c:410
-#: ../libpurple/protocols/jabber/chat.c:553
 msgid "Unable to configure"
 msgstr "No se pudo configurar"
 
-#: ../libpurple/protocols/jabber/chat.c:425
 msgid "Room Configuration Error"
 msgstr "Error de configuraci坦n de sala"
 
-#: ../libpurple/protocols/jabber/chat.c:426
 msgid "This room is not capable of being configured"
 msgstr "Esta sala no es capaz de ser configurada"
 
-#: ../libpurple/protocols/jabber/chat.c:475
-#: ../libpurple/protocols/jabber/chat.c:544
 msgid "Registration error"
 msgstr "Error de registro"
 
-#: ../libpurple/protocols/jabber/chat.c:632
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "El cambio de apodo no est叩 soportado en salas de chat no-MUC"
 
-#: ../libpurple/protocols/jabber/chat.c:683
-#: ../libpurple/protocols/jabber/chat.c:694
-#: ../libpurple/protocols/silc/ops.c:1473
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Error al obtener la lista de salas"
 
-#: ../libpurple/protocols/jabber/chat.c:742
 msgid "Invalid Server"
 msgstr "Nombre de servidor no v叩lido"
 
-#: ../libpurple/protocols/jabber/chat.c:786
 msgid "Enter a Conference Server"
 msgstr "Introducir un servidor de conferencias"
 
-#: ../libpurple/protocols/jabber/chat.c:787
 msgid "Select a conference server to query"
 msgstr "Selecciona un servidor de conferencias al que consultar"
 
-#: ../libpurple/protocols/jabber/chat.c:790
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
 msgstr "Necesita cifrado, pero no est叩 disponible esa opci坦n en este servidor."
 
-#: ../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:401
 msgid "Ping timeout"
 msgstr "Tiempo de expiraci坦n del ping"
 
-#: ../libpurple/protocols/jabber/jabber.c:451
-#: ../libpurple/protocols/jabber/jabber.c:491
 msgid "Read Error"
 msgstr "Error de lectura"
 
-#: ../libpurple/protocols/jabber/jabber.c:528
-#: ../libpurple/protocols/oscar/flap_connection.c:403
-#: ../libpurple/protocols/yahoo/yahoo.c:2594
-#: ../libpurple/protocols/yahoo/yahoo.c:2626
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5821,556 +4123,379 @@
 "No se pudo establecer una conexi坦n con el servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:585
 msgid "Unable to create socket"
 msgstr "No se pudo crear el socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:635
-#: ../libpurple/protocols/jabber/jabber.c:1120
 msgid "Invalid XMPP ID"
 msgstr "XMPP ID no v叩lido"
 
-#: ../libpurple/protocols/jabber/jabber.c:642
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP ID inv叩lido. Debe establecerse el dominio."
 
-#: ../libpurple/protocols/jabber/jabber.c:720
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s efectuado con 辿xito"
 
-#: ../libpurple/protocols/jabber/jabber.c:726
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Registro a %s efectuado con 辿xito"
 
-#: ../libpurple/protocols/jabber/jabber.c:728
-#: ../libpurple/protocols/jabber/jabber.c:729
 msgid "Registration Successful"
 msgstr "�xito en el registro"
 
-#: ../libpurple/protocols/jabber/jabber.c:737
-#: ../libpurple/protocols/jabber/jabber.c:738
 msgid "Registration Failed"
 msgstr "Fall坦 el registro"
 
-#: ../libpurple/protocols/jabber/jabber.c:756
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Registro de %s efectuado con 辿xito"
 
-#: ../libpurple/protocols/jabber/jabber.c:758
-#: ../libpurple/protocols/jabber/jabber.c:759
 msgid "Unregistration Successful"
 msgstr "�xito en el deregistro"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Unregistration Failed"
 msgstr "Fall坦 el deregistro"
 
-#: ../libpurple/protocols/jabber/jabber.c:934
-#: ../libpurple/protocols/jabber/jabber.c:935
 msgid "Already Registered"
 msgstr "Ya est叩 registrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1022
-#: ../libpurple/protocols/oscar/oscar.c:3829
-#: ../libpurple/protocols/oscar/oscar.c:3842
 msgid "State"
 msgstr "Estado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1026
 msgid "Postal code"
 msgstr "C坦digo postal"
 
-#: ../libpurple/protocols/jabber/jabber.c:1030
-#: ../libpurple/protocols/silc/ops.c:1049
-#: ../libpurple/protocols/silc/silc.c:988
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:689
-#: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "Tel辿fono"
 
-#: ../libpurple/protocols/jabber/jabber.c:1038
 msgid "Date"
 msgstr "Fecha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Unregister"
 msgstr "Deregistrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1049
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr ""
 "Por favor, rellene la informaci坦n abajo indicada para cambiar su registro de "
 "cuenta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor, rellene la informaci坦n abajo indicada para registrar su nueva "
 "cuenta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1060
-#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Register New XMPP Account"
 msgstr "Registrando cuenta nueva de XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1062
-#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Register"
 msgstr "Registrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1067
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Cambiar la cuenta de registro en %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1068
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Registrar una cuenta nueva en %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Change Registration"
 msgstr "Cambiar registro"
 
-#: ../libpurple/protocols/jabber/jabber.c:1180
-#: ../libpurple/protocols/jabber/jabber.c:1181
 msgid "Error unregistering account"
 msgstr "Error al deregistrar la cuenta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1186
-#: ../libpurple/protocols/jabber/jabber.c:1187
 msgid "Account successfully unregistered"
 msgstr "La cuenta se ha deregistrado con 辿xito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1350
 msgid "Initializing Stream"
 msgstr "Inicializando flujo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1355
 msgid "Initializing SSL/TLS"
 msgstr "Inicializando SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1359
-#: ../libpurple/protocols/msn/session.c:408
-#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
 msgid "Re-initializing Stream"
 msgstr "Reinicializando flujo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1462
-#: ../libpurple/protocols/jabber/jabber.c:1920
-#: ../libpurple/protocols/jabber/jabber.c:1963
-#: ../libpurple/protocols/jabber/jabber.c:2001
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5717
 msgid "Not Authorized"
 msgstr "No autorizado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Both"
 msgstr "Ambos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "From (To pending)"
 msgstr "Desde (Destino pendiente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "From"
 msgstr "De"
 
-#: ../libpurple/protocols/jabber/jabber.c:1517
 msgid "To"
 msgstr "A"
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
 msgid "None (To pending)"
 msgstr "Nadie (Destino pendiente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1521
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ninguno"
 
-#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Subscription"
 msgstr "Subscripci坦n"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#: ../libpurple/protocols/jabber/jabber.c:1640
-#: ../libpurple/protocols/jabber/jabber.c:1654
-#: ../libpurple/protocols/jabber/jabber.c:1668
-#: ../libpurple/protocols/jabber/usermood.c:181
-#: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1225
-#: ../libpurple/protocols/silc10/buddy.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Estado de 叩nimo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
-#: ../libpurple/protocols/msn/msn.c:656
 msgid "Now Listening"
 msgstr "Escuchando ahora"
 
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1627
-#: ../libpurple/protocols/jabber/jabber.c:1641
-#: ../libpurple/protocols/jabber/jabber.c:1655
-#: ../libpurple/protocols/jabber/jabber.c:1669
 msgid "Mood Text"
 msgstr "Texto de estado de 叩nimo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1615
-#: ../libpurple/protocols/jabber/jabber.c:1629
-#: ../libpurple/protocols/jabber/jabber.c:1643
-#: ../libpurple/protocols/jabber/jabber.c:1657
-#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Allow Buzz"
 msgstr "Permitir codazos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1689
 msgid "Tune Artist"
 msgstr "Artista de m炭sica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
 msgid "Tune Title"
 msgstr "T鱈tulo de m炭sica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1691
 msgid "Tune Album"
 msgstr "Album de m炭sica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1692
 msgid "Tune Genre"
 msgstr "G辿nero de m炭sica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1693
 msgid "Tune Comment"
 msgstr "Comentario de m炭sica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1694
 msgid "Tune Track"
 msgstr "Pista de m炭sica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
 msgid "Tune Time"
 msgstr "Tiempo de m炭sica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1696
 msgid "Tune Year"
 msgstr "A単o de m炭sica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1697
 msgid "Tune URL"
 msgstr "URL de m炭sica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1713
 msgid "Password Changed"
 msgstr "Contrase単a modificada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
 msgid "Your password has been changed."
 msgstr "Su contrase単a ha sido modificada."
 
-#: ../libpurple/protocols/jabber/jabber.c:1720
-#: ../libpurple/protocols/jabber/jabber.c:1721
 msgid "Error changing password"
 msgstr "Error al cambiar la contrase単a"
 
-#: ../libpurple/protocols/jabber/jabber.c:1778
 msgid "Password (again)"
 msgstr "Contrase単a (de nuevo)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1784
-#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Change XMPP Password"
 msgstr "Cambiar contrase単a XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Please enter your new password"
 msgstr "Por favor, indique su nueva contrase単a"
 
-#: ../libpurple/protocols/jabber/jabber.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:6504
-#: ../libpurple/protocols/silc/silc.c:1309
-#: ../libpurple/protocols/silc10/silc.c:1010
 msgid "Set User Info..."
 msgstr "Establecer su informaci坦n de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:6515
-#: ../libpurple/protocols/silc/silc.c:1305
-#: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "Cambiar su contrase単a..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "Search for Users..."
 msgstr "Buscar usuarios..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Bad Request"
 msgstr "Solicitud err坦nea"
 
-#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Conflict"
 msgstr "Conflicto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Feature Not Implemented"
 msgstr "Funcionalidad no implementada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1908
 msgid "Gone"
 msgstr "Se fue"
 
-#: ../libpurple/protocols/jabber/jabber.c:1910
-#: ../libpurple/protocols/jabber/jabber.c:1991
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1912
 msgid "Item Not Found"
 msgstr "Elemento no encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Malformed XMPP ID"
 msgstr "ID de XMPP malformado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Not Acceptable"
 msgstr "No aceptable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Not Allowed"
 msgstr "No permitido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Payment Required"
 msgstr "Pago necesario"
 
-#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Recipient Unavailable"
 msgstr "Destinatario no disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Registration Required"
 msgstr "Registro necesario"
 
-#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Remote Server Not Found"
 msgstr "No se encontr坦 el servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Remote Server Timeout"
 msgstr "Expir坦 el tiempo del servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Service Unavailable"
 msgstr "Servicio no disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1938
 msgid "Subscription Required"
 msgstr "Subscripci坦n necesaria"
 
-#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Unexpected Request"
 msgstr "Solicitud no esperada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Authorization Aborted"
 msgstr "Autorizaci坦n interrumpida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Incorrect encoding in authorization"
 msgstr "Codificaci坦n incorrecta en la autorizaci坦n"
 
-#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid authzid"
 msgstr "Authzid inv叩lido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorizaci坦n inv叩lido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorizaci坦n demasiado d辿bil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Temporary Authentication Failure"
 msgstr "Fall坦 temporal de la autenticaci坦n"
 
-#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Authentication Failure"
 msgstr "Fall坦 de autenticaci坦n"
 
-#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Bad Format"
 msgstr "Formato err坦neo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Bad Namespace Prefix"
 msgstr "Prefijo del espacio de nombres err坦neo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Resource Conflict"
 msgstr "Conflicto de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1983
-#: ../libpurple/protocols/silc/silc.c:350
-#: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection Timeout"
 msgstr "Expir坦 la conexi坦n"
 
-#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "Host Gone"
 msgstr "Servidor desaparecido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1987
 msgid "Host Unknown"
 msgstr "Servidor desconocido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1989
 msgid "Improper Addressing"
 msgstr "Direccionamiento incorrecto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1993
 msgid "Invalid ID"
 msgstr "ID no v叩lido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1995
 msgid "Invalid Namespace"
 msgstr "Espacio de nombres no v叩lido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "Invalid XML"
 msgstr "XML inv叩lido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1999
 msgid "Non-matching Hosts"
 msgstr "No existen servidores coincidentes"
 
-#: ../libpurple/protocols/jabber/jabber.c:2003
 msgid "Policy Violation"
 msgstr "Violaci坦n de la pol鱈tica"
 
-#: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Remote Connection Failed"
 msgstr "Fall坦 la conexi坦n remota"
 
-#: ../libpurple/protocols/jabber/jabber.c:2007
 msgid "Resource Constraint"
 msgstr "Restricci坦n de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:2009
 msgid "Restricted XML"
 msgstr "XML restringido"
 
-#: ../libpurple/protocols/jabber/jabber.c:2011
 msgid "See Other Host"
 msgstr "Ver otros servidores"
 
-#: ../libpurple/protocols/jabber/jabber.c:2013
 msgid "System Shutdown"
 msgstr "Parada del sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:2015
 msgid "Undefined Condition"
 msgstr "Condici坦n no definida"
 
-#: ../libpurple/protocols/jabber/jabber.c:2017
 msgid "Unsupported Encoding"
 msgstr "Codificaci坦n no soportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:2019
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de 束stanza損 no soportado"
 
-#: ../libpurple/protocols/jabber/jabber.c:2021
 msgid "Unsupported Version"
 msgstr "Versi坦n no soportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:2023
 msgid "XML Not Well Formed"
 msgstr "XML malformado"
 
-#: ../libpurple/protocols/jabber/jabber.c:2025
 msgid "Stream Error"
 msgstr "Error de flujo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2110
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "No puede echar al usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2130
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliaci坦n desconocida: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2135
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "No se pudo afiliar al usuario %s como \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol desconocido: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2159
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "No se pudo establecer el rol \"%s\" para el usuario: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2212
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "No puede expulsar al usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2243
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "No puede hacer un ping al usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2261
-#: ../libpurple/protocols/jabber/jabber.c:2272
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr "No se pudo dar el codazo porque no se sabe nada del usuario %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:2267
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
 "No se pudo dar el codazo porque puede que el usuario %s est辿 desconectado."
 
-#: ../libpurple/protocols/jabber/jabber.c:2298
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr ""
@@ -6378,49 +4503,35 @@
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#: ../libpurple/protocols/jabber/jabber.c:2318
-#: ../libpurple/protocols/yahoo/yahoo.c:4167
 msgid "Buzz"
 msgstr "Codazo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2319
-#: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4168
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "臓%s le ha dado un codazo!"
 
-#: ../libpurple/protocols/jabber/jabber.c:2319
-#: ../libpurple/protocols/yahoo/yahoo.c:4168
 #, c-format
 msgid "Buzzing %s..."
 msgstr "Dando un codazo a %s..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2350
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar una sala de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2354
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar una sala de chat"
 
-#: ../libpurple/protocols/jabber/jabber.c:2363
 msgid "part [room]:  Leave the room."
 msgstr "part [habitaci坦n]:  Abandonar la habitaci坦n."
 
-#: ../libpurple/protocols/jabber/jabber.c:2368
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrarse en una sala de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2374
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuevo tema]:  Mostrar o cambiar el tema."
 
-#: ../libpurple/protocols/jabber/jabber.c:2380
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [raz坦n]:  Echar a un usuario de la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2386
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6428,7 +4539,6 @@
 "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:2392
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6436,31 +4546,25 @@
 "rol &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Definir el "
 "rol de un usuario en la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2398
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [mensaje]:  Invitar a un usuario a la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2404
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr "join: &lt;sala&gt; [contrase単a]:  Unirse a una sala en el servidor indicado."
-
-#: ../libpurple/protocols/jabber/jabber.c:2410
+msgstr ""
+"join: &lt;sala&gt; [contrase単a]:  Unirse a una sala en el servidor indicado."
+
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr "kick &lt;usuario&gt; [raz坦n]:  Echar a un usuario de la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2415
 msgid ""
 "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:2421
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 "ping &lt;jid&gt;:       Hacer un ping a un usuario, componente o servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:2426
-#: ../libpurple/protocols/yahoo/yahoo.c:4191
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Dar un codazo a un usuario para llamar su atenci坦n"
 
@@ -6474,96 +4578,70 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
 msgid "XMPP Protocol Plugin"
 msgstr "Complemento de protocolo XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:478
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
 msgstr "Requiere SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "Forzar SSL antiguo (puerto 5323)"
 
-#: ../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:227
-#: ../libpurple/protocols/myspace/myspace.c:3475
-#: ../libpurple/protocols/simple/simple.c:2105
 msgid "Connect port"
 msgstr "Puerto de conexi坦n"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:231
-#: ../libpurple/protocols/myspace/myspace.c:3472
-#: ../libpurple/protocols/silc/silc.c:2139
-#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:811
 msgid "Connect server"
 msgstr "Conectar con el servidor"
 
-#: ../libpurple/protocols/jabber/libxmpp.c: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:162
 #, c-format
 msgid "Message from %s"
 msgstr "Mensaje de %s"
 
-#: ../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:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "El tema es: %s"
 
-#: ../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:279
 msgid "XMPP Message Error"
 msgstr "Mensaje de error de XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:408
-#, c-format
-msgid " (Code %s)"
-msgstr " (C坦digo %s)"
-
-#: ../libpurple/protocols/jabber/parser.c:198
+#, c-format
+msgid "(Code %s)"
+msgstr "(C坦digo %s)"
+
 msgid "XML Parse error"
 msgstr "Error de tratamiento XML"
 
-#: ../libpurple/protocols/jabber/presence.c:453
 msgid "Unknown Error in presence"
 msgstr "Error desconocido en presencia"
 
-#: ../libpurple/protocols/jabber/presence.c:534
-#: ../libpurple/protocols/jabber/presence.c:535
 msgid "Create New Room"
 msgstr "Crear una sala nueva"
 
-#: ../libpurple/protocols/jabber/presence.c:536
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6571,90 +4649,68 @@
 "Va a crear una sala nueva. 多Desea configurarla o aceptar los valores por "
 "omisi坦n?"
 
-#: ../libpurple/protocols/jabber/presence.c:542
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../libpurple/protocols/jabber/presence.c:543
 msgid "_Accept Defaults"
 msgstr "_Aceptar valores por omisi坦n"
 
-#: ../libpurple/protocols/jabber/presence.c:585
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Error al unirse al chat %s"
+
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error en el chat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:589
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Error al unirse al chat %s"
-
-#: ../libpurple/protocols/jabber/si.c:1013
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "No se pudo enviar el archivo a %s, el usuario no soporta transferencias de "
 "archivos"
 
-#: ../libpurple/protocols/jabber/si.c:1014
-#: ../libpurple/protocols/jabber/si.c:1015
-#: ../libpurple/protocols/jabber/si.c:1084
 msgid "File Send Failed"
 msgstr "Fallo en el env鱈o del archivo"
 
-#: ../libpurple/protocols/jabber/si.c:1077
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "No se pudo enviar el archivo a %s, JID inv叩lido"
 
-#: ../libpurple/protocols/jabber/si.c:1079
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "No se pudo enviar el archivo a %s, el usuario no est叩 conectado"
 
-#: ../libpurple/protocols/jabber/si.c:1081
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "No se pudo enviar el archivo a %s, no est叩 suscrito a la presencia del "
 "usuario"
 
-#: ../libpurple/protocols/jabber/si.c:1096
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Elija el recurso de %s al que quiera enviar un archivo"
 
-#: ../libpurple/protocols/jabber/si.c:1112
 msgid "Select a Resource"
 msgstr "Seleccione un recurso"
 
-#: ../libpurple/protocols/jabber/usermood.c:194
-#: ../libpurple/protocols/jabber/usermood.c:195
 msgid "Edit User Mood"
 msgstr "Editar estados de 叩nimo del usuario"
 
-#: ../libpurple/protocols/jabber/usermood.c:196
 msgid "Please select your mood from the list."
 msgstr "Escoja un estado de 叩nimo de la lista."
 
-#: ../libpurple/protocols/jabber/usermood.c:198
-#: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Configurar"
 
-#: ../libpurple/protocols/jabber/usermood.c:206
 msgid "Set Mood..."
 msgstr "Fijar estado de 叩nimo..."
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Set User Nickname"
 msgstr "Establecer apodo de usuario"
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Please specify a new nickname for you."
 msgstr "Introduzca su nuevo apodo."
 
-#: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
@@ -6662,30 +4718,22 @@
 "Escoja algo apropiado, la informaci坦n ser叩 visible a todos los contactos en "
 "su lista de contactos."
 
-#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
 msgstr "Establecer apodo..."
 
-#: ../libpurple/protocols/jabber/xdata.c:381
 msgid "Actions"
 msgstr "Acciones"
 
-#: ../libpurple/protocols/jabber/xdata.c:383
 msgid "Select an action"
 msgstr "Seleccione una acci坦n"
 
-#: ../libpurple/protocols/msn/contact.c:782
 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: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. "
@@ -6694,8 +4742,6 @@
 "%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: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 "
@@ -6704,340 +4750,265 @@
 "%s est叩 en la lista local pero no est叩 en la lista del servidor. 多Desea "
 "a単adir a este amigo?"
 
-#: ../libpurple/protocols/msn/error.c:36
-#: ../libpurple/protocols/msnp9/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "No se pudo interpretar el mensaje"
 
-#: ../libpurple/protocols/msn/error.c:41
-#: ../libpurple/protocols/msnp9/error.c:41
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Error de sintaxis (probablemente un error del cliente)"
 
-#: ../libpurple/protocols/msn/error.c:46
-#: ../libpurple/protocols/msnp9/error.c:46
+#, c-format
 msgid "Invalid email address"
 msgstr "Direcci坦n de correo electr坦nico inv叩lida"
 
-#: ../libpurple/protocols/msn/error.c:49
-#: ../libpurple/protocols/msnp9/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "El usuario no existe"
 
-#: ../libpurple/protocols/msn/error.c:53
-#: ../libpurple/protocols/msnp9/error.c:53
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Falta un nombre de dominio totalmente cualificado"
 
-#: ../libpurple/protocols/msn/error.c:56
-#: ../libpurple/protocols/msnp9/error.c:56
+#, c-format
 msgid "Already logged in"
 msgstr "Ya est叩 conectado"
 
-#: ../libpurple/protocols/msn/error.c:59
-#: ../libpurple/protocols/msnp9/error.c:59
+#, c-format
 msgid "Invalid username"
 msgstr "Nombre de usuario no v叩lido"
 
-#: ../libpurple/protocols/msn/error.c:62
-#: ../libpurple/protocols/msnp9/error.c:62
+#, c-format
 msgid "Invalid friendly name"
 msgstr "Nombre de amigo no v叩lido"
 
-#: ../libpurple/protocols/msn/error.c:65
-#: ../libpurple/protocols/msnp9/error.c:65
+#, c-format
 msgid "List full"
 msgstr "Lista llena"
 
-#: ../libpurple/protocols/msn/error.c:68
-#: ../libpurple/protocols/msnp9/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "Ya est叩 en lista"
 
-#: ../libpurple/protocols/msn/error.c:72
-#: ../libpurple/protocols/msnp9/error.c:72
+#, c-format
 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:760
+#, c-format
 msgid "User is offline"
 msgstr "El usuario no est叩 conectado"
 
-#: ../libpurple/protocols/msn/error.c:78
-#: ../libpurple/protocols/msnp9/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "Ya est叩 en ese modo"
 
-#: ../libpurple/protocols/msn/error.c:82
-#: ../libpurple/protocols/msnp9/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "Ya est叩 en la lista contraria"
 
-#: ../libpurple/protocols/msn/error.c:86
-#: ../libpurple/protocols/msnp9/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "Demasiados grupos"
 
-#: ../libpurple/protocols/msn/error.c:89
-#: ../libpurple/protocols/msnp9/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "Grupo inv叩lido"
 
-#: ../libpurple/protocols/msn/error.c:92
-#: ../libpurple/protocols/msnp9/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "El usuario no est叩 en el grupo"
 
-#: ../libpurple/protocols/msn/error.c:95
-#: ../libpurple/protocols/msnp9/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "Nombre de grupo demasiado largo"
 
-#: ../libpurple/protocols/msn/error.c:98
-#: ../libpurple/protocols/msnp9/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "No se puede eliminar el grupo cero"
 
-#: ../libpurple/protocols/msn/error.c:103
-#: ../libpurple/protocols/msnp9/error.c:103
+#, c-format
 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
-#: ../libpurple/protocols/msnp9/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr "Fall坦 el servidor Switchboard"
 
-#: ../libpurple/protocols/msn/error.c:111
-#: ../libpurple/protocols/msnp9/error.c:111
+#, c-format
 msgid "Notify transfer failed"
 msgstr "Fall坦 la notificaci坦n de la transferencia"
 
-#: ../libpurple/protocols/msn/error.c:116
-#: ../libpurple/protocols/msnp9/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "Faltan campos obligatorios"
 
-#: ../libpurple/protocols/msn/error.c:120
-#: ../libpurple/protocols/msnp9/error.c:120
+#, c-format
 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:121
+#, c-format
 msgid "Not logged in"
 msgstr "No ha iniciado sesi坦n"
 
-#: ../libpurple/protocols/msn/error.c:128
-#: ../libpurple/protocols/msnp9/error.c:128
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Servicio no disponible temporalmente"
 
-#: ../libpurple/protocols/msn/error.c:131
-#: ../libpurple/protocols/msnp9/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "Error del servidor de base de datos"
 
-#: ../libpurple/protocols/msn/error.c:135
-#: ../libpurple/protocols/msnp9/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "Orden deshabilitada"
 
-#: ../libpurple/protocols/msn/error.c:139
-#: ../libpurple/protocols/msnp9/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "Error de operaci坦n de archivos"
 
-#: ../libpurple/protocols/msn/error.c:143
-#: ../libpurple/protocols/msnp9/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "Error al asignar memoria"
 
-#: ../libpurple/protocols/msn/error.c:147
-#: ../libpurple/protocols/msnp9/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Valor CHL err坦neo enviado al servidor"
 
-#: ../libpurple/protocols/msn/error.c:152
-#: ../libpurple/protocols/msnp9/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "Servidor ocupado"
 
-#: ../libpurple/protocols/msn/error.c:155
-#: ../libpurple/protocols/msn/error.c:170
-#: ../libpurple/protocols/msn/error.c:230
-#: ../libpurple/protocols/msnp9/error.c:155
-#: ../libpurple/protocols/msnp9/error.c:170
-#: ../libpurple/protocols/msnp9/error.c:230
+#, c-format
 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
-#: ../libpurple/protocols/msnp9/error.c:158
+#, c-format
 msgid "Peer notification server down"
 msgstr "Servidor de notificaci坦n de pares ca鱈do"
 
-#: ../libpurple/protocols/msn/error.c:162
-#: ../libpurple/protocols/msnp9/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "Error de conexi坦n con la base de datos"
 
-#: ../libpurple/protocols/msn/error.c:167
-#: ../libpurple/protocols/msnp9/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "El servidor est叩 apag叩ndose (S叩lvese quien pueda)"
 
-#: ../libpurple/protocols/msn/error.c:174
-#: ../libpurple/protocols/msnp9/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "Error al crear la conexi坦n"
 
-#: ../libpurple/protocols/msn/error.c:179
-#: ../libpurple/protocols/msnp9/error.c:179
+#, c-format
 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
-#: ../libpurple/protocols/msnp9/error.c:183
+#, c-format
 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
-#: ../libpurple/protocols/msnp9/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "Sobrecarga de sesi坦n"
 
-#: ../libpurple/protocols/msn/error.c:190
-#: ../libpurple/protocols/msnp9/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "El usuario est叩 demasiado activo"
 
-#: ../libpurple/protocols/msn/error.c:193
-#: ../libpurple/protocols/msnp9/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "Demasiadas sesiones"
 
-#: ../libpurple/protocols/msn/error.c:196
-#: ../libpurple/protocols/msnp9/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr "Pasaporte no verificado"
 
-#: ../libpurple/protocols/msn/error.c:199
-#: ../libpurple/protocols/msnp9/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "Fichero de amigos incorrecto"
 
-#: ../libpurple/protocols/msn/error.c:203
-#: ../libpurple/protocols/msnp9/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "No se esperaba"
 
-#: ../libpurple/protocols/msn/error.c:209
-#: ../libpurple/protocols/msnp9/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Los nombres de amigos cambian demasiado r叩pido"
 
-#: ../libpurple/protocols/msn/error.c:218
-#: ../libpurple/protocols/msnp9/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "Servidor muy ocupado"
 
-#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1422
-#: ../libpurple/protocols/silc/silc.c:338
-#: ../libpurple/protocols/silc10/ops.c:1713
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1448
+#, c-format
 msgid "Authentication failed"
 msgstr "Fall坦 la autenticaci坦n"
 
-#: ../libpurple/protocols/msn/error.c:225
-#: ../libpurple/protocols/msnp9/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "No puede mandar mensajes fuera de l鱈nea"
 
-#: ../libpurple/protocols/msn/error.c:233
-#: ../libpurple/protocols/msnp9/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "No se aceptan usuarios nuevos"
 
-#: ../libpurple/protocols/msn/error.c:237
-#: ../libpurple/protocols/msnp9/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Pasaporte de menores sin consentimiento paterno"
 
-#: ../libpurple/protocols/msn/error.c:241
-#: ../libpurple/protocols/msnp9/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Cuenta Passport no verificada a炭n"
 
-#: ../libpurple/protocols/msn/error.c:244
-#: ../libpurple/protocols/msnp9/error.c:244
+#, c-format
 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:128 ../libpurple/protocols/msnp9/msn.c:129
 msgid "Nudge"
 msgstr "Codazo"
 
-#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "%s has nudged you!"
 msgstr "臓Le ha dado un codazo %s!"
 
-#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "Nudging %s..."
 msgstr "Dando un codazo a %s..."
 
-#: ../libpurple/protocols/msn/msn.c:170 ../libpurple/protocols/msnp9/msn.c:171
+msgid "Email Address..."
+msgstr "Direcci坦n de correo electr坦nico..."
+
 msgid "Your new MSN friendly name is too long."
 msgstr "El nuevo nombre de amigo MSN es demasiado largo."
 
-#: ../libpurple/protocols/msn/msn.c:296 ../libpurple/protocols/msnp9/msn.c:279
 msgid "Set your friendly name."
 msgstr "Establecer su nombre de amigo."
 
-#: ../libpurple/protocols/msn/msn.c:297 ../libpurple/protocols/msnp9/msn.c:280
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "�ste es el nombre bajo el que otros amigos MSN le ver叩n."
 
-#: ../libpurple/protocols/msn/msn.c:315 ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your home phone number."
 msgstr "Establezca el n炭mero de tel辿fono de su domicilio."
 
-#: ../libpurple/protocols/msn/msn.c:332 ../libpurple/protocols/msnp9/msn.c:315
 msgid "Set your work phone number."
 msgstr "Establezca el n炭mero de tel辿fono de su trabajo."
 
-#: ../libpurple/protocols/msn/msn.c:349 ../libpurple/protocols/msnp9/msn.c:332
 msgid "Set your mobile phone number."
 msgstr "Establezca su n炭mero de tel辿fono m坦vil."
 
-#: ../libpurple/protocols/msn/msn.c:364 ../libpurple/protocols/msnp9/msn.c:347
 msgid "Allow MSN Mobile pages?"
 msgstr "多Permitir los env鱈os de MSN Mobile?"
 
-#: ../libpurple/protocols/msn/msn.c:365 ../libpurple/protocols/msnp9/msn.c:348
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -7045,69 +5016,53 @@
 "多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:371 ../libpurple/protocols/msnp9/msn.c:354
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../libpurple/protocols/msn/msn.c:372 ../libpurple/protocols/msnp9/msn.c:355
 msgid "Disallow"
 msgstr "Rechazar"
 
-#: ../libpurple/protocols/msn/msn.c:388 ../libpurple/protocols/msnp9/msn.c:371
-msgid "This Hotmail account may not be active."
-msgstr "Puede que esta cuenta de Hotmail no est辿 activa."
-
-#: ../libpurple/protocols/msn/msn.c:414 ../libpurple/protocols/msnp9/msn.c:397
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "Texto bloqueado para %s"
+
+msgid "No text is blocked for this account."
+msgstr "No hay texto bloqueado para esta cuenta."
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+"Los servidores MSN bloquean actualmente las siguientes expresiones regulares:"
+"<br/>%s"
+
+msgid "This account does not have email enabled."
+msgstr "Esta cuenta no tiene correo activado."
+
 msgid "Send a mobile message."
 msgstr "Enviar un mensaje a un m坦vil."
 
-#: ../libpurple/protocols/msn/msn.c:416 ../libpurple/protocols/msnp9/msn.c:399
 msgid "Page"
 msgstr "Buscapersonas"
 
-#: ../libpurple/protocols/msn/msn.c:679 ../libpurple/protocols/msnp9/msn.c:567
 msgid "Home Phone Number"
 msgstr "N炭mero de tel辿fono de casa"
 
-#: ../libpurple/protocols/msn/msn.c:683 ../libpurple/protocols/msnp9/msn.c:571
 msgid "Work Phone Number"
 msgstr "N炭mero de tel辿fono del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:687 ../libpurple/protocols/msnp9/msn.c:575
 msgid "Mobile Phone Number"
 msgstr "N炭mero de tel辿fono m坦vil"
 
-#: ../libpurple/protocols/msn/msn.c:710 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:594
-#: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3134
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
 msgid "Be Right Back"
 msgstr "Vuelvo enseguida"
 
-#: ../libpurple/protocols/msn/msn.c:716 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:598
-#: ../libpurple/protocols/msnp9/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2840
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/silc/buddy.c:1483
-#: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1483
-#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
-#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/msn/msn.c:721 ../libpurple/protocols/msnp9/msn.c:602
-#: ../libpurple/protocols/yahoo/yahoo.c:3144
-#: ../libpurple/protocols/yahoo/yahoo.c:3842
 msgid "On the Phone"
 msgstr "Al tel辿fono"
 
-#: ../libpurple/protocols/msn/msn.c:726 ../libpurple/protocols/msnp9/msn.c:606
-#: ../libpurple/protocols/yahoo/yahoo.c:3148
-#: ../libpurple/protocols/yahoo/yahoo.c:3848
 msgid "Out to Lunch"
 msgstr "Sal鱈 a comer"
 
@@ -7117,341 +5072,191 @@
 #. savable
 #. should be user_settable some day
 #. independent
-#: ../libpurple/protocols/msn/msn.c:745
-#: ../libpurple/protocols/myspace/myspace.c:170
 msgid "Artist"
 msgstr "Artista"
 
-#: ../libpurple/protocols/msn/msn.c:746
 msgid "Album"
 msgstr "Album"
 
-#: ../libpurple/protocols/msn/msn.c:764 ../libpurple/protocols/msnp9/msn.c:634
 msgid "Set Friendly Name..."
 msgstr "Establecer su nombre de amigo..."
 
-#: ../libpurple/protocols/msn/msn.c:769 ../libpurple/protocols/msnp9/msn.c:639
 msgid "Set Home Phone Number..."
 msgstr "Establecer el n炭mero de tel辿fono de su domicilio..."
 
-#: ../libpurple/protocols/msn/msn.c:773 ../libpurple/protocols/msnp9/msn.c:643
 msgid "Set Work Phone Number..."
 msgstr "Establecer el n炭mero de tel辿fono de su trabajo..."
 
-#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Set Mobile Phone Number..."
 msgstr "Establecer su n炭mero de tel辿fono m坦vil..."
 
-#: ../libpurple/protocols/msn/msn.c:783 ../libpurple/protocols/msnp9/msn.c:653
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Permitir/Rechazar dispositivos m坦viles..."
 
-#: ../libpurple/protocols/msn/msn.c:788 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permitir/Rechazar p叩ginas Mobile"
 
-#: ../libpurple/protocols/msn/msn.c:799 ../libpurple/protocols/msnp9/msn.c:669
+msgid "View Blocked Text..."
+msgstr "Mostrar mensaje bloqueado..."
+
 msgid "Open Hotmail Inbox"
 msgstr "Abrir bandeja de entrada de Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:823 ../libpurple/protocols/msnp9/msn.c:693
 msgid "Send to Mobile"
 msgstr "Enviar a un m坦vil"
 
-#: ../libpurple/protocols/msn/msn.c:833 ../libpurple/protocols/msnp9/msn.c:703
-#: ../libpurple/protocols/novell/novell.c:3426
 msgid "Initiate _Chat"
 msgstr "Iniciar _chat"
 
-#: ../libpurple/protocols/msn/msn.c:871 ../libpurple/protocols/msnp9/msn.c:742
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "El soporte SSL es necesario para MSN. Por favor, instale una biblioteca SSL "
 "soportada."
 
-#: ../libpurple/protocols/msn/msn.c:901 ../libpurple/protocols/msnp9/msn.c:772
 msgid "Failed to connect to server."
 msgstr "No se pudo conectar al servidor."
 
-#: ../libpurple/protocols/msn/msn.c:1685 ../libpurple/protocols/msn/msn.c:2028
-#: ../libpurple/protocols/msnp9/msn.c:1526
-#: ../libpurple/protocols/msnp9/msn.c:1869
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Error al obtener el perfil"
 
-#: ../libpurple/protocols/msn/msn.c:1751
-#: ../libpurple/protocols/msnp9/msn.c:1592 ../pidgin/plugins/convcolors.c:371
-#: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "General"
 
-#: ../libpurple/protocols/msn/msn.c:1758
-#: ../libpurple/protocols/msnp9/msn.c:1599
-#: ../libpurple/protocols/myspace/user.c:125
-#: ../libpurple/protocols/oscar/oscar.c:3794
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1088
 msgid "Age"
 msgstr "Edad"
 
-#: ../libpurple/protocols/msn/msn.c:1760
-#: ../libpurple/protocols/msnp9/msn.c:1601
-#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
 msgid "Occupation"
 msgstr "Ocupaci坦n"
 
-#: ../libpurple/protocols/msn/msn.c:1761
-#: ../libpurple/protocols/msnp9/msn.c:1602
-#: ../libpurple/protocols/myspace/user.c:133
-#: ../libpurple/protocols/novell/novell.c:1487
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1083
-#: ../libpurple/protocols/zephyr/zephyr.c:802
-#: ../libpurple/protocols/zephyr/zephyr.c:1175
 msgid "Location"
 msgstr "Ubicaci坦n"
 
-#: ../libpurple/protocols/msn/msn.c:1766 ../libpurple/protocols/msn/msn.c:1958
-#: ../libpurple/protocols/msn/msn.c:1964 ../libpurple/protocols/msn/msn.c:1971
-#: ../libpurple/protocols/msnp9/msn.c:1607
-#: ../libpurple/protocols/msnp9/msn.c:1799
-#: ../libpurple/protocols/msnp9/msn.c:1805
-#: ../libpurple/protocols/msnp9/msn.c:1812
 msgid "Hobbies and Interests"
 msgstr "Aficiones e intereses"
 
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1892
-#: ../libpurple/protocols/msn/msn.c:1898 ../libpurple/protocols/msn/msn.c:1905
-#: ../libpurple/protocols/msn/msn.c:1913 ../libpurple/protocols/msn/msn.c:1920
-#: ../libpurple/protocols/msnp9/msn.c:1613
-#: ../libpurple/protocols/msnp9/msn.c:1733
-#: ../libpurple/protocols/msnp9/msn.c:1739
-#: ../libpurple/protocols/msnp9/msn.c:1746
-#: ../libpurple/protocols/msnp9/msn.c:1754
-#: ../libpurple/protocols/msnp9/msn.c:1761
 msgid "A Little About Me"
 msgstr "Un poco sobre m鱈"
 
-#: ../libpurple/protocols/msn/msn.c:1789
-#: ../libpurple/protocols/msnp9/msn.c:1630
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1791
-#: ../libpurple/protocols/msnp9/msn.c:1632
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../libpurple/protocols/msn/msn.c:1792
-#: ../libpurple/protocols/msnp9/msn.c:1633
 msgid "Interests"
 msgstr "Aficiones"
 
-#: ../libpurple/protocols/msn/msn.c:1793
-#: ../libpurple/protocols/msnp9/msn.c:1634
 msgid "Pets"
 msgstr "Mascotas"
 
-#: ../libpurple/protocols/msn/msn.c:1794
-#: ../libpurple/protocols/msnp9/msn.c:1635
 msgid "Hometown"
 msgstr "Ciudad donde vive"
 
-#: ../libpurple/protocols/msn/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1636
 msgid "Places Lived"
 msgstr "Lugares donde he vivido"
 
-#: ../libpurple/protocols/msn/msn.c:1796
-#: ../libpurple/protocols/msnp9/msn.c:1637
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1797
-#: ../libpurple/protocols/msnp9/msn.c:1638
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/msnp9/msn.c:1639
 msgid "Music"
 msgstr "M炭sica"
 
-#: ../libpurple/protocols/msn/msn.c:1799 ../libpurple/protocols/msn/msn.c:1980
-#: ../libpurple/protocols/msn/msn.c:1986
-#: ../libpurple/protocols/msnp9/msn.c:1640
-#: ../libpurple/protocols/msnp9/msn.c:1821
-#: ../libpurple/protocols/msnp9/msn.c:1827
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1145
 msgid "Favorite Quote"
 msgstr "Cita preferida"
 
-#: ../libpurple/protocols/msn/msn.c:1816
-#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Contact Info"
 msgstr "Informaci坦n del contacto"
 
-#: ../libpurple/protocols/msn/msn.c:1817
-#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal"
 msgstr "Personal"
 
-#: ../libpurple/protocols/msn/msn.c:1820
-#: ../libpurple/protocols/msnp9/msn.c:1661
 msgid "Significant Other"
 msgstr "Otra persona importante"
 
-#: ../libpurple/protocols/msn/msn.c:1821
-#: ../libpurple/protocols/msnp9/msn.c:1662
 msgid "Home Phone"
 msgstr "Tel辿fono de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1822
-#: ../libpurple/protocols/msnp9/msn.c:1663
 msgid "Home Phone 2"
 msgstr "Tel辿fono de casa (2)"
 
-#: ../libpurple/protocols/msn/msn.c:1823
-#: ../libpurple/protocols/msnp9/msn.c:1664
-#: ../libpurple/protocols/oscar/oscar.c:3832
 msgid "Home Address"
 msgstr "Domicilio"
 
-#: ../libpurple/protocols/msn/msn.c:1824
-#: ../libpurple/protocols/msnp9/msn.c:1665
 msgid "Personal Mobile"
 msgstr "M坦vil personal"
 
-#: ../libpurple/protocols/msn/msn.c:1825
-#: ../libpurple/protocols/msnp9/msn.c:1666
 msgid "Home Fax"
 msgstr "Fax personal"
 
-#: ../libpurple/protocols/msn/msn.c:1826
-#: ../libpurple/protocols/msnp9/msn.c:1667
 msgid "Personal Email"
 msgstr "Correo-e personal"
 
-#: ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/msnp9/msn.c:1668
 msgid "Personal IM"
 msgstr "MI personal"
 
-#: ../libpurple/protocols/msn/msn.c:1829
-#: ../libpurple/protocols/msnp9/msn.c:1670
 msgid "Anniversary"
 msgstr "Aniversario"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1845
-#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work"
 msgstr "Trabajo"
 
 # Prefiero esto a "T鱈tulo laboral" que puede ser ambiguo, jfs
-#: ../libpurple/protocols/msn/msn.c:1847
-#: ../libpurple/protocols/msnp9/msn.c:1688
-#: ../libpurple/protocols/silc/ops.c:1024
-#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1848
-#: ../libpurple/protocols/msnp9/msn.c:1689
-#: ../libpurple/protocols/oscar/oscar.c:3853
 msgid "Company"
 msgstr "Compa単鱈a"
 
-#: ../libpurple/protocols/msn/msn.c:1849
-#: ../libpurple/protocols/msnp9/msn.c:1690
-#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Departamento"
 
-#: ../libpurple/protocols/msn/msn.c:1850
-#: ../libpurple/protocols/msnp9/msn.c:1691
 msgid "Profession"
 msgstr "Profesi坦n"
 
-#: ../libpurple/protocols/msn/msn.c:1851
-#: ../libpurple/protocols/msnp9/msn.c:1692
 msgid "Work Phone"
 msgstr "Tel辿fono del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1852
-#: ../libpurple/protocols/msnp9/msn.c:1693
 msgid "Work Phone 2"
 msgstr "Tel辿fono del trabajo (2)"
 
-#: ../libpurple/protocols/msn/msn.c:1853
-#: ../libpurple/protocols/msnp9/msn.c:1694
-#: ../libpurple/protocols/oscar/oscar.c:3845
 msgid "Work Address"
 msgstr "Direcci坦n del trabajo"
 
 # El latinoam辿rica se prefiere 'Celular', creo, jfs
-#: ../libpurple/protocols/msn/msn.c:1854
-#: ../libpurple/protocols/msnp9/msn.c:1695
 msgid "Work Mobile"
 msgstr "M坦vil del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1855
-#: ../libpurple/protocols/msnp9/msn.c:1696
 msgid "Work Pager"
 msgstr "Buscapersonas del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1856
-#: ../libpurple/protocols/msnp9/msn.c:1697
 msgid "Work Fax"
 msgstr "Fax del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1857
-#: ../libpurple/protocols/msnp9/msn.c:1698
 msgid "Work Email"
 msgstr "Correo-e del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1858
-#: ../libpurple/protocols/msnp9/msn.c:1699
 msgid "Work IM"
 msgstr "MI del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1859
-#: ../libpurple/protocols/msnp9/msn.c:1700
 msgid "Start Date"
 msgstr "Fecha inicial"
 
-#: ../libpurple/protocols/msn/msn.c:1929 ../libpurple/protocols/msn/msn.c:1935
-#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
-#: ../libpurple/protocols/msnp9/msn.c:1770
-#: ../libpurple/protocols/msnp9/msn.c:1776
-#: ../libpurple/protocols/msnp9/msn.c:1783
-#: ../libpurple/protocols/msnp9/msn.c:1790
 msgid "Favorite Things"
 msgstr "Cosas preferidas"
 
-#: ../libpurple/protocols/msn/msn.c:1994
-#: ../libpurple/protocols/msnp9/msn.c:1835
 msgid "Last Updated"
 msgstr "Actualizado por 炭ltima vez"
 
-#: ../libpurple/protocols/msn/msn.c:2005
-#: ../libpurple/protocols/msnp9/msn.c:1846
-#: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1040
-#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "P叩gina personal"
 
-#: ../libpurple/protocols/msn/msn.c:2029
-#: ../libpurple/protocols/msnp9/msn.c:1870
 msgid "The user has not created a public profile."
 msgstr "El usuario no ha creado un perfil p炭blico."
 
-#: ../libpurple/protocols/msn/msn.c:2030
-#: ../libpurple/protocols/msnp9/msn.c:1871
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7461,8 +5266,6 @@
 "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:2034
-#: ../libpurple/protocols/msnp9/msn.c:1875
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7470,9 +5273,6 @@
 "No se pudo encontrar informaci坦n en el perfil de usuario. Es probable que el "
 "usuario no exista."
 
-#: ../libpurple/protocols/msn/msn.c:2042
-#: ../libpurple/protocols/msnp9/msn.c:1883
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1247
 msgid "Profile URL"
 msgstr "URL del perfil"
 
@@ -7486,130 +5286,81 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2329 ../libpurple/protocols/msn/msn.c:2331
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de Windows Live Messenger"
 
-#: ../libpurple/protocols/msn/msn.c:2366
-#: ../libpurple/protocols/msnp9/msn.c:2206
 msgid "Use HTTP Method"
 msgstr "Usar m辿todo HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2371
-#: ../libpurple/protocols/msnp9/msn.c:2211
 msgid "HTTP Method Server"
 msgstr "Servidor de m辿todo HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2376
-#: ../libpurple/protocols/msnp9/msn.c:2216
 msgid "Show custom smileys"
 msgstr "Mostrar emoticonos a medida"
 
-#: ../libpurple/protocols/msn/msn.c:2384
-#: ../libpurple/protocols/msnp9/msn.c:2224
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para llamar su atenci坦n"
 
-#: ../libpurple/protocols/msn/nexus.c:71
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Autenticaci坦n Windows Live ID: No fue posible conectarse"
 
-#. we must have failed!
-#: ../libpurple/protocols/msn/nexus.c:124
-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:171
-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
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Autenticaci坦n Windows Live ID: Respuestas inv叩lida"
+
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s no es un nombre de grupo v叩lido."
 
-#: ../libpurple/protocols/msn/notification.c:191
-#: ../libpurple/protocols/msn/notification.c:935
-#: ../libpurple/protocols/msn/session.c:387
-#: ../libpurple/protocols/msnp9/notification.c:184
-#: ../libpurple/protocols/msnp9/notification.c:534
-#: ../libpurple/protocols/msnp9/session.c:339
 msgid "Unknown error."
 msgstr "Error desconocido."
 
-#: ../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:513
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "臓%s le acaba de dar un codazo!"
 
-#: ../libpurple/protocols/msn/notification.c:840
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Error desconocido (%d)"
 
-#: ../libpurple/protocols/msn/notification.c:841
-#: ../libpurple/protocols/sametime/sametime.c:4481
 msgid "Unable to add user"
 msgstr "No puede a単adir al usuario"
 
-#: ../libpurple/protocols/msn/notification.c:901
-#: ../libpurple/protocols/msnp9/notification.c:500
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "No se pudo a単adir al usuario a %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:905
-#: ../libpurple/protocols/msnp9/notification.c:504
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "No puede expulsar al usuario en %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:909
-#: ../libpurple/protocols/msnp9/notification.c:508
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "No se pudo invitar al usuario a %s (%s)."
 
-#: ../libpurple/protocols/msn/notification.c:917
-#: ../libpurple/protocols/msnp9/notification.c:516
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "No se pudo a単adir a %s porque su lista de amigos est叩 llena."
 
-#: ../libpurple/protocols/msn/notification.c:926
-#: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s no es un nombre de cuenta 束passport損 v叩lida."
 
-#: ../libpurple/protocols/msn/notification.c:931
-#: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "Servicio no disponible temporalmente."
 
-#: ../libpurple/protocols/msn/notification.c:1336
-#: ../libpurple/protocols/msnp9/notification.c:898
+msgid "Mobile message was not sent because it was too long."
+msgstr "No se pudo enviar el mensaje al m坦vil porque es demasiado largo."
+
 msgid "Unable to rename group"
 msgstr "No se pudo cambiar el nombre del grupo"
 
-#: ../libpurple/protocols/msn/notification.c:1391
-#: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "No se pudo borrar el grupo"
 
-#: ../libpurple/protocols/msn/notification.c:2008
-#: ../libpurple/protocols/msnp9/notification.c:1372
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7640,40 +5391,34 @@
 "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/yahoo_filexfer.c:1565
-#: ../libpurple/protocols/yahoo/yahoochat.c:1425
-#: ../libpurple/protocols/yahoo/yahoochat.c:1451
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"No se pudo enviar el mensaje porque el sistema no est叩 disponible. Esto "
+"sucede normalmente cuando el usuario est叩 bloqueado o no existe."
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr ""
+"No se pudo enviar el mensaje porque se est叩n enviando demasiado r叩pido."
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr ""
+"No se pudo enviar el mensaje porque se produjo un error de codificaci坦n "
+"desconocida."
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr "No se pudo enviar el mensaje porque se produjo un error desconocido:"
+
 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"
@@ -7682,125 +5427,77 @@
 "Error de conexi坦n del servidor %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:349
-#: ../libpurple/protocols/msnp9/session.c:301
 msgid "Our protocol is not supported by the server."
 msgstr "El servidor no soporta nuestro protocolo."
 
-#: ../libpurple/protocols/msn/session.c:354
-#: ../libpurple/protocols/msnp9/session.c:306
 msgid "Error parsing HTTP."
 msgstr "Error en el an叩lisis HTTP."
 
-#: ../libpurple/protocols/msn/session.c:358
-#: ../libpurple/protocols/msnp9/session.c:310
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "Ha conectado desde otra ubicaci坦n."
 
-#: ../libpurple/protocols/msn/session.c:364
-#: ../libpurple/protocols/msnp9/session.c:316
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Su lista de amigos MSN est叩 indisponible temporalmente. Por favor, espere y "
 "vuelva a intentarlo m叩s tarde."
 
-#: ../libpurple/protocols/msn/session.c:370
-#: ../libpurple/protocols/msnp9/session.c:322
 msgid "The MSN servers are going down temporarily."
 msgstr "Los servidores de MSN van a sufrir un apagado temporal."
 
-#: ../libpurple/protocols/msn/session.c:375
-#: ../libpurple/protocols/msnp9/session.c:327
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "No se pudo autenticar: %s"
 
-#: ../libpurple/protocols/msn/session.c:381
-#: ../libpurple/protocols/msnp9/session.c:333
 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:403
-#: ../libpurple/protocols/msn/session.c:405
-#: ../libpurple/protocols/msnp9/session.c:355
-#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Handshaking"
 msgstr "Negociaci坦n"
 
-#: ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msnp9/session.c:356
 msgid "Transferring"
 msgstr "Transfiriendo"
 
-#: ../libpurple/protocols/msn/session.c:406
-#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Starting authentication"
 msgstr "Empezando la autenticaci坦n"
 
-#: ../libpurple/protocols/msn/session.c:407
-#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Getting cookie"
 msgstr "Obteniendo una cookie"
 
-#: ../libpurple/protocols/msn/session.c:409
-#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Sending cookie"
 msgstr "Enviando cookie"
 
-#: ../libpurple/protocols/msn/session.c:410
-#: ../libpurple/protocols/msnp9/session.c:362
 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:406
-#: ../libpurple/protocols/msnp9/switchboard.c:411
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Posiblemente no se pudo enviar el mensaje porque expir坦 la conexi坦n:"
 
-#: ../libpurple/protocols/msn/switchboard.c:414
-#: ../libpurple/protocols/msnp9/switchboard.c:419
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "No se pudo enviar el mensaje, no est叩 permitido mientras sea invisible:"
 
-#: ../libpurple/protocols/msn/switchboard.c:418
-#: ../libpurple/protocols/msnp9/switchboard.c:423
 msgid "Message could not be sent because the user is offline:"
 msgstr "No se pudo enviar el mensaje porque el usuario no est叩 conectado:"
 
-#: ../libpurple/protocols/msn/switchboard.c:422
-#: ../libpurple/protocols/msnp9/switchboard.c:427
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 "No se pudo enviar el mensaje porque se produjo un error en la conexi坦n:"
 
-#: ../libpurple/protocols/msn/switchboard.c:426
-#: ../libpurple/protocols/msnp9/switchboard.c:431
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "No se pudo enviar el mensaje porque estamos enviando demasiado r叩pido:"
 
-#: ../libpurple/protocols/msn/switchboard.c:430
-#: ../libpurple/protocols/msnp9/switchboard.c:435
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
@@ -7809,26 +5506,18 @@
 "servidor. Es posible que se trate de un error del servidor, vuelva a "
 "intentarlo en unos minutos."
 
-#: ../libpurple/protocols/msn/switchboard.c:437
-#: ../libpurple/protocols/msnp9/switchboard.c:442
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "No se pudo enviar el mensaje porque se produjo un error con el 束switchboard損:"
 
-#: ../libpurple/protocols/msn/switchboard.c:445
-#: ../libpurple/protocols/msnp9/switchboard.c:450
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "No se pudo enviar el mensaje porque se produjo un error desconocido:"
 
-#: ../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: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."
@@ -7836,18 +5525,16 @@
 #. 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:713
-#: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "No se pudo a単adir a \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:716
-#: ../libpurple/protocols/msnp9/userlist.c:655
 msgid "The username specified is invalid."
 msgstr "El nombre de usuario especificado no es v叩lido."
 
-#: ../libpurple/protocols/msnp9/msn.c:546
+msgid "This Hotmail account may not be active."
+msgstr "Puede que esta cuenta de Hotmail no est辿 activa."
+
 msgid "Has you"
 msgstr "Le tiene"
 
@@ -7861,20 +5548,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msnp9/msn.c:2170
-#: ../libpurple/protocols/msnp9/msn.c:2172
 msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
-#: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
 msgstr "Falta un mecanismo de cifrado"
 
-#: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
 msgstr "No se puede encontrar el mecanismo de cifrado RC4"
 
-#: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
@@ -7882,76 +5564,63 @@
 "Actualice a una versi坦n de libpurple con soporte de RC4 (>= 2.0.1). No se "
 "cargar叩 el complemento de MySpaceIM."
 
-#: ../libpurple/protocols/myspace/myspace.c:345
 msgid "Reading challenge"
 msgstr "Leyendo el desaf鱈o"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
 msgid "Unexpected challenge length from server"
 msgstr "Longitud de desaf鱈o inesperada recibida del servidor"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
 msgid "Logging in"
 msgstr "Accediendo"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
-#, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
+#, c-format
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] ""
+"Se perdi坦 la conexi坦n con el servidor (no se recibi坦 ning炭n dato en %d "
+"segundo)"
+msgstr[1] ""
 "Se perdi坦 la conexi坦n con el servidor (no se recibi坦 ning炭n dato en %d "
 "segundos)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1374
 msgid "New mail messages"
 msgstr "Mensajes de correo nuevos"
 
-#: ../libpurple/protocols/myspace/myspace.c:1375
 msgid "New blog comments"
 msgstr "Nuevos comentarios de bit叩cora"
 
-#: ../libpurple/protocols/myspace/myspace.c:1376
 msgid "New profile comments"
 msgstr "Nuevos comentarios de perfil"
 
-#: ../libpurple/protocols/myspace/myspace.c:1377
 msgid "New friend requests!"
 msgstr "臓Nuevas solicitudes de amigos!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1378
 msgid "New picture comments"
 msgstr "Nuevos comentarios de fotos"
 
-#: ../libpurple/protocols/myspace/myspace.c:1408
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../libpurple/protocols/myspace/myspace.c:1594
 msgid "MySpaceIM - No Username Set"
 msgstr "MySpaceIM - No se ha configurado un nombre de usuario"
 
-#: ../libpurple/protocols/myspace/myspace.c:1595
 msgid "You appear to have no MySpace username."
 msgstr "Parece que no tiene un nombre de usuario MySpace."
 
-#: ../libpurple/protocols/myspace/myspace.c:1596
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr "多Deser鱈a configurar uno ahora? (Aviso: 臓NO PODR� CAMBIARLO!)"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1620
-#: ../libpurple/protocols/sametime/sametime.c:1548
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libpurple/protocols/myspace/myspace.c:1855
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Error de pr坦tocolo, c坦digo %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1877
 #, c-format
 msgid ""
 "%s Your password is %d characters, greater than the expected maximum length "
@@ -7964,191 +5633,146 @@
 "profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword損 "
 "e int辿ntelo de nuevo."
 
-#: ../libpurple/protocols/myspace/myspace.c:1900
 msgid "MySpaceIM Error"
 msgstr "Error MySpaceIM"
 
-#: ../libpurple/protocols/myspace/myspace.c:2078
-#: ../libpurple/protocols/myspace/myspace.c:2112
 msgid "Failed to add buddy"
 msgstr "No se pudo a単adir al amigo"
 
-#: ../libpurple/protocols/myspace/myspace.c:2078
 msgid "'addbuddy' command failed."
 msgstr "Fall坦 la orden 'addbudy'."
 
-#: ../libpurple/protocols/myspace/myspace.c:2112
-#: ../libpurple/protocols/myspace/myspace.c:2357
 msgid "persist command failed"
 msgstr "Fall坦 la orden 'persist'"
 
-#: ../libpurple/protocols/myspace/myspace.c:2217
 #, c-format
 msgid "No such user: %s"
 msgstr "No existe el usuario: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2219
 msgid "User lookup"
 msgstr "B炭squeda de usuario"
 
-#: ../libpurple/protocols/myspace/myspace.c:2338
-#: ../libpurple/protocols/myspace/myspace.c:2357
-#: ../libpurple/protocols/myspace/myspace.c:2379
 msgid "Failed to remove buddy"
 msgstr "No se pudo eliminar al amigo"
 
-#: ../libpurple/protocols/myspace/myspace.c:2338
 msgid "'delbuddy' command failed"
 msgstr "Fall坦 la orden 'delbuddy'"
 
-#: ../libpurple/protocols/myspace/myspace.c:2379
 msgid "blocklist command failed"
 msgstr "Fall坦 la orden 'blocklist'"
 
-#: ../libpurple/protocols/myspace/myspace.c:2493
 msgid "Invalid input condition"
 msgstr "Condici坦n de entrada inv叩lida"
 
-#: ../libpurple/protocols/myspace/myspace.c:2548
 msgid "Read buffer full (2)"
 msgstr "Cola de lectura llena (2)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2591
 msgid "Unparseable message"
 msgstr "No se pudo interpretar el mensaje"
 
-#: ../libpurple/protocols/myspace/myspace.c:2662
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "No se pudo conectar al servidor: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2840
 msgid "IM Friends"
 msgstr "Amigos MI"
 
-#: ../libpurple/protocols/myspace/myspace.c:2940
-#, c-format
-msgid ""
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr ""
-"Se a単adiero o actualizaron %d amigos del servidor (incluyendo a los amigos "
+msgstr[0] ""
+"Se a単adi坦 o actualiz坦 %d amigo del servidor (incluyendo a los amigos que ya "
+"estaban en la lista del lado del servidor)"
+msgstr[1] ""
+"Se a単adieron 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:2941
 msgid "Add contacts from server"
 msgstr "A単adir contactos del servidor"
 
-#: ../libpurple/protocols/myspace/myspace.c:2993
-#: ../libpurple/protocols/myspace/myspace.c:3057
 msgid "Add friends from MySpace.com"
 msgstr "A単adir amigos de MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2994
 msgid "Importing friends failed"
 msgstr "Fall坦 la carga de los amigos"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:3050
 msgid "Find people..."
 msgstr "Encontrar gente... "
 
-#: ../libpurple/protocols/myspace/myspace.c:3053
 msgid "Change IM name..."
 msgstr "Cambiar mi nombre MI..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3354
 msgid "myim URL handler"
 msgstr "gestor de URL myim"
 
-#: ../libpurple/protocols/myspace/myspace.c:3355
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 "No se encontr坦 una cuenta de MySpaceIM que pueda utilizarse para abrir esta "
 "URL myim."
 
-#: ../libpurple/protocols/myspace/myspace.c:3356
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Activar la cuenta apropiada de MySpaceIM y volver a intentarlo."
 
-#: ../libpurple/protocols/myspace/myspace.c:3479
 msgid "Show display name in status text"
 msgstr "Mostrar el nombre visible en el texto de estado"
 
-#: ../libpurple/protocols/myspace/myspace.c:3482
 msgid "Show headline in status text"
 msgstr "Mostrar titulares en los textos de estado"
 
-#: ../libpurple/protocols/myspace/myspace.c:3487
 msgid "Send emoticons"
 msgstr "Enviar emoticonos"
 
-#: ../libpurple/protocols/myspace/myspace.c:3492
 msgid "Screen resolution (dots per inch)"
 msgstr "Resoluci坦n de pantalla (puntos por pulgada)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3495
 msgid "Base font size (points)"
 msgstr "Tama単o de tipograf鱈a base (puntos)"
 
-#: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/zephyr/zephyr.c:790
-#: ../libpurple/protocols/zephyr/zephyr.c:1164
 msgid "User"
 msgstr "Usuario"
 
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3020
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libpurple/protocols/myspace/user.c:138
 msgid "Headline"
 msgstr "Titular"
 
-#: ../libpurple/protocols/myspace/user.c:153
 msgid "Song"
 msgstr "Canci坦n"
 
-#: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
 msgstr "Amigos en total"
 
-#: ../libpurple/protocols/myspace/user.c:180
 msgid "Client Version"
 msgstr "Versi坦n del cliente"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#: ../libpurple/protocols/myspace/user.c:570
 msgid "No username set"
 msgstr "No se ha configurado un nombre de usuario"
 
-#: ../libpurple/protocols/myspace/user.c:577
-#: ../libpurple/protocols/myspace/user.c:671
 msgid "MySpaceIM - Please Set a Username"
 msgstr "MySpaceIM - Introduzca un nombre de usuario"
 
-#: ../libpurple/protocols/myspace/user.c:578
 msgid "Please enter a username to check its availability:"
 msgstr "Defina un nombre de usuario para comprobar si est叩 disponible:"
 
-#: ../libpurple/protocols/myspace/user.c:658
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Nombre de usuario disponible"
 
-#: ../libpurple/protocols/myspace/user.c:659
 msgid "This username is available. Would you like to set it?"
 msgstr "Este nombre de usuario est叩 disponible, 多quiere utilizarlo?"
 
-#: ../libpurple/protocols/myspace/user.c:660
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "臓NO PODR� MODIFICARLO UNA VEZ FIJADO!"
 
-#: ../libpurple/protocols/myspace/user.c:672
 msgid "This username is unavailable."
 msgstr "Este nombre de usuario no est叩 disponible."
 
-#: ../libpurple/protocols/myspace/user.c:673
 msgid "Please try another username:"
 msgstr "Introduzca otro nombre de usuario:"
 
@@ -8158,32 +5782,25 @@
 #. * 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:48
-#: ../libpurple/protocols/myspace/zap.c:221
 msgid "Zap"
 msgstr "Zapear"
 
-#: ../libpurple/protocols/myspace/zap.c:48
 #, c-format
 msgid "%s has zapped you!"
 msgstr "臓%s le ha zapeado!"
 
-#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Zapping %s..."
 msgstr "Zapeando a %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:52
 msgid "Whack"
 msgstr "Golpear"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "%s has whacked you!"
 msgstr "臓%s le ha golpeado!"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Whacking %s..."
 msgstr "Golpeando a %s..."
@@ -8191,76 +5808,61 @@
 #. 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:58
 msgid "Torch"
 msgstr "Encender"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "%s has torched you!"
 msgstr "臓%s le ha encendido!"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
 msgstr "Encendiendo a %s..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
-#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
 msgstr "Besar"
 
-#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "%s has smooched you!"
 msgstr "臓%s le ha besado!"
 
-#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "Smooching %s..."
 msgstr "Besando a %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:66
 msgid "Hug"
 msgstr "Abrazar"
 
-#: ../libpurple/protocols/myspace/zap.c:66
 #, c-format
 msgid "%s has hugged you!"
 msgstr "臓%s le ha abrazado!"
 
-#: ../libpurple/protocols/myspace/zap.c:67
 #, c-format
 msgid "Hugging %s..."
 msgstr "Abrazando a %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:70
 msgid "Slap"
 msgstr "Abofetear"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has slapped you!"
 msgstr "臓%s le ha abofeteado!"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Slapping %s..."
 msgstr "Abofeteando a %s..."
 
 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:74
 msgid "Goose"
 msgstr "Pellizcar el trasero"
 
-#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "%s has goosed you!"
 msgstr "臓%s le ha pellizcado el trasero!"
 
-#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "Goosing %s..."
 msgstr "Pellizcando el trasero de %s..."
@@ -8268,16 +5870,13 @@
 #. 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:80
 msgid "High-five"
 msgstr "Chocar los cinco"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "臓%s le ha chocado los cinco!"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "High-fiving %s..."
 msgstr "Chocando los cinco con %s..."
@@ -8285,16 +5884,13 @@
 #. 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:86
 msgid "Punk"
 msgstr "Tomar el pelo"
 
-#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "臓%s le ha tomado el pelo!"
 
-#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "Punking %s..."
 msgstr "Tomando el pelo a %s..."
@@ -8306,101 +5902,77 @@
 #. * 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:96
 msgid "Raspberry"
 msgstr "Pedorreta"
 
-#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "臓%s le ha hecho una pedorreta!"
 
-#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "Haciendo una pedorreta a %s..."
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "No se han recibido los par叩metros requeridos"
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "No se pudo escribir en la red"
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "No se pudo leer de la red"
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Error comunic叩ndose con el servidor"
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Conferencia no encontrada"
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "La conferencia no existe"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Ya existe una carpeta con ese nombre"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "No soportado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "La contrase単a ha expirado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Contrase単a incorrecta"
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "La cuenta ha sido deshabilitada"
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "El servidor no pudo acceder al directorio"
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Esta opci坦n ha sido deshabilitada por su administrado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "El servidor no est叩 disponible, int辿ntelo de nuevo m叩s tarde"
 
-#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "No se puede a単adir un contacto a la misma carpeta dos veces"
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "No se puede a単adir uno mismo"
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "El archivo maestro no est叩 bien configurado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect username or password"
 msgstr "Nombre de usuario o contrase単a incorrecta"
 
-#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the username you entered"
 msgstr "No se reconoci坦 el servidor del nombre de usuario que introdujo"
 
-#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
@@ -8408,31 +5980,24 @@
 "Su cuenta ha sido deshabilitada porque se han introducido demasiadas "
 "contrase単a inv叩lidas"
 
-#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "No puede a単adir la misma persona dos veces a una conversaci坦n"
 
-#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Alcanz坦 el l鱈mite del n炭mero de contactos permitidos"
 
-#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect username"
 msgstr "El nombre de usuario que ha introducido no es v叩lido"
 
-#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Se produjo un error al actualizar el directorio"
 
-#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Versi坦n de protocolo incompatible"
 
-#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "El usuario le ha bloqueado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -8440,56 +6005,45 @@
 "Esta versi坦n de evaluaci坦n no permite la conexi坦n simult叩nea de m叩s de diez "
 "usuarios"
 
-#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "El usuario no est叩 conectado o vd. est叩 siendo bloqueado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Error desconocido: 0x%X"
 
-#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Fallo en la conexi坦n (%s)."
 
-#: ../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: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:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "No se pudo enviar el mensaje (%s)."
 
-#: ../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: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: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:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -8498,7 +6052,6 @@
 "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:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -8507,62 +6060,46 @@
 "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: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: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: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: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: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: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:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "No se pudo crear la conferencia (%s)."
 
-#: ../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:1485
 msgid "Telephone Number"
 msgstr "N炭mero de tel辿fono"
 
-#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "T鱈tulo"
 
-#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "Buz坦n de correo"
 
-#: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4178
 msgid "User ID"
 msgstr "ID de usuario"
 
@@ -8572,37 +6109,29 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferencia GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "No se pudo conectar al servidor."
 
-#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "Esperando respuesta..."
 
-#: ../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:1909
 msgid "Invitation to Conversation"
 msgstr "Invitaci坦n a una conversaci坦n"
 
-#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8613,16 +6142,13 @@
 "\n"
 "Enviada: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "多Desea unirse a la conversaci坦n?"
 
-#: ../libpurple/protocols/novell/novell.c:2028
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Ha sido desconectado porque se ha conectado desde otra estaci坦n de trabajo."
 
-#: ../libpurple/protocols/novell/novell.c:2085
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8630,7 +6156,6 @@
 "No parece que %s est辿 conectado y no ha recibido el mensaje que acaba de "
 "enviar."
 
-#: ../libpurple/protocols/novell/novell.c:2185
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8638,11 +6163,10 @@
 "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:2214
 msgid "Error. SSL support is not installed."
 msgstr "Error. El soporte de SSL no est叩 instalado."
 
-#: ../libpurple/protocols/novell/novell.c:2522
+#, c-format
 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."
 
@@ -8656,41 +6180,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3536
-#: ../libpurple/protocols/novell/novell.c:3538
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de Mensajer鱈a de Grupos de Novell"
 
-#: ../libpurple/protocols/novell/novell.c:3563
 msgid "Server address"
 msgstr "Direcci坦n del servidor"
 
-#: ../libpurple/protocols/novell/novell.c:3567
 msgid "Server port"
 msgstr "Puerto del servidor"
 
-#: ../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:396
-#: ../libpurple/protocols/yahoo/yahoo.c:2505
-#: ../libpurple/protocols/yahoo/yahoo.c:2673
-#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:609
-#: ../libpurple/proxy.c:1161 ../libpurple/proxy.c:1270
-#: ../libpurple/proxy.c:1376 ../libpurple/proxy.c:1529
 msgid "Server closed the connection."
 msgstr "El servidor ha cerrado la conexi坦n."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2498
-#: ../libpurple/protocols/yahoo/yahoo.c:2666 ../libpurple/proxy.c:621
-#: ../libpurple/proxy.c:1173 ../libpurple/proxy.c:1282
-#: ../libpurple/proxy.c:1388 ../libpurple/proxy.c:1541
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8699,10 +6206,6 @@
 "Se perdi坦 la conexi坦n con el servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:401
-#: ../libpurple/proxy.c:1190 ../libpurple/proxy.c:1295
-#: ../libpurple/proxy.c:1400 ../libpurple/proxy.c:1490
-#: ../libpurple/proxy.c:1554
 msgid "Received invalid data on connection with server."
 msgstr "Se recibieron datos inv叩lidos al conectarse al servidor."
 
@@ -8716,8 +6219,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:118
-#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "Complemento de protocolo AIM"
 
@@ -8731,43 +6232,31 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:118
-#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "Complemento de protocolo ICQ"
 
-#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4456
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Encoding"
 msgstr "Codificaci坦n"
 
-#: ../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:44
 msgid "The remote user has declined your request."
 msgstr "El usuario remoto ha rechazado su solicitud."
 
-#: ../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: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: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: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 "
@@ -8777,108 +6266,82 @@
 "s a trav辿s de conexi坦n MI directa. Int辿ntelo de nuevo utilizando la funci坦n "
 "de transferencia de archivos.\n"
 
-#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "El fichero %s es %s, que es m叩s grande que el tama単o m叩ximo de %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid error"
 msgstr "Error inv叩lido"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Invalid SNAC"
 msgstr "SNAC inv叩lido"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to host"
 msgstr "Tasa de mensajes al servidor"
 
-#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Rate to client"
 msgstr "Tasa de mensajes al cliente"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service unavailable"
 msgstr "Servicio no disponible"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Service not defined"
 msgstr "Servicio no definido"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Obsolete SNAC"
 msgstr "SNAC obsoleto"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by host"
 msgstr "No soportado por el servidor"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Not supported by client"
 msgstr "No soportado por el cliente"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Refused by client"
 msgstr "Rechazado por el cliente"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Reply too big"
 msgstr "Respuesta demasiado grande"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Responses lost"
 msgstr "Respuestas perdidas"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Request denied"
 msgstr "Solicitud denegada"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Busted SNAC payload"
 msgstr "Carga de SNAC destrozada"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Insufficient rights"
 msgstr "Derechos insuficientes"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "In local permit/deny"
 msgstr "En la lista local de autorizar/negar"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
-msgid "Too evil (sender)"
-msgstr "Demasiado malvado (remitente)"
-
-#: ../libpurple/protocols/oscar/oscar.c:135
-msgid "Too evil (receiver)"
-msgstr "Demasiado malvado (destinatario)"
-
-#: ../libpurple/protocols/oscar/oscar.c:136
+msgid "Warning level too high (sender)"
+msgstr "Nivel de aviso demasiado alto (emisor)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Nivel de aviso demasiado alto (receptor)"
+
 msgid "User temporarily unavailable"
 msgstr "Usuario temporalmente no disponible"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "No match"
 msgstr "No hubo coincidencia"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "List overflow"
 msgstr "Desbordamiento de la lista"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Request ambiguous"
 msgstr "Solicitud ambigua"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Queue full"
 msgstr "Cola llena"
 
-#: ../libpurple/protocols/oscar/oscar.c:141
 msgid "Not while on AOL"
 msgstr "No mientras est辿 en AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:349
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -8890,7 +6353,6 @@
 "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:458
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8901,135 +6363,101 @@
 "defectuosa.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:640 ../pidgin/gtkutils.c:2446
-#: ../pidgin/gtkutils.c:2476
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:336
 msgid "Buddy Icon"
 msgstr "Icono de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Voice"
 msgstr "Voz"
 
-#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "AIM Direct IM"
 msgstr "MI Directo AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:652
-#: ../libpurple/protocols/oscar/oscar.c:6125
 msgid "Get File"
 msgstr "Recibir archivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:659
 msgid "Games"
 msgstr "Juegos"
 
-#: ../libpurple/protocols/oscar/oscar.c:662
 msgid "Add-Ins"
 msgstr "Extensiones"
 
-#: ../libpurple/protocols/oscar/oscar.c:665
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:668
 msgid "ICQ Direct Connect"
 msgstr "Conexi坦n directa ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:671
 msgid "AP User"
 msgstr "Usuario de AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:674
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:677
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:680
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "Old ICQ UTF8"
 msgstr "Antiguo ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Trillian Encryption"
 msgstr "Cifrado Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:692
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:695
 msgid "Security Enabled"
 msgstr "Seguridad activada"
 
-#: ../libpurple/protocols/oscar/oscar.c:698
 msgid "Video Chat"
 msgstr "Video chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:702
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:705
 msgid "Live Video"
 msgstr "V鱈deo en tiempo real"
 
-#: ../libpurple/protocols/oscar/oscar.c:708
 msgid "Camera"
 msgstr "C叩mara"
 
-#: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5895
+msgid "Screen Sharing"
+msgstr "Compartiendo pantalla"
+
+#, c-format
 msgid "Free For Chat"
 msgstr "Disponible para conversar"
 
-#: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#, c-format
 msgid "Not Available"
 msgstr "No disponible"
 
-#: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:5916
+#, c-format
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/oscar/oscar.c:736
+#, c-format
 msgid "Web Aware"
 msgstr "Capacidad web"
 
-#: ../libpurple/protocols/oscar/oscar.c:738 ../libpurple/protocols/qq/qq.c:184
-#: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3152 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1089
+#, c-format
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/oscar/oscar.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3746
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1210
 msgid "IP Address"
 msgstr "Direcci坦n IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:846
-#: ../libpurple/protocols/oscar/oscar.c:2947
 msgid "Warning Level"
 msgstr "Niveles de aviso"
 
-#: ../libpurple/protocols/oscar/oscar.c:856
 msgid "Buddy Comment"
 msgstr "Comentario de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:996
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -9038,7 +6466,6 @@
 "No se pudo conectar al servidor de autenticaci坦n:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1004
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -9047,20 +6474,16 @@
 "No se pudo conectar al servidor BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1044
 msgid "Username sent"
 msgstr "Nombre de usuario enviado"
 
-#: ../libpurple/protocols/oscar/oscar.c:1049
 msgid "Connection established, cookie sent"
 msgstr "Conexi坦n establecida, cookie enviada"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1078
 msgid "Finalizing connection"
 msgstr "Terminando la conexi坦n"
 
-#: ../libpurple/protocols/oscar/oscar.c:1306
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the username is invalid.  "
@@ -9073,33 +6496,23 @@
 "espacios, o contener s坦lo n炭meros."
 
 #. Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1392
-#: ../libpurple/protocols/yahoo/yahoo.c:2127
 msgid "Invalid username."
 msgstr "Nombre de usuario no v叩lido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1398
-#: ../libpurple/protocols/qq/login_logout.c:485
-#: ../libpurple/protocols/simple/simple.c:1112
-#: ../libpurple/protocols/yahoo/yahoo.c:2149
 msgid "Incorrect password."
 msgstr "Contrase単a incorrecta."
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1402
 msgid "Your account is currently suspended."
 msgstr "Su cuenta est叩 deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1406
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servicio de Mensajer鱈a Instant叩neo AOL est叩 temporalmente no disponible."
 
 #. screen name connecting too frequently
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1410
-#: ../libpurple/protocols/oscar/oscar.c:1419
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -9108,46 +6521,33 @@
 "int辿ntelo de nuevo. Si sigue intent叩ndolo, necesitar叩 esperar incluso m叩s "
 "tiempo."
 
-#. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1414
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versi坦n del cliente que usa es demasiado antigua. Por favor, actual鱈cela "
 "en %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1456
 msgid "Received authorization"
 msgstr "Se recibi坦 la autorizaci坦n"
 
-#: ../libpurple/protocols/oscar/oscar.c:1479
 msgid "The SecurID key entered is invalid."
 msgstr "La clave SecurID que se ha introducido no es v叩lida."
 
-#: ../libpurple/protocols/oscar/oscar.c:1492
 msgid "Enter SecurID"
 msgstr "Introduzca SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1493
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduzca el d鱈gito de seis n炭meros que aparece en la pantalla."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1495
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:2337
-#: ../libpurple/protocols/oscar/oscar.c:6000
-#: ../libpurple/protocols/oscar/oscar.c:6282 ../libpurple/request.h:1401
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -9156,54 +6556,38 @@
 "Quiz叩 sea desconectado en breve.  Puede querer usar TOC hasta que esto se "
 "resuelva.  Compruebe %s para novedades."
 
-#: ../libpurple/protocols/oscar/oscar.c:1537
-#: ../libpurple/protocols/oscar/oscar.c:1581
 msgid "Unable to get a valid AIM login hash."
 msgstr "No se pudo obtener un 束hash損 de conexi坦n a AIM v叩lido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1578
-#: ../libpurple/protocols/oscar/oscar.c:1677
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Quiz叩 sea desconectado en breve.  Compruebe %s para novedades."
 
-#: ../libpurple/protocols/oscar/oscar.c:1680
 msgid "Unable to get a valid login hash."
 msgstr "No se pudo un 束hash損 de conexi坦n v叩lido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1710
+#. allow multple logins?
 msgid "Password sent"
 msgstr "Contrase単a enviada"
 
-#: ../libpurple/protocols/oscar/oscar.c:1766
 msgid "Unable to initialize connection"
 msgstr "No se pudo inicializar la conexi坦n"
 
-#: ../libpurple/protocols/oscar/oscar.c:2258
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Por favor, autor鱈ceme para que pueda a単adirle a mi lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2287
 msgid "Authorization Request Message:"
 msgstr "Mensaje de solicitud de autorizaci坦n:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2288
 msgid "Please authorize me!"
 msgstr "臓Por favor, autor鱈ceme!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2328
-#: ../libpurple/protocols/oscar/oscar.c:2336
-#: ../libpurple/protocols/oscar/oscar.c:2463
-#: ../libpurple/protocols/oscar/oscar.c:5372
-#: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "No se indic坦 una raz坦n."
 
-#: ../libpurple/protocols/oscar/oscar.c:2335
 msgid "Authorization Denied Message:"
 msgstr "Mensaje de autorizaci坦n denegada:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2463
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -9214,18 +6598,15 @@
 "la siguiente raz坦n:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2464
 msgid "ICQ authorization denied."
 msgstr "Autorizaci坦n ICQ denegada."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2471
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %u ha autorizado su petici坦n de a単adirlo a su lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2479
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9238,7 +6619,6 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2487
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9251,7 +6631,6 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2495
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -9264,38 +6643,31 @@
 "El mensaje es:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2516
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "El usuario ICQ %u le ha enviado un amigo: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2522
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "多Desea a単adir este amigo a su lista de amigos?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2527 ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "_A単adir"
 
-#: ../libpurple/protocols/oscar/oscar.c:2528
 msgid "_Decline"
 msgstr "_Rehusar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2652
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Usted perdi坦 %hu mensaje de %s porque no era v叩lido."
 msgstr[1] "Se perdieron %hu mensajes de %s porque porque no eran v叩lidos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2661
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Se perdi坦 %hu mensaje de %s porque era demasiado largo."
 msgstr[1] "Se perdieron %hu mensajes de %s porque eran demasiado largos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2670
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9305,21 +6677,27 @@
 msgstr[1] ""
 "Se perdieron %hu mensajes de %s porque fueron mandados demasiado r叩pido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2679
-#, c-format
-msgid "You missed %hu message from %s because he/she was too evil."
-msgid_plural "You missed %hu messages from %s because he/she was too evil."
-msgstr[0] "Se perdi坦 %hu mensaje de %s porque el/ella es muy malvado/a."
-msgstr[1] "Se perdieron %hu mensajes de %s porque el/ella es muy malvado/a."
-
-#: ../libpurple/protocols/oscar/oscar.c:2688
-#, c-format
-msgid "You missed %hu message from %s because you are too evil."
-msgid_plural "You missed %hu messages from %s because you are too evil."
-msgstr[0] "Se perdi坦 %hu mensaje de %s porque usted es muy malvado/a."
-msgstr[1] "Se perdieron %hu mensajes de %s porque usted es muy malvado/a."
-
-#: ../libpurple/protocols/oscar/oscar.c:2697
+#, c-format
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+"Se perdi坦 %hu mensaje de %s porque el nivel de aviso de 辿l o ella es "
+"demasiado elevado."
+msgstr[1] ""
+"Se perdieron %hu mensajes de %s porque su nivel de aviso de 辿l o ella es "
+"demasiado elevado."
+
+#, c-format
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+"Se perdi坦 %hu mensaje de %s porque su nivel de aviso es muy elevado."
+msgstr[1] ""
+"Se perdieron %hu mensajes de %s porque su nivel de aviso es muy elevado."
+
 #, 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."
@@ -9327,47 +6705,31 @@
 msgstr[1] "Se perdieron %hu mensajes de %s por motivos desconocidos."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2852
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No se pudo enviar el mensaje: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2852
-#: ../libpurple/protocols/oscar/oscar.c:2857
-#: ../libpurple/protocols/oscar/oscar.c:2921
 msgid "Unknown reason."
 msgstr "Raz坦n desconocida."
 
-#: ../libpurple/protocols/oscar/oscar.c:2855
-#: ../libpurple/protocols/sametime/sametime.c:2461
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "No se pudo enviar el mensaje a %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2921
 #, c-format
 msgid "User information not available: %s"
 msgstr "Informaci坦n de usuario de no disponible: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2952
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2957
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1192
 msgid "Member Since"
 msgstr "Miembro desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2992
-msgid "Available Message"
-msgstr "Mensajes disponibles"
-
-#: ../libpurple/protocols/oscar/oscar.c:3096
 msgid "Your AIM connection may be lost."
 msgstr "Su conexi坦n AIM puede haberse perdido."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3284
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9375,7 +6737,6 @@
 "[No se pudo mostrar un mensaje de este usuario porque conten鱈a caracteres "
 "inv叩lidos.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3448
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9384,74 +6745,56 @@
 "l鱈mite en la tasa de env鱈o de mensajes. Por favor, espere 10 segundos y "
 "vuelva a intentarlo."
 
-#: ../libpurple/protocols/oscar/oscar.c:3533
-#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ha sido desconectado de la sala de chat %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3768
-#: ../libpurple/protocols/silc/util.c:591
-#: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "Tel辿fono m坦vil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3798
 msgid "Personal Web Page"
 msgstr "P叩gina web personal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3822
-#: ../libpurple/protocols/qq/buddy_info.c:40
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "Informaci坦n adicional"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
-#: ../libpurple/protocols/oscar/oscar.c:3843
 msgid "Zip Code"
 msgstr "C坦digo postal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3854
+msgid "Work Information"
+msgstr "Informaci坦n de trabajo"
+
 msgid "Division"
 msgstr "Secci坦n"
 
-#: ../libpurple/protocols/oscar/oscar.c:3855
 msgid "Position"
 msgstr "Cargo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3857
 msgid "Web Page"
 msgstr "P叩gina web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3860
-msgid "Work Information"
-msgstr "Informaci坦n de trabajo"
-
-#: ../libpurple/protocols/oscar/oscar.c:3916
 msgid "Pop-Up Message"
 msgstr "Mensaje emergente"
 
-#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
 msgstr[0] "El siguiente nombre de usuario est叩 asociado a %s"
 msgstr[1] "Los nombres de usuarios siguientes est叩n asociados a %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3987
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No se encontraron resultados para la direcci坦n de correo %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Deber鱈a recibir un mensaje solicitando confirmaci坦n de %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
 msgid "Account Confirmation Requested"
 msgstr "Confirmaci坦n de cuenta solicitada"
 
-#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
@@ -9460,14 +6803,12 @@
 "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:4045
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque no es "
 "v叩lido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
@@ -9476,7 +6817,6 @@
 "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:4049
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -9485,7 +6825,6 @@
 "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:4051
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -9494,7 +6833,6 @@
 "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:4053
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -9503,36 +6841,29 @@
 "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:4055
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Error desconocido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4057
 msgid "Error Changing Account Info"
 msgstr "Error cambiando la informaci坦n de la cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4063
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "La direcci坦n de correo electr坦nico para %s es %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4065
 msgid "Account Info"
 msgstr "Informaci坦n de la cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4251
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "No se ha enviado su imagen MI. Debe estar directamente conectado para enviar "
 "im叩genes IM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4522
 msgid "Unable to set AIM profile."
 msgstr "No se pudo establecer el perfil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4523
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -9542,7 +6873,6 @@
 "conexi坦n se haya completado.  Su perfil quedar叩 sin cambiar, int辿ntelo "
 "nuevamente cuando ya est辿 conectado completamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4537
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9555,11 +6885,9 @@
 msgstr[1] ""
 "Se ha excedido el tama単o m叩ximo de perfil de %d bytes. Se ha truncado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4542
 msgid "Profile too long."
 msgstr "Perfil demasiado largo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4586
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9574,11 +6902,9 @@
 "Se excedi坦 el l鱈mite de %d bytes de longitud en el mensaje de ausencia. Se "
 "ha truncado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4591
 msgid "Away message too long."
 msgstr "Mensaje de ausencia demasiado largo"
 
-#: ../libpurple/protocols/oscar/oscar.c:4664
 #, c-format
 msgid ""
 "Could not add the buddy %s because the username is invalid.  Usernames must "
@@ -9589,17 +6915,12 @@
 "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:4666
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5156
 msgid "Unable To Add"
 msgstr "No se pudo a単adir"
 
-#: ../libpurple/protocols/oscar/oscar.c:4785
 msgid "Unable To Retrieve Buddy List"
 msgstr "No se ha podido obtener la lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:4786
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
@@ -9608,15 +6929,9 @@
 "perdido la lista de amigos, seguramente volver叩 a estar disponible en unos "
 "minutos."
 
-#: ../libpurple/protocols/oscar/oscar.c:4982
-#: ../libpurple/protocols/oscar/oscar.c:4984
-#: ../libpurple/protocols/oscar/oscar.c:5223
-#: ../libpurple/protocols/oscar/oscar.c:5224
-#: ../libpurple/protocols/oscar/oscar.c:5229
 msgid "Orphans"
 msgstr "Hu辿rfanos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5139
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9625,40 +6940,34 @@
 "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:5139
-#: ../libpurple/protocols/oscar/oscar.c:5154
 msgid "(no name)"
 msgstr "(sin nombre)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5153
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "No se pudo a単adir al amigo %s por motivos desconocidos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5287
 #, c-format
 msgid ""
 "The user %s has given you permission to add him or her to your buddy list.  "
 "Do you want to add this user?"
-msgstr "El usuario %s le ha dado a usted permiso para a単adirle a su lista de amigos. 多Desea a単adirle?"
-
-#: ../libpurple/protocols/oscar/oscar.c:5295
+msgstr ""
+"El usuario %s le ha dado a usted permiso para a単adirle a su lista de amigos. "
+"多Desea a単adirle?"
+
 msgid "Authorization Given"
 msgstr "Autorizaci坦n otorgada"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5368
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %s ha autorizado su solicitud de a単adirlo a su lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5369
 msgid "Authorization Granted"
 msgstr "Autorizaci坦n aceptada"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5372
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9669,48 +6978,30 @@
 "la siguiente raz坦n:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5373
 msgid "Authorization Denied"
 msgstr "Autorizaci坦n denegada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
-#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Intercambio:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "No se ha enviado su imagen MI. No se pueden enviar im叩genes IM en chats AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5684
-#: ../libpurple/protocols/oscar/oscar.c:5689
-msgid "Away Message"
-msgstr "Mensajes de ausencia"
-
-#: ../libpurple/protocols/oscar/oscar.c:5689
-msgid "<i>(retrieving)</i>"
-msgstr " <i>(obteniendo)</i>"
-
-#: ../libpurple/protocols/oscar/oscar.c:5889
 msgid "iTunes Music Store Link"
 msgstr "Enlace a la tienda de m炭sica de iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5997
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5998
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6045
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Usted pidi坦 abrir una conexi坦n MI directa con %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:6049
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9718,67 +7009,51 @@
 "Puede considerarse como un riesgo a su privacidad  ya que hacer 辿sto revela "
 "su direcci坦n IP. 多Quiere continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:6055
-#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "C_onectar"
 
 # TBD - comprobar si esto afecta al bot坦n en pantalla
-#: ../libpurple/protocols/oscar/oscar.c:6090
 msgid "Get AIM Info"
 msgstr "Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:6096
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6104
 msgid "Get Status Msg"
 msgstr "Obtener msj de estado"
 
-#: ../libpurple/protocols/oscar/oscar.c:6117
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6139
 msgid "Re-request Authorization"
 msgstr "Solicitar autorizaci坦n otra vez"
 
-#: ../libpurple/protocols/oscar/oscar.c:6198
 msgid "Require authorization"
 msgstr "Solicitar autorizaci坦n"
 
-#: ../libpurple/protocols/oscar/oscar.c:6201
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Capacidad web (臓si activa esto har叩 que recibe SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6206
 msgid "ICQ Privacy Options"
 msgstr "Opciones de privacidad de ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6226
 msgid "The new formatting is invalid."
 msgstr "El nuevo formato es inv叩lido."
 
-#: ../libpurple/protocols/oscar/oscar.c:6227
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
 "El formato del nombre de usuario s坦lo puede cambiar en la capitalizaci坦n y "
 "espacios en blanco."
 
-#: ../libpurple/protocols/oscar/oscar.c:6280
 msgid "Change Address To:"
 msgstr "Cambiar direcci坦n a:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6326
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>usted no est叩 esperando autorizaci坦n</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "You are awaiting authorization from the following buddies"
 msgstr "En espera de la autorizaci坦n de los siguientes amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6330
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9786,66 +7061,51 @@
 "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:6347
 msgid "Find Buddy by Email"
 msgstr "Buscar un amigo en base a su correo electr坦nico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6348
 msgid "Search for a buddy by email address"
 msgstr "Buscar amigo por la direcci坦n correo electr坦nico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6349
 msgid "Type the email 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:6352
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6510
 msgid "Set User Info (web)..."
 msgstr "Establecer su informaci坦n de usuario (web)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6521
 msgid "Change Password (web)"
 msgstr "Cambiar su contrase単a (web)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6525
 msgid "Configure IM Forwarding (web)"
 msgstr "Configurar reenv鱈o de MI (web)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6535
 msgid "Set Privacy Options..."
 msgstr "Configurar las opciones de privacidad..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6542
 msgid "Confirm Account"
 msgstr "Confirmar cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6546
 msgid "Display Currently Registered Email Address"
 msgstr "Mostrar direcciones de correo registradas actualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6550
 msgid "Change Currently Registered Email Address..."
 msgstr "Cambiar la direcci坦n de correo registrada actualmente..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6557
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos pendientes de autorizaci坦n"
 
-#: ../libpurple/protocols/oscar/oscar.c:6563
 msgid "Search for Buddy by Email Address..."
 msgstr "Buscar un amigo por correo electr坦nico..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6568
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a trav辿s de su informaci坦n"
 
-#: ../libpurple/protocols/oscar/oscar.c:6756
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9855,27 +7115,26 @@
 "para transferencias de ficheros y conexiones MI\n"
 "(lento, pero no descubre su direcci坦n IP)"
 
-#: ../libpurple/protocols/oscar/peer.c:699
+msgid "Allow multiple simultaneous logins"
+msgstr "Permitir m炭ltiples conexiones simult叩neas"
+
 #, 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:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Intentando conectarse a %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:858
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Intentando la conexi坦n a trav辿s de un servidor proxy."
 
-#: ../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: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 "
@@ -9885,168 +7144,126 @@
 "para Im叩genes de MI.  Como su direcci坦n IP ser叩 revelada, puede considerarse "
 "esto como un riesgo a su privacidad."
 
-#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Informaci坦n principal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "Introducci坦n personal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "N炭mero QQ"
 
-#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "Pa鱈s/Regi坦n"
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Provincia/Estado"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "S鱈mbolo del hor坦scopo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Signo zodiacal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Grupo sangu鱈neo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "Universidad"
 
-#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "C坦digo postal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "N炭mero de m坦vil"
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "N炭mero de tel辿fono"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Acuario"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Piscis"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Aries"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Tauro"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "G辿minis"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "C叩ncer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Leo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Virgo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Libra"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Escorpio"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Sagitario"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Capricornio"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Rata"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Buey"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Tigre"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Conejo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Drag坦n"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Serpiente"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Caballo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Cabra"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Mono"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Gallo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Perro"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Cerdo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Otro"
 
-#: ../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:524
 msgid "Update my information"
 msgstr "Actualizar mi informaci坦n"
 
-#: ../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:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
@@ -10054,219 +7271,154 @@
 msgstr ""
 "No se puede fijar una cara a medida. Por favor, escoja una imagen de %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:618
-#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "Cara QQ inv叩lida"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:112
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Ha rechazado la solicitud de %d"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
 msgstr "Introduzca sus motivos:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Rechazar solicitud"
 
 #. title
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:117
 msgid "Sorry, you are not my type..."
 msgstr "Lo siento, no eres mi tipo..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr "Fallo al a単adir un amigo con solicitud de autenticaci坦n"
 
 #. TODO: We don't really need to notify the user about this, do we?
-#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "Ha eliminado un amigo con 辿xito"
 
 #. TODO: Does the user really need to be notified about this?
-#: ../libpurple/protocols/qq/buddy_opt.c:338
 msgid "You have successfully removed yourself from your friend's buddy list"
 msgstr "Se ha borrado con 辿xito de la lista de amigos de su amigo"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "El usuario %d necesita autenticaci坦n"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Introduzca su solicitud a continuaci坦n"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:407
-#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "多Quieres ser mi amigo?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:408
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:119
 msgid "Send"
 msgstr "Enviar"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
 msgid "You have added %d to buddy list"
 msgstr "Ha a単adido %d a su lista de amigos"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "Error QQid"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "QQid inv叩lido"
 
-#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "ID de grupo:"
 
-#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Creador"
 
-#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Descripci坦n del grupo"
 
-#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "Autorizar"
 
-#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#: ../libpurple/protocols/qq/group.c:120
 msgid "Please enter external group ID"
 msgstr "Indique su ID de grupo externo"
 
-#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "S坦lo puede buscar grupos QQ permanentes\n"
 
-#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d requested to join group %d"
 msgstr "El usuario %d solicit坦 entrar en el grupo %d"
 
-#: ../libpurple/protocols/qq/group_im.c:127
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:196
 #, c-format
 msgid "Reason: %s"
 msgstr "Raz坦n: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_im.c:183
-#: ../libpurple/protocols/qq/group_im.c:223
-#: ../libpurple/protocols/qq/group_im.c:258
-#: ../libpurple/protocols/qq/group_im.c:292
-#: ../libpurple/protocols/qq/group_join.c:233
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:281
-#: ../libpurple/protocols/qq/group_opt.c:367
 msgid "QQ Qun Operation"
 msgstr "Opciones QQ Qun"
 
-#: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Aprobar"
 
-#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr ""
 "Su solicitud de unirse al grupo %d ha sido rechazada por el administrador %d"
 
-#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
 msgstr ""
 "Su solicitud de unirse al grupo %d ha sido aprobada por el administrador %d"
 
-#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr "Vd. [%d] ha salido del grupo 束%d損"
 
-#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
 msgstr "Vd. [%d] ha sido a単adido al grupo 束%d損"
 
-#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Se ha a単adido este grupo a su lista de amigos."
 
-#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not a member"
 msgstr "No soy miembro"
 
-#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Soy miembro"
 
-#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "He solicitado unirme"
 
-#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "Soy el administrador"
 
-#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Estado desconocido"
 
-#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "Este grupo no permite que otros se unan"
 
-#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully left the group"
 msgstr "Ha salido con 辿xito del grupo"
 
-#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "Autenticaci坦n grupo QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr "El servidor QQ ha aceptado su operaci坦n de autorizaci坦n"
 
-#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You entered a group ID outside the acceptable range"
 msgstr ""
 "Ha introducido un identificador de grupo que est叩 fuera del rango permitido"
 
-#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure you want to leave this Qun?"
 msgstr "多Est叩 seguro que quiere dejar este Qun?"
 
-#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -10274,160 +7426,122 @@
 "Tenga en cuenta que si vd. lo ha creado\n"
 "esta operaci坦n eliminar叩 este Qun eventualmente."
 
-#: ../libpurple/protocols/qq/group_network.c:92
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "C坦digo [0x%02X]: %s"
-
-#: ../libpurple/protocols/qq/group_network.c:93
-msgid "Group Operation Error"
-msgstr "Error de operaci坦n de grupo"
-
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:99
-#: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
 msgstr "多Desea aprobar esta solicitud?"
 
-#: ../libpurple/protocols/qq/group_opt.c:113
 msgid "Enter your reason:"
 msgstr "Introduzca sus motivos:"
 
-#: ../libpurple/protocols/qq/group_opt.c:211
 msgid "You have successfully modified Qun member"
 msgstr "Ha modificado el miembro Qun con 辿xito"
 
-#: ../libpurple/protocols/qq/group_opt.c:281
 msgid "You have successfully modified Qun information"
 msgstr "Ha modificado la informaci坦n Qun con 辿xito"
 
-#: ../libpurple/protocols/qq/group_opt.c:368
 msgid "You have successfully created a Qun"
 msgstr "Ha creado un Qun con 辿xito"
 
-#: ../libpurple/protocols/qq/group_opt.c:370
 msgid "Would you like to set up the Qun details now?"
 msgstr "多Desea establecer los detalles de Qun ahora?"
 
-#: ../libpurple/protocols/qq/group_opt.c:374
 msgid "Setup"
 msgstr "Configurar"
 
-#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Mensaje del sistema"
 
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "No se pudo enviar MI."
 
-#: ../libpurple/protocols/qq/keep_alive.c:88
-msgid "Keep alive error"
-msgstr "Error de comprobaci坦n de conexi坦n"
-
-#: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Error requesting login token"
-msgstr "Error al solicitar un testigo de conexi坦n"
-
-#: ../libpurple/protocols/qq/login_logout.c:490
-msgid "Unable to login. Check debug log."
-msgstr "No pudo conectarse, compruebe el registro de depuraci坦n."
-
-#: ../libpurple/protocols/qq/login_logout.c:493
-msgid "Unable to login"
-msgstr "No pudo conectarse"
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:158
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1195
-#: ../libpurple/protocols/yahoo/ycht.c:550
-msgid "Unable to connect."
-msgstr "No se pudo conectar."
-
-#: ../libpurple/protocols/qq/qq.c:187
 #, c-format
 msgid "Unknown-%d"
 msgstr "Desconocido-%d"
 
-#: ../libpurple/protocols/qq/qq.c:212
-msgid "TCP Address"
-msgstr "Direcci坦n TCP"
-
-#: ../libpurple/protocols/qq/qq.c:214
-msgid "UDP Address"
-msgstr "Direcci坦n UDP"
-
-#: ../libpurple/protocols/qq/qq.c:243
 msgid "Level"
 msgstr "Nivel"
 
-#: ../libpurple/protocols/qq/qq.c:374
+msgid "Member"
+msgstr "Miembro"
+
+msgid " VIP"
+msgstr " VIP"
+
+msgid " TCP"
+msgstr " TCP"
+
+msgid " FromMobile"
+msgstr " DeM坦vil"
+
+msgid " BindMobile"
+msgstr " BindM坦vil"
+
+msgid " Video"
+msgstr " V鱈deo"
+
+msgid " Space"
+msgstr " Space"
+
+msgid "Flag"
+msgstr "Marca"
+
+msgid "Ver"
+msgstr "Ver"
+
 msgid "Invalid name"
 msgstr "Nombre inv叩lido"
 
-#: ../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: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:445
+#, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>Servidor</b>: %s: %d<br>\n"
+
 #, 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: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:447
+#, c-format
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>Nombre real</b>: %s: %d<br>\n"
+
 #, 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: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: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: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:458
 msgid "Login Information"
 msgstr "Informaci坦n de conexi坦n"
 
-#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
 msgstr "Fijar mi informaci坦n"
 
-#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Cambiar contrase単a"
 
-#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "Mostrar la informaci坦n de conexi坦n"
 
-#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "Salir de este Qun QQ"
 
-#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "Bloquear a este amigo"
 
@@ -10441,225 +7555,252 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../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:753
 msgid "Connect using TCP"
 msgstr "Conectando utilizando TCP"
 
-#: ../libpurple/protocols/qq/recv_core.c:310
+msgid "resend interval(s)"
+msgstr "intervalo/s de reenv鱈o"
+
+msgid "Keep alive interval(s)"
+msgstr "Intervalo/s de comprobaci坦n de conexi坦n"
+
+msgid "Update interval(s)"
+msgstr "Intervalo/s de actualizaci坦n"
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr "Longitud de token no v叩lida, %d"
+
+msgid "Keep alive error"
+msgstr "Error de comprobaci坦n de conexi坦n"
+
+msgid "Failed to connect server"
+msgstr "Fallo al conectar con el servidor."
+
 msgid "Socket error"
 msgstr "Error de socket"
 
-#: ../libpurple/protocols/qq/recv_core.c:321
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"Se perdi坦 la conexi坦n con el servidor:\n"
+"%d, %s"
+
 msgid "Unable to read from socket"
 msgstr "No se pudo leer del socket"
 
-#: ../libpurple/protocols/qq/send_file.c:707
+msgid "Write Error"
+msgstr "Error de escritura"
+
+msgid "Connection lost"
+msgstr "Conexi坦n perdida"
+
+msgid "Couldn't resolve host"
+msgstr "No se pudo resolver el nombre"
+
+msgid "hostname is NULL or port is 0"
+msgstr "el nombre de equipo es NULL o el puerto es 0"
+
+#, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "Conectando al servidor %s, %d reintentos"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "No se pudo conectar."
+
+msgid "Could not resolve hostname"
+msgstr "No se pudo resolver el nombre de sistema"
+
+msgid "Unable to login. Check debug log."
+msgstr "No pudo conectarse, compruebe el registro de depuraci坦n."
+
+msgid "Unable to login"
+msgstr "No pudo conectarse"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+
+#, fuzzy
+msgid "Failed room reply"
+msgstr "Fallo en la conexi坦n, no ha habido respuesta"
+
+#, fuzzy, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Vd. [%d] ha sido a単adido al grupo 束%d損"
+
+msgid "Can not decrypt login reply"
+msgstr ""
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr "C坦digo de respuesta token inv叩lido, 0x%02X"
+
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d ha rechazado el archivo %s"
 
-#: ../libpurple/protocols/qq/send_file.c:710
-#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Archivo enviado"
 
-#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d cancel坦 la transferencia de %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:124
-msgid "Connection lost"
-msgstr "Conexi坦n perdida"
-
-#: ../libpurple/protocols/qq/sendqueue.c:133
-msgid "Login failed, no reply"
-msgstr "Fallo en la conexi坦n, no ha habido respuesta"
-
-#: ../libpurple/protocols/qq/sys_msg.c:111
 msgid "Do you want to add this buddy?"
 msgstr "多Desea a単adir este amigo?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "Ha sido a単adido por %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
-#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "多Desea a単adirle?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "El usuario %s lo ha a単adido [%s] a su lista de amigos."
 
-#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "User %s rejected your request"
 msgstr "El usuario %s rechaz坦 su solicitud"
 
-#: ../libpurple/protocols/qq/sys_msg.c:215
 #, c-format
 msgid "User %s approved your request"
 msgstr "El usuario %s ha aprobado su solicitud"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s quiere a単adirle [%s] como amigo"
 
-#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s no est叩 en su lista de amigos"
 
-#: ../libpurple/protocols/sametime/sametime.c:420
+#, c-format
+msgid "Notice from: %s"
+msgstr "Nota de: %s"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 msgid "Connection closed (writing)"
 msgstr "Conexi坦n cerrada (escribiendo)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1294
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>T鱈tulo de grupo:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Identificador de grupo 束Notes損:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1297
 #, c-format
 msgid "Info for Group %s"
 msgstr "Informaci坦n sobre el grupo %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1299
 msgid "Notes Address Book Information"
 msgstr "Informaci坦n de la libreta de direcciones 束Notes損"
 
-#: ../libpurple/protocols/sametime/sametime.c:1331
 msgid "Invite Group to Conference..."
 msgstr "Invitar grupo a la conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1341
 msgid "Get Notes Address Book Info"
 msgstr "Obtener la informaci坦n de la libreta de direcciones 束Notes損"
 
-#: ../libpurple/protocols/sametime/sametime.c:1508
 msgid "Sending Handshake"
 msgstr "Enviando negociaci坦n"
 
-#: ../libpurple/protocols/sametime/sametime.c:1513
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Esperando a la aceptaci坦n del saludo inicial"
 
-#: ../libpurple/protocols/sametime/sametime.c:1518
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Se acept坦 el saludo inicial. Enviando la identificaci坦n"
 
-#: ../libpurple/protocols/sametime/sametime.c:1523
 msgid "Waiting for Login Acknowledgement"
 msgstr "Esperando a la aceptaci坦n de la identificaci坦n"
 
-#: ../libpurple/protocols/sametime/sametime.c:1528
 msgid "Login Redirected"
 msgstr "Identificaci坦n redirigida"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Forcing Login"
 msgstr "Forzando la identificaci坦n"
 
-#: ../libpurple/protocols/sametime/sametime.c:1538
 msgid "Login Acknowledged"
 msgstr "Identificaci坦n aceptada"
 
-#: ../libpurple/protocols/sametime/sametime.c:1543
 msgid "Starting Services"
 msgstr "Arrancando servicios"
 
-#: ../libpurple/protocols/sametime/sametime.c:1680
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
-"Un administrador de 束Sametime損 ha enviado el siguiente anuncio en el "
-"servidor %s"
-
-#: ../libpurple/protocols/sametime/sametime.c:1685
+"Un administrador de 束Sametime損 ha enviado el siguiente anuncio en el servidor "
+"%s"
+
 msgid "Sametime Administrator Announcement"
 msgstr "Anuncio del administrador 束Sametime損"
 
-#: ../libpurple/protocols/sametime/sametime.c:1738
 msgid "Connection reset"
 msgstr "Conexi坦n rehusada"
 
-#: ../libpurple/protocols/sametime/sametime.c:1750
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Error al leer del socket: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1775
-#: ../libpurple/protocols/sametime/sametime.c:3782
 msgid "Unable to connect to host"
 msgstr "No se pudo conectar al servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:1816
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aviso de %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1990
 msgid "Conference Closed"
 msgstr "Conferencia cerrada"
 
-#: ../libpurple/protocols/sametime/sametime.c:2455
 msgid "Unable to send message: "
 msgstr "No se pudo enviar el mensaje:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3011
 msgid "Place Closed"
 msgstr "Lugar cerrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Microphone"
 msgstr "Micr坦fono"
 
-#: ../libpurple/protocols/sametime/sametime.c:3282
 msgid "Speakers"
 msgstr "Altavoces"
 
-#: ../libpurple/protocols/sametime/sametime.c:3283
 msgid "Video Camera"
 msgstr "V鱈deo c叩mara"
 
-#: ../libpurple/protocols/sametime/sametime.c:3321
-#: ../libpurple/protocols/sametime/sametime.c:4201
 msgid "Supports"
 msgstr "Soporta"
 
-#: ../libpurple/protocols/sametime/sametime.c:3326
-#: ../libpurple/protocols/sametime/sametime.c:4175
 msgid "External User"
 msgstr "Usuario externo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3432
 msgid "Create conference with user"
 msgstr "Crear conferencia con el usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:3433
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10668,27 +7809,21 @@
 "Por favor ingrese tema para la nueva conferencia, y un mensaje de invitaci坦n "
 "que se enviar叩 a %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3437
 msgid "New Conference"
 msgstr "Nueva conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3439
 msgid "Create"
 msgstr "Crear"
 
-#: ../libpurple/protocols/sametime/sametime.c:3504
 msgid "Available Conferences"
 msgstr "Conferencias disponibles"
 
-#: ../libpurple/protocols/sametime/sametime.c:3510
 msgid "Create New Conference..."
 msgstr "Crear nueva conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3517
 msgid "Invite user to a conference"
 msgstr "Invitar a un usuario a una conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3518
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10699,27 +7834,21 @@
 "Seleccione \"Crear nueva conferencia\" si quiere crear una nueva conferencia "
 "para invitar a este usuario tambi辿n."
 
-#: ../libpurple/protocols/sametime/sametime.c:3523
 msgid "Invite to Conference"
 msgstr "Invitar a conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "Invite to Conference..."
 msgstr "Invitar a conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3619
 msgid "Send TEST Announcement"
 msgstr "Enviar anuncio de prueba"
 
-#: ../libpurple/protocols/sametime/sametime.c:3638 ../pidgin/gtkconv.c:4524
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3666
 msgid "No Sametime Community Server specified"
 msgstr "No se ha especificado el servidor de comunidad 束Sametime損"
 
-#: ../libpurple/protocols/sametime/sametime.c:3691
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10728,42 +7857,31 @@
 "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:3696
 msgid "Meanwhile Connection Setup"
 msgstr "Configuraci坦n de la conexi坦n 束Meanwhile損"
 
-#: ../libpurple/protocols/sametime/sametime.c:3697
 msgid "No Sametime Community Server Specified"
 msgstr "No se ha especificado un servidor de comunidad 束Sametime損"
 
-#: ../libpurple/protocols/sametime/sametime.c:3699
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../libpurple/protocols/sametime/sametime.c:4191
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "(0x%04x) desconocido<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4193
 msgid "Last Known Client"
 msgstr "�ltimo cliente conocido:"
 
-#: ../libpurple/protocols/sametime/sametime.c:4357
-#: ../libpurple/protocols/sametime/sametime.c:5562
 msgid "User Name"
 msgstr "Nombre de usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:4360
-#: ../libpurple/protocols/sametime/sametime.c:5565
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4384
 msgid "An ambiguous user ID was entered"
 msgstr "Se ha introducido un identificador de usuario ambiguo"
 
-#: ../libpurple/protocols/sametime/sametime.c:4385
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10773,15 +7891,12 @@
 "usuarios. Por favor seleccione el usuario de la lista mostrada para a単adirlo "
 "a su lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:4390
 msgid "Select User"
 msgstr "Seleccionar usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:4474
 msgid "Unable to add user: user not found"
 msgstr "No se pudo a単adir al usuario: el usuario no se ha encontrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:4476
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10790,7 +7905,6 @@
 "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:5067
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10799,84 +7913,66 @@
 "Error al leer el archivo %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Remotely Stored Buddy List"
 msgstr "Lista de amigos remotamente almacenada"
 
-#: ../libpurple/protocols/sametime/sametime.c:5207
 msgid "Buddy List Storage Mode"
 msgstr "Modo de almacenamiento de la lista de amigos"
 
 # Usar empotrable? (jfs)
-#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Local Buddy List Only"
 msgstr "Solamente lista de amigos local"
 
-#: ../libpurple/protocols/sametime/sametime.c:5212
 msgid "Merge List from Server"
 msgstr "Fusionar lista desde el servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Merge and Save List to Server"
 msgstr "Fusionar y guardar lista en el servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
 msgid "Synchronize List with Server"
 msgstr "Sincronizar la lista con el servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5271
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importar la lista 束Sametime損 para la cuenta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportar la lista 束Sametime損 para la cuenta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5365
 msgid "Unable to add group: group exists"
 msgstr "No se pudo a単adir el grupo: el grupo ya existe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5366
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Un grupo llamado '%s' ya existe en su lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5369
-#: ../libpurple/protocols/sametime/sametime.c:5499
 msgid "Unable to add group"
 msgstr "No se pudo a単adir el grupo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5428
 msgid "Possible Matches"
 msgstr "Posibles coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5444
 msgid "Notes Address Book group results"
 msgstr ""
 "Resultados de las notas de los grupos de la libreta de direcciones 束Notes損"
 
-#: ../libpurple/protocols/sametime/sametime.c:5445
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-"Es posible que el identificador 束%s損 se refiera a cualquiera de los grupos "
-"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:5450
+"Es posible que el identificador 束%s損 se refiera a cualquiera de los grupos 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."
+
 msgid "Select Notes Address Book"
 msgstr "Seleccionar libro de direcciones 束Notes損"
 
-#: ../libpurple/protocols/sametime/sametime.c:5493
 msgid "Unable to add group: group not found"
 msgstr "No se pudo a単adir el grupo: no se ha encontrado el grupo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5495
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10885,11 +7981,9 @@
 "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:5536
 msgid "Notes Address Book Group"
 msgstr "Libreta de direcciones de grupos 束Notes損"
 
-#: ../libpurple/protocols/sametime/sametime.c:5537
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -10898,12 +7992,10 @@
 "campo a continuaci坦n para a単adir al grupo y a sus miembros en su lista de "
 "amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5586
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados de la b炭squeda '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5587
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10914,30 +8006,24 @@
 "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:5594 ../pidgin/gtknotify.c:794
 msgid "Search Results"
 msgstr "Resultados de la b炭squeda"
 
-#: ../libpurple/protocols/sametime/sametime.c:5619
 msgid "No matches"
 msgstr "No hubo coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5620
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
-"El identificador 束%s損 no coincide con ninguno de los usuarios en su "
-"comunidad 束Sametime損."
-
-#: ../libpurple/protocols/sametime/sametime.c:5624
+"El identificador 束%s損 no coincide con ninguno de los usuarios en su comunidad "
+"束Sametime損."
+
 msgid "No Matches"
 msgstr "No hubo coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5661
 msgid "Search for a user"
 msgstr "Buscar un usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:5662
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10945,115 +8031,59 @@
 "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:5665
 msgid "User Search"
 msgstr "B炭squeda de usuarios"
 
-#: ../libpurple/protocols/sametime/sametime.c:5678
 msgid "Import Sametime List..."
 msgstr "Importar la lista 束Sametime損..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5682
 msgid "Export Sametime List..."
 msgstr "Exportar la lista 束Sametime損..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5686
 msgid "Add Notes Address Book Group..."
 msgstr "A単adir a la libreta de direcciones de grupos 束Notes損..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5690
 msgid "User Search..."
 msgstr "B炭squeda de los usuarios..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Force login (ignore server redirects)"
 msgstr "Forzar conexi坦n (ignorar redirecciones del servidor)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5806
 msgid "Hide client identity"
 msgstr "Ocultar identidad de cliente"
 
-#: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:410
-#: ../libpurple/protocols/silc/buddy.c:538
-#: ../libpurple/protocols/silc/buddy.c:700
-#: ../libpurple/protocols/silc/ft.c:423
-#: ../libpurple/protocols/silc10/buddy.c:52
-#: ../libpurple/protocols/silc10/buddy.c:421
-#: ../libpurple/protocols/silc10/buddy.c:546
-#: ../libpurple/protocols/silc10/buddy.c:712
-#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "El usuario %s no est叩 disponible en la red"
 
-#: ../libpurple/protocols/silc/buddy.c:53
-#: ../libpurple/protocols/silc/buddy.c:110
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:119
-#: ../libpurple/protocols/silc/buddy.c:124
-#: ../libpurple/protocols/silc/buddy.c:129
-#: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:254
-#: ../libpurple/protocols/silc10/buddy.c:53
-#: ../libpurple/protocols/silc10/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:124
-#: ../libpurple/protocols/silc10/buddy.c:129
-#: ../libpurple/protocols/silc10/buddy.c:134
-#: ../libpurple/protocols/silc10/buddy.c:139
-#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "No se pudo establecer el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Se produjo un error durante el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Fall坦 el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Expir坦 el tiempo durante el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Se interrumpi坦 el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Ya se ha iniciado el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "No puede comenzar el acuerdo de claves consigo mismo"
 
-#: ../libpurple/protocols/silc/buddy.c:255
-#: ../libpurple/protocols/silc/buddy.c:383
-#: ../libpurple/protocols/silc/buddy.c:497
-#: ../libpurple/protocols/silc/buddy.c:508
-#: ../libpurple/protocols/silc10/buddy.c:258
-#: ../libpurple/protocols/silc10/buddy.c:389
-#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "El usuario remoto ya no est叩 activo dentro de la red"
 
-#: ../libpurple/protocols/silc/buddy.c:298
-#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -11062,8 +8092,6 @@
 "Se ha recibido una solicitud de acuerdo de claves de %s. 多Desea realizar el "
 "intercambio de claves?"
 
-#: ../libpurple/protocols/silc/buddy.c:302
-#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -11074,99 +8102,40 @@
 "Servidor remoto: %s\n"
 "Puerto remoto: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Solicitud de acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:382
-#: ../libpurple/protocols/silc/buddy.c:412
-#: ../libpurple/protocols/silc/buddy.c:452
-#: ../libpurple/protocols/silc10/buddy.c:388
-#: ../libpurple/protocols/silc10/buddy.c:423
-#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "MI con contrase単a"
 
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "No se pudo establecer la clave MI"
 
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 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:1516
-#: ../libpurple/protocols/silc/ops.c:1527
-#: ../libpurple/protocols/silc10/buddy.c:513
-#: ../libpurple/protocols/silc10/buddy.c:548
-#: ../libpurple/protocols/silc10/ops.c:1494
-#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Obtener clave p炭blica"
 
-#: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1517
-#: ../libpurple/protocols/silc/ops.c:1528
-#: ../libpurple/protocols/silc10/buddy.c:549
-#: ../libpurple/protocols/silc10/ops.c:1495
-#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "No se pudo obtener la clave p炭blica"
 
-#: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1658
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../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:1030
-#: ../libpurple/protocols/silc/chat.c:238
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../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"
 
-#: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1066
-#: ../libpurple/protocols/silc/ops.c:1181
-#: ../libpurple/protocols/silc/ops.c:1303
-#: ../libpurple/protocols/silc/ops.c:1304
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:713
-#: ../libpurple/protocols/silc10/ops.c:1087
-#: ../libpurple/protocols/silc10/ops.c:1159
-#: ../libpurple/protocols/silc10/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1295
-#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Informaci坦n de usuario"
 
-#: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1182
-#: ../libpurple/protocols/silc/ops.c:1323
-#: ../libpurple/protocols/silc10/buddy.c:714
-#: ../libpurple/protocols/silc10/ops.c:1160
-#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "No se pudo obtener la informaci坦n del usuario %s"
 
-#: ../libpurple/protocols/silc/buddy.c:723
-#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "No se conf鱈a en el amigo %s"
 
-#: ../libpurple/protocols/silc/buddy.c:726
-#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -11175,19 +8144,13 @@
 "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:1062
-#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../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: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."
@@ -11195,18 +8158,12 @@
 "Para a単adir al amigo debe importar su clave p炭blica. Pulse 束Importar損 para "
 "importar una clave p炭blica."
 
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ../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: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."
@@ -11214,8 +8171,6 @@
 "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: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."
@@ -11223,312 +8178,154 @@
 "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:1477
-#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "Desligado"
 
-#: ../libpurple/protocols/silc/buddy.c:1481
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1481
-#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Indispuesto"
 
-#: ../libpurple/protocols/silc/buddy.c:1485
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1485
-#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Despi辿rtame"
 
-#: ../libpurple/protocols/silc/buddy.c:1487
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1487
-#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiper-activo"
 
-#: ../libpurple/protocols/silc/buddy.c:1489
-#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:959
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:515
 msgid "Happy"
 msgstr "Feliz"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/silc.c:961
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:517
 msgid "Sad"
 msgstr "Triste"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:963
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:519
 msgid "Angry"
 msgstr "Furioso"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:965
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:666
-#: ../libpurple/protocols/silc10/util.c:521
 msgid "Jealous"
 msgstr "Celoso"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:967
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:523
 msgid "Ashamed"
 msgstr "Avergonzado"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:969
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:525
 msgid "Invincible"
 msgstr "Invencible"
 
-#: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1508
-#: ../libpurple/protocols/silc10/util.c:527
 msgid "In Love"
 msgstr "Enamorado"
 
-#: ../libpurple/protocols/silc/buddy.c:1510
-#: ../libpurple/protocols/silc/silc.c:973
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:529
 msgid "Sleepy"
 msgstr "Dormido"
 
-#: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/silc.c:975
-#: ../libpurple/protocols/silc/util.c:538
-#: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:676
-#: ../libpurple/protocols/silc10/util.c:531
 msgid "Bored"
 msgstr "Aburrido"
 
-#: ../libpurple/protocols/silc/buddy.c:1514
-#: ../libpurple/protocols/silc/silc.c:977
-#: ../libpurple/protocols/silc/util.c:540
-#: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:678
-#: ../libpurple/protocols/silc10/util.c:533
 msgid "Excited"
 msgstr "Excitado"
 
-#: ../libpurple/protocols/silc/buddy.c:1516
-#: ../libpurple/protocols/silc/silc.c:979
-#: ../libpurple/protocols/silc/util.c:542
-#: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:680
-#: ../libpurple/protocols/silc10/util.c:535
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: ../libpurple/protocols/silc/buddy.c:1548
-#: ../libpurple/protocols/silc/ops.c:1220
-#: ../libpurple/protocols/silc10/buddy.c:1548
-#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Modos de usuario"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
-#: ../libpurple/protocols/silc/ops.c:1237
-#: ../libpurple/protocols/silc10/buddy.c:1565
-#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Contacto preferido"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
-#: ../libpurple/protocols/silc/ops.c:1242
-#: ../libpurple/protocols/silc10/buddy.c:1570
-#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Idioma preferido"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
-#: ../libpurple/protocols/silc/ops.c:1247
-#: ../libpurple/protocols/silc10/buddy.c:1575
-#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../libpurple/protocols/silc/buddy.c:1580
-#: ../libpurple/protocols/silc/ops.c:1252
-#: ../libpurple/protocols/silc10/buddy.c:1580
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:728
-#: ../libpurple/protocols/silc10/silc.c:730
 msgid "Timezone"
 msgstr "Zona horaria"
 
-#: ../libpurple/protocols/silc/buddy.c:1585
-#: ../libpurple/protocols/silc/ops.c:1257
-#: ../libpurple/protocols/silc10/buddy.c:1585
-#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Localizaci坦n"
 
-#: ../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:1646
-#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "MI con intercambio de claves"
 
-#: ../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:1664
-#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "Obtener clave p炭blica..."
 
-#: ../libpurple/protocols/silc/buddy.c:1671
-#: ../libpurple/protocols/silc/ops.c:1625
-#: ../libpurple/protocols/silc10/buddy.c:1670
-#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Matar usuario"
 
-#: ../libpurple/protocols/silc/buddy.c:1681
-#: ../libpurple/protocols/silc/chat.c:1000
-#: ../libpurple/protocols/silc10/buddy.c:1680
-#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Escribir en la pizarra"
 
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "Contra_se単a:"
 
-#: ../libpurple/protocols/silc/chat.c:80
-#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "No existe el canal %s en la red"
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:176
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Informaci坦n de canal"
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "No se pudo cambiar la informaci坦n del canal"
 
-#: ../libpurple/protocols/silc/chat.c:119
-#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nombre del canal:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:122
-#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>N炭mero de usuarios:</b> %d"
 
-#: ../libpurple/protocols/silc/chat.c:129
-#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fundador del canal</b>: %s"
 
-#: ../libpurple/protocols/silc/chat.c:138
-#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cifrado del canal:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:143
-#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC de canal:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:148
-#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 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: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: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:237
-#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "A単adir clave p炭blica del canal"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:305
-#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Abrir clave p炭blica..."
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Contrase単a del canal"
 
-#: ../libpurple/protocols/silc/chat.c:431
-#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Lista de claves p炭blicas del canal"
 
-#: ../libpurple/protocols/silc/chat.c:436
-#: ../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 "
@@ -11542,451 +8339,251 @@
 "conectarse los usuarios que est辿n en la lista de claves p炭blicas si se "
 "utilizan claves p炭blicas para el acceso."
 
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:483
-#: ../libpurple/protocols/silc/chat.c:934
-#: ../libpurple/protocols/silc10/chat.c:422
-#: ../libpurple/protocols/silc10/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:461
-#: ../libpurple/protocols/silc10/chat.c:462
-#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Autenticaci坦n de canal"
 
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:484
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "A単adir / Quitar"
 
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Nombre de grupo"
 
-#: ../libpurple/protocols/silc/chat.c:604
-#: ../libpurple/protocols/silc/ops.c:1830
-#: ../libpurple/protocols/silc/silc.c:1236
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1907
-#: ../libpurple/protocols/silc10/silc.c:937
 msgid "Passphrase"
 msgstr "Contrase単a"
 
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 "Por favor, indique el nombre del grupo de canales privados %s y una "
 "contrase単a."
 
-#: ../libpurple/protocols/silc/chat.c:617
-#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "A単adir grupo de canales privados"
 
-#: ../libpurple/protocols/silc/chat.c:749
-#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "L鱈mite de usuarios"
 
-#: ../libpurple/protocols/silc/chat.c:750
-#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Fijar un limite de usuarios en el canal. Poner a cero para quitar el l鱈mite "
 "de usuarios."
 
-#: ../libpurple/protocols/silc/chat.c:914
-#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Lista de invitados"
 
-#: ../libpurple/protocols/silc/chat.c:919
-#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Lista de expulsados"
 
-#: ../libpurple/protocols/silc/chat.c:927
-#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "A単adir grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:940
-#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Borrado permanente"
 
-#: ../libpurple/protocols/silc/chat.c:945
-#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Fijar permanente"
 
-#: ../libpurple/protocols/silc/chat.c:953
-#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Establecer l鱈mite de usuarios"
 
-#: ../libpurple/protocols/silc/chat.c:959
-#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Quitar restricciones de temas"
 
-#: ../libpurple/protocols/silc/chat.c:964
-#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Establecer restricciones de tema"
 
-#: ../libpurple/protocols/silc/chat.c:971
-#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Limpiar canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:976
-#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Establecer canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:983
-#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Limpiar canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:988
-#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Establecer canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:1049
-#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Tiene que unirse al canal %s antes de poder unirse al grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1051
-#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Unirse a un grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1052
-#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "No se pudo unir a un grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1248
-#: ../libpurple/protocols/silc/silc.c:1433
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Call Command"
 msgstr "Orden de llamada"
 
-#: ../libpurple/protocols/silc/chat.c:1248
-#: ../libpurple/protocols/silc/silc.c:1434
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Cannot call command"
 msgstr "No se pudo llamar la orden"
 
-#: ../libpurple/protocols/silc/chat.c:1249
-#: ../libpurple/protocols/silc/silc.c:1435
-#: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1144
 msgid "Unknown command"
 msgstr "Orden desconocida"
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
-#: ../libpurple/protocols/silc10/ft.c:96
-#: ../libpurple/protocols/silc10/ft.c:100
-#: ../libpurple/protocols/silc10/ft.c:104
-#: ../libpurple/protocols/silc10/ft.c:205
-#: ../libpurple/protocols/silc10/ft.c:210
-#: ../libpurple/protocols/silc10/ft.c:215
-#: ../libpurple/protocols/silc10/ft.c:221
-#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Transferencia segura de archivos"
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
-#: ../libpurple/protocols/silc10/ft.c:101
-#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Se produjo un error durante la transferencia de archivos"
 
-#: ../libpurple/protocols/silc/ft.c:87
 msgid "Remote disconnected"
 msgstr "Se ha desconectado el remoto"
 
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Fall坦 el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/ft.c:114
 msgid "Connection timed out"
 msgstr "Expir坦 la conexi坦n"
 
-#: ../libpurple/protocols/silc/ft.c:118
 msgid "Creating connection failed"
 msgstr "Fall坦 la creaci坦n de la conexi坦n"
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "La sesi坦n de transferencia de archivos no existe"
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "No hay ninguna sesi坦n de transferencia de archivos activa"
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Ya se ha iniciado la transferencia de archivos"
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr ""
 "No se pudo realizar el acuerdo de claves para realizar la transferencia de "
 "archivos."
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "No se pudo comenzar la transferencia de archivos."
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "No se puede enviar el archivo."
 
-#: ../libpurple/protocols/silc/ops.c:76
 msgid "Error occurred"
 msgstr "Se produjo un error"
 
-#: ../libpurple/protocols/silc/ops.c:548 ../libpurple/protocols/silc/ops.c:557
-#: ../libpurple/protocols/silc/ops.c:566
-#: ../libpurple/protocols/silc10/ops.c:554
-#: ../libpurple/protocols/silc10/ops.c:563
-#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s ha cambiado el tema a de <I>%s</I> a: %s"
 
-#: ../libpurple/protocols/silc/ops.c:632
-#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> fijo los modos del canal <I>%s</I> a: %s"
 
-#: ../libpurple/protocols/silc/ops.c:636
-#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> quit坦 todos los modos del canal <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:669
-#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> fijo los modos del usuario <I>%s</I> a: %s"
 
-#: ../libpurple/protocols/silc/ops.c:677
-#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> quit坦 todos los modos del usuario <I>%s<I>"
 
-#: ../libpurple/protocols/silc/ops.c:706
-#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Ha sido expulsado de <I>%s</I> por %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:733 ../libpurple/protocols/silc/ops.c:738
-#: ../libpurple/protocols/silc/ops.c:743
-#: ../libpurple/protocols/silc10/ops.c:742
-#: ../libpurple/protocols/silc10/ops.c:747
-#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Ha sido expulsado por %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:764 ../libpurple/protocols/silc/ops.c:769
-#: ../libpurple/protocols/silc/ops.c:774
-#: ../libpurple/protocols/silc10/ops.c:773
-#: ../libpurple/protocols/silc10/ops.c:778
-#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:811
-#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Desconectado por el servidor"
 
-#: ../libpurple/protocols/silc/ops.c:997
-#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Informaci坦n personal"
 
-#: ../libpurple/protocols/silc/ops.c:1020
-#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Cumplea単os"
 
-#: ../libpurple/protocols/silc/ops.c:1028
-#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Rol laboral"
 
-#: ../libpurple/protocols/silc/ops.c:1032
-#: ../libpurple/protocols/silc/silc.c:1229
-#: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:930
 msgid "Organization"
 msgstr "Organizaci坦n"
 
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Unidad"
 
-#: ../libpurple/protocols/silc/ops.c:1060
-#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Nota"
 
-#: ../libpurple/protocols/silc/ops.c:1106
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Unirse a un chat"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../libpurple/protocols/silc/ops.c:1140
-#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Vd. es fundador del canal en <I>%s</I>."
 
-#: ../libpurple/protocols/silc/ops.c:1144
-#: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "El fundador del canal en <I>%s</I> es <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1203
-#: ../libpurple/protocols/silc/ops.c:1341
-#: ../libpurple/protocols/silc10/ops.c:1183
-#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1078
 msgid "Real Name"
 msgstr "Nombre real"
 
-#: ../libpurple/protocols/silc/ops.c:1231
-#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Texto de estado"
 
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1367
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Huella digital de la clave p炭blica"
 
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1368
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Huella babble de la clave p炭blica"
 
-#: ../libpurple/protocols/silc/ops.c:1307
-#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_M叩s..."
 
-#: ../libpurple/protocols/silc/ops.c:1386
-#: ../libpurple/protocols/silc/silc.c:1293
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr "Desligar del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1386
-#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "No se puede desligar"
 
-#: ../libpurple/protocols/silc/ops.c:1406
-#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "No se puede cambiar el tema"
 
-#: ../libpurple/protocols/silc/ops.c:1435
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "No se pudo cambiar el alias"
 
-#: ../libpurple/protocols/silc/ops.c:1484
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1484
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "No se pudo obtener la lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1485
 msgid "Network is empty"
 msgstr "La red est叩 vac鱈a"
 
-#: ../libpurple/protocols/silc/ops.c:1529
-#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "No se ha recibido una clave p炭blica"
 
-#: ../libpurple/protocols/silc/ops.c:1541
-#: ../libpurple/protocols/silc/ops.c:1554
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Informaci坦n del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1542
-#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "No se pudo obtener la informaci坦n del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1565
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Estad鱈sticas del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1566
-#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "No se pudieron obtener las estad鱈sticas del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1573
-#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -12021,59 +8618,36 @@
 "Operadores de servidor en total: %d\n"
 "Operadores de encaminadores en total: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Estad鱈sticas de red"
 
-#: ../libpurple/protocols/silc/ops.c:1613
-#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Fall坦 el ping"
 
-#: ../libpurple/protocols/silc/ops.c:1618
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Se recibi坦 una respuesta al ping del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1626
-#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "No se pudo expulsar al usuario"
 
-#: ../libpurple/protocols/silc/ops.c:1665
 msgid "WATCH"
 msgstr "A�ADIR"
 
-#: ../libpurple/protocols/silc/ops.c:1665
 msgid "Cannot watch user"
 msgstr "No se puede a単adir al usuario"
 
-#: ../libpurple/protocols/silc/ops.c:1741
-#: ../libpurple/protocols/silc/ops.c:1792
-#: ../libpurple/protocols/silc/silc.c:394
-#: ../libpurple/protocols/silc10/ops.c:1817
-#: ../libpurple/protocols/silc10/ops.c:1864
-#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Resuming session"
 msgstr "Reanudando la sesi坦n"
 
-#: ../libpurple/protocols/silc/ops.c:1743
-#: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Autenticando la conexi坦n"
 
-#: ../libpurple/protocols/silc/ops.c:1794
-#: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Comprobando la clave p炭blica del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1831
-#: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "Se necesita una contrase単a"
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -12082,12 +8656,10 @@
 "Se recibi坦 la clave p炭blica de %s. Su copia local no coincide con esta "
 "clave. 多Desea aceptar la clave p炭blica de todas formas?"
 
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Se recibi坦 la clave p炭blica de %s. 多Desea aceptar esta clave p炭blica?"
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -12100,104 +8672,69 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
-#: ../libpurple/protocols/silc10/pk.c:116
-#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verificar la clave p炭blica"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Ver..."
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Tipo de clave p炭blica no soportada"
 
-#: ../libpurple/protocols/silc/silc.c:319
-#: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
 msgstr "Desconectado por el servidor"
 
-#: ../libpurple/protocols/silc/silc.c:327
-#: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "Se produjo un error durante la conexi坦n al servidor SILC"
 
-#: ../libpurple/protocols/silc/silc.c:333
-#: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "Fall坦 el intercambio de claves"
 
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/ops.c:1718
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Se produjo un fallo al retomar la sesi坦n desligada. Pulse 束Reconectar損 para "
 "crear una nueva conexi坦n."
 
-#: ../libpurple/protocols/silc/silc.c:373
-#: ../libpurple/protocols/silc/silc.c:420
-#: ../libpurple/protocols/silc10/silc.c:163
 msgid "Connection failed"
 msgstr "Fall坦 la conexi坦n"
 
-#: ../libpurple/protocols/silc/silc.c:397
-#: ../libpurple/protocols/silc10/silc.c:196
 msgid "Performing key exchange"
 msgstr "Realizando intercambio de claves"
 
-#: ../libpurple/protocols/silc/silc.c:449
-#: ../libpurple/protocols/silc10/silc.c:361
 msgid "Unable to create connection"
 msgstr "No se pudo crear la conexi坦n"
 
-#: ../libpurple/protocols/silc/silc.c:492
-#: ../libpurple/protocols/silc/silc.c:508
-#: ../libpurple/protocols/silc/silc.c:537
-#: ../libpurple/protocols/silc10/silc.c:340
 msgid "Could not load SILC key pair"
 msgstr "No se pudo cargar la clave p炭blica SILC"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:522
-#: ../libpurple/protocols/silc10/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "Conectando con el servidor SILC"
 
-#: ../libpurple/protocols/silc/silc.c:568
-#: ../libpurple/protocols/silc10/silc.c:271
 msgid "Out of memory"
 msgstr "Sin memoria"
 
-#: ../libpurple/protocols/silc/silc.c:619
-#: ../libpurple/protocols/silc10/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "No se pudo inicializar el protocolo SILC"
 
-#: ../libpurple/protocols/silc/silc.c:632
-#: ../libpurple/protocols/silc10/silc.c:324
 msgid "Error loading SILC key pair"
 msgstr "Error al cargar el par de claves SILC"
 
-#: ../libpurple/protocols/silc/silc.c:955
-#: ../libpurple/protocols/silc10/silc.c:656
+#, c-format
+msgid "Download %s: %s"
+msgstr "Descarga %s: %s"
+
 msgid "Your Current Mood"
 msgstr "Su estado de 叩nimo actual"
 
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1795
+#, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:971
-#: ../libpurple/protocols/silc10/silc.c:672
 msgid "In love"
 msgstr "Enamorado"
 
-#: ../libpurple/protocols/silc/silc.c:982
-#: ../libpurple/protocols/silc10/silc.c:683
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -12205,63 +8742,36 @@
 "\n"
 "Sus m辿todos de contacto preferidos"
 
-#: ../libpurple/protocols/silc/silc.c:990
-#: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:691
-#: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:992
-#: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/silc.c:693
-#: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:994
-#: ../libpurple/protocols/silc10/silc.c:695
 msgid "Video conferencing"
 msgstr "Video conferencia"
 
-#: ../libpurple/protocols/silc/silc.c:999
-#: ../libpurple/protocols/silc10/silc.c:700
 msgid "Your Current Status"
 msgstr "Su estado actual"
 
-#: ../libpurple/protocols/silc/silc.c:1006
-#: ../libpurple/protocols/silc10/silc.c:707
 msgid "Online Services"
 msgstr "Servicios en l鱈nea"
 
-#: ../libpurple/protocols/silc/silc.c:1009
-#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what services you are using"
 msgstr "Permitir que otros consulten qu辿 servicios est叩 utilizando"
 
-#: ../libpurple/protocols/silc/silc.c:1015
-#: ../libpurple/protocols/silc10/silc.c:716
 msgid "Let others see what computer you are using"
 msgstr "Permitir que otros consulten qu辿 ordenador est叩 utilizando"
 
-#: ../libpurple/protocols/silc/silc.c:1022
-#: ../libpurple/protocols/silc10/silc.c:723
 msgid "Your VCard File"
 msgstr "Su archivo VCard"
 
-#: ../libpurple/protocols/silc/silc.c:1028
 msgid "Timezone (UTC)"
 msgstr "Zona horaria (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:1032
-#: ../libpurple/protocols/silc/silc.c:1033
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/silc10/silc.c:736
 msgid "User Online Status Attributes"
 msgstr "Atributos del estado del usuario en l鱈nea"
 
-#: ../libpurple/protocols/silc/silc.c:1034
-#: ../libpurple/protocols/silc10/silc.c:737
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -12271,217 +8781,128 @@
 "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:1075
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc/silc.c:1702
-#: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:784
-#: ../libpurple/protocols/silc10/silc.c:1421
 msgid "Message of the Day"
 msgstr "Mensaje del d鱈a"
 
-#: ../libpurple/protocols/silc/silc.c:1075
-#: ../libpurple/protocols/silc10/silc.c:778
 msgid "No Message of the Day available"
 msgstr "No hay disponible un mensaje del d鱈a"
 
-#: ../libpurple/protocols/silc/silc.c:1076
-#: ../libpurple/protocols/silc/silc.c:1697
-#: ../libpurple/protocols/silc10/silc.c:779
-#: ../libpurple/protocols/silc10/silc.c:1416
 msgid "There is no Message of the Day associated with this connection"
 msgstr "No hay un mensaje del d鱈a asociado con esta conexi坦n"
 
-#: ../libpurple/protocols/silc/silc.c:1127
-#: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc/silc.c:1244
-#: ../libpurple/protocols/silc/silc.c:1245
-#: ../libpurple/protocols/silc10/silc.c:830
-#: ../libpurple/protocols/silc10/silc.c:874
-#: ../libpurple/protocols/silc10/silc.c:945
-#: ../libpurple/protocols/silc10/silc.c:946
 msgid "Create New SILC Key Pair"
 msgstr "Crear nuevo par de claves SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1127
-#: ../libpurple/protocols/silc10/silc.c:830
 msgid "Passphrases do not match"
 msgstr "Las contrase単as no coinciden."
 
-#: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc10/silc.c:874
 msgid "Key Pair Generation failed"
 msgstr "Fall坦 la generaci坦n de claves"
 
-#: ../libpurple/protocols/silc/silc.c:1212
-#: ../libpurple/protocols/silc10/silc.c:913
 msgid "Key length"
 msgstr "Longitud de clave"
 
-#: ../libpurple/protocols/silc/silc.c:1214
-#: ../libpurple/protocols/silc10/silc.c:915
 msgid "Public key file"
 msgstr "Fichero de clave p炭blica"
 
-#: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:917
 msgid "Private key file"
 msgstr "Fichero de clave privada"
 
-#: ../libpurple/protocols/silc/silc.c:1239
-#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Passphrase (retype)"
 msgstr "Contrase単a (escribir de nuevo)"
 
-#: ../libpurple/protocols/silc/silc.c:1246
-#: ../libpurple/protocols/silc10/silc.c:947
 msgid "Generate Key Pair"
 msgstr "Generar par de claves"
 
-#: ../libpurple/protocols/silc/silc.c:1289
-#: ../libpurple/protocols/silc10/silc.c:990
 msgid "Online Status"
 msgstr "Estado en l鱈nea"
 
-#: ../libpurple/protocols/silc/silc.c:1297
-#: ../libpurple/protocols/silc10/silc.c:998
 msgid "View Message of the Day"
 msgstr "Mostrar mensaje del d鱈a"
 
-#: ../libpurple/protocols/silc/silc.c:1301
-#: ../libpurple/protocols/silc10/silc.c:1002
 msgid "Create SILC Key Pair..."
 msgstr "Crear par de claves SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1393
-#: ../libpurple/protocols/silc10/silc.c:1101
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "El usuario <I>%s</I> no est叩 en la red"
 
-#: ../libpurple/protocols/silc/silc.c:1573
-#: ../libpurple/protocols/silc10/silc.c:1292
 msgid "Topic too long"
 msgstr "Tema demasiado largo"
 
-#: ../libpurple/protocols/silc/silc.c:1654
-#: ../libpurple/protocols/silc10/silc.c:1373
 msgid "You must specify a nick"
 msgstr "Debe especificar un apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "no se ha encontrado el canal %s"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1480
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "los modos del canal de %s son: %s"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../libpurple/protocols/silc/silc.c:1763
-#: ../libpurple/protocols/silc10/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no se han definido modos de canal para %s"
 
-#: ../libpurple/protocols/silc/silc.c:1776
-#: ../libpurple/protocols/silc10/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "No se pudieron fijar los modos de canal para %s"
 
-#: ../libpurple/protocols/silc/silc.c:1806
-#: ../libpurple/protocols/silc10/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Orden desconocida: %s, (puede ser un error del cliente)"
 
-#: ../libpurple/protocols/silc/silc.c:1869
-#: ../libpurple/protocols/silc10/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]:  Abandonar un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1873
-#: ../libpurple/protocols/silc10/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canal]:  Abandonar un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1877
-#: ../libpurple/protocols/silc10/silc.c:1596
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nuevo tema&gt;]:  Ver o cambiar el tema"
 
-#: ../libpurple/protocols/silc/silc.c:1882
-#: ../libpurple/protocols/silc10/silc.c:1601
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;canal&gt; [&lt;contrase単a&gt;:  Unirse a un chat en esta red"
 
-#: ../libpurple/protocols/silc/silc.c:1886
-#: ../libpurple/protocols/silc10/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr "list:  Mostrar los canales en esta red"
 
-#: ../libpurple/protocols/silc/silc.c:1890
-#: ../libpurple/protocols/silc10/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;apodo&gt;:  Mostrar informaci坦n del apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1894
-#: ../libpurple/protocols/silc10/silc.c:1613
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario"
 
-#: ../libpurple/protocols/silc/silc.c:1898
-#: ../libpurple/protocols/silc10/silc.c:1617
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;apodo&gt; [&lt;mensaje&gt;]:  Enviar un mensaje privado al usuario"
 
-#: ../libpurple/protocols/silc/silc.c:1902
-#: ../libpurple/protocols/silc10/silc.c:1621
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Mostrar el mensaje del d鱈a del servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1906
-#: ../libpurple/protocols/silc10/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr "detach:  Desligar esta sesi坦n"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [mensaje]:  Desconecta del servidor actual opcionalmente indicando un "
 "mensaje"
 
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;orden&gt;:  Ejecutar una orden cualquiera del cliente SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1920
-#: ../libpurple/protocols/silc10/silc.c:1639
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|%lt;raz坦n%gt;]:  Matar un alias"
 
-#: ../libpurple/protocols/silc/silc.c:1924
-#: ../libpurple/protocols/silc10/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1928
-#: ../libpurple/protocols/silc10/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;apodo&gt;:  Mostrar informaci坦n del apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1932
-#: ../libpurple/protocols/silc10/silc.c:1651
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -12489,8 +8910,6 @@
 "cmode &lt;canal&gt; [+|&lt;modos-&gt;] [argumentos]:  Cambia o muestra los "
 "modos del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1936
-#: ../libpurple/protocols/silc10/silc.c:1655
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -12498,18 +8917,12 @@
 "cumode &lt;canal&gt; +|-&lt;modos&gt &lt;apodo&gt;:  Cambia los modos del "
 "usuario o del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1940
-#: ../libpurple/protocols/silc10/silc.c:1659
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos_usuario&gt;:  Establecer sus modos en la red"
 
-#: ../libpurple/protocols/silc/silc.c:1944
-#: ../libpurple/protocols/silc10/silc.c:1663
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nick&gt; [-pubkey]:  Establece privilegios de operador"
 
-#: ../libpurple/protocols/silc/silc.c:1948
-#: ../libpurple/protocols/silc10/silc.c:1667
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -12517,47 +8930,31 @@
 "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:1952
-#: ../libpurple/protocols/silc10/silc.c:1671
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canal&gt; &lt;apodo&gt; [comentario]:  Echar a un cliente del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1956
-#: ../libpurple/protocols/silc10/silc.c:1675
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]:  Consulta detalles administrativos del servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1960
-#: ../libpurple/protocols/silc10/silc.c:1679
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canal&gt; +|-&lt;apodo&gt;]:  Expulsar a un cliente del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1683
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;apodo|servidor&gt;:  Obtiene la clave p炭blica del servidor o del "
 "cliente"
 
-#: ../libpurple/protocols/silc/silc.c:1968
-#: ../libpurple/protocols/silc10/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Muestra las estad鱈sticas del servidor y de la red"
 
-#: ../libpurple/protocols/silc/silc.c:1972
-#: ../libpurple/protocols/silc10/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Enviar un PING al servidor al que est叩 conectado"
 
-#: ../libpurple/protocols/silc/silc.c:1977
-#: ../libpurple/protocols/silc10/silc.c:1696
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 "users &lt;canal&gt;:  Obtiene la lista de los usuarios que est叩n en el canal"
 
-#: ../libpurple/protocols/silc/silc.c:1981
-#: ../libpurple/protocols/silc10/silc.c:1700
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -12574,142 +8971,92 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:2092
-#: ../libpurple/protocols/silc10/silc.c:1825
 msgid "SILC Protocol Plugin"
 msgstr "Complemento de protocolo SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:2094
-#: ../libpurple/protocols/silc10/silc.c:1827
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocolo de Conferencia segura en vivo en Internet (SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:2135
-#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2150
 msgid "Network"
 msgstr "Red"
 
-#: ../libpurple/protocols/silc/silc.c:2146
-#: ../libpurple/protocols/silc10/silc.c:1870
 msgid "Public Key file"
 msgstr "Fichero de clave p炭blica"
 
-#: ../libpurple/protocols/silc/silc.c:2150
-#: ../libpurple/protocols/silc10/silc.c:1874
 msgid "Private Key file"
 msgstr "Fichero de clave privada"
 
-#: ../libpurple/protocols/silc/silc.c:2160
-#: ../libpurple/protocols/silc10/silc.c:1884
 msgid "Cipher"
 msgstr "Cifrado"
 
-#: ../libpurple/protocols/silc/silc.c:2170
-#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "HMAC"
 msgstr "HMAC"
 
 #
-#: ../libpurple/protocols/silc/silc.c:2173
 msgid "Use Perfect Forward Secrecy"
 msgstr "Utilizar 束Confidencialidad directa perfecta損"
 
-#: ../libpurple/protocols/silc/silc.c:2177
-#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Public key authentication"
 msgstr "Autenticaci坦n de clave p炭blica"
 
-#: ../libpurple/protocols/silc/silc.c:2180
-#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear MIs que no hagan un intercambio de claves"
 
-#: ../libpurple/protocols/silc/silc.c:2183
-#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr "Bloquear mensajes a la pizarra"
 
-#: ../libpurple/protocols/silc/silc.c:2186
-#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr "Abrir la pizarra autom叩ticamente"
 
-#: ../libpurple/protocols/silc/silc.c:2189
-#: ../libpurple/protocols/silc10/silc.c:1909
 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: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: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:363
-#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nombre real: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
-#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nombre de usuario: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
-#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "Email: \t\t%s\n"
 msgstr "Correo electr坦nico:     %s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
-#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nombre de servidor: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:371
-#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organizaci坦n: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:373
-#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Pa鱈s: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmo:      %s\n"
 
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Longitud de clave: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:377
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Versi坦n: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -12720,8 +9067,6 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -12730,44 +9075,28 @@
 "Huella babble de la clave p炭blica:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc/util.c:383
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Informaci坦n de clave p炭blica"
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr "Enviar"
 
-#: ../libpurple/protocols/silc/util.c:571
-#: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr "Video conferencia"
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr "Ordenador"
 
-#: ../libpurple/protocols/silc/util.c:593
-#: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:595
-#: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../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:292 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -12775,99 +9104,77 @@
 msgstr ""
 "%s envi坦 un mensaje a la pizarra del canal %s. 多Quiere abrir la pizarra?"
 
-#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "Pizarra"
 
-#: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
 msgstr "No se disponen de estad鱈sticas del servidor"
 
-#: ../libpurple/protocols/silc10/ops.c:1937
+#, 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:1940
+#, 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:1943
+#, 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:1946
+#, 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:1949
+#, 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:1952
+#, 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:1955
+#, 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:1957
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Fallo: Firma incorrecta"
 
-#: ../libpurple/protocols/silc10/ops.c:1959
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Fallo: Cookie inv叩lida"
 
-#: ../libpurple/protocols/silc10/ops.c:1970
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Fallo: Fall坦 la autenticaci坦n"
 
-#: ../libpurple/protocols/silc10/silc.c:185
 msgid "Cannot initialize SILC Client connection"
 msgstr "No se pudo inicializar al conexi坦n del cliente SILC"
 
-#: ../libpurple/protocols/silc10/silc.c:294
 msgid "John Noname"
 msgstr "Pepe sin nombre"
 
-#: ../libpurple/protocols/silc10/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "No se pudo cargar la clave p炭blica SILC: %s"
 
-#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "No se pudo escribir"
 
-#: ../libpurple/protocols/simple/simple.c:443
-#: ../libpurple/protocols/simple/simple.c:1713
 msgid "Could not connect"
 msgstr "No se pudo conectar"
 
-#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
 msgstr "Respuesta desconocida del servidor."
 
-#: ../libpurple/protocols/simple/simple.c:1749
-#: ../libpurple/protocols/simple/simple.c:1795
-#: ../libpurple/protocols/simple/simple.c:1810
-#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Could not create listen socket"
 msgstr "No se pudo crear el socket de escucha"
 
-#: ../libpurple/protocols/simple/simple.c:1774
-msgid "Couldn't resolve host"
-msgstr "No se pudo resolver el nombre"
-
-#: ../libpurple/protocols/simple/simple.c:1875
-msgid "Could not resolve hostname"
-msgstr "No se pudo resolver el nombre de sistema"
-
-#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 "Los nombres de usuario SIP no pueden tener espacios en blanco ni el s鱈mbolo @"
@@ -12880,159 +9187,138 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2073
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Complemento de protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2074
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "El complemento de protocolo SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:2102
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Estatus p炭blico (nota: todos podr叩n verlo)"
 
-#: ../libpurple/protocols/simple/simple.c:2108
 msgid "Use UDP"
 msgstr "Utilizar UDP"
 
-#: ../libpurple/protocols/simple/simple.c:2110
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../libpurple/protocols/simple/simple.c:2112
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:2114
 msgid "Auth User"
 msgstr "Usuario de autenticaci坦n"
 
-#: ../libpurple/protocols/simple/simple.c:2116
 msgid "Auth Domain"
 msgstr "Dominio de autenticaci坦n"
 
-#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Buscando %s"
 
-#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Fall坦 la conexi坦n a %s"
 
-#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "No se pudo escribir el archivo %s."
 
-#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "No se pudo leer el archivo %s."
 
-#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Mensaje demasiado largo, los 炭ltimos %s bytes fueron borrados."
 
-#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s no est叩 conectado ahora."
 
-#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 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 "
 "del servidor."
 
-#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "No est叩 disponible el chat en %s."
 
-#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Esta enviando mensajes demasiado r叩pido a %s."
 
-#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Usted perdi坦 un MI de %s porque era demasiado largo."
 
-#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 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 "Email 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."
 
-#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Fallo desconocido: %s."
 
-#: ../libpurple/protocols/toc/toc.c:549
+#, c-format
 msgid "Incorrect username or password."
 msgstr "Nombre de usuario 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."
@@ -13041,81 +9327,63 @@
 "int辿ntelo de nuevo. Si sigue intent叩ndolo, necesitar叩 esperar incluso m叩s "
 "tiempo."
 
-#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Ha ocurrido un error desconocido al conectarse: %s."
 
-#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Un error desconocido, %d, ha ocurrido. Info: %s"
 
-#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Nombre de grupo inv叩lido"
 
-#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Conexi坦n cerrada"
 
-#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Esperando respuesta..."
 
-#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC ha terminado su pausa. Ya puede volver a mandar mensajes."
 
-#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "La contrase単a se ha cambiado con 辿xito"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6847
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Obtener informaci坦n del directorio"
 
-#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Guardar informaci坦n del directorio"
 
-#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "臓No se pudo abrir %s para escritura!"
 
-#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Se produjo un fallo en la transferencia del archivo; posiblemente fue "
 "cancelado por el otro extremo."
 
-#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "No se pudo conectar para realizar la transferencia."
 
-#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 "No se pudo escribir la cabecera de archivo.  El archivo no ser叩 transferido."
 
-#: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s solicita %s para aceptar %d archivo: %s (%.2f %s)%s%s"
 msgstr[1] "%s solicita %s para aceptar %d archivos: %s (%.2f %s)%s%s"
 
-#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s le solicita que le mande un archivo"
@@ -13130,31 +9398,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "Complemento de protocolo TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:745
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 "%s le ha enviado una invitaci坦n para utilizar la webcam, algo a炭n no "
 "soportado."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:803
 msgid "Your Yahoo! message did not get sent."
 msgstr "Su mensaje Yahoo! no se envi坦."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:916
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaje del sistema Yahoo! para %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:990
 msgid "Authorization denied message:"
 msgstr "Mensaje de autorizaci坦n denegada:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1008
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -13163,18 +9425,15 @@
 "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:1011
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "El usuario %s ha rechazado su solicitud de a単adirlo a su lista de amigos (de "
 "forma retroactiva)."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1013
 msgid "Add buddy rejected"
 msgstr "Se rechaz坦 la adici坦n del amigo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -13185,11 +9444,9 @@
 "desconocido. Posiblemente no sea capaz de conectarse a Yahoo. Compruebe %s "
 "para ver si existe una actualizaci坦n."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2000
 msgid "Failed Yahoo! Authentication"
 msgstr "Fall坦 la autenticaci坦n en Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2078
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -13198,53 +9455,38 @@
 "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:2081
 msgid "Ignore buddy?"
 msgstr "多Ignorar amigo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2152
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "Su cuenta est叩 bloqueada. Por favor, con辿ctese al servidor de web de Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2155
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Error desconocido n炭mero %d. Si se conecta al servidor de web de Yahoo! es "
 "posible que 辿sto se arregle."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2208
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No se pudo a単adir al amigo %s al grupo %s de la lista en el servidor para la "
 "cuenta %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2211
 msgid "Could not add buddy to server list"
 msgstr "No se pudo a単adir el amigo a la lista del servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2333
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2689
 msgid "Received unexpected HTTP response from server."
 msgstr "Se recibi坦 una respuesta HTTP del servidor que no se esperaba."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2718
-#: ../libpurple/protocols/yahoo/yahoo.c:2906
-#: ../libpurple/protocols/yahoo/yahoo.c:3011
-#: ../libpurple/protocols/yahoo/yahoo.c:3022
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-#: ../libpurple/protocols/yahoo/yahoochat.c:1595
-#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Error de conexi坦n"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2744
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -13253,7 +9495,6 @@
 "Se perdi坦 la conexi坦n con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2769
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -13262,103 +9503,72 @@
 "No se pudo establecer una conexi坦n con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3138
-#: ../libpurple/protocols/yahoo/yahoo.c:3833
 msgid "Not at Home"
 msgstr "Fuera de casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3140
-#: ../libpurple/protocols/yahoo/yahoo.c:3836
 msgid "Not at Desk"
 msgstr "Lejos del escritorio"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3142
-#: ../libpurple/protocols/yahoo/yahoo.c:3839
 msgid "Not in Office"
 msgstr "Fuera de la oficina"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3146
-#: ../libpurple/protocols/yahoo/yahoo.c:3845
 msgid "On Vacation"
 msgstr "De vacaciones"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3150
-#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "Stepped Out"
 msgstr "Ha abandonado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3243
-#: ../libpurple/protocols/yahoo/yahoo.c:3273
 msgid "Not on server list"
 msgstr "No est叩 en la lista del servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3290
-#: ../libpurple/protocols/yahoo/yahoo.c:3348
 msgid "Appear Online"
 msgstr "Parecer conectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3293
-#: ../libpurple/protocols/yahoo/yahoo.c:3369
 msgid "Appear Permanently Offline"
 msgstr "Parecer siempre desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3311
 msgid "Presence"
 msgstr "Presencia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3363
 msgid "Don't Appear Permanently Offline"
 msgstr "No parecer siempre desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3411
 msgid "Join in Chat"
 msgstr "Unirse a un chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3417
 msgid "Initiate Conference"
 msgstr "Iniciar conferencia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3445
 msgid "Presence Settings"
 msgstr "Usar configuraci坦n del entorno"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3451
 msgid "Start Doodling"
 msgstr "Comenzar una sesi坦n de Doodle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3561
 msgid "Activate which ID?"
 msgstr "多Qu辿 ID quiere activar?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3572
 msgid "Join whom in chat?"
 msgstr "多Con qui辿n quiere juntarse en un chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3584
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3588
 msgid "Join User in Chat..."
 msgstr "Juntarse con un usuario en un chat..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3593
 msgid "Open Inbox"
 msgstr "Abrir bandeja de entrada"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4182
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;sala&gt;:  Unirse a una sala en la red de Yahoo."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4187
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Mostrar los canales de la red Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4195
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Solicitar al usuario el comienzo de una sesi坦n Doodle"
 
@@ -13372,92 +9582,64 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Yahoo Japan"
 msgstr "Yahoo Jap坦n"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Pager server"
 msgstr "Servidor buscapersonas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4435
 msgid "Japan Pager server"
 msgstr "Servidor de buscapersonas japon辿s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4438
 msgid "Pager port"
 msgstr "Puerto del buscapersonas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4441
 msgid "File transfer server"
 msgstr "Servidor de transferencia de archivos"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4444
 msgid "Japan file transfer server"
 msgstr "Servidor de transferencia de archivos japon辿s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4447
 msgid "File transfer port"
 msgstr "Puerto de transferencia de archivos"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4450
 msgid "Chat room locale"
 msgstr "Localizaci坦n de la sala de chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4453
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar las invitaciones a salas de conferencias o chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4461
 msgid "Chat room list URL"
 msgstr "Url de lista de salas de chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4464
 msgid "Yahoo Chat server"
 msgstr "Servidor de chat de Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4467
 msgid "Yahoo Chat port"
 msgstr "Puerto de chat de Yahoo"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "Enviar petici坦n Doodle."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:319
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1111
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1515
 msgid "Unable to establish file descriptor."
 msgstr "No se pudo establecer el descriptor de archivo."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1410
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s se ofrece a enviarle un conjunto de %d archivos.\n"
 
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
-msgid "Write Error"
-msgstr "Error de escritura"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil de Yahoo! Jap坦n"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Perfil Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -13465,61 +9647,46 @@
 "Lo siento, los perfiles con contenido s坦lo para adultos no est叩n soportados "
 "a炭n."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
 "Si desea ver este perfil, deber叩 visitar este enlace con su navegador web:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1040
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1116
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1120
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1124
 msgid "Hobbies"
 msgstr "Aficiones"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1134
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Latest News"
 msgstr "�ltimas noticias"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1159
 msgid "Home Page"
 msgstr "P叩gina personal"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1174
 msgid "Cool Link 1"
 msgstr "Enlace interesante 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1179
 msgid "Cool Link 2"
 msgstr "Enlace interesante 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1183
 msgid "Cool Link 3"
 msgstr "Enlace interesante 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
 msgid "Last Update"
 msgstr "�ltima actualizaci坦n"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1206
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Informaci坦n de usuario de %s no disponible"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1212
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
 "Lo siento, este perfil parece estar en un idioma o formato a炭n no soportado."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1228
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -13527,7 +9694,6 @@
 "No se pudo obtener el perfil del usuario. Esto es habitualmente un problema "
 "temporal en el lado del servidor. Por favor, pruebe de nuevo m叩s tarde."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -13538,39 +9704,31 @@
 "de usuario. Si est叩 seguro de que el usuario existe int辿ntelo de nuevo m叩s "
 "tarde."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1238
 msgid "The user's profile is empty."
 msgstr "El perfil del usuario est叩 vac鱈o."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:222
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s ha declinado su invitaci坦n de conferencia en la sala 束%s損 por 束%s損."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:224
 msgid "Invitation Rejected"
 msgstr "Invitaci坦n rechazada"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:443
 msgid "Failed to join chat"
 msgstr "No se pudo unir al chat"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:446
 msgid "Unknown room"
 msgstr "Sala desconocida"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:449
 msgid "Maybe the room is full"
 msgstr "Quiz叩s la sala est叩 llena"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
 msgid "Not available"
 msgstr "No disponible"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:456
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -13579,46 +9737,34 @@
 "antes de poder volver a unirse a la sala del chat."
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../libpurple/protocols/yahoo/yahoochat.c:539
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Ahora est叩 chateando en %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:728
 msgid "Failed to join buddy in chat"
 msgstr "No se pudo unir al amigo al chat"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:729
 msgid "Maybe they're not in a chat?"
 msgstr "多Quiz叩s no est叩n en un chat?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1425
-#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Fetching the room list failed."
 msgstr "No se pudo obtener la lista de salas."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1511
 msgid "Voices"
 msgstr "Voces"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
 msgid "Webcams"
 msgstr "C叩maras web"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 msgid "Unable to fetch room list."
 msgstr "No se pudo obtener la lista de salas."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1588
 msgid "User Rooms"
 msgstr "Salas de usuarios"
 
-#: ../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:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13627,7 +9773,6 @@
 "Se ha perdido la conexi坦n con el servidor\n"
 "%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:358
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -13635,77 +9780,58 @@
 "(Hubo un error convirtiendo este mensaje.\\t Verifique la opci坦n "
 "束Codificaci坦n損 en el Editor de cuentas)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "No se pudo enviar al chat %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:795
-#: ../libpurple/protocols/zephyr/zephyr.c:1170
 msgid "Hidden or not logged-in"
 msgstr "Oculto o no conectado"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:801
-#: ../libpurple/protocols/zephyr/zephyr.c:1172
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>En %s desde %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1510
-#: ../libpurple/protocols/zephyr/zephyr.c:1511
 msgid "Anyone"
 msgstr "Cualquiera"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2369
 msgid "_Class:"
 msgstr "_Clase:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2375
 msgid "_Instance:"
 msgstr "_Instancia:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2381
 msgid "_Recipient:"
 msgstr "_Destinatario:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2392
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Fall坦 el intento de suscripci坦n a %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;apodo&gt;: Localiza un usuario"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;apodo&gt;: Localiza un usuario"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2725
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2731
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;clase&gt; &lt;instancia&gt; &lt;receptor&gt;: Unirse a un nuevo chat"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2736
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instancia&gt;: Enviar un mensaje a &lt;mensaje,<i>instancia</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2742
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -13713,7 +9839,6 @@
 "zci &lt;clase&gt; &lt;instancia&gt;: Enviar un mensaje a &lt;<i>clase</i>,"
 "<i>instancia</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2748
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -13721,7 +9846,6 @@
 "zcir &lt;clase&gt; &lt;instancia&gt; &lt;receptor&gt;: Enviar un mensaje a "
 "&lt;<i>clase</i>,<i>instancia</i>,<i>receptor</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2754
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -13729,15 +9853,12 @@
 "zir &lt;instancia&gt; &lt;receptor&gt;: Enviar un mensaje a &lt;MENSAJE,"
 "<i>instancia</i>,<i>receptor</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2759
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;clase&gt;: Enviar un mensaje a &lt;<i>clase</i>,PERSONAL,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2835
 msgid "Resubscribe"
 msgstr "Re-suscribir"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2838
 msgid "Retrieve subscriptions from server"
 msgstr "Obtener las suscripciones del servidor"
 
@@ -13751,45 +9872,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2931
-#: ../libpurple/protocols/zephyr/zephyr.c:2933
 msgid "Zephyr Protocol Plugin"
 msgstr "Complemento de protocolo Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "Use tzc"
 msgstr "Use tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "tzc command"
 msgstr "orden tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .anyone"
 msgstr "Exportar a .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Export to .zephyr.subs"
 msgstr "Exportar a .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .anyone"
 msgstr "Importar de .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Import from .zephyr.subs"
 msgstr "Importar de .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "Realm"
 msgstr "Dominio"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Exposure"
 msgstr "Exposici坦n"
 
-#: ../libpurple/proxy.c:486 ../libpurple/proxy.c:933 ../libpurple/proxy.c:1092
-#: ../libpurple/proxy.c:1695
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13798,77 +9907,62 @@
 "No se pudo crear el socket:\n"
 "%s"
 
-#: ../libpurple/proxy.c:687
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "No se pudo interpretar la respuesta del proxy HTTP: %s\n"
 
-#: ../libpurple/proxy.c:727 ../libpurple/proxy.c:776 ../libpurple/proxy.c:814
-#: ../libpurple/proxy.c:826
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Error de conexi坦n en el proxy HTTP %d"
 
-#: ../libpurple/proxy.c:822
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 "Acceso denegado: el servidor proxy HTTP no permite t炭neles en el puerto %d."
 
-#: ../libpurple/proxy.c:1053
 #, c-format
 msgid "Error resolving %s"
 msgstr "Error al resolver %s"
 
-#: ../libpurple/proxy.c:1793
 msgid "Could not resolve host name"
 msgstr "No se pudo resolver el nombre de equipo"
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Solicitando la atenci坦n de %s..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "臓%s ha solicitado su atenci坦n!"
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1391 ../pidgin/gtkblist.c:552
 msgid "_Yes"
 msgstr "_S鱈"
 
-#: ../libpurple/request.h:1391 ../pidgin/gtkblist.c:552
 msgid "_No"
 msgstr "_No"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1411
 msgid "_Accept"
 msgstr "_Aceptar"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "No estoy aqu鱈 ahora"
 
-#: ../libpurple/savedstatuses.c:537
 msgid "saved statuses"
 msgstr "Estad鱈sticas guardadas"
 
-#: ../libpurple/server.c:265
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ahora se llama %s.\n"
 
-#: ../libpurple/server.c:356
-#, c-format
-msgid "Requesting %s's attention..."
-msgstr "Solicitando la atenci坦n de %s..."
-
-#: ../libpurple/server.c:401
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "臓%s ha solicitado su atenci坦n!"
-
-#: ../libpurple/server.c:898
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13877,99 +9971,97 @@
 "%s ha invitado a %s a la sala de chat %s:\n"
 "%s"
 
-#: ../libpurple/server.c:903
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s ha invitado a %s a la sala de chat %s\n"
 
-#: ../libpurple/server.c:907
 msgid "Accept chat invitation?"
 msgstr "多Aceptar la invitaci坦n de chat?"
 
-#: ../libpurple/sslconn.c:164
+#. Shortcut
+msgid "Shortcut"
+msgstr "Atajo de teclado"
+
+msgid "The text-shortcut for the smiley"
+msgstr "El atajo de teclado para el emoticono"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "Imagen almacenada"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "Imagen almacenada (esto tendr叩 que ser suficiente por ahora)"
+
 msgid "SSL Connection Failed"
 msgstr "Fall坦 la conexi坦n SSL"
 
-#: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
 msgstr "Se produjo un fallo en la negociaci坦n SSL"
 
-#: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
 msgstr "El servidor SSL present坦 un certificado inv叩lido"
 
-#: ../libpurple/sslconn.c:171
 msgid "Unknown SSL error"
 msgstr "Error SSL desconocido"
 
-#: ../libpurple/status.c:154
 msgid "Unset"
 msgstr "Desactivado"
 
-#: ../libpurple/status.c:157 ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1088
 msgid "Do not disturb"
 msgstr "No molestar"
 
-#: ../libpurple/status.c:160
 msgid "Extended away"
 msgstr "Ausencia extendida"
 
 # El latinoam辿rica se prefiere 'Celular', creo, jfs
-#: ../libpurple/status.c:161
 msgid "Mobile"
 msgstr "M坦vil"
 
-#: ../libpurple/status.c:162
 msgid "Listening to music"
 msgstr "Escuchando m炭sica"
 
-#: ../libpurple/status.c:611
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "el estado de %s (%s) cambi坦 de %s a %s"
 
-#: ../libpurple/status.c:622
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) es ahora %s"
 
-#: ../libpurple/status.c:628
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) ya no est叩 %s"
 
-#: ../libpurple/status.c:1243
 #, c-format
 msgid "%s became idle"
 msgstr "%s ahora est叩 inactivo"
 
-#: ../libpurple/status.c:1263
 #, c-format
 msgid "%s became unidle"
 msgstr "%s ahora est叩 activo"
 
-#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s ahora est叩 inactivo"
 
-#: ../libpurple/status.c:1331
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s ahora est叩 activo"
 
-#: ../libpurple/util.c:721
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2804
 #, c-format
 msgid "Error Reading %s"
 msgstr "Error al leer %s"
 
-#: ../libpurple/util.c:2805
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13978,67 +10070,56 @@
 "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:3304
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libpurple/util.c:3307
 msgid "Unknown."
 msgstr "Desconocido."
 
-#: ../libpurple/util.c:3333
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../libpurple/util.c:3345
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d d鱈a"
 msgstr[1] "%d d鱈as"
 
-#: ../libpurple/util.c:3353
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../libpurple/util.c:3359
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../libpurple/util.c:3367
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../libpurple/util.c:3373
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../libpurple/util.c:3633
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "No se pudo abrir %s: se produjeron demasiadas redirecciones"
 
-#: ../libpurple/util.c:3670 ../libpurple/util.c:3966
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "No se pudo conectar a %s"
 
-#: ../libpurple/util.c:3793
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -14047,137 +10128,116 @@
 "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:3828
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Error al leer de %s: %s"
 
-#: ../libpurple/util.c:3859
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Error al escribir a %s: %s"
 
-#: ../libpurple/util.c:3884
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "No se pudo conectar a %s: %s"
 
-#: ../libpurple/util.c:4696
 #, c-format
 msgid " - %s"
 msgstr " - %s"
 
-#: ../libpurple/util.c:4702
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#: ../libpurple/win32/libc_interface.c:322
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Otro programa en su ordenador ha interrumpido la conexi坦n."
 
 #. 10054
-#: ../libpurple/win32/libc_interface.c:325
+#, c-format
 msgid "Remote host closed connection."
 msgstr "El servidor remoto ha cerrado la conexi坦n."
 
 #. 10060
-#: ../libpurple/win32/libc_interface.c:328
+#, c-format
 msgid "Connection timed out."
 msgstr "Expir坦 la conexi坦n."
 
 #. 10061
-#: ../libpurple/win32/libc_interface.c:331
+#, c-format
 msgid "Connection refused."
 msgstr "Conexi坦n rechazada."
 
-#: ../pidgin.desktop.in.h:1
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr "La direcci坦n ya se est叩 utilizando."
+
 msgid "Internet Messenger"
 msgstr "Cliente de mensajer鱈a de Internet"
 
-#: ../pidgin.desktop.in.h:2
 msgid "Pidgin Internet Messenger"
 msgstr "Cliente de mensajer鱈a de Internet Pidgin"
 
-#: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr "Cliente de mensajer鱈a instant叩nea multiprotocolo"
 
-#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Orientaci坦n"
 
-#: ../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:379
 msgid "Login Options"
 msgstr "Opciones de conexi坦n"
 
-#: ../pidgin/gtkaccount.c:400
 msgid "Pro_tocol:"
 msgstr "Pro_tocolo:"
 
-#: ../pidgin/gtkaccount.c:411 ../pidgin/gtkaccount.c:1039
 msgid "_Username:"
 msgstr "Nombre de _usuario:"
 
-#: ../pidgin/gtkaccount.c:501
 msgid "Remember pass_word"
 msgstr "Recordar _contrase単a"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:555
 msgid "User Options"
 msgstr "Opciones de usuario"
 
-#: ../pidgin/gtkaccount.c:568
 msgid "_Local alias:"
 msgstr "Apodo _local:"
 
-#: ../pidgin/gtkaccount.c:572
 msgid "New _mail notifications"
 msgstr "Notificaciones de _correo nuevo"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:577
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizar este _icono de amigo para esta cuenta:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:705
 #, c-format
 msgid "%s Options"
 msgstr "Opciones de %s"
 
-#: ../pidgin/gtkaccount.c:910
 msgid "Use GNOME Proxy Settings"
 msgstr "Usar configuraci坦n del proxy de GNOME"
 
-#: ../pidgin/gtkaccount.c:911
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuraci坦n global del proxy"
 
-#: ../pidgin/gtkaccount.c:917
 msgid "No Proxy"
 msgstr "Sin proxy"
 
-#: ../pidgin/gtkaccount.c:923
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:929
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:935
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:941 ../pidgin/gtkprefs.c:1340
 msgid "Use Environmental Settings"
 msgstr "Usar configuraci坦n del entorno"
 
@@ -14186,69 +10246,52 @@
 #. 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:980
 msgid "If you look real closely"
 msgstr "Si miras de cerca"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:983
 msgid "you can see the butterflies mating"
 msgstr "puedes ver a las mariposas apare叩ndose"
 
-#: ../pidgin/gtkaccount.c:1004
 msgid "Proxy Options"
 msgstr "Opciones del proxy"
 
-#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1334
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../pidgin/gtkaccount.c:1027 ../pidgin/gtkprefs.c:1355
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: ../pidgin/gtkaccount.c:1031 ../pidgin/gtkprefs.c:1373
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../pidgin/gtkaccount.c:1046 ../pidgin/gtkprefs.c:1410
 msgid "Pa_ssword:"
 msgstr "_Contrase単a:"
 
-#: ../pidgin/gtkaccount.c:1171
 msgid "Unable to save new account"
 msgstr "No se pudo guardar la nueva cuenta"
 
-#: ../pidgin/gtkaccount.c:1172
 msgid "An account already exists with the specified criteria."
 msgstr "Ya existe una cuenta con los criterios especificados."
 
-#: ../pidgin/gtkaccount.c:1449
 msgid "Add Account"
 msgstr "A単adir cuenta"
 
-#: ../pidgin/gtkaccount.c:1466
 msgid "_Basic"
 msgstr "_B叩sica"
 
-#: ../pidgin/gtkaccount.c:1473
-msgid "Create this new account on the server"
-msgstr "Crear esta nueva cuenta en el servidor"
-
-#: ../pidgin/gtkaccount.c:1487
+msgid "Create _this new account on the server"
+msgstr "Crear es_ta nueva cuenta en el servidor"
+
 msgid "_Advanced"
 msgstr "_Avanzadas"
 
-#: ../pidgin/gtkaccount.c:1908 ../pidgin/gtkplugin.c:753
-#: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../pidgin/gtkaccount.c:1936
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../pidgin/gtkaccount.c:2139
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -14268,7 +10311,6 @@
 "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:549
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -14276,7 +10318,6 @@
 msgstr[0] "Tiene %d contacto llamado %s. 多Desear鱈a fusionarlo?"
 msgstr[1] "Tiene %d contactos llamados %s. 多Desear鱈a fusionarlos?"
 
-#: ../pidgin/gtkblist.c:550
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
@@ -14286,126 +10327,96 @@
 "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:683
 msgid "Please update the necessary fields."
 msgstr "Por favor, actualice los campos necesarios."
 
-#: ../pidgin/gtkblist.c:1038 ../pidgin/gtkblist.c:6794
 msgid "Room _List"
 msgstr "_Lista de salas"
 
-#: ../pidgin/gtkblist.c:1058
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduzca la informaci坦n apropiada del chat al que desear鱈a unirse.\n"
 
-#: ../pidgin/gtkblist.c:1070 ../pidgin/gtkblist.c:6829
-#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "_Cuenta:"
 
-#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkprivacy.c:549
-#: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../pidgin/gtkblist.c:1349
 msgid "Un_block"
 msgstr "Des_bloquear"
 
-#: ../pidgin/gtkblist.c:1392
 msgid "Move to"
 msgstr "Mover a"
 
-#: ../pidgin/gtkblist.c:1432
 msgid "Get _Info"
 msgstr "Obtener _informaci坦n"
 
-#: ../pidgin/gtkblist.c:1435 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1441
 msgid "_Send File..."
 msgstr "_Enviar archivo..."
 
-#: ../pidgin/gtkblist.c:1448
 msgid "Add Buddy _Pounce..."
 msgstr "A単adir _aviso de amigo..."
 
-#: ../pidgin/gtkblist.c:1453 ../pidgin/gtkblist.c:1457
-#: ../pidgin/gtkblist.c:1577 ../pidgin/gtkblist.c:1602
 msgid "View _Log"
 msgstr "Ver _registro"
 
-#: ../pidgin/gtkblist.c:1463 ../pidgin/gtkblist.c:1550
 msgid "Hide when offline"
 msgstr "Ocultar cuando se est辿 desconectado"
 
-#: ../pidgin/gtkblist.c:1463 ../pidgin/gtkblist.c:1550
 msgid "Show when offline"
 msgstr "Mostrar cuando se est辿 desconectado"
 
-#: ../pidgin/gtkblist.c:1477 ../pidgin/gtkblist.c:1486
-#: ../pidgin/gtkblist.c:1587 ../pidgin/gtkblist.c:1608
 msgid "_Alias..."
 msgstr "_Apodo..."
 
-#: ../pidgin/gtkblist.c:1480 ../pidgin/gtkblist.c:1488
-#: ../pidgin/gtkblist.c:1589 ../pidgin/gtkblist.c:1610
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: ../pidgin/gtkblist.c:1538
+msgid "Set Custom Icon"
+msgstr "Configurar icono personalizado"
+
+msgid "Remove Custom Icon"
+msgstr "Eliminar icono personalizado"
+
 msgid "Add _Buddy..."
 msgstr "A単adir _amigo..."
 
-#: ../pidgin/gtkblist.c:1541
 msgid "Add C_hat..."
 msgstr "A単adir c_hat..."
 
-#: ../pidgin/gtkblist.c:1544
 msgid "_Delete Group"
 msgstr "_Eliminar grupo"
 
-#: ../pidgin/gtkblist.c:1546
 msgid "_Rename"
 msgstr "_Renombrar"
 
 #. join button
-#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkroomlist.c:318
-#: ../pidgin/gtkroomlist.c:594 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../pidgin/gtkblist.c:1573
 msgid "Auto-Join"
 msgstr "Conectarse autom叩ticamente"
 
-#: ../pidgin/gtkblist.c:1575
 msgid "Persistent"
 msgstr "Persistente"
 
-#: ../pidgin/gtkblist.c:1585
 msgid "_Edit Settings..."
 msgstr "_Editar configuraci坦n..."
 
-#: ../pidgin/gtkblist.c:1615 ../pidgin/gtkblist.c:1638
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: ../pidgin/gtkblist.c:1643
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../pidgin/gtkblist.c:1894 ../pidgin/gtkblist.c:1906
-#: ../pidgin/gtkblist.c:5493 ../pidgin/gtkblist.c:5506
 msgid "/Tools/Mute Sounds"
 msgstr "/Herramientas/Sin sonido"
 
-#: ../pidgin/gtkblist.c:2366 ../pidgin/gtkconv.c:4926
-#: ../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."
@@ -14413,155 +10424,124 @@
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#: ../pidgin/gtkblist.c:2717
 msgid "Unknown node type"
 msgstr "Tipo de nodo desconocido"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3153
 msgid "/_Buddies"
 msgstr "/A_migos"
 
-#: ../pidgin/gtkblist.c:3154
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Mensaje _instant叩neo nuevo..."
 
-#: ../pidgin/gtkblist.c:3155
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Unirse a un _chat..."
 
-#: ../pidgin/gtkblist.c:3156
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Obtener _informaci坦n del usuario..."
 
-#: ../pidgin/gtkblist.c:3157
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _registro del usuario..."
 
-#: ../pidgin/gtkblist.c:3159
 msgid "/Buddies/Sh_ow"
 msgstr "/Amigos/M_ostrar"
 
-#: ../pidgin/gtkblist.c:3160
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Amigos/Mostrar/Amigos desc_onectados"
 
-#: ../pidgin/gtkblist.c:3161
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Amigos/Mostrar/Grupos _vac鱈os"
 
-#: ../pidgin/gtkblist.c:3162
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Amigos/Mostrar/_Detalles de amigo"
 
-#: ../pidgin/gtkblist.c:3163
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Amigos/Mostrar/_Tiempo de inactividad"
 
-#: ../pidgin/gtkblist.c:3164
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Amigos/Mostrar/Iconos de _protocolo"
 
-#: ../pidgin/gtkblist.c:3165
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/_Ordenar amigos"
 
-#: ../pidgin/gtkblist.c:3167
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_A単adir un amigo..."
 
-#: ../pidgin/gtkblist.c:3168
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/A単adir un _chat..."
 
-#: ../pidgin/gtkblist.c:3169
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/A単adir _grupo..."
 
-#: ../pidgin/gtkblist.c:3171
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Salir"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3174
 msgid "/_Accounts"
 msgstr "/_Cuentas"
 
-#: ../pidgin/gtkblist.c:3175 ../pidgin/gtkblist.c:7514
-msgid "/Accounts/Manage"
-msgstr "/Cuentas/Gestionar"
+msgid "/Accounts/Manage Accounts"
+msgstr "/Cuentas/Gestionar cuentas"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3178
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: ../pidgin/gtkblist.c:3179
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Herramientas/_Aviso de amigo"
 
-#: ../pidgin/gtkblist.c:3180
 msgid "/Tools/_Certificates"
 msgstr "/Herramientas/_Certificados"
 
-#: ../pidgin/gtkblist.c:3181
 msgid "/Tools/Plu_gins"
 msgstr "/Herramientas/Com_plementos"
 
-#: ../pidgin/gtkblist.c:3182
 msgid "/Tools/Pr_eferences"
-msgstr "/Herramientas/Pr_eferencias"
-
-#: ../pidgin/gtkblist.c:3183
+msgstr "/Herramientas/_Preferencias"
+
 msgid "/Tools/Pr_ivacy"
 msgstr "/Herramientas/Pri_vacidad"
 
-#: ../pidgin/gtkblist.c:3185
+msgid "/Tools/Smile_y"
+msgstr "/Herramientas/_Emoticonos"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Herramientas/_Transferencias de archivos"
 
-#: ../pidgin/gtkblist.c:3186
 msgid "/Tools/R_oom List"
 msgstr "/Herramientas/_Lista de salas"
 
-#: ../pidgin/gtkblist.c:3187
 msgid "/Tools/System _Log"
 msgstr "/Herramientas/_Registro del sistema"
 
-#: ../pidgin/gtkblist.c:3189
 msgid "/Tools/Mute _Sounds"
 msgstr "/Herramientas/_Sin sonido"
 
 #. Help
-#: ../pidgin/gtkblist.c:3191
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: ../pidgin/gtkblist.c:3192
 msgid "/Help/Online _Help"
 msgstr "/Ayuda/Ayuda en _l鱈nea"
 
-#: ../pidgin/gtkblist.c:3193
 msgid "/Help/_Debug Window"
 msgstr "/Ayuda/Ventana de _depuraci坦n"
 
-#: ../pidgin/gtkblist.c:3195 ../pidgin/gtkblist.c:3197
 msgid "/Help/_About"
 msgstr "/Ayuda/_Acerca de"
 
-#: ../pidgin/gtkblist.c:3228
 #, c-format
 msgid "<b>Account:</b> %s"
 msgstr "<b>Cuenta:</b> %s"
 
-#: ../pidgin/gtkblist.c:3247
 #, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
-msgstr "\n<b>Ocupantes:</b> %d"
-
-#: ../pidgin/gtkblist.c:3252
+msgstr ""
+"\n"
+"<b>Ocupantes:</b> %d"
+
 #, c-format
 msgid ""
 "\n"
@@ -14570,128 +10550,98 @@
 "\n"
 "<b>Tema:</b> %s"
 
-#: ../pidgin/gtkblist.c:3252
 msgid "(no topic set)"
 msgstr "(no hay tema establecido)"
 
-#: ../pidgin/gtkblist.c:3331
 msgid "Buddy Alias"
 msgstr "Apodo de amigo"
 
-#: ../pidgin/gtkblist.c:3360
 msgid "Logged In"
 msgstr "Conectado"
 
-#: ../pidgin/gtkblist.c:3406
 msgid "Last Seen"
 msgstr "Visto por 炭ltima vez"
 
-#: ../pidgin/gtkblist.c:3427
 msgid "Spooky"
 msgstr "Asustadizo"
 
-#: ../pidgin/gtkblist.c:3429
 msgid "Awesome"
 msgstr "Genial"
 
-#: ../pidgin/gtkblist.c:3431
 msgid "Rockin'"
 msgstr "Rock'n'roleando"
 
-#: ../pidgin/gtkblist.c:3462
 msgid "Total Buddies"
 msgstr "Amigos en total"
 
-#: ../pidgin/gtkblist.c:3824
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inactivo %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3826
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactivo %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3828
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactivo %dm"
 
-#: ../pidgin/gtkblist.c:3982
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nuevo mensaje instant叩neo..."
 
-#: ../pidgin/gtkblist.c:3983 ../pidgin/gtkblist.c:4016
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un chat..."
 
-#: ../pidgin/gtkblist.c:3984
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Obtener informaci坦n del usuario..."
 
-#: ../pidgin/gtkblist.c:3985
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/A単adir un amigo..."
 
-#: ../pidgin/gtkblist.c:3986 ../pidgin/gtkblist.c:4019
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/A単adir un chat..."
 
-#: ../pidgin/gtkblist.c:3987
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/A単adir un grupo..."
 
-#: ../pidgin/gtkblist.c:4022
 msgid "/Tools/Privacy"
 msgstr "/Herramientas/Privacidad"
 
-#: ../pidgin/gtkblist.c:4025
 msgid "/Tools/Room List"
 msgstr "/Herramientas/Lista de salas"
 
-#: ../pidgin/gtkblist.c:4157 ../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:4320
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:4323
 msgid "By status"
 msgstr "Por estado"
 
-#: ../pidgin/gtkblist.c:4324
 msgid "By log size"
 msgstr "Por tama単o de registro"
 
-#: ../pidgin/gtkblist.c:4662
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se ha desconectado"
 
-#: ../pidgin/gtkblist.c:4664
 #, c-format
 msgid "%s disabled"
 msgstr "%s deshabilitado"
 
-#: ../pidgin/gtkblist.c:4668
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../pidgin/gtkblist.c:4668 ../pidgin/gtkblist.c:4787
 msgid "Re-enable"
 msgstr "Reactivar"
 
-#: ../pidgin/gtkblist.c:4785
 msgid "Welcome back!"
 msgstr "臓Bienvenido!"
 
-#: ../pidgin/gtkblist.c:4821
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
@@ -14701,82 +10651,67 @@
 msgstr[1] ""
 "se deshabilitaron %d cuentas porque se ha conectado desde otra ubicaci坦n."
 
-#: ../pidgin/gtkblist.c:5100
 msgid "<b>Username:</b>"
 msgstr "<b>Nombre de usuario:</b>"
 
-#: ../pidgin/gtkblist.c:5107
 msgid "<b>Password:</b>"
 msgstr "<b>Contrase単a:</b>"
 
-#: ../pidgin/gtkblist.c:5118
 msgid "_Login"
 msgstr "_Entrada"
 
-#: ../pidgin/gtkblist.c:5202
 msgid "/Accounts"
 msgstr "/Cuentas"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:5216
 #, 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->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</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->Gestionar</b>. Podr叩 conectarse, "
-"fijar su estado y hablar con sus amigos una vez active sus cuentas."
+"ventana de <b>Cuentas</b> en <b>Cuentas->Gestionar cuentas</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:5487
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Amigos/Mostrar/Amigos desconectados"
 
-#: ../pidgin/gtkblist.c:5490
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Amigos/Mostrar/Grupos vac鱈os"
 
-#: ../pidgin/gtkblist.c:5496
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Amigos/Mostrar/Detalles de amigo"
 
-#: ../pidgin/gtkblist.c:5499
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Amigos/Mostrar/Tiempos de inactividad"
 
-#: ../pidgin/gtkblist.c:5502
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Amigos/Mostrar/Iconos de protocolo"
 
-#: ../pidgin/gtkblist.c:6455
 msgid "Add a buddy.\n"
 msgstr "A単adir un amigo.\n"
 
-#: ../pidgin/gtkblist.c:6470
 msgid "Buddy's _username:"
 msgstr "Nombre de _usuario del amigo:"
 
-#: ../pidgin/gtkblist.c:6492
 msgid "(Optional) A_lias:"
 msgstr "(Opcional) A_podo:"
 
-#: ../pidgin/gtkblist.c:6510
 msgid "Add buddy to _group:"
 msgstr "A単adir el amigo a un _grupo:"
 
-#: ../pidgin/gtkblist.c:6759
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo no est叩 soportado en las habitaciones de chats."
 
-#: ../pidgin/gtkblist.c:6775
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -14784,7 +10719,6 @@
 "No est叩 conectado con ninguna cuenta que tenga la capacidad de acceder a "
 "chats."
 
-#: ../pidgin/gtkblist.c:6819
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14792,79 +10726,61 @@
 "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:6842
 msgid "A_lias:"
 msgstr "_Apodo:"
 
-#: ../pidgin/gtkblist.c:6849
 msgid "Auto_join when account becomes online."
 msgstr "Reconec_tarse cuando la cuenta se pone en l鱈nea."
 
-#: ../pidgin/gtkblist.c:6850
 msgid "_Hide chat when the window is closed."
 msgstr "_Ocultar el chat cuando se cierra la ventana."
 
-#: ../pidgin/gtkblist.c:6876
 msgid "Please enter the name of the group to be added."
 msgstr "Introduzca el nombre del grupo a a単adir."
 
-#: ../pidgin/gtkblist.c:7534
+msgid "Enable Account"
+msgstr "Habilitar cuenta"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Cuentas/Activar cuenta"
+
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Cuentas/"
 
-#: ../pidgin/gtkblist.c:7558
 msgid "_Edit Account"
 msgstr "_Editar cuenta"
 
-#: ../pidgin/gtkblist.c:7571 ../pidgin/gtkconv.c:3220
 msgid "No actions available"
 msgstr "No hay acciones disponibles"
 
-#: ../pidgin/gtkblist.c:7579
 msgid "_Disable"
 msgstr "_Deshabilitar"
 
-#: ../pidgin/gtkblist.c:7591
-msgid "Enable Account"
-msgstr "Habilitar cuenta"
-
-#: ../pidgin/gtkblist.c:7597
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Cuentas/Activar cuenta"
-
-#: ../pidgin/gtkblist.c:7646
 msgid "/Tools"
 msgstr "/Herramientas"
 
-#: ../pidgin/gtkblist.c:7716
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:541
 msgid "SSL Servers"
 msgstr "Servidores SSL"
 
-#: ../pidgin/gtkconv.c:487
 msgid "Unknown command."
 msgstr "Orden desconocida."
 
-#: ../pidgin/gtkconv.c:771 ../pidgin/gtkconv.c:798
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Ese amigo no utiliza el mismo protocolo que este chat."
 
-#: ../pidgin/gtkconv.c:792
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "No est叩 conectado con ninguna cuenta con la que pueda invitar a ese amigo."
 
-#: ../pidgin/gtkconv.c:846
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitar a un amigo a la sala de chat"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:876
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14872,187 +10788,138 @@
 "Introduzca el nombre de usuario al que desea invitar, junto con un mensaje "
 "de invitaci坦n opcional."
 
-#: ../pidgin/gtkconv.c:897
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../pidgin/gtkconv.c:910 ../pidgin/gtksavedstatuses.c:1166
-#: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "_Mensaje:"
 
-#: ../pidgin/gtkconv.c:973
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversaciones con %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1011
 msgid "Save Conversation"
 msgstr "Guardar conversaci坦n"
 
-#: ../pidgin/gtkconv.c:1157 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "Buscar"
 
-#: ../pidgin/gtkconv.c:1183 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "T辿rmino a _buscar:"
 
-#: ../pidgin/gtkconv.c:1684
 msgid "Un-Ignore"
 msgstr "No ignorar"
 
-#: ../pidgin/gtkconv.c:1687
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../pidgin/gtkconv.c:1707
 msgid "Get Away Message"
 msgstr "Mensaje de ausencia"
 
-#: ../pidgin/gtkconv.c:1730
 msgid "Last said"
 msgstr "Dicho la 炭ltima vez"
 
-#: ../pidgin/gtkconv.c:2715
 msgid "Unable to save icon file to disk."
 msgstr "No se pudo salvar el archivo de iconos al disco."
 
-#: ../pidgin/gtkconv.c:2793
 msgid "Save Icon"
 msgstr "Guardar icono"
 
-#: ../pidgin/gtkconv.c:2851
 msgid "Animate"
 msgstr "Animar"
 
-#: ../pidgin/gtkconv.c:2856
 msgid "Hide Icon"
 msgstr "Ocultar icono"
 
-#: ../pidgin/gtkconv.c:2859
 msgid "Save Icon As..."
 msgstr "Guardar icono como..."
 
-#: ../pidgin/gtkconv.c:2863
 msgid "Set Custom Icon..."
 msgstr "Configurar icono personalizado..."
 
-#: ../pidgin/gtkconv.c:2867
 msgid "Change Size"
 msgstr "Cambiar tama単o"
 
-#: ../pidgin/gtkconv.c:2880
-msgid "Remove Custom Icon"
-msgstr "Eliminar icono personalizado"
-
-#: ../pidgin/gtkconv.c:3005
 msgid "Show All"
 msgstr "Mostrar todo"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:3024
 msgid "/_Conversation"
 msgstr "/_Conversaci坦n"
 
-#: ../pidgin/gtkconv.c:3026
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversaci坦n/Mensaje _instant叩neo nuevo..."
 
-#: ../pidgin/gtkconv.c:3031
 msgid "/Conversation/_Find..."
 msgstr "/Conversaci坦n/_Buscar..."
 
-#: ../pidgin/gtkconv.c:3033
 msgid "/Conversation/View _Log"
 msgstr "/Conversaci坦n/Ver _historial"
 
-#: ../pidgin/gtkconv.c:3034
 msgid "/Conversation/_Save As..."
 msgstr "/Conversaci坦n/_Guardar como..."
 
-#: ../pidgin/gtkconv.c:3036
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversaci坦n/Limpia_r deslizable"
 
-#: ../pidgin/gtkconv.c:3040
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversaci坦n/_Enviar archivo..."
 
-#: ../pidgin/gtkconv.c:3041
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversaci坦n/A単adir _aviso de amigo..."
 
-#: ../pidgin/gtkconv.c:3043
 msgid "/Conversation/_Get Info"
 msgstr "/Conversaci坦n/_Obtener informaci坦n"
 
-#: ../pidgin/gtkconv.c:3045
 msgid "/Conversation/In_vite..."
 msgstr "/Conversaci坦n/In_vitar..."
 
-#: ../pidgin/gtkconv.c:3047
 msgid "/Conversation/M_ore"
 msgstr "/Conversaci坦n/_M叩s"
 
-#: ../pidgin/gtkconv.c:3051
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversaci坦n/A_podo..."
 
-#: ../pidgin/gtkconv.c:3053
 msgid "/Conversation/_Block..."
 msgstr "/Conversaci坦n/_Bloquear..."
 
-#: ../pidgin/gtkconv.c:3055
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversaci坦n/_Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3057
 msgid "/Conversation/_Add..."
 msgstr "/Conversaci坦n/_A単adir..."
 
-#: ../pidgin/gtkconv.c:3059
 msgid "/Conversation/_Remove..."
 msgstr "/Conversaci坦n/Elimina_r..."
 
-#: ../pidgin/gtkconv.c:3064
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversaci坦n/Insertar en_lace..."
 
-#: ../pidgin/gtkconv.c:3066
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversaci坦n/Insertar imag_en..."
 
-#: ../pidgin/gtkconv.c:3072
 msgid "/Conversation/_Close"
 msgstr "/Conversaci坦n/_Cerrar"
 
 #. Options
-#: ../pidgin/gtkconv.c:3076
 msgid "/_Options"
 msgstr "/_Opciones"
 
-#: ../pidgin/gtkconv.c:3077
 msgid "/Options/Enable _Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: ../pidgin/gtkconv.c:3078
 msgid "/Options/Enable _Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: ../pidgin/gtkconv.c:3080
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opciones/Mostrar _barras de formato"
 
-#: ../pidgin/gtkconv.c:3081
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opciones/Mostrar _marcas de tiempo"
 
-#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/More"
 msgstr "/Conversaci坦n/M叩s"
 
-#: ../pidgin/gtkconv.c:3264
 msgid "/Options"
 msgstr "/Opciones"
 
@@ -15061,79 +10928,60 @@
 #. 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:3299 ../pidgin/gtkconv.c:3331
 msgid "/Conversation"
 msgstr "/Conversaci坦n"
 
-#: ../pidgin/gtkconv.c:3339
 msgid "/Conversation/View Log"
 msgstr "/Conversaci坦n/Ver registro"
 
-#: ../pidgin/gtkconv.c:3345
 msgid "/Conversation/Send File..."
 msgstr "/Conversaci坦n/Enviar archivo..."
 
-#: ../pidgin/gtkconv.c:3349
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversaci坦n/A単adir aviso de amigo..."
 
-#: ../pidgin/gtkconv.c:3355
 msgid "/Conversation/Get Info"
 msgstr "/Conversaci坦n/Obtener informaci坦n"
 
-#: ../pidgin/gtkconv.c:3359
 msgid "/Conversation/Invite..."
 msgstr "/Conversaci坦n/Invitar..."
 
-#: ../pidgin/gtkconv.c:3365
 msgid "/Conversation/Alias..."
 msgstr "/Conversaci坦n/Apodo..."
 
-#: ../pidgin/gtkconv.c:3369
 msgid "/Conversation/Block..."
 msgstr "/Conversaci坦n/Bloquear..."
 
-#: ../pidgin/gtkconv.c:3373
 msgid "/Conversation/Unblock..."
 msgstr "/Conversaci坦n/Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3377
 msgid "/Conversation/Add..."
 msgstr "/Conversaci坦n/A単adir..."
 
-#: ../pidgin/gtkconv.c:3381
 msgid "/Conversation/Remove..."
 msgstr "/Conversaci坦n/Eliminar..."
 
-#: ../pidgin/gtkconv.c:3387
 msgid "/Conversation/Insert Link..."
 msgstr "/Opciones/Insertar enlace..."
 
-#: ../pidgin/gtkconv.c:3391
 msgid "/Conversation/Insert Image..."
 msgstr "/Opciones/Insertar imagen..."
 
-#: ../pidgin/gtkconv.c:3397
 msgid "/Options/Enable Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: ../pidgin/gtkconv.c:3400
 msgid "/Options/Enable Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: ../pidgin/gtkconv.c:3413
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opciones/Mostrar barras de formato"
 
-#: ../pidgin/gtkconv.c:3416
 msgid "/Options/Show Timestamps"
 msgstr "/Opciones/Mostrar marcas de tiempo"
 
-#: ../pidgin/gtkconv.c:3494
 msgid "User is typing..."
 msgstr "El usuario est叩 escribiendo..."
 
-#: ../pidgin/gtkconv.c:3568
 #, c-format
 msgid ""
 "\n"
@@ -15143,527 +10991,378 @@
 "%s ha dejado de escribir"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3748 ../pidgin/gtkconv.c:8472
 msgid "S_end To"
 msgstr "_Enviar a"
 
-#: ../pidgin/gtkconv.c:4431 ../pidgin/plugins/sendbutton.c:44
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4590
 msgid "0 people in room"
 msgstr "0 personas en la conversaci坦n"
 
-#: ../pidgin/gtkconv.c:5932 ../pidgin/gtkconv.c:6053
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona en la conversaci坦n"
 msgstr[1] "%d personas en la conversaci坦n"
 
-#: ../pidgin/gtkconv.c:6687 ../pidgin/gtkstatusbox.c:684
 msgid "Typing"
 msgstr "Tecleando"
 
-#: ../pidgin/gtkconv.c:6691
 msgid "Stopped Typing"
 msgstr "Deja de escribi_r"
 
-#: ../pidgin/gtkconv.c:6694
 msgid "Nick Said"
 msgstr "Apodo dijo"
 
-#: ../pidgin/gtkconv.c:6697 ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "Mensajes sin leer"
 
-#: ../pidgin/gtkconv.c:6703
 msgid "New Event"
 msgstr "Nuevo acontecimiento"
 
-#: ../pidgin/gtkconv.c:7944
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: limpia todos los hist坦ricos de las ventanas de conversaci坦n."
 
-#: ../pidgin/gtkconv.c:8148
 msgid "Confirm close"
 msgstr "Confirmar cierre"
 
-#: ../pidgin/gtkconv.c:8180
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Tiene mensajes sin leer. 多Est叩 seguro que quiere cerrar la ventana?"
 
-#: ../pidgin/gtkconv.c:8813
 msgid "Close other tabs"
 msgstr "Cerrar otras solapas"
 
-#: ../pidgin/gtkconv.c:8819
 msgid "Close all tabs"
 msgstr "Cerrar todas las solapas"
 
-#: ../pidgin/gtkconv.c:8827
 msgid "Detach this tab"
 msgstr "Despegar esta solapa"
 
-#: ../pidgin/gtkconv.c:8833
 msgid "Close this tab"
 msgstr "Cerrar esta solapa"
 
-#: ../pidgin/gtkconv.c:9355
 msgid "Close conversation"
 msgstr "Cerrar conversaci坦n"
 
-#: ../pidgin/gtkconv.c:9959
 msgid "Last created window"
 msgstr "�ltima ventana creada"
 
-#: ../pidgin/gtkconv.c:9961
 msgid "Separate IM and Chat windows"
 msgstr "Separar ventanas de MIs y chats"
 
-#: ../pidgin/gtkconv.c:9963 ../pidgin/gtkprefs.c:1576
 msgid "New window"
 msgstr "Ventana nueva"
 
-#: ../pidgin/gtkconv.c:9965
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../pidgin/gtkconv.c:9967
 msgid "By account"
 msgstr "Por cuenta"
 
-#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Guardar registro de depuraci坦n"
 
-#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "Invertir"
 
-#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Resaltar coincidencias"
 
-#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "S坦lo _icono"
 
-#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "S坦lo _texto"
 
-#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "_Tanto iconos como texto"
 
-#: ../pidgin/gtkdebug.c:772
 msgid "Filter"
 msgstr "Filtro"
 
-#: ../pidgin/gtkdebug.c:791
 msgid "Right click for more options."
 msgstr "Pulsar el bot坦n derecho para m叩s opciones."
 
-#: ../pidgin/gtkdebug.c:821
 msgid "Level "
 msgstr "Nivel "
 
-#: ../pidgin/gtkdebug.c:822 ../pidgin/gtkdebug.c:828
 msgid "Select the debug filter level."
 msgstr "Seleccione el nivel del filtro de depuraci坦n."
 
-#: ../pidgin/gtkdebug.c:830
 msgid "All"
 msgstr "Todos"
 
-#: ../pidgin/gtkdebug.c:831
 msgid "Misc"
 msgstr "Miscel叩neo"
 
-#: ../pidgin/gtkdebug.c:833
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../pidgin/gtkdebug.c:834
 msgid "Error "
 msgstr "Error "
 
-#: ../pidgin/gtkdebug.c:835
 msgid "Fatal Error"
 msgstr "Error fatal"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:120
-msgid "lead developer"
-msgstr "desarrollador principal"
-
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../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:87 ../pidgin/gtkdialogs.c:90
-#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
-#: ../pidgin/gtkdialogs.c:94
 msgid "developer"
 msgstr "desarrollador"
 
-#: ../pidgin/gtkdialogs.c:88
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr "Ka-Hing Cheung"
+
 msgid "support"
 msgstr "soporte"
 
-#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "soporte/QA"
 
-#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:115
 msgid "developer & webmaster"
 msgstr "desarrollador y webmaster"
 
-#: ../pidgin/gtkdialogs.c:101
 msgid "Senior Contributor/QA"
 msgstr "Contribuyente senior/QA"
 
-#: ../pidgin/gtkdialogs.c:111
 msgid "win32 port"
 msgstr "adaptaci坦n a win32"
 
-#: ../pidgin/gtkdialogs.c:112 ../pidgin/gtkdialogs.c:113
 msgid "maintainer"
 msgstr "mantenedor"
 
-#: ../pidgin/gtkdialogs.c:114
 msgid "libfaim maintainer"
 msgstr "mantenedor de libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:117
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker y dise単ador de controladores [lazy bum]"
 
-#: ../pidgin/gtkdialogs.c:118
 msgid "XMPP developer"
 msgstr "desarrollador XMPP"
 
-#: ../pidgin/gtkdialogs.c:119
 msgid "original author"
 msgstr "autor original"
 
-#: ../pidgin/gtkdialogs.c:135
+msgid "lead developer"
+msgstr "desarrollador principal"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 # Amhario
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:231
 msgid "Arabic"
 msgstr "�rabe"
 
-#: ../pidgin/gtkdialogs.c:137
 msgid "Belarusian Latin"
 msgstr "Lat鱈n bieloruso"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:232
 msgid "Bulgarian"
 msgstr "B炭lgaro"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Bengali"
 msgstr "Bengal鱈"
 
-#: ../pidgin/gtkdialogs.c:144
 msgid "Bosnian"
 msgstr "Bosnio"
 
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
 msgid "Catalan"
 msgstr "Catal叩n"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:147
 msgid "Valencian-Catalan"
 msgstr "Valenciano-Catal叩n"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236
 msgid "Czech"
 msgstr "Checo"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
 msgid "Danish"
 msgstr "Dan辿s"
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:237
 msgid "German"
 msgstr "Alem叩n"
 
-#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:154
-#: ../pidgin/gtkdialogs.c:155
 msgid "Dzongkha"
 msgstr "Butan鱈"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
 msgid "Greek"
 msgstr "Griego"
 
-#: ../pidgin/gtkdialogs.c:158
 msgid "Australian English"
 msgstr "Ingl辿s australiano"
 
-#: ../pidgin/gtkdialogs.c:159
 msgid "Canadian English"
 msgstr "Ingl辿s canadiense"
 
-#: ../pidgin/gtkdialogs.c:160
 msgid "British English"
 msgstr "Ingl辿s brit叩nico"
 
-#: ../pidgin/gtkdialogs.c:161
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
 msgid "Spanish"
 msgstr "Espa単ol"
 
-#: ../pidgin/gtkdialogs.c:163
 msgid "Estonian"
 msgstr "Estonio"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
 msgid "Euskera(Basque)"
 msgstr "Eusquera(Vasco)"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:167
-#: ../pidgin/gtkdialogs.c:168
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243
 msgid "Finnish"
 msgstr "Finland辿s"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:244
-#: ../pidgin/gtkdialogs.c:245 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247
 msgid "French"
 msgstr "Franc辿s"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
-#: ../pidgin/gtkdialogs.c:248
 msgid "Galician"
 msgstr "Gallego"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:174
 msgid "Gujarati Language Team"
 msgstr "Grupo de traducci坦n al Gujarati"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:249
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../pidgin/gtkdialogs.c:176
 msgid "Hindi"
 msgstr "Hind炭"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:250
 msgid "Hungarian"
 msgstr "H炭ngaro"
 
-#: ../pidgin/gtkdialogs.c:178
 msgid "Indonesian"
 msgstr "Indonesio"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:251
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
 msgid "Japanese"
 msgstr "Japon辿s"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:255
 msgid "Georgian"
 msgstr "Georgiano"
 
-#: ../pidgin/gtkdialogs.c:181
 msgid "Ubuntu Georgian Translators"
 msgstr "Traductores al georgiano de Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:182
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:182
 msgid "Kannada Translation team"
 msgstr "Grupo de traducci坦n al kannada"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:256
-#: ../pidgin/gtkdialogs.c:257
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
-#: ../pidgin/gtkdialogs.c:186
 msgid "Kurdish"
 msgstr "Kurdo"
 
-#: ../pidgin/gtkdialogs.c:187
 msgid "Lao"
 msgstr "Laosiano"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:260
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
 msgid "Bokm奪l Norwegian"
 msgstr "Noruego Bokm奪l"
 
-#: ../pidgin/gtkdialogs.c:193
 msgid "Nepali"
 msgstr "Nepal辿s"
 
-#: ../pidgin/gtkdialogs.c:194
 msgid "Dutch, Flemish"
 msgstr "Dan辿s, Flamenco"
 
-#: ../pidgin/gtkdialogs.c:195
 msgid "Norwegian Nynorsk"
 msgstr "Noruego Nynorsk"
 
-#: ../pidgin/gtkdialogs.c:196
+msgid "Occitan"
+msgstr "Occitano"
+
 msgid "Punjabi"
 msgstr "Punjab鱈"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:263
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../pidgin/gtkdialogs.c:200
 msgid "Portuguese"
 msgstr "Portugu辿s"
 
-#: ../pidgin/gtkdialogs.c:201
 msgid "Portuguese-Brazil"
 msgstr "Portugu辿s brasile単o"
 
-#: ../pidgin/gtkdialogs.c:202
 msgid "Pashto"
 msgstr "Afgano"
 
-#: ../pidgin/gtkdialogs.c:203
 msgid "Romanian"
 msgstr "Rumano"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:264
-#: ../pidgin/gtkdialogs.c:265
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:266 ../pidgin/gtkdialogs.c:267
-#: ../pidgin/gtkdialogs.c:268
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:269
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../pidgin/gtkdialogs.c:208
 msgid "Albanian"
 msgstr "Alban辿s"
 
-#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:270 ../pidgin/gtkdialogs.c:271
 msgid "Serbian"
 msgstr "Serbio"
 
-#: ../pidgin/gtkdialogs.c:211
 msgid "Sinhala"
 msgstr "Sinhala"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:272
-#: ../pidgin/gtkdialogs.c:273
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../pidgin/gtkdialogs.c:213
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:214
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:215
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:274
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../pidgin/gtkdialogs.c:217
 msgid "Urdu"
 msgstr "Urdu"
 
-#: ../pidgin/gtkdialogs.c:218
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../pidgin/gtkdialogs.c:218
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh y el equipo Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:275
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: ../pidgin/gtkdialogs.c:220 ../pidgin/gtkdialogs.c:221
-#: ../pidgin/gtkdialogs.c:222
 msgid "Hong Kong Chinese"
 msgstr "Chino de Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:276
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
 # Amhario
-#: ../pidgin/gtkdialogs.c:230
 msgid "Amharic"
 msgstr "Amh叩rico"
 
-#: ../pidgin/gtkdialogs.c:361
 #, c-format
 msgid "About %s"
 msgstr "Acerca de %s"
 
-#: ../pidgin/gtkdialogs.c:397
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15687,57 +11386,43 @@
 "completa de personas que han contribuido. Este programa se distribuye sin "
 "ninguna garant鱈a.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:415
+#, c-format
 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:420
 msgid "Current Developers"
 msgstr "Desarrolladores actuales"
 
-#: ../pidgin/gtkdialogs.c:435
 msgid "Crazy Patch Writers"
 msgstr "Locos escritores de parches"
 
-#: ../pidgin/gtkdialogs.c:450
 msgid "Retired Developers"
 msgstr "Desarrolladores retirados"
 
-#: ../pidgin/gtkdialogs.c:465
 msgid "Retired Crazy Patch Writers"
 msgstr "Locos escritores de parches retirados"
 
-#: ../pidgin/gtkdialogs.c:480
 msgid "Artists"
 msgstr "Artistas"
 
-#: ../pidgin/gtkdialogs.c:495
 msgid "Current Translators"
 msgstr "Traductores actuales"
 
-#: ../pidgin/gtkdialogs.c:515
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-#: ../pidgin/gtkdialogs.c:533
 msgid "Debugging Information"
 msgstr "Informaci坦n de depuraci坦n"
 
-#: ../pidgin/gtkdialogs.c:749 ../pidgin/gtkdialogs.c:888
-#: ../pidgin/gtkdialogs.c:969
 msgid "_Name"
 msgstr "_Nombre"
 
-#: ../pidgin/gtkdialogs.c:754 ../pidgin/gtkdialogs.c:893
-#: ../pidgin/gtkdialogs.c:974
 msgid "_Account"
 msgstr "_Cuenta"
 
-#: ../pidgin/gtkdialogs.c:901
 msgid "Get User Info"
 msgstr "Obtener datos del usuario"
 
-#: ../pidgin/gtkdialogs.c:903
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
@@ -15745,36 +11430,28 @@
 "Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
 "ver informaci坦n."
 
-#: ../pidgin/gtkdialogs.c:993
 msgid "View User Log"
 msgstr "Ver registro de usuario"
 
-#: ../pidgin/gtkdialogs.c:1015
 msgid "Alias Contact"
 msgstr "Apodo para contacto"
 
-#: ../pidgin/gtkdialogs.c:1016
 msgid "Enter an alias for this contact."
 msgstr "Introduzca un apodo para este contacto."
 
-#: ../pidgin/gtkdialogs.c:1038
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduzca un alias para %s."
 
-#: ../pidgin/gtkdialogs.c:1040
 msgid "Alias Buddy"
 msgstr "Apodo de amigo"
 
-#: ../pidgin/gtkdialogs.c:1061
 msgid "Alias Chat"
 msgstr "Apodo en el chat"
 
-#: ../pidgin/gtkdialogs.c:1062
 msgid "Enter an alias for this chat."
 msgstr "Introduzca un apodo para este chat."
 
-#: ../pidgin/gtkdialogs.c:1101
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15789,15 +11466,12 @@
 "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:1109
 msgid "Remove Contact"
 msgstr "Eliminar contacto"
 
-#: ../pidgin/gtkdialogs.c:1112
 msgid "_Remove Contact"
 msgstr "_Eliminar contacto"
 
-#: ../pidgin/gtkdialogs.c:1143
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15806,15 +11480,12 @@
 "Est叩 a punto de fusionar el grupo llamado %s con el grupo llamado %s. 多Desea "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1150
 msgid "Merge Groups"
 msgstr "Fusionar grupos"
 
-#: ../pidgin/gtkdialogs.c:1153
 msgid "_Merge Groups"
 msgstr "_Fusionar grupos"
 
-#: ../pidgin/gtkdialogs.c:1203
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15823,29 +11494,23 @@
 "Est叩 a punto de borrar el grupo %s junto con todos sus miembros de la lista "
 "de amigos. 多Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1206
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../pidgin/gtkdialogs.c:1209
 msgid "_Remove Group"
 msgstr "_Eliminar grupo"
 
-#: ../pidgin/gtkdialogs.c:1242
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Est叩 a punto eliminar a %s de su lista de amigos. 多Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1245
 msgid "Remove Buddy"
 msgstr "Eliminar amigo"
 
-#: ../pidgin/gtkdialogs.c:1248
 msgid "_Remove Buddy"
 msgstr "_Eliminar amigo"
 
-#: ../pidgin/gtkdialogs.c:1269
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15853,224 +11518,189 @@
 msgstr ""
 "Est叩 a punto de eliminar el chat %s de su lista de amigos. 多Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1272
 msgid "Remove Chat"
 msgstr "Eliminar chat"
 
-#: ../pidgin/gtkdialogs.c:1275
 msgid "_Remove Chat"
 msgstr "_Eliminar chat"
 
-#: ../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:533
-msgid "Change Status"
-msgstr "Cambiar estado:"
-
-#: ../pidgin/gtkdocklet.c:681
-msgid "Show Buddy List"
-msgstr "Mostrar la lista de amigos"
-
-#: ../pidgin/gtkdocklet.c:707
-msgid "New Message..."
+msgid "_Change Status"
+msgstr "_Cambiar estado"
+
+msgid "Show Buddy _List"
+msgstr "Mostrar la _lista de amigos"
+
+msgid "_Unread Messages"
+msgstr "Mensajes _no le鱈dos"
+
+msgid "New _Message..."
 msgstr "Mensaje nuevo..."
 
-#: ../pidgin/gtkdocklet.c:722
-msgid "Mute Sounds"
-msgstr "Sin sonido"
-
-#: ../pidgin/gtkdocklet.c:729
-msgid "Blink on New Message"
-msgstr "Parpadear con nuevo mensaje"
-
-#: ../pidgin/gtkdocklet.c:739
-msgid "Quit"
-msgstr "Salir"
-
-#: ../pidgin/gtkft.c:154
+msgid "_Accounts"
+msgstr "Cuent_as"
+
+msgid "Plu_gins"
+msgstr "Co_mplementos"
+
+msgid "Pr_eferences"
+msgstr "Pr_eferencias"
+
+msgid "Mute _Sounds"
+msgstr "Sin s_onidos"
+
+msgid "_Blink on New Message"
+msgstr "_Parpadear con nuevo mensaje"
+
+msgid "_Quit"
+msgstr "_Salir"
+
 msgid "Not started"
 msgstr "No iniciado"
 
-#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Recibiendo como:</b>"
 
-#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Recibiendo de:</b>"
 
-#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>Enviando a:</b>"
 
-#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>Enviando como:</b>"
 
-#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
 msgstr ""
 "No se ha configurado ninguna aplicaci坦n para abrir este tipo de archivo."
 
-#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr "Se produjo un error al abrir el archivo."
 
-#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Error al lanzar %s: %s"
 
-#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "Error al ejecutar %s"
 
-#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "El proceso devolvi坦 el c坦digo de error %d"
 
-#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Nombre de archivo:"
 
-#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "Archivo local:"
 
-#: ../pidgin/gtkft.c:700
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "Tiempo transcurrido:"
 
-#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "Tiempo restante:"
 
-#: ../pidgin/gtkft.c:781
 msgid "Close this window when all transfers _finish"
 msgstr "Cerrar esta ventana cuando todas las transferencias _terminen"
 
-#: ../pidgin/gtkft.c:791
 msgid "C_lear finished transfers"
 msgstr "_Limpiar transferencias terminadas"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:800
 msgid "File transfer _details"
 msgstr "_Detalles de la transferencia de archivos"
 
 #. Pause button
-#: ../pidgin/gtkft.c:818 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Pausar"
 
 #. Resume button
-#: ../pidgin/gtkft.c:823
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../pidgin/gtkimhtml.c:842
 msgid "Paste as Plain _Text"
 msgstr "Pe_gar como texto en claro"
 
-#: ../pidgin/gtkimhtml.c:859 ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "_Reset formatting"
 msgstr "_Limpiar formato"
 
-#: ../pidgin/gtkimhtml.c:867
 msgid "Disable _smileys in selected text"
 msgstr "Deshabilitar los emoticono_s en el texto seleccionado"
 
-#: ../pidgin/gtkimhtml.c:1430
 msgid "Hyperlink color"
 msgstr "Color de hiperenlace"
 
-#: ../pidgin/gtkimhtml.c:1431
 msgid "Color to draw hyperlinks."
 msgstr "Color para dibujar hiperenlaces."
 
-#: ../pidgin/gtkimhtml.c:1434
 msgid "Hyperlink prelight color"
 msgstr "Color de hiperenlace pre-iluminado"
 
-#: ../pidgin/gtkimhtml.c:1435
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Color para dibujar hiperenlaces cuando el rat坦n est辿 encima."
 
-#: ../pidgin/gtkimhtml.c:1438 ../pidgin/plugins/pidginrc.c:52
 msgid "Sent Message Name Color"
 msgstr "Enviar color en mensajes con nombre"
 
-#: ../pidgin/gtkimhtml.c:1439
 msgid "Color to draw the name of a message you sent."
 msgstr "Color para dibujar el nombre en un mensaje que env鱈e."
 
-#: ../pidgin/gtkimhtml.c:1442 ../pidgin/plugins/pidginrc.c:53
 msgid "Received Message Name Color"
 msgstr "Color en mensajes recibidos con nombre"
 
-#: ../pidgin/gtkimhtml.c:1443
 msgid "Color to draw the name of a message you received."
 msgstr "Color para dibujar el nombre de un mensaje que reciba."
 
-#: ../pidgin/gtkimhtml.c:1446
 msgid "\"Attention\" Name Color"
 msgstr "Color en nombre 束atenci坦n損"
 
-#: ../pidgin/gtkimhtml.c:1447
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""
 "Color con el que dibujar el nombre de un mensaje que haya recibido y que "
 "contenga su nombre."
 
-#: ../pidgin/gtkimhtml.c:1450 ../pidgin/plugins/pidginrc.c:55
 msgid "Action Message Name Color"
 msgstr "Color para mensajes de acciones con nombre"
 
-#: ../pidgin/gtkimhtml.c:1451
 msgid "Color to draw the name of an action message."
 msgstr "Color con el que dibujar el nombre de un mensaje de acci坦n."
 
-#: ../pidgin/gtkimhtml.c:1460
+msgid "Action Message Name Color for Whispered Message"
+msgstr "Nombre de color de mensajes de accci坦n para mensajes susurrados"
+
+msgid "Whisper Message Name Color"
+msgstr "Susurrar nombre de color de mensajes"
+
 msgid "Typing notification color"
 msgstr "Color de notificaci坦n de tecleo"
 
-#: ../pidgin/gtkimhtml.c:1461
 msgid "The color to use for the typing notification font"
 msgstr "Color a utilizar para la tipograf鱈a de notificaci坦n de tecleo"
 
-#: ../pidgin/gtkimhtml.c:1464
 msgid "Typing notification font"
 msgstr "Tipograf鱈a de notificaci坦n de tecleo"
 
-#: ../pidgin/gtkimhtml.c:1465
 msgid "The font to use for the typing notification"
 msgstr "Tipograf鱈a a utilizar para la notificaci坦n de tecleo"
 
-#: ../pidgin/gtkimhtml.c:1468 ../pidgin/gtkimhtml.c:1469
 msgid "Enable typing notification"
 msgstr "Activar la notificaci坦n de tecleo"
 
-#: ../pidgin/gtkimhtml.c:1688
 msgid "_Copy Email Address"
 msgstr "_Copiar direcci坦n de correo electr坦nico"
 
-#: ../pidgin/gtkimhtml.c:1700
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"
 
-#: ../pidgin/gtkimhtml.c:1710
 msgid "_Copy Link Location"
 msgstr "_Copiar destino del enlace"
 
-#: ../pidgin/gtkimhtml.c:3482
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -16080,7 +11710,6 @@
 "\n"
 "Tomando PNG por omisi坦n."
 
-#: ../pidgin/gtkimhtml.c:3485
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -16090,7 +11719,6 @@
 "\n"
 "Tomando PNG por omisi坦n."
 
-#: ../pidgin/gtkimhtml.c:3514
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -16102,7 +11730,6 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3517
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -16113,35 +11740,32 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3598 ../pidgin/gtkimhtml.c:3610
 msgid "Save Image"
 msgstr "Guardar imagen"
 
-#: ../pidgin/gtkimhtml.c:3638
+#, c-format
 msgid "_Save Image..."
 msgstr "_Guardar imagen..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:164
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "_A単adir emoticonos a medida..."
+
 msgid "Select Font"
 msgstr "Seleccionar tipograf鱈a"
 
-#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "Seleccionar el color del texto"
 
-#: ../pidgin/gtkimhtmltoolbar.c:324
 msgid "Select Background Color"
 msgstr "Seleccionar el color de fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid "_Description"
 msgstr "_Descripci坦n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -16149,164 +11773,137 @@
 "Introduzca el URL y la descripci坦n del enlace que quiere insertar. La "
 "descripci坦n es opcional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:428
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduzca el URL del enlace que quiere insertar."
 
-#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1103
 msgid "Insert Link"
 msgstr "Insertar enlace"
 
-#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1264
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ../pidgin/gtkimhtmltoolbar.c:518
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "No se pudo almacenar la imagen: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:544 ../pidgin/gtkimhtmltoolbar.c:554
 msgid "Insert Image"
 msgstr "Insertar imagen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:712
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"Se ha deshabilitado este emoticono porque hay un emoticono definido para "
+"este atajo de teclado:\\n\n"
+" %s"
+
 msgid "Smile!"
 msgstr "臓Sonr鱈a!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:763
+msgid "_Manage custom smileys"
+msgstr "_Gestionar emoticonos a medida"
+
 msgid "This theme has no available smileys."
 msgstr "Este tema no tiene emoticonos disponibles."
 
-#: ../pidgin/gtkimhtmltoolbar.c:847 ../pidgin/gtkimhtmltoolbar.c:1221
 msgid "_Font"
 msgstr "_Tipograf鱈a"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1055
 msgid "Group Items"
 msgstr "Elementos de grupo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1055
 msgid "Ungroup Items"
 msgstr "Desagrupar items"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "Cursiva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "Subrayado"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1092
 msgid "Strikethrough"
 msgstr "Tachado"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Increase Font Size"
 msgstr "Incrementa tama単o de tipograf鱈a"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Decrease Font Size"
 msgstr "Reducir tama単o de tipograf鱈a"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
 msgid "Font Face"
 msgstr "Estilo de tipograf鱈a"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Background Color"
 msgstr "Color del fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Foreground Color"
 msgstr "Color del primer plano"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1101
 msgid "Reset Formatting"
 msgstr "Limpiar formato"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert IM Image"
 msgstr "Insertar imagen MI"
 
 # No estoy muy seguro de usar emoticono, quiz叩s 束smiley損 ser鱈a m叩s apropiado
-#: ../pidgin/gtkimhtmltoolbar.c:1105
 msgid "Insert Smiley"
 msgstr "Insertar emoticono"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<b>_Bold</b>"
 msgstr "<b> Negrita</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<i>_Italic</i>"
 msgstr "<i>_Cursiva</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<u>_Underline</u>"
 msgstr "<u>S_ubrayado</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Tachado</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size=\"larger\">M叩s _grande</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>M叩s _peque単o</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "_Font face"
 msgstr "_Estilo de tipograf鱈a"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "Foreground _color"
 msgstr "_Color del primer plano"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "Bac_kground color"
 msgstr "Color del _fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "_Imagen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_Enlace"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1284
 msgid "_Horizontal rule"
 msgstr "Regla _horizontal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1306
 msgid "_Smile!"
 msgstr "臓_Sonr鱈a!"
 
-#: ../pidgin/gtklog.c:245
 msgid "Log Deletion Failed"
 msgstr "Fall坦 el borrado del registro"
 
-#: ../pidgin/gtklog.c:246
 msgid "Check permissions and try again."
 msgstr "Compruebe los permisos e int辿ntelo de nuevo."
 
-#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -16315,7 +11912,6 @@
 "多Est叩 seguro que desea borrar de forma permanente el registro de la "
 "conversaci坦n con %s que empez坦 en %s?"
 
-#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -16324,7 +11920,6 @@
 "多Est叩 seguro que desea borrar de forma permanente el registro de la "
 "conversaci坦n en %s que empez坦 en %s?"
 
-#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -16333,35 +11928,28 @@
 "多Est叩 seguro que desea borrar de forma permanente el registro del sistema "
 "que comez坦 en %s?"
 
-#: ../pidgin/gtklog.c:323
 msgid "Delete Log?"
 msgstr "多Borrar el registro?"
 
-#: ../pidgin/gtklog.c:334
 msgid "Delete Log..."
 msgstr "Borrar el registro..."
 
-#: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span weight='bold' size='larger'>Conversaci坦n en %s de %s</span>"
 
-#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span weight='bold' size='larger'>Conversaci坦n con %s de %s</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:581
 msgid "_Browse logs folder"
 msgstr "_Acceder a la carpeta de registros"
 
-#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Intente `%s -h' para m叩s informaci坦n.\n"
 
-#: ../pidgin/gtkmain.c:389
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16395,7 +11983,6 @@
 "  --display=DISPLAY    pantalla X que se debe utilizar\n"
 "  -v, --version        mostrar la versi坦n actual y salir\n"
 
-#: ../pidgin/gtkmain.c:402
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16428,7 +12015,6 @@
 "  --display=DISPLAY    pantalla X que se debe utilizar\n"
 "  -v, --version        mostrar la versi坦n actual y salir\n"
 
-#: ../pidgin/gtkmain.c:532
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16469,71 +12055,56 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:726 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:360
 msgid "Open All Messages"
 msgstr "Abrir todos los mensajes"
 
-#: ../pidgin/gtknotify.c:414
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">臓Tiene correo!</span>"
 
-#: ../pidgin/gtknotify.c:570
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s tiene %d mensaje nuevo."
 msgstr[1] "%s tiene %d nuevos mensajes."
 
-#: ../pidgin/gtknotify.c:599
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>Tiene %d nuevo correo.</b>"
 msgstr[1] "<b>Tiene %d nuevos correos.</b>"
 
-#: ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "La orden de navegador 束%s損 no es v叩lida."
 
-#: ../pidgin/gtknotify.c:1035 ../pidgin/gtknotify.c:1047
-#: ../pidgin/gtknotify.c:1060 ../pidgin/gtknotify.c:1197
 msgid "Unable to open URL"
 msgstr "No se pudo abrir la URL"
 
-#: ../pidgin/gtknotify.c:1045 ../pidgin/gtknotify.c:1058
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Error al lanzar 束%s損: %s"
 
-#: ../pidgin/gtknotify.c:1198
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Se ha definido un navegador 束Manual損, pero no se ha definido ning炭n comando "
 "para ejecutarlo."
 
-#: ../pidgin/gtkplugin.c:278
 msgid "The following plugins will be unloaded."
 msgstr "Se van a desactivar los siguientes complementos."
 
-#: ../pidgin/gtkplugin.c:297
 msgid "Multiple plugins will be unloaded."
 msgstr "Se desactivar叩n m炭ltiples complementos."
 
-#: ../pidgin/gtkplugin.c:301
 msgid "Unload Plugins"
 msgstr "Desactivar complementos"
 
-#: ../pidgin/gtkplugin.c:318
 msgid "Could not unload plugin"
 msgstr "No se pudo descargar el complemente"
 
-#: ../pidgin/gtkplugin.c:319
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
@@ -16541,7 +12112,6 @@
 "No se pudo descargar el complemento, se deshabilitar叩 la pr坦xima vez que "
 "arranque el programa."
 
-#: ../pidgin/gtkplugin.c:454
 #, c-format
 msgid ""
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
@@ -16550,138 +12120,105 @@
 "<span foreground=\"red\" weight=\"bold\">Error: %s\\n\n"
 "Compruebe el sitio web del complemento para obtener una actualizaci坦n.</span>"
 
-#: ../pidgin/gtkplugin.c:583
 msgid "Author"
 msgstr "Autor"
 
-#: ../pidgin/gtkplugin.c:661
 msgid "<b>Written by:</b>"
 msgstr "<b>Escrito por:</b>"
 
-#: ../pidgin/gtkplugin.c:685
 msgid "<b>Web site:</b>"
 msgstr "<b>Sitio web:</b>"
 
-#: ../pidgin/gtkplugin.c:694
 msgid "<b>Filename:</b>"
 msgstr "<b>Nombre del fichero:</b>"
 
-#: ../pidgin/gtkplugin.c:720
 msgid "Configure Pl_ugin"
 msgstr "Configurar _complemento"
 
-#: ../pidgin/gtkplugin.c:788
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalles del complemento</b>"
 
-#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Seleccione un archivo"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "A qui辿n avisar"
 
-#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "Nombre del _amigo:"
 
-#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "Se _conecta"
 
-#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "Se _desconecta"
 
-#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "Se _ausenta"
 
-#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "_Deja de estar ausente"
 
-#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "Est叩 _inactivo"
 
-#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "Ya no est叩 i_nactivo."
 
-#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "Empieza a _escribir"
 
-#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "Se _pausa mientras escribe"
 
-#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "Deja de escribi_r"
 
-#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "Env鱈a un _mensaje"
 
-#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "_Abrir una ventana de MI"
 
-#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "_Notificaci坦n con una ventana emergente"
 
-#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "Enviar un _mensaje"
 
-#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "E_jecutar una orden"
 
-#: ../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:675
 msgid "Brows_e..."
 msgstr "_Navegar..."
 
 # Examinar puede ser tambi辿n v叩lido, comprobar, jfs.
-#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "_Navegar..."
 
-#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "Pre_visualizar"
 
-#: ../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:815
 msgid "_Recurring"
 msgstr "_Recurrente"
 
-#: ../pidgin/gtkpounce.c:1259
 msgid "Pounce Target"
 msgstr "Objetivo a avisar"
 
-#: ../pidgin/gtkprefs.c:458
 msgid "Smiley theme failed to unpack."
 msgstr "Fall坦 el desempaque de tema de emoticonos"
 
-#: ../pidgin/gtkprefs.c:593
 msgid "Install Theme"
 msgstr "Instalar tema"
 
-#: ../pidgin/gtkprefs.c:646
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -16689,148 +12226,112 @@
 "Seleccione de la lista inferior el tema de emoticonos que desee. Puede "
 "instalar temas nuevos arrastr叩ndolos y solt叩ndolos sobre esta lista de temas."
 
-#: ../pidgin/gtkprefs.c:681
 msgid "Icon"
 msgstr "Icono"
 
-#: ../pidgin/gtkprefs.c:894
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"
 
-#: ../pidgin/gtkprefs.c:914
 msgid "Cl_ose conversations with the Escape key"
 msgstr "C_errrar las conversaciones con la tecla Esc"
 
-#: ../pidgin/gtkprefs.c:943
 msgid "System Tray Icon"
 msgstr "Icono del 叩rea de notificaci坦n del sistema"
 
-#: ../pidgin/gtkprefs.c:944
 msgid "_Show system tray icon:"
 msgstr "_Mostrar icono del 叩rea de notificaci坦n del sistema:"
 
-#: ../pidgin/gtkprefs.c:947
 msgid "On unread messages"
 msgstr "Si hay mensajes sin leer"
 
-#: ../pidgin/gtkprefs.c:953
 msgid "Conversation Window Hiding"
 msgstr "Ocultar ventana de conversaci坦n"
 
-#: ../pidgin/gtkprefs.c:954
 msgid "_Hide new IM conversations:"
 msgstr "_Ocultar nuevas conversaciones MI:"
 
-#: ../pidgin/gtkprefs.c:957 ../pidgin/gtkprefs.c:2075
 msgid "When away"
 msgstr "Cuando estoy fuera"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:965
 msgid "Tabs"
 msgstr "Solapas"
 
-#: ../pidgin/gtkprefs.c:967
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostrar MIs y chats en ventanas con _solapas"
 
-#: ../pidgin/gtkprefs.c:981
 msgid "Show close b_utton on tabs"
 msgstr "Mostrar botones de _cierre en las solapas"
 
-#: ../pidgin/gtkprefs.c:984
 msgid "_Placement:"
 msgstr "_Colocaci坦n:"
 
-#: ../pidgin/gtkprefs.c:986
 msgid "Top"
 msgstr "Arriba"
 
-#: ../pidgin/gtkprefs.c:987
 msgid "Bottom"
 msgstr "Abajo"
 
-#: ../pidgin/gtkprefs.c:988
 msgid "Left"
 msgstr "Izquierda"
 
-#: ../pidgin/gtkprefs.c:989
 msgid "Right"
 msgstr "Derecha"
 
-#: ../pidgin/gtkprefs.c:991
 msgid "Left Vertical"
 msgstr "Vertical a la izquierda"
 
-#: ../pidgin/gtkprefs.c:992
 msgid "Right Vertical"
 msgstr "Vertical a la derecha"
 
-#: ../pidgin/gtkprefs.c:999
 msgid "N_ew conversations:"
 msgstr "_Nuevas conversaciones:"
 
-#: ../pidgin/gtkprefs.c:1048
 msgid "Show _formatting on incoming messages"
 msgstr "Mostrar el _formato de los mensajes entrantes"
 
-#: ../pidgin/gtkprefs.c:1050
 msgid "Close IMs immediately when the tab is closed"
 msgstr "Cerrar MIs inmediatamente cuando se cierra la pesta単a"
 
-#: ../pidgin/gtkprefs.c:1053
 msgid "Show _detailed information"
 msgstr "Mostrar informaci坦n _detallada"
 
-#: ../pidgin/gtkprefs.c:1055
 msgid "Enable buddy ic_on animation"
 msgstr "Habilitar animaciones en los i_conos de amigos"
 
-#: ../pidgin/gtkprefs.c:1062
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar a los amigos cuando les est辿 escribiendo"
 
-#: ../pidgin/gtkprefs.c:1065
 msgid "Highlight _misspelled words"
 msgstr "_Resaltar las faltas de ortograf鱈a"
 
-#: ../pidgin/gtkprefs.c:1069
 msgid "Use smooth-scrolling"
 msgstr "Utilizar paginado suave"
 
-#: ../pidgin/gtkprefs.c:1072
 msgid "F_lash window when IMs are received"
 msgstr "_Destello de ventana cuando se reciben MIs"
 
-#: ../pidgin/gtkprefs.c:1074
 msgid "Minimi_ze new conversation windows"
 msgstr "Minimi_zar las nuevas ventana de conversaci坦n"
 
-#: ../pidgin/gtkprefs.c:1078
 msgid "Minimum input area height in lines:"
 msgstr "Altura m鱈nima del 叩rea de entrada en l鱈neas:"
 
-#: ../pidgin/gtkprefs.c:1084
 msgid "Font"
 msgstr "Tipograf鱈a"
 
-#: ../pidgin/gtkprefs.c:1086
 msgid "Use document font from _theme"
 msgstr "Utilizar la tipograf鱈a de documento del _tema"
 
-#: ../pidgin/gtkprefs.c:1088
 msgid "Use font from _theme"
 msgstr "Utilizar la tipograf鱈a del _tema"
 
-#: ../pidgin/gtkprefs.c:1094
 msgid "Conversation _font:"
 msgstr "Tipograf鱈a para las conversaciones:"
 
-#: ../pidgin/gtkprefs.c:1101
 msgid "Default Formatting"
 msgstr "Formato por omisi坦n"
 
-#: ../pidgin/gtkprefs.c:1120
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16838,63 +12339,48 @@
 "As鱈 se ver叩 el texto de los mensajes que env鱈e cuando utilice protocolos que "
 "soportan el formateo."
 
-#: ../pidgin/gtkprefs.c:1180
 msgid "Cannot start proxy configuration program."
 msgstr "No se pudo iniciar el programa de configuraci坦n de proxy."
 
-#: ../pidgin/gtkprefs.c:1192
 msgid "Cannot start browser configuration program."
 msgstr "No se pudo iniciar el programa de configuraci坦n del navegador."
 
-#: ../pidgin/gtkprefs.c:1212
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1224
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ejemplo: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1228
 msgid "_Autodetect IP address"
 msgstr "_Auto detectar la direcci坦n IP"
 
-#: ../pidgin/gtkprefs.c:1237
 msgid "Public _IP:"
 msgstr "_IP p炭blica:"
 
-#: ../pidgin/gtkprefs.c:1268
 msgid "Ports"
 msgstr "Puertos"
 
-#: ../pidgin/gtkprefs.c:1271
 msgid "_Enable automatic router port forwarding"
 msgstr "_Activar reenv鱈o de puertos autom叩tico"
 
-#: ../pidgin/gtkprefs.c:1274
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente el rango de puertos en el que se escuchar叩"
 
-#: ../pidgin/gtkprefs.c:1277
 msgid "_Start port:"
 msgstr "Puerto _inicial:"
 
-#: ../pidgin/gtkprefs.c:1284
 msgid "_End port:"
 msgstr "Puerto _final:"
 
-#: ../pidgin/gtkprefs.c:1292
 msgid "Proxy Server &amp; Browser"
 msgstr "Servidor proxy y navegador"
 
-#: ../pidgin/gtkprefs.c:1300
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>No se encontr坦 el programa de configuraci坦n del proxy.</b>"
 
-#: ../pidgin/gtkprefs.c:1308
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>No se encontr坦 el programa de configuraci坦n del navegador.</b>"
 
-#: ../pidgin/gtkprefs.c:1313
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
@@ -16902,99 +12388,75 @@
 "Puede configurar las preferencias del proxy y del navegador\n"
 "en las preferencias de GNOME."
 
-#: ../pidgin/gtkprefs.c:1320
 msgid "Configure _Proxy"
 msgstr "Configurar _proxy"
 
-#: ../pidgin/gtkprefs.c:1325
 msgid "Configure _Browser"
 msgstr "Configurar _navegador"
 
-#: ../pidgin/gtkprefs.c:1331
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../pidgin/gtkprefs.c:1336
 msgid "No proxy"
 msgstr "Sin proxy"
 
-#: ../pidgin/gtkprefs.c:1392
 msgid "_User:"
 msgstr "_Usuario:"
 
-#: ../pidgin/gtkprefs.c:1480
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1481
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1482
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1483
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1484
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1485
 msgid "Desktop Default"
 msgstr "Valores por omisi坦n del escritorio"
 
-#: ../pidgin/gtkprefs.c:1486
 msgid "GNOME Default"
 msgstr "Valores por omisi坦n de Gnome"
 
-#: ../pidgin/gtkprefs.c:1487
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1488
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1489
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1490
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1499
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1560
 msgid "Browser Selection"
 msgstr "Selecci坦n de navegador"
 
-#: ../pidgin/gtkprefs.c:1564
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1572
 msgid "_Open link in:"
 msgstr "_Abrir enlace en:"
 
-#: ../pidgin/gtkprefs.c:1574
 msgid "Browser default"
 msgstr "Navegador por omisi坦n"
 
-#: ../pidgin/gtkprefs.c:1575
 msgid "Existing window"
 msgstr "Ventana existente"
 
-#: ../pidgin/gtkprefs.c:1577
 msgid "New tab"
 msgstr "Nueva solapa"
 
-#: ../pidgin/gtkprefs.c:1594
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -17003,63 +12465,54 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../pidgin/gtkprefs.c:1620
 msgid "Log _format:"
 msgstr "Formato de _registro:"
 
-#: ../pidgin/gtkprefs.c:1625
 msgid "Log all _instant messages"
 msgstr "Registrar todos los mensajes _instant叩neos"
 
-#: ../pidgin/gtkprefs.c:1627
 msgid "Log all c_hats"
 msgstr "Registrar todas las _charlas"
 
-#: ../pidgin/gtkprefs.c:1629
 msgid "Log all _status changes to system log"
 msgstr "Registrar todos los cambios de _estado en el registro del sistema"
 
-#: ../pidgin/gtkprefs.c:1779
 msgid "Sound Selection"
 msgstr "Selecci坦n de sonido"
 
-#: ../pidgin/gtkprefs.c:1789
+#, c-format
 msgid "Quietest"
 msgstr "El m叩s silencioso"
 
-#: ../pidgin/gtkprefs.c:1791
+#, c-format
 msgid "Quieter"
 msgstr "M叩s silencioso"
 
-#: ../pidgin/gtkprefs.c:1793
+#, c-format
 msgid "Quiet"
 msgstr "Silencio"
 
-#: ../pidgin/gtkprefs.c:1797
+#, c-format
 msgid "Loud"
 msgstr "Ruidoso"
 
-#: ../pidgin/gtkprefs.c:1799
+#, c-format
 msgid "Louder"
 msgstr "M叩s ruidoso"
 
-#: ../pidgin/gtkprefs.c:1801
+#, c-format
 msgid "Loudest"
 msgstr "El m叩s ruidoso"
 
-#: ../pidgin/gtkprefs.c:1864
 msgid "_Method:"
 msgstr "_M辿todo:"
 
-#: ../pidgin/gtkprefs.c:1866
 msgid "Console beep"
 msgstr "Timbre de la consola"
 
-#: ../pidgin/gtkprefs.c:1873
 msgid "No sounds"
 msgstr "Sin sonido"
 
-#: ../pidgin/gtkprefs.c:1886
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -17068,280 +12521,265 @@
 "_Comando para sonido:\n"
 "(%s para nombre de archivo)"
 
-#: ../pidgin/gtkprefs.c:1895
 msgid "Sounds when conversation has _focus"
 msgstr "Suena cuando la conversaci坦n obtiene el _foco"
 
-#: ../pidgin/gtkprefs.c:1897
 msgid "Enable sounds:"
 msgstr "Habilitar sonidos:"
 
-#: ../pidgin/gtkprefs.c:1914
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: ../pidgin/gtkprefs.c:1981
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../pidgin/gtkprefs.c:2058
+# Examinar puede ser tambi辿n v叩lido, comprobar, jfs.
+msgid "_Browse..."
+msgstr "_Navegar..."
+
+msgid "_Reset"
+msgstr "_Restablecer"
+
 msgid "_Report idle time:"
 msgstr "Mostrar el _tiempo de inactividad"
 
-#: ../pidgin/gtkprefs.c:2063
 msgid "Based on keyboard or mouse use"
 msgstr "Basado en teclado o en uso de rat坦n"
 
-#: ../pidgin/gtkprefs.c:2072
 msgid "_Auto-reply:"
 msgstr "Respuesta _autom叩tica:"
 
-#: ../pidgin/gtkprefs.c:2076
 msgid "When both away and idle"
 msgstr "Cuando est叩 ausente e inactivo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:2082
 msgid "Auto-away"
 msgstr "Auto-ausencia"
 
-#: ../pidgin/gtkprefs.c:2084
 msgid "Change status when _idle"
 msgstr "Cambiar el estado cuando est辿 _inactivo"
 
-#: ../pidgin/gtkprefs.c:2088
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de pasar a inactivo:"
 
-#: ../pidgin/gtkprefs.c:2095
 msgid "Change _status to:"
 msgstr "Cambiar _estado a:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2108
 msgid "Status at Startup"
 msgstr "Estado al arrancar"
 
-#: ../pidgin/gtkprefs.c:2110
 msgid "Use status from last _exit at startup"
 msgstr "Utilizar el estado de mi 炭ltima _salida al empezar"
 
-#: ../pidgin/gtkprefs.c:2117
 msgid "Status to a_pply at startup:"
 msgstr "Estado a _aplicar al empezar:"
 
-#: ../pidgin/gtkprefs.c:2146
 msgid "Interface"
 msgstr "Interfaz"
 
-#: ../pidgin/gtkprefs.c:2148
 msgid "Smiley Themes"
 msgstr "Temas de emoticonos"
 
-#: ../pidgin/gtkprefs.c:2155
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:2159
 msgid "Status / Idle"
 msgstr "Estado / Inactivo"
 
-#: ../pidgin/gtkprivacy.c:81
 msgid "Allow all users to contact me"
 msgstr "Permitir que todos los usuarios me contacten"
 
-#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users on my buddy list"
 msgstr "Permitir s坦lo a los usuarios en mi lista de amigos"
 
-#: ../pidgin/gtkprivacy.c:83
 msgid "Allow only the users below"
 msgstr "Permitir s坦lo a los siguientes usuarios"
 
-#: ../pidgin/gtkprivacy.c:84
 msgid "Block all users"
 msgstr "Bloquear todos los usuarios"
 
-#: ../pidgin/gtkprivacy.c:85
 msgid "Block only the users below"
 msgstr "Bloquear s坦lo los siguientes usuarios"
 
-#: ../pidgin/gtkprivacy.c:352
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: ../pidgin/gtkprivacy.c:362
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 "Los cambios a la configuraci坦n de privacidad tienen efecto inmediatamente."
 
-#: ../pidgin/gtkprivacy.c:371
 msgid "Set privacy for:"
 msgstr "Establecer privacidad para:"
 
 #. Remove All button
-#: ../pidgin/gtkprivacy.c:417
 msgid "Remove Al_l"
 msgstr "Quitar to_do"
 
-#: ../pidgin/gtkprivacy.c:503 ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "Permitir al usuario"
 
-#: ../pidgin/gtkprivacy.c:504
 msgid "Type a user you permit to contact you."
 msgstr "Escriba un usuario al que le permita contactar con vd."
 
-#: ../pidgin/gtkprivacy.c:505
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Introduzca el nombre de usuario al que quiere permitir que contacte con vd."
 
-#: ../pidgin/gtkprivacy.c:508 ../pidgin/gtkprivacy.c:524
 msgid "_Permit"
 msgstr "_Permitir"
 
-#: ../pidgin/gtkprivacy.c:514
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "多Permitir a %s contactar con vd.?"
 
-#: ../pidgin/gtkprivacy.c:516
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "多Est叩 seguro que quiere permitir que %s le contacte?"
 
-#: ../pidgin/gtkprivacy.c:545 ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "Bloquear al usuario"
 
-#: ../pidgin/gtkprivacy.c:546
 msgid "Type a user to block."
 msgstr "Escriba un usuario a bloquear."
 
-#: ../pidgin/gtkprivacy.c:547
 msgid "Please enter the name of the user you wish to block."
 msgstr "Introduzca el nombre del grupo a bloquear."
 
-#: ../pidgin/gtkprivacy.c:555
 #, c-format
 msgid "Block %s?"
 msgstr "多Bloquear a %s?"
 
-#: ../pidgin/gtkprivacy.c:557
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "多Est叩 seguro de que quiere bloquear a %s?"
 
-#: ../pidgin/gtkrequest.c:274
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../pidgin/gtkrequest.c:1504
 msgid "That file already exists"
 msgstr "Ese archivo ya existe"
 
-#: ../pidgin/gtkrequest.c:1505
 msgid "Would you like to overwrite it?"
 msgstr "多Quiere sobreescribirlo?"
 
-#: ../pidgin/gtkrequest.c:1508
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: ../pidgin/gtkrequest.c:1509
 msgid "Choose New Name"
 msgstr "Elegir un nuevo nombre"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Seleccionar carpeta..."
 
 #. list button
-#: ../pidgin/gtkroomlist.c:577
 msgid "_Get List"
 msgstr "_Obtener la lista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:585
 msgid "_Add Chat"
 msgstr "_A単adir chat"
 
-#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "多Est叩 seguro que desea borrar los estados guardados y seleccionados?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:616 ../pidgin/gtksavedstatuses.c:1229
 msgid "_Use"
 msgstr "_Usar"
 
-#: ../pidgin/gtksavedstatuses.c:765
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Ya se est叩 utilizando ese t鱈tulo. Debe elegir un t鱈tulo 炭nico."
 
-#: ../pidgin/gtksavedstatuses.c:961
 msgid "Different"
 msgstr "Diferente"
 
-#: ../pidgin/gtksavedstatuses.c:1153
 msgid "_Title:"
 msgstr "_T鱈tulo:"
 
-#: ../pidgin/gtksavedstatuses.c:1161 ../pidgin/gtksavedstatuses.c:1453
 msgid "_Status:"
 msgstr "E_stado:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1177
 msgid "Use a _different status for some accounts"
 msgstr "Usar un estado _diferente para algunas cuentas"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1236
 msgid "Sa_ve & Use"
 msgstr "Gua_rdar y usar"
 
-#: ../pidgin/gtksavedstatuses.c:1437
 #, c-format
 msgid "Status for %s"
 msgstr "Estado de %s"
 
-#: ../pidgin/gtkstatusbox.c:688
+# No estoy muy seguro de usar emoticono, quiz叩s 束smiley損 ser鱈a m叩s apropiado
+msgid "Custom Smiley"
+msgstr "Emoticono a medida"
+
+msgid "Duplicate Shortcut"
+msgstr "Atajo duplicado"
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+"Ya existe un emoticono a medida para el atajo de teclado seleccionado. "
+"Especifique un atajo distinto."
+
+msgid "More Data needed"
+msgstr "Son necesarios m叩s datos"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Indique un atajo para asociarlo al emoticono."
+
+msgid "Please select an image for the smiley."
+msgstr "Escoja una imagen para el emoticono."
+
+# No estoy muy seguro de usar emoticono, quiz叩s 束smiley損 ser鱈a m叩s apropiado
+msgid "Edit Smiley"
+msgstr "Editar emoticono"
+
+msgid "Add Smiley"
+msgstr "A単adir emoticono"
+
+msgid "Smiley _Image"
+msgstr "Imagen de emoticono"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "Ata_jos de emoticonos"
+
+msgid "Smiley"
+msgstr "Emoticono"
+
+msgid "Custom Smiley Manager"
+msgstr "Gestor de emoticonos a medida"
+
 msgid "Waiting for network connection"
 msgstr "Esperando la conexi坦n a la red"
 
-#: ../pidgin/gtkstatusbox.c:1101
 msgid "New status..."
 msgstr "Nuevo estado..."
 
-#: ../pidgin/gtkstatusbox.c:1102
 msgid "Saved statuses..."
 msgstr "Estados guardados..."
 
-#: ../pidgin/gtkstatusbox.c:1737
 msgid "Status Selector"
 msgstr "Selector de estado"
 
-#: ../pidgin/gtkutils.c:685
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1475
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Se ha producido el siguiente error al cargar %s: %s"
 
-#: ../pidgin/gtkutils.c:1455 ../pidgin/gtkutils.c:1477
 msgid "Failed to load image"
 msgstr "No se pudo cargar la imagen"
 
-#: ../pidgin/gtkutils.c:1551
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "No se puede enviar la carpeta %s."
 
-#: ../pidgin/gtkutils.c:1552
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -17350,12 +12788,9 @@
 "%s no puede transferir una carpeta. Tendr叩 que enviar los archivos que "
 "contiene individualmente."
 
-#: ../pidgin/gtkutils.c:1586 ../pidgin/gtkutils.c:1598
-#: ../pidgin/gtkutils.c:1605
 msgid "You have dragged an image"
 msgstr "Ha arrastrado una imagen"
 
-#: ../pidgin/gtkutils.c:1587
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -17363,23 +12798,18 @@
 "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:1593 ../pidgin/gtkutils.c:1613
 msgid "Set as buddy icon"
 msgstr "Establecer como icono de amigo"
 
-#: ../pidgin/gtkutils.c:1594 ../pidgin/gtkutils.c:1614
 msgid "Send image file"
 msgstr "Enviar archivo de imagen"
 
-#: ../pidgin/gtkutils.c:1595 ../pidgin/gtkutils.c:1614
 msgid "Insert in message"
 msgstr "Insertar en el mensaje"
 
-#: ../pidgin/gtkutils.c:1599
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "多Desea establecerla como el icono de amigo para este usuario?"
 
-#: ../pidgin/gtkutils.c:1606
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -17387,7 +12817,6 @@
 "Puede enviar esta imagen como una transferencia de archivo, o usarla como "
 "icono de amigo para este usuario."
 
-#: ../pidgin/gtkutils.c:1607
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -17400,11 +12829,9 @@
 #. * 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:1666
 msgid "Cannot send launcher"
 msgstr "No se puede enviar un lanzador"
 
-#: ../pidgin/gtkutils.c:1666
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -17412,7 +12839,6 @@
 "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:2404
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -17423,111 +12849,86 @@
 "<b>Tama単o de archivo:</b> %s\n"
 "<b>Tama単o de imagen:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2706
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 "El fichero 束%s損 es demasiado grande para %s. Intente utilizar una imagen m叩s "
 "peque単a.\n"
 
-#: ../pidgin/gtkutils.c:2708
 msgid "Icon Error"
 msgstr "Error en icono"
 
-#: ../pidgin/gtkutils.c:2709
 msgid "Could not set icon"
 msgstr "No se pudo fijar el icono"
 
-#: ../pidgin/gtkutils.c:2809
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "No se pudo abrir el archivo 束%s損: %s"
 
-#: ../pidgin/gtkutils.c:2858
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
-"Se produjo un fallo al cargar la imagen 束%s損: raz坦n desconocida, "
-"posiblemente se trata de un archivo de imagen da単ado"
-
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
+"Se produjo un fallo al cargar la imagen 束%s損: raz坦n desconocida, posiblemente "
+"se trata de un archivo de imagen da単ado"
+
 msgid "Save File"
 msgstr "Guardar archivo"
 
-#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Seleccionar el color"
 
-#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "_Apodo:"
 
-#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "Cerrar _solapas"
 
-#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "Obtener _informaci坦n"
 
-#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "_Invitar"
 
-#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "_Abrir correo"
 
-#: ../pidgin/pidgintooltip.c:100
 msgid "Pidgin Tooltip"
 msgstr "Consejos de Pidgin"
 
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Emoticonos de Pidgin"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr "Pinguinos bonitos"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr "Si selecciona esta opci坦n deshabilitar叩 los emoticonos gr叩ficos."
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "ninguno"
 
-#: ../pidgin/plugins/cap/cap.c:441 ../pidgin/plugins/cap/cap.c:444
 msgid "Response Probability:"
 msgstr "Probabilidad de respuesta"
 
-#: ../pidgin/plugins/cap/cap.c:769
 msgid "Statistics Configuration"
 msgstr "Configuraci坦n de estad鱈sticas"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:772
 msgid "Maximum response timeout:"
 msgstr "Tiempo de espera m叩ximo para respuestas:"
 
-#: ../pidgin/plugins/cap/cap.c:775 ../pidgin/plugins/cap/cap.c:782
-#: ../pidgin/plugins/cap/cap.c:789 ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "minutos"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:779
 msgid "Maximum last-seen difference:"
 msgstr "Diferencia m叩xima de 束visto por 炭ltima vez損:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:786
 msgid "Threshold:"
 msgstr "Umbral:"
 
@@ -17537,47 +12938,37 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:894
 msgid "Contact Availability Prediction"
 msgstr "Predicci坦n de disponibilidad de contactos"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:896
 msgid "Contact Availability Prediction plugin."
 msgstr "Complemento de predicci坦n de disponibilidad de contactos."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:897
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Muestra informaci坦n estad鱈stica de la disponibilidad de sus amigos"
 
-#: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
 msgstr "El amigo est叩 inactivo"
 
-#: ../pidgin/plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr "El amigo est叩 ausente"
 
-#: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
 msgstr "El amigo est叩 en ausencia 束extendida損"
 
 #. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
 msgstr "El amigo est叩 m坦vil"
 
-#: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr "El amigo est叩 desconectado"
 
-#: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Valores a utilizar cuando..."
 
-#: ../pidgin/plugins/contact_priority.c:118
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
@@ -17585,11 +12976,9 @@
 "El amigo con el <i>mayor marcador</i> es el que tendr叩 prioridad en el "
 "contacto.\n"
 
-#: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr "Usar el 炭ltimo amigo cuando los marcadores sean iguales"
 
-#: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "Valores a utilizar para la cuenta..."
 
@@ -17599,14 +12988,12 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "Prioridad del contacto"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:191
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
@@ -17614,7 +13001,6 @@
 "amigos."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:193
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -17622,61 +13008,47 @@
 "Permite cambiar los puntos asignados a los estados inactivo/ausente/no "
 "disponible para los amigos en c叩lculos de prioridades de contacto."
 
-#: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Colores de conversaci坦n"
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "Personaliza los colores de la ventana de conversaci坦n"
 
-#: ../pidgin/plugins/convcolors.c:87
 msgid "Error Messages"
 msgstr "Mensajes de error"
 
-#: ../pidgin/plugins/convcolors.c:88
 msgid "Highlighted Messages"
 msgstr "Mensajes resaltados"
 
-#: ../pidgin/plugins/convcolors.c:89
 msgid "System Messages"
 msgstr "Mensaje del sistema"
 
-#: ../pidgin/plugins/convcolors.c:90
 msgid "Sent Messages"
 msgstr "Mensajes enviados"
 
-#: ../pidgin/plugins/convcolors.c:91
 msgid "Received Messages"
 msgstr "Mensajes recibidos"
 
-#: ../pidgin/plugins/convcolors.c:223 ../pidgin/plugins/pidginrc.c:257
 #, c-format
 msgid "Select Color for %s"
 msgstr "Seleccionar el color para %s"
 
-#: ../pidgin/plugins/convcolors.c:372
 msgid "Ignore incoming format"
 msgstr "Ignorar formato entrante"
 
-#: ../pidgin/plugins/convcolors.c:373
 msgid "Apply in Chats"
 msgstr "Aplicar en los chats"
 
-#: ../pidgin/plugins/convcolors.c:374
 msgid "Apply in IMs"
 msgstr "Aplicar en los MIs"
 
-#: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Por n炭mero de conversaciones"
 
-#: ../pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Localizaci坦n de la conversaci坦n"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
-#: ../pidgin/plugins/extplacement.c:105
 msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
@@ -17684,11 +13056,9 @@
 "Nota: La opci坦n para 束Nuevas conversaciones損 debe fijarse 束Por n炭mero de "
 "conversaciones損."
 
-#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "N炭mero de conversaciones por ventana"
 
-#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Separar ventanas de MIs y chats cuando se ubican por n炭mero"
 
@@ -17698,19 +13068,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "_Ubicaci坦nExt"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Opciones adicionales de ubicaci坦n de conversaciones."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -17719,20 +13086,16 @@
 "utilizar ventanas distintas para MIs y Chats"
 
 #. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Configuraci坦n de los gestos con el rat坦n"
 
-#: ../pidgin/plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Bot坦n central del rat坦n"
 
-#: ../pidgin/plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Bot坦n derecho del rat坦n"
 
 #. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "Mostrar gestos _visuales"
 
@@ -17742,19 +13105,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Gestos con el rat坦n"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Proporciona soporte para gestos con el rat坦n"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
 "Allows support for mouse gestures in conversation windows. Drag the middle "
 "mouse button to perform certain actions:\n"
@@ -17763,41 +13123,33 @@
 " �� Drag up and then to the right to switch to the next conversation."
 msgstr ""
 "A単ade soporte de gestos del rat坦n en las ventanas de conversaci坦n.\n"
-"Arrastre con el bot坦n central del rat坦n para realizar las siguientes acciones:\n"
+"Arrastre con el bot坦n central del rat坦n para realizar las siguientes "
+"acciones:\n"
 " �� Abajo y despu辿s a la derecha para cerrar una ventana de conversaci坦n.\n"
 " �� Arriba y despu辿s a la izquierda para cambiar a la conversaci坦n anterior.\n"
 " �� Arriba y despu辿s a la derecha para cambiar a la siguiente conversaci坦n."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Mensajer鱈a Instant叩neos"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:461
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Seleccione una persona de su agenda mostrada abajo, o a単ada una nueva "
 "persona."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:555
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:305
 msgid "Group:"
 msgstr "Grupo:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:252
 msgid "New Person"
 msgstr "Nueva persona"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
 msgid "Select Buddy"
 msgstr "Seleccionar amigo"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -17806,43 +13158,33 @@
 "nueva persona."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "_Detalles del usuario"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Asociar amigo"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:242
-#: ../pidgin/plugins/gevolution/gevolution.c:248
 msgid "Unable to send email"
 msgstr "No se pudo enviar el correo electr坦nico"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:243
 msgid "The evolution executable was not found in the PATH."
 msgstr "No se encontr坦 el ejecutable de Evolution en la ruta."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:249
 msgid "An email address was not found for this buddy."
 msgstr "No se ha encontrado una direcci坦n de correo para este amigo."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:275
 msgid "Add to Address Book"
 msgstr "A単adir a la agenda"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:287
 msgid "Send Email"
 msgstr "Enviar correo electr坦nico"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:414
 msgid "Evolution Integration Configuration"
 msgstr "Configuraci坦n de la integraci坦n con Evolution"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:417
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Seleccione todas las cuentas a los que los amigos se a単adir叩n de forma "
@@ -17854,7 +13196,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:529
 msgid "Evolution Integration"
 msgstr "Integraci坦n con Evolution"
 
@@ -17862,37 +13203,30 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:532
-#: ../pidgin/plugins/gevolution/gevolution.c:534
 msgid "Provides integration with Evolution."
 msgstr "Ofrece integraci坦n con Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "Introduzca la informaci坦n de la persona a continuaci坦n."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's username and account type below."
-msgstr "Introduzca a continuaci坦n el nombre de usuario de su amigo y el tipo de cuenta."
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
+msgstr ""
+"Introduzca a continuaci坦n el nombre de usuario de su amigo y el tipo de "
+"cuenta."
+
 msgid "Account type:"
 msgstr "Tipo de cuenta:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:313
 msgid "Optional information:"
 msgstr "Informaci坦n opcional:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:348
 msgid "First name:"
 msgstr "Nombre:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:360
 msgid "Last name:"
 msgstr "Apellidos:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:380
 msgid "Email:"
 msgstr "Correo electr坦nico:"
 
@@ -17902,7 +13236,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
 msgstr "Prueba de se単ales GTK"
 
@@ -17910,14 +13243,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gtk-signals-test.c:163
-#: ../pidgin/plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
 msgstr ""
 "Probar para ver si todas las se単ales de la interfaz de usuario funcionan "
 "correctamente."
 
-#: ../pidgin/plugins/gtkbuddynote.c:36
 #, c-format
 msgid ""
 "\n"
@@ -17926,7 +13256,6 @@
 "\n"
 "<b>Nota de amigo:</b> %s"
 
-#: ../pidgin/plugins/history.c:201
 msgid "History"
 msgstr "Hist坦rico"
 
@@ -17937,7 +13266,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Iconizar en ausencia"
 
@@ -17945,51 +13273,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr ""
 "Iconiza la lista de amigos y de conversaciones cuando usted est叩 ausente."
 
-#: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Comprobador de correo"
 
-#: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Comprueba si hay correo local nuevo."
 
-#: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
 "A単ade una peque単a caja a la lista de amigos que muestra si tiene nuevo "
 "correo."
 
-#: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "Subrayado"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr ""
 "Dibuja una l鱈nea para indicar que hay nuevos mensajes en una conversaci坦n."
 
-#: ../pidgin/plugins/markerline.c:240
 msgid "Jump to markerline"
 msgstr "Saltar al subrayado"
 
-#: ../pidgin/plugins/markerline.c:274
 msgid "Draw Markerline in "
 msgstr "Dibujar l鱈nea de marcador en "
 
-#: ../pidgin/plugins/markerline.c:278 ../pidgin/plugins/notify.c:693
 msgid "_IM windows"
 msgstr "Ventanas de M_I"
 
-#: ../pidgin/plugins/markerline.c:282 ../pidgin/plugins/notify.c:700
 msgid "C_hat windows"
 msgstr "Ventanas de _chat"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
@@ -17997,36 +13314,28 @@
 "Se ha solicitado una sesi坦n de mensajer鱈a musical. Por favor, seleccione el "
 "icono de MM para aceptarla."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr "Se ha confirmado la sesi坦n de mensajer鱈a musical."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Mensajer鱈a musical"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "Se ha producido un conflicto al ejecutar la orden:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "Error al ejecutar el editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "Ha ocurrido el siguiente error:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "Configuraci坦n de Mensajes de m炭sica"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "Ruta del editor de partituras"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "_Aplicar"
 
@@ -18038,12 +13347,10 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Complemento de mensajer鱈a musical para composici坦n colaborativa."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -18053,79 +13360,63 @@
 "tiempo real."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:689
 msgid "Notify For"
 msgstr "Notificar de"
 
-#: ../pidgin/plugins/notify.c:708
 msgid "\t_Only when someone says your username"
 msgstr "\t_S坦lo si alguien menciona su nombre de usuario"
 
-#: ../pidgin/plugins/notify.c:718
 msgid "_Focused windows"
 msgstr "Ventanas _enfocadas"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:726
 msgid "Notification Methods"
 msgstr "M辿todos de notificaci坦n"
 
-#: ../pidgin/plugins/notify.c:733
 msgid "Prepend _string into window title:"
 msgstr "Prefijar la _cadena en el t鱈tulo de la ventana:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:752
 msgid "Insert c_ount of new messages into window title"
 msgstr "Insertar el _n炭mero de mensajes nuevos en el t鱈tulo de la ventana"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:761
 msgid "Insert count of new message into _X property"
 msgstr "Insertar el n炭mero de mensajes nuevos en la propiedad _X"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:769
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Establecer pista 束_URGENTE損 del gestor de ventanas"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:778
 msgid "R_aise conversation window"
 msgstr "_Subir la ventana de conversaci坦n"
 
 #. Present conversation method button
-#: ../pidgin/plugins/notify.c:786
 msgid "_Present conversation window"
 msgstr "_Mostrar la ventana de conversaci坦n"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:794
 msgid "Notification Removal"
 msgstr "Eliminaci坦n de la notificaci坦n"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:799
 msgid "Remove when conversation window _gains focus"
 msgstr "Eliminar cuando la ventana de la conversaci坦n obtiene el _foco"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:806
 msgid "Remove when conversation window _receives click"
 msgstr "Eliminar cuando la ventana de la conversaci坦n _recibe una pulsaci坦n"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:814
 msgid "Remove when _typing in conversation window"
 msgstr "Eliminar cuando se _escriba en la ventana de la conversaci坦n"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:822
 msgid "Remove when a _message gets sent"
 msgstr "Eliminar cuando se env鱈e un _mensaje"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:831
 msgid "Remove on switch to conversation ta_b"
 msgstr "Eliminar al cambiar de _solapa de conversaci坦n"
 
@@ -18135,7 +13426,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:924
 msgid "Message Notification"
 msgstr "Notificaci坦n de mensajes"
 
@@ -18143,7 +13433,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:927 ../pidgin/plugins/notify.c:929
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Permite notificar de diversas formas la presencia de mensajes sin leer."
@@ -18154,19 +13443,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/pidgininc.c:91
 msgid "Pidgin Demonstration Plugin"
 msgstr "Complemento de demostraci坦n de Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "Un ejemplo de complemento que hace cosas - consulte la descripci坦n."
 
 #. *  description
-#: ../pidgin/plugins/pidgininc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -18179,56 +13465,44 @@
 "- Env鱈a un mensaje a las personas en su lista inmediatamente cuando se "
 "conectan"
 
-#: ../pidgin/plugins/pidginrc.c:49
 msgid "Cursor Color"
 msgstr "Color del puntero"
 
-#: ../pidgin/plugins/pidginrc.c:50
 msgid "Secondary Cursor Color"
 msgstr "Color secundario del puntero"
 
-#: ../pidgin/plugins/pidginrc.c:51
 msgid "Hyperlink Color"
 msgstr "Color de hiperenlace"
 
-#: ../pidgin/plugins/pidginrc.c:54
 msgid "Highlighted Message Name Color"
 msgstr "Color para mensajes resaltados por nombre"
 
-#: ../pidgin/plugins/pidginrc.c:66
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separaci坦n horizontal GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:81
 msgid "Conversation Entry"
 msgstr "Entrada de conversaciones"
 
-#: ../pidgin/plugins/pidginrc.c:82
 msgid "Request Dialog"
 msgstr "Di叩logo de solicitud"
 
-#: ../pidgin/plugins/pidginrc.c:83
 msgid "Notify Dialog"
 msgstr "Di叩logo de notificaci坦n"
 
-#: ../pidgin/plugins/pidginrc.c:259
 msgid "Select Color"
 msgstr "Seleccionar el color"
 
-#: ../pidgin/plugins/pidginrc.c:306
+#, c-format
 msgid "Select Interface Font"
 msgstr "Seleccionar tipograf鱈a de la interfaz"
 
-#: ../pidgin/plugins/pidginrc.c:309
 #, c-format
 msgid "Select Font for %s"
 msgstr "Seleccionar tipograf鱈a para %s"
 
-#: ../pidgin/plugins/pidginrc.c:377
 msgid "GTK+ Interface Font"
 msgstr "Tipograf鱈a de la interfaz GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:397
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atajos de teclado GTK+"
 
@@ -18252,50 +13526,39 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:434
 msgid "Interface colors"
 msgstr "Colores de la interfaz"
 
-#: ../pidgin/plugins/pidginrc.c:458
 msgid "Widget Sizes"
 msgstr "Tama単o de los controles"
 
-#: ../pidgin/plugins/pidginrc.c:479
 msgid "Fonts"
 msgstr "Tipograf鱈a"
 
-#: ../pidgin/plugins/pidginrc.c:503
 msgid "Gtkrc File Tools"
 msgstr "Herramientas de ficheros Gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:508
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Escribir la configuraci坦n en %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:517
 msgid "Re-read gtkrc files"
 msgstr "Volver a leer archivos de configuraci坦n gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:555
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Control de tema GTK+ de Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:557 ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr ""
 "Da acceso a los par叩metros de configuraci坦n de gtkrc que se utilizan "
 "habitualmente."
 
-#: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr "En bruto"
 
-#: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Le permite enviar datos en bruto a protocolos basados en texto."
 
-#: ../pidgin/plugins/raw.c:178
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -18304,7 +13567,6 @@
 "IRC,  TOC). Pulse 束Intro損 en la caja de entrada para enviarlo. Observe la "
 "ventana de depuraci坦n."
 
-#: ../pidgin/plugins/relnot.c:71
 #, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
@@ -18313,12 +13575,10 @@
 "Usted est叩 utilizado %s, versi坦n %s. La versi坦n actual es %s. Puede "
 "obtenerla de <a href=\"%s\">%s</a><hr>"
 
-#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Registro de cambios:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Nueva versi坦n disponible"
 
@@ -18328,19 +13588,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Notificaci坦n de versiones"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Comprueba peri坦dicamente la existencia de nuevas versiones."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -18356,87 +13613,70 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/sendbutton.c:138
 msgid "Send Button"
 msgstr "Bot坦n 束enviar損"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/sendbutton.c:140
 msgid "Conversation Window Send Button."
 msgstr "Bot坦n 束enviar損 de la ventana de conversaci坦n."
 
 #. *< summary
-#: ../pidgin/plugins/sendbutton.c:141
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for when no physical keyboard is present."
-msgstr "A単ade un bot坦n 束Enviar損 al 叩rea de entrada de datos de la ventana de conversaci坦n. �til para cuando no hay un teclado f鱈sico disponible."
-
-#: ../pidgin/plugins/spellchk.c:1970
+msgstr ""
+"A単ade un bot坦n 束Enviar損 al 叩rea de entrada de datos de la ventana de "
+"conversaci坦n. �til para cuando no hay un teclado f鱈sico disponible."
+
 msgid "Duplicate Correction"
 msgstr "Correcci坦n duplicada"
 
-#: ../pidgin/plugins/spellchk.c:1971
 msgid "The specified word already exists in the correction list."
 msgstr "La palabra espec鱈fica ya existe en la lista de correcci坦n."
 
-#: ../pidgin/plugins/spellchk.c:2184
 msgid "Text Replacements"
 msgstr "Reemplazos de texto"
 
-#: ../pidgin/plugins/spellchk.c:2207
 msgid "You type"
 msgstr "Usted escribe"
 
-#: ../pidgin/plugins/spellchk.c:2221
 msgid "You send"
 msgstr "Usted env鱈a"
 
-#: ../pidgin/plugins/spellchk.c:2235
 msgid "Whole words only"
 msgstr "Solamente palabras enteras"
 
-#: ../pidgin/plugins/spellchk.c:2247
 msgid "Case sensitive"
 msgstr "Distingue may炭sculas de min炭sculas"
 
-#: ../pidgin/plugins/spellchk.c:2273
 msgid "Add a new text replacement"
 msgstr "A単adir una regla nueva de reemplazo de texto"
 
-#: ../pidgin/plugins/spellchk.c:2289
 msgid "You _type:"
 msgstr "Usted _escribe:"
 
-#: ../pidgin/plugins/spellchk.c:2293
 msgid "You _send:"
 msgstr "Usted _env鱈a:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2296
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
 "Ajustar al formato _exacto (desmarcar para gestionar may炭sculas y min炭sculas "
 "autom叩ticamente)"
 
-#: ../pidgin/plugins/spellchk.c:2298
 msgid "Only replace _whole words"
 msgstr "Reemplazar solamente palabras _enteras"
 
-#: ../pidgin/plugins/spellchk.c:2323
 msgid "General Text Replacement Options"
 msgstr "Opciones de reemplazos de texto general"
 
-#: ../pidgin/plugins/spellchk.c:2324
 msgid "Enable replacement of last word on send"
 msgstr "Habilitar la sustituci坦n de la 炭ltima palabra al enviar"
 
-#: ../pidgin/plugins/spellchk.c:2357
 msgid "Text replacement"
 msgstr "Reemplazo de texto"
 
-#: ../pidgin/plugins/spellchk.c:2359 ../pidgin/plugins/spellchk.c:2360
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Reemplaza el texto de los mensajes salientes seg炭n las reglas definidas por "
@@ -18448,7 +13688,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Deslizante de amigos"
 
@@ -18456,11 +13695,9 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../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:135
 msgid "Display Timestamps Every"
 msgstr "Mostrar marcas de tiempo cada"
 
@@ -18470,50 +13707,39 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:200
 msgid "Timestamp"
 msgstr "Marca temporal"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:203
 msgid "Display iChat-style timestamps"
 msgstr "Mostrar marcas de tiempo al estilo iChat"
 
 #. *  description
-#: ../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."
 
-#: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
 msgstr "Opciones de formato de marca de tiempo"
 
 # 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"
 
-#: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
 msgstr "Mostrar las fechas en..."
 
-#: ../pidgin/plugins/timestamp_format.c:38
 msgid "Co_nversations:"
 msgstr "Co_nversaciones:"
 
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
 msgstr "Para mensajes diferidos"
 
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
 msgstr "Para mensajes diferidos y para chats"
 
-#: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
 msgstr "Registro de _mensajes:"
 
@@ -18523,19 +13749,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Formatos de marca de tiempo de mensajes"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Configura el formato de la marca de tiempo de mensajes."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -18543,44 +13766,32 @@
 "Este complemento permite al usuario configurar los formatos de marca de "
 "tiempo para los mensajes en conversaciones y guardados en el registro."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Opacidad:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Ventanas de conversaci坦n de MI"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "Transparencia de las ventanas de M_I"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "_Mostrar barra deslizante en la ventana MI"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Eliminar la transparencia de las ventanas MI al enfocar"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Siempre en primer plano"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Ventana de la lista de amigos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "Transparencia de la ventana de lista de _amigos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr ""
 "Eliminar la transparencia de la ventana de lista de amigos cuando se enfoca"
@@ -18591,19 +13802,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Transparencia"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparencia variable para la lista de amigos y las conversaciones."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -18615,55 +13823,44 @@
 "\n"
 "* Nota: Este complemento requiere Win2000 o superior."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "Versi坦n en ejecuci坦n de GTK+"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Inicio"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Iniciar %s al iniciar Windows"
 
 # Usar empotrable? (jfs)
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "Lista de amigos a_pilable "
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Mantener la ventana de lista de amigos por encima del resto"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Solamente cuando se apile"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "_Destello de ventana cuando se reciben mensajes de chat"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Opciones de Pidgwin en Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opciones espec鱈ficas de %s para Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
 "Contiene las opciones espec鱈ficas al Pidgin de Windows como el apilado de la "
 "lista de amigos."
 
-#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Desconectado.</font>"
 
@@ -18673,49 +13870,80 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../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:756
 msgid "Account: "
 msgstr "Cuenta: "
 
-#: ../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:793
 msgid "Insert an <iq/> stanza."
 msgstr "Introducir una entrada <iq/>."
 
-#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "Introducir una entrada <presence/>."
 
-#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "Insertar una entrada <messag/>."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../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:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento es 炭til para depurar clientes o servidores XMPP."
 
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "C坦digo [0x%02X]: %s"
+
+#~ msgid "Group Operation Error"
+#~ msgstr "Error de operaci坦n de grupo"
+
+#~ msgid "Error setting socket options"
+#~ msgstr "Error al establecer las opciones del socket"
+
+#~ 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"
+
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "臓Fall坦 la autenticaci坦n Windows Live!"
+
+#~ msgid "Too evil (sender)"
+#~ msgstr "Demasiado malvado (remitente)"
+
+#~ msgid "Too evil (receiver)"
+#~ msgstr "Demasiado malvado (destinatario)"
+
+#~ msgid "Available Message"
+#~ msgstr "Mensajes disponibles"
+
+#~ msgid "Away Message"
+#~ msgstr "Mensajes de ausencia"
+
+#~ msgid "<i>(retrieving)</i>"
+#~ msgstr " <i>(obteniendo)</i>"
+
+#~ msgid "Error requesting login token"
+#~ msgstr "Error al solicitar un testigo de conexi坦n"
+
+#~ msgid "TCP Address"
+#~ msgstr "Direcci坦n TCP"
+
+#~ msgid "UDP Address"
+#~ msgstr "Direcci坦n UDP"
+
 #~ msgid "Screen name:"
 #~ msgstr "Nombre de usuario:"
 
-#~ msgid "Screen Name"
-#~ msgstr "Nombre de usuario"
-
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "Alguien dice su nombre de usuario en el chat"
 
@@ -18880,9 +14108,6 @@
 #~ msgid "_Send To"
 #~ msgstr "_Enviar a"
 
-#~ msgid "_Smiley"
-#~ msgstr "_Emoticono"
-
 #~ msgid "Conversation History"
 #~ msgstr "Historial de conversaciones"
 
@@ -19110,9 +14335,9 @@
 #~ "autom叩tica global en el di叩logo de las opciones del complemento. Si "
 #~ "quiere establecer mensajes de respuesta particulares para un amigo s坦lo "
 #~ "tiene que pulsar con el bot坦n derecho sobre el amigo en la ventana con la "
-#~ "lista de amigos. Vaya a la pesta単a 束Avanzadas損 en el di叩logo de edici坦n "
-#~ "de cuentas si quiere configurar un mensaje de respuesta autom叩tica para "
-#~ "s坦lo alguna de sus cuentas."
+#~ "lista de amigos. Vaya a la pesta単a 束Avanzadas損 en el di叩logo de edici坦n de "
+#~ "cuentas si quiere configurar un mensaje de respuesta autom叩tica para s坦lo "
+#~ "alguna de sus cuentas."
 
 #~ msgid "Set autoreply message for %s"
 #~ msgstr "Fijar el mensaje de respuesta autom叩tica para %s"
@@ -20258,9 +15483,6 @@
 #~ msgid "Away m_essage:"
 #~ msgstr "_Mensaje de ausencia:"
 
-#~ msgid "Quit message"
-#~ msgstr "Mensaje de salida"
-
 #~ msgid "Restore Away State On Reconnect"
 #~ msgstr "Restaurar el estado de ausencia al reconectarse"
 
@@ -20423,8 +15645,7 @@
 #~ "Enviar un MI a un nombre de usuario:\n"
 #~ "\tgaim-remote uri 'aim:goim?screenname=Ping端ino&message=hola+mundo'\n"
 #~ "En este caso, 束Ping端ino損 es el nombre de usuario al que se le quiere\n"
-#~ "enviar un MI, y 束hola mundo損 es el mensaje a enviar. Se debe utilizar "
-#~ "'+'\n"
+#~ "enviar un MI, y 束hola mundo損 es el mensaje a enviar. Se debe utilizar '+'\n"
 #~ "en lugar de los espacios en blanco.\n"
 #~ "Por favor, tenga en cuenta el entrecomillado utilizado arriba. Si "
 #~ "ejecuta\n"
@@ -20467,9 +15688,6 @@
 #~ msgid "Show fewer options"
 #~ msgstr "Mostrar menos opciones"
 
-#~ msgid "/Tools/_Away"
-#~ msgstr "/Herramientas/_Ausentarse"
-
 #~ msgid "/Tools/Pl_ugin Actions"
 #~ msgstr "/Herramientas/Acciones del com_plemento"
 
@@ -21214,9 +16432,6 @@
 #~ msgid "_Browse"
 #~ msgstr "_Navegador"
 
-#~ msgid "_Reset"
-#~ msgstr "_Restablecer"
-
 #~ msgid "Show IMs and chats in _same tabbed window"
 #~ msgstr "Mo_strar MIs y chats en la misma ventana con solapas."