irc: replace "server" by "target" in help of commands when the argument is not an internal WeeChat server (issue #1165)

13 files changed, 387 insertions, 243 deletions

diff --git a/po/cs.po b/po/cs.po
index dc2ef786c..d75bdadd6 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-03-31 15:55+0200\n"
+"POT-Creation-Date: 2018-04-01 07:56+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"
@@ -7061,11 +7061,13 @@ msgid "list all servernames which are known by the server answering the query"
 msgstr ""
 "vypsat všechny jména serverů, které jsou známy serveru odpovídajícím na query"
 
-msgid "[[<server>] <server_mask>]"
+#, fuzzy
+msgid "[[<target>] <server_mask>]"
 msgstr "[[<server>] <maska_serveru>]"
 
+#, fuzzy
 msgid ""
-"     server: this server should answer the query\n"
+"     target: this remote server should answer the query\n"
 "server_mask: list of servers must match this mask"
 msgstr ""
 "       server: tento server by měl odpovědět na query\n"
@@ -7074,13 +7076,14 @@ msgstr ""
 msgid "list channels and their topic"
 msgstr "vypsat kanály a jejich témata"
 
-msgid "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
+#, fuzzy
+msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
 msgstr "[<kanál>[,<kanál>...]] [<server>] [-re <regexp>]"
 
 #, fuzzy
 msgid ""
 "channel: channel to list\n"
-" server: server name\n"
+" target: server name\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
 "\n"
@@ -7341,12 +7344,14 @@ msgstr ""
 msgid "send a ping to server"
 msgstr "poslat ping serveru"
 
-msgid "<server1> [<server2>]"
-msgstr "<server1> [<server2>]"
+#, fuzzy
+msgid "<target1> [<target2>]"
+msgstr "[<maska> [<cíl>]]"
 
+#, fuzzy
 msgid ""
-"server1: server\n"
-"server2: forward ping to this server"
+"target1: server\n"
+"target2: forward ping to this server"
 msgstr ""
 "server1: server\n"
 "server2: přeposlat ping na tento server"
@@ -7603,11 +7608,13 @@ msgstr ""
 msgid "disconnect server links"
 msgstr "odpojit spojení serveru"
 
-msgid "<server> <comment>"
+#, fuzzy
+msgid "<target> <comment>"
 msgstr "<server> <komentář>"
 
+#, fuzzy
 msgid ""
-" server: server name\n"
+" target: server name\n"
 "comment: comment"
 msgstr ""
 "  server: jméno serveru\n"
@@ -7616,12 +7623,14 @@ msgstr ""
 msgid "query statistics about server"
 msgstr "dotázat se na statistiku o serveru"
 
-msgid "[<query> [<server>]]"
+#, fuzzy
+msgid "[<query> [<target>]]"
 msgstr "[<dotaz> [<server>]]"
 
+#, fuzzy
 msgid ""
 " query: c/h/i/k/l/m/o/y/u (see RFC1459)\n"
-"server: server name"
+"target: server name"
 msgstr ""
 " dotaz: c/h/i/k/l/m/o/y/u (viz. RFC1459)\n"
 "server: jméno serveru"
@@ -7708,11 +7717,13 @@ msgstr "seznam uživatelů přihlášených k serveru"
 msgid "give the version info of nick or server (current or specified)"
 msgstr "získat informace o verzi přezdívky nebo serveru (aktuální nebo určené)"
 
-msgid "[<server>|<nick>]"
+#, fuzzy
+msgid "[<target>|<nick>]"
 msgstr "[<server>|<přezdívka>]"
 
+#, fuzzy
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick"
 msgstr ""
 "server: jméno serveru\n"
@@ -7770,11 +7781,12 @@ msgstr ""
 msgid "query information about user(s)"
 msgstr "dotázat se na informace o uživateli (uživatelích)"
 
-msgid "[<server>] [<nick>[,<nick>...]]"
+#, fuzzy
+msgid "[<target>] [<nick>[,<nick>...]]"
 msgstr "[<server>] [<přezdívka>[,<přezdívka>...]]"
 
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick (may be a mask)\n"
 "\n"
 "Without argument, this command will do a whois on:\n"
@@ -12536,3 +12548,6 @@ 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 "<server1> [<server2>]"
+#~ msgstr "<server1> [<server2>]"
diff --git a/po/de.po b/po/de.po
index 5eae07735..eaf48fa22 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-03-31 15:55+0200\n"
+"POT-Creation-Date: 2018-04-01 07:56+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"
@@ -8558,11 +8558,13 @@ msgstr ""
 msgid "list all servernames which are known by the server answering the query"
 msgstr "alle Servernamen auflisten die dem antwortenden Server bekannt sind"
 
-msgid "[[<server>] <server_mask>]"
+#, fuzzy
+msgid "[[<target>] <server_mask>]"
 msgstr "[[<server>] <server_mask>]"
 
+#, fuzzy
 msgid ""
-"     server: this server should answer the query\n"
+"     target: this remote server should answer the query\n"
 "server_mask: list of servers must match this mask"
 msgstr ""
 "     server: dieser Server soll die Anfrage beantworten\n"
@@ -8571,12 +8573,14 @@ msgstr ""
 msgid "list channels and their topic"
 msgstr "Channels mit ihrem Thema auflisten"
 
-msgid "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
+#, fuzzy
+msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
 msgstr "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
 
+#, fuzzy
 msgid ""
 "channel: channel to list\n"
-" server: server name\n"
+" target: server name\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
 "\n"
@@ -8841,12 +8845,14 @@ msgstr ""
 msgid "send a ping to server"
 msgstr "sendet einen Ping an den Server"
 
-msgid "<server1> [<server2>]"
-msgstr "<server1> [<server2>]"
+#, fuzzy
+msgid "<target1> [<target2>]"
+msgstr "[<mask> [<target>]]"
 
+#, fuzzy
 msgid ""
-"server1: server\n"
-"server2: forward ping to this server"
+"target1: server\n"
+"target2: forward ping to this server"
 msgstr ""
 "server1: Server\n"
 "server2: Ping an diesen Server weiterleiten"
@@ -9111,11 +9117,13 @@ msgstr ""
 msgid "disconnect server links"
 msgstr "Verbindung zum Server trennen"
 
-msgid "<server> <comment>"
+#, fuzzy
+msgid "<target> <comment>"
 msgstr "<server> <comment>"
 
+#, fuzzy
 msgid ""
-" server: server name\n"
+" target: server name\n"
 "comment: comment"
 msgstr ""
 " server: Name des Servers\n"
@@ -9124,12 +9132,14 @@ msgstr ""
 msgid "query statistics about server"
 msgstr "Serverstatistik abfragen"
 
-msgid "[<query> [<server>]]"
+#, fuzzy
+msgid "[<query> [<target>]]"
 msgstr "[<query> [<server>]]"
 
+#, fuzzy
 msgid ""
 " query: c/h/i/k/l/m/o/y/u (see RFC1459)\n"
-"server: server name"
+"target: server name"
 msgstr ""
 " query: c/h/i/k/l/m/o/y/u (siehe RFC1459)\n"
 "server: Name des Servers"
@@ -9215,11 +9225,13 @@ msgstr ""
 "Versionsinformation des Nicknamen oder Servers ermitteln (des aktuellen oder "
 "angegebenen Nick/Server)"
 
-msgid "[<server>|<nick>]"
+#, fuzzy
+msgid "[<target>|<nick>]"
 msgstr "[<server>|<nick>]"
 
+#, fuzzy
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick"
 msgstr ""
 "server: Servername\n"
@@ -9275,11 +9287,13 @@ msgstr ""
 msgid "query information about user(s)"
 msgstr "Information über User abfragen"
 
-msgid "[<server>] [<nick>[,<nick>...]]"
+#, fuzzy
+msgid "[<target>] [<nick>[,<nick>...]]"
 msgstr "[<server>] [<nick>[,<nick>...]]"
 
+#, fuzzy
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick (may be a mask)\n"
 "\n"
 "Without argument, this command will do a whois on:\n"
@@ -14602,3 +14616,6 @@ 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 "<server1> [<server2>]"
+#~ msgstr "<server1> [<server2>]"
diff --git a/po/es.po b/po/es.po
index bbd737690..09ae2485e 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-03-31 15:55+0200\n"
+"POT-Creation-Date: 2018-04-01 07:56+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"
@@ -7308,11 +7308,13 @@ msgstr ""
 "lista todos los servidores conocidos por el servidor que responde a la "
 "consulta"
 
-msgid "[[<server>] <server_mask>]"
+#, fuzzy
+msgid "[[<target>] <server_mask>]"
 msgstr "[[<servidor>] <máscara>]"
 
+#, fuzzy
 msgid ""
-"     server: this server should answer the query\n"
+"     target: this remote server should answer the query\n"
 "server_mask: list of servers must match this mask"
 msgstr ""
 "servidor: este servidor debería responder a la consulta\n"
@@ -7321,13 +7323,14 @@ msgstr ""
 msgid "list channels and their topic"
 msgstr "lista canales y sus temas"
 
-msgid "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
+#, fuzzy
+msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
 msgstr "[<canal>[,<canal>...]] [<servidor>] [-re <regex>]"
 
 #, fuzzy
 msgid ""
 "channel: channel to list\n"
-" server: server name\n"
+" target: server name\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
 "\n"
@@ -7589,12 +7592,14 @@ msgstr ""
 msgid "send a ping to server"
 msgstr "enviar un ping al servidor"
 
-msgid "<server1> [<server2>]"
-msgstr "<servidor1> [<servidor2>]"
+#, fuzzy
+msgid "<target1> [<target2>]"
+msgstr "[<máscara> [<objectivo>]]"
 
+#, fuzzy
 msgid ""
-"server1: server\n"
-"server2: forward ping to this server"
+"target1: server\n"
+"target2: forward ping to this server"
 msgstr ""
 "servidor1: servidor\n"
 "servidor2: reenviar ping a este servidor"
@@ -7857,12 +7862,13 @@ msgstr ""
 msgid "disconnect server links"
 msgstr "desconectar los enlaces de servidor"
 
-msgid "<server> <comment>"
+#, fuzzy
+msgid "<target> <comment>"
 msgstr "<servidor> <comentario>"
 
 #, fuzzy
 msgid ""
-" server: server name\n"
+" target: server name\n"
 "comment: comment"
 msgstr ""
 "  servidor: nombre del servidor\n"
@@ -7871,12 +7877,14 @@ msgstr ""
 msgid "query statistics about server"
 msgstr "pedir estadísticas sobre el servidor"
 
-msgid "[<query> [<server>]]"
+#, fuzzy
+msgid "[<query> [<target>]]"
 msgstr "[<consulta> [<servidor>]]"
 
+#, fuzzy
 msgid ""
 " query: c/h/i/k/l/m/o/y/u (see RFC1459)\n"
-"server: server name"
+"target: server name"
 msgstr ""
 "consulta: c/h/i/k/l/m/o/y/u (ver RFC1459)\n"
 "servidor: nombre del servidor"
@@ -7968,11 +7976,13 @@ msgid "give the version info of nick or server (current or specified)"
 msgstr ""
 "da la información de versión del apodo o servidor (actual o especificado)"
 
-msgid "[<server>|<nick>]"
+#, fuzzy
+msgid "[<target>|<nick>]"
 msgstr "[<servidor>|<apodo>]"
 
+#, fuzzy
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick"
 msgstr ""
 "servidor: nombre de servidor\n"
@@ -8031,11 +8041,12 @@ msgstr ""
 msgid "query information about user(s)"
 msgstr "pedir información sobre el/los usuario(s)"
 
-msgid "[<server>] [<nick>[,<nick>...]]"
+#, fuzzy
+msgid "[<target>] [<nick>[,<nick>...]]"
 msgstr "[<servidor>] [<apodo>[,<apodo>...]]"
 
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick (may be a mask)\n"
 "\n"
 "Without argument, this command will do a whois on:\n"
@@ -12817,3 +12828,6 @@ 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 "<server1> [<server2>]"
+#~ msgstr "<servidor1> [<servidor2>]"
diff --git a/po/fr.po b/po/fr.po
index 0e321b260..cb243f068 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-03-31 15:55+0200\n"
-"PO-Revision-Date: 2018-03-31 15:57+0200\n"
+"POT-Creation-Date: 2018-04-01 07:56+0200\n"
+"PO-Revision-Date: 2018-04-01 07:59+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -8378,25 +8378,25 @@ msgid "list all servernames which are known by the server answering the query"
 msgstr ""
 "lister tous les noms de serveurs connus du serveur qui répondent à la requête"
 
-msgid "[[<server>] <server_mask>]"
-msgstr "[[<serveur>] <masque_serveur>]"
+msgid "[[<target>] <server_mask>]"
+msgstr "[[<cible>] <masque_serveur>]"
 
 msgid ""
-"     server: this server should answer the query\n"
+"     target: this remote server should answer the query\n"
 "server_mask: list of servers must match this mask"
 msgstr ""
-"       serveur : ce serveur doit répondre à la requête\n"
+"         cible : ce serveur doit répondre à la requête\n"
 "masque_serveur : liste des serveurs correspondant au masque"
 
 msgid "list channels and their topic"
 msgstr "lister les canaux et leur titre"
 
-msgid "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
-msgstr "[<canal>[,<canal>...]] [<serveur>] [-re <regex>]"
+msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
+msgstr "[<canal>[,<canal>...]] [<cible>] [-re <regex>]"
 
 msgid ""
 "channel: channel to list\n"
-" server: server name\n"
+" target: server name\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
 "\n"
@@ -8409,9 +8409,9 @@ msgid ""
 "networks):\n"
 "    /list -re #weechat.*"
 msgstr ""
-"  canal : canal à lister\n"
-"serveur : nom du serveur\n"
-"  regex : expression régulière POSIX étendue utilisée pour filtrer les "
+" canal : canal à lister\n"
+" cible : nom du serveur\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"
 "\n"
@@ -8659,15 +8659,15 @@ msgstr ""
 msgid "send a ping to server"
 msgstr "envoyer un ping au serveur"
 
-msgid "<server1> [<server2>]"
-msgstr "<serveur1> [<serveur2>]"
+msgid "<target1> [<target2>]"
+msgstr "<cible1> [<cible2>]"
 
 msgid ""
-"server1: server\n"
-"server2: forward ping to this server"
+"target1: server\n"
+"target2: forward ping to this server"
 msgstr ""
-"serveur1 : serveur\n"
-"serveur2 : faire suivre le ping à ce serveur"
+"cible1 : serveur\n"
+"cible2 : faire suivre le ping à ce serveur"
 
 msgid "answer to a ping message"
 msgstr "répondre à un message ping"
@@ -8924,28 +8924,28 @@ msgstr ""
 msgid "disconnect server links"
 msgstr "déconnecter les liens vers un serveur"
 
-msgid "<server> <comment>"
-msgstr "<serveur> <commentaire>"
+msgid "<target> <comment>"
+msgstr "<cible> <commentaire>"
 
 msgid ""
-" server: server name\n"
+" target: server name\n"
 "comment: comment"
 msgstr ""
-"    serveur : nom du serveur\n"
+"      cible : nom du serveur\n"
 "commentaire : commentaire"
 
 msgid "query statistics about server"
 msgstr "demander des statistiques sur le serveur"
 
-msgid "[<query> [<server>]]"
-msgstr "[<requête> [<serveur>]]"
+msgid "[<query> [<target>]]"
+msgstr "[<requête> [<cible>]]"
 
 msgid ""
 " query: c/h/i/k/l/m/o/y/u (see RFC1459)\n"
-"server: server name"
+"target: server name"
 msgstr ""
 "requête : c/h/i/k/l/m/o/y/u (voir la RFC1459)\n"
-"serveur : nom du serveur"
+"  cible : nom du serveur"
 
 msgid ""
 "give users who are on a host running an IRC server a message asking them to "
@@ -9026,15 +9026,15 @@ msgstr "liste des utilisateurs connectés au serveur"
 msgid "give the version info of nick or server (current or specified)"
 msgstr "retourner la version du pseudo ou du serveur (courant ou spécifié)"
 
-msgid "[<server>|<nick>]"
-msgstr "[<serveur>|<pseudo>]"
+msgid "[<target>|<nick>]"
+msgstr "[<cible>|<pseudo>]"
 
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick"
 msgstr ""
-"serveur : nom du serveur\n"
-" pseudo : pseudo"
+" cible : nom du serveur\n"
+"pseudo : pseudo"
 
 msgid "give voice to nick(s)"
 msgstr "donner la voix à/aux pseudo(s)"
@@ -9088,11 +9088,11 @@ msgstr ""
 msgid "query information about user(s)"
 msgstr "demander les informations sur le(s) utilisateur(s)"
 
-msgid "[<server>] [<nick>[,<nick>...]]"
-msgstr "[<serveur>] [<pseudo>[,<pseudo>...]]"
+msgid "[<target>] [<nick>[,<nick>...]]"
+msgstr "[<cible>] [<pseudo>[,<pseudo>...]]"
 
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick (may be a mask)\n"
 "\n"
 "Without argument, this command will do a whois on:\n"
@@ -9102,8 +9102,8 @@ msgid ""
 "If option irc.network.whois_double_nick is enabled, two nicks are sent (if "
 "only one nick is given), to get idle time in answer."
 msgstr ""
-"serveur : nom de serveur\n"
-" pseudo : pseudo (peut être un masque)\n"
+" cible : nom de serveur\n"
+"pseudo : pseudo (peut être un masque)\n"
 "\n"
 "Sans paramètre, cette commande effectuera un whois sur :\n"
 "- votre propre pseudo si le tampon est un serveur/canal\n"
@@ -14313,3 +14313,6 @@ 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 "<server1> [<server2>]"
+#~ msgstr "<serveur1> [<serveur2>]"
diff --git a/po/hu.po b/po/hu.po
index 704ac2c02..08f8b60b3 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-03-31 15:55+0200\n"
+"POT-Creation-Date: 2018-04-01 07:56+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"
@@ -6503,11 +6503,12 @@ msgstr ""
 "ismer"
 
 #, fuzzy
-msgid "[[<server>] <server_mask>]"
+msgid "[[<target>] <server_mask>]"
 msgstr "[[szerver] szerver_maszk]"
 
+#, fuzzy
 msgid ""
-"     server: this server should answer the query\n"
+"     target: this remote server should answer the query\n"
 "server_mask: list of servers must match this mask"
 msgstr ""
 "      szerver: ennek a szervernek a válaszát várjuk\n"
@@ -6517,12 +6518,12 @@ msgid "list channels and their topic"
 msgstr "szobák listája témájukkal együtt"
 
 #, fuzzy
-msgid "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
+msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
 msgstr "[szoba[,szoba] [szerver]]"
 
 msgid ""
 "channel: channel to list\n"
-" server: server name\n"
+" target: server name\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
 "\n"
@@ -6751,13 +6752,13 @@ msgid "send a ping to server"
 msgstr "szerver pingelése"
 
 #, fuzzy
-msgid "<server1> [<server2>]"
-msgstr "szerver1 [szerver2]"
+msgid "<target1> [<target2>]"
+msgstr "[maszk [cél]]"
 
 #, fuzzy
 msgid ""
-"server1: server\n"
-"server2: forward ping to this server"
+"target1: server\n"
+"target2: forward ping to this server"
 msgstr ""
 "szerver1: pingelni kívánt szerver\n"
 "szerver2: ping továbbítása erre a szerverre"
@@ -7034,12 +7035,12 @@ msgid "disconnect server links"
 msgstr "szerver linkek lecsatlakoztatása"
 
 #, fuzzy
-msgid "<server> <comment>"
+msgid "<target> <comment>"
 msgstr "szerver megjegyzés"
 
 #, fuzzy
 msgid ""
-" server: server name\n"
+" target: server name\n"
 "comment: comment"
 msgstr ""
 "   szerver: szerver neve\n"
@@ -7049,12 +7050,13 @@ msgid "query statistics about server"
 msgstr "szerver statisztika lekérdezése"
 
 #, fuzzy
-msgid "[<query> [<server>]]"
+msgid "[<query> [<target>]]"
 msgstr "[kérdés [szerver]]"
 
+#, fuzzy
 msgid ""
 " query: c/h/i/k/l/m/o/y/u (see RFC1459)\n"
-"server: server name"
+"target: server name"
 msgstr ""
 " kérdés: c/h/i/k/l/m/o/y/u (lásd RFC1459)\n"
 "szerver: szerver neve"
@@ -7149,12 +7151,12 @@ msgstr ""
 "megadott)"
 
 #, fuzzy
-msgid "[<server>|<nick>]"
+msgid "[<target>|<nick>]"
 msgstr "[szerver | név]"
 
 #, fuzzy
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick"
 msgstr ""
 "szerver: szerver neve\n"
@@ -7219,11 +7221,11 @@ msgid "query information about user(s)"
 msgstr "felhasználó(k) információjának lekérdezése"
 
 #, fuzzy
-msgid "[<server>] [<nick>[,<nick>...]]"
+msgid "[<target>] [<nick>[,<nick>...]]"
 msgstr "[szerver] felhasználó[,felhasználó]"
 
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick (may be a mask)\n"
 "\n"
 "Without argument, this command will do a whois on:\n"
@@ -11831,3 +11833,7 @@ 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 "<server1> [<server2>]"
+#~ msgstr "szerver1 [szerver2]"
diff --git a/po/it.po b/po/it.po
index b9acce7a6..f05a15df1 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-03-31 15:55+0200\n"
+"POT-Creation-Date: 2018-04-01 07:56+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"
@@ -7485,11 +7485,13 @@ msgid "list all servernames which are known by the server answering the query"
 msgstr ""
 "elenca tutti i nomi server conosciuti dal server che risponde alla richiesta"
 
-msgid "[[<server>] <server_mask>]"
+#, fuzzy
+msgid "[[<target>] <server_mask>]"
 msgstr "[[<server>] <mask_server>]"
 
+#, fuzzy
 msgid ""
-"     server: this server should answer the query\n"
+"     target: this remote server should answer the query\n"
 "server_mask: list of servers must match this mask"
 msgstr ""
 "     server: questo server dovrebbe rispondere alla richiesta\n"
@@ -7498,13 +7500,14 @@ msgstr ""
 msgid "list channels and their topic"
 msgstr "elenca i canali ed i loro argomenti"
 
-msgid "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
+#, fuzzy
+msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
 msgstr "[<canale>[,<canale>...]] [<server>] [-re <regexp>]"
 
 #, fuzzy
 msgid ""
 "channel: channel to list\n"
-" server: server name\n"
+" target: server name\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
 "\n"
@@ -7765,12 +7768,14 @@ msgstr ""
 msgid "send a ping to server"
 msgstr "invia un ping al server"
 
-msgid "<server1> [<server2>]"
-msgstr "<server1> [<server2>]"
+#, fuzzy
+msgid "<target1> [<target2>]"
+msgstr "[<mask> [<destinazione>]]"
 
+#, fuzzy
 msgid ""
-"server1: server\n"
-"server2: forward ping to this server"
+"target1: server\n"
+"target2: forward ping to this server"
 msgstr ""
 "server1: server su cui effettuare il ping\n"
 "server2: reindirizza il ping a questo server"
@@ -8031,12 +8036,13 @@ msgstr ""
 msgid "disconnect server links"
 msgstr "disconnette collegamenti al server"
 
-msgid "<server> <comment>"
+#, fuzzy
+msgid "<target> <comment>"
 msgstr "<server> <commento>"
 
 #, fuzzy
 msgid ""
-" server: server name\n"
+" target: server name\n"
 "comment: comment"
 msgstr ""
 "  server: nome server\n"
@@ -8045,12 +8051,14 @@ msgstr ""
 msgid "query statistics about server"
 msgstr "richiede statistiche sul server"
 
-msgid "[<query> [<server>]]"
+#, fuzzy
+msgid "[<query> [<target>]]"
 msgstr "[<query> [<server>]]"
 
+#, fuzzy
 msgid ""
 " query: c/h/i/k/l/m/o/y/u (see RFC1459)\n"
-"server: server name"
+"target: server name"
 msgstr ""
 " query: c/h/i/k/l/m/o/y/u (per info RFC1459)\n"
 "server: nome server"
@@ -8143,11 +8151,13 @@ msgstr ""
 "riceve informazioni di versione del nick o del server (corrente o "
 "specificato)"
 
-msgid "[<server>|<nick>]"
+#, fuzzy
+msgid "[<target>|<nick>]"
 msgstr "[<server>|<nick>]"
 
+#, fuzzy
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick"
 msgstr ""
 "server: nome server\n"
@@ -8206,11 +8216,12 @@ msgstr ""
 msgid "query information about user(s)"
 msgstr "richiedi informazioni su uno o più utenti"
 
-msgid "[<server>] [<nick>[,<nick>...]]"
+#, fuzzy
+msgid "[<target>] [<nick>[,<nick>...]]"
 msgstr "[<server>] [<nick>[,<nick>...]]"
 
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick (may be a mask)\n"
 "\n"
 "Without argument, this command will do a whois on:\n"
@@ -13030,3 +13041,6 @@ 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 "<server1> [<server2>]"
+#~ msgstr "<server1> [<server2>]"
diff --git a/po/ja.po b/po/ja.po
index 5981a77ad..7720f58fe 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-03-31 15:55+0200\n"
+"POT-Creation-Date: 2018-04-01 07:56+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/"
@@ -8031,11 +8031,13 @@ msgstr ""
 msgid "list all servernames which are known by the server answering the query"
 msgstr "このクエリに応答するサーバが知っている全てのサーバ名をリストアップ"
 
-msgid "[[<server>] <server_mask>]"
+#, fuzzy
+msgid "[[<target>] <server_mask>]"
 msgstr "[[<server>] <server_mask>]"
 
+#, fuzzy
 msgid ""
-"     server: this server should answer the query\n"
+"     target: this remote server should answer the query\n"
 "server_mask: list of servers must match this mask"
 msgstr ""
 "     server: このクエリに応答するべきサーバ\n"
@@ -8044,12 +8046,14 @@ msgstr ""
 msgid "list channels and their topic"
 msgstr "チャンネルとトピックをリストアップ"
 
-msgid "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
+#, fuzzy
+msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
 msgstr "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
 
+#, fuzzy
 msgid ""
 "channel: channel to list\n"
-" server: server name\n"
+" target: server name\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
 "\n"
@@ -8306,12 +8310,14 @@ msgstr ""
 msgid "send a ping to server"
 msgstr "サーバにピンを送信"
 
-msgid "<server1> [<server2>]"
-msgstr "<server1> [<server2>]"
+#, fuzzy
+msgid "<target1> [<target2>]"
+msgstr "[<mask> [<target>]]"
 
+#, fuzzy
 msgid ""
-"server1: server\n"
-"server2: forward ping to this server"
+"target1: server\n"
+"target2: forward ping to this server"
 msgstr ""
 "server1: サーバ\n"
 "server2: このサーバにピンを転送"
@@ -8565,11 +8571,13 @@ msgstr ""
 msgid "disconnect server links"
 msgstr "サーバリンクを切断"
 
-msgid "<server> <comment>"
+#, fuzzy
+msgid "<target> <comment>"
 msgstr "<server> <comment>"
 
+#, fuzzy
 msgid ""
-" server: server name\n"
+" target: server name\n"
 "comment: comment"
 msgstr ""
 " server: サーバ名\n"
@@ -8578,12 +8586,14 @@ msgstr ""
 msgid "query statistics about server"
 msgstr "サーバに関するクエリ統計"
 
-msgid "[<query> [<server>]]"
+#, fuzzy
+msgid "[<query> [<target>]]"
 msgstr "[<query> [<server>]]"
 
+#, fuzzy
 msgid ""
 " query: c/h/i/k/l/m/o/y/u (see RFC1459)\n"
-"server: server name"
+"target: server name"
 msgstr ""
 " query: c/h/i/k/l/m/o/y/u (RFC1459 を参照してください)\n"
 "server: サーバ名"
@@ -8668,11 +8678,13 @@ msgid "give the version info of nick or server (current or specified)"
 msgstr ""
 "ニックネームかサーバのバージョン情報を取得 (現在のサーバか指定したサーバ)"
 
-msgid "[<server>|<nick>]"
+#, fuzzy
+msgid "[<target>|<nick>]"
 msgstr "[<server>|<nick>]"
 
+#, fuzzy
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick"
 msgstr ""
 "server: サーバ名\n"
@@ -8729,11 +8741,13 @@ msgstr ""
 msgid "query information about user(s)"
 msgstr "ユーザに関する情報を要求"
 
-msgid "[<server>] [<nick>[,<nick>...]]"
+#, fuzzy
+msgid "[<target>] [<nick>[,<nick>...]]"
 msgstr "[<server>] [<nick>[,<nick>...]]"
 
+#, fuzzy
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick (may be a mask)\n"
 "\n"
 "Without argument, this command will do a whois on:\n"
@@ -13761,3 +13775,6 @@ msgstr "%s%s: \"%s\" のタイムアウト %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: 接続できません: 未定義のエラー (%d)"
+
+#~ msgid "<server1> [<server2>]"
+#~ msgstr "<server1> [<server2>]"
diff --git a/po/pl.po b/po/pl.po
index b1520cfda..55c573778 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-03-31 15:55+0200\n"
+"POT-Creation-Date: 2018-04-01 07:56+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"
@@ -8174,11 +8174,13 @@ msgstr ""
 "wyświetla wszystkie nazwy serwerów, które są połączone z tym samym serwerem "
 "co my"
 
-msgid "[[<server>] <server_mask>]"
+#, fuzzy
+msgid "[[<target>] <server_mask>]"
 msgstr "[[<serwer>] <maska_serwera>]"
 
+#, fuzzy
 msgid ""
-"     server: this server should answer the query\n"
+"     target: this remote server should answer the query\n"
 "server_mask: list of servers must match this mask"
 msgstr ""
 "     serwer: ten serwer powinien odpowiedzieć na zapytanie\n"
@@ -8187,12 +8189,14 @@ msgstr ""
 msgid "list channels and their topic"
 msgstr "wyświetla kanały i ich tematy"
 
-msgid "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
+#, fuzzy
+msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
 msgstr "[<kanał>[,<kanał>...]] [<serwer>] [-re <regex>]"
 
+#, fuzzy
 msgid ""
 "channel: channel to list\n"
-" server: server name\n"
+" target: server name\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
 "\n"
@@ -8452,12 +8456,14 @@ msgstr ""
 msgid "send a ping to server"
 msgstr "wyślij ping do serwera"
 
-msgid "<server1> [<server2>]"
-msgstr "<serwer1> [<serwer2>]"
+#, fuzzy
+msgid "<target1> [<target2>]"
+msgstr "[<maska> [<cel>]]"
 
+#, fuzzy
 msgid ""
-"server1: server\n"
-"server2: forward ping to this server"
+"target1: server\n"
+"target2: forward ping to this server"
 msgstr ""
 "serwer1: serwer\n"
 "serwer2: przekieruj ping do tego serwera"
@@ -8716,11 +8722,13 @@ msgstr ""
 msgid "disconnect server links"
 msgstr "rozłącza od podłączonych serwerów"
 
-msgid "<server> <comment>"
+#, fuzzy
+msgid "<target> <comment>"
 msgstr "<serwer> <komentarz>"
 
+#, fuzzy
 msgid ""
-" server: server name\n"
+" target: server name\n"
 "comment: comment"
 msgstr ""
 " serwer: nazwa serwera\n"
@@ -8729,12 +8737,14 @@ msgstr ""
 msgid "query statistics about server"
 msgstr "zapytanie o statystyki serwera"
 
-msgid "[<query> [<server>]]"
+#, fuzzy
+msgid "[<query> [<target>]]"
 msgstr "[<zapytanie> [<serwer>]]"
 
+#, fuzzy
 msgid ""
 " query: c/h/i/k/l/m/o/y/u (see RFC1459)\n"
-"server: server name"
+"target: server name"
 msgstr ""
 " zapytanie: c/h/i/k/l/m/o/y/u (zobacz RFC1459)\n"
 "serwer: nazwa serwera"
@@ -8822,11 +8832,13 @@ msgid "give the version info of nick or server (current or specified)"
 msgstr ""
 "podaje informację o wersji nicka lub serwera (obecnego lub określonego)"
 
-msgid "[<server>|<nick>]"
+#, fuzzy
+msgid "[<target>|<nick>]"
 msgstr "[<serwer>|<nick>]"
 
+#, fuzzy
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick"
 msgstr ""
 "serwer: nazwa serwera\n"
@@ -8884,11 +8896,13 @@ msgstr ""
 msgid "query information about user(s)"
 msgstr "zapytanie o informacje o użytkowniku(ach)"
 
-msgid "[<server>] [<nick>[,<nick>...]]"
+#, fuzzy
+msgid "[<target>] [<nick>[,<nick>...]]"
 msgstr "[<serwer>] [<nick>[,<nick>...]]"
 
+#, fuzzy
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick (may be a mask)\n"
 "\n"
 "Without argument, this command will do a whois on:\n"
@@ -13991,3 +14005,6 @@ 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 "<server1> [<server2>]"
+#~ msgstr "<serwer1> [<serwer2>]"
diff --git a/po/pt.po b/po/pt.po
index f28f4db01..6642436d2 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-03-31 15:55+0200\n"
+"POT-Creation-Date: 2018-04-01 07:56+0200\n"
 "PO-Revision-Date: 2018-03-31 15:36+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -7861,11 +7861,13 @@ msgstr ""
 msgid "list all servernames which are known by the server answering the query"
 msgstr "listar todos os servidores conhecidos pelo servidor consultado"
 
-msgid "[[<server>] <server_mask>]"
+#, fuzzy
+msgid "[[<target>] <server_mask>]"
 msgstr "[[<servidor>] <máscara_servidor>]"
 
+#, fuzzy
 msgid ""
-"     server: this server should answer the query\n"
+"     target: this remote server should answer the query\n"
 "server_mask: list of servers must match this mask"
 msgstr ""
 "        servidor: consultar este servidor\n"
@@ -7874,12 +7876,14 @@ msgstr ""
 msgid "list channels and their topic"
 msgstr "listar canais e respetivos tópicos"
 
-msgid "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
+#, fuzzy
+msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
 msgstr "[<canal>[,<canal>...]] [servidor>] [-re <regex>]"
 
+#, fuzzy
 msgid ""
 "channel: channel to list\n"
-" server: server name\n"
+" target: server name\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
 "\n"
@@ -8139,12 +8143,14 @@ msgstr ""
 msgid "send a ping to server"
 msgstr "enviar um ping ao servidor"
 
-msgid "<server1> [<server2>]"
-msgstr "<servidor1> [<servidor2>]"
+#, fuzzy
+msgid "<target1> [<target2>]"
+msgstr "[<máscara> [<destino>]]"
 
+#, fuzzy
 msgid ""
-"server1: server\n"
-"server2: forward ping to this server"
+"target1: server\n"
+"target2: forward ping to this server"
 msgstr ""
 "servidor1: servidor\n"
 "servidor2: reencaminhar ping para este servidor"
@@ -8402,11 +8408,13 @@ msgstr ""
 msgid "disconnect server links"
 msgstr "desconectar links do servidor"
 
-msgid "<server> <comment>"
+#, fuzzy
+msgid "<target> <comment>"
 msgstr "<servidor> <comentário>"
 
+#, fuzzy
 msgid ""
-" server: server name\n"
+" target: server name\n"
 "comment: comment"
 msgstr ""
 "  servidor: nome do servidor\n"
@@ -8415,12 +8423,14 @@ msgstr ""
 msgid "query statistics about server"
 msgstr "consultar estatísticas sobre o servidor"
 
-msgid "[<query> [<server>]]"
+#, fuzzy
+msgid "[<query> [<target>]]"
 msgstr "[<consulta> [<servidor>]]"
 
+#, fuzzy
 msgid ""
 " query: c/h/i/k/l/m/o/y/u (see RFC1459)\n"
-"server: server name"
+"target: server name"
 msgstr ""
 "consulta: c/h/i/k/l/m/o/y/u (ver RFC1459)\n"
 "servidor: nome do servidor"
@@ -8509,11 +8519,13 @@ msgstr "lista de utilizadores conectados ao servidor"
 msgid "give the version info of nick or server (current or specified)"
 msgstr "obter a versão do nick ou do servidor (atual ou especificado)"
 
-msgid "[<server>|<nick>]"
+#, fuzzy
+msgid "[<target>|<nick>]"
 msgstr "[<servidor>|<nick>]"
 
+#, fuzzy
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick"
 msgstr ""
 "servidor: nome do servidor\n"
@@ -8571,11 +8583,13 @@ msgstr ""
 msgid "query information about user(s)"
 msgstr "consultar informação sobre utilizadores"
 
-msgid "[<server>] [<nick>[,<nick>...]]"
+#, fuzzy
+msgid "[<target>] [<nick>[,<nick>...]]"
 msgstr "[<servidor>] [<nick>[,<nick>...]]"
 
+#, fuzzy
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick (may be a mask)\n"
 "\n"
 "Without argument, this command will do a whois on:\n"
@@ -13682,3 +13696,6 @@ 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 "<server1> [<server2>]"
+#~ msgstr "<servidor1> [<servidor2>]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4cfd0596c..a68c31a5e 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-03-31 15:55+0200\n"
+"POT-Creation-Date: 2018-04-01 07:56+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"
@@ -7102,23 +7102,25 @@ msgstr ""
 "listar todos os nomes de servidores que são conhecidos pelo servidor "
 "respondendo a pergunta"
 
-msgid "[[<server>] <server_mask>]"
+#, fuzzy
+msgid "[[<target>] <server_mask>]"
 msgstr "[[<servidor>] <máscara_do_servidor>]"
 
 msgid ""
-"     server: this server should answer the query\n"
+"     target: this remote server should answer the query\n"
 "server_mask: list of servers must match this mask"
 msgstr ""
 
 msgid "list channels and their topic"
 msgstr "listar canais e seus tópicos"
 
-msgid "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
+#, fuzzy
+msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
 msgstr "[<canal>[,<canal>...]] [<servidor>] [-re <expressão_regular>]"
 
 msgid ""
 "channel: channel to list\n"
-" server: server name\n"
+" target: server name\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
 "\n"
@@ -7307,12 +7309,14 @@ msgstr ""
 msgid "send a ping to server"
 msgstr "enviar um ping para o servidor"
 
-msgid "<server1> [<server2>]"
-msgstr "<server1> [<server2>]"
+#, fuzzy
+msgid "<target1> [<target2>]"
+msgstr "[<máscara> [<target>]]"
 
+#, fuzzy
 msgid ""
-"server1: server\n"
-"server2: forward ping to this server"
+"target1: server\n"
+"target2: forward ping to this server"
 msgstr ""
 "server1: servidor\n"
 "server2: redireciona ping para o servidor"
@@ -7512,23 +7516,24 @@ msgstr ""
 msgid "disconnect server links"
 msgstr ""
 
-msgid "<server> <comment>"
+msgid "<target> <comment>"
 msgstr ""
 
 msgid ""
-" server: server name\n"
+" target: server name\n"
 "comment: comment"
 msgstr ""
 
 msgid "query statistics about server"
 msgstr ""
 
-msgid "[<query> [<server>]]"
-msgstr ""
+#, fuzzy
+msgid "[<query> [<target>]]"
+msgstr "[<máscara> [<target>]]"
 
 msgid ""
 " query: c/h/i/k/l/m/o/y/u (see RFC1459)\n"
-"server: server name"
+"target: server name"
 msgstr ""
 
 msgid ""
@@ -7603,11 +7608,13 @@ msgstr "lista os usuários logados no servidor"
 msgid "give the version info of nick or server (current or specified)"
 msgstr "mostra a versão do nick ou servidor (corrent ou especificado)"
 
-msgid "[<server>|<nick>]"
+#, fuzzy
+msgid "[<target>|<nick>]"
 msgstr "[<server>|<nick>]"
 
+#, fuzzy
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick"
 msgstr ""
 "server: nome do servidor\n"
@@ -7664,11 +7671,11 @@ msgid "query information about user(s)"
 msgstr "requisitar informações sobre usuário(s)"
 
 #, fuzzy
-msgid "[<server>] [<nick>[,<nick>...]]"
+msgid "[<target>] [<nick>[,<nick>...]]"
 msgstr "<apelido> [<apelido>...]"
 
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick (may be a mask)\n"
 "\n"
 "Without argument, this command will do a whois on:\n"
@@ -12287,3 +12294,6 @@ 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 "<server1> [<server2>]"
+#~ msgstr "<server1> [<server2>]"
diff --git a/po/ru.po b/po/ru.po
index 94df51963..8824e9a39 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-03-31 15:55+0200\n"
+"POT-Creation-Date: 2018-04-01 07:56+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"
@@ -6541,11 +6541,12 @@ msgid "list all servernames which are known by the server answering the query"
 msgstr "перечислить все серверы известные серверу, отвечающему на запрос"
 
 #, fuzzy
-msgid "[[<server>] <server_mask>]"
+msgid "[[<target>] <server_mask>]"
 msgstr "[[сервер] маска_сервера]"
 
+#, fuzzy
 msgid ""
-"     server: this server should answer the query\n"
+"     target: this remote server should answer the query\n"
 "server_mask: list of servers must match this mask"
 msgstr ""
 "сервер: сервер, отвечающий на запрос\n"
@@ -6555,12 +6556,12 @@ msgid "list channels and their topic"
 msgstr "перечислить каналы и их темы"
 
 #, fuzzy
-msgid "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
+msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
 msgstr "[канал[,канал] [сервер]]"
 
 msgid ""
 "channel: channel to list\n"
-" server: server name\n"
+" target: server name\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
 "\n"
@@ -6789,13 +6790,13 @@ msgid "send a ping to server"
 msgstr "ping'ануть сервер"
 
 #, fuzzy
-msgid "<server1> [<server2>]"
-msgstr "сервер1 [сервер2]"
+msgid "<target1> [<target2>]"
+msgstr "[маска [цель]]"
 
 #, fuzzy
 msgid ""
-"server1: server\n"
-"server2: forward ping to this server"
+"target1: server\n"
+"target2: forward ping to this server"
 msgstr ""
 "сервер1: цель для ping'а\n"
 "сервер2: перенаправить пинг на этот сервер"
@@ -7068,12 +7069,12 @@ msgid "disconnect server links"
 msgstr "отключить ссылки сервера"
 
 #, fuzzy
-msgid "<server> <comment>"
+msgid "<target> <comment>"
 msgstr "сервер комментарий"
 
 #, fuzzy
 msgid ""
-" server: server name\n"
+" target: server name\n"
 "comment: comment"
 msgstr ""
 "    сервер: название сервера\n"
@@ -7083,12 +7084,13 @@ msgid "query statistics about server"
 msgstr "запросить статистику сервера"
 
 #, fuzzy
-msgid "[<query> [<server>]]"
+msgid "[<query> [<target>]]"
 msgstr "[запрос [сервер]]"
 
+#, fuzzy
 msgid ""
 " query: c/h/i/k/l/m/o/y/u (see RFC1459)\n"
-"server: server name"
+"target: server name"
 msgstr ""
 "запрос: c/h/i/k/l/m/o/y/u (см. RFC1459)\n"
 "сервер: название сервера"
@@ -7182,12 +7184,12 @@ msgstr ""
 "предоставляет информацию о версии ника или сервера (текущего или указанного)"
 
 #, fuzzy
-msgid "[<server>|<nick>]"
+msgid "[<target>|<nick>]"
 msgstr "[сервер | ник]"
 
 #, fuzzy
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick"
 msgstr ""
 "сервер: название сервера\n"
@@ -7249,11 +7251,11 @@ msgid "query information about user(s)"
 msgstr "запросить информацию и пользователе(-ях)"
 
 #, fuzzy
-msgid "[<server>] [<nick>[,<nick>...]]"
+msgid "[<target>] [<nick>[,<nick>...]]"
 msgstr "[сервер] ник[, ник]"
 
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick (may be a mask)\n"
 "\n"
 "Without argument, this command will do a whois on:\n"
@@ -11863,3 +11865,7 @@ msgstr "%s нет аргумента для параметра \"%s\"\n"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: не могу соединиться с отправителем\n"
+
+#, fuzzy
+#~ msgid "<server1> [<server2>]"
+#~ msgstr "сервер1 [сервер2]"
diff --git a/po/tr.po b/po/tr.po
index 87300df2d..9aea93ef4 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-03-31 15:55+0200\n"
+"POT-Creation-Date: 2018-04-01 07:56+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"
@@ -5984,23 +5984,25 @@ msgstr ""
 msgid "list all servernames which are known by the server answering the query"
 msgstr ""
 
-msgid "[[<server>] <server_mask>]"
-msgstr ""
+#, fuzzy
+msgid "[[<target>] <server_mask>]"
+msgstr "<sunucu1> [<sunucu2>]"
 
 msgid ""
-"     server: this server should answer the query\n"
+"     target: this remote server should answer the query\n"
 "server_mask: list of servers must match this mask"
 msgstr ""
 
 msgid "list channels and their topic"
 msgstr ""
 
-msgid "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
-msgstr ""
+#, fuzzy
+msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
+msgstr "[<kanal>[,<kanal>...]] [<ileti>]"
 
 msgid ""
 "channel: channel to list\n"
-" server: server name\n"
+" target: server name\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
 "\n"
@@ -6184,12 +6186,13 @@ msgstr ""
 msgid "send a ping to server"
 msgstr ""
 
-msgid "<server1> [<server2>]"
-msgstr "<sunucu1> [<sunucu2>]"
+#, fuzzy
+msgid "<target1> [<target2>]"
+msgstr "[<hedef>]"
 
 msgid ""
-"server1: server\n"
-"server2: forward ping to this server"
+"target1: server\n"
+"target2: forward ping to this server"
 msgstr ""
 
 msgid "answer to a ping message"
@@ -6417,12 +6420,13 @@ msgstr ""
 msgid "disconnect server links"
 msgstr ""
 
-msgid "<server> <comment>"
+#, fuzzy
+msgid "<target> <comment>"
 msgstr "<sunucu> <açıklama>"
 
 #, fuzzy
 msgid ""
-" server: server name\n"
+" target: server name\n"
 "comment: comment"
 msgstr ""
 "server: sunucu ismi\n"
@@ -6431,12 +6435,13 @@ msgstr ""
 msgid "query statistics about server"
 msgstr ""
 
-msgid "[<query> [<server>]]"
-msgstr ""
+#, fuzzy
+msgid "[<query> [<target>]]"
+msgstr "<kullanıcı> [<hedef> [<kanal>]]"
 
 msgid ""
 " query: c/h/i/k/l/m/o/y/u (see RFC1459)\n"
-"server: server name"
+"target: server name"
 msgstr ""
 
 msgid ""
@@ -6511,11 +6516,13 @@ msgstr ""
 msgid "give the version info of nick or server (current or specified)"
 msgstr ""
 
-msgid "[<server>|<nick>]"
+#, fuzzy
+msgid "[<target>|<nick>]"
 msgstr "[<sunucu>|<rumuz>]"
 
+#, fuzzy
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick"
 msgstr ""
 "server: sunucu ismi\n"
@@ -6565,11 +6572,12 @@ msgstr ""
 msgid "query information about user(s)"
 msgstr ""
 
-msgid "[<server>] [<nick>[,<nick>...]]"
+#, fuzzy
+msgid "[<target>] [<nick>[,<nick>...]]"
 msgstr "[<sunucu>] [<rumuz>[,<rumuz>...]]"
 
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick (may be a mask)\n"
 "\n"
 "Without argument, this command will do a whois on:\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index 9ad7d323e..4f3ba9fd1 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-03-31 15:55+0200\n"
+"POT-Creation-Date: 2018-04-01 07:56+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"
@@ -5918,23 +5918,23 @@ msgstr ""
 msgid "list all servernames which are known by the server answering the query"
 msgstr ""
 
-msgid "[[<server>] <server_mask>]"
+msgid "[[<target>] <server_mask>]"
 msgstr ""
 
 msgid ""
-"     server: this server should answer the query\n"
+"     target: this remote server should answer the query\n"
 "server_mask: list of servers must match this mask"
 msgstr ""
 
 msgid "list channels and their topic"
 msgstr ""
 
-msgid "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
+msgid "[<channel>[,<channel>...]] [<target>] [-re <regex>]"
 msgstr ""
 
 msgid ""
 "channel: channel to list\n"
-" server: server name\n"
+" target: server name\n"
 "  regex: POSIX extended regular expression used to filter results (case "
 "insensitive, can start by \"(?-i)\" to become case sensitive)\n"
 "\n"
@@ -6113,12 +6113,12 @@ msgstr ""
 msgid "send a ping to server"
 msgstr ""
 
-msgid "<server1> [<server2>]"
+msgid "<target1> [<target2>]"
 msgstr ""
 
 msgid ""
-"server1: server\n"
-"server2: forward ping to this server"
+"target1: server\n"
+"target2: forward ping to this server"
 msgstr ""
 
 msgid "answer to a ping message"
@@ -6310,23 +6310,23 @@ msgstr ""
 msgid "disconnect server links"
 msgstr ""
 
-msgid "<server> <comment>"
+msgid "<target> <comment>"
 msgstr ""
 
 msgid ""
-" server: server name\n"
+" target: server name\n"
 "comment: comment"
 msgstr ""
 
 msgid "query statistics about server"
 msgstr ""
 
-msgid "[<query> [<server>]]"
+msgid "[<query> [<target>]]"
 msgstr ""
 
 msgid ""
 " query: c/h/i/k/l/m/o/y/u (see RFC1459)\n"
-"server: server name"
+"target: server name"
 msgstr ""
 
 msgid ""
@@ -6394,11 +6394,11 @@ msgstr ""
 msgid "give the version info of nick or server (current or specified)"
 msgstr ""
 
-msgid "[<server>|<nick>]"
+msgid "[<target>|<nick>]"
 msgstr ""
 
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick"
 msgstr ""
 
@@ -6446,11 +6446,11 @@ msgstr ""
 msgid "query information about user(s)"
 msgstr ""
 
-msgid "[<server>] [<nick>[,<nick>...]]"
+msgid "[<target>] [<nick>[,<nick>...]]"
 msgstr ""
 
 msgid ""
-"server: server name\n"
+"target: server name\n"
 "  nick: nick (may be a mask)\n"
 "\n"
 "Without argument, this command will do a whois on:\n"