Replaced options nick1/nick2/nick3 by nicks in IRC servers

9 files changed, 292 insertions, 350 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 092baa433..134316f78 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -103,7 +103,6 @@
 ./src/plugins/irc/irc.h
 ./src/plugins/irc/irc-input.c
 ./src/plugins/irc/irc-input.h
-./src/plugins/irc/irc-log.c
 ./src/plugins/irc/irc-mode.c
 ./src/plugins/irc/irc-mode.h
 ./src/plugins/irc/irc-nick.c
diff --git a/po/cs.po b/po/cs.po
index 57d1d79ca..df83c4963 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-01-29 15:15+0100\n"
+"POT-Creation-Date: 2008-02-02 23:26+0100\n"
 "PO-Revision-Date: 2007-09-06 12:44+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2597,10 +2597,11 @@ msgstr ""
 msgid "list, add or remove servers"
 msgstr "vypíše, přídá nebo odebere servery"
 
+#, fuzzy
 msgid ""
 "[list [servername]] | [listfull [servername]] | [add servername hostname [-"
 "port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks "
-"nick1 nick2 nick3] [-username username] [-realname realname] [-command "
+"nick1,nick2,nick3,...] [-username username] [-realname realname] [-command "
 "command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
 "[rename servername newservername] | [keep servername] | [del servername]"
 msgstr ""
@@ -3039,21 +3040,10 @@ msgstr "použít SSL pro komunikaci se serverem"
 msgid "password for IRC server"
 msgstr "heslo pro IRC server"
 
-msgid "nickname to use on IRC server"
+#, fuzzy
+msgid "nicknames to use on IRC server (separated by comma)"
 msgstr "přezdívka použitá na IRC serveru"
 
-msgid "alternate nickname to use on IRC server (if nickname is already used)"
-msgstr ""
-"alternativní přezdívka použitá na IRC serveru (pokud přezdívka je již "
-"použita)"
-
-msgid ""
-"2nd alternate nickname to use on IRC server (if alternate nickname is "
-"already used)"
-msgstr ""
-"druhá alternativní přezdívka použitá na IRC serveru (pokud alternativní "
-"přezdívka je již použita)"
-
 msgid "user name to use on IRC server"
 msgstr "uživatelské jméno použité na IRC serveru"
 
@@ -3321,10 +3311,6 @@ msgstr "%s nepřipojen k serveru\n"
 msgid "%s: this buffer is not a channel!"
 msgstr "Tohe není okno kanálu!\n"
 
-#, c-format
-msgid "Not enough memory to write log file \"%s\"\n"
-msgstr "Nedostatek paměti pro zapsání log sourobru \"%s\"\n"
-
 msgid "error received from IRC server"
 msgstr "přijata chyba z IRC serveru"
 
@@ -3903,54 +3889,30 @@ msgid "%s%s[%s%s%s] %s%s%s banned"
 msgstr "%s[%s%s%s] %s%s%s takázaný\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 2nd nickname \"%s\""
-msgstr ""
-"%s: přezdívka \"%s\" je již používaná, zkouším druhou přezdívku \"%s\"\n"
-
-#, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
-msgstr ""
-"%s: přezdívka \"%s\" je již používaná, zkouším třetí přezdívku \"%s\"\n"
-
-#, fuzzy, c-format
 msgid ""
 "%s%s: all declared nicknames are already in use or invalid, closing "
-"connection with server!"
+"connection with server"
 msgstr ""
 "%s: všechny deklarované přezdívky jsou již používány nebo nevalidní, zavírám "
 "spojení se serverem!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
-msgstr ""
-"%s: přezdívka \"%s\" je již použivaná, zkouším první přezdívku \"%s\"\n"
-
-#, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\""
+msgid "%s%s: nickname \"%s\" is invalid, trying nickname #%d (\"%s\")"
 msgstr ""
 "%s: přezdívka \"%s\" je již používaná, zkouším druhou přezdívku \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
-msgstr ""
-"%s: přezdívka \"%s\" je již používaná, zkouším třetí přezdívku \"%s\"\n"
-
-#, fuzzy, c-format
 msgid ""
 "%s%s: all declared nicknames are already in use, closing connection with "
-"server!"
+"server"
 msgstr ""
 "%s: všechny deklarované přezdívky jsou již používány, zavírám spojení se "
 "serverem!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
-msgstr ""
-"%s: přezdívka \"%s\" je již použivaná, zkouším první přezdívku \"%s\"\n"
-
-#, c-format
-msgid "%s%s: error retrieving user's name: %s"
+msgid "%s%s: nickname \"%s\" is already in use, trying nickname #%d (\"%s\")"
 msgstr ""
+"%s: přezdívka \"%s\" je již používaná, zkouším druhou přezdívku \"%s\"\n"
 
 #, fuzzy, c-format
 msgid "%s%s: error when allocating new server"
@@ -4366,6 +4328,42 @@ msgstr ""
 msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s špatné parametry pro příkaz \"%s\"\n"
 
+#~ msgid ""
+#~ "alternate nickname to use on IRC server (if nickname is already used)"
+#~ msgstr ""
+#~ "alternativní přezdívka použitá na IRC serveru (pokud přezdívka je již "
+#~ "použita)"
+
+#~ msgid ""
+#~ "2nd alternate nickname to use on IRC server (if alternate nickname is "
+#~ "already used)"
+#~ msgstr ""
+#~ "druhá alternativní přezdívka použitá na IRC serveru (pokud alternativní "
+#~ "přezdívka je již použita)"
+
+#~ msgid "Not enough memory to write log file \"%s\"\n"
+#~ msgstr "Nedostatek paměti pro zapsání log sourobru \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
+#~ msgstr ""
+#~ "%s: přezdívka \"%s\" je již používaná, zkouším třetí přezdívku \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
+#~ msgstr ""
+#~ "%s: přezdívka \"%s\" je již použivaná, zkouším první přezdívku \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
+#~ msgstr ""
+#~ "%s: přezdívka \"%s\" je již používaná, zkouším třetí přezdívku \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
+#~ msgstr ""
+#~ "%s: přezdívka \"%s\" je již použivaná, zkouším první přezdívku \"%s\"\n"
+
 #~ msgid "[file]"
 #~ msgstr "[soubor]"
 
diff --git a/po/de.po b/po/de.po
index 4b07ab9fe..f740fa0f4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-01-29 15:15+0100\n"
+"POT-Creation-Date: 2008-02-02 23:26+0100\n"
 "PO-Revision-Date: 2007-09-06 12:44+0200\n"
 "Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2599,7 +2599,7 @@ msgstr "Auflisten, Hinzufügen oder Entfernen von Servern"
 msgid ""
 "[list [servername]] | [listfull [servername]] | [add servername hostname [-"
 "port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks "
-"nick1 nick2 nick3] [-username username] [-realname realname] [-command "
+"nick1,nick2,nick3,...] [-username username] [-realname realname] [-command "
 "command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
 "[rename servername newservername] | [keep servername] | [del servername]"
 msgstr ""
@@ -3027,21 +3027,10 @@ msgstr "Server über SSL ansprechen"
 msgid "password for IRC server"
 msgstr "Passwort für den IRC-Server"
 
-msgid "nickname to use on IRC server"
+#, fuzzy
+msgid "nicknames to use on IRC server (separated by comma)"
 msgstr "eigener Nickname, der auf dem IRC-Server benutzt werden soll"
 
-msgid "alternate nickname to use on IRC server (if nickname is already used)"
-msgstr ""
-"alternativer Nickname, der auf dem IRC-Server benutzt werden soll, wenn der "
-"erste Kandidat bereits benutzt wird"
-
-msgid ""
-"2nd alternate nickname to use on IRC server (if alternate nickname is "
-"already used)"
-msgstr ""
-"2. alternativer Nickname, der auf dem IRC-Server benutzt werden soll, wenn "
-"der erste alternative Nickname bereits benutzt wird"
-
 msgid "user name to use on IRC server"
 msgstr "Benutzername, der an den Server übermittelt werden soll"
 
@@ -3311,11 +3300,6 @@ msgstr "%s keine Verbindung zum Server \"%s\"!\n"
 msgid "%s: this buffer is not a channel!"
 msgstr "Dieses Fenster ist kein Channel!\n"
 
-#, fuzzy, c-format
-msgid "Not enough memory to write log file \"%s\"\n"
-msgstr ""
-"Nicht genügend Speicher, um das Logfile für einen Puffer zu schreiben\n"
-
 msgid "error received from IRC server"
 msgstr "Fehlermeldung vom IRC-Server empfangen"
 
@@ -3897,54 +3881,30 @@ msgid "%s%s[%s%s%s] %s%s%s banned"
 msgstr "%s[%s%s%s] %s%s%s gebannt\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 2nd nickname \"%s\""
-msgstr ""
-"%s: Nickname \"%s\" wird bereits verwendet, versuche 2. Nickname \"%s\"\n"
-
-#, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
-msgstr ""
-"%s: Nickname \"%s\" wird bereits verwendet, versuche 3. Nickname \"%s\"\n"
-
-#, fuzzy, c-format
 msgid ""
 "%s%s: all declared nicknames are already in use or invalid, closing "
-"connection with server!"
+"connection with server"
 msgstr ""
 "%s: alle eingestellten Nicknames sind bereits in Verwendung, Verbindung wird "
 "getrennt!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
-msgstr ""
-"%s: Nickname \"%s\" wird bereits verwendet, versuche 1. Nickname \"%s\"\n"
-
-#, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\""
+msgid "%s%s: nickname \"%s\" is invalid, trying nickname #%d (\"%s\")"
 msgstr ""
 "%s: Nickname \"%s\" wird bereits verwendet, versuche 2. Nickname \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
-msgstr ""
-"%s: Nickname \"%s\" wird bereits verwendet, versuche 3. Nickname \"%s\"\n"
-
-#, fuzzy, c-format
 msgid ""
 "%s%s: all declared nicknames are already in use, closing connection with "
-"server!"
+"server"
 msgstr ""
 "%s: alle eingestellten Nicknames sind in Verwendung, Verbindung wird "
 "getrennt!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
-msgstr ""
-"%s: Nickname \"%s\" wird bereits verwendet, versuche 1. Nickname \"%s\"\n"
-
-#, c-format
-msgid "%s%s: error retrieving user's name: %s"
+msgid "%s%s: nickname \"%s\" is already in use, trying nickname #%d (\"%s\")"
 msgstr ""
+"%s: Nickname \"%s\" wird bereits verwendet, versuche 2. Nickname \"%s\"\n"
 
 #, fuzzy, c-format
 msgid "%s%s: error when allocating new server"
@@ -4362,6 +4322,44 @@ msgstr ""
 msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s fehlerhafte Argumente für der \"%s\"-Befehl\n"
 
+#~ msgid ""
+#~ "alternate nickname to use on IRC server (if nickname is already used)"
+#~ msgstr ""
+#~ "alternativer Nickname, der auf dem IRC-Server benutzt werden soll, wenn "
+#~ "der erste Kandidat bereits benutzt wird"
+
+#~ msgid ""
+#~ "2nd alternate nickname to use on IRC server (if alternate nickname is "
+#~ "already used)"
+#~ msgstr ""
+#~ "2. alternativer Nickname, der auf dem IRC-Server benutzt werden soll, "
+#~ "wenn der erste alternative Nickname bereits benutzt wird"
+
+#, fuzzy
+#~ msgid "Not enough memory to write log file \"%s\"\n"
+#~ msgstr ""
+#~ "Nicht genügend Speicher, um das Logfile für einen Puffer zu schreiben\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
+#~ msgstr ""
+#~ "%s: Nickname \"%s\" wird bereits verwendet, versuche 3. Nickname \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
+#~ msgstr ""
+#~ "%s: Nickname \"%s\" wird bereits verwendet, versuche 1. Nickname \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
+#~ msgstr ""
+#~ "%s: Nickname \"%s\" wird bereits verwendet, versuche 3. Nickname \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
+#~ msgstr ""
+#~ "%s: Nickname \"%s\" wird bereits verwendet, versuche 1. Nickname \"%s\"\n"
+
 #~ msgid "[file]"
 #~ msgstr "[Datei]"
 
diff --git a/po/es.po b/po/es.po
index 10ee492ac..e9b12a59b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-01-29 15:15+0100\n"
+"POT-Creation-Date: 2008-02-02 23:26+0100\n"
 "PO-Revision-Date: 2007-09-19 12:09+0200\n"
 "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
 "Language-Team:  weechat-dev <weechat-dev@nongnu.org>\n"
@@ -909,8 +909,8 @@ msgstr "marca de tiempo para la fecha mostrada cuando el día cambió"
 
 msgid "use a marker on servers/channels to show first unread line"
 msgstr ""
-"usar un marcador en los servidores/canales para mostrar la primera línea sin "
-"leer"
+"usar un marcador en los servidores/canales para mostrar la primera línea "
+"sin leer"
 
 #, c-format
 msgid ""
@@ -1433,8 +1433,8 @@ msgid ""
 "support.\n"
 "Be careful, private info may be in these files.\n"
 msgstr ""
-"Por favor, envía %s/%s, %s/%s y los mensajes de arriba a los desarrolladores "
-"de Weechat para el soporte.\n"
+"Por favor, envía %s/%s, %s/%s y los mensajes de arriba a los "
+"desarrolladores de Weechat para el soporte.\n"
 "Sé cuidadoso, puede que haya información privada en estos ficheros.\n"
 
 #, c-format
@@ -2597,7 +2597,7 @@ msgstr "lista, añde o elimina servidores"
 msgid ""
 "[list [servername]] | [listfull [servername]] | [add servername hostname [-"
 "port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks "
-"nick1 nick2 nick3] [-username username] [-realname realname] [-command "
+"nick1,nick2,nick3,...] [-username username] [-realname realname] [-command "
 "command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
 "[rename servername newservername] | [keep servername] | [del servername]"
 msgstr ""
@@ -3032,21 +3032,10 @@ msgstr "usar SSL para la comunicación del servidor"
 msgid "password for IRC server"
 msgstr "contraseña para el servidor IRC"
 
-msgid "nickname to use on IRC server"
+#, fuzzy
+msgid "nicknames to use on IRC server (separated by comma)"
 msgstr "nombre de usuario a utilizar en el servidor IRC"
 
-msgid "alternate nickname to use on IRC server (if nickname is already used)"
-msgstr ""
-"nombre de usuario alternativo para el servidor IRC (si el nombre de usuario "
-"ya está en uso)"
-
-msgid ""
-"2nd alternate nickname to use on IRC server (if alternate nickname is "
-"already used)"
-msgstr ""
-"segundo nombre de usuario alternativo a utilizar en el servidor IRC (si el "
-"nombre de usuario alternativo ya está en uso)"
-
 msgid "user name to use on IRC server"
 msgstr "nombre de usuario para el servidor IRC"
 
@@ -3316,11 +3305,6 @@ msgstr "%s ¡no conectado al servidor \"%s\"!\n"
 msgid "%s: this buffer is not a channel!"
 msgstr "¡Esta ventana no es un canal!\n"
 
-#, fuzzy, c-format
-msgid "Not enough memory to write log file \"%s\"\n"
-msgstr ""
-"No hay suficiente memoria para escribir un fichero de log para un búfer\n"
-
 msgid "error received from IRC server"
 msgstr "error recibido del servidor IRC"
 
@@ -3906,61 +3890,33 @@ msgid "%s%s[%s%s%s] %s%s%s banned"
 msgstr "%s[%s%s%s] %s%s%s baneado\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 2nd nickname \"%s\""
-msgstr ""
-"%s: el nombre de usuario \"%s\" ya está en uso, probando con el 2 nombre de "
-"usuario \"%s\"\n"
-
-#, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
-msgstr ""
-"%s: el nombre de usuario \"%s\" ya está en uso, probando con el 3 nombre de "
-"usuario \"%s\"\n"
-
-#, fuzzy, c-format
 msgid ""
 "%s%s: all declared nicknames are already in use or invalid, closing "
-"connection with server!"
+"connection with server"
 msgstr ""
 "%s: todos los nombres de usuario declarados ya están en uso, ¡cerrando la "
 "conexión con el servidor!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
-msgstr ""
-"%s: el nombre de usuario \"%s\" ya está en uso, probando con el 1 nombre de "
-"usuario \"%s\"\n"
-
-#, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\""
+msgid "%s%s: nickname \"%s\" is invalid, trying nickname #%d (\"%s\")"
 msgstr ""
 "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 2 nombre de "
 "usuario \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
-msgstr ""
-"%s: el nombre de usuario \"%s\" ya está en uso, probando con el 3 nombre de "
-"usuario \"%s\"\n"
-
-#, fuzzy, c-format
 msgid ""
 "%s%s: all declared nicknames are already in use, closing connection with "
-"server!"
+"server"
 msgstr ""
 "%s: todos los nombres de usuario declarados ya están en uso, ¡cerrando la "
 "conexión con el servidor!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
+msgid "%s%s: nickname \"%s\" is already in use, trying nickname #%d (\"%s\")"
 msgstr ""
-"%s: el nombre de usuario \"%s\" ya está en uso, probando con el 1 nombre de "
+"%s: el nombre de usuario \"%s\" ya está en uso, probando con el 2 nombre de "
 "usuario \"%s\"\n"
 
-#, c-format
-msgid "%s%s: error retrieving user's name: %s"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s%s: error when allocating new server"
 msgstr "%s no ha sido posible crear un nuevo servidor\n"
@@ -4378,6 +4334,48 @@ msgstr ""
 msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s argumentos incorrectos para el comando \"%s\"\n"
 
+#~ msgid ""
+#~ "alternate nickname to use on IRC server (if nickname is already used)"
+#~ msgstr ""
+#~ "nombre de usuario alternativo para el servidor IRC (si el nombre de "
+#~ "usuario ya está en uso)"
+
+#~ msgid ""
+#~ "2nd alternate nickname to use on IRC server (if alternate nickname is "
+#~ "already used)"
+#~ msgstr ""
+#~ "segundo nombre de usuario alternativo a utilizar en el servidor IRC (si "
+#~ "el nombre de usuario alternativo ya está en uso)"
+
+#, fuzzy
+#~ msgid "Not enough memory to write log file \"%s\"\n"
+#~ msgstr ""
+#~ "No hay suficiente memoria para escribir un fichero de log para un búfer\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
+#~ msgstr ""
+#~ "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 3 nombre "
+#~ "de usuario \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
+#~ msgstr ""
+#~ "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 1 nombre "
+#~ "de usuario \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
+#~ msgstr ""
+#~ "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 3 nombre "
+#~ "de usuario \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
+#~ msgstr ""
+#~ "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 1 nombre "
+#~ "de usuario \"%s\"\n"
+
 #~ msgid "[file]"
 #~ msgstr "[archivo]"
 
@@ -4663,8 +4661,8 @@ msgstr "%s argumentos incorrectos para el comando \"%s\"\n"
 #~ "maximum number of lines in history for one server/channel/private window "
 #~ "(0 = unlimited)"
 #~ msgstr ""
-#~ "número máximo de líneas en el histórico para un servidor/canal/privado "
-#~ "(0 = ilimitado)"
+#~ "número máximo de líneas en el histórico para un servidor/canal/"
+#~ "privado (0 = ilimitado)"
 
 #, fuzzy
 #~ msgid "log messages from plugins"
@@ -4865,8 +4863,8 @@ msgstr "%s argumentos incorrectos para el comando \"%s\"\n"
 #~ "max size for aligning nick and other messages (should be >= to "
 #~ "look_align_size)"
 #~ msgstr ""
-#~ "tamaño máximo para la alineación de nick y otros mensajes (debería ser "
-#~ ">= a look_align_size)"
+#~ "tamaño máximo para la alineación de nick y otros mensajes (debería "
+#~ "ser >= a look_align_size)"
 
 #~ msgid "server name not found"
 #~ msgstr "nombre de servidor no encontrado"
@@ -5711,7 +5709,8 @@ msgstr "%s argumentos incorrectos para el comando \"%s\"\n"
 
 #~ msgid "color for chan owner symbol (specific to unrealircd)"
 #~ msgstr ""
-#~ "color para el símbolo de propietario de canal (especificado en unrealircd)"
+#~ "color para el símbolo de propietario de canal (especificado en "
+#~ "unrealircd)"
 
 #~ msgid "color for chan admin symbol"
 #~ msgstr "color para el símbolo de administrador de canal"
diff --git a/po/fr.po b/po/fr.po
index 09f2d4de2..4e4ef200f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-01-29 15:15+0100\n"
-"PO-Revision-Date: 2008-01-29 15:20+0100\n"
+"POT-Creation-Date: 2008-02-02 23:26+0100\n"
+"PO-Revision-Date: 2008-02-02 23:28+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -2515,16 +2515,10 @@ msgstr "liste, ajoute ou retire des serveurs"
 msgid ""
 "[list [servername]] | [listfull [servername]] | [add servername hostname [-"
 "port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks "
-"nick1 nick2 nick3] [-username username] [-realname realname] [-command "
+"nick1,nick2,nick3,...] [-username username] [-realname realname] [-command "
 "command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
 "[rename servername newservername] | [keep servername] | [del servername]"
-msgstr ""
-"[list [nom_serveur]] | [listfull [nom_serveur]] | [add nom_serveur nom/IP [-"
-"port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd mot_de_passe] [-"
-"nicks pseudo1 pseudo2 pseudo3] [-username nom_utilisateur] [-realname "
-"nom_réel] [-command commande] [-autojoin canal[,canal]] ] | [copy "
-"nom_serveur nouveau_nom_serveur] | [rename nom_serveur nouveau_nom_serveur] "
-"| [keep nom_serveur] | [del nom_serveur]"
+msgstr "[list [nom_serveur]] | [listfull [nom_serveur]] | [add nom_serveur nom/IP [-port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd mot_de_passe] [-nicks pseudo1,pseudo2,pseudo3,...] [-username nom_utilisateur] [-realname nom_réel] [-command commande] [-autojoin canal[,canal]] ] | [copy nom_serveur nouveau_nom_serveur] | [rename nom_serveur nouveau_nom_serveur] | [keep nom_serveur] | [del nom_serveur]"
 
 msgid ""
 "      list: list servers (no parameter implies this list)\n"
@@ -2965,18 +2959,8 @@ msgstr "utiliser SSL pour la communication avec le serveur"
 msgid "password for IRC server"
 msgstr "mot de passe pour le serveur IRC"
 
-msgid "nickname to use on IRC server"
-msgstr "pseudo à utiliser sur le serveur IRC"
-
-msgid "alternate nickname to use on IRC server (if nickname is already used)"
-msgstr "pseudo alternatif pour le serveur IRC (si le pseudo est déjà utilisé)"
-
-msgid ""
-"2nd alternate nickname to use on IRC server (if alternate nickname is "
-"already used)"
-msgstr ""
-"2ème pseudo alternatif pour le serveur IRC (si le pseudo alternatif est déjà "
-"utilisé)"
+msgid "nicknames to use on IRC server (separated by comma)"
+msgstr "pseudos à utiliser sur le serveur IRC (séparés par des virgules)"
 
 msgid "user name to use on IRC server"
 msgstr "nom d'utilisateur pour le serveur IRC"
@@ -3245,10 +3229,6 @@ msgstr "%s%s: vous n'êtes pas connecté au serveur"
 msgid "%s: this buffer is not a channel!"
 msgstr "%s: ce tampon n'est pas un canal !"
 
-#, c-format
-msgid "Not enough memory to write log file \"%s\"\n"
-msgstr "Pas assez de mémoire pour écrire le fichier log \"%s\"\n"
-
 msgid "error received from IRC server"
 msgstr "erreur reçue du serveur IRC"
 
@@ -3828,60 +3808,24 @@ msgid "%s%s[%s%s%s] %s%s%s banned"
 msgstr "%s%s[%s%s%s] %s%s%s banni"
 
 #, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 2nd nickname \"%s\""
-msgstr ""
-"%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 2ème "
-"pseudo \"%s\""
-
-#, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
-msgstr ""
-"%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 3ème "
-"pseudo \"%s\""
-
-#, c-format
 msgid ""
 "%s%s: all declared nicknames are already in use or invalid, closing "
-"connection with server!"
-msgstr ""
-"%s%s: tous les pseudos déclarés sont déjà en cours d'utilisation ou "
-"invalides, fermeture de la connexion avec le serveur !"
+"connection with server"
+msgstr "%s%s: tous les pseudos déclarés sont déjà en cours d'utilisation ou invalides, fermeture de la connexion avec le serveur"
 
 #, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
-msgstr ""
-"%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 1er "
-"pseudo \"%s\""
-
-#, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\""
-msgstr ""
-"%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 2ème "
-"pseudo \"%s\""
-
-#, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
-msgstr ""
-"%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 3ème "
-"pseudo \"%s\""
+msgid "%s%s: nickname \"%s\" is invalid, trying nickname #%d (\"%s\")"
+msgstr "%s%s: le pseudo \"%s\" est invalide, essai avec le pseudo n°%d (\"%s\")"
 
 #, c-format
 msgid ""
 "%s%s: all declared nicknames are already in use, closing connection with "
-"server!"
-msgstr ""
-"%s%s: tous les pseudos déclarés sont déjà en cours d'utilisation, fermeture "
-"de la connexion avec le serveur !"
-
-#, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
-msgstr ""
-"%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 1er "
-"pseudo \"%s\""
+"server"
+msgstr "%s%s: tous les pseudos déclarés sont déjà en cours d'utilisation, fermeture de la connexion avec le serveur"
 
 #, c-format
-msgid "%s%s: error retrieving user's name: %s"
-msgstr "%s%s: erreur de lecture du nom de l'utilisateur: %s"
+msgid "%s%s: nickname \"%s\" is already in use, trying nickname #%d (\"%s\")"
+msgstr "%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le pseudo n°%d (\"%s\")"
 
 #, c-format
 msgid "%s%s: error when allocating new server"
@@ -4313,3 +4257,41 @@ msgstr ""
 #, c-format
 msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s%s: paramètres invalides pour la fonction \"%s\""
+
+#~ msgid ""
+#~ "alternate nickname to use on IRC server (if nickname is already used)"
+#~ msgstr ""
+#~ "pseudo alternatif pour le serveur IRC (si le pseudo est déjà utilisé)"
+
+#~ msgid ""
+#~ "2nd alternate nickname to use on IRC server (if alternate nickname is "
+#~ "already used)"
+#~ msgstr ""
+#~ "2ème pseudo alternatif pour le serveur IRC (si le pseudo alternatif est "
+#~ "déjà utilisé)"
+
+#~ msgid "Not enough memory to write log file \"%s\"\n"
+#~ msgstr "Pas assez de mémoire pour écrire le fichier log \"%s\"\n"
+
+#~ msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
+#~ msgstr ""
+#~ "%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le "
+#~ "3ème pseudo \"%s\""
+
+#~ msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
+#~ msgstr ""
+#~ "%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 1er "
+#~ "pseudo \"%s\""
+
+#~ msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
+#~ msgstr ""
+#~ "%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le "
+#~ "3ème pseudo \"%s\""
+
+#~ msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
+#~ msgstr ""
+#~ "%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le 1er "
+#~ "pseudo \"%s\""
+
+#~ msgid "%s%s: error retrieving user's name: %s"
+#~ msgstr "%s%s: erreur de lecture du nom de l'utilisateur: %s"
diff --git a/po/hu.po b/po/hu.po
index 4047589a6..bb8b7e9f5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-01-29 15:15+0100\n"
+"POT-Creation-Date: 2008-02-02 23:26+0100\n"
 "PO-Revision-Date: 2007-10-10 18:07+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2607,10 +2607,11 @@ msgstr ""
 msgid "list, add or remove servers"
 msgstr "szerverek listázása, hozzáadása vagy eltávolítása"
 
+#, fuzzy
 msgid ""
 "[list [servername]] | [listfull [servername]] | [add servername hostname [-"
 "port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks "
-"nick1 nick2 nick3] [-username username] [-realname realname] [-command "
+"nick1,nick2,nick3,...] [-username username] [-realname realname] [-command "
 "command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
 "[rename servername newservername] | [keep servername] | [del servername]"
 msgstr ""
@@ -3041,17 +3042,10 @@ msgstr "SSL használata a a kapcsolathoz"
 msgid "password for IRC server"
 msgstr "jelszó az IRC szerveren"
 
-msgid "nickname to use on IRC server"
+#, fuzzy
+msgid "nicknames to use on IRC server (separated by comma)"
 msgstr "felhasználónév az IRC szerveren"
 
-msgid "alternate nickname to use on IRC server (if nickname is already used)"
-msgstr "alternatív név az IRC szerveren (ha a név már foglalt)"
-
-msgid ""
-"2nd alternate nickname to use on IRC server (if alternate nickname is "
-"already used)"
-msgstr "második alternatív név az IRC szerveren (ha az alternatív név foglalt)"
-
 msgid "user name to use on IRC server"
 msgstr "használni kívánt felhasználónév az IRC szerveren"
 
@@ -3323,10 +3317,6 @@ msgstr "%s nincs csatlakozva szerverhez!\n"
 msgid "%s: this buffer is not a channel!"
 msgstr "Ez az ablak nem egy szoba!\n"
 
-#, c-format
-msgid "Not enough memory to write log file \"%s\"\n"
-msgstr "Nincs elegendő memória a(z) \"%s\" naplófájl írásához\n"
-
 msgid "error received from IRC server"
 msgstr "az IRC szerver hibát jelzett"
 
@@ -3905,46 +3895,26 @@ msgid "%s%s[%s%s%s] %s%s%s banned"
 msgstr "%s[%s%s%s] %s%s%s kitiltva\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 2nd nickname \"%s\""
-msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a második nevet: \"%s\"\n"
-
-#, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
-msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a harmadik nevet: \"%s\"\n"
-
-#, fuzzy, c-format
 msgid ""
 "%s%s: all declared nicknames are already in use or invalid, closing "
-"connection with server!"
+"connection with server"
 msgstr ""
 "%s: minden megadott név foglalt vagy érvénytelen, kapcsolat bontása a "
 "szerverrel!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
-msgstr "%s: a(z) \"%s\" név már foglalt, próbálom az első nevet: \"%s\"\n"
-
-#, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\""
+msgid "%s%s: nickname \"%s\" is invalid, trying nickname #%d (\"%s\")"
 msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a második nevet: \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
-msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a harmadik nevet: \"%s\"\n"
-
-#, fuzzy, c-format
 msgid ""
 "%s%s: all declared nicknames are already in use, closing connection with "
-"server!"
+"server"
 msgstr "%s: minden megadott név foglalt, kapcsolat bontása a szerverrel!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
-msgstr "%s: a(z) \"%s\" név már foglalt, próbálom az első nevet: \"%s\"\n"
-
-#, c-format
-msgid "%s%s: error retrieving user's name: %s"
-msgstr ""
+msgid "%s%s: nickname \"%s\" is already in use, trying nickname #%d (\"%s\")"
+msgstr "%s: a(z) \"%s\" név már foglalt, próbálom a második nevet: \"%s\"\n"
 
 #, fuzzy, c-format
 msgid "%s%s: error when allocating new server"
@@ -4366,6 +4336,37 @@ msgstr ""
 msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s rossz argumentum a \"%s\" parancsnak\n"
 
+#~ msgid ""
+#~ "alternate nickname to use on IRC server (if nickname is already used)"
+#~ msgstr "alternatív név az IRC szerveren (ha a név már foglalt)"
+
+#~ msgid ""
+#~ "2nd alternate nickname to use on IRC server (if alternate nickname is "
+#~ "already used)"
+#~ msgstr ""
+#~ "második alternatív név az IRC szerveren (ha az alternatív név foglalt)"
+
+#~ msgid "Not enough memory to write log file \"%s\"\n"
+#~ msgstr "Nincs elegendő memória a(z) \"%s\" naplófájl írásához\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
+#~ msgstr ""
+#~ "%s: a(z) \"%s\" név már foglalt, próbálom a harmadik nevet: \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
+#~ msgstr "%s: a(z) \"%s\" név már foglalt, próbálom az első nevet: \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
+#~ msgstr ""
+#~ "%s: a(z) \"%s\" név már foglalt, próbálom a harmadik nevet: \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
+#~ msgstr "%s: a(z) \"%s\" név már foglalt, próbálom az első nevet: \"%s\"\n"
+
 #~ msgid "[file]"
 #~ msgstr "[fájl]"
 
diff --git a/po/ru.po b/po/ru.po
index 1bf0007e1..f1084f50a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-01-29 15:15+0100\n"
+"POT-Creation-Date: 2008-02-02 23:26+0100\n"
 "PO-Revision-Date: 2007-09-06 12:44+0200\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2605,10 +2605,11 @@ msgstr ""
 msgid "list, add or remove servers"
 msgstr "перечислить, добавить или удалить серверы"
 
+#, fuzzy
 msgid ""
 "[list [servername]] | [listfull [servername]] | [add servername hostname [-"
 "port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks "
-"nick1 nick2 nick3] [-username username] [-realname realname] [-command "
+"nick1,nick2,nick3,...] [-username username] [-realname realname] [-command "
 "command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
 "[rename servername newservername] | [keep servername] | [del servername]"
 msgstr ""
@@ -3036,17 +3037,10 @@ msgstr "использовать SSL при связи с сервером"
 msgid "password for IRC server"
 msgstr "пароль, используемый при подключении к IRC серверу"
 
-msgid "nickname to use on IRC server"
+#, fuzzy
+msgid "nicknames to use on IRC server (separated by comma)"
 msgstr "ник, используемый на IRC сервере"
 
-msgid "alternate nickname to use on IRC server (if nickname is already used)"
-msgstr "альтернативный ник, используемый на IRC сервере"
-
-msgid ""
-"2nd alternate nickname to use on IRC server (if alternate nickname is "
-"already used)"
-msgstr "второй альтернативный ник, используемый на IRC сервере"
-
 msgid "user name to use on IRC server"
 msgstr "имя пользователя, используемое на IRC сервере"
 
@@ -3311,10 +3305,6 @@ msgstr "%s вы не подключены к серверу\n"
 msgid "%s: this buffer is not a channel!"
 msgstr "Это окно не является каналом!\n"
 
-#, c-format
-msgid "Not enough memory to write log file \"%s\"\n"
-msgstr "Недостаточно памяти для записи лог-файла \"%s\"\n"
-
 msgid "error received from IRC server"
 msgstr "получена ошибка от IRC сервера"
 
@@ -3893,45 +3883,25 @@ msgid "%s%s[%s%s%s] %s%s%s banned"
 msgstr "%s[%s%s%s] %s%s%s забанен\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 2nd nickname \"%s\""
-msgstr "%s: ник \"%s\" уже используется, пробую второй ник \"%s\"\n"
-
-#, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
-msgstr "%s: ник \"%s\" уже используется, пробую третий ник \"%s\"\n"
-
-#, fuzzy, c-format
 msgid ""
 "%s%s: all declared nicknames are already in use or invalid, closing "
-"connection with server!"
+"connection with server"
 msgstr ""
 "%s: все предложенные ники заняты или непригодны, отключаюсь от сервера!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
-msgstr "%s: ник \"%s\" уже используется, пробую первый ник \"%s\"\n"
-
-#, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\""
+msgid "%s%s: nickname \"%s\" is invalid, trying nickname #%d (\"%s\")"
 msgstr "%s: ник \"%s\" уже используется, пробую второй ник \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
-msgstr "%s: ник \"%s\" уже используется, пробую третий ник \"%s\"\n"
-
-#, fuzzy, c-format
 msgid ""
 "%s%s: all declared nicknames are already in use, closing connection with "
-"server!"
+"server"
 msgstr "%s: все предложенные ники заняты, отключаюсь от сервера!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
-msgstr "%s: ник \"%s\" уже используется, пробую первый ник \"%s\"\n"
-
-#, c-format
-msgid "%s%s: error retrieving user's name: %s"
-msgstr ""
+msgid "%s%s: nickname \"%s\" is already in use, trying nickname #%d (\"%s\")"
+msgstr "%s: ник \"%s\" уже используется, пробую второй ник \"%s\"\n"
 
 #, fuzzy, c-format
 msgid "%s%s: error when allocating new server"
@@ -4348,6 +4318,34 @@ msgstr ""
 msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s некорректные аргументы команды \"%s\"\n"
 
+#~ msgid ""
+#~ "alternate nickname to use on IRC server (if nickname is already used)"
+#~ msgstr "альтернативный ник, используемый на IRC сервере"
+
+#~ msgid ""
+#~ "2nd alternate nickname to use on IRC server (if alternate nickname is "
+#~ "already used)"
+#~ msgstr "второй альтернативный ник, используемый на IRC сервере"
+
+#~ msgid "Not enough memory to write log file \"%s\"\n"
+#~ msgstr "Недостаточно памяти для записи лог-файла \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
+#~ msgstr "%s: ник \"%s\" уже используется, пробую третий ник \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
+#~ msgstr "%s: ник \"%s\" уже используется, пробую первый ник \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
+#~ msgstr "%s: ник \"%s\" уже используется, пробую третий ник \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
+#~ msgstr "%s: ник \"%s\" уже используется, пробую первый ник \"%s\"\n"
+
 #~ msgid "[file]"
 #~ msgstr "[файл]"
 
diff --git a/po/srcfiles.cmake b/po/srcfiles.cmake
index a9073beb2..19b79d461 100644
--- a/po/srcfiles.cmake
+++ b/po/srcfiles.cmake
@@ -104,7 +104,6 @@ SET(WEECHAT_SOURCES
 ./src/plugins/irc/irc.h
 ./src/plugins/irc/irc-input.c
 ./src/plugins/irc/irc-input.h
-./src/plugins/irc/irc-log.c
 ./src/plugins/irc/irc-mode.c
 ./src/plugins/irc/irc-mode.h
 ./src/plugins/irc/irc-nick.c
diff --git a/po/weechat.pot b/po/weechat.pot
index 176db5f7f..2f62a6467 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-01-29 15:15+0100\n"
+"POT-Creation-Date: 2008-02-02 23:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2188,7 +2188,7 @@ msgstr ""
 msgid ""
 "[list [servername]] | [listfull [servername]] | [add servername hostname [-"
 "port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks "
-"nick1 nick2 nick3] [-username username] [-realname realname] [-command "
+"nick1,nick2,nick3,...] [-username username] [-realname realname] [-command "
 "command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
 "[rename servername newservername] | [keep servername] | [del servername]"
 msgstr ""
@@ -2538,15 +2538,7 @@ msgstr ""
 msgid "password for IRC server"
 msgstr ""
 
-msgid "nickname to use on IRC server"
-msgstr ""
-
-msgid "alternate nickname to use on IRC server (if nickname is already used)"
-msgstr ""
-
-msgid ""
-"2nd alternate nickname to use on IRC server (if alternate nickname is "
-"already used)"
+msgid "nicknames to use on IRC server (separated by comma)"
 msgstr ""
 
 msgid "user name to use on IRC server"
@@ -2794,10 +2786,6 @@ msgstr ""
 msgid "%s: this buffer is not a channel!"
 msgstr ""
 
-#, c-format
-msgid "Not enough memory to write log file \"%s\"\n"
-msgstr ""
-
 msgid "error received from IRC server"
 msgstr ""
 
@@ -3373,43 +3361,23 @@ msgid "%s%s[%s%s%s] %s%s%s banned"
 msgstr ""
 
 #, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 2nd nickname \"%s\""
-msgstr ""
-
-#, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 3rd nickname \"%s\""
-msgstr ""
-
-#, c-format
 msgid ""
 "%s%s: all declared nicknames are already in use or invalid, closing "
-"connection with server!"
-msgstr ""
-
-#, c-format
-msgid "%s%s: nickname \"%s\" is invalid, trying 1st nickname \"%s\""
+"connection with server"
 msgstr ""
 
 #, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\""
-msgstr ""
-
-#, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\""
+msgid "%s%s: nickname \"%s\" is invalid, trying nickname #%d (\"%s\")"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s%s: all declared nicknames are already in use, closing connection with "
-"server!"
-msgstr ""
-
-#, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\""
+"server"
 msgstr ""
 
 #, c-format
-msgid "%s%s: error retrieving user's name: %s"
+msgid "%s%s: nickname \"%s\" is already in use, trying nickname #%d (\"%s\")"
 msgstr ""
 
 #, c-format