Use of many addresses for one IRC server (auto-switch when a connexion fails), nicks are now set with one option "nicks" (task #6088)

7 files changed, 202 insertions, 154 deletions

diff --git a/po/cs.po b/po/cs.po
index df83c4963..459aba758 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-02-02 23:26+0100\n"
+"POT-Creation-Date: 2008-02-03 13:17+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"
@@ -2599,11 +2599,11 @@ 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 "
-"command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
-"[rename servername newservername] | [keep servername] | [del servername]"
+"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
+"port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1,"
+"nick2,...] [-username username] [-realname realname] [-command command] [-"
+"autojoin channel[,channel]] ] | [copy servername newservername] | [rename "
+"servername newservername] | [keep servername] | [del servername]"
 msgstr ""
 "[list [jméno_serveru]] | [listfull [jméno_serveru]] | [add jméno_serveru "
 "jméno_hosta [-port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd "
@@ -2613,22 +2613,21 @@ msgstr ""
 "jméno_serveru nové_jméno_serveru] | [keep jméno_serveru] | [del "
 "jméno_serveru]"
 
+#, fuzzy
 msgid ""
 "      list: list servers (no parameter implies this list)\n"
 "  listfull: list servers with detailed info for each server\n"
 "       add: create a new server\n"
 "servername: server name, for internal and display use\n"
-"  hostname: name or IP address of server\n"
-"      port: port for server (integer, default is 6667)\n"
+"  hostname: name or IP address of server, with optional port (default: "
+"6667)\n"
 "      temp: create temporary server (not saved in config file)\n"
 "      auto: automatically connect to server when WeeChat starts\n"
 "    noauto: do not connect to server when WeeChat starts (default)\n"
 "      ipv6: use IPv6 protocol\n"
 "       ssl: use SSL protocol\n"
 "  password: password for server\n"
-"     nick1: first nick for server\n"
-"     nick2: alternate nick for server\n"
-"     nick3: second alternate nick for server\n"
+"nick1,2,..: nicknames for server\n"
 "  username: user name\n"
 "  realname: real name of user\n"
 "      copy: duplicate a server\n"
@@ -3025,11 +3024,9 @@ msgstr "automaticky znovu připojit server, když je odpojen"
 msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr "doba (v sekundách) před novým zkušením znovupřipojení na server"
 
-msgid "IP address or hostname of IRC server"
-msgstr "IP adresa nebo jeméno hosta IRC serveru"
-
-msgid "port for connecting to server"
-msgstr "port pro připojení na server"
+#, fuzzy
+msgid "list of IP/port or hostname/port for server (separated by comma)"
+msgstr "přezdívka použitá na IRC serveru"
 
 msgid "use IPv6 protocol for server communication"
 msgstr "použít protokol IPv6 pro komunikaci se serverem"
@@ -3963,6 +3960,10 @@ msgid "%s%s: reconnecting to server in %d %s"
 msgstr "%s: Navazuji nové spojení se serverem za %d sekund\n"
 
 #, fuzzy, c-format
+msgid "%s%s: switching address to %s/%d"
+msgstr "%s IP adresa nenalezena\n"
+
+#, fuzzy, c-format
 msgid "%s%s: GnuTLS handshake failed"
 msgstr "%s handshake s gnutls selhal\n"
 
@@ -4010,19 +4011,19 @@ msgstr ""
 "GNUtls\n"
 
 #, fuzzy, c-format
-msgid "%s%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s..."
+msgid "%s%s: connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
 msgstr "%s: připojuji se k serveru %s:%d%s%s přes %s proxy %s:%d%s...\n"
 
 #, fuzzy, c-format
-msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s..."
+msgid "Connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
 msgstr "Připojuji se k serveru %s:%d%s%s přes %s proxy %s:%d%s...\n"
 
 #, fuzzy, c-format
-msgid "%s%s: connecting to server %s:%d%s%s..."
+msgid "%s%s: connecting to server %s/%d%s%s..."
 msgstr "%s: připojuji se k serveru %s:%d%s%s...\n"
 
 #, fuzzy, c-format
-msgid "%s: connecting to server %s:%d%s%s..."
+msgid "%s: connecting to server %s/%d%s%s..."
 msgstr "%s: připojuji se k serveru %s:%d%s%s...\n"
 
 #, fuzzy, c-format
@@ -4328,6 +4329,12 @@ msgstr ""
 msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s špatné parametry pro příkaz \"%s\"\n"
 
+#~ msgid "IP address or hostname of IRC server"
+#~ msgstr "IP adresa nebo jeméno hosta IRC serveru"
+
+#~ msgid "port for connecting to server"
+#~ msgstr "port pro připojení na server"
+
 #~ msgid ""
 #~ "alternate nickname to use on IRC server (if nickname is already used)"
 #~ msgstr ""
diff --git a/po/de.po b/po/de.po
index f740fa0f4..d8f7f45cf 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-02-02 23:26+0100\n"
+"POT-Creation-Date: 2008-02-03 13:17+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"
@@ -2597,11 +2597,11 @@ msgstr "Auflisten, Hinzufügen oder Entfernen von Servern"
 
 #, 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 "
-"command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
-"[rename servername newservername] | [keep servername] | [del servername]"
+"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
+"port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1,"
+"nick2,...] [-username username] [-realname realname] [-command command] [-"
+"autojoin channel[,channel]] ] | [copy servername newservername] | [rename "
+"servername newservername] | [keep servername] | [del servername]"
 msgstr ""
 "[Servername] | [Servername Hostname Port [-auto | -noauto] [-ipv6] [-ssl] [-"
 "pwd Passwort] [-nicks Nick1 Nick2 Nick3] [-username Benutzername] [-realname "
@@ -2613,17 +2613,15 @@ msgid ""
 "  listfull: list servers with detailed info for each server\n"
 "       add: create a new server\n"
 "servername: server name, for internal and display use\n"
-"  hostname: name or IP address of server\n"
-"      port: port for server (integer, default is 6667)\n"
+"  hostname: name or IP address of server, with optional port (default: "
+"6667)\n"
 "      temp: create temporary server (not saved in config file)\n"
 "      auto: automatically connect to server when WeeChat starts\n"
 "    noauto: do not connect to server when WeeChat starts (default)\n"
 "      ipv6: use IPv6 protocol\n"
 "       ssl: use SSL protocol\n"
 "  password: password for server\n"
-"     nick1: first nick for server\n"
-"     nick2: alternate nick for server\n"
-"     nick3: second alternate nick for server\n"
+"nick1,2,..: nicknames for server\n"
 "  username: user name\n"
 "  realname: real name of user\n"
 "      copy: duplicate a server\n"
@@ -3012,11 +3010,9 @@ msgstr ""
 "Zeit in Sekunden, die gewartet wird, bevor ein Verbindungsneuaufbau versucht "
 "wird"
 
-msgid "IP address or hostname of IRC server"
-msgstr "IP-Adresse oder Hostname des IRC-Servers"
-
-msgid "port for connecting to server"
-msgstr "Port, auf dem der IRC-Server läuft"
+#, fuzzy
+msgid "list of IP/port or hostname/port for server (separated by comma)"
+msgstr "eigener Nickname, der auf dem IRC-Server benutzt werden soll"
 
 msgid "use IPv6 protocol for server communication"
 msgstr "Server über IPv6 ansprechen"
@@ -3955,6 +3951,10 @@ msgid "%s%s: reconnecting to server in %d %s"
 msgstr "%s: Neuverbinden in %d Sekunden\n"
 
 #, fuzzy, c-format
+msgid "%s%s: switching address to %s/%d"
+msgstr "%s IP-Adresse nicht gefunden\n"
+
+#, fuzzy, c-format
 msgid "%s%s: GnuTLS handshake failed"
 msgstr "%s gnutls-Handshake schlug fehl\n"
 
@@ -4002,19 +4002,19 @@ msgstr ""
 "kompiliert wurde\n"
 
 #, fuzzy, c-format
-msgid "%s%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s..."
+msgid "%s%s: connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
 msgstr "%s: verbinden zu Server %s:%d%s%s via %s-Proxy %s:%d%s...\n"
 
 #, fuzzy, c-format
-msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s..."
+msgid "Connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
 msgstr "verbinden zu Server %s:%d%s%s via %s-Proxy %s:%d%s...\n"
 
 #, fuzzy, c-format
-msgid "%s%s: connecting to server %s:%d%s%s..."
+msgid "%s%s: connecting to server %s/%d%s%s..."
 msgstr "%s: verbinden zu Server %s:%d%s%s...\n"
 
 #, fuzzy, c-format
-msgid "%s: connecting to server %s:%d%s%s..."
+msgid "%s: connecting to server %s/%d%s%s..."
 msgstr "%s: verbinden zu Server %s:%d%s%s...\n"
 
 #, fuzzy, c-format
@@ -4322,6 +4322,12 @@ msgstr ""
 msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s fehlerhafte Argumente für der \"%s\"-Befehl\n"
 
+#~ msgid "IP address or hostname of IRC server"
+#~ msgstr "IP-Adresse oder Hostname des IRC-Servers"
+
+#~ msgid "port for connecting to server"
+#~ msgstr "Port, auf dem der IRC-Server läuft"
+
 #~ msgid ""
 #~ "alternate nickname to use on IRC server (if nickname is already used)"
 #~ msgstr ""
diff --git a/po/es.po b/po/es.po
index e9b12a59b..3954f9fc9 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-02-02 23:26+0100\n"
+"POT-Creation-Date: 2008-02-03 13:17+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"
@@ -2595,11 +2595,11 @@ msgstr "lista, añde o elimina servidores"
 
 #, 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 "
-"command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
-"[rename servername newservername] | [keep servername] | [del servername]"
+"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
+"port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1,"
+"nick2,...] [-username username] [-realname realname] [-command command] [-"
+"autojoin channel[,channel]] ] | [copy servername newservername] | [rename "
+"servername newservername] | [keep servername] | [del servername]"
 msgstr ""
 "[nombre_de_servidor] | [nombre_de_servidor nombre/IP puerto [-auto | -"
 "noauto] [-ipv6] [-ssl] [-pwd contraseña] [-nicks alias1 alias2 alias3] [-"
@@ -2612,17 +2612,15 @@ msgid ""
 "  listfull: list servers with detailed info for each server\n"
 "       add: create a new server\n"
 "servername: server name, for internal and display use\n"
-"  hostname: name or IP address of server\n"
-"      port: port for server (integer, default is 6667)\n"
+"  hostname: name or IP address of server, with optional port (default: "
+"6667)\n"
 "      temp: create temporary server (not saved in config file)\n"
 "      auto: automatically connect to server when WeeChat starts\n"
 "    noauto: do not connect to server when WeeChat starts (default)\n"
 "      ipv6: use IPv6 protocol\n"
 "       ssl: use SSL protocol\n"
 "  password: password for server\n"
-"     nick1: first nick for server\n"
-"     nick2: alternate nick for server\n"
-"     nick3: second alternate nick for server\n"
+"nick1,2,..: nicknames for server\n"
 "  username: user name\n"
 "  realname: real name of user\n"
 "      copy: duplicate a server\n"
@@ -3017,11 +3015,9 @@ msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr ""
 "espera (en segundos) antes de intentar de nuevo una reconexión al servidor"
 
-msgid "IP address or hostname of IRC server"
-msgstr "dirección IP o nombre de máquina del servidor IRC"
-
-msgid "port for connecting to server"
-msgstr "puerto para conectarse al servidor"
+#, fuzzy
+msgid "list of IP/port or hostname/port for server (separated by comma)"
+msgstr "nombre de usuario a utilizar en el servidor IRC"
 
 msgid "use IPv6 protocol for server communication"
 msgstr "usar el protocolo IPv6 para la comunicación del servidor"
@@ -3967,6 +3963,10 @@ msgid "%s%s: reconnecting to server in %d %s"
 msgstr "%s: Reconexión al servidor en %d segundos\n"
 
 #, fuzzy, c-format
+msgid "%s%s: switching address to %s/%d"
+msgstr "%s Dirección IP no encontrada\n"
+
+#, fuzzy, c-format
 msgid "%s%s: GnuTLS handshake failed"
 msgstr "%s el handshake gnutls ha fallado\n"
 
@@ -4014,19 +4014,19 @@ msgstr ""
 "con soporte GNUtls\n"
 
 #, fuzzy, c-format
-msgid "%s%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s..."
+msgid "%s%s: connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
 msgstr "%s: conectando al servidor %s:%d%s%s vía %s proxy %s: %d%s...\n"
 
 #, fuzzy, c-format
-msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s..."
+msgid "Connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
 msgstr "Conectando al servidor %s:%d%s%s vía %s proxy %s:%d%s...\n"
 
 #, fuzzy, c-format
-msgid "%s%s: connecting to server %s:%d%s%s..."
+msgid "%s%s: connecting to server %s/%d%s%s..."
 msgstr "%s: conectando al servidor %s:%d%s%s...\n"
 
 #, fuzzy, c-format
-msgid "%s: connecting to server %s:%d%s%s..."
+msgid "%s: connecting to server %s/%d%s%s..."
 msgstr "%s: conectando al servidor %s:%d%s%s...\n"
 
 #, fuzzy, c-format
@@ -4334,6 +4334,12 @@ msgstr ""
 msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s argumentos incorrectos para el comando \"%s\"\n"
 
+#~ msgid "IP address or hostname of IRC server"
+#~ msgstr "dirección IP o nombre de máquina del servidor IRC"
+
+#~ msgid "port for connecting to server"
+#~ msgstr "puerto para conectarse al servidor"
+
 #~ msgid ""
 #~ "alternate nickname to use on IRC server (if nickname is already used)"
 #~ msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 4e4ef200f..d475dcada 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-02-02 23:26+0100\n"
-"PO-Revision-Date: 2008-02-02 23:28+0100\n"
+"POT-Creation-Date: 2008-02-03 13:17+0100\n"
+"PO-Revision-Date: 2008-02-03 13:19+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -2513,29 +2513,33 @@ msgid "list, add or remove servers"
 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 "
-"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]"
+"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
+"port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1,"
+"nick2,...] [-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[/"
+"port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd mot_de_passe] [-nicks "
+"pseudo1,pseudo2,...] [-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"
 "  listfull: list servers with detailed info for each server\n"
 "       add: create a new server\n"
 "servername: server name, for internal and display use\n"
-"  hostname: name or IP address of server\n"
-"      port: port for server (integer, default is 6667)\n"
+"  hostname: name or IP address of server, with optional port (default: "
+"6667)\n"
 "      temp: create temporary server (not saved in config file)\n"
 "      auto: automatically connect to server when WeeChat starts\n"
 "    noauto: do not connect to server when WeeChat starts (default)\n"
 "      ipv6: use IPv6 protocol\n"
 "       ssl: use SSL protocol\n"
 "  password: password for server\n"
-"     nick1: first nick for server\n"
-"     nick2: alternate nick for server\n"
-"     nick3: second alternate nick for server\n"
+"nick1,2,..: nicknames for server\n"
 "  username: user name\n"
 "  realname: real name of user\n"
 "      copy: duplicate a server\n"
@@ -2550,8 +2554,8 @@ msgstr ""
 "       listfull: afficher les serveurs avec de l'info détaillée pour chaque\n"
 "            add: créer un nouveau serveur\n"
 "    nom_serveur: nom du serveur, pour usage interne et affichage\n"
-"         nom/IP: nom ou adresse IP du serveur\n"
-"           port: port pour le serveur (nombre entier, 6667 par défaut)\n"
+"            nom: nom ou adresse IP du serveur avec port en option (defaut: "
+"6667)\n"
 "           temp: créer un serveur temporaire (non sauvegardé dans le fichier "
 "de configuration)\n"
 "           auto: se connecter automatiquement au serveur quand WeeChat "
@@ -2561,9 +2565,7 @@ msgstr ""
 "           ipv6: utiliser le protocole IPv6\n"
 "            ssl: utiliser le protocole SSL\n"
 "   mot_de_passe: mot de passe pour le serveur\n"
-"        pseudo1: premier pseudo pour le serveur\n"
-"        pseudo2: pseudo alternatif pour le serveur\n"
-"        pseudo3: second pseudo alternatif pour le serveur\n"
+"  pseudo1,2,...: pseudos pour le serveur\n"
 "nom_utilisateur: nom d'utilisateur\n"
 "       nom_réel: nom réel de l'utilisateur\n"
 "           copy: dupliquer un serveur\n"
@@ -2944,11 +2946,8 @@ msgstr "reconnexion automatique au serveur après une déconnexion"
 msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr "délai (en secondes) avant de tenter une reconnexion au serveur"
 
-msgid "IP address or hostname of IRC server"
-msgstr "adresse IP ou nom du serveur IRC"
-
-msgid "port for connecting to server"
-msgstr "port pour se connecter au serveur"
+msgid "list of IP/port or hostname/port for server (separated by comma)"
+msgstr "liste d'IP/port ou nom/port pour le serveur (séparés par des virgules)"
 
 msgid "use IPv6 protocol for server communication"
 msgstr "utiliser le protocole IPv6 pour la communication avec le serveur"
@@ -3811,21 +3810,28 @@ msgstr "%s%s[%s%s%s] %s%s%s banni"
 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"
+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 nickname #%d (\"%s\")"
-msgstr "%s%s: le pseudo \"%s\" est invalide, essai avec le pseudo n°%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"
+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 nickname #%d (\"%s\")"
-msgstr "%s%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le pseudo n°%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"
@@ -3881,6 +3887,10 @@ msgid "%s%s: reconnecting to server in %d %s"
 msgstr "%s%s: reconnexion au serveur dans %d %s"
 
 #, c-format
+msgid "%s%s: switching address to %s/%d"
+msgstr "%s%s: bascule vers l'adresse %s/%d"
+
+#, c-format
 msgid "%s%s: GnuTLS handshake failed"
 msgstr "%s%s: la poignée de main de GnuTLS a échoué"
 
@@ -3928,20 +3938,20 @@ msgstr ""
 "avec le support GnuTLS"
 
 #, c-format
-msgid "%s%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s..."
-msgstr "%s%s: connexion au serveur %s:%d%s%s via le proxy %s %s:%d%s..."
+msgid "%s%s: connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
+msgstr "%s%s: connexion au serveur %s/%d%s%s via le proxy %s %s/%d%s..."
 
 #, c-format
-msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s..."
-msgstr "Connexion au serveur %s:%d%s%s via le proxy %s %s:%d%s..."
+msgid "Connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
+msgstr "Connexion au serveur %s/%d%s%s via le proxy %s %s/%d%s..."
 
 #, c-format
-msgid "%s%s: connecting to server %s:%d%s%s..."
-msgstr "%s%s: connexion au serveur %s:%d%s%s..."
+msgid "%s%s: connecting to server %s/%d%s%s..."
+msgstr "%s%s: connexion au serveur %s/%d%s%s..."
 
 #, c-format
-msgid "%s: connecting to server %s:%d%s%s..."
-msgstr "%s: connexion au serveur %s:%d%s%s..."
+msgid "%s: connecting to server %s/%d%s%s..."
+msgstr "%s: connexion au serveur %s/%d%s%s..."
 
 #, c-format
 msgid "%s%s: GnuTLS init error"
@@ -4258,6 +4268,12 @@ msgstr ""
 msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s%s: paramètres invalides pour la fonction \"%s\""
 
+#~ msgid "IP address or hostname of IRC server"
+#~ msgstr "adresse IP ou nom du serveur IRC"
+
+#~ msgid "port for connecting to server"
+#~ msgstr "port pour se connecter au serveur"
+
 #~ msgid ""
 #~ "alternate nickname to use on IRC server (if nickname is already used)"
 #~ msgstr ""
diff --git a/po/hu.po b/po/hu.po
index bb8b7e9f5..21779ce3b 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-02-02 23:26+0100\n"
+"POT-Creation-Date: 2008-02-03 13:17+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"
@@ -2609,11 +2609,11 @@ 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 "
-"command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
-"[rename servername newservername] | [keep servername] | [del servername]"
+"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
+"port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1,"
+"nick2,...] [-username username] [-realname realname] [-command command] [-"
+"autojoin channel[,channel]] ] | [copy servername newservername] | [rename "
+"servername newservername] | [keep servername] | [del servername]"
 msgstr ""
 "[list [szervernév]] | [listfull [szervernév]] | [add szervernév gépnév [-"
 "port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd jelszó] [-nicks "
@@ -2621,22 +2621,21 @@ msgstr ""
 "parancs] [-autojoin szoba[,szoba]] ] | [copy szervernév újszervernév] | "
 "[rename szervernév újszervernév] | [keep szervernév] | [del szervernév]"
 
+#, fuzzy
 msgid ""
 "      list: list servers (no parameter implies this list)\n"
 "  listfull: list servers with detailed info for each server\n"
 "       add: create a new server\n"
 "servername: server name, for internal and display use\n"
-"  hostname: name or IP address of server\n"
-"      port: port for server (integer, default is 6667)\n"
+"  hostname: name or IP address of server, with optional port (default: "
+"6667)\n"
 "      temp: create temporary server (not saved in config file)\n"
 "      auto: automatically connect to server when WeeChat starts\n"
 "    noauto: do not connect to server when WeeChat starts (default)\n"
 "      ipv6: use IPv6 protocol\n"
 "       ssl: use SSL protocol\n"
 "  password: password for server\n"
-"     nick1: first nick for server\n"
-"     nick2: alternate nick for server\n"
-"     nick3: second alternate nick for server\n"
+"nick1,2,..: nicknames for server\n"
 "  username: user name\n"
 "  realname: real name of user\n"
 "      copy: duplicate a server\n"
@@ -3027,11 +3026,9 @@ msgstr "automatikus újracsatlakozás a szerverhez, ha lekapcsolódik"
 msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr "két újracsatlakozási próba közti szünet (másodpercben)"
 
-msgid "IP address or hostname of IRC server"
-msgstr "IRC szerver IP-címe vagy hosztneve"
-
-msgid "port for connecting to server"
-msgstr "szerverhez csatlakozás portja"
+#, fuzzy
+msgid "list of IP/port or hostname/port for server (separated by comma)"
+msgstr "felhasználónév az IRC szerveren"
 
 msgid "use IPv6 protocol for server communication"
 msgstr "IPv6 protokoll használata a kapcsolathoz"
@@ -3967,6 +3964,10 @@ msgid "%s%s: reconnecting to server in %d %s"
 msgstr "%s: Újracsatlakozás a szerverhez %d másodperc múlva\n"
 
 #, fuzzy, c-format
+msgid "%s%s: switching address to %s/%d"
+msgstr "%s IP-cím nem található\n"
+
+#, fuzzy, c-format
 msgid "%s%s: GnuTLS handshake failed"
 msgstr "%s gnutls kézfogás sikertelen\n"
 
@@ -4014,23 +4015,23 @@ msgstr ""
 "támogatás nélkül lett fordítva\n"
 
 #, fuzzy, c-format
-msgid "%s%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s..."
+msgid "%s%s: connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
 msgstr ""
 "%s: csatlakozás a(z) %s:%d%s%s szerverhez %s proxy kiszolgálón keresztül: %s:"
 "%d%s...\n"
 
 #, fuzzy, c-format
-msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s..."
+msgid "Connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
 msgstr ""
 "Csatlakozás a(z) %s:%d%s%s szerverhez %s proxy kiszolgálón keresztül: %s:%d%"
 "s...\n"
 
 #, fuzzy, c-format
-msgid "%s%s: connecting to server %s:%d%s%s..."
+msgid "%s%s: connecting to server %s/%d%s%s..."
 msgstr "%s: csatlakozás a(z) %s:%d%s%s szerverhez...\n"
 
 #, fuzzy, c-format
-msgid "%s: connecting to server %s:%d%s%s..."
+msgid "%s: connecting to server %s/%d%s%s..."
 msgstr "%s: csatlakozás a(z) %s:%d%s%s szerverhez...\n"
 
 #, fuzzy, c-format
@@ -4336,6 +4337,12 @@ msgstr ""
 msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s rossz argumentum a \"%s\" parancsnak\n"
 
+#~ msgid "IP address or hostname of IRC server"
+#~ msgstr "IRC szerver IP-címe vagy hosztneve"
+
+#~ msgid "port for connecting to server"
+#~ msgstr "szerverhez csatlakozás portja"
+
 #~ 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)"
diff --git a/po/ru.po b/po/ru.po
index f1084f50a..15f279605 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-02-02 23:26+0100\n"
+"POT-Creation-Date: 2008-02-03 13:17+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"
@@ -2607,11 +2607,11 @@ 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 "
-"command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
-"[rename servername newservername] | [keep servername] | [del servername]"
+"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
+"port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1,"
+"nick2,...] [-username username] [-realname realname] [-command command] [-"
+"autojoin channel[,channel]] ] | [copy servername newservername] | [rename "
+"servername newservername] | [keep servername] | [del servername]"
 msgstr ""
 "[list [сервер]] | [listfull [сервер]] | [add сервер адрес [-port порт] [-"
 "temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd пароль] [-nicks ник1 ник2 ник3] "
@@ -2619,22 +2619,21 @@ msgstr ""
 "autojoin канал[,канал]] ] | [copy сервер новый_сервер] | [rename сервер "
 "новое_имя] | [keep сервер] | [del сервер]"
 
+#, fuzzy
 msgid ""
 "      list: list servers (no parameter implies this list)\n"
 "  listfull: list servers with detailed info for each server\n"
 "       add: create a new server\n"
 "servername: server name, for internal and display use\n"
-"  hostname: name or IP address of server\n"
-"      port: port for server (integer, default is 6667)\n"
+"  hostname: name or IP address of server, with optional port (default: "
+"6667)\n"
 "      temp: create temporary server (not saved in config file)\n"
 "      auto: automatically connect to server when WeeChat starts\n"
 "    noauto: do not connect to server when WeeChat starts (default)\n"
 "      ipv6: use IPv6 protocol\n"
 "       ssl: use SSL protocol\n"
 "  password: password for server\n"
-"     nick1: first nick for server\n"
-"     nick2: alternate nick for server\n"
-"     nick3: second alternate nick for server\n"
+"nick1,2,..: nicknames for server\n"
 "  username: user name\n"
 "  realname: real name of user\n"
 "      copy: duplicate a server\n"
@@ -3022,11 +3021,9 @@ msgstr "автоматически переподключаться к серв�
 msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr "задержка (в секундах) перед повторным соединением с сервером"
 
-msgid "IP address or hostname of IRC server"
-msgstr "IP адрес или хост IRC сервера"
-
-msgid "port for connecting to server"
-msgstr "порт, используемый при соединении с сервером"
+#, fuzzy
+msgid "list of IP/port or hostname/port for server (separated by comma)"
+msgstr "ник, используемый на IRC сервере"
 
 msgid "use IPv6 protocol for server communication"
 msgstr "использовать IPv6 при связи с сервером"
@@ -3953,6 +3950,10 @@ msgid "%s%s: reconnecting to server in %d %s"
 msgstr "%s: Повторное подключение к серверу через %d секунд\n"
 
 #, fuzzy, c-format
+msgid "%s%s: switching address to %s/%d"
+msgstr "%s IP адрес не найден\n"
+
+#, fuzzy, c-format
 msgid "%s%s: GnuTLS handshake failed"
 msgstr "%s инициализация gnutls не удалось\n"
 
@@ -4000,19 +4001,19 @@ msgstr ""
 "поддержки GNUtls\n"
 
 #, fuzzy, c-format
-msgid "%s%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s..."
+msgid "%s%s: connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
 msgstr "%s: подключение к серверу %s:%d%s%s через %s proxy %s:%d%s...\n"
 
 #, fuzzy, c-format
-msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s..."
+msgid "Connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
 msgstr "Подключаюсь к серверу %s:%d%s%s через %s proxy %s:%d%s...\n"
 
 #, fuzzy, c-format
-msgid "%s%s: connecting to server %s:%d%s%s..."
+msgid "%s%s: connecting to server %s/%d%s%s..."
 msgstr "%s: поключаюсь к серверу %s:%d%s%s...\n"
 
 #, fuzzy, c-format
-msgid "%s: connecting to server %s:%d%s%s..."
+msgid "%s: connecting to server %s/%d%s%s..."
 msgstr "%s: поключаюсь к серверу %s:%d%s%s...\n"
 
 #, fuzzy, c-format
@@ -4318,6 +4319,12 @@ msgstr ""
 msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s некорректные аргументы команды \"%s\"\n"
 
+#~ msgid "IP address or hostname of IRC server"
+#~ msgstr "IP адрес или хост IRC сервера"
+
+#~ msgid "port for connecting to server"
+#~ msgstr "порт, используемый при соединении с сервером"
+
 #~ msgid ""
 #~ "alternate nickname to use on IRC server (if nickname is already used)"
 #~ msgstr "альтернативный ник, используемый на IRC сервере"
diff --git a/po/weechat.pot b/po/weechat.pot
index 2f62a6467..bb0d5a204 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-02-02 23:26+0100\n"
+"POT-Creation-Date: 2008-02-03 13:17+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"
@@ -2186,11 +2186,11 @@ msgid "list, add or remove servers"
 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 "
-"command] [-autojoin channel[,channel]] ] | [copy servername newservername] | "
-"[rename servername newservername] | [keep servername] | [del servername]"
+"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
+"port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1,"
+"nick2,...] [-username username] [-realname realname] [-command command] [-"
+"autojoin channel[,channel]] ] | [copy servername newservername] | [rename "
+"servername newservername] | [keep servername] | [del servername]"
 msgstr ""
 
 msgid ""
@@ -2198,17 +2198,15 @@ msgid ""
 "  listfull: list servers with detailed info for each server\n"
 "       add: create a new server\n"
 "servername: server name, for internal and display use\n"
-"  hostname: name or IP address of server\n"
-"      port: port for server (integer, default is 6667)\n"
+"  hostname: name or IP address of server, with optional port (default: "
+"6667)\n"
 "      temp: create temporary server (not saved in config file)\n"
 "      auto: automatically connect to server when WeeChat starts\n"
 "    noauto: do not connect to server when WeeChat starts (default)\n"
 "      ipv6: use IPv6 protocol\n"
 "       ssl: use SSL protocol\n"
 "  password: password for server\n"
-"     nick1: first nick for server\n"
-"     nick2: alternate nick for server\n"
-"     nick3: second alternate nick for server\n"
+"nick1,2,..: nicknames for server\n"
 "  username: user name\n"
 "  realname: real name of user\n"
 "      copy: duplicate a server\n"
@@ -2523,10 +2521,7 @@ msgstr ""
 msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr ""
 
-msgid "IP address or hostname of IRC server"
-msgstr ""
-
-msgid "port for connecting to server"
+msgid "list of IP/port or hostname/port for server (separated by comma)"
 msgstr ""
 
 msgid "use IPv6 protocol for server communication"
@@ -3429,6 +3424,10 @@ msgid "%s%s: reconnecting to server in %d %s"
 msgstr ""
 
 #, c-format
+msgid "%s%s: switching address to %s/%d"
+msgstr ""
+
+#, c-format
 msgid "%s%s: GnuTLS handshake failed"
 msgstr ""
 
@@ -3472,19 +3471,19 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "%s%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s..."
+msgid "%s%s: connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
 msgstr ""
 
 #, c-format
-msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s..."
+msgid "Connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
 msgstr ""
 
 #, c-format
-msgid "%s%s: connecting to server %s:%d%s%s..."
+msgid "%s%s: connecting to server %s/%d%s%s..."
 msgstr ""
 
 #, c-format
-msgid "%s: connecting to server %s:%d%s%s..."
+msgid "%s: connecting to server %s/%d%s%s..."
 msgstr ""
 
 #, c-format