Fixed bug with erroneous nickname when connecting to server (bug #19812), fixed display bugs in IRC error messages

1 files changed, 142 insertions, 113 deletions

diff --git a/po/es.po b/po/es.po
index aca30291e..af16d8bc9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.5-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2007-05-02 11:39+0200\n"
+"POT-Creation-Date: 2007-05-09 12:45+0200\n"
 "PO-Revision-Date: 2007-04-24 12:43+0200\n"
 "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
 "Language-Team:  weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14,93 +14,93 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/irc/irc-server.c:196 src/common/weeconfig.c:2324
+#: src/irc/irc-server.c:207 src/common/weeconfig.c:2324
 msgid "Unable to get user's name"
 msgstr "No ha sido posible obtener el nombre de usuario"
 
-#: src/irc/irc-server.c:265
+#: src/irc/irc-server.c:276
 #, c-format
 msgid "%s cannot allocate new server\n"
 msgstr "%s no ha sido posible crear un nuevo servidor\n"
 
-#: src/irc/irc-server.c:572 src/irc/irc-server.c:653
+#: src/irc/irc-server.c:583 src/irc/irc-server.c:664
 #, c-format
 msgid "%s error sending data to IRC server\n"
 msgstr "%s error enviando datos al servidor IRC\n"
 
-#: src/irc/irc-server.c:675 src/irc/irc-server.c:1002
+#: src/irc/irc-server.c:686 src/irc/irc-server.c:1011
 #, fuzzy
 msgid "(message dropped)"
 msgstr "mensaje recibido"
 
-#: src/irc/irc-server.c:787 src/irc/irc-server.c:800 src/irc/irc-server.c:847
-#: src/irc/irc-server.c:860
+#: src/irc/irc-server.c:796 src/irc/irc-server.c:809 src/irc/irc-server.c:856
+#: src/irc/irc-server.c:869
 #, c-format
 msgid "%s not enough memory for received IRC message\n"
 msgstr "%s memoria insuficiente para un mensaje IRC recibido\n"
 
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:978
 #, c-format
 msgid "%s Command \"%s\" failed!\n"
 msgstr "%s ¡El comando \"%s\" ha fallado!\n"
 
-#: src/irc/irc-server.c:975
+#: src/irc/irc-server.c:984
 #, c-format
 msgid "%s No command to execute!\n"
 msgstr "%s ¡Ningún comando para ejecutar!\n"
 
-#: src/irc/irc-server.c:981
+#: src/irc/irc-server.c:990
 #, c-format
 msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
 msgstr "%s Comando desconocido: cmd=\"%s\", host=\"%s\", params=\"%s\"\n"
 
-#: src/irc/irc-server.c:1047
+#: src/irc/irc-server.c:1056
 #, c-format
 msgid "%s cannot read data from socket, disconnecting from server...\n"
 msgstr ""
 "%s no ha sido posible leer datos del socket, desconectando del servidor...\n"
 
-#: src/irc/irc-server.c:1129
+#: src/irc/irc-server.c:1138
 #, c-format
 msgid "%s: Reconnecting to server in %d seconds\n"
 msgstr "%s: Reconexión al servidor en %d segundos\n"
 
-#: src/irc/irc-server.c:1163
+#: src/irc/irc-server.c:1172
 #, c-format
 msgid "%s gnutls handshake failed\n"
 msgstr "%s el handshake gnutls ha fallado\n"
 
-#: src/irc/irc-server.c:1180
+#: src/irc/irc-server.c:1189
 #, c-format
 msgid "%s proxy address \"%s\" not found\n"
 msgstr "%s dirección proxy \"%s\" no encontrada\n"
 
-#: src/irc/irc-server.c:1184
+#: src/irc/irc-server.c:1193
 #, c-format
 msgid "%s address \"%s\" not found\n"
 msgstr "%s dirección \"%s\" no encontrada\n"
 
-#: src/irc/irc-server.c:1194
+#: src/irc/irc-server.c:1203
 #, c-format
 msgid "%s proxy IP address not found\n"
 msgstr "%s dirección proxy IP no encontrada\n"
 
-#: src/irc/irc-server.c:1197
+#: src/irc/irc-server.c:1206
 #, c-format
 msgid "%s IP address not found\n"
 msgstr "%s Dirección IP no encontrada\n"
 
-#: src/irc/irc-server.c:1206
+#: src/irc/irc-server.c:1215
 #, c-format
 msgid "%s proxy connection refused\n"
 msgstr "%s conexión proxy rechazada\n"
 
-#: src/irc/irc-server.c:1209
+#: src/irc/irc-server.c:1218
 #, c-format
 msgid "%s connection refused\n"
 msgstr "%s conexión rechazada\n"
 
-#: src/irc/irc-server.c:1217
+#: src/irc/irc-server.c:1226
 #, c-format
 msgid ""
 "%s proxy fails to establish connection to server (check username/password if "
@@ -109,12 +109,12 @@ msgstr ""
 "%s el proxy ha fallado al establecer la conexión al servidor (comprueba el "
 "nombre de usuario o la contraseña si es necesario)\n"
 
-#: src/irc/irc-server.c:1227
+#: src/irc/irc-server.c:1236
 #, fuzzy, c-format
 msgid "%s unable to set local hostname/IP\n"
 msgstr "%s no es posible crear el servidor\n"
 
-#: src/irc/irc-server.c:1742
+#: src/irc/irc-server.c:1748
 #, c-format
 msgid ""
 "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -122,57 +122,57 @@ msgstr ""
 "%s No ha sido posible conectar con SSL debido a que Weechat no fue compilado "
 "con soporte GNUtls\n"
 
-#: src/irc/irc-server.c:1751
+#: src/irc/irc-server.c:1757
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr "%s: conectando al servidor %s:%d%s%s vía %s proxy %s: %d%s...\n"
 
-#: src/irc/irc-server.c:1757
+#: src/irc/irc-server.c:1763
 #, c-format
 msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr "Conectando al servidor %s:%d%s%s vía %s proxy %s:%d%s...\n"
 
-#: src/irc/irc-server.c:1767
+#: src/irc/irc-server.c:1773
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s...\n"
 msgstr "%s: conectando al servidor %s:%d%s%s...\n"
 
-#: src/irc/irc-server.c:1771
+#: src/irc/irc-server.c:1777
 #, c-format
 msgid "Connecting to server %s:%d%s%s...\n"
 msgstr "Conectando al servidor %s:%d%s%s...\n"
 
-#: src/irc/irc-server.c:1789
+#: src/irc/irc-server.c:1795
 #, c-format
 msgid "%s gnutls init error\n"
 msgstr "%s error de inicialización de gnutls\n"
 
-#: src/irc/irc-server.c:1804
+#: src/irc/irc-server.c:1811
 #, c-format
 msgid "%s cannot create pipe\n"
 msgstr "%s no ha sido posible crear la interconexión\n"
 
-#: src/irc/irc-server.c:1819
+#: src/irc/irc-server.c:1826
 #, c-format
 msgid "%s cannot create socket\n"
 msgstr "%s no ha sido posible crear el socket\n"
 
-#: src/irc/irc-server.c:1830
+#: src/irc/irc-server.c:1837
 #, c-format
 msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
 msgstr "%s no ha sido posible configurar la opción socket \"SO_REUSEADDR\"\n"
 
-#: src/irc/irc-server.c:1841
+#: src/irc/irc-server.c:1848
 #, c-format
 msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
 msgstr "%s no ha sido posible configurar la opción socket \"SO_KEEPALIVE\"\n"
 
-#: src/irc/irc-server.c:1872
+#: src/irc/irc-server.c:1879
 #, c-format
 msgid "%s: Reconnecting to server...\n"
 msgstr "%s: Reconectando al servidor...\n"
 
-#: src/irc/irc-server.c:1923 src/irc/irc-server.c:1934
+#: src/irc/irc-server.c:1930 src/irc/irc-server.c:1941
 msgid "Disconnected from server!\n"
 msgstr "¡Desconectado del servidor!\n"
 
@@ -1384,7 +1384,7 @@ msgstr "inactivo"
 msgid " (temporary server, will not be saved)"
 msgstr " (servidor temporal, no será guardado)"
 
-#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3164
+#: src/irc/irc-display.c:399 src/irc/irc-display.c:443 src/irc/irc-recv.c:3170
 msgid "seconds"
 msgstr "segundos"
 
@@ -1439,7 +1439,7 @@ msgid "%s \"%s\" command can only be executed in a channel or private buffer\n"
 msgstr ""
 "%s el comando \"%s\" sólo puede ser ejecutado en una ventana de canal\n"
 
-#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:582
+#: src/irc/irc-send.c:1305 src/irc/irc-recv.c:579
 #, c-format
 msgid "%s nick \"%s\" not found for \"%s\" command\n"
 msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n"
@@ -1462,60 +1462,60 @@ msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
 msgid "%s, compiled on %s %s\n"
 msgstr "%s, compilado en %s %s\n"
 
-#: src/irc/irc-recv.c:419
+#: src/irc/irc-recv.c:413
 #, c-format
 msgid "You have been invited to %s%s%s by %s%s\n"
 msgstr "Usted ha sido invitado a %s%s%s por %s%s\n"
 
-#: src/irc/irc-recv.c:437 src/irc/irc-recv.c:551 src/irc/irc-recv.c:751
-#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3471
-#: src/irc/irc-recv.c:3537 src/irc/irc-recv.c:3558
+#: src/irc/irc-recv.c:431 src/irc/irc-recv.c:548 src/irc/irc-recv.c:748
+#: src/irc/irc-recv.c:1180 src/irc/irc-recv.c:1528 src/irc/irc-recv.c:3477
+#: src/irc/irc-recv.c:3543 src/irc/irc-recv.c:3564
 #, c-format
 msgid "%s channel \"%s\" not found for \"%s\" command\n"
 msgstr "%s canal \"%s\" no encontrado para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:466
+#: src/irc/irc-recv.c:463
 #, c-format
 msgid "%s cannot create new channel \"%s\"\n"
 msgstr "%s no es posible crear un nuevo canal \"%s\"\n"
 
-#: src/irc/irc-recv.c:479
+#: src/irc/irc-recv.c:476
 #, c-format
 msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
 msgstr "%s%s %s(%s%s%s)%s se ha unido %s%s\n"
 
-#: src/irc/irc-recv.c:559
+#: src/irc/irc-recv.c:556
 #, c-format
 msgid "%s%s%s has kicked %s%s%s from %s%s"
 msgstr "%s%s%s ha pateado a %s%s%s de %s%s"
 
-#: src/irc/irc-recv.c:649
+#: src/irc/irc-recv.c:646
 #, c-format
 msgid "%s%s%s has killed %s%s%s from server"
 msgstr "%s%s%s ha expulsado a %s%s%s del servidor"
 
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:668
 #, c-format
 msgid "%s host \"%s\" not found for \"%s\" command\n"
 msgstr "%s anfitrión \"%s\" no encontrado para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:693 src/irc/irc-recv.c:794 src/irc/irc-recv.c:1324
+#: src/irc/irc-recv.c:690 src/irc/irc-recv.c:791 src/irc/irc-recv.c:1324
 #: src/irc/irc-recv.c:2095
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr "%s comando \"%s\" recibido sin host \n"
 
-#: src/irc/irc-recv.c:703
+#: src/irc/irc-recv.c:700
 #, c-format
 msgid "%s \"%s\" command received without channel or nickname\n"
 msgstr "%s comando \"%s\" recibido sin canal o usuario\n"
 
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:730
 #, fuzzy, c-format
 msgid "Mode %s%s %s[%s%s%s]%s by %s%s\n"
 msgstr "%s%s %s(%s%s@%s%s)%s estaba %s\n"
 
-#: src/irc/irc-recv.c:762
+#: src/irc/irc-recv.c:759
 #, fuzzy, c-format
 msgid "User mode %s[%s%s%s]%s by %s%s\n"
 msgstr "Modo de usuario %s[%s%s%s/%s%s%s]\n"
@@ -1599,11 +1599,11 @@ msgstr "reop canal %s%s%s: %s%s\n"
 #: src/irc/irc-recv.c:1653 src/irc/irc-recv.c:1684 src/irc/irc-recv.c:1705
 #: src/irc/irc-recv.c:1721 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1772
 #: src/irc/irc-recv.c:1788 src/irc/irc-recv.c:1818 src/irc/irc-recv.c:1839
-#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2508
-#: src/irc/irc-recv.c:3942 src/irc/irc-recv.c:3957 src/irc/irc-recv.c:4056
-#: src/irc/irc-recv.c:4070 src/irc/irc-recv.c:4316 src/irc/irc-recv.c:4443
-#: src/irc/irc-recv.c:4580 src/irc/irc-recv.c:4595 src/irc/irc-recv.c:4701
-#: src/irc/irc-recv.c:4715
+#: src/irc/irc-recv.c:1854 src/irc/irc-recv.c:2071 src/irc/irc-recv.c:2514
+#: src/irc/irc-recv.c:3948 src/irc/irc-recv.c:3963 src/irc/irc-recv.c:4062
+#: src/irc/irc-recv.c:4076 src/irc/irc-recv.c:4322 src/irc/irc-recv.c:4449
+#: src/irc/irc-recv.c:4586 src/irc/irc-recv.c:4601 src/irc/irc-recv.c:4707
+#: src/irc/irc-recv.c:4721
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr "%s no es posible analizar el comando \"%s\"\n"
@@ -1613,228 +1613,258 @@ msgstr "%s no es posible analizar el comando \"%s\"\n"
 msgid "%s unknown DCC CHAT type received from "
 msgstr "%s tipo DCC CHAT desconocido recibido de "
 
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2122
 #, c-format
 msgid "%s%s %s(%s%s%s)%s has quit"
 msgstr "%s%s %s(%s%s%s)%s ha salido"
 
-#: src/irc/irc-recv.c:2291
+#: src/irc/irc-recv.c:2297
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr "%s comando \"%s\" recibido sin canal\n"
 
-#: src/irc/irc-recv.c:2320
+#: src/irc/irc-recv.c:2326
 #, c-format
 msgid "%s%s%s has changed topic for %s%s%s to:"
 msgstr "%s%s%s ha cambiado el tema para %s%s%s a:"
 
-#: src/irc/irc-recv.c:2331
+#: src/irc/irc-recv.c:2337
 #, c-format
 msgid "%s%s%s has unset topic for %s%s\n"
 msgstr "%s%s%s ha quitado el tema para %s%s\n"
 
-#: src/irc/irc-recv.c:2368
+#: src/irc/irc-recv.c:2374
 #, fuzzy, c-format
 msgid "WALLOPS from %s%s%s: %s\n"
 msgstr "CTCP %sVERSION%s respuesta de %s%s%s: %s\n"
 
-#: src/irc/irc-recv.c:2494
+#: src/irc/irc-recv.c:2500
 #, fuzzy, c-format
 msgid "User mode for %s%s%s is %s[%s%s%s]\n"
 msgstr "Modo de usuario %s[%s%s%s/%s%s%s]\n"
 
-#: src/irc/irc-recv.c:2558
+#: src/irc/irc-recv.c:2564
 #, c-format
 msgid "%s%s%s is away: %s\n"
 msgstr "%s%s%s está ausente: %s\n"
 
-#: src/irc/irc-recv.c:2650
+#: src/irc/irc-recv.c:2656
 msgid "Users online: "
 msgstr "Usuarios conectados: "
 
-#: src/irc/irc-recv.c:2825
+#: src/irc/irc-recv.c:2831
 #, fuzzy, c-format
 msgid "%s[%s%s%s]%s help mode (+h)\n"
 msgstr "%s[%s%s%s]%s inactividad: "
 
-#: src/irc/irc-recv.c:3015
+#: src/irc/irc-recv.c:3021
 #, c-format
 msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
 msgstr "%s%s %s(%s%s@%s%s)%s estaba %s\n"
 
-#: src/irc/irc-recv.c:3136
+#: src/irc/irc-recv.c:3142
 #, c-format
 msgid "%s[%s%s%s]%s idle: "
 msgstr "%s[%s%s%s]%s inactividad: "
 
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
 msgid "days"
 msgstr "días"
 
-#: src/irc/irc-recv.c:3148 src/common/command.c:3952 src/common/command.c:3970
+#: src/irc/irc-recv.c:3154 src/common/command.c:3952 src/common/command.c:3970
 msgid "day"
 msgstr "día"
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3158
 #, c-format
 msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
 msgstr "%s%02d %s%s %s%02d %s%s %s%02d %s%s, firmó en: %s%s"
 
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
 msgid "hours"
 msgstr "horas"
 
-#: src/irc/irc-recv.c:3156
+#: src/irc/irc-recv.c:3162
 msgid "hour"
 msgstr "hora"
 
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
 msgid "minutes"
 msgstr "minutos"
 
-#: src/irc/irc-recv.c:3160
+#: src/irc/irc-recv.c:3166
 msgid "minute"
 msgstr "minuto"
 
-#: src/irc/irc-recv.c:3164
+#: src/irc/irc-recv.c:3170
 msgid "second"
 msgstr "segundo"
 
-#: src/irc/irc-recv.c:3482
+#: src/irc/irc-recv.c:3488
 #, fuzzy, c-format
 msgid "Channel created on %s"
 msgstr "lista de excepción de canal"
 
-#: src/irc/irc-recv.c:3491 src/irc/irc-recv.c:3688
+#: src/irc/irc-recv.c:3497 src/irc/irc-recv.c:3694
 #, c-format
 msgid "%s cannot identify date/time for \"%s\" command\n"
 msgstr "%s no es posible identificar la fecha/hora para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:3500 src/irc/irc-recv.c:3624 src/irc/irc-recv.c:3706
-#: src/irc/irc-recv.c:3817
+#: src/irc/irc-recv.c:3506 src/irc/irc-recv.c:3630 src/irc/irc-recv.c:3712
+#: src/irc/irc-recv.c:3823
 #, c-format
 msgid "%s cannot identify channel for \"%s\" command\n"
 msgstr "%s no es posible identificar el canal para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:3549
+#: src/irc/irc-recv.c:3555
 #, c-format
 msgid "No topic set for %s%s\n"
 msgstr "Sin tema establecido para %s%s\n"
 
-#: src/irc/irc-recv.c:3609
+#: src/irc/irc-recv.c:3615
 #, c-format
 msgid "Topic for %s%s%s is: "
 msgstr "El tema para %s%s%s es: "
 
-#: src/irc/irc-recv.c:3677
+#: src/irc/irc-recv.c:3683
 #, c-format
 msgid "Topic set by %s%s%s, %s"
 msgstr "Tema establecido por %s%s%s, %s"
 
-#: src/irc/irc-recv.c:3697 src/irc/irc-recv.c:3826
+#: src/irc/irc-recv.c:3703 src/irc/irc-recv.c:3832
 #, c-format
 msgid "%s cannot identify nickname for \"%s\" command\n"
 msgstr ""
 "%s no es posible determinar el nombre de usuario para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:3802
+#: src/irc/irc-recv.c:3808
 #, c-format
 msgid "%s%s%s has invited %s%s%s on %s%s\n"
 msgstr "%s%s%s ha invitado a %s%s%s en %s%s\n"
 
-#: src/irc/irc-recv.c:3862
+#: src/irc/irc-recv.c:3868
 #, c-format
 msgid "Channel reop %s%s%s: %s%s\n"
 msgstr "reop canal %s%s%s: %s%s\n"
 
-#: src/irc/irc-recv.c:4011
+#: src/irc/irc-recv.c:4017
 #, fuzzy, c-format
 msgid " by %s%s %s(%s%s%s)"
 msgstr "%s%s %s(%s%s%s)%s ha salido"
 
-#: src/irc/irc-recv.c:4020
+#: src/irc/irc-recv.c:4026
 #, c-format
 msgid " by %s%s"
 msgstr ""
 
-#: src/irc/irc-recv.c:4330 src/irc/irc-recv.c:4489
+#: src/irc/irc-recv.c:4336 src/irc/irc-recv.c:4495
 #, c-format
 msgid "Nicks %s%s%s: %s["
 msgstr "Usuarios %s%s%s: %s["
 
-#: src/irc/irc-recv.c:4411
+#: src/irc/irc-recv.c:4417
 #, c-format
 msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
 msgstr "%s no es posible crear el usuario \"%s\" para el canal \"%s\"\n"
 
-#: src/irc/irc-recv.c:4510
+#: src/irc/irc-recv.c:4516
 #, c-format
 msgid ""
 "Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
 msgstr ""
 "Canal %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
 
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
 msgid "nicks"
 msgstr "usuarios"
 
-#: src/irc/irc-recv.c:4518
+#: src/irc/irc-recv.c:4524
 msgid "nick"
 msgstr "usuario"
 
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
 msgid "ops"
 msgstr "operadores"
 
-#: src/irc/irc-recv.c:4523
+#: src/irc/irc-recv.c:4529
 msgid "op"
 msgstr "operador"
 
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
 msgid "halfops"
 msgstr "semi-operadores"
 
-#: src/irc/irc-recv.c:4527
+#: src/irc/irc-recv.c:4533
 msgid "halfop"
 msgstr "semi-operador"
 
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
 msgid "voices"
 msgstr "voces"
 
-#: src/irc/irc-recv.c:4531
+#: src/irc/irc-recv.c:4537
 msgid "voice"
 msgstr "voz"
 
-#: src/irc/irc-recv.c:4535
+#: src/irc/irc-recv.c:4541
 msgid "normal"
 msgstr "normal"
 
-#: src/irc/irc-recv.c:4635
+#: src/irc/irc-recv.c:4641
 #, c-format
 msgid "%s[%s%s%s] %s%s%s banned by "
 msgstr "%s[%s%s%s] %s%s%s baneado por "
 
-#: src/irc/irc-recv.c:4670
+#: src/irc/irc-recv.c:4676
 #, c-format
 msgid "%s[%s%s%s] %s%s%s banned\n"
 msgstr "%s[%s%s%s] %s%s%s baneado\n"
 
-#: src/irc/irc-recv.c:4805
+#: src/irc/irc-recv.c:4811
+#, fuzzy, c-format
+msgid "%s: trying 2nd nickname \"%s\"\n"
+msgstr ""
+"%s: el nombre de usuario \"%s\" ya está en uso, probando con el 2 nombre de "
+"usuario \"%s\"\n"
+
+#: src/irc/irc-recv.c:4822
+#, fuzzy, c-format
+msgid "%s: trying 3rd nickname \"%s\"\n"
+msgstr ""
+"%s: el nombre de usuario \"%s\" ya está en uso, probando con el 3 nombre de "
+"usuario \"%s\"\n"
+
+#: src/irc/irc-recv.c:4833
+#, fuzzy, c-format
+msgid ""
+"%s: all declared nicknames are already in use or invalid, closing connection "
+"with server!\n"
+msgstr ""
+"%s: todos los nombres de usuario declarados ya están en uso, ¡cerrando la "
+"conexión con el servidor!\n"
+
+#: src/irc/irc-recv.c:4844
+#, fuzzy, c-format
+msgid "%s: trying 1st nickname \"%s\"\n"
+msgstr ""
+"%s: el nombre de usuario \"%s\" ya está en uso, probando con el 1 nombre de "
+"usuario \"%s\"\n"
+
+#: src/irc/irc-recv.c:4873
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
 msgstr ""
 "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 2 nombre de "
 "usuario \"%s\"\n"
 
-#: src/irc/irc-recv.c:4817
+#: src/irc/irc-recv.c:4885
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
 msgstr ""
 "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 3 nombre de "
 "usuario \"%s\"\n"
 
-#: src/irc/irc-recv.c:4829
+#: src/irc/irc-recv.c:4897
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
@@ -1843,17 +1873,13 @@ msgstr ""
 "%s: todos los nombres de usuario declarados ya están en uso, ¡cerrando la "
 "conexión con el servidor!\n"
 
-#: src/irc/irc-recv.c:4839
+#: src/irc/irc-recv.c:4907
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
 msgstr ""
 "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 1 nombre de "
 "usuario \"%s\"\n"
 
-#: src/irc/irc-recv.c:4851
-msgid "unknown"
-msgstr "desconocido"
-
 #: src/irc/irc-dcc.c:55
 msgid "Waiting"
 msgstr "Esperando"
@@ -3948,32 +3974,32 @@ msgstr "error de lectura de tipo"
 msgid "wrong type (expected: %d, read: %d)"
 msgstr "tipo erróneo (esperado: %d, leído: %d)"
 
-#: src/common/session.c:835
+#: src/common/session.c:834
 msgid "server name not found"
 msgstr "nombre de servidor no encontrado"
 
-#: src/common/session.c:840
+#: src/common/session.c:839
 #, c-format
 msgid "session: loading server \"%s\"\n"
 msgstr "sesión: cargando servidor \"%s\"\n"
 
-#: src/common/session.c:844
+#: src/common/session.c:843
 msgid "server found, updating values\n"
 msgstr "servidor encontrado, actualizando valores\n"
 
-#: src/common/session.c:847
+#: src/common/session.c:846
 msgid "server not found, creating new one\n"
 msgstr "servidor no encontrado, creando uno nuevo\n"
 
-#: src/common/session.c:852
+#: src/common/session.c:851
 msgid "can't create new server"
 msgstr "no se puede crear un nuevo servidor"
 
-#: src/common/session.c:866
+#: src/common/session.c:865
 msgid "unexpected end of file (reading server)"
 msgstr "fin de fichero inesperado (leyendo servidor)"
 
-#: src/common/session.c:957
+#: src/common/session.c:956
 msgid "gnutls init error"
 msgstr "error de inicio de gnutls"
 
@@ -5698,3 +5724,6 @@ msgstr ""
 #: src/common/weeconfig.c:2388
 msgid "Saving config to disk\n"
 msgstr "Guardar configuración a disco\n"
+
+#~ msgid "unknown"
+#~ msgstr "desconocido"