diff --git a/doc/en/weechat_commands.xml b/doc/en/weechat_commands.xml
index d8a905f7e..025225557 100644
--- a/doc/en/weechat_commands.xml
+++ b/doc/en/weechat_commands.xml
@@ -154,6 +154,8 @@ set config parameters
 option: name of an option (if name is full and no value is given, then help is displayed on option)
 value: value for option
 
+Option may be: servername.server_xxx where "servername" is an internal server name and "xxx" an option for this server.
+
 </programlisting>
 <command>unalias  alias_name</command>
 <programlisting>
diff --git a/doc/fr/weechat_commands.xml b/doc/fr/weechat_commands.xml
index 5b0782d57..64be4a670 100644
--- a/doc/fr/weechat_commands.xml
+++ b/doc/fr/weechat_commands.xml
@@ -154,6 +154,8 @@ modifier des param
 option: nom de l'option (si le nom est complet et qu'aucune valeur n'est donnée, alors l'aide sur l'option est affichée)
 valeur: valeur pour l'option
 
+L'option peut ętre: nomserveur.server_xxx oů "nomserveur" est le nom interne d'un serveur et "xxx" une option pour ce serveur.
+
 </programlisting>
 <command>unalias  nom_alias</command>
 <programlisting>
diff --git a/po/cs.po b/po/cs.po
index 116c61d95..d7b29f114 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.9-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-03-21 12:04+0100\n"
+"POT-Creation-Date: 2006-03-21 15:11+0100\n"
 "PO-Revision-Date: 2006-03-18 11:45+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1416,7 +1416,7 @@ msgstr "neznámý"
 msgid "%s: using local hostname \"%s\"\n"
 msgstr "%s: používám lokální jméno hosta \"%s\"\n"
 
-#: src/irc/irc-send.c:215 src/common/command.c:1028
+#: src/irc/irc-send.c:215 src/common/command.c:1030
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr "%s nemohu najít přezdívku pro poslání zprávy\n"
@@ -1438,8 +1438,8 @@ msgstr "%s \"%s\" příkaz nemůže být spuštěn v bufferu serveru\n"
 
 #: src/irc/irc-send.c:628 src/irc/irc-send.c:640 src/irc/irc-send.c:658
 #: src/irc/irc-send.c:1365 src/irc/irc-send.c:1503 src/irc/irc-send.c:2098
-#: src/common/command.c:1914 src/common/command.c:2427
-#: src/common/command.c:2568
+#: src/common/command.c:1916 src/common/command.c:2429
+#: src/common/command.c:2570
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s špatný počet parametrů pro příkaz \"%s\"\n"
@@ -1797,11 +1797,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s byl %s\n"
 msgid "%s[%s%s%s]%s idle: "
 msgstr "%s[%s%s%s]%s neÄŤinnĂ˝: "
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "days"
 msgstr "dnĂ­"
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "day"
 msgstr "den"
 
@@ -2319,7 +2319,7 @@ msgstr "%s server/kanál (%s/%s) nenaleyen pro exec příkaz pluginu\n"
 msgid "Day changed to %s\n"
 msgstr "Změnil se den na %s\n"
 
-#: src/gui/curses/gui-input.c:439
+#: src/gui/curses/gui-input.c:456
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s zpoždění je veliké, odpojuji se od serveru...\n"
@@ -2595,7 +2595,7 @@ msgstr "obnov obrazovku"
 msgid "grab a key"
 msgstr "zachytit klávesu"
 
-#: src/gui/gui-keyboard.c:444 src/common/command.c:2442
+#: src/gui/gui-keyboard.c:444 src/common/command.c:2444
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr "%s nemohu napojit kalávesu \"%s\"\n"
@@ -2908,36 +2908,40 @@ msgid "[option [ = value]]"
 msgstr "[volba [ = hodnota]]"
 
 #: src/common/command.c:148
+#, fuzzy
 msgid ""
 "option: name of an option (if name is full and no value is given, then help "
 "is displayed on option)\n"
-"value: value for option"
+"value: value for option\n"
+"\n"
+"Option may be: servername.server_xxx where \"servername\" is an internal "
+"server name and \"xxx\" an option for this server."
 msgstr ""
 "volba: jméno volby (pokud je jméno celé a není zadána hodnota pak je "
 "zobrazena nápověda pro volby)\n"
 "hodnota: hodnota volby"
 
-#: src/common/command.c:152
+#: src/common/command.c:154
 msgid "remove an alias"
 msgstr "odebere alias"
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name"
 msgstr "jméno_aliasu"
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name: name of alias to remove"
 msgstr "jméno_aliasu: jméno aliasu pro odebrání"
 
-#: src/common/command.c:155
+#: src/common/command.c:157
 msgid "unignore IRC messages and/or hosts"
 msgstr "zruší ignorování IRC zprávy a/nebo hosta"
 
-#: src/common/command.c:156
+#: src/common/command.c:158
 msgid "[number | [mask [[type | command] [channel [server]]]]]"
 msgstr "[číslo | [maska [[typ | příkaz] [kanál [server]]]]]"
 
-#: src/common/command.c:157
+#: src/common/command.c:159
 msgid ""
 " number: # of ignore to unignore (number is displayed by list of ignore)\n"
 "   mask: nick or host mask to unignore\n"
@@ -2960,11 +2964,11 @@ msgstr ""
 "Pro každý argument znamená '*' všechno.\n"
 "Bez argunetů, vypíše příkaz /unignore seznam definovaných ignorací."
 
-#: src/common/command.c:167
+#: src/common/command.c:169
 msgid "upgrade WeeChat without disconnecting from servers"
 msgstr "aktualizovat WeeChat bez odpojenĂ­ od serveru"
 
-#: src/common/command.c:169
+#: src/common/command.c:171
 msgid ""
 "This command run again WeeChat binary, so it should have been compiled "
 "installed with a package manager before running this command."
@@ -2972,23 +2976,23 @@ msgstr ""
 "Tento příkaz znovu spustí binární soubor WeeChat, je třeba mít WeeChat "
 "předem zkompilovaný a nainstalovaný pomocí balíčkovacího systému."
 
-#: src/common/command.c:172
+#: src/common/command.c:174
 msgid "show WeeChat uptime"
 msgstr "zobrazit jak dlouho WeeChat běží"
 
-#: src/common/command.c:173
+#: src/common/command.c:175
 msgid "[-o]"
 msgstr "[-o]"
 
-#: src/common/command.c:174
+#: src/common/command.c:176
 msgid "-o: send uptime on current channel as an IRC message"
 msgstr "-o: poslat čas běhu na aktuální kanál jako IRC zprávu"
 
-#: src/common/command.c:176
+#: src/common/command.c:178
 msgid "manage windows"
 msgstr "spravuje okna"
 
-#: src/common/command.c:177
+#: src/common/command.c:179
 msgid ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
@@ -2996,7 +3000,7 @@ msgstr ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
 
-#: src/common/command.c:179
+#: src/common/command.c:181
 #, c-format
 msgid ""
 "  list: list opened windows (no parameter implies this list)\n"
@@ -3033,23 +3037,23 @@ msgstr ""
 "spočítána s aktuálním oknem jako velikost reference. Např. 25 znamená "
 "vytvořít nové okno s velikostí = aktuální_velikost / 4"
 
-#: src/common/command.c:376 src/common/command.c:730
+#: src/common/command.c:378 src/common/command.c:732
 #, c-format
 msgid "%s circular reference when calling alias \"/%s\"\n"
 msgstr ""
 
-#: src/common/command.c:710 src/common/command.c:846 src/common/command.c:917
+#: src/common/command.c:712 src/common/command.c:848 src/common/command.c:919
 #, c-format
 msgid "%s command \"%s\" failed\n"
 msgstr "%s příkaz \"%s\" selhal\n"
 
-#: src/common/command.c:812
+#: src/common/command.c:814
 #, c-format
 msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 "%s špatný počet argumentů pro %s příkaz \"%s\" (očekáváno: %d argumentů%s)\n"
 
-#: src/common/command.c:824
+#: src/common/command.c:826
 #, c-format
 msgid ""
 "%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
@@ -3058,13 +3062,13 @@ msgstr ""
 "%s špatyný počet argumentů pro %s příkaz \"%s\" (očekáváno: mezi %d a %d "
 "argumenty%s)\n"
 
-#: src/common/command.c:873
+#: src/common/command.c:875
 #, c-format
 msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 "%s chybný počet argumentů pro IRC příkaz \"%s\" (očekáváno: %d argumentů%s)\n"
 
-#: src/common/command.c:885
+#: src/common/command.c:887
 #, c-format
 msgid ""
 "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
@@ -3073,324 +3077,324 @@ msgstr ""
 "%s špatný počet argumentů pro IRC příkaz \"%s\" (očekáváno: mezi %d a %d "
 "argumenty%s)\n"
 
-#: src/common/command.c:900
+#: src/common/command.c:902
 #, c-format
 msgid "%s command \"%s\" needs a server connection!\n"
 msgstr "%s příkaz \"%s\" potřebuje připojení na server!\n"
 
-#: src/common/command.c:930
+#: src/common/command.c:932
 #, c-format
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr "%s neznámý příkaz \"%s\" (zadejte /help pro nápovědu)\n"
 
-#: src/common/command.c:1075
+#: src/common/command.c:1077
 msgid "This window is not a channel!\n"
 msgstr "Tohe není okno kanálu!\n"
 
-#: src/common/command.c:1108 src/common/command.c:1145
-#: src/common/command.c:1280
+#: src/common/command.c:1110 src/common/command.c:1147
+#: src/common/command.c:1282
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr "%s chybí argumenty pro příkaz \"%s\"\n"
 
-#: src/common/command.c:1117
+#: src/common/command.c:1119
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr "Alias \"%s\" => \"%s\" vytvořen\n"
 
-#: src/common/command.c:1123
+#: src/common/command.c:1125
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr "Selhalo vytvoření aliasu \"%s\" => \"%s\" (nedostatek paměti)\n"
 
-#: src/common/command.c:1135 src/common/command.c:1156
+#: src/common/command.c:1137 src/common/command.c:1158
 msgid "List of aliases:\n"
 msgstr "Seznam pro aliasy:\n"
 
-#: src/common/command.c:1170
+#: src/common/command.c:1172
 msgid "No alias defined.\n"
 msgstr "Žádné aliasy nejsou definovány.\n"
 
-#: src/common/command.c:1189
+#: src/common/command.c:1191
 #, c-format
 msgid "%sServer: %s%s\n"
 msgstr "%sServer: %s%s\n"
 
-#: src/common/command.c:1194
+#: src/common/command.c:1196
 #, c-format
 msgid "%snot connected\n"
 msgstr "%snepřipojen\n"
 
-#: src/common/command.c:1198
+#: src/common/command.c:1200
 #, c-format
 msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
 msgstr "%sKanál: %s%s %s(server: %s%s%s)\n"
 
-#: src/common/command.c:1207
+#: src/common/command.c:1209
 #, c-format
 msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
 msgstr "%sSoukromĂ˝ s: %s%s %s(server: %s%s%s)\n"
 
-#: src/common/command.c:1216 src/common/command.c:1228
+#: src/common/command.c:1218 src/common/command.c:1230
 #, c-format
 msgid "%sunknown\n"
 msgstr "%sneznámý\n"
 
-#: src/common/command.c:1224
+#: src/common/command.c:1226
 #, c-format
 msgid "%sraw IRC data\n"
 msgstr ""
 
-#: src/common/command.c:1259
+#: src/common/command.c:1261
 msgid "Opened buffers:\n"
 msgstr "Otevřené buffery:\n"
 
-#: src/common/command.c:1304
+#: src/common/command.c:1306
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr "%s nekorektnĂ­ ÄŤĂ­slo bufferu\n"
 
-#: src/common/command.c:1321
+#: src/common/command.c:1323
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr "%s nemohu zavřít jediný buffer\n"
 
-#: src/common/command.c:1332
+#: src/common/command.c:1334
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr "%s nemohu zavřít buffer serveru dokud jsou otevřeny kanály\n"
 
-#: src/common/command.c:1390
+#: src/common/command.c:1392
 msgid "Notify levels:  "
 msgstr "Level upozornění:  "
 
-#: src/common/command.c:1396
+#: src/common/command.c:1398
 msgid "Raw IRC data"
 msgstr ""
 
-#: src/common/command.c:1420 src/common/command.c:1470
+#: src/common/command.c:1422 src/common/command.c:1472
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr "%s nekorektní level upozornění (musí být mezi %d a %d)\n"
 
-#: src/common/command.c:1430
+#: src/common/command.c:1432
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr "%s nekorektní buffer pro upozornění (musí být kanál nebo soukromý)\n"
 
-#: src/common/command.c:1440
+#: src/common/command.c:1442
 #, c-format
 msgid "New notify level for %s%s%s: %s%d %s"
 msgstr "Nový level upozornění %s%s%s: %s%d %s"
 
-#: src/common/command.c:1450
+#: src/common/command.c:1452
 msgid "(hotlist: never)\n"
 msgstr "(hotlist: nikdy)\n"
 
-#: src/common/command.c:1453
+#: src/common/command.c:1455
 msgid "(hotlist: highlights)\n"
 msgstr "(hotlist: zvýraznění)\n"
 
-#: src/common/command.c:1456
+#: src/common/command.c:1458
 msgid "(hotlist: highlights + messages)\n"
 msgstr "(hotlist: zvýraznění + zprávy)\n"
 
-#: src/common/command.c:1459
+#: src/common/command.c:1461
 msgid "(hotlist: highlights + messages + join/part (all))\n"
 msgstr "(hotlist: zvýrazění + zprávy + připojení/odpojení (vše))\n"
 
-#: src/common/command.c:1590
+#: src/common/command.c:1592
 #, c-format
 msgid "Charsets for server %s%s%s: "
 msgstr "Znaková sada pro server %s%s%s: "
 
-#: src/common/command.c:1598
+#: src/common/command.c:1600
 #, c-format
 msgid "Charsets for channel %s%s%s: "
 msgstr "Znaková sada pro kanál %s%s%s: "
 
-#: src/common/command.c:1606
+#: src/common/command.c:1608
 #, c-format
 msgid "Charsets for private %s%s%s: "
 msgstr "Znaková sada pro soukromé %s%s%s: "
 
-#: src/common/command.c:1634 src/common/command.c:1664
-#: src/common/command.c:1694
+#: src/common/command.c:1636 src/common/command.c:1666
+#: src/common/command.c:1696
 #, c-format
 msgid " (inherited: \"%s%s%s\")"
 msgstr " (zděděno: \"%s%s%s\")"
 
-#: src/common/command.c:1763 src/common/command.c:1791
-#: src/common/command.c:1933 src/common/command.c:2561
-#: src/common/command.c:3658 src/common/command.c:3701
+#: src/common/command.c:1765 src/common/command.c:1793
+#: src/common/command.c:1935 src/common/command.c:2563
+#: src/common/command.c:3660 src/common/command.c:3703
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s neznámá volba pro příkaz \"%s\"\n"
 
-#: src/common/command.c:1826
+#: src/common/command.c:1828
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s již vytvořený server \"%s\"!\n"
 
-#: src/common/command.c:1834
+#: src/common/command.c:1836
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr "%s zrovna připojuji k serveru \"%s\"!\n"
 
-#: src/common/command.c:1853 src/common/command.c:1982
+#: src/common/command.c:1855 src/common/command.c:1984
 #, c-format
 msgid "%s server not found\n"
 msgstr "%s server nenalezen\n"
 
-#: src/common/command.c:1966
+#: src/common/command.c:1968
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr "%s nepřipojen k serveru \"%s\"!\n"
 
-#: src/common/command.c:1974
+#: src/common/command.c:1976
 msgid "Auto-reconnection is cancelled\n"
 msgstr "Automatické znovupřipojené je zrušeno\n"
 
-#: src/common/command.c:2010 src/common/weechat.c:459
+#: src/common/command.c:2012 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "%s vnitřní příkazy:\n"
 
-#: src/common/command.c:2020 src/common/weechat.c:479
+#: src/common/command.c:2022 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr "IRC příkazy:\n"
 
-#: src/common/command.c:2034
+#: src/common/command.c:2036
 msgid "Plugin commands:\n"
 msgstr "Příkazy pluginu:\n"
 
-#: src/common/command.c:2150
+#: src/common/command.c:2152
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr "Není dostupná žádná nápověda, \"%s\" je neznámý příkaz\n"
 
-#: src/common/command.c:2219
+#: src/common/command.c:2221
 #, c-format
 msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n"
 msgstr "%sna %s%s%s/%s%s%s:%s ignoruji %s%s%s od %s%s\n"
 
-#: src/common/command.c:2257
+#: src/common/command.c:2259
 msgid "List of ignore:\n"
 msgstr "Seznam ignorování:\n"
 
-#: src/common/command.c:2274
+#: src/common/command.c:2276
 msgid "No ignore defined.\n"
 msgstr "Žádné ignorování není definováno.\n"
 
-#: src/common/command.c:2300
+#: src/common/command.c:2302
 msgid "New ignore:"
 msgstr "Nové ignorování:"
 
-#: src/common/command.c:2320
+#: src/common/command.c:2322
 #, c-format
 msgid "New key binding:  %s"
 msgstr "Nová klávesová zkratka:  %s"
 
-#: src/common/command.c:2359
+#: src/common/command.c:2361
 msgid "Key bindings:\n"
 msgstr "Klávesové zkratky:\n"
 
-#: src/common/command.c:2373
+#: src/common/command.c:2375
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr "Klávesa \"%s\" odpojena\n"
 
-#: src/common/command.c:2379
+#: src/common/command.c:2381
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s nemohu odpojit klávesu \"%s\"\n"
 
-#: src/common/command.c:2387 src/common/weechat.c:511
+#: src/common/command.c:2389 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Vnitřní klávesové funkce:\n"
 
-#: src/common/command.c:2407
+#: src/common/command.c:2409
 msgid "Default key bindings restored\n"
 msgstr "Výchozí klávesové zkratky obnoveny\n"
 
-#: src/common/command.c:2413
+#: src/common/command.c:2415
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 "%s \"-yes\" argument je požadován pro reset kaláves (bezpečnostní opatření)\n"
 
-#: src/common/command.c:2474
+#: src/common/command.c:2476
 msgid "Plugins loaded:\n"
 msgstr "Načtené pluginy:\n"
 
-#: src/common/command.c:2490
+#: src/common/command.c:2492
 msgid "     message handlers:\n"
 msgstr "     obsluhovače zpráv:\n"
 
-#: src/common/command.c:2499
+#: src/common/command.c:2501
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr "       IRC(%s)\n"
 
-#: src/common/command.c:2506
+#: src/common/command.c:2508
 msgid "       (no message handler)\n"
 msgstr "       (není obsluhovač zprávy)\n"
 
-#: src/common/command.c:2511
+#: src/common/command.c:2513
 msgid "     command handlers:\n"
 msgstr "     obsluhovače příkazu:\n"
 
-#: src/common/command.c:2532
+#: src/common/command.c:2534
 msgid "       (no command handler)\n"
 msgstr "       (není obsluhovač příkazu)\n"
 
-#: src/common/command.c:2538
+#: src/common/command.c:2540
 msgid "  (no plugin)\n"
 msgstr "  (nenĂ­ plugin)\n"
 
-#: src/common/command.c:2574
+#: src/common/command.c:2576
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
 msgstr ""
 "Příkaz \"plugin\" není dostupný, WeeChat byl přeložen bez podpory pluginů.\n"
 
-#: src/common/command.c:2602
+#: src/common/command.c:2604
 msgid "Configuration file saved\n"
 msgstr "KonfiguraÄŤnĂ­ soubor uloĹľen\n"
 
-#: src/common/command.c:2607
+#: src/common/command.c:2609
 #, c-format
 msgid "%s failed to save configuration file\n"
 msgstr "%s selhalo uloĹľenĂ­ konfiguraÄŤnĂ­ho souboru\n"
 
-#: src/common/command.c:2646
+#: src/common/command.c:2648
 msgid "No server.\n"
 msgstr "žádný server.\n"
 
-#: src/common/command.c:2657
+#: src/common/command.c:2659
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "Server '%s' nenalezen.\n"
 
-#: src/common/command.c:2669
+#: src/common/command.c:2671
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr "%s chybí jméno serveru pro příkaz \"%s\"\n"
 
-#: src/common/command.c:2677
+#: src/common/command.c:2679
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr "%s příliž mnoho argumentů pro příkaz \"%s\", ignoruji argumety\n"
 
-#: src/common/command.c:2687
+#: src/common/command.c:2689
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr "%s server \"%s\" nenalezen pro příkaz \"%s\"\n"
 
-#: src/common/command.c:2695
+#: src/common/command.c:2697
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -3399,173 +3403,173 @@ msgstr ""
 "%s nemůžete odebrat server \"%s\", protože jste k němu připojent. Skuste "
 "nejprve /dissconnect %s.\n"
 
-#: src/common/command.c:2715
+#: src/common/command.c:2717
 #, c-format
 msgid "Server %s%s%s has been deleted\n"
 msgstr "Server %s%s%s byl odebrán\n"
 
-#: src/common/command.c:2734
+#: src/common/command.c:2736
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s chybí parametry pro příkaz \"%s\"\n"
 
-#: src/common/command.c:2744
+#: src/common/command.c:2746
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr "%s server \"%s\" již existuje, nemohu jej vytvořít!\n"
 
-#: src/common/command.c:2773 src/common/command.c:2801
-#: src/common/command.c:2814 src/common/command.c:2840
+#: src/common/command.c:2775 src/common/command.c:2803
+#: src/common/command.c:2816 src/common/command.c:2842
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr "%s chybĂ­ heslo pro parametr \"%s\"\n"
 
-#: src/common/command.c:2786
+#: src/common/command.c:2788
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr "%s chybí přezdívka/přezdívky pro parametr \"%s\"\n"
 
-#: src/common/command.c:2827
+#: src/common/command.c:2829
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s chybí příkaz pro parametr \"%s\"\n"
 
-#: src/common/command.c:2864
+#: src/common/command.c:2866
 #, c-format
 msgid "Server %s%s%s created\n"
 msgstr "Server %s%s%s vytvořen\n"
 
-#: src/common/command.c:2873
+#: src/common/command.c:2875
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s nemohu vytvořit server\n"
 
-#: src/common/command.c:2933
+#: src/common/command.c:2935
 msgid "(unknown)"
 msgstr "(neznámý)"
 
-#: src/common/command.c:2956
+#: src/common/command.c:2958
 #, c-format
 msgid "%s(password hidden) "
 msgstr "%s(heslo schováno) "
 
-#: src/common/command.c:3054
+#: src/common/command.c:3056
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s server \"%s\" nenalezen\n"
 
-#: src/common/command.c:3087 src/common/command.c:3135
+#: src/common/command.c:3089 src/common/command.c:3137
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s volba nastavenĂ­ \"%s\" nenalezena\n"
 
-#: src/common/command.c:3092 src/common/command.c:3127
+#: src/common/command.c:3094 src/common/command.c:3129
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s nekorektnĂ­ hodnota pro volbu \"%s\"\n"
 
-#: src/common/command.c:3108
+#: src/common/command.c:3110
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr "%s volba \"%s\" nemůže být změněna dokud WeeChat běží\n"
 
-#: src/common/command.c:3218
+#: src/common/command.c:3220
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr "Nebyla nalezena žádná volba nastavení s \"%s\"\n"
 
-#: src/common/command.c:3221
+#: src/common/command.c:3223
 msgid "No config option found\n"
 msgstr "Nebyla nalezena žádná volba nastavení\n"
 
-#: src/common/command.c:3228
+#: src/common/command.c:3230
 #, c-format
 msgid "%sDetail:\n"
 msgstr "%sDetail:\n"
 
-#: src/common/command.c:3233
+#: src/common/command.c:3235
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr "  . typ boolean (hodnota: 'on' nebo 'off')\n"
 
-#: src/common/command.c:3234 src/common/command.c:3257
-#: src/common/command.c:3263 src/common/command.c:3269
+#: src/common/command.c:3236 src/common/command.c:3259
+#: src/common/command.c:3265 src/common/command.c:3271
 #: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
 #: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . výchozí hodnota: '%s'\n"
 
-#: src/common/command.c:3239
+#: src/common/command.c:3241
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . typ celoÄŤĂ­selnĂ˝ (hodnoty: mezi %d a %d)\n"
 
-#: src/common/command.c:3242 src/common/weechat.c:404
+#: src/common/command.c:3244 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . výchozí hodnota: %d\n"
 
-#: src/common/command.c:3246
+#: src/common/command.c:3248
 msgid "  . type string (values: "
 msgstr "  . typ řetězec (hodnoty: "
 
-#: src/common/command.c:3259 src/common/command.c:3265
-#: src/common/command.c:3271 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/command.c:3261 src/common/command.c:3267
+#: src/common/command.c:3273 src/common/weechat.c:422 src/common/weechat.c:429
 #: src/common/weechat.c:436
 msgid "empty"
 msgstr "prázdný"
 
-#: src/common/command.c:3262
+#: src/common/command.c:3264
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr "  . typ barva (Curses nebo Gtk barva, viz WeeChat dokumentace)\n"
 
-#: src/common/command.c:3268
+#: src/common/command.c:3270
 msgid "  . type string (any string)\n"
 msgstr "  . typ řetězec (jakýkoliv řetězec)\n"
 
-#: src/common/command.c:3274 src/common/weechat.c:439
+#: src/common/command.c:3276 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . popis: %s\n"
 
-#: src/common/command.c:3285
+#: src/common/command.c:3287
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr "volba/volby nastavenĂ­ nalezeny s \"%s\"\n"
 
-#: src/common/command.c:3288
+#: src/common/command.c:3290
 msgid "config option(s) found\n"
 msgstr "volba/volby nastavenĂ­ nalezeny\n"
 
-#: src/common/command.c:3314
+#: src/common/command.c:3316
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s alias nebo příkaz \"%s\" nenalezen\n"
 
-#: src/common/command.c:3324
+#: src/common/command.c:3326
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "Alias \"%s\" odebrán\n"
 
-#: src/common/command.c:3384
+#: src/common/command.c:3386
 msgid "ignore were removed.\n"
 msgstr "ignorování bylo odebráno.\n"
 
-#: src/common/command.c:3386
+#: src/common/command.c:3388
 msgid "ignore was removed.\n"
 msgstr "ignorování bylo odebrán\n"
 
-#: src/common/command.c:3391
+#: src/common/command.c:3393
 #, c-format
 msgid "%s no ignore found\n"
 msgstr "%s žádné ignorování nenaleyeno\n"
 
-#: src/common/command.c:3425
+#: src/common/command.c:3427
 #, c-format
 msgid "%s can't upgrade: connection to at least one server is pending\n"
 msgstr "%s nemůžu aktualizovat: existují nevyřešená spojení na server\n"
 
-#: src/common/command.c:3435
+#: src/common/command.c:3437
 #, c-format
 msgid ""
 "%s can't upgrade: connection to at least one SSL server is active (should be "
@@ -3574,35 +3578,35 @@ msgstr ""
 "%s nemohu aktualiyovat: je aktuvní jedno nebo více připojení na SSL server "
 "(mělo by být opraveno v budoucnosti)\n"
 
-#: src/common/command.c:3451
+#: src/common/command.c:3453
 msgid "Upgrading WeeChat...\n"
 msgstr "Aktualizuji WeeChat...\n"
 
-#: src/common/command.c:3458
+#: src/common/command.c:3460
 #, c-format
 msgid "%s unable to save session in file\n"
 msgstr "%s nemohu uloĹľit sezenĂ­ do souboru\n"
 
-#: src/common/command.c:3484
+#: src/common/command.c:3486
 #, c-format
 msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n"
 msgstr "%s exec selhal (program: \"%s\"), ukonÄŤuji WeeChat\n"
 
-#: src/common/command.c:3524
+#: src/common/command.c:3526
 #, c-format
 msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s"
 msgstr "Čas běhu WeeChat: %d %s %02d:%02d:%02d, spuštěn %s"
 
-#: src/common/command.c:3538
+#: src/common/command.c:3540
 #, c-format
 msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s"
 msgstr "Čas běhu WeeChat: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, spuštěn %s%s"
 
-#: src/common/command.c:3582
+#: src/common/command.c:3584
 msgid "Opened windows:\n"
 msgstr "Otevřené okna:\n"
 
-#: src/common/command.c:3669
+#: src/common/command.c:3671
 #, c-format
 msgid ""
 "%s can not merge windows, there's no other window with same size near "
diff --git a/po/es.po b/po/es.po
index 150d2cee6..2bc06b879 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.9-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-03-21 12:04+0100\n"
+"POT-Creation-Date: 2006-03-21 15:11+0100\n"
 "PO-Revision-Date: 2006-03-18 11:45+0100\n"
 "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1428,7 +1428,7 @@ msgstr "desconocido"
 msgid "%s: using local hostname \"%s\"\n"
 msgstr "%s: utilización del nombre de máquina local \"%s\"\n"
 
-#: src/irc/irc-send.c:215 src/common/command.c:1028
+#: src/irc/irc-send.c:215 src/common/command.c:1030
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr "%s no ha sido posible encontrar el usuario al que enviar el mensaje\n"
@@ -1451,8 +1451,8 @@ msgstr "%s el comando \"%s\" no puede ejecutarse en una ventana de servidor\n"
 
 #: src/irc/irc-send.c:628 src/irc/irc-send.c:640 src/irc/irc-send.c:658
 #: src/irc/irc-send.c:1365 src/irc/irc-send.c:1503 src/irc/irc-send.c:2098
-#: src/common/command.c:1914 src/common/command.c:2427
-#: src/common/command.c:2568
+#: src/common/command.c:1916 src/common/command.c:2429
+#: src/common/command.c:2570
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s número de argumentos incorrecto para el comando \"%s\"\n"
@@ -1809,11 +1809,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s estaba %s\n"
 msgid "%s[%s%s%s]%s idle: "
 msgstr "%s[%s%s%s]%s inactividad: "
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "days"
 msgstr "días"
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "day"
 msgstr "día"
 
@@ -2342,7 +2342,7 @@ msgstr ""
 msgid "Day changed to %s\n"
 msgstr "Día cambiado a %s\n"
 
-#: src/gui/curses/gui-input.c:439
+#: src/gui/curses/gui-input.c:456
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s el lag (retraso) es alto, desconectando del servidor...\n"
@@ -2620,7 +2620,7 @@ msgstr "recargar la pantalla"
 msgid "grab a key"
 msgstr "capturar una clave"
 
-#: src/gui/gui-keyboard.c:444 src/common/command.c:2442
+#: src/gui/gui-keyboard.c:444 src/common/command.c:2444
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr "%s No ha sido posible atar la clave \"%s\"\n"
@@ -2939,36 +2939,40 @@ msgid "[option [ = value]]"
 msgstr "[opción [ = valor]]"
 
 #: src/common/command.c:148
+#, fuzzy
 msgid ""
 "option: name of an option (if name is full and no value is given, then help "
 "is displayed on option)\n"
-"value: value for option"
+"value: value for option\n"
+"\n"
+"Option may be: servername.server_xxx where \"servername\" is an internal "
+"server name and \"xxx\" an option for this server."
 msgstr ""
 "opción: nombre de una opción (si el nombre está completo y no se da ningún "
 "valor, entonces se muestra la ayuda de la opción)\n"
 "valor: valor para una opción"
 
-#: src/common/command.c:152
+#: src/common/command.c:154
 msgid "remove an alias"
 msgstr "eliminar un alias"
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name"
 msgstr "alias"
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name: name of alias to remove"
 msgstr "alias: nombre del alias a suprimir"
 
-#: src/common/command.c:155
+#: src/common/command.c:157
 msgid "unignore IRC messages and/or hosts"
 msgstr "no ignorar mensajes IRC y/o hosts"
 
-#: src/common/command.c:156
+#: src/common/command.c:158
 msgid "[number | [mask [[type | command] [channel [server]]]]]"
 msgstr "[número | [máscara [[tipo | comando] [canal [servidor]]]]]"
 
-#: src/common/command.c:157
+#: src/common/command.c:159
 msgid ""
 " number: # of ignore to unignore (number is displayed by list of ignore)\n"
 "   mask: nick or host mask to unignore\n"
@@ -2991,33 +2995,33 @@ msgstr ""
 "Para cada argumento, '*' significa todo.\n"
 "Sin argumentos, el comando /unignore lista todos los ignores definidos."
 
-#: src/common/command.c:167
+#: src/common/command.c:169
 msgid "upgrade WeeChat without disconnecting from servers"
 msgstr "actualizar Weechat sin desconectarse de los servidores"
 
-#: src/common/command.c:169
+#: src/common/command.c:171
 msgid ""
 "This command run again WeeChat binary, so it should have been compiled "
 "installed with a package manager before running this command."
 msgstr ""
 
-#: src/common/command.c:172
+#: src/common/command.c:174
 msgid "show WeeChat uptime"
 msgstr "muestra el tiempo de uso de WeeChat"
 
-#: src/common/command.c:173
+#: src/common/command.c:175
 msgid "[-o]"
 msgstr "[-o]"
 
-#: src/common/command.c:174
+#: src/common/command.c:176
 msgid "-o: send uptime on current channel as an IRC message"
 msgstr "-o: envía el tiempo de uso en el canal actual como un mensaje IRC"
 
-#: src/common/command.c:176
+#: src/common/command.c:178
 msgid "manage windows"
 msgstr "gestión de ventanas"
 
-#: src/common/command.c:177
+#: src/common/command.c:179
 msgid ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
@@ -3025,7 +3029,7 @@ msgstr ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
 
-#: src/common/command.c:179
+#: src/common/command.c:181
 #, c-format
 msgid ""
 "  list: list opened windows (no parameter implies this list)\n"
@@ -3063,24 +3067,24 @@ msgstr ""
 "nueva ventana, tomando como referencia el tamańo de la ventana actual. Por "
 "ejemplo 25 significa crear una nueva ventana con tamańo = tamańo_actual / 4"
 
-#: src/common/command.c:376 src/common/command.c:730
+#: src/common/command.c:378 src/common/command.c:732
 #, c-format
 msgid "%s circular reference when calling alias \"/%s\"\n"
 msgstr ""
 
-#: src/common/command.c:710 src/common/command.c:846 src/common/command.c:917
+#: src/common/command.c:712 src/common/command.c:848 src/common/command.c:919
 #, c-format
 msgid "%s command \"%s\" failed\n"
 msgstr "%s el comando \"%s\" ha fallado\n"
 
-#: src/common/command.c:812
+#: src/common/command.c:814
 #, c-format
 msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 "%s número de argumentos incorrecto para el comando %s \"%s\" (esperado: %d "
 "parámetro%s)\n"
 
-#: src/common/command.c:824
+#: src/common/command.c:826
 #, c-format
 msgid ""
 "%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
@@ -3089,14 +3093,14 @@ msgstr ""
 "%s número de argumentos incorrecto para el comando %s \"%s\" (esperado: "
 "entre %d y %d parámetro%s)\n"
 
-#: src/common/command.c:873
+#: src/common/command.c:875
 #, c-format
 msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 "%s número de argumentos incorrecto para el comando IRC \"%s\" (esperado: %d "
 "parámetro%s)\n"
 
-#: src/common/command.c:885
+#: src/common/command.c:887
 #, c-format
 msgid ""
 "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
@@ -3105,288 +3109,288 @@ msgstr ""
 "%s número de argumentos incorrecto para el comando IRC \"%s\" (esperado: "
 "entre %d y %d parámetro%s)\n"
 
-#: src/common/command.c:900
+#: src/common/command.c:902
 #, c-format
 msgid "%s command \"%s\" needs a server connection!\n"
 msgstr "%s ˇel comando \"%s\" requiere una conexión a servidor!\n"
 
-#: src/common/command.c:930
+#: src/common/command.c:932
 #, c-format
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr "%s comando \"%s\" desconocido (escriba /help para la ayuda)\n"
 
-#: src/common/command.c:1075
+#: src/common/command.c:1077
 msgid "This window is not a channel!\n"
 msgstr "ˇEsta ventana no es un canal!\n"
 
-#: src/common/command.c:1108 src/common/command.c:1145
-#: src/common/command.c:1280
+#: src/common/command.c:1110 src/common/command.c:1147
+#: src/common/command.c:1282
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr "%s faltan argumentos para el comando \"%s\"\n"
 
-#: src/common/command.c:1117
+#: src/common/command.c:1119
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr "Alias \"%s\" => \"%s\" creado\n"
 
-#: src/common/command.c:1123
+#: src/common/command.c:1125
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr ""
 "No ha sido posible crear el alias \"%s\" => \"%s\" (no hay suficiente "
 "memoria)\n"
 
-#: src/common/command.c:1135 src/common/command.c:1156
+#: src/common/command.c:1137 src/common/command.c:1158
 msgid "List of aliases:\n"
 msgstr "Lista de alias:\n"
 
-#: src/common/command.c:1170
+#: src/common/command.c:1172
 msgid "No alias defined.\n"
 msgstr "Ningún alias definido.\n"
 
-#: src/common/command.c:1189
+#: src/common/command.c:1191
 #, c-format
 msgid "%sServer: %s%s\n"
 msgstr "%sServidor: %s%s\n"
 
-#: src/common/command.c:1194
+#: src/common/command.c:1196
 #, c-format
 msgid "%snot connected\n"
 msgstr "%sno conectado\n"
 
-#: src/common/command.c:1198
+#: src/common/command.c:1200
 #, c-format
 msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
 msgstr "%s Canal: %s%s %s(servidor: %s%s%s)\n"
 
-#: src/common/command.c:1207
+#: src/common/command.c:1209
 #, c-format
 msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
 msgstr "%sPrivado con: %s%s %s(servidor: %s%s%s)\n"
 
-#: src/common/command.c:1216 src/common/command.c:1228
+#: src/common/command.c:1218 src/common/command.c:1230
 #, c-format
 msgid "%sunknown\n"
 msgstr "%sdesconocido\n"
 
-#: src/common/command.c:1224
+#: src/common/command.c:1226
 #, c-format
 msgid "%sraw IRC data\n"
 msgstr ""
 
-#: src/common/command.c:1259
+#: src/common/command.c:1261
 msgid "Opened buffers:\n"
 msgstr "Búfers abiertos:\n"
 
-#: src/common/command.c:1304
+#: src/common/command.c:1306
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr "%s número de búfer incorrecto\n"
 
-#: src/common/command.c:1321
+#: src/common/command.c:1323
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr "%s no es posible cerrar el único búfer\n"
 
-#: src/common/command.c:1332
+#: src/common/command.c:1334
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr ""
 "%s no se puede cerrar el búfer de servidor mientras haya canales abiertos\n"
 
-#: src/common/command.c:1390
+#: src/common/command.c:1392
 msgid "Notify levels:  "
 msgstr "Niveles de notificación:  "
 
-#: src/common/command.c:1396
+#: src/common/command.c:1398
 msgid "Raw IRC data"
 msgstr ""
 
-#: src/common/command.c:1420 src/common/command.c:1470
+#: src/common/command.c:1422 src/common/command.c:1472
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr "%s nivel de notificación incorrecto (debe estar entre %d y %d)\n"
 
-#: src/common/command.c:1430
+#: src/common/command.c:1432
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr "%s búfer incorrecto para notificar (debe ser canal o privado)\n"
 
-#: src/common/command.c:1440
+#: src/common/command.c:1442
 #, c-format
 msgid "New notify level for %s%s%s: %s%d %s"
 msgstr "Nuevo nivel de notificación para %s%s%s: %s%d %s"
 
-#: src/common/command.c:1450
+#: src/common/command.c:1452
 msgid "(hotlist: never)\n"
 msgstr "(hotlist: nunca)\n"
 
-#: src/common/command.c:1453
+#: src/common/command.c:1455
 msgid "(hotlist: highlights)\n"
 msgstr "(hotlist: resaltados)\n"
 
-#: src/common/command.c:1456
+#: src/common/command.c:1458
 msgid "(hotlist: highlights + messages)\n"
 msgstr "(hotlist: resaltados + mensajes)\n"
 
-#: src/common/command.c:1459
+#: src/common/command.c:1461
 msgid "(hotlist: highlights + messages + join/part (all))\n"
 msgstr "(hotlist: resaltados + mensajes + join/part (todos))\n"
 
-#: src/common/command.c:1590
+#: src/common/command.c:1592
 #, c-format
 msgid "Charsets for server %s%s%s: "
 msgstr "Juegos de caracteres para el servidor %s%s%s: "
 
-#: src/common/command.c:1598
+#: src/common/command.c:1600
 #, c-format
 msgid "Charsets for channel %s%s%s: "
 msgstr "Juegos de caracteres para el canal %s%s%s: "
 
-#: src/common/command.c:1606
+#: src/common/command.c:1608
 #, c-format
 msgid "Charsets for private %s%s%s: "
 msgstr "Juegos de caracteres para el privado %s%s%s: "
 
-#: src/common/command.c:1634 src/common/command.c:1664
-#: src/common/command.c:1694
+#: src/common/command.c:1636 src/common/command.c:1666
+#: src/common/command.c:1696
 #, c-format
 msgid " (inherited: \"%s%s%s\")"
 msgstr " (heredado: \"%s%s%s\")"
 
-#: src/common/command.c:1763 src/common/command.c:1791
-#: src/common/command.c:1933 src/common/command.c:2561
-#: src/common/command.c:3658 src/common/command.c:3701
+#: src/common/command.c:1765 src/common/command.c:1793
+#: src/common/command.c:1935 src/common/command.c:2563
+#: src/common/command.c:3660 src/common/command.c:3703
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s opción desconocida para el comando \"%s\"\n"
 
-#: src/common/command.c:1826
+#: src/common/command.c:1828
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s ˇya conectado al servidor \"%s\"!\n"
 
-#: src/common/command.c:1834
+#: src/common/command.c:1836
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr "%s ˇactualmente conectando al servidor \"%s\"!\n"
 
-#: src/common/command.c:1853 src/common/command.c:1982
+#: src/common/command.c:1855 src/common/command.c:1984
 #, c-format
 msgid "%s server not found\n"
 msgstr "%s servidor no encontrado\n"
 
-#: src/common/command.c:1966
+#: src/common/command.c:1968
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr "%s ˇno conectado al servidor \"%s\"!\n"
 
-#: src/common/command.c:1974
+#: src/common/command.c:1976
 msgid "Auto-reconnection is cancelled\n"
 msgstr "La reconexión automática está anulada\n"
 
-#: src/common/command.c:2010 src/common/weechat.c:459
+#: src/common/command.c:2012 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "Comandos internos %s :\n"
 
-#: src/common/command.c:2020 src/common/weechat.c:479
+#: src/common/command.c:2022 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr "Comandos IRC :\n"
 
-#: src/common/command.c:2034
+#: src/common/command.c:2036
 msgid "Plugin commands:\n"
 msgstr "Comandos de plugin:\n"
 
-#: src/common/command.c:2150
+#: src/common/command.c:2152
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr "No hay ayuda disponible, el comando \"%s\" es desconocido\n"
 
-#: src/common/command.c:2219
+#: src/common/command.c:2221
 #, c-format
 msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n"
 msgstr "%sen %s%s%s/%s%s%s:%s ignorando %s%s%s de %s%s\n"
 
-#: src/common/command.c:2257
+#: src/common/command.c:2259
 msgid "List of ignore:\n"
 msgstr "Lista de ignores:\n"
 
-#: src/common/command.c:2274
+#: src/common/command.c:2276
 msgid "No ignore defined.\n"
 msgstr "Sin ignores definidos.\n"
 
-#: src/common/command.c:2300
+#: src/common/command.c:2302
 msgid "New ignore:"
 msgstr "Nuevo ignore:"
 
-#: src/common/command.c:2320
+#: src/common/command.c:2322
 #, c-format
 msgid "New key binding:  %s"
 msgstr "Nueva anclaje de clave:  %s"
 
-#: src/common/command.c:2359
+#: src/common/command.c:2361
 msgid "Key bindings:\n"
 msgstr "Anclajes de clave:\n"
 
-#: src/common/command.c:2373
+#: src/common/command.c:2375
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr "Clave \"%s\" desatada\n"
 
-#: src/common/command.c:2379
+#: src/common/command.c:2381
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s No ha sido posible desatar la clave \"%s\"\n"
 
-#: src/common/command.c:2387 src/common/weechat.c:511
+#: src/common/command.c:2389 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Funciones de clave internas:\n"
 
-#: src/common/command.c:2407
+#: src/common/command.c:2409
 msgid "Default key bindings restored\n"
 msgstr "Anclajes de clave por defecto restaurados\n"
 
-#: src/common/command.c:2413
+#: src/common/command.c:2415
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 "%s \"-yes\" se requiere argumento para resetear las claves (por razones de "
 "seguridad)\n"
 
-#: src/common/command.c:2474
+#: src/common/command.c:2476
 msgid "Plugins loaded:\n"
 msgstr "Plugins cargados:\n"
 
-#: src/common/command.c:2490
+#: src/common/command.c:2492
 msgid "     message handlers:\n"
 msgstr "     manejadores de mensaje:\n"
 
-#: src/common/command.c:2499
+#: src/common/command.c:2501
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr "        IRC(%s)\n"
 
-#: src/common/command.c:2506
+#: src/common/command.c:2508
 msgid "       (no message handler)\n"
 msgstr "       (sin manejador de mensaje)\n"
 
-#: src/common/command.c:2511
+#: src/common/command.c:2513
 msgid "     command handlers:\n"
 msgstr "     manejadores de comando:\n"
 
-#: src/common/command.c:2532
+#: src/common/command.c:2534
 msgid "       (no command handler)\n"
 msgstr "       (sin manejador de comando)\n"
 
-#: src/common/command.c:2538
+#: src/common/command.c:2540
 msgid "  (no plugin)\n"
 msgstr "  (sin plugins)\n"
 
-#: src/common/command.c:2574
+#: src/common/command.c:2576
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
@@ -3394,41 +3398,41 @@ msgstr ""
 "El comando \"plugin\" no está disponible, Weechat fue compilado sin soporte "
 "para plugins.\n"
 
-#: src/common/command.c:2602
+#: src/common/command.c:2604
 msgid "Configuration file saved\n"
 msgstr ""
 
-#: src/common/command.c:2607
+#: src/common/command.c:2609
 #, c-format
 msgid "%s failed to save configuration file\n"
 msgstr ""
 
-#: src/common/command.c:2646
+#: src/common/command.c:2648
 msgid "No server.\n"
 msgstr "Ningún servidor.\n"
 
-#: src/common/command.c:2657
+#: src/common/command.c:2659
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "Servidor '%s' no encontrado.\n"
 
-#: src/common/command.c:2669
+#: src/common/command.c:2671
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr "%s falta el nombre de servidor para el comando \"%s\"\n"
 
-#: src/common/command.c:2677
+#: src/common/command.c:2679
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr ""
 "%s demasiados argumentos para el comando \"%s\", ignorando parámetros\n"
 
-#: src/common/command.c:2687
+#: src/common/command.c:2689
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr "%s servidor \"%s\" no encontrado para el comando \"%s\"\n"
 
-#: src/common/command.c:2695
+#: src/common/command.c:2697
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -3437,175 +3441,175 @@ msgstr ""
 "%s usted no puede eliminar el servidor \"%s\" ya que está usted conectado a "
 "él. Pruebe /disconnect %s antes.\n"
 
-#: src/common/command.c:2715
+#: src/common/command.c:2717
 #, c-format
 msgid "Server %s%s%s has been deleted\n"
 msgstr "El servidor %s%s%s ha sido borrado\n"
 
-#: src/common/command.c:2734
+#: src/common/command.c:2736
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s faltan parámetros para el comando \"%s\"\n"
 
-#: src/common/command.c:2744
+#: src/common/command.c:2746
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr "%s el servidor \"%s\" ya existe, ˇno se puede crear!\n"
 
-#: src/common/command.c:2773 src/common/command.c:2801
-#: src/common/command.c:2814 src/common/command.c:2840
+#: src/common/command.c:2775 src/common/command.c:2803
+#: src/common/command.c:2816 src/common/command.c:2842
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr "%s falta contraseńa para el comando \"%s\"\n"
 
-#: src/common/command.c:2786
+#: src/common/command.c:2788
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr "%s falta(n) usuario(s) para el parámetro \"%s\"\n"
 
-#: src/common/command.c:2827
+#: src/common/command.c:2829
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s falta comando para el parámetro \"%s\"\n"
 
-#: src/common/command.c:2864
+#: src/common/command.c:2866
 #, c-format
 msgid "Server %s%s%s created\n"
 msgstr "Servidor %s%s%s creado\n"
 
-#: src/common/command.c:2873
+#: src/common/command.c:2875
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s no es posible crear el servidor\n"
 
-#: src/common/command.c:2933
+#: src/common/command.c:2935
 msgid "(unknown)"
 msgstr "(desconocido)"
 
-#: src/common/command.c:2956
+#: src/common/command.c:2958
 #, c-format
 msgid "%s(password hidden) "
 msgstr "%s(contraseńa oculta) "
 
-#: src/common/command.c:3054
+#: src/common/command.c:3056
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s servidor \"%s\" no encontrado\n"
 
-#: src/common/command.c:3087 src/common/command.c:3135
+#: src/common/command.c:3089 src/common/command.c:3137
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s opción de configuración \"%s\" no encontrada\n"
 
-#: src/common/command.c:3092 src/common/command.c:3127
+#: src/common/command.c:3094 src/common/command.c:3129
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s valor incorrecto para la opción \"%s\"\n"
 
-#: src/common/command.c:3108
+#: src/common/command.c:3110
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr ""
 "%s la opción \"%s\" no puede ser modificada mientras WeeChat está en "
 "ejecución\n"
 
-#: src/common/command.c:3218
+#: src/common/command.c:3220
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr "Ninguna opción de configuración encontrada con \"%s\"\n"
 
-#: src/common/command.c:3221
+#: src/common/command.c:3223
 msgid "No config option found\n"
 msgstr "Ninguna opción de configuración encontrada\n"
 
-#: src/common/command.c:3228
+#: src/common/command.c:3230
 #, c-format
 msgid "%sDetail:\n"
 msgstr "%sDetalle:\n"
 
-#: src/common/command.c:3233
+#: src/common/command.c:3235
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr "  . tipo booleano (valores: 'on' u 'off')\n"
 
-#: src/common/command.c:3234 src/common/command.c:3257
-#: src/common/command.c:3263 src/common/command.c:3269
+#: src/common/command.c:3236 src/common/command.c:3259
+#: src/common/command.c:3265 src/common/command.c:3271
 #: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
 #: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . valor por defecto: '%s'\n"
 
-#: src/common/command.c:3239
+#: src/common/command.c:3241
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . tipo entero (valores: entre %d y %d)\n"
 
-#: src/common/command.c:3242 src/common/weechat.c:404
+#: src/common/command.c:3244 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . valor por defecto: %d\n"
 
-#: src/common/command.c:3246
+#: src/common/command.c:3248
 msgid "  . type string (values: "
 msgstr "  . tipo cadena (valores: "
 
-#: src/common/command.c:3259 src/common/command.c:3265
-#: src/common/command.c:3271 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/command.c:3261 src/common/command.c:3267
+#: src/common/command.c:3273 src/common/weechat.c:422 src/common/weechat.c:429
 #: src/common/weechat.c:436
 msgid "empty"
 msgstr "vacío"
 
-#: src/common/command.c:3262
+#: src/common/command.c:3264
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr "  . tipo color (color Curses o Gtk, ver la documentación de WeeChat)\n"
 
-#: src/common/command.c:3268
+#: src/common/command.c:3270
 msgid "  . type string (any string)\n"
 msgstr "  . tipo cadena (cualquier cadena)\n"
 
-#: src/common/command.c:3274 src/common/weechat.c:439
+#: src/common/command.c:3276 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . descripción: %s\n"
 
-#: src/common/command.c:3285
+#: src/common/command.c:3287
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr "opción/opciones de configuración encontrada(s) con \"%s\"\n"
 
-#: src/common/command.c:3288
+#: src/common/command.c:3290
 msgid "config option(s) found\n"
 msgstr "opción/opciones de configuración encontrada(s)\n"
 
-#: src/common/command.c:3314
+#: src/common/command.c:3316
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s alias o comando \"%s\" no encontrado\n"
 
-#: src/common/command.c:3324
+#: src/common/command.c:3326
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "Alias \"%s\" eliminado\n"
 
-#: src/common/command.c:3384
+#: src/common/command.c:3386
 msgid "ignore were removed.\n"
 msgstr "los ignores fueron eliminados.\n"
 
-#: src/common/command.c:3386
+#: src/common/command.c:3388
 msgid "ignore was removed.\n"
 msgstr "el ignore fue eliminado.\n"
 
-#: src/common/command.c:3391
+#: src/common/command.c:3393
 #, c-format
 msgid "%s no ignore found\n"
 msgstr "%s no se encontraron ignores\n"
 
-#: src/common/command.c:3425
+#: src/common/command.c:3427
 #, c-format
 msgid "%s can't upgrade: connection to at least one server is pending\n"
 msgstr "%s no se puede actualizar: conexión pendiente a un servidor al menos\n"
 
-#: src/common/command.c:3435
+#: src/common/command.c:3437
 #, c-format
 msgid ""
 "%s can't upgrade: connection to at least one SSL server is active (should be "
@@ -3614,37 +3618,37 @@ msgstr ""
 "%s no se puede actualizar: conexión activa a un servidor SSL por lo menos "
 "(debería ser corregido en una futura versión)\n"
 
-#: src/common/command.c:3451
+#: src/common/command.c:3453
 msgid "Upgrading WeeChat...\n"
 msgstr "Actualizando Weechat...\n"
 
-#: src/common/command.c:3458
+#: src/common/command.c:3460
 #, c-format
 msgid "%s unable to save session in file\n"
 msgstr "%s no ha sido posible guardar la sesión en el archivo\n"
 
-#: src/common/command.c:3484
+#: src/common/command.c:3486
 #, c-format
 msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n"
 msgstr "%s exec ha fallado (programa: \"%s\"), saliendo de Weechat\n"
 
-#: src/common/command.c:3524
+#: src/common/command.c:3526
 #, c-format
 msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s"
 msgstr "Tiempo de uso de WeeChat: %d %s %02d:%02d:%02d, empezó en %s"
 
-#: src/common/command.c:3538
+#: src/common/command.c:3540
 #, c-format
 msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s"
 msgstr ""
 "Tiempo de uso de WeeChat: %s%d %s%s %s%02d%s: %s%02d%s:%s%02d%s, empezó en %s"
 "%s"
 
-#: src/common/command.c:3582
+#: src/common/command.c:3584
 msgid "Opened windows:\n"
 msgstr "Ventanas abiertas:\n"
 
-#: src/common/command.c:3669
+#: src/common/command.c:3671
 #, c-format
 msgid ""
 "%s can not merge windows, there's no other window with same size near "
diff --git a/po/fr.po b/po/fr.po
index af36c1e1d..c150b7256 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.9-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-03-21 12:04+0100\n"
-"PO-Revision-Date: 2006-03-21 12:04+0100\n"
+"POT-Creation-Date: 2006-03-21 15:11+0100\n"
+"PO-Revision-Date: 2006-03-21 15:12+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -1420,7 +1420,7 @@ msgstr "inconnu"
 msgid "%s: using local hostname \"%s\"\n"
 msgstr "%s: utilisation du nom de machine local \"%s\"\n"
 
-#: src/irc/irc-send.c:215 src/common/command.c:1028
+#: src/irc/irc-send.c:215 src/common/command.c:1030
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr "%s impossible de trouver le pseudo pour envoyer le message\n"
@@ -1444,8 +1444,8 @@ msgstr ""
 
 #: src/irc/irc-send.c:628 src/irc/irc-send.c:640 src/irc/irc-send.c:658
 #: src/irc/irc-send.c:1365 src/irc/irc-send.c:1503 src/irc/irc-send.c:2098
-#: src/common/command.c:1914 src/common/command.c:2427
-#: src/common/command.c:2568
+#: src/common/command.c:1916 src/common/command.c:2429
+#: src/common/command.c:2570
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s nombre de paramčtres erroné pour la commande \"%s\"\n"
@@ -1797,11 +1797,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s 
 msgid "%s[%s%s%s]%s idle: "
 msgstr "%s[%s%s%s]%s inactivité: "
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "days"
 msgstr "jours"
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "day"
 msgstr "jour"
 
@@ -2192,11 +2192,11 @@ msgstr ""
 "\" (existe déjŕ)\n"
 
 #: src/plugins/plugins.c:270
-#, fuzzy, c-format
+#, c-format
 msgid "%s plugin %s: unable to add handler for \"%s\" command (forbidden)\n"
 msgstr ""
 "%s extension %s: impossible d'ajouter la fonction pour la commande \"%s"
-"\" (existe déjŕ)\n"
+"\" (interdit)\n"
 
 #: src/plugins/plugins.c:310
 #, c-format
@@ -2331,7 +2331,7 @@ msgstr ""
 msgid "Day changed to %s\n"
 msgstr "Jour changé: %s\n"
 
-#: src/gui/curses/gui-input.c:439
+#: src/gui/curses/gui-input.c:456
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s le lag est élevé, déconnexion du serveur...\n"
@@ -2605,7 +2605,7 @@ msgstr "rafra
 msgid "grab a key"
 msgstr "capturer une touche"
 
-#: src/gui/gui-keyboard.c:444 src/common/command.c:2442
+#: src/gui/gui-keyboard.c:444 src/common/command.c:2444
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr "%s impossible de créer la touche \"%s\"\n"
@@ -2927,33 +2927,37 @@ msgstr "[option [ = valeur]]"
 msgid ""
 "option: name of an option (if name is full and no value is given, then help "
 "is displayed on option)\n"
-"value: value for option"
+"value: value for option\n"
+"\n"
+"Option may be: servername.server_xxx where \"servername\" is an internal "
+"server name and \"xxx\" an option for this server."
 msgstr ""
-"option: nom de l'option (si le nom est complet et qu'aucune valeur n'est "
-"donnée, alors l'aide sur l'option est affichée)\n"
-"valeur: valeur pour l'option"
+"option: nom de l'option (si le nom est complet et qu'aucune valeur n'est donnée, alors l'aide sur l'option est affichée)\n"
+"valeur: valeur pour l'option\n"
+"\n"
+"L'option peut ętre: nomserveur.server_xxx oů \"nomserveur\" est le nom interne d'un serveur et \"xxx\" une option pour ce serveur."
 
-#: src/common/command.c:152
+#: src/common/command.c:154
 msgid "remove an alias"
 msgstr "supprimer un alias"
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name"
 msgstr "nom_alias"
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name: name of alias to remove"
 msgstr "nom_alias: nom de l'alias ŕ supprimer"
 
-#: src/common/command.c:155
+#: src/common/command.c:157
 msgid "unignore IRC messages and/or hosts"
 msgstr "supprimer le ignore des messages IRC et/ou des masques"
 
-#: src/common/command.c:156
+#: src/common/command.c:158
 msgid "[number | [mask [[type | command] [channel [server]]]]]"
 msgstr "[nombre | [masque [[type | commande] [canal [serveur]]]]]"
 
-#: src/common/command.c:157
+#: src/common/command.c:159
 msgid ""
 " number: # of ignore to unignore (number is displayed by list of ignore)\n"
 "   mask: nick or host mask to unignore\n"
@@ -2976,11 +2980,11 @@ msgstr ""
 "Pour chaque paramčtre, '*' signifie tou(te)s.\n"
 "Sans paramčtre, /ignore liste les ignore définis."
 
-#: src/common/command.c:167
+#: src/common/command.c:169
 msgid "upgrade WeeChat without disconnecting from servers"
 msgstr "mettre ŕ jour WeeChat sans se déconnecter des serveurs"
 
-#: src/common/command.c:169
+#: src/common/command.c:171
 msgid ""
 "This command run again WeeChat binary, so it should have been compiled "
 "installed with a package manager before running this command."
@@ -2989,23 +2993,23 @@ msgstr ""
 "compilé ou installé via un gestionnaire de paquet avant de lancer cette "
 "commande."
 
-#: src/common/command.c:172
+#: src/common/command.c:174
 msgid "show WeeChat uptime"
 msgstr "montrer l'uptime de WeeChat"
 
-#: src/common/command.c:173
+#: src/common/command.c:175
 msgid "[-o]"
 msgstr "[-o]"
 
-#: src/common/command.c:174
+#: src/common/command.c:176
 msgid "-o: send uptime on current channel as an IRC message"
 msgstr "-o: envoyer l'uptime sur le canal courant en tant que message IRC"
 
-#: src/common/command.c:176
+#: src/common/command.c:178
 msgid "manage windows"
 msgstr "gestion des fenętres"
 
-#: src/common/command.c:177
+#: src/common/command.c:179
 msgid ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
@@ -3013,7 +3017,7 @@ msgstr ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[ptc] | resize pct | merge [all]]"
 
-#: src/common/command.c:179
+#: src/common/command.c:181
 #, c-format
 msgid ""
 "  list: list opened windows (no parameter implies this list)\n"
@@ -3052,24 +3056,24 @@ msgstr ""
 "Par exemple 25 signifie créer une fenętre qui a pour taille: "
 "taille_courante / 4"
 
-#: src/common/command.c:376 src/common/command.c:730
+#: src/common/command.c:378 src/common/command.c:732
 #, c-format
 msgid "%s circular reference when calling alias \"/%s\"\n"
 msgstr "%s référence circulaire lors de l'appel ŕ l'alias \"%s\"\n"
 
-#: src/common/command.c:710 src/common/command.c:846 src/common/command.c:917
+#: src/common/command.c:712 src/common/command.c:848 src/common/command.c:919
 #, c-format
 msgid "%s command \"%s\" failed\n"
 msgstr "%s la commande \"%s\" a échoué\n"
 
-#: src/common/command.c:812
+#: src/common/command.c:814
 #, c-format
 msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 "%s nombre de paramčtres incorrect pour la commande %s \"%s\" (attendu: %d "
 "paramčtre%s)\n"
 
-#: src/common/command.c:824
+#: src/common/command.c:826
 #, c-format
 msgid ""
 "%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
@@ -3078,14 +3082,14 @@ msgstr ""
 "%s nombre de paramčtres incorrect pour la commande %s \"%s\" (attendu: entre "
 "%d et %d paramčtre%s)\n"
 
-#: src/common/command.c:873
+#: src/common/command.c:875
 #, c-format
 msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 "%s nombre de paramčtres incorrect pour la commande IRC \"%s\" (attendu: %d "
 "paramčtre%s)\n"
 
-#: src/common/command.c:885
+#: src/common/command.c:887
 #, c-format
 msgid ""
 "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
@@ -3094,288 +3098,288 @@ msgstr ""
 "%s nombre de paramčtres incorrect pour la commande IRC \"%s\" (attendu: "
 "entre %d et %d paramčtre%s)\n"
 
-#: src/common/command.c:900
+#: src/common/command.c:902
 #, c-format
 msgid "%s command \"%s\" needs a server connection!\n"
 msgstr "%s la commande \"%s\" nécessite une connexion au serveur !\n"
 
-#: src/common/command.c:930
+#: src/common/command.c:932
 #, c-format
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr "%s commande \"%s\" inconnue (tapez /help pour l'aide)\n"
 
-#: src/common/command.c:1075
+#: src/common/command.c:1077
 msgid "This window is not a channel!\n"
 msgstr "Cette fenętre n'est pas un canal !\n"
 
-#: src/common/command.c:1108 src/common/command.c:1145
-#: src/common/command.c:1280
+#: src/common/command.c:1110 src/common/command.c:1147
+#: src/common/command.c:1282
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr "%s paramčtres manquants pour la commande \"%s\"\n"
 
-#: src/common/command.c:1117
+#: src/common/command.c:1119
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr "Alias \"%s\" => \"%s\" créé\n"
 
-#: src/common/command.c:1123
+#: src/common/command.c:1125
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr "Impossible de créer l'alias \"%s\" => \"%s\" (pas assez de mémoire)\n"
 
-#: src/common/command.c:1135 src/common/command.c:1156
+#: src/common/command.c:1137 src/common/command.c:1158
 msgid "List of aliases:\n"
 msgstr "Liste des alias:\n"
 
-#: src/common/command.c:1170
+#: src/common/command.c:1172
 msgid "No alias defined.\n"
 msgstr "Aucun alias défini.\n"
 
-#: src/common/command.c:1189
+#: src/common/command.c:1191
 #, c-format
 msgid "%sServer: %s%s\n"
 msgstr "%sServeur: %s%s\n"
 
-#: src/common/command.c:1194
+#: src/common/command.c:1196
 #, c-format
 msgid "%snot connected\n"
 msgstr "%snon connecté\n"
 
-#: src/common/command.c:1198
+#: src/common/command.c:1200
 #, c-format
 msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
 msgstr "%sCanal: %s%s %s(serveur: %s%s%s)\n"
 
-#: src/common/command.c:1207
+#: src/common/command.c:1209
 #, c-format
 msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
 msgstr "%sPrivé avec: %s%s %s(serveur: %s%s%s)\n"
 
-#: src/common/command.c:1216 src/common/command.c:1228
+#: src/common/command.c:1218 src/common/command.c:1230
 #, c-format
 msgid "%sunknown\n"
 msgstr "%sinconnu\n"
 
-#: src/common/command.c:1224
+#: src/common/command.c:1226
 #, c-format
 msgid "%sraw IRC data\n"
 msgstr "%sdonnées IRC brutes\n"
 
-#: src/common/command.c:1259
+#: src/common/command.c:1261
 msgid "Opened buffers:\n"
 msgstr "Tampons ouverts:\n"
 
-#: src/common/command.c:1304
+#: src/common/command.c:1306
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr "%s numéro de tampon incorrect\n"
 
-#: src/common/command.c:1321
+#: src/common/command.c:1323
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr "%s impossible de fermer le tampon unique\n"
 
-#: src/common/command.c:1332
+#: src/common/command.c:1334
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr ""
 "%s impossible de fermer le tampon du serveur tant que des canaux sont "
 "ouverts\n"
 
-#: src/common/command.c:1390
+#: src/common/command.c:1392
 msgid "Notify levels:  "
 msgstr "Niveaux de notification:  "
 
-#: src/common/command.c:1396
+#: src/common/command.c:1398
 msgid "Raw IRC data"
 msgstr "Données IRC brutes"
 
-#: src/common/command.c:1420 src/common/command.c:1470
+#: src/common/command.c:1422 src/common/command.c:1472
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr "%s niveau de notification incorrect (doit ętre entre %d et %d)\n"
 
-#: src/common/command.c:1430
+#: src/common/command.c:1432
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr ""
 "%s tampon incorrect pour la notification (doit ętre un canal ou un privé)\n"
 
-#: src/common/command.c:1440
+#: src/common/command.c:1442
 #, c-format
 msgid "New notify level for %s%s%s: %s%d %s"
 msgstr "Nouveau niveau de notification pour %s%s%s: %s%d %s"
 
-#: src/common/command.c:1450
+#: src/common/command.c:1452
 msgid "(hotlist: never)\n"
 msgstr "(hotlist: jamais)\n"
 
-#: src/common/command.c:1453
+#: src/common/command.c:1455
 msgid "(hotlist: highlights)\n"
 msgstr "(hotlist: highlights)\n"
 
-#: src/common/command.c:1456
+#: src/common/command.c:1458
 msgid "(hotlist: highlights + messages)\n"
 msgstr "(hotlist: highlights + messages)\n"
 
-#: src/common/command.c:1459
+#: src/common/command.c:1461
 msgid "(hotlist: highlights + messages + join/part (all))\n"
 msgstr "(hotlist: highlights + messages + join/part (tous))\n"
 
-#: src/common/command.c:1590
+#: src/common/command.c:1592
 #, c-format
 msgid "Charsets for server %s%s%s: "
 msgstr "Jeux de caractčres pour le serveur %s%s%s: "
 
-#: src/common/command.c:1598
+#: src/common/command.c:1600
 #, c-format
 msgid "Charsets for channel %s%s%s: "
 msgstr "Jeux de caractčres pour le canal %s%s%s: "
 
-#: src/common/command.c:1606
+#: src/common/command.c:1608
 #, c-format
 msgid "Charsets for private %s%s%s: "
 msgstr "Jeux de caractčres pour le privé %s%s%s: "
 
-#: src/common/command.c:1634 src/common/command.c:1664
-#: src/common/command.c:1694
+#: src/common/command.c:1636 src/common/command.c:1666
+#: src/common/command.c:1696
 #, c-format
 msgid " (inherited: \"%s%s%s\")"
 msgstr " (hérité: \"%s%s%s\")"
 
-#: src/common/command.c:1763 src/common/command.c:1791
-#: src/common/command.c:1933 src/common/command.c:2561
-#: src/common/command.c:3658 src/common/command.c:3701
+#: src/common/command.c:1765 src/common/command.c:1793
+#: src/common/command.c:1935 src/common/command.c:2563
+#: src/common/command.c:3660 src/common/command.c:3703
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s option inconnue pour la commande \"%s\"\n"
 
-#: src/common/command.c:1826
+#: src/common/command.c:1828
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s déjŕ connecté au serveur \"%s\" !\n"
 
-#: src/common/command.c:1834
+#: src/common/command.c:1836
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr "%s une connexion vers le serveur \"%s\" est en cours !\n"
 
-#: src/common/command.c:1853 src/common/command.c:1982
+#: src/common/command.c:1855 src/common/command.c:1984
 #, c-format
 msgid "%s server not found\n"
 msgstr "%s serveur non trouvé\n"
 
-#: src/common/command.c:1966
+#: src/common/command.c:1968
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr "%s non connecté au serveur \"%s\" !\n"
 
-#: src/common/command.c:1974
+#: src/common/command.c:1976
 msgid "Auto-reconnection is cancelled\n"
 msgstr "La reconnexion automatique est annulée\n"
 
-#: src/common/command.c:2010 src/common/weechat.c:459
+#: src/common/command.c:2012 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "Commandes internes %s :\n"
 
-#: src/common/command.c:2020 src/common/weechat.c:479
+#: src/common/command.c:2022 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr "Commandes IRC :\n"
 
-#: src/common/command.c:2034
+#: src/common/command.c:2036
 msgid "Plugin commands:\n"
 msgstr "Commandes d'extension :\n"
 
-#: src/common/command.c:2150
+#: src/common/command.c:2152
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr "Pas d'aide disponible, la commande \"%s\" est inconnue\n"
 
-#: src/common/command.c:2219
+#: src/common/command.c:2221
 #, c-format
 msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n"
 msgstr "%ssur %s%s%s/%s%s%s:%s ignore %s%s%s de %s%s\n"
 
-#: src/common/command.c:2257
+#: src/common/command.c:2259
 msgid "List of ignore:\n"
 msgstr "Liste des ignore:\n"
 
-#: src/common/command.c:2274
+#: src/common/command.c:2276
 msgid "No ignore defined.\n"
 msgstr "Aucun ignore défini.\n"
 
-#: src/common/command.c:2300
+#: src/common/command.c:2302
 msgid "New ignore:"
 msgstr "Nouveau ignore:"
 
-#: src/common/command.c:2320
+#: src/common/command.c:2322
 #, c-format
 msgid "New key binding:  %s"
 msgstr "Nouvelle touche:  %s"
 
-#: src/common/command.c:2359
+#: src/common/command.c:2361
 msgid "Key bindings:\n"
 msgstr "Associations de touches:\n"
 
-#: src/common/command.c:2373
+#: src/common/command.c:2375
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr "Touche \"%s\" supprimée\n"
 
-#: src/common/command.c:2379
+#: src/common/command.c:2381
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s impossible de supprimer la touche \"%s\"\n"
 
-#: src/common/command.c:2387 src/common/weechat.c:511
+#: src/common/command.c:2389 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Fonctions internes pour les touches:\n"
 
-#: src/common/command.c:2407
+#: src/common/command.c:2409
 msgid "Default key bindings restored\n"
 msgstr "Touches par défaut restaurées\n"
 
-#: src/common/command.c:2413
+#: src/common/command.c:2415
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 "%s le paramčtre \"-yes\" est requis pour la réinitialisation des touches "
 "(raison de sécurité)\n"
 
-#: src/common/command.c:2474
+#: src/common/command.c:2476
 msgid "Plugins loaded:\n"
 msgstr "Extensions chargées :\n"
 
-#: src/common/command.c:2490
+#: src/common/command.c:2492
 msgid "     message handlers:\n"
 msgstr "     fonctions de message :\n"
 
-#: src/common/command.c:2499
+#: src/common/command.c:2501
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr "       IRC(%s)\n"
 
-#: src/common/command.c:2506
+#: src/common/command.c:2508
 msgid "       (no message handler)\n"
 msgstr "       (aucune fonction de message)\n"
 
-#: src/common/command.c:2511
+#: src/common/command.c:2513
 msgid "     command handlers:\n"
 msgstr "     commandes :\n"
 
-#: src/common/command.c:2532
+#: src/common/command.c:2534
 msgid "       (no command handler)\n"
 msgstr "       (aucune commande)\n"
 
-#: src/common/command.c:2538
+#: src/common/command.c:2540
 msgid "  (no plugin)\n"
 msgstr "  (aucune extension)\n"
 
-#: src/common/command.c:2574
+#: src/common/command.c:2576
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
@@ -3383,40 +3387,40 @@ msgstr ""
 "La commande \"plugin\" n'est pas disponible, WeeChat a été compilé sans le "
 "support des extensions.\n"
 
-#: src/common/command.c:2602
+#: src/common/command.c:2604
 msgid "Configuration file saved\n"
 msgstr "Fichier de configuration sauvé\n"
 
-#: src/common/command.c:2607
+#: src/common/command.c:2609
 #, c-format
 msgid "%s failed to save configuration file\n"
 msgstr "%s impossible de sauver le fichier de configuration\n"
 
-#: src/common/command.c:2646
+#: src/common/command.c:2648
 msgid "No server.\n"
 msgstr "Pas de serveur.\n"
 
-#: src/common/command.c:2657
+#: src/common/command.c:2659
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "Serveur '%s' non trouvé.\n"
 
-#: src/common/command.c:2669
+#: src/common/command.c:2671
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr "%s il manque le nom du serveur pour la commande \"%s\"\n"
 
-#: src/common/command.c:2677
+#: src/common/command.c:2679
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr "%s trop de paramčtres pour la commande \"%s\", paramčtres ignorés\n"
 
-#: src/common/command.c:2687
+#: src/common/command.c:2689
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr "%s le serveur \"%s\" n'existe pas pour la commande \"%s\"\n"
 
-#: src/common/command.c:2695
+#: src/common/command.c:2697
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -3425,175 +3429,175 @@ msgstr ""
 "%s vous ne pouvez pas supprimer le server \"%s\" car vous ętes connecté "
 "dessus. Essayez /disconnect %s avant.\n"
 
-#: src/common/command.c:2715
+#: src/common/command.c:2717
 #, c-format
 msgid "Server %s%s%s has been deleted\n"
 msgstr "Le serveur %s%s%s a été supprimé\n"
 
-#: src/common/command.c:2734
+#: src/common/command.c:2736
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s paramčtres manquants pour la commande \"%s\"\n"
 
-#: src/common/command.c:2744
+#: src/common/command.c:2746
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr "%s le serveur \"%s\" existe déjŕ, impossible de le créer !\n"
 
-#: src/common/command.c:2773 src/common/command.c:2801
-#: src/common/command.c:2814 src/common/command.c:2840
+#: src/common/command.c:2775 src/common/command.c:2803
+#: src/common/command.c:2816 src/common/command.c:2842
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr "%s mot de passe manquant pour le paramčtre \"%s\"\n"
 
-#: src/common/command.c:2786
+#: src/common/command.c:2788
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr "%s pseudo(s) manquant(s) pour le paramčtre \"%s\"\n"
 
-#: src/common/command.c:2827
+#: src/common/command.c:2829
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s commande manquante pour le paramčtre \"%s\"\n"
 
-#: src/common/command.c:2864
+#: src/common/command.c:2866
 #, c-format
 msgid "Server %s%s%s created\n"
 msgstr "Serveur %s%s%s créé\n"
 
-#: src/common/command.c:2873
+#: src/common/command.c:2875
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s impossible de créer le serveur\n"
 
-#: src/common/command.c:2933
+#: src/common/command.c:2935
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: src/common/command.c:2956
+#: src/common/command.c:2958
 #, c-format
 msgid "%s(password hidden) "
 msgstr "%s(mot de passe caché) "
 
-#: src/common/command.c:3054
+#: src/common/command.c:3056
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s serveur \"%s\" non trouvé\n"
 
-#: src/common/command.c:3087 src/common/command.c:3135
+#: src/common/command.c:3089 src/common/command.c:3137
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s option de configuration \"%s\" non trouvée\n"
 
-#: src/common/command.c:3092 src/common/command.c:3127
+#: src/common/command.c:3094 src/common/command.c:3129
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s valeur incorrecte pour l'option \"%s\"\n"
 
-#: src/common/command.c:3108
+#: src/common/command.c:3110
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr "%s l'option \"%s\" ne peut pas ętre changée lorsque WeeChat tourne\n"
 
-#: src/common/command.c:3218
+#: src/common/command.c:3220
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr "Aucune option de configuration trouvée avec \"%s\"\n"
 
-#: src/common/command.c:3221
+#: src/common/command.c:3223
 msgid "No config option found\n"
 msgstr "Aucune option de configuration trouvée\n"
 
-#: src/common/command.c:3228
+#: src/common/command.c:3230
 #, c-format
 msgid "%sDetail:\n"
 msgstr "%sDétail :\n"
 
-#: src/common/command.c:3233
+#: src/common/command.c:3235
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr "  . type booléen (valeurs: 'on' ou 'off')\n"
 
-#: src/common/command.c:3234 src/common/command.c:3257
-#: src/common/command.c:3263 src/common/command.c:3269
+#: src/common/command.c:3236 src/common/command.c:3259
+#: src/common/command.c:3265 src/common/command.c:3271
 #: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
 #: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . valeur par défaut: '%s'\n"
 
-#: src/common/command.c:3239
+#: src/common/command.c:3241
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . type entier (valeurs: entre %d et %d)\n"
 
-#: src/common/command.c:3242 src/common/weechat.c:404
+#: src/common/command.c:3244 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . valeur par défaut: %d\n"
 
-#: src/common/command.c:3246
+#: src/common/command.c:3248
 msgid "  . type string (values: "
 msgstr "  . type chaîne (valeurs: "
 
-#: src/common/command.c:3259 src/common/command.c:3265
-#: src/common/command.c:3271 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/command.c:3261 src/common/command.c:3267
+#: src/common/command.c:3273 src/common/weechat.c:422 src/common/weechat.c:429
 #: src/common/weechat.c:436
 msgid "empty"
 msgstr "vide"
 
-#: src/common/command.c:3262
+#: src/common/command.c:3264
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr "  . type couleur (couleur Curses ou Gtk, voir la doc WeeChat)\n"
 
-#: src/common/command.c:3268
+#: src/common/command.c:3270
 msgid "  . type string (any string)\n"
 msgstr "  . type chaîne (toute chaîne)\n"
 
-#: src/common/command.c:3274 src/common/weechat.c:439
+#: src/common/command.c:3276 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . description: %s\n"
 
-#: src/common/command.c:3285
+#: src/common/command.c:3287
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr "option(s) de configuration trouvée(s) avec \"%s\"\n"
 
-#: src/common/command.c:3288
+#: src/common/command.c:3290
 msgid "config option(s) found\n"
 msgstr "option(s) de configuration trouvée(s)\n"
 
-#: src/common/command.c:3314
+#: src/common/command.c:3316
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s alias ou commande \"%s\" non trouvé\n"
 
-#: src/common/command.c:3324
+#: src/common/command.c:3326
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "Alias \"%s\" supprimé\n"
 
-#: src/common/command.c:3384
+#: src/common/command.c:3386
 msgid "ignore were removed.\n"
 msgstr "ignore ont été supprimés.\n"
 
-#: src/common/command.c:3386
+#: src/common/command.c:3388
 msgid "ignore was removed.\n"
 msgstr "ignore a été supprimé.\n"
 
-#: src/common/command.c:3391
+#: src/common/command.c:3393
 #, c-format
 msgid "%s no ignore found\n"
 msgstr "%s aucun ignore trouvé\n"
 
-#: src/common/command.c:3425
+#: src/common/command.c:3427
 #, c-format
 msgid "%s can't upgrade: connection to at least one server is pending\n"
 msgstr ""
 "%s impossible de mettre ŕ jour: une connexion ŕ au moins un serveur est en "
 "cours\n"
 
-#: src/common/command.c:3435
+#: src/common/command.c:3437
 #, c-format
 msgid ""
 "%s can't upgrade: connection to at least one SSL server is active (should be "
@@ -3602,35 +3606,35 @@ msgstr ""
 "%s impossible de mettre ŕ jour: une connexion ŕ au moins un serveur SSL est "
 "active (devrait ętre corrigé dans une future version)\n"
 
-#: src/common/command.c:3451
+#: src/common/command.c:3453
 msgid "Upgrading WeeChat...\n"
 msgstr "Mise ŕ jour de WeeChat...\n"
 
-#: src/common/command.c:3458
+#: src/common/command.c:3460
 #, c-format
 msgid "%s unable to save session in file\n"
 msgstr "%s impossible de sauver la session dans le fichier\n"
 
-#: src/common/command.c:3484
+#: src/common/command.c:3486
 #, c-format
 msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n"
 msgstr "%s l'exécution a échoué (programme: \"%s\"), sortie de WeeChat\n"
 
-#: src/common/command.c:3524
+#: src/common/command.c:3526
 #, c-format
 msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s"
 msgstr "Uptime WeeChat: %d %s %02d:%02d:%02d, démarré le %s"
 
-#: src/common/command.c:3538
+#: src/common/command.c:3540
 #, c-format
 msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s"
 msgstr "Uptime WeeChat: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, démarré le %s%s"
 
-#: src/common/command.c:3582
+#: src/common/command.c:3584
 msgid "Opened windows:\n"
 msgstr "Fenętres ouvertes:\n"
 
-#: src/common/command.c:3669
+#: src/common/command.c:3671
 #, c-format
 msgid ""
 "%s can not merge windows, there's no other window with same size near "
diff --git a/po/hu.po b/po/hu.po
index c29ef9c86..efd41b23d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.9-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-03-21 12:04+0100\n"
+"POT-Creation-Date: 2006-03-21 15:11+0100\n"
 "PO-Revision-Date: 2006-03-18 11:46+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team:  weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1429,7 +1429,7 @@ msgstr "ismeretlen"
 msgid "%s: using local hostname \"%s\"\n"
 msgstr "%s: helyi hosztnév \"%s\"\n"
 
-#: src/irc/irc-send.c:215 src/common/command.c:1028
+#: src/irc/irc-send.c:215 src/common/command.c:1030
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr "%s nem található név az üzenet küldéséhez\n"
@@ -1451,8 +1451,8 @@ msgstr "%s \"%s\" parancs nem futtathatĂł a szerverablakban\n"
 
 #: src/irc/irc-send.c:628 src/irc/irc-send.c:640 src/irc/irc-send.c:658
 #: src/irc/irc-send.c:1365 src/irc/irc-send.c:1503 src/irc/irc-send.c:2098
-#: src/common/command.c:1914 src/common/command.c:2427
-#: src/common/command.c:2568
+#: src/common/command.c:1916 src/common/command.c:2429
+#: src/common/command.c:2570
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s rossz argumentum szám a \"%s\" parancsnak\n"
@@ -1802,11 +1802,11 @@ msgstr ""
 msgid "%s[%s%s%s]%s idle: "
 msgstr "%s[%s%s%s]%s tétlen: "
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "days"
 msgstr "nap"
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "day"
 msgstr "nap"
 
@@ -2300,7 +2300,7 @@ msgstr "%s (%s/%s) szerver/szoba nem található a modul futtatása parancshoz\n
 msgid "Day changed to %s\n"
 msgstr "A mai dátum: %s\n"
 
-#: src/gui/curses/gui-input.c:439
+#: src/gui/curses/gui-input.c:456
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s túl nagy a késés(lag), lecsatlakozás a szerverről...\n"
@@ -2574,7 +2574,7 @@ msgstr "képernyő frissítése"
 msgid "grab a key"
 msgstr ""
 
-#: src/gui/gui-keyboard.c:444 src/common/command.c:2442
+#: src/gui/gui-keyboard.c:444 src/common/command.c:2444
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr ""
@@ -2870,36 +2870,40 @@ msgid "[option [ = value]]"
 msgstr "[opció [ = érték]]"
 
 #: src/common/command.c:148
+#, fuzzy
 msgid ""
 "option: name of an option (if name is full and no value is given, then help "
 "is displayed on option)\n"
-"value: value for option"
+"value: value for option\n"
+"\n"
+"Option may be: servername.server_xxx where \"servername\" is an internal "
+"server name and \"xxx\" an option for this server."
 msgstr ""
 "opció: az opció neve (ha a név teljes és nincs érték megadva, akkor "
 "megjeleníti az opcióhoz tartozó segítséget\n"
 "érték: az opcióhoz tartozó érték"
 
-#: src/common/command.c:152
+#: src/common/command.c:154
 msgid "remove an alias"
 msgstr "alias eltávolítása"
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name"
 msgstr "alias_név"
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name: name of alias to remove"
 msgstr "alias_név: az eltávolítandó alias neve"
 
-#: src/common/command.c:155
+#: src/common/command.c:157
 msgid "unignore IRC messages and/or hosts"
 msgstr ""
 
-#: src/common/command.c:156
+#: src/common/command.c:158
 msgid "[number | [mask [[type | command] [channel [server]]]]]"
 msgstr "[szám | [maszk [[típus | parancs] [szoba [szerver]]]]]"
 
-#: src/common/command.c:157
+#: src/common/command.c:159
 msgid ""
 " number: # of ignore to unignore (number is displayed by list of ignore)\n"
 "   mask: nick or host mask to unignore\n"
@@ -2912,33 +2916,33 @@ msgid ""
 "Without argument, /unignore command lists all defined ignore."
 msgstr ""
 
-#: src/common/command.c:167
+#: src/common/command.c:169
 msgid "upgrade WeeChat without disconnecting from servers"
 msgstr "WeeChat frissítése a szerverekről való lecsatlakozás nélkül"
 
-#: src/common/command.c:169
+#: src/common/command.c:171
 msgid ""
 "This command run again WeeChat binary, so it should have been compiled "
 "installed with a package manager before running this command."
 msgstr ""
 
-#: src/common/command.c:172
+#: src/common/command.c:174
 msgid "show WeeChat uptime"
 msgstr "a WeeChat futásidejének mutatása"
 
-#: src/common/command.c:173
+#: src/common/command.c:175
 msgid "[-o]"
 msgstr "[-o]"
 
-#: src/common/command.c:174
+#: src/common/command.c:176
 msgid "-o: send uptime on current channel as an IRC message"
 msgstr "-o: a futásidő mint IRC üzenet elküldése az aktuális szobába"
 
-#: src/common/command.c:176
+#: src/common/command.c:178
 msgid "manage windows"
 msgstr "ablakok kezelése"
 
-#: src/common/command.c:177
+#: src/common/command.c:179
 msgid ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
@@ -2946,7 +2950,7 @@ msgstr ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
 
-#: src/common/command.c:179
+#: src/common/command.c:181
 #, c-format
 msgid ""
 "  list: list opened windows (no parameter implies this list)\n"
@@ -2983,323 +2987,323 @@ msgstr ""
 "hogy az új ablak hány százaléka lesz a szülőablaknak. Például 25 esetén a "
 "szülőablak negyedét kapjuk."
 
-#: src/common/command.c:376 src/common/command.c:730
+#: src/common/command.c:378 src/common/command.c:732
 #, c-format
 msgid "%s circular reference when calling alias \"/%s\"\n"
 msgstr ""
 
-#: src/common/command.c:710 src/common/command.c:846 src/common/command.c:917
+#: src/common/command.c:712 src/common/command.c:848 src/common/command.c:919
 #, c-format
 msgid "%s command \"%s\" failed\n"
 msgstr "%s a \"%s\" parancs végrehajtása sikertelen\n"
 
-#: src/common/command.c:812
+#: src/common/command.c:814
 #, c-format
 msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 
-#: src/common/command.c:824
+#: src/common/command.c:826
 #, c-format
 msgid ""
 "%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
 "arg%s)\n"
 msgstr ""
 
-#: src/common/command.c:873
+#: src/common/command.c:875
 #, c-format
 msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 
-#: src/common/command.c:885
+#: src/common/command.c:887
 #, c-format
 msgid ""
 "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
 "arg%s)\n"
 msgstr ""
 
-#: src/common/command.c:900
+#: src/common/command.c:902
 #, c-format
 msgid "%s command \"%s\" needs a server connection!\n"
 msgstr "%s a \"%s\" parancs futtatásához csatlakozni kell a szerverhez!\n"
 
-#: src/common/command.c:930
+#: src/common/command.c:932
 #, c-format
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr "%s ismeretlen parancs: \"%s\" (segítséget a /help parancstól kaphat)\n"
 
-#: src/common/command.c:1075
+#: src/common/command.c:1077
 msgid "This window is not a channel!\n"
 msgstr "Ez az ablak nem egy szoba!\n"
 
-#: src/common/command.c:1108 src/common/command.c:1145
-#: src/common/command.c:1280
+#: src/common/command.c:1110 src/common/command.c:1147
+#: src/common/command.c:1282
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr "%s hiányzó argumentum a \"%s\" parancsnak\n"
 
-#: src/common/command.c:1117
+#: src/common/command.c:1119
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr "A \"%s\" => \"%s\" aliasz elkészült\n"
 
-#: src/common/command.c:1123
+#: src/common/command.c:1125
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr ""
 "A \"%s\" => \"%s\" aliasz elkészítése sikertelen (nincs elég memória)\n"
 
-#: src/common/command.c:1135 src/common/command.c:1156
+#: src/common/command.c:1137 src/common/command.c:1158
 msgid "List of aliases:\n"
 msgstr "Aliaszok listája:\n"
 
-#: src/common/command.c:1170
+#: src/common/command.c:1172
 msgid "No alias defined.\n"
 msgstr "Nincs aliasz definiálva.\n"
 
-#: src/common/command.c:1189
+#: src/common/command.c:1191
 #, c-format
 msgid "%sServer: %s%s\n"
 msgstr "%sSzerver: %s%s\n"
 
-#: src/common/command.c:1194
+#: src/common/command.c:1196
 #, c-format
 msgid "%snot connected\n"
 msgstr "%snincs csatlakozva\n"
 
-#: src/common/command.c:1198
+#: src/common/command.c:1200
 #, c-format
 msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
 msgstr "%sSzoba: %s%s %s(szerver: %s%s%s)\n"
 
-#: src/common/command.c:1207
+#: src/common/command.c:1209
 #, c-format
 msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
 msgstr "%sPrivát beszélgetés: %s%s %s(szerver: %s%s%s)\n"
 
-#: src/common/command.c:1216 src/common/command.c:1228
+#: src/common/command.c:1218 src/common/command.c:1230
 #, c-format
 msgid "%sunknown\n"
 msgstr "%sismeretlen\n"
 
-#: src/common/command.c:1224
+#: src/common/command.c:1226
 #, c-format
 msgid "%sraw IRC data\n"
 msgstr ""
 
-#: src/common/command.c:1259
+#: src/common/command.c:1261
 msgid "Opened buffers:\n"
 msgstr "Nyitott pufferek:\n"
 
-#: src/common/command.c:1304
+#: src/common/command.c:1306
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr "%s helytelen pufferszám\n"
 
-#: src/common/command.c:1321
+#: src/common/command.c:1323
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr "%s az utolsó puffert nem lehet bezárni\n"
 
-#: src/common/command.c:1332
+#: src/common/command.c:1334
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr "%s nem lehet szerverpuffert bezárni, míg a szobákban tartózkodunk\n"
 
-#: src/common/command.c:1390
+#: src/common/command.c:1392
 msgid "Notify levels:  "
 msgstr "Értesítési szintek:  "
 
-#: src/common/command.c:1396
+#: src/common/command.c:1398
 msgid "Raw IRC data"
 msgstr ""
 
-#: src/common/command.c:1420 src/common/command.c:1470
+#: src/common/command.c:1422 src/common/command.c:1472
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr ""
 "%s helytelen értesítési szint (az értéknek %d és %d között kell lennie)\n"
 
-#: src/common/command.c:1430
+#: src/common/command.c:1432
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr ""
 "%s helytelen puffer az értesítéshez (szobát vagy privát beszélgetést kell "
 "megjelölnie)\n"
 
-#: src/common/command.c:1440
+#: src/common/command.c:1442
 #, c-format
 msgid "New notify level for %s%s%s: %s%d %s"
 msgstr "A %s%s%s új értesítési szintje: %s%d %s"
 
-#: src/common/command.c:1450
+#: src/common/command.c:1452
 msgid "(hotlist: never)\n"
 msgstr ""
 
-#: src/common/command.c:1453
+#: src/common/command.c:1455
 msgid "(hotlist: highlights)\n"
 msgstr ""
 
-#: src/common/command.c:1456
+#: src/common/command.c:1458
 msgid "(hotlist: highlights + messages)\n"
 msgstr ""
 
-#: src/common/command.c:1459
+#: src/common/command.c:1461
 msgid "(hotlist: highlights + messages + join/part (all))\n"
 msgstr ""
 
-#: src/common/command.c:1590
+#: src/common/command.c:1592
 #, c-format
 msgid "Charsets for server %s%s%s: "
 msgstr "Karakterkészlet a %s%s%s szerveren: "
 
-#: src/common/command.c:1598
+#: src/common/command.c:1600
 #, c-format
 msgid "Charsets for channel %s%s%s: "
 msgstr "Karakterkészlet a %s%s%s szobában: "
 
-#: src/common/command.c:1606
+#: src/common/command.c:1608
 #, c-format
 msgid "Charsets for private %s%s%s: "
 msgstr "Karakterkészlet a %s%s%s privát beszélgetéshez: "
 
-#: src/common/command.c:1634 src/common/command.c:1664
-#: src/common/command.c:1694
+#: src/common/command.c:1636 src/common/command.c:1666
+#: src/common/command.c:1696
 #, c-format
 msgid " (inherited: \"%s%s%s\")"
 msgstr " (örökölt: \"%s%s%s\")"
 
-#: src/common/command.c:1763 src/common/command.c:1791
-#: src/common/command.c:1933 src/common/command.c:2561
-#: src/common/command.c:3658 src/common/command.c:3701
+#: src/common/command.c:1765 src/common/command.c:1793
+#: src/common/command.c:1935 src/common/command.c:2563
+#: src/common/command.c:3660 src/common/command.c:3703
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s ismeretlen opciĂł a \"%s\" parancsnak\n"
 
-#: src/common/command.c:1826
+#: src/common/command.c:1828
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s már csatlakozott a \"%s\" szerverhez!\n"
 
-#: src/common/command.c:1834
+#: src/common/command.c:1836
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr ""
 
-#: src/common/command.c:1853 src/common/command.c:1982
+#: src/common/command.c:1855 src/common/command.c:1984
 #, c-format
 msgid "%s server not found\n"
 msgstr "%s a szerver nem található\n"
 
-#: src/common/command.c:1966
+#: src/common/command.c:1968
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr "%s nincs csatlakozva a \"%s\" szerverhez!\n"
 
-#: src/common/command.c:1974
+#: src/common/command.c:1976
 msgid "Auto-reconnection is cancelled\n"
 msgstr "automata újracsatlakozás megszakítva\n"
 
-#: src/common/command.c:2010 src/common/weechat.c:459
+#: src/common/command.c:2012 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "%s belső parancsok:\n"
 
-#: src/common/command.c:2020 src/common/weechat.c:479
+#: src/common/command.c:2022 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr "IRC parancsok:\n"
 
-#: src/common/command.c:2034
+#: src/common/command.c:2036
 msgid "Plugin commands:\n"
 msgstr "Modul parancsok:\n"
 
-#: src/common/command.c:2150
+#: src/common/command.c:2152
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr "Nem érhető el segítség, a \"%s\" ismeretlen parancs\n"
 
-#: src/common/command.c:2219
+#: src/common/command.c:2221
 #, c-format
 msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n"
 msgstr ""
 
-#: src/common/command.c:2257
+#: src/common/command.c:2259
 msgid "List of ignore:\n"
 msgstr ""
 
-#: src/common/command.c:2274
+#: src/common/command.c:2276
 msgid "No ignore defined.\n"
 msgstr ""
 
-#: src/common/command.c:2300
+#: src/common/command.c:2302
 msgid "New ignore:"
 msgstr ""
 
-#: src/common/command.c:2320
+#: src/common/command.c:2322
 #, c-format
 msgid "New key binding:  %s"
 msgstr ""
 
-#: src/common/command.c:2359
+#: src/common/command.c:2361
 msgid "Key bindings:\n"
 msgstr ""
 
-#: src/common/command.c:2373
+#: src/common/command.c:2375
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr ""
 
-#: src/common/command.c:2379
+#: src/common/command.c:2381
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:2387 src/common/weechat.c:511
+#: src/common/command.c:2389 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr ""
 
-#: src/common/command.c:2407
+#: src/common/command.c:2409
 msgid "Default key bindings restored\n"
 msgstr "Alapértelmezett billentyűparancsok visszaállítva\n"
 
-#: src/common/command.c:2413
+#: src/common/command.c:2415
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 "%s \"-yes\" paraméter megadása kötelező a billentyűparancsok "
 "visszaállításához (biztonsági okokból)\n"
 
-#: src/common/command.c:2474
+#: src/common/command.c:2476
 msgid "Plugins loaded:\n"
 msgstr "Betöltött modulok:\n"
 
-#: src/common/command.c:2490
+#: src/common/command.c:2492
 msgid "     message handlers:\n"
 msgstr ""
 
-#: src/common/command.c:2499
+#: src/common/command.c:2501
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr ""
 
-#: src/common/command.c:2506
+#: src/common/command.c:2508
 msgid "       (no message handler)\n"
 msgstr ""
 
-#: src/common/command.c:2511
+#: src/common/command.c:2513
 msgid "     command handlers:\n"
 msgstr ""
 
-#: src/common/command.c:2532
+#: src/common/command.c:2534
 msgid "       (no command handler)\n"
 msgstr ""
 
-#: src/common/command.c:2538
+#: src/common/command.c:2540
 msgid "  (no plugin)\n"
 msgstr "  (nem található bővítőmodul)\n"
 
-#: src/common/command.c:2574
+#: src/common/command.c:2576
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
@@ -3307,40 +3311,40 @@ msgstr ""
 "A \"plugin\" parancs nem elérhető, a WeeChat modultámogatás nélkül lett "
 "lefordĂ­tva.\n"
 
-#: src/common/command.c:2602
+#: src/common/command.c:2604
 msgid "Configuration file saved\n"
 msgstr "Konfigurációs fájl elmentve\n"
 
-#: src/common/command.c:2607
+#: src/common/command.c:2609
 #, c-format
 msgid "%s failed to save configuration file\n"
 msgstr "%s nem sikerült a konfigurációs fájlt elmenteni\n"
 
-#: src/common/command.c:2646
+#: src/common/command.c:2648
 msgid "No server.\n"
 msgstr "Nincs szerver.\n"
 
-#: src/common/command.c:2657
+#: src/common/command.c:2659
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "A '%s' szerver nem található.\n"
 
-#: src/common/command.c:2669
+#: src/common/command.c:2671
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr "%s hiányzó szervernév a \"%s\" parancshoz\n"
 
-#: src/common/command.c:2677
+#: src/common/command.c:2679
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr "%s túl sok paraméter a \"%s\" parancsnak, paraméterek mellőzve\n"
 
-#: src/common/command.c:2687
+#: src/common/command.c:2689
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr "%s a \"%s\" szerver nem található a \"%s\" parancshoz\n"
 
-#: src/common/command.c:2695
+#: src/common/command.c:2697
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -3349,175 +3353,175 @@ msgstr ""
 "%s nem tudja törölni a \"%s\" szervert, mert csatlakozva van hozzá. Próbálja "
 "a /disconnect %s parancsot előbb.\n"
 
-#: src/common/command.c:2715
+#: src/common/command.c:2717
 #, c-format
 msgid "Server %s%s%s has been deleted\n"
 msgstr "A %s%s%s szerver törölve\n"
 
-#: src/common/command.c:2734
+#: src/common/command.c:2736
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s hiányzó paraméter a \"%s\" parancsnak\n"
 
-#: src/common/command.c:2744
+#: src/common/command.c:2746
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr "%s a \"%s\" szerver már létezik, nem hozhatja létre!\n"
 
-#: src/common/command.c:2773 src/common/command.c:2801
-#: src/common/command.c:2814 src/common/command.c:2840
+#: src/common/command.c:2775 src/common/command.c:2803
+#: src/common/command.c:2816 src/common/command.c:2842
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr "%s hiányzó jelszó a \"%s\" paraméterhez\n"
 
-#: src/common/command.c:2786
+#: src/common/command.c:2788
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr "%s hiányzó név a \"%s\" paraméterhez\n"
 
-#: src/common/command.c:2827
+#: src/common/command.c:2829
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s hiányzó parancs a \"%s\" paraméterhez\n"
 
-#: src/common/command.c:2864
+#: src/common/command.c:2866
 #, c-format
 msgid "Server %s%s%s created\n"
 msgstr "A %s%s%s szerver létrehozva\n"
 
-#: src/common/command.c:2873
+#: src/common/command.c:2875
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s nem sikerült a szervert létrehozni\n"
 
-#: src/common/command.c:2933
+#: src/common/command.c:2935
 msgid "(unknown)"
 msgstr "(ismeretlen)"
 
-#: src/common/command.c:2956
+#: src/common/command.c:2958
 #, c-format
 msgid "%s(password hidden) "
 msgstr "%s(jelszĂł rejtve) "
 
-#: src/common/command.c:3054
+#: src/common/command.c:3056
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s a \"%s\" szerver nem található\n"
 
-#: src/common/command.c:3087 src/common/command.c:3135
+#: src/common/command.c:3089 src/common/command.c:3137
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s a \"%s\" opció nem található\n"
 
-#: src/common/command.c:3092 src/common/command.c:3127
+#: src/common/command.c:3094 src/common/command.c:3129
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s helytelen érték a \"%s\" paraméternek\n"
 
-#: src/common/command.c:3108
+#: src/common/command.c:3110
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr "%s a \"%s\" opció nem módosítható a WeeChat futása közben\n"
 
-#: src/common/command.c:3218
+#: src/common/command.c:3220
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:3221
+#: src/common/command.c:3223
 msgid "No config option found\n"
 msgstr "Nem található az opció\n"
 
-#: src/common/command.c:3228
+#: src/common/command.c:3230
 #, c-format
 msgid "%sDetail:\n"
 msgstr "%sRĂ©szletek:\n"
 
-#: src/common/command.c:3233
+#: src/common/command.c:3235
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr "  . típus logikai (értékek: 'on' vagy 'off')\n"
 
-#: src/common/command.c:3234 src/common/command.c:3257
-#: src/common/command.c:3263 src/common/command.c:3269
+#: src/common/command.c:3236 src/common/command.c:3259
+#: src/common/command.c:3265 src/common/command.c:3271
 #: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
 #: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . alapérték: '%s'\n"
 
-#: src/common/command.c:3239
+#: src/common/command.c:3241
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . típus szám (értékek: %d és %d között)\n"
 
-#: src/common/command.c:3242 src/common/weechat.c:404
+#: src/common/command.c:3244 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . alapérték: %d\n"
 
-#: src/common/command.c:3246
+#: src/common/command.c:3248
 msgid "  . type string (values: "
 msgstr "  . típus szöveg (értékek: "
 
-#: src/common/command.c:3259 src/common/command.c:3265
-#: src/common/command.c:3271 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/command.c:3261 src/common/command.c:3267
+#: src/common/command.c:3273 src/common/weechat.c:422 src/common/weechat.c:429
 #: src/common/weechat.c:436
 msgid "empty"
 msgstr "ĂĽres"
 
-#: src/common/command.c:3262
+#: src/common/command.c:3264
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr "  . típus szín (Curses vagy Gtk szín, lásd WeeChat dokumentáció)\n"
 
-#: src/common/command.c:3268
+#: src/common/command.c:3270
 msgid "  . type string (any string)\n"
 msgstr "  . típus szöveg (bármilyen szöveg)\n"
 
-#: src/common/command.c:3274 src/common/weechat.c:439
+#: src/common/command.c:3276 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . leírás : %s\n"
 
-#: src/common/command.c:3285
+#: src/common/command.c:3287
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr "a \"%s\" kifejezéshez tartozó opciók\n"
 
-#: src/common/command.c:3288
+#: src/common/command.c:3290
 msgid "config option(s) found\n"
 msgstr "megtalált opciók\n"
 
-#: src/common/command.c:3314
+#: src/common/command.c:3316
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s a \"%s\" aliasz vagy parancs nem található\n"
 
-#: src/common/command.c:3324
+#: src/common/command.c:3326
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "A \"%s\" aliasz eltávolítva\n"
 
-#: src/common/command.c:3384
+#: src/common/command.c:3386
 msgid "ignore were removed.\n"
 msgstr "mellőzés eltávolítva.\n"
 
-#: src/common/command.c:3386
+#: src/common/command.c:3388
 msgid "ignore was removed.\n"
 msgstr "mellőzés eltávolítva.\n"
 
-#: src/common/command.c:3391
+#: src/common/command.c:3393
 #, c-format
 msgid "%s no ignore found\n"
 msgstr "%s nem található ilyen mellőzés\n"
 
-#: src/common/command.c:3425
+#: src/common/command.c:3427
 #, c-format
 msgid "%s can't upgrade: connection to at least one server is pending\n"
 msgstr ""
 "%s nem sikerült frissíteni: a kapcsolat egy vagy több szerverrel még "
 "folyamatban van\n"
 
-#: src/common/command.c:3435
+#: src/common/command.c:3437
 #, c-format
 msgid ""
 "%s can't upgrade: connection to at least one SSL server is active (should be "
@@ -3526,36 +3530,36 @@ msgstr ""
 "%s nem sikerült frissíteni: a kapcsolat legalább egy SSL szerverrel aktív (a "
 "következő verziókban javítva lesz)\n"
 
-#: src/common/command.c:3451
+#: src/common/command.c:3453
 msgid "Upgrading WeeChat...\n"
 msgstr "WeeChat frissítése...\n"
 
-#: src/common/command.c:3458
+#: src/common/command.c:3460
 #, c-format
 msgid "%s unable to save session in file\n"
 msgstr ""
 
-#: src/common/command.c:3484
+#: src/common/command.c:3486
 #, c-format
 msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n"
 msgstr ""
 
-#: src/common/command.c:3524
+#: src/common/command.c:3526
 #, c-format
 msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s"
 msgstr "WeeChat futásidő: %d %s %02d:%02d:%02d, elindítva: %s"
 
-#: src/common/command.c:3538
+#: src/common/command.c:3540
 #, c-format
 msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s"
 msgstr ""
 "WeeChat futásidő: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, elindítva: %s%s"
 
-#: src/common/command.c:3582
+#: src/common/command.c:3584
 msgid "Opened windows:\n"
 msgstr "Nyitott ablakok:\n"
 
-#: src/common/command.c:3669
+#: src/common/command.c:3671
 #, c-format
 msgid ""
 "%s can not merge windows, there's no other window with same size near "
diff --git a/po/weechat.pot b/po/weechat.pot
index eb4c62396..85c4803e9 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: 2006-03-21 12:04+0100\n"
+"POT-Creation-Date: 2006-03-21 15:11+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"
@@ -1306,7 +1306,7 @@ msgstr ""
 msgid "%s: using local hostname \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-send.c:215 src/common/command.c:1028
+#: src/irc/irc-send.c:215 src/common/command.c:1030
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr ""
@@ -1328,8 +1328,8 @@ msgstr ""
 
 #: src/irc/irc-send.c:628 src/irc/irc-send.c:640 src/irc/irc-send.c:658
 #: src/irc/irc-send.c:1365 src/irc/irc-send.c:1503 src/irc/irc-send.c:2098
-#: src/common/command.c:1914 src/common/command.c:2427
-#: src/common/command.c:2568
+#: src/common/command.c:1916 src/common/command.c:2429
+#: src/common/command.c:2570
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr ""
@@ -1679,11 +1679,11 @@ msgstr ""
 msgid "%s[%s%s%s]%s idle: "
 msgstr ""
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "days"
 msgstr ""
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "day"
 msgstr ""
 
@@ -2163,7 +2163,7 @@ msgstr ""
 msgid "Day changed to %s\n"
 msgstr ""
 
-#: src/gui/curses/gui-input.c:439
+#: src/gui/curses/gui-input.c:456
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr ""
@@ -2437,7 +2437,7 @@ msgstr ""
 msgid "grab a key"
 msgstr ""
 
-#: src/gui/gui-keyboard.c:444 src/common/command.c:2442
+#: src/gui/gui-keyboard.c:444 src/common/command.c:2444
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr ""
@@ -2697,30 +2697,33 @@ msgstr ""
 msgid ""
 "option: name of an option (if name is full and no value is given, then help "
 "is displayed on option)\n"
-"value: value for option"
+"value: value for option\n"
+"\n"
+"Option may be: servername.server_xxx where \"servername\" is an internal "
+"server name and \"xxx\" an option for this server."
 msgstr ""
 
-#: src/common/command.c:152
+#: src/common/command.c:154
 msgid "remove an alias"
 msgstr ""
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name"
 msgstr ""
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name: name of alias to remove"
 msgstr ""
 
-#: src/common/command.c:155
+#: src/common/command.c:157
 msgid "unignore IRC messages and/or hosts"
 msgstr ""
 
-#: src/common/command.c:156
+#: src/common/command.c:158
 msgid "[number | [mask [[type | command] [channel [server]]]]]"
 msgstr ""
 
-#: src/common/command.c:157
+#: src/common/command.c:159
 msgid ""
 " number: # of ignore to unignore (number is displayed by list of ignore)\n"
 "   mask: nick or host mask to unignore\n"
@@ -2733,39 +2736,39 @@ msgid ""
 "Without argument, /unignore command lists all defined ignore."
 msgstr ""
 
-#: src/common/command.c:167
+#: src/common/command.c:169
 msgid "upgrade WeeChat without disconnecting from servers"
 msgstr ""
 
-#: src/common/command.c:169
+#: src/common/command.c:171
 msgid ""
 "This command run again WeeChat binary, so it should have been compiled "
 "installed with a package manager before running this command."
 msgstr ""
 
-#: src/common/command.c:172
+#: src/common/command.c:174
 msgid "show WeeChat uptime"
 msgstr ""
 
-#: src/common/command.c:173
+#: src/common/command.c:175
 msgid "[-o]"
 msgstr ""
 
-#: src/common/command.c:174
+#: src/common/command.c:176
 msgid "-o: send uptime on current channel as an IRC message"
 msgstr ""
 
-#: src/common/command.c:176
+#: src/common/command.c:178
 msgid "manage windows"
 msgstr ""
 
-#: src/common/command.c:177
+#: src/common/command.c:179
 msgid ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
 msgstr ""
 
-#: src/common/command.c:179
+#: src/common/command.c:181
 #, c-format
 msgid ""
 "  list: list opened windows (no parameter implies this list)\n"
@@ -2786,564 +2789,564 @@ msgid ""
 "create a new window with size = current_size / 4"
 msgstr ""
 
-#: src/common/command.c:376 src/common/command.c:730
+#: src/common/command.c:378 src/common/command.c:732
 #, c-format
 msgid "%s circular reference when calling alias \"/%s\"\n"
 msgstr ""
 
-#: src/common/command.c:710 src/common/command.c:846 src/common/command.c:917
+#: src/common/command.c:712 src/common/command.c:848 src/common/command.c:919
 #, c-format
 msgid "%s command \"%s\" failed\n"
 msgstr ""
 
-#: src/common/command.c:812
+#: src/common/command.c:814
 #, c-format
 msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 
-#: src/common/command.c:824
+#: src/common/command.c:826
 #, c-format
 msgid ""
 "%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
 "arg%s)\n"
 msgstr ""
 
-#: src/common/command.c:873
+#: src/common/command.c:875
 #, c-format
 msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 
-#: src/common/command.c:885
+#: src/common/command.c:887
 #, c-format
 msgid ""
 "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
 "arg%s)\n"
 msgstr ""
 
-#: src/common/command.c:900
+#: src/common/command.c:902
 #, c-format
 msgid "%s command \"%s\" needs a server connection!\n"
 msgstr ""
 
-#: src/common/command.c:930
+#: src/common/command.c:932
 #, c-format
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr ""
 
-#: src/common/command.c:1075
+#: src/common/command.c:1077
 msgid "This window is not a channel!\n"
 msgstr ""
 
-#: src/common/command.c:1108 src/common/command.c:1145
-#: src/common/command.c:1280
+#: src/common/command.c:1110 src/common/command.c:1147
+#: src/common/command.c:1282
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1117
+#: src/common/command.c:1119
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr ""
 
-#: src/common/command.c:1123
+#: src/common/command.c:1125
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr ""
 
-#: src/common/command.c:1135 src/common/command.c:1156
+#: src/common/command.c:1137 src/common/command.c:1158
 msgid "List of aliases:\n"
 msgstr ""
 
-#: src/common/command.c:1170
+#: src/common/command.c:1172
 msgid "No alias defined.\n"
 msgstr ""
 
-#: src/common/command.c:1189
+#: src/common/command.c:1191
 #, c-format
 msgid "%sServer: %s%s\n"
 msgstr ""
 
-#: src/common/command.c:1194
+#: src/common/command.c:1196
 #, c-format
 msgid "%snot connected\n"
 msgstr ""
 
-#: src/common/command.c:1198
+#: src/common/command.c:1200
 #, c-format
 msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
 msgstr ""
 
-#: src/common/command.c:1207
+#: src/common/command.c:1209
 #, c-format
 msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
 msgstr ""
 
-#: src/common/command.c:1216 src/common/command.c:1228
+#: src/common/command.c:1218 src/common/command.c:1230
 #, c-format
 msgid "%sunknown\n"
 msgstr ""
 
-#: src/common/command.c:1224
+#: src/common/command.c:1226
 #, c-format
 msgid "%sraw IRC data\n"
 msgstr ""
 
-#: src/common/command.c:1259
+#: src/common/command.c:1261
 msgid "Opened buffers:\n"
 msgstr ""
 
-#: src/common/command.c:1304
+#: src/common/command.c:1306
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr ""
 
-#: src/common/command.c:1321
+#: src/common/command.c:1323
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr ""
 
-#: src/common/command.c:1332
+#: src/common/command.c:1334
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr ""
 
-#: src/common/command.c:1390
+#: src/common/command.c:1392
 msgid "Notify levels:  "
 msgstr ""
 
-#: src/common/command.c:1396
+#: src/common/command.c:1398
 msgid "Raw IRC data"
 msgstr ""
 
-#: src/common/command.c:1420 src/common/command.c:1470
+#: src/common/command.c:1422 src/common/command.c:1472
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr ""
 
-#: src/common/command.c:1430
+#: src/common/command.c:1432
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr ""
 
-#: src/common/command.c:1440
+#: src/common/command.c:1442
 #, c-format
 msgid "New notify level for %s%s%s: %s%d %s"
 msgstr ""
 
-#: src/common/command.c:1450
+#: src/common/command.c:1452
 msgid "(hotlist: never)\n"
 msgstr ""
 
-#: src/common/command.c:1453
+#: src/common/command.c:1455
 msgid "(hotlist: highlights)\n"
 msgstr ""
 
-#: src/common/command.c:1456
+#: src/common/command.c:1458
 msgid "(hotlist: highlights + messages)\n"
 msgstr ""
 
-#: src/common/command.c:1459
+#: src/common/command.c:1461
 msgid "(hotlist: highlights + messages + join/part (all))\n"
 msgstr ""
 
-#: src/common/command.c:1590
+#: src/common/command.c:1592
 #, c-format
 msgid "Charsets for server %s%s%s: "
 msgstr ""
 
-#: src/common/command.c:1598
+#: src/common/command.c:1600
 #, c-format
 msgid "Charsets for channel %s%s%s: "
 msgstr ""
 
-#: src/common/command.c:1606
+#: src/common/command.c:1608
 #, c-format
 msgid "Charsets for private %s%s%s: "
 msgstr ""
 
-#: src/common/command.c:1634 src/common/command.c:1664
-#: src/common/command.c:1694
+#: src/common/command.c:1636 src/common/command.c:1666
+#: src/common/command.c:1696
 #, c-format
 msgid " (inherited: \"%s%s%s\")"
 msgstr ""
 
-#: src/common/command.c:1763 src/common/command.c:1791
-#: src/common/command.c:1933 src/common/command.c:2561
-#: src/common/command.c:3658 src/common/command.c:3701
+#: src/common/command.c:1765 src/common/command.c:1793
+#: src/common/command.c:1935 src/common/command.c:2563
+#: src/common/command.c:3660 src/common/command.c:3703
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1826
+#: src/common/command.c:1828
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr ""
 
-#: src/common/command.c:1834
+#: src/common/command.c:1836
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr ""
 
-#: src/common/command.c:1853 src/common/command.c:1982
+#: src/common/command.c:1855 src/common/command.c:1984
 #, c-format
 msgid "%s server not found\n"
 msgstr ""
 
-#: src/common/command.c:1966
+#: src/common/command.c:1968
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr ""
 
-#: src/common/command.c:1974
+#: src/common/command.c:1976
 msgid "Auto-reconnection is cancelled\n"
 msgstr ""
 
-#: src/common/command.c:2010 src/common/weechat.c:459
+#: src/common/command.c:2012 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr ""
 
-#: src/common/command.c:2020 src/common/weechat.c:479
+#: src/common/command.c:2022 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr ""
 
-#: src/common/command.c:2034
+#: src/common/command.c:2036
 msgid "Plugin commands:\n"
 msgstr ""
 
-#: src/common/command.c:2150
+#: src/common/command.c:2152
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr ""
 
-#: src/common/command.c:2219
+#: src/common/command.c:2221
 #, c-format
 msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n"
 msgstr ""
 
-#: src/common/command.c:2257
+#: src/common/command.c:2259
 msgid "List of ignore:\n"
 msgstr ""
 
-#: src/common/command.c:2274
+#: src/common/command.c:2276
 msgid "No ignore defined.\n"
 msgstr ""
 
-#: src/common/command.c:2300
+#: src/common/command.c:2302
 msgid "New ignore:"
 msgstr ""
 
-#: src/common/command.c:2320
+#: src/common/command.c:2322
 #, c-format
 msgid "New key binding:  %s"
 msgstr ""
 
-#: src/common/command.c:2359
+#: src/common/command.c:2361
 msgid "Key bindings:\n"
 msgstr ""
 
-#: src/common/command.c:2373
+#: src/common/command.c:2375
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr ""
 
-#: src/common/command.c:2379
+#: src/common/command.c:2381
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:2387 src/common/weechat.c:511
+#: src/common/command.c:2389 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr ""
 
-#: src/common/command.c:2407
+#: src/common/command.c:2409
 msgid "Default key bindings restored\n"
 msgstr ""
 
-#: src/common/command.c:2413
+#: src/common/command.c:2415
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 
-#: src/common/command.c:2474
+#: src/common/command.c:2476
 msgid "Plugins loaded:\n"
 msgstr ""
 
-#: src/common/command.c:2490
+#: src/common/command.c:2492
 msgid "     message handlers:\n"
 msgstr ""
 
-#: src/common/command.c:2499
+#: src/common/command.c:2501
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr ""
 
-#: src/common/command.c:2506
+#: src/common/command.c:2508
 msgid "       (no message handler)\n"
 msgstr ""
 
-#: src/common/command.c:2511
+#: src/common/command.c:2513
 msgid "     command handlers:\n"
 msgstr ""
 
-#: src/common/command.c:2532
+#: src/common/command.c:2534
 msgid "       (no command handler)\n"
 msgstr ""
 
-#: src/common/command.c:2538
+#: src/common/command.c:2540
 msgid "  (no plugin)\n"
 msgstr ""
 
-#: src/common/command.c:2574
+#: src/common/command.c:2576
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
 msgstr ""
 
-#: src/common/command.c:2602
+#: src/common/command.c:2604
 msgid "Configuration file saved\n"
 msgstr ""
 
-#: src/common/command.c:2607
+#: src/common/command.c:2609
 #, c-format
 msgid "%s failed to save configuration file\n"
 msgstr ""
 
-#: src/common/command.c:2646
+#: src/common/command.c:2648
 msgid "No server.\n"
 msgstr ""
 
-#: src/common/command.c:2657
+#: src/common/command.c:2659
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr ""
 
-#: src/common/command.c:2669
+#: src/common/command.c:2671
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:2677
+#: src/common/command.c:2679
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr ""
 
-#: src/common/command.c:2687
+#: src/common/command.c:2689
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:2695
+#: src/common/command.c:2697
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
 "disconnect %s before.\n"
 msgstr ""
 
-#: src/common/command.c:2715
+#: src/common/command.c:2717
 #, c-format
 msgid "Server %s%s%s has been deleted\n"
 msgstr ""
 
-#: src/common/command.c:2734
+#: src/common/command.c:2736
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:2744
+#: src/common/command.c:2746
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr ""
 
-#: src/common/command.c:2773 src/common/command.c:2801
-#: src/common/command.c:2814 src/common/command.c:2840
+#: src/common/command.c:2775 src/common/command.c:2803
+#: src/common/command.c:2816 src/common/command.c:2842
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:2786
+#: src/common/command.c:2788
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:2827
+#: src/common/command.c:2829
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:2864
+#: src/common/command.c:2866
 #, c-format
 msgid "Server %s%s%s created\n"
 msgstr ""
 
-#: src/common/command.c:2873
+#: src/common/command.c:2875
 #, c-format
 msgid "%s unable to create server\n"
 msgstr ""
 
-#: src/common/command.c:2933
+#: src/common/command.c:2935
 msgid "(unknown)"
 msgstr ""
 
-#: src/common/command.c:2956
+#: src/common/command.c:2958
 #, c-format
 msgid "%s(password hidden) "
 msgstr ""
 
-#: src/common/command.c:3054
+#: src/common/command.c:3056
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr ""
 
-#: src/common/command.c:3087 src/common/command.c:3135
+#: src/common/command.c:3089 src/common/command.c:3137
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr ""
 
-#: src/common/command.c:3092 src/common/command.c:3127
+#: src/common/command.c:3094 src/common/command.c:3129
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:3108
+#: src/common/command.c:3110
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr ""
 
-#: src/common/command.c:3218
+#: src/common/command.c:3220
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:3221
+#: src/common/command.c:3223
 msgid "No config option found\n"
 msgstr ""
 
-#: src/common/command.c:3228
+#: src/common/command.c:3230
 #, c-format
 msgid "%sDetail:\n"
 msgstr ""
 
-#: src/common/command.c:3233
+#: src/common/command.c:3235
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr ""
 
-#: src/common/command.c:3234 src/common/command.c:3257
-#: src/common/command.c:3263 src/common/command.c:3269
+#: src/common/command.c:3236 src/common/command.c:3259
+#: src/common/command.c:3265 src/common/command.c:3271
 #: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
 #: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr ""
 
-#: src/common/command.c:3239
+#: src/common/command.c:3241
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr ""
 
-#: src/common/command.c:3242 src/common/weechat.c:404
+#: src/common/command.c:3244 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr ""
 
-#: src/common/command.c:3246
+#: src/common/command.c:3248
 msgid "  . type string (values: "
 msgstr ""
 
-#: src/common/command.c:3259 src/common/command.c:3265
-#: src/common/command.c:3271 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/command.c:3261 src/common/command.c:3267
+#: src/common/command.c:3273 src/common/weechat.c:422 src/common/weechat.c:429
 #: src/common/weechat.c:436
 msgid "empty"
 msgstr ""
 
-#: src/common/command.c:3262
+#: src/common/command.c:3264
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr ""
 
-#: src/common/command.c:3268
+#: src/common/command.c:3270
 msgid "  . type string (any string)\n"
 msgstr ""
 
-#: src/common/command.c:3274 src/common/weechat.c:439
+#: src/common/command.c:3276 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr ""
 
-#: src/common/command.c:3285
+#: src/common/command.c:3287
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:3288
+#: src/common/command.c:3290
 msgid "config option(s) found\n"
 msgstr ""
 
-#: src/common/command.c:3314
+#: src/common/command.c:3316
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr ""
 
-#: src/common/command.c:3324
+#: src/common/command.c:3326
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr ""
 
-#: src/common/command.c:3384
+#: src/common/command.c:3386
 msgid "ignore were removed.\n"
 msgstr ""
 
-#: src/common/command.c:3386
+#: src/common/command.c:3388
 msgid "ignore was removed.\n"
 msgstr ""
 
-#: src/common/command.c:3391
+#: src/common/command.c:3393
 #, c-format
 msgid "%s no ignore found\n"
 msgstr ""
 
-#: src/common/command.c:3425
+#: src/common/command.c:3427
 #, c-format
 msgid "%s can't upgrade: connection to at least one server is pending\n"
 msgstr ""
 
-#: src/common/command.c:3435
+#: src/common/command.c:3437
 #, c-format
 msgid ""
 "%s can't upgrade: connection to at least one SSL server is active (should be "
 "fixed in a future version)\n"
 msgstr ""
 
-#: src/common/command.c:3451
+#: src/common/command.c:3453
 msgid "Upgrading WeeChat...\n"
 msgstr ""
 
-#: src/common/command.c:3458
+#: src/common/command.c:3460
 #, c-format
 msgid "%s unable to save session in file\n"
 msgstr ""
 
-#: src/common/command.c:3484
+#: src/common/command.c:3486
 #, c-format
 msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n"
 msgstr ""
 
-#: src/common/command.c:3524
+#: src/common/command.c:3526
 #, c-format
 msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s"
 msgstr ""
 
-#: src/common/command.c:3538
+#: src/common/command.c:3540
 #, c-format
 msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s"
 msgstr ""
 
-#: src/common/command.c:3582
+#: src/common/command.c:3584
 msgid "Opened windows:\n"
 msgstr ""
 
-#: src/common/command.c:3669
+#: src/common/command.c:3671
 #, c-format
 msgid ""
 "%s can not merge windows, there's no other window with same size near "
diff --git a/src/common/command.c b/src/common/command.c
index 01d08551a..91b74d99a 100644
--- a/src/common/command.c
+++ b/src/common/command.c
@@ -147,7 +147,9 @@ t_weechat_command weechat_commands[] =
     N_("[option [ = value]]"),
     N_("option: name of an option (if name is full "
        "and no value is given, then help is displayed on option)\n"
-       "value: value for option"),
+       "value: value for option\n\n"
+       "Option may be: servername.server_xxx where \"servername\" is an "
+       "internal server name and \"xxx\" an option for this server."),
     "%o = %v", 0, MAX_ARGS, NULL, weechat_cmd_set },
   { "unalias", N_("remove an alias"),
     N_("alias_name"), N_("alias_name: name of alias to remove"),
diff --git a/weechat/doc/en/weechat_commands.xml b/weechat/doc/en/weechat_commands.xml
index d8a905f7e..025225557 100644
--- a/weechat/doc/en/weechat_commands.xml
+++ b/weechat/doc/en/weechat_commands.xml
@@ -154,6 +154,8 @@ set config parameters
 option: name of an option (if name is full and no value is given, then help is displayed on option)
 value: value for option
 
+Option may be: servername.server_xxx where "servername" is an internal server name and "xxx" an option for this server.
+
 </programlisting>
 <command>unalias  alias_name</command>
 <programlisting>
diff --git a/weechat/doc/fr/weechat_commands.xml b/weechat/doc/fr/weechat_commands.xml
index 5b0782d57..64be4a670 100644
--- a/weechat/doc/fr/weechat_commands.xml
+++ b/weechat/doc/fr/weechat_commands.xml
@@ -154,6 +154,8 @@ modifier des param
 option: nom de l'option (si le nom est complet et qu'aucune valeur n'est donnée, alors l'aide sur l'option est affichée)
 valeur: valeur pour l'option
 
+L'option peut ętre: nomserveur.server_xxx oů "nomserveur" est le nom interne d'un serveur et "xxx" une option pour ce serveur.
+
 </programlisting>
 <command>unalias  nom_alias</command>
 <programlisting>
diff --git a/weechat/po/cs.po b/weechat/po/cs.po
index 116c61d95..d7b29f114 100644
--- a/weechat/po/cs.po
+++ b/weechat/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.9-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-03-21 12:04+0100\n"
+"POT-Creation-Date: 2006-03-21 15:11+0100\n"
 "PO-Revision-Date: 2006-03-18 11:45+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1416,7 +1416,7 @@ msgstr "neznámý"
 msgid "%s: using local hostname \"%s\"\n"
 msgstr "%s: používám lokální jméno hosta \"%s\"\n"
 
-#: src/irc/irc-send.c:215 src/common/command.c:1028
+#: src/irc/irc-send.c:215 src/common/command.c:1030
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr "%s nemohu najít přezdívku pro poslání zprávy\n"
@@ -1438,8 +1438,8 @@ msgstr "%s \"%s\" příkaz nemůže být spuštěn v bufferu serveru\n"
 
 #: src/irc/irc-send.c:628 src/irc/irc-send.c:640 src/irc/irc-send.c:658
 #: src/irc/irc-send.c:1365 src/irc/irc-send.c:1503 src/irc/irc-send.c:2098
-#: src/common/command.c:1914 src/common/command.c:2427
-#: src/common/command.c:2568
+#: src/common/command.c:1916 src/common/command.c:2429
+#: src/common/command.c:2570
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s špatný počet parametrů pro příkaz \"%s\"\n"
@@ -1797,11 +1797,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s byl %s\n"
 msgid "%s[%s%s%s]%s idle: "
 msgstr "%s[%s%s%s]%s neÄŤinnĂ˝: "
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "days"
 msgstr "dnĂ­"
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "day"
 msgstr "den"
 
@@ -2319,7 +2319,7 @@ msgstr "%s server/kanál (%s/%s) nenaleyen pro exec příkaz pluginu\n"
 msgid "Day changed to %s\n"
 msgstr "Změnil se den na %s\n"
 
-#: src/gui/curses/gui-input.c:439
+#: src/gui/curses/gui-input.c:456
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s zpoždění je veliké, odpojuji se od serveru...\n"
@@ -2595,7 +2595,7 @@ msgstr "obnov obrazovku"
 msgid "grab a key"
 msgstr "zachytit klávesu"
 
-#: src/gui/gui-keyboard.c:444 src/common/command.c:2442
+#: src/gui/gui-keyboard.c:444 src/common/command.c:2444
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr "%s nemohu napojit kalávesu \"%s\"\n"
@@ -2908,36 +2908,40 @@ msgid "[option [ = value]]"
 msgstr "[volba [ = hodnota]]"
 
 #: src/common/command.c:148
+#, fuzzy
 msgid ""
 "option: name of an option (if name is full and no value is given, then help "
 "is displayed on option)\n"
-"value: value for option"
+"value: value for option\n"
+"\n"
+"Option may be: servername.server_xxx where \"servername\" is an internal "
+"server name and \"xxx\" an option for this server."
 msgstr ""
 "volba: jméno volby (pokud je jméno celé a není zadána hodnota pak je "
 "zobrazena nápověda pro volby)\n"
 "hodnota: hodnota volby"
 
-#: src/common/command.c:152
+#: src/common/command.c:154
 msgid "remove an alias"
 msgstr "odebere alias"
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name"
 msgstr "jméno_aliasu"
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name: name of alias to remove"
 msgstr "jméno_aliasu: jméno aliasu pro odebrání"
 
-#: src/common/command.c:155
+#: src/common/command.c:157
 msgid "unignore IRC messages and/or hosts"
 msgstr "zruší ignorování IRC zprávy a/nebo hosta"
 
-#: src/common/command.c:156
+#: src/common/command.c:158
 msgid "[number | [mask [[type | command] [channel [server]]]]]"
 msgstr "[číslo | [maska [[typ | příkaz] [kanál [server]]]]]"
 
-#: src/common/command.c:157
+#: src/common/command.c:159
 msgid ""
 " number: # of ignore to unignore (number is displayed by list of ignore)\n"
 "   mask: nick or host mask to unignore\n"
@@ -2960,11 +2964,11 @@ msgstr ""
 "Pro každý argument znamená '*' všechno.\n"
 "Bez argunetů, vypíše příkaz /unignore seznam definovaných ignorací."
 
-#: src/common/command.c:167
+#: src/common/command.c:169
 msgid "upgrade WeeChat without disconnecting from servers"
 msgstr "aktualizovat WeeChat bez odpojenĂ­ od serveru"
 
-#: src/common/command.c:169
+#: src/common/command.c:171
 msgid ""
 "This command run again WeeChat binary, so it should have been compiled "
 "installed with a package manager before running this command."
@@ -2972,23 +2976,23 @@ msgstr ""
 "Tento příkaz znovu spustí binární soubor WeeChat, je třeba mít WeeChat "
 "předem zkompilovaný a nainstalovaný pomocí balíčkovacího systému."
 
-#: src/common/command.c:172
+#: src/common/command.c:174
 msgid "show WeeChat uptime"
 msgstr "zobrazit jak dlouho WeeChat běží"
 
-#: src/common/command.c:173
+#: src/common/command.c:175
 msgid "[-o]"
 msgstr "[-o]"
 
-#: src/common/command.c:174
+#: src/common/command.c:176
 msgid "-o: send uptime on current channel as an IRC message"
 msgstr "-o: poslat čas běhu na aktuální kanál jako IRC zprávu"
 
-#: src/common/command.c:176
+#: src/common/command.c:178
 msgid "manage windows"
 msgstr "spravuje okna"
 
-#: src/common/command.c:177
+#: src/common/command.c:179
 msgid ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
@@ -2996,7 +3000,7 @@ msgstr ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
 
-#: src/common/command.c:179
+#: src/common/command.c:181
 #, c-format
 msgid ""
 "  list: list opened windows (no parameter implies this list)\n"
@@ -3033,23 +3037,23 @@ msgstr ""
 "spočítána s aktuálním oknem jako velikost reference. Např. 25 znamená "
 "vytvořít nové okno s velikostí = aktuální_velikost / 4"
 
-#: src/common/command.c:376 src/common/command.c:730
+#: src/common/command.c:378 src/common/command.c:732
 #, c-format
 msgid "%s circular reference when calling alias \"/%s\"\n"
 msgstr ""
 
-#: src/common/command.c:710 src/common/command.c:846 src/common/command.c:917
+#: src/common/command.c:712 src/common/command.c:848 src/common/command.c:919
 #, c-format
 msgid "%s command \"%s\" failed\n"
 msgstr "%s příkaz \"%s\" selhal\n"
 
-#: src/common/command.c:812
+#: src/common/command.c:814
 #, c-format
 msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 "%s špatný počet argumentů pro %s příkaz \"%s\" (očekáváno: %d argumentů%s)\n"
 
-#: src/common/command.c:824
+#: src/common/command.c:826
 #, c-format
 msgid ""
 "%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
@@ -3058,13 +3062,13 @@ msgstr ""
 "%s špatyný počet argumentů pro %s příkaz \"%s\" (očekáváno: mezi %d a %d "
 "argumenty%s)\n"
 
-#: src/common/command.c:873
+#: src/common/command.c:875
 #, c-format
 msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 "%s chybný počet argumentů pro IRC příkaz \"%s\" (očekáváno: %d argumentů%s)\n"
 
-#: src/common/command.c:885
+#: src/common/command.c:887
 #, c-format
 msgid ""
 "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
@@ -3073,324 +3077,324 @@ msgstr ""
 "%s špatný počet argumentů pro IRC příkaz \"%s\" (očekáváno: mezi %d a %d "
 "argumenty%s)\n"
 
-#: src/common/command.c:900
+#: src/common/command.c:902
 #, c-format
 msgid "%s command \"%s\" needs a server connection!\n"
 msgstr "%s příkaz \"%s\" potřebuje připojení na server!\n"
 
-#: src/common/command.c:930
+#: src/common/command.c:932
 #, c-format
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr "%s neznámý příkaz \"%s\" (zadejte /help pro nápovědu)\n"
 
-#: src/common/command.c:1075
+#: src/common/command.c:1077
 msgid "This window is not a channel!\n"
 msgstr "Tohe není okno kanálu!\n"
 
-#: src/common/command.c:1108 src/common/command.c:1145
-#: src/common/command.c:1280
+#: src/common/command.c:1110 src/common/command.c:1147
+#: src/common/command.c:1282
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr "%s chybí argumenty pro příkaz \"%s\"\n"
 
-#: src/common/command.c:1117
+#: src/common/command.c:1119
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr "Alias \"%s\" => \"%s\" vytvořen\n"
 
-#: src/common/command.c:1123
+#: src/common/command.c:1125
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr "Selhalo vytvoření aliasu \"%s\" => \"%s\" (nedostatek paměti)\n"
 
-#: src/common/command.c:1135 src/common/command.c:1156
+#: src/common/command.c:1137 src/common/command.c:1158
 msgid "List of aliases:\n"
 msgstr "Seznam pro aliasy:\n"
 
-#: src/common/command.c:1170
+#: src/common/command.c:1172
 msgid "No alias defined.\n"
 msgstr "Žádné aliasy nejsou definovány.\n"
 
-#: src/common/command.c:1189
+#: src/common/command.c:1191
 #, c-format
 msgid "%sServer: %s%s\n"
 msgstr "%sServer: %s%s\n"
 
-#: src/common/command.c:1194
+#: src/common/command.c:1196
 #, c-format
 msgid "%snot connected\n"
 msgstr "%snepřipojen\n"
 
-#: src/common/command.c:1198
+#: src/common/command.c:1200
 #, c-format
 msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
 msgstr "%sKanál: %s%s %s(server: %s%s%s)\n"
 
-#: src/common/command.c:1207
+#: src/common/command.c:1209
 #, c-format
 msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
 msgstr "%sSoukromĂ˝ s: %s%s %s(server: %s%s%s)\n"
 
-#: src/common/command.c:1216 src/common/command.c:1228
+#: src/common/command.c:1218 src/common/command.c:1230
 #, c-format
 msgid "%sunknown\n"
 msgstr "%sneznámý\n"
 
-#: src/common/command.c:1224
+#: src/common/command.c:1226
 #, c-format
 msgid "%sraw IRC data\n"
 msgstr ""
 
-#: src/common/command.c:1259
+#: src/common/command.c:1261
 msgid "Opened buffers:\n"
 msgstr "Otevřené buffery:\n"
 
-#: src/common/command.c:1304
+#: src/common/command.c:1306
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr "%s nekorektnĂ­ ÄŤĂ­slo bufferu\n"
 
-#: src/common/command.c:1321
+#: src/common/command.c:1323
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr "%s nemohu zavřít jediný buffer\n"
 
-#: src/common/command.c:1332
+#: src/common/command.c:1334
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr "%s nemohu zavřít buffer serveru dokud jsou otevřeny kanály\n"
 
-#: src/common/command.c:1390
+#: src/common/command.c:1392
 msgid "Notify levels:  "
 msgstr "Level upozornění:  "
 
-#: src/common/command.c:1396
+#: src/common/command.c:1398
 msgid "Raw IRC data"
 msgstr ""
 
-#: src/common/command.c:1420 src/common/command.c:1470
+#: src/common/command.c:1422 src/common/command.c:1472
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr "%s nekorektní level upozornění (musí být mezi %d a %d)\n"
 
-#: src/common/command.c:1430
+#: src/common/command.c:1432
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr "%s nekorektní buffer pro upozornění (musí být kanál nebo soukromý)\n"
 
-#: src/common/command.c:1440
+#: src/common/command.c:1442
 #, c-format
 msgid "New notify level for %s%s%s: %s%d %s"
 msgstr "Nový level upozornění %s%s%s: %s%d %s"
 
-#: src/common/command.c:1450
+#: src/common/command.c:1452
 msgid "(hotlist: never)\n"
 msgstr "(hotlist: nikdy)\n"
 
-#: src/common/command.c:1453
+#: src/common/command.c:1455
 msgid "(hotlist: highlights)\n"
 msgstr "(hotlist: zvýraznění)\n"
 
-#: src/common/command.c:1456
+#: src/common/command.c:1458
 msgid "(hotlist: highlights + messages)\n"
 msgstr "(hotlist: zvýraznění + zprávy)\n"
 
-#: src/common/command.c:1459
+#: src/common/command.c:1461
 msgid "(hotlist: highlights + messages + join/part (all))\n"
 msgstr "(hotlist: zvýrazění + zprávy + připojení/odpojení (vše))\n"
 
-#: src/common/command.c:1590
+#: src/common/command.c:1592
 #, c-format
 msgid "Charsets for server %s%s%s: "
 msgstr "Znaková sada pro server %s%s%s: "
 
-#: src/common/command.c:1598
+#: src/common/command.c:1600
 #, c-format
 msgid "Charsets for channel %s%s%s: "
 msgstr "Znaková sada pro kanál %s%s%s: "
 
-#: src/common/command.c:1606
+#: src/common/command.c:1608
 #, c-format
 msgid "Charsets for private %s%s%s: "
 msgstr "Znaková sada pro soukromé %s%s%s: "
 
-#: src/common/command.c:1634 src/common/command.c:1664
-#: src/common/command.c:1694
+#: src/common/command.c:1636 src/common/command.c:1666
+#: src/common/command.c:1696
 #, c-format
 msgid " (inherited: \"%s%s%s\")"
 msgstr " (zděděno: \"%s%s%s\")"
 
-#: src/common/command.c:1763 src/common/command.c:1791
-#: src/common/command.c:1933 src/common/command.c:2561
-#: src/common/command.c:3658 src/common/command.c:3701
+#: src/common/command.c:1765 src/common/command.c:1793
+#: src/common/command.c:1935 src/common/command.c:2563
+#: src/common/command.c:3660 src/common/command.c:3703
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s neznámá volba pro příkaz \"%s\"\n"
 
-#: src/common/command.c:1826
+#: src/common/command.c:1828
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s již vytvořený server \"%s\"!\n"
 
-#: src/common/command.c:1834
+#: src/common/command.c:1836
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr "%s zrovna připojuji k serveru \"%s\"!\n"
 
-#: src/common/command.c:1853 src/common/command.c:1982
+#: src/common/command.c:1855 src/common/command.c:1984
 #, c-format
 msgid "%s server not found\n"
 msgstr "%s server nenalezen\n"
 
-#: src/common/command.c:1966
+#: src/common/command.c:1968
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr "%s nepřipojen k serveru \"%s\"!\n"
 
-#: src/common/command.c:1974
+#: src/common/command.c:1976
 msgid "Auto-reconnection is cancelled\n"
 msgstr "Automatické znovupřipojené je zrušeno\n"
 
-#: src/common/command.c:2010 src/common/weechat.c:459
+#: src/common/command.c:2012 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "%s vnitřní příkazy:\n"
 
-#: src/common/command.c:2020 src/common/weechat.c:479
+#: src/common/command.c:2022 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr "IRC příkazy:\n"
 
-#: src/common/command.c:2034
+#: src/common/command.c:2036
 msgid "Plugin commands:\n"
 msgstr "Příkazy pluginu:\n"
 
-#: src/common/command.c:2150
+#: src/common/command.c:2152
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr "Není dostupná žádná nápověda, \"%s\" je neznámý příkaz\n"
 
-#: src/common/command.c:2219
+#: src/common/command.c:2221
 #, c-format
 msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n"
 msgstr "%sna %s%s%s/%s%s%s:%s ignoruji %s%s%s od %s%s\n"
 
-#: src/common/command.c:2257
+#: src/common/command.c:2259
 msgid "List of ignore:\n"
 msgstr "Seznam ignorování:\n"
 
-#: src/common/command.c:2274
+#: src/common/command.c:2276
 msgid "No ignore defined.\n"
 msgstr "Žádné ignorování není definováno.\n"
 
-#: src/common/command.c:2300
+#: src/common/command.c:2302
 msgid "New ignore:"
 msgstr "Nové ignorování:"
 
-#: src/common/command.c:2320
+#: src/common/command.c:2322
 #, c-format
 msgid "New key binding:  %s"
 msgstr "Nová klávesová zkratka:  %s"
 
-#: src/common/command.c:2359
+#: src/common/command.c:2361
 msgid "Key bindings:\n"
 msgstr "Klávesové zkratky:\n"
 
-#: src/common/command.c:2373
+#: src/common/command.c:2375
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr "Klávesa \"%s\" odpojena\n"
 
-#: src/common/command.c:2379
+#: src/common/command.c:2381
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s nemohu odpojit klávesu \"%s\"\n"
 
-#: src/common/command.c:2387 src/common/weechat.c:511
+#: src/common/command.c:2389 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Vnitřní klávesové funkce:\n"
 
-#: src/common/command.c:2407
+#: src/common/command.c:2409
 msgid "Default key bindings restored\n"
 msgstr "Výchozí klávesové zkratky obnoveny\n"
 
-#: src/common/command.c:2413
+#: src/common/command.c:2415
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 "%s \"-yes\" argument je požadován pro reset kaláves (bezpečnostní opatření)\n"
 
-#: src/common/command.c:2474
+#: src/common/command.c:2476
 msgid "Plugins loaded:\n"
 msgstr "Načtené pluginy:\n"
 
-#: src/common/command.c:2490
+#: src/common/command.c:2492
 msgid "     message handlers:\n"
 msgstr "     obsluhovače zpráv:\n"
 
-#: src/common/command.c:2499
+#: src/common/command.c:2501
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr "       IRC(%s)\n"
 
-#: src/common/command.c:2506
+#: src/common/command.c:2508
 msgid "       (no message handler)\n"
 msgstr "       (není obsluhovač zprávy)\n"
 
-#: src/common/command.c:2511
+#: src/common/command.c:2513
 msgid "     command handlers:\n"
 msgstr "     obsluhovače příkazu:\n"
 
-#: src/common/command.c:2532
+#: src/common/command.c:2534
 msgid "       (no command handler)\n"
 msgstr "       (není obsluhovač příkazu)\n"
 
-#: src/common/command.c:2538
+#: src/common/command.c:2540
 msgid "  (no plugin)\n"
 msgstr "  (nenĂ­ plugin)\n"
 
-#: src/common/command.c:2574
+#: src/common/command.c:2576
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
 msgstr ""
 "Příkaz \"plugin\" není dostupný, WeeChat byl přeložen bez podpory pluginů.\n"
 
-#: src/common/command.c:2602
+#: src/common/command.c:2604
 msgid "Configuration file saved\n"
 msgstr "KonfiguraÄŤnĂ­ soubor uloĹľen\n"
 
-#: src/common/command.c:2607
+#: src/common/command.c:2609
 #, c-format
 msgid "%s failed to save configuration file\n"
 msgstr "%s selhalo uloĹľenĂ­ konfiguraÄŤnĂ­ho souboru\n"
 
-#: src/common/command.c:2646
+#: src/common/command.c:2648
 msgid "No server.\n"
 msgstr "žádný server.\n"
 
-#: src/common/command.c:2657
+#: src/common/command.c:2659
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "Server '%s' nenalezen.\n"
 
-#: src/common/command.c:2669
+#: src/common/command.c:2671
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr "%s chybí jméno serveru pro příkaz \"%s\"\n"
 
-#: src/common/command.c:2677
+#: src/common/command.c:2679
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr "%s příliž mnoho argumentů pro příkaz \"%s\", ignoruji argumety\n"
 
-#: src/common/command.c:2687
+#: src/common/command.c:2689
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr "%s server \"%s\" nenalezen pro příkaz \"%s\"\n"
 
-#: src/common/command.c:2695
+#: src/common/command.c:2697
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -3399,173 +3403,173 @@ msgstr ""
 "%s nemůžete odebrat server \"%s\", protože jste k němu připojent. Skuste "
 "nejprve /dissconnect %s.\n"
 
-#: src/common/command.c:2715
+#: src/common/command.c:2717
 #, c-format
 msgid "Server %s%s%s has been deleted\n"
 msgstr "Server %s%s%s byl odebrán\n"
 
-#: src/common/command.c:2734
+#: src/common/command.c:2736
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s chybí parametry pro příkaz \"%s\"\n"
 
-#: src/common/command.c:2744
+#: src/common/command.c:2746
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr "%s server \"%s\" již existuje, nemohu jej vytvořít!\n"
 
-#: src/common/command.c:2773 src/common/command.c:2801
-#: src/common/command.c:2814 src/common/command.c:2840
+#: src/common/command.c:2775 src/common/command.c:2803
+#: src/common/command.c:2816 src/common/command.c:2842
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr "%s chybĂ­ heslo pro parametr \"%s\"\n"
 
-#: src/common/command.c:2786
+#: src/common/command.c:2788
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr "%s chybí přezdívka/přezdívky pro parametr \"%s\"\n"
 
-#: src/common/command.c:2827
+#: src/common/command.c:2829
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s chybí příkaz pro parametr \"%s\"\n"
 
-#: src/common/command.c:2864
+#: src/common/command.c:2866
 #, c-format
 msgid "Server %s%s%s created\n"
 msgstr "Server %s%s%s vytvořen\n"
 
-#: src/common/command.c:2873
+#: src/common/command.c:2875
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s nemohu vytvořit server\n"
 
-#: src/common/command.c:2933
+#: src/common/command.c:2935
 msgid "(unknown)"
 msgstr "(neznámý)"
 
-#: src/common/command.c:2956
+#: src/common/command.c:2958
 #, c-format
 msgid "%s(password hidden) "
 msgstr "%s(heslo schováno) "
 
-#: src/common/command.c:3054
+#: src/common/command.c:3056
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s server \"%s\" nenalezen\n"
 
-#: src/common/command.c:3087 src/common/command.c:3135
+#: src/common/command.c:3089 src/common/command.c:3137
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s volba nastavenĂ­ \"%s\" nenalezena\n"
 
-#: src/common/command.c:3092 src/common/command.c:3127
+#: src/common/command.c:3094 src/common/command.c:3129
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s nekorektnĂ­ hodnota pro volbu \"%s\"\n"
 
-#: src/common/command.c:3108
+#: src/common/command.c:3110
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr "%s volba \"%s\" nemůže být změněna dokud WeeChat běží\n"
 
-#: src/common/command.c:3218
+#: src/common/command.c:3220
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr "Nebyla nalezena žádná volba nastavení s \"%s\"\n"
 
-#: src/common/command.c:3221
+#: src/common/command.c:3223
 msgid "No config option found\n"
 msgstr "Nebyla nalezena žádná volba nastavení\n"
 
-#: src/common/command.c:3228
+#: src/common/command.c:3230
 #, c-format
 msgid "%sDetail:\n"
 msgstr "%sDetail:\n"
 
-#: src/common/command.c:3233
+#: src/common/command.c:3235
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr "  . typ boolean (hodnota: 'on' nebo 'off')\n"
 
-#: src/common/command.c:3234 src/common/command.c:3257
-#: src/common/command.c:3263 src/common/command.c:3269
+#: src/common/command.c:3236 src/common/command.c:3259
+#: src/common/command.c:3265 src/common/command.c:3271
 #: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
 #: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . výchozí hodnota: '%s'\n"
 
-#: src/common/command.c:3239
+#: src/common/command.c:3241
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . typ celoÄŤĂ­selnĂ˝ (hodnoty: mezi %d a %d)\n"
 
-#: src/common/command.c:3242 src/common/weechat.c:404
+#: src/common/command.c:3244 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . výchozí hodnota: %d\n"
 
-#: src/common/command.c:3246
+#: src/common/command.c:3248
 msgid "  . type string (values: "
 msgstr "  . typ řetězec (hodnoty: "
 
-#: src/common/command.c:3259 src/common/command.c:3265
-#: src/common/command.c:3271 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/command.c:3261 src/common/command.c:3267
+#: src/common/command.c:3273 src/common/weechat.c:422 src/common/weechat.c:429
 #: src/common/weechat.c:436
 msgid "empty"
 msgstr "prázdný"
 
-#: src/common/command.c:3262
+#: src/common/command.c:3264
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr "  . typ barva (Curses nebo Gtk barva, viz WeeChat dokumentace)\n"
 
-#: src/common/command.c:3268
+#: src/common/command.c:3270
 msgid "  . type string (any string)\n"
 msgstr "  . typ řetězec (jakýkoliv řetězec)\n"
 
-#: src/common/command.c:3274 src/common/weechat.c:439
+#: src/common/command.c:3276 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . popis: %s\n"
 
-#: src/common/command.c:3285
+#: src/common/command.c:3287
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr "volba/volby nastavenĂ­ nalezeny s \"%s\"\n"
 
-#: src/common/command.c:3288
+#: src/common/command.c:3290
 msgid "config option(s) found\n"
 msgstr "volba/volby nastavenĂ­ nalezeny\n"
 
-#: src/common/command.c:3314
+#: src/common/command.c:3316
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s alias nebo příkaz \"%s\" nenalezen\n"
 
-#: src/common/command.c:3324
+#: src/common/command.c:3326
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "Alias \"%s\" odebrán\n"
 
-#: src/common/command.c:3384
+#: src/common/command.c:3386
 msgid "ignore were removed.\n"
 msgstr "ignorování bylo odebráno.\n"
 
-#: src/common/command.c:3386
+#: src/common/command.c:3388
 msgid "ignore was removed.\n"
 msgstr "ignorování bylo odebrán\n"
 
-#: src/common/command.c:3391
+#: src/common/command.c:3393
 #, c-format
 msgid "%s no ignore found\n"
 msgstr "%s žádné ignorování nenaleyeno\n"
 
-#: src/common/command.c:3425
+#: src/common/command.c:3427
 #, c-format
 msgid "%s can't upgrade: connection to at least one server is pending\n"
 msgstr "%s nemůžu aktualizovat: existují nevyřešená spojení na server\n"
 
-#: src/common/command.c:3435
+#: src/common/command.c:3437
 #, c-format
 msgid ""
 "%s can't upgrade: connection to at least one SSL server is active (should be "
@@ -3574,35 +3578,35 @@ msgstr ""
 "%s nemohu aktualiyovat: je aktuvní jedno nebo více připojení na SSL server "
 "(mělo by být opraveno v budoucnosti)\n"
 
-#: src/common/command.c:3451
+#: src/common/command.c:3453
 msgid "Upgrading WeeChat...\n"
 msgstr "Aktualizuji WeeChat...\n"
 
-#: src/common/command.c:3458
+#: src/common/command.c:3460
 #, c-format
 msgid "%s unable to save session in file\n"
 msgstr "%s nemohu uloĹľit sezenĂ­ do souboru\n"
 
-#: src/common/command.c:3484
+#: src/common/command.c:3486
 #, c-format
 msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n"
 msgstr "%s exec selhal (program: \"%s\"), ukonÄŤuji WeeChat\n"
 
-#: src/common/command.c:3524
+#: src/common/command.c:3526
 #, c-format
 msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s"
 msgstr "Čas běhu WeeChat: %d %s %02d:%02d:%02d, spuštěn %s"
 
-#: src/common/command.c:3538
+#: src/common/command.c:3540
 #, c-format
 msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s"
 msgstr "Čas běhu WeeChat: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, spuštěn %s%s"
 
-#: src/common/command.c:3582
+#: src/common/command.c:3584
 msgid "Opened windows:\n"
 msgstr "Otevřené okna:\n"
 
-#: src/common/command.c:3669
+#: src/common/command.c:3671
 #, c-format
 msgid ""
 "%s can not merge windows, there's no other window with same size near "
diff --git a/weechat/po/es.po b/weechat/po/es.po
index 150d2cee6..2bc06b879 100644
--- a/weechat/po/es.po
+++ b/weechat/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.9-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-03-21 12:04+0100\n"
+"POT-Creation-Date: 2006-03-21 15:11+0100\n"
 "PO-Revision-Date: 2006-03-18 11:45+0100\n"
 "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1428,7 +1428,7 @@ msgstr "desconocido"
 msgid "%s: using local hostname \"%s\"\n"
 msgstr "%s: utilización del nombre de máquina local \"%s\"\n"
 
-#: src/irc/irc-send.c:215 src/common/command.c:1028
+#: src/irc/irc-send.c:215 src/common/command.c:1030
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr "%s no ha sido posible encontrar el usuario al que enviar el mensaje\n"
@@ -1451,8 +1451,8 @@ msgstr "%s el comando \"%s\" no puede ejecutarse en una ventana de servidor\n"
 
 #: src/irc/irc-send.c:628 src/irc/irc-send.c:640 src/irc/irc-send.c:658
 #: src/irc/irc-send.c:1365 src/irc/irc-send.c:1503 src/irc/irc-send.c:2098
-#: src/common/command.c:1914 src/common/command.c:2427
-#: src/common/command.c:2568
+#: src/common/command.c:1916 src/common/command.c:2429
+#: src/common/command.c:2570
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s número de argumentos incorrecto para el comando \"%s\"\n"
@@ -1809,11 +1809,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s estaba %s\n"
 msgid "%s[%s%s%s]%s idle: "
 msgstr "%s[%s%s%s]%s inactividad: "
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "days"
 msgstr "días"
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "day"
 msgstr "día"
 
@@ -2342,7 +2342,7 @@ msgstr ""
 msgid "Day changed to %s\n"
 msgstr "Día cambiado a %s\n"
 
-#: src/gui/curses/gui-input.c:439
+#: src/gui/curses/gui-input.c:456
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s el lag (retraso) es alto, desconectando del servidor...\n"
@@ -2620,7 +2620,7 @@ msgstr "recargar la pantalla"
 msgid "grab a key"
 msgstr "capturar una clave"
 
-#: src/gui/gui-keyboard.c:444 src/common/command.c:2442
+#: src/gui/gui-keyboard.c:444 src/common/command.c:2444
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr "%s No ha sido posible atar la clave \"%s\"\n"
@@ -2939,36 +2939,40 @@ msgid "[option [ = value]]"
 msgstr "[opción [ = valor]]"
 
 #: src/common/command.c:148
+#, fuzzy
 msgid ""
 "option: name of an option (if name is full and no value is given, then help "
 "is displayed on option)\n"
-"value: value for option"
+"value: value for option\n"
+"\n"
+"Option may be: servername.server_xxx where \"servername\" is an internal "
+"server name and \"xxx\" an option for this server."
 msgstr ""
 "opción: nombre de una opción (si el nombre está completo y no se da ningún "
 "valor, entonces se muestra la ayuda de la opción)\n"
 "valor: valor para una opción"
 
-#: src/common/command.c:152
+#: src/common/command.c:154
 msgid "remove an alias"
 msgstr "eliminar un alias"
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name"
 msgstr "alias"
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name: name of alias to remove"
 msgstr "alias: nombre del alias a suprimir"
 
-#: src/common/command.c:155
+#: src/common/command.c:157
 msgid "unignore IRC messages and/or hosts"
 msgstr "no ignorar mensajes IRC y/o hosts"
 
-#: src/common/command.c:156
+#: src/common/command.c:158
 msgid "[number | [mask [[type | command] [channel [server]]]]]"
 msgstr "[número | [máscara [[tipo | comando] [canal [servidor]]]]]"
 
-#: src/common/command.c:157
+#: src/common/command.c:159
 msgid ""
 " number: # of ignore to unignore (number is displayed by list of ignore)\n"
 "   mask: nick or host mask to unignore\n"
@@ -2991,33 +2995,33 @@ msgstr ""
 "Para cada argumento, '*' significa todo.\n"
 "Sin argumentos, el comando /unignore lista todos los ignores definidos."
 
-#: src/common/command.c:167
+#: src/common/command.c:169
 msgid "upgrade WeeChat without disconnecting from servers"
 msgstr "actualizar Weechat sin desconectarse de los servidores"
 
-#: src/common/command.c:169
+#: src/common/command.c:171
 msgid ""
 "This command run again WeeChat binary, so it should have been compiled "
 "installed with a package manager before running this command."
 msgstr ""
 
-#: src/common/command.c:172
+#: src/common/command.c:174
 msgid "show WeeChat uptime"
 msgstr "muestra el tiempo de uso de WeeChat"
 
-#: src/common/command.c:173
+#: src/common/command.c:175
 msgid "[-o]"
 msgstr "[-o]"
 
-#: src/common/command.c:174
+#: src/common/command.c:176
 msgid "-o: send uptime on current channel as an IRC message"
 msgstr "-o: envía el tiempo de uso en el canal actual como un mensaje IRC"
 
-#: src/common/command.c:176
+#: src/common/command.c:178
 msgid "manage windows"
 msgstr "gestión de ventanas"
 
-#: src/common/command.c:177
+#: src/common/command.c:179
 msgid ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
@@ -3025,7 +3029,7 @@ msgstr ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
 
-#: src/common/command.c:179
+#: src/common/command.c:181
 #, c-format
 msgid ""
 "  list: list opened windows (no parameter implies this list)\n"
@@ -3063,24 +3067,24 @@ msgstr ""
 "nueva ventana, tomando como referencia el tamańo de la ventana actual. Por "
 "ejemplo 25 significa crear una nueva ventana con tamańo = tamańo_actual / 4"
 
-#: src/common/command.c:376 src/common/command.c:730
+#: src/common/command.c:378 src/common/command.c:732
 #, c-format
 msgid "%s circular reference when calling alias \"/%s\"\n"
 msgstr ""
 
-#: src/common/command.c:710 src/common/command.c:846 src/common/command.c:917
+#: src/common/command.c:712 src/common/command.c:848 src/common/command.c:919
 #, c-format
 msgid "%s command \"%s\" failed\n"
 msgstr "%s el comando \"%s\" ha fallado\n"
 
-#: src/common/command.c:812
+#: src/common/command.c:814
 #, c-format
 msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 "%s número de argumentos incorrecto para el comando %s \"%s\" (esperado: %d "
 "parámetro%s)\n"
 
-#: src/common/command.c:824
+#: src/common/command.c:826
 #, c-format
 msgid ""
 "%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
@@ -3089,14 +3093,14 @@ msgstr ""
 "%s número de argumentos incorrecto para el comando %s \"%s\" (esperado: "
 "entre %d y %d parámetro%s)\n"
 
-#: src/common/command.c:873
+#: src/common/command.c:875
 #, c-format
 msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 "%s número de argumentos incorrecto para el comando IRC \"%s\" (esperado: %d "
 "parámetro%s)\n"
 
-#: src/common/command.c:885
+#: src/common/command.c:887
 #, c-format
 msgid ""
 "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
@@ -3105,288 +3109,288 @@ msgstr ""
 "%s número de argumentos incorrecto para el comando IRC \"%s\" (esperado: "
 "entre %d y %d parámetro%s)\n"
 
-#: src/common/command.c:900
+#: src/common/command.c:902
 #, c-format
 msgid "%s command \"%s\" needs a server connection!\n"
 msgstr "%s ˇel comando \"%s\" requiere una conexión a servidor!\n"
 
-#: src/common/command.c:930
+#: src/common/command.c:932
 #, c-format
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr "%s comando \"%s\" desconocido (escriba /help para la ayuda)\n"
 
-#: src/common/command.c:1075
+#: src/common/command.c:1077
 msgid "This window is not a channel!\n"
 msgstr "ˇEsta ventana no es un canal!\n"
 
-#: src/common/command.c:1108 src/common/command.c:1145
-#: src/common/command.c:1280
+#: src/common/command.c:1110 src/common/command.c:1147
+#: src/common/command.c:1282
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr "%s faltan argumentos para el comando \"%s\"\n"
 
-#: src/common/command.c:1117
+#: src/common/command.c:1119
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr "Alias \"%s\" => \"%s\" creado\n"
 
-#: src/common/command.c:1123
+#: src/common/command.c:1125
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr ""
 "No ha sido posible crear el alias \"%s\" => \"%s\" (no hay suficiente "
 "memoria)\n"
 
-#: src/common/command.c:1135 src/common/command.c:1156
+#: src/common/command.c:1137 src/common/command.c:1158
 msgid "List of aliases:\n"
 msgstr "Lista de alias:\n"
 
-#: src/common/command.c:1170
+#: src/common/command.c:1172
 msgid "No alias defined.\n"
 msgstr "Ningún alias definido.\n"
 
-#: src/common/command.c:1189
+#: src/common/command.c:1191
 #, c-format
 msgid "%sServer: %s%s\n"
 msgstr "%sServidor: %s%s\n"
 
-#: src/common/command.c:1194
+#: src/common/command.c:1196
 #, c-format
 msgid "%snot connected\n"
 msgstr "%sno conectado\n"
 
-#: src/common/command.c:1198
+#: src/common/command.c:1200
 #, c-format
 msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
 msgstr "%s Canal: %s%s %s(servidor: %s%s%s)\n"
 
-#: src/common/command.c:1207
+#: src/common/command.c:1209
 #, c-format
 msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
 msgstr "%sPrivado con: %s%s %s(servidor: %s%s%s)\n"
 
-#: src/common/command.c:1216 src/common/command.c:1228
+#: src/common/command.c:1218 src/common/command.c:1230
 #, c-format
 msgid "%sunknown\n"
 msgstr "%sdesconocido\n"
 
-#: src/common/command.c:1224
+#: src/common/command.c:1226
 #, c-format
 msgid "%sraw IRC data\n"
 msgstr ""
 
-#: src/common/command.c:1259
+#: src/common/command.c:1261
 msgid "Opened buffers:\n"
 msgstr "Búfers abiertos:\n"
 
-#: src/common/command.c:1304
+#: src/common/command.c:1306
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr "%s número de búfer incorrecto\n"
 
-#: src/common/command.c:1321
+#: src/common/command.c:1323
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr "%s no es posible cerrar el único búfer\n"
 
-#: src/common/command.c:1332
+#: src/common/command.c:1334
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr ""
 "%s no se puede cerrar el búfer de servidor mientras haya canales abiertos\n"
 
-#: src/common/command.c:1390
+#: src/common/command.c:1392
 msgid "Notify levels:  "
 msgstr "Niveles de notificación:  "
 
-#: src/common/command.c:1396
+#: src/common/command.c:1398
 msgid "Raw IRC data"
 msgstr ""
 
-#: src/common/command.c:1420 src/common/command.c:1470
+#: src/common/command.c:1422 src/common/command.c:1472
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr "%s nivel de notificación incorrecto (debe estar entre %d y %d)\n"
 
-#: src/common/command.c:1430
+#: src/common/command.c:1432
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr "%s búfer incorrecto para notificar (debe ser canal o privado)\n"
 
-#: src/common/command.c:1440
+#: src/common/command.c:1442
 #, c-format
 msgid "New notify level for %s%s%s: %s%d %s"
 msgstr "Nuevo nivel de notificación para %s%s%s: %s%d %s"
 
-#: src/common/command.c:1450
+#: src/common/command.c:1452
 msgid "(hotlist: never)\n"
 msgstr "(hotlist: nunca)\n"
 
-#: src/common/command.c:1453
+#: src/common/command.c:1455
 msgid "(hotlist: highlights)\n"
 msgstr "(hotlist: resaltados)\n"
 
-#: src/common/command.c:1456
+#: src/common/command.c:1458
 msgid "(hotlist: highlights + messages)\n"
 msgstr "(hotlist: resaltados + mensajes)\n"
 
-#: src/common/command.c:1459
+#: src/common/command.c:1461
 msgid "(hotlist: highlights + messages + join/part (all))\n"
 msgstr "(hotlist: resaltados + mensajes + join/part (todos))\n"
 
-#: src/common/command.c:1590
+#: src/common/command.c:1592
 #, c-format
 msgid "Charsets for server %s%s%s: "
 msgstr "Juegos de caracteres para el servidor %s%s%s: "
 
-#: src/common/command.c:1598
+#: src/common/command.c:1600
 #, c-format
 msgid "Charsets for channel %s%s%s: "
 msgstr "Juegos de caracteres para el canal %s%s%s: "
 
-#: src/common/command.c:1606
+#: src/common/command.c:1608
 #, c-format
 msgid "Charsets for private %s%s%s: "
 msgstr "Juegos de caracteres para el privado %s%s%s: "
 
-#: src/common/command.c:1634 src/common/command.c:1664
-#: src/common/command.c:1694
+#: src/common/command.c:1636 src/common/command.c:1666
+#: src/common/command.c:1696
 #, c-format
 msgid " (inherited: \"%s%s%s\")"
 msgstr " (heredado: \"%s%s%s\")"
 
-#: src/common/command.c:1763 src/common/command.c:1791
-#: src/common/command.c:1933 src/common/command.c:2561
-#: src/common/command.c:3658 src/common/command.c:3701
+#: src/common/command.c:1765 src/common/command.c:1793
+#: src/common/command.c:1935 src/common/command.c:2563
+#: src/common/command.c:3660 src/common/command.c:3703
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s opción desconocida para el comando \"%s\"\n"
 
-#: src/common/command.c:1826
+#: src/common/command.c:1828
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s ˇya conectado al servidor \"%s\"!\n"
 
-#: src/common/command.c:1834
+#: src/common/command.c:1836
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr "%s ˇactualmente conectando al servidor \"%s\"!\n"
 
-#: src/common/command.c:1853 src/common/command.c:1982
+#: src/common/command.c:1855 src/common/command.c:1984
 #, c-format
 msgid "%s server not found\n"
 msgstr "%s servidor no encontrado\n"
 
-#: src/common/command.c:1966
+#: src/common/command.c:1968
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr "%s ˇno conectado al servidor \"%s\"!\n"
 
-#: src/common/command.c:1974
+#: src/common/command.c:1976
 msgid "Auto-reconnection is cancelled\n"
 msgstr "La reconexión automática está anulada\n"
 
-#: src/common/command.c:2010 src/common/weechat.c:459
+#: src/common/command.c:2012 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "Comandos internos %s :\n"
 
-#: src/common/command.c:2020 src/common/weechat.c:479
+#: src/common/command.c:2022 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr "Comandos IRC :\n"
 
-#: src/common/command.c:2034
+#: src/common/command.c:2036
 msgid "Plugin commands:\n"
 msgstr "Comandos de plugin:\n"
 
-#: src/common/command.c:2150
+#: src/common/command.c:2152
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr "No hay ayuda disponible, el comando \"%s\" es desconocido\n"
 
-#: src/common/command.c:2219
+#: src/common/command.c:2221
 #, c-format
 msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n"
 msgstr "%sen %s%s%s/%s%s%s:%s ignorando %s%s%s de %s%s\n"
 
-#: src/common/command.c:2257
+#: src/common/command.c:2259
 msgid "List of ignore:\n"
 msgstr "Lista de ignores:\n"
 
-#: src/common/command.c:2274
+#: src/common/command.c:2276
 msgid "No ignore defined.\n"
 msgstr "Sin ignores definidos.\n"
 
-#: src/common/command.c:2300
+#: src/common/command.c:2302
 msgid "New ignore:"
 msgstr "Nuevo ignore:"
 
-#: src/common/command.c:2320
+#: src/common/command.c:2322
 #, c-format
 msgid "New key binding:  %s"
 msgstr "Nueva anclaje de clave:  %s"
 
-#: src/common/command.c:2359
+#: src/common/command.c:2361
 msgid "Key bindings:\n"
 msgstr "Anclajes de clave:\n"
 
-#: src/common/command.c:2373
+#: src/common/command.c:2375
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr "Clave \"%s\" desatada\n"
 
-#: src/common/command.c:2379
+#: src/common/command.c:2381
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s No ha sido posible desatar la clave \"%s\"\n"
 
-#: src/common/command.c:2387 src/common/weechat.c:511
+#: src/common/command.c:2389 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Funciones de clave internas:\n"
 
-#: src/common/command.c:2407
+#: src/common/command.c:2409
 msgid "Default key bindings restored\n"
 msgstr "Anclajes de clave por defecto restaurados\n"
 
-#: src/common/command.c:2413
+#: src/common/command.c:2415
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 "%s \"-yes\" se requiere argumento para resetear las claves (por razones de "
 "seguridad)\n"
 
-#: src/common/command.c:2474
+#: src/common/command.c:2476
 msgid "Plugins loaded:\n"
 msgstr "Plugins cargados:\n"
 
-#: src/common/command.c:2490
+#: src/common/command.c:2492
 msgid "     message handlers:\n"
 msgstr "     manejadores de mensaje:\n"
 
-#: src/common/command.c:2499
+#: src/common/command.c:2501
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr "        IRC(%s)\n"
 
-#: src/common/command.c:2506
+#: src/common/command.c:2508
 msgid "       (no message handler)\n"
 msgstr "       (sin manejador de mensaje)\n"
 
-#: src/common/command.c:2511
+#: src/common/command.c:2513
 msgid "     command handlers:\n"
 msgstr "     manejadores de comando:\n"
 
-#: src/common/command.c:2532
+#: src/common/command.c:2534
 msgid "       (no command handler)\n"
 msgstr "       (sin manejador de comando)\n"
 
-#: src/common/command.c:2538
+#: src/common/command.c:2540
 msgid "  (no plugin)\n"
 msgstr "  (sin plugins)\n"
 
-#: src/common/command.c:2574
+#: src/common/command.c:2576
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
@@ -3394,41 +3398,41 @@ msgstr ""
 "El comando \"plugin\" no está disponible, Weechat fue compilado sin soporte "
 "para plugins.\n"
 
-#: src/common/command.c:2602
+#: src/common/command.c:2604
 msgid "Configuration file saved\n"
 msgstr ""
 
-#: src/common/command.c:2607
+#: src/common/command.c:2609
 #, c-format
 msgid "%s failed to save configuration file\n"
 msgstr ""
 
-#: src/common/command.c:2646
+#: src/common/command.c:2648
 msgid "No server.\n"
 msgstr "Ningún servidor.\n"
 
-#: src/common/command.c:2657
+#: src/common/command.c:2659
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "Servidor '%s' no encontrado.\n"
 
-#: src/common/command.c:2669
+#: src/common/command.c:2671
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr "%s falta el nombre de servidor para el comando \"%s\"\n"
 
-#: src/common/command.c:2677
+#: src/common/command.c:2679
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr ""
 "%s demasiados argumentos para el comando \"%s\", ignorando parámetros\n"
 
-#: src/common/command.c:2687
+#: src/common/command.c:2689
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr "%s servidor \"%s\" no encontrado para el comando \"%s\"\n"
 
-#: src/common/command.c:2695
+#: src/common/command.c:2697
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -3437,175 +3441,175 @@ msgstr ""
 "%s usted no puede eliminar el servidor \"%s\" ya que está usted conectado a "
 "él. Pruebe /disconnect %s antes.\n"
 
-#: src/common/command.c:2715
+#: src/common/command.c:2717
 #, c-format
 msgid "Server %s%s%s has been deleted\n"
 msgstr "El servidor %s%s%s ha sido borrado\n"
 
-#: src/common/command.c:2734
+#: src/common/command.c:2736
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s faltan parámetros para el comando \"%s\"\n"
 
-#: src/common/command.c:2744
+#: src/common/command.c:2746
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr "%s el servidor \"%s\" ya existe, ˇno se puede crear!\n"
 
-#: src/common/command.c:2773 src/common/command.c:2801
-#: src/common/command.c:2814 src/common/command.c:2840
+#: src/common/command.c:2775 src/common/command.c:2803
+#: src/common/command.c:2816 src/common/command.c:2842
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr "%s falta contraseńa para el comando \"%s\"\n"
 
-#: src/common/command.c:2786
+#: src/common/command.c:2788
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr "%s falta(n) usuario(s) para el parámetro \"%s\"\n"
 
-#: src/common/command.c:2827
+#: src/common/command.c:2829
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s falta comando para el parámetro \"%s\"\n"
 
-#: src/common/command.c:2864
+#: src/common/command.c:2866
 #, c-format
 msgid "Server %s%s%s created\n"
 msgstr "Servidor %s%s%s creado\n"
 
-#: src/common/command.c:2873
+#: src/common/command.c:2875
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s no es posible crear el servidor\n"
 
-#: src/common/command.c:2933
+#: src/common/command.c:2935
 msgid "(unknown)"
 msgstr "(desconocido)"
 
-#: src/common/command.c:2956
+#: src/common/command.c:2958
 #, c-format
 msgid "%s(password hidden) "
 msgstr "%s(contraseńa oculta) "
 
-#: src/common/command.c:3054
+#: src/common/command.c:3056
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s servidor \"%s\" no encontrado\n"
 
-#: src/common/command.c:3087 src/common/command.c:3135
+#: src/common/command.c:3089 src/common/command.c:3137
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s opción de configuración \"%s\" no encontrada\n"
 
-#: src/common/command.c:3092 src/common/command.c:3127
+#: src/common/command.c:3094 src/common/command.c:3129
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s valor incorrecto para la opción \"%s\"\n"
 
-#: src/common/command.c:3108
+#: src/common/command.c:3110
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr ""
 "%s la opción \"%s\" no puede ser modificada mientras WeeChat está en "
 "ejecución\n"
 
-#: src/common/command.c:3218
+#: src/common/command.c:3220
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr "Ninguna opción de configuración encontrada con \"%s\"\n"
 
-#: src/common/command.c:3221
+#: src/common/command.c:3223
 msgid "No config option found\n"
 msgstr "Ninguna opción de configuración encontrada\n"
 
-#: src/common/command.c:3228
+#: src/common/command.c:3230
 #, c-format
 msgid "%sDetail:\n"
 msgstr "%sDetalle:\n"
 
-#: src/common/command.c:3233
+#: src/common/command.c:3235
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr "  . tipo booleano (valores: 'on' u 'off')\n"
 
-#: src/common/command.c:3234 src/common/command.c:3257
-#: src/common/command.c:3263 src/common/command.c:3269
+#: src/common/command.c:3236 src/common/command.c:3259
+#: src/common/command.c:3265 src/common/command.c:3271
 #: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
 #: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . valor por defecto: '%s'\n"
 
-#: src/common/command.c:3239
+#: src/common/command.c:3241
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . tipo entero (valores: entre %d y %d)\n"
 
-#: src/common/command.c:3242 src/common/weechat.c:404
+#: src/common/command.c:3244 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . valor por defecto: %d\n"
 
-#: src/common/command.c:3246
+#: src/common/command.c:3248
 msgid "  . type string (values: "
 msgstr "  . tipo cadena (valores: "
 
-#: src/common/command.c:3259 src/common/command.c:3265
-#: src/common/command.c:3271 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/command.c:3261 src/common/command.c:3267
+#: src/common/command.c:3273 src/common/weechat.c:422 src/common/weechat.c:429
 #: src/common/weechat.c:436
 msgid "empty"
 msgstr "vacío"
 
-#: src/common/command.c:3262
+#: src/common/command.c:3264
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr "  . tipo color (color Curses o Gtk, ver la documentación de WeeChat)\n"
 
-#: src/common/command.c:3268
+#: src/common/command.c:3270
 msgid "  . type string (any string)\n"
 msgstr "  . tipo cadena (cualquier cadena)\n"
 
-#: src/common/command.c:3274 src/common/weechat.c:439
+#: src/common/command.c:3276 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . descripción: %s\n"
 
-#: src/common/command.c:3285
+#: src/common/command.c:3287
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr "opción/opciones de configuración encontrada(s) con \"%s\"\n"
 
-#: src/common/command.c:3288
+#: src/common/command.c:3290
 msgid "config option(s) found\n"
 msgstr "opción/opciones de configuración encontrada(s)\n"
 
-#: src/common/command.c:3314
+#: src/common/command.c:3316
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s alias o comando \"%s\" no encontrado\n"
 
-#: src/common/command.c:3324
+#: src/common/command.c:3326
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "Alias \"%s\" eliminado\n"
 
-#: src/common/command.c:3384
+#: src/common/command.c:3386
 msgid "ignore were removed.\n"
 msgstr "los ignores fueron eliminados.\n"
 
-#: src/common/command.c:3386
+#: src/common/command.c:3388
 msgid "ignore was removed.\n"
 msgstr "el ignore fue eliminado.\n"
 
-#: src/common/command.c:3391
+#: src/common/command.c:3393
 #, c-format
 msgid "%s no ignore found\n"
 msgstr "%s no se encontraron ignores\n"
 
-#: src/common/command.c:3425
+#: src/common/command.c:3427
 #, c-format
 msgid "%s can't upgrade: connection to at least one server is pending\n"
 msgstr "%s no se puede actualizar: conexión pendiente a un servidor al menos\n"
 
-#: src/common/command.c:3435
+#: src/common/command.c:3437
 #, c-format
 msgid ""
 "%s can't upgrade: connection to at least one SSL server is active (should be "
@@ -3614,37 +3618,37 @@ msgstr ""
 "%s no se puede actualizar: conexión activa a un servidor SSL por lo menos "
 "(debería ser corregido en una futura versión)\n"
 
-#: src/common/command.c:3451
+#: src/common/command.c:3453
 msgid "Upgrading WeeChat...\n"
 msgstr "Actualizando Weechat...\n"
 
-#: src/common/command.c:3458
+#: src/common/command.c:3460
 #, c-format
 msgid "%s unable to save session in file\n"
 msgstr "%s no ha sido posible guardar la sesión en el archivo\n"
 
-#: src/common/command.c:3484
+#: src/common/command.c:3486
 #, c-format
 msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n"
 msgstr "%s exec ha fallado (programa: \"%s\"), saliendo de Weechat\n"
 
-#: src/common/command.c:3524
+#: src/common/command.c:3526
 #, c-format
 msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s"
 msgstr "Tiempo de uso de WeeChat: %d %s %02d:%02d:%02d, empezó en %s"
 
-#: src/common/command.c:3538
+#: src/common/command.c:3540
 #, c-format
 msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s"
 msgstr ""
 "Tiempo de uso de WeeChat: %s%d %s%s %s%02d%s: %s%02d%s:%s%02d%s, empezó en %s"
 "%s"
 
-#: src/common/command.c:3582
+#: src/common/command.c:3584
 msgid "Opened windows:\n"
 msgstr "Ventanas abiertas:\n"
 
-#: src/common/command.c:3669
+#: src/common/command.c:3671
 #, c-format
 msgid ""
 "%s can not merge windows, there's no other window with same size near "
diff --git a/weechat/po/fr.po b/weechat/po/fr.po
index af36c1e1d..c150b7256 100644
--- a/weechat/po/fr.po
+++ b/weechat/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.9-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-03-21 12:04+0100\n"
-"PO-Revision-Date: 2006-03-21 12:04+0100\n"
+"POT-Creation-Date: 2006-03-21 15:11+0100\n"
+"PO-Revision-Date: 2006-03-21 15:12+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -1420,7 +1420,7 @@ msgstr "inconnu"
 msgid "%s: using local hostname \"%s\"\n"
 msgstr "%s: utilisation du nom de machine local \"%s\"\n"
 
-#: src/irc/irc-send.c:215 src/common/command.c:1028
+#: src/irc/irc-send.c:215 src/common/command.c:1030
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr "%s impossible de trouver le pseudo pour envoyer le message\n"
@@ -1444,8 +1444,8 @@ msgstr ""
 
 #: src/irc/irc-send.c:628 src/irc/irc-send.c:640 src/irc/irc-send.c:658
 #: src/irc/irc-send.c:1365 src/irc/irc-send.c:1503 src/irc/irc-send.c:2098
-#: src/common/command.c:1914 src/common/command.c:2427
-#: src/common/command.c:2568
+#: src/common/command.c:1916 src/common/command.c:2429
+#: src/common/command.c:2570
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s nombre de paramčtres erroné pour la commande \"%s\"\n"
@@ -1797,11 +1797,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s 
 msgid "%s[%s%s%s]%s idle: "
 msgstr "%s[%s%s%s]%s inactivité: "
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "days"
 msgstr "jours"
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "day"
 msgstr "jour"
 
@@ -2192,11 +2192,11 @@ msgstr ""
 "\" (existe déjŕ)\n"
 
 #: src/plugins/plugins.c:270
-#, fuzzy, c-format
+#, c-format
 msgid "%s plugin %s: unable to add handler for \"%s\" command (forbidden)\n"
 msgstr ""
 "%s extension %s: impossible d'ajouter la fonction pour la commande \"%s"
-"\" (existe déjŕ)\n"
+"\" (interdit)\n"
 
 #: src/plugins/plugins.c:310
 #, c-format
@@ -2331,7 +2331,7 @@ msgstr ""
 msgid "Day changed to %s\n"
 msgstr "Jour changé: %s\n"
 
-#: src/gui/curses/gui-input.c:439
+#: src/gui/curses/gui-input.c:456
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s le lag est élevé, déconnexion du serveur...\n"
@@ -2605,7 +2605,7 @@ msgstr "rafra
 msgid "grab a key"
 msgstr "capturer une touche"
 
-#: src/gui/gui-keyboard.c:444 src/common/command.c:2442
+#: src/gui/gui-keyboard.c:444 src/common/command.c:2444
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr "%s impossible de créer la touche \"%s\"\n"
@@ -2927,33 +2927,37 @@ msgstr "[option [ = valeur]]"
 msgid ""
 "option: name of an option (if name is full and no value is given, then help "
 "is displayed on option)\n"
-"value: value for option"
+"value: value for option\n"
+"\n"
+"Option may be: servername.server_xxx where \"servername\" is an internal "
+"server name and \"xxx\" an option for this server."
 msgstr ""
-"option: nom de l'option (si le nom est complet et qu'aucune valeur n'est "
-"donnée, alors l'aide sur l'option est affichée)\n"
-"valeur: valeur pour l'option"
+"option: nom de l'option (si le nom est complet et qu'aucune valeur n'est donnée, alors l'aide sur l'option est affichée)\n"
+"valeur: valeur pour l'option\n"
+"\n"
+"L'option peut ętre: nomserveur.server_xxx oů \"nomserveur\" est le nom interne d'un serveur et \"xxx\" une option pour ce serveur."
 
-#: src/common/command.c:152
+#: src/common/command.c:154
 msgid "remove an alias"
 msgstr "supprimer un alias"
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name"
 msgstr "nom_alias"
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name: name of alias to remove"
 msgstr "nom_alias: nom de l'alias ŕ supprimer"
 
-#: src/common/command.c:155
+#: src/common/command.c:157
 msgid "unignore IRC messages and/or hosts"
 msgstr "supprimer le ignore des messages IRC et/ou des masques"
 
-#: src/common/command.c:156
+#: src/common/command.c:158
 msgid "[number | [mask [[type | command] [channel [server]]]]]"
 msgstr "[nombre | [masque [[type | commande] [canal [serveur]]]]]"
 
-#: src/common/command.c:157
+#: src/common/command.c:159
 msgid ""
 " number: # of ignore to unignore (number is displayed by list of ignore)\n"
 "   mask: nick or host mask to unignore\n"
@@ -2976,11 +2980,11 @@ msgstr ""
 "Pour chaque paramčtre, '*' signifie tou(te)s.\n"
 "Sans paramčtre, /ignore liste les ignore définis."
 
-#: src/common/command.c:167
+#: src/common/command.c:169
 msgid "upgrade WeeChat without disconnecting from servers"
 msgstr "mettre ŕ jour WeeChat sans se déconnecter des serveurs"
 
-#: src/common/command.c:169
+#: src/common/command.c:171
 msgid ""
 "This command run again WeeChat binary, so it should have been compiled "
 "installed with a package manager before running this command."
@@ -2989,23 +2993,23 @@ msgstr ""
 "compilé ou installé via un gestionnaire de paquet avant de lancer cette "
 "commande."
 
-#: src/common/command.c:172
+#: src/common/command.c:174
 msgid "show WeeChat uptime"
 msgstr "montrer l'uptime de WeeChat"
 
-#: src/common/command.c:173
+#: src/common/command.c:175
 msgid "[-o]"
 msgstr "[-o]"
 
-#: src/common/command.c:174
+#: src/common/command.c:176
 msgid "-o: send uptime on current channel as an IRC message"
 msgstr "-o: envoyer l'uptime sur le canal courant en tant que message IRC"
 
-#: src/common/command.c:176
+#: src/common/command.c:178
 msgid "manage windows"
 msgstr "gestion des fenętres"
 
-#: src/common/command.c:177
+#: src/common/command.c:179
 msgid ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
@@ -3013,7 +3017,7 @@ msgstr ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[ptc] | resize pct | merge [all]]"
 
-#: src/common/command.c:179
+#: src/common/command.c:181
 #, c-format
 msgid ""
 "  list: list opened windows (no parameter implies this list)\n"
@@ -3052,24 +3056,24 @@ msgstr ""
 "Par exemple 25 signifie créer une fenętre qui a pour taille: "
 "taille_courante / 4"
 
-#: src/common/command.c:376 src/common/command.c:730
+#: src/common/command.c:378 src/common/command.c:732
 #, c-format
 msgid "%s circular reference when calling alias \"/%s\"\n"
 msgstr "%s référence circulaire lors de l'appel ŕ l'alias \"%s\"\n"
 
-#: src/common/command.c:710 src/common/command.c:846 src/common/command.c:917
+#: src/common/command.c:712 src/common/command.c:848 src/common/command.c:919
 #, c-format
 msgid "%s command \"%s\" failed\n"
 msgstr "%s la commande \"%s\" a échoué\n"
 
-#: src/common/command.c:812
+#: src/common/command.c:814
 #, c-format
 msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 "%s nombre de paramčtres incorrect pour la commande %s \"%s\" (attendu: %d "
 "paramčtre%s)\n"
 
-#: src/common/command.c:824
+#: src/common/command.c:826
 #, c-format
 msgid ""
 "%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
@@ -3078,14 +3082,14 @@ msgstr ""
 "%s nombre de paramčtres incorrect pour la commande %s \"%s\" (attendu: entre "
 "%d et %d paramčtre%s)\n"
 
-#: src/common/command.c:873
+#: src/common/command.c:875
 #, c-format
 msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 "%s nombre de paramčtres incorrect pour la commande IRC \"%s\" (attendu: %d "
 "paramčtre%s)\n"
 
-#: src/common/command.c:885
+#: src/common/command.c:887
 #, c-format
 msgid ""
 "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
@@ -3094,288 +3098,288 @@ msgstr ""
 "%s nombre de paramčtres incorrect pour la commande IRC \"%s\" (attendu: "
 "entre %d et %d paramčtre%s)\n"
 
-#: src/common/command.c:900
+#: src/common/command.c:902
 #, c-format
 msgid "%s command \"%s\" needs a server connection!\n"
 msgstr "%s la commande \"%s\" nécessite une connexion au serveur !\n"
 
-#: src/common/command.c:930
+#: src/common/command.c:932
 #, c-format
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr "%s commande \"%s\" inconnue (tapez /help pour l'aide)\n"
 
-#: src/common/command.c:1075
+#: src/common/command.c:1077
 msgid "This window is not a channel!\n"
 msgstr "Cette fenętre n'est pas un canal !\n"
 
-#: src/common/command.c:1108 src/common/command.c:1145
-#: src/common/command.c:1280
+#: src/common/command.c:1110 src/common/command.c:1147
+#: src/common/command.c:1282
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr "%s paramčtres manquants pour la commande \"%s\"\n"
 
-#: src/common/command.c:1117
+#: src/common/command.c:1119
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr "Alias \"%s\" => \"%s\" créé\n"
 
-#: src/common/command.c:1123
+#: src/common/command.c:1125
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr "Impossible de créer l'alias \"%s\" => \"%s\" (pas assez de mémoire)\n"
 
-#: src/common/command.c:1135 src/common/command.c:1156
+#: src/common/command.c:1137 src/common/command.c:1158
 msgid "List of aliases:\n"
 msgstr "Liste des alias:\n"
 
-#: src/common/command.c:1170
+#: src/common/command.c:1172
 msgid "No alias defined.\n"
 msgstr "Aucun alias défini.\n"
 
-#: src/common/command.c:1189
+#: src/common/command.c:1191
 #, c-format
 msgid "%sServer: %s%s\n"
 msgstr "%sServeur: %s%s\n"
 
-#: src/common/command.c:1194
+#: src/common/command.c:1196
 #, c-format
 msgid "%snot connected\n"
 msgstr "%snon connecté\n"
 
-#: src/common/command.c:1198
+#: src/common/command.c:1200
 #, c-format
 msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
 msgstr "%sCanal: %s%s %s(serveur: %s%s%s)\n"
 
-#: src/common/command.c:1207
+#: src/common/command.c:1209
 #, c-format
 msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
 msgstr "%sPrivé avec: %s%s %s(serveur: %s%s%s)\n"
 
-#: src/common/command.c:1216 src/common/command.c:1228
+#: src/common/command.c:1218 src/common/command.c:1230
 #, c-format
 msgid "%sunknown\n"
 msgstr "%sinconnu\n"
 
-#: src/common/command.c:1224
+#: src/common/command.c:1226
 #, c-format
 msgid "%sraw IRC data\n"
 msgstr "%sdonnées IRC brutes\n"
 
-#: src/common/command.c:1259
+#: src/common/command.c:1261
 msgid "Opened buffers:\n"
 msgstr "Tampons ouverts:\n"
 
-#: src/common/command.c:1304
+#: src/common/command.c:1306
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr "%s numéro de tampon incorrect\n"
 
-#: src/common/command.c:1321
+#: src/common/command.c:1323
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr "%s impossible de fermer le tampon unique\n"
 
-#: src/common/command.c:1332
+#: src/common/command.c:1334
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr ""
 "%s impossible de fermer le tampon du serveur tant que des canaux sont "
 "ouverts\n"
 
-#: src/common/command.c:1390
+#: src/common/command.c:1392
 msgid "Notify levels:  "
 msgstr "Niveaux de notification:  "
 
-#: src/common/command.c:1396
+#: src/common/command.c:1398
 msgid "Raw IRC data"
 msgstr "Données IRC brutes"
 
-#: src/common/command.c:1420 src/common/command.c:1470
+#: src/common/command.c:1422 src/common/command.c:1472
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr "%s niveau de notification incorrect (doit ętre entre %d et %d)\n"
 
-#: src/common/command.c:1430
+#: src/common/command.c:1432
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr ""
 "%s tampon incorrect pour la notification (doit ętre un canal ou un privé)\n"
 
-#: src/common/command.c:1440
+#: src/common/command.c:1442
 #, c-format
 msgid "New notify level for %s%s%s: %s%d %s"
 msgstr "Nouveau niveau de notification pour %s%s%s: %s%d %s"
 
-#: src/common/command.c:1450
+#: src/common/command.c:1452
 msgid "(hotlist: never)\n"
 msgstr "(hotlist: jamais)\n"
 
-#: src/common/command.c:1453
+#: src/common/command.c:1455
 msgid "(hotlist: highlights)\n"
 msgstr "(hotlist: highlights)\n"
 
-#: src/common/command.c:1456
+#: src/common/command.c:1458
 msgid "(hotlist: highlights + messages)\n"
 msgstr "(hotlist: highlights + messages)\n"
 
-#: src/common/command.c:1459
+#: src/common/command.c:1461
 msgid "(hotlist: highlights + messages + join/part (all))\n"
 msgstr "(hotlist: highlights + messages + join/part (tous))\n"
 
-#: src/common/command.c:1590
+#: src/common/command.c:1592
 #, c-format
 msgid "Charsets for server %s%s%s: "
 msgstr "Jeux de caractčres pour le serveur %s%s%s: "
 
-#: src/common/command.c:1598
+#: src/common/command.c:1600
 #, c-format
 msgid "Charsets for channel %s%s%s: "
 msgstr "Jeux de caractčres pour le canal %s%s%s: "
 
-#: src/common/command.c:1606
+#: src/common/command.c:1608
 #, c-format
 msgid "Charsets for private %s%s%s: "
 msgstr "Jeux de caractčres pour le privé %s%s%s: "
 
-#: src/common/command.c:1634 src/common/command.c:1664
-#: src/common/command.c:1694
+#: src/common/command.c:1636 src/common/command.c:1666
+#: src/common/command.c:1696
 #, c-format
 msgid " (inherited: \"%s%s%s\")"
 msgstr " (hérité: \"%s%s%s\")"
 
-#: src/common/command.c:1763 src/common/command.c:1791
-#: src/common/command.c:1933 src/common/command.c:2561
-#: src/common/command.c:3658 src/common/command.c:3701
+#: src/common/command.c:1765 src/common/command.c:1793
+#: src/common/command.c:1935 src/common/command.c:2563
+#: src/common/command.c:3660 src/common/command.c:3703
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s option inconnue pour la commande \"%s\"\n"
 
-#: src/common/command.c:1826
+#: src/common/command.c:1828
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s déjŕ connecté au serveur \"%s\" !\n"
 
-#: src/common/command.c:1834
+#: src/common/command.c:1836
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr "%s une connexion vers le serveur \"%s\" est en cours !\n"
 
-#: src/common/command.c:1853 src/common/command.c:1982
+#: src/common/command.c:1855 src/common/command.c:1984
 #, c-format
 msgid "%s server not found\n"
 msgstr "%s serveur non trouvé\n"
 
-#: src/common/command.c:1966
+#: src/common/command.c:1968
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr "%s non connecté au serveur \"%s\" !\n"
 
-#: src/common/command.c:1974
+#: src/common/command.c:1976
 msgid "Auto-reconnection is cancelled\n"
 msgstr "La reconnexion automatique est annulée\n"
 
-#: src/common/command.c:2010 src/common/weechat.c:459
+#: src/common/command.c:2012 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "Commandes internes %s :\n"
 
-#: src/common/command.c:2020 src/common/weechat.c:479
+#: src/common/command.c:2022 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr "Commandes IRC :\n"
 
-#: src/common/command.c:2034
+#: src/common/command.c:2036
 msgid "Plugin commands:\n"
 msgstr "Commandes d'extension :\n"
 
-#: src/common/command.c:2150
+#: src/common/command.c:2152
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr "Pas d'aide disponible, la commande \"%s\" est inconnue\n"
 
-#: src/common/command.c:2219
+#: src/common/command.c:2221
 #, c-format
 msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n"
 msgstr "%ssur %s%s%s/%s%s%s:%s ignore %s%s%s de %s%s\n"
 
-#: src/common/command.c:2257
+#: src/common/command.c:2259
 msgid "List of ignore:\n"
 msgstr "Liste des ignore:\n"
 
-#: src/common/command.c:2274
+#: src/common/command.c:2276
 msgid "No ignore defined.\n"
 msgstr "Aucun ignore défini.\n"
 
-#: src/common/command.c:2300
+#: src/common/command.c:2302
 msgid "New ignore:"
 msgstr "Nouveau ignore:"
 
-#: src/common/command.c:2320
+#: src/common/command.c:2322
 #, c-format
 msgid "New key binding:  %s"
 msgstr "Nouvelle touche:  %s"
 
-#: src/common/command.c:2359
+#: src/common/command.c:2361
 msgid "Key bindings:\n"
 msgstr "Associations de touches:\n"
 
-#: src/common/command.c:2373
+#: src/common/command.c:2375
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr "Touche \"%s\" supprimée\n"
 
-#: src/common/command.c:2379
+#: src/common/command.c:2381
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s impossible de supprimer la touche \"%s\"\n"
 
-#: src/common/command.c:2387 src/common/weechat.c:511
+#: src/common/command.c:2389 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Fonctions internes pour les touches:\n"
 
-#: src/common/command.c:2407
+#: src/common/command.c:2409
 msgid "Default key bindings restored\n"
 msgstr "Touches par défaut restaurées\n"
 
-#: src/common/command.c:2413
+#: src/common/command.c:2415
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 "%s le paramčtre \"-yes\" est requis pour la réinitialisation des touches "
 "(raison de sécurité)\n"
 
-#: src/common/command.c:2474
+#: src/common/command.c:2476
 msgid "Plugins loaded:\n"
 msgstr "Extensions chargées :\n"
 
-#: src/common/command.c:2490
+#: src/common/command.c:2492
 msgid "     message handlers:\n"
 msgstr "     fonctions de message :\n"
 
-#: src/common/command.c:2499
+#: src/common/command.c:2501
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr "       IRC(%s)\n"
 
-#: src/common/command.c:2506
+#: src/common/command.c:2508
 msgid "       (no message handler)\n"
 msgstr "       (aucune fonction de message)\n"
 
-#: src/common/command.c:2511
+#: src/common/command.c:2513
 msgid "     command handlers:\n"
 msgstr "     commandes :\n"
 
-#: src/common/command.c:2532
+#: src/common/command.c:2534
 msgid "       (no command handler)\n"
 msgstr "       (aucune commande)\n"
 
-#: src/common/command.c:2538
+#: src/common/command.c:2540
 msgid "  (no plugin)\n"
 msgstr "  (aucune extension)\n"
 
-#: src/common/command.c:2574
+#: src/common/command.c:2576
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
@@ -3383,40 +3387,40 @@ msgstr ""
 "La commande \"plugin\" n'est pas disponible, WeeChat a été compilé sans le "
 "support des extensions.\n"
 
-#: src/common/command.c:2602
+#: src/common/command.c:2604
 msgid "Configuration file saved\n"
 msgstr "Fichier de configuration sauvé\n"
 
-#: src/common/command.c:2607
+#: src/common/command.c:2609
 #, c-format
 msgid "%s failed to save configuration file\n"
 msgstr "%s impossible de sauver le fichier de configuration\n"
 
-#: src/common/command.c:2646
+#: src/common/command.c:2648
 msgid "No server.\n"
 msgstr "Pas de serveur.\n"
 
-#: src/common/command.c:2657
+#: src/common/command.c:2659
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "Serveur '%s' non trouvé.\n"
 
-#: src/common/command.c:2669
+#: src/common/command.c:2671
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr "%s il manque le nom du serveur pour la commande \"%s\"\n"
 
-#: src/common/command.c:2677
+#: src/common/command.c:2679
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr "%s trop de paramčtres pour la commande \"%s\", paramčtres ignorés\n"
 
-#: src/common/command.c:2687
+#: src/common/command.c:2689
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr "%s le serveur \"%s\" n'existe pas pour la commande \"%s\"\n"
 
-#: src/common/command.c:2695
+#: src/common/command.c:2697
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -3425,175 +3429,175 @@ msgstr ""
 "%s vous ne pouvez pas supprimer le server \"%s\" car vous ętes connecté "
 "dessus. Essayez /disconnect %s avant.\n"
 
-#: src/common/command.c:2715
+#: src/common/command.c:2717
 #, c-format
 msgid "Server %s%s%s has been deleted\n"
 msgstr "Le serveur %s%s%s a été supprimé\n"
 
-#: src/common/command.c:2734
+#: src/common/command.c:2736
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s paramčtres manquants pour la commande \"%s\"\n"
 
-#: src/common/command.c:2744
+#: src/common/command.c:2746
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr "%s le serveur \"%s\" existe déjŕ, impossible de le créer !\n"
 
-#: src/common/command.c:2773 src/common/command.c:2801
-#: src/common/command.c:2814 src/common/command.c:2840
+#: src/common/command.c:2775 src/common/command.c:2803
+#: src/common/command.c:2816 src/common/command.c:2842
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr "%s mot de passe manquant pour le paramčtre \"%s\"\n"
 
-#: src/common/command.c:2786
+#: src/common/command.c:2788
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr "%s pseudo(s) manquant(s) pour le paramčtre \"%s\"\n"
 
-#: src/common/command.c:2827
+#: src/common/command.c:2829
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s commande manquante pour le paramčtre \"%s\"\n"
 
-#: src/common/command.c:2864
+#: src/common/command.c:2866
 #, c-format
 msgid "Server %s%s%s created\n"
 msgstr "Serveur %s%s%s créé\n"
 
-#: src/common/command.c:2873
+#: src/common/command.c:2875
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s impossible de créer le serveur\n"
 
-#: src/common/command.c:2933
+#: src/common/command.c:2935
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: src/common/command.c:2956
+#: src/common/command.c:2958
 #, c-format
 msgid "%s(password hidden) "
 msgstr "%s(mot de passe caché) "
 
-#: src/common/command.c:3054
+#: src/common/command.c:3056
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s serveur \"%s\" non trouvé\n"
 
-#: src/common/command.c:3087 src/common/command.c:3135
+#: src/common/command.c:3089 src/common/command.c:3137
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s option de configuration \"%s\" non trouvée\n"
 
-#: src/common/command.c:3092 src/common/command.c:3127
+#: src/common/command.c:3094 src/common/command.c:3129
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s valeur incorrecte pour l'option \"%s\"\n"
 
-#: src/common/command.c:3108
+#: src/common/command.c:3110
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr "%s l'option \"%s\" ne peut pas ętre changée lorsque WeeChat tourne\n"
 
-#: src/common/command.c:3218
+#: src/common/command.c:3220
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr "Aucune option de configuration trouvée avec \"%s\"\n"
 
-#: src/common/command.c:3221
+#: src/common/command.c:3223
 msgid "No config option found\n"
 msgstr "Aucune option de configuration trouvée\n"
 
-#: src/common/command.c:3228
+#: src/common/command.c:3230
 #, c-format
 msgid "%sDetail:\n"
 msgstr "%sDétail :\n"
 
-#: src/common/command.c:3233
+#: src/common/command.c:3235
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr "  . type booléen (valeurs: 'on' ou 'off')\n"
 
-#: src/common/command.c:3234 src/common/command.c:3257
-#: src/common/command.c:3263 src/common/command.c:3269
+#: src/common/command.c:3236 src/common/command.c:3259
+#: src/common/command.c:3265 src/common/command.c:3271
 #: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
 #: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . valeur par défaut: '%s'\n"
 
-#: src/common/command.c:3239
+#: src/common/command.c:3241
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . type entier (valeurs: entre %d et %d)\n"
 
-#: src/common/command.c:3242 src/common/weechat.c:404
+#: src/common/command.c:3244 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . valeur par défaut: %d\n"
 
-#: src/common/command.c:3246
+#: src/common/command.c:3248
 msgid "  . type string (values: "
 msgstr "  . type chaîne (valeurs: "
 
-#: src/common/command.c:3259 src/common/command.c:3265
-#: src/common/command.c:3271 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/command.c:3261 src/common/command.c:3267
+#: src/common/command.c:3273 src/common/weechat.c:422 src/common/weechat.c:429
 #: src/common/weechat.c:436
 msgid "empty"
 msgstr "vide"
 
-#: src/common/command.c:3262
+#: src/common/command.c:3264
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr "  . type couleur (couleur Curses ou Gtk, voir la doc WeeChat)\n"
 
-#: src/common/command.c:3268
+#: src/common/command.c:3270
 msgid "  . type string (any string)\n"
 msgstr "  . type chaîne (toute chaîne)\n"
 
-#: src/common/command.c:3274 src/common/weechat.c:439
+#: src/common/command.c:3276 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . description: %s\n"
 
-#: src/common/command.c:3285
+#: src/common/command.c:3287
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr "option(s) de configuration trouvée(s) avec \"%s\"\n"
 
-#: src/common/command.c:3288
+#: src/common/command.c:3290
 msgid "config option(s) found\n"
 msgstr "option(s) de configuration trouvée(s)\n"
 
-#: src/common/command.c:3314
+#: src/common/command.c:3316
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s alias ou commande \"%s\" non trouvé\n"
 
-#: src/common/command.c:3324
+#: src/common/command.c:3326
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "Alias \"%s\" supprimé\n"
 
-#: src/common/command.c:3384
+#: src/common/command.c:3386
 msgid "ignore were removed.\n"
 msgstr "ignore ont été supprimés.\n"
 
-#: src/common/command.c:3386
+#: src/common/command.c:3388
 msgid "ignore was removed.\n"
 msgstr "ignore a été supprimé.\n"
 
-#: src/common/command.c:3391
+#: src/common/command.c:3393
 #, c-format
 msgid "%s no ignore found\n"
 msgstr "%s aucun ignore trouvé\n"
 
-#: src/common/command.c:3425
+#: src/common/command.c:3427
 #, c-format
 msgid "%s can't upgrade: connection to at least one server is pending\n"
 msgstr ""
 "%s impossible de mettre ŕ jour: une connexion ŕ au moins un serveur est en "
 "cours\n"
 
-#: src/common/command.c:3435
+#: src/common/command.c:3437
 #, c-format
 msgid ""
 "%s can't upgrade: connection to at least one SSL server is active (should be "
@@ -3602,35 +3606,35 @@ msgstr ""
 "%s impossible de mettre ŕ jour: une connexion ŕ au moins un serveur SSL est "
 "active (devrait ętre corrigé dans une future version)\n"
 
-#: src/common/command.c:3451
+#: src/common/command.c:3453
 msgid "Upgrading WeeChat...\n"
 msgstr "Mise ŕ jour de WeeChat...\n"
 
-#: src/common/command.c:3458
+#: src/common/command.c:3460
 #, c-format
 msgid "%s unable to save session in file\n"
 msgstr "%s impossible de sauver la session dans le fichier\n"
 
-#: src/common/command.c:3484
+#: src/common/command.c:3486
 #, c-format
 msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n"
 msgstr "%s l'exécution a échoué (programme: \"%s\"), sortie de WeeChat\n"
 
-#: src/common/command.c:3524
+#: src/common/command.c:3526
 #, c-format
 msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s"
 msgstr "Uptime WeeChat: %d %s %02d:%02d:%02d, démarré le %s"
 
-#: src/common/command.c:3538
+#: src/common/command.c:3540
 #, c-format
 msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s"
 msgstr "Uptime WeeChat: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, démarré le %s%s"
 
-#: src/common/command.c:3582
+#: src/common/command.c:3584
 msgid "Opened windows:\n"
 msgstr "Fenętres ouvertes:\n"
 
-#: src/common/command.c:3669
+#: src/common/command.c:3671
 #, c-format
 msgid ""
 "%s can not merge windows, there's no other window with same size near "
diff --git a/weechat/po/hu.po b/weechat/po/hu.po
index c29ef9c86..efd41b23d 100644
--- a/weechat/po/hu.po
+++ b/weechat/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.9-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-03-21 12:04+0100\n"
+"POT-Creation-Date: 2006-03-21 15:11+0100\n"
 "PO-Revision-Date: 2006-03-18 11:46+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team:  weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1429,7 +1429,7 @@ msgstr "ismeretlen"
 msgid "%s: using local hostname \"%s\"\n"
 msgstr "%s: helyi hosztnév \"%s\"\n"
 
-#: src/irc/irc-send.c:215 src/common/command.c:1028
+#: src/irc/irc-send.c:215 src/common/command.c:1030
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr "%s nem található név az üzenet küldéséhez\n"
@@ -1451,8 +1451,8 @@ msgstr "%s \"%s\" parancs nem futtathatĂł a szerverablakban\n"
 
 #: src/irc/irc-send.c:628 src/irc/irc-send.c:640 src/irc/irc-send.c:658
 #: src/irc/irc-send.c:1365 src/irc/irc-send.c:1503 src/irc/irc-send.c:2098
-#: src/common/command.c:1914 src/common/command.c:2427
-#: src/common/command.c:2568
+#: src/common/command.c:1916 src/common/command.c:2429
+#: src/common/command.c:2570
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s rossz argumentum szám a \"%s\" parancsnak\n"
@@ -1802,11 +1802,11 @@ msgstr ""
 msgid "%s[%s%s%s]%s idle: "
 msgstr "%s[%s%s%s]%s tétlen: "
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "days"
 msgstr "nap"
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "day"
 msgstr "nap"
 
@@ -2300,7 +2300,7 @@ msgstr "%s (%s/%s) szerver/szoba nem található a modul futtatása parancshoz\n
 msgid "Day changed to %s\n"
 msgstr "A mai dátum: %s\n"
 
-#: src/gui/curses/gui-input.c:439
+#: src/gui/curses/gui-input.c:456
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s túl nagy a késés(lag), lecsatlakozás a szerverről...\n"
@@ -2574,7 +2574,7 @@ msgstr "képernyő frissítése"
 msgid "grab a key"
 msgstr ""
 
-#: src/gui/gui-keyboard.c:444 src/common/command.c:2442
+#: src/gui/gui-keyboard.c:444 src/common/command.c:2444
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr ""
@@ -2870,36 +2870,40 @@ msgid "[option [ = value]]"
 msgstr "[opció [ = érték]]"
 
 #: src/common/command.c:148
+#, fuzzy
 msgid ""
 "option: name of an option (if name is full and no value is given, then help "
 "is displayed on option)\n"
-"value: value for option"
+"value: value for option\n"
+"\n"
+"Option may be: servername.server_xxx where \"servername\" is an internal "
+"server name and \"xxx\" an option for this server."
 msgstr ""
 "opció: az opció neve (ha a név teljes és nincs érték megadva, akkor "
 "megjeleníti az opcióhoz tartozó segítséget\n"
 "érték: az opcióhoz tartozó érték"
 
-#: src/common/command.c:152
+#: src/common/command.c:154
 msgid "remove an alias"
 msgstr "alias eltávolítása"
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name"
 msgstr "alias_név"
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name: name of alias to remove"
 msgstr "alias_név: az eltávolítandó alias neve"
 
-#: src/common/command.c:155
+#: src/common/command.c:157
 msgid "unignore IRC messages and/or hosts"
 msgstr ""
 
-#: src/common/command.c:156
+#: src/common/command.c:158
 msgid "[number | [mask [[type | command] [channel [server]]]]]"
 msgstr "[szám | [maszk [[típus | parancs] [szoba [szerver]]]]]"
 
-#: src/common/command.c:157
+#: src/common/command.c:159
 msgid ""
 " number: # of ignore to unignore (number is displayed by list of ignore)\n"
 "   mask: nick or host mask to unignore\n"
@@ -2912,33 +2916,33 @@ msgid ""
 "Without argument, /unignore command lists all defined ignore."
 msgstr ""
 
-#: src/common/command.c:167
+#: src/common/command.c:169
 msgid "upgrade WeeChat without disconnecting from servers"
 msgstr "WeeChat frissítése a szerverekről való lecsatlakozás nélkül"
 
-#: src/common/command.c:169
+#: src/common/command.c:171
 msgid ""
 "This command run again WeeChat binary, so it should have been compiled "
 "installed with a package manager before running this command."
 msgstr ""
 
-#: src/common/command.c:172
+#: src/common/command.c:174
 msgid "show WeeChat uptime"
 msgstr "a WeeChat futásidejének mutatása"
 
-#: src/common/command.c:173
+#: src/common/command.c:175
 msgid "[-o]"
 msgstr "[-o]"
 
-#: src/common/command.c:174
+#: src/common/command.c:176
 msgid "-o: send uptime on current channel as an IRC message"
 msgstr "-o: a futásidő mint IRC üzenet elküldése az aktuális szobába"
 
-#: src/common/command.c:176
+#: src/common/command.c:178
 msgid "manage windows"
 msgstr "ablakok kezelése"
 
-#: src/common/command.c:177
+#: src/common/command.c:179
 msgid ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
@@ -2946,7 +2950,7 @@ msgstr ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
 
-#: src/common/command.c:179
+#: src/common/command.c:181
 #, c-format
 msgid ""
 "  list: list opened windows (no parameter implies this list)\n"
@@ -2983,323 +2987,323 @@ msgstr ""
 "hogy az új ablak hány százaléka lesz a szülőablaknak. Például 25 esetén a "
 "szülőablak negyedét kapjuk."
 
-#: src/common/command.c:376 src/common/command.c:730
+#: src/common/command.c:378 src/common/command.c:732
 #, c-format
 msgid "%s circular reference when calling alias \"/%s\"\n"
 msgstr ""
 
-#: src/common/command.c:710 src/common/command.c:846 src/common/command.c:917
+#: src/common/command.c:712 src/common/command.c:848 src/common/command.c:919
 #, c-format
 msgid "%s command \"%s\" failed\n"
 msgstr "%s a \"%s\" parancs végrehajtása sikertelen\n"
 
-#: src/common/command.c:812
+#: src/common/command.c:814
 #, c-format
 msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 
-#: src/common/command.c:824
+#: src/common/command.c:826
 #, c-format
 msgid ""
 "%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
 "arg%s)\n"
 msgstr ""
 
-#: src/common/command.c:873
+#: src/common/command.c:875
 #, c-format
 msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 
-#: src/common/command.c:885
+#: src/common/command.c:887
 #, c-format
 msgid ""
 "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
 "arg%s)\n"
 msgstr ""
 
-#: src/common/command.c:900
+#: src/common/command.c:902
 #, c-format
 msgid "%s command \"%s\" needs a server connection!\n"
 msgstr "%s a \"%s\" parancs futtatásához csatlakozni kell a szerverhez!\n"
 
-#: src/common/command.c:930
+#: src/common/command.c:932
 #, c-format
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr "%s ismeretlen parancs: \"%s\" (segítséget a /help parancstól kaphat)\n"
 
-#: src/common/command.c:1075
+#: src/common/command.c:1077
 msgid "This window is not a channel!\n"
 msgstr "Ez az ablak nem egy szoba!\n"
 
-#: src/common/command.c:1108 src/common/command.c:1145
-#: src/common/command.c:1280
+#: src/common/command.c:1110 src/common/command.c:1147
+#: src/common/command.c:1282
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr "%s hiányzó argumentum a \"%s\" parancsnak\n"
 
-#: src/common/command.c:1117
+#: src/common/command.c:1119
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr "A \"%s\" => \"%s\" aliasz elkészült\n"
 
-#: src/common/command.c:1123
+#: src/common/command.c:1125
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr ""
 "A \"%s\" => \"%s\" aliasz elkészítése sikertelen (nincs elég memória)\n"
 
-#: src/common/command.c:1135 src/common/command.c:1156
+#: src/common/command.c:1137 src/common/command.c:1158
 msgid "List of aliases:\n"
 msgstr "Aliaszok listája:\n"
 
-#: src/common/command.c:1170
+#: src/common/command.c:1172
 msgid "No alias defined.\n"
 msgstr "Nincs aliasz definiálva.\n"
 
-#: src/common/command.c:1189
+#: src/common/command.c:1191
 #, c-format
 msgid "%sServer: %s%s\n"
 msgstr "%sSzerver: %s%s\n"
 
-#: src/common/command.c:1194
+#: src/common/command.c:1196
 #, c-format
 msgid "%snot connected\n"
 msgstr "%snincs csatlakozva\n"
 
-#: src/common/command.c:1198
+#: src/common/command.c:1200
 #, c-format
 msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
 msgstr "%sSzoba: %s%s %s(szerver: %s%s%s)\n"
 
-#: src/common/command.c:1207
+#: src/common/command.c:1209
 #, c-format
 msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
 msgstr "%sPrivát beszélgetés: %s%s %s(szerver: %s%s%s)\n"
 
-#: src/common/command.c:1216 src/common/command.c:1228
+#: src/common/command.c:1218 src/common/command.c:1230
 #, c-format
 msgid "%sunknown\n"
 msgstr "%sismeretlen\n"
 
-#: src/common/command.c:1224
+#: src/common/command.c:1226
 #, c-format
 msgid "%sraw IRC data\n"
 msgstr ""
 
-#: src/common/command.c:1259
+#: src/common/command.c:1261
 msgid "Opened buffers:\n"
 msgstr "Nyitott pufferek:\n"
 
-#: src/common/command.c:1304
+#: src/common/command.c:1306
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr "%s helytelen pufferszám\n"
 
-#: src/common/command.c:1321
+#: src/common/command.c:1323
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr "%s az utolsó puffert nem lehet bezárni\n"
 
-#: src/common/command.c:1332
+#: src/common/command.c:1334
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr "%s nem lehet szerverpuffert bezárni, míg a szobákban tartózkodunk\n"
 
-#: src/common/command.c:1390
+#: src/common/command.c:1392
 msgid "Notify levels:  "
 msgstr "Értesítési szintek:  "
 
-#: src/common/command.c:1396
+#: src/common/command.c:1398
 msgid "Raw IRC data"
 msgstr ""
 
-#: src/common/command.c:1420 src/common/command.c:1470
+#: src/common/command.c:1422 src/common/command.c:1472
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr ""
 "%s helytelen értesítési szint (az értéknek %d és %d között kell lennie)\n"
 
-#: src/common/command.c:1430
+#: src/common/command.c:1432
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr ""
 "%s helytelen puffer az értesítéshez (szobát vagy privát beszélgetést kell "
 "megjelölnie)\n"
 
-#: src/common/command.c:1440
+#: src/common/command.c:1442
 #, c-format
 msgid "New notify level for %s%s%s: %s%d %s"
 msgstr "A %s%s%s új értesítési szintje: %s%d %s"
 
-#: src/common/command.c:1450
+#: src/common/command.c:1452
 msgid "(hotlist: never)\n"
 msgstr ""
 
-#: src/common/command.c:1453
+#: src/common/command.c:1455
 msgid "(hotlist: highlights)\n"
 msgstr ""
 
-#: src/common/command.c:1456
+#: src/common/command.c:1458
 msgid "(hotlist: highlights + messages)\n"
 msgstr ""
 
-#: src/common/command.c:1459
+#: src/common/command.c:1461
 msgid "(hotlist: highlights + messages + join/part (all))\n"
 msgstr ""
 
-#: src/common/command.c:1590
+#: src/common/command.c:1592
 #, c-format
 msgid "Charsets for server %s%s%s: "
 msgstr "Karakterkészlet a %s%s%s szerveren: "
 
-#: src/common/command.c:1598
+#: src/common/command.c:1600
 #, c-format
 msgid "Charsets for channel %s%s%s: "
 msgstr "Karakterkészlet a %s%s%s szobában: "
 
-#: src/common/command.c:1606
+#: src/common/command.c:1608
 #, c-format
 msgid "Charsets for private %s%s%s: "
 msgstr "Karakterkészlet a %s%s%s privát beszélgetéshez: "
 
-#: src/common/command.c:1634 src/common/command.c:1664
-#: src/common/command.c:1694
+#: src/common/command.c:1636 src/common/command.c:1666
+#: src/common/command.c:1696
 #, c-format
 msgid " (inherited: \"%s%s%s\")"
 msgstr " (örökölt: \"%s%s%s\")"
 
-#: src/common/command.c:1763 src/common/command.c:1791
-#: src/common/command.c:1933 src/common/command.c:2561
-#: src/common/command.c:3658 src/common/command.c:3701
+#: src/common/command.c:1765 src/common/command.c:1793
+#: src/common/command.c:1935 src/common/command.c:2563
+#: src/common/command.c:3660 src/common/command.c:3703
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s ismeretlen opciĂł a \"%s\" parancsnak\n"
 
-#: src/common/command.c:1826
+#: src/common/command.c:1828
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s már csatlakozott a \"%s\" szerverhez!\n"
 
-#: src/common/command.c:1834
+#: src/common/command.c:1836
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr ""
 
-#: src/common/command.c:1853 src/common/command.c:1982
+#: src/common/command.c:1855 src/common/command.c:1984
 #, c-format
 msgid "%s server not found\n"
 msgstr "%s a szerver nem található\n"
 
-#: src/common/command.c:1966
+#: src/common/command.c:1968
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr "%s nincs csatlakozva a \"%s\" szerverhez!\n"
 
-#: src/common/command.c:1974
+#: src/common/command.c:1976
 msgid "Auto-reconnection is cancelled\n"
 msgstr "automata újracsatlakozás megszakítva\n"
 
-#: src/common/command.c:2010 src/common/weechat.c:459
+#: src/common/command.c:2012 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "%s belső parancsok:\n"
 
-#: src/common/command.c:2020 src/common/weechat.c:479
+#: src/common/command.c:2022 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr "IRC parancsok:\n"
 
-#: src/common/command.c:2034
+#: src/common/command.c:2036
 msgid "Plugin commands:\n"
 msgstr "Modul parancsok:\n"
 
-#: src/common/command.c:2150
+#: src/common/command.c:2152
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr "Nem érhető el segítség, a \"%s\" ismeretlen parancs\n"
 
-#: src/common/command.c:2219
+#: src/common/command.c:2221
 #, c-format
 msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n"
 msgstr ""
 
-#: src/common/command.c:2257
+#: src/common/command.c:2259
 msgid "List of ignore:\n"
 msgstr ""
 
-#: src/common/command.c:2274
+#: src/common/command.c:2276
 msgid "No ignore defined.\n"
 msgstr ""
 
-#: src/common/command.c:2300
+#: src/common/command.c:2302
 msgid "New ignore:"
 msgstr ""
 
-#: src/common/command.c:2320
+#: src/common/command.c:2322
 #, c-format
 msgid "New key binding:  %s"
 msgstr ""
 
-#: src/common/command.c:2359
+#: src/common/command.c:2361
 msgid "Key bindings:\n"
 msgstr ""
 
-#: src/common/command.c:2373
+#: src/common/command.c:2375
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr ""
 
-#: src/common/command.c:2379
+#: src/common/command.c:2381
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:2387 src/common/weechat.c:511
+#: src/common/command.c:2389 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr ""
 
-#: src/common/command.c:2407
+#: src/common/command.c:2409
 msgid "Default key bindings restored\n"
 msgstr "Alapértelmezett billentyűparancsok visszaállítva\n"
 
-#: src/common/command.c:2413
+#: src/common/command.c:2415
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 "%s \"-yes\" paraméter megadása kötelező a billentyűparancsok "
 "visszaállításához (biztonsági okokból)\n"
 
-#: src/common/command.c:2474
+#: src/common/command.c:2476
 msgid "Plugins loaded:\n"
 msgstr "Betöltött modulok:\n"
 
-#: src/common/command.c:2490
+#: src/common/command.c:2492
 msgid "     message handlers:\n"
 msgstr ""
 
-#: src/common/command.c:2499
+#: src/common/command.c:2501
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr ""
 
-#: src/common/command.c:2506
+#: src/common/command.c:2508
 msgid "       (no message handler)\n"
 msgstr ""
 
-#: src/common/command.c:2511
+#: src/common/command.c:2513
 msgid "     command handlers:\n"
 msgstr ""
 
-#: src/common/command.c:2532
+#: src/common/command.c:2534
 msgid "       (no command handler)\n"
 msgstr ""
 
-#: src/common/command.c:2538
+#: src/common/command.c:2540
 msgid "  (no plugin)\n"
 msgstr "  (nem található bővítőmodul)\n"
 
-#: src/common/command.c:2574
+#: src/common/command.c:2576
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
@@ -3307,40 +3311,40 @@ msgstr ""
 "A \"plugin\" parancs nem elérhető, a WeeChat modultámogatás nélkül lett "
 "lefordĂ­tva.\n"
 
-#: src/common/command.c:2602
+#: src/common/command.c:2604
 msgid "Configuration file saved\n"
 msgstr "Konfigurációs fájl elmentve\n"
 
-#: src/common/command.c:2607
+#: src/common/command.c:2609
 #, c-format
 msgid "%s failed to save configuration file\n"
 msgstr "%s nem sikerült a konfigurációs fájlt elmenteni\n"
 
-#: src/common/command.c:2646
+#: src/common/command.c:2648
 msgid "No server.\n"
 msgstr "Nincs szerver.\n"
 
-#: src/common/command.c:2657
+#: src/common/command.c:2659
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "A '%s' szerver nem található.\n"
 
-#: src/common/command.c:2669
+#: src/common/command.c:2671
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr "%s hiányzó szervernév a \"%s\" parancshoz\n"
 
-#: src/common/command.c:2677
+#: src/common/command.c:2679
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr "%s túl sok paraméter a \"%s\" parancsnak, paraméterek mellőzve\n"
 
-#: src/common/command.c:2687
+#: src/common/command.c:2689
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr "%s a \"%s\" szerver nem található a \"%s\" parancshoz\n"
 
-#: src/common/command.c:2695
+#: src/common/command.c:2697
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -3349,175 +3353,175 @@ msgstr ""
 "%s nem tudja törölni a \"%s\" szervert, mert csatlakozva van hozzá. Próbálja "
 "a /disconnect %s parancsot előbb.\n"
 
-#: src/common/command.c:2715
+#: src/common/command.c:2717
 #, c-format
 msgid "Server %s%s%s has been deleted\n"
 msgstr "A %s%s%s szerver törölve\n"
 
-#: src/common/command.c:2734
+#: src/common/command.c:2736
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s hiányzó paraméter a \"%s\" parancsnak\n"
 
-#: src/common/command.c:2744
+#: src/common/command.c:2746
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr "%s a \"%s\" szerver már létezik, nem hozhatja létre!\n"
 
-#: src/common/command.c:2773 src/common/command.c:2801
-#: src/common/command.c:2814 src/common/command.c:2840
+#: src/common/command.c:2775 src/common/command.c:2803
+#: src/common/command.c:2816 src/common/command.c:2842
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr "%s hiányzó jelszó a \"%s\" paraméterhez\n"
 
-#: src/common/command.c:2786
+#: src/common/command.c:2788
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr "%s hiányzó név a \"%s\" paraméterhez\n"
 
-#: src/common/command.c:2827
+#: src/common/command.c:2829
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s hiányzó parancs a \"%s\" paraméterhez\n"
 
-#: src/common/command.c:2864
+#: src/common/command.c:2866
 #, c-format
 msgid "Server %s%s%s created\n"
 msgstr "A %s%s%s szerver létrehozva\n"
 
-#: src/common/command.c:2873
+#: src/common/command.c:2875
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s nem sikerült a szervert létrehozni\n"
 
-#: src/common/command.c:2933
+#: src/common/command.c:2935
 msgid "(unknown)"
 msgstr "(ismeretlen)"
 
-#: src/common/command.c:2956
+#: src/common/command.c:2958
 #, c-format
 msgid "%s(password hidden) "
 msgstr "%s(jelszĂł rejtve) "
 
-#: src/common/command.c:3054
+#: src/common/command.c:3056
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s a \"%s\" szerver nem található\n"
 
-#: src/common/command.c:3087 src/common/command.c:3135
+#: src/common/command.c:3089 src/common/command.c:3137
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s a \"%s\" opció nem található\n"
 
-#: src/common/command.c:3092 src/common/command.c:3127
+#: src/common/command.c:3094 src/common/command.c:3129
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s helytelen érték a \"%s\" paraméternek\n"
 
-#: src/common/command.c:3108
+#: src/common/command.c:3110
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr "%s a \"%s\" opció nem módosítható a WeeChat futása közben\n"
 
-#: src/common/command.c:3218
+#: src/common/command.c:3220
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:3221
+#: src/common/command.c:3223
 msgid "No config option found\n"
 msgstr "Nem található az opció\n"
 
-#: src/common/command.c:3228
+#: src/common/command.c:3230
 #, c-format
 msgid "%sDetail:\n"
 msgstr "%sRĂ©szletek:\n"
 
-#: src/common/command.c:3233
+#: src/common/command.c:3235
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr "  . típus logikai (értékek: 'on' vagy 'off')\n"
 
-#: src/common/command.c:3234 src/common/command.c:3257
-#: src/common/command.c:3263 src/common/command.c:3269
+#: src/common/command.c:3236 src/common/command.c:3259
+#: src/common/command.c:3265 src/common/command.c:3271
 #: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
 #: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . alapérték: '%s'\n"
 
-#: src/common/command.c:3239
+#: src/common/command.c:3241
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . típus szám (értékek: %d és %d között)\n"
 
-#: src/common/command.c:3242 src/common/weechat.c:404
+#: src/common/command.c:3244 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . alapérték: %d\n"
 
-#: src/common/command.c:3246
+#: src/common/command.c:3248
 msgid "  . type string (values: "
 msgstr "  . típus szöveg (értékek: "
 
-#: src/common/command.c:3259 src/common/command.c:3265
-#: src/common/command.c:3271 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/command.c:3261 src/common/command.c:3267
+#: src/common/command.c:3273 src/common/weechat.c:422 src/common/weechat.c:429
 #: src/common/weechat.c:436
 msgid "empty"
 msgstr "ĂĽres"
 
-#: src/common/command.c:3262
+#: src/common/command.c:3264
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr "  . típus szín (Curses vagy Gtk szín, lásd WeeChat dokumentáció)\n"
 
-#: src/common/command.c:3268
+#: src/common/command.c:3270
 msgid "  . type string (any string)\n"
 msgstr "  . típus szöveg (bármilyen szöveg)\n"
 
-#: src/common/command.c:3274 src/common/weechat.c:439
+#: src/common/command.c:3276 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . leírás : %s\n"
 
-#: src/common/command.c:3285
+#: src/common/command.c:3287
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr "a \"%s\" kifejezéshez tartozó opciók\n"
 
-#: src/common/command.c:3288
+#: src/common/command.c:3290
 msgid "config option(s) found\n"
 msgstr "megtalált opciók\n"
 
-#: src/common/command.c:3314
+#: src/common/command.c:3316
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s a \"%s\" aliasz vagy parancs nem található\n"
 
-#: src/common/command.c:3324
+#: src/common/command.c:3326
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "A \"%s\" aliasz eltávolítva\n"
 
-#: src/common/command.c:3384
+#: src/common/command.c:3386
 msgid "ignore were removed.\n"
 msgstr "mellőzés eltávolítva.\n"
 
-#: src/common/command.c:3386
+#: src/common/command.c:3388
 msgid "ignore was removed.\n"
 msgstr "mellőzés eltávolítva.\n"
 
-#: src/common/command.c:3391
+#: src/common/command.c:3393
 #, c-format
 msgid "%s no ignore found\n"
 msgstr "%s nem található ilyen mellőzés\n"
 
-#: src/common/command.c:3425
+#: src/common/command.c:3427
 #, c-format
 msgid "%s can't upgrade: connection to at least one server is pending\n"
 msgstr ""
 "%s nem sikerült frissíteni: a kapcsolat egy vagy több szerverrel még "
 "folyamatban van\n"
 
-#: src/common/command.c:3435
+#: src/common/command.c:3437
 #, c-format
 msgid ""
 "%s can't upgrade: connection to at least one SSL server is active (should be "
@@ -3526,36 +3530,36 @@ msgstr ""
 "%s nem sikerült frissíteni: a kapcsolat legalább egy SSL szerverrel aktív (a "
 "következő verziókban javítva lesz)\n"
 
-#: src/common/command.c:3451
+#: src/common/command.c:3453
 msgid "Upgrading WeeChat...\n"
 msgstr "WeeChat frissítése...\n"
 
-#: src/common/command.c:3458
+#: src/common/command.c:3460
 #, c-format
 msgid "%s unable to save session in file\n"
 msgstr ""
 
-#: src/common/command.c:3484
+#: src/common/command.c:3486
 #, c-format
 msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n"
 msgstr ""
 
-#: src/common/command.c:3524
+#: src/common/command.c:3526
 #, c-format
 msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s"
 msgstr "WeeChat futásidő: %d %s %02d:%02d:%02d, elindítva: %s"
 
-#: src/common/command.c:3538
+#: src/common/command.c:3540
 #, c-format
 msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s"
 msgstr ""
 "WeeChat futásidő: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, elindítva: %s%s"
 
-#: src/common/command.c:3582
+#: src/common/command.c:3584
 msgid "Opened windows:\n"
 msgstr "Nyitott ablakok:\n"
 
-#: src/common/command.c:3669
+#: src/common/command.c:3671
 #, c-format
 msgid ""
 "%s can not merge windows, there's no other window with same size near "
diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot
index eb4c62396..85c4803e9 100644
--- a/weechat/po/weechat.pot
+++ b/weechat/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: 2006-03-21 12:04+0100\n"
+"POT-Creation-Date: 2006-03-21 15:11+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"
@@ -1306,7 +1306,7 @@ msgstr ""
 msgid "%s: using local hostname \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-send.c:215 src/common/command.c:1028
+#: src/irc/irc-send.c:215 src/common/command.c:1030
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr ""
@@ -1328,8 +1328,8 @@ msgstr ""
 
 #: src/irc/irc-send.c:628 src/irc/irc-send.c:640 src/irc/irc-send.c:658
 #: src/irc/irc-send.c:1365 src/irc/irc-send.c:1503 src/irc/irc-send.c:2098
-#: src/common/command.c:1914 src/common/command.c:2427
-#: src/common/command.c:2568
+#: src/common/command.c:1916 src/common/command.c:2429
+#: src/common/command.c:2570
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr ""
@@ -1679,11 +1679,11 @@ msgstr ""
 msgid "%s[%s%s%s]%s idle: "
 msgstr ""
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "days"
 msgstr ""
 
-#: src/irc/irc-recv.c:3407 src/common/command.c:3526 src/common/command.c:3544
+#: src/irc/irc-recv.c:3407 src/common/command.c:3528 src/common/command.c:3546
 msgid "day"
 msgstr ""
 
@@ -2163,7 +2163,7 @@ msgstr ""
 msgid "Day changed to %s\n"
 msgstr ""
 
-#: src/gui/curses/gui-input.c:439
+#: src/gui/curses/gui-input.c:456
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr ""
@@ -2437,7 +2437,7 @@ msgstr ""
 msgid "grab a key"
 msgstr ""
 
-#: src/gui/gui-keyboard.c:444 src/common/command.c:2442
+#: src/gui/gui-keyboard.c:444 src/common/command.c:2444
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr ""
@@ -2697,30 +2697,33 @@ msgstr ""
 msgid ""
 "option: name of an option (if name is full and no value is given, then help "
 "is displayed on option)\n"
-"value: value for option"
+"value: value for option\n"
+"\n"
+"Option may be: servername.server_xxx where \"servername\" is an internal "
+"server name and \"xxx\" an option for this server."
 msgstr ""
 
-#: src/common/command.c:152
+#: src/common/command.c:154
 msgid "remove an alias"
 msgstr ""
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name"
 msgstr ""
 
-#: src/common/command.c:153
+#: src/common/command.c:155
 msgid "alias_name: name of alias to remove"
 msgstr ""
 
-#: src/common/command.c:155
+#: src/common/command.c:157
 msgid "unignore IRC messages and/or hosts"
 msgstr ""
 
-#: src/common/command.c:156
+#: src/common/command.c:158
 msgid "[number | [mask [[type | command] [channel [server]]]]]"
 msgstr ""
 
-#: src/common/command.c:157
+#: src/common/command.c:159
 msgid ""
 " number: # of ignore to unignore (number is displayed by list of ignore)\n"
 "   mask: nick or host mask to unignore\n"
@@ -2733,39 +2736,39 @@ msgid ""
 "Without argument, /unignore command lists all defined ignore."
 msgstr ""
 
-#: src/common/command.c:167
+#: src/common/command.c:169
 msgid "upgrade WeeChat without disconnecting from servers"
 msgstr ""
 
-#: src/common/command.c:169
+#: src/common/command.c:171
 msgid ""
 "This command run again WeeChat binary, so it should have been compiled "
 "installed with a package manager before running this command."
 msgstr ""
 
-#: src/common/command.c:172
+#: src/common/command.c:174
 msgid "show WeeChat uptime"
 msgstr ""
 
-#: src/common/command.c:173
+#: src/common/command.c:175
 msgid "[-o]"
 msgstr ""
 
-#: src/common/command.c:174
+#: src/common/command.c:176
 msgid "-o: send uptime on current channel as an IRC message"
 msgstr ""
 
-#: src/common/command.c:176
+#: src/common/command.c:178
 msgid "manage windows"
 msgstr ""
 
-#: src/common/command.c:177
+#: src/common/command.c:179
 msgid ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
 msgstr ""
 
-#: src/common/command.c:179
+#: src/common/command.c:181
 #, c-format
 msgid ""
 "  list: list opened windows (no parameter implies this list)\n"
@@ -2786,564 +2789,564 @@ msgid ""
 "create a new window with size = current_size / 4"
 msgstr ""
 
-#: src/common/command.c:376 src/common/command.c:730
+#: src/common/command.c:378 src/common/command.c:732
 #, c-format
 msgid "%s circular reference when calling alias \"/%s\"\n"
 msgstr ""
 
-#: src/common/command.c:710 src/common/command.c:846 src/common/command.c:917
+#: src/common/command.c:712 src/common/command.c:848 src/common/command.c:919
 #, c-format
 msgid "%s command \"%s\" failed\n"
 msgstr ""
 
-#: src/common/command.c:812
+#: src/common/command.c:814
 #, c-format
 msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 
-#: src/common/command.c:824
+#: src/common/command.c:826
 #, c-format
 msgid ""
 "%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
 "arg%s)\n"
 msgstr ""
 
-#: src/common/command.c:873
+#: src/common/command.c:875
 #, c-format
 msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
 msgstr ""
 
-#: src/common/command.c:885
+#: src/common/command.c:887
 #, c-format
 msgid ""
 "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
 "arg%s)\n"
 msgstr ""
 
-#: src/common/command.c:900
+#: src/common/command.c:902
 #, c-format
 msgid "%s command \"%s\" needs a server connection!\n"
 msgstr ""
 
-#: src/common/command.c:930
+#: src/common/command.c:932
 #, c-format
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr ""
 
-#: src/common/command.c:1075
+#: src/common/command.c:1077
 msgid "This window is not a channel!\n"
 msgstr ""
 
-#: src/common/command.c:1108 src/common/command.c:1145
-#: src/common/command.c:1280
+#: src/common/command.c:1110 src/common/command.c:1147
+#: src/common/command.c:1282
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1117
+#: src/common/command.c:1119
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr ""
 
-#: src/common/command.c:1123
+#: src/common/command.c:1125
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr ""
 
-#: src/common/command.c:1135 src/common/command.c:1156
+#: src/common/command.c:1137 src/common/command.c:1158
 msgid "List of aliases:\n"
 msgstr ""
 
-#: src/common/command.c:1170
+#: src/common/command.c:1172
 msgid "No alias defined.\n"
 msgstr ""
 
-#: src/common/command.c:1189
+#: src/common/command.c:1191
 #, c-format
 msgid "%sServer: %s%s\n"
 msgstr ""
 
-#: src/common/command.c:1194
+#: src/common/command.c:1196
 #, c-format
 msgid "%snot connected\n"
 msgstr ""
 
-#: src/common/command.c:1198
+#: src/common/command.c:1200
 #, c-format
 msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
 msgstr ""
 
-#: src/common/command.c:1207
+#: src/common/command.c:1209
 #, c-format
 msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
 msgstr ""
 
-#: src/common/command.c:1216 src/common/command.c:1228
+#: src/common/command.c:1218 src/common/command.c:1230
 #, c-format
 msgid "%sunknown\n"
 msgstr ""
 
-#: src/common/command.c:1224
+#: src/common/command.c:1226
 #, c-format
 msgid "%sraw IRC data\n"
 msgstr ""
 
-#: src/common/command.c:1259
+#: src/common/command.c:1261
 msgid "Opened buffers:\n"
 msgstr ""
 
-#: src/common/command.c:1304
+#: src/common/command.c:1306
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr ""
 
-#: src/common/command.c:1321
+#: src/common/command.c:1323
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr ""
 
-#: src/common/command.c:1332
+#: src/common/command.c:1334
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr ""
 
-#: src/common/command.c:1390
+#: src/common/command.c:1392
 msgid "Notify levels:  "
 msgstr ""
 
-#: src/common/command.c:1396
+#: src/common/command.c:1398
 msgid "Raw IRC data"
 msgstr ""
 
-#: src/common/command.c:1420 src/common/command.c:1470
+#: src/common/command.c:1422 src/common/command.c:1472
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr ""
 
-#: src/common/command.c:1430
+#: src/common/command.c:1432
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr ""
 
-#: src/common/command.c:1440
+#: src/common/command.c:1442
 #, c-format
 msgid "New notify level for %s%s%s: %s%d %s"
 msgstr ""
 
-#: src/common/command.c:1450
+#: src/common/command.c:1452
 msgid "(hotlist: never)\n"
 msgstr ""
 
-#: src/common/command.c:1453
+#: src/common/command.c:1455
 msgid "(hotlist: highlights)\n"
 msgstr ""
 
-#: src/common/command.c:1456
+#: src/common/command.c:1458
 msgid "(hotlist: highlights + messages)\n"
 msgstr ""
 
-#: src/common/command.c:1459
+#: src/common/command.c:1461
 msgid "(hotlist: highlights + messages + join/part (all))\n"
 msgstr ""
 
-#: src/common/command.c:1590
+#: src/common/command.c:1592
 #, c-format
 msgid "Charsets for server %s%s%s: "
 msgstr ""
 
-#: src/common/command.c:1598
+#: src/common/command.c:1600
 #, c-format
 msgid "Charsets for channel %s%s%s: "
 msgstr ""
 
-#: src/common/command.c:1606
+#: src/common/command.c:1608
 #, c-format
 msgid "Charsets for private %s%s%s: "
 msgstr ""
 
-#: src/common/command.c:1634 src/common/command.c:1664
-#: src/common/command.c:1694
+#: src/common/command.c:1636 src/common/command.c:1666
+#: src/common/command.c:1696
 #, c-format
 msgid " (inherited: \"%s%s%s\")"
 msgstr ""
 
-#: src/common/command.c:1763 src/common/command.c:1791
-#: src/common/command.c:1933 src/common/command.c:2561
-#: src/common/command.c:3658 src/common/command.c:3701
+#: src/common/command.c:1765 src/common/command.c:1793
+#: src/common/command.c:1935 src/common/command.c:2563
+#: src/common/command.c:3660 src/common/command.c:3703
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1826
+#: src/common/command.c:1828
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr ""
 
-#: src/common/command.c:1834
+#: src/common/command.c:1836
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr ""
 
-#: src/common/command.c:1853 src/common/command.c:1982
+#: src/common/command.c:1855 src/common/command.c:1984
 #, c-format
 msgid "%s server not found\n"
 msgstr ""
 
-#: src/common/command.c:1966
+#: src/common/command.c:1968
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr ""
 
-#: src/common/command.c:1974
+#: src/common/command.c:1976
 msgid "Auto-reconnection is cancelled\n"
 msgstr ""
 
-#: src/common/command.c:2010 src/common/weechat.c:459
+#: src/common/command.c:2012 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr ""
 
-#: src/common/command.c:2020 src/common/weechat.c:479
+#: src/common/command.c:2022 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr ""
 
-#: src/common/command.c:2034
+#: src/common/command.c:2036
 msgid "Plugin commands:\n"
 msgstr ""
 
-#: src/common/command.c:2150
+#: src/common/command.c:2152
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr ""
 
-#: src/common/command.c:2219
+#: src/common/command.c:2221
 #, c-format
 msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n"
 msgstr ""
 
-#: src/common/command.c:2257
+#: src/common/command.c:2259
 msgid "List of ignore:\n"
 msgstr ""
 
-#: src/common/command.c:2274
+#: src/common/command.c:2276
 msgid "No ignore defined.\n"
 msgstr ""
 
-#: src/common/command.c:2300
+#: src/common/command.c:2302
 msgid "New ignore:"
 msgstr ""
 
-#: src/common/command.c:2320
+#: src/common/command.c:2322
 #, c-format
 msgid "New key binding:  %s"
 msgstr ""
 
-#: src/common/command.c:2359
+#: src/common/command.c:2361
 msgid "Key bindings:\n"
 msgstr ""
 
-#: src/common/command.c:2373
+#: src/common/command.c:2375
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr ""
 
-#: src/common/command.c:2379
+#: src/common/command.c:2381
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:2387 src/common/weechat.c:511
+#: src/common/command.c:2389 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr ""
 
-#: src/common/command.c:2407
+#: src/common/command.c:2409
 msgid "Default key bindings restored\n"
 msgstr ""
 
-#: src/common/command.c:2413
+#: src/common/command.c:2415
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 
-#: src/common/command.c:2474
+#: src/common/command.c:2476
 msgid "Plugins loaded:\n"
 msgstr ""
 
-#: src/common/command.c:2490
+#: src/common/command.c:2492
 msgid "     message handlers:\n"
 msgstr ""
 
-#: src/common/command.c:2499
+#: src/common/command.c:2501
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr ""
 
-#: src/common/command.c:2506
+#: src/common/command.c:2508
 msgid "       (no message handler)\n"
 msgstr ""
 
-#: src/common/command.c:2511
+#: src/common/command.c:2513
 msgid "     command handlers:\n"
 msgstr ""
 
-#: src/common/command.c:2532
+#: src/common/command.c:2534
 msgid "       (no command handler)\n"
 msgstr ""
 
-#: src/common/command.c:2538
+#: src/common/command.c:2540
 msgid "  (no plugin)\n"
 msgstr ""
 
-#: src/common/command.c:2574
+#: src/common/command.c:2576
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
 msgstr ""
 
-#: src/common/command.c:2602
+#: src/common/command.c:2604
 msgid "Configuration file saved\n"
 msgstr ""
 
-#: src/common/command.c:2607
+#: src/common/command.c:2609
 #, c-format
 msgid "%s failed to save configuration file\n"
 msgstr ""
 
-#: src/common/command.c:2646
+#: src/common/command.c:2648
 msgid "No server.\n"
 msgstr ""
 
-#: src/common/command.c:2657
+#: src/common/command.c:2659
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr ""
 
-#: src/common/command.c:2669
+#: src/common/command.c:2671
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:2677
+#: src/common/command.c:2679
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr ""
 
-#: src/common/command.c:2687
+#: src/common/command.c:2689
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:2695
+#: src/common/command.c:2697
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
 "disconnect %s before.\n"
 msgstr ""
 
-#: src/common/command.c:2715
+#: src/common/command.c:2717
 #, c-format
 msgid "Server %s%s%s has been deleted\n"
 msgstr ""
 
-#: src/common/command.c:2734
+#: src/common/command.c:2736
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:2744
+#: src/common/command.c:2746
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr ""
 
-#: src/common/command.c:2773 src/common/command.c:2801
-#: src/common/command.c:2814 src/common/command.c:2840
+#: src/common/command.c:2775 src/common/command.c:2803
+#: src/common/command.c:2816 src/common/command.c:2842
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:2786
+#: src/common/command.c:2788
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:2827
+#: src/common/command.c:2829
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:2864
+#: src/common/command.c:2866
 #, c-format
 msgid "Server %s%s%s created\n"
 msgstr ""
 
-#: src/common/command.c:2873
+#: src/common/command.c:2875
 #, c-format
 msgid "%s unable to create server\n"
 msgstr ""
 
-#: src/common/command.c:2933
+#: src/common/command.c:2935
 msgid "(unknown)"
 msgstr ""
 
-#: src/common/command.c:2956
+#: src/common/command.c:2958
 #, c-format
 msgid "%s(password hidden) "
 msgstr ""
 
-#: src/common/command.c:3054
+#: src/common/command.c:3056
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr ""
 
-#: src/common/command.c:3087 src/common/command.c:3135
+#: src/common/command.c:3089 src/common/command.c:3137
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr ""
 
-#: src/common/command.c:3092 src/common/command.c:3127
+#: src/common/command.c:3094 src/common/command.c:3129
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:3108
+#: src/common/command.c:3110
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr ""
 
-#: src/common/command.c:3218
+#: src/common/command.c:3220
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:3221
+#: src/common/command.c:3223
 msgid "No config option found\n"
 msgstr ""
 
-#: src/common/command.c:3228
+#: src/common/command.c:3230
 #, c-format
 msgid "%sDetail:\n"
 msgstr ""
 
-#: src/common/command.c:3233
+#: src/common/command.c:3235
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr ""
 
-#: src/common/command.c:3234 src/common/command.c:3257
-#: src/common/command.c:3263 src/common/command.c:3269
+#: src/common/command.c:3236 src/common/command.c:3259
+#: src/common/command.c:3265 src/common/command.c:3271
 #: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
 #: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr ""
 
-#: src/common/command.c:3239
+#: src/common/command.c:3241
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr ""
 
-#: src/common/command.c:3242 src/common/weechat.c:404
+#: src/common/command.c:3244 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr ""
 
-#: src/common/command.c:3246
+#: src/common/command.c:3248
 msgid "  . type string (values: "
 msgstr ""
 
-#: src/common/command.c:3259 src/common/command.c:3265
-#: src/common/command.c:3271 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/command.c:3261 src/common/command.c:3267
+#: src/common/command.c:3273 src/common/weechat.c:422 src/common/weechat.c:429
 #: src/common/weechat.c:436
 msgid "empty"
 msgstr ""
 
-#: src/common/command.c:3262
+#: src/common/command.c:3264
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr ""
 
-#: src/common/command.c:3268
+#: src/common/command.c:3270
 msgid "  . type string (any string)\n"
 msgstr ""
 
-#: src/common/command.c:3274 src/common/weechat.c:439
+#: src/common/command.c:3276 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr ""
 
-#: src/common/command.c:3285
+#: src/common/command.c:3287
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:3288
+#: src/common/command.c:3290
 msgid "config option(s) found\n"
 msgstr ""
 
-#: src/common/command.c:3314
+#: src/common/command.c:3316
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr ""
 
-#: src/common/command.c:3324
+#: src/common/command.c:3326
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr ""
 
-#: src/common/command.c:3384
+#: src/common/command.c:3386
 msgid "ignore were removed.\n"
 msgstr ""
 
-#: src/common/command.c:3386
+#: src/common/command.c:3388
 msgid "ignore was removed.\n"
 msgstr ""
 
-#: src/common/command.c:3391
+#: src/common/command.c:3393
 #, c-format
 msgid "%s no ignore found\n"
 msgstr ""
 
-#: src/common/command.c:3425
+#: src/common/command.c:3427
 #, c-format
 msgid "%s can't upgrade: connection to at least one server is pending\n"
 msgstr ""
 
-#: src/common/command.c:3435
+#: src/common/command.c:3437
 #, c-format
 msgid ""
 "%s can't upgrade: connection to at least one SSL server is active (should be "
 "fixed in a future version)\n"
 msgstr ""
 
-#: src/common/command.c:3451
+#: src/common/command.c:3453
 msgid "Upgrading WeeChat...\n"
 msgstr ""
 
-#: src/common/command.c:3458
+#: src/common/command.c:3460
 #, c-format
 msgid "%s unable to save session in file\n"
 msgstr ""
 
-#: src/common/command.c:3484
+#: src/common/command.c:3486
 #, c-format
 msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n"
 msgstr ""
 
-#: src/common/command.c:3524
+#: src/common/command.c:3526
 #, c-format
 msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s"
 msgstr ""
 
-#: src/common/command.c:3538
+#: src/common/command.c:3540
 #, c-format
 msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s"
 msgstr ""
 
-#: src/common/command.c:3582
+#: src/common/command.c:3584
 msgid "Opened windows:\n"
 msgstr ""
 
-#: src/common/command.c:3669
+#: src/common/command.c:3671
 #, c-format
 msgid ""
 "%s can not merge windows, there's no other window with same size near "
diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c
index 01d08551a..91b74d99a 100644
--- a/weechat/src/common/command.c
+++ b/weechat/src/common/command.c
@@ -147,7 +147,9 @@ t_weechat_command weechat_commands[] =
     N_("[option [ = value]]"),
     N_("option: name of an option (if name is full "
        "and no value is given, then help is displayed on option)\n"
-       "value: value for option"),
+       "value: value for option\n\n"
+       "Option may be: servername.server_xxx where \"servername\" is an "
+       "internal server name and \"xxx\" an option for this server."),
     "%o = %v", 0, MAX_ARGS, NULL, weechat_cmd_set },
   { "unalias", N_("remove an alias"),
     N_("alias_name"), N_("alias_name: name of alias to remove"),