diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | po/fr.po | 304 | ||||
-rw-r--r-- | po/weechat.pot | 304 | ||||
-rw-r--r-- | src/common/command.c | 4 | ||||
-rw-r--r-- | src/common/log.c | 23 | ||||
-rw-r--r-- | src/common/log.h | 2 | ||||
-rw-r--r-- | src/common/weeconfig.c | 5 | ||||
-rw-r--r-- | src/common/weeconfig.h | 1 | ||||
-rw-r--r-- | src/gui/curses/gui-display.c | 9 | ||||
-rw-r--r-- | src/gui/gui-common.c | 1 | ||||
-rw-r--r-- | src/gui/gui.h | 5 | ||||
-rw-r--r-- | src/irc/irc-commands.c | 2 | ||||
-rw-r--r-- | src/irc/irc-display.c | 12 | ||||
-rw-r--r-- | weechat/ChangeLog | 4 | ||||
-rw-r--r-- | weechat/po/fr.po | 304 | ||||
-rw-r--r-- | weechat/po/weechat.pot | 304 | ||||
-rw-r--r-- | weechat/src/common/command.c | 4 | ||||
-rw-r--r-- | weechat/src/common/log.c | 23 | ||||
-rw-r--r-- | weechat/src/common/log.h | 2 | ||||
-rw-r--r-- | weechat/src/common/weeconfig.c | 5 | ||||
-rw-r--r-- | weechat/src/common/weeconfig.h | 1 | ||||
-rw-r--r-- | weechat/src/gui/curses/gui-display.c | 9 | ||||
-rw-r--r-- | weechat/src/gui/gui-common.c | 1 | ||||
-rw-r--r-- | weechat/src/gui/gui.h | 5 | ||||
-rw-r--r-- | weechat/src/irc/irc-commands.c | 2 | ||||
-rw-r--r-- | weechat/src/irc/irc-display.c | 12 |
26 files changed, 742 insertions, 610 deletions
@@ -4,6 +4,10 @@ WeeChat - Wee Enhanced Environment for Chat ChangeLog - 2005-02-12 +Version 0.1.1 (under dev!): + * on server buffer, only server messages are logged + * plugins messages are logged with new config option (log_plugin_msg) + Version 0.1.0 (2005-02-12): * improved /window command: now split and merge are ok * away nicks are now displayed with another color (new option: "irc_away_check") @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.1-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-02-12 12:00+0100\n" +"POT-Creation-Date: 2005-02-12 21:42+0100\n" "PO-Revision-Date: 2005-02-12 12:00+0100\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -20,7 +20,7 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "%s ompossible d'allouer un nouveau pseudo\n" -#: src/irc/irc-server.c:139 src/common/weeconfig.c:1451 +#: src/irc/irc-server.c:139 src/common/weeconfig.c:1456 msgid "Unable to get user's name" msgstr "Impossible de déterminer le nom d'utilisateur" @@ -1011,182 +1011,186 @@ msgid "no origin" msgstr "pas d'origine" #: src/irc/irc-commands.c:340 +msgid "no services" +msgstr "pas de service" + +#: src/irc/irc-commands.c:342 msgid "no recipient" msgstr "pas de destinataire" -#: src/irc/irc-commands.c:342 +#: src/irc/irc-commands.c:344 msgid "no text to send" msgstr "pas de texte à envoyer" -#: src/irc/irc-commands.c:344 +#: src/irc/irc-commands.c:346 msgid "no toplevel" msgstr "pas de niveau supérieur" -#: src/irc/irc-commands.c:346 +#: src/irc/irc-commands.c:348 msgid "wilcard in toplevel domain" msgstr "caractère joker dans le domaine de niveau supérieur" -#: src/irc/irc-commands.c:348 +#: src/irc/irc-commands.c:350 msgid "unknown command" msgstr "commande inconnue" -#: src/irc/irc-commands.c:350 +#: src/irc/irc-commands.c:352 msgid "MOTD is missing" msgstr "MOTD est manquant" -#: src/irc/irc-commands.c:352 +#: src/irc/irc-commands.c:354 msgid "no administrative info" msgstr "pas d'information administrative" -#: src/irc/irc-commands.c:354 +#: src/irc/irc-commands.c:356 msgid "file error" msgstr "erreur de fichier" -#: src/irc/irc-commands.c:356 +#: src/irc/irc-commands.c:358 msgid "no nickname given" msgstr "pas d'utilisateur donné" -#: src/irc/irc-commands.c:358 +#: src/irc/irc-commands.c:360 msgid "erroneus nickname" msgstr "nom d'utilisateur erroné" -#: src/irc/irc-commands.c:360 +#: src/irc/irc-commands.c:362 msgid "nickname already in use" msgstr "nom d'utilisateur déjà en cours d'utilisation" -#: src/irc/irc-commands.c:362 +#: src/irc/irc-commands.c:364 msgid "nickname collision" msgstr "collision sur le nom d'utilisateur" -#: src/irc/irc-commands.c:364 +#: src/irc/irc-commands.c:366 msgid "user not in channel" msgstr "utilisateur non présent dans le canal" -#: src/irc/irc-commands.c:366 +#: src/irc/irc-commands.c:368 msgid "not on channel" msgstr "non présent sur le canal" -#: src/irc/irc-commands.c:368 +#: src/irc/irc-commands.c:370 msgid "user already on channel" msgstr "utilisateur déjà sur le canal" -#: src/irc/irc-commands.c:370 +#: src/irc/irc-commands.c:372 msgid "user not logged in" msgstr "utilisateur non enregistré" -#: src/irc/irc-commands.c:372 +#: src/irc/irc-commands.c:374 msgid "summon has been disabled" msgstr "summon a été désactivé" -#: src/irc/irc-commands.c:374 +#: src/irc/irc-commands.c:376 msgid "users has been disabled" msgstr "users a été désactivé" -#: src/irc/irc-commands.c:376 +#: src/irc/irc-commands.c:378 msgid "you are not registered" msgstr "vous n'êtes pas enregistré" -#: src/irc/irc-commands.c:378 +#: src/irc/irc-commands.c:380 msgid "not enough parameters" msgstr "pas assez de paramètres" -#: src/irc/irc-commands.c:380 +#: src/irc/irc-commands.c:382 msgid "you may not register" msgstr "vous ne pouvez pas vous enregistrer" -#: src/irc/irc-commands.c:382 +#: src/irc/irc-commands.c:384 msgid "your host isn't among the privileged" msgstr "votre nom de machine n'est pas parmi les privilégiés" -#: src/irc/irc-commands.c:384 +#: src/irc/irc-commands.c:386 msgid "password incorrect" msgstr "mot de passe incorrect" -#: src/irc/irc-commands.c:386 +#: src/irc/irc-commands.c:388 msgid "you are banned from this server" msgstr "vous êtes banni de ce serveur" -#: src/irc/irc-commands.c:388 +#: src/irc/irc-commands.c:390 msgid "channel key already set" msgstr "clé du canal déjà définie" -#: src/irc/irc-commands.c:390 +#: src/irc/irc-commands.c:392 msgid "channel is already full" msgstr "le canal est déjà plein" -#: src/irc/irc-commands.c:392 +#: src/irc/irc-commands.c:394 msgid "unknown mode char to me" msgstr "caractère de mode inconnu pour moi" -#: src/irc/irc-commands.c:394 +#: src/irc/irc-commands.c:396 msgid "cannot join channel (invite only)" msgstr "impossible de rejoindre le canal (invités seulement)" -#: src/irc/irc-commands.c:396 +#: src/irc/irc-commands.c:398 msgid "cannot join channel (banned from channel)" msgstr "impossible de rejoindre le canal (banni du canal)" -#: src/irc/irc-commands.c:398 +#: src/irc/irc-commands.c:400 msgid "cannot join channel (bad channel key)" msgstr "impossible de rejoindre le canal (mauvaise clé pour le canal)" -#: src/irc/irc-commands.c:400 +#: src/irc/irc-commands.c:402 msgid "bad channel mask" msgstr "mauvais masque de canal" -#: src/irc/irc-commands.c:402 +#: src/irc/irc-commands.c:404 msgid "channel doesn't support modes" msgstr "le canal ne supporte pas les modes" -#: src/irc/irc-commands.c:404 +#: src/irc/irc-commands.c:406 msgid "you're not an IRC operator" msgstr "vous n'êtres pas opérateur IRC" -#: src/irc/irc-commands.c:406 +#: src/irc/irc-commands.c:408 msgid "you're not channel operator" msgstr "vous n'êtes pas opérateur du canal" -#: src/irc/irc-commands.c:408 +#: src/irc/irc-commands.c:410 msgid "you can't kill a server!" msgstr "vous ne pouvez pas supprimer un serveur !" -#: src/irc/irc-commands.c:410 +#: src/irc/irc-commands.c:412 msgid "no O-lines for your host" msgstr "pas de O-lines pour votre host" -#: src/irc/irc-commands.c:412 +#: src/irc/irc-commands.c:414 msgid "unknown mode flag" msgstr "drapeau de mode inconnu" -#: src/irc/irc-commands.c:414 +#: src/irc/irc-commands.c:416 msgid "can't change mode for other users" msgstr "impossible de changer le mode pour les autres utilisateurs" -#: src/irc/irc-display.c:145 src/common/command.c:801 +#: src/irc/irc-display.c:151 src/common/command.c:801 msgid "Server: " msgstr "Serveur: " -#: src/irc/irc-display.c:150 +#: src/irc/irc-display.c:156 msgid "connected" msgstr "connecté" -#: src/irc/irc-display.c:150 +#: src/irc/irc-display.c:156 msgid "not connected" msgstr "non connecté" -#: src/irc/irc-display.c:155 src/irc/irc-display.c:161 +#: src/irc/irc-display.c:161 src/irc/irc-display.c:167 msgid "yes" msgstr "oui" -#: src/irc/irc-display.c:155 src/irc/irc-display.c:161 +#: src/irc/irc-display.c:161 src/irc/irc-display.c:167 msgid "no" msgstr "non" -#: src/irc/irc-display.c:157 +#: src/irc/irc-display.c:163 msgid " (temporary server, will not be saved)" msgstr " (serveur temporaire, ne sera pas sauvé)" -#: src/irc/irc-display.c:178 +#: src/irc/irc-display.c:184 msgid "(hidden)" msgstr "(caché)" @@ -1828,12 +1832,12 @@ msgstr "serveur" 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:493 +#: src/gui/gui-common.c:494 #, 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:536 +#: src/gui/gui-common.c:537 msgid "not enough memory!\n" msgstr "pas assez de mémoire !\n" @@ -2545,19 +2549,19 @@ msgstr "%sBienvenue dans " msgid "compiled on" msgstr "compilé le" -#: src/common/log.c:95 +#: src/common/log.c:118 msgid "Not enough memory to write log file for a buffer\n" msgstr "Pas assez de mémoire pour écrire un fichier log de tampon\n" -#: src/common/log.c:123 +#: src/common/log.c:146 msgid "Unable to write log file for a buffer\n" msgstr "Impossible d'écrire le fichier log pour un tampon\n" -#: src/common/log.c:127 +#: src/common/log.c:150 msgid "**** Beginning of log " msgstr "**** Début du log " -#: src/common/log.c:141 +#: src/common/log.c:164 msgid "**** End of log " msgstr "**** Fin du log " @@ -2970,286 +2974,290 @@ msgid "maximum number of user commands in history (0 = unlimited)" msgstr "" "nombre maximum de commandes utilisateur dans l'historique (0 = sans limite)" -#: src/common/weeconfig.c:440 src/common/weeconfig.c:441 +#: src/common/weeconfig.c:441 src/common/weeconfig.c:442 msgid "automatically log server messages" msgstr "enregistrer automatiquement les messages du serveur" -#: src/common/weeconfig.c:444 src/common/weeconfig.c:445 +#: src/common/weeconfig.c:445 src/common/weeconfig.c:446 msgid "automatically log channel chats" msgstr "enregistrer automatiquement les conversations des canaux" -#: src/common/weeconfig.c:448 src/common/weeconfig.c:449 +#: src/common/weeconfig.c:449 src/common/weeconfig.c:450 msgid "automatically log private chats" msgstr "enregistrer automatiquement les conversations privées" -#: src/common/weeconfig.c:452 +#: src/common/weeconfig.c:453 src/common/weeconfig.c:454 +msgid "log messages from plugins (scripts)" +msgstr "enregistrer les messages des plugins (scripts)" + +#: src/common/weeconfig.c:457 msgid "path for log files" msgstr "chemin pour les conversations sauvegardées" -#: src/common/weeconfig.c:453 +#: src/common/weeconfig.c:458 msgid "path for WeeChat log files" msgstr "chemin pour les conversations sauvegardées par WeeChat" -#: src/common/weeconfig.c:456 +#: src/common/weeconfig.c:461 msgid "timestamp for log" msgstr "horodatage pour les conversations sauvegardées" -#: src/common/weeconfig.c:457 +#: src/common/weeconfig.c:462 msgid "timestamp for log (see man strftime for date/time specifiers)" msgstr "" "horodatage pour les conversations sauvegardées (voir man strftime pour le " "format de date/heure)" -#: src/common/weeconfig.c:460 src/common/weeconfig.c:461 +#: src/common/weeconfig.c:465 src/common/weeconfig.c:466 msgid "hide password displayed by nickserv" msgstr "masquer le mot de passe affiché par nickserv" -#: src/common/weeconfig.c:479 +#: src/common/weeconfig.c:484 msgid "display message to all channels when away" msgstr "affiche un message sur tous les canaux pour l'absence" -#: src/common/weeconfig.c:480 +#: src/common/weeconfig.c:485 msgid "display message to all channels when (un)marking as away" msgstr "affiche un message sur tous les canaux pour l'absence/le retour" -#: src/common/weeconfig.c:483 src/common/weeconfig.c:484 +#: src/common/weeconfig.c:488 src/common/weeconfig.c:489 msgid "default message when away" msgstr "message par défaut pour l'absence" -#: src/common/weeconfig.c:487 src/common/weeconfig.c:488 +#: src/common/weeconfig.c:492 src/common/weeconfig.c:493 msgid "default part message (leaving channel)" msgstr "message par défaut pour le part (quitte un canal)" -#: src/common/weeconfig.c:491 +#: src/common/weeconfig.c:496 msgid "default quit message" msgstr "message de fin par défaut" -#: src/common/weeconfig.c:492 +#: src/common/weeconfig.c:497 msgid "" "default quit message ('%v' will be replaced by WeeChat version in string)" msgstr "" "message de fin par défaut ('%v' sera remplacé par la version de WeeChat dans " "la chaîne)" -#: src/common/weeconfig.c:495 +#: src/common/weeconfig.c:500 msgid "interval between two checks for away" msgstr "intervalle entre deux vérifications des absences" -#: src/common/weeconfig.c:496 +#: src/common/weeconfig.c:501 msgid "interval between two checks for away (in minutes, 0 = never check)" msgstr "" "intervalle entre deux vérifications des absences (en minutes, 0 = ne jemais " "vérifier)" -#: src/common/weeconfig.c:499 +#: src/common/weeconfig.c:504 msgid "interval between two checks for lag" msgstr "intervalle entre deux mesures de lag" -#: src/common/weeconfig.c:500 +#: src/common/weeconfig.c:505 msgid "interval between two checks for lag (in seconds)" msgstr "intervalle entre deux mesures de lag (en secondes)" -#: src/common/weeconfig.c:503 +#: src/common/weeconfig.c:508 msgid "minimum lag to show" msgstr "lag minimum à afficher" -#: src/common/weeconfig.c:504 +#: src/common/weeconfig.c:509 msgid "minimum lag to show (in seconds)" msgstr "lag minimum à afficher (en secondes)" -#: src/common/weeconfig.c:507 +#: src/common/weeconfig.c:512 msgid "disconnect after important lag" msgstr "déconnexion après un lag important" -#: src/common/weeconfig.c:508 +#: src/common/weeconfig.c:513 msgid "disconnect after important lag (in minutes, 0 = never disconnect)" msgstr "" "déconnexion après un lag important (en minutes, 0 = ne jamais se déconnecter)" -#: src/common/weeconfig.c:526 +#: src/common/weeconfig.c:531 msgid "automatically accept dcc files" msgstr "accepte automatiquement les fichiers dcc" -#: src/common/weeconfig.c:527 +#: src/common/weeconfig.c:532 msgid "automatically accept incoming dcc files" msgstr "accepte automatiquement les fichiers dcc entrants" -#: src/common/weeconfig.c:530 +#: src/common/weeconfig.c:535 msgid "automatically accept dcc chats" msgstr "accepte automatiquement les demandes de discussion dcc" -#: src/common/weeconfig.c:531 +#: src/common/weeconfig.c:536 msgid "automatically accept dcc chats (use carefully!)" msgstr "" "accepte automatiquement les demandes de discussion dcc (à utiliser avec " "précaution !)" -#: src/common/weeconfig.c:534 +#: src/common/weeconfig.c:539 msgid "timeout for dcc request" msgstr "délai d'attente pour les requêtes dcc" -#: src/common/weeconfig.c:535 +#: src/common/weeconfig.c:540 msgid "timeout for dcc request (in seconds)" msgstr "délai d'attente pour les requêtes dcc (en secondes)" -#: src/common/weeconfig.c:538 +#: src/common/weeconfig.c:543 msgid "block size for dcc packets" msgstr "taille de bloc pour les paquets dcc" -#: src/common/weeconfig.c:539 +#: src/common/weeconfig.c:544 msgid "block size for dcc packets in bytes (default: 1024)" msgstr "taille de bloc pour les paquets dcc en octets (défaut: 1024)" -#: src/common/weeconfig.c:542 +#: src/common/weeconfig.c:547 msgid "path for incoming files with dcc" msgstr "chemin les fichiers reçus par dcc" -#: src/common/weeconfig.c:543 +#: src/common/weeconfig.c:548 msgid "path for writing incoming files with dcc (default: user home)" msgstr "" "chemin pour écrire les fichiers reçus par dcc (par défaut: répertoire de " "l'utilisateur)" -#: src/common/weeconfig.c:546 +#: src/common/weeconfig.c:551 msgid "default path for sending files with dcc" msgstr "chemin par défaut pour envoyer les fichiers par dcc" -#: src/common/weeconfig.c:547 +#: src/common/weeconfig.c:552 msgid "" "path for reading files when sending thru dcc (when no path is specified)" msgstr "" "chemin pour lire les fichiers lorsqu'ils sont envoyés par dcc (quand aucun " "chemin n'est spécifié)" -#: src/common/weeconfig.c:550 +#: src/common/weeconfig.c:555 msgid "automatically rename dcc files if already exists" msgstr "renomme automatiquement les fichiers dcc s'ils existent déjà" -#: src/common/weeconfig.c:551 +#: src/common/weeconfig.c:556 msgid "rename incoming files if already exists (add '.1', '.2', ...)" msgstr "" "renommer les fichiers reçus s'ils existent déjà (ajoute '.1', '.2', ...)" -#: src/common/weeconfig.c:554 +#: src/common/weeconfig.c:559 msgid "automatically resume aborted transfers" msgstr "continuer automatiquement les transferts non terminés" -#: src/common/weeconfig.c:555 +#: src/common/weeconfig.c:560 msgid "" "automatically resume dcc transfer if connection with remote host is loosed" msgstr "" "continuer automatiquement les transferts dcc si la connexion avec la machine " "distante a été perdue" -#: src/common/weeconfig.c:569 +#: src/common/weeconfig.c:574 msgid "use proxy" msgstr "utiliser un proxy" -#: src/common/weeconfig.c:570 +#: src/common/weeconfig.c:575 msgid "use a proxy server to connect to irc server" msgstr "utiliser un proxy pour se connecter au serveur irc" -#: src/common/weeconfig.c:573 +#: src/common/weeconfig.c:578 msgid "proxy address" msgstr "adresse du proxy" -#: src/common/weeconfig.c:574 +#: src/common/weeconfig.c:579 msgid "proxy server address (IP or hostname)" msgstr "adresse du serveur proxy (IP ou nom)" -#: src/common/weeconfig.c:577 +#: src/common/weeconfig.c:582 msgid "port for proxy" msgstr "port pour le proxy" -#: src/common/weeconfig.c:578 +#: src/common/weeconfig.c:583 msgid "port for connecting to proxy server" msgstr "port pour se connecter au serveur proxy" -#: src/common/weeconfig.c:581 +#: src/common/weeconfig.c:586 msgid "proxy password" msgstr "mot de passe pour le proxy" -#: src/common/weeconfig.c:582 +#: src/common/weeconfig.c:587 msgid "password for proxy server" msgstr "mot de passe pour le serveur proxy" -#: src/common/weeconfig.c:593 +#: src/common/weeconfig.c:598 msgid "server name" msgstr "nom du serveur" -#: src/common/weeconfig.c:594 +#: src/common/weeconfig.c:599 msgid "name associated to IRC server (for display only)" msgstr "nom associé au serveur IRC (pour affichage seulement)" -#: src/common/weeconfig.c:597 +#: src/common/weeconfig.c:602 msgid "automatically connect to server" msgstr "connexion automatique au serveur" -#: src/common/weeconfig.c:598 +#: src/common/weeconfig.c:603 msgid "automatically connect to server when WeeChat is starting" msgstr "connexion automatique au serveur quand WeeChat démarre" -#: src/common/weeconfig.c:601 +#: src/common/weeconfig.c:606 msgid "automatically reconnect to server" msgstr "reconnexion automatique au serveur" -#: src/common/weeconfig.c:602 +#: src/common/weeconfig.c:607 msgid "automatically reconnect to server when disconnected" msgstr "reconnexion automatique au serveur après une déconnexion" -#: src/common/weeconfig.c:605 +#: src/common/weeconfig.c:610 msgid "delay before trying again to reconnect" msgstr "délai avant de tenter une reconnexion" -#: src/common/weeconfig.c:606 +#: src/common/weeconfig.c:611 msgid "delay (in deconds) before trying again to reconnect to server" msgstr "délai (en secondes) avant de tenter une reconnexion au serveur" -#: src/common/weeconfig.c:609 +#: src/common/weeconfig.c:614 msgid "server address or hostname" msgstr "adresse ou nom du serveur" -#: src/common/weeconfig.c:610 +#: src/common/weeconfig.c:615 msgid "IP address or hostname of IRC server" msgstr "adresse IP ou nom du serveur IRC" -#: src/common/weeconfig.c:613 +#: src/common/weeconfig.c:618 msgid "port for IRC server" msgstr "port pour le serveur IRC" -#: src/common/weeconfig.c:614 +#: src/common/weeconfig.c:619 msgid "port for connecting to server" msgstr "port pour se connecter au serveur" -#: src/common/weeconfig.c:617 +#: src/common/weeconfig.c:622 msgid "server password" msgstr "mot de passe pour le serveur" -#: src/common/weeconfig.c:618 +#: src/common/weeconfig.c:623 msgid "password for IRC server" msgstr "mot de passe pour le serveur IRC" -#: src/common/weeconfig.c:621 +#: src/common/weeconfig.c:626 msgid "nickname for server" msgstr "pseudo pour le serveur" -#: src/common/weeconfig.c:622 +#: src/common/weeconfig.c:627 msgid "nickname to use on IRC server" msgstr "pseudo à utiliser sur le serveur IRC" -#: src/common/weeconfig.c:625 +#: src/common/weeconfig.c:630 msgid "alternate nickname for server" msgstr "pseudo alternatif pour le serveur" -#: src/common/weeconfig.c:626 +#: src/common/weeconfig.c:631 msgid "alternate nickname to use on IRC server (if nickname is already used)" msgstr "pseudo alternatif pour le serveur IRC (si le pseudo est déjà utilisé)" -#: src/common/weeconfig.c:629 +#: src/common/weeconfig.c:634 msgid "2nd alternate nickname for server" msgstr "2nd pseudo alternatif pour le serveur" -#: src/common/weeconfig.c:630 +#: src/common/weeconfig.c:635 msgid "" "2nd alternate nickname to use on IRC server (if alternate nickname is " "already used)" @@ -3257,31 +3265,31 @@ msgstr "" "2nd pseudo alternatif pour le serveur IRC (si le pseudo alternatif est déjà " "utilisé)" -#: src/common/weeconfig.c:633 +#: src/common/weeconfig.c:638 msgid "user name for server" msgstr "nom d'utilisateur pour le serveur" -#: src/common/weeconfig.c:634 +#: src/common/weeconfig.c:639 msgid "user name to use on IRC server" msgstr "nom d'utilisateur pour le serveur IRC" -#: src/common/weeconfig.c:637 +#: src/common/weeconfig.c:642 msgid "real name for server" msgstr "nom réel pour le serveur" -#: src/common/weeconfig.c:638 +#: src/common/weeconfig.c:643 msgid "real name to use on IRC server" msgstr "nom réel pour le serveur IRC" -#: src/common/weeconfig.c:641 src/common/weeconfig.c:642 +#: src/common/weeconfig.c:646 src/common/weeconfig.c:647 msgid "first command to run when connected to server" msgstr "commande à exécuter en premier lorsque connecté au serveur" -#: src/common/weeconfig.c:645 +#: src/common/weeconfig.c:650 msgid "delay (in seconds) after command was executed" msgstr "délai (en secondes) après exécution de la commande" -#: src/common/weeconfig.c:646 +#: src/common/weeconfig.c:651 msgid "" "delay (in seconds) after command was executed (example: give some time for " "authentication)" @@ -3289,76 +3297,76 @@ msgstr "" "délai (en secondes) après exécution de la commande (exemple: donner du temps " "pour l'authentification)" -#: src/common/weeconfig.c:649 +#: src/common/weeconfig.c:654 msgid "list of channels to join when connected to server" msgstr "liste des canaux à rejoindre lorsque connecté au serveur" -#: src/common/weeconfig.c:650 +#: src/common/weeconfig.c:655 msgid "comma separated list of channels to join when connected to server" msgstr "" "liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au " "serveur" -#: src/common/weeconfig.c:653 src/common/weeconfig.c:654 +#: src/common/weeconfig.c:658 src/common/weeconfig.c:659 msgid "automatically rejoin channels when kicked" msgstr "rejoindre automatiquement les canaux quand mis dehors" -#: src/common/weeconfig.c:1002 +#: src/common/weeconfig.c:1007 #, c-format msgid "%s %s, line %d: new server, but previous was incomplete\n" msgstr "%s %s, ligne %d: nouveau serveur, mais le précédent était incomplet\n" -#: src/common/weeconfig.c:1011 +#: src/common/weeconfig.c:1016 #, c-format msgid "%s %s, line %d: server '%s' already exists\n" msgstr "%s %s, ligne %d: le serveur '%s' existe déjà\n" -#: src/common/weeconfig.c:1025 +#: src/common/weeconfig.c:1030 #, c-format msgid "%s %s, line %d: unable to create server\n" msgstr "%s %s, ligne %d: impossible de créer le serveur\n" -#: src/common/weeconfig.c:1064 +#: src/common/weeconfig.c:1069 #, c-format msgid "%s unable to assign default int with string (\"%s\")\n" msgstr "%s impossible d'assigner la valeur entière avec la chaîne (\"%s\")\n" -#: src/common/weeconfig.c:1075 +#: src/common/weeconfig.c:1080 #, c-format msgid "%s unable to assign default color (\"%s\")\n" msgstr "%s impossible d'assigner la couleur par défaut (\"%s\")\n" -#: src/common/weeconfig.c:1114 +#: src/common/weeconfig.c:1119 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "%s fichier de configuration \"%s\" non trouvé.\n" -#: src/common/weeconfig.c:1146 +#: src/common/weeconfig.c:1151 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"]\"\n" msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"]\"\n" -#: src/common/weeconfig.c:1163 +#: src/common/weeconfig.c:1168 #, c-format msgid "%s %s, line %d: unknown section identifier (\"%s\")\n" msgstr "%s %s, ligne %d: section inconnue (\"%s\")\n" -#: src/common/weeconfig.c:1181 +#: src/common/weeconfig.c:1186 #, c-format msgid "%s %s, line %d: invalid section for option, line is ignored\n" msgstr "%s %s, ligne %d: section invalide pour l'option, ligne ignorée\n" -#: src/common/weeconfig.c:1189 +#: src/common/weeconfig.c:1194 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"=\"\n" msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"=\"\n" -#: src/common/weeconfig.c:1223 +#: src/common/weeconfig.c:1228 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "%s %s, ligne %d: option \"%s\" invalide\n" -#: src/common/weeconfig.c:1234 +#: src/common/weeconfig.c:1239 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" @@ -3367,7 +3375,7 @@ msgstr "" "%s %s, ligne %d: valeur invalide pour l'option '%s'\n" "Attendu: valeur booléenne: 'off' ou 'on'\n" -#: src/common/weeconfig.c:1243 +#: src/common/weeconfig.c:1248 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3376,7 +3384,7 @@ msgstr "" "%s %s, ligne %d: valeur invalide pour l'option '%s'\n" "Attendu: entier compris entre %d et %d\n" -#: src/common/weeconfig.c:1254 +#: src/common/weeconfig.c:1259 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3385,26 +3393,26 @@ msgstr "" "%s %s, ligne %d: valeur invalide pour l'option '%s'\n" "Attendu: une de ces chaînes: " -#: src/common/weeconfig.c:1270 +#: src/common/weeconfig.c:1275 #, c-format msgid "%s %s, line %d: invalid color name for option '%s'\n" msgstr "%s %s, ligne %d: nom de couleur invalide pour l'option '%s'\n" -#: src/common/weeconfig.c:1330 src/common/weeconfig.c:1503 +#: src/common/weeconfig.c:1335 src/common/weeconfig.c:1508 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "%s impossible de créer le fichier \"%s\"\n" -#: src/common/weeconfig.c:1336 +#: src/common/weeconfig.c:1341 #, c-format msgid "%s: creating default config file...\n" msgstr "%s: création du fichier de configuration par défaut...\n" -#: src/common/weeconfig.c:1337 +#: src/common/weeconfig.c:1342 msgid "creating default config file\n" msgstr "création du fichier de configuration par défaut\n" -#: src/common/weeconfig.c:1340 src/common/weeconfig.c:1512 +#: src/common/weeconfig.c:1345 src/common/weeconfig.c:1517 #, c-format msgid "" "#\n" @@ -3413,6 +3421,6 @@ msgstr "" "#\n" "# %s: fichier de configuration, créé par %s v%s le %s#\n" -#: src/common/weeconfig.c:1509 +#: src/common/weeconfig.c:1514 msgid "saving config to disk\n" msgstr "sauvegarde de la configuration sur disque\n" diff --git a/po/weechat.pot b/po/weechat.pot index 48183b1da..eb03c6655 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-02-12 12:00+0100\n" +"POT-Creation-Date: 2005-02-12 21:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -20,7 +20,7 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "" -#: src/irc/irc-server.c:139 src/common/weeconfig.c:1451 +#: src/irc/irc-server.c:139 src/common/weeconfig.c:1456 msgid "Unable to get user's name" msgstr "" @@ -917,182 +917,186 @@ msgid "no origin" msgstr "" #: src/irc/irc-commands.c:340 -msgid "no recipient" +msgid "no services" msgstr "" #: src/irc/irc-commands.c:342 -msgid "no text to send" +msgid "no recipient" msgstr "" #: src/irc/irc-commands.c:344 -msgid "no toplevel" +msgid "no text to send" msgstr "" #: src/irc/irc-commands.c:346 -msgid "wilcard in toplevel domain" +msgid "no toplevel" msgstr "" #: src/irc/irc-commands.c:348 -msgid "unknown command" +msgid "wilcard in toplevel domain" msgstr "" #: src/irc/irc-commands.c:350 -msgid "MOTD is missing" +msgid "unknown command" msgstr "" #: src/irc/irc-commands.c:352 -msgid "no administrative info" +msgid "MOTD is missing" msgstr "" #: src/irc/irc-commands.c:354 -msgid "file error" +msgid "no administrative info" msgstr "" #: src/irc/irc-commands.c:356 -msgid "no nickname given" +msgid "file error" msgstr "" #: src/irc/irc-commands.c:358 -msgid "erroneus nickname" +msgid "no nickname given" msgstr "" #: src/irc/irc-commands.c:360 -msgid "nickname already in use" +msgid "erroneus nickname" msgstr "" #: src/irc/irc-commands.c:362 -msgid "nickname collision" +msgid "nickname already in use" msgstr "" #: src/irc/irc-commands.c:364 -msgid "user not in channel" +msgid "nickname collision" msgstr "" #: src/irc/irc-commands.c:366 -msgid "not on channel" +msgid "user not in channel" msgstr "" #: src/irc/irc-commands.c:368 -msgid "user already on channel" +msgid "not on channel" msgstr "" #: src/irc/irc-commands.c:370 -msgid "user not logged in" +msgid "user already on channel" msgstr "" #: src/irc/irc-commands.c:372 -msgid "summon has been disabled" +msgid "user not logged in" msgstr "" #: src/irc/irc-commands.c:374 -msgid "users has been disabled" +msgid "summon has been disabled" msgstr "" #: src/irc/irc-commands.c:376 -msgid "you are not registered" +msgid "users has been disabled" msgstr "" #: src/irc/irc-commands.c:378 -msgid "not enough parameters" +msgid "you are not registered" msgstr "" #: src/irc/irc-commands.c:380 -msgid "you may not register" +msgid "not enough parameters" msgstr "" #: src/irc/irc-commands.c:382 -msgid "your host isn't among the privileged" +msgid "you may not register" msgstr "" #: src/irc/irc-commands.c:384 -msgid "password incorrect" +msgid "your host isn't among the privileged" msgstr "" #: src/irc/irc-commands.c:386 -msgid "you are banned from this server" +msgid "password incorrect" msgstr "" #: src/irc/irc-commands.c:388 -msgid "channel key already set" +msgid "you are banned from this server" msgstr "" #: src/irc/irc-commands.c:390 -msgid "channel is already full" +msgid "channel key already set" msgstr "" #: src/irc/irc-commands.c:392 -msgid "unknown mode char to me" +msgid "channel is already full" msgstr "" #: src/irc/irc-commands.c:394 -msgid "cannot join channel (invite only)" +msgid "unknown mode char to me" msgstr "" #: src/irc/irc-commands.c:396 -msgid "cannot join channel (banned from channel)" +msgid "cannot join channel (invite only)" msgstr "" #: src/irc/irc-commands.c:398 -msgid "cannot join channel (bad channel key)" +msgid "cannot join channel (banned from channel)" msgstr "" #: src/irc/irc-commands.c:400 -msgid "bad channel mask" +msgid "cannot join channel (bad channel key)" msgstr "" #: src/irc/irc-commands.c:402 -msgid "channel doesn't support modes" +msgid "bad channel mask" msgstr "" #: src/irc/irc-commands.c:404 -msgid "you're not an IRC operator" +msgid "channel doesn't support modes" msgstr "" #: src/irc/irc-commands.c:406 -msgid "you're not channel operator" +msgid "you're not an IRC operator" msgstr "" #: src/irc/irc-commands.c:408 -msgid "you can't kill a server!" +msgid "you're not channel operator" msgstr "" #: src/irc/irc-commands.c:410 -msgid "no O-lines for your host" +msgid "you can't kill a server!" msgstr "" #: src/irc/irc-commands.c:412 -msgid "unknown mode flag" +msgid "no O-lines for your host" msgstr "" #: src/irc/irc-commands.c:414 +msgid "unknown mode flag" +msgstr "" + +#: src/irc/irc-commands.c:416 msgid "can't change mode for other users" msgstr "" -#: src/irc/irc-display.c:145 src/common/command.c:801 +#: src/irc/irc-display.c:151 src/common/command.c:801 msgid "Server: " msgstr "" -#: src/irc/irc-display.c:150 +#: src/irc/irc-display.c:156 msgid "connected" msgstr "" -#: src/irc/irc-display.c:150 +#: src/irc/irc-display.c:156 msgid "not connected" msgstr "" -#: src/irc/irc-display.c:155 src/irc/irc-display.c:161 +#: src/irc/irc-display.c:161 src/irc/irc-display.c:167 msgid "yes" msgstr "" -#: src/irc/irc-display.c:155 src/irc/irc-display.c:161 +#: src/irc/irc-display.c:161 src/irc/irc-display.c:167 msgid "no" msgstr "" -#: src/irc/irc-display.c:157 +#: src/irc/irc-display.c:163 msgid " (temporary server, will not be saved)" msgstr "" -#: src/irc/irc-display.c:178 +#: src/irc/irc-display.c:184 msgid "(hidden)" msgstr "" @@ -1716,12 +1720,12 @@ msgstr "" msgid "%s not enough memory for infobar message\n" msgstr "" -#: src/gui/gui-common.c:493 +#: src/gui/gui-common.c:494 #, c-format msgid "%s not enough memory for new line!\n" msgstr "" -#: src/gui/gui-common.c:536 +#: src/gui/gui-common.c:537 msgid "not enough memory!\n" msgstr "" @@ -2376,19 +2380,19 @@ msgstr "" msgid "compiled on" msgstr "" -#: src/common/log.c:95 +#: src/common/log.c:118 msgid "Not enough memory to write log file for a buffer\n" msgstr "" -#: src/common/log.c:123 +#: src/common/log.c:146 msgid "Unable to write log file for a buffer\n" msgstr "" -#: src/common/log.c:127 +#: src/common/log.c:150 msgid "**** Beginning of log " msgstr "" -#: src/common/log.c:141 +#: src/common/log.c:164 msgid "**** End of log " msgstr "" @@ -2774,419 +2778,423 @@ msgstr "" msgid "maximum number of user commands in history (0 = unlimited)" msgstr "" -#: src/common/weeconfig.c:440 src/common/weeconfig.c:441 +#: src/common/weeconfig.c:441 src/common/weeconfig.c:442 msgid "automatically log server messages" msgstr "" -#: src/common/weeconfig.c:444 src/common/weeconfig.c:445 +#: src/common/weeconfig.c:445 src/common/weeconfig.c:446 msgid "automatically log channel chats" msgstr "" -#: src/common/weeconfig.c:448 src/common/weeconfig.c:449 +#: src/common/weeconfig.c:449 src/common/weeconfig.c:450 msgid "automatically log private chats" msgstr "" -#: src/common/weeconfig.c:452 +#: src/common/weeconfig.c:453 src/common/weeconfig.c:454 +msgid "log messages from plugins (scripts)" +msgstr "" + +#: src/common/weeconfig.c:457 msgid "path for log files" msgstr "" -#: src/common/weeconfig.c:453 +#: src/common/weeconfig.c:458 msgid "path for WeeChat log files" msgstr "" -#: src/common/weeconfig.c:456 +#: src/common/weeconfig.c:461 msgid "timestamp for log" msgstr "" -#: src/common/weeconfig.c:457 +#: src/common/weeconfig.c:462 msgid "timestamp for log (see man strftime for date/time specifiers)" msgstr "" -#: src/common/weeconfig.c:460 src/common/weeconfig.c:461 +#: src/common/weeconfig.c:465 src/common/weeconfig.c:466 msgid "hide password displayed by nickserv" msgstr "" -#: src/common/weeconfig.c:479 +#: src/common/weeconfig.c:484 msgid "display message to all channels when away" msgstr "" -#: src/common/weeconfig.c:480 +#: src/common/weeconfig.c:485 msgid "display message to all channels when (un)marking as away" msgstr "" -#: src/common/weeconfig.c:483 src/common/weeconfig.c:484 +#: src/common/weeconfig.c:488 src/common/weeconfig.c:489 msgid "default message when away" msgstr "" -#: src/common/weeconfig.c:487 src/common/weeconfig.c:488 +#: src/common/weeconfig.c:492 src/common/weeconfig.c:493 msgid "default part message (leaving channel)" msgstr "" -#: src/common/weeconfig.c:491 +#: src/common/weeconfig.c:496 msgid "default quit message" msgstr "" -#: src/common/weeconfig.c:492 +#: src/common/weeconfig.c:497 msgid "" "default quit message ('%v' will be replaced by WeeChat version in string)" msgstr "" -#: src/common/weeconfig.c:495 +#: src/common/weeconfig.c:500 msgid "interval between two checks for away" msgstr "" -#: src/common/weeconfig.c:496 +#: src/common/weeconfig.c:501 msgid "interval between two checks for away (in minutes, 0 = never check)" msgstr "" -#: src/common/weeconfig.c:499 +#: src/common/weeconfig.c:504 msgid "interval between two checks for lag" msgstr "" -#: src/common/weeconfig.c:500 +#: src/common/weeconfig.c:505 msgid "interval between two checks for lag (in seconds)" msgstr "" -#: src/common/weeconfig.c:503 +#: src/common/weeconfig.c:508 msgid "minimum lag to show" msgstr "" -#: src/common/weeconfig.c:504 +#: src/common/weeconfig.c:509 msgid "minimum lag to show (in seconds)" msgstr "" -#: src/common/weeconfig.c:507 +#: src/common/weeconfig.c:512 msgid "disconnect after important lag" msgstr "" -#: src/common/weeconfig.c:508 +#: src/common/weeconfig.c:513 msgid "disconnect after important lag (in minutes, 0 = never disconnect)" msgstr "" -#: src/common/weeconfig.c:526 +#: src/common/weeconfig.c:531 msgid "automatically accept dcc files" msgstr "" -#: src/common/weeconfig.c:527 +#: src/common/weeconfig.c:532 msgid "automatically accept incoming dcc files" msgstr "" -#: src/common/weeconfig.c:530 +#: src/common/weeconfig.c:535 msgid "automatically accept dcc chats" msgstr "" -#: src/common/weeconfig.c:531 +#: src/common/weeconfig.c:536 msgid "automatically accept dcc chats (use carefully!)" msgstr "" -#: src/common/weeconfig.c:534 +#: src/common/weeconfig.c:539 msgid "timeout for dcc request" msgstr "" -#: src/common/weeconfig.c:535 +#: src/common/weeconfig.c:540 msgid "timeout for dcc request (in seconds)" msgstr "" -#: src/common/weeconfig.c:538 +#: src/common/weeconfig.c:543 msgid "block size for dcc packets" msgstr "" -#: src/common/weeconfig.c:539 +#: src/common/weeconfig.c:544 msgid "block size for dcc packets in bytes (default: 1024)" msgstr "" -#: src/common/weeconfig.c:542 +#: src/common/weeconfig.c:547 msgid "path for incoming files with dcc" msgstr "" -#: src/common/weeconfig.c:543 +#: src/common/weeconfig.c:548 msgid "path for writing incoming files with dcc (default: user home)" msgstr "" -#: src/common/weeconfig.c:546 +#: src/common/weeconfig.c:551 msgid "default path for sending files with dcc" msgstr "" -#: src/common/weeconfig.c:547 +#: src/common/weeconfig.c:552 msgid "" "path for reading files when sending thru dcc (when no path is specified)" msgstr "" -#: src/common/weeconfig.c:550 +#: src/common/weeconfig.c:555 msgid "automatically rename dcc files if already exists" msgstr "" -#: src/common/weeconfig.c:551 +#: src/common/weeconfig.c:556 msgid "rename incoming files if already exists (add '.1', '.2', ...)" msgstr "" -#: src/common/weeconfig.c:554 +#: src/common/weeconfig.c:559 msgid "automatically resume aborted transfers" msgstr "" -#: src/common/weeconfig.c:555 +#: src/common/weeconfig.c:560 msgid "" "automatically resume dcc transfer if connection with remote host is loosed" msgstr "" -#: src/common/weeconfig.c:569 +#: src/common/weeconfig.c:574 msgid "use proxy" msgstr "" -#: src/common/weeconfig.c:570 +#: src/common/weeconfig.c:575 msgid "use a proxy server to connect to irc server" msgstr "" -#: src/common/weeconfig.c:573 +#: src/common/weeconfig.c:578 msgid "proxy address" msgstr "" -#: src/common/weeconfig.c:574 +#: src/common/weeconfig.c:579 msgid "proxy server address (IP or hostname)" msgstr "" -#: src/common/weeconfig.c:577 +#: src/common/weeconfig.c:582 msgid "port for proxy" msgstr "" -#: src/common/weeconfig.c:578 +#: src/common/weeconfig.c:583 msgid "port for connecting to proxy server" msgstr "" -#: src/common/weeconfig.c:581 +#: src/common/weeconfig.c:586 msgid "proxy password" msgstr "" -#: src/common/weeconfig.c:582 +#: src/common/weeconfig.c:587 msgid "password for proxy server" msgstr "" -#: src/common/weeconfig.c:593 +#: src/common/weeconfig.c:598 msgid "server name" msgstr "" -#: src/common/weeconfig.c:594 +#: src/common/weeconfig.c:599 msgid "name associated to IRC server (for display only)" msgstr "" -#: src/common/weeconfig.c:597 +#: src/common/weeconfig.c:602 msgid "automatically connect to server" msgstr "" -#: src/common/weeconfig.c:598 +#: src/common/weeconfig.c:603 msgid "automatically connect to server when WeeChat is starting" msgstr "" -#: src/common/weeconfig.c:601 +#: src/common/weeconfig.c:606 msgid "automatically reconnect to server" msgstr "" -#: src/common/weeconfig.c:602 +#: src/common/weeconfig.c:607 msgid "automatically reconnect to server when disconnected" msgstr "" -#: src/common/weeconfig.c:605 +#: src/common/weeconfig.c:610 msgid "delay before trying again to reconnect" msgstr "" -#: src/common/weeconfig.c:606 +#: src/common/weeconfig.c:611 msgid "delay (in deconds) before trying again to reconnect to server" msgstr "" -#: src/common/weeconfig.c:609 +#: src/common/weeconfig.c:614 msgid "server address or hostname" msgstr "" -#: src/common/weeconfig.c:610 +#: src/common/weeconfig.c:615 msgid "IP address or hostname of IRC server" msgstr "" -#: src/common/weeconfig.c:613 +#: src/common/weeconfig.c:618 msgid "port for IRC server" msgstr "" -#: src/common/weeconfig.c:614 +#: src/common/weeconfig.c:619 msgid "port for connecting to server" msgstr "" -#: src/common/weeconfig.c:617 +#: src/common/weeconfig.c:622 msgid "server password" msgstr "" -#: src/common/weeconfig.c:618 +#: src/common/weeconfig.c:623 msgid "password for IRC server" msgstr "" -#: src/common/weeconfig.c:621 +#: src/common/weeconfig.c:626 msgid "nickname for server" msgstr "" -#: src/common/weeconfig.c:622 +#: src/common/weeconfig.c:627 msgid "nickname to use on IRC server" msgstr "" -#: src/common/weeconfig.c:625 +#: src/common/weeconfig.c:630 msgid "alternate nickname for server" msgstr "" -#: src/common/weeconfig.c:626 +#: src/common/weeconfig.c:631 msgid "alternate nickname to use on IRC server (if nickname is already used)" msgstr "" -#: src/common/weeconfig.c:629 +#: src/common/weeconfig.c:634 msgid "2nd alternate nickname for server" msgstr "" -#: src/common/weeconfig.c:630 +#: src/common/weeconfig.c:635 msgid "" "2nd alternate nickname to use on IRC server (if alternate nickname is " "already used)" msgstr "" -#: src/common/weeconfig.c:633 +#: src/common/weeconfig.c:638 msgid "user name for server" msgstr "" -#: src/common/weeconfig.c:634 +#: src/common/weeconfig.c:639 msgid "user name to use on IRC server" msgstr "" -#: src/common/weeconfig.c:637 +#: src/common/weeconfig.c:642 msgid "real name for server" msgstr "" -#: src/common/weeconfig.c:638 +#: src/common/weeconfig.c:643 msgid "real name to use on IRC server" msgstr "" -#: src/common/weeconfig.c:641 src/common/weeconfig.c:642 +#: src/common/weeconfig.c:646 src/common/weeconfig.c:647 msgid "first command to run when connected to server" msgstr "" -#: src/common/weeconfig.c:645 +#: src/common/weeconfig.c:650 msgid "delay (in seconds) after command was executed" msgstr "" -#: src/common/weeconfig.c:646 +#: src/common/weeconfig.c:651 msgid "" "delay (in seconds) after command was executed (example: give some time for " "authentication)" msgstr "" -#: src/common/weeconfig.c:649 +#: src/common/weeconfig.c:654 msgid "list of channels to join when connected to server" msgstr "" -#: src/common/weeconfig.c:650 +#: src/common/weeconfig.c:655 msgid "comma separated list of channels to join when connected to server" msgstr "" -#: src/common/weeconfig.c:653 src/common/weeconfig.c:654 +#: src/common/weeconfig.c:658 src/common/weeconfig.c:659 msgid "automatically rejoin channels when kicked" msgstr "" -#: src/common/weeconfig.c:1002 +#: src/common/weeconfig.c:1007 #, c-format msgid "%s %s, line %d: new server, but previous was incomplete\n" msgstr "" -#: src/common/weeconfig.c:1011 +#: src/common/weeconfig.c:1016 #, c-format msgid "%s %s, line %d: server '%s' already exists\n" msgstr "" -#: src/common/weeconfig.c:1025 +#: src/common/weeconfig.c:1030 #, c-format msgid "%s %s, line %d: unable to create server\n" msgstr "" -#: src/common/weeconfig.c:1064 +#: src/common/weeconfig.c:1069 #, c-format msgid "%s unable to assign default int with string (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1075 +#: src/common/weeconfig.c:1080 #, c-format msgid "%s unable to assign default color (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1114 +#: src/common/weeconfig.c:1119 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "" -#: src/common/weeconfig.c:1146 +#: src/common/weeconfig.c:1151 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"]\"\n" msgstr "" -#: src/common/weeconfig.c:1163 +#: src/common/weeconfig.c:1168 #, c-format msgid "%s %s, line %d: unknown section identifier (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1181 +#: src/common/weeconfig.c:1186 #, c-format msgid "%s %s, line %d: invalid section for option, line is ignored\n" msgstr "" -#: src/common/weeconfig.c:1189 +#: src/common/weeconfig.c:1194 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"=\"\n" msgstr "" -#: src/common/weeconfig.c:1223 +#: src/common/weeconfig.c:1228 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "" -#: src/common/weeconfig.c:1234 +#: src/common/weeconfig.c:1239 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" "Expected: boolean value: 'off' or 'on'\n" msgstr "" -#: src/common/weeconfig.c:1243 +#: src/common/weeconfig.c:1248 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" "Expected: integer between %d and %d\n" msgstr "" -#: src/common/weeconfig.c:1254 +#: src/common/weeconfig.c:1259 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" "Expected: one of these strings: " msgstr "" -#: src/common/weeconfig.c:1270 +#: src/common/weeconfig.c:1275 #, c-format msgid "%s %s, line %d: invalid color name for option '%s'\n" msgstr "" -#: src/common/weeconfig.c:1330 src/common/weeconfig.c:1503 +#: src/common/weeconfig.c:1335 src/common/weeconfig.c:1508 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "" -#: src/common/weeconfig.c:1336 +#: src/common/weeconfig.c:1341 #, c-format msgid "%s: creating default config file...\n" msgstr "" -#: src/common/weeconfig.c:1337 +#: src/common/weeconfig.c:1342 msgid "creating default config file\n" msgstr "" -#: src/common/weeconfig.c:1340 src/common/weeconfig.c:1512 +#: src/common/weeconfig.c:1345 src/common/weeconfig.c:1517 #, c-format msgid "" "#\n" "# %s configuration file, created by %s v%s on %s#\n" msgstr "" -#: src/common/weeconfig.c:1509 +#: src/common/weeconfig.c:1514 msgid "saving config to disk\n" msgstr "" diff --git a/src/common/command.c b/src/common/command.c index e6cf37ad5..d38395bc3 100644 --- a/src/common/command.c +++ b/src/common/command.c @@ -704,8 +704,8 @@ user_command (t_irc_server *server, char *command) else { irc_display_prefix ((server) ? server->buffer : NULL, PREFIX_ERROR); - gui_printf ((server) ? server->buffer : NULL, - _("This window is not a channel!\n")); + gui_printf_nolog ((server) ? server->buffer : NULL, + _("This window is not a channel!\n")); } } } diff --git a/src/common/log.c b/src/common/log.c index cdaaba286..06f62f7cd 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -31,6 +31,7 @@ #include "weechat.h" #include "log.h" #include "weeconfig.h" +#include "../gui/gui.h" /* @@ -72,6 +73,28 @@ log_write (t_gui_buffer *buffer, char *message) } /* + * log_write_line: writes a WeeChat line to log file + */ + +void +log_write_line (t_gui_buffer *buffer, t_gui_line *line) +{ + t_gui_message *ptr_msg; + + if (buffer->log_file) + { + log_write_date (buffer); + for (ptr_msg = line->messages; ptr_msg; ptr_msg = ptr_msg->next_message) + { + if (ptr_msg->type != MSG_TYPE_TIME) + fprintf (buffer->log_file, "%s", ptr_msg->message); + } + fprintf (buffer->log_file, "\n"); + fflush (buffer->log_file); + } +} + +/* * log_start: starts a log */ diff --git a/src/common/log.h b/src/common/log.h index 74d67a63d..7119d50af 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -22,9 +22,11 @@ #define __WEECHAT_LOG_H 1 #include "../irc/irc.h" +#include "../gui/gui.h" extern void log_write_date (t_gui_buffer *); extern void log_write (t_gui_buffer *, char *); +extern void log_write_line (t_gui_buffer *, t_gui_line *); extern void log_start (t_gui_buffer *); extern void log_end (t_gui_buffer *); diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c index 91b96fc2c..04e678f40 100644 --- a/src/common/weeconfig.c +++ b/src/common/weeconfig.c @@ -432,6 +432,7 @@ t_config_option weechat_options_history[] = int cfg_log_auto_server; int cfg_log_auto_channel; int cfg_log_auto_private; +int cfg_log_plugin_msg; char *cfg_log_path; char *cfg_log_timestamp; int cfg_log_hide_nickserv_pwd; @@ -449,6 +450,10 @@ t_config_option weechat_options_log[] = N_("automatically log private chats"), OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE, NULL, NULL, &cfg_log_auto_private, NULL, NULL }, + { "log_plugin_msg", N_("log messages from plugins (scripts)"), + N_("log messages from plugins (scripts)"), + OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE, + NULL, NULL, &cfg_log_plugin_msg, NULL, NULL }, { "log_path", N_("path for log files"), N_("path for WeeChat log files"), OPTION_TYPE_STRING, 0, 0, 0, diff --git a/src/common/weeconfig.h b/src/common/weeconfig.h index b231be902..920228a48 100644 --- a/src/common/weeconfig.h +++ b/src/common/weeconfig.h @@ -148,6 +148,7 @@ extern int cfg_history_max_commands; extern int cfg_log_auto_server; extern int cfg_log_auto_channel; extern int cfg_log_auto_private; +extern int cfg_log_plugin_msg; extern char *cfg_log_path; extern char *cfg_log_timestamp; extern int cfg_log_hide_nickserv_pwd; diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c index 29a145d30..1fa32908e 100644 --- a/src/gui/curses/gui-display.c +++ b/src/gui/curses/gui-display.c @@ -2222,6 +2222,8 @@ gui_add_message (t_gui_buffer *buffer, int type, int color, char *message) buffer->last_line->line_with_highlight = 1; if ((type & MSG_TYPE_TIME) || (type & MSG_TYPE_NICK)) buffer->last_line->length_align += length; + if (type & MSG_TYPE_NOLOG) + buffer->last_line->log_write = 0; if (pos) { pos[0] = '\n'; @@ -2247,6 +2249,8 @@ gui_add_message (t_gui_buffer *buffer, int type, int color, char *message) } } } + if (buffer->line_complete && buffer->log_file && buffer->last_line->log_write) + log_write_line (buffer, buffer->last_line); } /* @@ -2271,6 +2275,7 @@ gui_printf_color_type (t_gui_buffer *buffer, int type, int color, char *message, if (buffer == NULL) { + type |= MSG_TYPE_NOLOG; if (SERVER(gui_current_window->buffer)) buffer = SERVER(gui_current_window->buffer)->buffer; else @@ -2342,12 +2347,8 @@ gui_printf_color_type (t_gui_buffer *buffer, int type, int color, char *message, snprintf (timestamp, 16, "%02d", date_tmp->tm_sec); gui_add_message (buffer, MSG_TYPE_TIME, COLOR_WIN_CHAT_TIME, timestamp); gui_add_message (buffer, MSG_TYPE_TIME, COLOR_WIN_CHAT_DARK, "] "); - if (buffer->log_file) - log_write_date (buffer); } gui_add_message (buffer, type, color, pos + 1); - if (buffer->log_file) - log_write (buffer, pos + 1); pos = strchr (pos + 1, '\n'); if (pos && !pos[1]) pos = NULL; diff --git a/src/gui/gui-common.c b/src/gui/gui-common.c index 1f34dae7d..28c94e44c 100644 --- a/src/gui/gui-common.c +++ b/src/gui/gui-common.c @@ -475,6 +475,7 @@ gui_new_line (t_gui_buffer *buffer) { new_line->length = 0; new_line->length_align = 0; + new_line->log_write = 1; new_line->line_with_message = 0; new_line->line_with_highlight = 0; new_line->messages = NULL; diff --git a/src/gui/gui.h b/src/gui/gui.h index 1056ce1f6..069e9346a 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -80,6 +80,7 @@ #define MSG_TYPE_INFO 4 #define MSG_TYPE_MSG 8 #define MSG_TYPE_HIGHLIGHT 16 +#define MSG_TYPE_NOLOG 32 #define gui_printf_color(buffer, color, fmt, argz...) \ gui_printf_color_type(buffer, MSG_TYPE_INFO, color, fmt, ##argz) @@ -87,6 +88,9 @@ #define gui_printf(buffer, fmt, argz...) \ gui_printf_color_type(buffer, MSG_TYPE_INFO, -1, fmt, ##argz) +#define gui_printf_nolog(buffer, fmt, argz...) \ + gui_printf_color_type(buffer, MSG_TYPE_INFO | MSG_TYPE_NOLOG, -1, fmt, ##argz) + typedef struct t_gui_message t_gui_message; struct t_gui_message @@ -104,6 +108,7 @@ struct t_gui_line { int length; /* length of the line (in char) */ int length_align; /* alignment length (time or time/nick) */ + int log_write; /* = 1 if line will be written to log */ 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 */ diff --git a/src/irc/irc-commands.c b/src/irc/irc-commands.c index 1e1fc8f97..1cbff48bb 100644 --- a/src/irc/irc-commands.c +++ b/src/irc/irc-commands.c @@ -337,6 +337,8 @@ t_irc_command irc_commands[] = "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error }, { "409", N_("no origin"), "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error }, + { "410", N_("no services"), + "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error }, { "411", N_("no recipient"), "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error }, { "412", N_("no text to send"), diff --git a/src/irc/irc-display.c b/src/irc/irc-display.c index 78378198c..312d62fbe 100644 --- a/src/irc/irc-display.c +++ b/src/irc/irc-display.c @@ -43,11 +43,17 @@ void irc_display_prefix (t_gui_buffer *buffer, char *prefix) { + int type; + + type = MSG_TYPE_INFO; + if (!cfg_log_plugin_msg && (prefix == PREFIX_PLUGIN)) + type |= MSG_TYPE_NOLOG; + if (prefix[0] == prefix[2]) { - gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%c", prefix[0]); - gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX2, "%c", prefix[1]); - gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%c ", prefix[2]); + gui_printf_color_type (buffer, type, COLOR_WIN_CHAT_PREFIX1, "%c", prefix[0]); + gui_printf_color_type (buffer, type, COLOR_WIN_CHAT_PREFIX2, "%c", prefix[1]); + gui_printf_color_type (buffer, type, COLOR_WIN_CHAT_PREFIX1, "%c ", prefix[2]); } else gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%s ", prefix); diff --git a/weechat/ChangeLog b/weechat/ChangeLog index cdb0f6511..199e293df 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -4,6 +4,10 @@ WeeChat - Wee Enhanced Environment for Chat ChangeLog - 2005-02-12 +Version 0.1.1 (under dev!): + * on server buffer, only server messages are logged + * plugins messages are logged with new config option (log_plugin_msg) + Version 0.1.0 (2005-02-12): * improved /window command: now split and merge are ok * away nicks are now displayed with another color (new option: "irc_away_check") diff --git a/weechat/po/fr.po b/weechat/po/fr.po index 957e30418..bb15ab6b0 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.1-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-02-12 12:00+0100\n" +"POT-Creation-Date: 2005-02-12 21:42+0100\n" "PO-Revision-Date: 2005-02-12 12:00+0100\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -20,7 +20,7 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "%s ompossible d'allouer un nouveau pseudo\n" -#: src/irc/irc-server.c:139 src/common/weeconfig.c:1451 +#: src/irc/irc-server.c:139 src/common/weeconfig.c:1456 msgid "Unable to get user's name" msgstr "Impossible de déterminer le nom d'utilisateur" @@ -1011,182 +1011,186 @@ msgid "no origin" msgstr "pas d'origine" #: src/irc/irc-commands.c:340 +msgid "no services" +msgstr "pas de service" + +#: src/irc/irc-commands.c:342 msgid "no recipient" msgstr "pas de destinataire" -#: src/irc/irc-commands.c:342 +#: src/irc/irc-commands.c:344 msgid "no text to send" msgstr "pas de texte à envoyer" -#: src/irc/irc-commands.c:344 +#: src/irc/irc-commands.c:346 msgid "no toplevel" msgstr "pas de niveau supérieur" -#: src/irc/irc-commands.c:346 +#: src/irc/irc-commands.c:348 msgid "wilcard in toplevel domain" msgstr "caractère joker dans le domaine de niveau supérieur" -#: src/irc/irc-commands.c:348 +#: src/irc/irc-commands.c:350 msgid "unknown command" msgstr "commande inconnue" -#: src/irc/irc-commands.c:350 +#: src/irc/irc-commands.c:352 msgid "MOTD is missing" msgstr "MOTD est manquant" -#: src/irc/irc-commands.c:352 +#: src/irc/irc-commands.c:354 msgid "no administrative info" msgstr "pas d'information administrative" -#: src/irc/irc-commands.c:354 +#: src/irc/irc-commands.c:356 msgid "file error" msgstr "erreur de fichier" -#: src/irc/irc-commands.c:356 +#: src/irc/irc-commands.c:358 msgid "no nickname given" msgstr "pas d'utilisateur donné" -#: src/irc/irc-commands.c:358 +#: src/irc/irc-commands.c:360 msgid "erroneus nickname" msgstr "nom d'utilisateur erroné" -#: src/irc/irc-commands.c:360 +#: src/irc/irc-commands.c:362 msgid "nickname already in use" msgstr "nom d'utilisateur déjà en cours d'utilisation" -#: src/irc/irc-commands.c:362 +#: src/irc/irc-commands.c:364 msgid "nickname collision" msgstr "collision sur le nom d'utilisateur" -#: src/irc/irc-commands.c:364 +#: src/irc/irc-commands.c:366 msgid "user not in channel" msgstr "utilisateur non présent dans le canal" -#: src/irc/irc-commands.c:366 +#: src/irc/irc-commands.c:368 msgid "not on channel" msgstr "non présent sur le canal" -#: src/irc/irc-commands.c:368 +#: src/irc/irc-commands.c:370 msgid "user already on channel" msgstr "utilisateur déjà sur le canal" -#: src/irc/irc-commands.c:370 +#: src/irc/irc-commands.c:372 msgid "user not logged in" msgstr "utilisateur non enregistré" -#: src/irc/irc-commands.c:372 +#: src/irc/irc-commands.c:374 msgid "summon has been disabled" msgstr "summon a été désactivé" -#: src/irc/irc-commands.c:374 +#: src/irc/irc-commands.c:376 msgid "users has been disabled" msgstr "users a été désactivé" -#: src/irc/irc-commands.c:376 +#: src/irc/irc-commands.c:378 msgid "you are not registered" msgstr "vous n'êtes pas enregistré" -#: src/irc/irc-commands.c:378 +#: src/irc/irc-commands.c:380 msgid "not enough parameters" msgstr "pas assez de paramètres" -#: src/irc/irc-commands.c:380 +#: src/irc/irc-commands.c:382 msgid "you may not register" msgstr "vous ne pouvez pas vous enregistrer" -#: src/irc/irc-commands.c:382 +#: src/irc/irc-commands.c:384 msgid "your host isn't among the privileged" msgstr "votre nom de machine n'est pas parmi les privilégiés" -#: src/irc/irc-commands.c:384 +#: src/irc/irc-commands.c:386 msgid "password incorrect" msgstr "mot de passe incorrect" -#: src/irc/irc-commands.c:386 +#: src/irc/irc-commands.c:388 msgid "you are banned from this server" msgstr "vous êtes banni de ce serveur" -#: src/irc/irc-commands.c:388 +#: src/irc/irc-commands.c:390 msgid "channel key already set" msgstr "clé du canal déjà définie" -#: src/irc/irc-commands.c:390 +#: src/irc/irc-commands.c:392 msgid "channel is already full" msgstr "le canal est déjà plein" -#: src/irc/irc-commands.c:392 +#: src/irc/irc-commands.c:394 msgid "unknown mode char to me" msgstr "caractère de mode inconnu pour moi" -#: src/irc/irc-commands.c:394 +#: src/irc/irc-commands.c:396 msgid "cannot join channel (invite only)" msgstr "impossible de rejoindre le canal (invités seulement)" -#: src/irc/irc-commands.c:396 +#: src/irc/irc-commands.c:398 msgid "cannot join channel (banned from channel)" msgstr "impossible de rejoindre le canal (banni du canal)" -#: src/irc/irc-commands.c:398 +#: src/irc/irc-commands.c:400 msgid "cannot join channel (bad channel key)" msgstr "impossible de rejoindre le canal (mauvaise clé pour le canal)" -#: src/irc/irc-commands.c:400 +#: src/irc/irc-commands.c:402 msgid "bad channel mask" msgstr "mauvais masque de canal" -#: src/irc/irc-commands.c:402 +#: src/irc/irc-commands.c:404 msgid "channel doesn't support modes" msgstr "le canal ne supporte pas les modes" -#: src/irc/irc-commands.c:404 +#: src/irc/irc-commands.c:406 msgid "you're not an IRC operator" msgstr "vous n'êtres pas opérateur IRC" -#: src/irc/irc-commands.c:406 +#: src/irc/irc-commands.c:408 msgid "you're not channel operator" msgstr "vous n'êtes pas opérateur du canal" -#: src/irc/irc-commands.c:408 +#: src/irc/irc-commands.c:410 msgid "you can't kill a server!" msgstr "vous ne pouvez pas supprimer un serveur !" -#: src/irc/irc-commands.c:410 +#: src/irc/irc-commands.c:412 msgid "no O-lines for your host" msgstr "pas de O-lines pour votre host" -#: src/irc/irc-commands.c:412 +#: src/irc/irc-commands.c:414 msgid "unknown mode flag" msgstr "drapeau de mode inconnu" -#: src/irc/irc-commands.c:414 +#: src/irc/irc-commands.c:416 msgid "can't change mode for other users" msgstr "impossible de changer le mode pour les autres utilisateurs" -#: src/irc/irc-display.c:145 src/common/command.c:801 +#: src/irc/irc-display.c:151 src/common/command.c:801 msgid "Server: " msgstr "Serveur: " -#: src/irc/irc-display.c:150 +#: src/irc/irc-display.c:156 msgid "connected" msgstr "connecté" -#: src/irc/irc-display.c:150 +#: src/irc/irc-display.c:156 msgid "not connected" msgstr "non connecté" -#: src/irc/irc-display.c:155 src/irc/irc-display.c:161 +#: src/irc/irc-display.c:161 src/irc/irc-display.c:167 msgid "yes" msgstr "oui" -#: src/irc/irc-display.c:155 src/irc/irc-display.c:161 +#: src/irc/irc-display.c:161 src/irc/irc-display.c:167 msgid "no" msgstr "non" -#: src/irc/irc-display.c:157 +#: src/irc/irc-display.c:163 msgid " (temporary server, will not be saved)" msgstr " (serveur temporaire, ne sera pas sauvé)" -#: src/irc/irc-display.c:178 +#: src/irc/irc-display.c:184 msgid "(hidden)" msgstr "(caché)" @@ -1828,12 +1832,12 @@ msgstr "serveur" 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:493 +#: src/gui/gui-common.c:494 #, 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:536 +#: src/gui/gui-common.c:537 msgid "not enough memory!\n" msgstr "pas assez de mémoire !\n" @@ -2545,19 +2549,19 @@ msgstr "%sBienvenue dans " msgid "compiled on" msgstr "compilé le" -#: src/common/log.c:95 +#: src/common/log.c:118 msgid "Not enough memory to write log file for a buffer\n" msgstr "Pas assez de mémoire pour écrire un fichier log de tampon\n" -#: src/common/log.c:123 +#: src/common/log.c:146 msgid "Unable to write log file for a buffer\n" msgstr "Impossible d'écrire le fichier log pour un tampon\n" -#: src/common/log.c:127 +#: src/common/log.c:150 msgid "**** Beginning of log " msgstr "**** Début du log " -#: src/common/log.c:141 +#: src/common/log.c:164 msgid "**** End of log " msgstr "**** Fin du log " @@ -2970,286 +2974,290 @@ msgid "maximum number of user commands in history (0 = unlimited)" msgstr "" "nombre maximum de commandes utilisateur dans l'historique (0 = sans limite)" -#: src/common/weeconfig.c:440 src/common/weeconfig.c:441 +#: src/common/weeconfig.c:441 src/common/weeconfig.c:442 msgid "automatically log server messages" msgstr "enregistrer automatiquement les messages du serveur" -#: src/common/weeconfig.c:444 src/common/weeconfig.c:445 +#: src/common/weeconfig.c:445 src/common/weeconfig.c:446 msgid "automatically log channel chats" msgstr "enregistrer automatiquement les conversations des canaux" -#: src/common/weeconfig.c:448 src/common/weeconfig.c:449 +#: src/common/weeconfig.c:449 src/common/weeconfig.c:450 msgid "automatically log private chats" msgstr "enregistrer automatiquement les conversations privées" -#: src/common/weeconfig.c:452 +#: src/common/weeconfig.c:453 src/common/weeconfig.c:454 +msgid "log messages from plugins (scripts)" +msgstr "enregistrer les messages des plugins (scripts)" + +#: src/common/weeconfig.c:457 msgid "path for log files" msgstr "chemin pour les conversations sauvegardées" -#: src/common/weeconfig.c:453 +#: src/common/weeconfig.c:458 msgid "path for WeeChat log files" msgstr "chemin pour les conversations sauvegardées par WeeChat" -#: src/common/weeconfig.c:456 +#: src/common/weeconfig.c:461 msgid "timestamp for log" msgstr "horodatage pour les conversations sauvegardées" -#: src/common/weeconfig.c:457 +#: src/common/weeconfig.c:462 msgid "timestamp for log (see man strftime for date/time specifiers)" msgstr "" "horodatage pour les conversations sauvegardées (voir man strftime pour le " "format de date/heure)" -#: src/common/weeconfig.c:460 src/common/weeconfig.c:461 +#: src/common/weeconfig.c:465 src/common/weeconfig.c:466 msgid "hide password displayed by nickserv" msgstr "masquer le mot de passe affiché par nickserv" -#: src/common/weeconfig.c:479 +#: src/common/weeconfig.c:484 msgid "display message to all channels when away" msgstr "affiche un message sur tous les canaux pour l'absence" -#: src/common/weeconfig.c:480 +#: src/common/weeconfig.c:485 msgid "display message to all channels when (un)marking as away" msgstr "affiche un message sur tous les canaux pour l'absence/le retour" -#: src/common/weeconfig.c:483 src/common/weeconfig.c:484 +#: src/common/weeconfig.c:488 src/common/weeconfig.c:489 msgid "default message when away" msgstr "message par défaut pour l'absence" -#: src/common/weeconfig.c:487 src/common/weeconfig.c:488 +#: src/common/weeconfig.c:492 src/common/weeconfig.c:493 msgid "default part message (leaving channel)" msgstr "message par défaut pour le part (quitte un canal)" -#: src/common/weeconfig.c:491 +#: src/common/weeconfig.c:496 msgid "default quit message" msgstr "message de fin par défaut" -#: src/common/weeconfig.c:492 +#: src/common/weeconfig.c:497 msgid "" "default quit message ('%v' will be replaced by WeeChat version in string)" msgstr "" "message de fin par défaut ('%v' sera remplacé par la version de WeeChat dans " "la chaîne)" -#: src/common/weeconfig.c:495 +#: src/common/weeconfig.c:500 msgid "interval between two checks for away" msgstr "intervalle entre deux vérifications des absences" -#: src/common/weeconfig.c:496 +#: src/common/weeconfig.c:501 msgid "interval between two checks for away (in minutes, 0 = never check)" msgstr "" "intervalle entre deux vérifications des absences (en minutes, 0 = ne jemais " "vérifier)" -#: src/common/weeconfig.c:499 +#: src/common/weeconfig.c:504 msgid "interval between two checks for lag" msgstr "intervalle entre deux mesures de lag" -#: src/common/weeconfig.c:500 +#: src/common/weeconfig.c:505 msgid "interval between two checks for lag (in seconds)" msgstr "intervalle entre deux mesures de lag (en secondes)" -#: src/common/weeconfig.c:503 +#: src/common/weeconfig.c:508 msgid "minimum lag to show" msgstr "lag minimum à afficher" -#: src/common/weeconfig.c:504 +#: src/common/weeconfig.c:509 msgid "minimum lag to show (in seconds)" msgstr "lag minimum à afficher (en secondes)" -#: src/common/weeconfig.c:507 +#: src/common/weeconfig.c:512 msgid "disconnect after important lag" msgstr "déconnexion après un lag important" -#: src/common/weeconfig.c:508 +#: src/common/weeconfig.c:513 msgid "disconnect after important lag (in minutes, 0 = never disconnect)" msgstr "" "déconnexion après un lag important (en minutes, 0 = ne jamais se déconnecter)" -#: src/common/weeconfig.c:526 +#: src/common/weeconfig.c:531 msgid "automatically accept dcc files" msgstr "accepte automatiquement les fichiers dcc" -#: src/common/weeconfig.c:527 +#: src/common/weeconfig.c:532 msgid "automatically accept incoming dcc files" msgstr "accepte automatiquement les fichiers dcc entrants" -#: src/common/weeconfig.c:530 +#: src/common/weeconfig.c:535 msgid "automatically accept dcc chats" msgstr "accepte automatiquement les demandes de discussion dcc" -#: src/common/weeconfig.c:531 +#: src/common/weeconfig.c:536 msgid "automatically accept dcc chats (use carefully!)" msgstr "" "accepte automatiquement les demandes de discussion dcc (à utiliser avec " "précaution !)" -#: src/common/weeconfig.c:534 +#: src/common/weeconfig.c:539 msgid "timeout for dcc request" msgstr "délai d'attente pour les requêtes dcc" -#: src/common/weeconfig.c:535 +#: src/common/weeconfig.c:540 msgid "timeout for dcc request (in seconds)" msgstr "délai d'attente pour les requêtes dcc (en secondes)" -#: src/common/weeconfig.c:538 +#: src/common/weeconfig.c:543 msgid "block size for dcc packets" msgstr "taille de bloc pour les paquets dcc" -#: src/common/weeconfig.c:539 +#: src/common/weeconfig.c:544 msgid "block size for dcc packets in bytes (default: 1024)" msgstr "taille de bloc pour les paquets dcc en octets (défaut: 1024)" -#: src/common/weeconfig.c:542 +#: src/common/weeconfig.c:547 msgid "path for incoming files with dcc" msgstr "chemin les fichiers reçus par dcc" -#: src/common/weeconfig.c:543 +#: src/common/weeconfig.c:548 msgid "path for writing incoming files with dcc (default: user home)" msgstr "" "chemin pour écrire les fichiers reçus par dcc (par défaut: répertoire de " "l'utilisateur)" -#: src/common/weeconfig.c:546 +#: src/common/weeconfig.c:551 msgid "default path for sending files with dcc" msgstr "chemin par défaut pour envoyer les fichiers par dcc" -#: src/common/weeconfig.c:547 +#: src/common/weeconfig.c:552 msgid "" "path for reading files when sending thru dcc (when no path is specified)" msgstr "" "chemin pour lire les fichiers lorsqu'ils sont envoyés par dcc (quand aucun " "chemin n'est spécifié)" -#: src/common/weeconfig.c:550 +#: src/common/weeconfig.c:555 msgid "automatically rename dcc files if already exists" msgstr "renomme automatiquement les fichiers dcc s'ils existent déjà" -#: src/common/weeconfig.c:551 +#: src/common/weeconfig.c:556 msgid "rename incoming files if already exists (add '.1', '.2', ...)" msgstr "" "renommer les fichiers reçus s'ils existent déjà (ajoute '.1', '.2', ...)" -#: src/common/weeconfig.c:554 +#: src/common/weeconfig.c:559 msgid "automatically resume aborted transfers" msgstr "continuer automatiquement les transferts non terminés" -#: src/common/weeconfig.c:555 +#: src/common/weeconfig.c:560 msgid "" "automatically resume dcc transfer if connection with remote host is loosed" msgstr "" "continuer automatiquement les transferts dcc si la connexion avec la machine " "distante a été perdue" -#: src/common/weeconfig.c:569 +#: src/common/weeconfig.c:574 msgid "use proxy" msgstr "utiliser un proxy" -#: src/common/weeconfig.c:570 +#: src/common/weeconfig.c:575 msgid "use a proxy server to connect to irc server" msgstr "utiliser un proxy pour se connecter au serveur irc" -#: src/common/weeconfig.c:573 +#: src/common/weeconfig.c:578 msgid "proxy address" msgstr "adresse du proxy" -#: src/common/weeconfig.c:574 +#: src/common/weeconfig.c:579 msgid "proxy server address (IP or hostname)" msgstr "adresse du serveur proxy (IP ou nom)" -#: src/common/weeconfig.c:577 +#: src/common/weeconfig.c:582 msgid "port for proxy" msgstr "port pour le proxy" -#: src/common/weeconfig.c:578 +#: src/common/weeconfig.c:583 msgid "port for connecting to proxy server" msgstr "port pour se connecter au serveur proxy" -#: src/common/weeconfig.c:581 +#: src/common/weeconfig.c:586 msgid "proxy password" msgstr "mot de passe pour le proxy" -#: src/common/weeconfig.c:582 +#: src/common/weeconfig.c:587 msgid "password for proxy server" msgstr "mot de passe pour le serveur proxy" -#: src/common/weeconfig.c:593 +#: src/common/weeconfig.c:598 msgid "server name" msgstr "nom du serveur" -#: src/common/weeconfig.c:594 +#: src/common/weeconfig.c:599 msgid "name associated to IRC server (for display only)" msgstr "nom associé au serveur IRC (pour affichage seulement)" -#: src/common/weeconfig.c:597 +#: src/common/weeconfig.c:602 msgid "automatically connect to server" msgstr "connexion automatique au serveur" -#: src/common/weeconfig.c:598 +#: src/common/weeconfig.c:603 msgid "automatically connect to server when WeeChat is starting" msgstr "connexion automatique au serveur quand WeeChat démarre" -#: src/common/weeconfig.c:601 +#: src/common/weeconfig.c:606 msgid "automatically reconnect to server" msgstr "reconnexion automatique au serveur" -#: src/common/weeconfig.c:602 +#: src/common/weeconfig.c:607 msgid "automatically reconnect to server when disconnected" msgstr "reconnexion automatique au serveur après une déconnexion" -#: src/common/weeconfig.c:605 +#: src/common/weeconfig.c:610 msgid "delay before trying again to reconnect" msgstr "délai avant de tenter une reconnexion" -#: src/common/weeconfig.c:606 +#: src/common/weeconfig.c:611 msgid "delay (in deconds) before trying again to reconnect to server" msgstr "délai (en secondes) avant de tenter une reconnexion au serveur" -#: src/common/weeconfig.c:609 +#: src/common/weeconfig.c:614 msgid "server address or hostname" msgstr "adresse ou nom du serveur" -#: src/common/weeconfig.c:610 +#: src/common/weeconfig.c:615 msgid "IP address or hostname of IRC server" msgstr "adresse IP ou nom du serveur IRC" -#: src/common/weeconfig.c:613 +#: src/common/weeconfig.c:618 msgid "port for IRC server" msgstr "port pour le serveur IRC" -#: src/common/weeconfig.c:614 +#: src/common/weeconfig.c:619 msgid "port for connecting to server" msgstr "port pour se connecter au serveur" -#: src/common/weeconfig.c:617 +#: src/common/weeconfig.c:622 msgid "server password" msgstr "mot de passe pour le serveur" -#: src/common/weeconfig.c:618 +#: src/common/weeconfig.c:623 msgid "password for IRC server" msgstr "mot de passe pour le serveur IRC" -#: src/common/weeconfig.c:621 +#: src/common/weeconfig.c:626 msgid "nickname for server" msgstr "pseudo pour le serveur" -#: src/common/weeconfig.c:622 +#: src/common/weeconfig.c:627 msgid "nickname to use on IRC server" msgstr "pseudo à utiliser sur le serveur IRC" -#: src/common/weeconfig.c:625 +#: src/common/weeconfig.c:630 msgid "alternate nickname for server" msgstr "pseudo alternatif pour le serveur" -#: src/common/weeconfig.c:626 +#: src/common/weeconfig.c:631 msgid "alternate nickname to use on IRC server (if nickname is already used)" msgstr "pseudo alternatif pour le serveur IRC (si le pseudo est déjà utilisé)" -#: src/common/weeconfig.c:629 +#: src/common/weeconfig.c:634 msgid "2nd alternate nickname for server" msgstr "2nd pseudo alternatif pour le serveur" -#: src/common/weeconfig.c:630 +#: src/common/weeconfig.c:635 msgid "" "2nd alternate nickname to use on IRC server (if alternate nickname is " "already used)" @@ -3257,31 +3265,31 @@ msgstr "" "2nd pseudo alternatif pour le serveur IRC (si le pseudo alternatif est déjà " "utilisé)" -#: src/common/weeconfig.c:633 +#: src/common/weeconfig.c:638 msgid "user name for server" msgstr "nom d'utilisateur pour le serveur" -#: src/common/weeconfig.c:634 +#: src/common/weeconfig.c:639 msgid "user name to use on IRC server" msgstr "nom d'utilisateur pour le serveur IRC" -#: src/common/weeconfig.c:637 +#: src/common/weeconfig.c:642 msgid "real name for server" msgstr "nom réel pour le serveur" -#: src/common/weeconfig.c:638 +#: src/common/weeconfig.c:643 msgid "real name to use on IRC server" msgstr "nom réel pour le serveur IRC" -#: src/common/weeconfig.c:641 src/common/weeconfig.c:642 +#: src/common/weeconfig.c:646 src/common/weeconfig.c:647 msgid "first command to run when connected to server" msgstr "commande à exécuter en premier lorsque connecté au serveur" -#: src/common/weeconfig.c:645 +#: src/common/weeconfig.c:650 msgid "delay (in seconds) after command was executed" msgstr "délai (en secondes) après exécution de la commande" -#: src/common/weeconfig.c:646 +#: src/common/weeconfig.c:651 msgid "" "delay (in seconds) after command was executed (example: give some time for " "authentication)" @@ -3289,76 +3297,76 @@ msgstr "" "délai (en secondes) après exécution de la commande (exemple: donner du temps " "pour l'authentification)" -#: src/common/weeconfig.c:649 +#: src/common/weeconfig.c:654 msgid "list of channels to join when connected to server" msgstr "liste des canaux à rejoindre lorsque connecté au serveur" -#: src/common/weeconfig.c:650 +#: src/common/weeconfig.c:655 msgid "comma separated list of channels to join when connected to server" msgstr "" "liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au " "serveur" -#: src/common/weeconfig.c:653 src/common/weeconfig.c:654 +#: src/common/weeconfig.c:658 src/common/weeconfig.c:659 msgid "automatically rejoin channels when kicked" msgstr "rejoindre automatiquement les canaux quand mis dehors" -#: src/common/weeconfig.c:1002 +#: src/common/weeconfig.c:1007 #, c-format msgid "%s %s, line %d: new server, but previous was incomplete\n" msgstr "%s %s, ligne %d: nouveau serveur, mais le précédent était incomplet\n" -#: src/common/weeconfig.c:1011 +#: src/common/weeconfig.c:1016 #, c-format msgid "%s %s, line %d: server '%s' already exists\n" msgstr "%s %s, ligne %d: le serveur '%s' existe déjà\n" -#: src/common/weeconfig.c:1025 +#: src/common/weeconfig.c:1030 #, c-format msgid "%s %s, line %d: unable to create server\n" msgstr "%s %s, ligne %d: impossible de créer le serveur\n" -#: src/common/weeconfig.c:1064 +#: src/common/weeconfig.c:1069 #, c-format msgid "%s unable to assign default int with string (\"%s\")\n" msgstr "%s impossible d'assigner la valeur entière avec la chaîne (\"%s\")\n" -#: src/common/weeconfig.c:1075 +#: src/common/weeconfig.c:1080 #, c-format msgid "%s unable to assign default color (\"%s\")\n" msgstr "%s impossible d'assigner la couleur par défaut (\"%s\")\n" -#: src/common/weeconfig.c:1114 +#: src/common/weeconfig.c:1119 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "%s fichier de configuration \"%s\" non trouvé.\n" -#: src/common/weeconfig.c:1146 +#: src/common/weeconfig.c:1151 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"]\"\n" msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"]\"\n" -#: src/common/weeconfig.c:1163 +#: src/common/weeconfig.c:1168 #, c-format msgid "%s %s, line %d: unknown section identifier (\"%s\")\n" msgstr "%s %s, ligne %d: section inconnue (\"%s\")\n" -#: src/common/weeconfig.c:1181 +#: src/common/weeconfig.c:1186 #, c-format msgid "%s %s, line %d: invalid section for option, line is ignored\n" msgstr "%s %s, ligne %d: section invalide pour l'option, ligne ignorée\n" -#: src/common/weeconfig.c:1189 +#: src/common/weeconfig.c:1194 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"=\"\n" msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"=\"\n" -#: src/common/weeconfig.c:1223 +#: src/common/weeconfig.c:1228 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "%s %s, ligne %d: option \"%s\" invalide\n" -#: src/common/weeconfig.c:1234 +#: src/common/weeconfig.c:1239 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" @@ -3367,7 +3375,7 @@ msgstr "" "%s %s, ligne %d: valeur invalide pour l'option '%s'\n" "Attendu: valeur booléenne: 'off' ou 'on'\n" -#: src/common/weeconfig.c:1243 +#: src/common/weeconfig.c:1248 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3376,7 +3384,7 @@ msgstr "" "%s %s, ligne %d: valeur invalide pour l'option '%s'\n" "Attendu: entier compris entre %d et %d\n" -#: src/common/weeconfig.c:1254 +#: src/common/weeconfig.c:1259 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3385,26 +3393,26 @@ msgstr "" "%s %s, ligne %d: valeur invalide pour l'option '%s'\n" "Attendu: une de ces chaînes: " -#: src/common/weeconfig.c:1270 +#: src/common/weeconfig.c:1275 #, c-format msgid "%s %s, line %d: invalid color name for option '%s'\n" msgstr "%s %s, ligne %d: nom de couleur invalide pour l'option '%s'\n" -#: src/common/weeconfig.c:1330 src/common/weeconfig.c:1503 +#: src/common/weeconfig.c:1335 src/common/weeconfig.c:1508 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "%s impossible de créer le fichier \"%s\"\n" -#: src/common/weeconfig.c:1336 +#: src/common/weeconfig.c:1341 #, c-format msgid "%s: creating default config file...\n" msgstr "%s: création du fichier de configuration par défaut...\n" -#: src/common/weeconfig.c:1337 +#: src/common/weeconfig.c:1342 msgid "creating default config file\n" msgstr "création du fichier de configuration par défaut\n" -#: src/common/weeconfig.c:1340 src/common/weeconfig.c:1512 +#: src/common/weeconfig.c:1345 src/common/weeconfig.c:1517 #, c-format msgid "" "#\n" @@ -3413,6 +3421,6 @@ msgstr "" "#\n" "# %s: fichier de configuration, créé par %s v%s le %s#\n" -#: src/common/weeconfig.c:1509 +#: src/common/weeconfig.c:1514 msgid "saving config to disk\n" msgstr "sauvegarde de la configuration sur disque\n" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index 48183b1da..eb03c6655 100644 --- a/weechat/po/weechat.pot +++ b/weechat/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-02-12 12:00+0100\n" +"POT-Creation-Date: 2005-02-12 21:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -20,7 +20,7 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "" -#: src/irc/irc-server.c:139 src/common/weeconfig.c:1451 +#: src/irc/irc-server.c:139 src/common/weeconfig.c:1456 msgid "Unable to get user's name" msgstr "" @@ -917,182 +917,186 @@ msgid "no origin" msgstr "" #: src/irc/irc-commands.c:340 -msgid "no recipient" +msgid "no services" msgstr "" #: src/irc/irc-commands.c:342 -msgid "no text to send" +msgid "no recipient" msgstr "" #: src/irc/irc-commands.c:344 -msgid "no toplevel" +msgid "no text to send" msgstr "" #: src/irc/irc-commands.c:346 -msgid "wilcard in toplevel domain" +msgid "no toplevel" msgstr "" #: src/irc/irc-commands.c:348 -msgid "unknown command" +msgid "wilcard in toplevel domain" msgstr "" #: src/irc/irc-commands.c:350 -msgid "MOTD is missing" +msgid "unknown command" msgstr "" #: src/irc/irc-commands.c:352 -msgid "no administrative info" +msgid "MOTD is missing" msgstr "" #: src/irc/irc-commands.c:354 -msgid "file error" +msgid "no administrative info" msgstr "" #: src/irc/irc-commands.c:356 -msgid "no nickname given" +msgid "file error" msgstr "" #: src/irc/irc-commands.c:358 -msgid "erroneus nickname" +msgid "no nickname given" msgstr "" #: src/irc/irc-commands.c:360 -msgid "nickname already in use" +msgid "erroneus nickname" msgstr "" #: src/irc/irc-commands.c:362 -msgid "nickname collision" +msgid "nickname already in use" msgstr "" #: src/irc/irc-commands.c:364 -msgid "user not in channel" +msgid "nickname collision" msgstr "" #: src/irc/irc-commands.c:366 -msgid "not on channel" +msgid "user not in channel" msgstr "" #: src/irc/irc-commands.c:368 -msgid "user already on channel" +msgid "not on channel" msgstr "" #: src/irc/irc-commands.c:370 -msgid "user not logged in" +msgid "user already on channel" msgstr "" #: src/irc/irc-commands.c:372 -msgid "summon has been disabled" +msgid "user not logged in" msgstr "" #: src/irc/irc-commands.c:374 -msgid "users has been disabled" +msgid "summon has been disabled" msgstr "" #: src/irc/irc-commands.c:376 -msgid "you are not registered" +msgid "users has been disabled" msgstr "" #: src/irc/irc-commands.c:378 -msgid "not enough parameters" +msgid "you are not registered" msgstr "" #: src/irc/irc-commands.c:380 -msgid "you may not register" +msgid "not enough parameters" msgstr "" #: src/irc/irc-commands.c:382 -msgid "your host isn't among the privileged" +msgid "you may not register" msgstr "" #: src/irc/irc-commands.c:384 -msgid "password incorrect" +msgid "your host isn't among the privileged" msgstr "" #: src/irc/irc-commands.c:386 -msgid "you are banned from this server" +msgid "password incorrect" msgstr "" #: src/irc/irc-commands.c:388 -msgid "channel key already set" +msgid "you are banned from this server" msgstr "" #: src/irc/irc-commands.c:390 -msgid "channel is already full" +msgid "channel key already set" msgstr "" #: src/irc/irc-commands.c:392 -msgid "unknown mode char to me" +msgid "channel is already full" msgstr "" #: src/irc/irc-commands.c:394 -msgid "cannot join channel (invite only)" +msgid "unknown mode char to me" msgstr "" #: src/irc/irc-commands.c:396 -msgid "cannot join channel (banned from channel)" +msgid "cannot join channel (invite only)" msgstr "" #: src/irc/irc-commands.c:398 -msgid "cannot join channel (bad channel key)" +msgid "cannot join channel (banned from channel)" msgstr "" #: src/irc/irc-commands.c:400 -msgid "bad channel mask" +msgid "cannot join channel (bad channel key)" msgstr "" #: src/irc/irc-commands.c:402 -msgid "channel doesn't support modes" +msgid "bad channel mask" msgstr "" #: src/irc/irc-commands.c:404 -msgid "you're not an IRC operator" +msgid "channel doesn't support modes" msgstr "" #: src/irc/irc-commands.c:406 -msgid "you're not channel operator" +msgid "you're not an IRC operator" msgstr "" #: src/irc/irc-commands.c:408 -msgid "you can't kill a server!" +msgid "you're not channel operator" msgstr "" #: src/irc/irc-commands.c:410 -msgid "no O-lines for your host" +msgid "you can't kill a server!" msgstr "" #: src/irc/irc-commands.c:412 -msgid "unknown mode flag" +msgid "no O-lines for your host" msgstr "" #: src/irc/irc-commands.c:414 +msgid "unknown mode flag" +msgstr "" + +#: src/irc/irc-commands.c:416 msgid "can't change mode for other users" msgstr "" -#: src/irc/irc-display.c:145 src/common/command.c:801 +#: src/irc/irc-display.c:151 src/common/command.c:801 msgid "Server: " msgstr "" -#: src/irc/irc-display.c:150 +#: src/irc/irc-display.c:156 msgid "connected" msgstr "" -#: src/irc/irc-display.c:150 +#: src/irc/irc-display.c:156 msgid "not connected" msgstr "" -#: src/irc/irc-display.c:155 src/irc/irc-display.c:161 +#: src/irc/irc-display.c:161 src/irc/irc-display.c:167 msgid "yes" msgstr "" -#: src/irc/irc-display.c:155 src/irc/irc-display.c:161 +#: src/irc/irc-display.c:161 src/irc/irc-display.c:167 msgid "no" msgstr "" -#: src/irc/irc-display.c:157 +#: src/irc/irc-display.c:163 msgid " (temporary server, will not be saved)" msgstr "" -#: src/irc/irc-display.c:178 +#: src/irc/irc-display.c:184 msgid "(hidden)" msgstr "" @@ -1716,12 +1720,12 @@ msgstr "" msgid "%s not enough memory for infobar message\n" msgstr "" -#: src/gui/gui-common.c:493 +#: src/gui/gui-common.c:494 #, c-format msgid "%s not enough memory for new line!\n" msgstr "" -#: src/gui/gui-common.c:536 +#: src/gui/gui-common.c:537 msgid "not enough memory!\n" msgstr "" @@ -2376,19 +2380,19 @@ msgstr "" msgid "compiled on" msgstr "" -#: src/common/log.c:95 +#: src/common/log.c:118 msgid "Not enough memory to write log file for a buffer\n" msgstr "" -#: src/common/log.c:123 +#: src/common/log.c:146 msgid "Unable to write log file for a buffer\n" msgstr "" -#: src/common/log.c:127 +#: src/common/log.c:150 msgid "**** Beginning of log " msgstr "" -#: src/common/log.c:141 +#: src/common/log.c:164 msgid "**** End of log " msgstr "" @@ -2774,419 +2778,423 @@ msgstr "" msgid "maximum number of user commands in history (0 = unlimited)" msgstr "" -#: src/common/weeconfig.c:440 src/common/weeconfig.c:441 +#: src/common/weeconfig.c:441 src/common/weeconfig.c:442 msgid "automatically log server messages" msgstr "" -#: src/common/weeconfig.c:444 src/common/weeconfig.c:445 +#: src/common/weeconfig.c:445 src/common/weeconfig.c:446 msgid "automatically log channel chats" msgstr "" -#: src/common/weeconfig.c:448 src/common/weeconfig.c:449 +#: src/common/weeconfig.c:449 src/common/weeconfig.c:450 msgid "automatically log private chats" msgstr "" -#: src/common/weeconfig.c:452 +#: src/common/weeconfig.c:453 src/common/weeconfig.c:454 +msgid "log messages from plugins (scripts)" +msgstr "" + +#: src/common/weeconfig.c:457 msgid "path for log files" msgstr "" -#: src/common/weeconfig.c:453 +#: src/common/weeconfig.c:458 msgid "path for WeeChat log files" msgstr "" -#: src/common/weeconfig.c:456 +#: src/common/weeconfig.c:461 msgid "timestamp for log" msgstr "" -#: src/common/weeconfig.c:457 +#: src/common/weeconfig.c:462 msgid "timestamp for log (see man strftime for date/time specifiers)" msgstr "" -#: src/common/weeconfig.c:460 src/common/weeconfig.c:461 +#: src/common/weeconfig.c:465 src/common/weeconfig.c:466 msgid "hide password displayed by nickserv" msgstr "" -#: src/common/weeconfig.c:479 +#: src/common/weeconfig.c:484 msgid "display message to all channels when away" msgstr "" -#: src/common/weeconfig.c:480 +#: src/common/weeconfig.c:485 msgid "display message to all channels when (un)marking as away" msgstr "" -#: src/common/weeconfig.c:483 src/common/weeconfig.c:484 +#: src/common/weeconfig.c:488 src/common/weeconfig.c:489 msgid "default message when away" msgstr "" -#: src/common/weeconfig.c:487 src/common/weeconfig.c:488 +#: src/common/weeconfig.c:492 src/common/weeconfig.c:493 msgid "default part message (leaving channel)" msgstr "" -#: src/common/weeconfig.c:491 +#: src/common/weeconfig.c:496 msgid "default quit message" msgstr "" -#: src/common/weeconfig.c:492 +#: src/common/weeconfig.c:497 msgid "" "default quit message ('%v' will be replaced by WeeChat version in string)" msgstr "" -#: src/common/weeconfig.c:495 +#: src/common/weeconfig.c:500 msgid "interval between two checks for away" msgstr "" -#: src/common/weeconfig.c:496 +#: src/common/weeconfig.c:501 msgid "interval between two checks for away (in minutes, 0 = never check)" msgstr "" -#: src/common/weeconfig.c:499 +#: src/common/weeconfig.c:504 msgid "interval between two checks for lag" msgstr "" -#: src/common/weeconfig.c:500 +#: src/common/weeconfig.c:505 msgid "interval between two checks for lag (in seconds)" msgstr "" -#: src/common/weeconfig.c:503 +#: src/common/weeconfig.c:508 msgid "minimum lag to show" msgstr "" -#: src/common/weeconfig.c:504 +#: src/common/weeconfig.c:509 msgid "minimum lag to show (in seconds)" msgstr "" -#: src/common/weeconfig.c:507 +#: src/common/weeconfig.c:512 msgid "disconnect after important lag" msgstr "" -#: src/common/weeconfig.c:508 +#: src/common/weeconfig.c:513 msgid "disconnect after important lag (in minutes, 0 = never disconnect)" msgstr "" -#: src/common/weeconfig.c:526 +#: src/common/weeconfig.c:531 msgid "automatically accept dcc files" msgstr "" -#: src/common/weeconfig.c:527 +#: src/common/weeconfig.c:532 msgid "automatically accept incoming dcc files" msgstr "" -#: src/common/weeconfig.c:530 +#: src/common/weeconfig.c:535 msgid "automatically accept dcc chats" msgstr "" -#: src/common/weeconfig.c:531 +#: src/common/weeconfig.c:536 msgid "automatically accept dcc chats (use carefully!)" msgstr "" -#: src/common/weeconfig.c:534 +#: src/common/weeconfig.c:539 msgid "timeout for dcc request" msgstr "" -#: src/common/weeconfig.c:535 +#: src/common/weeconfig.c:540 msgid "timeout for dcc request (in seconds)" msgstr "" -#: src/common/weeconfig.c:538 +#: src/common/weeconfig.c:543 msgid "block size for dcc packets" msgstr "" -#: src/common/weeconfig.c:539 +#: src/common/weeconfig.c:544 msgid "block size for dcc packets in bytes (default: 1024)" msgstr "" -#: src/common/weeconfig.c:542 +#: src/common/weeconfig.c:547 msgid "path for incoming files with dcc" msgstr "" -#: src/common/weeconfig.c:543 +#: src/common/weeconfig.c:548 msgid "path for writing incoming files with dcc (default: user home)" msgstr "" -#: src/common/weeconfig.c:546 +#: src/common/weeconfig.c:551 msgid "default path for sending files with dcc" msgstr "" -#: src/common/weeconfig.c:547 +#: src/common/weeconfig.c:552 msgid "" "path for reading files when sending thru dcc (when no path is specified)" msgstr "" -#: src/common/weeconfig.c:550 +#: src/common/weeconfig.c:555 msgid "automatically rename dcc files if already exists" msgstr "" -#: src/common/weeconfig.c:551 +#: src/common/weeconfig.c:556 msgid "rename incoming files if already exists (add '.1', '.2', ...)" msgstr "" -#: src/common/weeconfig.c:554 +#: src/common/weeconfig.c:559 msgid "automatically resume aborted transfers" msgstr "" -#: src/common/weeconfig.c:555 +#: src/common/weeconfig.c:560 msgid "" "automatically resume dcc transfer if connection with remote host is loosed" msgstr "" -#: src/common/weeconfig.c:569 +#: src/common/weeconfig.c:574 msgid "use proxy" msgstr "" -#: src/common/weeconfig.c:570 +#: src/common/weeconfig.c:575 msgid "use a proxy server to connect to irc server" msgstr "" -#: src/common/weeconfig.c:573 +#: src/common/weeconfig.c:578 msgid "proxy address" msgstr "" -#: src/common/weeconfig.c:574 +#: src/common/weeconfig.c:579 msgid "proxy server address (IP or hostname)" msgstr "" -#: src/common/weeconfig.c:577 +#: src/common/weeconfig.c:582 msgid "port for proxy" msgstr "" -#: src/common/weeconfig.c:578 +#: src/common/weeconfig.c:583 msgid "port for connecting to proxy server" msgstr "" -#: src/common/weeconfig.c:581 +#: src/common/weeconfig.c:586 msgid "proxy password" msgstr "" -#: src/common/weeconfig.c:582 +#: src/common/weeconfig.c:587 msgid "password for proxy server" msgstr "" -#: src/common/weeconfig.c:593 +#: src/common/weeconfig.c:598 msgid "server name" msgstr "" -#: src/common/weeconfig.c:594 +#: src/common/weeconfig.c:599 msgid "name associated to IRC server (for display only)" msgstr "" -#: src/common/weeconfig.c:597 +#: src/common/weeconfig.c:602 msgid "automatically connect to server" msgstr "" -#: src/common/weeconfig.c:598 +#: src/common/weeconfig.c:603 msgid "automatically connect to server when WeeChat is starting" msgstr "" -#: src/common/weeconfig.c:601 +#: src/common/weeconfig.c:606 msgid "automatically reconnect to server" msgstr "" -#: src/common/weeconfig.c:602 +#: src/common/weeconfig.c:607 msgid "automatically reconnect to server when disconnected" msgstr "" -#: src/common/weeconfig.c:605 +#: src/common/weeconfig.c:610 msgid "delay before trying again to reconnect" msgstr "" -#: src/common/weeconfig.c:606 +#: src/common/weeconfig.c:611 msgid "delay (in deconds) before trying again to reconnect to server" msgstr "" -#: src/common/weeconfig.c:609 +#: src/common/weeconfig.c:614 msgid "server address or hostname" msgstr "" -#: src/common/weeconfig.c:610 +#: src/common/weeconfig.c:615 msgid "IP address or hostname of IRC server" msgstr "" -#: src/common/weeconfig.c:613 +#: src/common/weeconfig.c:618 msgid "port for IRC server" msgstr "" -#: src/common/weeconfig.c:614 +#: src/common/weeconfig.c:619 msgid "port for connecting to server" msgstr "" -#: src/common/weeconfig.c:617 +#: src/common/weeconfig.c:622 msgid "server password" msgstr "" -#: src/common/weeconfig.c:618 +#: src/common/weeconfig.c:623 msgid "password for IRC server" msgstr "" -#: src/common/weeconfig.c:621 +#: src/common/weeconfig.c:626 msgid "nickname for server" msgstr "" -#: src/common/weeconfig.c:622 +#: src/common/weeconfig.c:627 msgid "nickname to use on IRC server" msgstr "" -#: src/common/weeconfig.c:625 +#: src/common/weeconfig.c:630 msgid "alternate nickname for server" msgstr "" -#: src/common/weeconfig.c:626 +#: src/common/weeconfig.c:631 msgid "alternate nickname to use on IRC server (if nickname is already used)" msgstr "" -#: src/common/weeconfig.c:629 +#: src/common/weeconfig.c:634 msgid "2nd alternate nickname for server" msgstr "" -#: src/common/weeconfig.c:630 +#: src/common/weeconfig.c:635 msgid "" "2nd alternate nickname to use on IRC server (if alternate nickname is " "already used)" msgstr "" -#: src/common/weeconfig.c:633 +#: src/common/weeconfig.c:638 msgid "user name for server" msgstr "" -#: src/common/weeconfig.c:634 +#: src/common/weeconfig.c:639 msgid "user name to use on IRC server" msgstr "" -#: src/common/weeconfig.c:637 +#: src/common/weeconfig.c:642 msgid "real name for server" msgstr "" -#: src/common/weeconfig.c:638 +#: src/common/weeconfig.c:643 msgid "real name to use on IRC server" msgstr "" -#: src/common/weeconfig.c:641 src/common/weeconfig.c:642 +#: src/common/weeconfig.c:646 src/common/weeconfig.c:647 msgid "first command to run when connected to server" msgstr "" -#: src/common/weeconfig.c:645 +#: src/common/weeconfig.c:650 msgid "delay (in seconds) after command was executed" msgstr "" -#: src/common/weeconfig.c:646 +#: src/common/weeconfig.c:651 msgid "" "delay (in seconds) after command was executed (example: give some time for " "authentication)" msgstr "" -#: src/common/weeconfig.c:649 +#: src/common/weeconfig.c:654 msgid "list of channels to join when connected to server" msgstr "" -#: src/common/weeconfig.c:650 +#: src/common/weeconfig.c:655 msgid "comma separated list of channels to join when connected to server" msgstr "" -#: src/common/weeconfig.c:653 src/common/weeconfig.c:654 +#: src/common/weeconfig.c:658 src/common/weeconfig.c:659 msgid "automatically rejoin channels when kicked" msgstr "" -#: src/common/weeconfig.c:1002 +#: src/common/weeconfig.c:1007 #, c-format msgid "%s %s, line %d: new server, but previous was incomplete\n" msgstr "" -#: src/common/weeconfig.c:1011 +#: src/common/weeconfig.c:1016 #, c-format msgid "%s %s, line %d: server '%s' already exists\n" msgstr "" -#: src/common/weeconfig.c:1025 +#: src/common/weeconfig.c:1030 #, c-format msgid "%s %s, line %d: unable to create server\n" msgstr "" -#: src/common/weeconfig.c:1064 +#: src/common/weeconfig.c:1069 #, c-format msgid "%s unable to assign default int with string (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1075 +#: src/common/weeconfig.c:1080 #, c-format msgid "%s unable to assign default color (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1114 +#: src/common/weeconfig.c:1119 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "" -#: src/common/weeconfig.c:1146 +#: src/common/weeconfig.c:1151 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"]\"\n" msgstr "" -#: src/common/weeconfig.c:1163 +#: src/common/weeconfig.c:1168 #, c-format msgid "%s %s, line %d: unknown section identifier (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1181 +#: src/common/weeconfig.c:1186 #, c-format msgid "%s %s, line %d: invalid section for option, line is ignored\n" msgstr "" -#: src/common/weeconfig.c:1189 +#: src/common/weeconfig.c:1194 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"=\"\n" msgstr "" -#: src/common/weeconfig.c:1223 +#: src/common/weeconfig.c:1228 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "" -#: src/common/weeconfig.c:1234 +#: src/common/weeconfig.c:1239 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" "Expected: boolean value: 'off' or 'on'\n" msgstr "" -#: src/common/weeconfig.c:1243 +#: src/common/weeconfig.c:1248 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" "Expected: integer between %d and %d\n" msgstr "" -#: src/common/weeconfig.c:1254 +#: src/common/weeconfig.c:1259 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" "Expected: one of these strings: " msgstr "" -#: src/common/weeconfig.c:1270 +#: src/common/weeconfig.c:1275 #, c-format msgid "%s %s, line %d: invalid color name for option '%s'\n" msgstr "" -#: src/common/weeconfig.c:1330 src/common/weeconfig.c:1503 +#: src/common/weeconfig.c:1335 src/common/weeconfig.c:1508 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "" -#: src/common/weeconfig.c:1336 +#: src/common/weeconfig.c:1341 #, c-format msgid "%s: creating default config file...\n" msgstr "" -#: src/common/weeconfig.c:1337 +#: src/common/weeconfig.c:1342 msgid "creating default config file\n" msgstr "" -#: src/common/weeconfig.c:1340 src/common/weeconfig.c:1512 +#: src/common/weeconfig.c:1345 src/common/weeconfig.c:1517 #, c-format msgid "" "#\n" "# %s configuration file, created by %s v%s on %s#\n" msgstr "" -#: src/common/weeconfig.c:1509 +#: src/common/weeconfig.c:1514 msgid "saving config to disk\n" msgstr "" diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c index e6cf37ad5..d38395bc3 100644 --- a/weechat/src/common/command.c +++ b/weechat/src/common/command.c @@ -704,8 +704,8 @@ user_command (t_irc_server *server, char *command) else { irc_display_prefix ((server) ? server->buffer : NULL, PREFIX_ERROR); - gui_printf ((server) ? server->buffer : NULL, - _("This window is not a channel!\n")); + gui_printf_nolog ((server) ? server->buffer : NULL, + _("This window is not a channel!\n")); } } } diff --git a/weechat/src/common/log.c b/weechat/src/common/log.c index cdaaba286..06f62f7cd 100644 --- a/weechat/src/common/log.c +++ b/weechat/src/common/log.c @@ -31,6 +31,7 @@ #include "weechat.h" #include "log.h" #include "weeconfig.h" +#include "../gui/gui.h" /* @@ -72,6 +73,28 @@ log_write (t_gui_buffer *buffer, char *message) } /* + * log_write_line: writes a WeeChat line to log file + */ + +void +log_write_line (t_gui_buffer *buffer, t_gui_line *line) +{ + t_gui_message *ptr_msg; + + if (buffer->log_file) + { + log_write_date (buffer); + for (ptr_msg = line->messages; ptr_msg; ptr_msg = ptr_msg->next_message) + { + if (ptr_msg->type != MSG_TYPE_TIME) + fprintf (buffer->log_file, "%s", ptr_msg->message); + } + fprintf (buffer->log_file, "\n"); + fflush (buffer->log_file); + } +} + +/* * log_start: starts a log */ diff --git a/weechat/src/common/log.h b/weechat/src/common/log.h index 74d67a63d..7119d50af 100644 --- a/weechat/src/common/log.h +++ b/weechat/src/common/log.h @@ -22,9 +22,11 @@ #define __WEECHAT_LOG_H 1 #include "../irc/irc.h" +#include "../gui/gui.h" extern void log_write_date (t_gui_buffer *); extern void log_write (t_gui_buffer *, char *); +extern void log_write_line (t_gui_buffer *, t_gui_line *); extern void log_start (t_gui_buffer *); extern void log_end (t_gui_buffer *); diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c index 91b96fc2c..04e678f40 100644 --- a/weechat/src/common/weeconfig.c +++ b/weechat/src/common/weeconfig.c @@ -432,6 +432,7 @@ t_config_option weechat_options_history[] = int cfg_log_auto_server; int cfg_log_auto_channel; int cfg_log_auto_private; +int cfg_log_plugin_msg; char *cfg_log_path; char *cfg_log_timestamp; int cfg_log_hide_nickserv_pwd; @@ -449,6 +450,10 @@ t_config_option weechat_options_log[] = N_("automatically log private chats"), OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE, NULL, NULL, &cfg_log_auto_private, NULL, NULL }, + { "log_plugin_msg", N_("log messages from plugins (scripts)"), + N_("log messages from plugins (scripts)"), + OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE, + NULL, NULL, &cfg_log_plugin_msg, NULL, NULL }, { "log_path", N_("path for log files"), N_("path for WeeChat log files"), OPTION_TYPE_STRING, 0, 0, 0, diff --git a/weechat/src/common/weeconfig.h b/weechat/src/common/weeconfig.h index b231be902..920228a48 100644 --- a/weechat/src/common/weeconfig.h +++ b/weechat/src/common/weeconfig.h @@ -148,6 +148,7 @@ extern int cfg_history_max_commands; extern int cfg_log_auto_server; extern int cfg_log_auto_channel; extern int cfg_log_auto_private; +extern int cfg_log_plugin_msg; extern char *cfg_log_path; extern char *cfg_log_timestamp; extern int cfg_log_hide_nickserv_pwd; diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c index 29a145d30..1fa32908e 100644 --- a/weechat/src/gui/curses/gui-display.c +++ b/weechat/src/gui/curses/gui-display.c @@ -2222,6 +2222,8 @@ gui_add_message (t_gui_buffer *buffer, int type, int color, char *message) buffer->last_line->line_with_highlight = 1; if ((type & MSG_TYPE_TIME) || (type & MSG_TYPE_NICK)) buffer->last_line->length_align += length; + if (type & MSG_TYPE_NOLOG) + buffer->last_line->log_write = 0; if (pos) { pos[0] = '\n'; @@ -2247,6 +2249,8 @@ gui_add_message (t_gui_buffer *buffer, int type, int color, char *message) } } } + if (buffer->line_complete && buffer->log_file && buffer->last_line->log_write) + log_write_line (buffer, buffer->last_line); } /* @@ -2271,6 +2275,7 @@ gui_printf_color_type (t_gui_buffer *buffer, int type, int color, char *message, if (buffer == NULL) { + type |= MSG_TYPE_NOLOG; if (SERVER(gui_current_window->buffer)) buffer = SERVER(gui_current_window->buffer)->buffer; else @@ -2342,12 +2347,8 @@ gui_printf_color_type (t_gui_buffer *buffer, int type, int color, char *message, snprintf (timestamp, 16, "%02d", date_tmp->tm_sec); gui_add_message (buffer, MSG_TYPE_TIME, COLOR_WIN_CHAT_TIME, timestamp); gui_add_message (buffer, MSG_TYPE_TIME, COLOR_WIN_CHAT_DARK, "] "); - if (buffer->log_file) - log_write_date (buffer); } gui_add_message (buffer, type, color, pos + 1); - if (buffer->log_file) - log_write (buffer, pos + 1); pos = strchr (pos + 1, '\n'); if (pos && !pos[1]) pos = NULL; diff --git a/weechat/src/gui/gui-common.c b/weechat/src/gui/gui-common.c index 1f34dae7d..28c94e44c 100644 --- a/weechat/src/gui/gui-common.c +++ b/weechat/src/gui/gui-common.c @@ -475,6 +475,7 @@ gui_new_line (t_gui_buffer *buffer) { new_line->length = 0; new_line->length_align = 0; + new_line->log_write = 1; new_line->line_with_message = 0; new_line->line_with_highlight = 0; new_line->messages = NULL; diff --git a/weechat/src/gui/gui.h b/weechat/src/gui/gui.h index 1056ce1f6..069e9346a 100644 --- a/weechat/src/gui/gui.h +++ b/weechat/src/gui/gui.h @@ -80,6 +80,7 @@ #define MSG_TYPE_INFO 4 #define MSG_TYPE_MSG 8 #define MSG_TYPE_HIGHLIGHT 16 +#define MSG_TYPE_NOLOG 32 #define gui_printf_color(buffer, color, fmt, argz...) \ gui_printf_color_type(buffer, MSG_TYPE_INFO, color, fmt, ##argz) @@ -87,6 +88,9 @@ #define gui_printf(buffer, fmt, argz...) \ gui_printf_color_type(buffer, MSG_TYPE_INFO, -1, fmt, ##argz) +#define gui_printf_nolog(buffer, fmt, argz...) \ + gui_printf_color_type(buffer, MSG_TYPE_INFO | MSG_TYPE_NOLOG, -1, fmt, ##argz) + typedef struct t_gui_message t_gui_message; struct t_gui_message @@ -104,6 +108,7 @@ struct t_gui_line { int length; /* length of the line (in char) */ int length_align; /* alignment length (time or time/nick) */ + int log_write; /* = 1 if line will be written to log */ 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 */ diff --git a/weechat/src/irc/irc-commands.c b/weechat/src/irc/irc-commands.c index 1e1fc8f97..1cbff48bb 100644 --- a/weechat/src/irc/irc-commands.c +++ b/weechat/src/irc/irc-commands.c @@ -337,6 +337,8 @@ t_irc_command irc_commands[] = "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error }, { "409", N_("no origin"), "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error }, + { "410", N_("no services"), + "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error }, { "411", N_("no recipient"), "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error }, { "412", N_("no text to send"), diff --git a/weechat/src/irc/irc-display.c b/weechat/src/irc/irc-display.c index 78378198c..312d62fbe 100644 --- a/weechat/src/irc/irc-display.c +++ b/weechat/src/irc/irc-display.c @@ -43,11 +43,17 @@ void irc_display_prefix (t_gui_buffer *buffer, char *prefix) { + int type; + + type = MSG_TYPE_INFO; + if (!cfg_log_plugin_msg && (prefix == PREFIX_PLUGIN)) + type |= MSG_TYPE_NOLOG; + if (prefix[0] == prefix[2]) { - gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%c", prefix[0]); - gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX2, "%c", prefix[1]); - gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%c ", prefix[2]); + gui_printf_color_type (buffer, type, COLOR_WIN_CHAT_PREFIX1, "%c", prefix[0]); + gui_printf_color_type (buffer, type, COLOR_WIN_CHAT_PREFIX2, "%c", prefix[1]); + gui_printf_color_type (buffer, type, COLOR_WIN_CHAT_PREFIX1, "%c ", prefix[2]); } else gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%s ", prefix); |