From f02ba717a03c2dee7528c4a6e54b827bdd4f8169 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Sun, 4 Jul 2004 15:39:49 +0000 Subject: [PATCH] Added /buffer command, jump to buffer by number (alt-digit), actions now ok in private buffers --- ChangeLog | 7 +- TODO | 17 +- doc/weechat_doc_en.texi | 21 +- doc/weechat_doc_fr.texi | 21 +- doc/weechat_doc_pt.texi | 8 +- po/fr.po | 423 ++++++++++++++------------ po/weechat.pot | 430 ++++++++++++++------------- src/common/command.c | 75 ++++- src/common/command.h | 1 + src/gui/curses/gui-display.c | 45 +-- src/gui/curses/gui-input.c | 14 + src/gui/gui-common.c | 46 ++- src/gui/gui.h | 12 +- src/irc/irc-recv.c | 90 ++++-- weechat/ChangeLog | 7 +- weechat/TODO | 17 +- weechat/doc/weechat_doc_en.texi | 21 +- weechat/doc/weechat_doc_fr.texi | 21 +- weechat/doc/weechat_doc_pt.texi | 8 +- weechat/po/fr.po | 423 ++++++++++++++------------ weechat/po/weechat.pot | 430 ++++++++++++++------------- weechat/src/common/command.c | 75 ++++- weechat/src/common/command.h | 1 + weechat/src/gui/curses/gui-display.c | 45 +-- weechat/src/gui/curses/gui-input.c | 14 + weechat/src/gui/gui-common.c | 46 ++- weechat/src/gui/gui.h | 12 +- weechat/src/irc/irc-recv.c | 90 ++++-- 28 files changed, 1426 insertions(+), 994 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17b60a71f..42795356e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,13 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2004-07-03 +ChangeLog - 2004-07-04 Version 0.0.7 (under dev!): - * buffers ordered by number, auto-switch to active buffers (alt-a) - * split terminal horizontally/vertically + * /buffer command added, buffers ordered by number, auto-jump to active + buffers (alt-a), jump to buffers by number (alt-number) + * /window command added, split terminal horizontally/vertically * unique color for each nick (based on nickname) * action messages are now considered as messages, not crappy joins/parts * fixed display bug when nicklist is displayed at bottom of screen diff --git a/TODO b/TODO index a33d7f85d..ec2b3c8f6 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,7 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -TODO - 2004-07-03 +TODO - 2004-07-04 Legend: # done @@ -21,8 +21,12 @@ v0.0.7: + "/dcc" command (for chat and sending/receiving files) * Interface: - + split terminal in multiple windows (horizontally/vertically) - + hotlist (channels with activity) and auto-switch to channels + + "/buffer" command, buffers ordered by number, auto-jump to active + buffers (alt-a), jump to buffers by number (alt-number) + + "/window" command, split terminal in multiple windows + (horizontally/vertically) + # forget some old lines that were displayed long time ago (now all is saved, + if WeeChat is running for long time, a lot of memory is used!) + internationalization (traduce WeeChat in many languages) * Configuration: @@ -63,10 +67,7 @@ Future versions: + Gtk GUI - color for nicks (except own nick) when nick colors are disabled - interpret special chars in messages (color & bold for example) - - many channel windows in one window/term (window split) - add lag indicator - - forget some old lines that were displayed long time ago (now all is saved, - if WeeChat is running for long time, a lot of memory is used!) - improve completion (for example complete command parameters when possible) - understand incomplete commands if unambigous (for example: /he for /help is ok) - tab key with empty command line should switch to next window (like F7) @@ -79,10 +80,6 @@ Future versions: - SSL support - IPv6 protocol implementation - * Configuration: - - load config file after GUI (so init values by default (colors, ...) before - loading config) - * Plugins: - Python plugin - "/python load" and "/python unload" commands to (un)load Python scripts diff --git a/doc/weechat_doc_en.texi b/doc/weechat_doc_en.texi index 076947eaf..272d7856b 100644 --- a/doc/weechat_doc_en.texi +++ b/doc/weechat_doc_en.texi @@ -35,7 +35,7 @@ @title WeeChat - User guide @subtitle Fast, light and extensible IRC client -@subtitle Documentation for WeeChat v0.0.6 - June, 12 2004 +@subtitle Documentation for WeeChat v0.0.7 - July, 04 2004 @image{weechat_image} @@ -343,12 +343,12 @@ Type: color (Curses or Gtk color), default value: 'default'@* @item col_status Color for status bar@* Type: color (Curses or Gtk color), default value: 'gray'@* -@item col_status_active -Color for active window (status bar)@* -Type: color (Curses or Gtk color), default value: 'yellow'@* @item col_status_data_msg Color for window with new messages (status bar)@* Type: color (Curses or Gtk color), default value: 'lightred'@* +@item col_status_highlight +Color for window with highlight (status bar)@* +Type: color (Curses or Gtk color), default value: 'yellow'@* @item col_status_data_other Color for window with new data (not messages) (status bar)@* Type: color (Curses or Gtk color), default value: 'lightmagenta'@* @@ -572,14 +572,23 @@ Execute command or send message@* Call again last commands/messages@* @* @item PageUp / PageDown -Show window history@* +Show buffer history@* @* @item F6 / F7 -Switch to previous / next window@* +Switch to previous / next buffer@* +@* +@item F8 +Switch to next window@* @* @item Alt + left arrow / Alt + right arrow Same as F6 / F7@* @* +@item Alt + A +Switch to next buffer with activity (with priority: highlight, message, other)@* +@* +@item Alt + digit (1-9) +Switch to buffer by number@* +@* @item F10 Remove last infobar message@* @* diff --git a/doc/weechat_doc_fr.texi b/doc/weechat_doc_fr.texi index 7a39cc6fb..d9ce8f74a 100644 --- a/doc/weechat_doc_fr.texi +++ b/doc/weechat_doc_fr.texi @@ -35,7 +35,7 @@ @title WeeChat - Guide utilisateur @subtitle Client IRC rapide, l@'eger et extensible -@subtitle Documentation pour WeeChat v0.0.6 - 12 juin 2004 +@subtitle Documentation pour WeeChat v0.0.7 - 04 juillet 2004 @image{weechat_image} @@ -343,12 +343,12 @@ Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'default'@* @item col_status Couleur pour la barre de statut@* Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'gray'@* -@item col_status_active -Couleur pour la fen@^etre active (barre de statut)@* -Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'yellow'@* @item col_status_data_msg Couleur pour une fen@^etre avec de nouvelles infos (barre de statut)@* Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightred'@* +@item col_status_highlight +Color for window with highlight (status bar)@* +Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'yellow'@* @item col_status_data_other Couleur pour une fen@^etre avec des nouvelles donn@'ees (pas des infos) (barre de statut)@* Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightmagenta'@* @@ -572,14 +572,23 @@ Ex@'ecuter la commande ou envoyer le message@* Rappeler les derni@`eres commandes/messages@* @* @item PageUp / PageDown -Afficher l'historique de la fen@^etre@* +Afficher l'historique du tampon@* @* @item F6 / F7 -Aller @`a la fen@^etre pr@'ec@'edente / suivante@* +Aller au tampon pr@'ec@'edent@* +@* +@item F8 +Aller @`a la fen@^etre suivante@* @* @item Alt + fl@`eche gauche / Alt + fl@`eche droite Identique @`a F6 / F7@* @* +@item Alt + A +Sauter au tampon avec activit@'e (avec priorit@'e: highlight, message, autre)@* +@* +@item Alt + chiffre (1-9) +Sauter au tampon avec ce num@'ero@* +@* @item F10 Effacer le dernier message de la barre d'infos@* @* diff --git a/doc/weechat_doc_pt.texi b/doc/weechat_doc_pt.texi index dca2e7d46..e5ff858ff 100644 --- a/doc/weechat_doc_pt.texi +++ b/doc/weechat_doc_pt.texi @@ -35,7 +35,7 @@ @title WeeChat - Guia do Utilizador @subtitle Cliente de IRC rapido, leve e extencivel -@subtitle Documenta@,{c}@~ao do WeeChat v0.0.6 - 12 de Junho de 2004 +@subtitle Documenta@,{c}@~ao do WeeChat v0.0.7 - 04 de Julho de 2004 @image{weechat_image} @@ -277,6 +277,12 @@ Ir para a janela anterior/seguinte@* @item Alt + Seta da esquerda / Alt + Seta da direita Identico a F6 / F7@* @* +@item Alt + A +Comute ao amortecedor seguinte com atividade (com prioridade: destaque, mensagem, outra)@* +@* +@item Alt + d@'igito (1-9) +Comute ao amortecedor pelo n@'umero@* +@* @item F10 Apagar a @'ultima mensagem da barra do info@* @* diff --git a/po/fr.po b/po/fr.po index 1fe44807a..1a1ccf020 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.0.7-pre2\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2004-07-03 15:08+0200\n" +"POT-Creation-Date: 2004-07-04 16:44+0200\n" "PO-Revision-Date: 2004-06-05 10:52+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" @@ -1137,7 +1137,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-send.c:58 src/irc/irc-recv.c:2865 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2897 msgid "unknown" msgstr "inconnu" @@ -1162,17 +1162,17 @@ msgstr "" "%s la commande \"%s\" ne peut pas être exécutée dans une fenêtre serveur\n" #: src/irc/irc-send.c:481 src/irc/irc-send.c:503 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:993 +#: src/irc/irc-recv.c:996 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n" -#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1154 +#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1157 #, c-format 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:547 src/common/command.c:1126 +#: src/irc/irc-send.c:547 src/common/command.c:1176 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n" @@ -1192,7 +1192,7 @@ msgid " has joined " msgstr " a rejoint " #: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:865 -#: src/irc/irc-recv.c:1002 src/irc/irc-recv.c:2365 src/irc/irc-recv.c:2430 +#: src/irc/irc-recv.c:1005 src/irc/irc-recv.c:2397 src/irc/irc-recv.c:2462 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "%s canal non trouvé pour la commande \"%s\"\n" @@ -1294,7 +1294,7 @@ msgid "removes voice from" msgstr "supprime la voix de" #: src/irc/irc-recv.c:538 src/irc/irc-recv.c:611 src/irc/irc-recv.c:907 -#: src/irc/irc-recv.c:1219 +#: src/irc/irc-recv.c:1251 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "%s commande \"%s\" reçue sans host\n" @@ -1339,216 +1339,216 @@ msgstr "%s commande \"%s\" re msgid " has left " msgstr " a quitté " -#: src/irc/irc-recv.c:955 +#: src/irc/irc-recv.c:956 src/irc/irc-recv.c:1183 #, c-format msgid "On %s: * %s %s" msgstr "Sur %s: * %s %s" -#: src/irc/irc-recv.c:979 +#: src/irc/irc-recv.c:982 #, c-format msgid "On %s: %s> %s" msgstr "Sur %s: %s> %s" -#: src/irc/irc-recv.c:1047 +#: src/irc/irc-recv.c:1050 msgid "Received a " msgstr "Reçu un " -#: src/irc/irc-recv.c:1049 +#: src/irc/irc-recv.c:1052 msgid "CTCP VERSION " msgstr "CTCP VERSION " -#: src/irc/irc-recv.c:1051 +#: src/irc/irc-recv.c:1054 msgid "from" msgstr "de" -#: src/irc/irc-recv.c:1086 src/irc/irc-recv.c:1100 src/irc/irc-recv.c:1115 -#: src/irc/irc-recv.c:1130 src/irc/irc-recv.c:1196 src/irc/irc-recv.c:2651 -#: src/irc/irc-recv.c:2691 +#: src/irc/irc-recv.c:1089 src/irc/irc-recv.c:1103 src/irc/irc-recv.c:1118 +#: src/irc/irc-recv.c:1133 src/irc/irc-recv.c:1228 src/irc/irc-recv.c:2683 +#: src/irc/irc-recv.c:2723 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s impossible d'analyser la commande \"%s\"\n" -#: src/irc/irc-recv.c:1178 +#: src/irc/irc-recv.c:1209 #, c-format msgid "Private %s> %s" msgstr "Privé %s> %s" -#: src/irc/irc-recv.c:1251 +#: src/irc/irc-recv.c:1283 msgid "has quit" msgstr "a quitté" -#: src/irc/irc-recv.c:1371 +#: src/irc/irc-recv.c:1403 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s commande \"%s\" reçue sans canal\n" -#: src/irc/irc-recv.c:1399 +#: src/irc/irc-recv.c:1431 msgid " has changed topic for " msgstr " a changé le titre pour " -#: src/irc/irc-recv.c:1404 +#: src/irc/irc-recv.c:1436 #, c-format msgid " to: \"%s\"\n" msgstr " en: \"%s\"\n" -#: src/irc/irc-recv.c:1410 +#: src/irc/irc-recv.c:1442 msgid " has unset topic for " msgstr " a retiré le titre pour " -#: src/irc/irc-recv.c:1501 +#: src/irc/irc-recv.c:1533 #, c-format msgid " is away: %s\n" msgstr " est absent: %s\n" -#: src/irc/irc-recv.c:1575 +#: src/irc/irc-recv.c:1607 msgid "Users online: " msgstr "Utilisateurs en ligne: " -#: src/irc/irc-recv.c:1938 +#: src/irc/irc-recv.c:1970 msgid "idle: " msgstr "inactivité: " -#: src/irc/irc-recv.c:1946 +#: src/irc/irc-recv.c:1978 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:1946 +#: src/irc/irc-recv.c:1978 msgid "day" msgstr "jour" -#: src/irc/irc-recv.c:1956 +#: src/irc/irc-recv.c:1988 msgid "hours" msgstr "heures" -#: src/irc/irc-recv.c:1956 +#: src/irc/irc-recv.c:1988 msgid "hour" msgstr "heure" -#: src/irc/irc-recv.c:1962 +#: src/irc/irc-recv.c:1994 msgid "minutes" msgstr "minutes" -#: src/irc/irc-recv.c:1962 +#: src/irc/irc-recv.c:1994 msgid "minute" msgstr "minute" -#: src/irc/irc-recv.c:1968 +#: src/irc/irc-recv.c:2000 msgid "seconds" msgstr "secondes" -#: src/irc/irc-recv.c:1968 +#: src/irc/irc-recv.c:2000 msgid "second" msgstr "seconde" -#: src/irc/irc-recv.c:1973 +#: src/irc/irc-recv.c:2005 msgid "signon at: " msgstr "signé le: " -#: src/irc/irc-recv.c:2061 +#: src/irc/irc-recv.c:2093 msgid "Channels: " msgstr "Canauxs: " -#: src/irc/irc-recv.c:2312 +#: src/irc/irc-recv.c:2344 msgid "No topic set for " msgstr "Pas de titre défini pour " -#: src/irc/irc-recv.c:2354 +#: src/irc/irc-recv.c:2386 msgid "Topic for " msgstr "Le titre pour " -#: src/irc/irc-recv.c:2358 +#: src/irc/irc-recv.c:2390 #, c-format msgid " is: \"%s\"\n" msgstr " est: \"%s\"\n" -#: src/irc/irc-recv.c:2374 src/irc/irc-recv.c:2454 +#: src/irc/irc-recv.c:2406 src/irc/irc-recv.c:2486 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "%s impossible de déterminer le canal pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2420 +#: src/irc/irc-recv.c:2452 msgid "Topic set by " msgstr "Titre défini par " -#: src/irc/irc-recv.c:2438 +#: src/irc/irc-recv.c:2470 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "%s impossible d'identifier la date/heure pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2446 +#: src/irc/irc-recv.c:2478 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" "%s impossible de déterminer le nom d'utilisateur pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2575 +#: src/irc/irc-recv.c:2607 msgid " on " msgstr " sur " -#: src/irc/irc-recv.c:2682 +#: src/irc/irc-recv.c:2714 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "%s impossible de créer l'utilisateur \"%s\" pour le canal \"%s\"\n" -#: src/irc/irc-recv.c:2735 +#: src/irc/irc-recv.c:2767 msgid "Nicks " msgstr "Utilisateurs " -#: src/irc/irc-recv.c:2755 +#: src/irc/irc-recv.c:2787 msgid "Channel " msgstr "Canal " -#: src/irc/irc-recv.c:2766 +#: src/irc/irc-recv.c:2798 msgid "nicks" msgstr "utilisateurs" -#: src/irc/irc-recv.c:2766 +#: src/irc/irc-recv.c:2798 msgid "nick" msgstr "utilisateur" -#: src/irc/irc-recv.c:2774 +#: src/irc/irc-recv.c:2806 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:2774 +#: src/irc/irc-recv.c:2806 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:2783 +#: src/irc/irc-recv.c:2815 msgid "halfops" msgstr "halfops" -#: src/irc/irc-recv.c:2783 +#: src/irc/irc-recv.c:2815 msgid "halfop" msgstr "halfop" -#: src/irc/irc-recv.c:2792 +#: src/irc/irc-recv.c:2824 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:2792 +#: src/irc/irc-recv.c:2824 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:2801 +#: src/irc/irc-recv.c:2833 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:2834 +#: src/irc/irc-recv.c:2866 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 2nd " "nom d'utilisateur \"%s\"\n" -#: src/irc/irc-recv.c:2845 +#: src/irc/irc-recv.c:2877 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai du 3ème nom " "d'utilisateur \"%s\"\n" -#: src/irc/irc-recv.c:2854 +#: src/irc/irc-recv.c:2886 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1618,16 +1618,16 @@ msgstr "" "%s impossible d'ajouter la fonction pour le message \"%s\" (mémoire " "insuffisante)\n" -#: src/gui/curses/gui-display.c:921 +#: src/gui/curses/gui-display.c:870 #, c-format msgid "%d:[not connected] " msgstr "%d:[non connecté] " -#: src/gui/curses/gui-display.c:929 -msgid "Act: " -msgstr "Act: " +#: src/gui/curses/gui-display.c:878 +msgid "[Act: " +msgstr "[Act: " -#: src/gui/curses/gui-display.c:961 src/gui/curses/gui-display.c:964 +#: src/gui/curses/gui-display.c:913 src/gui/curses/gui-display.c:916 msgid "-MORE-" msgstr "-PLUS-" @@ -1635,17 +1635,17 @@ msgstr "-PLUS-" msgid "server" msgstr "serveur" -#: src/gui/gui-common.c:303 +#: src/gui/gui-common.c:300 #, c-format msgid "%s not enough memory for infobar message\n" msgstr "%s pas assez de mémoire pour un message de la barre d'infos\n" -#: src/gui/gui-common.c:423 +#: src/gui/gui-common.c:421 #, c-format msgid "%s not enough memory for new line!\n" msgstr "%s pas assez de mémoire pour une nouvelle ligne !\n" -#: src/gui/gui-common.c:466 +#: src/gui/gui-common.c:464 msgid "not enough memory!\n" msgstr "pas assez de mémoire !\n" @@ -1668,58 +1668,79 @@ msgstr "" "paramètres: paramètres pour la commande" #: src/common/command.c:46 +msgid "manage buffers" +msgstr "gère les buffers" + +#: src/common/command.c:47 +msgid "[action | number]" +msgstr "[action | nombre]" + +#: src/common/command.c:48 +msgid "" +"action: action to do:\n" +" move move buffer in the list (may be relative, for example -1)\n" +" list list opened buffers (no parameter implies this list)\n" +"number: jump to buffer by number" +msgstr "" +"action: action à effectuer:\n" +" move déplacer le buffer dans la liste (peut être relatif, par exemple -" +"1)\n" +" list liste les buffers ouverts (pas de paramètre affiche cette liste)\n" +"nombre: sauter au buffer qui a ce numéro" + +#: src/common/command.c:53 msgid "clear window(s)" msgstr "affacer la/les fenêtre(s)" -#: src/common/command.c:47 +#: src/common/command.c:54 msgid "[-all]" msgstr "[-all]" -#: src/common/command.c:48 +#: src/common/command.c:55 msgid "-all: clear all windows" msgstr "-all: effacer toutes les fenêtres" -#: src/common/command.c:50 +#: src/common/command.c:57 msgid "connect to a server" msgstr "se connecter à un serveur" -#: src/common/command.c:51 src/common/command.c:55 +#: src/common/command.c:58 src/common/command.c:62 msgid "servername" msgstr "nom_serveur" -#: src/common/command.c:52 +#: src/common/command.c:59 msgid "servername: server name to connect" msgstr "nom_serveur: nom du serveur pour se connecter" -#: src/common/command.c:54 +#: src/common/command.c:61 msgid "disconnect from a server" msgstr "se déconnecter d'un serveur" -#: src/common/command.c:56 +#: src/common/command.c:63 msgid "servername: server name to disconnect" msgstr "nom_serveur: nom du serveur pour se déconnecter" -#: src/common/command.c:58 +#: src/common/command.c:65 msgid "display help about commands" msgstr "afficher l'aide sur les commandes" -#: src/common/command.c:59 +#: src/common/command.c:66 msgid "[command]" msgstr "[commande]" -#: src/common/command.c:59 +#: src/common/command.c:66 msgid "command: name of a WeeChat or IRC command" msgstr "commande: nom d'une commande WeeChat ou IRC" -#: src/common/command.c:61 +#: src/common/command.c:68 msgid "list/load/unload Perl scripts" msgstr "liste/charge/décharge des scripts Perl" -#: src/common/command.c:62 +#: src/common/command.c:69 msgid "[load filename] | [unload]" msgstr "[load fichier] | [unload]" -#: src/common/command.c:63 +#: src/common/command.c:70 msgid "" "filename: Perl script (file) to load\n" "Without argument, /perl command lists all loaded Perl scripts." @@ -1727,11 +1748,11 @@ msgstr "" "fichier: script Perl (fichier) à charger\n" "Sans paramètre, la commande /perl liste tous les scripts Perl chargés." -#: src/common/command.c:66 +#: src/common/command.c:73 msgid "list, add or remove servers" msgstr "liste, ajoute ou retire des serveurs" -#: src/common/command.c:67 +#: src/common/command.c:74 msgid "" "[list] | [servername hostname port [-auto | -noauto] [-pwd password] [-nicks " "nick1 [nick2 [nick3]]] [-username username] [-realname realname] [-command " @@ -1741,7 +1762,7 @@ msgstr "" "nicks pseudo1 [pseudo2 [pseudo3]]] [-username nom_utilisateur] [-realname " "nom_réel] [-command commande] [-autojoin canal[,canal]] ] | [del nom_serveur]" -#: src/common/command.c:72 +#: src/common/command.c:79 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" @@ -1751,7 +1772,7 @@ msgid "" "nick2: alternate nick for server\n" "nick3: second alternate nick for server\n" "username: user name\n" -"realname: real name of user\n" +"realname: real name of user" msgstr "" "nom_serveur: nom du serveur, pour usage interne et affichage\n" "nom/IP: nom ou adresse IP du serveur\n" @@ -1761,29 +1782,29 @@ msgstr "" "pseudo2: pseudo alternatif pour le serveur\n" "pseudo3: second pseudo alternatif pour le serveur\n" "nom_utilisateur: nom d'utilisateur\n" -"nom_réel: nom réel de l'utilisateur\n" +"nom_réel: nom réel de l'utilisateur" -#: src/common/command.c:82 +#: src/common/command.c:89 msgid "save config to disk" msgstr "sauvegarder la configuration sur disque" -#: src/common/command.c:83 +#: src/common/command.c:90 msgid "[file]" msgstr "[fichier]" -#: src/common/command.c:83 +#: src/common/command.c:90 msgid "file: filename for writing config" msgstr "fichier: fichier pour sauvegarder la configuration" -#: src/common/command.c:85 +#: src/common/command.c:92 msgid "set config parameters" msgstr "modifier des paramètres de configuration" -#: src/common/command.c:86 +#: src/common/command.c:93 msgid "[option [value]]" msgstr "[option [valeur]]" -#: src/common/command.c:86 +#: src/common/command.c:93 msgid "" "option: name of an option\n" "value: value for option" @@ -1791,27 +1812,27 @@ msgstr "" "option: nom d'une option\n" "valeur: valeur pour l'option" -#: src/common/command.c:88 +#: src/common/command.c:95 msgid "remove an alias" msgstr "supprimer un alias" -#: src/common/command.c:89 +#: src/common/command.c:96 msgid "alias_name" msgstr "nom_alias" -#: src/common/command.c:89 +#: src/common/command.c:96 msgid "alias_name: name of alias to remove" msgstr "nom_alias: nom de l'alias à supprimer" -#: src/common/command.c:91 +#: src/common/command.c:98 msgid "manage windows" msgstr "gestion des fenêtres" -#: src/common/command.c:92 +#: src/common/command.c:99 msgid "[action]" msgstr "[action]" -#: src/common/command.c:93 +#: src/common/command.c:100 msgid "" "action: action to do:\n" " close close current window (under development!)\n" @@ -1826,29 +1847,29 @@ msgstr "" " splith éclate la fenêtre en deux horizontalement\n" " splitv éclate la fenêtre en deux verticalement" -#: src/common/command.c:348 +#: src/common/command.c:355 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "%s l'alias ou la commande \"%s\" existe déjà !\n" -#: src/common/command.c:357 +#: src/common/command.c:364 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "%s l'alias ne peux pas lancer un autre alias !\n" -#: src/common/command.c:363 +#: src/common/command.c:370 #, c-format msgid "%s target command \"%s\" does not exist!\n" msgstr "%s la commande cible \"%s\" n'existe pas !\n" -#: src/common/command.c:549 +#: src/common/command.c:556 #, 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:558 +#: src/common/command.c:565 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " @@ -1857,19 +1878,19 @@ 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:577 +#: src/common/command.c:584 #, c-format msgid "%s %s command \"%s\" failed\n" msgstr "%s %s la commande \"%s\" a échoué\n" -#: src/common/command.c:602 +#: src/common/command.c:609 #, 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:611 +#: src/common/command.c:618 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " @@ -1878,134 +1899,144 @@ 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:624 +#: src/common/command.c:631 #, 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:636 +#: src/common/command.c:643 #, c-format msgid "%s IRC command \"%s\" failed\n" msgstr "%s la commande IRC \"%s\" a échoué\n" -#: src/common/command.c:683 +#: src/common/command.c:690 #, 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:752 +#: src/common/command.c:759 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s impossible de trouver le pseudo pour envoyer le message\n" -#: src/common/command.c:758 +#: src/common/command.c:765 msgid "This window is not a channel!\n" msgstr "Cette fenêtre n'est pas un canal !\n" -#: src/common/command.c:784 src/common/command.c:796 +#: src/common/command.c:791 src/common/command.c:803 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "%s paramètres manquants pour la commande \"%s\"\n" -#: src/common/command.c:791 +#: src/common/command.c:798 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "Alias \"%s\" => \"%s\" créé\n" -#: src/common/command.c:806 +#: src/common/command.c:813 msgid "List of aliases:\n" msgstr "Liste des alias:\n" -#: src/common/command.c:816 +#: src/common/command.c:823 msgid "No alias defined.\n" msgstr "Aucun alias défini.\n" -#: src/common/command.c:835 +#: src/common/command.c:855 +#, c-format +msgid "%s incorrect buffer number\n" +msgstr "%s numéro de buffer incorrect\n" + +#: src/common/command.c:862 +#, 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:885 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "paramètre inconnu \"%s\" pour la commande \"%s\"\n" -#: src/common/command.c:864 +#: src/common/command.c:914 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s déjà connecté au serveur \"%s\" !\n" -#: src/common/command.c:887 src/common/command.c:922 +#: src/common/command.c:937 src/common/command.c:972 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s serveur \"%s\" non trouvé\n" -#: src/common/command.c:912 +#: src/common/command.c:962 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s non connecté au serveur \"%s\" !\n" -#: src/common/command.c:941 +#: src/common/command.c:991 #, c-format msgid "> List of %s internal commands:\n" msgstr "> Liste des commandes internes %s:\n" -#: src/common/command.c:946 +#: src/common/command.c:996 msgid "> List of IRC commands:\n" msgstr "> Liste des commandes IRC:\n" -#: src/common/command.c:961 +#: src/common/command.c:1011 #, c-format msgid "> Help on %s internal command \"%s\":\n" msgstr "> Aide sur la commande interne %s \"%s\":\n" -#: src/common/command.c:964 src/common/command.c:985 +#: src/common/command.c:1014 src/common/command.c:1035 #, c-format msgid "Syntax: /%s %s\n" msgstr "Syntaxe: /%s %s\n" -#: src/common/command.c:983 +#: src/common/command.c:1033 #, c-format msgid "> Help on IRC command \"%s\":\n" msgstr "> Aide sur la commande IRC \"%s\":\n" -#: src/common/command.c:999 +#: src/common/command.c:1049 #, 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:1024 +#: src/common/command.c:1074 msgid "Registered Perl scripts:\n" msgstr "Scripts Perl enregistrés :\n" -#: src/common/command.c:1041 src/common/command.c:1063 -#: src/common/command.c:1085 +#: src/common/command.c:1091 src/common/command.c:1113 +#: src/common/command.c:1135 msgid " (none)\n" msgstr " (aucun)\n" -#: src/common/command.c:1046 +#: src/common/command.c:1096 msgid "Perl message handlers:\n" msgstr "Fonctions Perl pour messages :\n" -#: src/common/command.c:1055 +#: src/common/command.c:1105 #, c-format msgid " IRC(%s) => Perl(%s)\n" msgstr " IRC(%s) => Perl(%s)\n" -#: src/common/command.c:1068 +#: src/common/command.c:1118 msgid "Perl command handlers:\n" msgstr "Commandes Perl :\n" -#: src/common/command.c:1077 +#: src/common/command.c:1127 #, c-format msgid " Command /%s => Perl(%s)\n" msgstr " Commande /%s => Perl(%s)\n" -#: src/common/command.c:1095 +#: src/common/command.c:1145 msgid "Perl scripts unloaded\n" msgstr "Scripts Perl déchargés\n" -#: src/common/command.c:1120 +#: src/common/command.c:1170 src/common/command.c:1708 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s option inconnue pour la commande \"%s\"\n" -#: src/common/command.c:1131 +#: src/common/command.c:1181 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" @@ -2014,188 +2045,188 @@ msgstr "" "Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le " "script ./configure\n" -#: src/common/command.c:1175 +#: src/common/command.c:1225 msgid "Server: " msgstr "Serveur: " -#: src/common/command.c:1186 +#: src/common/command.c:1236 msgid "connected" msgstr "connecté" -#: src/common/command.c:1186 +#: src/common/command.c:1236 msgid "not connected" msgstr "non connecté" -#: src/common/command.c:1193 +#: src/common/command.c:1243 #, c-format msgid " Autoconnect: %s%s\n" msgstr " Autoconnect: %s%s\n" -#: src/common/command.c:1194 +#: src/common/command.c:1244 msgid "yes" msgstr "oui" -#: src/common/command.c:1194 +#: src/common/command.c:1244 msgid "no" msgstr "non" -#: src/common/command.c:1196 +#: src/common/command.c:1246 msgid " (temporary server, will not be saved)" msgstr " (serveur temporaire, ne sera pas sauvé)" -#: src/common/command.c:1201 +#: src/common/command.c:1251 #, c-format msgid " Hostname : %s\n" msgstr " Nom/IP : %s\n" -#: src/common/command.c:1206 +#: src/common/command.c:1256 #, c-format msgid " Port : %d\n" msgstr " Port : %d\n" -#: src/common/command.c:1212 +#: src/common/command.c:1262 msgid " Password : (hidden)\n" msgstr " Mot passe : (caché)\n" -#: src/common/command.c:1216 +#: src/common/command.c:1266 msgid " Password : (none)\n" msgstr " Mot passe : (aucun)\n" -#: src/common/command.c:1220 +#: src/common/command.c:1270 #, c-format msgid " Nicks : %s" msgstr " Pseudos : %s" -#: src/common/command.c:1237 +#: src/common/command.c:1287 #, c-format msgid " Username : %s\n" msgstr " Nom utilis.: %s\n" -#: src/common/command.c:1242 +#: src/common/command.c:1292 #, c-format msgid " Realname : %s\n" msgstr " Nom réel : %s\n" -#: src/common/command.c:1248 +#: src/common/command.c:1298 #, c-format msgid " Command : %s\n" msgstr " Commande : %s\n" -#: src/common/command.c:1253 +#: src/common/command.c:1303 msgid " Command : (none)\n" msgstr " Commande : (aucune)\n" -#: src/common/command.c:1258 +#: src/common/command.c:1308 #, c-format msgid " Auto-join : %s\n" msgstr " Auto-join : %s\n" -#: src/common/command.c:1263 +#: src/common/command.c:1313 msgid " Auto-join : (none)\n" msgstr " Auto-join : (aucun)\n" -#: src/common/command.c:1267 +#: src/common/command.c:1317 msgid "No server.\n" msgstr "Pas de serveur.\n" -#: src/common/command.c:1276 +#: src/common/command.c:1326 #, 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:1282 +#: src/common/command.c:1332 #, 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:1299 +#: src/common/command.c:1349 #, 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:1305 src/common/command.c:1436 +#: src/common/command.c:1355 src/common/command.c:1486 msgid "Server" msgstr "Serveur" -#: src/common/command.c:1308 +#: src/common/command.c:1358 msgid "has been deleted\n" msgstr "a été supprimé\n" -#: src/common/command.c:1322 +#: src/common/command.c:1372 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s paramètres manquants pour la commande \"%s\"\n" -#: src/common/command.c:1331 +#: src/common/command.c:1381 #, 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:1355 src/common/command.c:1381 -#: src/common/command.c:1393 src/common/command.c:1417 +#: src/common/command.c:1405 src/common/command.c:1431 +#: src/common/command.c:1443 src/common/command.c:1467 #, 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:1367 +#: src/common/command.c:1417 #, 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:1405 +#: src/common/command.c:1455 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s commande manquante pour le paramètre \"%s\"\n" -#: src/common/command.c:1439 +#: src/common/command.c:1489 msgid "created\n" msgstr "créé\n" -#: src/common/command.c:1444 +#: src/common/command.c:1494 #, c-format msgid "%s unable to create server\n" msgstr "%s impossible de créer le serveur\n" -#: src/common/command.c:1498 +#: src/common/command.c:1548 #, 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" +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:1510 +#: src/common/command.c:1560 #, c-format -msgid "%s incorrect value for option '%s'\n" -msgstr "%s valeur incorrecte pour l'option '%s'\n" - -#: src/common/command.c:1516 -#, c-format -msgid "%s config option '%s' not found\n" -msgstr "%s option de configuration '%s' non trouvée\n" +msgid "%s incorrect value for option \"%s\"\n" +msgstr "%s valeur incorrecte pour l'option \"%s\"\n" #: src/common/command.c:1566 +#, c-format +msgid "%s config option \"%s\" not found\n" +msgstr "%s option de configuration \"%s\" non trouvée\n" + +#: src/common/command.c:1616 msgid "(unknown)" msgstr "(inconnu)" -#: src/common/command.c:1586 src/common/command.c:1589 +#: src/common/command.c:1636 src/common/command.c:1639 #, c-format -msgid "No config option found with '%s'\n" -msgstr "Aucune option de configuration trouvée avec '%s'\n" +msgid "No config option found with \"%s\"\n" +msgstr "Aucune option de configuration trouvée avec \"%s\"\n" -#: src/common/command.c:1594 +#: src/common/command.c:1644 #, c-format -msgid "%d config option(s) found with '%s'\n" -msgstr "%d option(s) de configuration trouvées avec '%s'\n" +msgid "%d config option(s) found with \"%s\"\n" +msgstr "%d option(s) de configuration trouvées avec \"%s\"\n" -#: src/common/command.c:1597 +#: src/common/command.c:1647 #, c-format msgid "%d config option(s) found\n" msgstr "%d option(s) de configuration trouvées\n" -#: src/common/command.c:1617 +#: src/common/command.c:1667 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias ou commande \"%s\" non trouvé\n" -#: src/common/command.c:1626 +#: src/common/command.c:1676 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" supprimé\n" @@ -2539,21 +2570,21 @@ msgid "color for status bar" msgstr "couleur pour la barre de statut" #: src/common/weeconfig.c:258 -msgid "color for active window" -msgstr "couleur pour la fenêtre active" - -#: src/common/weeconfig.c:259 -msgid "color for active window (status bar)" -msgstr "couleur pour la fenêtre active (barre de statut)" - -#: src/common/weeconfig.c:262 msgid "color for window with new messages" msgstr "couleur pour une fenêtre avec de nouvelles infos" -#: src/common/weeconfig.c:263 +#: src/common/weeconfig.c:259 msgid "color for window with new messages (status bar)" msgstr "couleur pour une fenêtre avec de nouvelles infos (barre de statut)" +#: src/common/weeconfig.c:262 +msgid "color for window with highlight" +msgstr "couleur pour une fenêtre avec un highlight" + +#: src/common/weeconfig.c:263 +msgid "color for window with highlight (status bar)" +msgstr "couleur pour une fenêtre avec un highlight (barre de statut)" + #: src/common/weeconfig.c:266 msgid "color for window with new data (not messages)" msgstr "couleur pour une fenêtre avec des nouvelles données (pas des infos)" @@ -3032,3 +3063,9 @@ msgstr "" #: src/common/weeconfig.c:1248 msgid "saving config to disk\n" msgstr "sauvegarde de la configuration sur disque\n" + +#~ msgid "color for active window" +#~ msgstr "couleur pour la fenêtre active" + +#~ msgid "color for active window (status bar)" +#~ msgstr "couleur pour la fenêtre active (barre de statut)" diff --git a/po/weechat.pot b/po/weechat.pot index 8ad49eed8..d3cf1163a 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: 2004-07-03 15:08+0200\n" +"POT-Creation-Date: 2004-07-04 16:44+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1046,7 +1046,7 @@ msgstr "" msgid "can't change mode for other users" msgstr "" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2865 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2897 msgid "unknown" msgstr "" @@ -1068,17 +1068,17 @@ msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" #: src/irc/irc-send.c:481 src/irc/irc-send.c:503 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:993 +#: src/irc/irc-recv.c:996 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1154 +#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1157 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:547 src/common/command.c:1126 +#: src/irc/irc-send.c:547 src/common/command.c:1176 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "" @@ -1098,7 +1098,7 @@ msgid " has joined " msgstr "" #: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:865 -#: src/irc/irc-recv.c:1002 src/irc/irc-recv.c:2365 src/irc/irc-recv.c:2430 +#: src/irc/irc-recv.c:1005 src/irc/irc-recv.c:2397 src/irc/irc-recv.c:2462 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "" @@ -1200,7 +1200,7 @@ msgid "removes voice from" msgstr "" #: src/irc/irc-recv.c:538 src/irc/irc-recv.c:611 src/irc/irc-recv.c:907 -#: src/irc/irc-recv.c:1219 +#: src/irc/irc-recv.c:1251 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "" @@ -1245,211 +1245,211 @@ msgstr "" msgid " has left " msgstr "" -#: src/irc/irc-recv.c:955 +#: src/irc/irc-recv.c:956 src/irc/irc-recv.c:1183 #, c-format msgid "On %s: * %s %s" msgstr "" -#: src/irc/irc-recv.c:979 +#: src/irc/irc-recv.c:982 #, c-format msgid "On %s: %s> %s" msgstr "" -#: src/irc/irc-recv.c:1047 +#: src/irc/irc-recv.c:1050 msgid "Received a " msgstr "" -#: src/irc/irc-recv.c:1049 +#: src/irc/irc-recv.c:1052 msgid "CTCP VERSION " msgstr "" -#: src/irc/irc-recv.c:1051 +#: src/irc/irc-recv.c:1054 msgid "from" msgstr "" -#: src/irc/irc-recv.c:1086 src/irc/irc-recv.c:1100 src/irc/irc-recv.c:1115 -#: src/irc/irc-recv.c:1130 src/irc/irc-recv.c:1196 src/irc/irc-recv.c:2651 -#: src/irc/irc-recv.c:2691 +#: src/irc/irc-recv.c:1089 src/irc/irc-recv.c:1103 src/irc/irc-recv.c:1118 +#: src/irc/irc-recv.c:1133 src/irc/irc-recv.c:1228 src/irc/irc-recv.c:2683 +#: src/irc/irc-recv.c:2723 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:1178 +#: src/irc/irc-recv.c:1209 #, c-format msgid "Private %s> %s" msgstr "" -#: src/irc/irc-recv.c:1251 +#: src/irc/irc-recv.c:1283 msgid "has quit" msgstr "" -#: src/irc/irc-recv.c:1371 +#: src/irc/irc-recv.c:1403 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "" -#: src/irc/irc-recv.c:1399 +#: src/irc/irc-recv.c:1431 msgid " has changed topic for " msgstr "" -#: src/irc/irc-recv.c:1404 +#: src/irc/irc-recv.c:1436 #, c-format msgid " to: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:1410 +#: src/irc/irc-recv.c:1442 msgid " has unset topic for " msgstr "" -#: src/irc/irc-recv.c:1501 +#: src/irc/irc-recv.c:1533 #, c-format msgid " is away: %s\n" msgstr "" -#: src/irc/irc-recv.c:1575 +#: src/irc/irc-recv.c:1607 msgid "Users online: " msgstr "" -#: src/irc/irc-recv.c:1938 +#: src/irc/irc-recv.c:1970 msgid "idle: " msgstr "" -#: src/irc/irc-recv.c:1946 +#: src/irc/irc-recv.c:1978 msgid "days" msgstr "" -#: src/irc/irc-recv.c:1946 +#: src/irc/irc-recv.c:1978 msgid "day" msgstr "" -#: src/irc/irc-recv.c:1956 +#: src/irc/irc-recv.c:1988 msgid "hours" msgstr "" -#: src/irc/irc-recv.c:1956 +#: src/irc/irc-recv.c:1988 msgid "hour" msgstr "" -#: src/irc/irc-recv.c:1962 +#: src/irc/irc-recv.c:1994 msgid "minutes" msgstr "" -#: src/irc/irc-recv.c:1962 +#: src/irc/irc-recv.c:1994 msgid "minute" msgstr "" -#: src/irc/irc-recv.c:1968 +#: src/irc/irc-recv.c:2000 msgid "seconds" msgstr "" -#: src/irc/irc-recv.c:1968 +#: src/irc/irc-recv.c:2000 msgid "second" msgstr "" -#: src/irc/irc-recv.c:1973 +#: src/irc/irc-recv.c:2005 msgid "signon at: " msgstr "" -#: src/irc/irc-recv.c:2061 +#: src/irc/irc-recv.c:2093 msgid "Channels: " msgstr "" -#: src/irc/irc-recv.c:2312 +#: src/irc/irc-recv.c:2344 msgid "No topic set for " msgstr "" -#: src/irc/irc-recv.c:2354 +#: src/irc/irc-recv.c:2386 msgid "Topic for " msgstr "" -#: src/irc/irc-recv.c:2358 +#: src/irc/irc-recv.c:2390 #, c-format msgid " is: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2374 src/irc/irc-recv.c:2454 +#: src/irc/irc-recv.c:2406 src/irc/irc-recv.c:2486 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2420 +#: src/irc/irc-recv.c:2452 msgid "Topic set by " msgstr "" -#: src/irc/irc-recv.c:2438 +#: src/irc/irc-recv.c:2470 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2446 +#: src/irc/irc-recv.c:2478 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2575 +#: src/irc/irc-recv.c:2607 msgid " on " msgstr "" -#: src/irc/irc-recv.c:2682 +#: src/irc/irc-recv.c:2714 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2735 +#: src/irc/irc-recv.c:2767 msgid "Nicks " msgstr "" -#: src/irc/irc-recv.c:2755 +#: src/irc/irc-recv.c:2787 msgid "Channel " msgstr "" -#: src/irc/irc-recv.c:2766 +#: src/irc/irc-recv.c:2798 msgid "nicks" msgstr "" -#: src/irc/irc-recv.c:2766 +#: src/irc/irc-recv.c:2798 msgid "nick" msgstr "" -#: src/irc/irc-recv.c:2774 +#: src/irc/irc-recv.c:2806 msgid "ops" msgstr "" -#: src/irc/irc-recv.c:2774 +#: src/irc/irc-recv.c:2806 msgid "op" msgstr "" -#: src/irc/irc-recv.c:2783 +#: src/irc/irc-recv.c:2815 msgid "halfops" msgstr "" -#: src/irc/irc-recv.c:2783 +#: src/irc/irc-recv.c:2815 msgid "halfop" msgstr "" -#: src/irc/irc-recv.c:2792 +#: src/irc/irc-recv.c:2824 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:2792 +#: src/irc/irc-recv.c:2824 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:2801 +#: src/irc/irc-recv.c:2833 msgid "normal" msgstr "" -#: src/irc/irc-recv.c:2834 +#: src/irc/irc-recv.c:2866 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2845 +#: src/irc/irc-recv.c:2877 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2854 +#: src/irc/irc-recv.c:2886 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1511,16 +1511,16 @@ msgstr "" msgid "%s unable to add handler for \"%s\" message (not enough memory)\n" msgstr "" -#: src/gui/curses/gui-display.c:921 +#: src/gui/curses/gui-display.c:870 #, c-format msgid "%d:[not connected] " msgstr "" -#: src/gui/curses/gui-display.c:929 -msgid "Act: " +#: src/gui/curses/gui-display.c:878 +msgid "[Act: " msgstr "" -#: src/gui/curses/gui-display.c:961 src/gui/curses/gui-display.c:964 +#: src/gui/curses/gui-display.c:913 src/gui/curses/gui-display.c:916 msgid "-MORE-" msgstr "" @@ -1528,17 +1528,17 @@ msgstr "" msgid "server" msgstr "" -#: src/gui/gui-common.c:303 +#: src/gui/gui-common.c:300 #, c-format msgid "%s not enough memory for infobar message\n" msgstr "" -#: src/gui/gui-common.c:423 +#: src/gui/gui-common.c:421 #, c-format msgid "%s not enough memory for new line!\n" msgstr "" -#: src/gui/gui-common.c:466 +#: src/gui/gui-common.c:464 msgid "not enough memory!\n" msgstr "" @@ -1558,75 +1558,91 @@ msgid "" msgstr "" #: src/common/command.c:46 -msgid "clear window(s)" +msgid "manage buffers" msgstr "" #: src/common/command.c:47 -msgid "[-all]" +msgid "[action | number]" msgstr "" #: src/common/command.c:48 -msgid "-all: clear all windows" +msgid "" +"action: action to do:\n" +" move move buffer in the list (may be relative, for example -1)\n" +" list list opened buffers (no parameter implies this list)\n" +"number: jump to buffer by number" msgstr "" -#: src/common/command.c:50 -msgid "connect to a server" -msgstr "" - -#: src/common/command.c:51 src/common/command.c:55 -msgid "servername" -msgstr "" - -#: src/common/command.c:52 -msgid "servername: server name to connect" +#: src/common/command.c:53 +msgid "clear window(s)" msgstr "" #: src/common/command.c:54 -msgid "disconnect from a server" +msgid "[-all]" msgstr "" -#: src/common/command.c:56 -msgid "servername: server name to disconnect" +#: src/common/command.c:55 +msgid "-all: clear all windows" msgstr "" -#: src/common/command.c:58 -msgid "display help about commands" +#: src/common/command.c:57 +msgid "connect to a server" +msgstr "" + +#: src/common/command.c:58 src/common/command.c:62 +msgid "servername" msgstr "" #: src/common/command.c:59 -msgid "[command]" -msgstr "" - -#: src/common/command.c:59 -msgid "command: name of a WeeChat or IRC command" +msgid "servername: server name to connect" msgstr "" #: src/common/command.c:61 -msgid "list/load/unload Perl scripts" -msgstr "" - -#: src/common/command.c:62 -msgid "[load filename] | [unload]" +msgid "disconnect from a server" msgstr "" #: src/common/command.c:63 +msgid "servername: server name to disconnect" +msgstr "" + +#: src/common/command.c:65 +msgid "display help about commands" +msgstr "" + +#: src/common/command.c:66 +msgid "[command]" +msgstr "" + +#: src/common/command.c:66 +msgid "command: name of a WeeChat or IRC command" +msgstr "" + +#: src/common/command.c:68 +msgid "list/load/unload Perl scripts" +msgstr "" + +#: src/common/command.c:69 +msgid "[load filename] | [unload]" +msgstr "" + +#: src/common/command.c:70 msgid "" "filename: Perl script (file) to load\n" "Without argument, /perl command lists all loaded Perl scripts." msgstr "" -#: src/common/command.c:66 +#: src/common/command.c:73 msgid "list, add or remove servers" msgstr "" -#: src/common/command.c:67 +#: src/common/command.c:74 msgid "" "[list] | [servername hostname port [-auto | -noauto] [-pwd password] [-nicks " "nick1 [nick2 [nick3]]] [-username username] [-realname realname] [-command " "command] [-autojoin channel[,channel]] ] | [del servername]" msgstr "" -#: src/common/command.c:72 +#: src/common/command.c:79 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" @@ -1636,56 +1652,56 @@ msgid "" "nick2: alternate nick for server\n" "nick3: second alternate nick for server\n" "username: user name\n" -"realname: real name of user\n" +"realname: real name of user" msgstr "" -#: src/common/command.c:82 +#: src/common/command.c:89 msgid "save config to disk" msgstr "" -#: src/common/command.c:83 +#: src/common/command.c:90 msgid "[file]" msgstr "" -#: src/common/command.c:83 +#: src/common/command.c:90 msgid "file: filename for writing config" msgstr "" -#: src/common/command.c:85 +#: src/common/command.c:92 msgid "set config parameters" msgstr "" -#: src/common/command.c:86 +#: src/common/command.c:93 msgid "[option [value]]" msgstr "" -#: src/common/command.c:86 +#: src/common/command.c:93 msgid "" "option: name of an option\n" "value: value for option" msgstr "" -#: src/common/command.c:88 +#: src/common/command.c:95 msgid "remove an alias" msgstr "" -#: src/common/command.c:89 +#: src/common/command.c:96 msgid "alias_name" msgstr "" -#: src/common/command.c:89 +#: src/common/command.c:96 msgid "alias_name: name of alias to remove" msgstr "" -#: src/common/command.c:91 +#: src/common/command.c:98 msgid "manage windows" msgstr "" -#: src/common/command.c:92 +#: src/common/command.c:99 msgid "[action]" msgstr "" -#: src/common/command.c:93 +#: src/common/command.c:100 msgid "" "action: action to do:\n" " close close current window (under development!)\n" @@ -1694,365 +1710,375 @@ msgid "" " splitv split current window vertically" msgstr "" -#: src/common/command.c:348 +#: src/common/command.c:355 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "" -#: src/common/command.c:357 +#: src/common/command.c:364 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "" -#: src/common/command.c:363 +#: src/common/command.c:370 #, c-format msgid "%s target command \"%s\" does not exist!\n" msgstr "" -#: src/common/command.c:549 +#: src/common/command.c:556 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" -#: src/common/command.c:558 +#: src/common/command.c:565 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " "arg%s)\n" msgstr "" -#: src/common/command.c:577 +#: src/common/command.c:584 #, c-format msgid "%s %s command \"%s\" failed\n" msgstr "" -#: src/common/command.c:602 +#: src/common/command.c:609 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" -#: src/common/command.c:611 +#: src/common/command.c:618 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " "arg%s)\n" msgstr "" -#: src/common/command.c:624 +#: src/common/command.c:631 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "" -#: src/common/command.c:636 +#: src/common/command.c:643 #, c-format msgid "%s IRC command \"%s\" failed\n" msgstr "" -#: src/common/command.c:683 +#: src/common/command.c:690 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "" -#: src/common/command.c:752 +#: src/common/command.c:759 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "" -#: src/common/command.c:758 +#: src/common/command.c:765 msgid "This window is not a channel!\n" msgstr "" -#: src/common/command.c:784 src/common/command.c:796 +#: src/common/command.c:791 src/common/command.c:803 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "" -#: src/common/command.c:791 +#: src/common/command.c:798 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "" -#: src/common/command.c:806 +#: src/common/command.c:813 msgid "List of aliases:\n" msgstr "" -#: src/common/command.c:816 +#: src/common/command.c:823 msgid "No alias defined.\n" msgstr "" -#: src/common/command.c:835 +#: src/common/command.c:855 +#, c-format +msgid "%s incorrect buffer number\n" +msgstr "" + +#: src/common/command.c:862 +#, c-format +msgid "%s buffer \"%s\" not found for \"%s\" command\n" +msgstr "" + +#: src/common/command.c:885 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "" -#: src/common/command.c:864 +#: src/common/command.c:914 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:887 src/common/command.c:922 +#: src/common/command.c:937 src/common/command.c:972 #, c-format msgid "%s server \"%s\" not found\n" msgstr "" -#: src/common/command.c:912 +#: src/common/command.c:962 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:941 +#: src/common/command.c:991 #, c-format msgid "> List of %s internal commands:\n" msgstr "" -#: src/common/command.c:946 +#: src/common/command.c:996 msgid "> List of IRC commands:\n" msgstr "" -#: src/common/command.c:961 +#: src/common/command.c:1011 #, c-format msgid "> Help on %s internal command \"%s\":\n" msgstr "" -#: src/common/command.c:964 src/common/command.c:985 +#: src/common/command.c:1014 src/common/command.c:1035 #, c-format msgid "Syntax: /%s %s\n" msgstr "" -#: src/common/command.c:983 +#: src/common/command.c:1033 #, c-format msgid "> Help on IRC command \"%s\":\n" msgstr "" -#: src/common/command.c:999 +#: src/common/command.c:1049 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "" -#: src/common/command.c:1024 +#: src/common/command.c:1074 msgid "Registered Perl scripts:\n" msgstr "" -#: src/common/command.c:1041 src/common/command.c:1063 -#: src/common/command.c:1085 +#: src/common/command.c:1091 src/common/command.c:1113 +#: src/common/command.c:1135 msgid " (none)\n" msgstr "" -#: src/common/command.c:1046 +#: src/common/command.c:1096 msgid "Perl message handlers:\n" msgstr "" -#: src/common/command.c:1055 +#: src/common/command.c:1105 #, c-format msgid " IRC(%s) => Perl(%s)\n" msgstr "" -#: src/common/command.c:1068 +#: src/common/command.c:1118 msgid "Perl command handlers:\n" msgstr "" -#: src/common/command.c:1077 +#: src/common/command.c:1127 #, c-format msgid " Command /%s => Perl(%s)\n" msgstr "" -#: src/common/command.c:1095 +#: src/common/command.c:1145 msgid "Perl scripts unloaded\n" msgstr "" -#: src/common/command.c:1120 +#: src/common/command.c:1170 src/common/command.c:1708 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "" -#: src/common/command.c:1131 +#: src/common/command.c:1181 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" msgstr "" -#: src/common/command.c:1175 +#: src/common/command.c:1225 msgid "Server: " msgstr "" -#: src/common/command.c:1186 +#: src/common/command.c:1236 msgid "connected" msgstr "" -#: src/common/command.c:1186 +#: src/common/command.c:1236 msgid "not connected" msgstr "" -#: src/common/command.c:1193 +#: src/common/command.c:1243 #, c-format msgid " Autoconnect: %s%s\n" msgstr "" -#: src/common/command.c:1194 +#: src/common/command.c:1244 msgid "yes" msgstr "" -#: src/common/command.c:1194 +#: src/common/command.c:1244 msgid "no" msgstr "" -#: src/common/command.c:1196 +#: src/common/command.c:1246 msgid " (temporary server, will not be saved)" msgstr "" -#: src/common/command.c:1201 +#: src/common/command.c:1251 #, c-format msgid " Hostname : %s\n" msgstr "" -#: src/common/command.c:1206 +#: src/common/command.c:1256 #, c-format msgid " Port : %d\n" msgstr "" -#: src/common/command.c:1212 +#: src/common/command.c:1262 msgid " Password : (hidden)\n" msgstr "" -#: src/common/command.c:1216 +#: src/common/command.c:1266 msgid " Password : (none)\n" msgstr "" -#: src/common/command.c:1220 +#: src/common/command.c:1270 #, c-format msgid " Nicks : %s" msgstr "" -#: src/common/command.c:1237 +#: src/common/command.c:1287 #, c-format msgid " Username : %s\n" msgstr "" -#: src/common/command.c:1242 +#: src/common/command.c:1292 #, c-format msgid " Realname : %s\n" msgstr "" -#: src/common/command.c:1248 +#: src/common/command.c:1298 #, c-format msgid " Command : %s\n" msgstr "" -#: src/common/command.c:1253 +#: src/common/command.c:1303 msgid " Command : (none)\n" msgstr "" -#: src/common/command.c:1258 +#: src/common/command.c:1308 #, c-format msgid " Auto-join : %s\n" msgstr "" -#: src/common/command.c:1263 +#: src/common/command.c:1313 msgid " Auto-join : (none)\n" msgstr "" -#: src/common/command.c:1267 +#: src/common/command.c:1317 msgid "No server.\n" msgstr "" -#: src/common/command.c:1276 +#: src/common/command.c:1326 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "" -#: src/common/command.c:1282 +#: src/common/command.c:1332 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" -#: src/common/command.c:1299 +#: src/common/command.c:1349 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:1305 src/common/command.c:1436 +#: src/common/command.c:1355 src/common/command.c:1486 msgid "Server" msgstr "" -#: src/common/command.c:1308 +#: src/common/command.c:1358 msgid "has been deleted\n" msgstr "" -#: src/common/command.c:1322 +#: src/common/command.c:1372 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "" -#: src/common/command.c:1331 +#: src/common/command.c:1381 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "" -#: src/common/command.c:1355 src/common/command.c:1381 -#: src/common/command.c:1393 src/common/command.c:1417 +#: src/common/command.c:1405 src/common/command.c:1431 +#: src/common/command.c:1443 src/common/command.c:1467 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1367 +#: src/common/command.c:1417 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1405 +#: src/common/command.c:1455 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1439 +#: src/common/command.c:1489 msgid "created\n" msgstr "" -#: src/common/command.c:1444 +#: src/common/command.c:1494 #, c-format msgid "%s unable to create server\n" msgstr "" -#: src/common/command.c:1498 +#: src/common/command.c:1548 #, c-format -msgid "%s option '%s' can not be changed while WeeChat is running\n" +msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" -#: src/common/command.c:1510 +#: src/common/command.c:1560 #, c-format -msgid "%s incorrect value for option '%s'\n" -msgstr "" - -#: src/common/command.c:1516 -#, c-format -msgid "%s config option '%s' not found\n" +msgid "%s incorrect value for option \"%s\"\n" msgstr "" #: src/common/command.c:1566 +#, c-format +msgid "%s config option \"%s\" not found\n" +msgstr "" + +#: src/common/command.c:1616 msgid "(unknown)" msgstr "" -#: src/common/command.c:1586 src/common/command.c:1589 +#: src/common/command.c:1636 src/common/command.c:1639 #, c-format -msgid "No config option found with '%s'\n" +msgid "No config option found with \"%s\"\n" msgstr "" -#: src/common/command.c:1594 +#: src/common/command.c:1644 #, c-format -msgid "%d config option(s) found with '%s'\n" +msgid "%d config option(s) found with \"%s\"\n" msgstr "" -#: src/common/command.c:1597 +#: src/common/command.c:1647 #, c-format msgid "%d config option(s) found\n" msgstr "" -#: src/common/command.c:1617 +#: src/common/command.c:1667 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "" -#: src/common/command.c:1626 +#: src/common/command.c:1676 #, c-format msgid "Alias \"%s\" removed\n" msgstr "" @@ -2372,21 +2398,21 @@ msgid "color for status bar" msgstr "" #: src/common/weeconfig.c:258 -msgid "color for active window" -msgstr "" - -#: src/common/weeconfig.c:259 -msgid "color for active window (status bar)" -msgstr "" - -#: src/common/weeconfig.c:262 msgid "color for window with new messages" msgstr "" -#: src/common/weeconfig.c:263 +#: src/common/weeconfig.c:259 msgid "color for window with new messages (status bar)" msgstr "" +#: src/common/weeconfig.c:262 +msgid "color for window with highlight" +msgstr "" + +#: src/common/weeconfig.c:263 +msgid "color for window with highlight (status bar)" +msgstr "" + #: src/common/weeconfig.c:266 msgid "color for window with new data (not messages)" msgstr "" diff --git a/src/common/command.c b/src/common/command.c index 873adeff8..d934e8ca5 100644 --- a/src/common/command.c +++ b/src/common/command.c @@ -43,6 +43,13 @@ t_weechat_command weechat_commands[] = N_("alias_name: name of alias\ncommand: command name (WeeChat " "or IRC command, without first '/')\n" "arguments: arguments for command"), 0, MAX_ARGS, NULL, weechat_cmd_alias }, + { "buffer", N_("manage buffers"), + N_("[action | number]"), + N_("action: action to do:\n" + " move move buffer in the list (may be relative, for example -1)\n" + " list list opened buffers (no parameter implies this list)\n" + "number: jump to buffer by number"), + 0, MAX_ARGS, weechat_cmd_buffer, NULL }, { "clear", N_("clear window(s)"), N_("[-all]"), N_("-all: clear all windows"), @@ -77,7 +84,7 @@ t_weechat_command weechat_commands[] = "nick2: alternate nick for server\n" "nick3: second alternate nick for server\n" "username: user name\n" - "realname: real name of user\n"), + "realname: real name of user"), 0, MAX_ARGS, weechat_cmd_server, NULL }, { "save", N_("save config to disk"), N_("[file]"), N_("file: filename for writing config"), @@ -818,6 +825,49 @@ weechat_cmd_alias (char *arguments) return 0; } +/* + * weechat_cmd_buffer: manage buffers + */ + +int +weechat_cmd_buffer (int argc, char **argv) +{ + int number; + char *error; + + if ((argc == 0) || ((argc == 1) && (strcasecmp (argv[0], "list") == 0))) + { + /* list opened bufferss */ + gui_printf (NULL, "buffer list -- NOT DEVELOPED!\n"); + } + else + { + if (strcasecmp (argv[0], "move") == 0) + { + /* move buffer to another number in the list */ + gui_printf (NULL, "buffer move -- NOT DEVELOPED!\n"); + } + else + { + number = strtol (argv[0], &error, 10); + if (error) + { + gui_printf (NULL, _("%s incorrect buffer number\n"), + WEECHAT_ERROR); + return -1; + } + if (!gui_switch_to_buffer_by_number (gui_current_window, number)) + { + gui_printf (NULL, + _("%s buffer \"%s\" not found for \"%s\" command\n"), + WEECHAT_ERROR, argv[0], "buffer"); + return -1; + } + } + } + return 0; +} + /* * weechat_cmd_clear: display or create alias */ @@ -1495,7 +1545,7 @@ weechat_cmd_set (char *arguments) if (ptr_option->handler_change == NULL) { gui_printf (NULL, - _("%s option '%s' can not be changed while WeeChat is running\n"), + _("%s option \"%s\" can not be changed while WeeChat is running\n"), WEECHAT_ERROR, option); } else @@ -1507,13 +1557,13 @@ weechat_cmd_set (char *arguments) gui_printf (NULL, " %s = %s\n", option, value); } else - gui_printf (NULL, _("%s incorrect value for option '%s'\n"), + gui_printf (NULL, _("%s incorrect value for option \"%s\"\n"), WEECHAT_ERROR, option); } } else { - gui_printf (NULL, _("%s config option '%s' not found\n"), + gui_printf (NULL, _("%s config option \"%s\" not found\n"), WEECHAT_ERROR, option); } } @@ -1583,15 +1633,15 @@ weechat_cmd_set (char *arguments) if (number_found == 0) { if (value) - gui_printf (NULL, _("No config option found with '%s'\n"), + gui_printf (NULL, _("No config option found with \"%s\"\n"), value); else - gui_printf (NULL, _("No config option found with '%s'\n")); + gui_printf (NULL, _("No config option found with \"%s\"\n")); } else { if (value) - gui_printf (NULL, _("%d config option(s) found with '%s'\n"), + gui_printf (NULL, _("%d config option(s) found with \"%s\"\n"), number_found, value); else gui_printf (NULL, _("%d config option(s) found\n"), @@ -1635,9 +1685,6 @@ weechat_cmd_unalias (char *arguments) int weechat_cmd_window (int argc, char **argv) { - int i; - t_irc_server server, *ptr_server, *server_found, *new_server; - if ((argc == 0) || ((argc == 1) && (strcasecmp (argv[0], "list") == 0))) { /* list opened windows */ @@ -1656,7 +1703,11 @@ weechat_cmd_window (int argc, char **argv) gui_window_split_vertic (gui_current_window); } else - return -1; + { + gui_printf (NULL, + _("%s unknown option for \"%s\" command\n"), + WEECHAT_ERROR, "window"); + } } return 0; -} \ No newline at end of file +} diff --git a/src/common/command.h b/src/common/command.h index 3be538255..90d623da9 100644 --- a/src/common/command.h +++ b/src/common/command.h @@ -67,6 +67,7 @@ extern t_weechat_alias *alias_new (char *, char *); extern int exec_weechat_command (t_irc_server *, char *); extern void user_command (t_irc_server *, char *); extern int weechat_cmd_alias (char *); +extern int weechat_cmd_buffer (int, char **); extern int weechat_cmd_clear (int, char **); extern int weechat_cmd_connect (int, char **); extern int weechat_cmd_disconnect (int, char **); diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c index 5decef5d0..f331637d4 100644 --- a/src/gui/curses/gui-display.c +++ b/src/gui/curses/gui-display.c @@ -482,8 +482,8 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int stop_at_end) /* insert spaces for align text under time/nick */ if ((window->win_chat_cursor_x == 0) && - (ptr_message->type != MSG_TYPE_TIME) && - (ptr_message->type != MSG_TYPE_NICK) && + (!(ptr_message->type & MSG_TYPE_TIME)) && + (!(ptr_message->type & MSG_TYPE_NICK)) && (line->length_align > 0) && /* TODO: modify arbitraty value for non aligning messages on time/nick? */ (line->length_align < (window->win_chat_width - 5))) @@ -805,12 +805,17 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase) wrefresh (ptr_win->win_status); } wmove (ptr_win->win_status, 0, 0); + + /* display number of buffers */ + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS); + wprintw (ptr_win->win_status, "[%d] ", + (last_gui_buffer) ? last_gui_buffer->number : 0); + + /* display current server */ if (SERVER(ptr_win->buffer) && SERVER(ptr_win->buffer)->name) - { - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS); wprintw (ptr_win->win_status, "[%s] ", SERVER(ptr_win->buffer)->name); - } + if (SERVER(ptr_win->buffer) && !CHANNEL(ptr_win->buffer)) { gui_window_set_color (ptr_win->win_status, @@ -870,7 +875,7 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase) if (hotlist) { gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS); - wprintw (ptr_win->win_status, _("Act: ")); + wprintw (ptr_win->win_status, _("[Act: ")); for (ptr_hotlist = hotlist; ptr_hotlist; ptr_hotlist = ptr_hotlist->next_hotlist) { @@ -896,6 +901,9 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase) if (ptr_hotlist->next_hotlist) wprintw (ptr_win->win_status, ","); } + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS); + wprintw (ptr_win->win_status, "]"); } /* display "-MORE-" if last line is not displayed */ @@ -1215,7 +1223,6 @@ gui_switch_to_buffer (t_gui_window *window, t_gui_buffer *buffer) window->win_status = newwin (1, window->win_width, window->win_y + window->win_height - 2, window->win_x); buffer->num_displayed++; - buffer->unread_data = 0; hotlist_remove_buffer (buffer); } @@ -1301,8 +1308,6 @@ gui_move_page_down (t_gui_window *window) window->sub_lines -= window->win_chat_height - 1; if (window->sub_lines < 0) window->sub_lines = 0; - if (window->sub_lines == 0) - window->buffer->unread_data = 0; gui_draw_buffer_chat (window->buffer, 0); gui_draw_buffer_status (window->buffer, 0); } @@ -1344,7 +1349,7 @@ gui_curses_resize_handler () } /* - * gui_view_init_subviews: init subviews for a WeeChat view + * gui_window_init_subviews: init subviews for a WeeChat window */ void @@ -1661,9 +1666,11 @@ gui_add_message (t_gui_buffer *buffer, int type, int color, char *message) buffer->last_line->last_message->message = strdup (message); length = strlen (message); buffer->last_line->length += length; - if (type == MSG_TYPE_MSG) + if (type & MSG_TYPE_MSG) buffer->last_line->line_with_message = 1; - if ((type == MSG_TYPE_TIME) || (type == MSG_TYPE_NICK)) + if (type & MSG_TYPE_HIGHLIGHT) + buffer->last_line->line_with_highlight = 1; + if ((type & MSG_TYPE_TIME) || (type & MSG_TYPE_NICK)) buffer->last_line->length_align += length; if (pos) { @@ -1677,14 +1684,12 @@ gui_add_message (t_gui_buffer *buffer, int type, int color, char *message) /*else gui_display_line (buffer, buffer->last_line, 1);*/ } - if ((buffer->num_displayed == 0) || (gui_current_window->sub_lines > 0)) + if (buffer->num_displayed == 0) { - if (buffer->unread_data < 1 + buffer->last_line->line_with_message) - { - buffer->unread_data = 1 + buffer->last_line->line_with_message; - hotlist_add (buffer->last_line->line_with_message, buffer); - gui_draw_buffer_status (buffer, 1); - } + hotlist_add (buffer->last_line->line_with_message + + buffer->last_line->line_with_highlight, + buffer); + gui_draw_buffer_status (gui_current_window->buffer, 1); } } } diff --git a/src/gui/curses/gui-input.c b/src/gui/curses/gui-input.c index 179d962d7..e56bbd038 100644 --- a/src/gui/curses/gui-input.c +++ b/src/gui/curses/gui-input.c @@ -299,6 +299,8 @@ gui_read_keyb () case KEY_ESCAPE: if ((key = getch()) != ERR) { + /*gui_printf (gui_current_window->buffer, + "[Debug] key pressed = %d, as octal: %o\n", key, key);*/ switch (key) { case KEY_LEFT: @@ -327,6 +329,18 @@ gui_read_keyb () } } break; + /* Alt-number */ + case 49: /* Alt-1 */ + case 50: /* Alt-2 */ + case 51: /* Alt-3 */ + case 52: /* Alt-4 */ + case 53: /* Alt-5 */ + case 54: /* Alt-6 */ + case 55: /* Alt-7 */ + case 56: /* Alt-8 */ + case 57: /* Alt-9 */ + gui_switch_to_buffer_by_number (gui_current_window, key - 48); + break; /* Alt-A */ case 'a': case 'A': diff --git a/src/gui/gui-common.c b/src/gui/gui-common.c index 864096918..445eca13d 100644 --- a/src/gui/gui-common.c +++ b/src/gui/gui-common.c @@ -145,7 +145,7 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int switch_to if ((new_buffer = (t_gui_buffer *)(malloc (sizeof (t_gui_buffer))))) { new_buffer->num_displayed = 0; - new_buffer->number = (gui_buffers) ? last_gui_buffer->number + 1 : 1; + new_buffer->number = (last_gui_buffer) ? last_gui_buffer->number + 1 : 1; /* assign server and channel to buffer */ SERVER(new_buffer) = server; @@ -157,21 +157,19 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int switch_to CHANNEL(new_buffer)->buffer = new_buffer; if (!window->buffer) + { window->buffer = new_buffer; - window->first_line_displayed = 1; - window->sub_lines = 0; - - gui_calculate_pos_size (window); - - /* init buffers */ - gui_window_init_subwindows (window); + window->first_line_displayed = 1; + window->sub_lines = 0; + gui_calculate_pos_size (window); + gui_window_init_subwindows (window); + } /* init lines */ new_buffer->lines = NULL; new_buffer->last_line = NULL; new_buffer->num_lines = 0; new_buffer->line_complete = 1; - new_buffer->unread_data = 0; /* init input buffer */ new_buffer->input_buffer_alloc = INPUT_BUFFER_BLOCK_SIZE; @@ -242,7 +240,6 @@ gui_buffer_clear (t_gui_buffer *buffer) buffer->last_line = NULL; buffer->num_lines = 0; buffer->line_complete = 1; - buffer->unread_data = 0; for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) { @@ -407,6 +404,7 @@ gui_new_line (t_gui_buffer *buffer) new_line->length = 0; new_line->length_align = 0; new_line->line_with_message = 0; + new_line->line_with_highlight = 0; new_line->messages = NULL; new_line->last_message = NULL; if (!buffer->lines) @@ -624,3 +622,31 @@ gui_buffer_insert_string (t_gui_buffer *buffer, char *string, int pos) /* insert new string */ strncpy (buffer->input_buffer + pos, string, length); } + +/* + * gui_switch_to_buffer_by_number: switch to another buffer with number + */ + +t_gui_buffer * +gui_switch_to_buffer_by_number (t_gui_window *window, int number) +{ + t_gui_buffer *ptr_buffer; + + /* buffer is currently displayed ? */ + if (number == window->buffer->number) + return window->buffer; + + /* search for buffer in the list */ + for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer) + { + if ((ptr_buffer != window->buffer) && (number == ptr_buffer->number)) + { + gui_switch_to_buffer (window, ptr_buffer); + gui_redraw_buffer (window->buffer); + return ptr_buffer; + } + } + + /* buffer not found */ + return NULL; +} diff --git a/src/gui/gui.h b/src/gui/gui.h index 1066d478d..a2b6a726b 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -66,10 +66,11 @@ #define BUFFER_IS_CHANNEL(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHAT_CHANNEL)) #define BUFFER_IS_PRIVATE(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHAT_PRIVATE)) -#define MSG_TYPE_TIME 0 -#define MSG_TYPE_NICK 1 -#define MSG_TYPE_INFO 2 -#define MSG_TYPE_MSG 3 +#define MSG_TYPE_TIME 1 +#define MSG_TYPE_NICK 2 +#define MSG_TYPE_INFO 4 +#define MSG_TYPE_MSG 8 +#define MSG_TYPE_HIGHLIGHT 16 #define gui_printf_color(buffer, color, fmt, argz...) \ gui_printf_color_type(buffer, MSG_TYPE_INFO, color, fmt, ##argz) @@ -95,6 +96,7 @@ struct t_gui_line int length; /* length of the line (in char) */ int length_align; /* alignment length (time or time/nick) */ int line_with_message; /* line contains a message from a user? */ + int line_with_highlight; /* line contains highlight */ t_gui_message *messages; /* messages for the line */ t_gui_message *last_message; /* last message of the line */ t_gui_line *prev_line; /* link to previous line */ @@ -138,7 +140,6 @@ struct t_gui_buffer t_gui_line *last_line; /* last line of chat window */ int num_lines; /* number of lines in the window */ int line_complete; /* current line complete ? (\n ending) */ - int unread_data; /* highlight windows with unread data */ /* inupt buffer */ char *input_buffer; /* input buffer */ @@ -235,6 +236,7 @@ extern void gui_delete_previous_word (t_gui_buffer *); extern void gui_move_previous_word (t_gui_buffer *); extern void gui_move_next_word (t_gui_buffer *); extern void gui_buffer_insert_string (t_gui_buffer *, char *, int); +extern t_gui_buffer *gui_switch_to_buffer_by_number (t_gui_window *, int); /* GUI dependant functions */ extern int gui_assign_color (int *, char *); extern int gui_get_color_by_name (char *); diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c index ae4326a2a..45b9e5d2f 100644 --- a/src/irc/irc-recv.c +++ b/src/irc/irc-recv.c @@ -945,10 +945,11 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (strstr (pos, server->nick)) { gui_printf_color_type (ptr_channel->buffer, - MSG_TYPE_MSG, + MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT, COLOR_WIN_CHAT_HIGHLIGHT, "%s", host); - if ( (cfg_look_infobar_delay_highlight > 0) + if ( (cfg_look_infobar) + && (cfg_look_infobar_delay_highlight > 0) && (ptr_channel->buffer != gui_current_window->buffer) ) gui_infobar_printf (cfg_look_infobar_delay_highlight, COLOR_WIN_INFOBAR_HIGHLIGHT, @@ -971,8 +972,10 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (strstr (pos, server->nick)) { irc_display_nick (ptr_channel->buffer, ptr_nick, - MSG_TYPE_NICK, 1, -1, 0); - if ( (cfg_look_infobar_delay_highlight > 0) + MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT, + 1, -1, 0); + if ( (cfg_look_infobar) + && (cfg_look_infobar_delay_highlight > 0) && (ptr_channel->buffer != gui_current_window->buffer) ) gui_infobar_printf (cfg_look_infobar_delay_highlight, COLOR_WIN_INFOBAR_HIGHLIGHT, @@ -1157,38 +1160,67 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) } } if (!ptr_channel->topic) - { ptr_channel->topic = strdup (host2); - gui_draw_buffer_title (ptr_channel->buffer, 1); - } - gui_printf_color_type (ptr_channel->buffer, - MSG_TYPE_NICK, - COLOR_WIN_CHAT_DARK, "<"); - if (strstr (pos, server->nick)) + if (strncmp (pos, "\01ACTION ", 8) == 0) { - gui_printf_color_type (ptr_channel->buffer, - MSG_TYPE_NICK, - COLOR_WIN_CHAT_HIGHLIGHT, - "%s", host); - if ( (cfg_look_infobar_delay_highlight > 0) - && (ptr_channel->buffer != gui_current_window->buffer) ) - gui_infobar_printf (cfg_look_infobar_delay_highlight, - COLOR_WIN_INFOBAR_HIGHLIGHT, - _("Private %s> %s"), - host, pos); + pos += 8; + pos2 = strchr (pos, '\01'); + if (pos2) + pos2[0] = '\0'; + irc_display_prefix (ptr_channel->buffer, PREFIX_ACTION_ME); + if (strstr (pos, server->nick)) + { + gui_printf_color_type (ptr_channel->buffer, + MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT, + COLOR_WIN_CHAT_HIGHLIGHT, + "%s", host); + if ( (cfg_look_infobar) + && (cfg_look_infobar_delay_highlight > 0) + && (ptr_channel->buffer != gui_current_window->buffer) ) + gui_infobar_printf (cfg_look_infobar_delay_highlight, + COLOR_WIN_INFOBAR_HIGHLIGHT, + _("On %s: * %s %s"), + ptr_channel->name, + host, pos); + } + else + gui_printf_color_type (ptr_channel->buffer, + MSG_TYPE_MSG, + COLOR_WIN_CHAT_NICK, "%s", host); + gui_printf_color (ptr_channel->buffer, + COLOR_WIN_CHAT, " %s\n", pos); } else + { gui_printf_color_type (ptr_channel->buffer, MSG_TYPE_NICK, - COLOR_WIN_NICK_PRIVATE, - "%s", host); - gui_printf_color_type (ptr_channel->buffer, - MSG_TYPE_NICK, - COLOR_WIN_CHAT_DARK, "> "); - gui_printf_color_type (ptr_channel->buffer, - MSG_TYPE_MSG, - COLOR_WIN_CHAT, "%s\n", pos); + COLOR_WIN_CHAT_DARK, "<"); + if (strstr (pos, server->nick)) + { + gui_printf_color_type (ptr_channel->buffer, + MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT, + COLOR_WIN_CHAT_HIGHLIGHT, + "%s", host); + if ( (cfg_look_infobar_delay_highlight > 0) + && (ptr_channel->buffer != gui_current_window->buffer) ) + gui_infobar_printf (cfg_look_infobar_delay_highlight, + COLOR_WIN_INFOBAR_HIGHLIGHT, + _("Private %s> %s"), + host, pos); + } + else + gui_printf_color_type (ptr_channel->buffer, + MSG_TYPE_NICK, + COLOR_WIN_NICK_PRIVATE, + "%s", host); + gui_printf_color_type (ptr_channel->buffer, + MSG_TYPE_NICK, + COLOR_WIN_CHAT_DARK, "> "); + gui_printf_color_type (ptr_channel->buffer, + MSG_TYPE_MSG, + COLOR_WIN_CHAT, "%s\n", pos); + } } else { diff --git a/weechat/ChangeLog b/weechat/ChangeLog index 17b60a71f..42795356e 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -1,12 +1,13 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2004-07-03 +ChangeLog - 2004-07-04 Version 0.0.7 (under dev!): - * buffers ordered by number, auto-switch to active buffers (alt-a) - * split terminal horizontally/vertically + * /buffer command added, buffers ordered by number, auto-jump to active + buffers (alt-a), jump to buffers by number (alt-number) + * /window command added, split terminal horizontally/vertically * unique color for each nick (based on nickname) * action messages are now considered as messages, not crappy joins/parts * fixed display bug when nicklist is displayed at bottom of screen diff --git a/weechat/TODO b/weechat/TODO index a33d7f85d..ec2b3c8f6 100644 --- a/weechat/TODO +++ b/weechat/TODO @@ -1,7 +1,7 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -TODO - 2004-07-03 +TODO - 2004-07-04 Legend: # done @@ -21,8 +21,12 @@ v0.0.7: + "/dcc" command (for chat and sending/receiving files) * Interface: - + split terminal in multiple windows (horizontally/vertically) - + hotlist (channels with activity) and auto-switch to channels + + "/buffer" command, buffers ordered by number, auto-jump to active + buffers (alt-a), jump to buffers by number (alt-number) + + "/window" command, split terminal in multiple windows + (horizontally/vertically) + # forget some old lines that were displayed long time ago (now all is saved, + if WeeChat is running for long time, a lot of memory is used!) + internationalization (traduce WeeChat in many languages) * Configuration: @@ -63,10 +67,7 @@ Future versions: + Gtk GUI - color for nicks (except own nick) when nick colors are disabled - interpret special chars in messages (color & bold for example) - - many channel windows in one window/term (window split) - add lag indicator - - forget some old lines that were displayed long time ago (now all is saved, - if WeeChat is running for long time, a lot of memory is used!) - improve completion (for example complete command parameters when possible) - understand incomplete commands if unambigous (for example: /he for /help is ok) - tab key with empty command line should switch to next window (like F7) @@ -79,10 +80,6 @@ Future versions: - SSL support - IPv6 protocol implementation - * Configuration: - - load config file after GUI (so init values by default (colors, ...) before - loading config) - * Plugins: - Python plugin - "/python load" and "/python unload" commands to (un)load Python scripts diff --git a/weechat/doc/weechat_doc_en.texi b/weechat/doc/weechat_doc_en.texi index 076947eaf..272d7856b 100644 --- a/weechat/doc/weechat_doc_en.texi +++ b/weechat/doc/weechat_doc_en.texi @@ -35,7 +35,7 @@ @title WeeChat - User guide @subtitle Fast, light and extensible IRC client -@subtitle Documentation for WeeChat v0.0.6 - June, 12 2004 +@subtitle Documentation for WeeChat v0.0.7 - July, 04 2004 @image{weechat_image} @@ -343,12 +343,12 @@ Type: color (Curses or Gtk color), default value: 'default'@* @item col_status Color for status bar@* Type: color (Curses or Gtk color), default value: 'gray'@* -@item col_status_active -Color for active window (status bar)@* -Type: color (Curses or Gtk color), default value: 'yellow'@* @item col_status_data_msg Color for window with new messages (status bar)@* Type: color (Curses or Gtk color), default value: 'lightred'@* +@item col_status_highlight +Color for window with highlight (status bar)@* +Type: color (Curses or Gtk color), default value: 'yellow'@* @item col_status_data_other Color for window with new data (not messages) (status bar)@* Type: color (Curses or Gtk color), default value: 'lightmagenta'@* @@ -572,14 +572,23 @@ Execute command or send message@* Call again last commands/messages@* @* @item PageUp / PageDown -Show window history@* +Show buffer history@* @* @item F6 / F7 -Switch to previous / next window@* +Switch to previous / next buffer@* +@* +@item F8 +Switch to next window@* @* @item Alt + left arrow / Alt + right arrow Same as F6 / F7@* @* +@item Alt + A +Switch to next buffer with activity (with priority: highlight, message, other)@* +@* +@item Alt + digit (1-9) +Switch to buffer by number@* +@* @item F10 Remove last infobar message@* @* diff --git a/weechat/doc/weechat_doc_fr.texi b/weechat/doc/weechat_doc_fr.texi index 7a39cc6fb..d9ce8f74a 100644 --- a/weechat/doc/weechat_doc_fr.texi +++ b/weechat/doc/weechat_doc_fr.texi @@ -35,7 +35,7 @@ @title WeeChat - Guide utilisateur @subtitle Client IRC rapide, l@'eger et extensible -@subtitle Documentation pour WeeChat v0.0.6 - 12 juin 2004 +@subtitle Documentation pour WeeChat v0.0.7 - 04 juillet 2004 @image{weechat_image} @@ -343,12 +343,12 @@ Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'default'@* @item col_status Couleur pour la barre de statut@* Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'gray'@* -@item col_status_active -Couleur pour la fen@^etre active (barre de statut)@* -Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'yellow'@* @item col_status_data_msg Couleur pour une fen@^etre avec de nouvelles infos (barre de statut)@* Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightred'@* +@item col_status_highlight +Color for window with highlight (status bar)@* +Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'yellow'@* @item col_status_data_other Couleur pour une fen@^etre avec des nouvelles donn@'ees (pas des infos) (barre de statut)@* Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightmagenta'@* @@ -572,14 +572,23 @@ Ex@'ecuter la commande ou envoyer le message@* Rappeler les derni@`eres commandes/messages@* @* @item PageUp / PageDown -Afficher l'historique de la fen@^etre@* +Afficher l'historique du tampon@* @* @item F6 / F7 -Aller @`a la fen@^etre pr@'ec@'edente / suivante@* +Aller au tampon pr@'ec@'edent@* +@* +@item F8 +Aller @`a la fen@^etre suivante@* @* @item Alt + fl@`eche gauche / Alt + fl@`eche droite Identique @`a F6 / F7@* @* +@item Alt + A +Sauter au tampon avec activit@'e (avec priorit@'e: highlight, message, autre)@* +@* +@item Alt + chiffre (1-9) +Sauter au tampon avec ce num@'ero@* +@* @item F10 Effacer le dernier message de la barre d'infos@* @* diff --git a/weechat/doc/weechat_doc_pt.texi b/weechat/doc/weechat_doc_pt.texi index dca2e7d46..e5ff858ff 100644 --- a/weechat/doc/weechat_doc_pt.texi +++ b/weechat/doc/weechat_doc_pt.texi @@ -35,7 +35,7 @@ @title WeeChat - Guia do Utilizador @subtitle Cliente de IRC rapido, leve e extencivel -@subtitle Documenta@,{c}@~ao do WeeChat v0.0.6 - 12 de Junho de 2004 +@subtitle Documenta@,{c}@~ao do WeeChat v0.0.7 - 04 de Julho de 2004 @image{weechat_image} @@ -277,6 +277,12 @@ Ir para a janela anterior/seguinte@* @item Alt + Seta da esquerda / Alt + Seta da direita Identico a F6 / F7@* @* +@item Alt + A +Comute ao amortecedor seguinte com atividade (com prioridade: destaque, mensagem, outra)@* +@* +@item Alt + d@'igito (1-9) +Comute ao amortecedor pelo n@'umero@* +@* @item F10 Apagar a @'ultima mensagem da barra do info@* @* diff --git a/weechat/po/fr.po b/weechat/po/fr.po index 1fe44807a..1a1ccf020 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.0.7-pre2\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2004-07-03 15:08+0200\n" +"POT-Creation-Date: 2004-07-04 16:44+0200\n" "PO-Revision-Date: 2004-06-05 10:52+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" @@ -1137,7 +1137,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-send.c:58 src/irc/irc-recv.c:2865 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2897 msgid "unknown" msgstr "inconnu" @@ -1162,17 +1162,17 @@ msgstr "" "%s la commande \"%s\" ne peut pas être exécutée dans une fenêtre serveur\n" #: src/irc/irc-send.c:481 src/irc/irc-send.c:503 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:993 +#: src/irc/irc-recv.c:996 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n" -#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1154 +#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1157 #, c-format 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:547 src/common/command.c:1126 +#: src/irc/irc-send.c:547 src/common/command.c:1176 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n" @@ -1192,7 +1192,7 @@ msgid " has joined " msgstr " a rejoint " #: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:865 -#: src/irc/irc-recv.c:1002 src/irc/irc-recv.c:2365 src/irc/irc-recv.c:2430 +#: src/irc/irc-recv.c:1005 src/irc/irc-recv.c:2397 src/irc/irc-recv.c:2462 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "%s canal non trouvé pour la commande \"%s\"\n" @@ -1294,7 +1294,7 @@ msgid "removes voice from" msgstr "supprime la voix de" #: src/irc/irc-recv.c:538 src/irc/irc-recv.c:611 src/irc/irc-recv.c:907 -#: src/irc/irc-recv.c:1219 +#: src/irc/irc-recv.c:1251 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "%s commande \"%s\" reçue sans host\n" @@ -1339,216 +1339,216 @@ msgstr "%s commande \"%s\" re msgid " has left " msgstr " a quitté " -#: src/irc/irc-recv.c:955 +#: src/irc/irc-recv.c:956 src/irc/irc-recv.c:1183 #, c-format msgid "On %s: * %s %s" msgstr "Sur %s: * %s %s" -#: src/irc/irc-recv.c:979 +#: src/irc/irc-recv.c:982 #, c-format msgid "On %s: %s> %s" msgstr "Sur %s: %s> %s" -#: src/irc/irc-recv.c:1047 +#: src/irc/irc-recv.c:1050 msgid "Received a " msgstr "Reçu un " -#: src/irc/irc-recv.c:1049 +#: src/irc/irc-recv.c:1052 msgid "CTCP VERSION " msgstr "CTCP VERSION " -#: src/irc/irc-recv.c:1051 +#: src/irc/irc-recv.c:1054 msgid "from" msgstr "de" -#: src/irc/irc-recv.c:1086 src/irc/irc-recv.c:1100 src/irc/irc-recv.c:1115 -#: src/irc/irc-recv.c:1130 src/irc/irc-recv.c:1196 src/irc/irc-recv.c:2651 -#: src/irc/irc-recv.c:2691 +#: src/irc/irc-recv.c:1089 src/irc/irc-recv.c:1103 src/irc/irc-recv.c:1118 +#: src/irc/irc-recv.c:1133 src/irc/irc-recv.c:1228 src/irc/irc-recv.c:2683 +#: src/irc/irc-recv.c:2723 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s impossible d'analyser la commande \"%s\"\n" -#: src/irc/irc-recv.c:1178 +#: src/irc/irc-recv.c:1209 #, c-format msgid "Private %s> %s" msgstr "Privé %s> %s" -#: src/irc/irc-recv.c:1251 +#: src/irc/irc-recv.c:1283 msgid "has quit" msgstr "a quitté" -#: src/irc/irc-recv.c:1371 +#: src/irc/irc-recv.c:1403 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s commande \"%s\" reçue sans canal\n" -#: src/irc/irc-recv.c:1399 +#: src/irc/irc-recv.c:1431 msgid " has changed topic for " msgstr " a changé le titre pour " -#: src/irc/irc-recv.c:1404 +#: src/irc/irc-recv.c:1436 #, c-format msgid " to: \"%s\"\n" msgstr " en: \"%s\"\n" -#: src/irc/irc-recv.c:1410 +#: src/irc/irc-recv.c:1442 msgid " has unset topic for " msgstr " a retiré le titre pour " -#: src/irc/irc-recv.c:1501 +#: src/irc/irc-recv.c:1533 #, c-format msgid " is away: %s\n" msgstr " est absent: %s\n" -#: src/irc/irc-recv.c:1575 +#: src/irc/irc-recv.c:1607 msgid "Users online: " msgstr "Utilisateurs en ligne: " -#: src/irc/irc-recv.c:1938 +#: src/irc/irc-recv.c:1970 msgid "idle: " msgstr "inactivité: " -#: src/irc/irc-recv.c:1946 +#: src/irc/irc-recv.c:1978 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:1946 +#: src/irc/irc-recv.c:1978 msgid "day" msgstr "jour" -#: src/irc/irc-recv.c:1956 +#: src/irc/irc-recv.c:1988 msgid "hours" msgstr "heures" -#: src/irc/irc-recv.c:1956 +#: src/irc/irc-recv.c:1988 msgid "hour" msgstr "heure" -#: src/irc/irc-recv.c:1962 +#: src/irc/irc-recv.c:1994 msgid "minutes" msgstr "minutes" -#: src/irc/irc-recv.c:1962 +#: src/irc/irc-recv.c:1994 msgid "minute" msgstr "minute" -#: src/irc/irc-recv.c:1968 +#: src/irc/irc-recv.c:2000 msgid "seconds" msgstr "secondes" -#: src/irc/irc-recv.c:1968 +#: src/irc/irc-recv.c:2000 msgid "second" msgstr "seconde" -#: src/irc/irc-recv.c:1973 +#: src/irc/irc-recv.c:2005 msgid "signon at: " msgstr "signé le: " -#: src/irc/irc-recv.c:2061 +#: src/irc/irc-recv.c:2093 msgid "Channels: " msgstr "Canauxs: " -#: src/irc/irc-recv.c:2312 +#: src/irc/irc-recv.c:2344 msgid "No topic set for " msgstr "Pas de titre défini pour " -#: src/irc/irc-recv.c:2354 +#: src/irc/irc-recv.c:2386 msgid "Topic for " msgstr "Le titre pour " -#: src/irc/irc-recv.c:2358 +#: src/irc/irc-recv.c:2390 #, c-format msgid " is: \"%s\"\n" msgstr " est: \"%s\"\n" -#: src/irc/irc-recv.c:2374 src/irc/irc-recv.c:2454 +#: src/irc/irc-recv.c:2406 src/irc/irc-recv.c:2486 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "%s impossible de déterminer le canal pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2420 +#: src/irc/irc-recv.c:2452 msgid "Topic set by " msgstr "Titre défini par " -#: src/irc/irc-recv.c:2438 +#: src/irc/irc-recv.c:2470 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "%s impossible d'identifier la date/heure pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2446 +#: src/irc/irc-recv.c:2478 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" "%s impossible de déterminer le nom d'utilisateur pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2575 +#: src/irc/irc-recv.c:2607 msgid " on " msgstr " sur " -#: src/irc/irc-recv.c:2682 +#: src/irc/irc-recv.c:2714 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "%s impossible de créer l'utilisateur \"%s\" pour le canal \"%s\"\n" -#: src/irc/irc-recv.c:2735 +#: src/irc/irc-recv.c:2767 msgid "Nicks " msgstr "Utilisateurs " -#: src/irc/irc-recv.c:2755 +#: src/irc/irc-recv.c:2787 msgid "Channel " msgstr "Canal " -#: src/irc/irc-recv.c:2766 +#: src/irc/irc-recv.c:2798 msgid "nicks" msgstr "utilisateurs" -#: src/irc/irc-recv.c:2766 +#: src/irc/irc-recv.c:2798 msgid "nick" msgstr "utilisateur" -#: src/irc/irc-recv.c:2774 +#: src/irc/irc-recv.c:2806 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:2774 +#: src/irc/irc-recv.c:2806 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:2783 +#: src/irc/irc-recv.c:2815 msgid "halfops" msgstr "halfops" -#: src/irc/irc-recv.c:2783 +#: src/irc/irc-recv.c:2815 msgid "halfop" msgstr "halfop" -#: src/irc/irc-recv.c:2792 +#: src/irc/irc-recv.c:2824 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:2792 +#: src/irc/irc-recv.c:2824 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:2801 +#: src/irc/irc-recv.c:2833 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:2834 +#: src/irc/irc-recv.c:2866 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 2nd " "nom d'utilisateur \"%s\"\n" -#: src/irc/irc-recv.c:2845 +#: src/irc/irc-recv.c:2877 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai du 3ème nom " "d'utilisateur \"%s\"\n" -#: src/irc/irc-recv.c:2854 +#: src/irc/irc-recv.c:2886 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1618,16 +1618,16 @@ msgstr "" "%s impossible d'ajouter la fonction pour le message \"%s\" (mémoire " "insuffisante)\n" -#: src/gui/curses/gui-display.c:921 +#: src/gui/curses/gui-display.c:870 #, c-format msgid "%d:[not connected] " msgstr "%d:[non connecté] " -#: src/gui/curses/gui-display.c:929 -msgid "Act: " -msgstr "Act: " +#: src/gui/curses/gui-display.c:878 +msgid "[Act: " +msgstr "[Act: " -#: src/gui/curses/gui-display.c:961 src/gui/curses/gui-display.c:964 +#: src/gui/curses/gui-display.c:913 src/gui/curses/gui-display.c:916 msgid "-MORE-" msgstr "-PLUS-" @@ -1635,17 +1635,17 @@ msgstr "-PLUS-" msgid "server" msgstr "serveur" -#: src/gui/gui-common.c:303 +#: src/gui/gui-common.c:300 #, c-format msgid "%s not enough memory for infobar message\n" msgstr "%s pas assez de mémoire pour un message de la barre d'infos\n" -#: src/gui/gui-common.c:423 +#: src/gui/gui-common.c:421 #, c-format msgid "%s not enough memory for new line!\n" msgstr "%s pas assez de mémoire pour une nouvelle ligne !\n" -#: src/gui/gui-common.c:466 +#: src/gui/gui-common.c:464 msgid "not enough memory!\n" msgstr "pas assez de mémoire !\n" @@ -1668,58 +1668,79 @@ msgstr "" "paramètres: paramètres pour la commande" #: src/common/command.c:46 +msgid "manage buffers" +msgstr "gère les buffers" + +#: src/common/command.c:47 +msgid "[action | number]" +msgstr "[action | nombre]" + +#: src/common/command.c:48 +msgid "" +"action: action to do:\n" +" move move buffer in the list (may be relative, for example -1)\n" +" list list opened buffers (no parameter implies this list)\n" +"number: jump to buffer by number" +msgstr "" +"action: action à effectuer:\n" +" move déplacer le buffer dans la liste (peut être relatif, par exemple -" +"1)\n" +" list liste les buffers ouverts (pas de paramètre affiche cette liste)\n" +"nombre: sauter au buffer qui a ce numéro" + +#: src/common/command.c:53 msgid "clear window(s)" msgstr "affacer la/les fenêtre(s)" -#: src/common/command.c:47 +#: src/common/command.c:54 msgid "[-all]" msgstr "[-all]" -#: src/common/command.c:48 +#: src/common/command.c:55 msgid "-all: clear all windows" msgstr "-all: effacer toutes les fenêtres" -#: src/common/command.c:50 +#: src/common/command.c:57 msgid "connect to a server" msgstr "se connecter à un serveur" -#: src/common/command.c:51 src/common/command.c:55 +#: src/common/command.c:58 src/common/command.c:62 msgid "servername" msgstr "nom_serveur" -#: src/common/command.c:52 +#: src/common/command.c:59 msgid "servername: server name to connect" msgstr "nom_serveur: nom du serveur pour se connecter" -#: src/common/command.c:54 +#: src/common/command.c:61 msgid "disconnect from a server" msgstr "se déconnecter d'un serveur" -#: src/common/command.c:56 +#: src/common/command.c:63 msgid "servername: server name to disconnect" msgstr "nom_serveur: nom du serveur pour se déconnecter" -#: src/common/command.c:58 +#: src/common/command.c:65 msgid "display help about commands" msgstr "afficher l'aide sur les commandes" -#: src/common/command.c:59 +#: src/common/command.c:66 msgid "[command]" msgstr "[commande]" -#: src/common/command.c:59 +#: src/common/command.c:66 msgid "command: name of a WeeChat or IRC command" msgstr "commande: nom d'une commande WeeChat ou IRC" -#: src/common/command.c:61 +#: src/common/command.c:68 msgid "list/load/unload Perl scripts" msgstr "liste/charge/décharge des scripts Perl" -#: src/common/command.c:62 +#: src/common/command.c:69 msgid "[load filename] | [unload]" msgstr "[load fichier] | [unload]" -#: src/common/command.c:63 +#: src/common/command.c:70 msgid "" "filename: Perl script (file) to load\n" "Without argument, /perl command lists all loaded Perl scripts." @@ -1727,11 +1748,11 @@ msgstr "" "fichier: script Perl (fichier) à charger\n" "Sans paramètre, la commande /perl liste tous les scripts Perl chargés." -#: src/common/command.c:66 +#: src/common/command.c:73 msgid "list, add or remove servers" msgstr "liste, ajoute ou retire des serveurs" -#: src/common/command.c:67 +#: src/common/command.c:74 msgid "" "[list] | [servername hostname port [-auto | -noauto] [-pwd password] [-nicks " "nick1 [nick2 [nick3]]] [-username username] [-realname realname] [-command " @@ -1741,7 +1762,7 @@ msgstr "" "nicks pseudo1 [pseudo2 [pseudo3]]] [-username nom_utilisateur] [-realname " "nom_réel] [-command commande] [-autojoin canal[,canal]] ] | [del nom_serveur]" -#: src/common/command.c:72 +#: src/common/command.c:79 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" @@ -1751,7 +1772,7 @@ msgid "" "nick2: alternate nick for server\n" "nick3: second alternate nick for server\n" "username: user name\n" -"realname: real name of user\n" +"realname: real name of user" msgstr "" "nom_serveur: nom du serveur, pour usage interne et affichage\n" "nom/IP: nom ou adresse IP du serveur\n" @@ -1761,29 +1782,29 @@ msgstr "" "pseudo2: pseudo alternatif pour le serveur\n" "pseudo3: second pseudo alternatif pour le serveur\n" "nom_utilisateur: nom d'utilisateur\n" -"nom_réel: nom réel de l'utilisateur\n" +"nom_réel: nom réel de l'utilisateur" -#: src/common/command.c:82 +#: src/common/command.c:89 msgid "save config to disk" msgstr "sauvegarder la configuration sur disque" -#: src/common/command.c:83 +#: src/common/command.c:90 msgid "[file]" msgstr "[fichier]" -#: src/common/command.c:83 +#: src/common/command.c:90 msgid "file: filename for writing config" msgstr "fichier: fichier pour sauvegarder la configuration" -#: src/common/command.c:85 +#: src/common/command.c:92 msgid "set config parameters" msgstr "modifier des paramètres de configuration" -#: src/common/command.c:86 +#: src/common/command.c:93 msgid "[option [value]]" msgstr "[option [valeur]]" -#: src/common/command.c:86 +#: src/common/command.c:93 msgid "" "option: name of an option\n" "value: value for option" @@ -1791,27 +1812,27 @@ msgstr "" "option: nom d'une option\n" "valeur: valeur pour l'option" -#: src/common/command.c:88 +#: src/common/command.c:95 msgid "remove an alias" msgstr "supprimer un alias" -#: src/common/command.c:89 +#: src/common/command.c:96 msgid "alias_name" msgstr "nom_alias" -#: src/common/command.c:89 +#: src/common/command.c:96 msgid "alias_name: name of alias to remove" msgstr "nom_alias: nom de l'alias à supprimer" -#: src/common/command.c:91 +#: src/common/command.c:98 msgid "manage windows" msgstr "gestion des fenêtres" -#: src/common/command.c:92 +#: src/common/command.c:99 msgid "[action]" msgstr "[action]" -#: src/common/command.c:93 +#: src/common/command.c:100 msgid "" "action: action to do:\n" " close close current window (under development!)\n" @@ -1826,29 +1847,29 @@ msgstr "" " splith éclate la fenêtre en deux horizontalement\n" " splitv éclate la fenêtre en deux verticalement" -#: src/common/command.c:348 +#: src/common/command.c:355 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "%s l'alias ou la commande \"%s\" existe déjà !\n" -#: src/common/command.c:357 +#: src/common/command.c:364 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "%s l'alias ne peux pas lancer un autre alias !\n" -#: src/common/command.c:363 +#: src/common/command.c:370 #, c-format msgid "%s target command \"%s\" does not exist!\n" msgstr "%s la commande cible \"%s\" n'existe pas !\n" -#: src/common/command.c:549 +#: src/common/command.c:556 #, 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:558 +#: src/common/command.c:565 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " @@ -1857,19 +1878,19 @@ 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:577 +#: src/common/command.c:584 #, c-format msgid "%s %s command \"%s\" failed\n" msgstr "%s %s la commande \"%s\" a échoué\n" -#: src/common/command.c:602 +#: src/common/command.c:609 #, 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:611 +#: src/common/command.c:618 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " @@ -1878,134 +1899,144 @@ 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:624 +#: src/common/command.c:631 #, 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:636 +#: src/common/command.c:643 #, c-format msgid "%s IRC command \"%s\" failed\n" msgstr "%s la commande IRC \"%s\" a échoué\n" -#: src/common/command.c:683 +#: src/common/command.c:690 #, 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:752 +#: src/common/command.c:759 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s impossible de trouver le pseudo pour envoyer le message\n" -#: src/common/command.c:758 +#: src/common/command.c:765 msgid "This window is not a channel!\n" msgstr "Cette fenêtre n'est pas un canal !\n" -#: src/common/command.c:784 src/common/command.c:796 +#: src/common/command.c:791 src/common/command.c:803 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "%s paramètres manquants pour la commande \"%s\"\n" -#: src/common/command.c:791 +#: src/common/command.c:798 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "Alias \"%s\" => \"%s\" créé\n" -#: src/common/command.c:806 +#: src/common/command.c:813 msgid "List of aliases:\n" msgstr "Liste des alias:\n" -#: src/common/command.c:816 +#: src/common/command.c:823 msgid "No alias defined.\n" msgstr "Aucun alias défini.\n" -#: src/common/command.c:835 +#: src/common/command.c:855 +#, c-format +msgid "%s incorrect buffer number\n" +msgstr "%s numéro de buffer incorrect\n" + +#: src/common/command.c:862 +#, 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:885 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "paramètre inconnu \"%s\" pour la commande \"%s\"\n" -#: src/common/command.c:864 +#: src/common/command.c:914 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s déjà connecté au serveur \"%s\" !\n" -#: src/common/command.c:887 src/common/command.c:922 +#: src/common/command.c:937 src/common/command.c:972 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s serveur \"%s\" non trouvé\n" -#: src/common/command.c:912 +#: src/common/command.c:962 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s non connecté au serveur \"%s\" !\n" -#: src/common/command.c:941 +#: src/common/command.c:991 #, c-format msgid "> List of %s internal commands:\n" msgstr "> Liste des commandes internes %s:\n" -#: src/common/command.c:946 +#: src/common/command.c:996 msgid "> List of IRC commands:\n" msgstr "> Liste des commandes IRC:\n" -#: src/common/command.c:961 +#: src/common/command.c:1011 #, c-format msgid "> Help on %s internal command \"%s\":\n" msgstr "> Aide sur la commande interne %s \"%s\":\n" -#: src/common/command.c:964 src/common/command.c:985 +#: src/common/command.c:1014 src/common/command.c:1035 #, c-format msgid "Syntax: /%s %s\n" msgstr "Syntaxe: /%s %s\n" -#: src/common/command.c:983 +#: src/common/command.c:1033 #, c-format msgid "> Help on IRC command \"%s\":\n" msgstr "> Aide sur la commande IRC \"%s\":\n" -#: src/common/command.c:999 +#: src/common/command.c:1049 #, 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:1024 +#: src/common/command.c:1074 msgid "Registered Perl scripts:\n" msgstr "Scripts Perl enregistrés :\n" -#: src/common/command.c:1041 src/common/command.c:1063 -#: src/common/command.c:1085 +#: src/common/command.c:1091 src/common/command.c:1113 +#: src/common/command.c:1135 msgid " (none)\n" msgstr " (aucun)\n" -#: src/common/command.c:1046 +#: src/common/command.c:1096 msgid "Perl message handlers:\n" msgstr "Fonctions Perl pour messages :\n" -#: src/common/command.c:1055 +#: src/common/command.c:1105 #, c-format msgid " IRC(%s) => Perl(%s)\n" msgstr " IRC(%s) => Perl(%s)\n" -#: src/common/command.c:1068 +#: src/common/command.c:1118 msgid "Perl command handlers:\n" msgstr "Commandes Perl :\n" -#: src/common/command.c:1077 +#: src/common/command.c:1127 #, c-format msgid " Command /%s => Perl(%s)\n" msgstr " Commande /%s => Perl(%s)\n" -#: src/common/command.c:1095 +#: src/common/command.c:1145 msgid "Perl scripts unloaded\n" msgstr "Scripts Perl déchargés\n" -#: src/common/command.c:1120 +#: src/common/command.c:1170 src/common/command.c:1708 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s option inconnue pour la commande \"%s\"\n" -#: src/common/command.c:1131 +#: src/common/command.c:1181 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" @@ -2014,188 +2045,188 @@ msgstr "" "Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le " "script ./configure\n" -#: src/common/command.c:1175 +#: src/common/command.c:1225 msgid "Server: " msgstr "Serveur: " -#: src/common/command.c:1186 +#: src/common/command.c:1236 msgid "connected" msgstr "connecté" -#: src/common/command.c:1186 +#: src/common/command.c:1236 msgid "not connected" msgstr "non connecté" -#: src/common/command.c:1193 +#: src/common/command.c:1243 #, c-format msgid " Autoconnect: %s%s\n" msgstr " Autoconnect: %s%s\n" -#: src/common/command.c:1194 +#: src/common/command.c:1244 msgid "yes" msgstr "oui" -#: src/common/command.c:1194 +#: src/common/command.c:1244 msgid "no" msgstr "non" -#: src/common/command.c:1196 +#: src/common/command.c:1246 msgid " (temporary server, will not be saved)" msgstr " (serveur temporaire, ne sera pas sauvé)" -#: src/common/command.c:1201 +#: src/common/command.c:1251 #, c-format msgid " Hostname : %s\n" msgstr " Nom/IP : %s\n" -#: src/common/command.c:1206 +#: src/common/command.c:1256 #, c-format msgid " Port : %d\n" msgstr " Port : %d\n" -#: src/common/command.c:1212 +#: src/common/command.c:1262 msgid " Password : (hidden)\n" msgstr " Mot passe : (caché)\n" -#: src/common/command.c:1216 +#: src/common/command.c:1266 msgid " Password : (none)\n" msgstr " Mot passe : (aucun)\n" -#: src/common/command.c:1220 +#: src/common/command.c:1270 #, c-format msgid " Nicks : %s" msgstr " Pseudos : %s" -#: src/common/command.c:1237 +#: src/common/command.c:1287 #, c-format msgid " Username : %s\n" msgstr " Nom utilis.: %s\n" -#: src/common/command.c:1242 +#: src/common/command.c:1292 #, c-format msgid " Realname : %s\n" msgstr " Nom réel : %s\n" -#: src/common/command.c:1248 +#: src/common/command.c:1298 #, c-format msgid " Command : %s\n" msgstr " Commande : %s\n" -#: src/common/command.c:1253 +#: src/common/command.c:1303 msgid " Command : (none)\n" msgstr " Commande : (aucune)\n" -#: src/common/command.c:1258 +#: src/common/command.c:1308 #, c-format msgid " Auto-join : %s\n" msgstr " Auto-join : %s\n" -#: src/common/command.c:1263 +#: src/common/command.c:1313 msgid " Auto-join : (none)\n" msgstr " Auto-join : (aucun)\n" -#: src/common/command.c:1267 +#: src/common/command.c:1317 msgid "No server.\n" msgstr "Pas de serveur.\n" -#: src/common/command.c:1276 +#: src/common/command.c:1326 #, 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:1282 +#: src/common/command.c:1332 #, 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:1299 +#: src/common/command.c:1349 #, 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:1305 src/common/command.c:1436 +#: src/common/command.c:1355 src/common/command.c:1486 msgid "Server" msgstr "Serveur" -#: src/common/command.c:1308 +#: src/common/command.c:1358 msgid "has been deleted\n" msgstr "a été supprimé\n" -#: src/common/command.c:1322 +#: src/common/command.c:1372 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s paramètres manquants pour la commande \"%s\"\n" -#: src/common/command.c:1331 +#: src/common/command.c:1381 #, 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:1355 src/common/command.c:1381 -#: src/common/command.c:1393 src/common/command.c:1417 +#: src/common/command.c:1405 src/common/command.c:1431 +#: src/common/command.c:1443 src/common/command.c:1467 #, 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:1367 +#: src/common/command.c:1417 #, 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:1405 +#: src/common/command.c:1455 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s commande manquante pour le paramètre \"%s\"\n" -#: src/common/command.c:1439 +#: src/common/command.c:1489 msgid "created\n" msgstr "créé\n" -#: src/common/command.c:1444 +#: src/common/command.c:1494 #, c-format msgid "%s unable to create server\n" msgstr "%s impossible de créer le serveur\n" -#: src/common/command.c:1498 +#: src/common/command.c:1548 #, 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" +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:1510 +#: src/common/command.c:1560 #, c-format -msgid "%s incorrect value for option '%s'\n" -msgstr "%s valeur incorrecte pour l'option '%s'\n" - -#: src/common/command.c:1516 -#, c-format -msgid "%s config option '%s' not found\n" -msgstr "%s option de configuration '%s' non trouvée\n" +msgid "%s incorrect value for option \"%s\"\n" +msgstr "%s valeur incorrecte pour l'option \"%s\"\n" #: src/common/command.c:1566 +#, c-format +msgid "%s config option \"%s\" not found\n" +msgstr "%s option de configuration \"%s\" non trouvée\n" + +#: src/common/command.c:1616 msgid "(unknown)" msgstr "(inconnu)" -#: src/common/command.c:1586 src/common/command.c:1589 +#: src/common/command.c:1636 src/common/command.c:1639 #, c-format -msgid "No config option found with '%s'\n" -msgstr "Aucune option de configuration trouvée avec '%s'\n" +msgid "No config option found with \"%s\"\n" +msgstr "Aucune option de configuration trouvée avec \"%s\"\n" -#: src/common/command.c:1594 +#: src/common/command.c:1644 #, c-format -msgid "%d config option(s) found with '%s'\n" -msgstr "%d option(s) de configuration trouvées avec '%s'\n" +msgid "%d config option(s) found with \"%s\"\n" +msgstr "%d option(s) de configuration trouvées avec \"%s\"\n" -#: src/common/command.c:1597 +#: src/common/command.c:1647 #, c-format msgid "%d config option(s) found\n" msgstr "%d option(s) de configuration trouvées\n" -#: src/common/command.c:1617 +#: src/common/command.c:1667 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias ou commande \"%s\" non trouvé\n" -#: src/common/command.c:1626 +#: src/common/command.c:1676 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" supprimé\n" @@ -2539,21 +2570,21 @@ msgid "color for status bar" msgstr "couleur pour la barre de statut" #: src/common/weeconfig.c:258 -msgid "color for active window" -msgstr "couleur pour la fenêtre active" - -#: src/common/weeconfig.c:259 -msgid "color for active window (status bar)" -msgstr "couleur pour la fenêtre active (barre de statut)" - -#: src/common/weeconfig.c:262 msgid "color for window with new messages" msgstr "couleur pour une fenêtre avec de nouvelles infos" -#: src/common/weeconfig.c:263 +#: src/common/weeconfig.c:259 msgid "color for window with new messages (status bar)" msgstr "couleur pour une fenêtre avec de nouvelles infos (barre de statut)" +#: src/common/weeconfig.c:262 +msgid "color for window with highlight" +msgstr "couleur pour une fenêtre avec un highlight" + +#: src/common/weeconfig.c:263 +msgid "color for window with highlight (status bar)" +msgstr "couleur pour une fenêtre avec un highlight (barre de statut)" + #: src/common/weeconfig.c:266 msgid "color for window with new data (not messages)" msgstr "couleur pour une fenêtre avec des nouvelles données (pas des infos)" @@ -3032,3 +3063,9 @@ msgstr "" #: src/common/weeconfig.c:1248 msgid "saving config to disk\n" msgstr "sauvegarde de la configuration sur disque\n" + +#~ msgid "color for active window" +#~ msgstr "couleur pour la fenêtre active" + +#~ msgid "color for active window (status bar)" +#~ msgstr "couleur pour la fenêtre active (barre de statut)" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index 8ad49eed8..d3cf1163a 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: 2004-07-03 15:08+0200\n" +"POT-Creation-Date: 2004-07-04 16:44+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1046,7 +1046,7 @@ msgstr "" msgid "can't change mode for other users" msgstr "" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2865 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2897 msgid "unknown" msgstr "" @@ -1068,17 +1068,17 @@ msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" #: src/irc/irc-send.c:481 src/irc/irc-send.c:503 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:993 +#: src/irc/irc-recv.c:996 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1154 +#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1157 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:547 src/common/command.c:1126 +#: src/irc/irc-send.c:547 src/common/command.c:1176 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "" @@ -1098,7 +1098,7 @@ msgid " has joined " msgstr "" #: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:865 -#: src/irc/irc-recv.c:1002 src/irc/irc-recv.c:2365 src/irc/irc-recv.c:2430 +#: src/irc/irc-recv.c:1005 src/irc/irc-recv.c:2397 src/irc/irc-recv.c:2462 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "" @@ -1200,7 +1200,7 @@ msgid "removes voice from" msgstr "" #: src/irc/irc-recv.c:538 src/irc/irc-recv.c:611 src/irc/irc-recv.c:907 -#: src/irc/irc-recv.c:1219 +#: src/irc/irc-recv.c:1251 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "" @@ -1245,211 +1245,211 @@ msgstr "" msgid " has left " msgstr "" -#: src/irc/irc-recv.c:955 +#: src/irc/irc-recv.c:956 src/irc/irc-recv.c:1183 #, c-format msgid "On %s: * %s %s" msgstr "" -#: src/irc/irc-recv.c:979 +#: src/irc/irc-recv.c:982 #, c-format msgid "On %s: %s> %s" msgstr "" -#: src/irc/irc-recv.c:1047 +#: src/irc/irc-recv.c:1050 msgid "Received a " msgstr "" -#: src/irc/irc-recv.c:1049 +#: src/irc/irc-recv.c:1052 msgid "CTCP VERSION " msgstr "" -#: src/irc/irc-recv.c:1051 +#: src/irc/irc-recv.c:1054 msgid "from" msgstr "" -#: src/irc/irc-recv.c:1086 src/irc/irc-recv.c:1100 src/irc/irc-recv.c:1115 -#: src/irc/irc-recv.c:1130 src/irc/irc-recv.c:1196 src/irc/irc-recv.c:2651 -#: src/irc/irc-recv.c:2691 +#: src/irc/irc-recv.c:1089 src/irc/irc-recv.c:1103 src/irc/irc-recv.c:1118 +#: src/irc/irc-recv.c:1133 src/irc/irc-recv.c:1228 src/irc/irc-recv.c:2683 +#: src/irc/irc-recv.c:2723 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:1178 +#: src/irc/irc-recv.c:1209 #, c-format msgid "Private %s> %s" msgstr "" -#: src/irc/irc-recv.c:1251 +#: src/irc/irc-recv.c:1283 msgid "has quit" msgstr "" -#: src/irc/irc-recv.c:1371 +#: src/irc/irc-recv.c:1403 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "" -#: src/irc/irc-recv.c:1399 +#: src/irc/irc-recv.c:1431 msgid " has changed topic for " msgstr "" -#: src/irc/irc-recv.c:1404 +#: src/irc/irc-recv.c:1436 #, c-format msgid " to: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:1410 +#: src/irc/irc-recv.c:1442 msgid " has unset topic for " msgstr "" -#: src/irc/irc-recv.c:1501 +#: src/irc/irc-recv.c:1533 #, c-format msgid " is away: %s\n" msgstr "" -#: src/irc/irc-recv.c:1575 +#: src/irc/irc-recv.c:1607 msgid "Users online: " msgstr "" -#: src/irc/irc-recv.c:1938 +#: src/irc/irc-recv.c:1970 msgid "idle: " msgstr "" -#: src/irc/irc-recv.c:1946 +#: src/irc/irc-recv.c:1978 msgid "days" msgstr "" -#: src/irc/irc-recv.c:1946 +#: src/irc/irc-recv.c:1978 msgid "day" msgstr "" -#: src/irc/irc-recv.c:1956 +#: src/irc/irc-recv.c:1988 msgid "hours" msgstr "" -#: src/irc/irc-recv.c:1956 +#: src/irc/irc-recv.c:1988 msgid "hour" msgstr "" -#: src/irc/irc-recv.c:1962 +#: src/irc/irc-recv.c:1994 msgid "minutes" msgstr "" -#: src/irc/irc-recv.c:1962 +#: src/irc/irc-recv.c:1994 msgid "minute" msgstr "" -#: src/irc/irc-recv.c:1968 +#: src/irc/irc-recv.c:2000 msgid "seconds" msgstr "" -#: src/irc/irc-recv.c:1968 +#: src/irc/irc-recv.c:2000 msgid "second" msgstr "" -#: src/irc/irc-recv.c:1973 +#: src/irc/irc-recv.c:2005 msgid "signon at: " msgstr "" -#: src/irc/irc-recv.c:2061 +#: src/irc/irc-recv.c:2093 msgid "Channels: " msgstr "" -#: src/irc/irc-recv.c:2312 +#: src/irc/irc-recv.c:2344 msgid "No topic set for " msgstr "" -#: src/irc/irc-recv.c:2354 +#: src/irc/irc-recv.c:2386 msgid "Topic for " msgstr "" -#: src/irc/irc-recv.c:2358 +#: src/irc/irc-recv.c:2390 #, c-format msgid " is: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2374 src/irc/irc-recv.c:2454 +#: src/irc/irc-recv.c:2406 src/irc/irc-recv.c:2486 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2420 +#: src/irc/irc-recv.c:2452 msgid "Topic set by " msgstr "" -#: src/irc/irc-recv.c:2438 +#: src/irc/irc-recv.c:2470 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2446 +#: src/irc/irc-recv.c:2478 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2575 +#: src/irc/irc-recv.c:2607 msgid " on " msgstr "" -#: src/irc/irc-recv.c:2682 +#: src/irc/irc-recv.c:2714 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2735 +#: src/irc/irc-recv.c:2767 msgid "Nicks " msgstr "" -#: src/irc/irc-recv.c:2755 +#: src/irc/irc-recv.c:2787 msgid "Channel " msgstr "" -#: src/irc/irc-recv.c:2766 +#: src/irc/irc-recv.c:2798 msgid "nicks" msgstr "" -#: src/irc/irc-recv.c:2766 +#: src/irc/irc-recv.c:2798 msgid "nick" msgstr "" -#: src/irc/irc-recv.c:2774 +#: src/irc/irc-recv.c:2806 msgid "ops" msgstr "" -#: src/irc/irc-recv.c:2774 +#: src/irc/irc-recv.c:2806 msgid "op" msgstr "" -#: src/irc/irc-recv.c:2783 +#: src/irc/irc-recv.c:2815 msgid "halfops" msgstr "" -#: src/irc/irc-recv.c:2783 +#: src/irc/irc-recv.c:2815 msgid "halfop" msgstr "" -#: src/irc/irc-recv.c:2792 +#: src/irc/irc-recv.c:2824 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:2792 +#: src/irc/irc-recv.c:2824 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:2801 +#: src/irc/irc-recv.c:2833 msgid "normal" msgstr "" -#: src/irc/irc-recv.c:2834 +#: src/irc/irc-recv.c:2866 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2845 +#: src/irc/irc-recv.c:2877 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2854 +#: src/irc/irc-recv.c:2886 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1511,16 +1511,16 @@ msgstr "" msgid "%s unable to add handler for \"%s\" message (not enough memory)\n" msgstr "" -#: src/gui/curses/gui-display.c:921 +#: src/gui/curses/gui-display.c:870 #, c-format msgid "%d:[not connected] " msgstr "" -#: src/gui/curses/gui-display.c:929 -msgid "Act: " +#: src/gui/curses/gui-display.c:878 +msgid "[Act: " msgstr "" -#: src/gui/curses/gui-display.c:961 src/gui/curses/gui-display.c:964 +#: src/gui/curses/gui-display.c:913 src/gui/curses/gui-display.c:916 msgid "-MORE-" msgstr "" @@ -1528,17 +1528,17 @@ msgstr "" msgid "server" msgstr "" -#: src/gui/gui-common.c:303 +#: src/gui/gui-common.c:300 #, c-format msgid "%s not enough memory for infobar message\n" msgstr "" -#: src/gui/gui-common.c:423 +#: src/gui/gui-common.c:421 #, c-format msgid "%s not enough memory for new line!\n" msgstr "" -#: src/gui/gui-common.c:466 +#: src/gui/gui-common.c:464 msgid "not enough memory!\n" msgstr "" @@ -1558,75 +1558,91 @@ msgid "" msgstr "" #: src/common/command.c:46 -msgid "clear window(s)" +msgid "manage buffers" msgstr "" #: src/common/command.c:47 -msgid "[-all]" +msgid "[action | number]" msgstr "" #: src/common/command.c:48 -msgid "-all: clear all windows" +msgid "" +"action: action to do:\n" +" move move buffer in the list (may be relative, for example -1)\n" +" list list opened buffers (no parameter implies this list)\n" +"number: jump to buffer by number" msgstr "" -#: src/common/command.c:50 -msgid "connect to a server" -msgstr "" - -#: src/common/command.c:51 src/common/command.c:55 -msgid "servername" -msgstr "" - -#: src/common/command.c:52 -msgid "servername: server name to connect" +#: src/common/command.c:53 +msgid "clear window(s)" msgstr "" #: src/common/command.c:54 -msgid "disconnect from a server" +msgid "[-all]" msgstr "" -#: src/common/command.c:56 -msgid "servername: server name to disconnect" +#: src/common/command.c:55 +msgid "-all: clear all windows" msgstr "" -#: src/common/command.c:58 -msgid "display help about commands" +#: src/common/command.c:57 +msgid "connect to a server" +msgstr "" + +#: src/common/command.c:58 src/common/command.c:62 +msgid "servername" msgstr "" #: src/common/command.c:59 -msgid "[command]" -msgstr "" - -#: src/common/command.c:59 -msgid "command: name of a WeeChat or IRC command" +msgid "servername: server name to connect" msgstr "" #: src/common/command.c:61 -msgid "list/load/unload Perl scripts" -msgstr "" - -#: src/common/command.c:62 -msgid "[load filename] | [unload]" +msgid "disconnect from a server" msgstr "" #: src/common/command.c:63 +msgid "servername: server name to disconnect" +msgstr "" + +#: src/common/command.c:65 +msgid "display help about commands" +msgstr "" + +#: src/common/command.c:66 +msgid "[command]" +msgstr "" + +#: src/common/command.c:66 +msgid "command: name of a WeeChat or IRC command" +msgstr "" + +#: src/common/command.c:68 +msgid "list/load/unload Perl scripts" +msgstr "" + +#: src/common/command.c:69 +msgid "[load filename] | [unload]" +msgstr "" + +#: src/common/command.c:70 msgid "" "filename: Perl script (file) to load\n" "Without argument, /perl command lists all loaded Perl scripts." msgstr "" -#: src/common/command.c:66 +#: src/common/command.c:73 msgid "list, add or remove servers" msgstr "" -#: src/common/command.c:67 +#: src/common/command.c:74 msgid "" "[list] | [servername hostname port [-auto | -noauto] [-pwd password] [-nicks " "nick1 [nick2 [nick3]]] [-username username] [-realname realname] [-command " "command] [-autojoin channel[,channel]] ] | [del servername]" msgstr "" -#: src/common/command.c:72 +#: src/common/command.c:79 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" @@ -1636,56 +1652,56 @@ msgid "" "nick2: alternate nick for server\n" "nick3: second alternate nick for server\n" "username: user name\n" -"realname: real name of user\n" +"realname: real name of user" msgstr "" -#: src/common/command.c:82 +#: src/common/command.c:89 msgid "save config to disk" msgstr "" -#: src/common/command.c:83 +#: src/common/command.c:90 msgid "[file]" msgstr "" -#: src/common/command.c:83 +#: src/common/command.c:90 msgid "file: filename for writing config" msgstr "" -#: src/common/command.c:85 +#: src/common/command.c:92 msgid "set config parameters" msgstr "" -#: src/common/command.c:86 +#: src/common/command.c:93 msgid "[option [value]]" msgstr "" -#: src/common/command.c:86 +#: src/common/command.c:93 msgid "" "option: name of an option\n" "value: value for option" msgstr "" -#: src/common/command.c:88 +#: src/common/command.c:95 msgid "remove an alias" msgstr "" -#: src/common/command.c:89 +#: src/common/command.c:96 msgid "alias_name" msgstr "" -#: src/common/command.c:89 +#: src/common/command.c:96 msgid "alias_name: name of alias to remove" msgstr "" -#: src/common/command.c:91 +#: src/common/command.c:98 msgid "manage windows" msgstr "" -#: src/common/command.c:92 +#: src/common/command.c:99 msgid "[action]" msgstr "" -#: src/common/command.c:93 +#: src/common/command.c:100 msgid "" "action: action to do:\n" " close close current window (under development!)\n" @@ -1694,365 +1710,375 @@ msgid "" " splitv split current window vertically" msgstr "" -#: src/common/command.c:348 +#: src/common/command.c:355 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "" -#: src/common/command.c:357 +#: src/common/command.c:364 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "" -#: src/common/command.c:363 +#: src/common/command.c:370 #, c-format msgid "%s target command \"%s\" does not exist!\n" msgstr "" -#: src/common/command.c:549 +#: src/common/command.c:556 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" -#: src/common/command.c:558 +#: src/common/command.c:565 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " "arg%s)\n" msgstr "" -#: src/common/command.c:577 +#: src/common/command.c:584 #, c-format msgid "%s %s command \"%s\" failed\n" msgstr "" -#: src/common/command.c:602 +#: src/common/command.c:609 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" -#: src/common/command.c:611 +#: src/common/command.c:618 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " "arg%s)\n" msgstr "" -#: src/common/command.c:624 +#: src/common/command.c:631 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "" -#: src/common/command.c:636 +#: src/common/command.c:643 #, c-format msgid "%s IRC command \"%s\" failed\n" msgstr "" -#: src/common/command.c:683 +#: src/common/command.c:690 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "" -#: src/common/command.c:752 +#: src/common/command.c:759 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "" -#: src/common/command.c:758 +#: src/common/command.c:765 msgid "This window is not a channel!\n" msgstr "" -#: src/common/command.c:784 src/common/command.c:796 +#: src/common/command.c:791 src/common/command.c:803 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "" -#: src/common/command.c:791 +#: src/common/command.c:798 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "" -#: src/common/command.c:806 +#: src/common/command.c:813 msgid "List of aliases:\n" msgstr "" -#: src/common/command.c:816 +#: src/common/command.c:823 msgid "No alias defined.\n" msgstr "" -#: src/common/command.c:835 +#: src/common/command.c:855 +#, c-format +msgid "%s incorrect buffer number\n" +msgstr "" + +#: src/common/command.c:862 +#, c-format +msgid "%s buffer \"%s\" not found for \"%s\" command\n" +msgstr "" + +#: src/common/command.c:885 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "" -#: src/common/command.c:864 +#: src/common/command.c:914 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:887 src/common/command.c:922 +#: src/common/command.c:937 src/common/command.c:972 #, c-format msgid "%s server \"%s\" not found\n" msgstr "" -#: src/common/command.c:912 +#: src/common/command.c:962 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:941 +#: src/common/command.c:991 #, c-format msgid "> List of %s internal commands:\n" msgstr "" -#: src/common/command.c:946 +#: src/common/command.c:996 msgid "> List of IRC commands:\n" msgstr "" -#: src/common/command.c:961 +#: src/common/command.c:1011 #, c-format msgid "> Help on %s internal command \"%s\":\n" msgstr "" -#: src/common/command.c:964 src/common/command.c:985 +#: src/common/command.c:1014 src/common/command.c:1035 #, c-format msgid "Syntax: /%s %s\n" msgstr "" -#: src/common/command.c:983 +#: src/common/command.c:1033 #, c-format msgid "> Help on IRC command \"%s\":\n" msgstr "" -#: src/common/command.c:999 +#: src/common/command.c:1049 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "" -#: src/common/command.c:1024 +#: src/common/command.c:1074 msgid "Registered Perl scripts:\n" msgstr "" -#: src/common/command.c:1041 src/common/command.c:1063 -#: src/common/command.c:1085 +#: src/common/command.c:1091 src/common/command.c:1113 +#: src/common/command.c:1135 msgid " (none)\n" msgstr "" -#: src/common/command.c:1046 +#: src/common/command.c:1096 msgid "Perl message handlers:\n" msgstr "" -#: src/common/command.c:1055 +#: src/common/command.c:1105 #, c-format msgid " IRC(%s) => Perl(%s)\n" msgstr "" -#: src/common/command.c:1068 +#: src/common/command.c:1118 msgid "Perl command handlers:\n" msgstr "" -#: src/common/command.c:1077 +#: src/common/command.c:1127 #, c-format msgid " Command /%s => Perl(%s)\n" msgstr "" -#: src/common/command.c:1095 +#: src/common/command.c:1145 msgid "Perl scripts unloaded\n" msgstr "" -#: src/common/command.c:1120 +#: src/common/command.c:1170 src/common/command.c:1708 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "" -#: src/common/command.c:1131 +#: src/common/command.c:1181 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" msgstr "" -#: src/common/command.c:1175 +#: src/common/command.c:1225 msgid "Server: " msgstr "" -#: src/common/command.c:1186 +#: src/common/command.c:1236 msgid "connected" msgstr "" -#: src/common/command.c:1186 +#: src/common/command.c:1236 msgid "not connected" msgstr "" -#: src/common/command.c:1193 +#: src/common/command.c:1243 #, c-format msgid " Autoconnect: %s%s\n" msgstr "" -#: src/common/command.c:1194 +#: src/common/command.c:1244 msgid "yes" msgstr "" -#: src/common/command.c:1194 +#: src/common/command.c:1244 msgid "no" msgstr "" -#: src/common/command.c:1196 +#: src/common/command.c:1246 msgid " (temporary server, will not be saved)" msgstr "" -#: src/common/command.c:1201 +#: src/common/command.c:1251 #, c-format msgid " Hostname : %s\n" msgstr "" -#: src/common/command.c:1206 +#: src/common/command.c:1256 #, c-format msgid " Port : %d\n" msgstr "" -#: src/common/command.c:1212 +#: src/common/command.c:1262 msgid " Password : (hidden)\n" msgstr "" -#: src/common/command.c:1216 +#: src/common/command.c:1266 msgid " Password : (none)\n" msgstr "" -#: src/common/command.c:1220 +#: src/common/command.c:1270 #, c-format msgid " Nicks : %s" msgstr "" -#: src/common/command.c:1237 +#: src/common/command.c:1287 #, c-format msgid " Username : %s\n" msgstr "" -#: src/common/command.c:1242 +#: src/common/command.c:1292 #, c-format msgid " Realname : %s\n" msgstr "" -#: src/common/command.c:1248 +#: src/common/command.c:1298 #, c-format msgid " Command : %s\n" msgstr "" -#: src/common/command.c:1253 +#: src/common/command.c:1303 msgid " Command : (none)\n" msgstr "" -#: src/common/command.c:1258 +#: src/common/command.c:1308 #, c-format msgid " Auto-join : %s\n" msgstr "" -#: src/common/command.c:1263 +#: src/common/command.c:1313 msgid " Auto-join : (none)\n" msgstr "" -#: src/common/command.c:1267 +#: src/common/command.c:1317 msgid "No server.\n" msgstr "" -#: src/common/command.c:1276 +#: src/common/command.c:1326 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "" -#: src/common/command.c:1282 +#: src/common/command.c:1332 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" -#: src/common/command.c:1299 +#: src/common/command.c:1349 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:1305 src/common/command.c:1436 +#: src/common/command.c:1355 src/common/command.c:1486 msgid "Server" msgstr "" -#: src/common/command.c:1308 +#: src/common/command.c:1358 msgid "has been deleted\n" msgstr "" -#: src/common/command.c:1322 +#: src/common/command.c:1372 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "" -#: src/common/command.c:1331 +#: src/common/command.c:1381 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "" -#: src/common/command.c:1355 src/common/command.c:1381 -#: src/common/command.c:1393 src/common/command.c:1417 +#: src/common/command.c:1405 src/common/command.c:1431 +#: src/common/command.c:1443 src/common/command.c:1467 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1367 +#: src/common/command.c:1417 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1405 +#: src/common/command.c:1455 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1439 +#: src/common/command.c:1489 msgid "created\n" msgstr "" -#: src/common/command.c:1444 +#: src/common/command.c:1494 #, c-format msgid "%s unable to create server\n" msgstr "" -#: src/common/command.c:1498 +#: src/common/command.c:1548 #, c-format -msgid "%s option '%s' can not be changed while WeeChat is running\n" +msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" -#: src/common/command.c:1510 +#: src/common/command.c:1560 #, c-format -msgid "%s incorrect value for option '%s'\n" -msgstr "" - -#: src/common/command.c:1516 -#, c-format -msgid "%s config option '%s' not found\n" +msgid "%s incorrect value for option \"%s\"\n" msgstr "" #: src/common/command.c:1566 +#, c-format +msgid "%s config option \"%s\" not found\n" +msgstr "" + +#: src/common/command.c:1616 msgid "(unknown)" msgstr "" -#: src/common/command.c:1586 src/common/command.c:1589 +#: src/common/command.c:1636 src/common/command.c:1639 #, c-format -msgid "No config option found with '%s'\n" +msgid "No config option found with \"%s\"\n" msgstr "" -#: src/common/command.c:1594 +#: src/common/command.c:1644 #, c-format -msgid "%d config option(s) found with '%s'\n" +msgid "%d config option(s) found with \"%s\"\n" msgstr "" -#: src/common/command.c:1597 +#: src/common/command.c:1647 #, c-format msgid "%d config option(s) found\n" msgstr "" -#: src/common/command.c:1617 +#: src/common/command.c:1667 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "" -#: src/common/command.c:1626 +#: src/common/command.c:1676 #, c-format msgid "Alias \"%s\" removed\n" msgstr "" @@ -2372,21 +2398,21 @@ msgid "color for status bar" msgstr "" #: src/common/weeconfig.c:258 -msgid "color for active window" -msgstr "" - -#: src/common/weeconfig.c:259 -msgid "color for active window (status bar)" -msgstr "" - -#: src/common/weeconfig.c:262 msgid "color for window with new messages" msgstr "" -#: src/common/weeconfig.c:263 +#: src/common/weeconfig.c:259 msgid "color for window with new messages (status bar)" msgstr "" +#: src/common/weeconfig.c:262 +msgid "color for window with highlight" +msgstr "" + +#: src/common/weeconfig.c:263 +msgid "color for window with highlight (status bar)" +msgstr "" + #: src/common/weeconfig.c:266 msgid "color for window with new data (not messages)" msgstr "" diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c index 873adeff8..d934e8ca5 100644 --- a/weechat/src/common/command.c +++ b/weechat/src/common/command.c @@ -43,6 +43,13 @@ t_weechat_command weechat_commands[] = N_("alias_name: name of alias\ncommand: command name (WeeChat " "or IRC command, without first '/')\n" "arguments: arguments for command"), 0, MAX_ARGS, NULL, weechat_cmd_alias }, + { "buffer", N_("manage buffers"), + N_("[action | number]"), + N_("action: action to do:\n" + " move move buffer in the list (may be relative, for example -1)\n" + " list list opened buffers (no parameter implies this list)\n" + "number: jump to buffer by number"), + 0, MAX_ARGS, weechat_cmd_buffer, NULL }, { "clear", N_("clear window(s)"), N_("[-all]"), N_("-all: clear all windows"), @@ -77,7 +84,7 @@ t_weechat_command weechat_commands[] = "nick2: alternate nick for server\n" "nick3: second alternate nick for server\n" "username: user name\n" - "realname: real name of user\n"), + "realname: real name of user"), 0, MAX_ARGS, weechat_cmd_server, NULL }, { "save", N_("save config to disk"), N_("[file]"), N_("file: filename for writing config"), @@ -818,6 +825,49 @@ weechat_cmd_alias (char *arguments) return 0; } +/* + * weechat_cmd_buffer: manage buffers + */ + +int +weechat_cmd_buffer (int argc, char **argv) +{ + int number; + char *error; + + if ((argc == 0) || ((argc == 1) && (strcasecmp (argv[0], "list") == 0))) + { + /* list opened bufferss */ + gui_printf (NULL, "buffer list -- NOT DEVELOPED!\n"); + } + else + { + if (strcasecmp (argv[0], "move") == 0) + { + /* move buffer to another number in the list */ + gui_printf (NULL, "buffer move -- NOT DEVELOPED!\n"); + } + else + { + number = strtol (argv[0], &error, 10); + if (error) + { + gui_printf (NULL, _("%s incorrect buffer number\n"), + WEECHAT_ERROR); + return -1; + } + if (!gui_switch_to_buffer_by_number (gui_current_window, number)) + { + gui_printf (NULL, + _("%s buffer \"%s\" not found for \"%s\" command\n"), + WEECHAT_ERROR, argv[0], "buffer"); + return -1; + } + } + } + return 0; +} + /* * weechat_cmd_clear: display or create alias */ @@ -1495,7 +1545,7 @@ weechat_cmd_set (char *arguments) if (ptr_option->handler_change == NULL) { gui_printf (NULL, - _("%s option '%s' can not be changed while WeeChat is running\n"), + _("%s option \"%s\" can not be changed while WeeChat is running\n"), WEECHAT_ERROR, option); } else @@ -1507,13 +1557,13 @@ weechat_cmd_set (char *arguments) gui_printf (NULL, " %s = %s\n", option, value); } else - gui_printf (NULL, _("%s incorrect value for option '%s'\n"), + gui_printf (NULL, _("%s incorrect value for option \"%s\"\n"), WEECHAT_ERROR, option); } } else { - gui_printf (NULL, _("%s config option '%s' not found\n"), + gui_printf (NULL, _("%s config option \"%s\" not found\n"), WEECHAT_ERROR, option); } } @@ -1583,15 +1633,15 @@ weechat_cmd_set (char *arguments) if (number_found == 0) { if (value) - gui_printf (NULL, _("No config option found with '%s'\n"), + gui_printf (NULL, _("No config option found with \"%s\"\n"), value); else - gui_printf (NULL, _("No config option found with '%s'\n")); + gui_printf (NULL, _("No config option found with \"%s\"\n")); } else { if (value) - gui_printf (NULL, _("%d config option(s) found with '%s'\n"), + gui_printf (NULL, _("%d config option(s) found with \"%s\"\n"), number_found, value); else gui_printf (NULL, _("%d config option(s) found\n"), @@ -1635,9 +1685,6 @@ weechat_cmd_unalias (char *arguments) int weechat_cmd_window (int argc, char **argv) { - int i; - t_irc_server server, *ptr_server, *server_found, *new_server; - if ((argc == 0) || ((argc == 1) && (strcasecmp (argv[0], "list") == 0))) { /* list opened windows */ @@ -1656,7 +1703,11 @@ weechat_cmd_window (int argc, char **argv) gui_window_split_vertic (gui_current_window); } else - return -1; + { + gui_printf (NULL, + _("%s unknown option for \"%s\" command\n"), + WEECHAT_ERROR, "window"); + } } return 0; -} \ No newline at end of file +} diff --git a/weechat/src/common/command.h b/weechat/src/common/command.h index 3be538255..90d623da9 100644 --- a/weechat/src/common/command.h +++ b/weechat/src/common/command.h @@ -67,6 +67,7 @@ extern t_weechat_alias *alias_new (char *, char *); extern int exec_weechat_command (t_irc_server *, char *); extern void user_command (t_irc_server *, char *); extern int weechat_cmd_alias (char *); +extern int weechat_cmd_buffer (int, char **); extern int weechat_cmd_clear (int, char **); extern int weechat_cmd_connect (int, char **); extern int weechat_cmd_disconnect (int, char **); diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c index 5decef5d0..f331637d4 100644 --- a/weechat/src/gui/curses/gui-display.c +++ b/weechat/src/gui/curses/gui-display.c @@ -482,8 +482,8 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int stop_at_end) /* insert spaces for align text under time/nick */ if ((window->win_chat_cursor_x == 0) && - (ptr_message->type != MSG_TYPE_TIME) && - (ptr_message->type != MSG_TYPE_NICK) && + (!(ptr_message->type & MSG_TYPE_TIME)) && + (!(ptr_message->type & MSG_TYPE_NICK)) && (line->length_align > 0) && /* TODO: modify arbitraty value for non aligning messages on time/nick? */ (line->length_align < (window->win_chat_width - 5))) @@ -805,12 +805,17 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase) wrefresh (ptr_win->win_status); } wmove (ptr_win->win_status, 0, 0); + + /* display number of buffers */ + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS); + wprintw (ptr_win->win_status, "[%d] ", + (last_gui_buffer) ? last_gui_buffer->number : 0); + + /* display current server */ if (SERVER(ptr_win->buffer) && SERVER(ptr_win->buffer)->name) - { - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS); wprintw (ptr_win->win_status, "[%s] ", SERVER(ptr_win->buffer)->name); - } + if (SERVER(ptr_win->buffer) && !CHANNEL(ptr_win->buffer)) { gui_window_set_color (ptr_win->win_status, @@ -870,7 +875,7 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase) if (hotlist) { gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS); - wprintw (ptr_win->win_status, _("Act: ")); + wprintw (ptr_win->win_status, _("[Act: ")); for (ptr_hotlist = hotlist; ptr_hotlist; ptr_hotlist = ptr_hotlist->next_hotlist) { @@ -896,6 +901,9 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase) if (ptr_hotlist->next_hotlist) wprintw (ptr_win->win_status, ","); } + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS); + wprintw (ptr_win->win_status, "]"); } /* display "-MORE-" if last line is not displayed */ @@ -1215,7 +1223,6 @@ gui_switch_to_buffer (t_gui_window *window, t_gui_buffer *buffer) window->win_status = newwin (1, window->win_width, window->win_y + window->win_height - 2, window->win_x); buffer->num_displayed++; - buffer->unread_data = 0; hotlist_remove_buffer (buffer); } @@ -1301,8 +1308,6 @@ gui_move_page_down (t_gui_window *window) window->sub_lines -= window->win_chat_height - 1; if (window->sub_lines < 0) window->sub_lines = 0; - if (window->sub_lines == 0) - window->buffer->unread_data = 0; gui_draw_buffer_chat (window->buffer, 0); gui_draw_buffer_status (window->buffer, 0); } @@ -1344,7 +1349,7 @@ gui_curses_resize_handler () } /* - * gui_view_init_subviews: init subviews for a WeeChat view + * gui_window_init_subviews: init subviews for a WeeChat window */ void @@ -1661,9 +1666,11 @@ gui_add_message (t_gui_buffer *buffer, int type, int color, char *message) buffer->last_line->last_message->message = strdup (message); length = strlen (message); buffer->last_line->length += length; - if (type == MSG_TYPE_MSG) + if (type & MSG_TYPE_MSG) buffer->last_line->line_with_message = 1; - if ((type == MSG_TYPE_TIME) || (type == MSG_TYPE_NICK)) + if (type & MSG_TYPE_HIGHLIGHT) + buffer->last_line->line_with_highlight = 1; + if ((type & MSG_TYPE_TIME) || (type & MSG_TYPE_NICK)) buffer->last_line->length_align += length; if (pos) { @@ -1677,14 +1684,12 @@ gui_add_message (t_gui_buffer *buffer, int type, int color, char *message) /*else gui_display_line (buffer, buffer->last_line, 1);*/ } - if ((buffer->num_displayed == 0) || (gui_current_window->sub_lines > 0)) + if (buffer->num_displayed == 0) { - if (buffer->unread_data < 1 + buffer->last_line->line_with_message) - { - buffer->unread_data = 1 + buffer->last_line->line_with_message; - hotlist_add (buffer->last_line->line_with_message, buffer); - gui_draw_buffer_status (buffer, 1); - } + hotlist_add (buffer->last_line->line_with_message + + buffer->last_line->line_with_highlight, + buffer); + gui_draw_buffer_status (gui_current_window->buffer, 1); } } } diff --git a/weechat/src/gui/curses/gui-input.c b/weechat/src/gui/curses/gui-input.c index 179d962d7..e56bbd038 100644 --- a/weechat/src/gui/curses/gui-input.c +++ b/weechat/src/gui/curses/gui-input.c @@ -299,6 +299,8 @@ gui_read_keyb () case KEY_ESCAPE: if ((key = getch()) != ERR) { + /*gui_printf (gui_current_window->buffer, + "[Debug] key pressed = %d, as octal: %o\n", key, key);*/ switch (key) { case KEY_LEFT: @@ -327,6 +329,18 @@ gui_read_keyb () } } break; + /* Alt-number */ + case 49: /* Alt-1 */ + case 50: /* Alt-2 */ + case 51: /* Alt-3 */ + case 52: /* Alt-4 */ + case 53: /* Alt-5 */ + case 54: /* Alt-6 */ + case 55: /* Alt-7 */ + case 56: /* Alt-8 */ + case 57: /* Alt-9 */ + gui_switch_to_buffer_by_number (gui_current_window, key - 48); + break; /* Alt-A */ case 'a': case 'A': diff --git a/weechat/src/gui/gui-common.c b/weechat/src/gui/gui-common.c index 864096918..445eca13d 100644 --- a/weechat/src/gui/gui-common.c +++ b/weechat/src/gui/gui-common.c @@ -145,7 +145,7 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int switch_to if ((new_buffer = (t_gui_buffer *)(malloc (sizeof (t_gui_buffer))))) { new_buffer->num_displayed = 0; - new_buffer->number = (gui_buffers) ? last_gui_buffer->number + 1 : 1; + new_buffer->number = (last_gui_buffer) ? last_gui_buffer->number + 1 : 1; /* assign server and channel to buffer */ SERVER(new_buffer) = server; @@ -157,21 +157,19 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int switch_to CHANNEL(new_buffer)->buffer = new_buffer; if (!window->buffer) + { window->buffer = new_buffer; - window->first_line_displayed = 1; - window->sub_lines = 0; - - gui_calculate_pos_size (window); - - /* init buffers */ - gui_window_init_subwindows (window); + window->first_line_displayed = 1; + window->sub_lines = 0; + gui_calculate_pos_size (window); + gui_window_init_subwindows (window); + } /* init lines */ new_buffer->lines = NULL; new_buffer->last_line = NULL; new_buffer->num_lines = 0; new_buffer->line_complete = 1; - new_buffer->unread_data = 0; /* init input buffer */ new_buffer->input_buffer_alloc = INPUT_BUFFER_BLOCK_SIZE; @@ -242,7 +240,6 @@ gui_buffer_clear (t_gui_buffer *buffer) buffer->last_line = NULL; buffer->num_lines = 0; buffer->line_complete = 1; - buffer->unread_data = 0; for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) { @@ -407,6 +404,7 @@ gui_new_line (t_gui_buffer *buffer) new_line->length = 0; new_line->length_align = 0; new_line->line_with_message = 0; + new_line->line_with_highlight = 0; new_line->messages = NULL; new_line->last_message = NULL; if (!buffer->lines) @@ -624,3 +622,31 @@ gui_buffer_insert_string (t_gui_buffer *buffer, char *string, int pos) /* insert new string */ strncpy (buffer->input_buffer + pos, string, length); } + +/* + * gui_switch_to_buffer_by_number: switch to another buffer with number + */ + +t_gui_buffer * +gui_switch_to_buffer_by_number (t_gui_window *window, int number) +{ + t_gui_buffer *ptr_buffer; + + /* buffer is currently displayed ? */ + if (number == window->buffer->number) + return window->buffer; + + /* search for buffer in the list */ + for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer) + { + if ((ptr_buffer != window->buffer) && (number == ptr_buffer->number)) + { + gui_switch_to_buffer (window, ptr_buffer); + gui_redraw_buffer (window->buffer); + return ptr_buffer; + } + } + + /* buffer not found */ + return NULL; +} diff --git a/weechat/src/gui/gui.h b/weechat/src/gui/gui.h index 1066d478d..a2b6a726b 100644 --- a/weechat/src/gui/gui.h +++ b/weechat/src/gui/gui.h @@ -66,10 +66,11 @@ #define BUFFER_IS_CHANNEL(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHAT_CHANNEL)) #define BUFFER_IS_PRIVATE(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHAT_PRIVATE)) -#define MSG_TYPE_TIME 0 -#define MSG_TYPE_NICK 1 -#define MSG_TYPE_INFO 2 -#define MSG_TYPE_MSG 3 +#define MSG_TYPE_TIME 1 +#define MSG_TYPE_NICK 2 +#define MSG_TYPE_INFO 4 +#define MSG_TYPE_MSG 8 +#define MSG_TYPE_HIGHLIGHT 16 #define gui_printf_color(buffer, color, fmt, argz...) \ gui_printf_color_type(buffer, MSG_TYPE_INFO, color, fmt, ##argz) @@ -95,6 +96,7 @@ struct t_gui_line int length; /* length of the line (in char) */ int length_align; /* alignment length (time or time/nick) */ int line_with_message; /* line contains a message from a user? */ + int line_with_highlight; /* line contains highlight */ t_gui_message *messages; /* messages for the line */ t_gui_message *last_message; /* last message of the line */ t_gui_line *prev_line; /* link to previous line */ @@ -138,7 +140,6 @@ struct t_gui_buffer t_gui_line *last_line; /* last line of chat window */ int num_lines; /* number of lines in the window */ int line_complete; /* current line complete ? (\n ending) */ - int unread_data; /* highlight windows with unread data */ /* inupt buffer */ char *input_buffer; /* input buffer */ @@ -235,6 +236,7 @@ extern void gui_delete_previous_word (t_gui_buffer *); extern void gui_move_previous_word (t_gui_buffer *); extern void gui_move_next_word (t_gui_buffer *); extern void gui_buffer_insert_string (t_gui_buffer *, char *, int); +extern t_gui_buffer *gui_switch_to_buffer_by_number (t_gui_window *, int); /* GUI dependant functions */ extern int gui_assign_color (int *, char *); extern int gui_get_color_by_name (char *); diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c index ae4326a2a..45b9e5d2f 100644 --- a/weechat/src/irc/irc-recv.c +++ b/weechat/src/irc/irc-recv.c @@ -945,10 +945,11 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (strstr (pos, server->nick)) { gui_printf_color_type (ptr_channel->buffer, - MSG_TYPE_MSG, + MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT, COLOR_WIN_CHAT_HIGHLIGHT, "%s", host); - if ( (cfg_look_infobar_delay_highlight > 0) + if ( (cfg_look_infobar) + && (cfg_look_infobar_delay_highlight > 0) && (ptr_channel->buffer != gui_current_window->buffer) ) gui_infobar_printf (cfg_look_infobar_delay_highlight, COLOR_WIN_INFOBAR_HIGHLIGHT, @@ -971,8 +972,10 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (strstr (pos, server->nick)) { irc_display_nick (ptr_channel->buffer, ptr_nick, - MSG_TYPE_NICK, 1, -1, 0); - if ( (cfg_look_infobar_delay_highlight > 0) + MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT, + 1, -1, 0); + if ( (cfg_look_infobar) + && (cfg_look_infobar_delay_highlight > 0) && (ptr_channel->buffer != gui_current_window->buffer) ) gui_infobar_printf (cfg_look_infobar_delay_highlight, COLOR_WIN_INFOBAR_HIGHLIGHT, @@ -1157,38 +1160,67 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) } } if (!ptr_channel->topic) - { ptr_channel->topic = strdup (host2); - gui_draw_buffer_title (ptr_channel->buffer, 1); - } - gui_printf_color_type (ptr_channel->buffer, - MSG_TYPE_NICK, - COLOR_WIN_CHAT_DARK, "<"); - if (strstr (pos, server->nick)) + if (strncmp (pos, "\01ACTION ", 8) == 0) { - gui_printf_color_type (ptr_channel->buffer, - MSG_TYPE_NICK, - COLOR_WIN_CHAT_HIGHLIGHT, - "%s", host); - if ( (cfg_look_infobar_delay_highlight > 0) - && (ptr_channel->buffer != gui_current_window->buffer) ) - gui_infobar_printf (cfg_look_infobar_delay_highlight, - COLOR_WIN_INFOBAR_HIGHLIGHT, - _("Private %s> %s"), - host, pos); + pos += 8; + pos2 = strchr (pos, '\01'); + if (pos2) + pos2[0] = '\0'; + irc_display_prefix (ptr_channel->buffer, PREFIX_ACTION_ME); + if (strstr (pos, server->nick)) + { + gui_printf_color_type (ptr_channel->buffer, + MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT, + COLOR_WIN_CHAT_HIGHLIGHT, + "%s", host); + if ( (cfg_look_infobar) + && (cfg_look_infobar_delay_highlight > 0) + && (ptr_channel->buffer != gui_current_window->buffer) ) + gui_infobar_printf (cfg_look_infobar_delay_highlight, + COLOR_WIN_INFOBAR_HIGHLIGHT, + _("On %s: * %s %s"), + ptr_channel->name, + host, pos); + } + else + gui_printf_color_type (ptr_channel->buffer, + MSG_TYPE_MSG, + COLOR_WIN_CHAT_NICK, "%s", host); + gui_printf_color (ptr_channel->buffer, + COLOR_WIN_CHAT, " %s\n", pos); } else + { gui_printf_color_type (ptr_channel->buffer, MSG_TYPE_NICK, - COLOR_WIN_NICK_PRIVATE, - "%s", host); - gui_printf_color_type (ptr_channel->buffer, - MSG_TYPE_NICK, - COLOR_WIN_CHAT_DARK, "> "); - gui_printf_color_type (ptr_channel->buffer, - MSG_TYPE_MSG, - COLOR_WIN_CHAT, "%s\n", pos); + COLOR_WIN_CHAT_DARK, "<"); + if (strstr (pos, server->nick)) + { + gui_printf_color_type (ptr_channel->buffer, + MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT, + COLOR_WIN_CHAT_HIGHLIGHT, + "%s", host); + if ( (cfg_look_infobar_delay_highlight > 0) + && (ptr_channel->buffer != gui_current_window->buffer) ) + gui_infobar_printf (cfg_look_infobar_delay_highlight, + COLOR_WIN_INFOBAR_HIGHLIGHT, + _("Private %s> %s"), + host, pos); + } + else + gui_printf_color_type (ptr_channel->buffer, + MSG_TYPE_NICK, + COLOR_WIN_NICK_PRIVATE, + "%s", host); + gui_printf_color_type (ptr_channel->buffer, + MSG_TYPE_NICK, + COLOR_WIN_CHAT_DARK, "> "); + gui_printf_color_type (ptr_channel->buffer, + MSG_TYPE_MSG, + COLOR_WIN_CHAT, "%s\n", pos); + } } else {