Improved /help command output

10 files changed, 304 insertions, 380 deletions

diff --git a/ChangeLog b/ChangeLog
index 62e80b4f1..e2ac55be5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,13 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2005-02-15
+ChangeLog - 2005-02-17
 
 
 Version 0.1.1 (under dev!):
    * added support for UnrealIrcd ("~" for chan owner, "&" for chan admin)
    * on server buffer, only server messages are logged
+   * improved /help command output
    * plugins messages are logged with new config option (log_plugin_msg)
    * fixed /buffer close command (now ok when disconnected from server)
    * fixed display bugs when many windows are opened
diff --git a/po/fr.po b/po/fr.po
index 8981f56b0..86b1ad3ac 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.1-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-02-15 20:55+0100\n"
+"POT-Creation-Date: 2005-02-17 23:45+0100\n"
 "PO-Revision-Date: 2005-02-12 12:00+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1233,7 +1233,7 @@ msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n"
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
 
-#: src/irc/irc-send.c:717 src/irc/irc-send.c:791 src/common/command.c:1363
+#: src/irc/irc-send.c:717 src/irc/irc-send.c:791 src/common/command.c:1355
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n"
@@ -1766,60 +1766,60 @@ msgstr ""
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s le lag est élevé, déconnexion du serveur...\n"
 
-#: src/gui/curses/gui-display.c:598
+#: src/gui/curses/gui-display.c:601
 msgid "bytes"
 msgstr "octets"
 
-#: src/gui/curses/gui-display.c:598
+#: src/gui/curses/gui-display.c:601
 msgid "Kb"
 msgstr "Ko"
 
-#: src/gui/curses/gui-display.c:598
+#: src/gui/curses/gui-display.c:601
 msgid "Mb"
 msgstr "Mo"
 
-#: src/gui/curses/gui-display.c:598
+#: src/gui/curses/gui-display.c:601
 msgid "Gb"
 msgstr "Go"
 
-#: src/gui/curses/gui-display.c:968
+#: src/gui/curses/gui-display.c:971
 msgid "(away)"
 msgstr "(absent)"
 
-#: src/gui/curses/gui-display.c:1053
+#: src/gui/curses/gui-display.c:1056
 #, c-format
 msgid "%d:[not connected] "
 msgstr "%d:[non connecté] "
 
-#: src/gui/curses/gui-display.c:1070
+#: src/gui/curses/gui-display.c:1073
 msgid "Act: "
 msgstr "Act: "
 
-#: src/gui/curses/gui-display.c:1119
+#: src/gui/curses/gui-display.c:1122
 #, c-format
 msgid "Lag: %.1f"
 msgstr "Lag: %.1f"
 
-#: src/gui/curses/gui-display.c:1134
+#: src/gui/curses/gui-display.c:1137
 msgid "-MORE-"
 msgstr "-PLUS-"
 
-#: src/gui/curses/gui-display.c:1310
+#: src/gui/curses/gui-display.c:1313
 msgid "  [A] Accept"
 msgstr "  [A] Accepter"
 
-#: src/gui/curses/gui-display.c:1311 src/gui/curses/gui-display.c:1317
-#: src/gui/curses/gui-display.c:1324
+#: src/gui/curses/gui-display.c:1314 src/gui/curses/gui-display.c:1320
+#: src/gui/curses/gui-display.c:1327
 msgid "  [C] Cancel"
 msgstr "  [C] Annuler"
 
-#: src/gui/curses/gui-display.c:1312 src/gui/curses/gui-display.c:1318
-#: src/gui/curses/gui-display.c:1325 src/gui/curses/gui-display.c:1332
-#: src/gui/curses/gui-display.c:1337
+#: src/gui/curses/gui-display.c:1315 src/gui/curses/gui-display.c:1321
+#: src/gui/curses/gui-display.c:1328 src/gui/curses/gui-display.c:1335
+#: src/gui/curses/gui-display.c:1340
 msgid "  [Q] Close DCC view"
 msgstr "  [Q] Fermer la vue DCC"
 
-#: src/gui/curses/gui-display.c:1331
+#: src/gui/curses/gui-display.c:1334
 msgid "  [R] Remove"
 msgstr "  [R] Retirer"
 
@@ -2039,7 +2039,6 @@ msgid ""
 "splitv  split current window vertically\n"
 " merge  merge window with another"
 msgstr ""
-"action: action à effectuer:\n"
 "  list  liste les fenêtres ouvertes (pas de paramètre affiche cette liste)\n"
 "splith  éclate la fenêtre en deux horizontalement\n"
 "splitv  éclate la fenêtre en deux verticalement\n"
@@ -2202,7 +2201,7 @@ msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s déjà connecté au serveur \"%s\" !\n"
 
 #: src/common/command.c:1090 src/common/command.c:1133
-#: src/common/command.c:1791
+#: src/common/command.c:1783
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s serveur \"%s\" non trouvé\n"
@@ -2218,69 +2217,56 @@ msgstr "La reconnexion automatique est annulée\n"
 
 #: src/common/command.c:1153
 #, c-format
-msgid "> List of %s internal commands:\n"
-msgstr "> Liste des commandes internes %s :\n"
+msgid "%s internal commands:\n"
+msgstr "Commandes internes %s :\n"
 
 #: src/common/command.c:1164
-msgid "> List of IRC commands:\n"
-msgstr "> Liste des commandes IRC :\n"
-
-#: src/common/command.c:1182
-#, c-format
-msgid "> Help on %s internal command \""
-msgstr "> Aide sur la commande interne %s \""
+msgid "IRC commands:\n"
+msgstr "Commandes IRC :\n"
 
-#: src/common/command.c:1187 src/common/command.c:1214
-msgid "Syntax: "
-msgstr "Syntaxe: "
-
-#: src/common/command.c:1209
-msgid "> Help on IRC command \""
-msgstr "> Aide sur la commande IRC \""
-
-#: src/common/command.c:1232
+#: src/common/command.c:1224
 #, 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:1257
+#: src/common/command.c:1249
 msgid "Registered Perl scripts:\n"
 msgstr "Scripts Perl enregistrés :\n"
 
-#: src/common/command.c:1274 src/common/command.c:1296
-#: src/common/command.c:1318
+#: src/common/command.c:1266 src/common/command.c:1288
+#: src/common/command.c:1310
 msgid "  (none)\n"
 msgstr "  (aucun)\n"
 
-#: src/common/command.c:1279
+#: src/common/command.c:1271
 msgid "Perl message handlers:\n"
 msgstr "Fonctions Perl pour messages :\n"
 
-#: src/common/command.c:1288
+#: src/common/command.c:1280
 #, c-format
 msgid "  IRC(%s) => Perl(%s)\n"
 msgstr "  IRC(%s) => Perl(%s)\n"
 
-#: src/common/command.c:1301
+#: src/common/command.c:1293
 msgid "Perl command handlers:\n"
 msgstr "Commandes Perl :\n"
 
-#: src/common/command.c:1310
+#: src/common/command.c:1302
 #, c-format
 msgid "  Command /%s => Perl(%s)\n"
 msgstr "  Commande /%s => Perl(%s)\n"
 
-#: src/common/command.c:1330
+#: src/common/command.c:1322
 msgid "Perl scripts unloaded\n"
 msgstr "Scripts Perl déchargés\n"
 
-#: src/common/command.c:1356 src/common/command.c:2062
-#: src/common/command.c:2074
+#: src/common/command.c:1348 src/common/command.c:2054
+#: src/common/command.c:2066
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s option inconnue pour la commande \"%s\"\n"
 
-#: src/common/command.c:1369
+#: src/common/command.c:1361
 msgid ""
 "WeeChat was build without Perl support.\n"
 "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n"
@@ -2289,31 +2275,31 @@ msgstr ""
 "Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le "
 "script ./configure\n"
 
-#: src/common/command.c:1423
+#: src/common/command.c:1415
 msgid "No server.\n"
 msgstr "Pas de serveur.\n"
 
-#: src/common/command.c:1434
+#: src/common/command.c:1426
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "Serveur '%s' non trouvé.\n"
 
-#: src/common/command.c:1446
+#: src/common/command.c:1438
 #, 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:1454
+#: src/common/command.c:1446
 #, 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:1473
+#: src/common/command.c:1465
 #, 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:1481
+#: src/common/command.c:1473
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -2322,101 +2308,101 @@ msgstr ""
 "%s vous ne pouvez pas supprimer le server \"%s\" car vous êtes connecté "
 "dessus. Essayez /disconnect %s avant.\n"
 
-#: src/common/command.c:1497 src/common/command.c:1638
+#: src/common/command.c:1489 src/common/command.c:1630
 msgid "Server"
 msgstr "Serveur"
 
-#: src/common/command.c:1500
+#: src/common/command.c:1492
 msgid "has been deleted\n"
 msgstr "a été supprimé\n"
 
-#: src/common/command.c:1515
+#: src/common/command.c:1507
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s paramètres manquants pour la commande \"%s\"\n"
 
-#: src/common/command.c:1525
+#: src/common/command.c:1517
 #, 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:1550 src/common/command.c:1578
-#: src/common/command.c:1591 src/common/command.c:1617
+#: src/common/command.c:1542 src/common/command.c:1570
+#: src/common/command.c:1583 src/common/command.c:1609
 #, 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:1563
+#: src/common/command.c:1555
 #, 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:1604
+#: src/common/command.c:1596
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s commande manquante pour le paramètre \"%s\"\n"
 
-#: src/common/command.c:1641
+#: src/common/command.c:1633
 msgid "created\n"
 msgstr "créé\n"
 
-#: src/common/command.c:1647
+#: src/common/command.c:1639
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s impossible de créer le serveur\n"
 
-#: src/common/command.c:1704
+#: src/common/command.c:1696
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: src/common/command.c:1727
+#: src/common/command.c:1719
 msgid "(password hidden) "
 msgstr "(mot de passe caché)"
 
-#: src/common/command.c:1823 src/common/command.c:1870
+#: src/common/command.c:1815 src/common/command.c:1862
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s option de configuration \"%s\" non trouvée\n"
 
-#: src/common/command.c:1828 src/common/command.c:1862
+#: src/common/command.c:1820 src/common/command.c:1854
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s valeur incorrecte pour l'option \"%s\"\n"
 
-#: src/common/command.c:1844
+#: src/common/command.c:1836
 #, 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:1946
+#: src/common/command.c:1938
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr "Aucune option de configuration trouvée avec \"%s\"\n"
 
-#: src/common/command.c:1949
+#: src/common/command.c:1941
 msgid "No config option found\n"
 msgstr "Aucune option de configuration trouvée\n"
 
-#: src/common/command.c:1956
+#: src/common/command.c:1948
 #, 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:1959
+#: src/common/command.c:1951
 msgid "config option(s) found\n"
 msgstr "option(s) de configuration trouvée(s)\n"
 
-#: src/common/command.c:1979
+#: src/common/command.c:1971
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s alias ou commande \"%s\" non trouvé\n"
 
-#: src/common/command.c:1989
+#: src/common/command.c:1981
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "Alias \"%s\" supprimé\n"
 
-#: src/common/command.c:2009
+#: src/common/command.c:2001
 msgid "Opened windows:\n"
 msgstr "Fenêtres ouvertes:\n"
 
diff --git a/po/weechat.pot b/po/weechat.pot
index 727d9144f..8eb28b816 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: 2005-02-15 20:55+0100\n"
+"POT-Creation-Date: 2005-02-17 23:45+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"
@@ -1136,7 +1136,7 @@ msgstr ""
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-send.c:717 src/irc/irc-send.c:791 src/common/command.c:1363
+#: src/irc/irc-send.c:717 src/irc/irc-send.c:791 src/common/command.c:1355
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr ""
@@ -1654,60 +1654,60 @@ msgstr ""
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:598
+#: src/gui/curses/gui-display.c:601
 msgid "bytes"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:598
+#: src/gui/curses/gui-display.c:601
 msgid "Kb"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:598
+#: src/gui/curses/gui-display.c:601
 msgid "Mb"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:598
+#: src/gui/curses/gui-display.c:601
 msgid "Gb"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:968
+#: src/gui/curses/gui-display.c:971
 msgid "(away)"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1053
+#: src/gui/curses/gui-display.c:1056
 #, c-format
 msgid "%d:[not connected] "
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1070
+#: src/gui/curses/gui-display.c:1073
 msgid "Act: "
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1119
+#: src/gui/curses/gui-display.c:1122
 #, c-format
 msgid "Lag: %.1f"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1134
+#: src/gui/curses/gui-display.c:1137
 msgid "-MORE-"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1310
+#: src/gui/curses/gui-display.c:1313
 msgid "  [A] Accept"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1311 src/gui/curses/gui-display.c:1317
-#: src/gui/curses/gui-display.c:1324
+#: src/gui/curses/gui-display.c:1314 src/gui/curses/gui-display.c:1320
+#: src/gui/curses/gui-display.c:1327
 msgid "  [C] Cancel"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1312 src/gui/curses/gui-display.c:1318
-#: src/gui/curses/gui-display.c:1325 src/gui/curses/gui-display.c:1332
-#: src/gui/curses/gui-display.c:1337
+#: src/gui/curses/gui-display.c:1315 src/gui/curses/gui-display.c:1321
+#: src/gui/curses/gui-display.c:1328 src/gui/curses/gui-display.c:1335
+#: src/gui/curses/gui-display.c:1340
 msgid "  [Q] Close DCC view"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1331
+#: src/gui/curses/gui-display.c:1334
 msgid "  [R] Remove"
 msgstr ""
 
@@ -2046,7 +2046,7 @@ msgid "%s already connected to server \"%s\"!\n"
 msgstr ""
 
 #: src/common/command.c:1090 src/common/command.c:1133
-#: src/common/command.c:1791
+#: src/common/command.c:1783
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr ""
@@ -2062,200 +2062,187 @@ msgstr ""
 
 #: src/common/command.c:1153
 #, c-format
-msgid "> List of %s internal commands:\n"
+msgid "%s internal commands:\n"
 msgstr ""
 
 #: src/common/command.c:1164
-msgid "> List of IRC commands:\n"
+msgid "IRC commands:\n"
 msgstr ""
 
-#: src/common/command.c:1182
-#, c-format
-msgid "> Help on %s internal command \""
-msgstr ""
-
-#: src/common/command.c:1187 src/common/command.c:1214
-msgid "Syntax: "
-msgstr ""
-
-#: src/common/command.c:1209
-msgid "> Help on IRC command \""
-msgstr ""
-
-#: src/common/command.c:1232
+#: src/common/command.c:1224
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr ""
 
-#: src/common/command.c:1257
+#: src/common/command.c:1249
 msgid "Registered Perl scripts:\n"
 msgstr ""
 
-#: src/common/command.c:1274 src/common/command.c:1296
-#: src/common/command.c:1318
+#: src/common/command.c:1266 src/common/command.c:1288
+#: src/common/command.c:1310
 msgid "  (none)\n"
 msgstr ""
 
-#: src/common/command.c:1279
+#: src/common/command.c:1271
 msgid "Perl message handlers:\n"
 msgstr ""
 
-#: src/common/command.c:1288
+#: src/common/command.c:1280
 #, c-format
 msgid "  IRC(%s) => Perl(%s)\n"
 msgstr ""
 
-#: src/common/command.c:1301
+#: src/common/command.c:1293
 msgid "Perl command handlers:\n"
 msgstr ""
 
-#: src/common/command.c:1310
+#: src/common/command.c:1302
 #, c-format
 msgid "  Command /%s => Perl(%s)\n"
 msgstr ""
 
-#: src/common/command.c:1330
+#: src/common/command.c:1322
 msgid "Perl scripts unloaded\n"
 msgstr ""
 
-#: src/common/command.c:1356 src/common/command.c:2062
-#: src/common/command.c:2074
+#: src/common/command.c:1348 src/common/command.c:2054
+#: src/common/command.c:2066
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1369
+#: src/common/command.c:1361
 msgid ""
 "WeeChat was build without Perl support.\n"
 "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n"
 msgstr ""
 
-#: src/common/command.c:1423
+#: src/common/command.c:1415
 msgid "No server.\n"
 msgstr ""
 
-#: src/common/command.c:1434
+#: src/common/command.c:1426
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr ""
 
-#: src/common/command.c:1446
+#: src/common/command.c:1438
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1454
+#: src/common/command.c:1446
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr ""
 
-#: src/common/command.c:1473
+#: src/common/command.c:1465
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1481
+#: src/common/command.c:1473
 #, 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:1497 src/common/command.c:1638
+#: src/common/command.c:1489 src/common/command.c:1630
 msgid "Server"
 msgstr ""
 
-#: src/common/command.c:1500
+#: src/common/command.c:1492
 msgid "has been deleted\n"
 msgstr ""
 
-#: src/common/command.c:1515
+#: src/common/command.c:1507
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1525
+#: src/common/command.c:1517
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr ""
 
-#: src/common/command.c:1550 src/common/command.c:1578
-#: src/common/command.c:1591 src/common/command.c:1617
+#: src/common/command.c:1542 src/common/command.c:1570
+#: src/common/command.c:1583 src/common/command.c:1609
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:1563
+#: src/common/command.c:1555
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:1604
+#: src/common/command.c:1596
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:1641
+#: src/common/command.c:1633
 msgid "created\n"
 msgstr ""
 
-#: src/common/command.c:1647
+#: src/common/command.c:1639
 #, c-format
 msgid "%s unable to create server\n"
 msgstr ""
 
-#: src/common/command.c:1704
+#: src/common/command.c:1696
 msgid "(unknown)"
 msgstr ""
 
-#: src/common/command.c:1727
+#: src/common/command.c:1719
 msgid "(password hidden) "
 msgstr ""
 
-#: src/common/command.c:1823 src/common/command.c:1870
+#: src/common/command.c:1815 src/common/command.c:1862
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr ""
 
-#: src/common/command.c:1828 src/common/command.c:1862
+#: src/common/command.c:1820 src/common/command.c:1854
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:1844
+#: src/common/command.c:1836
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr ""
 
-#: src/common/command.c:1946
+#: src/common/command.c:1938
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:1949
+#: src/common/command.c:1941
 msgid "No config option found\n"
 msgstr ""
 
-#: src/common/command.c:1956
+#: src/common/command.c:1948
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:1959
+#: src/common/command.c:1951
 msgid "config option(s) found\n"
 msgstr ""
 
-#: src/common/command.c:1979
+#: src/common/command.c:1971
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr ""
 
-#: src/common/command.c:1989
+#: src/common/command.c:1981
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr ""
 
-#: src/common/command.c:2009
+#: src/common/command.c:2001
 msgid "Opened windows:\n"
 msgstr ""
 
diff --git a/src/common/command.c b/src/common/command.c
index cbbadff5b..48e3f85f0 100644
--- a/src/common/command.c
+++ b/src/common/command.c
@@ -1148,29 +1148,31 @@ weechat_cmd_help (int argc, char **argv)
 
     if (argc == 0)
     {
-        irc_display_prefix (NULL, PREFIX_INFO);
+        gui_printf (NULL, "\n");
         gui_printf (NULL,
-                    _("> List of %s internal commands:\n"),
+                    _("%s internal commands:\n"),
                     PACKAGE_NAME);
+        gui_printf (NULL, "\n");
         for (i = 0; weechat_commands[i].command_name; i++)
         {
-            irc_display_prefix (NULL, PREFIX_INFO);
-            gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "    %s",
+            gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "   %s",
                               weechat_commands[i].command_name);
             gui_printf (NULL, " - %s\n",
                         _(weechat_commands[i].command_description));
         }
-        irc_display_prefix (NULL, PREFIX_INFO);
-        gui_printf (NULL, _("> List of IRC commands:\n"));
+        gui_printf (NULL, "\n");
+        gui_printf (NULL, _("IRC commands:\n"));
+        gui_printf (NULL, "\n");
         for (i = 0; irc_commands[i].command_name; i++)
+        {
             if (irc_commands[i].cmd_function_args || irc_commands[i].cmd_function_1arg)
             {
-                irc_display_prefix (NULL, PREFIX_INFO);
-                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "    %s",
+                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "   %s",
                                   irc_commands[i].command_name);
                 gui_printf (NULL, " - %s\n",
                             _(irc_commands[i].command_description));
             }
+        }
     }
     if (argc == 1)
     {
@@ -1178,24 +1180,19 @@ weechat_cmd_help (int argc, char **argv)
         {
             if (strcasecmp (weechat_commands[i].command_name, argv[0]) == 0)
             {
-                irc_display_prefix (NULL, PREFIX_INFO);
-                gui_printf (NULL, _("> Help on %s internal command \""), PACKAGE_NAME);
-                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s",
-                                  weechat_commands[i].command_name);
-                gui_printf (NULL, "\":\n");
-                irc_display_prefix (NULL, PREFIX_INFO);
-                gui_printf (NULL, _("Syntax: "));
-                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "/%s",
+                gui_printf (NULL, "\n");
+                gui_printf (NULL, "[w]");
+                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "  /%s",
                                   weechat_commands[i].command_name);
                 if (weechat_commands[i].arguments &&
                     weechat_commands[i].arguments[0])
-                    gui_printf (NULL, " %s\n",
+                    gui_printf (NULL, "  %s\n",
                                 _(weechat_commands[i].arguments));
                 else
                     gui_printf (NULL, "\n");
                 if (weechat_commands[i].arguments_description &&
                     weechat_commands[i].arguments_description[0])
-                    gui_printf (NULL, "%s\n",
+                    gui_printf (NULL, "\n%s\n",
                                 _(weechat_commands[i].arguments_description));
                 return 0;
             }
@@ -1205,24 +1202,19 @@ weechat_cmd_help (int argc, char **argv)
             if ((strcasecmp (irc_commands[i].command_name, argv[0]) == 0)
                 && (irc_commands[i].cmd_function_args || irc_commands[i].cmd_function_1arg))
             {
-                irc_display_prefix (NULL, PREFIX_INFO);
-                gui_printf (NULL, _("> Help on IRC command \""));
-                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s",
-                                  irc_commands[i].command_name);
-                gui_printf (NULL, "\":\n");
-                irc_display_prefix (NULL, PREFIX_INFO);
-                gui_printf (NULL, _("Syntax: "));
-                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "/%s",
+                gui_printf (NULL, "\n");
+                gui_printf (NULL, "[i]");
+                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "  /%s",
                                   irc_commands[i].command_name);
                 if (irc_commands[i].arguments &&
                     irc_commands[i].arguments[0])
-                    gui_printf (NULL, " %s\n",
+                    gui_printf (NULL, "  %s\n",
                                 _(irc_commands[i].arguments));
                 else
                     gui_printf (NULL, "\n");
                 if (irc_commands[i].arguments_description &&
                     irc_commands[i].arguments_description[0])
-                    gui_printf (NULL, "%s\n",
+                    gui_printf (NULL, "\n%s\n",
                                 _(irc_commands[i].arguments_description));
                 return 0;
             }
diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c
index ec488e310..6fa24e0aa 100644
--- a/src/gui/curses/gui-display.c
+++ b/src/gui/curses/gui-display.c
@@ -401,7 +401,10 @@ gui_get_line_num_splits (t_gui_window *window, t_gui_line *line)
         width = window->win_chat_width - line->length_align;
     }
     
-    return (length % width == 0) ? (length / width) : ((length / width) + 1);
+    if (length == 0)
+        return 1;
+    else
+        return (length % width == 0) ? (length / width) : ((length / width) + 1);
 }
 
 /*
@@ -2241,15 +2244,8 @@ gui_add_message (t_gui_buffer *buffer, int type, int color, char *message)
     if (pos)
     {
         pos[0] = '\n';
-        if ((buffer->num_displayed > 0) /*&& (gui_current_window->sub_lines == 0)*/)
-        {
-            /*if ((buffer->window->win_chat_cursor_y
-                + gui_get_line_num_splits (buffer, buffer->last_line)) >
-                (buffer->window->win_chat_height - 1))*/
-                gui_draw_buffer_chat (buffer, 0);
-            /*else
-                gui_display_line (buffer, buffer->last_line, 1);*/
-        }
+        if (buffer->num_displayed > 0)
+            gui_draw_buffer_chat (buffer, 0);
         if (buffer->num_displayed == 0)
         {
             if (3 - buffer->last_line->line_with_message -
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 62e80b4f1..e2ac55be5 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,12 +1,13 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2005-02-15
+ChangeLog - 2005-02-17
 
 
 Version 0.1.1 (under dev!):
    * added support for UnrealIrcd ("~" for chan owner, "&" for chan admin)
    * on server buffer, only server messages are logged
+   * improved /help command output
    * plugins messages are logged with new config option (log_plugin_msg)
    * fixed /buffer close command (now ok when disconnected from server)
    * fixed display bugs when many windows are opened
diff --git a/weechat/po/fr.po b/weechat/po/fr.po
index 8981f56b0..86b1ad3ac 100644
--- a/weechat/po/fr.po
+++ b/weechat/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.1-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-02-15 20:55+0100\n"
+"POT-Creation-Date: 2005-02-17 23:45+0100\n"
 "PO-Revision-Date: 2005-02-12 12:00+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1233,7 +1233,7 @@ msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n"
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
 
-#: src/irc/irc-send.c:717 src/irc/irc-send.c:791 src/common/command.c:1363
+#: src/irc/irc-send.c:717 src/irc/irc-send.c:791 src/common/command.c:1355
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n"
@@ -1766,60 +1766,60 @@ msgstr ""
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s le lag est élevé, déconnexion du serveur...\n"
 
-#: src/gui/curses/gui-display.c:598
+#: src/gui/curses/gui-display.c:601
 msgid "bytes"
 msgstr "octets"
 
-#: src/gui/curses/gui-display.c:598
+#: src/gui/curses/gui-display.c:601
 msgid "Kb"
 msgstr "Ko"
 
-#: src/gui/curses/gui-display.c:598
+#: src/gui/curses/gui-display.c:601
 msgid "Mb"
 msgstr "Mo"
 
-#: src/gui/curses/gui-display.c:598
+#: src/gui/curses/gui-display.c:601
 msgid "Gb"
 msgstr "Go"
 
-#: src/gui/curses/gui-display.c:968
+#: src/gui/curses/gui-display.c:971
 msgid "(away)"
 msgstr "(absent)"
 
-#: src/gui/curses/gui-display.c:1053
+#: src/gui/curses/gui-display.c:1056
 #, c-format
 msgid "%d:[not connected] "
 msgstr "%d:[non connecté] "
 
-#: src/gui/curses/gui-display.c:1070
+#: src/gui/curses/gui-display.c:1073
 msgid "Act: "
 msgstr "Act: "
 
-#: src/gui/curses/gui-display.c:1119
+#: src/gui/curses/gui-display.c:1122
 #, c-format
 msgid "Lag: %.1f"
 msgstr "Lag: %.1f"
 
-#: src/gui/curses/gui-display.c:1134
+#: src/gui/curses/gui-display.c:1137
 msgid "-MORE-"
 msgstr "-PLUS-"
 
-#: src/gui/curses/gui-display.c:1310
+#: src/gui/curses/gui-display.c:1313
 msgid "  [A] Accept"
 msgstr "  [A] Accepter"
 
-#: src/gui/curses/gui-display.c:1311 src/gui/curses/gui-display.c:1317
-#: src/gui/curses/gui-display.c:1324
+#: src/gui/curses/gui-display.c:1314 src/gui/curses/gui-display.c:1320
+#: src/gui/curses/gui-display.c:1327
 msgid "  [C] Cancel"
 msgstr "  [C] Annuler"
 
-#: src/gui/curses/gui-display.c:1312 src/gui/curses/gui-display.c:1318
-#: src/gui/curses/gui-display.c:1325 src/gui/curses/gui-display.c:1332
-#: src/gui/curses/gui-display.c:1337
+#: src/gui/curses/gui-display.c:1315 src/gui/curses/gui-display.c:1321
+#: src/gui/curses/gui-display.c:1328 src/gui/curses/gui-display.c:1335
+#: src/gui/curses/gui-display.c:1340
 msgid "  [Q] Close DCC view"
 msgstr "  [Q] Fermer la vue DCC"
 
-#: src/gui/curses/gui-display.c:1331
+#: src/gui/curses/gui-display.c:1334
 msgid "  [R] Remove"
 msgstr "  [R] Retirer"
 
@@ -2039,7 +2039,6 @@ msgid ""
 "splitv  split current window vertically\n"
 " merge  merge window with another"
 msgstr ""
-"action: action à effectuer:\n"
 "  list  liste les fenêtres ouvertes (pas de paramètre affiche cette liste)\n"
 "splith  éclate la fenêtre en deux horizontalement\n"
 "splitv  éclate la fenêtre en deux verticalement\n"
@@ -2202,7 +2201,7 @@ msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s déjà connecté au serveur \"%s\" !\n"
 
 #: src/common/command.c:1090 src/common/command.c:1133
-#: src/common/command.c:1791
+#: src/common/command.c:1783
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s serveur \"%s\" non trouvé\n"
@@ -2218,69 +2217,56 @@ msgstr "La reconnexion automatique est annulée\n"
 
 #: src/common/command.c:1153
 #, c-format
-msgid "> List of %s internal commands:\n"
-msgstr "> Liste des commandes internes %s :\n"
+msgid "%s internal commands:\n"
+msgstr "Commandes internes %s :\n"
 
 #: src/common/command.c:1164
-msgid "> List of IRC commands:\n"
-msgstr "> Liste des commandes IRC :\n"
-
-#: src/common/command.c:1182
-#, c-format
-msgid "> Help on %s internal command \""
-msgstr "> Aide sur la commande interne %s \""
+msgid "IRC commands:\n"
+msgstr "Commandes IRC :\n"
 
-#: src/common/command.c:1187 src/common/command.c:1214
-msgid "Syntax: "
-msgstr "Syntaxe: "
-
-#: src/common/command.c:1209
-msgid "> Help on IRC command \""
-msgstr "> Aide sur la commande IRC \""
-
-#: src/common/command.c:1232
+#: src/common/command.c:1224
 #, 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:1257
+#: src/common/command.c:1249
 msgid "Registered Perl scripts:\n"
 msgstr "Scripts Perl enregistrés :\n"
 
-#: src/common/command.c:1274 src/common/command.c:1296
-#: src/common/command.c:1318
+#: src/common/command.c:1266 src/common/command.c:1288
+#: src/common/command.c:1310
 msgid "  (none)\n"
 msgstr "  (aucun)\n"
 
-#: src/common/command.c:1279
+#: src/common/command.c:1271
 msgid "Perl message handlers:\n"
 msgstr "Fonctions Perl pour messages :\n"
 
-#: src/common/command.c:1288
+#: src/common/command.c:1280
 #, c-format
 msgid "  IRC(%s) => Perl(%s)\n"
 msgstr "  IRC(%s) => Perl(%s)\n"
 
-#: src/common/command.c:1301
+#: src/common/command.c:1293
 msgid "Perl command handlers:\n"
 msgstr "Commandes Perl :\n"
 
-#: src/common/command.c:1310
+#: src/common/command.c:1302
 #, c-format
 msgid "  Command /%s => Perl(%s)\n"
 msgstr "  Commande /%s => Perl(%s)\n"
 
-#: src/common/command.c:1330
+#: src/common/command.c:1322
 msgid "Perl scripts unloaded\n"
 msgstr "Scripts Perl déchargés\n"
 
-#: src/common/command.c:1356 src/common/command.c:2062
-#: src/common/command.c:2074
+#: src/common/command.c:1348 src/common/command.c:2054
+#: src/common/command.c:2066
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s option inconnue pour la commande \"%s\"\n"
 
-#: src/common/command.c:1369
+#: src/common/command.c:1361
 msgid ""
 "WeeChat was build without Perl support.\n"
 "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n"
@@ -2289,31 +2275,31 @@ msgstr ""
 "Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le "
 "script ./configure\n"
 
-#: src/common/command.c:1423
+#: src/common/command.c:1415
 msgid "No server.\n"
 msgstr "Pas de serveur.\n"
 
-#: src/common/command.c:1434
+#: src/common/command.c:1426
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "Serveur '%s' non trouvé.\n"
 
-#: src/common/command.c:1446
+#: src/common/command.c:1438
 #, 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:1454
+#: src/common/command.c:1446
 #, 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:1473
+#: src/common/command.c:1465
 #, 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:1481
+#: src/common/command.c:1473
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -2322,101 +2308,101 @@ msgstr ""
 "%s vous ne pouvez pas supprimer le server \"%s\" car vous êtes connecté "
 "dessus. Essayez /disconnect %s avant.\n"
 
-#: src/common/command.c:1497 src/common/command.c:1638
+#: src/common/command.c:1489 src/common/command.c:1630
 msgid "Server"
 msgstr "Serveur"
 
-#: src/common/command.c:1500
+#: src/common/command.c:1492
 msgid "has been deleted\n"
 msgstr "a été supprimé\n"
 
-#: src/common/command.c:1515
+#: src/common/command.c:1507
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s paramètres manquants pour la commande \"%s\"\n"
 
-#: src/common/command.c:1525
+#: src/common/command.c:1517
 #, 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:1550 src/common/command.c:1578
-#: src/common/command.c:1591 src/common/command.c:1617
+#: src/common/command.c:1542 src/common/command.c:1570
+#: src/common/command.c:1583 src/common/command.c:1609
 #, 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:1563
+#: src/common/command.c:1555
 #, 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:1604
+#: src/common/command.c:1596
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s commande manquante pour le paramètre \"%s\"\n"
 
-#: src/common/command.c:1641
+#: src/common/command.c:1633
 msgid "created\n"
 msgstr "créé\n"
 
-#: src/common/command.c:1647
+#: src/common/command.c:1639
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s impossible de créer le serveur\n"
 
-#: src/common/command.c:1704
+#: src/common/command.c:1696
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: src/common/command.c:1727
+#: src/common/command.c:1719
 msgid "(password hidden) "
 msgstr "(mot de passe caché)"
 
-#: src/common/command.c:1823 src/common/command.c:1870
+#: src/common/command.c:1815 src/common/command.c:1862
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s option de configuration \"%s\" non trouvée\n"
 
-#: src/common/command.c:1828 src/common/command.c:1862
+#: src/common/command.c:1820 src/common/command.c:1854
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s valeur incorrecte pour l'option \"%s\"\n"
 
-#: src/common/command.c:1844
+#: src/common/command.c:1836
 #, 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:1946
+#: src/common/command.c:1938
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr "Aucune option de configuration trouvée avec \"%s\"\n"
 
-#: src/common/command.c:1949
+#: src/common/command.c:1941
 msgid "No config option found\n"
 msgstr "Aucune option de configuration trouvée\n"
 
-#: src/common/command.c:1956
+#: src/common/command.c:1948
 #, 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:1959
+#: src/common/command.c:1951
 msgid "config option(s) found\n"
 msgstr "option(s) de configuration trouvée(s)\n"
 
-#: src/common/command.c:1979
+#: src/common/command.c:1971
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s alias ou commande \"%s\" non trouvé\n"
 
-#: src/common/command.c:1989
+#: src/common/command.c:1981
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "Alias \"%s\" supprimé\n"
 
-#: src/common/command.c:2009
+#: src/common/command.c:2001
 msgid "Opened windows:\n"
 msgstr "Fenêtres ouvertes:\n"
 
diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot
index 727d9144f..8eb28b816 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: 2005-02-15 20:55+0100\n"
+"POT-Creation-Date: 2005-02-17 23:45+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"
@@ -1136,7 +1136,7 @@ msgstr ""
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-send.c:717 src/irc/irc-send.c:791 src/common/command.c:1363
+#: src/irc/irc-send.c:717 src/irc/irc-send.c:791 src/common/command.c:1355
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr ""
@@ -1654,60 +1654,60 @@ msgstr ""
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:598
+#: src/gui/curses/gui-display.c:601
 msgid "bytes"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:598
+#: src/gui/curses/gui-display.c:601
 msgid "Kb"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:598
+#: src/gui/curses/gui-display.c:601
 msgid "Mb"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:598
+#: src/gui/curses/gui-display.c:601
 msgid "Gb"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:968
+#: src/gui/curses/gui-display.c:971
 msgid "(away)"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1053
+#: src/gui/curses/gui-display.c:1056
 #, c-format
 msgid "%d:[not connected] "
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1070
+#: src/gui/curses/gui-display.c:1073
 msgid "Act: "
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1119
+#: src/gui/curses/gui-display.c:1122
 #, c-format
 msgid "Lag: %.1f"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1134
+#: src/gui/curses/gui-display.c:1137
 msgid "-MORE-"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1310
+#: src/gui/curses/gui-display.c:1313
 msgid "  [A] Accept"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1311 src/gui/curses/gui-display.c:1317
-#: src/gui/curses/gui-display.c:1324
+#: src/gui/curses/gui-display.c:1314 src/gui/curses/gui-display.c:1320
+#: src/gui/curses/gui-display.c:1327
 msgid "  [C] Cancel"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1312 src/gui/curses/gui-display.c:1318
-#: src/gui/curses/gui-display.c:1325 src/gui/curses/gui-display.c:1332
-#: src/gui/curses/gui-display.c:1337
+#: src/gui/curses/gui-display.c:1315 src/gui/curses/gui-display.c:1321
+#: src/gui/curses/gui-display.c:1328 src/gui/curses/gui-display.c:1335
+#: src/gui/curses/gui-display.c:1340
 msgid "  [Q] Close DCC view"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1331
+#: src/gui/curses/gui-display.c:1334
 msgid "  [R] Remove"
 msgstr ""
 
@@ -2046,7 +2046,7 @@ msgid "%s already connected to server \"%s\"!\n"
 msgstr ""
 
 #: src/common/command.c:1090 src/common/command.c:1133
-#: src/common/command.c:1791
+#: src/common/command.c:1783
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr ""
@@ -2062,200 +2062,187 @@ msgstr ""
 
 #: src/common/command.c:1153
 #, c-format
-msgid "> List of %s internal commands:\n"
+msgid "%s internal commands:\n"
 msgstr ""
 
 #: src/common/command.c:1164
-msgid "> List of IRC commands:\n"
+msgid "IRC commands:\n"
 msgstr ""
 
-#: src/common/command.c:1182
-#, c-format
-msgid "> Help on %s internal command \""
-msgstr ""
-
-#: src/common/command.c:1187 src/common/command.c:1214
-msgid "Syntax: "
-msgstr ""
-
-#: src/common/command.c:1209
-msgid "> Help on IRC command \""
-msgstr ""
-
-#: src/common/command.c:1232
+#: src/common/command.c:1224
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr ""
 
-#: src/common/command.c:1257
+#: src/common/command.c:1249
 msgid "Registered Perl scripts:\n"
 msgstr ""
 
-#: src/common/command.c:1274 src/common/command.c:1296
-#: src/common/command.c:1318
+#: src/common/command.c:1266 src/common/command.c:1288
+#: src/common/command.c:1310
 msgid "  (none)\n"
 msgstr ""
 
-#: src/common/command.c:1279
+#: src/common/command.c:1271
 msgid "Perl message handlers:\n"
 msgstr ""
 
-#: src/common/command.c:1288
+#: src/common/command.c:1280
 #, c-format
 msgid "  IRC(%s) => Perl(%s)\n"
 msgstr ""
 
-#: src/common/command.c:1301
+#: src/common/command.c:1293
 msgid "Perl command handlers:\n"
 msgstr ""
 
-#: src/common/command.c:1310
+#: src/common/command.c:1302
 #, c-format
 msgid "  Command /%s => Perl(%s)\n"
 msgstr ""
 
-#: src/common/command.c:1330
+#: src/common/command.c:1322
 msgid "Perl scripts unloaded\n"
 msgstr ""
 
-#: src/common/command.c:1356 src/common/command.c:2062
-#: src/common/command.c:2074
+#: src/common/command.c:1348 src/common/command.c:2054
+#: src/common/command.c:2066
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1369
+#: src/common/command.c:1361
 msgid ""
 "WeeChat was build without Perl support.\n"
 "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n"
 msgstr ""
 
-#: src/common/command.c:1423
+#: src/common/command.c:1415
 msgid "No server.\n"
 msgstr ""
 
-#: src/common/command.c:1434
+#: src/common/command.c:1426
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr ""
 
-#: src/common/command.c:1446
+#: src/common/command.c:1438
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1454
+#: src/common/command.c:1446
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr ""
 
-#: src/common/command.c:1473
+#: src/common/command.c:1465
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1481
+#: src/common/command.c:1473
 #, 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:1497 src/common/command.c:1638
+#: src/common/command.c:1489 src/common/command.c:1630
 msgid "Server"
 msgstr ""
 
-#: src/common/command.c:1500
+#: src/common/command.c:1492
 msgid "has been deleted\n"
 msgstr ""
 
-#: src/common/command.c:1515
+#: src/common/command.c:1507
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1525
+#: src/common/command.c:1517
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr ""
 
-#: src/common/command.c:1550 src/common/command.c:1578
-#: src/common/command.c:1591 src/common/command.c:1617
+#: src/common/command.c:1542 src/common/command.c:1570
+#: src/common/command.c:1583 src/common/command.c:1609
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:1563
+#: src/common/command.c:1555
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:1604
+#: src/common/command.c:1596
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:1641
+#: src/common/command.c:1633
 msgid "created\n"
 msgstr ""
 
-#: src/common/command.c:1647
+#: src/common/command.c:1639
 #, c-format
 msgid "%s unable to create server\n"
 msgstr ""
 
-#: src/common/command.c:1704
+#: src/common/command.c:1696
 msgid "(unknown)"
 msgstr ""
 
-#: src/common/command.c:1727
+#: src/common/command.c:1719
 msgid "(password hidden) "
 msgstr ""
 
-#: src/common/command.c:1823 src/common/command.c:1870
+#: src/common/command.c:1815 src/common/command.c:1862
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr ""
 
-#: src/common/command.c:1828 src/common/command.c:1862
+#: src/common/command.c:1820 src/common/command.c:1854
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:1844
+#: src/common/command.c:1836
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr ""
 
-#: src/common/command.c:1946
+#: src/common/command.c:1938
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:1949
+#: src/common/command.c:1941
 msgid "No config option found\n"
 msgstr ""
 
-#: src/common/command.c:1956
+#: src/common/command.c:1948
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:1959
+#: src/common/command.c:1951
 msgid "config option(s) found\n"
 msgstr ""
 
-#: src/common/command.c:1979
+#: src/common/command.c:1971
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr ""
 
-#: src/common/command.c:1989
+#: src/common/command.c:1981
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr ""
 
-#: src/common/command.c:2009
+#: src/common/command.c:2001
 msgid "Opened windows:\n"
 msgstr ""
 
diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c
index cbbadff5b..48e3f85f0 100644
--- a/weechat/src/common/command.c
+++ b/weechat/src/common/command.c
@@ -1148,29 +1148,31 @@ weechat_cmd_help (int argc, char **argv)
 
     if (argc == 0)
     {
-        irc_display_prefix (NULL, PREFIX_INFO);
+        gui_printf (NULL, "\n");
         gui_printf (NULL,
-                    _("> List of %s internal commands:\n"),
+                    _("%s internal commands:\n"),
                     PACKAGE_NAME);
+        gui_printf (NULL, "\n");
         for (i = 0; weechat_commands[i].command_name; i++)
         {
-            irc_display_prefix (NULL, PREFIX_INFO);
-            gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "    %s",
+            gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "   %s",
                               weechat_commands[i].command_name);
             gui_printf (NULL, " - %s\n",
                         _(weechat_commands[i].command_description));
         }
-        irc_display_prefix (NULL, PREFIX_INFO);
-        gui_printf (NULL, _("> List of IRC commands:\n"));
+        gui_printf (NULL, "\n");
+        gui_printf (NULL, _("IRC commands:\n"));
+        gui_printf (NULL, "\n");
         for (i = 0; irc_commands[i].command_name; i++)
+        {
             if (irc_commands[i].cmd_function_args || irc_commands[i].cmd_function_1arg)
             {
-                irc_display_prefix (NULL, PREFIX_INFO);
-                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "    %s",
+                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "   %s",
                                   irc_commands[i].command_name);
                 gui_printf (NULL, " - %s\n",
                             _(irc_commands[i].command_description));
             }
+        }
     }
     if (argc == 1)
     {
@@ -1178,24 +1180,19 @@ weechat_cmd_help (int argc, char **argv)
         {
             if (strcasecmp (weechat_commands[i].command_name, argv[0]) == 0)
             {
-                irc_display_prefix (NULL, PREFIX_INFO);
-                gui_printf (NULL, _("> Help on %s internal command \""), PACKAGE_NAME);
-                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s",
-                                  weechat_commands[i].command_name);
-                gui_printf (NULL, "\":\n");
-                irc_display_prefix (NULL, PREFIX_INFO);
-                gui_printf (NULL, _("Syntax: "));
-                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "/%s",
+                gui_printf (NULL, "\n");
+                gui_printf (NULL, "[w]");
+                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "  /%s",
                                   weechat_commands[i].command_name);
                 if (weechat_commands[i].arguments &&
                     weechat_commands[i].arguments[0])
-                    gui_printf (NULL, " %s\n",
+                    gui_printf (NULL, "  %s\n",
                                 _(weechat_commands[i].arguments));
                 else
                     gui_printf (NULL, "\n");
                 if (weechat_commands[i].arguments_description &&
                     weechat_commands[i].arguments_description[0])
-                    gui_printf (NULL, "%s\n",
+                    gui_printf (NULL, "\n%s\n",
                                 _(weechat_commands[i].arguments_description));
                 return 0;
             }
@@ -1205,24 +1202,19 @@ weechat_cmd_help (int argc, char **argv)
             if ((strcasecmp (irc_commands[i].command_name, argv[0]) == 0)
                 && (irc_commands[i].cmd_function_args || irc_commands[i].cmd_function_1arg))
             {
-                irc_display_prefix (NULL, PREFIX_INFO);
-                gui_printf (NULL, _("> Help on IRC command \""));
-                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s",
-                                  irc_commands[i].command_name);
-                gui_printf (NULL, "\":\n");
-                irc_display_prefix (NULL, PREFIX_INFO);
-                gui_printf (NULL, _("Syntax: "));
-                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "/%s",
+                gui_printf (NULL, "\n");
+                gui_printf (NULL, "[i]");
+                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "  /%s",
                                   irc_commands[i].command_name);
                 if (irc_commands[i].arguments &&
                     irc_commands[i].arguments[0])
-                    gui_printf (NULL, " %s\n",
+                    gui_printf (NULL, "  %s\n",
                                 _(irc_commands[i].arguments));
                 else
                     gui_printf (NULL, "\n");
                 if (irc_commands[i].arguments_description &&
                     irc_commands[i].arguments_description[0])
-                    gui_printf (NULL, "%s\n",
+                    gui_printf (NULL, "\n%s\n",
                                 _(irc_commands[i].arguments_description));
                 return 0;
             }
diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c
index ec488e310..6fa24e0aa 100644
--- a/weechat/src/gui/curses/gui-display.c
+++ b/weechat/src/gui/curses/gui-display.c
@@ -401,7 +401,10 @@ gui_get_line_num_splits (t_gui_window *window, t_gui_line *line)
         width = window->win_chat_width - line->length_align;
     }
     
-    return (length % width == 0) ? (length / width) : ((length / width) + 1);
+    if (length == 0)
+        return 1;
+    else
+        return (length % width == 0) ? (length / width) : ((length / width) + 1);
 }
 
 /*
@@ -2241,15 +2244,8 @@ gui_add_message (t_gui_buffer *buffer, int type, int color, char *message)
     if (pos)
     {
         pos[0] = '\n';
-        if ((buffer->num_displayed > 0) /*&& (gui_current_window->sub_lines == 0)*/)
-        {
-            /*if ((buffer->window->win_chat_cursor_y
-                + gui_get_line_num_splits (buffer, buffer->last_line)) >
-                (buffer->window->win_chat_height - 1))*/
-                gui_draw_buffer_chat (buffer, 0);
-            /*else
-                gui_display_line (buffer, buffer->last_line, 1);*/
-        }
+        if (buffer->num_displayed > 0)
+            gui_draw_buffer_chat (buffer, 0);
         if (buffer->num_displayed == 0)
         {
             if (3 - buffer->last_line->line_with_message -