summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--doc/en/autogen/user/irc_commands.txt24
-rw-r--r--doc/fr/autogen/user/irc_commands.txt24
-rw-r--r--po/cs.po41
-rw-r--r--po/de.po43
-rw-r--r--po/es.po43
-rw-r--r--po/fr.po81
-rw-r--r--po/hu.po40
-rw-r--r--po/it.po41
-rw-r--r--po/pl.po41
-rw-r--r--po/ru.po40
-rw-r--r--po/weechat.pot36
-rw-r--r--src/plugins/irc/irc-command.c102
-rw-r--r--src/plugins/irc/irc-server.c58
-rw-r--r--src/plugins/irc/irc-server.h2
15 files changed, 357 insertions, 262 deletions
diff --git a/ChangeLog b/ChangeLog
index 5077a1937..db908a9bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
FlashCode <flashcode@flashtux.org>
-v0.3.1-dev, 2009-11-19
+v0.3.1-dev, 2009-11-24
Version 0.3.1 (under dev!)
@@ -30,6 +30,7 @@ Version 0.3.1 (under dev!)
* irc: add commands /sajoin, /samode, /sanick, /sapart, /saquit (task #9770)
* irc: add options for CTCP, to block/customize CTCP reply (task #9693)
* irc: add missing CTCP: clientinfo, finger, source, time, userinfo (task #7270)
+* irc: add all server options for commands /server and /connect
* irc: fix command /connect (options -ssl, -ipv6 and -port) (bug #27486)
* irc: improve error management on socket error (recv/send)
* irc: improve mask used by command /kickban
diff --git a/doc/en/autogen/user/irc_commands.txt b/doc/en/autogen/user/irc_commands.txt
index f01bc5af6..4580c51cb 100644
--- a/doc/en/autogen/user/irc_commands.txt
+++ b/doc/en/autogen/user/irc_commands.txt
@@ -40,7 +40,7 @@
nickname: user or host to ban
........................................
-&bull; *`/connect`* `[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-ipv6] [-ssl]]`::
+&bull; *`/connect`* `[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-option[=value]] [-nooption]]`::
........................................
connect to IRC server(s)
@@ -50,8 +50,15 @@
-nojoin: do not join any channel (even if autojoin is enabled on server)
hostname: hostname (or IP) of a server
port: port for server (6667 by default)
- ipv6: use IPv6 protocol
- ssl: use SSL protocol
+ option: set option for server (for boolean option, value can be omitted)
+ nooption: set boolean option to 'off' (for example: -nossl)
+
+ Examples:
+ /connect freenode
+ /connect irc.oftc.net/6667
+ /connect irc6.oftc.net/6667 -ipv6
+ /connect irc6.oftc.net/6697 -ipv6 -ssl
+ /connect my.server.org/6697 -ssl -password=test
........................................
&bull; *`/ctcp`* `receiver type [arguments]`::
@@ -446,7 +453,7 @@
reason: reason
........................................
-&bull; *`/server`* `[list [servername]] | [listfull [servername]] | [add servername hostname[/port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | [rename servername newservername] | [keep servername] | [del servername] | [deloutq] | [jump] | [raw]`::
+&bull; *`/server`* `[list [servername]] | [listfull [servername]] | [add servername hostname[/port] [-temp] [-option[=value]] [-nooption]] | [copy servername newservername] | [rename servername newservername] | [keep servername] | [del servername] | [deloutq] | [jump] | [raw]`::
........................................
list, add or remove IRC servers
@@ -456,10 +463,9 @@
add: create a new server
servername: server name, for internal and display use
hostname: name or IP address of server, with optional port (default: 6667)
- auto: automatically connect to server when WeeChat starts
- noauto: do not connect to server when WeeChat starts (default)
- ipv6: use IPv6 protocol
- ssl: use SSL protocol
+ temp: create temporary server (not saved)
+ option: set option for server (for boolean option, value can be omitted)
+ nooption: set boolean option to 'off' (for example: -nossl)
copy: duplicate a server
rename: rename a server
keep: keep server in config file (for temporary servers only)
@@ -470,7 +476,7 @@
Examples:
/server listfull
- /server add oftc irc.oftc.net/6697 -ssl
+ /server add oftc irc.oftc.net/6697 -ssl -autoconnect
/server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl
/server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667
/server copy oftc oftcbis
diff --git a/doc/fr/autogen/user/irc_commands.txt b/doc/fr/autogen/user/irc_commands.txt
index 97c6e49df..4f384253c 100644
--- a/doc/fr/autogen/user/irc_commands.txt
+++ b/doc/fr/autogen/user/irc_commands.txt
@@ -40,7 +40,7 @@
pseudo: pseudo ou hôte pour le bannissement
........................................
-&bull; *`/connect`* `[-all [-nojoin] | nom_serveur [nom_serveur ...] [-nojoin] | nom[/port] [-ipv6] [-ssl]]`::
+&bull; *`/connect`* `[-all [-nojoin] | nom_serveur [nom_serveur ...] [-nojoin] | nom[/port] [-option[=valeur]] [-nooption]]`::
........................................
se connecter à un/plusieurs serveur(s) IRC
@@ -50,8 +50,15 @@
-nojoin: ne rejoindre aucun canal (même si l'autojoin est activé pour le serveur)
nom: nom (ou adresse IP) d'un serveur
port: port pour le serveur (6667 par défaut)
- ipv6: utiliser le protocole IPv6
- ssl: utiliser le protocole SSL
+ option: définir l'option pour le serveur (pour une option booléenne, la valeur peut être omise)
+ nooption: définir l'option booléenne à 'off' (par exemple: -nossl)
+
+ Exemples:
+ /connect freenode
+ /connect irc.oftc.net/6667
+ /connect irc6.oftc.net/6667 -ipv6
+ /connect irc6.oftc.net/6697 -ipv6 -ssl
+ /connect my.server.org/6697 -ssl -password=test
........................................
&bull; *`/ctcp`* `cible type [arguments]`::
@@ -446,7 +453,7 @@
raison: raison
........................................
-&bull; *`/server`* `[list [nom_serveur]] | [listfull [nom_serveur]] | [add nom_serveur nom[/port] [-temp] [-auto | -noauto] [-ipv6] [-ssl]] | [copy nom_serveur nouveau_nom_serveur] | [rename nom_serveur nouveau_nom_serveur] | [keep nom_serveur] | [del nom_serveur] | [deloutq] | [jump] | [raw]`::
+&bull; *`/server`* `[list [nom_serveur]] | [listfull [nom_serveur]] | [add nom_serveur nom[/port] [-temp] [-option[=valeur]] [-nooption]] | [copy nom_serveur nouveau_nom_serveur] | [rename nom_serveur nouveau_nom_serveur] | [keep nom_serveur] | [del nom_serveur] | [deloutq] | [jump] | [raw]`::
........................................
liste, ajoute ou retire des serveurs IRC
@@ -456,10 +463,9 @@
add: créer un nouveau serveur
nom_serveur: nom du serveur, pour usage interne et affichage
nom: nom ou adresse IP du serveur avec port en option (defaut: 6667)
- auto: se connecter automatiquement au serveur quand WeeChat démarre
- noauto: ne pas se connecter au serveur quand WeeChat démarre (par défaut)
- ipv6: utiliser le protocole IPv6
- ssl: utiliser le protocole SSL
+ temp: créer un serveur temporaire (non sauvé)
+ option: définir l'option pour le serveur (pour une option booléenne, la valeur peut être omise)
+ nooption: définir l'option booléenne à 'off' (par exemple: -nossl)
copy: dupliquer un serveur
rename: renommer un serveur
keep: garder le serveur dans le fichier de configuration (pour les serveurs temporaires seulement)
@@ -470,7 +476,7 @@
Exemples:
/server listfull
- /server add oftc irc.oftc.net/6697 -ssl
+ /server add oftc irc.oftc.net/6697 -ssl -autoconnect
/server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl
/server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667
/server copy oftc oftcbis
diff --git a/po/cs.po b/po/cs.po
index 40caeff62..ae47bdc5a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-11-20 15:30+0100\n"
+"POT-Creation-Date: 2009-11-24 15:30+0100\n"
"PO-Revision-Date: 2009-09-14 10:56+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2739,10 +2739,6 @@ msgid "%s%s: currently connecting to server \"%s\"!"
msgstr "%s%s: zrovna připojuji k serveru \"%s\"!"
#, c-format
-msgid "%s%s: missing argument for \"%s\" option"
-msgstr "%s%s: chybí argument pro volbu \"%s\""
-
-#, c-format
msgid "%s: server %s%s%s created (temporary server, NOT SAVED!)"
msgstr "%s: server %s%s%s vytvořen (dočasný server, NEUKLÁDA SE!)"
@@ -2984,7 +2980,7 @@ msgstr "připojit se k IRC serveru/serverům"
#, fuzzy
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
-"ipv6] [-ssl]]"
+"option[=value]] [-nooption]]"
msgstr ""
"[-all [-nojoin] | jméno_serveru [jméno_serveru ...] [-nojoin] | hostname [-"
"port port] [-ipv6] [-ssl]]"
@@ -2997,8 +2993,16 @@ msgid ""
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
-" ipv6: use IPv6 protocol\n"
-" ssl: use SSL protocol"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
+"\n"
+"Examples:\n"
+" /connect freenode\n"
+" /connect irc.oftc.net/6667\n"
+" /connect irc6.oftc.net/6667 -ipv6\n"
+" /connect irc6.oftc.net/6697 -ipv6 -ssl\n"
+" /connect my.server.org/6697 -ssl -password=test"
msgstr ""
" -all: připojit ke všem serverům\n"
"jméno_serveru: vnitřní jméno serveru pro přípojení\n"
@@ -3535,17 +3539,19 @@ msgstr ""
msgid "list, add or remove IRC servers"
msgstr "vypíše, přídá nebo odebere IRC servery"
+#, fuzzy
msgid ""
"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
-"port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | "
-"[rename servername newservername] | [keep servername] | [del servername] | "
-"[deloutq] | [jump] | [raw]"
+"port] [-temp] [-option[=value]] [-nooption]] | [copy servername "
+"newservername] | [rename servername newservername] | [keep servername] | "
+"[del servername] | [deloutq] | [jump] | [raw]"
msgstr ""
"[list [jméno_serveru]] | [listfull [jméno_serveru]] | [add jméno_serveru "
"jméno_hosta[/port] [-auto | -noauto] [-ipv6] [-ssl] | [copy jméno_serveru "
"nové_jméno_serveru] | [rename jméno_serveru nové_jméno_serveru] | [keep "
"jméno_serveru] | [del jméno_serveru] | [deloutq] | [jump] | [raw]"
+#, fuzzy
msgid ""
" list: list servers (no parameter implies this list)\n"
" listfull: list servers with detailed info for each server\n"
@@ -3553,10 +3559,10 @@ msgid ""
"servername: server name, for internal and display use\n"
" hostname: name or IP address of server, with optional port (default: "
"6667)\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"
+" temp: create temporary server (not saved)\n"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
" copy: duplicate a server\n"
" rename: rename a server\n"
" keep: keep server in config file (for temporary servers only)\n"
@@ -3568,7 +3574,7 @@ msgid ""
"\n"
"Examples:\n"
" /server listfull\n"
-" /server add oftc irc.oftc.net/6697 -ssl\n"
+" /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
" /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
" /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
" /server copy oftc oftcbis\n"
@@ -5812,6 +5818,9 @@ msgstr "%s%s: nemohu nastavit \"neblokovaci\" volbu na soket"
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: vypršel časový limit \"%s\" pro %s"
+#~ msgid "%s%s: missing argument for \"%s\" option"
+#~ msgstr "%s%s: chybí argument pro volbu \"%s\""
+
#~ msgid "%s%s unable to run function \"%s\""
#~ msgstr "%s%s nemůžu spustit funkci \"%s\""
diff --git a/po/de.po b/po/de.po
index 45deeba98..262df07cf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-11-20 15:30+0100\n"
+"POT-Creation-Date: 2009-11-24 15:30+0100\n"
"PO-Revision-Date: 2009-11-20 17:55+0100\n"
"Last-Translator: Nils G <weechatter@arcor.de>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2832,10 +2832,6 @@ msgid "%s%s: currently connecting to server \"%s\"!"
msgstr "%s%s: Verbindungsaufbau zum Server \"%s\" läuft bereits!"
#, c-format
-msgid "%s%s: missing argument for \"%s\" option"
-msgstr "%s%s: Fehlendes Argument für die Option \"%s\""
-
-#, c-format
msgid "%s: server %s%s%s created (temporary server, NOT SAVED!)"
msgstr "%s: Server %s%s%s angelegt (Vorübergehender Server, NICHT GESICHERT!)"
@@ -3080,13 +3076,15 @@ msgstr ""
msgid "connect to IRC server(s)"
msgstr "Mit IRC-Server(n) verbinden"
+#, fuzzy
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
-"ipv6] [-ssl]]"
+"option[=value]] [-nooption]]"
msgstr ""
"[-all [-nojoin] | Servername [Servername ...] [-nojoin] | Hostname [/port] [-"
"ipv6] [-ssl]]"
+#, fuzzy
msgid ""
" -all: connect to all servers\n"
"servername: internal server name to connect (server must have been created "
@@ -3094,8 +3092,16 @@ msgid ""
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
-" ipv6: use IPv6 protocol\n"
-" ssl: use SSL protocol"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
+"\n"
+"Examples:\n"
+" /connect freenode\n"
+" /connect irc.oftc.net/6667\n"
+" /connect irc6.oftc.net/6667 -ipv6\n"
+" /connect irc6.oftc.net/6697 -ipv6 -ssl\n"
+" /connect my.server.org/6697 -ssl -password=test"
msgstr ""
" -all: Verbinde mit allen Servern\n"
"servername: intern genutzter Servername, mit dem verbunden werden soll (Der "
@@ -3650,17 +3656,19 @@ msgstr ""
msgid "list, add or remove IRC servers"
msgstr "Auflisten, Hinzufügen oder Entfernen von IRC-Servern"
+#, fuzzy
msgid ""
"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
-"port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | "
-"[rename servername newservername] | [keep servername] | [del servername] | "
-"[deloutq] | [jump] | [raw]"
+"port] [-temp] [-option[=value]] [-nooption]] | [copy servername "
+"newservername] | [rename servername newservername] | [keep servername] | "
+"[del servername] | [deloutq] | [jump] | [raw]"
msgstr ""
"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
"port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | "
"[rename servername newservername] | [keep servername] | [del servername] | "
"[deloutq] | [jump] | [raw]"
+#, fuzzy
msgid ""
" list: list servers (no parameter implies this list)\n"
" listfull: list servers with detailed info for each server\n"
@@ -3668,10 +3676,10 @@ msgid ""
"servername: server name, for internal and display use\n"
" hostname: name or IP address of server, with optional port (default: "
"6667)\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"
+" temp: create temporary server (not saved)\n"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
" copy: duplicate a server\n"
" rename: rename a server\n"
" keep: keep server in config file (for temporary servers only)\n"
@@ -3683,7 +3691,7 @@ msgid ""
"\n"
"Examples:\n"
" /server listfull\n"
-" /server add oftc irc.oftc.net/6697 -ssl\n"
+" /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
" /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
" /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
" /server copy oftc oftcbis\n"
@@ -5991,6 +5999,9 @@ msgstr ""
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s"
+#~ msgid "%s%s: missing argument for \"%s\" option"
+#~ msgstr "%s%s: Fehlendes Argument für die Option \"%s\""
+
#~ msgid "%s%s unable to run function \"%s\""
#~ msgstr "%s%s Kann Funktion \"%s\" nicht ausführen"
diff --git a/po/es.po b/po/es.po
index 6061bbab3..28dfa4447 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-11-20 15:30+0100\n"
+"POT-Creation-Date: 2009-11-24 15:30+0100\n"
"PO-Revision-Date: 2009-09-06 21:25+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2646,10 +2646,6 @@ msgid "%s%s: currently connecting to server \"%s\"!"
msgstr "%s%s: ¡actualmente conectando al servidor \"%s\"!"
#, c-format
-msgid "%s%s: missing argument for \"%s\" option"
-msgstr "%s%s: falta el argumento para la opción \"%s\""
-
-#, c-format
msgid "%s: server %s%s%s created (temporary server, NOT SAVED!)"
msgstr "%s: servidor %s%s%s creado (temporalmente, ¡SIN GUARDAR!)"
@@ -2891,13 +2887,15 @@ msgstr ""
msgid "connect to IRC server(s)"
msgstr "conectar a un servidor IRC"
+#, fuzzy
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
-"ipv6] [-ssl]]"
+"option[=value]] [-nooption]]"
msgstr ""
"[-all [-nojoin] | servidor [servidor ...] [-nojoin] | hostname[/puerto] [-"
"ipv6] [-ssl]]"
+#, fuzzy
msgid ""
" -all: connect to all servers\n"
"servername: internal server name to connect (server must have been created "
@@ -2905,8 +2903,16 @@ msgid ""
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
-" ipv6: use IPv6 protocol\n"
-" ssl: use SSL protocol"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
+"\n"
+"Examples:\n"
+" /connect freenode\n"
+" /connect irc.oftc.net/6667\n"
+" /connect irc6.oftc.net/6667 -ipv6\n"
+" /connect irc6.oftc.net/6697 -ipv6 -ssl\n"
+" /connect my.server.org/6697 -ssl -password=test"
msgstr ""
" -all: conectar a todos los servidores\n"
"servidor: nombre interno del servidor a conectar (debe haber sido creado "
@@ -3454,17 +3460,19 @@ msgstr ""
msgid "list, add or remove IRC servers"
msgstr "lista, añade o elimina servidores IRC"
+#, fuzzy
msgid ""
"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
-"port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | "
-"[rename servername newservername] | [keep servername] | [del servername] | "
-"[deloutq] | [jump] | [raw]"
+"port] [-temp] [-option[=value]] [-nooption]] | [copy servername "
+"newservername] | [rename servername newservername] | [keep servername] | "
+"[del servername] | [deloutq] | [jump] | [raw]"
msgstr ""
"[list [servidor]] | [listfull [servidor]] | [add servidor dirección[/puerto] "
"[-auto | -noauto] [-ipv6] [-ssl]] | [copy servidor nuevoservidor] | [rename "
"servidor nuevoservidor] | [keep servidor] | [del servidor] | [deloutq] | "
"[jump] | [raw]"
+#, fuzzy
msgid ""
" list: list servers (no parameter implies this list)\n"
" listfull: list servers with detailed info for each server\n"
@@ -3472,10 +3480,10 @@ msgid ""
"servername: server name, for internal and display use\n"
" hostname: name or IP address of server, with optional port (default: "
"6667)\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"
+" temp: create temporary server (not saved)\n"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
" copy: duplicate a server\n"
" rename: rename a server\n"
" keep: keep server in config file (for temporary servers only)\n"
@@ -3487,7 +3495,7 @@ msgid ""
"\n"
"Examples:\n"
" /server listfull\n"
-" /server add oftc irc.oftc.net/6697 -ssl\n"
+" /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
" /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
" /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
" /server copy oftc oftcbis\n"
@@ -5705,6 +5713,9 @@ msgstr "%s%s: no es posible configurar la opción \"nonblock\" para el socket"
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s"
+#~ msgid "%s%s: missing argument for \"%s\" option"
+#~ msgstr "%s%s: falta el argumento para la opción \"%s\""
+
#, fuzzy
#~ msgid "%s%s unable to run function \"%s\""
#~ msgstr "No es posible escribir un fichero de log para un búfer\n"
diff --git a/po/fr.po b/po/fr.po
index 28a36b21c..442eb670b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-11-20 15:30+0100\n"
-"PO-Revision-Date: 2009-11-20 15:30+0100\n"
+"POT-Creation-Date: 2009-11-24 15:30+0100\n"
+"PO-Revision-Date: 2009-11-24 15:32+0100\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n"
@@ -2806,10 +2806,6 @@ msgid "%s%s: currently connecting to server \"%s\"!"
msgstr "%s%s: une connexion vers le serveur \"%s\" est en cours !"
#, c-format
-msgid "%s%s: missing argument for \"%s\" option"
-msgstr "%s%s: paramètre manquant pour l'option \"%s\""
-
-#, c-format
msgid "%s: server %s%s%s created (temporary server, NOT SAVED!)"
msgstr "%s: serveur %s%s%s créé (serveur temporaire, NON SAUVE !)"
@@ -3054,10 +3050,10 @@ msgstr "se connecter à un/plusieurs serveur(s) IRC"
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
-"ipv6] [-ssl]]"
+"option[=value]] [-nooption]]"
msgstr ""
"[-all [-nojoin] | nom_serveur [nom_serveur ...] [-nojoin] | nom[/port] [-"
-"ipv6] [-ssl]]"
+"option[=valeur]] [-nooption]]"
msgid ""
" -all: connect to all servers\n"
@@ -3066,8 +3062,16 @@ msgid ""
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
-" ipv6: use IPv6 protocol\n"
-" ssl: use SSL protocol"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
+"\n"
+"Examples:\n"
+" /connect freenode\n"
+" /connect irc.oftc.net/6667\n"
+" /connect irc6.oftc.net/6667 -ipv6\n"
+" /connect irc6.oftc.net/6697 -ipv6 -ssl\n"
+" /connect my.server.org/6697 -ssl -password=test"
msgstr ""
" -all: se reconnecter à tous les serveurs\n"
"nom_serveur: nom du serveur interne pour se connecter (le serveur doit avoir "
@@ -3076,8 +3080,16 @@ msgstr ""
"serveur)\n"
" nom: nom (ou adresse IP) d'un serveur\n"
" port: port pour le serveur (6667 par défaut)\n"
-" ipv6: utiliser le protocole IPv6\n"
-" ssl: utiliser le protocole SSL"
+" option: définir l'option pour le serveur (pour une option booléenne, la "
+"valeur peut être omise)\n"
+" nooption: définir l'option booléenne à 'off' (par exemple: -nossl)\n"
+"\n"
+"Exemples:\n"
+" /connect freenode\n"
+" /connect irc.oftc.net/6667\n"
+" /connect irc6.oftc.net/6667 -ipv6\n"
+" /connect irc6.oftc.net/6697 -ipv6 -ssl\n"
+" /connect my.server.org/6697 -ssl -password=test"
msgid "send a CTCP message (Client-To-Client Protocol)"
msgstr "envoyer un message CTCP (Client-To-Client Protocol)"
@@ -3619,14 +3631,10 @@ msgstr "liste, ajoute ou retire des serveurs IRC"
msgid ""
"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
-"port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | "
-"[rename servername newservername] | [keep servername] | [del servername] | "
-"[deloutq] | [jump] | [raw]"
-msgstr ""
-"[list [nom_serveur]] | [listfull [nom_serveur]] | [add nom_serveur nom[/"
-"port] [-temp] [-auto | -noauto] [-ipv6] [-ssl]] | [copy nom_serveur "
-"nouveau_nom_serveur] | [rename nom_serveur nouveau_nom_serveur] | [keep "
-"nom_serveur] | [del nom_serveur] | [deloutq] | [jump] | [raw]"
+"port] [-temp] [-option[=value]] [-nooption]] | [copy servername "
+"newservername] | [rename servername newservername] | [keep servername] | "
+"[del servername] | [deloutq] | [jump] | [raw]"
+msgstr "[list [nom_serveur]] | [listfull [nom_serveur]] | [add nom_serveur nom[/port] [-temp] [-option[=valeur]] [-nooption]] | [copy nom_serveur nouveau_nom_serveur] | [rename nom_serveur nouveau_nom_serveur] | [keep nom_serveur] | [del nom_serveur] | [deloutq] | [jump] | [raw]"
msgid ""
" list: list servers (no parameter implies this list)\n"
@@ -3635,10 +3643,10 @@ msgid ""
"servername: server name, for internal and display use\n"
" hostname: name or IP address of server, with optional port (default: "
"6667)\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"
+" temp: create temporary server (not saved)\n"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
" copy: duplicate a server\n"
" rename: rename a server\n"
" keep: keep server in config file (for temporary servers only)\n"
@@ -3650,7 +3658,7 @@ msgid ""
"\n"
"Examples:\n"
" /server listfull\n"
-" /server add oftc irc.oftc.net/6697 -ssl\n"
+" /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
" /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
" /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
" /server copy oftc oftcbis\n"
@@ -3662,27 +3670,21 @@ 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: nom ou adresse IP du serveur avec port en option (defaut: "
-"6667)\n"
-" auto: se connecter automatiquement au serveur quand WeeChat démarre\n"
-" noauto: ne pas se connecter au serveur quand WeeChat démarre (par "
-"défaut)\n"
-" ipv6: utiliser le protocole IPv6\n"
-" ssl: utiliser le protocole SSL\n"
+" nom: nom ou adresse IP du serveur avec port en option (defaut: 6667)\n"
+" temp: créer un serveur temporaire (non sauvé)\n"
+" option: définir l'option pour le serveur (pour une option booléenne, la valeur peut être omise)\n"
+" nooption: définir l'option booléenne à 'off' (par exemple: -nossl)\n"
" copy: dupliquer un serveur\n"
" rename: renommer un serveur\n"
-" keep: garder le serveur dans le fichier de configuration (pour les "
-"serveurs temporaires seulement)\n"
+" keep: garder le serveur dans le fichier de configuration (pour les serveurs temporaires seulement)\n"
" del: supprimer un serveur\n"
-" deloutq: supprimer la file d'attente des messages sortants pour tous les "
-"serveurs (tous les messages que WeeChat est actuellement en train "
-"d'envoyer)\n"
+" deloutq: supprimer la file d'attente des messages sortants pour tous les serveurs (tous les messages que WeeChat est actuellement en train d'envoyer)\n"
" jump: sauter au tampon du serveur\n"
" raw: ouvre le tampon avec les données brutes IRC\n"
"\n"
"Exemples:\n"
" /server listfull\n"
-" /server add oftc irc.oftc.net/6697 -ssl\n"
+" /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
" /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
" /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
" /server copy oftc oftcbis\n"
@@ -5933,3 +5935,6 @@ msgstr "%s%s: impossible de positionner l'option \"nonblock\" pour la socket"
#, c-format
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: délai d'attente dépassé pour \"%s\" avec %s"
+
+#~ msgid "%s%s: missing argument for \"%s\" option"
+#~ msgstr "%s%s: paramètre manquant pour l'option \"%s\""
diff --git a/po/hu.po b/po/hu.po
index b2d91daba..1782f18b3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-11-20 15:30+0100\n"
+"POT-Creation-Date: 2009-11-24 15:30+0100\n"
"PO-Revision-Date: 2009-09-20 13:51+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2659,10 +2659,6 @@ msgid "%s%s: currently connecting to server \"%s\"!"
msgstr "%s éppen kapcsolódik a(z) \"%s\" szerverhez!\n"
#, fuzzy, c-format
-msgid "%s%s: missing argument for \"%s\" option"
-msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
-
-#, fuzzy, c-format
msgid "%s: server %s%s%s created (temporary server, NOT SAVED!)"
msgstr "A %s%s%s szerver létrehozva\n"
@@ -2906,7 +2902,7 @@ msgstr "csatlakozás a szerver(ek)hez"
#, fuzzy
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
-"ipv6] [-ssl]]"
+"option[=value]] [-nooption]]"
msgstr ""
"[-all [-nojoin] | szervernév [szervernév ...] [-nojoin] | gépnév [-port "
"port] [-ipv6] [-ssl]]"
@@ -2919,8 +2915,16 @@ msgid ""
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
-" ipv6: use IPv6 protocol\n"
-" ssl: use SSL protocol"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
+"\n"
+"Examples:\n"
+" /connect freenode\n"
+" /connect irc.oftc.net/6667\n"
+" /connect irc6.oftc.net/6667 -ipv6\n"
+" /connect irc6.oftc.net/6697 -ipv6 -ssl\n"
+" /connect my.server.org/6697 -ssl -password=test"
msgstr ""
" -all: kapcsolódás minden szerverhez\n"
"szervernév: a belső szervernév amihez kapcsolódik\n"
@@ -3472,9 +3476,9 @@ msgstr "szerverek listázása, hozzáadása vagy eltávolítása"
#, fuzzy
msgid ""
"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
-"port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | "
-"[rename servername newservername] | [keep servername] | [del servername] | "
-"[deloutq] | [jump] | [raw]"
+"port] [-temp] [-option[=value]] [-nooption]] | [copy servername "
+"newservername] | [rename servername newservername] | [keep servername] | "
+"[del servername] | [deloutq] | [jump] | [raw]"
msgstr ""
"[list [szervernév]] | [listfull [szervernév]] | [add szervernév gépnév [-"
"port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd jelszó] [-nicks "
@@ -3490,10 +3494,10 @@ msgid ""
"servername: server name, for internal and display use\n"
" hostname: name or IP address of server, with optional port (default: "
"6667)\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"
+" temp: create temporary server (not saved)\n"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
" copy: duplicate a server\n"
" rename: rename a server\n"
" keep: keep server in config file (for temporary servers only)\n"
@@ -3505,7 +3509,7 @@ msgid ""
"\n"
"Examples:\n"
" /server listfull\n"
-" /server add oftc irc.oftc.net/6697 -ssl\n"
+" /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
" /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
" /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
" /server copy oftc oftcbis\n"
@@ -5755,6 +5759,10 @@ msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
#, fuzzy
+#~ msgid "%s%s: missing argument for \"%s\" option"
+#~ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
+
+#, fuzzy
#~ msgid "%s%s unable to run function \"%s\""
#~ msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
diff --git a/po/it.po b/po/it.po
index 2da0eb089..fa737b650 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Weechat 0.31-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-11-20 15:30+0100\n"
+"POT-Creation-Date: 2009-11-24 15:30+0100\n"
"PO-Revision-Date: 2009-11-18 21:26+0100\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2787,10 +2787,6 @@ msgid "%s%s: currently connecting to server \"%s\"!"
msgstr "%s%s: la connessione al server \"%s\" è già in corso!"
#, c-format
-msgid "%s%s: missing argument for \"%s\" option"
-msgstr "%s%s: argomento mancante per l'opzione \"%s\""
-
-#, c-format
msgid "%s: server %s%s%s created (temporary server, NOT SAVED!)"
msgstr "%s: server %s%s%s creato (server temporaneo, NON SALVATO!)"
@@ -3034,7 +3030,7 @@ msgstr "connette ad uno o più server IRC"
#, fuzzy
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
-"ipv6] [-ssl]]"
+"option[=value]] [-nooption]]"
msgstr ""
"[-all [-nojoin] | nome_server [nome_server ...] [-nojoin] | nome_host [-"
"porta porta] [-ipv6] [-ssl]]"
@@ -3047,8 +3043,16 @@ msgid ""
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
-" ipv6: use IPv6 protocol\n"
-" ssl: use SSL protocol"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
+"\n"
+"Examples:\n"
+" /connect freenode\n"
+" /connect irc.oftc.net/6667\n"
+" /connect irc6.oftc.net/6667 -ipv6\n"
+" /connect irc6.oftc.net/6697 -ipv6 -ssl\n"
+" /connect my.server.org/6697 -ssl -password=test"
msgstr ""
" -all: connette a tutti i server\n"
"nome_server: nome interno del server a cui connettersi\n"
@@ -3594,17 +3598,19 @@ msgstr ""
msgid "list, add or remove IRC servers"
msgstr "elenca, aggiunge o rimuove server IRC"
+#, fuzzy
msgid ""
"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
-"port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | "
-"[rename servername newservername] | [keep servername] | [del servername] | "
-"[deloutq] | [jump] | [raw]"
+"port] [-temp] [-option[=value]] [-nooption]] | [copy servername "
+"newservername] | [rename servername newservername] | [keep servername] | "
+"[del servername] | [deloutq] | [jump] | [raw]"
msgstr ""
"[list [nome_server]] | [listfull [nome_server]] | [add nome_server host"
"[porta][-auto | -noauto] [-ipv6] [-ssl] | [copy nome_server "
"nuovo_nome_server] | [rename nome_server nuovo_nome_server] | [keep "
"nome_server] | [del nome_server ] | [deloutq] | [jump] | [raw]"
+#, fuzzy
msgid ""
" list: list servers (no parameter implies this list)\n"
" listfull: list servers with detailed info for each server\n"
@@ -3612,10 +3618,10 @@ msgid ""
"servername: server name, for internal and display use\n"
" hostname: name or IP address of server, with optional port (default: "
"6667)\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"
+" temp: create temporary server (not saved)\n"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
" copy: duplicate a server\n"
" rename: rename a server\n"
" keep: keep server in config file (for temporary servers only)\n"
@@ -3627,7 +3633,7 @@ msgid ""
"\n"
"Examples:\n"
" /server listfull\n"
-" /server add oftc irc.oftc.net/6697 -ssl\n"
+" /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
" /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
" /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
" /server copy oftc oftcbis\n"
@@ -5891,6 +5897,9 @@ msgstr "%s%s: impossibile impostare l'opzione \"nonblock\" per il socket"
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: timeout per \"%s\" con %s"
+#~ msgid "%s%s: missing argument for \"%s\" option"
+#~ msgstr "%s%s: argomento mancante per l'opzione \"%s\""
+
#~ msgid "%s%s unable to run function \"%s\""
#~ msgstr "%s%s: impossibile eseguire la funzione \"%s\""
diff --git a/po/pl.po b/po/pl.po
index fc193e16a..53fd71c3a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-11-20 15:30+0100\n"
+"POT-Creation-Date: 2009-11-24 15:30+0100\n"
"PO-Revision-Date: 2009-09-06 21:25+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: Polish\n"
@@ -2773,10 +2773,6 @@ msgid "%s%s: currently connecting to server \"%s\"!"
msgstr "%s%s: obecnie łączę się z serwerem \"%s\"!"
#, c-format
-msgid "%s%s: missing argument for \"%s\" option"
-msgstr "%s%s: brakuje argumentu dla opcji \"%s\""
-
-#, c-format
msgid "%s: server %s%s%s created (temporary server, NOT SAVED!)"
msgstr "%s: utworzono serwer %s%s%s (tymczasowy serwer, NIE ZAPISANO!)"
@@ -3019,7 +3015,7 @@ msgstr "łączy się z serwerem(ami) IRC"
#, fuzzy
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
-"ipv6] [-ssl]]"
+"option[=value]] [-nooption]]"
msgstr ""
"[-all [-nojoin] | nazwa_serwera [nazwa_serwera ...] [-nojoin] | nazwa_hosta "
"[-port port] [-ipv6] [-ssl]]"
@@ -3032,8 +3028,16 @@ msgid ""
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
-" ipv6: use IPv6 protocol\n"
-" ssl: use SSL protocol"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
+"\n"
+"Examples:\n"
+" /connect freenode\n"
+" /connect irc.oftc.net/6667\n"
+" /connect irc6.oftc.net/6667 -ipv6\n"
+" /connect irc6.oftc.net/6697 -ipv6 -ssl\n"
+" /connect my.server.org/6697 -ssl -password=test"
msgstr ""
" -all: łączy się ze wszystkimi serwerami\n"
"nazwa_serwera: wewnętrzna nazwa serwera do połączenia\n"
@@ -3583,17 +3587,19 @@ msgstr ""
msgid "list, add or remove IRC servers"
msgstr "wyświetla, dodaje lub usuwa serwery IRC"
+#, fuzzy
msgid ""
"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
-"port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | "
-"[rename servername newservername] | [keep servername] | [del servername] | "
-"[deloutq] | [jump] | [raw]"
+"port] [-temp] [-option[=value]] [-nooption]] | [copy servername "
+"newservername] | [rename servername newservername] | [keep servername] | "
+"[del servername] | [deloutq] | [jump] | [raw]"
msgstr ""
"[list [nazwa_serwera]] | [listfull [nazwa_serwera]] | [add nazwa_serwera host"
"[/port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy nazwa_serwera "
"nowa_nazwa_serwera] | [rename nazwa_serwera nowa_nazwa_serwera] | [keep "
"nazwa_serwera] | [del nazwa_serwera] | [deloutq] | [jump] | [raw]"
+#, fuzzy
msgid ""
" list: list servers (no parameter implies this list)\n"
" listfull: list servers with detailed info for each server\n"
@@ -3601,10 +3607,10 @@ msgid ""
"servername: server name, for internal and display use\n"
" hostname: name or IP address of server, with optional port (default: "
"6667)\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"
+" temp: create temporary server (not saved)\n"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
" copy: duplicate a server\n"
" rename: rename a server\n"
" keep: keep server in config file (for temporary servers only)\n"
@@ -3616,7 +3622,7 @@ msgid ""
"\n"
"Examples:\n"
" /server listfull\n"
-" /server add oftc irc.oftc.net/6697 -ssl\n"
+" /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
" /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
" /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
" /server copy oftc oftcbis\n"
@@ -5869,6 +5875,9 @@ msgstr "%s%s: nie można ustawić opcji \"nonblock\" dla gniazda"
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: przekroczono czas na \"%s\" z %s"
+#~ msgid "%s%s: missing argument for \"%s\" option"
+#~ msgstr "%s%s: brakuje argumentu dla opcji \"%s\""
+
#~ msgid "%s%s unable to run function \"%s\""
#~ msgstr "%s%s nie można wykonać funkcji \"%s\""
diff --git a/po/ru.po b/po/ru.po
index b806e1577..819e8cbb6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-11-20 15:30+0100\n"
+"POT-Creation-Date: 2009-11-24 15:30+0100\n"
"PO-Revision-Date: 2009-09-20 13:50+0200\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2671,10 +2671,6 @@ msgid "%s%s: currently connecting to server \"%s\"!"
msgstr "%s подключается к серверу \"%s\"!\n"
#, fuzzy, c-format
-msgid "%s%s: missing argument for \"%s\" option"
-msgstr "%s нет аргумента для параметра \"%s\"\n"
-
-#, fuzzy, c-format
msgid "%s: server %s%s%s created (temporary server, NOT SAVED!)"
msgstr "Сервер %s%s%s создан\n"
@@ -2918,7 +2914,7 @@ msgstr "подключиться к серверу(-ам)"
#, fuzzy
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
-"ipv6] [-ssl]]"
+"option[=value]] [-nooption]]"
msgstr ""
"[-all [-nojoin] | сервер [servername ...] [-nojoin] | адрес [-port порт] [-"
"ipv6] [-ssl]]"
@@ -2931,8 +2927,16 @@ msgid ""
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
-" ipv6: use IPv6 protocol\n"
-" ssl: use SSL protocol"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
+"\n"
+"Examples:\n"
+" /connect freenode\n"
+" /connect irc.oftc.net/6667\n"
+" /connect irc6.oftc.net/6667 -ipv6\n"
+" /connect irc6.oftc.net/6697 -ipv6 -ssl\n"
+" /connect my.server.org/6697 -ssl -password=test"
msgstr ""
" -all: переподключиться ко всем серверам\n"
" сервер: название сервера для переподключения\n"
@@ -3480,9 +3484,9 @@ msgstr "перечислить, добавить или удалить серв
#, fuzzy
msgid ""
"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
-"port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | "
-"[rename servername newservername] | [keep servername] | [del servername] | "
-"[deloutq] | [jump] | [raw]"
+"port] [-temp] [-option[=value]] [-nooption]] | [copy servername "
+"newservername] | [rename servername newservername] | [keep servername] | "
+"[del servername] | [deloutq] | [jump] | [raw]"
msgstr ""
"[list [сервер]] | [listfull [сервер]] | [add сервер адрес [-port порт] [-"
"temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd пароль] [-nicks ник1 ник2 ник3] "
@@ -3498,10 +3502,10 @@ msgid ""
"servername: server name, for internal and display use\n"
" hostname: name or IP address of server, with optional port (default: "
"6667)\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"
+" temp: create temporary server (not saved)\n"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
" copy: duplicate a server\n"
" rename: rename a server\n"
" keep: keep server in config file (for temporary servers only)\n"
@@ -3513,7 +3517,7 @@ msgid ""
"\n"
"Examples:\n"
" /server listfull\n"
-" /server add oftc irc.oftc.net/6697 -ssl\n"
+" /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
" /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
" /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
" /server copy oftc oftcbis\n"
@@ -5753,6 +5757,10 @@ msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s нет аргумента для параметра \"%s\"\n"
#, fuzzy
+#~ msgid "%s%s: missing argument for \"%s\" option"
+#~ msgstr "%s нет аргумента для параметра \"%s\"\n"
+
+#, fuzzy
#~ msgid "%s%s unable to run function \"%s\""
#~ msgstr "Не могу записать лог-файл \"%s\"\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index b23df63f6..64871c47d 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: 2009-11-20 15:30+0100\n"
+"POT-Creation-Date: 2009-11-24 15:30+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"
@@ -2303,10 +2303,6 @@ msgid "%s%s: currently connecting to server \"%s\"!"
msgstr ""
#, c-format
-msgid "%s%s: missing argument for \"%s\" option"
-msgstr ""
-
-#, c-format
msgid "%s: server %s%s%s created (temporary server, NOT SAVED!)"
msgstr ""
@@ -2536,7 +2532,7 @@ msgstr ""
msgid ""
"[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-"
-"ipv6] [-ssl]]"
+"option[=value]] [-nooption]]"
msgstr ""
msgid ""
@@ -2546,8 +2542,16 @@ msgid ""
" -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
-" ipv6: use IPv6 protocol\n"
-" ssl: use SSL protocol"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
+"\n"
+"Examples:\n"
+" /connect freenode\n"
+" /connect irc.oftc.net/6667\n"
+" /connect irc6.oftc.net/6667 -ipv6\n"
+" /connect irc6.oftc.net/6697 -ipv6 -ssl\n"
+" /connect my.server.org/6697 -ssl -password=test"
msgstr ""
msgid "send a CTCP message (Client-To-Client Protocol)"
@@ -2979,9 +2983,9 @@ msgstr ""
msgid ""
"[list [servername]] | [listfull [servername]] | [add servername hostname[/"
-"port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | "
-"[rename servername newservername] | [keep servername] | [del servername] | "
-"[deloutq] | [jump] | [raw]"
+"port] [-temp] [-option[=value]] [-nooption]] | [copy servername "
+"newservername] | [rename servername newservername] | [keep servername] | "
+"[del servername] | [deloutq] | [jump] | [raw]"
msgstr ""
msgid ""
@@ -2991,10 +2995,10 @@ msgid ""
"servername: server name, for internal and display use\n"
" hostname: name or IP address of server, with optional port (default: "
"6667)\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"
+" temp: create temporary server (not saved)\n"
+" option: set option for server (for boolean option, value can be "
+"omitted)\n"
+" nooption: set boolean option to 'off' (for example: -nossl)\n"
" copy: duplicate a server\n"
" rename: rename a server\n"
" keep: keep server in config file (for temporary servers only)\n"
@@ -3006,7 +3010,7 @@ msgid ""
"\n"
"Examples:\n"
" /server listfull\n"
-" /server add oftc irc.oftc.net/6697 -ssl\n"
+" /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
" /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
" /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
" /server copy oftc oftcbis\n"
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 0973a5cd5..18b6116e4 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -536,9 +536,8 @@ int
irc_command_connect (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
- int i, nb_connect, connect_ok, all_servers, no_join, port, ipv6, ssl;
- char *name, *error;
- long number;
+ int i, nb_connect, connect_ok, all_servers, no_join;
+ char *name;
IRC_GET_SERVER(buffer);
@@ -548,9 +547,6 @@ irc_command_connect (void *data, struct t_gui_buffer *buffer, int argc,
nb_connect = 0;
connect_ok = 1;
- port = IRC_SERVER_DEFAULT_PORT;
- ipv6 = 0;
- ssl = 0;
all_servers = 0;
no_join = 0;
@@ -560,26 +556,6 @@ irc_command_connect (void *data, struct t_gui_buffer *buffer, int argc,
all_servers = 1;
if (weechat_strcasecmp (argv[i], "-nojoin") == 0)
no_join = 1;
- if (weechat_strcasecmp (argv[i], "-ipv6") == 0)
- ipv6 = 1;
- if (weechat_strcasecmp (argv[i], "-ssl") == 0)
- ssl = 1;
- if (weechat_strcasecmp (argv[i], "-port") == 0)
- {
- if (i == (argc - 1))
- {
- weechat_printf (NULL,
- _("%s%s: missing argument for \"%s\" "
- "option"),
- weechat_prefix ("error"), IRC_PLUGIN_NAME,
- "-port");
- return WEECHAT_RC_OK;
- }
- error = NULL;
- number = strtol (argv[++i], &error, 10);
- if (error && !error[0])
- port = number;
- }
}
if (all_servers)
@@ -625,16 +601,8 @@ irc_command_connect (void *data, struct t_gui_buffer *buffer, int argc,
IRC_COLOR_CHAT_SERVER,
ptr_server->name,
IRC_COLOR_CHAT);
- if (ipv6)
- {
- weechat_config_option_set (ptr_server->options[IRC_SERVER_OPTION_IPV6],
- "on", 1);
- }
- if (ssl)
- {
- weechat_config_option_set (ptr_server->options[IRC_SERVER_OPTION_SSL],
- "on", 1);
- }
+ irc_server_apply_command_line_options (ptr_server,
+ argc, argv);
if (!irc_command_connect_one_server (ptr_server, 0))
connect_ok = 0;
}
@@ -3011,34 +2979,7 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
weechat_config_option_set (new_server->options[IRC_SERVER_OPTION_ADDRESSES],
argv[3], 1);
-
- /* parse arguments */
- for (i = 4; i < argc; i++)
- {
- if (argv[i][0] == '-')
- {
- if (weechat_strcasecmp (argv[i], "-auto") == 0)
- {
- weechat_config_option_set (new_server->options[IRC_SERVER_OPTION_AUTOCONNECT],
- "on", 1);
- }
- if (weechat_strcasecmp (argv[i], "-noauto") == 0)
- {
- weechat_config_option_set (new_server->options[IRC_SERVER_OPTION_AUTOCONNECT],
- "off", 1);
- }
- if (weechat_strcasecmp (argv[i], "-ipv6") == 0)
- {
- weechat_config_option_set (new_server->options[IRC_SERVER_OPTION_IPV6],
- "on", 1);
- }
- if (weechat_strcasecmp (argv[i], "-ssl") == 0)
- {
- weechat_config_option_set (new_server->options[IRC_SERVER_OPTION_SSL],
- "on", 1);
- }
- }
- }
+ irc_server_apply_command_line_options (new_server, argc, argv);
weechat_printf (NULL,
_("%s: server %s%s%s created"),
@@ -3870,8 +3811,8 @@ irc_command_init ()
weechat_hook_command ("connect",
N_("connect to IRC server(s)"),
N_("[-all [-nojoin] | servername [servername ...] "
- "[-nojoin] | hostname[/port] [-ipv6] "
- "[-ssl]]"),
+ "[-nojoin] | hostname[/port] [-option[=value]] "
+ "[-nooption]]"),
N_(" -all: connect to all servers\n"
"servername: internal server name to connect "
"(server must have been created by /server add)\n"
@@ -3879,8 +3820,16 @@ irc_command_init ()
"autojoin is enabled on server)\n"
" hostname: hostname (or IP) of a server\n"
" port: port for server (6667 by default)\n"
- " ipv6: use IPv6 protocol\n"
- " ssl: use SSL protocol"),
+ " option: set option for server (for boolean "
+ "option, value can be omitted)\n"
+ " nooption: set boolean option to 'off' (for "
+ "example: -nossl)\n\n"
+ "Examples:\n"
+ " /connect freenode\n"
+ " /connect irc.oftc.net/6667\n"
+ " /connect irc6.oftc.net/6667 -ipv6\n"
+ " /connect irc6.oftc.net/6697 -ipv6 -ssl\n"
+ " /connect my.server.org/6697 -ssl -password=test"),
"-all -nojoin"
" || %(irc_servers)|%*",
&irc_command_connect, NULL);
@@ -4224,8 +4173,8 @@ irc_command_init ()
weechat_hook_command ("server",
N_("list, add or remove IRC servers"),
N_("[list [servername]] | [listfull [servername]] | "
- "[add servername hostname[/port] "
- "[-auto | -noauto] [-ipv6] [-ssl]] | "
+ "[add servername hostname[/port] [-temp] "
+ "[-option[=value]] [-nooption]] | "
"[copy servername newservername] | "
"[rename servername newservername] | "
"[keep servername] | [del servername] | "
@@ -4239,12 +4188,11 @@ irc_command_init ()
"display use\n"
" hostname: name or IP address of server, with "
"optional port (default: 6667)\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"
+ " temp: create temporary server (not saved)\n"
+ " option: set option for server (for boolean "
+ "option, value can be omitted)\n"
+ " nooption: set boolean option to 'off' (for "
+ "example: -nossl)\n"
" copy: duplicate a server\n"
" rename: rename a server\n"
" keep: keep server in config file (for "
@@ -4257,7 +4205,7 @@ irc_command_init ()
" raw: open buffer with raw IRC data\n\n"
"Examples:\n"
" /server listfull\n"
- " /server add oftc irc.oftc.net/6697 -ssl\n"
+ " /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
" /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
" /server add freenode2 chat.eu.freenode.net/6667,"
"chat.us.freenode.net/6667\n"
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index 2d3fbb14d..9bcba9a27 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -517,6 +517,64 @@ irc_server_alloc_with_url (const char *irc_url)
}
/*
+ * irc_server_apply_command_line_options: apply options on command line to a
+ * server
+ * for example:
+ * -ssl
+ * -nossl
+ * -password=test
+ * -proxy=myproxy
+ */
+
+void
+irc_server_apply_command_line_options (struct t_irc_server *server,
+ int argc, char **argv)
+{
+ int i, index_option;
+ char *pos, *option_name, *ptr_value, *value_boolean[2] = { "off", "on" };
+
+ for (i = 0; i < argc; i++)
+ {
+ if (argv[i][0] == '-')
+ {
+ pos = strchr (argv[i], '=');
+ ptr_value = value_boolean[0];
+ if (pos)
+ {
+ option_name = weechat_strndup (argv[i] + 1, pos - argv[i] - 1);
+ ptr_value = pos + 1;
+ }
+ else
+ {
+ option_name = strdup (argv[i] + 1);
+ ptr_value = value_boolean[1];
+ }
+ if (option_name)
+ {
+ index_option = irc_server_search_option (option_name);
+ if (index_option < 0)
+ {
+ /* look if option is negative, like "-noxxx" */
+ if (weechat_strncasecmp (argv[i], "-no", 3) == 0)
+ {
+ free (option_name);
+ option_name = strdup (argv[i] + 3);
+ index_option = irc_server_search_option (option_name);
+ ptr_value = value_boolean[0];
+ }
+ }
+ if (index_option >= 0)
+ {
+ weechat_config_option_set (server->options[index_option],
+ ptr_value, 1);
+ }
+ free (option_name);
+ }
+ }
+ }
+}
+
+/*
* irc_server_outqueue_add: add a message in out queue
*/
diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h
index c0214fd6b..4b456567a 100644
--- a/src/plugins/irc/irc-server.h
+++ b/src/plugins/irc/irc-server.h
@@ -173,6 +173,8 @@ extern void irc_server_set_nicks (struct t_irc_server *server, const char *nicks
extern void irc_server_set_nick (struct t_irc_server *server, const char *nick);
extern struct t_irc_server *irc_server_alloc (const char *name);
extern int irc_server_alloc_with_url (const char *irc_url);
+extern void irc_server_apply_command_line_options (struct t_irc_server *server,
+ int argc, char **argv);
extern void irc_server_free_all ();
extern struct t_irc_server *irc_server_copy (struct t_irc_server *server,
const char *new_name);