irc: rename server options "default_msg_*" to "msg_*", evaluate them

26 files changed, 687 insertions, 381 deletions

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 8a76e9007..8aaeba661 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -26,6 +26,7 @@ Improvements::
 
   * core, irc, xfer: display more information in memory allocation errors (issue #573)
   * api: remove functions printf_date() and printf_tags()
+  * irc: rename server options "default_msg_{kick|part|quit}" to "msg_{kick|part|quit}", evaluate them
   * relay: allow escape of comma in command "init" (weechat protocol) (issue #730)
 
 Bug fixes::
diff --git a/ReleaseNotes.adoc b/ReleaseNotes.adoc
index 62c1f5f4c..74a2c29b4 100644
--- a/ReleaseNotes.adoc
+++ b/ReleaseNotes.adoc
@@ -20,6 +20,20 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
 [[v1.6]]
 == Version 1.6 (under dev)
 
+[[v1.6_irc_server_default_msg]]
+=== IRC kick/part/quit default messages
+
+Server options with default messages for kick/part/quit have been renamed:
+
+* options by default for all servers:
+** _irc.server_default.default_msg_kick_ has been renamed to _irc.server_default.msg_kick_
+** _irc.server_default.default_msg_part_ has been renamed to _irc.server_default.msg_part_
+** _irc.server_default.default_msg_quit_ has been renamed to _irc.server_default.msg_quit_
+* options in each server:
+** _irc.server.xxx.default_msg_kick_ has been renamed to _irc.server.xxx.msg_kick_
+** _irc.server.xxx.default_msg_part_ has been renamed to _irc.server.xxx.msg_part_
+** _irc.server.xxx.default_msg_quit_ has been renamed to _irc.server.xxx.msg_quit_
+
 [[v1.6_api_printf]]
 === Printf API functions
 
diff --git a/doc/de/autogen/user/irc_options.adoc b/doc/de/autogen/user/irc_options.adoc
index 197230c89..5409fb3c3 100644
--- a/doc/de/autogen/user/irc_options.adoc
+++ b/doc/de/autogen/user/irc_options.adoc
@@ -502,21 +502,6 @@
 ** Typ: integer
 ** Werte: 1 .. 3600 (Standardwert: `+60+`)
 
-* [[option_irc.server_default.default_msg_kick]] *irc.server_default.default_msg_kick*
-** Beschreibung: pass:none[Standardmitteilung einer kick-Nachricht, für die Befehle "/kick" und "/kickban" (Variablen die genutzt werden können: $nick, $channel und $server)]
-** Typ: Zeichenkette
-** Werte: beliebige Zeichenkette (Standardwert: `+""+`)
-
-* [[option_irc.server_default.default_msg_part]] *irc.server_default.default_msg_part*
-** Beschreibung: pass:none[Standardmitteilung beim Verlassen eines Channels ("%v": wird durch die WeeChat-Version ersetzt)]
-** Typ: Zeichenkette
-** Werte: beliebige Zeichenkette (Standardwert: `+"WeeChat %v"+`)
-
-* [[option_irc.server_default.default_msg_quit]] *irc.server_default.default_msg_quit*
-** Beschreibung: pass:none[Standardmitteilung beim Beenden (Verbindung zum Server trennen) ("%v": wird durch die WeeChat-Version ersetzt)]
-** Typ: Zeichenkette
-** Werte: beliebige Zeichenkette (Standardwert: `+"WeeChat %v"+`)
-
 * [[option_irc.server_default.ipv6]] *irc.server_default.ipv6*
 ** Beschreibung: pass:none[bei der Kommunikation mit dem Server wird das IPv6 Protokoll genutzt (sollte IPv6 nicht verfügbar sein dann wird automatisch auf IPv4 umgeschaltet); wird die Funktion deaktiviert, dann wird ausschließlich IPv4 genutzt]
 ** Typ: boolesch
@@ -527,6 +512,21 @@
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `+""+`)
 
+* [[option_irc.server_default.msg_kick]] *irc.server_default.msg_kick*
+** Beschreibung: pass:none[default kick message used by commands "/kick" and "/kickban" (note: content is evaluated, see /help eval; special variables ${nick}, ${channel} and ${server} are replaced by their value)]
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `+""+`)
+
+* [[option_irc.server_default.msg_part]] *irc.server_default.msg_part*
+** Beschreibung: pass:none[default part message (leaving channel) (note: content is evaluated, see /help eval; special variables ${nick}, ${channel} and ${server} are replaced by their value; "%v" is replaced by WeeChat version if there is no ${...} in string)]
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `+"WeeChat ${info:version}"+`)
+
+* [[option_irc.server_default.msg_quit]] *irc.server_default.msg_quit*
+** Beschreibung: pass:none[default quit message (disconnecting from server) (note: content is evaluated, see /help eval; special variables ${nick}, ${channel} and ${server} are replaced by their value; "%v" is replaced by WeeChat version if there is no ${...} in string)]
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `+"WeeChat ${info:version}"+`)
+
 * [[option_irc.server_default.nicks]] *irc.server_default.nicks*
 ** Beschreibung: pass:none[Nicknamen, die auf dem IRC-Server benutzt werden sollen (durch Komma getrennt) (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
 ** Typ: Zeichenkette
diff --git a/doc/en/autogen/user/irc_options.adoc b/doc/en/autogen/user/irc_options.adoc
index 2081225fb..46d9f2ede 100644
--- a/doc/en/autogen/user/irc_options.adoc
+++ b/doc/en/autogen/user/irc_options.adoc
@@ -502,21 +502,6 @@
 ** type: integer
 ** values: 1 .. 3600 (default value: `+60+`)
 
-* [[option_irc.server_default.default_msg_kick]] *irc.server_default.default_msg_kick*
-** description: pass:none[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: pass:none[default part message (leaving channel) ("%v" will be replaced by WeeChat version in string)]
-** type: string
-** values: any string (default value: `+"WeeChat %v"+`)
-
-* [[option_irc.server_default.default_msg_quit]] *irc.server_default.default_msg_quit*
-** description: pass:none[default quit message (disconnecting from server) ("%v" will be replaced by WeeChat version in string)]
-** type: string
-** values: any string (default value: `+"WeeChat %v"+`)
-
 * [[option_irc.server_default.ipv6]] *irc.server_default.ipv6*
 ** description: pass:none[use IPv6 protocol for server communication (try IPv6 then fallback to IPv4); if disabled, only IPv4 is used]
 ** type: boolean
@@ -527,6 +512,21 @@
 ** type: string
 ** values: any string (default value: `+""+`)
 
+* [[option_irc.server_default.msg_kick]] *irc.server_default.msg_kick*
+** description: pass:none[default kick message used by commands "/kick" and "/kickban" (note: content is evaluated, see /help eval; special variables ${nick}, ${channel} and ${server} are replaced by their value)]
+** type: string
+** values: any string (default value: `+""+`)
+
+* [[option_irc.server_default.msg_part]] *irc.server_default.msg_part*
+** description: pass:none[default part message (leaving channel) (note: content is evaluated, see /help eval; special variables ${nick}, ${channel} and ${server} are replaced by their value; "%v" is replaced by WeeChat version if there is no ${...} in string)]
+** type: string
+** values: any string (default value: `+"WeeChat ${info:version}"+`)
+
+* [[option_irc.server_default.msg_quit]] *irc.server_default.msg_quit*
+** description: pass:none[default quit message (disconnecting from server) (note: content is evaluated, see /help eval; special variables ${nick}, ${channel} and ${server} are replaced by their value; "%v" is replaced by WeeChat version if there is no ${...} in string)]
+** type: string
+** values: any string (default value: `+"WeeChat ${info:version}"+`)
+
 * [[option_irc.server_default.nicks]] *irc.server_default.nicks*
 ** description: pass:none[nicknames to use on server (separated by comma) (note: content is evaluated, see /help eval)]
 ** type: string
diff --git a/doc/fr/autogen/user/irc_options.adoc b/doc/fr/autogen/user/irc_options.adoc
index e1d62d7ed..ca73fb3a2 100644
--- a/doc/fr/autogen/user/irc_options.adoc
+++ b/doc/fr/autogen/user/irc_options.adoc
@@ -502,21 +502,6 @@
 ** type: entier
 ** valeurs: 1 .. 3600 (valeur par défaut: `+60+`)
 
-* [[option_irc.server_default.default_msg_kick]] *irc.server_default.default_msg_kick*
-** description: pass:none[message par défaut pour l'éjection 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: pass:none[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
-** valeurs: toute chaîne (valeur par défaut: `+"WeeChat %v"+`)
-
-* [[option_irc.server_default.default_msg_quit]] *irc.server_default.default_msg_quit*
-** description: pass:none[message de fin par défaut (lors de la déconnexion du serveur) ("%v" sera remplacé par la version de WeeChat dans la chaîne)]
-** type: chaîne
-** valeurs: toute chaîne (valeur par défaut: `+"WeeChat %v"+`)
-
 * [[option_irc.server_default.ipv6]] *irc.server_default.ipv6*
 ** description: pass:none[utiliser le protocole IPv6 pour la communication avec le serveur (essayer IPv6 puis repli sur l'IPv4) ; si désactivé, seulement l'IPv4 est utilisé]
 ** type: booléen
@@ -527,6 +512,21 @@
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `+""+`)
 
+* [[option_irc.server_default.msg_kick]] *irc.server_default.msg_kick*
+** description: pass:none[message par défaut pour l'éjection utilisé par les commandes "/kick" et "/kickban" (note : le contenu est évalué, voir /help eval ; 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.msg_part]] *irc.server_default.msg_part*
+** description: pass:none[message par défaut pour le part (en quittant un canal) (note : le contenu est évalué, voir /help eval ; les variables spéciales ${nick}, ${channel} et ${server} sont remplacées par leur valeur ; "%v" est remplacé par la version de WeeChat s'il n'y a pas de ${...} dans la chaîne)]
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: `+"WeeChat ${info:version}"+`)
+
+* [[option_irc.server_default.msg_quit]] *irc.server_default.msg_quit*
+** description: pass:none[message de fin par défaut (lors de la déconnexion du serveur) (note : le contenu est évalué, voir /help eval ; les variables spéciales ${nick}, ${channel} et ${server} sont remplacées par leur valeur ; "%v" est remplacé par la version de WeeChat s'il n'y a pas de ${...} dans la chaîne)]
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: `+"WeeChat ${info:version}"+`)
+
 * [[option_irc.server_default.nicks]] *irc.server_default.nicks*
 ** description: pass:none[pseudos à utiliser sur le serveur (séparés par des virgules) (note : le contenu est évalué, voir /help eval)]
 ** type: chaîne
diff --git a/doc/it/autogen/user/irc_options.adoc b/doc/it/autogen/user/irc_options.adoc
index 92ced6650..ff8807a58 100644
--- a/doc/it/autogen/user/irc_options.adoc
+++ b/doc/it/autogen/user/irc_options.adoc
@@ -502,21 +502,6 @@
 ** tipo: intero
 ** valori: 1 .. 3600 (valore predefinito: `+60+`)
 
-* [[option_irc.server_default.default_msg_kick]] *irc.server_default.default_msg_kick*
-** descrizione: pass:none[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: pass:none[messaggio di uscita predefinito (in uscita dal canale) ("%v" verrà sostituito dalla versione di WeeChat)]
-** tipo: stringa
-** valori: qualsiasi stringa (valore predefinito: `+"WeeChat %v"+`)
-
-* [[option_irc.server_default.default_msg_quit]] *irc.server_default.default_msg_quit*
-** descrizione: pass:none[messaggio di abbandono predefinito (disconnessione dal server) ("%v" verrà sostituito dalla versione di WeeChat)]
-** tipo: stringa
-** valori: qualsiasi stringa (valore predefinito: `+"WeeChat %v"+`)
-
 * [[option_irc.server_default.ipv6]] *irc.server_default.ipv6*
 ** descrizione: pass:none[usa il protocollo IPv6 per le comunicazioni con il server (prova con IPv6, se non disponibile usa IPv4); se disabilitato, viene usato solo IPv4]
 ** tipo: bool
@@ -527,6 +512,21 @@
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `+""+`)
 
+* [[option_irc.server_default.msg_kick]] *irc.server_default.msg_kick*
+** descrizione: pass:none[default kick message used by commands "/kick" and "/kickban" (note: content is evaluated, see /help eval; special variables ${nick}, ${channel} and ${server} are replaced by their value)]
+** tipo: stringa
+** valori: qualsiasi stringa (valore predefinito: `+""+`)
+
+* [[option_irc.server_default.msg_part]] *irc.server_default.msg_part*
+** descrizione: pass:none[default part message (leaving channel) (note: content is evaluated, see /help eval; special variables ${nick}, ${channel} and ${server} are replaced by their value; "%v" is replaced by WeeChat version if there is no ${...} in string)]
+** tipo: stringa
+** valori: qualsiasi stringa (valore predefinito: `+"WeeChat ${info:version}"+`)
+
+* [[option_irc.server_default.msg_quit]] *irc.server_default.msg_quit*
+** descrizione: pass:none[default quit message (disconnecting from server) (note: content is evaluated, see /help eval; special variables ${nick}, ${channel} and ${server} are replaced by their value; "%v" is replaced by WeeChat version if there is no ${...} in string)]
+** tipo: stringa
+** valori: qualsiasi stringa (valore predefinito: `+"WeeChat ${info:version}"+`)
+
 * [[option_irc.server_default.nicks]] *irc.server_default.nicks*
 ** descrizione: pass:none[nicknames to use on server (separated by comma) (note: content is evaluated, see /help eval)]
 ** tipo: stringa
diff --git a/doc/ja/autogen/user/irc_options.adoc b/doc/ja/autogen/user/irc_options.adoc
index b1997a8a8..224223871 100644
--- a/doc/ja/autogen/user/irc_options.adoc
+++ b/doc/ja/autogen/user/irc_options.adoc
@@ -502,21 +502,6 @@
 ** タイプ: 整数
 ** 値: 1 .. 3600 (デフォルト値: `+60+`)
 
-* [[option_irc.server_default.default_msg_kick]] *irc.server_default.default_msg_kick*
-** 説明: pass:none["/kick" と "/kickban" コマンドが使うデフォルトのキックメッセージ (特殊変数 $nick、$channel、$server はそれぞれの値に置換されます)]
-** タイプ: 文字列
-** 値: 未制約文字列 (デフォルト値: `+""+`)
-
-* [[option_irc.server_default.default_msg_part]] *irc.server_default.default_msg_part*
-** 説明: pass:none[デフォルトの退出メッセージ (チャンネルから出る際の) ("%v" は WeeChat バージョンで置換)]
-** タイプ: 文字列
-** 値: 未制約文字列 (デフォルト値: `+"WeeChat %v"+`)
-
-* [[option_irc.server_default.default_msg_quit]] *irc.server_default.default_msg_quit*
-** 説明: pass:none[デフォルトの終了メッセージ (サーバとの接続を切る際の) ("%v" は WeeChat バージョンで置換)]
-** タイプ: 文字列
-** 値: 未制約文字列 (デフォルト値: `+"WeeChat %v"+`)
-
 * [[option_irc.server_default.ipv6]] *irc.server_default.ipv6*
 ** 説明: pass:none[サーバ接続に IPv6 プロトコルを利用 (IPv6 の利用に失敗したら IPv4 を利用); 無効の場合には IPv4 を利用]
 ** タイプ: ブール
@@ -527,6 +512,21 @@
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `+""+`)
 
+* [[option_irc.server_default.msg_kick]] *irc.server_default.msg_kick*
+** 説明: pass:none[default kick message used by commands "/kick" and "/kickban" (note: content is evaluated, see /help eval; special variables ${nick}, ${channel} and ${server} are replaced by their value)]
+** タイプ: 文字列
+** 値: 未制約文字列 (デフォルト値: `+""+`)
+
+* [[option_irc.server_default.msg_part]] *irc.server_default.msg_part*
+** 説明: pass:none[default part message (leaving channel) (note: content is evaluated, see /help eval; special variables ${nick}, ${channel} and ${server} are replaced by their value; "%v" is replaced by WeeChat version if there is no ${...} in string)]
+** タイプ: 文字列
+** 値: 未制約文字列 (デフォルト値: `+"WeeChat ${info:version}"+`)
+
+* [[option_irc.server_default.msg_quit]] *irc.server_default.msg_quit*
+** 説明: pass:none[default quit message (disconnecting from server) (note: content is evaluated, see /help eval; special variables ${nick}, ${channel} and ${server} are replaced by their value; "%v" is replaced by WeeChat version if there is no ${...} in string)]
+** タイプ: 文字列
+** 値: 未制約文字列 (デフォルト値: `+"WeeChat ${info:version}"+`)
+
 * [[option_irc.server_default.nicks]] *irc.server_default.nicks*
 ** 説明: pass:none[サーバで使用するニックネーム (コンマ区切り) (注意: 値は評価されます、/help eval を参照してください)]
 ** タイプ: 文字列
diff --git a/doc/pl/autogen/user/irc_options.adoc b/doc/pl/autogen/user/irc_options.adoc
index e3175b3cf..883c05de3 100644
--- a/doc/pl/autogen/user/irc_options.adoc
+++ b/doc/pl/autogen/user/irc_options.adoc
@@ -502,21 +502,6 @@
 ** typ: liczba
 ** wartości: 1 .. 3600 (domyślna wartość: `+60+`)
 
-* [[option_irc.server_default.default_msg_kick]] *irc.server_default.default_msg_kick*
-** opis: pass:none[domyślna wiadomość dla wykopania z kanału używana przez komendy "/kick" i "/kickban" (specjalne zmienne jak $nick, $channel i $server są zamieniane na odpowiednie wartości)]
-** typ: ciąg
-** wartości: dowolny ciąg (domyślna wartość: `+""+`)
-
-* [[option_irc.server_default.default_msg_part]] *irc.server_default.default_msg_part*
-** opis: pass:none[domyślna wiadomość opuszczenia kanału ("%v" zostanie zastąpione wersja WeeChat)]
-** typ: ciąg
-** wartości: dowolny ciąg (domyślna wartość: `+"WeeChat %v"+`)
-
-* [[option_irc.server_default.default_msg_quit]] *irc.server_default.default_msg_quit*
-** opis: pass:none[domyślna wiadomość wyjścia z IRC (rozłączenia z serwerem) ("%v" zostanie zastąpione wersją WeeChat)]
-** typ: ciąg
-** wartości: dowolny ciąg (domyślna wartość: `+"WeeChat %v"+`)
-
 * [[option_irc.server_default.ipv6]] *irc.server_default.ipv6*
 ** opis: pass:none[używaj protokołu IPv6 do komunikacji z serwerem (próbuj IPv6 później wróć do IPv4); jeśli wyłączone używane jest tylko IPv4]
 ** typ: bool
@@ -527,6 +512,21 @@
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `+""+`)
 
+* [[option_irc.server_default.msg_kick]] *irc.server_default.msg_kick*
+** opis: pass:none[default kick message used by commands "/kick" and "/kickban" (note: content is evaluated, see /help eval; special variables ${nick}, ${channel} and ${server} are replaced by their value)]
+** typ: ciąg
+** wartości: dowolny ciąg (domyślna wartość: `+""+`)
+
+* [[option_irc.server_default.msg_part]] *irc.server_default.msg_part*
+** opis: pass:none[default part message (leaving channel) (note: content is evaluated, see /help eval; special variables ${nick}, ${channel} and ${server} are replaced by their value; "%v" is replaced by WeeChat version if there is no ${...} in string)]
+** typ: ciąg
+** wartości: dowolny ciąg (domyślna wartość: `+"WeeChat ${info:version}"+`)
+
+* [[option_irc.server_default.msg_quit]] *irc.server_default.msg_quit*
+** opis: pass:none[default quit message (disconnecting from server) (note: content is evaluated, see /help eval; special variables ${nick}, ${channel} and ${server} are replaced by their value; "%v" is replaced by WeeChat version if there is no ${...} in string)]
+** typ: ciąg
+** wartości: dowolny ciąg (domyślna wartość: `+"WeeChat ${info:version}"+`)
+
 * [[option_irc.server_default.nicks]] *irc.server_default.nicks*
 ** opis: pass:none[nazwy użytkownika do użycia na serwerze (oddzielone przecinkiem) (uwaga: zawartość jest przetwarzana, zobacz /help eval)]
 ** typ: ciąg
diff --git a/po/cs.po b/po/cs.po
index d3f1035c1..58394806c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-06-22 10:25+0200\n"
+"POT-Creation-Date: 2016-07-16 09:54+0200\n"
 "PO-Revision-Date: 2016-05-18 07:42+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7133,24 +7133,29 @@ msgstr ""
 "nekontrolovat nepřítomnost přezdívek na kanále s vetším počtem přezdívek (0 "
 "= nekonečno)"
 
+#, fuzzy
 msgid ""
-"default kick message used by commands \"/kick\" and \"/kickban\" (special "
-"variables $nick, $channel and $server are replaced by their value)"
+"default kick message used by commands \"/kick\" and \"/kickban\" (note: "
+"content is evaluated, see /help eval; special variables ${nick}, ${channel} "
+"and ${server} are replaced by their value)"
 msgstr ""
+"    kanál: kanál na kterém je uživatel\n"
+"přezdívka: přezdívka, kterou vykopnout\n"
+"    důvod: důvod pro vykopnutí"
 
 msgid ""
-"default part message (leaving channel) (\"%v\" will be replaced by WeeChat "
-"version in string)"
+"default part message (leaving channel) (note: content is evaluated, see /"
+"help eval; special variables ${nick}, ${channel} and ${server} are replaced "
+"by their value; \"%v\" is replaced by WeeChat version if there is no ${...} "
+"in string)"
 msgstr ""
-"výchozí zpráva při odchodu z kanálu (\"%v\" bude nahrazeno verzí WeeChat v "
-"řetězci)"
 
 msgid ""
-"default quit message (disconnecting from server) (\"%v\" will be replaced by "
-"WeeChat version in string)"
+"default quit message (disconnecting from server) (note: content is "
+"evaluated, see /help eval; special variables ${nick}, ${channel} and "
+"${server} are replaced by their value; \"%v\" is replaced by WeeChat version "
+"if there is no ${...} in string)"
 msgstr ""
-"výchozí zpráva při uknočnení (odpojení od serveru) (\"%v\" bude nahrazeno "
-"verzí WeeChat v řetězci)"
 
 msgid ""
 "notify list for server (you should not change this option but use /notify "
@@ -11346,3 +11351,17 @@ msgstr "%s%s: vypršel časový limit \"%s\" pro %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nemohu se připojit\" neočekávaná chyba (%d)"
+
+#~ msgid ""
+#~ "default part message (leaving channel) (\"%v\" will be replaced by "
+#~ "WeeChat version in string)"
+#~ msgstr ""
+#~ "výchozí zpráva při odchodu z kanálu (\"%v\" bude nahrazeno verzí WeeChat "
+#~ "v řetězci)"
+
+#~ msgid ""
+#~ "default quit message (disconnecting from server) (\"%v\" will be replaced "
+#~ "by WeeChat version in string)"
+#~ msgstr ""
+#~ "výchozí zpráva při uknočnení (odpojení od serveru) (\"%v\" bude nahrazeno "
+#~ "verzí WeeChat v řetězci)"
diff --git a/po/de.po b/po/de.po
index 6eb3bb8d0..cfa15b140 100644
--- a/po/de.po
+++ b/po/de.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-06-22 10:25+0200\n"
+"POT-Creation-Date: 2016-07-16 09:54+0200\n"
 "PO-Revision-Date: 2016-07-09 12:31+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <>\n"
@@ -8251,26 +8251,34 @@ msgstr ""
 "der Nutzer höher ist, als der angegebene Wert (0 = unbegrenzte Anzahl an "
 "Nutzern im Channel)"
 
+#, fuzzy
 msgid ""
-"default kick message used by commands \"/kick\" and \"/kickban\" (special "
-"variables $nick, $channel and $server are replaced by their value)"
+"default kick message used by commands \"/kick\" and \"/kickban\" (note: "
+"content is evaluated, see /help eval; special variables ${nick}, ${channel} "
+"and ${server} are replaced by their value)"
 msgstr ""
 "Standardmitteilung einer kick-Nachricht, für die Befehle \"/kick\" und \"/"
 "kickban\" (Variablen die genutzt werden können: $nick, $channel und $server)"
 
+#, fuzzy
 msgid ""
-"default part message (leaving channel) (\"%v\" will be replaced by WeeChat "
-"version in string)"
+"default part message (leaving channel) (note: content is evaluated, see /"
+"help eval; special variables ${nick}, ${channel} and ${server} are replaced "
+"by their value; \"%v\" is replaced by WeeChat version if there is no ${...} "
+"in string)"
 msgstr ""
-"Standardmitteilung beim Verlassen eines Channels (\"%v\": wird durch die "
-"WeeChat-Version ersetzt)"
+"Standardmitteilung einer kick-Nachricht, für die Befehle \"/kick\" und \"/"
+"kickban\" (Variablen die genutzt werden können: $nick, $channel und $server)"
 
+#, fuzzy
 msgid ""
-"default quit message (disconnecting from server) (\"%v\" will be replaced by "
-"WeeChat version in string)"
+"default quit message (disconnecting from server) (note: content is "
+"evaluated, see /help eval; special variables ${nick}, ${channel} and "
+"${server} are replaced by their value; \"%v\" is replaced by WeeChat version "
+"if there is no ${...} in string)"
 msgstr ""
-"Standardmitteilung beim Beenden (Verbindung zum Server trennen) (\"%v\": "
-"wird durch die WeeChat-Version ersetzt)"
+"Standardmitteilung einer kick-Nachricht, für die Befehle \"/kick\" und \"/"
+"kickban\" (Variablen die genutzt werden können: $nick, $channel und $server)"
 
 msgid ""
 "notify list for server (you should not change this option but use /notify "
@@ -12901,3 +12909,17 @@ msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr ""
 "%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)"
+
+#~ msgid ""
+#~ "default part message (leaving channel) (\"%v\" will be replaced by "
+#~ "WeeChat version in string)"
+#~ msgstr ""
+#~ "Standardmitteilung beim Verlassen eines Channels (\"%v\": wird durch die "
+#~ "WeeChat-Version ersetzt)"
+
+#~ msgid ""
+#~ "default quit message (disconnecting from server) (\"%v\" will be replaced "
+#~ "by WeeChat version in string)"
+#~ msgstr ""
+#~ "Standardmitteilung beim Beenden (Verbindung zum Server trennen) (\"%v\": "
+#~ "wird durch die WeeChat-Version ersetzt)"
diff --git a/po/es.po b/po/es.po
index 3d0ec5872..d58cfa6ca 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-06-22 10:25+0200\n"
+"POT-Creation-Date: 2016-07-16 09:54+0200\n"
 "PO-Revision-Date: 2016-05-18 07:42+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7383,24 +7383,29 @@ msgstr ""
 "no comprobar la ausencia de los usuarios en canales con un número de apodos "
 "alto (0 = ilimitado)"
 
+#, fuzzy
 msgid ""
-"default kick message used by commands \"/kick\" and \"/kickban\" (special "
-"variables $nick, $channel and $server are replaced by their value)"
+"default kick message used by commands \"/kick\" and \"/kickban\" (note: "
+"content is evaluated, see /help eval; special variables ${nick}, ${channel} "
+"and ${server} are replaced by their value)"
 msgstr ""
+"canal: canal donde está el usuario\n"
+"apodo: usuario a expulsar\n"
+"razón: razón de la expulsión"
 
 msgid ""
-"default part message (leaving channel) (\"%v\" will be replaced by WeeChat "
-"version in string)"
+"default part message (leaving channel) (note: content is evaluated, see /"
+"help eval; special variables ${nick}, ${channel} and ${server} are replaced "
+"by their value; \"%v\" is replaced by WeeChat version if there is no ${...} "
+"in string)"
 msgstr ""
-"mensaje de abandono por defecto (cuando se abandona un canal) (\"%v\" será "
-"reemplazado por la versión de WeeChat)"
 
 msgid ""
-"default quit message (disconnecting from server) (\"%v\" will be replaced by "
-"WeeChat version in string)"
+"default quit message (disconnecting from server) (note: content is "
+"evaluated, see /help eval; special variables ${nick}, ${channel} and "
+"${server} are replaced by their value; \"%v\" is replaced by WeeChat version "
+"if there is no ${...} in string)"
 msgstr ""
-"mensaje de salida por defecto (cuando se desconecta del servidor) (\"%v\" "
-"será reemplazado por la versión de WeeChat)"
 
 msgid ""
 "notify list for server (you should not change this option but use /notify "
@@ -11606,3 +11611,17 @@ msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: no es posible conectarse al transmisor"
+
+#~ msgid ""
+#~ "default part message (leaving channel) (\"%v\" will be replaced by "
+#~ "WeeChat version in string)"
+#~ msgstr ""
+#~ "mensaje de abandono por defecto (cuando se abandona un canal) (\"%v\" "
+#~ "será reemplazado por la versión de WeeChat)"
+
+#~ msgid ""
+#~ "default quit message (disconnecting from server) (\"%v\" will be replaced "
+#~ "by WeeChat version in string)"
+#~ msgstr ""
+#~ "mensaje de salida por defecto (cuando se desconecta del servidor) (\"%v\" "
+#~ "será reemplazado por la versión de WeeChat)"
diff --git a/po/fr.po b/po/fr.po
index 6421f4420..8c5a61e92 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-06-22 10:25+0200\n"
-"PO-Revision-Date: 2016-07-09 12:30+0200\n"
+"POT-Creation-Date: 2016-07-16 09:54+0200\n"
+"PO-Revision-Date: 2016-07-16 09:58+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -8067,26 +8067,35 @@ msgstr ""
 "pseudos (0 = pas de limite)"
 
 msgid ""
-"default kick message used by commands \"/kick\" and \"/kickban\" (special "
-"variables $nick, $channel and $server are replaced by their value)"
+"default kick message used by commands \"/kick\" and \"/kickban\" (note: "
+"content is evaluated, see /help eval; special variables ${nick}, ${channel} "
+"and ${server} are replaced by their value)"
 msgstr ""
 "message par défaut pour l'éjection utilisé par les commandes \"/kick\" et \"/"
-"kickban\" (les variables spéciales $nick, $channel et $server sont "
-"remplacées par leur valeur)"
+"kickban\" (note : le contenu est évalué, voir /help eval ; les variables "
+"spéciales ${nick}, ${channel} et ${server} sont remplacées par leur valeur)"
 
 msgid ""
-"default part message (leaving channel) (\"%v\" will be replaced by WeeChat "
-"version in string)"
+"default part message (leaving channel) (note: content is evaluated, see /"
+"help eval; special variables ${nick}, ${channel} and ${server} are replaced "
+"by their value; \"%v\" is replaced by WeeChat version if there is no ${...} "
+"in string)"
 msgstr ""
-"message par défaut pour le part (en quittant un canal) (\"%v\" sera remplacé "
-"par la version de WeeChat dans la chaîne)"
+"message par défaut pour le part (en quittant un canal) (note : le contenu "
+"est évalué, voir /help eval ; les variables spéciales ${nick}, ${channel} et "
+"${server} sont remplacées par leur valeur ; \"%v\" est remplacé par la "
+"version de WeeChat s'il n'y a pas de ${...} dans la chaîne)"
 
 msgid ""
-"default quit message (disconnecting from server) (\"%v\" will be replaced by "
-"WeeChat version in string)"
+"default quit message (disconnecting from server) (note: content is "
+"evaluated, see /help eval; special variables ${nick}, ${channel} and "
+"${server} are replaced by their value; \"%v\" is replaced by WeeChat version "
+"if there is no ${...} in string)"
 msgstr ""
-"message de fin par défaut (lors de la déconnexion du serveur) (\"%v\" sera "
-"remplacé par la version de WeeChat dans la chaîne)"
+"message de fin par défaut (lors de la déconnexion du serveur) (note : le "
+"contenu est évalué, voir /help eval ; les variables spéciales ${nick}, "
+"${channel} et ${server} sont remplacées par leur valeur ; \"%v\" est "
+"remplacé par la version de WeeChat s'il n'y a pas de ${...} dans la chaîne)"
 
 msgid ""
 "notify list for server (you should not change this option but use /notify "
@@ -12634,3 +12643,17 @@ msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)"
+
+#~ msgid ""
+#~ "default part message (leaving channel) (\"%v\" will be replaced by "
+#~ "WeeChat version in string)"
+#~ msgstr ""
+#~ "message par défaut pour le part (en quittant un canal) (\"%v\" sera "
+#~ "remplacé par la version de WeeChat dans la chaîne)"
+
+#~ msgid ""
+#~ "default quit message (disconnecting from server) (\"%v\" will be replaced "
+#~ "by WeeChat version in string)"
+#~ msgstr ""
+#~ "message de fin par défaut (lors de la déconnexion du serveur) (\"%v\" "
+#~ "sera remplacé par la version de WeeChat dans la chaîne)"
diff --git a/po/hu.po b/po/hu.po
index 3901a5a4c..4b0d59191 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-06-22 10:25+0200\n"
+"POT-Creation-Date: 2016-07-16 09:54+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6578,26 +6578,29 @@ msgid ""
 msgstr ""
 "nem ellenőrzi a távollétet nagy létszámú szobák esetében (0 = korlátlan)"
 
+#, fuzzy
 msgid ""
-"default kick message used by commands \"/kick\" and \"/kickban\" (special "
-"variables $nick, $channel and $server are replaced by their value)"
+"default kick message used by commands \"/kick\" and \"/kickban\" (note: "
+"content is evaluated, see /help eval; special variables ${nick}, ${channel} "
+"and ${server} are replaced by their value)"
 msgstr ""
+"     szoba: a szoba, ahol a felhasználó tartózkodik\n"
+"       név: a kirúgandó neve\n"
+"megjegyzés: megjegyzés a kirúgáshoz"
 
-#, fuzzy
 msgid ""
-"default part message (leaving channel) (\"%v\" will be replaced by WeeChat "
-"version in string)"
+"default part message (leaving channel) (note: content is evaluated, see /"
+"help eval; special variables ${nick}, ${channel} and ${server} are replaced "
+"by their value; \"%v\" is replaced by WeeChat version if there is no ${...} "
+"in string)"
 msgstr ""
-"alapértelmezett távozó üzenet (szoba elhagyásakor) (a '%v' változó a WeeChat "
-"verziójára cserélődik)"
 
-#, fuzzy
 msgid ""
-"default quit message (disconnecting from server) (\"%v\" will be replaced by "
-"WeeChat version in string)"
+"default quit message (disconnecting from server) (note: content is "
+"evaluated, see /help eval; special variables ${nick}, ${channel} and "
+"${server} are replaced by their value; \"%v\" is replaced by WeeChat version "
+"if there is no ${...} in string)"
 msgstr ""
-"alapértelmezett kilépő üzenet (a '%v' változó a WeeChat verziójára "
-"cserélődik)"
 
 msgid ""
 "notify list for server (you should not change this option but use /notify "
@@ -10649,3 +10652,19 @@ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "default part message (leaving channel) (\"%v\" will be replaced by "
+#~ "WeeChat version in string)"
+#~ msgstr ""
+#~ "alapértelmezett távozó üzenet (szoba elhagyásakor) (a '%v' változó a "
+#~ "WeeChat verziójára cserélődik)"
+
+#, fuzzy
+#~ msgid ""
+#~ "default quit message (disconnecting from server) (\"%v\" will be replaced "
+#~ "by WeeChat version in string)"
+#~ msgstr ""
+#~ "alapértelmezett kilépő üzenet (a '%v' változó a WeeChat verziójára "
+#~ "cserélődik)"
diff --git a/po/it.po b/po/it.po
index 44a743fe1..41f900f72 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-06-22 10:25+0200\n"
+"POT-Creation-Date: 2016-07-16 09:54+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7534,24 +7534,29 @@ msgstr ""
 "non verificare l'assenza su canali con un elevato numero di nick (0 = "
 "illimitato)"
 
+#, fuzzy
 msgid ""
-"default kick message used by commands \"/kick\" and \"/kickban\" (special "
-"variables $nick, $channel and $server are replaced by their value)"
+"default kick message used by commands \"/kick\" and \"/kickban\" (note: "
+"content is evaluated, see /help eval; special variables ${nick}, ${channel} "
+"and ${server} are replaced by their value)"
 msgstr ""
+"canale: canale dove si trova l'utente\n"
+"  nick: nick da cacciare\n"
+"motivo: motivo per il kick"
 
 msgid ""
-"default part message (leaving channel) (\"%v\" will be replaced by WeeChat "
-"version in string)"
+"default part message (leaving channel) (note: content is evaluated, see /"
+"help eval; special variables ${nick}, ${channel} and ${server} are replaced "
+"by their value; \"%v\" is replaced by WeeChat version if there is no ${...} "
+"in string)"
 msgstr ""
-"messaggio di uscita predefinito (in uscita dal canale) (\"%v\" verrà "
-"sostituito dalla versione di WeeChat)"
 
 msgid ""
-"default quit message (disconnecting from server) (\"%v\" will be replaced by "
-"WeeChat version in string)"
+"default quit message (disconnecting from server) (note: content is "
+"evaluated, see /help eval; special variables ${nick}, ${channel} and "
+"${server} are replaced by their value; \"%v\" is replaced by WeeChat version "
+"if there is no ${...} in string)"
 msgstr ""
-"messaggio di abbandono predefinito (disconnessione dal server) (\"%v\" verrà "
-"sostituito dalla versione di WeeChat)"
 
 msgid ""
 "notify list for server (you should not change this option but use /notify "
@@ -11793,3 +11798,17 @@ msgstr "%s%s: timeout per \"%s\" con %s"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: impossibile connettersi al mittente"
+
+#~ msgid ""
+#~ "default part message (leaving channel) (\"%v\" will be replaced by "
+#~ "WeeChat version in string)"
+#~ msgstr ""
+#~ "messaggio di uscita predefinito (in uscita dal canale) (\"%v\" verrà "
+#~ "sostituito dalla versione di WeeChat)"
+
+#~ msgid ""
+#~ "default quit message (disconnecting from server) (\"%v\" will be replaced "
+#~ "by WeeChat version in string)"
+#~ msgstr ""
+#~ "messaggio di abbandono predefinito (disconnessione dal server) (\"%v\" "
+#~ "verrà sostituito dalla versione di WeeChat)"
diff --git a/po/ja.po b/po/ja.po
index 281485007..1f166335b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-06-22 10:25+0200\n"
+"POT-Creation-Date: 2016-07-16 09:54+0200\n"
 "PO-Revision-Date: 2016-07-09 12:32+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/translation/ja>\n"
@@ -7734,26 +7734,34 @@ msgstr ""
 "大きなニックネーム番号を持つニックネームに対しては、away 確認を行わない (0 = "
 "制限無し)"
 
+#, fuzzy
 msgid ""
-"default kick message used by commands \"/kick\" and \"/kickban\" (special "
-"variables $nick, $channel and $server are replaced by their value)"
+"default kick message used by commands \"/kick\" and \"/kickban\" (note: "
+"content is evaluated, see /help eval; special variables ${nick}, ${channel} "
+"and ${server} are replaced by their value)"
 msgstr ""
 "\"/kick\" と \"/kickban\" コマンドが使うデフォルトのキックメッセージ (特殊変"
 "数 $nick、$channel、$server はそれぞれの値に置換されます)"
 
+#, fuzzy
 msgid ""
-"default part message (leaving channel) (\"%v\" will be replaced by WeeChat "
-"version in string)"
+"default part message (leaving channel) (note: content is evaluated, see /"
+"help eval; special variables ${nick}, ${channel} and ${server} are replaced "
+"by their value; \"%v\" is replaced by WeeChat version if there is no ${...} "
+"in string)"
 msgstr ""
-"デフォルトの退出メッセージ (チャンネルから出る際の) (\"%v\" は WeeChat バー"
-"ジョンで置換)"
+"\"/kick\" と \"/kickban\" コマンドが使うデフォルトのキックメッセージ (特殊変"
+"数 $nick、$channel、$server はそれぞれの値に置換されます)"
 
+#, fuzzy
 msgid ""
-"default quit message (disconnecting from server) (\"%v\" will be replaced by "
-"WeeChat version in string)"
+"default quit message (disconnecting from server) (note: content is "
+"evaluated, see /help eval; special variables ${nick}, ${channel} and "
+"${server} are replaced by their value; \"%v\" is replaced by WeeChat version "
+"if there is no ${...} in string)"
 msgstr ""
-"デフォルトの終了メッセージ (サーバとの接続を切る際の) (\"%v\" は WeeChat バー"
-"ジョンで置換)"
+"\"/kick\" と \"/kickban\" コマンドが使うデフォルトのキックメッセージ (特殊変"
+"数 $nick、$channel、$server はそれぞれの値に置換されます)"
 
 msgid ""
 "notify list for server (you should not change this option but use /notify "
@@ -12145,3 +12153,17 @@ msgstr "%s%s: \"%s\" のタイムアウト %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: 接続できません: 未定義のエラー (%d)"
+
+#~ msgid ""
+#~ "default part message (leaving channel) (\"%v\" will be replaced by "
+#~ "WeeChat version in string)"
+#~ msgstr ""
+#~ "デフォルトの退出メッセージ (チャンネルから出る際の) (\"%v\" は WeeChat "
+#~ "バージョンで置換)"
+
+#~ msgid ""
+#~ "default quit message (disconnecting from server) (\"%v\" will be replaced "
+#~ "by WeeChat version in string)"
+#~ msgstr ""
+#~ "デフォルトの終了メッセージ (サーバとの接続を切る際の) (\"%v\" は WeeChat "
+#~ "バージョンで置換)"
diff --git a/po/pl.po b/po/pl.po
index 8ce806430..e9a8b0375 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-06-22 10:25+0200\n"
+"POT-Creation-Date: 2016-07-16 09:54+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys1@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7910,27 +7910,37 @@ msgstr ""
 "nie sprawdzaj nieobecności osób na kanałach z dużą ilością użytkowników (0 = "
 "nieograniczone)"
 
+#, fuzzy
 msgid ""
-"default kick message used by commands \"/kick\" and \"/kickban\" (special "
-"variables $nick, $channel and $server are replaced by their value)"
+"default kick message used by commands \"/kick\" and \"/kickban\" (note: "
+"content is evaluated, see /help eval; special variables ${nick}, ${channel} "
+"and ${server} are replaced by their value)"
 msgstr ""
 "domyślna wiadomość dla wykopania z kanału używana przez komendy \"/kick\" i "
 "\"/kickban\" (specjalne zmienne jak $nick, $channel i $server są zamieniane "
 "na odpowiednie wartości)"
 
+#, fuzzy
 msgid ""
-"default part message (leaving channel) (\"%v\" will be replaced by WeeChat "
-"version in string)"
+"default part message (leaving channel) (note: content is evaluated, see /"
+"help eval; special variables ${nick}, ${channel} and ${server} are replaced "
+"by their value; \"%v\" is replaced by WeeChat version if there is no ${...} "
+"in string)"
 msgstr ""
-"domyślna wiadomość opuszczenia kanału (\"%v\" zostanie zastąpione wersja "
-"WeeChat)"
+"domyślna wiadomość dla wykopania z kanału używana przez komendy \"/kick\" i "
+"\"/kickban\" (specjalne zmienne jak $nick, $channel i $server są zamieniane "
+"na odpowiednie wartości)"
 
+#, fuzzy
 msgid ""
-"default quit message (disconnecting from server) (\"%v\" will be replaced by "
-"WeeChat version in string)"
+"default quit message (disconnecting from server) (note: content is "
+"evaluated, see /help eval; special variables ${nick}, ${channel} and "
+"${server} are replaced by their value; \"%v\" is replaced by WeeChat version "
+"if there is no ${...} in string)"
 msgstr ""
-"domyślna wiadomość wyjścia z IRC (rozłączenia z serwerem) (\"%v\" zostanie "
-"zastąpione wersją WeeChat)"
+"domyślna wiadomość dla wykopania z kanału używana przez komendy \"/kick\" i "
+"\"/kickban\" (specjalne zmienne jak $nick, $channel i $server są zamieniane "
+"na odpowiednie wartości)"
 
 msgid ""
 "notify list for server (you should not change this option but use /notify "
@@ -12380,3 +12390,17 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)"
+
+#~ msgid ""
+#~ "default part message (leaving channel) (\"%v\" will be replaced by "
+#~ "WeeChat version in string)"
+#~ msgstr ""
+#~ "domyślna wiadomość opuszczenia kanału (\"%v\" zostanie zastąpione wersja "
+#~ "WeeChat)"
+
+#~ msgid ""
+#~ "default quit message (disconnecting from server) (\"%v\" will be replaced "
+#~ "by WeeChat version in string)"
+#~ msgstr ""
+#~ "domyślna wiadomość wyjścia z IRC (rozłączenia z serwerem) (\"%v\" "
+#~ "zostanie zastąpione wersją WeeChat)"
diff --git a/po/pt.po b/po/pt.po
index 70c325b0a..27278b109 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-06-22 10:25+0200\n"
+"POT-Creation-Date: 2016-07-16 09:54+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -7910,27 +7910,37 @@ msgstr ""
 "não verificar nicks ausentes em canais com elevado número de nicks (0 = "
 "ilimitado)"
 
+#, fuzzy
 msgid ""
-"default kick message used by commands \"/kick\" and \"/kickban\" (special "
-"variables $nick, $channel and $server are replaced by their value)"
+"default kick message used by commands \"/kick\" and \"/kickban\" (note: "
+"content is evaluated, see /help eval; special variables ${nick}, ${channel} "
+"and ${server} are replaced by their value)"
 msgstr ""
 "mensagem de expulsão predefinida usada pelos comandos \"/kick\" e \"/kickban"
 "\" (as variáveis especiais $nick, $channel e $server são substituídas pelos "
 "respetivos valores)"
 
+#, fuzzy
 msgid ""
-"default part message (leaving channel) (\"%v\" will be replaced by WeeChat "
-"version in string)"
+"default part message (leaving channel) (note: content is evaluated, see /"
+"help eval; special variables ${nick}, ${channel} and ${server} are replaced "
+"by their value; \"%v\" is replaced by WeeChat version if there is no ${...} "
+"in string)"
 msgstr ""
-"mensagem de saída predefinida (ao sair do canal) (\"%v\" é substituído pela "
-"versão do WeeChat na cadeia)"
+"mensagem de expulsão predefinida usada pelos comandos \"/kick\" e \"/kickban"
+"\" (as variáveis especiais $nick, $channel e $server são substituídas pelos "
+"respetivos valores)"
 
+#, fuzzy
 msgid ""
-"default quit message (disconnecting from server) (\"%v\" will be replaced by "
-"WeeChat version in string)"
+"default quit message (disconnecting from server) (note: content is "
+"evaluated, see /help eval; special variables ${nick}, ${channel} and "
+"${server} are replaced by their value; \"%v\" is replaced by WeeChat version "
+"if there is no ${...} in string)"
 msgstr ""
-"mensagem de saída predefinida (ao desconectar-se do servidor) (\"%v\" é "
-"substituído pela versão do WeeChat na cadeia)"
+"mensagem de expulsão predefinida usada pelos comandos \"/kick\" e \"/kickban"
+"\" (as variáveis especiais $nick, $channel e $server são substituídas pelos "
+"respetivos valores)"
 
 msgid ""
 "notify list for server (you should not change this option but use /notify "
@@ -12391,3 +12401,17 @@ msgstr "%s%s: tempo limite de \"%s\" com %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: não foi possível conectar: erro inesperado (%d)"
+
+#~ msgid ""
+#~ "default part message (leaving channel) (\"%v\" will be replaced by "
+#~ "WeeChat version in string)"
+#~ msgstr ""
+#~ "mensagem de saída predefinida (ao sair do canal) (\"%v\" é substituído "
+#~ "pela versão do WeeChat na cadeia)"
+
+#~ msgid ""
+#~ "default quit message (disconnecting from server) (\"%v\" will be replaced "
+#~ "by WeeChat version in string)"
+#~ msgstr ""
+#~ "mensagem de saída predefinida (ao desconectar-se do servidor) (\"%v\" é "
+#~ "substituído pela versão do WeeChat na cadeia)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b75fe7033..e92ab98a2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-06-22 10:25+0200\n"
+"POT-Creation-Date: 2016-07-16 09:54+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6996,23 +6996,24 @@ msgstr ""
 "= ilimitado)"
 
 msgid ""
-"default kick message used by commands \"/kick\" and \"/kickban\" (special "
-"variables $nick, $channel and $server are replaced by their value)"
+"default kick message used by commands \"/kick\" and \"/kickban\" (note: "
+"content is evaluated, see /help eval; special variables ${nick}, ${channel} "
+"and ${server} are replaced by their value)"
 msgstr ""
 
 msgid ""
-"default part message (leaving channel) (\"%v\" will be replaced by WeeChat "
-"version in string)"
+"default part message (leaving channel) (note: content is evaluated, see /"
+"help eval; special variables ${nick}, ${channel} and ${server} are replaced "
+"by their value; \"%v\" is replaced by WeeChat version if there is no ${...} "
+"in string)"
 msgstr ""
-"mensagem padrão de partida (deixando canal) (\"%v\" será substituído pela "
-"string de versão do WeeChat)"
 
 msgid ""
-"default quit message (disconnecting from server) (\"%v\" will be replaced by "
-"WeeChat version in string)"
+"default quit message (disconnecting from server) (note: content is "
+"evaluated, see /help eval; special variables ${nick}, ${channel} and "
+"${server} are replaced by their value; \"%v\" is replaced by WeeChat version "
+"if there is no ${...} in string)"
 msgstr ""
-"mensagem padrão de saída (desconectando do servidor) (\"%v\" será "
-"substituído pela string de versão do WeeChat)"
 
 msgid ""
 "notify list for server (you should not change this option but use /notify "
@@ -11090,3 +11091,17 @@ msgstr "%s%s: tempo esgotado para \"%s\" com %s"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: não foi possível conectar ao remetente"
+
+#~ msgid ""
+#~ "default part message (leaving channel) (\"%v\" will be replaced by "
+#~ "WeeChat version in string)"
+#~ msgstr ""
+#~ "mensagem padrão de partida (deixando canal) (\"%v\" será substituído pela "
+#~ "string de versão do WeeChat)"
+
+#~ msgid ""
+#~ "default quit message (disconnecting from server) (\"%v\" will be replaced "
+#~ "by WeeChat version in string)"
+#~ msgstr ""
+#~ "mensagem padrão de saída (desconectando do servidor) (\"%v\" será "
+#~ "substituído pela string de versão do WeeChat)"
diff --git a/po/ru.po b/po/ru.po
index deb4076e6..002f835e2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-06-22 10:25+0200\n"
+"POT-Creation-Date: 2016-07-16 09:54+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6610,22 +6610,29 @@ msgstr ""
 "не проверять отсутствие на каналах с большим количеством ников (0=не "
 "ограничено)"
 
+#, fuzzy
 msgid ""
-"default kick message used by commands \"/kick\" and \"/kickban\" (special "
-"variables $nick, $channel and $server are replaced by their value)"
+"default kick message used by commands \"/kick\" and \"/kickban\" (note: "
+"content is evaluated, see /help eval; special variables ${nick}, ${channel} "
+"and ${server} are replaced by their value)"
 msgstr ""
+"      канал: канал, на котором присутствует пользователь\n"
+"        ник: цель для кика\n"
+"комментарий: причина кика"
 
-#, fuzzy
 msgid ""
-"default part message (leaving channel) (\"%v\" will be replaced by WeeChat "
-"version in string)"
-msgstr "сообщение покидания канала ('%v' будет заменён на версию WeeChat)"
+"default part message (leaving channel) (note: content is evaluated, see /"
+"help eval; special variables ${nick}, ${channel} and ${server} are replaced "
+"by their value; \"%v\" is replaced by WeeChat version if there is no ${...} "
+"in string)"
+msgstr ""
 
-#, fuzzy
 msgid ""
-"default quit message (disconnecting from server) (\"%v\" will be replaced by "
-"WeeChat version in string)"
-msgstr "сообщение о выходе по-умолчанию ('%v' будет заменён на версию WeeChat)"
+"default quit message (disconnecting from server) (note: content is "
+"evaluated, see /help eval; special variables ${nick}, ${channel} and "
+"${server} are replaced by their value; \"%v\" is replaced by WeeChat version "
+"if there is no ${...} in string)"
+msgstr ""
 
 msgid ""
 "notify list for server (you should not change this option but use /notify "
@@ -10677,3 +10684,16 @@ msgstr "%s нет аргумента для параметра \"%s\"\n"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: не могу соединиться с отправителем\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "default part message (leaving channel) (\"%v\" will be replaced by "
+#~ "WeeChat version in string)"
+#~ msgstr "сообщение покидания канала ('%v' будет заменён на версию WeeChat)"
+
+#, fuzzy
+#~ msgid ""
+#~ "default quit message (disconnecting from server) (\"%v\" will be replaced "
+#~ "by WeeChat version in string)"
+#~ msgstr ""
+#~ "сообщение о выходе по-умолчанию ('%v' будет заменён на версию WeeChat)"
diff --git a/po/tr.po b/po/tr.po
index 203cbc6e2..2fe30de4c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-06-22 10:25+0200\n"
+"POT-Creation-Date: 2016-07-16 09:54+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5914,18 +5914,23 @@ msgid ""
 msgstr ""
 
 msgid ""
-"default kick message used by commands \"/kick\" and \"/kickban\" (special "
-"variables $nick, $channel and $server are replaced by their value)"
+"default kick message used by commands \"/kick\" and \"/kickban\" (note: "
+"content is evaluated, see /help eval; special variables ${nick}, ${channel} "
+"and ${server} are replaced by their value)"
 msgstr ""
 
 msgid ""
-"default part message (leaving channel) (\"%v\" will be replaced by WeeChat "
-"version in string)"
+"default part message (leaving channel) (note: content is evaluated, see /"
+"help eval; special variables ${nick}, ${channel} and ${server} are replaced "
+"by their value; \"%v\" is replaced by WeeChat version if there is no ${...} "
+"in string)"
 msgstr ""
 
 msgid ""
-"default quit message (disconnecting from server) (\"%v\" will be replaced by "
-"WeeChat version in string)"
+"default quit message (disconnecting from server) (note: content is "
+"evaluated, see /help eval; special variables ${nick}, ${channel} and "
+"${server} are replaced by their value; \"%v\" is replaced by WeeChat version "
+"if there is no ${...} in string)"
 msgstr ""
 
 msgid ""
diff --git a/po/weechat.pot b/po/weechat.pot
index 2e56b4db9..11bb1991f 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-06-22 10:25+0200\n"
+"POT-Creation-Date: 2016-07-16 09:54+0200\n"
 "PO-Revision-Date: 2014-08-16 10:27+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5836,18 +5836,23 @@ msgid ""
 msgstr ""
 
 msgid ""
-"default kick message used by commands \"/kick\" and \"/kickban\" (special "
-"variables $nick, $channel and $server are replaced by their value)"
+"default kick message used by commands \"/kick\" and \"/kickban\" (note: "
+"content is evaluated, see /help eval; special variables ${nick}, ${channel} "
+"and ${server} are replaced by their value)"
 msgstr ""
 
 msgid ""
-"default part message (leaving channel) (\"%v\" will be replaced by WeeChat "
-"version in string)"
+"default part message (leaving channel) (note: content is evaluated, see /"
+"help eval; special variables ${nick}, ${channel} and ${server} are replaced "
+"by their value; \"%v\" is replaced by WeeChat version if there is no ${...} "
+"in string)"
 msgstr ""
 
 msgid ""
-"default quit message (disconnecting from server) (\"%v\" will be replaced by "
-"WeeChat version in string)"
+"default quit message (disconnecting from server) (note: content is "
+"evaluated, see /help eval; special variables ${nick}, ${channel} and "
+"${server} are replaced by their value; \"%v\" is replaced by WeeChat version "
+"if there is no ${...} in string)"
 msgstr ""
 
 msgid ""
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 238914c73..41ce07719 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -1469,8 +1469,8 @@ IRC_COMMAND_CALLBACK(ctcp)
 
 IRC_COMMAND_CALLBACK(cycle)
 {
-    char *channel_name, *pos_args, *buf;
-    const char *version, *ptr_arg, *msg_part;
+    char *channel_name, *pos_args, *msg;
+    const char *ptr_arg;
     char **channels;
     int i, num_channels;
 
@@ -1545,24 +1545,24 @@ IRC_COMMAND_CALLBACK(cycle)
         ptr_channel->cycle = 1;
     }
 
-    msg_part = IRC_SERVER_OPTION_STRING(ptr_server,
-                                        IRC_SERVER_OPTION_DEFAULT_MSG_PART);
-    ptr_arg = (pos_args) ? pos_args :
-        ((msg_part && msg_part[0]) ? msg_part : NULL);
-
-    if (ptr_arg)
+    msg = NULL;
+    ptr_arg = (pos_args) ?
+        pos_args : IRC_SERVER_OPTION_STRING(ptr_server,
+                                            IRC_SERVER_OPTION_MSG_PART);
+    if (ptr_arg && ptr_arg[0])
     {
-        version = weechat_info_get ("version", "");
-        buf = weechat_string_replace (ptr_arg, "%v", (version) ? version : "");
+        msg = irc_server_get_default_msg (ptr_arg, ptr_server, channel_name);
         irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
-                          "PART %s :%s", channel_name,
-                          (buf) ? buf : ptr_arg);
-        if (buf)
-            free (buf);
+                          "PART %s :%s", channel_name, msg);
     }
     else
+    {
         irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
                           "PART %s", channel_name);
+    }
+
+    if (msg)
+        free (msg);
 
     return WEECHAT_RC_OK;
 }
@@ -1817,29 +1817,28 @@ IRC_COMMAND_CALLBACK(die)
 void
 irc_command_quit_server (struct t_irc_server *server, const char *arguments)
 {
-    const char *ptr_arg, *version, *msg_quit;
-    char *buf;
+    const char *ptr_arg;
+    char *msg;
 
     if (!server || !server->is_connected)
         return;
 
-    msg_quit = IRC_SERVER_OPTION_STRING(server,
-                                        IRC_SERVER_OPTION_DEFAULT_MSG_QUIT);
-    ptr_arg = (arguments) ? arguments :
-        ((msg_quit && msg_quit[0]) ? msg_quit : NULL);
-
-    if (ptr_arg)
+    msg = NULL;
+    ptr_arg = (arguments) ?
+        arguments : IRC_SERVER_OPTION_STRING(server,
+                                             IRC_SERVER_OPTION_MSG_QUIT);
+    if (ptr_arg && ptr_arg[0])
     {
-        version = weechat_info_get ("version", "");
-        buf = weechat_string_replace (ptr_arg, "%v",
-                                      (version) ? version : "");
-        irc_server_sendf (server, 0, NULL, "QUIT :%s",
-                          (buf) ? buf : ptr_arg);
-        if (buf)
-            free (buf);
+        msg = irc_server_get_default_msg (ptr_arg, server, NULL);
+        irc_server_sendf (server, 0, NULL, "QUIT :%s", msg);
     }
     else
+    {
         irc_server_sendf (server, 0, NULL, "QUIT");
+    }
+
+    if (msg)
+        free (msg);
 }
 
 /*
@@ -2539,23 +2538,19 @@ irc_command_kick_channel (struct t_irc_server *server,
                           const char *channel_name, const char *nick_name,
                           const char *message)
 {
-    const char *msg_kick;
-    char *msg_vars_replaced;
+    const char *ptr_msg;
+    char *msg;
 
-    msg_kick = (message && message[0]) ?
+    msg = NULL;
+    ptr_msg = (message && message[0]) ?
         message : IRC_SERVER_OPTION_STRING(server,
-                                           IRC_SERVER_OPTION_DEFAULT_MSG_KICK);
-    if (msg_kick && msg_kick[0])
+                                           IRC_SERVER_OPTION_MSG_KICK);
+    if (ptr_msg && ptr_msg[0])
     {
-        msg_vars_replaced = irc_message_replace_vars (server,
-                                                      channel_name,
-                                                      msg_kick);
+        msg = irc_server_get_default_msg (ptr_msg, server, channel_name);
         irc_server_sendf (server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
                           "KICK %s %s :%s",
-                          channel_name, nick_name,
-                          (msg_vars_replaced) ? msg_vars_replaced : msg_kick);
-        if (msg_vars_replaced)
-            free (msg_vars_replaced);
+                          channel_name, nick_name, msg);
     }
     else
     {
@@ -2563,6 +2558,9 @@ irc_command_kick_channel (struct t_irc_server *server,
                           "KICK %s %s",
                           channel_name, nick_name);
     }
+
+    if (msg)
+        free (msg);
 }
 
 /*
@@ -3715,30 +3713,27 @@ void
 irc_command_part_channel (struct t_irc_server *server, const char *channel_name,
                           const char *part_message)
 {
-    const char *ptr_arg, *version, *msg_part;
-    char *buf;
-
-    msg_part = IRC_SERVER_OPTION_STRING(server,
-                                        IRC_SERVER_OPTION_DEFAULT_MSG_PART);
-    ptr_arg = (part_message) ? part_message :
-        ((msg_part && msg_part[0]) ? msg_part : NULL);
+    const char *ptr_arg;
+    char *msg;
 
-    if (ptr_arg)
+    msg = NULL;
+    ptr_arg = (part_message) ?
+        part_message : IRC_SERVER_OPTION_STRING(server,
+                                                IRC_SERVER_OPTION_MSG_PART);
+    if (ptr_arg && ptr_arg[0])
     {
-        version = weechat_info_get ("version", "");
-        buf = weechat_string_replace (ptr_arg, "%v", (version) ? version : "");
+        msg = irc_server_get_default_msg (ptr_arg, server, channel_name);
         irc_server_sendf (server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
-                          "PART %s :%s",
-                          channel_name,
-                          (buf) ? buf : ptr_arg);
-        if (buf)
-            free (buf);
+                          "PART %s :%s", channel_name, msg);
     }
     else
     {
         irc_server_sendf (server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
                           "PART %s", channel_name);
     }
+
+    if (msg)
+        free (msg);
 }
 
 /*
@@ -4825,30 +4820,30 @@ irc_command_display_server (struct t_irc_server *server, int with_detail)
             weechat_printf (NULL, "  away_check_max_nicks : %s%d",
                             IRC_COLOR_CHAT_VALUE,
                             weechat_config_integer (server->options[IRC_SERVER_OPTION_AWAY_CHECK_MAX_NICKS]));
-        /* default_msg_kick */
-        if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_DEFAULT_MSG_KICK]))
-            weechat_printf (NULL, "  default_msg_kick . . :   ('%s')",
-                            IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_DEFAULT_MSG_KICK));
+        /* msg_kick */
+        if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_MSG_KICK]))
+            weechat_printf (NULL, "  msg_kick . . . . . . :   ('%s')",
+                            IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_MSG_KICK));
         else
-            weechat_printf (NULL, "  default_msg_kick . . : %s'%s'",
+            weechat_printf (NULL, "  msg_kick . . . . . . : %s'%s'",
                             IRC_COLOR_CHAT_VALUE,
-                            weechat_config_string (server->options[IRC_SERVER_OPTION_DEFAULT_MSG_KICK]));
-        /* default_msg_part */
-        if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_DEFAULT_MSG_PART]))
-            weechat_printf (NULL, "  default_msg_part . . :   ('%s')",
-                            IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_DEFAULT_MSG_PART));
+                            weechat_config_string (server->options[IRC_SERVER_OPTION_MSG_KICK]));
+        /* msg_part */
+        if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_MSG_PART]))
+            weechat_printf (NULL, "  msg_part . . . . . . :   ('%s')",
+                            IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_MSG_PART));
         else
-            weechat_printf (NULL, "  default_msg_part . . : %s'%s'",
+            weechat_printf (NULL, "  msg_part . . . . . . : %s'%s'",
                             IRC_COLOR_CHAT_VALUE,
-                            weechat_config_string (server->options[IRC_SERVER_OPTION_DEFAULT_MSG_PART]));
-        /* default_msg_quit */
-        if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_DEFAULT_MSG_QUIT]))
-            weechat_printf (NULL, "  default_msg_quit . . :   ('%s')",
-                            IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_DEFAULT_MSG_QUIT));
+                            weechat_config_string (server->options[IRC_SERVER_OPTION_MSG_PART]));
+        /* msg_quit */
+        if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_MSG_QUIT]))
+            weechat_printf (NULL, "  msg_quit . . . . . . :   ('%s')",
+                            IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_MSG_QUIT));
         else
-            weechat_printf (NULL, "  default_msg_quit . . : %s'%s'",
+            weechat_printf (NULL, "  msg_quit . . . . . . : %s'%s'",
                             IRC_COLOR_CHAT_VALUE,
-                            weechat_config_string (server->options[IRC_SERVER_OPTION_DEFAULT_MSG_QUIT]));
+                            weechat_config_string (server->options[IRC_SERVER_OPTION_MSG_QUIT]));
         /* notify */
         if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_NOTIFY]))
             weechat_printf (NULL, "  notify . . . . . . . :   ('%s')",
diff --git a/src/plugins/irc/irc-completion.c b/src/plugins/irc/irc-completion.c
index b0140496e..56b2bf21e 100644
--- a/src/plugins/irc/irc-completion.c
+++ b/src/plugins/irc/irc-completion.c
@@ -605,7 +605,7 @@ irc_completion_msg_kick_cb (const void *pointer, void *data,
     if (ptr_server)
     {
         msg_kick = IRC_SERVER_OPTION_STRING(ptr_server,
-                                            IRC_SERVER_OPTION_DEFAULT_MSG_KICK);
+                                            IRC_SERVER_OPTION_MSG_KICK);
         if (msg_kick && msg_kick[0])
         {
             weechat_hook_completion_list_add (completion, msg_kick,
@@ -638,7 +638,7 @@ irc_completion_msg_part_cb (const void *pointer, void *data,
     if (ptr_server)
     {
         msg_part = IRC_SERVER_OPTION_STRING(ptr_server,
-                                            IRC_SERVER_OPTION_DEFAULT_MSG_PART);
+                                            IRC_SERVER_OPTION_MSG_PART);
         if (msg_part && msg_part[0])
         {
             weechat_hook_completion_list_add (completion, msg_part,
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index a488936b0..d4acd7ba3 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -2148,13 +2148,15 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 callback_change_data,
                 NULL, NULL, NULL);
             break;
-        case IRC_SERVER_OPTION_DEFAULT_MSG_KICK:
+        case IRC_SERVER_OPTION_MSG_KICK:
             new_option = weechat_config_new_option (
                 config_file, section,
                 option_name, "string",
                 N_("default kick message used by commands \"/kick\" and "
-                   "\"/kickban\" (special variables $nick, $channel and $server "
-                   "are replaced by their value)"),
+                   "\"/kickban\" "
+                   "(note: content is evaluated, see /help eval; special "
+                   "variables ${nick}, ${channel} and ${server} are replaced "
+                   "by their value)"),
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
@@ -2166,12 +2168,15 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 callback_change_data,
                 NULL, NULL, NULL);
             break;
-        case IRC_SERVER_OPTION_DEFAULT_MSG_PART:
+        case IRC_SERVER_OPTION_MSG_PART:
             new_option = weechat_config_new_option (
                 config_file, section,
                 option_name, "string",
-                N_("default part message (leaving channel) (\"%v\" will be "
-                   "replaced by WeeChat version in string)"),
+                N_("default part message (leaving channel) "
+                   "(note: content is evaluated, see /help eval; special "
+                   "variables ${nick}, ${channel} and ${server} are replaced "
+                   "by their value; \"%v\" is replaced by WeeChat version if "
+                   "there is no ${...} in string)"),
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
@@ -2183,12 +2188,15 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 callback_change_data,
                 NULL, NULL, NULL);
             break;
-        case IRC_SERVER_OPTION_DEFAULT_MSG_QUIT:
+        case IRC_SERVER_OPTION_MSG_QUIT:
             new_option = weechat_config_new_option (
                 config_file, section,
                 option_name, "string",
-                N_("default quit message (disconnecting from server) (\"%v\" "
-                   "will be replaced by WeeChat version in string)"),
+                N_("default quit message (disconnecting from server) "
+                   "(note: content is evaluated, see /help eval; special "
+                   "variables ${nick}, ${channel} and ${server} are replaced "
+                   "by their value; \"%v\" is replaced by WeeChat version if "
+                   "there is no ${...} in string)"),
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index ea59de9be..0f35155ba 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -75,45 +75,45 @@ char *irc_server_sasl_fail_string[IRC_SERVER_NUM_SASL_FAIL] =
 { "continue", "reconnect", "disconnect" };
 
 char *irc_server_options[IRC_SERVER_NUM_OPTIONS][2] =
-{ { "addresses",            ""                    },
-  { "proxy",                ""                    },
-  { "ipv6",                 "on"                  },
-  { "ssl",                  "off"                 },
-  { "ssl_cert",             ""                    },
-  { "ssl_priorities",       "NORMAL:-VERS-SSL3.0" },
-  { "ssl_dhkey_size",       "2048"                },
-  { "ssl_fingerprint",      ""                    },
-  { "ssl_verify",           "on"                  },
-  { "password",             ""                    },
-  { "capabilities",         ""                    },
-  { "sasl_mechanism",       "plain"               },
-  { "sasl_username",        ""                    },
-  { "sasl_password",        ""                    },
-  { "sasl_key",             "",                   },
-  { "sasl_timeout",         "15"                  },
-  { "sasl_fail",            "continue"            },
-  { "autoconnect",          "off"                 },
-  { "autoreconnect",        "on"                  },
-  { "autoreconnect_delay",  "10"                  },
-  { "nicks",                ""                    },
-  { "nicks_alternate",      "on"                  },
-  { "username",             ""                    },
-  { "realname",             ""                    },
-  { "local_hostname",       ""                    },
-  { "command",              ""                    },
-  { "command_delay",        "0"                   },
-  { "autojoin",             ""                    },
-  { "autorejoin",           "off"                 },
-  { "autorejoin_delay",     "30"                  },
-  { "connection_timeout",   "60"                  },
-  { "anti_flood_prio_high", "2"                   },
-  { "anti_flood_prio_low",  "2"                   },
-  { "away_check",           "0"                   },
-  { "away_check_max_nicks", "25"                  },
-  { "default_msg_kick",     ""                    },
-  { "default_msg_part",     "WeeChat %v"          },
-  { "default_msg_quit",     "WeeChat %v"          },
-  { "notify",               ""                    },
+{ { "addresses",            ""                        },
+  { "proxy",                ""                        },
+  { "ipv6",                 "on"                      },
+  { "ssl",                  "off"                     },
+  { "ssl_cert",             ""                        },
+  { "ssl_priorities",       "NORMAL:-VERS-SSL3.0"     },
+  { "ssl_dhkey_size",       "2048"                    },
+  { "ssl_fingerprint",      ""                        },
+  { "ssl_verify",           "on"                      },
+  { "password",             ""                        },
+  { "capabilities",         ""                        },
+  { "sasl_mechanism",       "plain"                   },
+  { "sasl_username",        ""                        },
+  { "sasl_password",        ""                        },
+  { "sasl_key",             "",                       },
+  { "sasl_timeout",         "15"                      },
+  { "sasl_fail",            "continue"                },
+  { "autoconnect",          "off"                     },
+  { "autoreconnect",        "on"                      },
+  { "autoreconnect_delay",  "10"                      },
+  { "nicks",                ""                        },
+  { "nicks_alternate",      "on"                      },
+  { "username",             ""                        },
+  { "realname",             ""                        },
+  { "local_hostname",       ""                        },
+  { "command",              ""                        },
+  { "command_delay",        "0"                       },
+  { "autojoin",             ""                        },
+  { "autorejoin",           "off"                     },
+  { "autorejoin_delay",     "30"                      },
+  { "connection_timeout",   "60"                      },
+  { "anti_flood_prio_high", "2"                       },
+  { "anti_flood_prio_low",  "2"                       },
+  { "away_check",           "0"                       },
+  { "away_check_max_nicks", "25"                      },
+  { "msg_kick",             ""                        },
+  { "msg_part",             "WeeChat ${info:version}" },
+  { "msg_quit",             "WeeChat ${info:version}" },
+  { "notify",               ""                        },
 };
 
 char *irc_server_casemapping_string[IRC_SERVER_NUM_CASEMAPPING] =
@@ -950,6 +950,55 @@ irc_server_prefix_char_statusmsg (struct t_irc_server *server,
 }
 
 /*
+ * Gets an evaluated default_msg server option: replaces "%v" by WeeChat
+ * version if there's no ${...} in string, or just evaluates the string.
+ *
+ * Note: result must be freed after use.
+ */
+
+char *
+irc_server_get_default_msg (const char *default_msg,
+                            struct t_irc_server *server,
+                            const char *channel_name)
+{
+    const char *version;
+    struct t_hashtable *extra_vars;
+    char *msg;
+
+    /*
+     * "%v" for version is deprecated since WeeChat 1.6, where
+     * an expression ${info:version} is preferred, so we replace
+     * the "%v" with version only if there's no "${...}" in string
+     */
+    if (strstr (default_msg, "%v") && !strstr (default_msg, "${"))
+    {
+        version = weechat_info_get ("version", "");
+        return weechat_string_replace (default_msg, "%v",
+                                       (version) ? version : "");
+    }
+
+    extra_vars = weechat_hashtable_new (32,
+                                        WEECHAT_HASHTABLE_STRING,
+                                        WEECHAT_HASHTABLE_POINTER,
+                                        NULL,
+                                        NULL);
+    if (extra_vars)
+    {
+        weechat_hashtable_set (extra_vars, "server", server->name);
+        weechat_hashtable_set (extra_vars, "channel",
+                               (channel_name) ? channel_name : "");
+        weechat_hashtable_set (extra_vars, "nick", server->nick);
+    }
+
+    msg = weechat_string_eval_expression (default_msg, NULL, extra_vars, NULL);
+
+    if (extra_vars)
+        weechat_hashtable_free (extra_vars);
+
+    return msg;
+}
+
+/*
  * Allocates a new server and adds it to the servers queue.
  *
  * Returns pointer to new server, NULL if error.
@@ -5492,14 +5541,14 @@ irc_server_add_to_infolist (struct t_infolist *infolist,
     if (!weechat_infolist_new_var_integer (ptr_item, "away_check_max_nicks",
                                            IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AWAY_CHECK_MAX_NICKS)))
         return 0;
-    if (!weechat_infolist_new_var_string (ptr_item, "default_msg_kick",
-                                          IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_DEFAULT_MSG_KICK)))
+    if (!weechat_infolist_new_var_string (ptr_item, "msg_kick",
+                                          IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_MSG_KICK)))
         return 0;
-    if (!weechat_infolist_new_var_string (ptr_item, "default_msg_part",
-                                          IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_DEFAULT_MSG_PART)))
+    if (!weechat_infolist_new_var_string (ptr_item, "msg_part",
+                                          IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_MSG_PART)))
         return 0;
-    if (!weechat_infolist_new_var_string (ptr_item, "default_msg_quit",
-                                          IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_DEFAULT_MSG_QUIT)))
+    if (!weechat_infolist_new_var_string (ptr_item, "msg_quit",
+                                          IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_MSG_QUIT)))
         return 0;
     if (!weechat_infolist_new_var_integer (ptr_item, "temp_server", server->temp_server))
         return 0;
@@ -5851,27 +5900,27 @@ irc_server_print_log ()
         else
             weechat_log_printf ("  away_check_max_nicks : %d",
                                 weechat_config_integer (ptr_server->options[IRC_SERVER_OPTION_AWAY_CHECK_MAX_NICKS]));
-        /* default_msg_kick */
-        if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_DEFAULT_MSG_KICK]))
-            weechat_log_printf ("  default_msg_kick . . : null ('%s')",
-                                IRC_SERVER_OPTION_STRING(ptr_server, IRC_SERVER_OPTION_DEFAULT_MSG_KICK));
+        /* msg_kick */
+        if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_MSG_KICK]))
+            weechat_log_printf ("  msg_kick . . . . . . : null ('%s')",
+                                IRC_SERVER_OPTION_STRING(ptr_server, IRC_SERVER_OPTION_MSG_KICK));
         else
-            weechat_log_printf ("  default_msg_kick . . : '%s'",
-                                weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_DEFAULT_MSG_KICK]));
-        /* default_msg_part */
-        if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_DEFAULT_MSG_PART]))
-            weechat_log_printf ("  default_msg_part . . : null ('%s')",
-                                IRC_SERVER_OPTION_STRING(ptr_server, IRC_SERVER_OPTION_DEFAULT_MSG_PART));
+            weechat_log_printf ("  msg_kick . . . . . . : '%s'",
+                                weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_MSG_KICK]));
+        /* msg_part */
+        if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_MSG_PART]))
+            weechat_log_printf ("  msg_part . . . . . . : null ('%s')",
+                                IRC_SERVER_OPTION_STRING(ptr_server, IRC_SERVER_OPTION_MSG_PART));
         else
-            weechat_log_printf ("  default_msg_part . . : '%s'",
-                                weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_DEFAULT_MSG_PART]));
-        /* default_msg_quit */
-        if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_DEFAULT_MSG_QUIT]))
-            weechat_log_printf ("  default_msg_quit . . : null ('%s')",
-                                IRC_SERVER_OPTION_STRING(ptr_server, IRC_SERVER_OPTION_DEFAULT_MSG_QUIT));
+            weechat_log_printf ("  msg_part . . . . . . : '%s'",
+                                weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_MSG_PART]));
+        /* msg_quit */
+        if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_MSG_QUIT]))
+            weechat_log_printf ("  msg_quit . . . . . . : null ('%s')",
+                                IRC_SERVER_OPTION_STRING(ptr_server, IRC_SERVER_OPTION_MSG_QUIT));
         else
-            weechat_log_printf ("  default_msg_quit . . : '%s'",
-                                weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_DEFAULT_MSG_QUIT]));
+            weechat_log_printf ("  msg_quit . . . . . . : '%s'",
+                                weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_MSG_QUIT]));
         /* other server variables */
         weechat_log_printf ("  temp_server. . . . . : %d",    ptr_server->temp_server);
         weechat_log_printf ("  reloading_from_config: %d",    ptr_server->reloaded_from_config);
diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h
index 10bb1094f..663b0d085 100644
--- a/src/plugins/irc/irc-server.h
+++ b/src/plugins/irc/irc-server.h
@@ -78,9 +78,9 @@ enum t_irc_server_option
     IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_LOW,  /* anti-flood (low priority)     */
     IRC_SERVER_OPTION_AWAY_CHECK,           /* delay between away checks     */
     IRC_SERVER_OPTION_AWAY_CHECK_MAX_NICKS, /* max nicks for away check      */
-    IRC_SERVER_OPTION_DEFAULT_MSG_KICK,     /* default kick message          */
-    IRC_SERVER_OPTION_DEFAULT_MSG_PART,     /* default part message          */
-    IRC_SERVER_OPTION_DEFAULT_MSG_QUIT,     /* default quit message          */
+    IRC_SERVER_OPTION_MSG_KICK,             /* default kick message          */
+    IRC_SERVER_OPTION_MSG_PART,             /* default part message          */
+    IRC_SERVER_OPTION_MSG_QUIT,             /* default quit message          */
     IRC_SERVER_OPTION_NOTIFY,               /* notify list                   */
     /* number of server options */
     IRC_SERVER_NUM_OPTIONS,
@@ -300,6 +300,9 @@ extern char irc_server_get_prefix_char_for_mode (struct t_irc_server *server,
 extern const char *irc_server_get_chanmodes (struct t_irc_server *server);
 extern int irc_server_prefix_char_statusmsg (struct t_irc_server *server,
                                              char prefix_char);
+extern char *irc_server_get_default_msg (const char *default_msg,
+                                         struct t_irc_server *server,
+                                         const char *channel_name);
 extern struct t_irc_server *irc_server_alloc (const char *name);
 extern struct t_irc_server *irc_server_alloc_with_url (const char *irc_url);
 extern void irc_server_apply_command_line_options (struct t_irc_server *server,