From 0a6945b6ed451c3277b7c07313412ea7d31aeb50 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Sun, 3 Oct 2004 01:56:30 +0000 Subject: [PATCH] Command "/buffer notify" --- ChangeLog | 6 +- po/fr.po | 257 ++++++++++++++------------- po/weechat.pot | 251 +++++++++++++------------- src/common/command.c | 54 +++++- src/gui/curses/gui-display.c | 13 +- src/gui/gui-common.c | 3 + src/gui/gui.h | 6 + weechat/ChangeLog | 6 +- weechat/po/fr.po | 257 ++++++++++++++------------- weechat/po/weechat.pot | 251 +++++++++++++------------- weechat/src/common/command.c | 54 +++++- weechat/src/gui/curses/gui-display.c | 13 +- weechat/src/gui/gui-common.c | 3 + weechat/src/gui/gui.h | 6 + 14 files changed, 678 insertions(+), 502 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8bd46ac0..859712b36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,17 +1,17 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2004-09-19 +ChangeLog - 2004-10-03 Version 0.0.8 (under dev!): + * /buffer command developed (buffers list, move and notify) * logging buffers to disk (server/channel/private according to user prefs) - * /buffer command developed (buffers list and move function) * Away now announced in channels, and config option "look_display_away" added to enable/disable this feature * Fixed crash when resizing terminal to very small size * "-MORE-" message is now erased when switching to another buffer - * DCC window with Alt-D + * DCC file receive ok (Alt-D for DCC view) * /query command now reopens private buffer if already opened * added key for redrawing terminal (Ctrl-L) * added key for clearing hotlist (Alt-R) diff --git a/po/fr.po b/po/fr.po index a573a583b..0185e66c5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.0.8-pre2\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2004-09-19 22:20+0200\n" +"POT-Creation-Date: 2004-10-03 03:44+0200\n" "PO-Revision-Date: 2004-08-08 20:47+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" @@ -1172,7 +1172,7 @@ msgstr "%s utilisateur non trouv 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:622 src/common/command.c:1254 +#: src/irc/irc-send.c:622 src/common/command.c:1304 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n" @@ -1733,17 +1733,17 @@ msgstr " [R] Retirer" msgid "server" msgstr "serveur" -#: src/gui/gui-common.c:319 +#: src/gui/gui-common.c:322 #, 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:459 +#: src/gui/gui-common.c:462 #, 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:502 +#: src/gui/gui-common.c:505 msgid "not enough memory!\n" msgstr "pas assez de mémoire !\n" @@ -1776,69 +1776,73 @@ 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" +" move move buffer in the list (may be relative, for example -1)\n" +" list list opened buffers (no parameter implies this list)\n" +" notify set notify level for buffer (0=never, 1=highlight, 2=1+msg, 3=2" +"+join/part)\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 -" +" move déplacer le tampon dans la liste (peut être relatif, par exemple -" "1)\n" -" list liste les buffers ouverts (pas de paramètre affiche cette liste)\n" +" list liste les tampons ouverts (pas de paramètre affiche cette liste)\n" +" notify fixer le niveau de notification (0=jamais, 1=highlight, 2=1+msg, " +"3=2+join/part)\n" "nombre: sauter au buffer qui a ce numéro" -#: src/common/command.c:53 +#: src/common/command.c:54 msgid "clear window(s)" msgstr "affacer la/les fenêtre(s)" -#: src/common/command.c:54 +#: src/common/command.c:55 msgid "[-all]" msgstr "[-all]" -#: src/common/command.c:55 +#: src/common/command.c:56 msgid "-all: clear all windows" msgstr "-all: effacer toutes les fenêtres" -#: src/common/command.c:57 +#: src/common/command.c:58 msgid "connect to a server" msgstr "se connecter à un serveur" -#: src/common/command.c:58 src/common/command.c:62 +#: src/common/command.c:59 src/common/command.c:63 msgid "servername" msgstr "nom_serveur" -#: src/common/command.c:59 +#: src/common/command.c:60 msgid "servername: server name to connect" msgstr "nom_serveur: nom du serveur pour se connecter" -#: src/common/command.c:61 +#: src/common/command.c:62 msgid "disconnect from a server" msgstr "se déconnecter d'un serveur" -#: src/common/command.c:63 +#: src/common/command.c:64 msgid "servername: server name to disconnect" msgstr "nom_serveur: nom du serveur pour se déconnecter" -#: src/common/command.c:65 +#: src/common/command.c:66 msgid "display help about commands" msgstr "afficher l'aide sur les commandes" -#: src/common/command.c:66 +#: src/common/command.c:67 msgid "[command]" msgstr "[commande]" -#: src/common/command.c:66 +#: src/common/command.c:67 msgid "command: name of a WeeChat or IRC command" msgstr "commande: nom d'une commande WeeChat ou IRC" -#: src/common/command.c:68 +#: src/common/command.c:69 msgid "list/load/unload Perl scripts" msgstr "liste/charge/décharge des scripts Perl" -#: src/common/command.c:69 +#: src/common/command.c:70 msgid "[load filename] | [autoload] | [unload]" msgstr "[load fichier] | [autoload] | [unload]" -#: src/common/command.c:70 +#: src/common/command.c:71 msgid "" "filename: Perl script (file) to load\n" "Without argument, /perl command lists all loaded Perl scripts." @@ -1846,11 +1850,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:73 +#: src/common/command.c:74 msgid "list, add or remove servers" msgstr "liste, ajoute ou retire des serveurs" -#: src/common/command.c:74 +#: src/common/command.c:75 msgid "" "[list] | [servername hostname port [-auto | -noauto] [-pwd password] [-nicks " "nick1 [nick2 [nick3]]] [-username username] [-realname realname] [-command " @@ -1860,7 +1864,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:79 +#: src/common/command.c:80 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" @@ -1882,27 +1886,27 @@ msgstr "" "nom_utilisateur: nom d'utilisateur\n" "nom_réel: nom réel de l'utilisateur" -#: src/common/command.c:89 +#: src/common/command.c:90 msgid "save config to disk" msgstr "sauvegarder la configuration sur disque" -#: src/common/command.c:90 +#: src/common/command.c:91 msgid "[file]" msgstr "[fichier]" -#: src/common/command.c:90 +#: src/common/command.c:91 msgid "file: filename for writing config" msgstr "fichier: fichier pour sauvegarder la configuration" -#: src/common/command.c:92 +#: src/common/command.c:93 msgid "set config parameters" msgstr "modifier des paramètres de configuration" -#: src/common/command.c:93 +#: src/common/command.c:94 msgid "[option [value]]" msgstr "[option [valeur]]" -#: src/common/command.c:93 +#: src/common/command.c:94 msgid "" "option: name of an option\n" "value: value for option" @@ -1910,27 +1914,27 @@ msgstr "" "option: nom d'une option\n" "valeur: valeur pour l'option" -#: src/common/command.c:95 +#: src/common/command.c:96 msgid "remove an alias" msgstr "supprimer un alias" -#: src/common/command.c:96 +#: src/common/command.c:97 msgid "alias_name" msgstr "nom_alias" -#: src/common/command.c:96 +#: src/common/command.c:97 msgid "alias_name: name of alias to remove" msgstr "nom_alias: nom de l'alias à supprimer" -#: src/common/command.c:98 +#: src/common/command.c:99 msgid "manage windows" msgstr "gestion des fenêtres" -#: src/common/command.c:99 +#: src/common/command.c:100 msgid "[action]" msgstr "[action]" -#: src/common/command.c:100 +#: src/common/command.c:101 msgid "" "action: action to do:\n" " close close current window (under development!)\n" @@ -1945,29 +1949,29 @@ msgstr "" " splith éclate la fenêtre en deux horizontalement\n" " splitv éclate la fenêtre en deux verticalement" -#: src/common/command.c:355 +#: src/common/command.c:356 #, 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:364 +#: src/common/command.c:365 #, 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:370 +#: src/common/command.c:371 #, 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:556 +#: src/common/command.c:557 #, 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:565 +#: src/common/command.c:566 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " @@ -1976,19 +1980,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:584 +#: src/common/command.c:585 #, c-format msgid "%s %s command \"%s\" failed\n" msgstr "%s %s la commande \"%s\" a échoué\n" -#: src/common/command.c:609 +#: src/common/command.c:610 #, 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:618 +#: src/common/command.c:619 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " @@ -1997,164 +2001,173 @@ 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:631 +#: src/common/command.c:632 #, 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:643 +#: src/common/command.c:644 #, c-format msgid "%s IRC command \"%s\" failed\n" msgstr "%s la commande IRC \"%s\" a échoué\n" -#: src/common/command.c:690 +#: src/common/command.c:691 #, 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:759 +#: src/common/command.c:760 #, 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:765 +#: src/common/command.c:766 msgid "This window is not a channel!\n" msgstr "Cette fenêtre n'est pas un canal !\n" -#: src/common/command.c:791 src/common/command.c:803 src/common/command.c:891 +#: src/common/command.c:792 src/common/command.c:804 src/common/command.c:892 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "%s paramètres manquants pour la commande \"%s\"\n" -#: src/common/command.c:798 +#: src/common/command.c:799 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "Alias \"%s\" => \"%s\" créé\n" -#: src/common/command.c:813 +#: src/common/command.c:814 msgid "List of aliases:\n" msgstr "Liste des alias:\n" -#: src/common/command.c:823 +#: src/common/command.c:824 msgid "No alias defined.\n" msgstr "Aucun alias défini.\n" -#: src/common/command.c:844 +#: src/common/command.c:845 msgid "Opened buffers:\n" msgstr "Tampons ouverts:\n" -#: src/common/command.c:857 src/common/command.c:1303 +#: src/common/command.c:858 src/common/command.c:1353 msgid "Server: " msgstr "Serveur: " -#: src/common/command.c:863 +#: src/common/command.c:864 msgid "Channel: " msgstr "Canal: " -#: src/common/command.c:866 src/common/command.c:876 +#: src/common/command.c:867 src/common/command.c:877 msgid " (server: " msgstr " (serveur: " -#: src/common/command.c:873 +#: src/common/command.c:874 msgid "Private with: " msgstr "Privé avec: " -#: src/common/command.c:913 src/common/command.c:937 +#: src/common/command.c:914 src/common/command.c:987 #, c-format msgid "%s incorrect buffer number\n" msgstr "%s numéro de buffer incorrect\n" -#: src/common/command.c:929 +#: src/common/command.c:927 +msgid "Notify levels: " +msgstr "Niveaux de notification: " + +#: src/common/command.c:953 src/common/command.c:962 +#, c-format +msgid "%s incorrect notify level (must be between 0 and 3)\n" +msgstr "%s niveau de notification incorrect (doit être entre 0 et 3)\n" + +#: src/common/command.c:979 #, 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:961 +#: src/common/command.c:1011 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "paramètre inconnu \"%s\" pour la commande \"%s\"\n" -#: src/common/command.c:990 +#: src/common/command.c:1040 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s déjà connecté au serveur \"%s\" !\n" -#: src/common/command.c:1013 src/common/command.c:1048 +#: src/common/command.c:1063 src/common/command.c:1098 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s serveur \"%s\" non trouvé\n" -#: src/common/command.c:1038 +#: src/common/command.c:1088 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s non connecté au serveur \"%s\" !\n" -#: src/common/command.c:1067 +#: src/common/command.c:1117 #, c-format msgid "> List of %s internal commands:\n" msgstr "> Liste des commandes internes %s:\n" -#: src/common/command.c:1072 +#: src/common/command.c:1122 msgid "> List of IRC commands:\n" msgstr "> Liste des commandes IRC:\n" -#: src/common/command.c:1087 +#: src/common/command.c:1137 #, c-format msgid "> Help on %s internal command \"%s\":\n" msgstr "> Aide sur la commande interne %s \"%s\":\n" -#: src/common/command.c:1090 src/common/command.c:1111 +#: src/common/command.c:1140 src/common/command.c:1161 #, c-format msgid "Syntax: /%s %s\n" msgstr "Syntaxe: /%s %s\n" -#: src/common/command.c:1109 +#: src/common/command.c:1159 #, c-format msgid "> Help on IRC command \"%s\":\n" msgstr "> Aide sur la commande IRC \"%s\":\n" -#: src/common/command.c:1125 +#: src/common/command.c:1175 #, 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:1150 +#: src/common/command.c:1200 msgid "Registered Perl scripts:\n" msgstr "Scripts Perl enregistrés :\n" -#: src/common/command.c:1167 src/common/command.c:1189 -#: src/common/command.c:1211 +#: src/common/command.c:1217 src/common/command.c:1239 +#: src/common/command.c:1261 msgid " (none)\n" msgstr " (aucun)\n" -#: src/common/command.c:1172 +#: src/common/command.c:1222 msgid "Perl message handlers:\n" msgstr "Fonctions Perl pour messages :\n" -#: src/common/command.c:1181 +#: src/common/command.c:1231 #, c-format msgid " IRC(%s) => Perl(%s)\n" msgstr " IRC(%s) => Perl(%s)\n" -#: src/common/command.c:1194 +#: src/common/command.c:1244 msgid "Perl command handlers:\n" msgstr "Commandes Perl :\n" -#: src/common/command.c:1203 +#: src/common/command.c:1253 #, c-format msgid " Command /%s => Perl(%s)\n" msgstr " Commande /%s => Perl(%s)\n" -#: src/common/command.c:1223 +#: src/common/command.c:1273 msgid "Perl scripts unloaded\n" msgstr "Scripts Perl déchargés\n" -#: src/common/command.c:1248 src/common/command.c:1786 +#: src/common/command.c:1298 src/common/command.c:1836 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s option inconnue pour la commande \"%s\"\n" -#: src/common/command.c:1259 +#: src/common/command.c:1309 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" @@ -2163,184 +2176,184 @@ msgstr "" "Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le " "script ./configure\n" -#: src/common/command.c:1314 +#: src/common/command.c:1364 msgid "connected" msgstr "connecté" -#: src/common/command.c:1314 +#: src/common/command.c:1364 msgid "not connected" msgstr "non connecté" -#: src/common/command.c:1321 +#: src/common/command.c:1371 #, c-format msgid " Autoconnect: %s%s\n" msgstr " Autoconnect: %s%s\n" -#: src/common/command.c:1322 +#: src/common/command.c:1372 msgid "yes" msgstr "oui" -#: src/common/command.c:1322 +#: src/common/command.c:1372 msgid "no" msgstr "non" -#: src/common/command.c:1324 +#: src/common/command.c:1374 msgid " (temporary server, will not be saved)" msgstr " (serveur temporaire, ne sera pas sauvé)" -#: src/common/command.c:1329 +#: src/common/command.c:1379 #, c-format msgid " Hostname : %s\n" msgstr " Nom/IP : %s\n" -#: src/common/command.c:1334 +#: src/common/command.c:1384 #, c-format msgid " Port : %d\n" msgstr " Port : %d\n" -#: src/common/command.c:1340 +#: src/common/command.c:1390 msgid " Password : (hidden)\n" msgstr " Mot passe : (caché)\n" -#: src/common/command.c:1344 +#: src/common/command.c:1394 msgid " Password : (none)\n" msgstr " Mot passe : (aucun)\n" -#: src/common/command.c:1348 +#: src/common/command.c:1398 #, c-format msgid " Nicks : %s" msgstr " Pseudos : %s" -#: src/common/command.c:1365 +#: src/common/command.c:1415 #, c-format msgid " Username : %s\n" msgstr " Nom utilis.: %s\n" -#: src/common/command.c:1370 +#: src/common/command.c:1420 #, c-format msgid " Realname : %s\n" msgstr " Nom réel : %s\n" -#: src/common/command.c:1376 +#: src/common/command.c:1426 #, c-format msgid " Command : %s\n" msgstr " Commande : %s\n" -#: src/common/command.c:1381 +#: src/common/command.c:1431 msgid " Command : (none)\n" msgstr " Commande : (aucune)\n" -#: src/common/command.c:1386 +#: src/common/command.c:1436 #, c-format msgid " Auto-join : %s\n" msgstr " Auto-join : %s\n" -#: src/common/command.c:1391 +#: src/common/command.c:1441 msgid " Auto-join : (none)\n" msgstr " Auto-join : (aucun)\n" -#: src/common/command.c:1395 +#: src/common/command.c:1445 msgid "No server.\n" msgstr "Pas de serveur.\n" -#: src/common/command.c:1404 +#: src/common/command.c:1454 #, 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:1410 +#: src/common/command.c:1460 #, 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:1427 +#: src/common/command.c:1477 #, 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:1433 src/common/command.c:1564 +#: src/common/command.c:1483 src/common/command.c:1614 msgid "Server" msgstr "Serveur" -#: src/common/command.c:1436 +#: src/common/command.c:1486 msgid "has been deleted\n" msgstr "a été supprimé\n" -#: src/common/command.c:1450 +#: src/common/command.c:1500 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s paramètres manquants pour la commande \"%s\"\n" -#: src/common/command.c:1459 +#: src/common/command.c:1509 #, 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:1483 src/common/command.c:1509 -#: src/common/command.c:1521 src/common/command.c:1545 +#: src/common/command.c:1533 src/common/command.c:1559 +#: src/common/command.c:1571 src/common/command.c:1595 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s mot de passe manquant pour le paramètre \"%s\"\n" -#: src/common/command.c:1495 +#: src/common/command.c:1545 #, 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:1533 +#: src/common/command.c:1583 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s commande manquante pour le paramètre \"%s\"\n" -#: src/common/command.c:1567 +#: src/common/command.c:1617 msgid "created\n" msgstr "créé\n" -#: src/common/command.c:1572 +#: src/common/command.c:1622 #, c-format msgid "%s unable to create server\n" msgstr "%s impossible de créer le serveur\n" -#: src/common/command.c:1626 +#: src/common/command.c:1676 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "%s l'option \"%s\" ne peut pas être changée lorsque WeeChat tourne\n" -#: src/common/command.c:1638 +#: src/common/command.c:1688 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valeur incorrecte pour l'option \"%s\"\n" -#: src/common/command.c:1644 +#: src/common/command.c:1694 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s option de configuration \"%s\" non trouvée\n" -#: src/common/command.c:1694 +#: src/common/command.c:1744 msgid "(unknown)" msgstr "(inconnu)" -#: src/common/command.c:1714 src/common/command.c:1717 +#: src/common/command.c:1764 src/common/command.c:1767 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Aucune option de configuration trouvée avec \"%s\"\n" -#: src/common/command.c:1722 +#: src/common/command.c:1772 #, c-format msgid "%d config option(s) found with \"%s\"\n" msgstr "%d option(s) de configuration trouvées avec \"%s\"\n" -#: src/common/command.c:1725 +#: src/common/command.c:1775 #, c-format msgid "%d config option(s) found\n" msgstr "%d option(s) de configuration trouvées\n" -#: src/common/command.c:1745 +#: src/common/command.c:1795 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias ou commande \"%s\" non trouvé\n" -#: src/common/command.c:1754 +#: src/common/command.c:1804 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" supprimé\n" diff --git a/po/weechat.pot b/po/weechat.pot index e41b0db95..905fa45de 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-09-19 22:20+0200\n" +"POT-Creation-Date: 2004-10-03 03:44+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1078,7 +1078,7 @@ msgstr "" msgid "%s cannot create new private window \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:622 src/common/command.c:1254 +#: src/irc/irc-send.c:622 src/common/command.c:1304 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "" @@ -1626,17 +1626,17 @@ msgstr "" msgid "server" msgstr "" -#: src/gui/gui-common.c:319 +#: src/gui/gui-common.c:322 #, c-format msgid "%s not enough memory for infobar message\n" msgstr "" -#: src/gui/gui-common.c:459 +#: src/gui/gui-common.c:462 #, c-format msgid "%s not enough memory for new line!\n" msgstr "" -#: src/gui/gui-common.c:502 +#: src/gui/gui-common.c:505 msgid "not enough memory!\n" msgstr "" @@ -1666,81 +1666,83 @@ msgstr "" #: 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" +" move move buffer in the list (may be relative, for example -1)\n" +" list list opened buffers (no parameter implies this list)\n" +" notify set notify level for buffer (0=never, 1=highlight, 2=1+msg, 3=2" +"+join/part)\n" "number: jump to buffer by number" msgstr "" -#: src/common/command.c:53 +#: src/common/command.c:54 msgid "clear window(s)" msgstr "" -#: src/common/command.c:54 +#: src/common/command.c:55 msgid "[-all]" msgstr "" -#: src/common/command.c:55 +#: src/common/command.c:56 msgid "-all: clear all windows" msgstr "" -#: src/common/command.c:57 +#: src/common/command.c:58 msgid "connect to a server" msgstr "" -#: src/common/command.c:58 src/common/command.c:62 +#: src/common/command.c:59 src/common/command.c:63 msgid "servername" msgstr "" -#: src/common/command.c:59 +#: src/common/command.c:60 msgid "servername: server name to connect" msgstr "" -#: src/common/command.c:61 +#: src/common/command.c:62 msgid "disconnect from a server" msgstr "" -#: src/common/command.c:63 +#: src/common/command.c:64 msgid "servername: server name to disconnect" msgstr "" -#: src/common/command.c:65 +#: src/common/command.c:66 msgid "display help about commands" msgstr "" -#: src/common/command.c:66 +#: src/common/command.c:67 msgid "[command]" msgstr "" -#: src/common/command.c:66 +#: src/common/command.c:67 msgid "command: name of a WeeChat or IRC command" msgstr "" -#: src/common/command.c:68 +#: src/common/command.c:69 msgid "list/load/unload Perl scripts" msgstr "" -#: src/common/command.c:69 +#: src/common/command.c:70 msgid "[load filename] | [autoload] | [unload]" msgstr "" -#: src/common/command.c:70 +#: src/common/command.c:71 msgid "" "filename: Perl script (file) to load\n" "Without argument, /perl command lists all loaded Perl scripts." msgstr "" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "list, add or remove servers" msgstr "" -#: src/common/command.c:74 +#: src/common/command.c:75 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:79 +#: src/common/command.c:80 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" @@ -1753,53 +1755,53 @@ msgid "" "realname: real name of user" msgstr "" -#: src/common/command.c:89 +#: src/common/command.c:90 msgid "save config to disk" msgstr "" -#: src/common/command.c:90 +#: src/common/command.c:91 msgid "[file]" msgstr "" -#: src/common/command.c:90 +#: src/common/command.c:91 msgid "file: filename for writing config" msgstr "" -#: src/common/command.c:92 +#: src/common/command.c:93 msgid "set config parameters" msgstr "" -#: src/common/command.c:93 +#: src/common/command.c:94 msgid "[option [value]]" msgstr "" -#: src/common/command.c:93 +#: src/common/command.c:94 msgid "" "option: name of an option\n" "value: value for option" msgstr "" -#: src/common/command.c:95 +#: src/common/command.c:96 msgid "remove an alias" msgstr "" -#: src/common/command.c:96 +#: src/common/command.c:97 msgid "alias_name" msgstr "" -#: src/common/command.c:96 +#: src/common/command.c:97 msgid "alias_name: name of alias to remove" msgstr "" -#: src/common/command.c:98 +#: src/common/command.c:99 msgid "manage windows" msgstr "" -#: src/common/command.c:99 +#: src/common/command.c:100 msgid "[action]" msgstr "" -#: src/common/command.c:100 +#: src/common/command.c:101 msgid "" "action: action to do:\n" " close close current window (under development!)\n" @@ -1808,391 +1810,400 @@ msgid "" " splitv split current window vertically" msgstr "" -#: src/common/command.c:355 +#: src/common/command.c:356 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "" -#: src/common/command.c:364 +#: src/common/command.c:365 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "" -#: src/common/command.c:370 +#: src/common/command.c:371 #, c-format msgid "%s target command \"%s\" does not exist!\n" msgstr "" -#: src/common/command.c:556 +#: src/common/command.c:557 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" -#: src/common/command.c:565 +#: src/common/command.c:566 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " "arg%s)\n" msgstr "" -#: src/common/command.c:584 +#: src/common/command.c:585 #, c-format msgid "%s %s command \"%s\" failed\n" msgstr "" -#: src/common/command.c:609 +#: src/common/command.c:610 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" -#: src/common/command.c:618 +#: src/common/command.c:619 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " "arg%s)\n" msgstr "" -#: src/common/command.c:631 +#: src/common/command.c:632 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "" -#: src/common/command.c:643 +#: src/common/command.c:644 #, c-format msgid "%s IRC command \"%s\" failed\n" msgstr "" -#: src/common/command.c:690 +#: src/common/command.c:691 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "" -#: src/common/command.c:759 +#: src/common/command.c:760 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "" -#: src/common/command.c:765 +#: src/common/command.c:766 msgid "This window is not a channel!\n" msgstr "" -#: src/common/command.c:791 src/common/command.c:803 src/common/command.c:891 +#: src/common/command.c:792 src/common/command.c:804 src/common/command.c:892 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "" -#: src/common/command.c:798 +#: src/common/command.c:799 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "" -#: src/common/command.c:813 +#: src/common/command.c:814 msgid "List of aliases:\n" msgstr "" -#: src/common/command.c:823 +#: src/common/command.c:824 msgid "No alias defined.\n" msgstr "" -#: src/common/command.c:844 +#: src/common/command.c:845 msgid "Opened buffers:\n" msgstr "" -#: src/common/command.c:857 src/common/command.c:1303 +#: src/common/command.c:858 src/common/command.c:1353 msgid "Server: " msgstr "" -#: src/common/command.c:863 +#: src/common/command.c:864 msgid "Channel: " msgstr "" -#: src/common/command.c:866 src/common/command.c:876 +#: src/common/command.c:867 src/common/command.c:877 msgid " (server: " msgstr "" -#: src/common/command.c:873 +#: src/common/command.c:874 msgid "Private with: " msgstr "" -#: src/common/command.c:913 src/common/command.c:937 +#: src/common/command.c:914 src/common/command.c:987 #, c-format msgid "%s incorrect buffer number\n" msgstr "" -#: src/common/command.c:929 +#: src/common/command.c:927 +msgid "Notify levels: " +msgstr "" + +#: src/common/command.c:953 src/common/command.c:962 +#, c-format +msgid "%s incorrect notify level (must be between 0 and 3)\n" +msgstr "" + +#: src/common/command.c:979 #, c-format msgid "%s buffer \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:961 +#: src/common/command.c:1011 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "" -#: src/common/command.c:990 +#: src/common/command.c:1040 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1013 src/common/command.c:1048 +#: src/common/command.c:1063 src/common/command.c:1098 #, c-format msgid "%s server \"%s\" not found\n" msgstr "" -#: src/common/command.c:1038 +#: src/common/command.c:1088 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1067 +#: src/common/command.c:1117 #, c-format msgid "> List of %s internal commands:\n" msgstr "" -#: src/common/command.c:1072 +#: src/common/command.c:1122 msgid "> List of IRC commands:\n" msgstr "" -#: src/common/command.c:1087 +#: src/common/command.c:1137 #, c-format msgid "> Help on %s internal command \"%s\":\n" msgstr "" -#: src/common/command.c:1090 src/common/command.c:1111 +#: src/common/command.c:1140 src/common/command.c:1161 #, c-format msgid "Syntax: /%s %s\n" msgstr "" -#: src/common/command.c:1109 +#: src/common/command.c:1159 #, c-format msgid "> Help on IRC command \"%s\":\n" msgstr "" -#: src/common/command.c:1125 +#: src/common/command.c:1175 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "" -#: src/common/command.c:1150 +#: src/common/command.c:1200 msgid "Registered Perl scripts:\n" msgstr "" -#: src/common/command.c:1167 src/common/command.c:1189 -#: src/common/command.c:1211 +#: src/common/command.c:1217 src/common/command.c:1239 +#: src/common/command.c:1261 msgid " (none)\n" msgstr "" -#: src/common/command.c:1172 +#: src/common/command.c:1222 msgid "Perl message handlers:\n" msgstr "" -#: src/common/command.c:1181 +#: src/common/command.c:1231 #, c-format msgid " IRC(%s) => Perl(%s)\n" msgstr "" -#: src/common/command.c:1194 +#: src/common/command.c:1244 msgid "Perl command handlers:\n" msgstr "" -#: src/common/command.c:1203 +#: src/common/command.c:1253 #, c-format msgid " Command /%s => Perl(%s)\n" msgstr "" -#: src/common/command.c:1223 +#: src/common/command.c:1273 msgid "Perl scripts unloaded\n" msgstr "" -#: src/common/command.c:1248 src/common/command.c:1786 +#: src/common/command.c:1298 src/common/command.c:1836 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "" -#: src/common/command.c:1259 +#: src/common/command.c:1309 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" msgstr "" -#: src/common/command.c:1314 +#: src/common/command.c:1364 msgid "connected" msgstr "" -#: src/common/command.c:1314 +#: src/common/command.c:1364 msgid "not connected" msgstr "" -#: src/common/command.c:1321 +#: src/common/command.c:1371 #, c-format msgid " Autoconnect: %s%s\n" msgstr "" -#: src/common/command.c:1322 +#: src/common/command.c:1372 msgid "yes" msgstr "" -#: src/common/command.c:1322 +#: src/common/command.c:1372 msgid "no" msgstr "" -#: src/common/command.c:1324 +#: src/common/command.c:1374 msgid " (temporary server, will not be saved)" msgstr "" -#: src/common/command.c:1329 +#: src/common/command.c:1379 #, c-format msgid " Hostname : %s\n" msgstr "" -#: src/common/command.c:1334 +#: src/common/command.c:1384 #, c-format msgid " Port : %d\n" msgstr "" -#: src/common/command.c:1340 +#: src/common/command.c:1390 msgid " Password : (hidden)\n" msgstr "" -#: src/common/command.c:1344 +#: src/common/command.c:1394 msgid " Password : (none)\n" msgstr "" -#: src/common/command.c:1348 +#: src/common/command.c:1398 #, c-format msgid " Nicks : %s" msgstr "" -#: src/common/command.c:1365 +#: src/common/command.c:1415 #, c-format msgid " Username : %s\n" msgstr "" -#: src/common/command.c:1370 +#: src/common/command.c:1420 #, c-format msgid " Realname : %s\n" msgstr "" -#: src/common/command.c:1376 +#: src/common/command.c:1426 #, c-format msgid " Command : %s\n" msgstr "" -#: src/common/command.c:1381 +#: src/common/command.c:1431 msgid " Command : (none)\n" msgstr "" -#: src/common/command.c:1386 +#: src/common/command.c:1436 #, c-format msgid " Auto-join : %s\n" msgstr "" -#: src/common/command.c:1391 +#: src/common/command.c:1441 msgid " Auto-join : (none)\n" msgstr "" -#: src/common/command.c:1395 +#: src/common/command.c:1445 msgid "No server.\n" msgstr "" -#: src/common/command.c:1404 +#: src/common/command.c:1454 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "" -#: src/common/command.c:1410 +#: src/common/command.c:1460 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" -#: src/common/command.c:1427 +#: src/common/command.c:1477 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:1433 src/common/command.c:1564 +#: src/common/command.c:1483 src/common/command.c:1614 msgid "Server" msgstr "" -#: src/common/command.c:1436 +#: src/common/command.c:1486 msgid "has been deleted\n" msgstr "" -#: src/common/command.c:1450 +#: src/common/command.c:1500 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "" -#: src/common/command.c:1459 +#: src/common/command.c:1509 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "" -#: src/common/command.c:1483 src/common/command.c:1509 -#: src/common/command.c:1521 src/common/command.c:1545 +#: src/common/command.c:1533 src/common/command.c:1559 +#: src/common/command.c:1571 src/common/command.c:1595 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1495 +#: src/common/command.c:1545 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1533 +#: src/common/command.c:1583 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1567 +#: src/common/command.c:1617 msgid "created\n" msgstr "" -#: src/common/command.c:1572 +#: src/common/command.c:1622 #, c-format msgid "%s unable to create server\n" msgstr "" -#: src/common/command.c:1626 +#: src/common/command.c:1676 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" -#: src/common/command.c:1638 +#: src/common/command.c:1688 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "" -#: src/common/command.c:1644 +#: src/common/command.c:1694 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "" -#: src/common/command.c:1694 +#: src/common/command.c:1744 msgid "(unknown)" msgstr "" -#: src/common/command.c:1714 src/common/command.c:1717 +#: src/common/command.c:1764 src/common/command.c:1767 #, c-format msgid "No config option found with \"%s\"\n" msgstr "" -#: src/common/command.c:1722 +#: src/common/command.c:1772 #, c-format msgid "%d config option(s) found with \"%s\"\n" msgstr "" -#: src/common/command.c:1725 +#: src/common/command.c:1775 #, c-format msgid "%d config option(s) found\n" msgstr "" -#: src/common/command.c:1745 +#: src/common/command.c:1795 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "" -#: src/common/command.c:1754 +#: src/common/command.c:1804 #, c-format msgid "Alias \"%s\" removed\n" msgstr "" diff --git a/src/common/command.c b/src/common/command.c index a94cc44d7..f9fbd7828 100644 --- a/src/common/command.c +++ b/src/common/command.c @@ -46,8 +46,9 @@ t_weechat_command weechat_commands[] = { "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" + " move move buffer in the list (may be relative, for example -1)\n" + " list list opened buffers (no parameter implies this list)\n" + " notify set notify level for buffer (0=never, 1=highlight, 2=1+msg, 3=2+join/part)\n" "number: jump to buffer by number"), 0, MAX_ARGS, weechat_cmd_buffer, NULL }, { "clear", N_("clear window(s)"), @@ -915,6 +916,55 @@ weechat_cmd_buffer (int argc, char **argv) return -1; } } + else if (strcasecmp (argv[0], "notify") == 0) + { + /* set notify level for buffer */ + + if (argc < 2) + { + /* display notify level for all buffers */ + irc_display_prefix (NULL, PREFIX_INFO); + gui_printf (NULL, _("Notify levels: ")); + for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer) + { + gui_printf (NULL, "%d.%s:", + ptr_buffer->number, + (ptr_buffer->dcc) ? "DCC" : + ((BUFFER_IS_SERVER(ptr_buffer)) ? SERVER(ptr_buffer)->name : + CHANNEL(ptr_buffer)->name)); + if (ptr_buffer->dcc) + gui_printf (NULL, "-"); + else + gui_printf (NULL, "%d", ptr_buffer->notify_level); + if (ptr_buffer->next_buffer) + gui_printf (NULL, " "); + } + gui_printf (NULL, "\n"); + } + else + { + error = NULL; + number = strtol (argv[1], &error, 10); + if ((error) && (error[0] == '\0')) + { + if ((number < 0) || (number > 3)) + { + /* invalid highlight level */ + gui_printf (NULL, _("%s incorrect notify level (must be between 0 and 3)\n"), + WEECHAT_ERROR); + return -1; + } + gui_current_window->buffer->notify_level = number; + } + else + { + /* invalid number */ + gui_printf (NULL, _("%s incorrect notify level (must be between 0 and 3)\n"), + WEECHAT_ERROR); + return -1; + } + } + } else { /* jump to buffer by number */ diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c index 1f65fee8c..4c969e625 100644 --- a/src/gui/curses/gui-display.c +++ b/src/gui/curses/gui-display.c @@ -1966,10 +1966,15 @@ gui_add_message (t_gui_buffer *buffer, int type, int color, char *message) } if (buffer->num_displayed == 0) { - hotlist_add (buffer->last_line->line_with_message + - buffer->last_line->line_with_highlight, - buffer); - gui_draw_buffer_status (gui_current_window->buffer, 1); + if (3 - buffer->last_line->line_with_message - + buffer->last_line->line_with_highlight <= + buffer->notify_level) + { + 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/gui-common.c b/src/gui/gui-common.c index 43a6297ed..c9076e838 100644 --- a/src/gui/gui-common.c +++ b/src/gui/gui-common.c @@ -182,6 +182,9 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int dcc, new_buffer->num_lines = 0; new_buffer->line_complete = 1; + /* notify level */ + new_buffer->notify_level = 3; + /* create/append to log file */ new_buffer->log_filename = NULL; new_buffer->log_file = NULL; diff --git a/src/gui/gui.h b/src/gui/gui.h index 20d561677..5dd4fecad 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -150,6 +150,12 @@ struct t_gui_buffer int num_lines; /* number of lines in the window */ int line_complete; /* current line complete ? (\n ending) */ + /* notify level: when activity should be displayed? default: 3 (always) */ + int notify_level; /* 0 = never */ + /* 1 = highlight only */ + /* 2 = highlight + message */ + /* 3 = highlight + message + join/part */ + /* file to save buffer content */ char *log_filename; /* filename for saving buffer content */ FILE *log_file; /* for logging buffer to file */ diff --git a/weechat/ChangeLog b/weechat/ChangeLog index b8bd46ac0..859712b36 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -1,17 +1,17 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2004-09-19 +ChangeLog - 2004-10-03 Version 0.0.8 (under dev!): + * /buffer command developed (buffers list, move and notify) * logging buffers to disk (server/channel/private according to user prefs) - * /buffer command developed (buffers list and move function) * Away now announced in channels, and config option "look_display_away" added to enable/disable this feature * Fixed crash when resizing terminal to very small size * "-MORE-" message is now erased when switching to another buffer - * DCC window with Alt-D + * DCC file receive ok (Alt-D for DCC view) * /query command now reopens private buffer if already opened * added key for redrawing terminal (Ctrl-L) * added key for clearing hotlist (Alt-R) diff --git a/weechat/po/fr.po b/weechat/po/fr.po index a573a583b..0185e66c5 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.0.8-pre2\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2004-09-19 22:20+0200\n" +"POT-Creation-Date: 2004-10-03 03:44+0200\n" "PO-Revision-Date: 2004-08-08 20:47+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" @@ -1172,7 +1172,7 @@ msgstr "%s utilisateur non trouv 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:622 src/common/command.c:1254 +#: src/irc/irc-send.c:622 src/common/command.c:1304 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n" @@ -1733,17 +1733,17 @@ msgstr " [R] Retirer" msgid "server" msgstr "serveur" -#: src/gui/gui-common.c:319 +#: src/gui/gui-common.c:322 #, 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:459 +#: src/gui/gui-common.c:462 #, 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:502 +#: src/gui/gui-common.c:505 msgid "not enough memory!\n" msgstr "pas assez de mémoire !\n" @@ -1776,69 +1776,73 @@ 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" +" move move buffer in the list (may be relative, for example -1)\n" +" list list opened buffers (no parameter implies this list)\n" +" notify set notify level for buffer (0=never, 1=highlight, 2=1+msg, 3=2" +"+join/part)\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 -" +" move déplacer le tampon dans la liste (peut être relatif, par exemple -" "1)\n" -" list liste les buffers ouverts (pas de paramètre affiche cette liste)\n" +" list liste les tampons ouverts (pas de paramètre affiche cette liste)\n" +" notify fixer le niveau de notification (0=jamais, 1=highlight, 2=1+msg, " +"3=2+join/part)\n" "nombre: sauter au buffer qui a ce numéro" -#: src/common/command.c:53 +#: src/common/command.c:54 msgid "clear window(s)" msgstr "affacer la/les fenêtre(s)" -#: src/common/command.c:54 +#: src/common/command.c:55 msgid "[-all]" msgstr "[-all]" -#: src/common/command.c:55 +#: src/common/command.c:56 msgid "-all: clear all windows" msgstr "-all: effacer toutes les fenêtres" -#: src/common/command.c:57 +#: src/common/command.c:58 msgid "connect to a server" msgstr "se connecter à un serveur" -#: src/common/command.c:58 src/common/command.c:62 +#: src/common/command.c:59 src/common/command.c:63 msgid "servername" msgstr "nom_serveur" -#: src/common/command.c:59 +#: src/common/command.c:60 msgid "servername: server name to connect" msgstr "nom_serveur: nom du serveur pour se connecter" -#: src/common/command.c:61 +#: src/common/command.c:62 msgid "disconnect from a server" msgstr "se déconnecter d'un serveur" -#: src/common/command.c:63 +#: src/common/command.c:64 msgid "servername: server name to disconnect" msgstr "nom_serveur: nom du serveur pour se déconnecter" -#: src/common/command.c:65 +#: src/common/command.c:66 msgid "display help about commands" msgstr "afficher l'aide sur les commandes" -#: src/common/command.c:66 +#: src/common/command.c:67 msgid "[command]" msgstr "[commande]" -#: src/common/command.c:66 +#: src/common/command.c:67 msgid "command: name of a WeeChat or IRC command" msgstr "commande: nom d'une commande WeeChat ou IRC" -#: src/common/command.c:68 +#: src/common/command.c:69 msgid "list/load/unload Perl scripts" msgstr "liste/charge/décharge des scripts Perl" -#: src/common/command.c:69 +#: src/common/command.c:70 msgid "[load filename] | [autoload] | [unload]" msgstr "[load fichier] | [autoload] | [unload]" -#: src/common/command.c:70 +#: src/common/command.c:71 msgid "" "filename: Perl script (file) to load\n" "Without argument, /perl command lists all loaded Perl scripts." @@ -1846,11 +1850,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:73 +#: src/common/command.c:74 msgid "list, add or remove servers" msgstr "liste, ajoute ou retire des serveurs" -#: src/common/command.c:74 +#: src/common/command.c:75 msgid "" "[list] | [servername hostname port [-auto | -noauto] [-pwd password] [-nicks " "nick1 [nick2 [nick3]]] [-username username] [-realname realname] [-command " @@ -1860,7 +1864,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:79 +#: src/common/command.c:80 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" @@ -1882,27 +1886,27 @@ msgstr "" "nom_utilisateur: nom d'utilisateur\n" "nom_réel: nom réel de l'utilisateur" -#: src/common/command.c:89 +#: src/common/command.c:90 msgid "save config to disk" msgstr "sauvegarder la configuration sur disque" -#: src/common/command.c:90 +#: src/common/command.c:91 msgid "[file]" msgstr "[fichier]" -#: src/common/command.c:90 +#: src/common/command.c:91 msgid "file: filename for writing config" msgstr "fichier: fichier pour sauvegarder la configuration" -#: src/common/command.c:92 +#: src/common/command.c:93 msgid "set config parameters" msgstr "modifier des paramètres de configuration" -#: src/common/command.c:93 +#: src/common/command.c:94 msgid "[option [value]]" msgstr "[option [valeur]]" -#: src/common/command.c:93 +#: src/common/command.c:94 msgid "" "option: name of an option\n" "value: value for option" @@ -1910,27 +1914,27 @@ msgstr "" "option: nom d'une option\n" "valeur: valeur pour l'option" -#: src/common/command.c:95 +#: src/common/command.c:96 msgid "remove an alias" msgstr "supprimer un alias" -#: src/common/command.c:96 +#: src/common/command.c:97 msgid "alias_name" msgstr "nom_alias" -#: src/common/command.c:96 +#: src/common/command.c:97 msgid "alias_name: name of alias to remove" msgstr "nom_alias: nom de l'alias à supprimer" -#: src/common/command.c:98 +#: src/common/command.c:99 msgid "manage windows" msgstr "gestion des fenêtres" -#: src/common/command.c:99 +#: src/common/command.c:100 msgid "[action]" msgstr "[action]" -#: src/common/command.c:100 +#: src/common/command.c:101 msgid "" "action: action to do:\n" " close close current window (under development!)\n" @@ -1945,29 +1949,29 @@ msgstr "" " splith éclate la fenêtre en deux horizontalement\n" " splitv éclate la fenêtre en deux verticalement" -#: src/common/command.c:355 +#: src/common/command.c:356 #, 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:364 +#: src/common/command.c:365 #, 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:370 +#: src/common/command.c:371 #, 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:556 +#: src/common/command.c:557 #, 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:565 +#: src/common/command.c:566 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " @@ -1976,19 +1980,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:584 +#: src/common/command.c:585 #, c-format msgid "%s %s command \"%s\" failed\n" msgstr "%s %s la commande \"%s\" a échoué\n" -#: src/common/command.c:609 +#: src/common/command.c:610 #, 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:618 +#: src/common/command.c:619 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " @@ -1997,164 +2001,173 @@ 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:631 +#: src/common/command.c:632 #, 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:643 +#: src/common/command.c:644 #, c-format msgid "%s IRC command \"%s\" failed\n" msgstr "%s la commande IRC \"%s\" a échoué\n" -#: src/common/command.c:690 +#: src/common/command.c:691 #, 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:759 +#: src/common/command.c:760 #, 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:765 +#: src/common/command.c:766 msgid "This window is not a channel!\n" msgstr "Cette fenêtre n'est pas un canal !\n" -#: src/common/command.c:791 src/common/command.c:803 src/common/command.c:891 +#: src/common/command.c:792 src/common/command.c:804 src/common/command.c:892 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "%s paramètres manquants pour la commande \"%s\"\n" -#: src/common/command.c:798 +#: src/common/command.c:799 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "Alias \"%s\" => \"%s\" créé\n" -#: src/common/command.c:813 +#: src/common/command.c:814 msgid "List of aliases:\n" msgstr "Liste des alias:\n" -#: src/common/command.c:823 +#: src/common/command.c:824 msgid "No alias defined.\n" msgstr "Aucun alias défini.\n" -#: src/common/command.c:844 +#: src/common/command.c:845 msgid "Opened buffers:\n" msgstr "Tampons ouverts:\n" -#: src/common/command.c:857 src/common/command.c:1303 +#: src/common/command.c:858 src/common/command.c:1353 msgid "Server: " msgstr "Serveur: " -#: src/common/command.c:863 +#: src/common/command.c:864 msgid "Channel: " msgstr "Canal: " -#: src/common/command.c:866 src/common/command.c:876 +#: src/common/command.c:867 src/common/command.c:877 msgid " (server: " msgstr " (serveur: " -#: src/common/command.c:873 +#: src/common/command.c:874 msgid "Private with: " msgstr "Privé avec: " -#: src/common/command.c:913 src/common/command.c:937 +#: src/common/command.c:914 src/common/command.c:987 #, c-format msgid "%s incorrect buffer number\n" msgstr "%s numéro de buffer incorrect\n" -#: src/common/command.c:929 +#: src/common/command.c:927 +msgid "Notify levels: " +msgstr "Niveaux de notification: " + +#: src/common/command.c:953 src/common/command.c:962 +#, c-format +msgid "%s incorrect notify level (must be between 0 and 3)\n" +msgstr "%s niveau de notification incorrect (doit être entre 0 et 3)\n" + +#: src/common/command.c:979 #, 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:961 +#: src/common/command.c:1011 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "paramètre inconnu \"%s\" pour la commande \"%s\"\n" -#: src/common/command.c:990 +#: src/common/command.c:1040 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s déjà connecté au serveur \"%s\" !\n" -#: src/common/command.c:1013 src/common/command.c:1048 +#: src/common/command.c:1063 src/common/command.c:1098 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s serveur \"%s\" non trouvé\n" -#: src/common/command.c:1038 +#: src/common/command.c:1088 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s non connecté au serveur \"%s\" !\n" -#: src/common/command.c:1067 +#: src/common/command.c:1117 #, c-format msgid "> List of %s internal commands:\n" msgstr "> Liste des commandes internes %s:\n" -#: src/common/command.c:1072 +#: src/common/command.c:1122 msgid "> List of IRC commands:\n" msgstr "> Liste des commandes IRC:\n" -#: src/common/command.c:1087 +#: src/common/command.c:1137 #, c-format msgid "> Help on %s internal command \"%s\":\n" msgstr "> Aide sur la commande interne %s \"%s\":\n" -#: src/common/command.c:1090 src/common/command.c:1111 +#: src/common/command.c:1140 src/common/command.c:1161 #, c-format msgid "Syntax: /%s %s\n" msgstr "Syntaxe: /%s %s\n" -#: src/common/command.c:1109 +#: src/common/command.c:1159 #, c-format msgid "> Help on IRC command \"%s\":\n" msgstr "> Aide sur la commande IRC \"%s\":\n" -#: src/common/command.c:1125 +#: src/common/command.c:1175 #, 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:1150 +#: src/common/command.c:1200 msgid "Registered Perl scripts:\n" msgstr "Scripts Perl enregistrés :\n" -#: src/common/command.c:1167 src/common/command.c:1189 -#: src/common/command.c:1211 +#: src/common/command.c:1217 src/common/command.c:1239 +#: src/common/command.c:1261 msgid " (none)\n" msgstr " (aucun)\n" -#: src/common/command.c:1172 +#: src/common/command.c:1222 msgid "Perl message handlers:\n" msgstr "Fonctions Perl pour messages :\n" -#: src/common/command.c:1181 +#: src/common/command.c:1231 #, c-format msgid " IRC(%s) => Perl(%s)\n" msgstr " IRC(%s) => Perl(%s)\n" -#: src/common/command.c:1194 +#: src/common/command.c:1244 msgid "Perl command handlers:\n" msgstr "Commandes Perl :\n" -#: src/common/command.c:1203 +#: src/common/command.c:1253 #, c-format msgid " Command /%s => Perl(%s)\n" msgstr " Commande /%s => Perl(%s)\n" -#: src/common/command.c:1223 +#: src/common/command.c:1273 msgid "Perl scripts unloaded\n" msgstr "Scripts Perl déchargés\n" -#: src/common/command.c:1248 src/common/command.c:1786 +#: src/common/command.c:1298 src/common/command.c:1836 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s option inconnue pour la commande \"%s\"\n" -#: src/common/command.c:1259 +#: src/common/command.c:1309 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" @@ -2163,184 +2176,184 @@ msgstr "" "Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le " "script ./configure\n" -#: src/common/command.c:1314 +#: src/common/command.c:1364 msgid "connected" msgstr "connecté" -#: src/common/command.c:1314 +#: src/common/command.c:1364 msgid "not connected" msgstr "non connecté" -#: src/common/command.c:1321 +#: src/common/command.c:1371 #, c-format msgid " Autoconnect: %s%s\n" msgstr " Autoconnect: %s%s\n" -#: src/common/command.c:1322 +#: src/common/command.c:1372 msgid "yes" msgstr "oui" -#: src/common/command.c:1322 +#: src/common/command.c:1372 msgid "no" msgstr "non" -#: src/common/command.c:1324 +#: src/common/command.c:1374 msgid " (temporary server, will not be saved)" msgstr " (serveur temporaire, ne sera pas sauvé)" -#: src/common/command.c:1329 +#: src/common/command.c:1379 #, c-format msgid " Hostname : %s\n" msgstr " Nom/IP : %s\n" -#: src/common/command.c:1334 +#: src/common/command.c:1384 #, c-format msgid " Port : %d\n" msgstr " Port : %d\n" -#: src/common/command.c:1340 +#: src/common/command.c:1390 msgid " Password : (hidden)\n" msgstr " Mot passe : (caché)\n" -#: src/common/command.c:1344 +#: src/common/command.c:1394 msgid " Password : (none)\n" msgstr " Mot passe : (aucun)\n" -#: src/common/command.c:1348 +#: src/common/command.c:1398 #, c-format msgid " Nicks : %s" msgstr " Pseudos : %s" -#: src/common/command.c:1365 +#: src/common/command.c:1415 #, c-format msgid " Username : %s\n" msgstr " Nom utilis.: %s\n" -#: src/common/command.c:1370 +#: src/common/command.c:1420 #, c-format msgid " Realname : %s\n" msgstr " Nom réel : %s\n" -#: src/common/command.c:1376 +#: src/common/command.c:1426 #, c-format msgid " Command : %s\n" msgstr " Commande : %s\n" -#: src/common/command.c:1381 +#: src/common/command.c:1431 msgid " Command : (none)\n" msgstr " Commande : (aucune)\n" -#: src/common/command.c:1386 +#: src/common/command.c:1436 #, c-format msgid " Auto-join : %s\n" msgstr " Auto-join : %s\n" -#: src/common/command.c:1391 +#: src/common/command.c:1441 msgid " Auto-join : (none)\n" msgstr " Auto-join : (aucun)\n" -#: src/common/command.c:1395 +#: src/common/command.c:1445 msgid "No server.\n" msgstr "Pas de serveur.\n" -#: src/common/command.c:1404 +#: src/common/command.c:1454 #, 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:1410 +#: src/common/command.c:1460 #, 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:1427 +#: src/common/command.c:1477 #, 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:1433 src/common/command.c:1564 +#: src/common/command.c:1483 src/common/command.c:1614 msgid "Server" msgstr "Serveur" -#: src/common/command.c:1436 +#: src/common/command.c:1486 msgid "has been deleted\n" msgstr "a été supprimé\n" -#: src/common/command.c:1450 +#: src/common/command.c:1500 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s paramètres manquants pour la commande \"%s\"\n" -#: src/common/command.c:1459 +#: src/common/command.c:1509 #, 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:1483 src/common/command.c:1509 -#: src/common/command.c:1521 src/common/command.c:1545 +#: src/common/command.c:1533 src/common/command.c:1559 +#: src/common/command.c:1571 src/common/command.c:1595 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s mot de passe manquant pour le paramètre \"%s\"\n" -#: src/common/command.c:1495 +#: src/common/command.c:1545 #, 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:1533 +#: src/common/command.c:1583 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s commande manquante pour le paramètre \"%s\"\n" -#: src/common/command.c:1567 +#: src/common/command.c:1617 msgid "created\n" msgstr "créé\n" -#: src/common/command.c:1572 +#: src/common/command.c:1622 #, c-format msgid "%s unable to create server\n" msgstr "%s impossible de créer le serveur\n" -#: src/common/command.c:1626 +#: src/common/command.c:1676 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "%s l'option \"%s\" ne peut pas être changée lorsque WeeChat tourne\n" -#: src/common/command.c:1638 +#: src/common/command.c:1688 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valeur incorrecte pour l'option \"%s\"\n" -#: src/common/command.c:1644 +#: src/common/command.c:1694 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s option de configuration \"%s\" non trouvée\n" -#: src/common/command.c:1694 +#: src/common/command.c:1744 msgid "(unknown)" msgstr "(inconnu)" -#: src/common/command.c:1714 src/common/command.c:1717 +#: src/common/command.c:1764 src/common/command.c:1767 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Aucune option de configuration trouvée avec \"%s\"\n" -#: src/common/command.c:1722 +#: src/common/command.c:1772 #, c-format msgid "%d config option(s) found with \"%s\"\n" msgstr "%d option(s) de configuration trouvées avec \"%s\"\n" -#: src/common/command.c:1725 +#: src/common/command.c:1775 #, c-format msgid "%d config option(s) found\n" msgstr "%d option(s) de configuration trouvées\n" -#: src/common/command.c:1745 +#: src/common/command.c:1795 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias ou commande \"%s\" non trouvé\n" -#: src/common/command.c:1754 +#: src/common/command.c:1804 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" supprimé\n" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index e41b0db95..905fa45de 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-09-19 22:20+0200\n" +"POT-Creation-Date: 2004-10-03 03:44+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1078,7 +1078,7 @@ msgstr "" msgid "%s cannot create new private window \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:622 src/common/command.c:1254 +#: src/irc/irc-send.c:622 src/common/command.c:1304 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "" @@ -1626,17 +1626,17 @@ msgstr "" msgid "server" msgstr "" -#: src/gui/gui-common.c:319 +#: src/gui/gui-common.c:322 #, c-format msgid "%s not enough memory for infobar message\n" msgstr "" -#: src/gui/gui-common.c:459 +#: src/gui/gui-common.c:462 #, c-format msgid "%s not enough memory for new line!\n" msgstr "" -#: src/gui/gui-common.c:502 +#: src/gui/gui-common.c:505 msgid "not enough memory!\n" msgstr "" @@ -1666,81 +1666,83 @@ msgstr "" #: 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" +" move move buffer in the list (may be relative, for example -1)\n" +" list list opened buffers (no parameter implies this list)\n" +" notify set notify level for buffer (0=never, 1=highlight, 2=1+msg, 3=2" +"+join/part)\n" "number: jump to buffer by number" msgstr "" -#: src/common/command.c:53 +#: src/common/command.c:54 msgid "clear window(s)" msgstr "" -#: src/common/command.c:54 +#: src/common/command.c:55 msgid "[-all]" msgstr "" -#: src/common/command.c:55 +#: src/common/command.c:56 msgid "-all: clear all windows" msgstr "" -#: src/common/command.c:57 +#: src/common/command.c:58 msgid "connect to a server" msgstr "" -#: src/common/command.c:58 src/common/command.c:62 +#: src/common/command.c:59 src/common/command.c:63 msgid "servername" msgstr "" -#: src/common/command.c:59 +#: src/common/command.c:60 msgid "servername: server name to connect" msgstr "" -#: src/common/command.c:61 +#: src/common/command.c:62 msgid "disconnect from a server" msgstr "" -#: src/common/command.c:63 +#: src/common/command.c:64 msgid "servername: server name to disconnect" msgstr "" -#: src/common/command.c:65 +#: src/common/command.c:66 msgid "display help about commands" msgstr "" -#: src/common/command.c:66 +#: src/common/command.c:67 msgid "[command]" msgstr "" -#: src/common/command.c:66 +#: src/common/command.c:67 msgid "command: name of a WeeChat or IRC command" msgstr "" -#: src/common/command.c:68 +#: src/common/command.c:69 msgid "list/load/unload Perl scripts" msgstr "" -#: src/common/command.c:69 +#: src/common/command.c:70 msgid "[load filename] | [autoload] | [unload]" msgstr "" -#: src/common/command.c:70 +#: src/common/command.c:71 msgid "" "filename: Perl script (file) to load\n" "Without argument, /perl command lists all loaded Perl scripts." msgstr "" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "list, add or remove servers" msgstr "" -#: src/common/command.c:74 +#: src/common/command.c:75 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:79 +#: src/common/command.c:80 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" @@ -1753,53 +1755,53 @@ msgid "" "realname: real name of user" msgstr "" -#: src/common/command.c:89 +#: src/common/command.c:90 msgid "save config to disk" msgstr "" -#: src/common/command.c:90 +#: src/common/command.c:91 msgid "[file]" msgstr "" -#: src/common/command.c:90 +#: src/common/command.c:91 msgid "file: filename for writing config" msgstr "" -#: src/common/command.c:92 +#: src/common/command.c:93 msgid "set config parameters" msgstr "" -#: src/common/command.c:93 +#: src/common/command.c:94 msgid "[option [value]]" msgstr "" -#: src/common/command.c:93 +#: src/common/command.c:94 msgid "" "option: name of an option\n" "value: value for option" msgstr "" -#: src/common/command.c:95 +#: src/common/command.c:96 msgid "remove an alias" msgstr "" -#: src/common/command.c:96 +#: src/common/command.c:97 msgid "alias_name" msgstr "" -#: src/common/command.c:96 +#: src/common/command.c:97 msgid "alias_name: name of alias to remove" msgstr "" -#: src/common/command.c:98 +#: src/common/command.c:99 msgid "manage windows" msgstr "" -#: src/common/command.c:99 +#: src/common/command.c:100 msgid "[action]" msgstr "" -#: src/common/command.c:100 +#: src/common/command.c:101 msgid "" "action: action to do:\n" " close close current window (under development!)\n" @@ -1808,391 +1810,400 @@ msgid "" " splitv split current window vertically" msgstr "" -#: src/common/command.c:355 +#: src/common/command.c:356 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "" -#: src/common/command.c:364 +#: src/common/command.c:365 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "" -#: src/common/command.c:370 +#: src/common/command.c:371 #, c-format msgid "%s target command \"%s\" does not exist!\n" msgstr "" -#: src/common/command.c:556 +#: src/common/command.c:557 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" -#: src/common/command.c:565 +#: src/common/command.c:566 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " "arg%s)\n" msgstr "" -#: src/common/command.c:584 +#: src/common/command.c:585 #, c-format msgid "%s %s command \"%s\" failed\n" msgstr "" -#: src/common/command.c:609 +#: src/common/command.c:610 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" -#: src/common/command.c:618 +#: src/common/command.c:619 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " "arg%s)\n" msgstr "" -#: src/common/command.c:631 +#: src/common/command.c:632 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "" -#: src/common/command.c:643 +#: src/common/command.c:644 #, c-format msgid "%s IRC command \"%s\" failed\n" msgstr "" -#: src/common/command.c:690 +#: src/common/command.c:691 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "" -#: src/common/command.c:759 +#: src/common/command.c:760 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "" -#: src/common/command.c:765 +#: src/common/command.c:766 msgid "This window is not a channel!\n" msgstr "" -#: src/common/command.c:791 src/common/command.c:803 src/common/command.c:891 +#: src/common/command.c:792 src/common/command.c:804 src/common/command.c:892 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "" -#: src/common/command.c:798 +#: src/common/command.c:799 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "" -#: src/common/command.c:813 +#: src/common/command.c:814 msgid "List of aliases:\n" msgstr "" -#: src/common/command.c:823 +#: src/common/command.c:824 msgid "No alias defined.\n" msgstr "" -#: src/common/command.c:844 +#: src/common/command.c:845 msgid "Opened buffers:\n" msgstr "" -#: src/common/command.c:857 src/common/command.c:1303 +#: src/common/command.c:858 src/common/command.c:1353 msgid "Server: " msgstr "" -#: src/common/command.c:863 +#: src/common/command.c:864 msgid "Channel: " msgstr "" -#: src/common/command.c:866 src/common/command.c:876 +#: src/common/command.c:867 src/common/command.c:877 msgid " (server: " msgstr "" -#: src/common/command.c:873 +#: src/common/command.c:874 msgid "Private with: " msgstr "" -#: src/common/command.c:913 src/common/command.c:937 +#: src/common/command.c:914 src/common/command.c:987 #, c-format msgid "%s incorrect buffer number\n" msgstr "" -#: src/common/command.c:929 +#: src/common/command.c:927 +msgid "Notify levels: " +msgstr "" + +#: src/common/command.c:953 src/common/command.c:962 +#, c-format +msgid "%s incorrect notify level (must be between 0 and 3)\n" +msgstr "" + +#: src/common/command.c:979 #, c-format msgid "%s buffer \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:961 +#: src/common/command.c:1011 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "" -#: src/common/command.c:990 +#: src/common/command.c:1040 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1013 src/common/command.c:1048 +#: src/common/command.c:1063 src/common/command.c:1098 #, c-format msgid "%s server \"%s\" not found\n" msgstr "" -#: src/common/command.c:1038 +#: src/common/command.c:1088 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1067 +#: src/common/command.c:1117 #, c-format msgid "> List of %s internal commands:\n" msgstr "" -#: src/common/command.c:1072 +#: src/common/command.c:1122 msgid "> List of IRC commands:\n" msgstr "" -#: src/common/command.c:1087 +#: src/common/command.c:1137 #, c-format msgid "> Help on %s internal command \"%s\":\n" msgstr "" -#: src/common/command.c:1090 src/common/command.c:1111 +#: src/common/command.c:1140 src/common/command.c:1161 #, c-format msgid "Syntax: /%s %s\n" msgstr "" -#: src/common/command.c:1109 +#: src/common/command.c:1159 #, c-format msgid "> Help on IRC command \"%s\":\n" msgstr "" -#: src/common/command.c:1125 +#: src/common/command.c:1175 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "" -#: src/common/command.c:1150 +#: src/common/command.c:1200 msgid "Registered Perl scripts:\n" msgstr "" -#: src/common/command.c:1167 src/common/command.c:1189 -#: src/common/command.c:1211 +#: src/common/command.c:1217 src/common/command.c:1239 +#: src/common/command.c:1261 msgid " (none)\n" msgstr "" -#: src/common/command.c:1172 +#: src/common/command.c:1222 msgid "Perl message handlers:\n" msgstr "" -#: src/common/command.c:1181 +#: src/common/command.c:1231 #, c-format msgid " IRC(%s) => Perl(%s)\n" msgstr "" -#: src/common/command.c:1194 +#: src/common/command.c:1244 msgid "Perl command handlers:\n" msgstr "" -#: src/common/command.c:1203 +#: src/common/command.c:1253 #, c-format msgid " Command /%s => Perl(%s)\n" msgstr "" -#: src/common/command.c:1223 +#: src/common/command.c:1273 msgid "Perl scripts unloaded\n" msgstr "" -#: src/common/command.c:1248 src/common/command.c:1786 +#: src/common/command.c:1298 src/common/command.c:1836 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "" -#: src/common/command.c:1259 +#: src/common/command.c:1309 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" msgstr "" -#: src/common/command.c:1314 +#: src/common/command.c:1364 msgid "connected" msgstr "" -#: src/common/command.c:1314 +#: src/common/command.c:1364 msgid "not connected" msgstr "" -#: src/common/command.c:1321 +#: src/common/command.c:1371 #, c-format msgid " Autoconnect: %s%s\n" msgstr "" -#: src/common/command.c:1322 +#: src/common/command.c:1372 msgid "yes" msgstr "" -#: src/common/command.c:1322 +#: src/common/command.c:1372 msgid "no" msgstr "" -#: src/common/command.c:1324 +#: src/common/command.c:1374 msgid " (temporary server, will not be saved)" msgstr "" -#: src/common/command.c:1329 +#: src/common/command.c:1379 #, c-format msgid " Hostname : %s\n" msgstr "" -#: src/common/command.c:1334 +#: src/common/command.c:1384 #, c-format msgid " Port : %d\n" msgstr "" -#: src/common/command.c:1340 +#: src/common/command.c:1390 msgid " Password : (hidden)\n" msgstr "" -#: src/common/command.c:1344 +#: src/common/command.c:1394 msgid " Password : (none)\n" msgstr "" -#: src/common/command.c:1348 +#: src/common/command.c:1398 #, c-format msgid " Nicks : %s" msgstr "" -#: src/common/command.c:1365 +#: src/common/command.c:1415 #, c-format msgid " Username : %s\n" msgstr "" -#: src/common/command.c:1370 +#: src/common/command.c:1420 #, c-format msgid " Realname : %s\n" msgstr "" -#: src/common/command.c:1376 +#: src/common/command.c:1426 #, c-format msgid " Command : %s\n" msgstr "" -#: src/common/command.c:1381 +#: src/common/command.c:1431 msgid " Command : (none)\n" msgstr "" -#: src/common/command.c:1386 +#: src/common/command.c:1436 #, c-format msgid " Auto-join : %s\n" msgstr "" -#: src/common/command.c:1391 +#: src/common/command.c:1441 msgid " Auto-join : (none)\n" msgstr "" -#: src/common/command.c:1395 +#: src/common/command.c:1445 msgid "No server.\n" msgstr "" -#: src/common/command.c:1404 +#: src/common/command.c:1454 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "" -#: src/common/command.c:1410 +#: src/common/command.c:1460 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" -#: src/common/command.c:1427 +#: src/common/command.c:1477 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:1433 src/common/command.c:1564 +#: src/common/command.c:1483 src/common/command.c:1614 msgid "Server" msgstr "" -#: src/common/command.c:1436 +#: src/common/command.c:1486 msgid "has been deleted\n" msgstr "" -#: src/common/command.c:1450 +#: src/common/command.c:1500 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "" -#: src/common/command.c:1459 +#: src/common/command.c:1509 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "" -#: src/common/command.c:1483 src/common/command.c:1509 -#: src/common/command.c:1521 src/common/command.c:1545 +#: src/common/command.c:1533 src/common/command.c:1559 +#: src/common/command.c:1571 src/common/command.c:1595 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1495 +#: src/common/command.c:1545 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1533 +#: src/common/command.c:1583 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1567 +#: src/common/command.c:1617 msgid "created\n" msgstr "" -#: src/common/command.c:1572 +#: src/common/command.c:1622 #, c-format msgid "%s unable to create server\n" msgstr "" -#: src/common/command.c:1626 +#: src/common/command.c:1676 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" -#: src/common/command.c:1638 +#: src/common/command.c:1688 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "" -#: src/common/command.c:1644 +#: src/common/command.c:1694 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "" -#: src/common/command.c:1694 +#: src/common/command.c:1744 msgid "(unknown)" msgstr "" -#: src/common/command.c:1714 src/common/command.c:1717 +#: src/common/command.c:1764 src/common/command.c:1767 #, c-format msgid "No config option found with \"%s\"\n" msgstr "" -#: src/common/command.c:1722 +#: src/common/command.c:1772 #, c-format msgid "%d config option(s) found with \"%s\"\n" msgstr "" -#: src/common/command.c:1725 +#: src/common/command.c:1775 #, c-format msgid "%d config option(s) found\n" msgstr "" -#: src/common/command.c:1745 +#: src/common/command.c:1795 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "" -#: src/common/command.c:1754 +#: src/common/command.c:1804 #, c-format msgid "Alias \"%s\" removed\n" msgstr "" diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c index a94cc44d7..f9fbd7828 100644 --- a/weechat/src/common/command.c +++ b/weechat/src/common/command.c @@ -46,8 +46,9 @@ t_weechat_command weechat_commands[] = { "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" + " move move buffer in the list (may be relative, for example -1)\n" + " list list opened buffers (no parameter implies this list)\n" + " notify set notify level for buffer (0=never, 1=highlight, 2=1+msg, 3=2+join/part)\n" "number: jump to buffer by number"), 0, MAX_ARGS, weechat_cmd_buffer, NULL }, { "clear", N_("clear window(s)"), @@ -915,6 +916,55 @@ weechat_cmd_buffer (int argc, char **argv) return -1; } } + else if (strcasecmp (argv[0], "notify") == 0) + { + /* set notify level for buffer */ + + if (argc < 2) + { + /* display notify level for all buffers */ + irc_display_prefix (NULL, PREFIX_INFO); + gui_printf (NULL, _("Notify levels: ")); + for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer) + { + gui_printf (NULL, "%d.%s:", + ptr_buffer->number, + (ptr_buffer->dcc) ? "DCC" : + ((BUFFER_IS_SERVER(ptr_buffer)) ? SERVER(ptr_buffer)->name : + CHANNEL(ptr_buffer)->name)); + if (ptr_buffer->dcc) + gui_printf (NULL, "-"); + else + gui_printf (NULL, "%d", ptr_buffer->notify_level); + if (ptr_buffer->next_buffer) + gui_printf (NULL, " "); + } + gui_printf (NULL, "\n"); + } + else + { + error = NULL; + number = strtol (argv[1], &error, 10); + if ((error) && (error[0] == '\0')) + { + if ((number < 0) || (number > 3)) + { + /* invalid highlight level */ + gui_printf (NULL, _("%s incorrect notify level (must be between 0 and 3)\n"), + WEECHAT_ERROR); + return -1; + } + gui_current_window->buffer->notify_level = number; + } + else + { + /* invalid number */ + gui_printf (NULL, _("%s incorrect notify level (must be between 0 and 3)\n"), + WEECHAT_ERROR); + return -1; + } + } + } else { /* jump to buffer by number */ diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c index 1f65fee8c..4c969e625 100644 --- a/weechat/src/gui/curses/gui-display.c +++ b/weechat/src/gui/curses/gui-display.c @@ -1966,10 +1966,15 @@ gui_add_message (t_gui_buffer *buffer, int type, int color, char *message) } if (buffer->num_displayed == 0) { - hotlist_add (buffer->last_line->line_with_message + - buffer->last_line->line_with_highlight, - buffer); - gui_draw_buffer_status (gui_current_window->buffer, 1); + if (3 - buffer->last_line->line_with_message - + buffer->last_line->line_with_highlight <= + buffer->notify_level) + { + 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/gui-common.c b/weechat/src/gui/gui-common.c index 43a6297ed..c9076e838 100644 --- a/weechat/src/gui/gui-common.c +++ b/weechat/src/gui/gui-common.c @@ -182,6 +182,9 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int dcc, new_buffer->num_lines = 0; new_buffer->line_complete = 1; + /* notify level */ + new_buffer->notify_level = 3; + /* create/append to log file */ new_buffer->log_filename = NULL; new_buffer->log_file = NULL; diff --git a/weechat/src/gui/gui.h b/weechat/src/gui/gui.h index 20d561677..5dd4fecad 100644 --- a/weechat/src/gui/gui.h +++ b/weechat/src/gui/gui.h @@ -150,6 +150,12 @@ struct t_gui_buffer int num_lines; /* number of lines in the window */ int line_complete; /* current line complete ? (\n ending) */ + /* notify level: when activity should be displayed? default: 3 (always) */ + int notify_level; /* 0 = never */ + /* 1 = highlight only */ + /* 2 = highlight + message */ + /* 3 = highlight + message + join/part */ + /* file to save buffer content */ char *log_filename; /* filename for saving buffer content */ FILE *log_file; /* for logging buffer to file */