diff --git a/configure.in b/configure.in
index 20f6690d6..b8917f78e 100644
--- a/configure.in
+++ b/configure.in
@@ -19,10 +19,10 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.2.1, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.2.2-cvs, flashcode@flashtux.org)
AC_CONFIG_SRCDIR([src/common/weechat.c])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.2.1])
+AM_INIT_AUTOMAKE([weechat], [0.2.2-cvs])
# Checks for programs
AC_PROG_CC
diff --git a/doc/de/irc_commands.xml b/doc/de/irc_commands.xml
index 1a7884001..d3ba4bf35 100644
--- a/doc/de/irc_commands.xml
+++ b/doc/de/irc_commands.xml
@@ -42,13 +42,13 @@ Nicknames oder Hosts sperren/verbannen
Nickname: zu sperrender User oder Host
-ctcp Nickname Typ [Argumente]
+ctcp receiver type [arguments]
CTCP-Nachricht verschicken
- Nickname: User, an den die CTCP-Nachricht geschickt werden soll
- Typ: Typ der CTCP-Nachricht (z.B. "version", "ping", ...)
-Argumente: Argumente für CTCP
+ receiver: nick or channel to send CTCP to
+ type: CTCP type (examples: "version", "ping", ..)
+arguments: arguments for CTCP
cycle [Channel[,Channel]] [Abschiedsnachricht]
diff --git a/doc/de/weechat.de.xml b/doc/de/weechat.de.xml
index 0eb479c85..3b1b8e5fb 100644
--- a/doc/de/weechat.de.xml
+++ b/doc/de/weechat.de.xml
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- WeeChat 0.2.1 - User guide
+ WeeChat 0.2.2-cvs - User guide
Schneller, leichter und erweiterbarer IRC Client
diff --git a/doc/de/weechat_commands.xml b/doc/de/weechat_commands.xml
index eb00264f6..ecdbcb907 100644
--- a/doc/de/weechat_commands.xml
+++ b/doc/de/weechat_commands.xml
@@ -118,14 +118,14 @@ Bei jedem Argument steht '*' f
Ohne Argumente listet /ignore alle definierten /ignore-Regeln auf.
-key [Taste Funktion/Befehl] [unbind Taste] [functions] [reset -yes]
+key [key [function/command]] [unbind key] [functions] [reset -yes]
belegen/freigeben von Tasten
- Taste: diese Taste mit einer internen Funktion oder einem Befehl, beginnend mit "/", belegen
- unbind: Tastenbelegung aufheben
-functions: interne Funktionen für Tastenbelegungen auflisten
- reset: Standardbelegung wiederherstellen und entferne alle eigenen Belegungen (Vorsicht!)
+ key: display or bind this key to an internal function or a command (beginning by "/")
+ unbind: unbind a key
+functions: list internal functions for key bindings
+ reset: restore bindings to the default values and delete ALL personal bindings (use carefully!)
plugin [load Dateiname] | [autoload] | [reload] | [unload]
diff --git a/doc/en/irc_commands.xml b/doc/en/irc_commands.xml
index 8945fbf01..294c70f14 100644
--- a/doc/en/irc_commands.xml
+++ b/doc/en/irc_commands.xml
@@ -42,11 +42,11 @@ bans nicks or hosts
nickname: user or host to ban
-ctcp nickname type [arguments]
+ctcp receiver type [arguments]
send a CTCP message (Client-To-Client Protocol)
- nickname: user to send CTCP to
+ receiver: nick or channel to send CTCP to
type: CTCP type (examples: "version", "ping", ..)
arguments: arguments for CTCP
diff --git a/doc/en/weechat.en.xml b/doc/en/weechat.en.xml
index 7f3e35ede..4f7b88b9f 100644
--- a/doc/en/weechat.en.xml
+++ b/doc/en/weechat.en.xml
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- WeeChat 0.2.1 - User guide
+ WeeChat 0.2.2-cvs - User guide
Fast, light and extensible IRC client
diff --git a/doc/en/weechat_commands.xml b/doc/en/weechat_commands.xml
index c5dbac54c..f62c29989 100644
--- a/doc/en/weechat_commands.xml
+++ b/doc/en/weechat_commands.xml
@@ -117,11 +117,11 @@ For each argument, '*' means all.
Without argument, /ignore command lists all defined ignore.
-key [key function/command] [unbind key] [functions] [reset -yes]
+key [key [function/command]] [unbind key] [functions] [reset -yes]
bind/unbind keys
- key: bind this key to an internal function or a command (beginning by "/")
+ key: display or bind this key to an internal function or a command (beginning by "/")
unbind: unbind a key
functions: list internal functions for key bindings
reset: restore bindings to the default values and delete ALL personal bindings (use carefully!)
diff --git a/doc/fr/irc_commands.xml b/doc/fr/irc_commands.xml
index 06b6817a1..5ef7de4d0 100644
--- a/doc/fr/irc_commands.xml
+++ b/doc/fr/irc_commands.xml
@@ -42,11 +42,11 @@ bannit des pseudos ou masques
pseudo: pseudo ou masque pour le bannissement
-ctcp pseudo type [arguments]
+ctcp cible type [arguments]
envoyer un message CTCP (Client-To-Client Protocol)
- pseudo: utilisateur à qui envoyer le CTCP
+ cible: utilisateur à qui envoyer le CTCP
type: type de CTCP (exemples: "version", "ping", etc...)
arguments: arguments pour le CTCP
diff --git a/doc/fr/weechat.fr.xml b/doc/fr/weechat.fr.xml
index 0682c60fc..fe7ab6a80 100644
--- a/doc/fr/weechat.fr.xml
+++ b/doc/fr/weechat.fr.xml
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- WeeChat 0.2.1 - Guide utilisateur
+ WeeChat 0.2.2-cvs - Guide utilisateur
Client IRC rapide, léger et extensible
diff --git a/doc/fr/weechat_commands.xml b/doc/fr/weechat_commands.xml
index 590c3e73c..a769706c7 100644
--- a/doc/fr/weechat_commands.xml
+++ b/doc/fr/weechat_commands.xml
@@ -117,11 +117,11 @@ Pour chaque param
Sans paramètres, la commande /ignore liste les ignore définis.
-key [touche fonction/commande] [unbind touche] [functions] [reset -yes]
+key [touche [fonction/commande]] [unbind touche] [functions] [reset -yes]
associer/libérer des touches
- touche: associer cette touche à une fonction interne ou une commande (commençant par "/")
+ touche: voir ou associer cette touche à une fonction interne ou une commande (commençant par "/")
unbind: supprimer l'association à une touche
functions: lister la liste des fonctions internes pour les associations de touches
reset: restaure les touches aux valeurs par défaut et supprime TOUTES les touches personnelles (utiliser avec précaution !)
diff --git a/po/cs.po b/po/cs.po
index 495011d4d..6100ea3ed 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: WeeChat 0.2.1\n"
+"Project-Id-Version: WeeChat 0.2.2-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2006-10-01 10:04+0200\n"
-"PO-Revision-Date: 2006-10-01 09:33+0200\n"
+"PO-Revision-Date: 2006-10-01 12:10+0200\n"
"Last-Translator: Jiri Golembiovsky \n"
"Language-Team: weechat-dev \n"
"MIME-Version: 1.0\n"
diff --git a/po/de.po b/po/de.po
index 014d4cb47..209fbe98f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,10 +6,10 @@
# Thomas Schuetz , 2006.
msgid ""
msgstr ""
-"Project-Id-Version: WeeChat 0.2.1\n"
+"Project-Id-Version: WeeChat 0.2.2-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2006-10-01 10:04+0200\n"
-"PO-Revision-Date: 2006-10-01 09:33+0200\n"
+"PO-Revision-Date: 2006-10-01 12:10+0200\n"
"Last-Translator: Thomas Schuetz \n"
"Language-Team: weechat-dev \n"
"MIME-Version: 1.0\n"
diff --git a/po/es.po b/po/es.po
index 571964259..5f0178477 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Weechat 0.2.1\n"
+"Project-Id-Version: Weechat 0.2.2-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2006-10-01 10:04+0200\n"
-"PO-Revision-Date: 2006-10-01 09:33+0200\n"
+"PO-Revision-Date: 2006-10-01 12:10+0200\n"
"Last-Translator: Roberto González Cardenete \n"
"Language-Team: weechat-dev \n"
"MIME-Version: 1.0\n"
diff --git a/po/fr.po b/po/fr.po
index d6f08aac5..437a28b12 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: WeeChat 0.2.1\n"
+"Project-Id-Version: WeeChat 0.2.2-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2006-10-01 10:04+0200\n"
-"PO-Revision-Date: 2006-10-01 09:33+0200\n"
+"PO-Revision-Date: 2006-10-01 12:10+0200\n"
"Last-Translator: FlashCode \n"
"Language-Team: weechat-dev \n"
"MIME-Version: 1.0\n"
diff --git a/po/hu.po b/po/hu.po
index dfbdf0601..3d4882f5d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,10 +5,10 @@
# Andras Voroskoi , 2006.
msgid ""
msgstr ""
-"Project-Id-Version: WeeChat 0.2.1\n"
+"Project-Id-Version: WeeChat 0.2.2-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2006-10-01 10:04+0200\n"
-"PO-Revision-Date: 2006-10-01 09:33+0200\n"
+"PO-Revision-Date: 2006-10-01 12:10+0200\n"
"Last-Translator: Andras Voroskoi \n"
"Language-Team: weechat-dev \n"
"MIME-Version: 1.0\n"
diff --git a/po/ru.po b/po/ru.po
index 7cbd82066..53bc55f29 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: WeeChat 0.2.1\n"
+"Project-Id-Version: WeeChat 0.2.2-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2006-10-01 10:04+0200\n"
-"PO-Revision-Date: 2006-10-01 09:33+0200\n"
+"PO-Revision-Date: 2006-10-01 12:10+0200\n"
"Last-Translator: Stalwart \n"
"Language-Team: weechat-dev \n"
"MIME-Version: 1.0\n"
diff --git a/weechat/configure.in b/weechat/configure.in
index 20f6690d6..b8917f78e 100644
--- a/weechat/configure.in
+++ b/weechat/configure.in
@@ -19,10 +19,10 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.2.1, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.2.2-cvs, flashcode@flashtux.org)
AC_CONFIG_SRCDIR([src/common/weechat.c])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.2.1])
+AM_INIT_AUTOMAKE([weechat], [0.2.2-cvs])
# Checks for programs
AC_PROG_CC
diff --git a/weechat/doc/de/irc_commands.xml b/weechat/doc/de/irc_commands.xml
index 1a7884001..d3ba4bf35 100644
--- a/weechat/doc/de/irc_commands.xml
+++ b/weechat/doc/de/irc_commands.xml
@@ -42,13 +42,13 @@ Nicknames oder Hosts sperren/verbannen
Nickname: zu sperrender User oder Host
-ctcp Nickname Typ [Argumente]
+ctcp receiver type [arguments]
CTCP-Nachricht verschicken
- Nickname: User, an den die CTCP-Nachricht geschickt werden soll
- Typ: Typ der CTCP-Nachricht (z.B. "version", "ping", ...)
-Argumente: Argumente für CTCP
+ receiver: nick or channel to send CTCP to
+ type: CTCP type (examples: "version", "ping", ..)
+arguments: arguments for CTCP
cycle [Channel[,Channel]] [Abschiedsnachricht]
diff --git a/weechat/doc/de/weechat.de.xml b/weechat/doc/de/weechat.de.xml
index 0eb479c85..3b1b8e5fb 100644
--- a/weechat/doc/de/weechat.de.xml
+++ b/weechat/doc/de/weechat.de.xml
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- WeeChat 0.2.1 - User guide
+ WeeChat 0.2.2-cvs - User guide
Schneller, leichter und erweiterbarer IRC Client
diff --git a/weechat/doc/de/weechat_commands.xml b/weechat/doc/de/weechat_commands.xml
index eb00264f6..ecdbcb907 100644
--- a/weechat/doc/de/weechat_commands.xml
+++ b/weechat/doc/de/weechat_commands.xml
@@ -118,14 +118,14 @@ Bei jedem Argument steht '*' f
Ohne Argumente listet /ignore alle definierten /ignore-Regeln auf.
-key [Taste Funktion/Befehl] [unbind Taste] [functions] [reset -yes]
+key [key [function/command]] [unbind key] [functions] [reset -yes]
belegen/freigeben von Tasten
- Taste: diese Taste mit einer internen Funktion oder einem Befehl, beginnend mit "/", belegen
- unbind: Tastenbelegung aufheben
-functions: interne Funktionen für Tastenbelegungen auflisten
- reset: Standardbelegung wiederherstellen und entferne alle eigenen Belegungen (Vorsicht!)
+ key: display or bind this key to an internal function or a command (beginning by "/")
+ unbind: unbind a key
+functions: list internal functions for key bindings
+ reset: restore bindings to the default values and delete ALL personal bindings (use carefully!)
plugin [load Dateiname] | [autoload] | [reload] | [unload]
diff --git a/weechat/doc/en/irc_commands.xml b/weechat/doc/en/irc_commands.xml
index 8945fbf01..294c70f14 100644
--- a/weechat/doc/en/irc_commands.xml
+++ b/weechat/doc/en/irc_commands.xml
@@ -42,11 +42,11 @@ bans nicks or hosts
nickname: user or host to ban
-ctcp nickname type [arguments]
+ctcp receiver type [arguments]
send a CTCP message (Client-To-Client Protocol)
- nickname: user to send CTCP to
+ receiver: nick or channel to send CTCP to
type: CTCP type (examples: "version", "ping", ..)
arguments: arguments for CTCP
diff --git a/weechat/doc/en/weechat.en.xml b/weechat/doc/en/weechat.en.xml
index 7f3e35ede..4f7b88b9f 100644
--- a/weechat/doc/en/weechat.en.xml
+++ b/weechat/doc/en/weechat.en.xml
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- WeeChat 0.2.1 - User guide
+ WeeChat 0.2.2-cvs - User guide
Fast, light and extensible IRC client
diff --git a/weechat/doc/en/weechat_commands.xml b/weechat/doc/en/weechat_commands.xml
index c5dbac54c..f62c29989 100644
--- a/weechat/doc/en/weechat_commands.xml
+++ b/weechat/doc/en/weechat_commands.xml
@@ -117,11 +117,11 @@ For each argument, '*' means all.
Without argument, /ignore command lists all defined ignore.
-key [key function/command] [unbind key] [functions] [reset -yes]
+key [key [function/command]] [unbind key] [functions] [reset -yes]
bind/unbind keys
- key: bind this key to an internal function or a command (beginning by "/")
+ key: display or bind this key to an internal function or a command (beginning by "/")
unbind: unbind a key
functions: list internal functions for key bindings
reset: restore bindings to the default values and delete ALL personal bindings (use carefully!)
diff --git a/weechat/doc/fr/irc_commands.xml b/weechat/doc/fr/irc_commands.xml
index 06b6817a1..5ef7de4d0 100644
--- a/weechat/doc/fr/irc_commands.xml
+++ b/weechat/doc/fr/irc_commands.xml
@@ -42,11 +42,11 @@ bannit des pseudos ou masques
pseudo: pseudo ou masque pour le bannissement
-ctcp pseudo type [arguments]
+ctcp cible type [arguments]
envoyer un message CTCP (Client-To-Client Protocol)
- pseudo: utilisateur à qui envoyer le CTCP
+ cible: utilisateur à qui envoyer le CTCP
type: type de CTCP (exemples: "version", "ping", etc...)
arguments: arguments pour le CTCP
diff --git a/weechat/doc/fr/weechat.fr.xml b/weechat/doc/fr/weechat.fr.xml
index 0682c60fc..fe7ab6a80 100644
--- a/weechat/doc/fr/weechat.fr.xml
+++ b/weechat/doc/fr/weechat.fr.xml
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- WeeChat 0.2.1 - Guide utilisateur
+ WeeChat 0.2.2-cvs - Guide utilisateur
Client IRC rapide, léger et extensible
diff --git a/weechat/doc/fr/weechat_commands.xml b/weechat/doc/fr/weechat_commands.xml
index 590c3e73c..a769706c7 100644
--- a/weechat/doc/fr/weechat_commands.xml
+++ b/weechat/doc/fr/weechat_commands.xml
@@ -117,11 +117,11 @@ Pour chaque param
Sans paramètres, la commande /ignore liste les ignore définis.
-key [touche fonction/commande] [unbind touche] [functions] [reset -yes]
+key [touche [fonction/commande]] [unbind touche] [functions] [reset -yes]
associer/libérer des touches
- touche: associer cette touche à une fonction interne ou une commande (commençant par "/")
+ touche: voir ou associer cette touche à une fonction interne ou une commande (commençant par "/")
unbind: supprimer l'association à une touche
functions: lister la liste des fonctions internes pour les associations de touches
reset: restaure les touches aux valeurs par défaut et supprime TOUTES les touches personnelles (utiliser avec précaution !)
diff --git a/weechat/po/cs.po b/weechat/po/cs.po
index 495011d4d..6100ea3ed 100644
--- a/weechat/po/cs.po
+++ b/weechat/po/cs.po
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: WeeChat 0.2.1\n"
+"Project-Id-Version: WeeChat 0.2.2-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2006-10-01 10:04+0200\n"
-"PO-Revision-Date: 2006-10-01 09:33+0200\n"
+"PO-Revision-Date: 2006-10-01 12:10+0200\n"
"Last-Translator: Jiri Golembiovsky \n"
"Language-Team: weechat-dev \n"
"MIME-Version: 1.0\n"
diff --git a/weechat/po/de.po b/weechat/po/de.po
index 014d4cb47..209fbe98f 100644
--- a/weechat/po/de.po
+++ b/weechat/po/de.po
@@ -6,10 +6,10 @@
# Thomas Schuetz , 2006.
msgid ""
msgstr ""
-"Project-Id-Version: WeeChat 0.2.1\n"
+"Project-Id-Version: WeeChat 0.2.2-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2006-10-01 10:04+0200\n"
-"PO-Revision-Date: 2006-10-01 09:33+0200\n"
+"PO-Revision-Date: 2006-10-01 12:10+0200\n"
"Last-Translator: Thomas Schuetz \n"
"Language-Team: weechat-dev \n"
"MIME-Version: 1.0\n"
diff --git a/weechat/po/es.po b/weechat/po/es.po
index 571964259..5f0178477 100644
--- a/weechat/po/es.po
+++ b/weechat/po/es.po
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Weechat 0.2.1\n"
+"Project-Id-Version: Weechat 0.2.2-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2006-10-01 10:04+0200\n"
-"PO-Revision-Date: 2006-10-01 09:33+0200\n"
+"PO-Revision-Date: 2006-10-01 12:10+0200\n"
"Last-Translator: Roberto González Cardenete \n"
"Language-Team: weechat-dev \n"
"MIME-Version: 1.0\n"
diff --git a/weechat/po/fr.po b/weechat/po/fr.po
index d6f08aac5..437a28b12 100644
--- a/weechat/po/fr.po
+++ b/weechat/po/fr.po
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: WeeChat 0.2.1\n"
+"Project-Id-Version: WeeChat 0.2.2-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2006-10-01 10:04+0200\n"
-"PO-Revision-Date: 2006-10-01 09:33+0200\n"
+"PO-Revision-Date: 2006-10-01 12:10+0200\n"
"Last-Translator: FlashCode \n"
"Language-Team: weechat-dev \n"
"MIME-Version: 1.0\n"
diff --git a/weechat/po/hu.po b/weechat/po/hu.po
index dfbdf0601..3d4882f5d 100644
--- a/weechat/po/hu.po
+++ b/weechat/po/hu.po
@@ -5,10 +5,10 @@
# Andras Voroskoi , 2006.
msgid ""
msgstr ""
-"Project-Id-Version: WeeChat 0.2.1\n"
+"Project-Id-Version: WeeChat 0.2.2-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2006-10-01 10:04+0200\n"
-"PO-Revision-Date: 2006-10-01 09:33+0200\n"
+"PO-Revision-Date: 2006-10-01 12:10+0200\n"
"Last-Translator: Andras Voroskoi \n"
"Language-Team: weechat-dev \n"
"MIME-Version: 1.0\n"
diff --git a/weechat/po/ru.po b/weechat/po/ru.po
index 7cbd82066..53bc55f29 100644
--- a/weechat/po/ru.po
+++ b/weechat/po/ru.po
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: WeeChat 0.2.1\n"
+"Project-Id-Version: WeeChat 0.2.2-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2006-10-01 10:04+0200\n"
-"PO-Revision-Date: 2006-10-01 09:33+0200\n"
+"PO-Revision-Date: 2006-10-01 12:10+0200\n"
"Last-Translator: Stalwart \n"
"Language-Team: weechat-dev \n"
"MIME-Version: 1.0\n"