Add option "-server" to IRC commands: msg, notice, query, quote

12 files changed, 436 insertions, 228 deletions

diff --git a/doc/de/autogen/irc_commands.xml b/doc/de/autogen/irc_commands.xml
index ac5f4936c..86c4172b1 100644
--- a/doc/de/autogen/irc_commands.xml
+++ b/doc/de/autogen/irc_commands.xml
@@ -257,12 +257,13 @@ die "Nachricht von heute" abfragen
 Ziel: Servername
 </programlisting>
 
-<command>/msg  Empfänger[,Empfänger] Text</command>
+<command>/msg  [-server server] receiver[,receiver] text</command>
 <programlisting>
 Nachricht an Nick/Channel verschicken
 
-Empfänger: Nick/Channel (darf eine Maske sein, '*' = aktueller Channel)
-Text: zu sendender Text
+  server: send to this server (internal name)
+receiver: nick or channel (may be mask, '*' = current channel)
+    text: text to send
 </programlisting>
 
 <command>/names  [Channel[,Channel]]</command>
@@ -280,12 +281,13 @@ aktuellen Nickname wechseln
 Nickname: neuer Nickname
 </programlisting>
 
-<command>/notice  Nickname Text</command>
+<command>/notice  [-server server] nickname text</command>
 <programlisting>
 NOTICE an einen User verschicken
 
-Nickname: Empfänger der Nachricht
-    Text: zu sendender Text
+  server: send to this server (internal name)
+nickname: user to send notice to
+    text: text to send
 </programlisting>
 
 <command>/op  Nickname [Nickname]</command>
@@ -324,19 +326,21 @@ auf Ping antworten
 Daemon2: Nachricht an diesen Daemon weiterleiten
 </programlisting>
 
-<command>/query  Nickname [Text]</command>
+<command>/query  [-server server] nickname [text]</command>
 <programlisting>
 private Nachricht an jemanden schicken
 
-Nickname: Nickname für privaten Chat
-    Text: zu sendender Text
+  server: send to this server (internal name)
+nickname: nickname for private conversation
+    text: text to send
 </programlisting>
 
-<command>/quote  Daten</command>
+<command>/quote  [-server server] data</command>
 <programlisting>
 Daten direkt an Server senden (siehe RFC 2812)
 
-Daten: zu sendende Rohdaten
+server: send to this server (internal name)
+data: raw data to send
 </programlisting>
 
 <command>/reconnect  [-all [-nojoin] | servername [servername ...] [-nojoin]]</command>
diff --git a/doc/en/autogen/irc_commands.xml b/doc/en/autogen/irc_commands.xml
index 0f8982a29..b60face1e 100644
--- a/doc/en/autogen/irc_commands.xml
+++ b/doc/en/autogen/irc_commands.xml
@@ -257,12 +257,13 @@ get the "Message Of The Day"
 target: server name
 </programlisting>
 
-<command>/msg  receiver[,receiver] text</command>
+<command>/msg  [-server server] receiver[,receiver] text</command>
 <programlisting>
 send message to a nick or channel
 
+  server: send to this server (internal name)
 receiver: nick or channel (may be mask, '*' = current channel)
-text: text to send
+    text: text to send
 </programlisting>
 
 <command>/names  [channel[,channel]]</command>
@@ -280,10 +281,11 @@ change current nickname
 nickname: new nickname
 </programlisting>
 
-<command>/notice  nickname text</command>
+<command>/notice  [-server server] nickname text</command>
 <programlisting>
 send notice message to user
 
+  server: send to this server (internal name)
 nickname: user to send notice to
     text: text to send
 </programlisting>
@@ -324,18 +326,20 @@ answer to a ping message
 daemon2: forward message to this daemon
 </programlisting>
 
-<command>/query  nickname [text]</command>
+<command>/query  [-server server] nickname [text]</command>
 <programlisting>
 send a private message to a nick
 
+  server: send to this server (internal name)
 nickname: nickname for private conversation
     text: text to send
 </programlisting>
 
-<command>/quote  data</command>
+<command>/quote  [-server server] data</command>
 <programlisting>
 send raw data to server without parsing
 
+server: send to this server (internal name)
 data: raw data to send
 </programlisting>
 
diff --git a/doc/fr/autogen/irc_commands.xml b/doc/fr/autogen/irc_commands.xml
index 53e7e1eb2..d62ecb902 100644
--- a/doc/fr/autogen/irc_commands.xml
+++ b/doc/fr/autogen/irc_commands.xml
@@ -257,12 +257,13 @@ obtenir le message du jour
 cible: nom du serveur
 </programlisting>
 
-<command>/msg  cible[,cible] texte</command>
+<command>/msg  [-server serveur] cible[,cible] texte</command>
 <programlisting>
 envoyer un message à un pseudo ou canal
 
-cible: pseudo ou canal (peut-être un masque, '*' = canal courant)
-texte: texte à envoyer
+serveur: envoyer à ce serveur (nom interne)
+  cible: pseudo ou canal (peut-être un masque, '*' = canal courant)
+  texte: texte à envoyer
 </programlisting>
 
 <command>/names  [canal[,canal]]</command>
@@ -280,12 +281,13 @@ changer le pseudo courant
 pseudo: nouveau pseudo
 </programlisting>
 
-<command>/notice  pseudo texte</command>
+<command>/notice  [-server serveur] pseudo texte</command>
 <programlisting>
 envoyer un message notice à un utilisateur
 
-pseudo: pseudo cible pour la notice
- texte: texte à envoyer
+serveur: envoyer à ce serveur (nom interne)
+ pseudo: pseudo cible pour la notice
+  texte: texte à envoyer
 </programlisting>
 
 <command>/op  pseudo [pseudo]</command>
@@ -324,18 +326,20 @@ répondre à un message ping
 démon2: faire suivre le message à ce démon
 </programlisting>
 
-<command>/query  pseudo [texte]</command>
+<command>/query  [-server serveur] pseudo [texte]</command>
 <programlisting>
 envoyer un message privé à un pseudo
 
-pseudo: pseudo pour la conversation privée
- texte: texte à envoyer
+serveur: envoyer à ce serveur (nom interne)
+ pseudo: pseudo pour la conversation privée
+  texte: texte à envoyer
 </programlisting>
 
-<command>/quote  données</command>
+<command>/quote  [-server serveur] données</command>
 <programlisting>
 envoyer des données brutes au serveur sans analyse
 
+serveur: envoyer à ce serveur (nom interne)
 données: données brutes à envoyer
 </programlisting>
 
diff --git a/doc/fr/autogen/irc_infos.xml b/doc/fr/autogen/irc_infos.xml
index 92ae2c393..ae0ee2838 100644
--- a/doc/fr/autogen/irc_infos.xml
+++ b/doc/fr/autogen/irc_infos.xml
@@ -19,7 +19,7 @@
 <row>
   <entry>info</entry>
   <entry>irc_nick</entry>
-  <entry>get current nick on a server</entry>
+  <entry>retourne le pseudo utilisé actuellement sur un serveur</entry>
 </row>
 <row>
   <entry>info</entry>
diff --git a/po/cs.po b/po/cs.po
index 7b062b952..97a536b3f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-02-10 11:58+0100\n"
+"POT-Creation-Date: 2009-02-10 12:42+0100\n"
 "PO-Revision-Date: 2009-01-03 00:42+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2942,12 +2942,15 @@ msgstr "získat \"Zprávu dne\""
 msgid "send message to a nick or channel"
 msgstr "poslat zprávu přezdívce nebo kanálu"
 
-msgid "receiver[,receiver] text"
+#, fuzzy
+msgid "[-server server] receiver[,receiver] text"
 msgstr "příjemce[,příjemce] text"
 
+#, fuzzy
 msgid ""
+"  server: send to this server (internal name)\n"
 "receiver: nick or channel (may be mask, '*' = current channel)\n"
-"text: text to send"
+"    text: text to send"
 msgstr ""
 "příjemce: přezdívka nebo kanál (může být maska, '*' = aktuální kanál)\n"
 "text: text, který se má poslat"
@@ -2977,10 +2980,13 @@ msgstr ""
 msgid "send notice message to user"
 msgstr "poslat notifikační zprávu uživateli"
 
-msgid "nickname text"
-msgstr "přezdívka text"
+#, fuzzy
+msgid "[-server server] nickname text"
+msgstr "[server | přezdívka]"
 
+#, fuzzy
 msgid ""
+"  server: send to this server (internal name)\n"
 "nickname: user to send notice to\n"
 "    text: text to send"
 msgstr ""
@@ -3042,10 +3048,13 @@ msgstr ""
 msgid "send a private message to a nick"
 msgstr "poslat soukromou zprávu přezdívce"
 
-msgid "nickname [text]"
-msgstr "přezdívka [text]"
+#, fuzzy
+msgid "[-server server] nickname [text]"
+msgstr "[server | přezdívka]"
 
+#, fuzzy
 msgid ""
+"  server: send to this server (internal name)\n"
 "nickname: nickname for private conversation\n"
 "    text: text to send"
 msgstr ""
@@ -3055,11 +3064,14 @@ msgstr ""
 msgid "send raw data to server without parsing"
 msgstr "poslat čistá data na server bez pársování"
 
-msgid "data"
-msgstr "data"
+#, fuzzy
+msgid "[-server server] data"
+msgstr "server1 [server2]"
 
-msgid "data: raw data to send"
-msgstr "data: čístá data pro server"
+msgid ""
+"server: send to this server (internal name)\n"
+"data: raw data to send"
+msgstr ""
 
 msgid "reconnect to server(s)"
 msgstr "znovu připojit k serveru/serverům"
@@ -5442,6 +5454,18 @@ msgstr "%s DCC: nemohu nastavit 'neblokovaci' volbu na soket\n"
 msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s chybí argument pro volbu \"%s\"\n"
 
+#~ msgid "nickname text"
+#~ msgstr "přezdívka text"
+
+#~ msgid "nickname [text]"
+#~ msgstr "přezdívka [text]"
+
+#~ msgid "data"
+#~ msgstr "data"
+
+#~ msgid "data: raw data to send"
+#~ msgstr "data: čístá data pro server"
+
 #, fuzzy
 #~ msgid ""
 #~ "%s%s: cannot connect with TLS because WeeChat was not built with GnuTLS "
diff --git a/po/de.po b/po/de.po
index ab918537a..a7daaf719 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-02-10 11:58+0100\n"
+"POT-Creation-Date: 2009-02-10 12:42+0100\n"
 "PO-Revision-Date: 2009-01-03 00:42+0100\n"
 "Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2945,12 +2945,15 @@ msgstr "die \"Nachricht von heute\" abfragen"
 msgid "send message to a nick or channel"
 msgstr "Nachricht an Nick/Channel verschicken"
 
-msgid "receiver[,receiver] text"
+#, fuzzy
+msgid "[-server server] receiver[,receiver] text"
 msgstr "Empfänger[,Empfänger] Text"
 
+#, fuzzy
 msgid ""
+"  server: send to this server (internal name)\n"
 "receiver: nick or channel (may be mask, '*' = current channel)\n"
-"text: text to send"
+"    text: text to send"
 msgstr ""
 "Empfänger: Nick/Channel (darf eine Maske sein, '*' = aktueller Channel)\n"
 "Text: zu sendender Text"
@@ -2980,10 +2983,13 @@ msgstr ""
 msgid "send notice message to user"
 msgstr "NOTICE an einen User verschicken"
 
-msgid "nickname text"
-msgstr "Nickname Text"
+#, fuzzy
+msgid "[-server server] nickname text"
+msgstr "[Server | Nickname]"
 
+#, fuzzy
 msgid ""
+"  server: send to this server (internal name)\n"
 "nickname: user to send notice to\n"
 "    text: text to send"
 msgstr ""
@@ -3045,10 +3051,13 @@ msgstr ""
 msgid "send a private message to a nick"
 msgstr "private Nachricht an jemanden schicken"
 
-msgid "nickname [text]"
-msgstr "Nickname [Text]"
+#, fuzzy
+msgid "[-server server] nickname [text]"
+msgstr "[Server | Nickname]"
 
+#, fuzzy
 msgid ""
+"  server: send to this server (internal name)\n"
 "nickname: nickname for private conversation\n"
 "    text: text to send"
 msgstr ""
@@ -3058,11 +3067,14 @@ msgstr ""
 msgid "send raw data to server without parsing"
 msgstr "Daten direkt an Server senden (siehe RFC 2812)"
 
-msgid "data"
-msgstr "Daten"
+#, fuzzy
+msgid "[-server server] data"
+msgstr "Server1 [Server2]"
 
-msgid "data: raw data to send"
-msgstr "Daten: zu sendende Rohdaten"
+msgid ""
+"server: send to this server (internal name)\n"
+"data: raw data to send"
+msgstr ""
 
 msgid "reconnect to server(s)"
 msgstr "mit einem Server oder mehreren Servern neu verbinden"
@@ -5379,6 +5391,18 @@ msgstr "%s DCC: kann die 'nonblock'-Option für den Socket nicht festlegen\n"
 msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s fehlende Argumente für die \"--dir\"-Option\n"
 
+#~ msgid "nickname text"
+#~ msgstr "Nickname Text"
+
+#~ msgid "nickname [text]"
+#~ msgstr "Nickname [Text]"
+
+#~ msgid "data"
+#~ msgstr "Daten"
+
+#~ msgid "data: raw data to send"
+#~ msgstr "Daten: zu sendende Rohdaten"
+
 #, fuzzy
 #~ msgid ""
 #~ "%s%s: cannot connect with TLS because WeeChat was not built with GnuTLS "
diff --git a/po/es.po b/po/es.po
index 7f45bf39c..109bae428 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-02-10 11:58+0100\n"
+"POT-Creation-Date: 2009-02-10 12:42+0100\n"
 "PO-Revision-Date: 2009-01-03 00:42+0100\n"
 "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
 "Language-Team:  weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2925,12 +2925,15 @@ msgstr "obtener el mensaje del día"
 msgid "send message to a nick or channel"
 msgstr "enviar un mensaje a un usuario o canal"
 
-msgid "receiver[,receiver] text"
+#, fuzzy
+msgid "[-server server] receiver[,receiver] text"
 msgstr "destinatario[,destinatario] texto"
 
+#, fuzzy
 msgid ""
+"  server: send to this server (internal name)\n"
 "receiver: nick or channel (may be mask, '*' = current channel)\n"
-"text: text to send"
+"    text: text to send"
 msgstr ""
 "destinatario: usuario o canal (puede que sea una máscara, '*' = canal "
 "actual)\n"
@@ -2962,10 +2965,13 @@ msgstr ""
 msgid "send notice message to user"
 msgstr "enviar mensaje de aviso a usuario"
 
-msgid "nickname text"
-msgstr "usuario texto"
+#, fuzzy
+msgid "[-server server] nickname text"
+msgstr "[servidor | usuario]"
 
+#, fuzzy
 msgid ""
+"  server: send to this server (internal name)\n"
 "nickname: user to send notice to\n"
 "    text: text to send"
 msgstr ""
@@ -3029,10 +3035,13 @@ msgstr ""
 msgid "send a private message to a nick"
 msgstr "enviar un mensaje privado a un usuario"
 
-msgid "nickname [text]"
-msgstr "usuario [texto]"
+#, fuzzy
+msgid "[-server server] nickname [text]"
+msgstr "[servidor | usuario]"
 
+#, fuzzy
 msgid ""
+"  server: send to this server (internal name)\n"
 "nickname: nickname for private conversation\n"
 "    text: text to send"
 msgstr ""
@@ -3042,11 +3051,14 @@ msgstr ""
 msgid "send raw data to server without parsing"
 msgstr "enviar datos en sucio al servidor sin analizar"
 
-msgid "data"
-msgstr "datos"
+#, fuzzy
+msgid "[-server server] data"
+msgstr "servidor1 [servidor2]"
 
-msgid "data: raw data to send"
-msgstr "datos: datos en sucio a enviar"
+msgid ""
+"server: send to this server (internal name)\n"
+"data: raw data to send"
+msgstr ""
 
 #, fuzzy
 msgid "reconnect to server(s)"
@@ -5375,6 +5387,18 @@ msgstr "%s no es posible crear el servidor\n"
 msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s falta un argumento para la opción --dir\n"
 
+#~ msgid "nickname text"
+#~ msgstr "usuario texto"
+
+#~ msgid "nickname [text]"
+#~ msgstr "usuario [texto]"
+
+#~ msgid "data"
+#~ msgstr "datos"
+
+#~ msgid "data: raw data to send"
+#~ msgstr "datos: datos en sucio a enviar"
+
 #, fuzzy
 #~ msgid ""
 #~ "%s%s: cannot connect with TLS because WeeChat was not built with GnuTLS "
diff --git a/po/fr.po b/po/fr.po
index d029ebf1f..24f577740 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-02-10 11:58+0100\n"
-"PO-Revision-Date: 2009-02-10 11:58+0100\n"
+"POT-Creation-Date: 2009-02-10 12:42+0100\n"
+"PO-Revision-Date: 2009-02-10 12:44+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -3059,15 +3059,17 @@ msgstr "obtenir le message du jour"
 msgid "send message to a nick or channel"
 msgstr "envoyer un message à un pseudo ou canal"
 
-msgid "receiver[,receiver] text"
-msgstr "cible[,cible] texte"
+msgid "[-server server] receiver[,receiver] text"
+msgstr "[-server serveur] cible[,cible] texte"
 
 msgid ""
+"  server: send to this server (internal name)\n"
 "receiver: nick or channel (may be mask, '*' = current channel)\n"
-"text: text to send"
+"    text: text to send"
 msgstr ""
-"cible: pseudo ou canal (peut-être un masque, '*' = canal courant)\n"
-"texte: texte à envoyer"
+"serveur: envoyer à ce serveur (nom interne)\n"
+"  cible: pseudo ou canal (peut-être un masque, '*' = canal courant)\n"
+"  texte: texte à envoyer"
 
 msgid "list nicknames on channels"
 msgstr "lister les pseudos sur des canaux"
@@ -3094,15 +3096,17 @@ msgstr ""
 msgid "send notice message to user"
 msgstr "envoyer un message notice à un utilisateur"
 
-msgid "nickname text"
-msgstr "pseudo texte"
+msgid "[-server server] nickname text"
+msgstr "[-server serveur] pseudo texte"
 
 msgid ""
+"  server: send to this server (internal name)\n"
 "nickname: user to send notice to\n"
 "    text: text to send"
 msgstr ""
-"pseudo: pseudo cible pour la notice\n"
-" texte: texte à envoyer"
+"serveur: envoyer à ce serveur (nom interne)\n"
+" pseudo: pseudo cible pour la notice\n"
+"  texte: texte à envoyer"
 
 msgid "give channel operator status to nickname(s)"
 msgstr "donner le statut opérateur à un/des pseudo(s)"
@@ -3160,24 +3164,30 @@ msgstr ""
 msgid "send a private message to a nick"
 msgstr "envoyer un message privé à un pseudo"
 
-msgid "nickname [text]"
-msgstr "pseudo [texte]"
+msgid "[-server server] nickname [text]"
+msgstr "[-server serveur] pseudo [texte]"
 
 msgid ""
+"  server: send to this server (internal name)\n"
 "nickname: nickname for private conversation\n"
 "    text: text to send"
 msgstr ""
-"pseudo: pseudo pour la conversation privée\n"
-" texte: texte à envoyer"
+"serveur: envoyer à ce serveur (nom interne)\n"
+" pseudo: pseudo pour la conversation privée\n"
+"  texte: texte à envoyer"
 
 msgid "send raw data to server without parsing"
 msgstr "envoyer des données brutes au serveur sans analyse"
 
-msgid "data"
-msgstr "données"
+msgid "[-server server] data"
+msgstr "[-server serveur] données"
 
-msgid "data: raw data to send"
-msgstr "données: données brutes à envoyer"
+msgid ""
+"server: send to this server (internal name)\n"
+"data: raw data to send"
+msgstr ""
+"serveur: envoyer à ce serveur (nom interne)\n"
+"données: données brutes à envoyer"
 
 msgid "reconnect to server(s)"
 msgstr "se reconnecter à un/plusieurs serveur(s)"
@@ -5553,3 +5563,15 @@ msgstr "%s%s: impossible de positionner l'option \"nonblock\" pour la socket"
 #, c-format
 msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s%s: délai d'attente dépassé pour \"%s\" avec %s"
+
+#~ msgid "nickname text"
+#~ msgstr "pseudo texte"
+
+#~ msgid "nickname [text]"
+#~ msgstr "pseudo [texte]"
+
+#~ msgid "data"
+#~ msgstr "données"
+
+#~ msgid "data: raw data to send"
+#~ msgstr "données: données brutes à envoyer"
diff --git a/po/hu.po b/po/hu.po
index 47510b600..d4debb2be 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-02-10 11:58+0100\n"
+"POT-Creation-Date: 2009-02-10 12:42+0100\n"
 "PO-Revision-Date: 2009-01-03 00:42+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2960,12 +2960,15 @@ msgstr "\"A Napi Üzenet\" lekérdezése"
 msgid "send message to a nick or channel"
 msgstr "üzenet küldése egy felhasználónak vagy szobának"
 
-msgid "receiver[,receiver] text"
+#, fuzzy
+msgid "[-server server] receiver[,receiver] text"
 msgstr "fogadó [,fogadó] szöveg"
 
+#, fuzzy
 msgid ""
+"  server: send to this server (internal name)\n"
 "receiver: nick or channel (may be mask, '*' = current channel)\n"
-"text: text to send"
+"    text: text to send"
 msgstr ""
 "fogadó: név vagy szoba (esetleg maszk, '*' = aktuális szoba)\n"
 "szöveg: küldendő üzenet"
@@ -2995,10 +2998,13 @@ msgstr ""
 msgid "send notice message to user"
 msgstr "emlékeztető küldése egy felhasználónak"
 
-msgid "nickname text"
-msgstr "név szöveg"
+#, fuzzy
+msgid "[-server server] nickname text"
+msgstr "[szerver | név]"
 
+#, fuzzy
 msgid ""
+"  server: send to this server (internal name)\n"
 "nickname: user to send notice to\n"
 "    text: text to send"
 msgstr ""
@@ -3062,10 +3068,13 @@ msgstr ""
 msgid "send a private message to a nick"
 msgstr "személyes üzenet küldése egy felhasználónak"
 
-msgid "nickname [text]"
-msgstr "becenév [szöveg]"
+#, fuzzy
+msgid "[-server server] nickname [text]"
+msgstr "[szerver | név]"
 
+#, fuzzy
 msgid ""
+"  server: send to this server (internal name)\n"
 "nickname: nickname for private conversation\n"
 "    text: text to send"
 msgstr ""
@@ -3075,11 +3084,14 @@ msgstr ""
 msgid "send raw data to server without parsing"
 msgstr "formázás nélküli nyers üzenet küldése a szervernek"
 
-msgid "data"
-msgstr "adat"
+#, fuzzy
+msgid "[-server server] data"
+msgstr "szerver1 [szerver2]"
 
-msgid "data: raw data to send"
-msgstr "adat: küldendő nyers üzenet"
+msgid ""
+"server: send to this server (internal name)\n"
+"data: raw data to send"
+msgstr ""
 
 msgid "reconnect to server(s)"
 msgstr "újracsatlakozás a szerver(ek)hez"
@@ -5433,6 +5445,18 @@ msgstr "%s DCC: nem sikerült 'nonblock' opciót beállítani a csatornán\n"
 msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
 
+#~ msgid "nickname text"
+#~ msgstr "név szöveg"
+
+#~ msgid "nickname [text]"
+#~ msgstr "becenév [szöveg]"
+
+#~ msgid "data"
+#~ msgstr "adat"
+
+#~ msgid "data: raw data to send"
+#~ msgstr "adat: küldendő nyers üzenet"
+
 #, fuzzy
 #~ msgid ""
 #~ "%s%s: cannot connect with TLS because WeeChat was not built with GnuTLS "
diff --git a/po/ru.po b/po/ru.po
index d2de54fe0..06cc97510 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-02-10 11:58+0100\n"
+"POT-Creation-Date: 2009-02-10 12:42+0100\n"
 "PO-Revision-Date: 2009-01-03 00:42+0100\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2961,12 +2961,15 @@ msgstr "получить \"Message Of The Day\""
 msgid "send message to a nick or channel"
 msgstr "отправить сообщение нику или на канал"
 
-msgid "receiver[,receiver] text"
+#, fuzzy
+msgid "[-server server] receiver[,receiver] text"
 msgstr "адресат[,адресат] текст"
 
+#, fuzzy
 msgid ""
+"  server: send to this server (internal name)\n"
 "receiver: nick or channel (may be mask, '*' = current channel)\n"
-"text: text to send"
+"    text: text to send"
 msgstr ""
 "адресат: ник или канал (можно использовать маску, '*' = текущий канал)\n"
 "текст: отправляаемый текст"
@@ -2996,10 +2999,13 @@ msgstr ""
 msgid "send notice message to user"
 msgstr "отправить уведомление пользователю"
 
-msgid "nickname text"
-msgstr "ник текст"
+#, fuzzy
+msgid "[-server server] nickname text"
+msgstr "[сервер | ник]"
 
+#, fuzzy
 msgid ""
+"  server: send to this server (internal name)\n"
 "nickname: user to send notice to\n"
 "    text: text to send"
 msgstr ""
@@ -3063,10 +3069,13 @@ msgstr ""
 msgid "send a private message to a nick"
 msgstr "отправить личное сообщение нику"
 
-msgid "nickname [text]"
-msgstr "ник [текст]"
+#, fuzzy
+msgid "[-server server] nickname [text]"
+msgstr "[сервер | ник]"
 
+#, fuzzy
 msgid ""
+"  server: send to this server (internal name)\n"
 "nickname: nickname for private conversation\n"
 "    text: text to send"
 msgstr ""
@@ -3076,11 +3085,14 @@ msgstr ""
 msgid "send raw data to server without parsing"
 msgstr "отправить сырые (raw) данные серверу"
 
-msgid "data"
-msgstr "данные"
+#, fuzzy
+msgid "[-server server] data"
+msgstr "сервер1 [сервер2]"
 
-msgid "data: raw data to send"
-msgstr "данные: отправляемые данные"
+msgid ""
+"server: send to this server (internal name)\n"
+"data: raw data to send"
+msgstr ""
 
 msgid "reconnect to server(s)"
 msgstr "переподключиться к серверу(-ам)"
@@ -5404,6 +5416,18 @@ msgstr "%s DCC: не могу установить неблокирующий р
 msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s нет аргумента для параметра \"%s\"\n"
 
+#~ msgid "nickname text"
+#~ msgstr "ник текст"
+
+#~ msgid "nickname [text]"
+#~ msgstr "ник [текст]"
+
+#~ msgid "data"
+#~ msgstr "данные"
+
+#~ msgid "data: raw data to send"
+#~ msgstr "данные: отправляемые данные"
+
 #, fuzzy
 #~ msgid ""
 #~ "%s%s: cannot connect with TLS because WeeChat was not built with GnuTLS "
diff --git a/po/weechat.pot b/po/weechat.pot
index ebe0dd9b3..d8c9ad602 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-02-10 11:58+0100\n"
+"POT-Creation-Date: 2009-02-10 12:42+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2543,12 +2543,13 @@ msgstr ""
 msgid "send message to a nick or channel"
 msgstr ""
 
-msgid "receiver[,receiver] text"
+msgid "[-server server] receiver[,receiver] text"
 msgstr ""
 
 msgid ""
+"  server: send to this server (internal name)\n"
 "receiver: nick or channel (may be mask, '*' = current channel)\n"
-"text: text to send"
+"    text: text to send"
 msgstr ""
 
 msgid "list nicknames on channels"
@@ -2574,10 +2575,11 @@ msgstr ""
 msgid "send notice message to user"
 msgstr ""
 
-msgid "nickname text"
+msgid "[-server server] nickname text"
 msgstr ""
 
 msgid ""
+"  server: send to this server (internal name)\n"
 "nickname: user to send notice to\n"
 "    text: text to send"
 msgstr ""
@@ -2630,10 +2632,11 @@ msgstr ""
 msgid "send a private message to a nick"
 msgstr ""
 
-msgid "nickname [text]"
+msgid "[-server server] nickname [text]"
 msgstr ""
 
 msgid ""
+"  server: send to this server (internal name)\n"
 "nickname: nickname for private conversation\n"
 "    text: text to send"
 msgstr ""
@@ -2641,10 +2644,12 @@ msgstr ""
 msgid "send raw data to server without parsing"
 msgstr ""
 
-msgid "data"
+msgid "[-server server] data"
 msgstr ""
 
-msgid "data: raw data to send"
+msgid ""
+"server: send to this server (internal name)\n"
+"data: raw data to send"
 msgstr ""
 
 msgid "reconnect to server(s)"
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index c53de7991..e99c83064 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -1981,7 +1981,7 @@ irc_command_msg (void *data, struct t_gui_buffer *buffer, int argc,
                  char **argv, char **argv_eol)
 {
     char **targets;
-    int num_targets, i;
+    int num_targets, i, arg_target, arg_text;
     char *msg_pwd_hidden;
     struct t_irc_nick *ptr_nick;
     char *string;
@@ -1993,79 +1993,125 @@ irc_command_msg (void *data, struct t_gui_buffer *buffer, int argc,
     /* make C compiler happy */
     (void) data;
     (void) argv_eol;
-
-    if (argc > 2)
+    
+    if (argc <= 2)
+    {
+        IRC_COMMAND_TOO_FEW_ARGUMENTS(ptr_server->buffer, "msg");
+    }
+    
+    arg_target = 1;
+    arg_text = 2;
+    
+    if ((argc >= 5) && (weechat_strcasecmp (argv[1], "-server") == 0))
     {
-        targets = weechat_string_explode (argv[1], ",", 0, 0,
-                                          &num_targets);
-        if (targets)
+        ptr_server = irc_server_search (argv[2]);
+        if (!ptr_server || !ptr_server->is_connected)
+            return WEECHAT_RC_ERROR;
+        ptr_channel = NULL;
+        arg_target = 3;
+        arg_text = 4;
+    }
+    
+    targets = weechat_string_explode (argv[arg_target], ",", 0, 0,
+                                      &num_targets);
+    if (targets)
+    {
+        for (i = 0; i < num_targets; i++)
         {
-            for (i = 0; i < num_targets; i++)
+            if (strcmp (targets[i], "*") == 0)
+            {
+                if (!ptr_channel
+                    || ((ptr_channel->type != IRC_CHANNEL_TYPE_CHANNEL)
+                        && (ptr_channel->type != IRC_CHANNEL_TYPE_PRIVATE)))
+                {
+                    weechat_printf (ptr_server->buffer,
+                                    _("%s%s: \"%s\" command can only be "
+                                      "executed in a channel or private "
+                                      "buffer"),
+                                    irc_buffer_get_server_prefix (ptr_server,
+                                                                  "error"),
+                                    IRC_PLUGIN_NAME, "msg *");
+                }
+                if (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL)
+                    ptr_nick = irc_nick_search (ptr_channel, ptr_server->nick);
+                else
+                    ptr_nick = NULL;
+                string = irc_color_decode (argv_eol[arg_text],
+                                           weechat_config_boolean (irc_config_network_colors_receive));
+                irc_input_user_message_display (ptr_channel->buffer,
+                                                (string) ? string : argv_eol[arg_text]);
+                if (string)
+                    free (string);
+                
+                irc_server_sendf (ptr_server, "PRIVMSG %s :%s",
+                                  ptr_channel->name, argv_eol[arg_text]);
+            }
+            else
             {
-                if (strcmp (targets[i], "*") == 0)
+                if (irc_channel_is_channel (targets[i]))
                 {
-                    if (!ptr_channel
-                        || ((ptr_channel->type != IRC_CHANNEL_TYPE_CHANNEL)
-                            && (ptr_channel->type != IRC_CHANNEL_TYPE_PRIVATE)))
+                    ptr_channel = irc_channel_search (ptr_server,
+                                                      targets[i]);
+                    if (ptr_channel)
                     {
-                        weechat_printf (ptr_server->buffer,
-                                        _("%s%s: \"%s\" command can only be "
-                                          "executed in a channel or private "
-                                          "buffer"),
-                                        irc_buffer_get_server_prefix (ptr_server,
-                                                                      "error"),
-                                        IRC_PLUGIN_NAME, "msg *");
+                        if (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL)
+                            ptr_nick = irc_nick_search (ptr_channel, ptr_server->nick);
+                        else
+                            ptr_nick = NULL;
+                        string = irc_color_decode (argv_eol[arg_text],
+                                                   weechat_config_boolean (irc_config_network_colors_receive));
+                        irc_input_user_message_display (ptr_channel->buffer,
+                                                        (string) ? string : argv_eol[arg_text]);
+                        if (string)
+                            free (string);
                     }
-                    if (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL)
-                        ptr_nick = irc_nick_search (ptr_channel, ptr_server->nick);
-                    else
-                        ptr_nick = NULL;
-                    string = irc_color_decode (argv_eol[2],
-                                               weechat_config_boolean (irc_config_network_colors_receive));
-                    irc_input_user_message_display (ptr_channel->buffer,
-                                                    (string) ? string : argv_eol[2]);
-                    if (string)
-                        free (string);
-                    
                     irc_server_sendf (ptr_server, "PRIVMSG %s :%s",
-                                      ptr_channel->name, argv_eol[2]);
+                                      targets[i], argv_eol[arg_text]);
                 }
                 else
                 {
-                    if (irc_channel_is_channel (targets[i]))
+                    /* message to nickserv with identify ? */
+                    if (weechat_strcasecmp (targets[i], "nickserv") == 0)
                     {
+                        msg_pwd_hidden = strdup (argv_eol[arg_text]);
+                        if (msg_pwd_hidden
+                            && (weechat_config_boolean (irc_config_look_hide_nickserv_pwd)))
+                            irc_display_hide_password (msg_pwd_hidden, 0);
+                        string = irc_color_decode (
+                            (msg_pwd_hidden) ? msg_pwd_hidden : argv_eol[arg_text],
+                            weechat_config_boolean (irc_config_network_colors_receive));
+                        weechat_printf (ptr_server->buffer,
+                                        "%s%s-%s%s%s- %s%s",
+                                        irc_buffer_get_server_prefix (ptr_server,
+                                                                      "network"),
+                                        IRC_COLOR_CHAT_DELIMITERS,
+                                        IRC_COLOR_CHAT_NICK,
+                                        targets[i],
+                                        IRC_COLOR_CHAT_DELIMITERS,
+                                        IRC_COLOR_CHAT,
+                                        (string) ?
+                                        string : ((msg_pwd_hidden) ?
+                                                  msg_pwd_hidden : argv_eol[arg_text]));
+                        if (string)
+                            free (string);
+                        if (msg_pwd_hidden)
+                            free (msg_pwd_hidden);
+                    }
+                    else
+                    {
+                        string = irc_color_decode (argv_eol[arg_text],
+                                                   weechat_config_boolean (irc_config_network_colors_receive));
                         ptr_channel = irc_channel_search (ptr_server,
                                                           targets[i]);
                         if (ptr_channel)
                         {
-                            if (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL)
-                                ptr_nick = irc_nick_search (ptr_channel, ptr_server->nick);
-                            else
-                                ptr_nick = NULL;
-                            string = irc_color_decode (argv_eol[2],
-                                                       weechat_config_boolean (irc_config_network_colors_receive));
                             irc_input_user_message_display (ptr_channel->buffer,
-                                                            (string) ? string : argv_eol[2]);
-                            if (string)
-                                free (string);
+                                                            (string) ? string : argv_eol[arg_text]);
                         }
-                        irc_server_sendf (ptr_server, "PRIVMSG %s :%s",
-                                          targets[i], argv_eol[2]);
-                    }
-                    else
-                    {
-                        /* message to nickserv with identify ? */
-                        if (weechat_strcasecmp (targets[i], "nickserv") == 0)
+                        else
                         {
-                            msg_pwd_hidden = strdup (argv_eol[2]);
-                            if (msg_pwd_hidden
-                                && (weechat_config_boolean (irc_config_look_hide_nickserv_pwd)))
-                                irc_display_hide_password (msg_pwd_hidden, 0);
-                            string = irc_color_decode (
-                                (msg_pwd_hidden) ? msg_pwd_hidden : argv_eol[2],
-                                weechat_config_boolean (irc_config_network_colors_receive));
                             weechat_printf (ptr_server->buffer,
-                                            "%s%s-%s%s%s- %s%s",
+                                            "%sMSG%s(%s%s%s)%s: %s",
                                             irc_buffer_get_server_prefix (ptr_server,
                                                                           "network"),
                                             IRC_COLOR_CHAT_DELIMITERS,
@@ -2073,52 +2119,17 @@ irc_command_msg (void *data, struct t_gui_buffer *buffer, int argc,
                                             targets[i],
                                             IRC_COLOR_CHAT_DELIMITERS,
                                             IRC_COLOR_CHAT,
-                                            (string) ?
-                                            string : ((msg_pwd_hidden) ?
-                                                      msg_pwd_hidden : argv_eol[2]));
-                            if (string)
-                                free (string);
-                            if (msg_pwd_hidden)
-                                free (msg_pwd_hidden);
-                        }
-                        else
-                        {
-                            string = irc_color_decode (argv_eol[2],
-                                                       weechat_config_boolean (irc_config_network_colors_receive));
-                            ptr_channel = irc_channel_search (ptr_server,
-                                                              targets[i]);
-                            if (ptr_channel)
-                            {
-                                irc_input_user_message_display (ptr_channel->buffer,
-                                                                (string) ? string : argv_eol[2]);
-                            }
-                            else
-                            {
-                                weechat_printf (ptr_server->buffer,
-                                                "%sMSG%s(%s%s%s)%s: %s",
-                                                irc_buffer_get_server_prefix (ptr_server,
-                                                                              "network"),
-                                                IRC_COLOR_CHAT_DELIMITERS,
-                                                IRC_COLOR_CHAT_NICK,
-                                                targets[i],
-                                                IRC_COLOR_CHAT_DELIMITERS,
-                                                IRC_COLOR_CHAT,
-                                                (string) ? string : argv_eol[2]);
-                            }
-                            if (string)
-                                free (string);
+                                            (string) ? string : argv_eol[arg_text]);
                         }
-                        irc_server_sendf (ptr_server, "PRIVMSG %s :%s",
-                                          targets[i], argv_eol[2]);
+                        if (string)
+                            free (string);
                     }
+                    irc_server_sendf (ptr_server, "PRIVMSG %s :%s",
+                                      targets[i], argv_eol[arg_text]);
                 }
             }
-            weechat_string_free_exploded (targets);
         }
-    }
-    else
-    {
-        IRC_COMMAND_TOO_FEW_ARGUMENTS(ptr_server->buffer, "msg");
+        weechat_string_free_exploded (targets);
     }
     
     return WEECHAT_RC_OK;
@@ -2231,6 +2242,7 @@ irc_command_notice (void *data, struct t_gui_buffer *buffer, int argc,
                     char **argv, char **argv_eol)
 {
     char *string;
+    int arg_nick, arg_text;
     
     IRC_GET_SERVER(buffer);
     if (!ptr_server || !ptr_server->is_connected)
@@ -2242,19 +2254,29 @@ irc_command_notice (void *data, struct t_gui_buffer *buffer, int argc,
 
     if (argc > 2)
     {
-        string = irc_color_decode (argv_eol[2],
+        arg_nick = 1;
+        arg_text = 2;
+        if ((argc >= 5) && (weechat_strcasecmp (argv[1], "-server") == 0))
+        {
+            ptr_server = irc_server_search (argv[2]);
+            if (!ptr_server || !ptr_server->is_connected)
+                return WEECHAT_RC_ERROR;
+            arg_nick = 3;
+            arg_text = 4;
+        }
+        string = irc_color_decode (argv_eol[arg_text],
                                    weechat_config_boolean (irc_config_network_colors_receive));
         weechat_printf (ptr_server->buffer,
                         "%sNotice -> %s%s%s: %s",
                         irc_buffer_get_server_prefix (ptr_server, NULL),
                         IRC_COLOR_CHAT_NICK,
-                        argv[1],
+                        argv[arg_nick],
                         IRC_COLOR_CHAT,
-                        (string) ? string : argv_eol[2]);
+                        (string) ? string : argv_eol[arg_text]);
         if (string)
             free (string);
         irc_server_sendf (ptr_server, "NOTICE %s :%s",
-                          argv[1], argv_eol[2]);
+                          argv[arg_nick], argv_eol[arg_text]);
     }
     else
     {
@@ -2486,6 +2508,7 @@ irc_command_query (void *data, struct t_gui_buffer *buffer, int argc,
                    char **argv, char **argv_eol)
 {
     char *string;
+    int arg_nick, arg_text;
     
     IRC_GET_SERVER_CHANNEL(buffer);
     if (!ptr_server || !ptr_server->is_connected)
@@ -2493,40 +2516,50 @@ irc_command_query (void *data, struct t_gui_buffer *buffer, int argc,
     
     /* make C compiler happy */
     (void) data;
-    (void) argv;
-
+    
     if (argc > 1)
     {
+        arg_nick = 1;
+        arg_text = 2;
+        if ((argc >= 4) && (weechat_strcasecmp (argv[1], "-server") == 0))
+        {
+            ptr_server = irc_server_search (argv[2]);
+            if (!ptr_server || !ptr_server->is_connected)
+                return WEECHAT_RC_ERROR;
+            arg_nick = 3;
+            arg_text = 4;
+        }
+        
         /* create private window if not already opened */
-        ptr_channel = irc_channel_search (ptr_server, argv[1]);
+        ptr_channel = irc_channel_search (ptr_server, argv[arg_nick]);
         if (!ptr_channel)
         {
             ptr_channel = irc_channel_new (ptr_server,
                                            IRC_CHANNEL_TYPE_PRIVATE,
-                                           argv[1], 1, 0);
+                                           argv[arg_nick], 1, 0);
             if (!ptr_channel)
             {
                 weechat_printf (ptr_server->buffer,
                                 _("%s%s: cannot create new private "
                                   "buffer \"%s\""),
                                 irc_buffer_get_server_prefix (ptr_server, "error"),
-                                IRC_PLUGIN_NAME, argv[1]);
+                                IRC_PLUGIN_NAME, argv[arg_nick]);
                 return WEECHAT_RC_ERROR;
             }
         }
         weechat_buffer_set (ptr_channel->buffer, "display", "1");
         
         /* display text if given */
-        if (argv_eol[2])
+        if (argv_eol[arg_text])
         {
-            string = irc_color_decode (argv_eol[2],
+            string = irc_color_decode (argv_eol[arg_text],
                                        weechat_config_boolean (irc_config_network_colors_receive));
             irc_input_user_message_display (ptr_channel->buffer,
-                                            (string) ? string : argv_eol[2]);
+                                            (string) ? string : argv_eol[arg_text]);
             if (string)
                 free (string);
             irc_server_sendf (ptr_server, "PRIVMSG %s :%s",
-                              argv[1], argv_eol[2]);
+                              argv[arg_nick], argv_eol[arg_text]);
         }
     }
     else
@@ -2546,7 +2579,7 @@ irc_command_quote (void *data, struct t_gui_buffer *buffer, int argc,
                    char **argv, char **argv_eol)
 {
     IRC_GET_SERVER(buffer);
-    if (!ptr_server)
+    if (!ptr_server || (ptr_server->sock < 0))
         return WEECHAT_RC_ERROR;
     
     /* make C compiler happy */
@@ -2554,7 +2587,19 @@ irc_command_quote (void *data, struct t_gui_buffer *buffer, int argc,
     (void) argv;
     
     if (argc > 1)
-        irc_server_sendf (ptr_server, "%s", argv_eol[1]);
+    {
+        if ((argc >= 4) && (weechat_strcasecmp (argv[1], "-server") == 0))
+        {
+            ptr_server = irc_server_search (argv[2]);
+            if (!ptr_server || (ptr_server->sock < 0))
+                return WEECHAT_RC_ERROR;
+            irc_server_sendf (ptr_server, "%s", argv_eol[3]);
+        }
+        else
+        {
+            irc_server_sendf (ptr_server, "%s", argv_eol[1]);
+        }
+    }
     else
     {
         IRC_COMMAND_TOO_FEW_ARGUMENTS(ptr_server->buffer, "quote");
@@ -3928,10 +3973,11 @@ irc_command_init ()
                           NULL, &irc_command_motd, NULL);
     weechat_hook_command ("msg",
                           N_("send message to a nick or channel"),
-                          N_("receiver[,receiver] text"),
-                          N_("receiver: nick or channel (may be mask, '*' = "
+                          N_("[-server server] receiver[,receiver] text"),
+                          N_("  server: send to this server (internal name)\n"
+                             "receiver: nick or channel (may be mask, '*' = "
                              "current channel)\n"
-                             "text: text to send"),
+                             "    text: text to send"),
                           NULL, &irc_command_msg, NULL);
     weechat_hook_command ("names",
                           N_("list nicknames on channels"),
@@ -3947,8 +3993,9 @@ irc_command_init ()
                           "-all", &irc_command_nick, NULL);
     weechat_hook_command ("notice",
                           N_("send notice message to user"),
-                          N_("nickname text"),
-                          N_("nickname: user to send notice to\n"
+                          N_("[-server server] nickname text"),
+                          N_("  server: send to this server (internal name)\n"
+                             "nickname: user to send notice to\n"
                              "    text: text to send"),
                           "%n %-", &irc_command_notice, NULL);
     weechat_hook_command ("op",
@@ -3984,14 +4031,16 @@ irc_command_init ()
                           NULL, &irc_command_pong, NULL);
     weechat_hook_command ("query",
                           N_("send a private message to a nick"),
-                          N_("nickname [text]"),
-                          N_("nickname: nickname for private conversation\n"
+                          N_("[-server server] nickname [text]"),
+                          N_("  server: send to this server (internal name)\n"
+                             "nickname: nickname for private conversation\n"
                              "    text: text to send"),
                           "%n %-", &irc_command_query, NULL);
     weechat_hook_command ("quote",
                           N_("send raw data to server without parsing"),
-                          N_("data"),
-                          N_("data: raw data to send"),
+                          N_("[-server server] data"),
+                          N_("server: send to this server (internal name)\n"
+                             "data: raw data to send"),
                           NULL, &irc_command_quote, NULL);
     weechat_hook_command ("reconnect",
                           N_("reconnect to server(s)"),