15 files changed, 67 insertions, 32 deletions
diff --git a/doc/de/autogen/plugin_api/completions.txt b/doc/de/autogen/plugin_api/completions.txt
index 4fbe7857e..81d714bdf 100644
--- a/doc/de/autogen/plugin_api/completions.txt
+++ b/doc/de/autogen/plugin_api/completions.txt
@@ -22,6 +22,8 @@
 
 | irc | irc_ignores_numbers | Anzahl für festgelegte Ignorierungen
 
+| irc | irc_msg_kick | default kick message
+
 | irc | irc_msg_part | Standardnachricht beim Verlassen (/part) eines IRC-Channels
 
 | irc | irc_notify_nicks | Nicks für die eine Benachrichtigung existiert
diff --git a/doc/de/autogen/user/irc_commands.txt b/doc/de/autogen/user/irc_commands.txt
index 03364c294..1fd7d7d57 100644
--- a/doc/de/autogen/user/irc_commands.txt
+++ b/doc/de/autogen/user/irc_commands.txt
@@ -249,9 +249,9 @@ Beispiele:
 ........................................
 /kick  [<channel>] <nick> [<reason>]
 
-channel: Channel in dem der Benutzers sich befindet
-   nick: Nick der rausgeworfen werden soll
- reason: Begründung für den Rauswurf
+channel: channel where user is
+   nick: nick to kick
+ reason: reason for kick (special variables $nick, $channel and $server are replaced by their value)
 ........................................
 
 [[command_irc_kickban]]
@@ -259,14 +259,14 @@ channel: Channel in dem der Benutzers sich befindet
 ........................................
 /kickban  [<channel>] <nick> [<reason>]
 
-channel: Channel in dem sich der User befindet
-   nick: Nickname der rausgeworfen und gebannt werden soll
- reason: Begründung weshalb der User rausgeworfen wurde
+channel: channel where user is
+   nick: nick to kick and ban
+ reason: reason for kick (special variables $nick, $channel and $channel are replaced by their value)
 
-Es ist möglich kick/ban mittels einer Maske durchzuführen. Der Nick wird aus der Maske heraus gefiltert und durch Joker ("*") ersetzt.
+It is possible to kick/ban with a mask, nick will be extracted from mask and replaced by "*".
 
-Beispiel:
-  Sperre "*!*@host.com" und kicke dann "toto":
+Example:
+  ban "*!*@host.com" and then kick "toto":
     /kickban toto!*@host.com
 ........................................
 
diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt
index ab5e920a6..bb1704be0 100644
--- a/doc/de/autogen/user/irc_options.txt
+++ b/doc/de/autogen/user/irc_options.txt
@@ -468,6 +468,11 @@
 ** Typ: integer
 ** Werte: 1 .. 3600 (Standardwert: `60`)
 
+* [[option_irc.server_default.default_msg_kick]] *irc.server_default.default_msg_kick*
+** Beschreibung: `default kick message used by commands "/kick" and "/kickban" (special variables $nick, $channel and $server are replaced by their value)`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `""`)
+
 * [[option_irc.server_default.default_msg_part]] *irc.server_default.default_msg_part*
 ** Beschreibung: `Standardnachricht beim Verlassen eines Channels ("%v": wird durch die WeeChat-Version ersetzt)`
 ** Typ: Zeichenkette
diff --git a/doc/en/autogen/plugin_api/completions.txt b/doc/en/autogen/plugin_api/completions.txt
index 2b5b4eebf..4dd4fb19a 100644
--- a/doc/en/autogen/plugin_api/completions.txt
+++ b/doc/en/autogen/plugin_api/completions.txt
@@ -22,6 +22,8 @@
 
 | irc | irc_ignores_numbers | numbers for defined ignores
 
+| irc | irc_msg_kick | default kick message
+
 | irc | irc_msg_part | default part message for IRC channel
 
 | irc | irc_notify_nicks | nicks in notify list
diff --git a/doc/en/autogen/user/irc_commands.txt b/doc/en/autogen/user/irc_commands.txt
index 0c93b700c..505a24155 100644
--- a/doc/en/autogen/user/irc_commands.txt
+++ b/doc/en/autogen/user/irc_commands.txt
@@ -251,7 +251,7 @@ Examples:
 
 channel: channel where user is
    nick: nick to kick
- reason: reason for kick
+ reason: reason for kick (special variables $nick, $channel and $server are replaced by their value)
 ........................................
 
 [[command_irc_kickban]]
@@ -261,7 +261,7 @@ channel: channel where user is
 
 channel: channel where user is
    nick: nick to kick and ban
- reason: reason for kick
+ reason: reason for kick (special variables $nick, $channel and $channel are replaced by their value)
 
 It is possible to kick/ban with a mask, nick will be extracted from mask and replaced by "*".
 
diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt
index c9a4f4e5a..8897470d5 100644
--- a/doc/en/autogen/user/irc_options.txt
+++ b/doc/en/autogen/user/irc_options.txt
@@ -468,6 +468,11 @@
 ** type: integer
 ** values: 1 .. 3600 (default value: `60`)
 
+* [[option_irc.server_default.default_msg_kick]] *irc.server_default.default_msg_kick*
+** description: `default kick message used by commands "/kick" and "/kickban" (special variables $nick, $channel and $server are replaced by their value)`
+** type: string
+** values: any string (default value: `""`)
+
 * [[option_irc.server_default.default_msg_part]] *irc.server_default.default_msg_part*
 ** description: `default part message (leaving channel) ("%v" will be replaced by WeeChat version in string)`
 ** type: string
diff --git a/doc/fr/autogen/plugin_api/completions.txt b/doc/fr/autogen/plugin_api/completions.txt
index 2f7a2b521..bcfbca0a2 100644
--- a/doc/fr/autogen/plugin_api/completions.txt
+++ b/doc/fr/autogen/plugin_api/completions.txt
@@ -22,6 +22,8 @@
 
 | irc | irc_ignores_numbers | numéros pour les ignores définis
 
+| irc | irc_msg_kick | message d'élimination par défaut
+
 | irc | irc_msg_part | message de fin par défaut pour le canal IRC
 
 | irc | irc_notify_nicks | pseudos dans la liste de notifications
diff --git a/doc/fr/autogen/user/irc_commands.txt b/doc/fr/autogen/user/irc_commands.txt
index 2f7548c07..84a90488d 100644
--- a/doc/fr/autogen/user/irc_commands.txt
+++ b/doc/fr/autogen/user/irc_commands.txt
@@ -251,7 +251,7 @@ Exemples:
 
  canal: canal où l'utilisateur se trouve
 pseudo: pseudo à éliminer
-raison: raison pour l'élimination
+raison: raison pour l'élimination (les variables spéciales $nick, $channel et $server sont remplacées par leur valeur)
 ........................................
 
 [[command_irc_kickban]]
@@ -261,7 +261,7 @@ raison: raison pour l'élimination
 
  canal: canal où l'utilisateur se trouve
 pseudo: pseudo à éliminer et bannir
-raison: raison pour l'élimination
+raison: raison pour l'élimination (les variables spéciales $nick, $channel et $server sont remplacées par leur valeur)
 
 Il est possible d'éliminer/bannir avec un masque, le pseudo sera extrait du masque et remplacé par "*".
 
diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt
index 5bde0dfb8..69dba4e7f 100644
--- a/doc/fr/autogen/user/irc_options.txt
+++ b/doc/fr/autogen/user/irc_options.txt
@@ -468,6 +468,11 @@
 ** type: entier
 ** valeurs: 1 .. 3600 (valeur par défaut: `60`)
 
+* [[option_irc.server_default.default_msg_kick]] *irc.server_default.default_msg_kick*
+** description: `message par défaut pour l'élimination utilisé par les commandes "/kick" et "/kickban" (les variables spéciales $nick, $channel et $server sont remplacées par leur valeur)`
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: `""`)
+
 * [[option_irc.server_default.default_msg_part]] *irc.server_default.default_msg_part*
 ** description: `message par défaut pour le part (en quittant un canal) ("%v" sera remplacé par la version de WeeChat dans la chaîne)`
 ** type: chaîne
diff --git a/doc/it/autogen/plugin_api/completions.txt b/doc/it/autogen/plugin_api/completions.txt
index fa9c13e0d..ecfeb667a 100644
--- a/doc/it/autogen/plugin_api/completions.txt
+++ b/doc/it/autogen/plugin_api/completions.txt
@@ -22,6 +22,8 @@
 
 | irc | irc_ignores_numbers | numero di ignore definiti
 
+| irc | irc_msg_kick | default kick message
+
 | irc | irc_msg_part | messaggio di uscita predefinito per il canale IRC
 
 | irc | irc_notify_nicks | nick nella lista notifiche
diff --git a/doc/it/autogen/user/irc_commands.txt b/doc/it/autogen/user/irc_commands.txt
index dc03b8a16..77b7c4696 100644
--- a/doc/it/autogen/user/irc_commands.txt
+++ b/doc/it/autogen/user/irc_commands.txt
@@ -249,9 +249,9 @@ Esempi:
 ........................................
 /kick  [<canale>] <nick> [<motivo>]
 
-canale: canale dove si trova l'utente
-  nick: nick da cacciare
-motivo: motivo per il kick
+channel: channel where user is
+   nick: nick to kick
+ reason: reason for kick (special variables $nick, $channel and $server are replaced by their value)
 ........................................
 
 [[command_irc_kickban]]
@@ -259,15 +259,15 @@ motivo: motivo per il kick
 ........................................
 /kickban  [<canale>] <nick> [<motivo>]
 
-  canale: canale in cui si trova l'utente
-    nick: nick da cacciare e bannare
-commento: motivo per il kick
+channel: channel where user is
+   nick: nick to kick and ban
+ reason: reason for kick (special variables $nick, $channel and $channel are replaced by their value)
 
-È possibile cacciare/bannare con una mask, il nick verrà estratto dalla mask e sostituito da "*".
+It is possible to kick/ban with a mask, nick will be extracted from mask and replaced by "*".
 
-Esempio:
-  banna "*!*@host.com" e poi caccia "tizio":
-    /kickban tizio!*@host.com
+Example:
+  ban "*!*@host.com" and then kick "toto":
+    /kickban toto!*@host.com
 ........................................
 
 [[command_irc_kill]]
diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt
index f327798b1..c5d4e86e6 100644
--- a/doc/it/autogen/user/irc_options.txt
+++ b/doc/it/autogen/user/irc_options.txt
@@ -468,6 +468,11 @@
 ** tipo: intero
 ** valori: 1 .. 3600 (valore predefinito: `60`)
 
+* [[option_irc.server_default.default_msg_kick]] *irc.server_default.default_msg_kick*
+** descrizione: `default kick message used by commands "/kick" and "/kickban" (special variables $nick, $channel and $server are replaced by their value)`
+** tipo: stringa
+** valori: qualsiasi stringa (valore predefinito: `""`)
+
 * [[option_irc.server_default.default_msg_part]] *irc.server_default.default_msg_part*
 ** descrizione: `messaggio di uscita predefinito (in uscita dal canale) ("%v" verrà sostituito dalla versione di WeeChat)`
 ** tipo: stringa
diff --git a/doc/ja/autogen/plugin_api/completions.txt b/doc/ja/autogen/plugin_api/completions.txt
index 8e6f819ba..c5a4a72e0 100644
--- a/doc/ja/autogen/plugin_api/completions.txt
+++ b/doc/ja/autogen/plugin_api/completions.txt
@@ -22,6 +22,8 @@
 
 | irc | irc_ignores_numbers | 無視エントリの数
 
+| irc | irc_msg_kick | default kick message
+
 | irc | irc_msg_part | IRC チャンネルのデフォルト退出メッセージ
 
 | irc | irc_notify_nicks | 通知エントリのニックネーム
diff --git a/doc/ja/autogen/user/irc_commands.txt b/doc/ja/autogen/user/irc_commands.txt
index 9ef01bb0e..d5b961909 100644
--- a/doc/ja/autogen/user/irc_commands.txt
+++ b/doc/ja/autogen/user/irc_commands.txt
@@ -249,9 +249,9 @@ nick: nick
 ........................................
 /kick  [<channel>] <nick> [<reason>]
 
-channel: ユーザの居るチャンネル
-   nick: キックするニックネーム
- reason: キック理由
+channel: channel where user is
+   nick: nick to kick
+ reason: reason for kick (special variables $nick, $channel and $server are replaced by their value)
 ........................................
 
 [[command_irc_kickban]]
@@ -259,14 +259,14 @@ channel: ユーザの居るチャンネル
 ........................................
 /kickban  [<channel>] <nick> [<reason>]
 
-channel: ユーザの居るチャンネル
-   nick: キックと参加禁止にするニックネーム
- reason: キック理由
+channel: channel where user is
+   nick: nick to kick and ban
+ reason: reason for kick (special variables $nick, $channel and $channel are replaced by their value)
 
-キックと参加禁止にマスクを使える場合、"*" のマスク展開後にマッチするニックネームがこれらの対象になる。
+It is possible to kick/ban with a mask, nick will be extracted from mask and replaced by "*".
 
-例:
-  "*!*@host.com" を参加禁止して "toto" をキック:
+Example:
+  ban "*!*@host.com" and then kick "toto":
     /kickban toto!*@host.com
 ........................................
 
diff --git a/doc/ja/autogen/user/irc_options.txt b/doc/ja/autogen/user/irc_options.txt
index ee71b0264..1ccc2012e 100644
--- a/doc/ja/autogen/user/irc_options.txt
+++ b/doc/ja/autogen/user/irc_options.txt
@@ -468,6 +468,11 @@
 ** タイプ: 整数
 ** 値: 1 .. 3600 (デフォルト値: `60`)
 
+* [[option_irc.server_default.default_msg_kick]] *irc.server_default.default_msg_kick*
+** 説明: `default kick message used by commands "/kick" and "/kickban" (special variables $nick, $channel and $server are replaced by their value)`
+** タイプ: 文字列
+** 値: 未制約文字列 (デフォルト値: `""`)
+
 * [[option_irc.server_default.default_msg_part]] *irc.server_default.default_msg_part*
 ** 説明: `デフォルトの退出メッセージ (チャンネルから出る際の) ("%v" は WeeChat バージョンで置換)`
 ** タイプ: 文字列