irc: remove option irc.network.channel_encode, add server option "charset_message" (closes #832)

This new option controls which part of the IRC message is decoded/encoded to
the target charset, and the new default behavior is to decode/encode the whole
IRC message (behavior in WeeChat >= 1.3 was to decode/encode only the text by
default).

26 files changed, 302 insertions, 238 deletions

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index a4ad62d91..950950d34 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -28,6 +28,7 @@ Bug fixes::
 
   * core: fixed segfault during excessive evaluation in function string_repeat (issue #1400)
   * buflist: fix extra spaces between buffers when conditions are used to hide buffers (regression introduced in version 2.6) (issue #1403)
+  * irc: remove option irc.network.channel_encode, add server option "charset_message" to control which part of the IRC message is decoded/encoded to the target charset (issue #832)
 
 Build::
 
diff --git a/ReleaseNotes.adoc b/ReleaseNotes.adoc
index 9e9bdd998..48cc68380 100644
--- a/ReleaseNotes.adoc
+++ b/ReleaseNotes.adoc
@@ -56,6 +56,25 @@ plugin, using this cmake option:
 cmake .. -DENABLE_PHP=OFF
 ----
 
+[[v2.7_irc_message_decoding]]
+=== IRC message decoding/encoding
+
+A new server option called "charset_message" has been added, replacing the
+option _irc.network.channel_encode_.
+
+This new server option has three possible values:
+
+* _message_ (default): the whole IRC message is decoded/encoded, this is the
+  new default behavior; in case of problem with channel names, try to use
+  _text_ instead
+* _channel_: the message is decoded/encoded starting at the channel name (or
+  the text if no channel is present); this is like setting the old option
+  _irc.network.channel_encode_ to _on_
+* _text_: the message is decoded/encoded starting from the text (for example
+  the user message); this is like setting the old option
+  _irc.network.channel_encode_ to _off_ (so this was the default behavior
+  in previous versions)
+
 [[v2.6]]
 == Version 2.6 (2019-09-08)
 
diff --git a/doc/de/autogen/user/irc_options.adoc b/doc/de/autogen/user/irc_options.adoc
index 0668ede11..c4d8c4a9a 100644
--- a/doc/de/autogen/user/irc_options.adoc
+++ b/doc/de/autogen/user/irc_options.adoc
@@ -446,12 +446,6 @@
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+"*!$ident@$host"+`
 
-* [[option_irc.network.channel_encode]] *irc.network.channel_encode*
-** Beschreibung: pass:none[dekodieren/kodieren von Channelnamen innerhalb einer Nachricht mittels Charset-Optionen; es wird empfohlen diese Option deaktiviert zu lassen sofern man ausschließlich UTF-8 in Channelnamen verwendet. Diese Option sollte nur dann verwendet werden, sofern man exotische Zeichensätze wie ISO für Channelnamen nutzt]
-** Typ: boolesch
-** Werte: on, off
-** Standardwert: `+off+`
-
 * [[option_irc.network.colors_receive]] *irc.network.colors_receive*
 ** Beschreibung: pass:none[wenn deaktiviert, werden Farben-Codes von eingehenden Nachrichten ignoriert]
 ** Typ: boolesch
@@ -596,6 +590,12 @@
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`
 
+* [[option_irc.server_default.charset_message]] *irc.server_default.charset_message*
+** Beschreibung: pass:none[part of the IRC message (received or sent) which is decoded/encoded to the target charset; message = the whole IRC message (default), channel = starting from the channel name only (if found, with fallback on text), text = starting from the text only (you should try this value if you have issues with the channel name encoding)]
+** Typ: integer
+** Werte: message, channel, text
+** Standardwert: `+message+`
+
 * [[option_irc.server_default.command]] *irc.server_default.command*
 ** Beschreibung: pass:none[Befehl(e) welche nach einem Verbindungsaufbau zum Server und vor dem automatischem Betreten von Channels ausgeführt werden sollen (mehrere Befehle müssen durch ";" getrennt werden, soll ein Semikolon genutzt werden, schreibt man "\;", die Platzhalter $nick,$channel und $server werden durch den entsprechenden Wert ersetzt) (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)]
 ** Typ: Zeichenkette
diff --git a/doc/en/autogen/user/irc_options.adoc b/doc/en/autogen/user/irc_options.adoc
index ead67d226..4955f8777 100644
--- a/doc/en/autogen/user/irc_options.adoc
+++ b/doc/en/autogen/user/irc_options.adoc
@@ -446,12 +446,6 @@
 ** values: any string
 ** default value: `+"*!$ident@$host"+`
 
-* [[option_irc.network.channel_encode]] *irc.network.channel_encode*
-** description: pass:none[decode/encode channel name inside messages using charset options; it is recommended to keep that off if you use only UTF-8 in channel names; you can enable this option if you are using an exotic charset like ISO in channel names]
-** type: boolean
-** values: on, off
-** default value: `+off+`
-
 * [[option_irc.network.colors_receive]] *irc.network.colors_receive*
 ** description: pass:none[when off, colors codes are ignored in incoming messages]
 ** type: boolean
@@ -596,6 +590,12 @@
 ** values: any string
 ** default value: `+""+`
 
+* [[option_irc.server_default.charset_message]] *irc.server_default.charset_message*
+** description: pass:none[part of the IRC message (received or sent) which is decoded/encoded to the target charset; message = the whole IRC message (default), channel = starting from the channel name only (if found, with fallback on text), text = starting from the text only (you should try this value if you have issues with the channel name encoding)]
+** type: integer
+** values: message, channel, text
+** default value: `+message+`
+
 * [[option_irc.server_default.command]] *irc.server_default.command*
 ** description: pass:none[command(s) to run after connection to server and before auto-join of channels (many commands can be separated by ";", use "\;" for a semicolon, special variables $nick, $channel and $server are replaced by their value) (note: content is evaluated, see /help eval; server options are evaluated with ${irc_server.xxx} and ${server} is replaced by the server name)]
 ** type: string
diff --git a/doc/fr/autogen/user/irc_options.adoc b/doc/fr/autogen/user/irc_options.adoc
index a01f4a41f..be4638677 100644
--- a/doc/fr/autogen/user/irc_options.adoc
+++ b/doc/fr/autogen/user/irc_options.adoc
@@ -446,12 +446,6 @@
 ** valeurs: toute chaîne
 ** valeur par défaut: `+"*!$ident@$host"+`
 
-* [[option_irc.network.channel_encode]] *irc.network.channel_encode*
-** description: pass:none[décoder/encoder le nom du canal dans les messages en utilisant les options de charset ; il est recommandé de garder cette option désactivée si vous utilisez seulement UTF-8 dans les noms de canaux ; vous pouvez activer cette option si vous utilisez un charset exotique comme ISO dans les noms de canaux]
-** type: booléen
-** valeurs: on, off
-** valeur par défaut: `+off+`
-
 * [[option_irc.network.colors_receive]] *irc.network.colors_receive*
 ** description: pass:none[si désactivé, les codes couleurs des messages entrants sont ignorés]
 ** type: booléen
@@ -596,6 +590,12 @@
 ** valeurs: toute chaîne
 ** valeur par défaut: `+""+`
 
+* [[option_irc.server_default.charset_message]] *irc.server_default.charset_message*
+** description: pass:none[partie du message IRC (reçu ou envoyé) qui est décodé/encode vers le jeu de caractères cible ; message = le message IRC entier (par défaut), channel = à partir du nom du canal seulement (si trouvé, sinon à partir du texte), text = à partir du texte seulement (vous devriez essayer cette valeur si vous avec des problèmes d'encodage avec le nom du canal)]
+** type: entier
+** valeurs: message, channel, text
+** valeur par défaut: `+message+`
+
 * [[option_irc.server_default.command]] *irc.server_default.command*
 ** description: pass:none[commande(s) à exécuter après la connexion au serveur et avant le "join" automatique des canaux (plusieurs commandes peuvent être séparées par ";", utilisez "\;" pour un point-virgule, les variables spéciales $nick, $channel et $server sont remplacées par leur valeur) (note : le contenu est évalué, voir /help eval ; les options de serveur sont évaluées avec ${irc_server.xxx} et ${server} est remplacé par le nom du serveur)]
 ** type: chaîne
diff --git a/doc/it/autogen/user/irc_options.adoc b/doc/it/autogen/user/irc_options.adoc
index a0f54b0b3..bd162323a 100644
--- a/doc/it/autogen/user/irc_options.adoc
+++ b/doc/it/autogen/user/irc_options.adoc
@@ -446,12 +446,6 @@
 ** valori: qualsiasi stringa
 ** valore predefinito: `+"*!$ident@$host"+`
 
-* [[option_irc.network.channel_encode]] *irc.network.channel_encode*
-** descrizione: pass:none[decode/encode channel name inside messages using charset options; it is recommended to keep that off if you use only UTF-8 in channel names; you can enable this option if you are using an exotic charset like ISO in channel names]
-** tipo: bool
-** valori: on, off
-** valore predefinito: `+off+`
-
 * [[option_irc.network.colors_receive]] *irc.network.colors_receive*
 ** descrizione: pass:none[se disabilitato, i codici colori vengono ignorati nei messaggi in entrata]
 ** tipo: bool
@@ -596,6 +590,12 @@
 ** valori: qualsiasi stringa
 ** valore predefinito: `+""+`
 
+* [[option_irc.server_default.charset_message]] *irc.server_default.charset_message*
+** descrizione: pass:none[part of the IRC message (received or sent) which is decoded/encoded to the target charset; message = the whole IRC message (default), channel = starting from the channel name only (if found, with fallback on text), text = starting from the text only (you should try this value if you have issues with the channel name encoding)]
+** tipo: intero
+** valori: message, channel, text
+** valore predefinito: `+message+`
+
 * [[option_irc.server_default.command]] *irc.server_default.command*
 ** descrizione: pass:none[command(s) to run after connection to server and before auto-join of channels (many commands can be separated by ";", use "\;" for a semicolon, special variables $nick, $channel and $server are replaced by their value) (note: content is evaluated, see /help eval; server options are evaluated with ${irc_server.xxx} and ${server} is replaced by the server name)]
 ** tipo: stringa
diff --git a/doc/ja/autogen/user/irc_options.adoc b/doc/ja/autogen/user/irc_options.adoc
index afb8cb037..e89043d25 100644
--- a/doc/ja/autogen/user/irc_options.adoc
+++ b/doc/ja/autogen/user/irc_options.adoc
@@ -446,12 +446,6 @@
 ** 値: 未制約文字列
 ** デフォルト値: `+"*!$ident@$host"+`
 
-* [[option_irc.network.channel_encode]] *irc.network.channel_encode*
-** 説明: pass:none[文字セットオプションを使ってメッセージに含まれるチャンネル名をデコードおよびエンコードする; チャンネル名に UTF-8 を使っている場合のみこれを無効化しておくことをおすすめします; チャンネル名に ISO などの文字セットを使っている場合にはこれを有効化します]
-** タイプ: ブール
-** 値: on, off
-** デフォルト値: `+off+`
-
 * [[option_irc.network.colors_receive]] *irc.network.colors_receive*
 ** 説明: pass:none[オフの場合、到着メッセージに含まれる色コードを無視]
 ** タイプ: ブール
@@ -596,6 +590,12 @@
 ** 値: 未制約文字列
 ** デフォルト値: `+""+`
 
+* [[option_irc.server_default.charset_message]] *irc.server_default.charset_message*
+** 説明: pass:none[part of the IRC message (received or sent) which is decoded/encoded to the target charset; message = the whole IRC message (default), channel = starting from the channel name only (if found, with fallback on text), text = starting from the text only (you should try this value if you have issues with the channel name encoding)]
+** タイプ: 整数
+** 値: message, channel, text
+** デフォルト値: `+message+`
+
 * [[option_irc.server_default.command]] *irc.server_default.command*
 ** 説明: pass:none[サーバに接続した後、チャンネルに自動参加する前に実行するコマンド (";" で分けて 複数のコマンドを列挙できます、セミコロンは "\;" のように使ってください、特殊変数 $nick、$channel、$server はそれぞれの値に置換されます) (注意: 値は評価されます、/help eval を参照してください; ここで ${irc_server.xxx} はサーバオプション、${server} はサーバ名を意味します)]
 ** タイプ: 文字列
diff --git a/doc/pl/autogen/user/irc_options.adoc b/doc/pl/autogen/user/irc_options.adoc
index 70fda3234..09da1a800 100644
--- a/doc/pl/autogen/user/irc_options.adoc
+++ b/doc/pl/autogen/user/irc_options.adoc
@@ -446,12 +446,6 @@
 ** wartości: dowolny ciąg
 ** domyślna wartość: `+"*!$ident@$host"+`
 
-* [[option_irc.network.channel_encode]] *irc.network.channel_encode*
-** opis: pass:none[dekodowanie/kodowanie nazwy kanału wewnątrz wiadomości za pomocą opcji charset; zaleca się nie włączanie jej w przypadku używania tylko nazw kanałów UTF-8; możesz włączyć tą opcję jeśli używasz egzotycznych kodowań jak ISO w nazwach kanałów]
-** typ: bool
-** wartości: on, off
-** domyślna wartość: `+off+`
-
 * [[option_irc.network.colors_receive]] *irc.network.colors_receive*
 ** opis: pass:none[kiedy wyłączone (off) kody kolorów są ignorowane w przychodzących wiadomościach]
 ** typ: bool
@@ -596,6 +590,12 @@
 ** wartości: dowolny ciąg
 ** domyślna wartość: `+""+`
 
+* [[option_irc.server_default.charset_message]] *irc.server_default.charset_message*
+** opis: pass:none[part of the IRC message (received or sent) which is decoded/encoded to the target charset; message = the whole IRC message (default), channel = starting from the channel name only (if found, with fallback on text), text = starting from the text only (you should try this value if you have issues with the channel name encoding)]
+** typ: liczba
+** wartości: message, channel, text
+** domyślna wartość: `+message+`
+
 * [[option_irc.server_default.command]] *irc.server_default.command*
 ** opis: pass:none[komenda(y) do wykonania po połączeniu z serwerem przed automatycznym wejściem na kanały (wiele komend powinno zostać oddzielone ";", użyj "\;" dla średnika, specjalne zmienne $nick, $channel oraz $server są zastępowane ich wartościami) (uwaga: zawartość jest przetwarzana, zobacz /help eval; opcje serwera mogą zostać użytego w postaci ${irc_server.xxx} oraz ${server} jest zastępowany nazwą serwera)]
 ** typ: ciąg
diff --git a/po/cs.po b/po/cs.po
index df81d3dd3..5d508ab13 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: 2019-09-21 07:54+0200\n"
+"POT-Creation-Date: 2019-09-22 18:49+0200\n"
 "PO-Revision-Date: 2019-05-13 21:31+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6084,6 +6084,10 @@ msgstr "%s: skript \"%s\" odebrán"
 msgid "%s%s: script \"%s\" not loaded"
 msgstr "%s%s: skript \"%s\" nenačten"
 
+#, fuzzy, c-format
+msgid "%sCommand \"/%s eval\" is not yet implemented"
+msgstr "%sBarva \"%s\" není definovávána v paletě"
+
 msgid "server"
 msgid_plural "servers"
 msgstr[0] "server"
@@ -8168,6 +8172,14 @@ msgid ""
 "non-standard IRC servers, for example gateways like bitlbee"
 msgstr ""
 
+msgid ""
+"part of the IRC message (received or sent) which is decoded/encoded to the "
+"target charset; message = the whole IRC message (default), channel = "
+"starting from the channel name only (if found, with fallback on text), text "
+"= starting from the text only (you should try this value if you have issues "
+"with the channel name encoding)"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: error adding server \"%s\""
 msgstr "%s%s: chyba při přidávání notifikace"
@@ -8599,13 +8611,6 @@ msgid ""
 "knows the host for the nick"
 msgstr ""
 
-msgid ""
-"decode/encode channel name inside messages using charset options; it is "
-"recommended to keep that off if you use only UTF-8 in channel names; you can "
-"enable this option if you are using an exotic charset like ISO in channel "
-"names"
-msgstr ""
-
 msgid "when off, colors codes are ignored in incoming messages"
 msgstr "pokud je off, jsou barvy v příchozích zprávách ignorovány"
 
@@ -9689,10 +9694,6 @@ msgstr "%s%s: nemůžu načíst soubor \"%s\""
 msgid "%s%s: unable to execute file \"%s\""
 msgstr "%s%s: nemůžu spustit soubor \"%s\""
 
-#, fuzzy, c-format
-msgid "%sCommand \"/%s eval\" is not yet implemented"
-msgstr "%sBarva \"%s\" není definovávána v paletě"
-
 #, fuzzy
 msgid "Log buffers to files"
 msgstr "konfigurační soubory"
diff --git a/po/de.po b/po/de.po
index c28eb99da..565032882 100644
--- a/po/de.po
+++ b/po/de.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2019-09-21 07:54+0200\n"
-"PO-Revision-Date: 2019-09-21 08:31+0200\n"
+"POT-Creation-Date: 2019-09-22 18:49+0200\n"
+"PO-Revision-Date: 2019-09-22 18:54+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
 "Language: de\n"
@@ -7527,6 +7527,10 @@ msgstr "%s: Skript \"%s\" wurde beendet"
 msgid "%s%s: script \"%s\" not loaded"
 msgstr "%s%s: Das Skript \"%s\" wurde nicht installiert"
 
+#, c-format
+msgid "%sCommand \"/%s eval\" is not yet implemented"
+msgstr "%sBefehl \"/%s eval\" ist zur Zeit noch nicht implementiert"
+
 msgid "server"
 msgid_plural "servers"
 msgstr[0] "Server"
@@ -9808,6 +9812,14 @@ msgstr ""
 "0 oder jeder Wert zwischen 128 und 4096; diese Option sollte nur bei nicht-"
 "Standard IRC Servern verändert werden, zum Beispiel ein bitlbee Gateway"
 
+msgid ""
+"part of the IRC message (received or sent) which is decoded/encoded to the "
+"target charset; message = the whole IRC message (default), channel = "
+"starting from the channel name only (if found, with fallback on text), text "
+"= starting from the text only (you should try this value if you have issues "
+"with the channel name encoding)"
+msgstr ""
+
 #, c-format
 msgid "%s%s: error adding server \"%s\""
 msgstr "%s%s: Fehler bei der Erstellung des Servers \"%s\""
@@ -10355,18 +10367,6 @@ msgstr ""
 "\"~\" beginnt. Andernfalls wird daraus \"*\"; diese Vorgabemaske wird nur "
 "angewendet, sofern WeeChat den Host des Nicks ermitteln kann"
 
-msgid ""
-"decode/encode channel name inside messages using charset options; it is "
-"recommended to keep that off if you use only UTF-8 in channel names; you can "
-"enable this option if you are using an exotic charset like ISO in channel "
-"names"
-msgstr ""
-"dekodieren/kodieren von Channelnamen innerhalb einer Nachricht mittels "
-"Charset-Optionen; es wird empfohlen diese Option deaktiviert zu lassen "
-"sofern man ausschließlich UTF-8 in Channelnamen verwendet. Diese Option "
-"sollte nur dann verwendet werden, sofern man exotische Zeichensätze wie ISO "
-"für Channelnamen nutzt"
-
 msgid "when off, colors codes are ignored in incoming messages"
 msgstr ""
 "wenn deaktiviert, werden Farben-Codes von eingehenden Nachrichten ignoriert"
@@ -11501,10 +11501,6 @@ msgstr "%s%s: Kann die Datei \"%s\" nicht laden"
 msgid "%s%s: unable to execute file \"%s\""
 msgstr "%s%s: Die Datei \"%s\" kann nicht ausgeführt werden"
 
-#, c-format
-msgid "%sCommand \"/%s eval\" is not yet implemented"
-msgstr "%sBefehl \"/%s eval\" ist zur Zeit noch nicht implementiert"
-
 msgid "Log buffers to files"
 msgstr "sichert Buffer in eine Datei"
 
diff --git a/po/es.po b/po/es.po
index ce2e695e5..02d2c31dd 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: 2019-09-21 07:54+0200\n"
+"POT-Creation-Date: 2019-09-22 18:49+0200\n"
 "PO-Revision-Date: 2019-05-13 21:31+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6301,6 +6301,10 @@ msgstr "%s: script \"%s\" descargado"
 msgid "%s%s: script \"%s\" not loaded"
 msgstr "%s%s: el script \"%s\" no está cargado"
 
+#, fuzzy, c-format
+msgid "%sCommand \"/%s eval\" is not yet implemented"
+msgstr "%sColor \"%s\" no está definido en la paleta"
+
 msgid "server"
 msgid_plural "servers"
 msgstr[0] "servidor"
@@ -8430,6 +8434,14 @@ msgid ""
 "non-standard IRC servers, for example gateways like bitlbee"
 msgstr ""
 
+msgid ""
+"part of the IRC message (received or sent) which is decoded/encoded to the "
+"target charset; message = the whole IRC message (default), channel = "
+"starting from the channel name only (if found, with fallback on text), text "
+"= starting from the text only (you should try this value if you have issues "
+"with the channel name encoding)"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: error adding server \"%s\""
 msgstr "%s%s: error al crear el servidor \"%s\""
@@ -8895,13 +8907,6 @@ msgid ""
 "knows the host for the nick"
 msgstr ""
 
-msgid ""
-"decode/encode channel name inside messages using charset options; it is "
-"recommended to keep that off if you use only UTF-8 in channel names; you can "
-"enable this option if you are using an exotic charset like ISO in channel "
-"names"
-msgstr ""
-
 msgid "when off, colors codes are ignored in incoming messages"
 msgstr ""
 "cuando se desactiva, los códigos de color se ignoran en los mensajes "
@@ -10002,10 +10007,6 @@ msgstr "%s%s: no es posible cargar el archivo \"%s\""
 msgid "%s%s: unable to execute file \"%s\""
 msgstr "%s%s: no es posible ejecutar el archivo \"%s\""
 
-#, fuzzy, c-format
-msgid "%sCommand \"/%s eval\" is not yet implemented"
-msgstr "%sColor \"%s\" no está definido en la paleta"
-
 msgid "Log buffers to files"
 msgstr "Guardar registro de buffers"
 
diff --git a/po/fr.po b/po/fr.po
index a048d1ef0..b764f9f3b 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: 2019-09-21 07:54+0200\n"
-"PO-Revision-Date: 2019-09-21 07:54+0200\n"
+"POT-Creation-Date: 2019-09-22 18:49+0200\n"
+"PO-Revision-Date: 2019-09-22 18:54+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -7368,6 +7368,10 @@ msgstr "%s : script \"%s\" déchargé"
 msgid "%s%s: script \"%s\" not loaded"
 msgstr "%s%s : script \"%s\" non chargé"
 
+#, c-format
+msgid "%sCommand \"/%s eval\" is not yet implemented"
+msgstr "%sLa commande \"/%s eval\" n'est pas implémentée"
+
 msgid "server"
 msgid_plural "servers"
 msgstr[0] "serveur"
@@ -9601,6 +9605,19 @@ msgstr ""
 "entre 128 et 4096 ; cette option devrait être changée seulement sur les "
 "serveurs IRC non standards, par exemple sur les passerelles comme bitlbee"
 
+msgid ""
+"part of the IRC message (received or sent) which is decoded/encoded to the "
+"target charset; message = the whole IRC message (default), channel = "
+"starting from the channel name only (if found, with fallback on text), text "
+"= starting from the text only (you should try this value if you have issues "
+"with the channel name encoding)"
+msgstr ""
+"partie du message IRC (reçu ou envoyé) qui est décodé/encode vers le jeu de "
+"caractères cible ; message = le message IRC entier (par défaut), channel = à "
+"partir du nom du canal seulement (si trouvé, sinon à partir du texte), text "
+"= à partir du texte seulement (vous devriez essayer cette valeur si vous "
+"avec des problèmes d'encodage avec le nom du canal)"
+
 #, c-format
 msgid "%s%s: error adding server \"%s\""
 msgstr "%s%s : erreur d'ajout du serveur \"%s\""
@@ -10116,17 +10133,6 @@ msgstr ""
 "masque par défaut est utilisé seulement si WeeChat connaît l'hôte pour le "
 "pseudo"
 
-msgid ""
-"decode/encode channel name inside messages using charset options; it is "
-"recommended to keep that off if you use only UTF-8 in channel names; you can "
-"enable this option if you are using an exotic charset like ISO in channel "
-"names"
-msgstr ""
-"décoder/encoder le nom du canal dans les messages en utilisant les options "
-"de charset ; il est recommandé de garder cette option désactivée si vous "
-"utilisez seulement UTF-8 dans les noms de canaux ; vous pouvez activer cette "
-"option si vous utilisez un charset exotique comme ISO dans les noms de canaux"
-
 msgid "when off, colors codes are ignored in incoming messages"
 msgstr "si désactivé, les codes couleurs des messages entrants sont ignorés"
 
@@ -11235,10 +11241,6 @@ msgstr "%s%s : impossible de charger le fichier \"%s\""
 msgid "%s%s: unable to execute file \"%s\""
 msgstr "%s%s : impossible d'exécuter le fichier \"%s\""
 
-#, c-format
-msgid "%sCommand \"/%s eval\" is not yet implemented"
-msgstr "%sLa commande \"/%s eval\" n'est pas implémentée"
-
 msgid "Log buffers to files"
 msgstr "Enregistrement des tampons dans des fichiers"
 
diff --git a/po/hu.po b/po/hu.po
index 18b61c8c2..c48db6f05 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: 2019-09-21 07:54+0200\n"
+"POT-Creation-Date: 2019-09-22 18:49+0200\n"
 "PO-Revision-Date: 2019-05-13 21:31+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5620,6 +5620,10 @@ msgstr "A \"%s\" modul eltávolítva.\n"
 msgid "%s%s: script \"%s\" not loaded"
 msgstr "%s a \"%s\" szerver nem található\n"
 
+#, c-format
+msgid "%sCommand \"/%s eval\" is not yet implemented"
+msgstr ""
+
 #, fuzzy
 msgid "server"
 msgid_plural "servers"
@@ -7607,6 +7611,14 @@ msgid ""
 "non-standard IRC servers, for example gateways like bitlbee"
 msgstr ""
 
+msgid ""
+"part of the IRC message (received or sent) which is decoded/encoded to the "
+"target charset; message = the whole IRC message (default), channel = "
+"starting from the channel name only (if found, with fallback on text), text "
+"= starting from the text only (you should try this value if you have issues "
+"with the channel name encoding)"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: error adding server \"%s\""
 msgstr "%s nincs elég memória az információs pult üzenethez\n"
@@ -7989,13 +8001,6 @@ msgid ""
 "knows the host for the nick"
 msgstr ""
 
-msgid ""
-"decode/encode channel name inside messages using charset options; it is "
-"recommended to keep that off if you use only UTF-8 in channel names; you can "
-"enable this option if you are using an exotic charset like ISO in channel "
-"names"
-msgstr ""
-
 msgid "when off, colors codes are ignored in incoming messages"
 msgstr ""
 
@@ -9076,10 +9081,6 @@ msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
 msgid "%s%s: unable to execute file \"%s\""
 msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
 
-#, c-format
-msgid "%sCommand \"/%s eval\" is not yet implemented"
-msgstr ""
-
 #, fuzzy
 msgid "Log buffers to files"
 msgstr "szerver konfigurációs fájljának újraolvastatása"
diff --git a/po/it.po b/po/it.po
index 1697d8c14..9eafba23e 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: 2019-09-21 07:54+0200\n"
+"POT-Creation-Date: 2019-09-22 18:49+0200\n"
 "PO-Revision-Date: 2019-05-13 21:31+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6466,6 +6466,10 @@ msgstr "%s: script \"%s\" scaricato"
 msgid "%s%s: script \"%s\" not loaded"
 msgstr "%s%s: script \"%s\" non caricato"
 
+#, fuzzy, c-format
+msgid "%sCommand \"/%s eval\" is not yet implemented"
+msgstr "%sColore \"%s\" non definito nella tavolozza"
+
 msgid "server"
 msgid_plural "servers"
 msgstr[0] "server"
@@ -8603,6 +8607,14 @@ msgid ""
 "non-standard IRC servers, for example gateways like bitlbee"
 msgstr ""
 
+msgid ""
+"part of the IRC message (received or sent) which is decoded/encoded to the "
+"target charset; message = the whole IRC message (default), channel = "
+"starting from the channel name only (if found, with fallback on text), text "
+"= starting from the text only (you should try this value if you have issues "
+"with the channel name encoding)"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: error adding server \"%s\""
 msgstr "%s%s: errore durante la creazione del server \"%s\""
@@ -9087,13 +9099,6 @@ msgid ""
 "knows the host for the nick"
 msgstr ""
 
-msgid ""
-"decode/encode channel name inside messages using charset options; it is "
-"recommended to keep that off if you use only UTF-8 in channel names; you can "
-"enable this option if you are using an exotic charset like ISO in channel "
-"names"
-msgstr ""
-
 msgid "when off, colors codes are ignored in incoming messages"
 msgstr ""
 "se disabilitato, i codici colori vengono ignorati nei messaggi in entrata"
@@ -10184,10 +10189,6 @@ msgstr "%s%s: impossibile caricare il file \"%s\""
 msgid "%s%s: unable to execute file \"%s\""
 msgstr "%s%s: impossibile eseguire il file \"%s\""
 
-#, fuzzy, c-format
-msgid "%sCommand \"/%s eval\" is not yet implemented"
-msgstr "%sColore \"%s\" non definito nella tavolozza"
-
 msgid "Log buffers to files"
 msgstr "Registra i buffer su file"
 
diff --git a/po/ja.po b/po/ja.po
index 201744a6c..a5e85aac9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2019-09-21 07:54+0200\n"
-"PO-Revision-Date: 2019-06-22 08:40+0200\n"
+"POT-Creation-Date: 2019-09-22 18:49+0200\n"
+"PO-Revision-Date: 2019-09-22 18:54+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
 "translation/ja_JP>\n"
@@ -7051,6 +7051,10 @@ msgstr "%s: スクリプト \"%s\" がアンロードされました"
 msgid "%s%s: script \"%s\" not loaded"
 msgstr "%s%s: スクリプト \"%s\" はロードされていません"
 
+#, c-format
+msgid "%sCommand \"/%s eval\" is not yet implemented"
+msgstr "%sコマンド \"/%s eval\" はまだ実装されていません"
+
 msgid "server"
 msgid_plural "servers"
 msgstr[0] "サーバ"
@@ -9214,6 +9218,14 @@ msgstr ""
 "ば bitlbee などのゲートウェイ) を使う場合に限り、このオプションを変更すべきで"
 "す"
 
+msgid ""
+"part of the IRC message (received or sent) which is decoded/encoded to the "
+"target charset; message = the whole IRC message (default), channel = "
+"starting from the channel name only (if found, with fallback on text), text "
+"= starting from the text only (you should try this value if you have issues "
+"with the channel name encoding)"
+msgstr ""
+
 #, c-format
 msgid "%s%s: error adding server \"%s\""
 msgstr "%s%s: サーバ \"%s\" 追加中のエラー"
@@ -9706,17 +9718,6 @@ msgstr ""
 "以外の場合 $ident は \"*\" になります; 設定したデフォルトマスクはニックネーム"
 "のホスト名がわかる場合のみ利用されます"
 
-msgid ""
-"decode/encode channel name inside messages using charset options; it is "
-"recommended to keep that off if you use only UTF-8 in channel names; you can "
-"enable this option if you are using an exotic charset like ISO in channel "
-"names"
-msgstr ""
-"文字セットオプションを使ってメッセージに含まれるチャンネル名をデコードおよび"
-"エンコードする; チャンネル名に UTF-8 を使っている場合のみこれを無効化しておく"
-"ことをおすすめします; チャンネル名に ISO などの文字セットを使っている場合には"
-"これを有効化します"
-
 msgid "when off, colors codes are ignored in incoming messages"
 msgstr "オフの場合、到着メッセージに含まれる色コードを無視"
 
@@ -10819,10 +10820,6 @@ msgstr "%s%s: ファイル \"%s\" をロードできません"
 msgid "%s%s: unable to execute file \"%s\""
 msgstr "%s%s: ファイル \"%s\" を実行できません"
 
-#, c-format
-msgid "%sCommand \"/%s eval\" is not yet implemented"
-msgstr "%sコマンド \"/%s eval\" はまだ実装されていません"
-
 msgid "Log buffers to files"
 msgstr "ファイルにバッファログを保存"
 
diff --git a/po/pl.po b/po/pl.po
index 48323d901..9fb6718c0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2019-09-21 07:54+0200\n"
-"PO-Revision-Date: 2019-09-07 15:45+0200\n"
+"POT-Creation-Date: 2019-09-22 18:49+0200\n"
+"PO-Revision-Date: 2019-09-22 18:54+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
 "Language: pl\n"
@@ -7178,6 +7178,10 @@ msgstr "%s: skrypt \"%s\" wyładowano"
 msgid "%s%s: script \"%s\" not loaded"
 msgstr "%s%s: skrypt \"%s\" nie załadowany"
 
+#, c-format
+msgid "%sCommand \"/%s eval\" is not yet implemented"
+msgstr "%sKomenda \"/%s eval\" nie jest jeszcze zaimplementowana"
+
 msgid "server"
 msgid_plural "servers"
 msgstr[0] "serwer"
@@ -9378,6 +9382,14 @@ msgstr ""
 "to 0 lub dowolna liczba pomiędzy 128 a 4096; ta opcja powinna być zmieniana "
 "tylko dla niestandardowych serwerów IRC, na przykład dla bramek jak bitlbee"
 
+msgid ""
+"part of the IRC message (received or sent) which is decoded/encoded to the "
+"target charset; message = the whole IRC message (default), channel = "
+"starting from the channel name only (if found, with fallback on text), text "
+"= starting from the text only (you should try this value if you have issues "
+"with the channel name encoding)"
+msgstr ""
+
 #, c-format
 msgid "%s%s: error adding server \"%s\""
 msgstr "%s%s: błąd podczas dodawania serwera \"%s\""
@@ -9874,17 +9886,6 @@ msgstr ""
 "się od \"~\", w przeciwnym wypadku jest ustawiany na \"*\"; domyślna maska "
 "używana jest tylko, kiedy WeeChat zna nazwę hosta dla nicka"
 
-msgid ""
-"decode/encode channel name inside messages using charset options; it is "
-"recommended to keep that off if you use only UTF-8 in channel names; you can "
-"enable this option if you are using an exotic charset like ISO in channel "
-"names"
-msgstr ""
-"dekodowanie/kodowanie nazwy kanału wewnątrz wiadomości za pomocą opcji "
-"charset; zaleca się nie włączanie jej w przypadku używania tylko nazw "
-"kanałów UTF-8; możesz włączyć tą opcję jeśli używasz egzotycznych kodowań "
-"jak ISO w nazwach kanałów"
-
 msgid "when off, colors codes are ignored in incoming messages"
 msgstr ""
 "kiedy wyłączone (off) kody kolorów są ignorowane w przychodzących "
@@ -10985,10 +10986,6 @@ msgstr "%s%s: nie można wczytać pliku \"%s\""
 msgid "%s%s: unable to execute file \"%s\""
 msgstr "%s%s: nie można wykonać pliku \"%s\""
 
-#, c-format
-msgid "%sCommand \"/%s eval\" is not yet implemented"
-msgstr "%sKomenda \"/%s eval\" nie jest jeszcze zaimplementowana"
-
 msgid "Log buffers to files"
 msgstr "Zapisuj bufory do plików"
 
diff --git a/po/pt.po b/po/pt.po
index cec414be9..b4b56b9d2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2019-09-21 07:54+0200\n"
-"PO-Revision-Date: 2019-05-13 21:32+0200\n"
+"POT-Creation-Date: 2019-09-22 18:49+0200\n"
+"PO-Revision-Date: 2019-09-22 18:54+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
 "Language: pt\n"
@@ -6837,6 +6837,10 @@ msgstr "%s: script \"%s\" descarregado"
 msgid "%s%s: script \"%s\" not loaded"
 msgstr "%s%s: script \"%s\" não carregado"
 
+#, fuzzy, c-format
+msgid "%sCommand \"/%s eval\" is not yet implemented"
+msgstr "%sA cor \"%s\" não está definida na paleta"
+
 msgid "server"
 msgid_plural "servers"
 msgstr[0] "servidor"
@@ -9028,6 +9032,14 @@ msgid ""
 "non-standard IRC servers, for example gateways like bitlbee"
 msgstr ""
 
+msgid ""
+"part of the IRC message (received or sent) which is decoded/encoded to the "
+"target charset; message = the whole IRC message (default), channel = "
+"starting from the channel name only (if found, with fallback on text), text "
+"= starting from the text only (you should try this value if you have issues "
+"with the channel name encoding)"
+msgstr ""
+
 #, c-format
 msgid "%s%s: error adding server \"%s\""
 msgstr "%s%s: erro ao adicionar ao servidor \"%s\""
@@ -9530,17 +9542,6 @@ msgstr ""
 "$user não começar por \"~\", caso contrário é definido como \"*\"; esta "
 "máscara só é usada se o WeeChat souber o host do nick"
 
-msgid ""
-"decode/encode channel name inside messages using charset options; it is "
-"recommended to keep that off if you use only UTF-8 in channel names; you can "
-"enable this option if you are using an exotic charset like ISO in channel "
-"names"
-msgstr ""
-"descodificar/codificar o nome do canal inserido em mensagens usando as "
-"opções de charset; é recomendado manter desativado se só usa UTF-8 nos nomes "
-"dos canais; pode ativar esta opção se usa um charset exótico, tal como ISO, "
-"nos nomes dos canais"
-
 msgid "when off, colors codes are ignored in incoming messages"
 msgstr "se desativado, os códigos de cor são ignorados nas mensagens recebidas"
 
@@ -10654,10 +10655,6 @@ msgstr "%s%s: não foi possível carregar o ficheiro \"%s\""
 msgid "%s%s: unable to execute file \"%s\""
 msgstr "%s%s: não foi possível executar o ficheiro \"%s\""
 
-#, fuzzy, c-format
-msgid "%sCommand \"/%s eval\" is not yet implemented"
-msgstr "%sA cor \"%s\" não está definida na paleta"
-
 msgid "Log buffers to files"
 msgstr "Registar buffers em ficheiros"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a191fb3a5..2f2a5840b 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: 2019-09-21 07:54+0200\n"
+"POT-Creation-Date: 2019-09-22 18:49+0200\n"
 "PO-Revision-Date: 2019-05-13 21:32+0200\n"
 "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6265,6 +6265,10 @@ msgstr "%s: script \"%s\" descarregado"
 msgid "%s%s: script \"%s\" not loaded"
 msgstr "%s%s: script \"%s\" não carregado"
 
+#, fuzzy, c-format
+msgid "%sCommand \"/%s eval\" is not yet implemented"
+msgstr "%sCor \"%s\" não está definida na palheta"
+
 msgid "server"
 msgid_plural "servers"
 msgstr[0] "servidor"
@@ -8034,6 +8038,14 @@ msgid ""
 "non-standard IRC servers, for example gateways like bitlbee"
 msgstr ""
 
+msgid ""
+"part of the IRC message (received or sent) which is decoded/encoded to the "
+"target charset; message = the whole IRC message (default), channel = "
+"starting from the channel name only (if found, with fallback on text), text "
+"= starting from the text only (you should try this value if you have issues "
+"with the channel name encoding)"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: error adding server \"%s\""
 msgstr "%s%s: erro ao criar servidor \"%s\""
@@ -8427,13 +8439,6 @@ msgid ""
 "knows the host for the nick"
 msgstr ""
 
-msgid ""
-"decode/encode channel name inside messages using charset options; it is "
-"recommended to keep that off if you use only UTF-8 in channel names; you can "
-"enable this option if you are using an exotic charset like ISO in channel "
-"names"
-msgstr ""
-
 msgid "when off, colors codes are ignored in incoming messages"
 msgstr ""
 "quando desligado, códigos de cores são ignorados em mensagens recebidas"
@@ -9518,10 +9523,6 @@ msgstr "%s%s: não foi possível carregar arquivo \"%s\""
 msgid "%s%s: unable to execute file \"%s\""
 msgstr "%s%s: não foi possível executar arquivo \"%s\""
 
-#, fuzzy, c-format
-msgid "%sCommand \"/%s eval\" is not yet implemented"
-msgstr "%sCor \"%s\" não está definida na palheta"
-
 #, fuzzy
 msgid "Log buffers to files"
 msgstr "arquivos de configuração"
diff --git a/po/ru.po b/po/ru.po
index b0c25eb3b..208e13ae2 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: 2019-09-21 07:54+0200\n"
+"POT-Creation-Date: 2019-09-22 18:49+0200\n"
 "PO-Revision-Date: 2019-05-13 21:32+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5657,6 +5657,10 @@ msgstr "Plugin \"%s\" выгружен.\n"
 msgid "%s%s: script \"%s\" not loaded"
 msgstr "%s сервер \"%s\" не найден\n"
 
+#, fuzzy, c-format
+msgid "%sCommand \"/%s eval\" is not yet implemented"
+msgstr "%sЦвет \"%s\" не определён в палитре"
+
 #, fuzzy
 msgid "server"
 msgid_plural "servers"
@@ -7638,6 +7642,14 @@ msgid ""
 "non-standard IRC servers, for example gateways like bitlbee"
 msgstr ""
 
+msgid ""
+"part of the IRC message (received or sent) which is decoded/encoded to the "
+"target charset; message = the whole IRC message (default), channel = "
+"starting from the channel name only (if found, with fallback on text), text "
+"= starting from the text only (you should try this value if you have issues "
+"with the channel name encoding)"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: error adding server \"%s\""
 msgstr "%s недостаточно памяти для сообщения в строке информации\n"
@@ -8020,13 +8032,6 @@ msgid ""
 "knows the host for the nick"
 msgstr ""
 
-msgid ""
-"decode/encode channel name inside messages using charset options; it is "
-"recommended to keep that off if you use only UTF-8 in channel names; you can "
-"enable this option if you are using an exotic charset like ISO in channel "
-"names"
-msgstr ""
-
 msgid "when off, colors codes are ignored in incoming messages"
 msgstr "когда выключено, цвета в исходящих сообщениях игнорируются"
 
@@ -9113,10 +9118,6 @@ msgstr "Не могу записать лог-файл \"%s\"\n"
 msgid "%s%s: unable to execute file \"%s\""
 msgstr "Не могу записать лог-файл \"%s\"\n"
 
-#, fuzzy, c-format
-msgid "%sCommand \"/%s eval\" is not yet implemented"
-msgstr "%sЦвет \"%s\" не определён в палитре"
-
 #, fuzzy
 msgid "Log buffers to files"
 msgstr "перезагрузить конфигурационный файл сервера"
diff --git a/po/tr.po b/po/tr.po
index 02668053e..893603149 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: 2019-09-21 07:54+0200\n"
+"POT-Creation-Date: 2019-09-22 18:49+0200\n"
 "PO-Revision-Date: 2019-05-13 21:32+0200\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5186,6 +5186,10 @@ msgstr ""
 msgid "%s%s: script \"%s\" not loaded"
 msgstr ""
 
+#, c-format
+msgid "%sCommand \"/%s eval\" is not yet implemented"
+msgstr ""
+
 msgid "server"
 msgid_plural "servers"
 msgstr[0] "sunucu(lar)"
@@ -6892,6 +6896,14 @@ msgid ""
 "non-standard IRC servers, for example gateways like bitlbee"
 msgstr ""
 
+msgid ""
+"part of the IRC message (received or sent) which is decoded/encoded to the "
+"target charset; message = the whole IRC message (default), channel = "
+"starting from the channel name only (if found, with fallback on text), text "
+"= starting from the text only (you should try this value if you have issues "
+"with the channel name encoding)"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: error adding server \"%s\""
 msgstr "%sFiltre eklenirken hata"
@@ -7255,13 +7267,6 @@ msgid ""
 "knows the host for the nick"
 msgstr ""
 
-msgid ""
-"decode/encode channel name inside messages using charset options; it is "
-"recommended to keep that off if you use only UTF-8 in channel names; you can "
-"enable this option if you are using an exotic charset like ISO in channel "
-"names"
-msgstr ""
-
 msgid "when off, colors codes are ignored in incoming messages"
 msgstr ""
 
@@ -8284,10 +8289,6 @@ msgstr ""
 msgid "%s%s: unable to execute file \"%s\""
 msgstr ""
 
-#, c-format
-msgid "%sCommand \"/%s eval\" is not yet implemented"
-msgstr ""
-
 msgid "Log buffers to files"
 msgstr ""
 
diff --git a/po/weechat.pot b/po/weechat.pot
index 0fc2cbbc9..c5dfda9f3 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: 2019-09-21 07:54+0200\n"
+"POT-Creation-Date: 2019-09-22 18:49+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"
@@ -5126,6 +5126,10 @@ msgstr ""
 msgid "%s%s: script \"%s\" not loaded"
 msgstr ""
 
+#, c-format
+msgid "%sCommand \"/%s eval\" is not yet implemented"
+msgstr ""
+
 msgid "server"
 msgid_plural "servers"
 msgstr[0] ""
@@ -6760,6 +6764,14 @@ msgid ""
 "non-standard IRC servers, for example gateways like bitlbee"
 msgstr ""
 
+msgid ""
+"part of the IRC message (received or sent) which is decoded/encoded to the "
+"target charset; message = the whole IRC message (default), channel = "
+"starting from the channel name only (if found, with fallback on text), text "
+"= starting from the text only (you should try this value if you have issues "
+"with the channel name encoding)"
+msgstr ""
+
 #, c-format
 msgid "%s%s: error adding server \"%s\""
 msgstr ""
@@ -7119,13 +7131,6 @@ msgid ""
 "knows the host for the nick"
 msgstr ""
 
-msgid ""
-"decode/encode channel name inside messages using charset options; it is "
-"recommended to keep that off if you use only UTF-8 in channel names; you can "
-"enable this option if you are using an exotic charset like ISO in channel "
-"names"
-msgstr ""
-
 msgid "when off, colors codes are ignored in incoming messages"
 msgstr ""
 
@@ -8149,10 +8154,6 @@ msgstr ""
 msgid "%s%s: unable to execute file \"%s\""
 msgstr ""
 
-#, c-format
-msgid "%sCommand \"/%s eval\" is not yet implemented"
-msgstr ""
-
 msgid "Log buffers to files"
 msgstr ""
 
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index ab88437c3..6a37b3213 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -5076,7 +5076,6 @@ irc_command_display_server (struct t_irc_server *server, int with_detail)
             weechat_printf (NULL, "  notify . . . . . . . : %s'%s'",
                             IRC_COLOR_CHAT_VALUE,
                             weechat_config_string (server->options[IRC_SERVER_OPTION_NOTIFY]));
-
         /* split_msg_max_length */
         if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SPLIT_MSG_MAX_LENGTH]))
             weechat_printf (NULL, "  split_msg_max_length :   (%d)",
@@ -5085,6 +5084,14 @@ irc_command_display_server (struct t_irc_server *server, int with_detail)
             weechat_printf (NULL, "  split_msg_max_length : %s%d",
                             IRC_COLOR_CHAT_VALUE,
                             weechat_config_integer (server->options[IRC_SERVER_OPTION_SPLIT_MSG_MAX_LENGTH]));
+        /* charset_message */
+        if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_CHARSET_MESSAGE]))
+            weechat_printf (NULL, "  charset_message. . . :   ('%s')",
+                            IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_CHARSET_MESSAGE));
+        else
+            weechat_printf (NULL, "  charset_message. . . : %s'%s'",
+                            IRC_COLOR_CHAT_VALUE,
+                            weechat_config_string (server->options[IRC_SERVER_OPTION_CHARSET_MESSAGE]));
     }
     else
     {
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index 119d2b3c5..2f79614f0 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -130,7 +130,6 @@ struct t_config_option *irc_config_color_topic_old;
 struct t_config_option *irc_config_network_autoreconnect_delay_growing;
 struct t_config_option *irc_config_network_autoreconnect_delay_max;
 struct t_config_option *irc_config_network_ban_mask_default;
-struct t_config_option *irc_config_network_channel_encode;
 struct t_config_option *irc_config_network_colors_receive;
 struct t_config_option *irc_config_network_colors_send;
 struct t_config_option *irc_config_network_lag_check;
@@ -2394,6 +2393,28 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 callback_change_data,
                 NULL, NULL, NULL);
             break;
+        case IRC_SERVER_OPTION_CHARSET_MESSAGE:
+            new_option = weechat_config_new_option (
+                config_file, section,
+                option_name, "integer",
+                N_("part of the IRC message (received or sent) which is "
+                   "decoded/encoded to the target charset; "
+                   "message = the whole IRC message (default), "
+                   "channel = starting from the channel name only "
+                   "(if found, with fallback on text), "
+                   "text = starting from the text only (you should try this "
+                   "value if you have issues with the channel name encoding)"),
+                "message|channel|text", 0, 0,
+                default_value, value,
+                null_value_allowed,
+                callback_check_value,
+                callback_check_value_pointer,
+                callback_check_value_data,
+                callback_change,
+                callback_change_pointer,
+                callback_change_data,
+                NULL, NULL, NULL);
+            break;
         case IRC_SERVER_NUM_OPTIONS:
             break;
     }
@@ -3271,15 +3292,6 @@ irc_config_init ()
             "default mask is used only if WeeChat knows the host for the nick"),
         NULL, 0, 0, "*!$ident@$host", NULL, 0,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-    irc_config_network_channel_encode = weechat_config_new_option (
-        irc_config_file, ptr_section,
-        "channel_encode", "boolean",
-        N_("decode/encode channel name inside messages using charset options; "
-           "it is recommended to keep that off if you use only UTF-8 in "
-           "channel names; you can enable this option if you are using an "
-           "exotic charset like ISO in channel names"),
-        NULL, 0, 0, "off", NULL, 0,
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
     irc_config_network_colors_receive = weechat_config_new_option (
         irc_config_file, ptr_section,
         "colors_receive", "boolean",
diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h
index b60be4737..36947c216 100644
--- a/src/plugins/irc/irc-config.h
+++ b/src/plugins/irc/irc-config.h
@@ -166,7 +166,6 @@ extern struct t_config_option *irc_config_color_topic_old;
 extern struct t_config_option *irc_config_network_autoreconnect_delay_growing;
 extern struct t_config_option *irc_config_network_autoreconnect_delay_max;
 extern struct t_config_option *irc_config_network_ban_mask_default;
-extern struct t_config_option *irc_config_network_channel_encode;
 extern struct t_config_option *irc_config_network_colors_receive;
 extern struct t_config_option *irc_config_network_colors_send;
 extern struct t_config_option *irc_config_network_lag_check;
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index 1b3737b99..57acf0436 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -119,6 +119,7 @@ char *irc_server_options[IRC_SERVER_NUM_OPTIONS][2] =
   { "msg_quit",             "WeeChat ${info:version}" },
   { "notify",               ""                        },
   { "split_msg_max_length", "512"                     },
+  { "charset_message",      "message"                 },
 };
 
 char *irc_server_casemapping_string[IRC_SERVER_NUM_CASEMAPPING] =
@@ -2499,10 +2500,19 @@ irc_server_send_one_msg (struct t_irc_server *server, int flags,
         msg_encoded = NULL;
         irc_message_parse (server, ptr_msg, NULL, NULL, NULL, NULL, NULL, NULL,
                            NULL, NULL, NULL, NULL, &pos_channel, &pos_text);
-        if (weechat_config_boolean (irc_config_network_channel_encode))
-            pos_encode = (pos_channel >= 0) ? pos_channel : pos_text;
-        else
-            pos_encode = pos_text;
+        switch (IRC_SERVER_OPTION_INTEGER(server,
+                                          IRC_SERVER_OPTION_CHARSET_MESSAGE))
+        {
+            case IRC_SERVER_CHARSET_MESSAGE_MESSAGE:
+                pos_encode = 0;
+                break;
+            case IRC_SERVER_CHARSET_MESSAGE_CHANNEL:
+                pos_encode = (pos_channel >= 0) ? pos_channel : pos_text;
+                break;
+            case IRC_SERVER_CHARSET_MESSAGE_TEXT:
+                pos_encode = pos_text;
+                break;
+        }
         if (pos_encode >= 0)
         {
             ptr_chan_nick = (channel) ? channel : nick;
@@ -3009,10 +3019,21 @@ irc_server_msgq_flush ()
                                                &pos_channel, &pos_text);
 
                             msg_decoded = NULL;
-                            if (weechat_config_boolean (irc_config_network_channel_encode))
-                                pos_decode = (pos_channel >= 0) ? pos_channel : pos_text;
-                            else
-                                pos_decode = pos_text;
+
+
+                            switch (IRC_SERVER_OPTION_INTEGER(irc_recv_msgq->server,
+                                                              IRC_SERVER_OPTION_CHARSET_MESSAGE))
+                            {
+                                case IRC_SERVER_CHARSET_MESSAGE_MESSAGE:
+                                    pos_decode = 0;
+                                    break;
+                                case IRC_SERVER_CHARSET_MESSAGE_CHANNEL:
+                                    pos_decode = (pos_channel >= 0) ? pos_channel : pos_text;
+                                    break;
+                                case IRC_SERVER_CHARSET_MESSAGE_TEXT:
+                                    pos_decode = pos_text;
+                                    break;
+                            }
                             if (pos_decode >= 0)
                             {
                                 /* convert charset for message */
diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h
index 2f55a15cd..680f406ed 100644
--- a/src/plugins/irc/irc-server.h
+++ b/src/plugins/irc/irc-server.h
@@ -42,6 +42,13 @@ enum t_irc_server_sasl_fail
     IRC_SERVER_NUM_SASL_FAIL,
 };
 
+enum t_irc_server_charset_message
+{
+    IRC_SERVER_CHARSET_MESSAGE_MESSAGE = 0,
+    IRC_SERVER_CHARSET_MESSAGE_CHANNEL,
+    IRC_SERVER_CHARSET_MESSAGE_TEXT,
+};
+
 enum t_irc_server_option
 {
     IRC_SERVER_OPTION_ADDRESSES = 0, /* server addresses (IP/name with port) */
@@ -85,6 +92,7 @@ enum t_irc_server_option
     IRC_SERVER_OPTION_MSG_QUIT,             /* default quit message          */
     IRC_SERVER_OPTION_NOTIFY,               /* notify list                   */
     IRC_SERVER_OPTION_SPLIT_MSG_MAX_LENGTH, /* max length of messages        */
+    IRC_SERVER_OPTION_CHARSET_MESSAGE,      /* what to decode/encode in msg  */
     /* number of server options */
     IRC_SERVER_NUM_OPTIONS,
 };