irc: improve help of server option "autojoin"

18 files changed, 170 insertions, 85 deletions

diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt
index f57ba3219..ab5e920a6 100644
--- a/doc/de/autogen/user/irc_options.txt
+++ b/doc/de/autogen/user/irc_options.txt
@@ -414,7 +414,7 @@
 ** Werte: on, off (Standardwert: `off`)
 
 * [[option_irc.server_default.autojoin]] *irc.server_default.autojoin*
-** Beschreibung: `durch Kommata getrennte Liste der Channels, die beim Verbinden zum Server betreten werden sollen (Beispiel: "#chan1,#chan2,#chan3 key1,key2") (Hinweis: Inhalt wird evaluiert, siehe /help eval)`
+** Beschreibung: `comma separated list of channels to join when connected to server; the channels that require a key must be at beginning of the list, and all the keys must be given after the channels (separated by a space) (example: "#channel1,#channel2,#channel3 key1,key2" where #channel1 and #channel2 are protected by key1 and key2) (note: content is evaluated, see /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt
index 09cd6b402..c9a4f4e5a 100644
--- a/doc/en/autogen/user/irc_options.txt
+++ b/doc/en/autogen/user/irc_options.txt
@@ -414,7 +414,7 @@
 ** values: on, off (default value: `off`)
 
 * [[option_irc.server_default.autojoin]] *irc.server_default.autojoin*
-** description: `comma separated list of channels to join when connected to server (example: "#chan1,#chan2,#chan3 key1,key2") (note: content is evaluated, see /help eval)`
+** description: `comma separated list of channels to join when connected to server; the channels that require a key must be at beginning of the list, and all the keys must be given after the channels (separated by a space) (example: "#channel1,#channel2,#channel3 key1,key2" where #channel1 and #channel2 are protected by key1 and key2) (note: content is evaluated, see /help eval)`
 ** type: string
 ** values: any string (default value: `""`)
 
diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt
index 45b5faf21..5bde0dfb8 100644
--- a/doc/fr/autogen/user/irc_options.txt
+++ b/doc/fr/autogen/user/irc_options.txt
@@ -414,7 +414,7 @@
 ** valeurs: on, off (valeur par défaut: `off`)
 
 * [[option_irc.server_default.autojoin]] *irc.server_default.autojoin*
-** description: `liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au serveur (exemple: "#chan1,#chan2,#chan3 key1,key2") (note: le contenu est évalué, voir /help eval)`
+** description: `liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au serveur; les canaux nécessitant une clé doivent être en début de liste, et toutes les clés doivent être données après les canaux (séparées par un espace) (exemple: "#canal1,#canal2,#canal3 clé1,clé2" où #canal1 et #canal2 sont protégés par clé1 et clé2) (note: le contenu est évalué, voir /help eval)`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `""`)
 
diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt
index d07ee5062..f327798b1 100644
--- a/doc/it/autogen/user/irc_options.txt
+++ b/doc/it/autogen/user/irc_options.txt
@@ -414,7 +414,7 @@
 ** valori: on, off (valore predefinito: `off`)
 
 * [[option_irc.server_default.autojoin]] *irc.server_default.autojoin*
-** descrizione: `elenco separato da virgole di canali in cui entrare quando si è connessi al server (esempio: "#canale1", #canale2, #canale3 chiave1,chiave2") (nota: il contenuto viene valutato, consultare /help eval)`
+** descrizione: `comma separated list of channels to join when connected to server; the channels that require a key must be at beginning of the list, and all the keys must be given after the channels (separated by a space) (example: "#channel1,#channel2,#channel3 key1,key2" where #channel1 and #channel2 are protected by key1 and key2) (note: content is evaluated, see /help eval)`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `""`)
 
diff --git a/doc/ja/autogen/user/irc_options.txt b/doc/ja/autogen/user/irc_options.txt
index cbb0a8f87..ee71b0264 100644
--- a/doc/ja/autogen/user/irc_options.txt
+++ b/doc/ja/autogen/user/irc_options.txt
@@ -414,7 +414,7 @@
 ** 値: on, off (デフォルト値: `off`)
 
 * [[option_irc.server_default.autojoin]] *irc.server_default.autojoin*
-** 説明: `サーバに接続した際に参加するチャンネルのコンマ区切りリスト(例: "#chan1,#chan2,#chan3 key1,key2") (注意: 値は評価されます、/help eval を参照)`
+** 説明: `comma separated list of channels to join when connected to server; the channels that require a key must be at beginning of the list, and all the keys must be given after the channels (separated by a space) (example: "#channel1,#channel2,#channel3 key1,key2" where #channel1 and #channel2 are protected by key1 and key2) (note: content is evaluated, see /help eval)`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `""`)
 
diff --git a/po/cs.po b/po/cs.po
index 545270597..4ab6ff519 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-20 16:43+0200\n"
-"PO-Revision-Date: 2013-10-06 10:17+0200\n"
+"POT-Creation-Date: 2013-10-06 11:16+0200\n"
+"PO-Revision-Date: 2013-10-06 11:12+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: cs\n"
@@ -6091,14 +6091,13 @@ msgstr ""
 "počkání (v sekundách) po spuštění příkazu (například: dád nějaký čas pro "
 "autorizaci)"
 
-#, fuzzy
 msgid ""
-"comma separated list of channels to join when connected to server (example: "
-"\"#chan1,#chan2,#chan3 key1,key2\") (note: content is evaluated, see /help "
-"eval)"
+"comma separated list of channels to join when connected to server; the "
+"channels that require a key must be at beginning of the list, and all the "
+"keys must be given after the channels (separated by a space) (example: "
+"\"#channel1,#channel2,#channel3 key1,key2\" where #channel1 and #channel2 "
+"are protected by key1 and key2) (note: content is evaluated, see /help eval)"
 msgstr ""
-"čárkou rozdělený seznam kanálů na které přistoupit po připojení na server "
-"(příklad: \"#kanál1,#kanál2,#kanál3 klíč1,klíč2\")"
 
 msgid ""
 "automatically rejoin channels after kick; you can define a buffer local "
@@ -9827,3 +9826,12 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "comma separated list of channels to join when connected to server "
+#~ "(example: \"#chan1,#chan2,#chan3 key1,key2\") (note: content is "
+#~ "evaluated, see /help eval)"
+#~ msgstr ""
+#~ "čárkou rozdělený seznam kanálů na které přistoupit po připojení na server "
+#~ "(příklad: \"#kanál1,#kanál2,#kanál3 klíč1,klíč2\")"
diff --git a/po/de.po b/po/de.po
index 02c3f427e..6ce4bfc3a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-20 23:13+0200\n"
+"POT-Creation-Date: 2013-10-06 11:16+0200\n"
 "PO-Revision-Date: 2013-10-06 10:17+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
@@ -6787,13 +6787,12 @@ msgstr ""
 "Authentifizierung zu ermöglichen"
 
 msgid ""
-"comma separated list of channels to join when connected to server (example: "
-"\"#chan1,#chan2,#chan3 key1,key2\") (note: content is evaluated, see /help "
-"eval)"
+"comma separated list of channels to join when connected to server; the "
+"channels that require a key must be at beginning of the list, and all the "
+"keys must be given after the channels (separated by a space) (example: "
+"\"#channel1,#channel2,#channel3 key1,key2\" where #channel1 and #channel2 "
+"are protected by key1 and key2) (note: content is evaluated, see /help eval)"
 msgstr ""
-"durch Kommata getrennte Liste der Channels, die beim Verbinden zum Server "
-"betreten werden sollen (Beispiel: \"#chan1,#chan2,#chan3 key1,key2\") "
-"(Hinweis: Inhalt wird evaluiert, siehe /help eval)"
 
 msgid ""
 "automatically rejoin channels after kick; you can define a buffer local "
@@ -10846,3 +10845,12 @@ msgstr "Type"
 
 msgid "Constants"
 msgstr "Konstanten"
+
+#~ msgid ""
+#~ "comma separated list of channels to join when connected to server "
+#~ "(example: \"#chan1,#chan2,#chan3 key1,key2\") (note: content is "
+#~ "evaluated, see /help eval)"
+#~ msgstr ""
+#~ "durch Kommata getrennte Liste der Channels, die beim Verbinden zum Server "
+#~ "betreten werden sollen (Beispiel: \"#chan1,#chan2,#chan3 key1,key2\") "
+#~ "(Hinweis: Inhalt wird evaluiert, siehe /help eval)"
diff --git a/po/es.po b/po/es.po
index b9e9bf3f5..4ee9789be 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"POT-Creation-Date: 2013-10-06 11:16+0200\n"
 "PO-Revision-Date: 2013-10-06 10:17+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6322,14 +6322,13 @@ msgstr ""
 "espera (en segundos) después de que el comando sea ejecutado (ejemplo: dar "
 "algo de tiempo para la autenticación)"
 
-#, fuzzy
 msgid ""
-"comma separated list of channels to join when connected to server (example: "
-"\"#chan1,#chan2,#chan3 key1,key2\") (note: content is evaluated, see /help "
-"eval)"
+"comma separated list of channels to join when connected to server; the "
+"channels that require a key must be at beginning of the list, and all the "
+"keys must be given after the channels (separated by a space) (example: "
+"\"#channel1,#channel2,#channel3 key1,key2\" where #channel1 and #channel2 "
+"are protected by key1 and key2) (note: content is evaluated, see /help eval)"
 msgstr ""
-"lista de canales (separados por comas) a unirse cuando se conecte a un "
-"servidor (ejemplo: \"#canal1,#canal2,#canal3 clave1,clave2\")"
 
 msgid ""
 "automatically rejoin channels after kick; you can define a buffer local "
@@ -10083,3 +10082,12 @@ msgstr "Tipo"
 
 msgid "Constants"
 msgstr "Constantes"
+
+#, fuzzy
+#~ msgid ""
+#~ "comma separated list of channels to join when connected to server "
+#~ "(example: \"#chan1,#chan2,#chan3 key1,key2\") (note: content is "
+#~ "evaluated, see /help eval)"
+#~ msgstr ""
+#~ "lista de canales (separados por comas) a unirse cuando se conecte a un "
+#~ "servidor (ejemplo: \"#canal1,#canal2,#canal3 clave1,clave2\")"
diff --git a/po/fr.po b/po/fr.po
index 32fba3c39..1a438009f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-20 16:43+0200\n"
-"PO-Revision-Date: 2013-10-06 10:18+0200\n"
+"POT-Creation-Date: 2013-10-06 11:16+0200\n"
+"PO-Revision-Date: 2013-10-06 11:17+0200\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -6623,13 +6623,18 @@ msgstr ""
 "pour l'authentification)"
 
 msgid ""
-"comma separated list of channels to join when connected to server (example: "
-"\"#chan1,#chan2,#chan3 key1,key2\") (note: content is evaluated, see /help "
-"eval)"
+"comma separated list of channels to join when connected to server; the "
+"channels that require a key must be at beginning of the list, and all the "
+"keys must be given after the channels (separated by a space) (example: "
+"\"#channel1,#channel2,#channel3 key1,key2\" where #channel1 and #channel2 "
+"are protected by key1 and key2) (note: content is evaluated, see /help eval)"
 msgstr ""
 "liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au "
-"serveur (exemple: \"#chan1,#chan2,#chan3 key1,key2\") (note: le contenu est "
-"évalué, voir /help eval)"
+"serveur; les canaux nécessitant une clé doivent être en début de liste, et "
+"toutes les clés doivent être données après les canaux (séparées par un "
+"espace) (exemple: \"#canal1,#canal2,#canal3 clé1,clé2\" où #canal1 et "
+"#canal2 sont protégés par clé1 et clé2) (note: le contenu est évalué, voir /"
+"help eval)"
 
 msgid ""
 "automatically rejoin channels after kick; you can define a buffer local "
diff --git a/po/hu.po b/po/hu.po
index f45b650a5..59fc7d9b7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"POT-Creation-Date: 2013-10-06 11:16+0200\n"
 "PO-Revision-Date: 2013-10-06 10:18+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5639,14 +5639,13 @@ msgstr ""
 "szünet (másodpercben) a parancs futtatása után (például: hagyni némi időt az "
 "azonosításra)"
 
-#, fuzzy
 msgid ""
-"comma separated list of channels to join when connected to server (example: "
-"\"#chan1,#chan2,#chan3 key1,key2\") (note: content is evaluated, see /help "
-"eval)"
+"comma separated list of channels to join when connected to server; the "
+"channels that require a key must be at beginning of the list, and all the "
+"keys must be given after the channels (separated by a space) (example: "
+"\"#channel1,#channel2,#channel3 key1,key2\" where #channel1 and #channel2 "
+"are protected by key1 and key2) (note: content is evaluated, see /help eval)"
 msgstr ""
-"szobák vesszővel elválasztott listája ahová be akarunk lépni csatlakozás "
-"után (például: \"#szoba1,#szoba2,#szoba3 kulcs1,kulcs2\")"
 
 msgid ""
 "automatically rejoin channels after kick; you can define a buffer local "
@@ -9258,3 +9257,12 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "comma separated list of channels to join when connected to server "
+#~ "(example: \"#chan1,#chan2,#chan3 key1,key2\") (note: content is "
+#~ "evaluated, see /help eval)"
+#~ msgstr ""
+#~ "szobák vesszővel elválasztott listája ahová be akarunk lépni csatlakozás "
+#~ "után (például: \"#szoba1,#szoba2,#szoba3 kulcs1,kulcs2\")"
diff --git a/po/it.po b/po/it.po
index ed75686ea..e6ee9745f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"POT-Creation-Date: 2013-10-06 11:16+0200\n"
 "PO-Revision-Date: 2013-10-06 10:18+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6447,13 +6447,12 @@ msgstr ""
 "tempo per l'autenticazione)"
 
 msgid ""
-"comma separated list of channels to join when connected to server (example: "
-"\"#chan1,#chan2,#chan3 key1,key2\") (note: content is evaluated, see /help "
-"eval)"
+"comma separated list of channels to join when connected to server; the "
+"channels that require a key must be at beginning of the list, and all the "
+"keys must be given after the channels (separated by a space) (example: "
+"\"#channel1,#channel2,#channel3 key1,key2\" where #channel1 and #channel2 "
+"are protected by key1 and key2) (note: content is evaluated, see /help eval)"
 msgstr ""
-"elenco separato da virgole di canali in cui entrare quando si è connessi al "
-"server (esempio: \"#canale1\", #canale2, #canale3 chiave1,chiave2\") (nota: "
-"il contenuto viene valutato, consultare /help eval)"
 
 msgid ""
 "automatically rejoin channels after kick; you can define a buffer local "
@@ -10224,3 +10223,12 @@ msgstr "Tipo"
 
 msgid "Constants"
 msgstr "Costanti"
+
+#~ msgid ""
+#~ "comma separated list of channels to join when connected to server "
+#~ "(example: \"#chan1,#chan2,#chan3 key1,key2\") (note: content is "
+#~ "evaluated, see /help eval)"
+#~ msgstr ""
+#~ "elenco separato da virgole di canali in cui entrare quando si è connessi "
+#~ "al server (esempio: \"#canale1\", #canale2, #canale3 chiave1,chiave2\") "
+#~ "(nota: il contenuto viene valutato, consultare /help eval)"
diff --git a/po/ja.po b/po/ja.po
index 907997bf0..b72e49272 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"POT-Creation-Date: 2013-10-06 11:16+0200\n"
 "PO-Revision-Date: 2013-10-06 10:18+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -6376,12 +6376,12 @@ msgid ""
 msgstr "コマンド実行後の遅延時間 (秒単位) (例: 認証のために少し待つ)"
 
 msgid ""
-"comma separated list of channels to join when connected to server (example: "
-"\"#chan1,#chan2,#chan3 key1,key2\") (note: content is evaluated, see /help "
-"eval)"
+"comma separated list of channels to join when connected to server; the "
+"channels that require a key must be at beginning of the list, and all the "
+"keys must be given after the channels (separated by a space) (example: "
+"\"#channel1,#channel2,#channel3 key1,key2\" where #channel1 and #channel2 "
+"are protected by key1 and key2) (note: content is evaluated, see /help eval)"
 msgstr ""
-"サーバに接続した際に参加するチャンネルのコンマ区切りリスト(例: \"#chan1,"
-"#chan2,#chan3 key1,key2\") (注意: 値は評価されます、/help eval を参照)"
 
 msgid ""
 "automatically rejoin channels after kick; you can define a buffer local "
@@ -10196,3 +10196,11 @@ msgstr "タイプ"
 
 msgid "Constants"
 msgstr "定数"
+
+#~ msgid ""
+#~ "comma separated list of channels to join when connected to server "
+#~ "(example: \"#chan1,#chan2,#chan3 key1,key2\") (note: content is "
+#~ "evaluated, see /help eval)"
+#~ msgstr ""
+#~ "サーバに接続した際に参加するチャンネルのコンマ区切りリスト(例: \"#chan1,"
+#~ "#chan2,#chan3 key1,key2\") (注意: 値は評価されます、/help eval を参照)"
diff --git a/po/pl.po b/po/pl.po
index 174019e69..8b5bf2bb1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"POT-Creation-Date: 2013-10-06 11:16+0200\n"
 "PO-Revision-Date: 2013-10-06 10:18+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6504,13 +6504,12 @@ msgstr ""
 "autentykacje)"
 
 msgid ""
-"comma separated list of channels to join when connected to server (example: "
-"\"#chan1,#chan2,#chan3 key1,key2\") (note: content is evaluated, see /help "
-"eval)"
+"comma separated list of channels to join when connected to server; the "
+"channels that require a key must be at beginning of the list, and all the "
+"keys must be given after the channels (separated by a space) (example: "
+"\"#channel1,#channel2,#channel3 key1,key2\" where #channel1 and #channel2 "
+"are protected by key1 and key2) (note: content is evaluated, see /help eval)"
 msgstr ""
-"oddzielona przecinkami lista kanałów do wejścia po połączeniu z serwerem "
-"(przykład: \"#kanał1,#kanał2,#kanał3 klucz1,klucz2\") (uwaga: zawartość jest "
-"przetwarzana, zobacz /help eval)"
 
 msgid ""
 "automatically rejoin channels after kick; you can define a buffer local "
@@ -10378,3 +10377,12 @@ msgstr "Typ"
 
 msgid "Constants"
 msgstr "Stałe"
+
+#~ msgid ""
+#~ "comma separated list of channels to join when connected to server "
+#~ "(example: \"#chan1,#chan2,#chan3 key1,key2\") (note: content is "
+#~ "evaluated, see /help eval)"
+#~ msgstr ""
+#~ "oddzielona przecinkami lista kanałów do wejścia po połączeniu z serwerem "
+#~ "(przykład: \"#kanał1,#kanał2,#kanał3 klucz1,klucz2\") (uwaga: zawartość "
+#~ "jest przetwarzana, zobacz /help eval)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 44d3469b7..0f99f575e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"POT-Creation-Date: 2013-10-06 11:16+0200\n"
 "PO-Revision-Date: 2013-10-06 10:18+0200\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5844,14 +5844,13 @@ msgstr ""
 "tempo de espera (em segundos) depois que um comando for executado (exemplo: "
 "espere algum tempo para a autenticação)"
 
-#, fuzzy
 msgid ""
-"comma separated list of channels to join when connected to server (example: "
-"\"#chan1,#chan2,#chan3 key1,key2\") (note: content is evaluated, see /help "
-"eval)"
+"comma separated list of channels to join when connected to server; the "
+"channels that require a key must be at beginning of the list, and all the "
+"keys must be given after the channels (separated by a space) (example: "
+"\"#channel1,#channel2,#channel3 key1,key2\" where #channel1 and #channel2 "
+"are protected by key1 and key2) (note: content is evaluated, see /help eval)"
 msgstr ""
-"lista de canais (separados por vírgula) para entrar quando conectar ao "
-"servidor (exemplo: \"#chan1,#chan2,#chan3 senha1,senha2\")"
 
 msgid ""
 "automatically rejoin channels after kick; you can define a buffer local "
@@ -9458,3 +9457,12 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "comma separated list of channels to join when connected to server "
+#~ "(example: \"#chan1,#chan2,#chan3 key1,key2\") (note: content is "
+#~ "evaluated, see /help eval)"
+#~ msgstr ""
+#~ "lista de canais (separados por vírgula) para entrar quando conectar ao "
+#~ "servidor (exemplo: \"#chan1,#chan2,#chan3 senha1,senha2\")"
diff --git a/po/ru.po b/po/ru.po
index 86208dbe8..142cdc99b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"POT-Creation-Date: 2013-10-06 11:16+0200\n"
 "PO-Revision-Date: 2013-10-06 10:18+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5664,14 +5664,13 @@ msgstr ""
 "задержка (в секундах) перед выполнением команды (например, нужно время для "
 "аутентификации)"
 
-#, fuzzy
 msgid ""
-"comma separated list of channels to join when connected to server (example: "
-"\"#chan1,#chan2,#chan3 key1,key2\") (note: content is evaluated, see /help "
-"eval)"
+"comma separated list of channels to join when connected to server; the "
+"channels that require a key must be at beginning of the list, and all the "
+"keys must be given after the channels (separated by a space) (example: "
+"\"#channel1,#channel2,#channel3 key1,key2\" where #channel1 and #channel2 "
+"are protected by key1 and key2) (note: content is evaluated, see /help eval)"
 msgstr ""
-"разделённый запятыми список каналов, на которые заходить при подключении к "
-"серверу (например, \"#chan1,#chan2,#chan3 key1,key2\")"
 
 msgid ""
 "automatically rejoin channels after kick; you can define a buffer local "
@@ -9278,3 +9277,12 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "comma separated list of channels to join when connected to server "
+#~ "(example: \"#chan1,#chan2,#chan3 key1,key2\") (note: content is "
+#~ "evaluated, see /help eval)"
+#~ msgstr ""
+#~ "разделённый запятыми список каналов, на которые заходить при подключении "
+#~ "к серверу (например, \"#chan1,#chan2,#chan3 key1,key2\")"
diff --git a/po/tr.po b/po/tr.po
index 05c8ca8a8..0165009dd 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"POT-Creation-Date: 2013-10-06 11:16+0200\n"
 "PO-Revision-Date: 2013-10-06 10:18+0200\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4978,9 +4978,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"comma separated list of channels to join when connected to server (example: "
-"\"#chan1,#chan2,#chan3 key1,key2\") (note: content is evaluated, see /help "
-"eval)"
+"comma separated list of channels to join when connected to server; the "
+"channels that require a key must be at beginning of the list, and all the "
+"keys must be given after the channels (separated by a space) (example: "
+"\"#channel1,#channel2,#channel3 key1,key2\" where #channel1 and #channel2 "
+"are protected by key1 and key2) (note: content is evaluated, see /help eval)"
 msgstr ""
 
 msgid ""
diff --git a/po/weechat.pot b/po/weechat.pot
index de592f45c..d084a3e24 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"POT-Creation-Date: 2013-10-06 11:16+0200\n"
 "PO-Revision-Date: 2013-02-14 18:20+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4937,9 +4937,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"comma separated list of channels to join when connected to server (example: "
-"\"#chan1,#chan2,#chan3 key1,key2\") (note: content is evaluated, see /help "
-"eval)"
+"comma separated list of channels to join when connected to server; the "
+"channels that require a key must be at beginning of the list, and all the "
+"keys must be given after the channels (separated by a space) (example: "
+"\"#channel1,#channel2,#channel3 key1,key2\" where #channel1 and #channel2 "
+"are protected by key1 and key2) (note: content is evaluated, see /help eval)"
 msgstr ""
 
 msgid ""
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index 6ee8cc94d..7177d838e 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -1775,8 +1775,12 @@ irc_config_server_new_option (struct t_config_file *config_file,
             new_option = weechat_config_new_option (
                 config_file, section,
                 option_name, "string",
-                N_("comma separated list of channels to join when connected to server "
-                   "(example: \"#chan1,#chan2,#chan3 key1,key2\") "
+                N_("comma separated list of channels to join when connected to "
+                   "server; the channels that require a key must be at "
+                   "beginning of the list, and all the keys must be given after "
+                   "the channels (separated by a space) "
+                   "(example: \"#channel1,#channel2,#channel3 key1,key2\" "
+                   "where #channel1 and #channel2 are protected by key1 and key2) "
                    "(note: content is evaluated, see /help eval)"),
                 NULL, 0, 0,
                 default_value, value,