Improved /window command: now split and merge are ok, fixed crash when resizing terminal to small size

1 files changed, 97 insertions, 106 deletions

diff --git a/po/fr.po b/po/fr.po
index ebf787158..99690cbf8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.0-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-02-05 18:41+0100\n"
+"POT-Creation-Date: 2005-02-06 04:10+0100\n"
 "PO-Revision-Date: 2005-01-01 13:00+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1162,7 +1162,7 @@ msgstr "drapeau de mode inconnu"
 msgid "can't change mode for other users"
 msgstr "impossible de changer le mode pour les autres utilisateurs"
 
-#: src/irc/irc-display.c:145 src/common/command.c:820
+#: src/irc/irc-display.c:145 src/common/command.c:801
 msgid "Server: "
 msgstr "Serveur: "
 
@@ -1229,7 +1229,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:1331
+#: src/irc/irc-send.c:717 src/irc/irc-send.c:791 src/common/command.c:1341
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n"
@@ -1762,60 +1762,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:572
+#: src/gui/curses/gui-display.c:597
 msgid "bytes"
 msgstr "octets"
 
-#: src/gui/curses/gui-display.c:572
+#: src/gui/curses/gui-display.c:597
 msgid "Kb"
 msgstr "Ko"
 
-#: src/gui/curses/gui-display.c:572
+#: src/gui/curses/gui-display.c:597
 msgid "Mb"
 msgstr "Mo"
 
-#: src/gui/curses/gui-display.c:572
+#: src/gui/curses/gui-display.c:597
 msgid "Gb"
 msgstr "Go"
 
-#: src/gui/curses/gui-display.c:935
+#: src/gui/curses/gui-display.c:960
 msgid "(away)"
 msgstr "(absent)"
 
-#: src/gui/curses/gui-display.c:1013
+#: src/gui/curses/gui-display.c:1038
 #, c-format
 msgid "%d:[not connected] "
 msgstr "%d:[non connecté] "
 
-#: src/gui/curses/gui-display.c:1024
+#: src/gui/curses/gui-display.c:1049
 msgid "Act: "
 msgstr "Act: "
 
-#: src/gui/curses/gui-display.c:1068
+#: src/gui/curses/gui-display.c:1093
 #, c-format
 msgid "Lag: %.1f"
 msgstr "Lag: %.1f"
 
-#: src/gui/curses/gui-display.c:1080 src/gui/curses/gui-display.c:1083
+#: src/gui/curses/gui-display.c:1105 src/gui/curses/gui-display.c:1108
 msgid "-MORE-"
 msgstr "-PLUS-"
 
-#: src/gui/curses/gui-display.c:1252
+#: src/gui/curses/gui-display.c:1277
 msgid "  [A] Accept"
 msgstr "  [A] Accepter"
 
-#: src/gui/curses/gui-display.c:1253 src/gui/curses/gui-display.c:1259
-#: src/gui/curses/gui-display.c:1266
+#: src/gui/curses/gui-display.c:1278 src/gui/curses/gui-display.c:1284
+#: src/gui/curses/gui-display.c:1291
 msgid "  [C] Cancel"
 msgstr "  [C] Annuler"
 
-#: src/gui/curses/gui-display.c:1254 src/gui/curses/gui-display.c:1260
-#: src/gui/curses/gui-display.c:1267 src/gui/curses/gui-display.c:1274
-#: src/gui/curses/gui-display.c:1279
+#: src/gui/curses/gui-display.c:1279 src/gui/curses/gui-display.c:1285
+#: src/gui/curses/gui-display.c:1292 src/gui/curses/gui-display.c:1299
+#: src/gui/curses/gui-display.c:1304
 msgid "  [Q] Close DCC view"
 msgstr "  [Q] Fermer la vue DCC"
 
-#: src/gui/curses/gui-display.c:1273
+#: src/gui/curses/gui-display.c:1298
 msgid "  [R] Remove"
 msgstr "  [R] Retirer"
 
@@ -2025,23 +2025,21 @@ msgid "manage windows"
 msgstr "gestion des fenêtres"
 
 #: src/common/command.c:102
-msgid "[action]"
-msgstr "[action]"
+msgid "[list | splith | splitv | [merge [down | up | left | right | all]]]"
+msgstr "[list | splith | splitv | [merge [down | up | left | right | all]]]"
 
-#: src/common/command.c:103
+#: src/common/command.c:104
 msgid ""
-"action: action to do:\n"
-"   close  close current window (under development!)\n"
-"    list  list opened windows (no parameter implies this list)\n"
-"  splith  split current window horizontally\n"
-"  splitv  split current window vertically"
+"  list  list opened windows (no parameter implies this list)\n"
+"splith  split current window horizontally\n"
+"splitv  split current window vertically\n"
+" merge  merge window with another"
 msgstr ""
 "action: action à effectuer:\n"
-"   close  ferme la fenêtre courante (en développement !)\n"
-"    list  liste toutes 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"
+"  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"
+" merge  fusionne la fenêtre avec une autre"
 
 #: src/common/command.c:250
 #, c-format
@@ -2119,7 +2117,7 @@ msgstr "%s impossible de trouver le pseudo pour envoyer le message\n"
 msgid "This window is not a channel!\n"
 msgstr "Cette fenêtre n'est pas un canal !\n"
 
-#: src/common/command.c:736 src/common/command.c:760 src/common/command.c:855
+#: src/common/command.c:736 src/common/command.c:760 src/common/command.c:865
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr "%s paramètres manquants pour la commande \"%s\"\n"
@@ -2143,141 +2141,142 @@ msgid "No alias defined.\n"
 msgstr "Aucun alias défini.\n"
 
 #: src/common/command.c:807
-msgid "Opened buffers:\n"
-msgstr "Tampons ouverts:\n"
-
-#: src/common/command.c:826
 msgid "Channel: "
 msgstr "Canal: "
 
-#: src/common/command.c:829 src/common/command.c:839
+#: src/common/command.c:810 src/common/command.c:820
 msgid " (server: "
 msgstr " (serveur: "
 
-#: src/common/command.c:836
+#: src/common/command.c:817
 msgid "Private with: "
 msgstr "Privé avec: "
 
-#: src/common/command.c:878 src/common/command.c:992
+#: src/common/command.c:844
+msgid "Opened buffers:\n"
+msgstr "Tampons ouverts:\n"
+
+#: src/common/command.c:888 src/common/command.c:1002
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr "%s numéro de buffer incorrect\n"
 
-#: src/common/command.c:892
+#: src/common/command.c:902
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr "%s impossible de fermer le tampon unique\n"
 
-#: src/common/command.c:902
+#: src/common/command.c:912
 #, 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:928
+#: src/common/command.c:938
 msgid "Notify levels:  "
 msgstr "Niveaux de notification:  "
 
-#: src/common/command.c:955 src/common/command.c:965
+#: src/common/command.c:965 src/common/command.c:975
 #, c-format
 msgid "%s incorrect notify level (must be between 0 and 3)\n"
 msgstr "%s niveau de notification incorrect (doit être entre 0 et 3)\n"
 
-#: src/common/command.c:983
+#: src/common/command.c:993
 #, c-format
 msgid "%s buffer \"%s\" not found for \"%s\" command\n"
 msgstr "%s buffer \"%s\" non trouvé pour la commande \"%s\"\n"
 
-#: src/common/command.c:1017
+#: src/common/command.c:1027
 #, c-format
 msgid "unknown parameter \"%s\" for \"%s\" command\n"
 msgstr "paramètre inconnu \"%s\" pour la commande \"%s\"\n"
 
-#: src/common/command.c:1046
+#: src/common/command.c:1056
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s déjà connecté au serveur \"%s\" !\n"
 
-#: src/common/command.c:1066 src/common/command.c:1109
-#: src/common/command.c:1759
+#: src/common/command.c:1076 src/common/command.c:1119
+#: src/common/command.c:1769
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s serveur \"%s\" non trouvé\n"
 
-#: src/common/command.c:1092
+#: src/common/command.c:1102
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr "%s non connecté au serveur \"%s\" !\n"
 
-#: src/common/command.c:1100
+#: src/common/command.c:1110
 msgid "Auto-reconnection is cancelled\n"
 msgstr "La reconnexion automatique est annulée\n"
 
-#: src/common/command.c:1129
+#: src/common/command.c:1139
 #, c-format
 msgid "> List of %s internal commands:\n"
 msgstr "> Liste des commandes internes %s :\n"
 
-#: src/common/command.c:1140
+#: src/common/command.c:1150
 msgid "> List of IRC commands:\n"
 msgstr "> Liste des commandes IRC :\n"
 
-#: src/common/command.c:1158
+#: src/common/command.c:1168
 #, c-format
 msgid "> Help on %s internal command \""
 msgstr "> Aide sur la commande interne %s \""
 
-#: src/common/command.c:1163 src/common/command.c:1186
+#: src/common/command.c:1173 src/common/command.c:1196
 msgid "Syntax: "
 msgstr "Syntaxe: "
 
-#: src/common/command.c:1181
+#: src/common/command.c:1191
 msgid "> Help on IRC command \""
 msgstr "> Aide sur la commande IRC \""
 
-#: src/common/command.c:1200
+#: src/common/command.c:1210
 #, 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:1225
+#: src/common/command.c:1235
 msgid "Registered Perl scripts:\n"
 msgstr "Scripts Perl enregistrés :\n"
 
-#: src/common/command.c:1242 src/common/command.c:1264
-#: src/common/command.c:1286
+#: src/common/command.c:1252 src/common/command.c:1274
+#: src/common/command.c:1296
 msgid "  (none)\n"
 msgstr "  (aucun)\n"
 
-#: src/common/command.c:1247
+#: src/common/command.c:1257
 msgid "Perl message handlers:\n"
 msgstr "Fonctions Perl pour messages :\n"
 
-#: src/common/command.c:1256
+#: src/common/command.c:1266
 #, c-format
 msgid "  IRC(%s) => Perl(%s)\n"
 msgstr "  IRC(%s) => Perl(%s)\n"
 
-#: src/common/command.c:1269
+#: src/common/command.c:1279
 msgid "Perl command handlers:\n"
 msgstr "Commandes Perl :\n"
 
-#: src/common/command.c:1278
+#: src/common/command.c:1288
 #, c-format
 msgid "  Command /%s => Perl(%s)\n"
 msgstr "  Commande /%s => Perl(%s)\n"
 
-#: src/common/command.c:1298
+#: src/common/command.c:1308
 msgid "Perl scripts unloaded\n"
 msgstr "Scripts Perl déchargés\n"
 
-#: src/common/command.c:1324 src/common/command.c:1991
+#: src/common/command.c:1334 src/common/command.c:2040
+#: src/common/command.c:2052
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s option inconnue pour la commande \"%s\"\n"
 
-#: src/common/command.c:1337
+#: src/common/command.c:1347
 msgid ""
 "WeeChat was build without Perl support.\n"
 "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n"
@@ -2286,31 +2285,31 @@ msgstr ""
 "Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le "
 "script ./configure\n"
 
-#: src/common/command.c:1391
+#: src/common/command.c:1401
 msgid "No server.\n"
 msgstr "Pas de serveur.\n"
 
-#: src/common/command.c:1402
+#: src/common/command.c:1412
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "Serveur '%s' non trouvé.\n"
 
-#: src/common/command.c:1414
+#: src/common/command.c:1424
 #, 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:1422
+#: src/common/command.c:1432
 #, 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:1441
+#: src/common/command.c:1451
 #, 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:1449
+#: src/common/command.c:1459
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -2319,100 +2318,104 @@ msgstr ""
 "%s vous ne pouvez pas supprimer le server \"%s\" car vous êtes connecté "
 "dessus. Essayez /disconnect %s avant.\n"
 
-#: src/common/command.c:1465 src/common/command.c:1606
+#: src/common/command.c:1475 src/common/command.c:1616
 msgid "Server"
 msgstr "Serveur"
 
-#: src/common/command.c:1468
+#: src/common/command.c:1478
 msgid "has been deleted\n"
 msgstr "a été supprimé\n"
 
-#: src/common/command.c:1483
+#: src/common/command.c:1493
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s paramètres manquants pour la commande \"%s\"\n"
 
-#: src/common/command.c:1493
+#: src/common/command.c:1503
 #, 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:1518 src/common/command.c:1546
-#: src/common/command.c:1559 src/common/command.c:1585
+#: src/common/command.c:1528 src/common/command.c:1556
+#: src/common/command.c:1569 src/common/command.c:1595
 #, 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:1531
+#: src/common/command.c:1541
 #, 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:1572
+#: src/common/command.c:1582
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s commande manquante pour le paramètre \"%s\"\n"
 
-#: src/common/command.c:1609
+#: src/common/command.c:1619
 msgid "created\n"
 msgstr "créé\n"
 
-#: src/common/command.c:1615
+#: src/common/command.c:1625
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s impossible de créer le serveur\n"
 
-#: src/common/command.c:1672
+#: src/common/command.c:1682
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: src/common/command.c:1695
+#: src/common/command.c:1705
 msgid "(password hidden) "
 msgstr "(mot de passe caché)"
 
-#: src/common/command.c:1791 src/common/command.c:1838
+#: src/common/command.c:1801 src/common/command.c:1848
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s option de configuration \"%s\" non trouvée\n"
 
-#: src/common/command.c:1796 src/common/command.c:1830
+#: src/common/command.c:1806 src/common/command.c:1840
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s valeur incorrecte pour l'option \"%s\"\n"
 
-#: src/common/command.c:1812
+#: src/common/command.c:1822
 #, 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:1914
+#: src/common/command.c:1924
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr "Aucune option de configuration trouvée avec \"%s\"\n"
 
-#: src/common/command.c:1917
+#: src/common/command.c:1927
 msgid "No config option found\n"
 msgstr "Aucune option de configuration trouvée\n"
 
-#: src/common/command.c:1924
+#: src/common/command.c:1934
 #, 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:1927
+#: src/common/command.c:1937
 msgid "config option(s) found\n"
 msgstr "option(s) de configuration trouvée(s)\n"
 
-#: src/common/command.c:1947
+#: src/common/command.c:1957
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s alias ou commande \"%s\" non trouvé\n"
 
-#: src/common/command.c:1957
+#: src/common/command.c:1967
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "Alias \"%s\" supprimé\n"
 
+#: src/common/command.c:1987
+msgid "Opened windows:\n"
+msgstr "Fenêtres ouvertes:\n"
+
 #: src/common/weechat.c:184
 #, c-format
 msgid ""
@@ -3401,15 +3404,3 @@ msgstr ""
 #: src/common/weeconfig.c:1504
 msgid "saving config to disk\n"
 msgstr "sauvegarde de la configuration sur disque\n"
-
-#~ msgid "> List of "
-#~ msgstr "> Liste de "
-
-#~ msgid " commands:\n"
-#~ msgstr " commandes:\n"
-
-#~ msgid "> Help on "
-#~ msgstr "> Aide sur "
-
-#~ msgid " command \""
-#~ msgstr " commande \""