irc: add missing parameter "-server" in /help list (issue #1165)

20 files changed, 211 insertions, 132 deletions

diff --git a/doc/de/autogen/user/irc_commands.adoc b/doc/de/autogen/user/irc_commands.adoc
index a056cf653..c9dc50b80 100644
--- a/doc/de/autogen/user/irc_commands.adoc
+++ b/doc/de/autogen/user/irc_commands.adoc
@@ -386,11 +386,12 @@ server_mask: list of servers must match this mask
 * `+list+`: Channels mit ihrem Thema auflisten
 
 ----
-/list  [<channel>[,<channel>...]] [<target>] [-re <regex>]
+/list  [-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]
 
+ server: send to this server (internal name)
+  regex: POSIX extended regular expression used to filter results (case insensitive, can start by "(?-i)" to become case sensitive)
 channel: channel to list
  target: server name
-  regex: POSIX extended regular expression used to filter results (case insensitive, can start by "(?-i)" to become case sensitive)
 
 Examples:
   list all channels on server (can be very slow on large networks):
diff --git a/doc/en/autogen/user/irc_commands.adoc b/doc/en/autogen/user/irc_commands.adoc
index 441ec8933..ba2d5321c 100644
--- a/doc/en/autogen/user/irc_commands.adoc
+++ b/doc/en/autogen/user/irc_commands.adoc
@@ -386,11 +386,12 @@ server_mask: list of servers must match this mask
 * `+list+`: list channels and their topic
 
 ----
-/list  [<channel>[,<channel>...]] [<target>] [-re <regex>]
+/list  [-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]
 
+ server: send to this server (internal name)
+  regex: POSIX extended regular expression used to filter results (case insensitive, can start by "(?-i)" to become case sensitive)
 channel: channel to list
  target: server name
-  regex: POSIX extended regular expression used to filter results (case insensitive, can start by "(?-i)" to become case sensitive)
 
 Examples:
   list all channels on server (can be very slow on large networks):
diff --git a/doc/fr/autogen/user/irc_commands.adoc b/doc/fr/autogen/user/irc_commands.adoc
index cbd065ea1..c268d77b7 100644
--- a/doc/fr/autogen/user/irc_commands.adoc
+++ b/doc/fr/autogen/user/irc_commands.adoc
@@ -386,11 +386,12 @@ masque_serveur : liste des serveurs correspondant au masque
 * `+list+`: lister les canaux et leur titre
 
 ----
-/list  [<canal>[,<canal>...]] [<cible>] [-re <regex>]
+/list  [-server <serveur>] [-re <regex>] [<canal>[,<canal>...]] [<cible>]
 
- canal : canal à lister
- cible : nom du serveur
- regex : expression régulière POSIX étendue utilisée pour filtrer les résultats (insensible à la casse, peut commencer par "(?-i)" pour devenir sensible à la casse)
+serveur : envoyer à ce serveur (nom interne)
+  regex : expression régulière POSIX étendue utilisée pour filtrer les résultats (insensible à la casse, peut commencer par "(?-i)" pour devenir sensible à la casse)
+  canal : canal à lister
+  cible : nom du serveur
 
 Exemples :
   lister tous les canaux du serveur (peut être très lent pour les grands réseaux) :
diff --git a/doc/it/autogen/user/irc_commands.adoc b/doc/it/autogen/user/irc_commands.adoc
index 65a94dd1f..96c9437e9 100644
--- a/doc/it/autogen/user/irc_commands.adoc
+++ b/doc/it/autogen/user/irc_commands.adoc
@@ -386,11 +386,12 @@ server_mask: list of servers must match this mask
 * `+list+`: elenca i canali ed i loro argomenti
 
 ----
-/list  [<channel>[,<channel>...]] [<target>] [-re <regex>]
+/list  [-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]
 
+ server: send to this server (internal name)
+  regex: POSIX extended regular expression used to filter results (case insensitive, can start by "(?-i)" to become case sensitive)
 channel: channel to list
  target: server name
-  regex: POSIX extended regular expression used to filter results (case insensitive, can start by "(?-i)" to become case sensitive)
 
 Examples:
   list all channels on server (can be very slow on large networks):
diff --git a/doc/ja/autogen/user/irc_commands.adoc b/doc/ja/autogen/user/irc_commands.adoc
index 403583646..845306fe4 100644
--- a/doc/ja/autogen/user/irc_commands.adoc
+++ b/doc/ja/autogen/user/irc_commands.adoc
@@ -386,11 +386,12 @@ server_mask: list of servers must match this mask
 * `+list+`: チャンネルとトピックをリストアップ
 
 ----
-/list  [<channel>[,<channel>...]] [<target>] [-re <regex>]
+/list  [-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]
 
+ server: send to this server (internal name)
+  regex: POSIX extended regular expression used to filter results (case insensitive, can start by "(?-i)" to become case sensitive)
 channel: channel to list
  target: server name
-  regex: POSIX extended regular expression used to filter results (case insensitive, can start by "(?-i)" to become case sensitive)
 
 Examples:
   list all channels on server (can be very slow on large networks):
diff --git a/doc/pl/autogen/user/irc_commands.adoc b/doc/pl/autogen/user/irc_commands.adoc
index 38e0ee733..ca7ca18b7 100644
--- a/doc/pl/autogen/user/irc_commands.adoc
+++ b/doc/pl/autogen/user/irc_commands.adoc
@@ -386,11 +386,12 @@ server_mask: list of servers must match this mask
 * `+list+`: wyświetla kanały i ich tematy
 
 ----
-/list  [<channel>[,<channel>...]] [<target>] [-re <regex>]
+/list  [-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]
 
+ server: send to this server (internal name)
+  regex: POSIX extended regular expression used to filter results (case insensitive, can start by "(?-i)" to become case sensitive)
 channel: channel to list
  target: server name
-  regex: POSIX extended regular expression used to filter results (case insensitive, can start by "(?-i)" to become case sensitive)
 
 Examples:
   list all channels on server (can be very slow on large networks):
diff --git a/po/cs.po b/po/cs.po
index d75bdadd6..e8684867e 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: 2018-04-01 07:56+0200\n"
+"POT-Creation-Date: 2018-04-01 08:41+0200\n"
 "PO-Revision-Date: 2018-03-31 15:36+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6353,14 +6353,14 @@ msgid "%s%s: mask must begin with nick"
 msgstr "%s%s: maska musí začínat přezdívkou"
 
 #, c-format
-msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
-msgstr "%s%s: \"%s\" není validní regulární výraz (%s)"
-
-#, c-format
 msgid "%s%s: not enough memory for regular expression"
 msgstr "%s%s: nedostatek paměti pro regulární výraz"
 
 #, c-format
+msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
+msgstr "%s%s: \"%s\" není validní regulární výraz (%s)"
+
+#, c-format
 msgid ""
 "%s%s: you must specify channel for \"%s\" command if you're not in a channel"
 msgstr "%s%s: pokud nejste v kanálu, je ho třeba uvést pro příkaz \"%s\""
@@ -7077,15 +7077,16 @@ msgid "list channels and their topic"
 msgstr "vypsat kanály a jejich témata"
 
 #, fuzzy
-msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
-msgstr "[<kanál>[,<kanál>...]] [<server>] [-re <regexp>]"
+msgid "[-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]"
+msgstr "[-server <server>] [<kanál1>[,<kanál2>...]] [<klíč1>[,<klíč2>...]]"
 
 #, fuzzy
 msgid ""
-"channel: channel to list\n"
-" target: server name\n"
+" server: send to this server (internal name)\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
+"channel: channel to list\n"
+" target: server name\n"
 "\n"
 "Examples:\n"
 "  list all channels on server (can be very slow on large networks):\n"
@@ -12549,5 +12550,9 @@ msgstr "%s%s: vypršel časový limit \"%s\" pro %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nemohu se připojit\" neočekávaná chyba (%d)"
 
+#, fuzzy
+#~ msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
+#~ msgstr "[<kanál>[,<kanál>...]] [<server>] [-re <regexp>]"
+
 #~ msgid "<server1> [<server2>]"
 #~ msgstr "<server1> [<server2>]"
diff --git a/po/de.po b/po/de.po
index eaf48fa22..cffe6fd6f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-04-01 07:56+0200\n"
+"POT-Creation-Date: 2018-04-01 08:41+0200\n"
 "PO-Revision-Date: 2018-03-31 16:29+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -7776,14 +7776,14 @@ msgid "%s%s: mask must begin with nick"
 msgstr "%s%s: Die Maske muss mit einem Nick beginnen"
 
 #, c-format
-msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
-msgstr "%s%s: \"%s\" ist kein korrekter regulärer Ausdruck (%s)"
-
-#, c-format
 msgid "%s%s: not enough memory for regular expression"
 msgstr "%s%s: Nicht genügend Speicher für regulären Ausdruck vorhanden"
 
 #, c-format
+msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
+msgstr "%s%s: \"%s\" ist kein korrekter regulärer Ausdruck (%s)"
+
+#, c-format
 msgid ""
 "%s%s: you must specify channel for \"%s\" command if you're not in a channel"
 msgstr ""
@@ -8574,15 +8574,18 @@ msgid "list channels and their topic"
 msgstr "Channels mit ihrem Thema auflisten"
 
 #, fuzzy
-msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
-msgstr "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
+msgid "[-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]"
+msgstr ""
+"[-noswitch] [-server <server>] [<channel1>[,<channel2>...]] [<key1>[,"
+"<key2>...]]"
 
 #, fuzzy
 msgid ""
-"channel: channel to list\n"
-" target: server name\n"
+" server: send to this server (internal name)\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
+"channel: channel to list\n"
+" target: server name\n"
 "\n"
 "Examples:\n"
 "  list all channels on server (can be very slow on large networks):\n"
@@ -14617,5 +14620,9 @@ msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr ""
 "%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)"
 
+#, fuzzy
+#~ msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
+#~ msgstr "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
+
 #~ msgid "<server1> [<server2>]"
 #~ msgstr "<server1> [<server2>]"
diff --git a/po/es.po b/po/es.po
index 09ae2485e..93baf5e90 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: 2018-04-01 07:56+0200\n"
+"POT-Creation-Date: 2018-04-01 08:41+0200\n"
 "PO-Revision-Date: 2018-03-31 15:36+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6582,14 +6582,14 @@ msgid "%s%s: mask must begin with nick"
 msgstr "%s%s: la máscara debe empezar con el apodo"
 
 #, c-format
-msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
-msgstr "%s%s: \"%s\" no es una expresión regular válida (%s)"
-
-#, c-format
 msgid "%s%s: not enough memory for regular expression"
 msgstr "%s%s: no hay suficiente memoria para la expresión regular"
 
 #, c-format
+msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
+msgstr "%s%s: \"%s\" no es una expresión regular válida (%s)"
+
+#, c-format
 msgid ""
 "%s%s: you must specify channel for \"%s\" command if you're not in a channel"
 msgstr ""
@@ -7324,15 +7324,16 @@ msgid "list channels and their topic"
 msgstr "lista canales y sus temas"
 
 #, fuzzy
-msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
-msgstr "[<canal>[,<canal>...]] [<servidor>] [-re <regex>]"
+msgid "[-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]"
+msgstr "[-server <servidor>] [<canal1>[,<canal2>...]] [<clave1>[,<clave2>...]]"
 
 #, fuzzy
 msgid ""
-"channel: channel to list\n"
-" target: server name\n"
+" server: send to this server (internal name)\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
+"channel: channel to list\n"
+" target: server name\n"
 "\n"
 "Examples:\n"
 "  list all channels on server (can be very slow on large networks):\n"
@@ -12829,5 +12830,9 @@ msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: no es posible conectarse al transmisor"
 
+#, fuzzy
+#~ msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
+#~ msgstr "[<canal>[,<canal>...]] [<servidor>] [-re <regex>]"
+
 #~ msgid "<server1> [<server2>]"
 #~ msgstr "<servidor1> [<servidor2>]"
diff --git a/po/fr.po b/po/fr.po
index cb243f068..25246d461 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: 2018-04-01 07:56+0200\n"
-"PO-Revision-Date: 2018-04-01 07:59+0200\n"
+"POT-Creation-Date: 2018-04-01 08:41+0200\n"
+"PO-Revision-Date: 2018-04-01 08:43+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -7611,14 +7611,14 @@ msgid "%s%s: mask must begin with nick"
 msgstr "%s%s : le masque doit commencer par un pseudo"
 
 #, c-format
-msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
-msgstr "%s%s : \"%s\" n'est pas une expression régulière valide (%s)"
-
-#, c-format
 msgid "%s%s: not enough memory for regular expression"
 msgstr "%s%s : pas assez de mémoire pour l'expression régulière"
 
 #, c-format
+msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
+msgstr "%s%s : \"%s\" n'est pas une expression régulière valide (%s)"
+
+#, c-format
 msgid ""
 "%s%s: you must specify channel for \"%s\" command if you're not in a channel"
 msgstr ""
@@ -8391,14 +8391,15 @@ msgstr ""
 msgid "list channels and their topic"
 msgstr "lister les canaux et leur titre"
 
-msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
-msgstr "[<canal>[,<canal>...]] [<cible>] [-re <regex>]"
+msgid "[-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]"
+msgstr "[-server <serveur>] [-re <regex>] [<canal>[,<canal>...]] [<cible>]"
 
 msgid ""
-"channel: channel to list\n"
-" target: server name\n"
+" server: send to this server (internal name)\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
+"channel: channel to list\n"
+" target: server name\n"
 "\n"
 "Examples:\n"
 "  list all channels on server (can be very slow on large networks):\n"
@@ -8409,11 +8410,12 @@ msgid ""
 "networks):\n"
 "    /list -re #weechat.*"
 msgstr ""
-" canal : canal à lister\n"
-" cible : nom du serveur\n"
-" regex : expression régulière POSIX étendue utilisée pour filtrer les "
+"serveur : envoyer à ce serveur (nom interne)\n"
+"  regex : expression régulière POSIX étendue utilisée pour filtrer les "
 "résultats (insensible à la casse, peut commencer par \"(?-i)\" pour devenir "
 "sensible à la casse)\n"
+"  canal : canal à lister\n"
+"  cible : nom du serveur\n"
 "\n"
 "Exemples :\n"
 "  lister tous les canaux du serveur (peut être très lent pour les grands "
@@ -14314,5 +14316,8 @@ msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)"
 
+#~ msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
+#~ msgstr "[<canal>[,<canal>...]] [<cible>] [-re <regex>]"
+
 #~ msgid "<server1> [<server2>]"
 #~ msgstr "<serveur1> [<serveur2>]"
diff --git a/po/hu.po b/po/hu.po
index 08f8b60b3..bb5c5fb6b 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: 2018-04-01 07:56+0200\n"
+"POT-Creation-Date: 2018-04-01 08:41+0200\n"
 "PO-Revision-Date: 2018-03-31 15:36+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5870,13 +5870,13 @@ msgid "%s%s: mask must begin with nick"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
-msgstr "%s a(z) \"%s\" érvénytelen reguláris kifejezés (%s)\n"
-
-#, fuzzy, c-format
 msgid "%s%s: not enough memory for regular expression"
 msgstr "%s nincs elég memória a reguláris kifejezéshez\n"
 
+#, fuzzy, c-format
+msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
+msgstr "%s a(z) \"%s\" érvénytelen reguláris kifejezés (%s)\n"
+
 #, c-format
 msgid ""
 "%s%s: you must specify channel for \"%s\" command if you're not in a channel"
@@ -6518,14 +6518,15 @@ msgid "list channels and their topic"
 msgstr "szobák listája témájukkal együtt"
 
 #, fuzzy
-msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
-msgstr "[szoba[,szoba] [szerver]]"
+msgid "[-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]"
+msgstr "szoba[,szoba] [kulcs[,kulcs]]"
 
 msgid ""
-"channel: channel to list\n"
-" target: server name\n"
+" server: send to this server (internal name)\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
+"channel: channel to list\n"
+" target: server name\n"
 "\n"
 "Examples:\n"
 "  list all channels on server (can be very slow on large networks):\n"
@@ -11835,5 +11836,9 @@ 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 "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
+#~ msgstr "[szoba[,szoba] [szerver]]"
+
+#, fuzzy
 #~ msgid "<server1> [<server2>]"
 #~ msgstr "szerver1 [szerver2]"
diff --git a/po/it.po b/po/it.po
index f05a15df1..7c7373b95 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: 2018-04-01 07:56+0200\n"
+"POT-Creation-Date: 2018-04-01 08:41+0200\n"
 "PO-Revision-Date: 2018-03-31 15:36+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6757,14 +6757,14 @@ msgid "%s%s: mask must begin with nick"
 msgstr "%s%s: la mask deve iniziare col nick"
 
 #, c-format
-msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
-msgstr "%s%s: \"%s\" non è una espressione regolare valida (%s)"
-
-#, c-format
 msgid "%s%s: not enough memory for regular expression"
 msgstr "%s%s: memoria non sufficiente per l'espressione regolare"
 
 #, c-format
+msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
+msgstr "%s%s: \"%s\" non è una espressione regolare valida (%s)"
+
+#, c-format
 msgid ""
 "%s%s: you must specify channel for \"%s\" command if you're not in a channel"
 msgstr ""
@@ -7501,15 +7501,18 @@ msgid "list channels and their topic"
 msgstr "elenca i canali ed i loro argomenti"
 
 #, fuzzy
-msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
-msgstr "[<canale>[,<canale>...]] [<server>] [-re <regexp>]"
+msgid "[-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]"
+msgstr ""
+"[-noswitch] [-server <server>] [<canale1>[,<canale2>...]] [<chiave1>[,"
+"<chiave2>...]]"
 
 #, fuzzy
 msgid ""
-"channel: channel to list\n"
-" target: server name\n"
+" server: send to this server (internal name)\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
+"channel: channel to list\n"
+" target: server name\n"
 "\n"
 "Examples:\n"
 "  list all channels on server (can be very slow on large networks):\n"
@@ -13042,5 +13045,9 @@ msgstr "%s%s: timeout per \"%s\" con %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: impossibile connettersi al mittente"
 
+#, fuzzy
+#~ msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
+#~ msgstr "[<canale>[,<canale>...]] [<server>] [-re <regexp>]"
+
 #~ msgid "<server1> [<server2>]"
 #~ msgstr "<server1> [<server2>]"
diff --git a/po/ja.po b/po/ja.po
index 7720f58fe..9afae1c99 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: 2018-04-01 07:56+0200\n"
+"POT-Creation-Date: 2018-04-01 08:41+0200\n"
 "PO-Revision-Date: 2018-03-31 15:36+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -7280,14 +7280,14 @@ msgid "%s%s: mask must begin with nick"
 msgstr "%s%s: マスクはニックネームから始めてください"
 
 #, c-format
-msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
-msgstr "%s%s: \"%s\" は不正な正規表現です (%s)"
-
-#, c-format
 msgid "%s%s: not enough memory for regular expression"
 msgstr "%s%s: 正規表現用のメモリが足りません"
 
 #, c-format
+msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
+msgstr "%s%s: \"%s\" は不正な正規表現です (%s)"
+
+#, c-format
 msgid ""
 "%s%s: you must specify channel for \"%s\" command if you're not in a channel"
 msgstr ""
@@ -8047,15 +8047,18 @@ msgid "list channels and their topic"
 msgstr "チャンネルとトピックをリストアップ"
 
 #, fuzzy
-msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
-msgstr "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
+msgid "[-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]"
+msgstr ""
+"[-noswitch] [-server <server>] [<channel1>[,<channel2>...]] [<key1>[,"
+"<key2>...]]"
 
 #, fuzzy
 msgid ""
-"channel: channel to list\n"
-" target: server name\n"
+" server: send to this server (internal name)\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
+"channel: channel to list\n"
+" target: server name\n"
 "\n"
 "Examples:\n"
 "  list all channels on server (can be very slow on large networks):\n"
@@ -13776,5 +13779,9 @@ msgstr "%s%s: \"%s\" のタイムアウト %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: 接続できません: 未定義のエラー (%d)"
 
+#, fuzzy
+#~ msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
+#~ msgstr "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
+
 #~ msgid "<server1> [<server2>]"
 #~ msgstr "<server1> [<server2>]"
diff --git a/po/pl.po b/po/pl.po
index 55c573778..1c7a618c0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-04-01 07:56+0200\n"
+"POT-Creation-Date: 2018-04-01 08:41+0200\n"
 "PO-Revision-Date: 2018-03-31 15:36+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: Polish <>\n"
@@ -7419,14 +7419,14 @@ msgid "%s%s: mask must begin with nick"
 msgstr "%s%s: maska musi zaczynać się od nicka"
 
 #, c-format
-msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
-msgstr "%s%s: \"%s\" nie jest prawidłowym wyrażeniem regularnym (%s)"
-
-#, c-format
 msgid "%s%s: not enough memory for regular expression"
 msgstr "%s%s: za mało pamięci dla wyrażenia regularnego"
 
 #, c-format
+msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
+msgstr "%s%s: \"%s\" nie jest prawidłowym wyrażeniem regularnym (%s)"
+
+#, c-format
 msgid ""
 "%s%s: you must specify channel for \"%s\" command if you're not in a channel"
 msgstr ""
@@ -8190,15 +8190,18 @@ msgid "list channels and their topic"
 msgstr "wyświetla kanały i ich tematy"
 
 #, fuzzy
-msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
-msgstr "[<kanał>[,<kanał>...]] [<serwer>] [-re <regex>]"
+msgid "[-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]"
+msgstr ""
+"[-noswitch] [-server <serwer>] [<kanał1>[,<kanał2>...]] [<hasło1>[,"
+"<hasło2>...]]"
 
 #, fuzzy
 msgid ""
-"channel: channel to list\n"
-" target: server name\n"
+" server: send to this server (internal name)\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
+"channel: channel to list\n"
+" target: server name\n"
 "\n"
 "Examples:\n"
 "  list all channels on server (can be very slow on large networks):\n"
@@ -14006,5 +14009,9 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)"
 
+#, fuzzy
+#~ msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
+#~ msgstr "[<kanał>[,<kanał>...]] [<serwer>] [-re <regex>]"
+
 #~ msgid "<server1> [<server2>]"
 #~ msgstr "<serwer1> [<serwer2>]"
diff --git a/po/pt.po b/po/pt.po
index 6642436d2..d7b090860 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: 2018-04-01 07:56+0200\n"
+"POT-Creation-Date: 2018-04-01 08:41+0200\n"
 "PO-Revision-Date: 2018-03-31 15:36+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -7116,14 +7116,14 @@ msgid "%s%s: mask must begin with nick"
 msgstr "%s%s: máscara deve começar com um nick"
 
 #, c-format
-msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
-msgstr "%s%s: \"%s\" não é uma expressão regular válida (%s)"
-
-#, c-format
 msgid "%s%s: not enough memory for regular expression"
 msgstr "%s%s: memória insuficiente para a expressão regular"
 
 #, c-format
+msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
+msgstr "%s%s: \"%s\" não é uma expressão regular válida (%s)"
+
+#, c-format
 msgid ""
 "%s%s: you must specify channel for \"%s\" command if you're not in a channel"
 msgstr ""
@@ -7877,15 +7877,18 @@ msgid "list channels and their topic"
 msgstr "listar canais e respetivos tópicos"
 
 #, fuzzy
-msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
-msgstr "[<canal>[,<canal>...]] [servidor>] [-re <regex>]"
+msgid "[-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]"
+msgstr ""
+"[-noswitch] [-server <servidor>] [<canal1>[,<canal2>...]] [<chave1>[,"
+"<chave2>...]]"
 
 #, fuzzy
 msgid ""
-"channel: channel to list\n"
-" target: server name\n"
+" server: send to this server (internal name)\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
+"channel: channel to list\n"
+" target: server name\n"
 "\n"
 "Examples:\n"
 "  list all channels on server (can be very slow on large networks):\n"
@@ -13697,5 +13700,9 @@ msgstr "%s%s: tempo limite de \"%s\" com %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: não foi possível conectar: erro inesperado (%d)"
 
+#, fuzzy
+#~ msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
+#~ msgstr "[<canal>[,<canal>...]] [servidor>] [-re <regex>]"
+
 #~ msgid "<server1> [<server2>]"
 #~ msgstr "<servidor1> [<servidor2>]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a68c31a5e..4f0d0de38 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: 2018-04-01 07:56+0200\n"
+"POT-Creation-Date: 2018-04-01 08:41+0200\n"
 "PO-Revision-Date: 2018-03-31 15:37+0200\n"
 "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6530,11 +6530,11 @@ msgid "%s%s: mask must begin with nick"
 msgstr ""
 
 #, c-format
-msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
+msgid "%s%s: not enough memory for regular expression"
 msgstr ""
 
 #, c-format
-msgid "%s%s: not enough memory for regular expression"
+msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
 msgstr ""
 
 #, c-format
@@ -7115,14 +7115,15 @@ msgid "list channels and their topic"
 msgstr "listar canais e seus tópicos"
 
 #, fuzzy
-msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
-msgstr "[<canal>[,<canal>...]] [<servidor>] [-re <expressão_regular>]"
+msgid "[-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]"
+msgstr "<target> <tipo> [<argumentos>]"
 
 msgid ""
-"channel: channel to list\n"
-" target: server name\n"
+" server: send to this server (internal name)\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
+"channel: channel to list\n"
+" target: server name\n"
 "\n"
 "Examples:\n"
 "  list all channels on server (can be very slow on large networks):\n"
@@ -12295,5 +12296,9 @@ msgstr "%s%s: tempo esgotado para \"%s\" com %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: não foi possível conectar ao remetente"
 
+#, fuzzy
+#~ msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
+#~ msgstr "[<canal>[,<canal>...]] [<servidor>] [-re <expressão_regular>]"
+
 #~ msgid "<server1> [<server2>]"
 #~ msgstr "<server1> [<server2>]"
diff --git a/po/ru.po b/po/ru.po
index 8824e9a39..ee39ae1ee 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: 2018-04-01 07:56+0200\n"
+"POT-Creation-Date: 2018-04-01 08:41+0200\n"
 "PO-Revision-Date: 2018-03-31 15:37+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5909,13 +5909,13 @@ msgid "%s%s: mask must begin with nick"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
-msgstr "%s \"%s\" не является регулярным выражением (%s)\n"
-
-#, fuzzy, c-format
 msgid "%s%s: not enough memory for regular expression"
 msgstr "%s недостаточно памяти для регулярного выражения\n"
 
+#, fuzzy, c-format
+msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
+msgstr "%s \"%s\" не является регулярным выражением (%s)\n"
+
 #, c-format
 msgid ""
 "%s%s: you must specify channel for \"%s\" command if you're not in a channel"
@@ -6556,14 +6556,15 @@ msgid "list channels and their topic"
 msgstr "перечислить каналы и их темы"
 
 #, fuzzy
-msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
-msgstr "[канал[,канал] [сервер]]"
+msgid "[-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]"
+msgstr "канал[,канал] [ключ[,ключ]]"
 
 msgid ""
-"channel: channel to list\n"
-" target: server name\n"
+" server: send to this server (internal name)\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
+"channel: channel to list\n"
+" target: server name\n"
 "\n"
 "Examples:\n"
 "  list all channels on server (can be very slow on large networks):\n"
@@ -11867,5 +11868,9 @@ msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: не могу соединиться с отправителем\n"
 
 #, fuzzy
+#~ msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
+#~ msgstr "[канал[,канал] [сервер]]"
+
+#, fuzzy
 #~ msgid "<server1> [<server2>]"
 #~ msgstr "сервер1 [сервер2]"
diff --git a/po/tr.po b/po/tr.po
index 9aea93ef4..b260f7163 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: 2018-04-01 07:56+0200\n"
+"POT-Creation-Date: 2018-04-01 08:41+0200\n"
 "PO-Revision-Date: 2017-06-26 23:33+0200\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5429,11 +5429,11 @@ msgid "%s%s: mask must begin with nick"
 msgstr ""
 
 #, c-format
-msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
+msgid "%s%s: not enough memory for regular expression"
 msgstr ""
 
 #, c-format
-msgid "%s%s: not enough memory for regular expression"
+msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
 msgstr ""
 
 #, c-format
@@ -5997,14 +5997,16 @@ msgid "list channels and their topic"
 msgstr ""
 
 #, fuzzy
-msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
-msgstr "[<kanal>[,<kanal>...]] [<ileti>]"
+msgid "[-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]"
+msgstr ""
+"[-noswitch] [-server <sunucu>] [<kanal1>[,<kanal2>...]] [<tuş1>[,<tuş2>...]]"
 
 msgid ""
-"channel: channel to list\n"
-" target: server name\n"
+" server: send to this server (internal name)\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
+"channel: channel to list\n"
+" target: server name\n"
 "\n"
 "Examples:\n"
 "  list all channels on server (can be very slow on large networks):\n"
@@ -10810,3 +10812,7 @@ msgstr ""
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr ""
+
+#, fuzzy
+#~ msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
+#~ msgstr "[<kanal>[,<kanal>...]] [<ileti>]"
diff --git a/po/weechat.pot b/po/weechat.pot
index 4f3ba9fd1..8d60ac327 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: 2018-04-01 07:56+0200\n"
+"POT-Creation-Date: 2018-04-01 08:41+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"
@@ -5371,11 +5371,11 @@ msgid "%s%s: mask must begin with nick"
 msgstr ""
 
 #, c-format
-msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
+msgid "%s%s: not enough memory for regular expression"
 msgstr ""
 
 #, c-format
-msgid "%s%s: not enough memory for regular expression"
+msgid "%s%s: \"%s\" is not a valid regular expression (%s)"
 msgstr ""
 
 #, c-format
@@ -5929,14 +5929,15 @@ msgstr ""
 msgid "list channels and their topic"
 msgstr ""
 
-msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
+msgid "[-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]"
 msgstr ""
 
 msgid ""
-"channel: channel to list\n"
-" target: server name\n"
+" server: send to this server (internal name)\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
+"channel: channel to list\n"
+" target: server name\n"
 "\n"
 "Examples:\n"
 "  list all channels on server (can be very slow on large networks):\n"
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index e879242d5..a69482128 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -6581,13 +6581,14 @@ irc_command_init ()
     weechat_hook_command (
         "list",
         N_("list channels and their topic"),
-        N_("[<channel>[,<channel>...]] [<target>] "
-           "[-re <regex>]"),
-        N_("channel: channel to list\n"
-           " target: server name\n"
+        N_("[-server <server>] [-re <regex>] [<channel>[,<channel>...]] "
+           "[<target>]"),
+        N_(" server: send to this server (internal name)\n"
            "  regex: POSIX extended regular expression used to filter results "
            "(case insensitive, can start by \"(?-i)\" to become case "
            "sensitive)\n"
+           "channel: channel to list\n"
+           " target: server name\n"
            "\n"
            "Examples:\n"
            "  list all channels on server (can be very slow on large networks):\n"