Add examples in /help join

14 files changed, 268 insertions, 146 deletions

diff --git a/doc/docgen.pl b/doc/docgen.pl
index 5a8fa71b6..5c0e8be66 100644
--- a/doc/docgen.pl
+++ b/doc/docgen.pl
@@ -275,7 +275,7 @@ sub get_completions
             $ignore = 1 if ($completion_item =~ /${mask}/);
         }
         
-        if ($ignore ne 1)
+        if (($ignore ne 1) && ($completion_item ne ""))
         {
             $completions{$plugin}{$completion_item}{"description"} = weechat::infolist_string($infolist, "description");
         }
diff --git a/doc/en/autogen/user/irc_commands.txt b/doc/en/autogen/user/irc_commands.txt
index 6a982fc51..ec2a8a5e9 100644
--- a/doc/en/autogen/user/irc_commands.txt
+++ b/doc/en/autogen/user/irc_commands.txt
@@ -194,13 +194,17 @@
   nickname: nickname
 ........................................
 
-• *`/join`* `[channel[,channel] [key[,key]]]`::
+• *`/join`* `[channel1[,channel2[,channel3]] [key1[,key2]]]`::
 
 ........................................
   join a channel
 
   channel: channel name to join
-      key: key to join the channel
+      key: key to join the channel (channels with a key must be the first in list)
+  
+  Examples:
+    /join #weechat
+    /join #protectedchan,#weechat key
 ........................................
 
 • *`/kick`* `[channel] nickname [comment]`::
diff --git a/doc/fr/autogen/user/irc_commands.txt b/doc/fr/autogen/user/irc_commands.txt
index d5a89ddca..64d677a7c 100644
--- a/doc/fr/autogen/user/irc_commands.txt
+++ b/doc/fr/autogen/user/irc_commands.txt
@@ -194,13 +194,17 @@
   pseudo: pseudo
 ........................................
 
-• *`/join`* `[canal[,canal] [clé[,clé]]]`::
+• *`/join`* `[canal1[,canal2[,canal3]] [clé1[,clé2]]]`::
 
 ........................................
   joindre un canal
 
   canal: nom du canal à rejoindre
-    clé: clé pour rejoindre le canal
+    clé: clé pour rejoindre le canal (les canaux avec une clé doivent être les premiers dans la liste)
+  
+  Exemples:
+    /join #weechat
+    /join #protectedchan,#weechat key
 ........................................
 
 • *`/kick`* `[canal] pseudo [commentaire]`::
diff --git a/doc/it/autogen/user/irc_commands.txt b/doc/it/autogen/user/irc_commands.txt
index 26ec492b2..c407d1965 100644
--- a/doc/it/autogen/user/irc_commands.txt
+++ b/doc/it/autogen/user/irc_commands.txt
@@ -194,13 +194,17 @@
   nick: nick
 ........................................
 
-• *`/join`* `[canale[,canale ] [chiave[,chiave]]]`::
+• *`/join`* `[channel1[,channel2[,channel3]] [key1[,key2]]]`::
 
 ........................................
   entra in un canale
 
-  canale: nome del canale in cui entrare
-  chiave: chiave per entrare nel canale
+  channel: channel name to join
+      key: key to join the channel (channels with a key must be the first in list)
+  
+  Examples:
+    /join #weechat
+    /join #protectedchan,#weechat key
 ........................................
 
 • *`/kick`* `[canale] nick [commento]`::
diff --git a/po/cs.po b/po/cs.po
index c6751f85b..5de3f48ba 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-05-01 12:22+0200\n"
-"PO-Revision-Date: 2010-04-18 10:50+0200\n"
+"POT-Creation-Date: 2010-05-20 11:47+0200\n"
+"PO-Revision-Date: 2010-05-20 12:20+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
+"Language: Czech\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3497,15 +3498,19 @@ msgstr "přezdívka: přezdívka"
 msgid "join a channel"
 msgstr "připojit se ke kanálu"
 
-msgid "[channel[,channel] [key[,key]]]"
+#, fuzzy
+msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
 msgstr "[kanál[,kanál] [klíč[,klíč]]]"
 
 msgid ""
 "channel: channel name to join\n"
-"    key: key to join the channel"
+"    key: key to join the channel (channels with a key must be the first in "
+"list)\n"
+"\n"
+"Examples:\n"
+"  /join #weechat\n"
+"  /join #protectedchan,#weechat key"
 msgstr ""
-"kanál: jméno kanálu na který se připojit\n"
-" klíč: klíč pro připojení ke kanálu"
 
 msgid "forcibly remove a user from a channel"
 msgstr "násilně odebrat uživatele z kanálu"
@@ -4871,8 +4876,8 @@ msgstr[2] "minut"
 msgid ""
 "%s%s[%s%s%s]%s idle: %s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
 msgstr ""
-"%s%s[%s%s%s]%s nečinný: %s%02d %s%s %s%02d %s%s %s%02d %s%s, přihlášen v: %s%"
-"s"
+"%s%s[%s%s%s]%s nečinný: %s%02d %s%s %s%02d %s%s %s%02d %s%s, přihlášen v: %s"
+"%s"
 
 #, c-format
 msgid "%sMode %s%s %s[%s%s%s]"
@@ -5642,8 +5647,8 @@ msgstr "%sMůžete smazat tento soubor, pokud je plugin \"%s\" starý/neplatný"
 
 #, c-format
 msgid ""
-"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: \"%"
-"s\"), failed to load"
+"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: "
+"\"%s\"), failed to load"
 msgstr ""
 "%sChyba: chyba API v pluginu \"%s\" (aktuální API: \"%s\", API pluginu: \"%s"
 "\"), načtení selhalo"
@@ -5744,8 +5749,8 @@ msgstr "Klienti pro přenos:"
 
 #, c-format
 msgid ""
-"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, %"
-"lu sent"
+"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, "
+"%lu sent"
 msgstr ""
 "%3d. %s%s%s (%s%s%s), spuštěn v: %s, poslední aktivita: %s, bytů: %lu "
 "přijato, %lu odebráno"
@@ -6285,8 +6290,8 @@ msgstr "Xfer seznam:"
 msgid ""
 "%3d. %s (%s), file: \"%s\" (local: \"%s\"), %s %s, status: %s%s%s (%lu %%)"
 msgstr ""
-"%3d. %s (%s), soubor: \"%s\" (lokální: \"%s\"), %s %s, status: %s%s%s (%lu %"
-"%)"
+"%3d. %s (%s), soubor: \"%s\" (lokální: \"%s\"), %s %s, status: %s%s%s (%lu "
+"%%)"
 
 #, c-format
 msgid "%3d. %s, chat with %s (local nick: %s), started on %s, status: %s%s"
@@ -6298,8 +6303,8 @@ msgid ""
 "     plugin: %s (id: %s), file: %lu bytes (position: %lu), address: %d.%d.%d."
 "%d (port %d)"
 msgstr ""
-"     plugin: %s (id: %s), soubor: %lu bytů (pozice: %lu), adresa: %d.%d.%d.%"
-"d (port %d)"
+"     plugin: %s (id: %s), soubor: %lu bytů (pozice: %lu), adresa: %d.%d.%d."
+"%d (port %d)"
 
 #, c-format
 msgid "     fast_send: %s, blocksize: %d, started on %s"
@@ -6411,8 +6416,8 @@ msgstr "konvertovat mezery na podtržítka při odesílání souborů"
 
 msgid "rename incoming files if already exists (add \".1\", \".2\", ...)"
 msgstr ""
-"přejmenovat příchozí soubory, jestliže již existují (přídat \".1\", \".2"
-"\", ...)"
+"přejmenovat příchozí soubory, jestliže již existují (přídat \".1\", "
+"\".2\", ...)"
 
 msgid ""
 "automatically resume file transfer if connection with remote host is lost"
@@ -6491,6 +6496,13 @@ msgstr "Argumenty"
 msgid "Pointer"
 msgstr "Ukazatel"
 
+#~ msgid ""
+#~ "channel: channel name to join\n"
+#~ "    key: key to join the channel"
+#~ msgstr ""
+#~ "kanál: jméno kanálu na který se připojit\n"
+#~ " klíč: klíč pro připojení ke kanálu"
+
 #, fuzzy
 #~ msgid "color for buffer name when connected using SSL to server"
 #~ msgstr "%s%s: nejste připojen k serveru"
diff --git a/po/de.po b/po/de.po
index 166ea5247..4fc80bf57 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-05-01 12:22+0200\n"
-"PO-Revision-Date: 2010-04-18 10:50+0200\n"
+"POT-Creation-Date: 2010-05-20 11:47+0200\n"
+"PO-Revision-Date: 2010-05-20 12:20+0200\n"
 "Last-Translator: Nils G <weechatter@arcor.de>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
+"Language: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3634,15 +3635,19 @@ msgstr "Nickname: Nickname"
 msgid "join a channel"
 msgstr "einen Channel betreten"
 
-msgid "[channel[,channel] [key[,key]]]"
+#, fuzzy
+msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
 msgstr "[channel[,channel] [key[,key]]]"
 
 msgid ""
 "channel: channel name to join\n"
-"    key: key to join the channel"
+"    key: key to join the channel (channels with a key must be the first in "
+"list)\n"
+"\n"
+"Examples:\n"
+"  /join #weechat\n"
+"  /join #protectedchan,#weechat key"
 msgstr ""
-"  Channel: zu betretender Channel\n"
-"Passwort: Channelpasswort (+k-Mode)"
 
 msgid "forcibly remove a user from a channel"
 msgstr "Einen User aus einem Channel herauskicken"
@@ -5842,8 +5847,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: \"%"
-"s\"), failed to load"
+"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: "
+"\"%s\"), failed to load"
 msgstr ""
 "%sFehler: API Unverträglichkeit für Erweiterung \"%s\" (genutzte API: \"%s"
 "\", Erweiterungs-API: \"%s\"), Installation fehlgeschlagen"
@@ -5946,8 +5951,8 @@ msgstr "Clients für Relay:"
 
 #, c-format
 msgid ""
-"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, %"
-"lu sent"
+"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, "
+"%lu sent"
 msgstr ""
 "%3d. %s%s%s (%s%s%s), gestartet am: %s, letzte Aktivität: %s, Bytes: %lu "
 "empfangen, %lu gesendet"
@@ -6504,8 +6509,8 @@ msgstr ""
 #, c-format
 msgid "%3d. %s, chat with %s (local nick: %s), started on %s, status: %s%s"
 msgstr ""
-"%3d. %s, Der Chat mit %s (lokaler Nick: %s), wurde am %s gestartet, Status: %"
-"s%s"
+"%3d. %s, Der Chat mit %s (lokaler Nick: %s), wurde am %s gestartet, Status: "
+"%s%s"
 
 #, c-format
 msgid ""
@@ -6711,6 +6716,13 @@ msgstr "Argumente"
 msgid "Pointer"
 msgstr "Pointer"
 
+#~ msgid ""
+#~ "channel: channel name to join\n"
+#~ "    key: key to join the channel"
+#~ msgstr ""
+#~ "  Channel: zu betretender Channel\n"
+#~ "Passwort: Channelpasswort (+k-Mode)"
+
 #, fuzzy
 #~ msgid "color for buffer name when connected using SSL to server"
 #~ msgstr "%s%s: Es besteht keine Verbindung zum Server"
diff --git a/po/es.po b/po/es.po
index a401f5749..0ab853cc1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-05-01 12:22+0200\n"
-"PO-Revision-Date: 2010-04-18 10:50+0200\n"
+"POT-Creation-Date: 2010-05-20 11:47+0200\n"
+"PO-Revision-Date: 2010-05-20 12:20+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
+"Language: Spanish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3549,15 +3550,19 @@ msgstr "apodo: apodo"
 msgid "join a channel"
 msgstr "unirse a un canal"
 
-msgid "[channel[,channel] [key[,key]]]"
+#, fuzzy
+msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
 msgstr "[canal[,canal] [clave[,clave]]]"
 
 msgid ""
 "channel: channel name to join\n"
-"    key: key to join the channel"
+"    key: key to join the channel (channels with a key must be the first in "
+"list)\n"
+"\n"
+"Examples:\n"
+"  /join #weechat\n"
+"  /join #protectedchan,#weechat key"
 msgstr ""
-"canal: canal a unirse\n"
-"clave: clave para unirse al canal"
 
 msgid "forcibly remove a user from a channel"
 msgstr "expulsar forzosamente a un usuario de un canal"
@@ -5734,8 +5739,8 @@ msgstr "%sSi el plugin \"%s\" es viejo/obsoleto, puedes borrar este archivo."
 
 #, c-format
 msgid ""
-"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: \"%"
-"s\"), failed to load"
+"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: "
+"\"%s\"), failed to load"
 msgstr ""
 "%sError: API del plugin \"%s\" es incompatible (API actual: \"%s\", API del "
 "plugin: \"%s\"), no se puede cargar"
@@ -5839,8 +5844,8 @@ msgstr "Clientes para retransmitir:"
 
 #, c-format
 msgid ""
-"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, %"
-"lu sent"
+"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, "
+"%lu sent"
 msgstr ""
 "%3d. %s%s%s (%s%s%s), iniciado en: %s, última actividad: %s, bytes: %lu "
 "recibidos, %lu enviados"
@@ -6406,8 +6411,8 @@ msgid ""
 "     plugin: %s (id: %s), file: %lu bytes (position: %lu), address: %d.%d.%d."
 "%d (port %d)"
 msgstr ""
-"     plugin: %s (id: %s), archivo: %lu bytes (posición: %lu), dirección: %d.%"
-"d.%d.%d (puerto %d)"
+"     plugin: %s (id: %s), archivo: %lu bytes (posición: %lu), dirección: %d."
+"%d.%d.%d (puerto %d)"
 
 #, c-format
 msgid "     fast_send: %s, blocksize: %d, started on %s"
@@ -6603,6 +6608,13 @@ msgstr "Argumentos"
 msgid "Pointer"
 msgstr "Puntero"
 
+#~ msgid ""
+#~ "channel: channel name to join\n"
+#~ "    key: key to join the channel"
+#~ msgstr ""
+#~ "canal: canal a unirse\n"
+#~ "clave: clave para unirse al canal"
+
 #, fuzzy
 #~ msgid "color for buffer name when connected using SSL to server"
 #~ msgstr "%s%s: no estas conectado a ningún servidor"
diff --git a/po/fr.po b/po/fr.po
index 65389699c..8684a759e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-05-01 12:22+0200\n"
-"PO-Revision-Date: 2010-05-01 12:23+0200\n"
+"POT-Creation-Date: 2010-05-20 11:47+0200\n"
+"PO-Revision-Date: 2010-05-20 12:20+0200\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
+"Language: French\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -925,8 +926,8 @@ msgstr ""
 "   clear: efface le contenu du tampon (un numéro pour un tampon, -merged "
 "pour les tampons mélangés, -all pour tous les tampons, ou rien pour le "
 "tampon courant)\n"
-"    move: déplace le tampon dans la liste (peut être relatif, par exemple -"
-"1)\n"
+"    move: déplace le tampon dans la liste (peut être relatif, par exemple "
+"-1)\n"
 "   merge: mélange le tampon courant avec un autre tampon (la zone de "
 "discussion sera un mélange des deux tampons)\n"
 "          (par défaut ctrl-x bascule entre les tampons mélangés)\n"
@@ -3581,15 +3582,25 @@ msgstr "pseudo: pseudo"
 msgid "join a channel"
 msgstr "joindre un canal"
 
-msgid "[channel[,channel] [key[,key]]]"
-msgstr "[canal[,canal] [clé[,clé]]]"
+msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
+msgstr "[canal1[,canal2[,canal3]] [clé1[,clé2]]]"
 
 msgid ""
 "channel: channel name to join\n"
-"    key: key to join the channel"
+"    key: key to join the channel (channels with a key must be the first in "
+"list)\n"
+"\n"
+"Examples:\n"
+"  /join #weechat\n"
+"  /join #protectedchan,#weechat key"
 msgstr ""
 "canal: nom du canal à rejoindre\n"
-"  clé: clé pour rejoindre le canal"
+"  clé: clé pour rejoindre le canal (les canaux avec une clé doivent être les "
+"premiers dans la liste)\n"
+"\n"
+"Exemples:\n"
+"  /join #weechat\n"
+"  /join #protectedchan,#weechat key"
 
 msgid "forcibly remove a user from a channel"
 msgstr "retirer par la force un utilisateur d'un canal"
@@ -4978,8 +4989,8 @@ msgstr[1] "minutes"
 msgid ""
 "%s%s[%s%s%s]%s idle: %s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
 msgstr ""
-"%s%s[%s%s%s]%s inactivité: %s%02d %s%s %s%02d %s%s %s%02d %s%s, signé le: %s%"
-"s"
+"%s%s[%s%s%s]%s inactivité: %s%02d %s%s %s%02d %s%s %s%02d %s%s, signé le: %s"
+"%s"
 
 #, c-format
 msgid "%sMode %s%s %s[%s%s%s]"
@@ -5764,8 +5775,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: \"%"
-"s\"), failed to load"
+"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: "
+"\"%s\"), failed to load"
 msgstr ""
 "%sErreur: API non concordante pour l'extension \"%s\" (API courante: \"%s\", "
 "API extension: \"%s\"), échec de chargement"
@@ -5869,8 +5880,8 @@ msgstr "Clients pour le relai:"
 
 #, c-format
 msgid ""
-"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, %"
-"lu sent"
+"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, "
+"%lu sent"
 msgstr ""
 "%3d. %s%s%s (%s%s%s), démarré le: %s, dernière activité: %s, octets: %lu "
 "reçus, %lu envoyés"
@@ -6432,8 +6443,8 @@ msgid ""
 "     plugin: %s (id: %s), file: %lu bytes (position: %lu), address: %d.%d.%d."
 "%d (port %d)"
 msgstr ""
-"     extension: %s (id: %s), fichier: %lu octets (position: %lu), addresse: %"
-"d.%d.%d.%d (port %d)"
+"     extension: %s (id: %s), fichier: %lu octets (position: %lu), addresse: "
+"%d.%d.%d.%d (port %d)"
 
 #, c-format
 msgid "     fast_send: %s, blocksize: %d, started on %s"
@@ -6631,3 +6642,10 @@ msgstr "Paramètres"
 
 msgid "Pointer"
 msgstr "Pointeur"
+
+#~ msgid ""
+#~ "channel: channel name to join\n"
+#~ "    key: key to join the channel"
+#~ msgstr ""
+#~ "canal: nom du canal à rejoindre\n"
+#~ "  clé: clé pour rejoindre le canal"
diff --git a/po/hu.po b/po/hu.po
index 7d3d53e54..06d4dd1e9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-05-01 12:22+0200\n"
-"PO-Revision-Date: 2010-04-18 10:51+0200\n"
+"POT-Creation-Date: 2010-05-20 11:47+0200\n"
+"PO-Revision-Date: 2010-05-20 12:20+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
+"Language: Hungarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -929,8 +930,8 @@ msgstr ""
 "   close: puffer bezárása (esetleges argumentum egy kilépő üzenet szoba "
 "esetén)\n"
 "    list: nyitott pufferek listája (paraméter hiányában is ez fut le)\n"
-"  notify: értesítési szint beállítása (0=soha, 1=highlight, 2=1+üzenet, 3=2"
-"+ki/belépés)\n"
+"  notify: értesítési szint beállítása (0=soha, 1=highlight, 2=1+üzenet, "
+"3=2+ki/belépés)\n"
 "          (ha a szerver pufferben kerül lefuttatásra, akkor az egész "
 "szerverre állítja az értesítési szintet)\n"
 "  scroll: puffertörténet görgetése (lehet relatív és végződhet betűvel: "
@@ -3300,15 +3301,18 @@ msgid "join a channel"
 msgstr "belépés egy szobába"
 
 #, fuzzy
-msgid "[channel[,channel] [key[,key]]]"
+msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
 msgstr "szoba[,szoba] [kulcs[,kulcs]]"
 
 msgid ""
 "channel: channel name to join\n"
-"    key: key to join the channel"
+"    key: key to join the channel (channels with a key must be the first in "
+"list)\n"
+"\n"
+"Examples:\n"
+"  /join #weechat\n"
+"  /join #protectedchan,#weechat key"
 msgstr ""
-"szoba: a szoba neve, ahová csatlakozni szeretnénk\n"
-"kulcs: a csatlakozáshoz szükséges kulcs"
 
 msgid "forcibly remove a user from a channel"
 msgstr "felhasználó erőszakos eltávolítása a szobából"
@@ -5064,8 +5068,8 @@ msgstr ""
 #, fuzzy, c-format
 msgid "Connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
 msgstr ""
-"Csatlakozás a(z) %s:%d%s%s szerverhez %s proxy kiszolgálón keresztül: %s:%d%"
-"s...\n"
+"Csatlakozás a(z) %s:%d%s%s szerverhez %s proxy kiszolgálón keresztül: %s:%d"
+"%s...\n"
 
 #, fuzzy, c-format
 msgid "%s: connecting to server %s/%d%s%s..."
@@ -5424,8 +5428,8 @@ msgstr ""
 
 #, fuzzy, c-format
 msgid ""
-"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: \"%"
-"s\"), failed to load"
+"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: "
+"\"%s\"), failed to load"
 msgstr ""
 "%s a \"plugin_name\" szimbólum nem található a \"%s\" modulban, betöltés "
 "sikertelen\n"
@@ -5533,8 +5537,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, %"
-"lu sent"
+"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, "
+"%lu sent"
 msgstr ""
 
 #, fuzzy, c-format
@@ -5980,15 +5984,15 @@ msgstr "%s nincs elegendő memória új DCC számára\n"
 #, fuzzy, c-format
 msgid "%s: incoming file from %s (%d.%d.%d.%d): %s, %lu bytes (protocol: %s)"
 msgstr ""
-"Beérkező DCC fájl a következőtől: %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%"
-"s bájt\n"
+"Beérkező DCC fájl a következőtől: %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu"
+"%s bájt\n"
 
 #, fuzzy, c-format
 msgid ""
 "%s: sending file to %s: %s (local filename: %s), %lu bytes (protocol: %s)"
 msgstr ""
-"DCC fájl küldése a következőnek: %s%s%s: %s%s%s (helyi fájlnév: %s%s%s), %s%"
-"lu%s bájt\n"
+"DCC fájl küldése a következőnek: %s%s%s: %s%s%s (helyi fájlnév: %s%s%s), %s"
+"%lu%s bájt\n"
 
 #, fuzzy, c-format
 msgid "%s: incoming chat request from %s (%d.%d.%d.%d)"
@@ -6041,8 +6045,8 @@ msgid ""
 "%s%s: unable to resume file \"%s\" (port: %d, start position: %lu): xfer not "
 "found or not ready for transfer"
 msgstr ""
-"%s nem sikerült a(z) \"%s\" fájlra visszatérni (port: %d, indulási pozíció: %"
-"u): DCC nem található vagy véget ért\n"
+"%s nem sikerült a(z) \"%s\" fájlra visszatérni (port: %d, indulási pozíció: "
+"%u): DCC nem található vagy véget ért\n"
 
 #, fuzzy, c-format
 msgid "%s: file %s resumed at position %lu"
@@ -6053,8 +6057,8 @@ msgid ""
 "%s%s: unable to accept resume file \"%s\" (port: %d, start position: %lu): "
 "xfer not found or not ready for transfer"
 msgstr ""
-"%s nem sikerült a(z) \"%s\" fájlra visszatérni (port: %d, indulási pozíció: %"
-"u): DCC nem található vagy véget ért\n"
+"%s nem sikerült a(z) \"%s\" fájlra visszatérni (port: %d, indulási pozíció: "
+"%u): DCC nem található vagy véget ért\n"
 
 #, fuzzy, c-format
 msgid "%s%s: aborting active xfer: \"%s\" from %s"
@@ -6293,6 +6297,13 @@ msgstr "fogadó típusa [paraméterek]"
 msgid "Pointer"
 msgstr "perc"
 
+#~ msgid ""
+#~ "channel: channel name to join\n"
+#~ "    key: key to join the channel"
+#~ msgstr ""
+#~ "szoba: a szoba neve, ahová csatlakozni szeretnénk\n"
+#~ "kulcs: a csatlakozáshoz szükséges kulcs"
+
 #, fuzzy
 #~ msgid "color for buffer name when connected using SSL to server"
 #~ msgstr "%s nincs csatlakozva szerverhez!\n"
diff --git a/po/it.po b/po/it.po
index 8e0910b7c..0d559377e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weechat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-05-01 12:22+0200\n"
-"PO-Revision-Date: 2010-04-18 10:51+0200\n"
+"POT-Creation-Date: 2010-05-20 11:47+0200\n"
+"PO-Revision-Date: 2010-05-20 12:21+0200\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
+"Language: Italian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3555,15 +3556,19 @@ msgstr "nick: nick"
 msgid "join a channel"
 msgstr "entra in un canale"
 
-msgid "[channel[,channel] [key[,key]]]"
+#, fuzzy
+msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
 msgstr "[canale[,canale ] [chiave[,chiave]]]"
 
 msgid ""
 "channel: channel name to join\n"
-"    key: key to join the channel"
+"    key: key to join the channel (channels with a key must be the first in "
+"list)\n"
+"\n"
+"Examples:\n"
+"  /join #weechat\n"
+"  /join #protectedchan,#weechat key"
 msgstr ""
-"canale: nome del canale in cui entrare\n"
-"chiave: chiave per entrare nel canale"
 
 msgid "forcibly remove a user from a channel"
 msgstr "caccia forzatamente un utente da un canale"
@@ -4945,8 +4950,8 @@ msgstr[1] "minuti"
 msgid ""
 "%s%s[%s%s%s]%s idle: %s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
 msgstr ""
-"%s%s[%s%s%s]%s inattivo: %s%02d %s%s %s%02d %s%s %s%02d %s%s, connesso dal: %"
-"s%s"
+"%s%s[%s%s%s]%s inattivo: %s%02d %s%s %s%02d %s%s %s%02d %s%s, connesso dal: "
+"%s%s"
 
 #, c-format
 msgid "%sMode %s%s %s[%s%s%s]"
@@ -5733,8 +5738,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: \"%"
-"s\"), failed to load"
+"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: "
+"\"%s\"), failed to load"
 msgstr ""
 "%sErrore: API non corrispondente per il plugin \"%s\" (API corrente: \"%s\", "
 "API del plugin: \"%s\"), impossibile effettuare il caricamento"
@@ -5838,8 +5843,8 @@ msgstr "Client per relay:"
 
 #, c-format
 msgid ""
-"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, %"
-"lu sent"
+"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, "
+"%lu sent"
 msgstr ""
 "%3d, %s%s%s (%s%s%s), avviato il %s, attività recente: %s byte: %lu "
 "ricevuti, %lu inviati"
@@ -6346,8 +6351,8 @@ msgid ""
 "%s%s: unable to resume file \"%s\" (port: %d, start position: %lu): xfer not "
 "found or not ready for transfer"
 msgstr ""
-"%s%s: impossibile riprendere il file \"%s\" (porta: %d, posizione di avvio: %"
-"lu): xfer non trovato o non pronto per il trasferimento"
+"%s%s: impossibile riprendere il file \"%s\" (porta: %d, posizione di avvio: "
+"%lu): xfer non trovato o non pronto per il trasferimento"
 
 #, c-format
 msgid "%s: file %s resumed at position %lu"
@@ -6395,8 +6400,8 @@ msgid ""
 "     plugin: %s (id: %s), file: %lu bytes (position: %lu), address: %d.%d.%d."
 "%d (port %d)"
 msgstr ""
-"     plugin: %s (id: %s), file: %lu byte (posizione: %lu), indirizzo: %d.%d.%"
-"d.%d (porta %d)"
+"     plugin: %s (id: %s), file: %lu byte (posizione: %lu), indirizzo: %d.%d."
+"%d.%d (porta %d)"
 
 #, c-format
 msgid "     fast_send: %s, blocksize: %d, started on %s"
@@ -6587,6 +6592,13 @@ msgstr "Argomenti"
 msgid "Pointer"
 msgstr "Puntatore"
 
+#~ msgid ""
+#~ "channel: channel name to join\n"
+#~ "    key: key to join the channel"
+#~ msgstr ""
+#~ "canale: nome del canale in cui entrare\n"
+#~ "chiave: chiave per entrare nel canale"
+
 #, fuzzy
 #~ msgid "color for buffer name when connected using SSL to server"
 #~ msgstr "%s%s: non connesso al server"
diff --git a/po/pl.po b/po/pl.po
index ddfd9cf9a..21957b140 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-05-01 12:22+0200\n"
-"PO-Revision-Date: 2010-04-18 10:51+0200\n"
+"POT-Creation-Date: 2010-05-20 11:47+0200\n"
+"PO-Revision-Date: 2010-05-20 12:22+0200\n"
 "Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n"
-"Language-Team: Polish\n"
+"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
+"Language: Polish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -723,8 +724,8 @@ msgstr[2] "dni"
 #, c-format
 msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s"
 msgstr ""
-"Czas działania WeeChat: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, uruchomiono %s%"
-"s"
+"Czas działania WeeChat: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, uruchomiono %s"
+"%s"
 
 msgid "compiled on"
 msgstr "skompilowano"
@@ -3538,15 +3539,19 @@ msgstr "nick: nazwa użytkownika"
 msgid "join a channel"
 msgstr "wchodzi na kanał"
 
-msgid "[channel[,channel] [key[,key]]]"
+#, fuzzy
+msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
 msgstr "[kanał[,kanał] [klucz[,klucz]]]"
 
 msgid ""
 "channel: channel name to join\n"
-"    key: key to join the channel"
+"    key: key to join the channel (channels with a key must be the first in "
+"list)\n"
+"\n"
+"Examples:\n"
+"  /join #weechat\n"
+"  /join #protectedchan,#weechat key"
 msgstr ""
-"kanał: nazwa kanału, na który chcemy wejść\n"
-"    klucz: hasło wymagane do wejścia na kanał"
 
 msgid "forcibly remove a user from a channel"
 msgstr "siłowo usuwa użytkownika z kanału"
@@ -5688,8 +5693,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: \"%"
-"s\"), failed to load"
+"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: "
+"\"%s\"), failed to load"
 msgstr ""
 "%sBłąd: niedopasowane API \"%s\" (obecne API: \"%s\", API wtyczki: \"%s\"), "
 "nie udało się załadować"
@@ -5792,8 +5797,8 @@ msgstr "Klienci do przekazania:"
 
 #, c-format
 msgid ""
-"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, %"
-"lu sent"
+"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, "
+"%lu sent"
 msgstr ""
 "%3d. %s%s%s (%s%s%s), rozpoczęto: %s,ostatnia aktywność: %s, bajtów: %lu "
 "odebrano, %lu wysłano"
@@ -6165,8 +6170,8 @@ msgstr "%s: skryptów wyładowano"
 msgid ""
 "%s%s: unable to call function \"%s\", script is not initialized (script: %s)"
 msgstr ""
-"%s%s: nie można wywołać funcji \"%s\", skrypt nie zainicjalizowany (skrypt: %"
-"s)"
+"%s%s: nie można wywołać funcji \"%s\", skrypt nie zainicjalizowany (skrypt: "
+"%s)"
 
 #, c-format
 msgid "%s%s: wrong arguments for function \"%s\" (script: %s)"
@@ -6346,8 +6351,8 @@ msgid ""
 "     plugin: %s (id: %s), file: %lu bytes (position: %lu), address: %d.%d.%d."
 "%d (port %d)"
 msgstr ""
-"     wtyczka: %s (id: %s), plik: %lu bajtów (pozycja: %lu), adres: %d.%d.%d.%"
-"d (port %d)"
+"     wtyczka: %s (id: %s), plik: %lu bajtów (pozycja: %lu), adres: %d.%d.%d."
+"%d (port %d)"
 
 #, c-format
 msgid "     fast_send: %s, blocksize: %d, started on %s"
@@ -6458,8 +6463,8 @@ msgstr "zamień spacje na podkreślenia wysyłając plik"
 
 msgid "rename incoming files if already exists (add \".1\", \".2\", ...)"
 msgstr ""
-"zmień nazwę pliku przychodzącego jeśli juz istnieje (dodaj \".1\", \".2"
-"\", ...)"
+"zmień nazwę pliku przychodzącego jeśli juz istnieje (dodaj \".1\", "
+"\".2\", ...)"
 
 msgid ""
 "automatically resume file transfer if connection with remote host is lost"
@@ -6536,6 +6541,13 @@ msgstr "Argumenty"
 msgid "Pointer"
 msgstr "Wskaźnik"
 
+#~ msgid ""
+#~ "channel: channel name to join\n"
+#~ "    key: key to join the channel"
+#~ msgstr ""
+#~ "kanał: nazwa kanału, na który chcemy wejść\n"
+#~ "    klucz: hasło wymagane do wejścia na kanał"
+
 #, fuzzy
 #~ msgid "color for buffer name when connected using SSL to server"
 #~ msgstr "%s%s: nie jesteś połączony z serwerem"
diff --git a/po/ru.po b/po/ru.po
index 765dc0b79..17e878836 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,15 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-05-01 12:22+0200\n"
-"PO-Revision-Date: 2010-04-18 10:51+0200\n"
+"POT-Creation-Date: 2010-05-20 11:47+0200\n"
+"PO-Revision-Date: 2010-05-20 12:22+0200\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
+"Language: Russian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Poedit-Bookmarks: -1,-1,608,-1,-1,-1,-1,-1,-1,-1\n"
 
 #, c-format
@@ -926,8 +927,8 @@ msgid ""
 "    /buffer +1"
 msgstr ""
 "действие: выполняемое действие:\n"
-"    move: передвинуть буфер в списке (может быть относительным, например -"
-"1)\n"
+"    move: передвинуть буфер в списке (может быть относительным, например "
+"-1)\n"
 "   close: закрыть буфер (необязательный аргумент - сообщение покидания "
 "канала)\n"
 "    list: перечислить открытые буферы (отсутствие параметров подразумевает "
@@ -3310,15 +3311,18 @@ msgid "join a channel"
 msgstr "зайти на канал"
 
 #, fuzzy
-msgid "[channel[,channel] [key[,key]]]"
+msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
 msgstr "канал[,канал] [ключ[,ключ]]"
 
 msgid ""
 "channel: channel name to join\n"
-"    key: key to join the channel"
+"    key: key to join the channel (channels with a key must be the first in "
+"list)\n"
+"\n"
+"Examples:\n"
+"  /join #weechat\n"
+"  /join #protectedchan,#weechat key"
 msgstr ""
-"канал: название канала\n"
-" ключ: ключ для входа на канал"
 
 msgid "forcibly remove a user from a channel"
 msgstr "принудительно удалить пользователя с канала"
@@ -5426,8 +5430,8 @@ msgstr ""
 
 #, fuzzy, c-format
 msgid ""
-"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: \"%"
-"s\"), failed to load"
+"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: "
+"\"%s\"), failed to load"
 msgstr ""
 "%s символ \"plugin_name\" не найден в plugin'е \"%s\", загрузка не удалась\n"
 
@@ -5535,8 +5539,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, %"
-"lu sent"
+"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, "
+"%lu sent"
 msgstr ""
 
 #, fuzzy, c-format
@@ -6290,6 +6294,13 @@ msgstr "адресат тип [аргументы]"
 msgid "Pointer"
 msgstr "минута"
 
+#~ msgid ""
+#~ "channel: channel name to join\n"
+#~ "    key: key to join the channel"
+#~ msgstr ""
+#~ "канал: название канала\n"
+#~ " ключ: ключ для входа на канал"
+
 #, fuzzy
 #~ msgid "color for buffer name when connected using SSL to server"
 #~ msgstr "%s вы не подключены к серверу\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index 35dd69720..5fbac8380 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-05-01 12:22+0200\n"
+"POT-Creation-Date: 2010-05-20 11:47+0200\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2881,12 +2882,17 @@ msgstr ""
 msgid "join a channel"
 msgstr ""
 
-msgid "[channel[,channel] [key[,key]]]"
+msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
 msgstr ""
 
 msgid ""
 "channel: channel name to join\n"
-"    key: key to join the channel"
+"    key: key to join the channel (channels with a key must be the first in "
+"list)\n"
+"\n"
+"Examples:\n"
+"  /join #weechat\n"
+"  /join #protectedchan,#weechat key"
 msgstr ""
 
 msgid "forcibly remove a user from a channel"
@@ -4713,8 +4719,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: \"%"
-"s\"), failed to load"
+"%sError: API mismatch for plugin \"%s\" (current API: \"%s\", plugin API: "
+"\"%s\"), failed to load"
 msgstr ""
 
 #, c-format
@@ -4811,8 +4817,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, %"
-"lu sent"
+"%3d. %s%s%s (%s%s%s), started on: %s, last activity: %s, bytes: %lu recv, "
+"%lu sent"
 msgstr ""
 
 #, c-format
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 9316029d5..653740dbe 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -4387,9 +4387,13 @@ irc_command_init ()
                           "%(nicks)|%*", &irc_command_ison, NULL);
     weechat_hook_command ("join",
                           N_("join a channel"),
-                          N_("[channel[,channel] [key[,key]]]"),
+                          N_("[channel1[,channel2[,channel3]] [key1[,key2]]]"),
                           N_("channel: channel name to join\n"
-                             "    key: key to join the channel"),
+                             "    key: key to join the channel (channels with "
+                             "a key must be the first in list)\n\n"
+                             "Examples:\n"
+                             "  /join #weechat\n"
+                             "  /join #protectedchan,#weechat key"),
                           "%(irc_channels)", &irc_command_join, NULL);
     weechat_hook_command ("kick",
                           N_("forcibly remove a user from a channel"),