diff po/es.po @ 3450:5dfdf622bdf7

[gaim-migrate @ 3495] I'm tired. committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Tue, 27 Aug 2002 02:43:54 +0000
parents 3fa89049fe6c
children bf443ac50a07
line wrap: on
line diff
--- a/po/es.po	Mon Aug 26 05:29:45 2002 +0000
+++ b/po/es.po	Tue Aug 27 02:43:54 2002 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.60\n"
-"POT-Creation-Date: 2002-08-18 10:33-0700\n"
+"POT-Creation-Date: 2002-08-25 23:43-0400\n"
 "PO-Revision-Date: 2002-02-23 18:05+0100\n"
 "Last-Translator: Alex Villar <alx5000@terra.es>\n"
 "Language-Team:  <es@li.org>\n"
@@ -25,9 +25,9 @@
 
 #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:317 src/buddy.c:2690
 #: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
-#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
-#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1854
-#: src/prpl.c:448 src/prpl.c:695 src/server.c:1097
+#: src/conversation.c:2919 src/dialogs.c:1541 src/dialogs.c:4292
+#: src/multi.c:1078 src/plugins.c:347 src/prpl.c:450 src/prpl.c:697
+#: src/server.c:1097
 msgid "Close"
 msgstr "Cerrar"
 
@@ -40,16 +40,17 @@
 msgid "Refresh"
 msgstr "Refrescar"
 
+#. Put the buttons in the box
 #: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2802
-#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
-#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
-#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1566
+#: src/buddy_chat.c:1457 src/conversation.c:2436 src/conversation.c:2934
+#: src/dialogs.c:971 src/dialogs.c:1153 src/dialogs.c:1492 src/dialogs.c:1526
+#: src/dialogs.c:2521 src/multi.c:1062
 msgid "Add"
 msgstr "Añadir"
 
 #: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2804
-#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
-#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1578
+#: src/buddy_chat.c:1459 src/conversation.c:2422 src/conversation.c:2931
+#: src/dialogs.c:1496 src/dialogs.c:1530
 msgid "Remove"
 msgstr "Quitar"
 
@@ -73,6 +74,7 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
+#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -91,7 +93,7 @@
 msgid "Change"
 msgstr "Canal:"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1923
 msgid "Available"
 msgstr "En línea"
 
@@ -99,8 +101,8 @@
 msgid "Available for friends only"
 msgstr "Disponible sólo para los amigos"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
-#: src/applet.c:197 src/buddy.c:494 src/buddy.c:2556 src/buddy.c:2701
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1143 src/buddy.c:494
+#: src/buddy.c:2556 src/buddy.c:2701 src/prefs.c:812
 msgid "Away"
 msgstr "Ausente"
 
@@ -116,7 +118,7 @@
 msgid "Invisible for friends only"
 msgstr "Invisible sólo para los amigos"
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1139
 msgid "Unavailable"
 msgstr "No disponible"
 
@@ -150,7 +152,7 @@
 msgid "Unknown Error Code."
 msgstr "Código de error desconocido."
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2054
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
@@ -221,16 +223,6 @@
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "¡Se está intentando enviar un mensaje a un UIN inválido!"
 
-#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
-#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
-#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
-#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
-#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
-#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
-#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
-msgid "Gadu-Gadu Error"
-msgstr "Error de Gadu-Gadu"
-
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "No se pudieron obtener los resultados de la búsqueda"
@@ -276,109 +268,152 @@
 msgid "Sex"
 msgstr "Sexo"
 
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
+#. Line 5
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2050 src/dialogs.c:2758
 msgid "City"
 msgstr "Ciudad"
 
 #: src/protocols/gg/gg.c:761
-msgid "There is no Buddy List stored on server. Sorry!"
+#, fuzzy
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "¡Lo sentimos! No hay una lista de amigos almacenada en el servidor."
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:767
 msgid "Couldn't Import Buddies List from Server"
 msgstr "No se pudo importar la lista de amigos del servidor"
 
-#: src/protocols/gg/gg.c:815
+#: src/protocols/gg/gg.c:814
 #, fuzzy
-msgid "Buddy List successfully transferred to server"
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Se envío la lista de amigos correctamente al servidor"
 
-#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
-#: src/protocols/gg/gg.c:840
-msgid "Gadu-Gadu Information"
-msgstr "Información de Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:821
+#: src/protocols/gg/gg.c:819
 #, fuzzy
-msgid "Couldn't transfer Buddy List to server"
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "No se pudo enviar la lista de amigos al servidor"
 
-#: src/protocols/gg/gg.c:827
+#: src/protocols/gg/gg.c:825
 #, fuzzy
-msgid "Buddy List sucessfully deleted from server"
+msgid "Buddy List sucessfully deleted from Gadu-Gadu server"
 msgstr "La lista de amigos se borró correctamente del servidor"
 
-#: src/protocols/gg/gg.c:833
+#: src/protocols/gg/gg.c:830
 #, fuzzy
-msgid "Couldn't delete Buddy List from server"
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "No se pudo borrar la lista de amigos del servidor"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 #, fuzzy
 msgid "Password changed successfully"
 msgstr "La contraseña se cambió correctamente"
 
-#: src/protocols/gg/gg.c:845
+#: src/protocols/gg/gg.c:841
 msgid "Password couldn't be changed"
 msgstr "No se pudo cambiar la contraseña"
 
-#: src/protocols/gg/gg.c:956
-msgid "Couldn't send http request"
-msgstr "No se pudo enviar una petición http"
-
-#: src/protocols/gg/gg.c:982
-#, c-format
-msgid "Buddies List import from Server failed (%s)"
-msgstr "No se pudo importar la lista de amigos del servidor (%s)"
-
-#: src/protocols/gg/gg.c:1041
-#, c-format
-msgid "Buddies List export to Server failed (%s)"
-msgstr "No se pudo exportar la lista de amigos al servidor (%s)"
-
-#: src/protocols/gg/gg.c:1064
-#, c-format
-msgid "Deletion of Buddies List from Server failed (%s)"
-msgstr "Falló el borrado de amigos en el servidor (%s)"
-
-#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
-#, c-format
-msgid "Connect to search service failed (%s)"
-msgstr "Falló la conexión al servicio de búsqueda (%s)"
-
-#: src/protocols/gg/gg.c:1147
-#, c-format
-msgid "Changing Password failed (%s)"
-msgstr "Falló el cambio de Contraseña (%s)"
-
-#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:952
+msgid "Error communicating with Gadu-Gadu server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:953
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating to "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:980
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:981
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1038
+#, fuzzy
+msgid "Couldn't export buddy list"
+msgstr "No se pudo importar la lista de amigos del servidor"
+
+#: src/protocols/gg/gg.c:1039 src/protocols/gg/gg.c:1061
+msgid ""
+"Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1060
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1108
+#, fuzzy
+msgid "Unable to access directory"
+msgstr "No se pudo conectar a IM"
+
+#: src/protocols/gg/gg.c:1109
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please tryagain later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1141
+#, fuzzy
+msgid "Unable to change Gadu-Gadu password"
+msgstr "No se puede enviar la contraseña"
+
+#: src/protocols/gg/gg.c:1142
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+
+#: src/protocols/gg/gg.c:1152 src/protocols/gg/gg.c:1169
 msgid "Directory Search"
 msgstr "Búsqueda en el Directorio"
 
-#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
-#: src/dialogs.c:2153
+#.
+#. } else if (!strcmp(act, _("Set Dir Info"))) {
+#. show_set_dir(gc);
+#.
+#: src/protocols/gg/gg.c:1154 src/protocols/gg/gg.c:1171
+#: src/protocols/jabber/jabber.c:3957 src/protocols/jabber/jabber.c:3970
+#: src/dialogs.c:2167
 msgid "Change Password"
 msgstr "Cambiar Contraseña"
 
-#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#: src/protocols/gg/gg.c:1156 src/protocols/gg/gg.c:1173
 msgid "Import Buddies List from Server"
 msgstr "Importar Lista de Amigos del servidor"
 
-#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1174
 msgid "Export Buddies List to Server"
 msgstr "Exportar Lista de Amigos al Servidor"
 
-#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1175
 msgid "Delete Buddies List from Server"
 msgstr "Borrar Lista de Amigos del Servidor"
 
+#: src/protocols/gg/gg.c:1204
+#, fuzzy
+msgid "Unable to access user profile."
+msgstr "No se pudo leer archivo %s."
+
+#: src/protocols/gg/gg.c:1205
+msgid ""
+"Gaim was unable to access this users profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:233
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
 #: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "Enviar mensajes a través del servidor"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
+#: src/protocols/jabber/jabber.c:3045 src/protocols/oscar/oscar.c:3611
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Obtener Información"
@@ -394,20 +429,16 @@
 msgstr "<B>%s ha cambiado el topic a: %s</B>"
 
 #: src/protocols/irc/irc.c:825
-msgid "No such nick/channel"
-msgstr "No existe el apodo/canal"
-
-#: src/protocols/irc/irc.c:825 src/protocols/irc/irc.c:828
-#: src/protocols/irc/irc.c:830 src/protocols/irc/irc.c:1073
-msgid "IRC Error"
-msgstr "Error de IRC"
+msgid "There is no such nick or channel on this IRC channel."
+msgstr ""
 
 #: src/protocols/irc/irc.c:828
-msgid "No such server"
-msgstr "No existe el servidor"
+msgid "There is no such IRC Server"
+msgstr ""
 
 #: src/protocols/irc/irc.c:830
-msgid "No nickname given"
+#, fuzzy
+msgid "No IRC nickname given"
 msgstr "No se indicó un apodo"
 
 #: src/protocols/irc/irc.c:976
@@ -423,8 +454,8 @@
 msgstr "No se pudo escribir"
 
 #: src/protocols/irc/irc.c:1071
-#, c-format
-msgid "You have been kicked from %s: %s"
+#, fuzzy, c-format
+msgid "You have been kicked from %s:"
 msgstr "Ha sido expulsado de %s: %s"
 
 #: src/protocols/irc/irc.c:1076
@@ -437,10 +468,6 @@
 msgid "You have left %s"
 msgstr "Ha abandonado %s"
 
-#: src/protocols/irc/irc.c:1582
-msgid "IRC Part"
-msgstr "Salir de IRC"
-
 #: src/protocols/irc/irc.c:1671
 msgid "Channel:"
 msgstr "Canal:"
@@ -455,247 +482,268 @@
 msgstr "Hablar"
 
 #: src/protocols/jabber/jabber.c:950
-msgid "Incorrect current password! Password NOT Changed!"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
-msgid "Password Change Error!"
-msgstr "Gaim - Cambiar Contraseña"
-
-#: src/protocols/jabber/jabber.c:955
-msgid "New password same as old password! Password NOT Changed!"
+msgid "Unable to change password."
+msgstr "No se puede enviar la contraseña"
+
+#: src/protocols/jabber/jabber.c:951
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1115
+#: src/protocols/jabber/jabber.c:956
+#, fuzzy
+msgid "Unable to change password"
+msgstr "No se puede enviar la contraseña"
+
+#: src/protocols/jabber/jabber.c:957
+msgid ""
+"The new password you entered is the same as your current passord.  Your "
+"password remains the same."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1117
 #, fuzzy
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1145 src/protocols/jabber/jabber.c:1163
 #: src/buddy.c:2862
 msgid "Online"
 msgstr "Conectado"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1147
 msgid "Extended Away"
 msgstr "Ausencia Extendida"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1149
 msgid "Do Not Disturb"
 msgstr "No Molestar"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1347
+#, fuzzy, c-format
+msgid "Jabber Error %s"
+msgstr "Error de Mensaje"
+
+#: src/protocols/jabber/jabber.c:1459
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1462
 #, fuzzy
 msgid "Unknown Error in presence"
 msgstr "Código de error desconocido"
 
-#: src/protocols/jabber/jabber.c:1630
+#: src/protocols/jabber/jabber.c:1632
 #, fuzzy, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "El usuario %s (%s) quiere añadirle a su lista de amigos"
 
-#: src/protocols/jabber/jabber.c:1655
+#: src/protocols/jabber/jabber.c:1657
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1660
 #, fuzzy
-msgid "No such user"
+msgid "No such user."
 msgstr "No existe el usuario"
 
-#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
-#: src/protocols/jabber/jabber.c:2681
-#, fuzzy
-msgid "Jabber Error"
-msgstr "Error de Mensaje"
-
-#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
-#: src/dialogs.c:912
+#: src/protocols/jabber/jabber.c:1745 src/protocols/msn/msn.c:1114
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "Amigos"
 
-#: src/protocols/jabber/jabber.c:1805
+#: src/protocols/jabber/jabber.c:1808
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autorizando"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1845
 #, fuzzy
 msgid "Unknown login error"
 msgstr "Código de error desconocido."
 
-#: src/protocols/jabber/jabber.c:2033
+#: src/protocols/jabber/jabber.c:2036
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "La contraseña se cambió correctamente"
 
-#: src/protocols/jabber/jabber.c:2035
-#, fuzzy
-msgid "Password Change"
-msgstr "Gaim - Cambiar Contraseña"
-
-#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
+#: src/protocols/jabber/jabber.c:2080 src/protocols/jabber/jabber.c:3885
 #, fuzzy
 msgid "Connection lost"
 msgstr "Conexión Cerrada"
 
-#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
-#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
-#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
+#: src/protocols/jabber/jabber.c:2082 src/protocols/jabber/jabber.c:2114
+#: src/protocols/jabber/jabber.c:3887 src/protocols/jabber/jabber.c:3933
+#: src/protocols/msn/msn.c:1745 src/protocols/msn/msn.c:1774
 #, fuzzy
 msgid "Unable to connect"
 msgstr "No se pudo conectar."
 
-#: src/protocols/jabber/jabber.c:2085
+#: src/protocols/jabber/jabber.c:2088
 #, fuzzy
 msgid "Connected"
 msgstr "Conectado"
 
-#: src/protocols/jabber/jabber.c:2088
+#: src/protocols/jabber/jabber.c:2091
 #, fuzzy
 msgid "Requesting Authentication Method"
 msgstr "Falló la Autorización"
 
-#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2109 src/protocols/msn/msn.c:1766
 #, fuzzy
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
+#: src/protocols/jabber/jabber.c:2415
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:2417
 #, fuzzy
-msgid "Invalid Jabber I.D."
-msgstr "Usuario no válido"
-
-#: src/protocols/jabber/jabber.c:2648
+msgid "Jabber Error"
+msgstr "Error de Mensaje"
+
+#: src/protocols/jabber/jabber.c:2652
 msgid "Room:"
 msgstr "Sala:"
 
-#: src/protocols/jabber/jabber.c:2652
+#: src/protocols/jabber/jabber.c:2656
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/protocols/jabber/jabber.c:2657
+#: src/protocols/jabber/jabber.c:2661
 msgid "Handle:"
 msgstr "Gestor:"
 
-#: src/protocols/jabber/jabber.c:2714
+#: src/protocols/jabber/jabber.c:2685
+#, fuzzy
+msgid "Unable to join chat"
+msgstr "No se pudo conectar."
+
+#: src/protocols/jabber/jabber.c:2718
 #, fuzzy
 msgid "Chats"
 msgstr "Hablar"
 
-#: src/protocols/jabber/jabber.c:3029
+#: src/protocols/jabber/jabber.c:3033
 #, fuzzy
 msgid "View Error Msg"
 msgstr "Ver registro"
 
-#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/protocols/jabber/jabber.c:3050 src/protocols/oscar/oscar.c:3624
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Mensaje de Ausencia"
 
-#: src/protocols/jabber/jabber.c:3053
+#: src/protocols/jabber/jabber.c:3057
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3056
+#: src/protocols/jabber/jabber.c:3060
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3074
+#: src/protocols/jabber/jabber.c:3078
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3083
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "Notificación con un Popup"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3285
 #, fuzzy
 msgid "Full Name"
 msgstr "Nombre Completo"
 
-#: src/protocols/jabber/jabber.c:3282
+#: src/protocols/jabber/jabber.c:3286
 #, fuzzy
 msgid "Family Name"
 msgstr "Nombre"
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3287
 #, fuzzy
 msgid "Given Name"
 msgstr "Apellido de Soltera"
 
-#: src/protocols/jabber/jabber.c:3284
+#: src/protocols/jabber/jabber.c:3288
 #, fuzzy
 msgid "Nickname"
 msgstr "Apodo"
 
-#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
+#: src/protocols/jabber/jabber.c:3289 src/dialogs.c:2951
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3290
 msgid "Street Address"
 msgstr "Calle"
 
-#: src/protocols/jabber/jabber.c:3287
+#: src/protocols/jabber/jabber.c:3291
 msgid "Extended Address"
 msgstr "Dirección extendida"
 
-#: src/protocols/jabber/jabber.c:3288
+#: src/protocols/jabber/jabber.c:3292
 msgid "Locality"
 msgstr "Localidad"
 
-#: src/protocols/jabber/jabber.c:3289
+#: src/protocols/jabber/jabber.c:3293
 msgid "Region"
 msgstr "Región"
 
-#: src/protocols/jabber/jabber.c:3290
+#: src/protocols/jabber/jabber.c:3294
 msgid "Postal Code"
 msgstr "Código postal"
 
-#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
+#. Line 7
+#: src/protocols/jabber/jabber.c:3295 src/dialogs.c:2072 src/dialogs.c:2780
 msgid "Country"
 msgstr "País"
 
-#: src/protocols/jabber/jabber.c:3292
+#: src/protocols/jabber/jabber.c:3296
 #, fuzzy
 msgid "Telephone"
 msgstr "Numero de telefono"
 
-#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
+#: src/protocols/jabber/jabber.c:3297 src/dialogs.c:2856
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: src/protocols/jabber/jabber.c:3294
+#: src/protocols/jabber/jabber.c:3298
 msgid "Organization Name"
 msgstr "Nombre de empresa"
 
-#: src/protocols/jabber/jabber.c:3295
+#: src/protocols/jabber/jabber.c:3299
 msgid "Organization Unit"
 msgstr "Grupo de trabajo"
 
-#: src/protocols/jabber/jabber.c:3296
+#: src/protocols/jabber/jabber.c:3300
 msgid "Title"
 msgstr "Título"
 
-#: src/protocols/jabber/jabber.c:3297
+#: src/protocols/jabber/jabber.c:3301
 #, fuzzy
 msgid "Role"
 msgstr "Papel"
 
-#: src/protocols/jabber/jabber.c:3298
+#: src/protocols/jabber/jabber.c:3302
 #, fuzzy
 msgid "Birthday"
 msgstr "Año de nacimiento"
 
-#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
+#: src/protocols/jabber/jabber.c:3303 src/dialogs.c:2959
 msgid "Description"
 msgstr "Descripción"
 
-#: src/protocols/jabber/jabber.c:3324
+#: src/protocols/jabber/jabber.c:3328
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -703,24 +751,24 @@
 "Todos los campos siguientes son opcionales. Introduzca solo la "
 "informaciónque siente confortable compartir"
 
-#: src/protocols/jabber/jabber.c:3325
+#: src/protocols/jabber/jabber.c:3329
 #, fuzzy
 msgid "User Identity"
 msgstr "Información de Usuario"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/jabber.c:3741
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Editar datos en Jabber"
 
-#: src/protocols/jabber/jabber.c:3811
+#: src/protocols/jabber/jabber.c:3815
 msgid "Server Registration successful!"
 msgstr "Registro en el servidor efectuado exitosamente"
 
-#: src/protocols/jabber/jabber.c:3838
+#: src/protocols/jabber/jabber.c:3842
 msgid "Unknown registration error"
 msgstr "Error desconocido al registrar"
 
-#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
+#: src/protocols/jabber/jabber.c:3951 src/protocols/jabber/jabber.c:3966
 #, fuzzy
 msgid "Set User Info"
 msgstr "Información de Usuario"
@@ -885,108 +933,126 @@
 msgid "Unknown Error Code"
 msgstr "Código de error desconocido."
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "MSN Error"
-msgstr "Error de MSN"
-
 #: src/protocols/msn/msn.c:558
-msgid "A message may not have been received."
+#, fuzzy
+msgid "An MSN message may not have been received."
 msgstr "Puede que no se haya recibido un mensaje"
 
 #: src/protocols/msn/msn.c:815
-msgid "Gaim was unable to send a message"
+#, fuzzy
+msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim no pudo envíar el mensaje"
 
-#: src/protocols/msn/msn.c:919
+#: src/protocols/msn/msn.c:816
+msgid ""
+"Gaim encountered an error communicating with the MSN switchboard server.  "
+"Please try again later."
+msgstr ""
+
+#: src/protocols/msn/msn.c:921
 #, fuzzy, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "El usuario %s (%s) quiere añadirle a su lista de amigos"
 
-#: src/protocols/msn/msn.c:1076
+#: src/protocols/msn/msn.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "El usuario %s (%s) quiere añadirle a su lista de amigos"
 
-#: src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1179
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Ha sido desconectado al conectar desde otra ubicación"
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1683
 msgid "Error reading from server"
 msgstr "Error al leer del servidor"
 
-#: src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1572
 msgid "Requesting to send password"
 msgstr "Enviando contraseña"
 
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1622
 msgid "Unable to send password"
 msgstr "No se puede enviar la contraseña"
 
-#: src/protocols/msn/msn.c:1625
+#: src/protocols/msn/msn.c:1627
 msgid "Password sent"
 msgstr "Contraseña enviada"
 
-#: src/protocols/msn/msn.c:1750
+#: src/protocols/msn/msn.c:1752
 msgid "Unable to write to server"
 msgstr "No se puede escribir al servidor"
 
-#: src/protocols/msn/msn.c:1756
+#: src/protocols/msn/msn.c:1758
 msgid "Synching with server"
 msgstr "Redirigiendo al servidor"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 msgid "Away From Computer"
 msgstr "Ausente"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "Be Right Back"
 msgstr "Vuelvo enseguida"
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Busy"
 msgstr "No Disponible"
 
-#: src/protocols/msn/msn.c:1925
-msgid "On The Phone"
-msgstr "Al teléfono"
-
-#: src/protocols/msn/msn.c:1926
-msgid "Out To Lunch"
-msgstr "Salí a comer"
-
 #: src/protocols/msn/msn.c:1927
+msgid "On The Phone"
+msgstr "Al teléfono"
+
+#: src/protocols/msn/msn.c:1928
+msgid "Out To Lunch"
+msgstr "Salí a comer"
+
+#: src/protocols/msn/msn.c:1929
 msgid "Hidden"
 msgstr "Oculto"
 
-#: src/protocols/msn/msn.c:2043
+#: src/protocols/msn/msn.c:2045
 msgid "Reset friendly name"
 msgstr "Actualizar nombre"
 
-#: src/protocols/msn/msn.c:2116
-msgid "Friendly name too long."
+#: src/protocols/msn/msn.c:2118
+#, fuzzy
+msgid "New MSN friendly name too long."
 msgstr "Nombre demasiado largo"
 
-#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
+#: src/protocols/msn/msn.c:2133 src/protocols/msn/msn.c:2154
 msgid "Set Friendly Name"
 msgstr "Establecer nombre"
 
-#: src/protocols/msn/msn.c:2132
+#: src/protocols/msn/msn.c:2134
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "Establecer nombre"
 
-#: src/protocols/msn/msn.c:2133
+#: src/protocols/msn/msn.c:2135
 msgid "Reset All Friendly Names"
 msgstr "Actualizar todos los nombres"
 
-#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
-msgid "Invalid name"
-msgstr "Nombre no válido"
-
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
+#: src/protocols/msn/msn.c:2288
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your allow list."
+msgstr ""
+
+#: src/protocols/msn/msn.c:2291 src/protocols/msn/msn.c:2348
+#, fuzzy
+msgid "Invalid MSN screenname"
+msgstr "Nombre de usuario no válido"
+
+#: src/protocols/msn/msn.c:2345
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
+"meant %s@hotmail.com.  No changes were made to your block list."
+msgstr ""
+
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3227
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Unirse a qué grupo:"
@@ -1019,60 +1085,55 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "Ha sido desconectado de la sala: %s"
 
-#: src/protocols/oscar/oscar.c:395
-msgid "Chat Error!"
-msgstr "¡Error de Conversación!"
-
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
 msgstr "La conversación no está disponible"
 
-#: src/protocols/oscar/oscar.c:408
-msgid "Gaim - Chat"
-msgstr "Gaim - Conversaciones"
-
-#: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
+#: src/protocols/oscar/oscar.c:466 src/protocols/oscar/oscar.c:526
 msgid "Couldn't connect to host"
 msgstr "No se pudo conectar al host"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:474
 msgid "Password sent, waiting for response\n"
 msgstr "Contraseña enviada, esperando respuesta\n"
 
-#: src/protocols/oscar/oscar.c:508
+#: src/protocols/oscar/oscar.c:507
 msgid "internal connection error\n"
 msgstr "error interno de conexión\n"
 
-#: src/protocols/oscar/oscar.c:509
+#: src/protocols/oscar/oscar.c:508
 msgid "Unable to login to AIM"
 msgstr "No se pudo conectar a AIM"
 
-#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:513
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:585
 msgid "Signed off.\n"
 msgstr "Desconectado.\n"
 
-#: src/protocols/oscar/oscar.c:605 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:604 src/protocols/oscar/oscar.c:729
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:612
 msgid "Connection established, cookie sent"
 msgstr "Conexión establecida, cookie enviada"
 
-#: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:638 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "Nombre de cuenta o contraseña incorrecta."
 
-#: src/protocols/oscar/oscar.c:644
+#. Suspended account
+#: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
 msgstr "Su cuenta está deshabilitada actualmente."
 
-#: src/protocols/oscar/oscar.c:648
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:647
 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."
@@ -1081,26 +1142,49 @@
 "inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
 "tiempo."
 
-#: src/protocols/oscar/oscar.c:653
+#. client too old
+#: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr ""
 "La versión del cliente que usa es demasiado antigua. Por favor, actualícela "
 "en "
 
-#: src/protocols/oscar/oscar.c:657 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:656 src/protocols/toc/toc.c:542
 msgid "Authentication Failed"
 msgstr "Falló la Autorización"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:678
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:792
+#, fuzzy
+msgid "Gaim was Unable to get a valid AIM login hash."
+msgstr "Gaim no pudo envíar el mensaje"
+
+#: src/protocols/oscar/oscar.c:768 src/protocols/oscar/oscar.c:793
+#: src/protocols/oscar/oscar.c:875
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:794
+#: src/protocols/oscar/oscar.c:876
+msgid " for updates."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:874
+#, fuzzy
+msgid "Gaim was Unable to get valid login hash."
+msgstr "Gaim no pudo envíar el mensaje"
+
+#: src/protocols/oscar/oscar.c:1250 src/protocols/oscar/oscar.c:3438
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Se estableció un IM Directo con %s"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, fuzzy, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1111,123 +1195,111 @@
 "laSiguiente razon:\n"
 "\n"
 
-#: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:2456
 #, fuzzy
 msgid "No reason given."
 msgstr "No se indicó una razón"
 
-#: src/protocols/oscar/oscar.c:1505 src/protocols/oscar/oscar.c:2457
-msgid "Gaim - ICQ Authorization Denied"
+#: src/protocols/oscar/oscar.c:1507
+#, fuzzy
+msgid "ICQ authorization denied."
 msgstr "Gaim - Autorización ICQ negada"
 
-#: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:1513 src/protocols/oscar/oscar.c:2463
 #, fuzzy, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 "El usuario %d ha autorizado su petición de añadirlo a su lista de contactos"
 
-#: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464
-msgid "Gaim - ICQ Authorization Granted"
-msgstr "Gaim - Autorizacion ICQ aceptada"
-
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Usted perdió el mensaje %d de %s porque era inválido."
 
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1588
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Usted perdió %d mensajes de %s porque eran inválidos."
 
-#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:1597
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Usted perdió el mensaje %d de %s porque era demasiado grande."
 
-#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:1598
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Usted perdió %d mensajes de %s porque eran demasiado grandes."
 
-#: src/protocols/oscar/oscar.c:1605
+#: src/protocols/oscar/oscar.c:1607
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
 msgstr ""
 "Usted perdió el mensaje %d de %s porque se excedió el límite de cadencia."
 
-#: src/protocols/oscar/oscar.c:1606
+#: src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
 msgstr ""
 "Usted perdió %d mensajes de %s porque se excedió el límite de cadencia."
 
-#: src/protocols/oscar/oscar.c:1615
+#: src/protocols/oscar/oscar.c:1617
 #, c-format
 msgid "You missed %d message from %s because it was too evil."
 msgstr "Usted perdió el mensaje %d de %s porque era demasiado malvado."
 
-#: src/protocols/oscar/oscar.c:1616
+#: src/protocols/oscar/oscar.c:1618
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Usted perdió %d mensajes de %s porque son demasiado malvados."
 
-#: src/protocols/oscar/oscar.c:1625
+#: src/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Usted perdió %d mensajes de %s porque es demasiado malvado."
 
-#: src/protocols/oscar/oscar.c:1626
+#: src/protocols/oscar/oscar.c:1628
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Usted perdió %d mensajes de %s porque es demasiado malvado."
 
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1636
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Usted perdió el mensaje %d de %s por motivos desconocidos."
 
-#: src/protocols/oscar/oscar.c:1635
+#: src/protocols/oscar/oscar.c:1637
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Usted perdió %d mensajes de %s por motivos desconocidos."
 
-#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
-msgid "Gaim - Error"
-msgstr "Error de Gaim"
-
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1705
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1705
+#: src/protocols/oscar/oscar.c:1707
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1734
+#: src/protocols/oscar/oscar.c:1736
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC envió el error: %s\n"
 
-#: src/protocols/oscar/oscar.c:1736
-msgid "Gaim - Oscar SNAC Error"
-msgstr "Gaim - Error de OSCAR SNAC"
-
-#: src/protocols/oscar/oscar.c:1753
+#: src/protocols/oscar/oscar.c:1755
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Su mensaje a %s no fué enviado: %s"
 
-#: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
-msgid "Reason unknown"
-msgstr "Motivo desconocido"
-
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1756 src/protocols/oscar/oscar.c:1773
+#, fuzzy
+msgid "No reason was given."
+msgstr "No se indicó una razón"
+
+#: src/protocols/oscar/oscar.c:1772
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Información de usuario de %s no disponible: %s"
@@ -1339,50 +1411,87 @@
 msgstr "<i>No se aportó información</i>"
 
 #: src/protocols/oscar/oscar.c:1989
-msgid "Your connection may be lost."
+#, fuzzy
+msgid "Your AIM connection may be lost."
 msgstr "Su conexión puede haberse perdido."
 
-#: src/protocols/oscar/oscar.c:1990
-msgid "AOL error"
-msgstr "Error de AOL"
+#: src/protocols/oscar/oscar.c:2224
+msgid "Rate limiting error."
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:2225
+#, fuzzy
 msgid ""
-"The last message was not sent because you are over the rate limit. Please "
+"The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "El último mensaje no se envió, por haber superado el límite de cadencia. Por "
 "favor, espere 10 segundos y vuelva a intentarlo."
 
-#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
-msgid "Error"
-msgstr "Error"
-
-#: src/protocols/oscar/oscar.c:3207
+#: src/protocols/oscar/oscar.c:2457
+#, fuzzy
+msgid "ICQ Authorization denied"
+msgstr "Gaim - Autorización ICQ negada"
+
+#: src/protocols/oscar/oscar.c:2464
+#, fuzzy
+msgid "ICQ Authorization Granted"
+msgstr "Gaim - Autorizacion ICQ aceptada"
+
+#: src/protocols/oscar/oscar.c:2791
+#, fuzzy
+msgid "Unable to set AIM profile."
+msgstr "No se pudo leer archivo %s."
+
+#: src/protocols/oscar/oscar.c:2792
+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 "
+"fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2798
+#, c-format
+msgid ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated and set it."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to set AIM away message."
+msgstr "Gaim no pudo envíar el mensaje"
+
+#: src/protocols/oscar/oscar.c:2819
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2834
+#, c-format
+msgid ""
+"The away message length of %d bytes has been exceeded.  Gaim has truncated "
+"it and set you away."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3210
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3210
-#, fuzzy
-msgid "Gaim - Warning"
-msgstr "Gaim - ¿Advertir al usuario?"
-
-#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3231 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Intercambio:"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3559
 msgid "Unable to open Direct IM"
 msgstr "No se pudo conectar a IM"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3569
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1393,30 +1502,30 @@
 "permitirá ver su dirección IP y puede ser un riesgo de seguridad. ¿Desea "
 "continuar?"
 
-#: src/protocols/oscar/oscar.c:3583
+#: src/protocols/oscar/oscar.c:3586
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3618
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "Mensaje de Ausencia"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3631
 msgid "Direct IM"
 msgstr "IM Directo"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3639
 msgid "Get Capabilities"
 msgstr "Obtener funcionalidades"
 
@@ -1551,49 +1660,43 @@
 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."
 
-#: src/protocols/toc/toc.c:599
-msgid "TOC Resume"
-msgstr "Continúar con el TOC"
-
-#: src/protocols/toc/toc.c:763
-msgid "Chat Error"
-msgstr "Error de Conversación"
-
 #: src/protocols/toc/toc.c:782
 #, fuzzy
 msgid "Password Change Successful"
 msgstr "Se cambió la Contraseña con éxito"
 
-#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
-msgid "Gaim - Password Change"
-msgstr "Gaim - Cambiar Contraseña"
+#: src/protocols/toc/toc.c:785
+msgid "TOC has sent a PAUSE command."
+msgstr ""
 
 #: src/protocols/toc/toc.c:785
+#, fuzzy
 msgid ""
-"TOC has sent a PAUSE command. When this happens, TOC ignores any messages "
-"sent to it, and may kick you off if you send a message. Gaim will prevent "
-"anything from going through. This is only temporary, please be patient."
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
 msgstr ""
 "TOC ha enviado la orden de PAUSA. Cuando esto ocurre, TOC ignora todos los "
 "mensajes que se le envían y puede expulsarle si envía mensajes. Gaim evitará "
 "que le llegue nada. Esto es sólo temporal, por favor, sea paciente."
 
-#: src/protocols/toc/toc.c:788
-msgid "TOC Pause"
-msgstr "Pausa de TOC"
-
 #: src/protocols/toc/toc.c:1225
 msgid "Get Dir Info"
 msgstr "Obtener Información del Directorio"
 
 #: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1888
+#: src/protocols/toc/toc.c:1888
+#, fuzzy
+msgid "Could not connect for transfer."
+msgstr "¡No se pudo conectar para realizar la transferencia!"
+
+#: src/protocols/toc/toc.c:1802
 msgid "Could not connect for transfer!"
 msgstr "¡No se pudo conectar para realizar la transferencia!"
 
 #: src/protocols/toc/toc.c:1832
-msgid "Could not write file header!"
-msgstr "¡No se pudo escribir la cabecera del archivo!"
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
 
 #: src/protocols/toc/toc.c:1921
 msgid "Gaim - Save As..."
@@ -1615,22 +1718,23 @@
 msgstr "%s le pide que le mande un archivo"
 
 #: src/protocols/yahoo/yahoo.c:594
-msgid "Your message did not get sent."
+#, fuzzy
+msgid "Your Yahoo! message did not get sent."
 msgstr "Su mensaje no se envió."
 
-#: src/protocols/zephyr/zephyr.c:840
+#: src/protocols/zephyr/zephyr.c:841
 msgid "ZLocate"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:878
 msgid "Class:"
 msgstr "Clase:"
 
-#: src/protocols/zephyr/zephyr.c:881
+#: src/protocols/zephyr/zephyr.c:882
 msgid "Instance:"
 msgstr "Instancia:"
 
-#: src/protocols/zephyr/zephyr.c:885
+#: src/protocols/zephyr/zephyr.c:886
 msgid "Recipient:"
 msgstr "Destinatario:"
 
@@ -1655,10 +1759,11 @@
 "URL: "
 
 #: src/about.c:137
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"IRC: #gaim on irc.openprojects.net"
+"IRC: #gaim on irc.freenode.net"
 msgstr ""
 "\n"
 "\n"
@@ -1703,6 +1808,9 @@
 "Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
 "Mark Spencer (autor original)      [ markster@marko.net ]"
 
+#. this makes the sizes not work.
+#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "Página Web"
@@ -1712,13 +1820,10 @@
 msgstr "Desconectar"
 
 #: src/aim.c:162
-msgid "Please enter your logon"
+#, fuzzy
+msgid "Please enter your login."
 msgstr "Por favor, indique su nombre de cuenta"
 
-#: src/aim.c:162 src/multi.c:1407 src/server.c:55
-msgid "Signon Error"
-msgstr "Error de Conexión"
-
 #: src/aim.c:260
 msgid "Gaim - Login"
 msgstr "Conexión - Gaim"
@@ -1759,40 +1864,11 @@
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: src/aim.c:841 src/multi.c:1479
+#: src/aim.c:841 src/multi.c:1481
 #, fuzzy
 msgid "Auto-login"
 msgstr "Auto Conectarse"
 
-#: src/applet.c:109
-msgid "Attempting to sign on...."
-msgstr "Tratando de conectar..."
-
-#: src/applet.c:112
-msgid "Offline. Click to bring up login box."
-msgstr "Desconectado. Haga click para abrir ventana para conectarse."
-
-#: src/applet.c:128
-#, c-format
-msgid "Away: %d pending."
-msgstr "Ausente: %d en espera."
-
-#: src/applet.c:131
-msgid "Away."
-msgstr "Ausente."
-
-#: src/applet.c:200 src/away.c:388
-msgid "New Away Message"
-msgstr "Nuevo Mensaje de Ausencia"
-
-#: src/applet.c:348
-msgid "Can't create Gaim applet!"
-msgstr "No pudo crearse el programa Gaim"
-
-#: src/applet.c:368
-msgid "About..."
-msgstr "Acerca de..."
-
 #: src/away.c:202
 msgid "Gaim - Away!"
 msgstr "Gaim - Ausente!"
@@ -1805,6 +1881,10 @@
 msgid "Back"
 msgstr "Retroceder"
 
+#: src/away.c:388
+msgid "New Away Message"
+msgstr "Nuevo Mensaje de Ausencia"
+
 #: src/away.c:408
 msgid "Remove Away Message"
 msgstr "Quitar Mensaje de Ausencia"
@@ -1813,7 +1893,7 @@
 msgid "Set All Away"
 msgstr "Ausente en todas las cuentas"
 
-#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:967 src/dialogs.c:1114
+#: src/buddy.c:490 src/buddy.c:2803 src/dialogs.c:981 src/dialogs.c:1128
 msgid "Group"
 msgstr "Grupo"
 
@@ -1823,12 +1903,13 @@
 msgstr "Mensaje"
 
 #: src/buddy.c:497 src/buddy.c:2554 src/buddy_chat.c:880 src/buddy_chat.c:1289
-#: src/buddy_chat.c:1465 src/conversation.c:2922
+#: src/buddy_chat.c:1465 src/conversation.c:2952
 msgid "Info"
 msgstr "Información"
 
-#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1106 src/dialogs.c:3836
-#: src/dialogs.c:3851
+#. Put the buttons in the box
+#: src/buddy.c:653 src/buddy.c:823 src/dialogs.c:1120 src/dialogs.c:3851
+#: src/dialogs.c:3866
 msgid "Alias"
 msgstr "Alias"
 
@@ -1848,10 +1929,6 @@
 msgid "Un-Alias"
 msgstr "Quitar Alias"
 
-#: src/buddy.c:1629 src/buddy.c:2706
-msgid "Buddy Pounce"
-msgstr "Aviso de Amigo"
-
 #: src/buddy.c:1709
 msgid "New Buddy Pounce"
 msgstr "Nuevo Aviso de Amigo"
@@ -1908,7 +1985,7 @@
 msgid "Information on selected Buddy"
 msgstr "Información sobre el Amigo seleccionado"
 
-#: src/buddy.c:2589 src/dialogs.c:722
+#: src/buddy.c:2589 src/dialogs.c:736
 msgid "Send Instant Message"
 msgstr "Mandar Mensaje Instantáneo"
 
@@ -1936,7 +2013,7 @@
 msgid "New Instant Message"
 msgstr "Nuevo Mensaje Instantáneo"
 
-#: src/buddy.c:2673 src/dialogs.c:784
+#: src/buddy.c:2673 src/dialogs.c:798
 msgid "Get User Info"
 msgstr "Información de Usuario"
 
@@ -1948,6 +2025,10 @@
 msgid "Tools"
 msgstr "Herramientas"
 
+#: src/buddy.c:2706
+msgid "Buddy Pounce"
+msgstr "Aviso de Amigo"
+
 #: src/buddy.c:2719
 msgid "Protocol Actions"
 msgstr "Acciones del Protocolo"
@@ -1994,7 +2075,7 @@
 msgid "About Gaim"
 msgstr "Acerca de Gaim"
 
-#: src/buddy.c:2782 src/prefs.c:1660
+#: src/buddy.c:2782 src/prefs.c:1307
 msgid "Buddy List"
 msgstr "Lista de Amigos"
 
@@ -2027,12 +2108,12 @@
 msgstr "Unirse a Conversación como:"
 
 #: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
-#: src/dialogs.c:541 src/dialogs.c:740 src/dialogs.c:841 src/dialogs.c:959
-#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
-#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
-#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
-#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:160 src/prpl.c:234
+#: src/dialogs.c:541 src/dialogs.c:754 src/dialogs.c:855 src/dialogs.c:973
+#: src/dialogs.c:1149 src/dialogs.c:1899 src/dialogs.c:2104 src/dialogs.c:2228
+#: src/dialogs.c:2288 src/dialogs.c:2510 src/dialogs.c:2692 src/dialogs.c:2867
+#: src/dialogs.c:2938 src/dialogs.c:3601 src/dialogs.c:3853 src/dialogs.c:4034
+#: src/dialogs.c:4409 src/dialogs.c:4515 src/dialogs.c:5199 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:162 src/prpl.c:236
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -2045,7 +2126,7 @@
 msgid "Invite"
 msgstr "Invitar"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
+#: src/buddy_chat.c:412 src/dialogs.c:1727 src/dialogs.c:3861
 msgid "Buddy"
 msgstr "Amigo"
 
@@ -2061,10 +2142,11 @@
 msgid "Un-Ignore"
 msgstr "No Ignorar"
 
-#: src/buddy_chat.c:873 src/buddy_chat.c:1285
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285 src/prefs.c:379
 msgid "Ignore"
 msgstr "Ignorar"
 
+#. don't remove them from ignored in case they re-enter
 #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
 #: src/buddy_chat.c:1544
 #, c-format
@@ -2108,15 +2190,15 @@
 msgstr "Susurrar"
 
 #: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
-#: src/conversation.c:2933
+#: src/conversation.c:2963
 msgid "Send"
 msgstr "Enviar"
 
-#: src/buddy_chat.c:1461 src/conversation.c:2910
+#: src/buddy_chat.c:1461 src/conversation.c:2940
 msgid "Block"
 msgstr "Bloquear"
 
-#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/buddy_chat.c:1463 src/conversation.c:2946 src/dialogs.c:426
 #: src/dialogs.c:455
 msgid "Warn"
 msgstr "Advertir"
@@ -2131,16 +2213,14 @@
 msgstr "Gaim - Insertar Imagen"
 
 #: src/conversation.c:1336
-msgid "Unable to send message: too large"
+#, fuzzy
+msgid "Unable to send message.  The message is too large"
 msgstr "No se pudo enviar el mensaje: Demasiado grande"
 
-#: src/conversation.c:1336 src/conversation.c:1340
-msgid "Message Error"
-msgstr "Error de Mensaje"
-
 #: src/conversation.c:1340
-msgid "Unable to send message: Unknown reason"
-msgstr "No se pudo enviar el mensaje: Motivo desconocido"
+#, fuzzy
+msgid "Unable to send message"
+msgstr "No se pudo enviar el mensaje: Demasiado grande"
 
 #: src/conversation.c:1559
 #, fuzzy, c-format
@@ -2152,159 +2232,159 @@
 msgid "Setting position to %d\n"
 msgstr "Moviendo posición a %d\n"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2217
 msgid "Bold Text"
 msgstr "Texto en Negrita"
 
-#: src/conversation.c:2187 src/prefs.c:308
+#: src/conversation.c:2217
 msgid "Bold"
 msgstr "Negrita"
 
-#: src/conversation.c:2191
+#: src/conversation.c:2221
 msgid "Italics Text"
 msgstr "Texto Inclinado"
 
-#: src/conversation.c:2192 src/prefs.c:309
+#: src/conversation.c:2222
 msgid "Italics"
 msgstr "Inclinado"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2225
 msgid "Underline Text"
 msgstr "Subrayar Texto"
 
-#: src/conversation.c:2196 src/prefs.c:310
+#: src/conversation.c:2226
 msgid "Underline"
 msgstr "Subrayar"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike through Text"
 msgstr "Tachar el Texto"
 
-#: src/conversation.c:2200
+#: src/conversation.c:2230
 msgid "Strike"
 msgstr "Tachar"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Decrease font size"
 msgstr "Disminuir tamaño de fuente"
 
-#: src/conversation.c:2206
+#: src/conversation.c:2236
 msgid "Small"
 msgstr "Pequeño"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal font size"
 msgstr "Tamaño de fuente normal"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2239
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Increase font size"
 msgstr "Incrementar tamaño de fuente"
 
-#: src/conversation.c:2212
+#: src/conversation.c:2242
 msgid "Big"
 msgstr "Grande"
 
-#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
+#: src/conversation.c:2249 src/dialogs.c:3253 src/dialogs.c:3277
 msgid "Select Font"
 msgstr "Seleccionar fuente"
 
-#: src/conversation.c:2220
+#: src/conversation.c:2250
 msgid "Font"
 msgstr "Fuente"
 
-#: src/conversation.c:2223
+#: src/conversation.c:2253
 msgid "Text Color"
 msgstr "Color del texto"
 
-#: src/conversation.c:2224 src/conversation.c:2228
+#: src/conversation.c:2254 src/conversation.c:2258 src/prefs.c:329
 msgid "Color"
 msgstr "Color"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2258
 msgid "Background Color"
 msgstr "Color del fondo"
 
-#: src/conversation.c:2235 src/dialogs.c:2918
+#: src/conversation.c:2265 src/dialogs.c:2932
 msgid "Insert Link"
 msgstr "Insertar Enlace"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2266
 msgid "Link"
 msgstr "Enlace"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Insert smiley face"
 msgstr "Insertar smiley"
 
-#: src/conversation.c:2239
+#: src/conversation.c:2269
 msgid "Smiley"
 msgstr "Smiley"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "Imagen de IM"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2272
 #, fuzzy
 msgid "Image"
 msgstr "Imagen"
 
-#: src/conversation.c:2249
+#: src/conversation.c:2279
 msgid "Enable logging"
 msgstr "Habilitar registro"
 
-#: src/conversation.c:2250 src/prefs.c:1667
+#: src/conversation.c:2280 src/prefs.c:1314
 msgid "Logging"
 msgstr "Registro"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2289
 msgid "Save Conversation"
 msgstr "Guardar Conversación"
 
-#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
-#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
+#: src/conversation.c:2290 src/dialogs.c:2108 src/dialogs.c:2292
+#: src/dialogs.c:3613 src/dialogs.c:4301 src/dialogs.c:5207
 msgid "Save"
 msgstr "Guardar"
 
-#: src/conversation.c:2264
+#: src/conversation.c:2294
 #, fuzzy
 msgid "Toggle Sound"
 msgstr "Habilitar/Deshabilitar Registro"
 
-#: src/conversation.c:2265
+#: src/conversation.c:2295
 msgid "Sound"
 msgstr "Sonido"
 
-#: src/conversation.c:2752
+#: src/conversation.c:2782
 msgid "Gaim - Conversations"
 msgstr "Gaim - Conversaciones"
 
-#: src/conversation.c:2839
+#: src/conversation.c:2869
 msgid "Send message as: "
 msgstr "Enviar mensaje como:"
 
-#: src/conversation.c:3503
+#: src/conversation.c:3533
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Guardar Icono"
 
-#: src/conversation.c:3537
+#: src/conversation.c:3567
 msgid "Disable Animation"
 msgstr "Deshabilitar Animaciones"
 
-#: src/conversation.c:3548
+#: src/conversation.c:3578
 msgid "Enable Animation"
 msgstr "Habilitar Animaciones"
 
-#: src/conversation.c:3554
+#: src/conversation.c:3584
 msgid "Hide Icon"
 msgstr "Ocultar Icono"
 
-#: src/conversation.c:3560
+#: src/conversation.c:3590
 msgid "Save Icon As..."
 msgstr "Guardar Icono Como..."
 
@@ -2348,386 +2428,407 @@
 "Está a punto de borrar a '%s' \n"
 "de su lista de amigos. ¿Desea continuar?"
 
-#: src/dialogs.c:531 src/prpl.c:164 src/prpl.c:238
+#: src/dialogs.c:531 src/prpl.c:166 src/prpl.c:240
 msgid "Accept"
 msgstr "Aceptar"
 
-#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
-#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
-#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
-#: src/prefs.c:1831
+#. Build OK Button
+#: src/dialogs.c:674 src/dialogs.c:759 src/dialogs.c:860 src/dialogs.c:1903
+#: src/dialogs.c:2232 src/dialogs.c:2383 src/dialogs.c:2691 src/dialogs.c:2871
+#: src/dialogs.c:2937 src/dialogs.c:4414 src/dialogs.c:4520 src/multi.c:786
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:726
 msgid "Gaim - IM user"
 msgstr "Gaim - Usuario de IM"
 
-#: src/dialogs.c:729
+#: src/dialogs.c:743
 msgid "IM who:"
 msgstr "Quien: "
 
-#: src/dialogs.c:793
+#: src/dialogs.c:807
 msgid "User:"
 msgstr "Usuario:"
 
-#: src/dialogs.c:802
+#: src/dialogs.c:816
 #, fuzzy
 msgid "Account:"
 msgstr "Cuenta"
 
-#: src/dialogs.c:851
+#. Finish up
+#: src/dialogs.c:865
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Obtener Información del Usuario"
 
-#: src/dialogs.c:965
+#: src/dialogs.c:979
 msgid "Add Group"
 msgstr "Añadir Grupo"
 
-#: src/dialogs.c:990
+#: src/dialogs.c:1004
 msgid "Gaim - Add Group"
 msgstr "Gaim - Añadir Grupo"
 
-#: src/dialogs.c:1074
+#: src/dialogs.c:1088
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Añadir Amigo"
 
-#: src/dialogs.c:1086
+#: src/dialogs.c:1100
 msgid "Add Buddy"
 msgstr "Añadir Amigo"
 
-#: src/dialogs.c:1096
+#: src/dialogs.c:1110
 msgid "Contact"
 msgstr "Contacto"
 
-#: src/dialogs.c:1122
+#. Set up stuff for the account box
+#: src/dialogs.c:1136
 msgid "Add To"
 msgstr "Añadir a"
 
-#: src/dialogs.c:1417
+#: src/dialogs.c:1431
 #, fuzzy
 msgid "Gaim - Privacy"
 msgstr "Gaim - Ausente!"
 
-#: src/dialogs.c:1429
+#: src/dialogs.c:1443
 msgid "Privacy settings are affected immediately."
 msgstr ""
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1451
 msgid "Set privacy for:"
 msgstr "Privacidad para"
 
-#: src/dialogs.c:1456
+#: src/dialogs.c:1470
 msgid "Allow all users to contact me"
 msgstr "Permitir que todos los usuarios me contacten"
 
-#: src/dialogs.c:1457
+#: src/dialogs.c:1471
 msgid "Allow only the users below"
 msgstr "Permitir sólo a los siguientes usuarios"
 
-#: src/dialogs.c:1459
+#: src/dialogs.c:1473
 msgid "Allow List"
 msgstr "Lista de Usuarios Permitidos"
 
-#: src/dialogs.c:1490
+#: src/dialogs.c:1504
 msgid "Deny all users"
 msgstr "Negar a todos"
 
-#: src/dialogs.c:1491
+#: src/dialogs.c:1505
 msgid "Block the users below"
 msgstr "Bloquear los siguientes usuarios"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1507
 msgid "Block List"
 msgstr "Lista de Bloqueados"
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1560
 msgid "Please enter a buddy to pounce."
 msgstr "Por favor indique el amigo con aviso."
 
-#: src/dialogs.c:1546
-msgid "Buddy Pounce Error"
-msgstr "Error en Aviso de Amigo"
-
-#: src/dialogs.c:1682
+#: src/dialogs.c:1696
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nuevo Aviso de Amigo"
 
-#: src/dialogs.c:1693
+#. <pounce type="who">
+#: src/dialogs.c:1707
 msgid "Pounce Who"
 msgstr "Avisar a quién"
 
-#: src/dialogs.c:1704
+#: src/dialogs.c:1718
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/dialogs.c:1730
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1744
 msgid "Pounce When"
 msgstr "Avisar Cuándo"
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1754
 msgid "Pounce on sign on"
 msgstr "Aviso al conectarse"
 
-#: src/dialogs.c:1749
+#: src/dialogs.c:1763
 msgid "Pounce on return from away"
 msgstr "Aviso al dejar de estar ausente"
 
-#: src/dialogs.c:1758
+#: src/dialogs.c:1772
 msgid "Pounce on return from idle"
 msgstr "Aviso al dejar de estar inactivo"
 
-#: src/dialogs.c:1767
+#: src/dialogs.c:1781
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "Aviso cuando el amigo le esté escribiendo"
 
-#: src/dialogs.c:1777
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1791
 msgid "Pounce Action"
 msgstr "Acción del Aviso"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1802
 msgid "Open IM Window"
 msgstr "Abrir Ventana de Mensage"
 
-#: src/dialogs.c:1797
+#: src/dialogs.c:1811
 msgid "Popup Notification"
 msgstr "Notificación con un Popup"
 
-#: src/dialogs.c:1806
+#: src/dialogs.c:1820 src/prefs.c:395
 msgid "Send Message"
 msgstr "Enviar Mensaje"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1841
 msgid "Execute command on pounce"
 msgstr "Ejecutar orden para avisar"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1863
 msgid "Play sound on pounce"
 msgstr "Avisar mediante sonido"
 
-#: src/dialogs.c:1871
+#. </pounce type="action">
+#: src/dialogs.c:1885
 msgid "Save this pounce after activation"
 msgstr "Guardar este aviso tras la activación"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1971
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Crear Información del directorio"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1980
 msgid "Directory Info"
 msgstr "Información del Directorio"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2002
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Dejar que búsquedas en la Web encuentren su información"
 
-#: src/dialogs.c:1991 src/dialogs.c:2696
+#. Line 1
+#: src/dialogs.c:2005 src/dialogs.c:2710
 msgid "First Name"
 msgstr "Nombre"
 
-#: src/dialogs.c:2002 src/dialogs.c:2708
+#. Line 2
+#: src/dialogs.c:2016 src/dialogs.c:2722
 msgid "Middle Name"
 msgstr "Segundo Nombre"
 
-#: src/dialogs.c:2014 src/dialogs.c:2720
+#. Line 3
+#: src/dialogs.c:2028 src/dialogs.c:2734
 msgid "Last Name"
 msgstr "Apellido"
 
-#: src/dialogs.c:2025 src/dialogs.c:2732
+#. Line 4
+#: src/dialogs.c:2039 src/dialogs.c:2746
 msgid "Maiden Name"
 msgstr "Apellido de Soltera"
 
-#: src/dialogs.c:2047 src/dialogs.c:2755
+#. Line 6
+#: src/dialogs.c:2061 src/dialogs.c:2769
 msgid "State"
 msgstr "Estado"
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:2126
 msgid "New Passwords Do Not Match"
 msgstr "Las contraseñas no coinciden"
 
-#: src/dialogs.c:2112 src/dialogs.c:2117
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - Error cambiando la contraseña"
-
-#: src/dialogs.c:2117
+#: src/dialogs.c:2131
 msgid "Fill out all fields completely"
 msgstr "Rellene todos los campos completamente"
 
-#: src/dialogs.c:2172
+#: src/dialogs.c:2156
+msgid "Gaim - Password Change"
+msgstr "Gaim - Cambiar Contraseña"
+
+#: src/dialogs.c:2186
 msgid "Original Password"
 msgstr "Contraseña Original"
 
-#: src/dialogs.c:2186
+#: src/dialogs.c:2200
 msgid "New Password"
 msgstr "Nueva Contraseña"
 
-#: src/dialogs.c:2200
+#: src/dialogs.c:2214
 msgid "New Password (again)"
 msgstr "Nueva Contraseña (de nuevo)"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2255
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Crear Información del Usuario"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2367
 msgid "Below are the results of your search: "
 msgstr "A continucación, los resultados de su búsqueda: "
 
-#: src/dialogs.c:2486 src/dialogs.c:2493
+#: src/dialogs.c:2500 src/dialogs.c:2507
 msgid "Permit"
 msgstr "Permitir"
 
-#: src/dialogs.c:2488 src/dialogs.c:2495
+#: src/dialogs.c:2502 src/dialogs.c:2509
 msgid "Deny"
 msgstr "Negar"
 
-#: src/dialogs.c:2532
+#: src/dialogs.c:2546
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Añadir Permiso"
 
-#: src/dialogs.c:2534
+#: src/dialogs.c:2548
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Añadir Negación"
 
-#: src/dialogs.c:2594
+#: src/dialogs.c:2608
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Guardar Conversación"
 
-#: src/dialogs.c:2672 src/dialogs.c:2835
+#: src/dialogs.c:2686 src/dialogs.c:2849
 msgid "Search for Buddy"
 msgstr "Buscar un Amigo"
 
-#: src/dialogs.c:2800
+#: src/dialogs.c:2814
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Encontrar amigo por información"
 
-#: src/dialogs.c:2829
+#: src/dialogs.c:2843
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Encontrar amigo por correo electrónico"
 
-#: src/dialogs.c:2969
+#: src/dialogs.c:2983
 msgid "Gaim - Add URL"
 msgstr "Gaim - Añadir URL"
 
-#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
+#: src/dialogs.c:3097 src/dialogs.c:3118 src/dialogs.c:3172
 msgid "Select Text Color"
 msgstr "Seleccionar Color del Texto"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3151
 msgid "Select Background Color"
 msgstr "Seleccionar Color de Fondo"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3354
 msgid "Import to:"
 msgstr "Importar a:"
 
-#: src/dialogs.c:3364
+#: src/dialogs.c:3378
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importar Lista de Amigos"
 
-#: src/dialogs.c:3431
-msgid "You cannot create an away message with a blank title"
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3445
+#, fuzzy
+msgid "You cannot save an away message with a blank title"
 msgstr "No se puede crear un mensaje sin título"
 
-#: src/dialogs.c:3438
+#: src/dialogs.c:3446
+msgid ""
+"Please give the message a title, or choose \"Make Away\" to use without "
+"saving."
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3453
 msgid "You cannot create an empty away message"
 msgstr "No se puede crear un mensaje de ausencia vacío"
 
-#: src/dialogs.c:3506
+#: src/dialogs.c:3521
 msgid "Gaim - New away message"
 msgstr "Gaim - Nuevo Mensaje de Ausencia"
 
-#: src/dialogs.c:3516
+#: src/dialogs.c:3531
 msgid "New away message"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/dialogs.c:3529
+#: src/dialogs.c:3544
 msgid "Away title: "
 msgstr "Título del mensaje de ausencia: "
 
-#: src/dialogs.c:3590
+#: src/dialogs.c:3605
 msgid "Use"
 msgstr "Usar"
 
-#: src/dialogs.c:3594
+#: src/dialogs.c:3609
 msgid "Save & Use"
 msgstr "Guardar y Usar"
 
-#: src/dialogs.c:3791
+#. show everything
+#: src/dialogs.c:3806
 msgid "Smile!"
 msgstr "¡Sonrisa!"
 
-#: src/dialogs.c:3844
+#: src/dialogs.c:3859
 msgid "Alias Buddy"
 msgstr "Añadir Alias al Amigo"
 
-#: src/dialogs.c:3877
+#: src/dialogs.c:3892
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Añadir Alias al Amigo"
 
-#: src/dialogs.c:3949
+#: src/dialogs.c:3933 src/dialogs.c:3940
+#, fuzzy, c-format
+msgid "Couldn't write to %s."
+msgstr "No se pudo conectar al host"
+
+#: src/dialogs.c:3964
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Guardar Archivo de Registro"
 
-#: src/dialogs.c:3981
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "No se pudo borrar archivo %s - %s."
-
-#: src/dialogs.c:4009
+#: src/dialogs.c:3996
+#, fuzzy, c-format
+msgid "Couldn't remove file %s."
+msgstr "No se pudo abrir el archivo de configuración %s."
+
+#: src/dialogs.c:4024
 msgid "Really clear log?"
 msgstr "¿Limpiar el registro?"
 
-#: src/dialogs.c:4024
+#: src/dialogs.c:4039
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:4195
+#: src/dialogs.c:4210
 msgid "Date"
 msgstr "Fecha"
 
-#: src/dialogs.c:4258
+#: src/dialogs.c:4273
 msgid "Conversation"
 msgstr "Conversación"
 
-#: src/dialogs.c:4281
+#: src/dialogs.c:4296
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/dialogs.c:4363
+#: src/dialogs.c:4378
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Renombrar Grupo"
 
-#: src/dialogs.c:4373
+#: src/dialogs.c:4388
 msgid "Rename Group"
 msgstr "Renombrar Grupo"
 
-#: src/dialogs.c:4380 src/dialogs.c:4486
+#: src/dialogs.c:4395 src/dialogs.c:4501
 msgid "New name:"
 msgstr "Nuevo Nombre:"
 
-#: src/dialogs.c:4469
+#: src/dialogs.c:4484
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Renombrar Amigo"
 
-#: src/dialogs.c:4479
+#: src/dialogs.c:4494
 msgid "Rename Buddy"
 msgstr "Renombrar Amigo"
 
-#: src/dialogs.c:4563
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4578
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Seleccionar Script en Perl"
 
-#: src/gaimrc.c:1141
+#: src/gaimrc.c:1242
 #, c-format
 msgid "Could not open config file %s."
 msgstr "No se pudo abrir el archivo de configuración %s."
 
-#: src/gaimrc.c:1142
-msgid "Preferences Error"
-msgstr "Error en las Preferencias"
-
 #: src/html.c:183
 #, fuzzy, c-format
 msgid "Received: '%s'\n"
@@ -2737,9 +2838,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error abriendo la conexión. \n"
 
-#: src/module.c:106 src/module.c:112 src/module.c:122
-msgid "Plugin Error"
-msgstr "Error de añadido"
+#: src/module.c:106 src/module.c:112
+#, fuzzy
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim no pudo envíar el mensaje"
 
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
@@ -2753,7 +2855,7 @@
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/multi.c:513 src/prefs.c:1344
+#: src/multi.c:513 src/prefs.c:1066
 msgid "Reset"
 msgstr "Resetear"
 
@@ -2795,17 +2897,23 @@
 msgstr "Introduzca Contraseña"
 
 #: src/multi.c:948
+#, fuzzy
+msgid "TOC not found."
+msgstr "archivo no encontrado: %s\n"
+
+#: src/multi.c:949
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:952 src/multi.c:956
-msgid "Login Error"
-msgstr "Error de Conexión"
-
-#: src/multi.c:954
+#: src/multi.c:955
+#, fuzzy
+msgid "Protocol not found."
+msgstr "Acciones del Protocolo"
+
+#: src/multi.c:956
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2813,40 +2921,40 @@
 "No se puede conectar con esta cuenta; no se dispone del protocolo que usa, o "
 "el protocolo no dispone de la función de conexión."
 
-#: src/multi.c:985
+#: src/multi.c:987
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "¿Seguro que quiere borrar a %s?"
 
-#: src/multi.c:1022
+#: src/multi.c:1024
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editor de Cuentas"
 
-#: src/multi.c:1041
+#: src/multi.c:1043
 msgid "Select All"
 msgstr "Seleccionar Todo"
 
-#: src/multi.c:1046
+#: src/multi.c:1048
 msgid "Select Autos"
 msgstr "Seleccionar Auto"
 
-#: src/multi.c:1050
+#: src/multi.c:1052
 msgid "Select None"
 msgstr "No Seleccionar Nada"
 
-#: src/multi.c:1064
+#: src/multi.c:1066
 msgid "Modify"
 msgstr "Modificar"
 
-#: src/multi.c:1068
+#: src/multi.c:1070
 msgid "Sign On/Off"
 msgstr "Conectar/Desconectar"
 
-#: src/multi.c:1072
+#: src/multi.c:1074
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/multi.c:1387
+#: src/multi.c:1389
 #, c-format
 msgid ""
 "%s\n"
@@ -2855,29 +2963,29 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1406
+#: src/multi.c:1408
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s no pudo conectarse"
 
-#: src/multi.c:1417
+#: src/multi.c:1409
+msgid "Signon Error"
+msgstr "Error de Conexión"
+
+#: src/multi.c:1419
 msgid "Notice"
 msgstr "Aviso"
 
-#: src/multi.c:1427
+#: src/multi.c:1429
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr "%s no pudo conectarse"
 
-#: src/multi.c:1428
+#: src/multi.c:1430
 #, fuzzy
 msgid "Connection Error"
 msgstr "Error de Conexión"
 
-#: src/perl.c:879
-msgid "Perl Scripts"
-msgstr "Scripts de Perl"
-
 #: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Lista de Plugins"
@@ -2886,10 +2994,12 @@
 msgid "Gaim - Plugins"
 msgstr "Gaim - Plugins"
 
+#. Left side: frame with list of plugin file names
 #: src/plugins.c:221
 msgid "Loaded Plugins"
 msgstr "Plugins cargados"
 
+#. Right side: frame with description and the filepath of plugin
 #: src/plugins.c:265
 #, fuzzy
 msgid "Selected Plugin"
@@ -2935,430 +3045,596 @@
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: src/prefs.c:266
+#: src/prefs.c:279
+#, fuzzy
+msgid "Interface Options"
+msgstr "Opciones Generales"
+
+#. This shouldn't have to wait for user to click OK or APPLY or whatnot
+#. This really shouldn't be in preferences at all
+#: src/prefs.c:282
 #, fuzzy
-msgid "Windows"
-msgstr "Ventana de Mensajes"
-
-#: src/prefs.c:276
-msgid "Show Debug Window"
+msgid "Show _Debug Window"
 msgstr "Mostrar ventana de Depuración"
 
-#: src/prefs.c:280 src/prefs.c:302
+#: src/prefs.c:285
+#, fuzzy
+msgid "Use _borderless buttons"
+msgstr "Usar botones sin bordes"
+
+#: src/prefs.c:301
 #, fuzzy
 msgid "Style"
 msgstr "Estado"
 
-#: src/prefs.c:286
-msgid "Use borderless buttons"
-msgstr "Usar botones sin bordes"
-
-#: src/prefs.c:311
+#: src/prefs.c:302
+#, fuzzy
+msgid "_Bold"
+msgstr "Negrita"
+
+#: src/prefs.c:303
 #, fuzzy
-msgid "Strikethough"
+msgid "_Italics"
+msgstr "Inclinado"
+
+#: src/prefs.c:304
+#, fuzzy
+msgid "_Underline"
+msgstr "Subrayar"
+
+#: src/prefs.c:305
+#, fuzzy
+msgid "_Strikethough"
 msgstr "Tachar el Texto"
 
-#: src/prefs.c:315
+#: src/prefs.c:307
 #, fuzzy
 msgid "Face"
 msgstr "Cancelar"
 
-#: src/prefs.c:323
+#: src/prefs.c:310
 #, fuzzy
-msgid "Use custom face"
+msgid "Use custo_m face"
+msgstr "Insertar smiley"
+
+#: src/prefs.c:322
+#, fuzzy
+msgid "Use custom si_ze"
 msgstr "Insertar smiley"
 
-#: src/prefs.c:327 src/prefs.c:366 src/prefs.c:387
-msgid "Select"
-msgstr "Seleccionar"
-
-#: src/prefs.c:341
-msgid "Use custom size"
-msgstr ""
-
-#: src/prefs.c:359
+#: src/prefs.c:334
+#, fuzzy
+msgid "_Text color"
+msgstr "Color del texto"
+
+#: src/prefs.c:350
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "Color del fondo"
+
+#: src/prefs.c:373 src/prefs.c:468 src/prefs.c:508
+#, fuzzy
+msgid "Display"
+msgstr "Amigos"
+
+#: src/prefs.c:374
 #, fuzzy
-msgid "Text color"
-msgstr "Color del texto"
+msgid "Show graphical _smileys"
+msgstr "Mostar caritas gráficas"
+
+#: src/prefs.c:375
+#, fuzzy
+msgid "Show _timestamp on messages"
+msgstr "Mostar la hora de los mensajes"
+
+#: src/prefs.c:376
+#, fuzzy
+msgid "Show _URLs as links"
+msgstr "Mostrar URLs como enlaces"
+
+#: src/prefs.c:377
+#, fuzzy
+msgid "_Highlight misspelled words"
+msgstr "Destacar las faltas de ortografía"
+
+#: src/prefs.c:380
+#, fuzzy
+msgid "Ignore c_olors"
+msgstr "Ignorar colores"
 
 #: src/prefs.c:381
 #, fuzzy
-msgid "Background color"
-msgstr "Color del fondo"
+msgid "Ignore font _faces"
+msgstr "Ignorar estilos de fuente"
+
+#: src/prefs.c:382
+#, fuzzy
+msgid "Ignore font si_zes"
+msgstr "Ignorar tamaños de fuente"
+
+#: src/prefs.c:383
+#, fuzzy
+msgid "Ignore Ti_K Automated Messages"
+msgstr "Ignorar Mensaje automáticos de TiK"
+
+#: src/prefs.c:396
+#, fuzzy
+msgid "_Enter sends message"
+msgstr "Enter envía el mensaje"
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "C_ontrol-Enter sends message"
+msgstr "Control-Enter envía el mensaje"
+
+#: src/prefs.c:399
+#, fuzzy
+msgid "Window Closing"
+msgstr "Ventana de Mensajes"
+
+#: src/prefs.c:400
+#, fuzzy
+msgid "E_scape closes window"
+msgstr "Escape cierra la ventana"
+
+#: src/prefs.c:401
+#, fuzzy
+msgid "Control-_W closes window"
+msgstr "Escape cierra la ventana"
+
+#: src/prefs.c:404
+#, fuzzy
+msgid "Control-{B/I/U/S} inserts _HTML tags"
+msgstr "Control-{B/I/U/S} inserta etiquetas HTML"
+
+#: src/prefs.c:405
+#, fuzzy
+msgid "Control-(number) inserts _smileys"
+msgstr "Control-(número) inserta smileys"
+
+#: src/prefs.c:417
+#, fuzzy
+msgid "Buttons"
+msgstr "Abajo"
+
+#: src/prefs.c:418
+#, fuzzy
+msgid "_Hide IM/Info/Chat buttons"
+msgstr "Ocultar Botones de IM/Info/Chat"
 
 #: src/prefs.c:419
-msgid "Show graphical smileys"
-msgstr "Mostar caritas gráficas"
-
-#: src/prefs.c:420
-msgid "Show timestamp on messages"
-msgstr "Mostar la hora de los mensajes"
+#, fuzzy
+msgid "Show _pictures on buttons"
+msgstr "Mostrar dibujos en los botones"
 
 #: src/prefs.c:421
-msgid "Show URLs as links"
-msgstr "Mostrar URLs como enlaces"
+msgid "Buddy List Window"
+msgstr "Ventana de la Lista de Amigos"
 
 #: src/prefs.c:422
-msgid "Highlight misspelled words"
-msgstr "Destacar las faltas de ortografía"
+#, fuzzy
+msgid "_Save Window Size/Position"
+msgstr "Guardar el Tamaño/Posición de las Ventanas"
+
+#: src/prefs.c:423
+#, fuzzy
+msgid "_Raise Window on Events"
+msgstr "Alzar ventanas cuando se reciba un evento"
+
+#: src/prefs.c:425
+#, fuzzy
+msgid "Group Display"
+msgstr "Grupos"
+
+#: src/prefs.c:426
+#, fuzzy
+msgid "Hide _groups with no online buddies"
+msgstr "Ocultar los grupos sin miembros conectados"
+
+#: src/prefs.c:427
+#, fuzzy
+msgid "Show _numbers in groups"
+msgstr "Mostar números en los grupos"
+
+#: src/prefs.c:429
+#, fuzzy
+msgid "Buddy Display"
+msgstr "Amigos"
+
+#: src/prefs.c:430
+#, fuzzy
+msgid "Show buddy type _icons"
+msgstr "Mostar iconos de los tipos de amigos"
+
+#: src/prefs.c:431
+#, fuzzy
+msgid "Show _warning levels"
+msgstr "Mostrar niveles de aviso"
 
 #: src/prefs.c:432
-msgid "Ignore colors"
-msgstr "Ignorar colores"
+#, fuzzy
+msgid "Show idle _times"
+msgstr "Mostar el tiempo de inactividad"
 
 #: src/prefs.c:433
-msgid "Ignore font faces"
-msgstr "Ignorar estilos de fuente"
-
-#: src/prefs.c:434
-msgid "Ignore font sizes"
-msgstr "Ignorar tamaños de fuente"
-
-#: src/prefs.c:435
-msgid "Ignore TiK Automated Messages"
-msgstr "Ignorar Mensaje automáticos de TiK"
-
-#: src/prefs.c:455
-msgid "Enter sends message"
-msgstr "Enter envía el mensaje"
-
-#: src/prefs.c:456
-msgid "Control-Enter sends message"
-msgstr "Control-Enter envía el mensaje"
+#, fuzzy
+msgid "Grey i_dle buddies"
+msgstr "Poner en gris a los amigos inactivos"
+
+#: src/prefs.c:450 src/prefs.c:492
+#, fuzzy
+msgid "Window"
+msgstr "Ventana de Mensajes"
+
+#: src/prefs.c:457 src/prefs.c:499
+#, fuzzy
+msgid "New window _width:"
+msgstr "Ancho de la nueva ventana:"
+
+#: src/prefs.c:458 src/prefs.c:500
+#, fuzzy
+msgid "New window _height:"
+msgstr "Alto de la nueva ventana:"
+
+#: src/prefs.c:459 src/prefs.c:501
+#, fuzzy
+msgid "_Entry widget height:"
+msgstr "Alto del campo de texto:"
+
+#: src/prefs.c:460 src/prefs.c:502
+#, fuzzy
+msgid "_Raise windows on events"
+msgstr "Alzar ventanas cuando se reciba un evento"
+
+#: src/prefs.c:461
+#, fuzzy
+msgid "Hide window on _send"
+msgstr "Esconder la ventana al enviar"
+
+#: src/prefs.c:464
+msgid "Buddy Icons"
+msgstr "Iconos de Amigos"
 
 #: src/prefs.c:465
-msgid "Escape closes window"
-msgstr "Escape cierra la ventana"
+#, fuzzy
+msgid "Hide Buddy _Icons"
+msgstr "Ocultar Iconos de Amigos"
 
 #: src/prefs.c:466
 #, fuzzy
-msgid "Control-W closes window"
-msgstr "Escape cierra la ventana"
-
-#: src/prefs.c:476
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Control-{B/I/U/S} inserta etiquetas HTML"
-
-#: src/prefs.c:477
-msgid "Control-(number) inserts smileys"
-msgstr "Control-(número) inserta smileys"
-
-#: src/prefs.c:496
-msgid "Hide IM/Info/Chat buttons"
-msgstr "Ocultar Botones de IM/Info/Chat"
-
-#: src/prefs.c:497
-msgid "Show pictures on buttons"
-msgstr "Mostrar dibujos en los botones"
-
-#: src/prefs.c:507
-msgid "Automatically show buddy list on sign on"
-msgstr "Mostrar automáticamente la lista de amigos al conectarse"
+msgid "Disable Buddy Icon A_nimation"
+msgstr "Deshabilitar Animaciones"
+
+#: src/prefs.c:469
+#, fuzzy
+msgid "Show _logins in window"
+msgstr "Mostar cuando los amigos se conectan/desconectan en la ventana"
+
+#: src/prefs.c:471
+#, fuzzy
+msgid "Typing Notification"
+msgstr "Notificación con un Popup"
+
+#: src/prefs.c:472
+#, fuzzy
+msgid "Notify buddies that you are _typing to them"
+msgstr "Notificar a los amigos cuando les este escribiendo"
+
+#: src/prefs.c:504
+msgid "Tab Completion"
+msgstr "Tabulador"
+
+#: src/prefs.c:505
+#, fuzzy
+msgid "_Tab-Complete Nicks"
+msgstr "Tabulador completa los Apodos"
+
+#: src/prefs.c:506
+#, fuzzy
+msgid "_Old-Style Tab Completion"
+msgstr "Tabulador al estilo antiguo"
 
 #: src/prefs.c:509
-msgid "Display Buddy List near applet"
-msgstr "Mostar Lista de Amigos cerca del applet"
-
-#: src/prefs.c:512
-msgid "Save Window Size/Position"
-msgstr "Guardar el Tamaño/Posición de las Ventanas"
-
-#: src/prefs.c:513
 #, fuzzy
-msgid "Raise Window on Events"
-msgstr "Alzar ventanas cuando se reciba un evento"
-
-#: src/prefs.c:522
-msgid "Hide groups with no online buddies"
-msgstr "Ocultar los grupos sin miembros conectados"
-
-#: src/prefs.c:523
-msgid "Show numbers in groups"
-msgstr "Mostar números en los grupos"
-
-#: src/prefs.c:532
-msgid "Show buddy type icons"
-msgstr "Mostar iconos de los tipos de amigos"
+msgid "_Show people joining/leaving in window"
+msgstr "Mostrar la gente que se conecta/desconecta en la ventana"
+
+#: src/prefs.c:510
+msgid "Co_lorize screennames"
+msgstr ""
+
+#: src/prefs.c:526
+msgid "IM Tabs"
+msgstr ""
 
 #: src/prefs.c:533
-msgid "Show warning levels"
-msgstr "Mostrar niveles de aviso"
+#, fuzzy
+msgid ""
+"Show all _Instant Messages in one tabbed\n"
+"window"
+msgstr "Mostar todos los Chats en una ventana con pestañas"
 
 #: src/prefs.c:534
-msgid "Show idle times"
-msgstr "Mostar el tiempo de inactividad"
-
-#: src/prefs.c:535
-msgid "Grey idle buddies"
-msgstr "Poner en gris a los amigos inactivos"
-
-#: src/prefs.c:564 src/prefs.c:626
-msgid "New window width:"
-msgstr "Ancho de la nueva ventana:"
-
-#: src/prefs.c:565 src/prefs.c:627
-msgid "New window height:"
-msgstr "Alto de la nueva ventana:"
-
-#: src/prefs.c:566 src/prefs.c:628
-msgid "Entry widget height:"
-msgstr "Alto del campo de texto:"
-
-#: src/prefs.c:567 src/prefs.c:629
-msgid "Raise windows on events"
-msgstr "Alzar ventanas cuando se reciba un evento"
-
-#: src/prefs.c:568
-msgid "Hide window on send"
-msgstr "Esconder la ventana al enviar"
-
-#: src/prefs.c:577
-msgid "Hide Buddy Icons"
-msgstr "Ocultar Iconos de Amigos"
-
-#: src/prefs.c:578
+#, fuzzy
+msgid "Show a_liases in tabs/titles"
+msgstr "Mostrar alias en las pestañas/títulos"
+
+#: src/prefs.c:536
 #, fuzzy
-msgid "Disable Buddy Icon Animation"
-msgstr "Deshabilitar Animaciones"
-
-#: src/prefs.c:587
-msgid "Show logins in window"
-msgstr "Mostar cuando los amigos se conectan/desconectan en la ventana"
-
-#: src/prefs.c:596
-msgid "Notify buddies that you are typing to them"
-msgstr "Notificar a los amigos cuando les este escribiendo"
-
-#: src/prefs.c:638
-msgid "Tab-Complete Nicks"
-msgstr "Tabulador completa los Apodos"
-
-#: src/prefs.c:639
-msgid "Old-Style Tab Completion"
-msgstr "Tabulador al estilo antiguo"
-
-#: src/prefs.c:648
-msgid "Show people joining/leaving in window"
-msgstr "Mostrar la gente que se conecta/desconecta en la ventana"
-
-#: src/prefs.c:649
-msgid "Colorize screennames"
+msgid "Chat Tabs"
+msgstr "Hablar"
+
+#: src/prefs.c:543
+#, fuzzy
+msgid "Show all c_hats in one tabbed window"
+msgstr "Mostar todos los Chats en una ventana con pestañas"
+
+#: src/prefs.c:546
+msgid "Combined Tabs"
 msgstr ""
 
-#: src/prefs.c:674
+#: src/prefs.c:547
 #, fuzzy
 msgid ""
-"Show all Instant Messages in one tabbed\n"
-"window"
-msgstr "Mostar todos los Chats en una ventana con pestañas"
-
-#: src/prefs.c:675
-msgid "Show aliases in tabs/titles"
-msgstr "Mostrar alias en las pestañas/títulos"
-
-#: src/prefs.c:690
-msgid "Show all chats in one tabbed window"
-msgstr "Mostar todos los Chats en una ventana con pestañas"
-
-#: src/prefs.c:700
-#, fuzzy
-msgid ""
-"Show IMs and chats in same tabbed\n"
+"Show IMs and chats in _same tabbed\n"
 "window."
 msgstr "Mostar todas los chats en una unica ventana con pestañas"
 
-#: src/prefs.c:747
+#: src/prefs.c:549
+#, fuzzy
+msgid "Buddy List Tabs"
+msgstr "Lista de Amigos"
+
+#: src/prefs.c:570
+msgid "Proxy Type"
+msgstr "Tipo de Proxy"
+
+#: src/prefs.c:582
 msgid "Proxy Server"
 msgstr "Servidor Proxy"
 
-#: src/prefs.c:764
-msgid "Host"
+#: src/prefs.c:595
+#, fuzzy
+msgid "_Host"
 msgstr "Host"
 
-#: src/prefs.c:780
+#: src/prefs.c:609
 msgid "Port"
 msgstr "Puerto"
 
-#: src/prefs.c:797
-msgid "User"
+#: src/prefs.c:625
+#, fuzzy
+msgid "_User"
 msgstr "Usuario"
 
-#: src/prefs.c:813
-msgid "Password"
+#: src/prefs.c:639
+#, fuzzy
+msgid "Pa_ssword"
 msgstr "Contraseña"
 
-#: src/prefs.c:873
+#: src/prefs.c:670
 #, fuzzy
-msgid "Open new window by default"
+msgid "Browser Selection"
+msgstr "Opciones del Navegador"
+
+#: src/prefs.c:697
+msgid "Browser Options"
+msgstr "Opciones del Navegador"
+
+#: src/prefs.c:698
+#, fuzzy
+msgid "Open new _window by default"
 msgstr "Crear una nueva ventana por omisión"
 
-#: src/prefs.c:892
-msgid "Log all conversations"
+#: src/prefs.c:710
+#, fuzzy
+msgid "Message Logs"
+msgstr "Mensajes"
+
+#: src/prefs.c:711
+#, fuzzy
+msgid "_Log all conversations"
 msgstr "Guardar todas las conversaciones"
 
-#: src/prefs.c:893
-msgid "Strip HTML from logs"
+#: src/prefs.c:712
+#, fuzzy
+msgid "Strip _HTML from logs"
 msgstr "Quitar HTML de los registros"
 
-#: src/prefs.c:902
-msgid "Log when buddies sign on/sign off"
+#: src/prefs.c:714
+#, fuzzy
+msgid "System Logs"
+msgstr "Ver Registro del Sistema"
+
+#: src/prefs.c:715
+#, fuzzy
+msgid "Log when buddies _sign on/sign off"
 msgstr "Registrar cuándo se concetan/desconcetan los amigos"
 
-#: src/prefs.c:904
-msgid "Log when buddies become idle/un-idle"
+#: src/prefs.c:717
+#, fuzzy
+msgid "Log when buddies become _idle/un-idle"
 msgstr "Registrar cuándo los amigos están activos/inactivos"
 
-#: src/prefs.c:906
-msgid "Log when buddies go away/come back"
+#: src/prefs.c:719
+#, fuzzy
+msgid "Log when buddies go away/come _back"
 msgstr "Registrar cuándo los amigos se ausentan o regresan"
 
-#: src/prefs.c:907
-msgid "Log your own signons/idleness/awayness"
+#: src/prefs.c:720
+#, fuzzy
+msgid "Log your _own signons/idleness/awayness"
 msgstr "Registrar sus propias conexiones/ausencias/inactividades"
 
-#: src/prefs.c:909
-msgid "Individual log file for each buddy's signons"
+#: src/prefs.c:722
+#, fuzzy
+msgid "I_ndividual log file for each buddy's signons"
 msgstr "Un archivo de registro para la conexión de cada Amigo"
 
-#: src/prefs.c:952
-msgid "No sounds when you log in"
+#: src/prefs.c:749
+msgid "Sound Options"
+msgstr "Opciones de Sonido"
+
+#: src/prefs.c:750
+#, fuzzy
+msgid "_No sounds when you log in"
 msgstr "Sin sonido al conectarse"
 
-#: src/prefs.c:953
-msgid "Sounds while away"
+#: src/prefs.c:751
+#, fuzzy
+msgid "_Sounds while away"
 msgstr "Sonidos mientras se está ausente"
 
-#: src/prefs.c:990
-#, c-format
+#: src/prefs.c:753
+#, fuzzy
+msgid "Sound Method"
+msgstr "Metodo para reprodución de Sonido"
+
+#: src/prefs.c:777
+#, fuzzy, c-format
 msgid ""
-"Sound command\n"
+"Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
 "Comando para sonido\n"
 "(%s para nombre de archivo"
 
-#: src/prefs.c:1032
-msgid "Sending messages removes away status"
+#: src/prefs.c:813
+#, fuzzy
+msgid "_Sending messages removes away status"
 msgstr "El envío de un mensaje quita el estado de ausencia"
 
-#: src/prefs.c:1033
-msgid "Queue new messages when away"
+#: src/prefs.c:814
+#, fuzzy
+msgid "_Queue new messages when away"
 msgstr "Encolar nuevos mensajes durante las ausencias"
 
-#: src/prefs.c:1034
-msgid "Ignore new conversations when away"
+#: src/prefs.c:815
+#, fuzzy
+msgid "_Ignore new conversations when away"
 msgstr "Ignorar nuevas conversaciones mientras esé ausente"
 
-#: src/prefs.c:1046
-msgid "Seconds before resending:"
+#: src/prefs.c:817
+#, fuzzy
+msgid "Auto-response"
+msgstr "No enviar respuesta automática"
+
+#: src/prefs.c:820
+msgid "Seconds before _resending:"
 msgstr ""
 
-#: src/prefs.c:1049
-msgid "Don't send auto-response"
+#: src/prefs.c:822
+#, fuzzy
+msgid "_Don't send auto-response"
 msgstr "No enviar respuesta automática"
 
-#: src/prefs.c:1050
-msgid "Only send auto-response when idle"
+#: src/prefs.c:823
+#, fuzzy
+msgid "_Only send auto-response when idle"
 msgstr "Sólo enviar respuesta automática en Inactivo"
 
-#: src/prefs.c:1077
-msgid "Set away when idle"
+#: src/prefs.c:828
+msgid "Idle"
+msgstr "Ausente"
+
+#: src/prefs.c:839
+#, fuzzy
+msgid "Auto-away"
+msgstr "Ausente"
+
+#: src/prefs.c:840
+msgid "Set away _when idle"
 msgstr ""
 
-#: src/prefs.c:1191
+#: src/prefs.c:954
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Configuración del Sonido"
 
-#: src/prefs.c:1339
+#: src/prefs.c:1062
 #, fuzzy
 msgid "Test"
 msgstr "Probar"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1070
 msgid "Choose..."
 msgstr "Seleccionar..."
 
-#: src/prefs.c:1587
+#: src/prefs.c:1239
 #, fuzzy
 msgid "_Edit"
 msgstr "Editar"
 
-#: src/prefs.c:1590
-msgid "Edit"
-msgstr "Editar"
-
-#: src/prefs.c:1656
+#: src/prefs.c:1303
 #, fuzzy
 msgid "Interface"
 msgstr "Instancia:"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1304
 #, fuzzy
 msgid "Fonts"
 msgstr "Fuente"
 
-#: src/prefs.c:1658
+#: src/prefs.c:1305
 #, fuzzy
 msgid "Message Text"
 msgstr "Mensaje"
 
-#: src/prefs.c:1659
+#: src/prefs.c:1306
 msgid "Shortcuts"
 msgstr ""
 
-#: src/prefs.c:1661
+#: src/prefs.c:1308
 msgid "IM Window"
 msgstr "Ventana de Mensajes"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1309
 #, fuzzy
 msgid "Chat Window"
 msgstr "Ventana del Chat en Grupo"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1310
 msgid "Tabs"
 msgstr ""
 
-#: src/prefs.c:1664
+#: src/prefs.c:1311
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:1665
+#: src/prefs.c:1312
 msgid "Browser"
 msgstr "Navegador"
 
-#: src/prefs.c:1668
+#: src/prefs.c:1315
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1316
 #, fuzzy
 msgid "Sound Events"
 msgstr "Eventos"
 
-#: src/prefs.c:1670
+#: src/prefs.c:1317
 #, fuzzy
 msgid "Away / Idle"
 msgstr "Título del mensaje de ausencia: "
 
-#: src/prefs.c:1671
+#: src/prefs.c:1318
 msgid "Away Messages"
 msgstr "Mensajes de Ausencia"
 
-#: src/prefs.c:1732
+#: src/prefs.c:1380
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferencias"
 
-#: src/prefs.c:1842
-#, fuzzy
-msgid "Apply"
-msgstr "Aplique"
-
-#: src/prefs.c:1891
+#: src/prefs.c:1519
 msgid "Gaim debug output window"
 msgstr "Gaim ventana de respuestas del programa"
 
 #: src/prpl.c:70
+msgid "Incompatible protocol detected."
+msgstr ""
+
+#: src/prpl.c:71
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
 "version of the source as this application was. Unfortunately, because it is "
@@ -3369,11 +3645,11 @@
 "esta aplicación. Por desgracia, al no ser la misma versión, no se puede "
 "determinar cuál es. No hace falta decir que no se pudo usar con éxito"
 
-#: src/prpl.c:74
-msgid "Protocol Error"
-msgstr "Error de Protocolo"
-
-#: src/prpl.c:84
+#: src/prpl.c:85
+msgid "Libicq.so detected."
+msgstr ""
+
+#: src/prpl.c:86
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -3381,42 +3657,33 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:88
-#, fuzzy
-msgid "Protocol Warning"
-msgstr "Acciones del Protocolo"
-
-#: src/prpl.c:103
+#: src/prpl.c:105
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%s usaba %s, que fue eliminado. %s ahora está desconectado."
 
-#: src/prpl.c:106
-msgid "Disconnect"
-msgstr "Desconectado"
-
-#: src/prpl.c:143
+#: src/prpl.c:145
 msgid "Accept?"
 msgstr "¿Aceptar?"
 
-#: src/prpl.c:209
+#: src/prpl.c:211
 msgid "Gaim - Prompt"
 msgstr "Gaim - Preguntar"
 
-#: src/prpl.c:429
+#: src/prpl.c:431
 msgid "Gaim - New Mail"
 msgstr "Gaim - Correo Nuevo"
 
-#: src/prpl.c:455
+#: src/prpl.c:457
 msgid "Open Mail"
 msgstr "Abrir Correo"
 
-#: src/prpl.c:580
+#: src/prpl.c:582
 #, fuzzy, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s ha hecho %s a sus amigos %s%s%s"
 
-#: src/prpl.c:588
+#: src/prpl.c:590
 #, fuzzy
 msgid ""
 "\n"
@@ -3427,21 +3694,21 @@
 "\n"
 "¿Desea añadirlos a su lista de amigos?"
 
-#: src/prpl.c:631
+#: src/prpl.c:633
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "No dispone de ningún protocolo que permita registrar cuentas nuevas."
 
-#: src/prpl.c:668
+#: src/prpl.c:670
 msgid "Gaim - Registration"
 msgstr "Gaim - Registro"
 
-#: src/prpl.c:683
+#: src/prpl.c:685
 msgid "Registration Information"
 msgstr "Información de Registro"
 
-#: src/prpl.c:700
+#: src/prpl.c:702
 msgid "Register"
 msgstr "Registrar"
 
@@ -3458,10 +3725,6 @@
 msgid "(1 message)"
 msgstr "(1 mensaje)"
 
-#: src/server.c:808
-msgid "Warned"
-msgstr "Advertido"
-
 #: src/server.c:901
 msgid "Yes"
 msgstr "Sí"
@@ -3519,15 +3782,177 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "Gadu-Gadu Error"
+#~ msgstr "Error de Gadu-Gadu"
+
+#~ msgid "Gadu-Gadu Information"
+#~ msgstr "Información de Gadu-Gadu"
+
+#~ msgid "Couldn't send http request"
+#~ msgstr "No se pudo enviar una petición http"
+
+#~ msgid "Buddies List import from Server failed (%s)"
+#~ msgstr "No se pudo importar la lista de amigos del servidor (%s)"
+
+#~ msgid "Buddies List export to Server failed (%s)"
+#~ msgstr "No se pudo exportar la lista de amigos al servidor (%s)"
+
+#~ msgid "Deletion of Buddies List from Server failed (%s)"
+#~ msgstr "Falló el borrado de amigos en el servidor (%s)"
+
+#~ msgid "Connect to search service failed (%s)"
+#~ msgstr "Falló la conexión al servicio de búsqueda (%s)"
+
+#~ msgid "Changing Password failed (%s)"
+#~ msgstr "Falló el cambio de Contraseña (%s)"
+
+#~ msgid "No such nick/channel"
+#~ msgstr "No existe el apodo/canal"
+
+#~ msgid "IRC Error"
+#~ msgstr "Error de IRC"
+
+#~ msgid "No such server"
+#~ msgstr "No existe el servidor"
+
+#~ msgid "IRC Part"
+#~ msgstr "Salir de IRC"
+
+#, fuzzy
+#~ msgid "Password Change Error!"
+#~ msgstr "Gaim - Cambiar Contraseña"
+
+#, fuzzy
+#~ msgid "Password Change"
+#~ msgstr "Gaim - Cambiar Contraseña"
+
+#, fuzzy
+#~ msgid "Invalid Jabber I.D."
+#~ msgstr "Usuario no válido"
+
+#~ msgid "MSN Error"
+#~ msgstr "Error de MSN"
+
+#~ msgid "Invalid name"
+#~ msgstr "Nombre no válido"
+
+#~ msgid "Chat Error!"
+#~ msgstr "¡Error de Conversación!"
+
+#~ msgid "Gaim - Chat"
+#~ msgstr "Gaim - Conversaciones"
+
+#~ msgid "Gaim - Error"
+#~ msgstr "Error de Gaim"
+
+#~ msgid "Gaim - Oscar SNAC Error"
+#~ msgstr "Gaim - Error de OSCAR SNAC"
+
+#~ msgid "Reason unknown"
+#~ msgstr "Motivo desconocido"
+
+#~ msgid "AOL error"
+#~ msgstr "Error de AOL"
+
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#, fuzzy
+#~ msgid "Gaim - Warning"
+#~ msgstr "Gaim - ¿Advertir al usuario?"
+
+#~ msgid "TOC Resume"
+#~ msgstr "Continúar con el TOC"
+
+#~ msgid "Chat Error"
+#~ msgstr "Error de Conversación"
+
+#~ msgid "TOC Pause"
+#~ msgstr "Pausa de TOC"
+
+#~ msgid "Could not write file header!"
+#~ msgstr "¡No se pudo escribir la cabecera del archivo!"
+
+#~ msgid "Attempting to sign on...."
+#~ msgstr "Tratando de conectar..."
+
+#~ msgid "Offline. Click to bring up login box."
+#~ msgstr "Desconectado. Haga click para abrir ventana para conectarse."
+
+#~ msgid "Away: %d pending."
+#~ msgstr "Ausente: %d en espera."
+
+#~ msgid "Away."
+#~ msgstr "Ausente."
+
+#~ msgid "Can't create Gaim applet!"
+#~ msgstr "No pudo crearse el programa Gaim"
+
+#~ msgid "About..."
+#~ msgstr "Acerca de..."
+
+#~ msgid "Message Error"
+#~ msgstr "Error de Mensaje"
+
+#~ msgid "Unable to send message: Unknown reason"
+#~ msgstr "No se pudo enviar el mensaje: Motivo desconocido"
+
+#~ msgid "Buddy Pounce Error"
+#~ msgstr "Error en Aviso de Amigo"
+
+#~ msgid "Gaim - Change Password Error"
+#~ msgstr "Gaim - Error cambiando la contraseña"
+
+#~ msgid "Unable to remove file %s - %s"
+#~ msgstr "No se pudo borrar archivo %s - %s."
+
+#~ msgid "Preferences Error"
+#~ msgstr "Error en las Preferencias"
+
+#~ msgid "Plugin Error"
+#~ msgstr "Error de añadido"
+
+#~ msgid "Login Error"
+#~ msgstr "Error de Conexión"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Scripts de Perl"
+
+#~ msgid "Select"
+#~ msgstr "Seleccionar"
+
+#~ msgid "Automatically show buddy list on sign on"
+#~ msgstr "Mostrar automáticamente la lista de amigos al conectarse"
+
+#~ msgid "Display Buddy List near applet"
+#~ msgstr "Mostar Lista de Amigos cerca del applet"
+
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#, fuzzy
+#~ msgid "Apply"
+#~ msgstr "Aplique"
+
+#~ msgid "Protocol Error"
+#~ msgstr "Error de Protocolo"
+
+#, fuzzy
+#~ msgid "Protocol Warning"
+#~ msgstr "Acciones del Protocolo"
+
+#~ msgid "Disconnect"
+#~ msgstr "Desconectado"
+
+#~ msgid "Warned"
+#~ msgstr "Advertido"
+
 #~ msgid "Show Buddy Ticker"
 #~ msgstr "Mostrar ventana de noticias"
 
 #~ msgid "Away from the computer"
 #~ msgstr "Ausente"
 
-#~ msgid "Idle"
-#~ msgstr "Ausente"
-
 #~ msgid "Be right back"
 #~ msgstr "Vuelvo enseguida"
 
@@ -3540,9 +3965,6 @@
 #~ msgid "Enable sounds"
 #~ msgstr "Habilitar Sonidos"
 
-#~ msgid "General Options"
-#~ msgstr "Opciones Generales"
-
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr ""
 #~ "Todas la opciones toman efecto inmediatamente si no se indica lo contrario"
@@ -3590,9 +4012,6 @@
 #~ "No todos los protocolos pueden usar estas opciones del proxy. Por favor, "
 #~ "lea el archivo README para ver los detalles."
 
-#~ msgid "Proxy Type"
-#~ msgstr "Tipo de Proxy"
-
 #~ msgid "No Proxy"
 #~ msgstr "Sin Proxy"
 
@@ -3608,9 +4027,6 @@
 #~ msgid "Buddy List Options"
 #~ msgstr "Opciones de la Lista de Amigos"
 
-#~ msgid "Buddy List Window"
-#~ msgstr "Ventana de la Lista de Amigos"
-
 #, fuzzy
 #~ msgid "Tab Placement:"
 #~ msgstr "Ubicación de las pestañas"
@@ -3618,15 +4034,6 @@
 #~ msgid "Top"
 #~ msgstr "Arriba"
 
-#~ msgid "Bottom"
-#~ msgstr "Abajo"
-
-#~ msgid "Group Displays"
-#~ msgstr "Grupos"
-
-#~ msgid "Buddy Displays"
-#~ msgstr "Amigos"
-
 #~ msgid "Conversation Options"
 #~ msgstr "Opciones de Conversación"
 
@@ -3669,15 +4076,9 @@
 #~ msgid "Right"
 #~ msgstr "Derecha"
 
-#~ msgid "Buddy Icons"
-#~ msgstr "Iconos de Amigos"
-
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "Mostar todas las conversaciones en una ventana con pestañas"
 
-#~ msgid "Tab Completion"
-#~ msgstr "Tabulador"
-
 #~ msgid "Font Options"
 #~ msgstr "Opciones de Fuente"
 
@@ -3690,13 +4091,6 @@
 #~ msgid "Font Size for Text"
 #~ msgstr "Tamaño de Fuente para el Texto"
 
-#~ msgid "Sound Options"
-#~ msgstr "Opciones de Sonido"
-
-#, fuzzy
-#~ msgid "Sound method"
-#~ msgstr "Metodo para reprodución de Sonido"
-
 #, fuzzy
 #~ msgid "Sound played when:"
 #~ msgstr "Reproducir Sonidos en:"
@@ -3754,9 +4148,6 @@
 #~ msgid "Gaim - Buddy"
 #~ msgstr "Gaim - Amigo"
 
-#~ msgid "file not found: %s\n"
-#~ msgstr "archivo no encontrado: %s\n"
-
 #~ msgid "by Email"
 #~ msgstr "por Correo Electronico"
 
@@ -3820,9 +4211,6 @@
 #~ msgid "couldn't resolve host\n"
 #~ msgstr "no se pudo resolver la dirección\n"
 
-#~ msgid "Browser Options"
-#~ msgstr "Opciones del Navegador"
-
 #~ msgid "Logging Options"
 #~ msgstr "Options de Conexión"