From 76c4d4d427d0541d9d09e9c90817efb6914311e3 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Sun, 17 Oct 2004 09:13:54 +0000 Subject: [PATCH] Auto-rejoin channels when kicked (new config option: server_autorejoin on/off) --- ChangeLog | 3 +- po/fr.po | 278 +++++++++++++------------- po/weechat.pot | 284 ++++++++++++++------------- src/common/command.c | 2 +- src/common/weechat.c | 2 +- src/common/weeconfig.c | 9 +- src/gui/curses/gui-display.c | 10 +- src/irc/irc-recv.c | 18 +- src/irc/irc-server.c | 9 +- src/irc/irc.h | 4 +- weechat/ChangeLog | 3 +- weechat/po/fr.po | 278 +++++++++++++------------- weechat/po/weechat.pot | 284 ++++++++++++++------------- weechat/src/common/command.c | 2 +- weechat/src/common/weechat.c | 2 +- weechat/src/common/weeconfig.c | 9 +- weechat/src/gui/curses/gui-display.c | 10 +- weechat/src/irc/irc-recv.c | 18 +- weechat/src/irc/irc-server.c | 9 +- weechat/src/irc/irc.h | 4 +- 20 files changed, 672 insertions(+), 566 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69175bd49..9864cee36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,11 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2004-10-03 +ChangeLog - 2004-10-17 Version 0.0.8 (under dev!): + * auto-rejoin channels when kicked (new config option: server_autorejoin on/off) * added IRC::command function for Perl scripts * fixed bug when adding alias with same name as other * /buffer command developed (buffers list, move and notify) diff --git a/po/fr.po b/po/fr.po index 0185e66c5..05a28a6e9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.0.8-pre2\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2004-10-03 03:44+0200\n" +"POT-Creation-Date: 2004-10-17 11:02+0200\n" "PO-Revision-Date: 2004-08-08 20:47+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" @@ -20,94 +20,94 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "%s ompossible d'allouer un nouveau pseudo\n" -#: src/irc/irc-server.c:130 src/common/weeconfig.c:1227 +#: src/irc/irc-server.c:129 src/common/weeconfig.c:1231 msgid "Unable to get user's name" msgstr "Impossible de déterminer le nom d'utilisateur" -#: src/irc/irc-server.c:195 +#: src/irc/irc-server.c:194 #, c-format msgid "%s cannot allocate new server\n" msgstr "%s impossible d'allouer un nouveau serveur\n" -#: src/irc/irc-server.c:382 +#: src/irc/irc-server.c:384 #, c-format msgid "%s error sending data to IRC server\n" msgstr "%s erreur d'envoi de données au serveur IRC\n" -#: src/irc/irc-server.c:399 src/irc/irc-server.c:410 src/irc/irc-server.c:464 +#: src/irc/irc-server.c:401 src/irc/irc-server.c:412 src/irc/irc-server.c:466 #, c-format msgid "%s not enough memory for received IRC message\n" msgstr "%s mémoire insuffisante pour un message IRC reçu\n" -#: src/irc/irc-server.c:471 +#: src/irc/irc-server.c:473 #, c-format msgid "%s unable to explode received buffer\n" msgstr "%s impossible d'exploser le tampon de réception\n" -#: src/irc/irc-server.c:544 +#: src/irc/irc-server.c:546 #, c-format msgid "Command '%s' failed!\n" msgstr "La commande '%s' a échoué !\n" -#: src/irc/irc-server.c:548 +#: src/irc/irc-server.c:550 msgid "No command to execute!\n" msgstr "Pas de commande à exécuter !\n" -#: src/irc/irc-server.c:552 +#: src/irc/irc-server.c:554 #, c-format msgid "Unknown command: cmd=%s, args=%s\n" msgstr "Commande inconnue: cmd=%s, params=%s\n" -#: src/irc/irc-server.c:604 +#: src/irc/irc-server.c:606 #, c-format msgid "%s: connecting to %s:%d...\n" msgstr "%s: connexion à %s:%d...\n" -#: src/irc/irc-server.c:606 +#: src/irc/irc-server.c:608 #, c-format msgid "connecting to server %s:%d...\n" msgstr "connexion au serveur %s:%d...\n" -#: src/irc/irc-server.c:614 +#: src/irc/irc-server.c:616 #, c-format msgid "%s cannot create pipe\n" msgstr "%s impossible de créer le pipe\n" -#: src/irc/irc-server.c:628 +#: src/irc/irc-server.c:630 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s impossible de paramétrer l'option socket \"SO_REUSEADDR\"\n" -#: src/irc/irc-server.c:635 +#: src/irc/irc-server.c:637 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s impossible de paramétrer l'option socket \"SO_KEEPALIVE\"\n" -#: src/irc/irc-server.c:643 +#: src/irc/irc-server.c:645 #, c-format msgid "%s address \"%s\" not found\n" msgstr "%s adresse \"%s\" introuvable\n" -#: src/irc/irc-server.c:666 +#: src/irc/irc-server.c:668 #, c-format msgid "%s IP address not found\n" msgstr "%s adresse IP introuvable\n" -#: src/irc/irc-server.c:676 +#: src/irc/irc-server.c:678 #, c-format msgid "%s: server IP is: %s\n" msgstr "%s: l'adresse IP du serveur est : %s\n" -#: src/irc/irc-server.c:682 +#: src/irc/irc-server.c:684 #, c-format msgid "%s cannot connect to irc server\n" msgstr "%s connexion au serveur irc impossible\n" -#: src/irc/irc-server.c:732 +#: src/irc/irc-server.c:733 msgid "Disconnected from server!\n" msgstr "Déconnecté du serveur !\n" -#: src/irc/irc-channel.c:51 +#: src/irc/irc-channel.c:50 #, c-format msgid "%s cannot allocate new channel" msgstr "%s impossible d'allouer un nouveau canal" @@ -1137,7 +1137,7 @@ msgstr "drapeau de mode inconnu" msgid "can't change mode for other users" msgstr "impossible de changer le mode pour les autres utilisateurs" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2896 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2907 msgid "unknown" msgstr "inconnu" @@ -1162,12 +1162,12 @@ msgstr "" "%s la commande \"%s\" ne peut pas être exécutée dans une fenêtre serveur\n" #: src/irc/irc-send.c:556 src/irc/irc-send.c:578 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:996 +#: src/irc/irc-recv.c:1007 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n" -#: src/irc/irc-send.c:592 src/irc/irc-send.c:833 src/irc/irc-recv.c:1156 +#: src/irc/irc-send.c:592 src/irc/irc-send.c:833 src/irc/irc-recv.c:1167 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "%s impossible de créer la fenêtre privée \"%s\"\n" @@ -1191,8 +1191,8 @@ msgstr "%s impossible de cr msgid " has joined " msgstr " a rejoint " -#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:865 -#: src/irc/irc-recv.c:1005 src/irc/irc-recv.c:2396 src/irc/irc-recv.c:2461 +#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:592 src/irc/irc-recv.c:876 +#: src/irc/irc-recv.c:1016 src/irc/irc-recv.c:2407 src/irc/irc-recv.c:2472 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "%s canal non trouvé pour la commande \"%s\"\n" @@ -1205,350 +1205,350 @@ msgstr " a pouss msgid " from " msgstr " de " -#: src/irc/irc-recv.c:307 +#: src/irc/irc-recv.c:318 msgid "sets ban on" msgstr "instaure un bannissement sur" -#: src/irc/irc-recv.c:308 +#: src/irc/irc-recv.c:319 msgid "removes ban on" msgstr "supprime le banissement sur" -#: src/irc/irc-recv.c:325 +#: src/irc/irc-recv.c:336 msgid "sets invite-only channel flag" msgstr "définit le canal en mode invité seulement" -#: src/irc/irc-recv.c:326 +#: src/irc/irc-recv.c:337 msgid "removes invite-only channel flag" msgstr "supprime le mode invité seulement pour le canal" -#: src/irc/irc-recv.c:343 +#: src/irc/irc-recv.c:354 msgid "sets channel key to" msgstr "définit la clé du canal à" -#: src/irc/irc-recv.c:344 +#: src/irc/irc-recv.c:355 msgid "removes channel key" msgstr "supprime la clé du canal" -#: src/irc/irc-recv.c:375 +#: src/irc/irc-recv.c:386 msgid "sets the user limit to" msgstr "définit la limite d'utilisateurs à" -#: src/irc/irc-recv.c:376 +#: src/irc/irc-recv.c:387 msgid "removes user limit" msgstr "supprime la limite d'utilisateurs" -#: src/irc/irc-recv.c:398 +#: src/irc/irc-recv.c:409 msgid "sets moderated channel flag" msgstr "instaure la modération sur le canal" -#: src/irc/irc-recv.c:399 +#: src/irc/irc-recv.c:410 msgid "removes moderated channel flag" msgstr "supprime la modération sur le canal" -#: src/irc/irc-recv.c:409 +#: src/irc/irc-recv.c:420 msgid "sets messages from channel only flag" msgstr "interdit aux utilisateurs en dehors du canal d'y écrire" -#: src/irc/irc-recv.c:410 +#: src/irc/irc-recv.c:421 msgid "removes messages from channel only flag" msgstr "autorise tout utilisateur à écrire sur le canal" -#: src/irc/irc-recv.c:427 +#: src/irc/irc-recv.c:438 msgid "gives channel operator status to" msgstr "donne le droit opérateur à" -#: src/irc/irc-recv.c:428 +#: src/irc/irc-recv.c:439 msgid "removes channel operator status from" msgstr "supprime le droit opérateur à" -#: src/irc/irc-recv.c:455 +#: src/irc/irc-recv.c:466 msgid "sets private channel flag" msgstr "définit le canal comme privé" -#: src/irc/irc-recv.c:456 +#: src/irc/irc-recv.c:467 msgid "removes private channel flag" msgstr "supprime le mode privé pour le canal" -#: src/irc/irc-recv.c:466 +#: src/irc/irc-recv.c:477 msgid "sets secret channel flag" msgstr "définit le canal comme secret" -#: src/irc/irc-recv.c:467 +#: src/irc/irc-recv.c:478 msgid "removes secret channel flag" msgstr "supprime le mode secret pour le canal" -#: src/irc/irc-recv.c:477 +#: src/irc/irc-recv.c:488 msgid "sets topic protection" msgstr "active la protection du titre" -#: src/irc/irc-recv.c:478 +#: src/irc/irc-recv.c:489 msgid "removes topic protection" msgstr "supprime la protection du titre" -#: src/irc/irc-recv.c:495 +#: src/irc/irc-recv.c:506 msgid "gives voice to" msgstr "donne la voix à" -#: src/irc/irc-recv.c:496 +#: src/irc/irc-recv.c:507 msgid "removes voice from" msgstr "supprime la voix de" -#: src/irc/irc-recv.c:538 src/irc/irc-recv.c:611 src/irc/irc-recv.c:907 -#: src/irc/irc-recv.c:1250 +#: src/irc/irc-recv.c:549 src/irc/irc-recv.c:622 src/irc/irc-recv.c:918 +#: src/irc/irc-recv.c:1261 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "%s commande \"%s\" reçue sans host\n" -#: src/irc/irc-recv.c:552 +#: src/irc/irc-recv.c:563 #, c-format msgid "%s \"%s\" command received without channel or nickname\n" msgstr "%s commande \"%s\" reçue sans canal ou utilisateur\n" -#: src/irc/irc-recv.c:649 +#: src/irc/irc-recv.c:660 msgid "You are " msgstr "Vous êtes " -#: src/irc/irc-recv.c:656 +#: src/irc/irc-recv.c:667 msgid " is " msgstr " est " -#: src/irc/irc-recv.c:660 +#: src/irc/irc-recv.c:671 msgid "now known as " msgstr "maintenant connu sous le nom " -#: src/irc/irc-recv.c:713 +#: src/irc/irc-recv.c:724 #, c-format msgid "%s nickname not found for \"%s\" command\n" msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:726 src/irc/irc-recv.c:758 +#: src/irc/irc-recv.c:737 src/irc/irc-recv.c:769 msgid "reply from" msgstr "réponse de" -#: src/irc/irc-recv.c:761 +#: src/irc/irc-recv.c:772 #, c-format msgid ": %ld.%ld seconds\n" msgstr ": %ld.%ld secondes\n" -#: src/irc/irc-recv.c:791 +#: src/irc/irc-recv.c:802 #, c-format msgid "%s \"%s\" command received without host or channel\n" msgstr "%s commande \"%s\" reçue sans host ou canal\n" -#: src/irc/irc-recv.c:841 +#: src/irc/irc-recv.c:852 msgid " has left " msgstr " a quitté " -#: src/irc/irc-recv.c:956 src/irc/irc-recv.c:1182 +#: src/irc/irc-recv.c:967 src/irc/irc-recv.c:1193 #, c-format msgid "On %s: * %s %s" msgstr "Sur %s: * %s %s" -#: src/irc/irc-recv.c:982 +#: src/irc/irc-recv.c:993 #, c-format msgid "On %s: %s> %s" msgstr "Sur %s: %s> %s" -#: src/irc/irc-recv.c:1050 +#: src/irc/irc-recv.c:1061 msgid "Received a " msgstr "Reçu un " -#: src/irc/irc-recv.c:1052 +#: src/irc/irc-recv.c:1063 msgid "CTCP VERSION " msgstr "CTCP VERSION " -#: src/irc/irc-recv.c:1054 +#: src/irc/irc-recv.c:1065 msgid "from" msgstr "de" -#: src/irc/irc-recv.c:1089 src/irc/irc-recv.c:1103 src/irc/irc-recv.c:1118 -#: src/irc/irc-recv.c:1133 src/irc/irc-recv.c:1227 src/irc/irc-recv.c:2682 -#: src/irc/irc-recv.c:2722 +#: src/irc/irc-recv.c:1100 src/irc/irc-recv.c:1114 src/irc/irc-recv.c:1129 +#: src/irc/irc-recv.c:1144 src/irc/irc-recv.c:1238 src/irc/irc-recv.c:2693 +#: src/irc/irc-recv.c:2733 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s impossible d'analyser la commande \"%s\"\n" -#: src/irc/irc-recv.c:1208 +#: src/irc/irc-recv.c:1219 #, c-format msgid "Private %s> %s" msgstr "Privé %s> %s" -#: src/irc/irc-recv.c:1282 +#: src/irc/irc-recv.c:1293 msgid "has quit" msgstr "a quitté" -#: src/irc/irc-recv.c:1402 +#: src/irc/irc-recv.c:1413 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s commande \"%s\" reçue sans canal\n" -#: src/irc/irc-recv.c:1430 +#: src/irc/irc-recv.c:1441 msgid " has changed topic for " msgstr " a changé le titre pour " -#: src/irc/irc-recv.c:1435 +#: src/irc/irc-recv.c:1446 #, c-format msgid " to: \"%s\"\n" msgstr " en: \"%s\"\n" -#: src/irc/irc-recv.c:1441 +#: src/irc/irc-recv.c:1452 msgid " has unset topic for " msgstr " a retiré le titre pour " -#: src/irc/irc-recv.c:1532 +#: src/irc/irc-recv.c:1543 #, c-format msgid " is away: %s\n" msgstr " est absent: %s\n" -#: src/irc/irc-recv.c:1606 +#: src/irc/irc-recv.c:1617 msgid "Users online: " msgstr "Utilisateurs en ligne: " -#: src/irc/irc-recv.c:1969 +#: src/irc/irc-recv.c:1980 msgid "idle: " msgstr "inactivité: " -#: src/irc/irc-recv.c:1977 +#: src/irc/irc-recv.c:1988 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:1977 +#: src/irc/irc-recv.c:1988 msgid "day" msgstr "jour" -#: src/irc/irc-recv.c:1987 +#: src/irc/irc-recv.c:1998 msgid "hours" msgstr "heures" -#: src/irc/irc-recv.c:1987 +#: src/irc/irc-recv.c:1998 msgid "hour" msgstr "heure" -#: src/irc/irc-recv.c:1993 +#: src/irc/irc-recv.c:2004 msgid "minutes" msgstr "minutes" -#: src/irc/irc-recv.c:1993 +#: src/irc/irc-recv.c:2004 msgid "minute" msgstr "minute" -#: src/irc/irc-recv.c:1999 +#: src/irc/irc-recv.c:2010 msgid "seconds" msgstr "secondes" -#: src/irc/irc-recv.c:1999 +#: src/irc/irc-recv.c:2010 msgid "second" msgstr "seconde" -#: src/irc/irc-recv.c:2004 +#: src/irc/irc-recv.c:2015 msgid "signon at: " msgstr "signé le: " -#: src/irc/irc-recv.c:2092 +#: src/irc/irc-recv.c:2103 msgid "Channels: " msgstr "Canaux: " -#: src/irc/irc-recv.c:2343 +#: src/irc/irc-recv.c:2354 msgid "No topic set for " msgstr "Pas de titre défini pour " -#: src/irc/irc-recv.c:2385 +#: src/irc/irc-recv.c:2396 msgid "Topic for " msgstr "Le titre pour " -#: src/irc/irc-recv.c:2389 +#: src/irc/irc-recv.c:2400 #, c-format msgid " is: \"%s\"\n" msgstr " est: \"%s\"\n" -#: src/irc/irc-recv.c:2405 src/irc/irc-recv.c:2485 +#: src/irc/irc-recv.c:2416 src/irc/irc-recv.c:2496 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "%s impossible de déterminer le canal pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2451 +#: src/irc/irc-recv.c:2462 msgid "Topic set by " msgstr "Titre défini par " -#: src/irc/irc-recv.c:2469 +#: src/irc/irc-recv.c:2480 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "%s impossible d'identifier la date/heure pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2477 +#: src/irc/irc-recv.c:2488 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" "%s impossible de déterminer le nom d'utilisateur pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2606 +#: src/irc/irc-recv.c:2617 msgid " on " msgstr " sur " -#: src/irc/irc-recv.c:2713 +#: src/irc/irc-recv.c:2724 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "%s impossible de créer l'utilisateur \"%s\" pour le canal \"%s\"\n" -#: src/irc/irc-recv.c:2766 +#: src/irc/irc-recv.c:2777 msgid "Nicks " msgstr "Utilisateurs " -#: src/irc/irc-recv.c:2786 +#: src/irc/irc-recv.c:2797 msgid "Channel " msgstr "Canal " -#: src/irc/irc-recv.c:2797 +#: src/irc/irc-recv.c:2808 msgid "nicks" msgstr "utilisateurs" -#: src/irc/irc-recv.c:2797 +#: src/irc/irc-recv.c:2808 msgid "nick" msgstr "utilisateur" -#: src/irc/irc-recv.c:2805 +#: src/irc/irc-recv.c:2816 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:2805 +#: src/irc/irc-recv.c:2816 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:2814 +#: src/irc/irc-recv.c:2825 msgid "halfops" msgstr "halfops" -#: src/irc/irc-recv.c:2814 +#: src/irc/irc-recv.c:2825 msgid "halfop" msgstr "halfop" -#: src/irc/irc-recv.c:2823 +#: src/irc/irc-recv.c:2834 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:2823 +#: src/irc/irc-recv.c:2834 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:2832 +#: src/irc/irc-recv.c:2843 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:2865 +#: src/irc/irc-recv.c:2876 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 2nd " "nom d'utilisateur \"%s\"\n" -#: src/irc/irc-recv.c:2876 +#: src/irc/irc-recv.c:2887 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai du 3ème nom " "d'utilisateur \"%s\"\n" -#: src/irc/irc-recv.c:2885 +#: src/irc/irc-recv.c:2896 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1640,32 +1640,40 @@ msgid "Perl error: wrong parameters for IRC::print_infobar Perl function\n" msgstr "" "Erreur Perl: mauvais paramètres pour la fonction Perl IRC::print_infobar\n" -#: src/plugins/perl/wee-perl.c:450 +#: src/plugins/perl/wee-perl.c:256 +msgid "Perl error: server not found for IRC::command Perl function\n" +msgstr "Erreur Perl: serveur non trouvé pour la fonction Perl IRC::command\n" + +#: src/plugins/perl/wee-perl.c:357 +msgid "Perl error: server not found for IRC::get_info Perl function\n" +msgstr "Erreur Perl: serveur non trouvé pour la fonction Perl IRC::get_info\n" + +#: src/plugins/perl/wee-perl.c:526 #, c-format msgid "Perl error: %s\n" msgstr "Erreur Perl: %s\n" -#: src/plugins/perl/wee-perl.c:460 +#: src/plugins/perl/wee-perl.c:536 #, c-format msgid "Perl error: too much values from \"%s\" (%d). Expected: 1.\n" msgstr "Erreur Perl: trop de valeurs de \"%s\" (%d). Attendue: 1.\n" -#: src/plugins/perl/wee-perl.c:482 +#: src/plugins/perl/wee-perl.c:558 #, c-format msgid "loading Perl script \"%s\"\n" msgstr "chargement du script Perl \"%s\"\n" -#: src/plugins/perl/wee-perl.c:484 +#: src/plugins/perl/wee-perl.c:560 #, c-format msgid "Loading Perl script \"%s\"\n" msgstr "Chargement du script Perl \"%s\"\n" -#: src/plugins/perl/wee-perl.c:533 +#: src/plugins/perl/wee-perl.c:609 #, c-format msgid "unloading Perl script \"%s\"\n" msgstr "déchargement du script Perl \"%s\"\n" -#: src/plugins/perl/wee-perl.c:550 +#: src/plugins/perl/wee-perl.c:626 msgid "unloading all Perl scripts...\n" msgstr "déchargement de tous les scripts Perl...\n" @@ -3115,57 +3123,61 @@ msgstr "" "liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au " "serveur" -#: src/common/weeconfig.c:791 +#: src/common/weeconfig.c:572 src/common/weeconfig.c:573 +msgid "automatically rejoin channels when kicked" +msgstr "rejoindre automatiquement les canaux quand mis dehors" + +#: src/common/weeconfig.c:795 #, 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:800 +#: src/common/weeconfig.c:804 #, 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:812 +#: src/common/weeconfig.c:816 #, 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:851 +#: src/common/weeconfig.c:855 #, 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:862 +#: src/common/weeconfig.c:866 #, 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:901 +#: src/common/weeconfig.c:905 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "%s fichier de configuration \"%s\" non trouvé.\n" -#: src/common/weeconfig.c:933 +#: src/common/weeconfig.c:937 #, 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:950 +#: src/common/weeconfig.c:954 #, 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:968 +#: src/common/weeconfig.c:972 #, 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:1002 +#: src/common/weeconfig.c:1006 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "%s %s, ligne %d: option \"%s\" invalide\n" -#: src/common/weeconfig.c:1013 +#: src/common/weeconfig.c:1017 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" @@ -3174,7 +3186,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:1022 +#: src/common/weeconfig.c:1026 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3183,7 +3195,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:1033 +#: src/common/weeconfig.c:1037 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3192,26 +3204,26 @@ msgstr "" "%s %s, ligne %d: valeur invalide pour l'option '%s'\n" "Attendu: une de ces chaînes: " -#: src/common/weeconfig.c:1049 +#: src/common/weeconfig.c:1053 #, 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:1108 src/common/weeconfig.c:1276 +#: src/common/weeconfig.c:1112 src/common/weeconfig.c:1281 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "%s impossible de créer le fichier \"%s\"\n" -#: src/common/weeconfig.c:1114 +#: src/common/weeconfig.c:1118 #, 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:1115 +#: src/common/weeconfig.c:1119 msgid "creating default config file\n" msgstr "création du fichier de configuration par défaut\n" -#: src/common/weeconfig.c:1118 src/common/weeconfig.c:1285 +#: src/common/weeconfig.c:1122 src/common/weeconfig.c:1290 #, c-format msgid "" "#\n" @@ -3220,7 +3232,7 @@ msgstr "" "#\n" "# %s: fichier de configuration, créé par %s v%s le %s#\n" -#: src/common/weeconfig.c:1282 +#: src/common/weeconfig.c:1287 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 905fa45de..ff135768b 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2004-10-03 03:44+0200\n" +"POT-Creation-Date: 2004-10-17 11:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,94 +20,94 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "" -#: src/irc/irc-server.c:130 src/common/weeconfig.c:1227 +#: src/irc/irc-server.c:129 src/common/weeconfig.c:1231 msgid "Unable to get user's name" msgstr "" -#: src/irc/irc-server.c:195 +#: src/irc/irc-server.c:194 #, c-format msgid "%s cannot allocate new server\n" msgstr "" -#: src/irc/irc-server.c:382 +#: src/irc/irc-server.c:384 #, c-format msgid "%s error sending data to IRC server\n" msgstr "" -#: src/irc/irc-server.c:399 src/irc/irc-server.c:410 src/irc/irc-server.c:464 +#: src/irc/irc-server.c:401 src/irc/irc-server.c:412 src/irc/irc-server.c:466 #, c-format msgid "%s not enough memory for received IRC message\n" msgstr "" -#: src/irc/irc-server.c:471 +#: src/irc/irc-server.c:473 #, c-format msgid "%s unable to explode received buffer\n" msgstr "" -#: src/irc/irc-server.c:544 +#: src/irc/irc-server.c:546 #, c-format msgid "Command '%s' failed!\n" msgstr "" -#: src/irc/irc-server.c:548 +#: src/irc/irc-server.c:550 msgid "No command to execute!\n" msgstr "" -#: src/irc/irc-server.c:552 +#: src/irc/irc-server.c:554 #, c-format msgid "Unknown command: cmd=%s, args=%s\n" msgstr "" -#: src/irc/irc-server.c:604 +#: src/irc/irc-server.c:606 #, c-format msgid "%s: connecting to %s:%d...\n" msgstr "" -#: src/irc/irc-server.c:606 +#: src/irc/irc-server.c:608 #, c-format msgid "connecting to server %s:%d...\n" msgstr "" -#: src/irc/irc-server.c:614 +#: src/irc/irc-server.c:616 #, c-format msgid "%s cannot create pipe\n" msgstr "" -#: src/irc/irc-server.c:628 +#: src/irc/irc-server.c:630 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "" -#: src/irc/irc-server.c:635 +#: src/irc/irc-server.c:637 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "" -#: src/irc/irc-server.c:643 +#: src/irc/irc-server.c:645 #, c-format msgid "%s address \"%s\" not found\n" msgstr "" -#: src/irc/irc-server.c:666 +#: src/irc/irc-server.c:668 #, c-format msgid "%s IP address not found\n" msgstr "" -#: src/irc/irc-server.c:676 +#: src/irc/irc-server.c:678 #, c-format msgid "%s: server IP is: %s\n" msgstr "" -#: src/irc/irc-server.c:682 +#: src/irc/irc-server.c:684 #, c-format msgid "%s cannot connect to irc server\n" msgstr "" -#: src/irc/irc-server.c:732 +#: src/irc/irc-server.c:733 msgid "Disconnected from server!\n" msgstr "" -#: src/irc/irc-channel.c:51 +#: src/irc/irc-channel.c:50 #, c-format msgid "%s cannot allocate new channel" msgstr "" @@ -1046,7 +1046,7 @@ msgstr "" msgid "can't change mode for other users" msgstr "" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2896 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2907 msgid "unknown" msgstr "" @@ -1068,12 +1068,12 @@ msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" #: src/irc/irc-send.c:556 src/irc/irc-send.c:578 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:996 +#: src/irc/irc-recv.c:1007 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:592 src/irc/irc-send.c:833 src/irc/irc-recv.c:1156 +#: src/irc/irc-send.c:592 src/irc/irc-send.c:833 src/irc/irc-recv.c:1167 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "" @@ -1097,8 +1097,8 @@ msgstr "" msgid " has joined " msgstr "" -#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:865 -#: src/irc/irc-recv.c:1005 src/irc/irc-recv.c:2396 src/irc/irc-recv.c:2461 +#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:592 src/irc/irc-recv.c:876 +#: src/irc/irc-recv.c:1016 src/irc/irc-recv.c:2407 src/irc/irc-recv.c:2472 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "" @@ -1111,345 +1111,345 @@ msgstr "" msgid " from " msgstr "" -#: src/irc/irc-recv.c:307 +#: src/irc/irc-recv.c:318 msgid "sets ban on" msgstr "" -#: src/irc/irc-recv.c:308 +#: src/irc/irc-recv.c:319 msgid "removes ban on" msgstr "" -#: src/irc/irc-recv.c:325 +#: src/irc/irc-recv.c:336 msgid "sets invite-only channel flag" msgstr "" -#: src/irc/irc-recv.c:326 +#: src/irc/irc-recv.c:337 msgid "removes invite-only channel flag" msgstr "" -#: src/irc/irc-recv.c:343 +#: src/irc/irc-recv.c:354 msgid "sets channel key to" msgstr "" -#: src/irc/irc-recv.c:344 +#: src/irc/irc-recv.c:355 msgid "removes channel key" msgstr "" -#: src/irc/irc-recv.c:375 +#: src/irc/irc-recv.c:386 msgid "sets the user limit to" msgstr "" -#: src/irc/irc-recv.c:376 +#: src/irc/irc-recv.c:387 msgid "removes user limit" msgstr "" -#: src/irc/irc-recv.c:398 +#: src/irc/irc-recv.c:409 msgid "sets moderated channel flag" msgstr "" -#: src/irc/irc-recv.c:399 +#: src/irc/irc-recv.c:410 msgid "removes moderated channel flag" msgstr "" -#: src/irc/irc-recv.c:409 +#: src/irc/irc-recv.c:420 msgid "sets messages from channel only flag" msgstr "" -#: src/irc/irc-recv.c:410 +#: src/irc/irc-recv.c:421 msgid "removes messages from channel only flag" msgstr "" -#: src/irc/irc-recv.c:427 +#: src/irc/irc-recv.c:438 msgid "gives channel operator status to" msgstr "" -#: src/irc/irc-recv.c:428 +#: src/irc/irc-recv.c:439 msgid "removes channel operator status from" msgstr "" -#: src/irc/irc-recv.c:455 +#: src/irc/irc-recv.c:466 msgid "sets private channel flag" msgstr "" -#: src/irc/irc-recv.c:456 +#: src/irc/irc-recv.c:467 msgid "removes private channel flag" msgstr "" -#: src/irc/irc-recv.c:466 +#: src/irc/irc-recv.c:477 msgid "sets secret channel flag" msgstr "" -#: src/irc/irc-recv.c:467 +#: src/irc/irc-recv.c:478 msgid "removes secret channel flag" msgstr "" -#: src/irc/irc-recv.c:477 +#: src/irc/irc-recv.c:488 msgid "sets topic protection" msgstr "" -#: src/irc/irc-recv.c:478 +#: src/irc/irc-recv.c:489 msgid "removes topic protection" msgstr "" -#: src/irc/irc-recv.c:495 +#: src/irc/irc-recv.c:506 msgid "gives voice to" msgstr "" -#: src/irc/irc-recv.c:496 +#: src/irc/irc-recv.c:507 msgid "removes voice from" msgstr "" -#: src/irc/irc-recv.c:538 src/irc/irc-recv.c:611 src/irc/irc-recv.c:907 -#: src/irc/irc-recv.c:1250 +#: src/irc/irc-recv.c:549 src/irc/irc-recv.c:622 src/irc/irc-recv.c:918 +#: src/irc/irc-recv.c:1261 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "" -#: src/irc/irc-recv.c:552 +#: src/irc/irc-recv.c:563 #, c-format msgid "%s \"%s\" command received without channel or nickname\n" msgstr "" -#: src/irc/irc-recv.c:649 +#: src/irc/irc-recv.c:660 msgid "You are " msgstr "" -#: src/irc/irc-recv.c:656 +#: src/irc/irc-recv.c:667 msgid " is " msgstr "" -#: src/irc/irc-recv.c:660 +#: src/irc/irc-recv.c:671 msgid "now known as " msgstr "" -#: src/irc/irc-recv.c:713 +#: src/irc/irc-recv.c:724 #, c-format msgid "%s nickname not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:726 src/irc/irc-recv.c:758 +#: src/irc/irc-recv.c:737 src/irc/irc-recv.c:769 msgid "reply from" msgstr "" -#: src/irc/irc-recv.c:761 +#: src/irc/irc-recv.c:772 #, c-format msgid ": %ld.%ld seconds\n" msgstr "" -#: src/irc/irc-recv.c:791 +#: src/irc/irc-recv.c:802 #, c-format msgid "%s \"%s\" command received without host or channel\n" msgstr "" -#: src/irc/irc-recv.c:841 +#: src/irc/irc-recv.c:852 msgid " has left " msgstr "" -#: src/irc/irc-recv.c:956 src/irc/irc-recv.c:1182 +#: src/irc/irc-recv.c:967 src/irc/irc-recv.c:1193 #, c-format msgid "On %s: * %s %s" msgstr "" -#: src/irc/irc-recv.c:982 +#: src/irc/irc-recv.c:993 #, c-format msgid "On %s: %s> %s" msgstr "" -#: src/irc/irc-recv.c:1050 +#: src/irc/irc-recv.c:1061 msgid "Received a " msgstr "" -#: src/irc/irc-recv.c:1052 +#: src/irc/irc-recv.c:1063 msgid "CTCP VERSION " msgstr "" -#: src/irc/irc-recv.c:1054 +#: src/irc/irc-recv.c:1065 msgid "from" msgstr "" -#: src/irc/irc-recv.c:1089 src/irc/irc-recv.c:1103 src/irc/irc-recv.c:1118 -#: src/irc/irc-recv.c:1133 src/irc/irc-recv.c:1227 src/irc/irc-recv.c:2682 -#: src/irc/irc-recv.c:2722 +#: src/irc/irc-recv.c:1100 src/irc/irc-recv.c:1114 src/irc/irc-recv.c:1129 +#: src/irc/irc-recv.c:1144 src/irc/irc-recv.c:1238 src/irc/irc-recv.c:2693 +#: src/irc/irc-recv.c:2733 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:1208 +#: src/irc/irc-recv.c:1219 #, c-format msgid "Private %s> %s" msgstr "" -#: src/irc/irc-recv.c:1282 +#: src/irc/irc-recv.c:1293 msgid "has quit" msgstr "" -#: src/irc/irc-recv.c:1402 +#: src/irc/irc-recv.c:1413 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "" -#: src/irc/irc-recv.c:1430 +#: src/irc/irc-recv.c:1441 msgid " has changed topic for " msgstr "" -#: src/irc/irc-recv.c:1435 +#: src/irc/irc-recv.c:1446 #, c-format msgid " to: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:1441 +#: src/irc/irc-recv.c:1452 msgid " has unset topic for " msgstr "" -#: src/irc/irc-recv.c:1532 +#: src/irc/irc-recv.c:1543 #, c-format msgid " is away: %s\n" msgstr "" -#: src/irc/irc-recv.c:1606 +#: src/irc/irc-recv.c:1617 msgid "Users online: " msgstr "" -#: src/irc/irc-recv.c:1969 +#: src/irc/irc-recv.c:1980 msgid "idle: " msgstr "" -#: src/irc/irc-recv.c:1977 +#: src/irc/irc-recv.c:1988 msgid "days" msgstr "" -#: src/irc/irc-recv.c:1977 +#: src/irc/irc-recv.c:1988 msgid "day" msgstr "" -#: src/irc/irc-recv.c:1987 +#: src/irc/irc-recv.c:1998 msgid "hours" msgstr "" -#: src/irc/irc-recv.c:1987 +#: src/irc/irc-recv.c:1998 msgid "hour" msgstr "" -#: src/irc/irc-recv.c:1993 +#: src/irc/irc-recv.c:2004 msgid "minutes" msgstr "" -#: src/irc/irc-recv.c:1993 +#: src/irc/irc-recv.c:2004 msgid "minute" msgstr "" -#: src/irc/irc-recv.c:1999 +#: src/irc/irc-recv.c:2010 msgid "seconds" msgstr "" -#: src/irc/irc-recv.c:1999 +#: src/irc/irc-recv.c:2010 msgid "second" msgstr "" -#: src/irc/irc-recv.c:2004 +#: src/irc/irc-recv.c:2015 msgid "signon at: " msgstr "" -#: src/irc/irc-recv.c:2092 +#: src/irc/irc-recv.c:2103 msgid "Channels: " msgstr "" -#: src/irc/irc-recv.c:2343 +#: src/irc/irc-recv.c:2354 msgid "No topic set for " msgstr "" -#: src/irc/irc-recv.c:2385 +#: src/irc/irc-recv.c:2396 msgid "Topic for " msgstr "" -#: src/irc/irc-recv.c:2389 +#: src/irc/irc-recv.c:2400 #, c-format msgid " is: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2405 src/irc/irc-recv.c:2485 +#: src/irc/irc-recv.c:2416 src/irc/irc-recv.c:2496 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2451 +#: src/irc/irc-recv.c:2462 msgid "Topic set by " msgstr "" -#: src/irc/irc-recv.c:2469 +#: src/irc/irc-recv.c:2480 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2477 +#: src/irc/irc-recv.c:2488 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2606 +#: src/irc/irc-recv.c:2617 msgid " on " msgstr "" -#: src/irc/irc-recv.c:2713 +#: src/irc/irc-recv.c:2724 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2766 +#: src/irc/irc-recv.c:2777 msgid "Nicks " msgstr "" -#: src/irc/irc-recv.c:2786 +#: src/irc/irc-recv.c:2797 msgid "Channel " msgstr "" -#: src/irc/irc-recv.c:2797 +#: src/irc/irc-recv.c:2808 msgid "nicks" msgstr "" -#: src/irc/irc-recv.c:2797 +#: src/irc/irc-recv.c:2808 msgid "nick" msgstr "" -#: src/irc/irc-recv.c:2805 +#: src/irc/irc-recv.c:2816 msgid "ops" msgstr "" -#: src/irc/irc-recv.c:2805 +#: src/irc/irc-recv.c:2816 msgid "op" msgstr "" -#: src/irc/irc-recv.c:2814 +#: src/irc/irc-recv.c:2825 msgid "halfops" msgstr "" -#: src/irc/irc-recv.c:2814 +#: src/irc/irc-recv.c:2825 msgid "halfop" msgstr "" -#: src/irc/irc-recv.c:2823 +#: src/irc/irc-recv.c:2834 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:2823 +#: src/irc/irc-recv.c:2834 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:2832 +#: src/irc/irc-recv.c:2843 msgid "normal" msgstr "" -#: src/irc/irc-recv.c:2865 -#, c-format -msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" -msgstr "" - #: src/irc/irc-recv.c:2876 #, c-format +msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" +msgstr "" + +#: src/irc/irc-recv.c:2887 +#, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2885 +#: src/irc/irc-recv.c:2896 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1535,32 +1535,40 @@ msgstr "" msgid "Perl error: wrong parameters for IRC::print_infobar Perl function\n" msgstr "" -#: src/plugins/perl/wee-perl.c:450 +#: src/plugins/perl/wee-perl.c:256 +msgid "Perl error: server not found for IRC::command Perl function\n" +msgstr "" + +#: src/plugins/perl/wee-perl.c:357 +msgid "Perl error: server not found for IRC::get_info Perl function\n" +msgstr "" + +#: src/plugins/perl/wee-perl.c:526 #, c-format msgid "Perl error: %s\n" msgstr "" -#: src/plugins/perl/wee-perl.c:460 +#: src/plugins/perl/wee-perl.c:536 #, c-format msgid "Perl error: too much values from \"%s\" (%d). Expected: 1.\n" msgstr "" -#: src/plugins/perl/wee-perl.c:482 +#: src/plugins/perl/wee-perl.c:558 #, c-format msgid "loading Perl script \"%s\"\n" msgstr "" -#: src/plugins/perl/wee-perl.c:484 +#: src/plugins/perl/wee-perl.c:560 #, c-format msgid "Loading Perl script \"%s\"\n" msgstr "" -#: src/plugins/perl/wee-perl.c:533 +#: src/plugins/perl/wee-perl.c:609 #, c-format msgid "unloading Perl script \"%s\"\n" msgstr "" -#: src/plugins/perl/wee-perl.c:550 +#: src/plugins/perl/wee-perl.c:626 msgid "unloading all Perl scripts...\n" msgstr "" @@ -2921,103 +2929,107 @@ msgstr "" msgid "comma separated list of channels to join when connected to server" msgstr "" -#: src/common/weeconfig.c:791 +#: src/common/weeconfig.c:572 src/common/weeconfig.c:573 +msgid "automatically rejoin channels when kicked" +msgstr "" + +#: src/common/weeconfig.c:795 #, c-format msgid "%s %s, line %d: new server, but previous was incomplete\n" msgstr "" -#: src/common/weeconfig.c:800 +#: src/common/weeconfig.c:804 #, c-format msgid "%s %s, line %d: server '%s' already exists\n" msgstr "" -#: src/common/weeconfig.c:812 +#: src/common/weeconfig.c:816 #, c-format msgid "%s %s, line %d: unable to create server\n" msgstr "" -#: src/common/weeconfig.c:851 +#: src/common/weeconfig.c:855 #, c-format msgid "%s unable to assign default int with string (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:862 +#: src/common/weeconfig.c:866 #, c-format msgid "%s unable to assign default color (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:901 +#: src/common/weeconfig.c:905 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "" -#: src/common/weeconfig.c:933 +#: src/common/weeconfig.c:937 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"]\"\n" msgstr "" -#: src/common/weeconfig.c:950 +#: src/common/weeconfig.c:954 #, c-format msgid "%s %s, line %d: unknown section identifier (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:968 +#: src/common/weeconfig.c:972 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"=\"\n" msgstr "" -#: src/common/weeconfig.c:1002 +#: src/common/weeconfig.c:1006 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "" -#: src/common/weeconfig.c:1013 +#: src/common/weeconfig.c:1017 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" "Expected: boolean value: 'off' or 'on'\n" msgstr "" -#: src/common/weeconfig.c:1022 +#: src/common/weeconfig.c:1026 #, 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:1033 +#: src/common/weeconfig.c:1037 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" "Expected: one of these strings: " msgstr "" -#: src/common/weeconfig.c:1049 +#: src/common/weeconfig.c:1053 #, c-format msgid "%s %s, line %d: invalid color name for option '%s'\n" msgstr "" -#: src/common/weeconfig.c:1108 src/common/weeconfig.c:1276 +#: src/common/weeconfig.c:1112 src/common/weeconfig.c:1281 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "" -#: src/common/weeconfig.c:1114 +#: src/common/weeconfig.c:1118 #, c-format msgid "%s: creating default config file...\n" msgstr "" -#: src/common/weeconfig.c:1115 +#: src/common/weeconfig.c:1119 msgid "creating default config file\n" msgstr "" -#: src/common/weeconfig.c:1118 src/common/weeconfig.c:1285 +#: src/common/weeconfig.c:1122 src/common/weeconfig.c:1290 #, c-format msgid "" "#\n" "# %s configuration file, created by %s v%s on %s#\n" msgstr "" -#: src/common/weeconfig.c:1282 +#: src/common/weeconfig.c:1287 msgid "saving config to disk\n" msgstr "" diff --git a/src/common/command.c b/src/common/command.c index c9bf9faaa..23a5226f8 100644 --- a/src/common/command.c +++ b/src/common/command.c @@ -1607,7 +1607,7 @@ weechat_cmd_server (int argc, char **argv) server.address, server.port, server.password, server.nick1, server.nick2, server.nick3, server.username, server.realname, - server.command, server.autojoin); + server.command, server.autojoin, 1); if (new_server) { irc_display_prefix (NULL, PREFIX_INFO); diff --git a/src/common/weechat.c b/src/common/weechat.c index 776ae4005..5e98c9b9a 100644 --- a/src/common/weechat.c +++ b/src/common/weechat.c @@ -232,7 +232,7 @@ wee_parse_args (int argc, char *argv[]) server_tmp.address, server_tmp.port, server_tmp.password, server_tmp.nick1, server_tmp.nick2, server_tmp.nick3, - NULL, NULL, NULL, server_tmp.autojoin)) + NULL, NULL, NULL, server_tmp.autojoin, 1)) fprintf (stderr, _("%s unable to create server ('%s'), ignored\n"), WEECHAT_WARNING, argv[i]); server_destroy (&server_tmp); diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c index ddf275d89..d78d581ee 100644 --- a/src/common/weeconfig.c +++ b/src/common/weeconfig.c @@ -569,6 +569,10 @@ t_config_option weechat_options_server[] = N_("comma separated list of channels to join when connected to server"), OPTION_TYPE_STRING, 0, 0, 0, "", NULL, NULL, &(cfg_server.autojoin), NULL }, + { "server_autorejoin", N_("automatically rejoin channels when kicked"), + N_("automatically rejoin channels when kicked"), + OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE, + NULL, NULL, &(cfg_server.autorejoin), NULL, NULL }, { NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL } }; @@ -805,7 +809,7 @@ config_allocate_server (char *filename, int line_number) cfg_server.autoconnect, 0, cfg_server.address, cfg_server.port, cfg_server.password, cfg_server.nick1, cfg_server.nick2, cfg_server.nick3, cfg_server.username, cfg_server.realname, - cfg_server.command, cfg_server.autojoin)) + cfg_server.command, cfg_server.autojoin, cfg_server.autorejoin)) { server_free_all (); gui_printf (NULL, @@ -1235,6 +1239,7 @@ config_create_default () fprintf (file, "server_command=\n"); fprintf (file, "server_autojoin=\n"); + fprintf (file, "server_autorejoin=on\n"); fclose (file); free (filename); @@ -1372,6 +1377,8 @@ config_write (char *config_name) (ptr_server->command) ? ptr_server->command : ""); fprintf (file, "server_autojoin=%s\n", (ptr_server->autojoin) ? ptr_server->autojoin : ""); + fprintf (file, "server_autorejoin=%s\n", + (ptr_server->autorejoin) ? "on" : "off"); } } diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c index 4c969e625..b41d9f257 100644 --- a/src/gui/curses/gui-display.c +++ b/src/gui/curses/gui-display.c @@ -745,7 +745,7 @@ gui_draw_buffer_nick (t_gui_buffer *buffer, int erase) } } - if (CHANNEL(buffer) && CHANNEL(buffer)->nicks) + if (gui_buffer_has_nicklist (buffer)) { max_length = nick_get_max_length (CHANNEL(buffer)); if ((buffer == gui_current_window->buffer) && @@ -956,8 +956,12 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase) wprintw (ptr_win->win_status, ":"); gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS); - wprintw (ptr_win->win_status, "%s", - CHANNEL(ptr_win->buffer)->name); + if (CHANNEL(ptr_win->buffer)->nicks) + wprintw (ptr_win->win_status, "%s", + CHANNEL(ptr_win->buffer)->name); + else + wprintw (ptr_win->win_status, "(%s)", + CHANNEL(ptr_win->buffer)->name); if (ptr_win->buffer == CHANNEL(ptr_win->buffer)->buffer) { /* display channel modes */ diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c index 70ac0118f..c328cbcbc 100644 --- a/src/irc/irc-recv.c +++ b/src/irc/irc-recv.c @@ -262,11 +262,23 @@ irc_cmd_recv_kick (t_irc_server *server, char *host, char *arguments) WEECHAT_ERROR, "kick"); return -1; } - ptr_nick = nick_search (ptr_channel, pos_nick); - if (ptr_nick) + if (strcmp (pos_nick, server->nick) == 0) { - nick_free (ptr_channel, ptr_nick); + /* my nick was kicked => free all nicks, channel is not active any more */ + nick_free_all (ptr_channel); gui_draw_buffer_nick (gui_current_window->buffer, 1); + gui_draw_buffer_status (gui_current_window->buffer, 1); + if (server->autorejoin) + irc_cmd_send_join (server, ptr_channel->name); + } + { + /* someone was kicked from channel (but not me) => remove only this nick */ + ptr_nick = nick_search (ptr_channel, pos_nick); + if (ptr_nick) + { + nick_free (ptr_channel, ptr_nick); + gui_draw_buffer_nick (gui_current_window->buffer, 1); + } } return 0; } diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c index ba5e75808..b02111cc0 100644 --- a/src/irc/irc-server.c +++ b/src/irc/irc-server.c @@ -292,7 +292,8 @@ server_free_all () t_irc_server * server_new (char *name, int autoconnect, int command_line, char *address, int port, char *password, char *nick1, char *nick2, char *nick3, - char *username, char *realname, char *command, char *autojoin) + char *username, char *realname, char *command, char *autojoin, + int autorejoin) { t_irc_server *new_server; @@ -302,11 +303,12 @@ server_new (char *name, int autoconnect, int command_line, char *address, #ifdef DEBUG wee_log_printf ("creating new server (name:%s, address:%s, port:%d, pwd:%s, " "nick1:%s, nick2:%s, nick3:%s, username:%s, realname:%s, " - "command:%s, autojoin:%s)\n", + "command:%s, autojoin:%s, autorejoin:%s)\n", name, address, port, (password) ? password : "", (nick1) ? nick1 : "", (nick2) ? nick2 : "", (nick3) ? nick3 : "", (username) ? username : "", (realname) ? realname : "", - (command) ? command : "", (autojoin) ? autojoin : ""); + (command) ? command : "", (autojoin) ? autojoin : "", + (autorejoin) ? "on" : "off"); #endif if ((new_server = server_alloc ())) @@ -328,6 +330,7 @@ server_new (char *name, int autoconnect, int command_line, char *address, (command) ? strdup (command) : NULL; new_server->autojoin = (autojoin) ? strdup (autojoin) : NULL; + new_server->autorejoin = autorejoin; new_server->nick = strdup (new_server->nick1); } else diff --git a/src/irc/irc.h b/src/irc/irc.h index 15724351f..4f75db621 100644 --- a/src/irc/irc.h +++ b/src/irc/irc.h @@ -127,6 +127,7 @@ struct t_irc_server char *realname; /* real name */ char *command; /* command to run once connected */ char *autojoin; /* channels to automatically join */ + int autorejoin; /* auto rejoin channels when kicked */ /* internal vars */ char *nick; /* current nickname */ @@ -213,7 +214,8 @@ extern void server_destroy (t_irc_server *); extern void server_free (t_irc_server *); extern void server_free_all (); extern t_irc_server *server_new (char *, int, int, char *, int, char *, char *, - char *, char *, char *, char *, char *, char *); + char *, char *, char *, char *, char *, char *, + int); extern int server_send (t_irc_server *, char *, int); extern void server_sendf (t_irc_server *, char *, ...); extern void server_recv (t_irc_server *); diff --git a/weechat/ChangeLog b/weechat/ChangeLog index 69175bd49..9864cee36 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -1,10 +1,11 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2004-10-03 +ChangeLog - 2004-10-17 Version 0.0.8 (under dev!): + * auto-rejoin channels when kicked (new config option: server_autorejoin on/off) * added IRC::command function for Perl scripts * fixed bug when adding alias with same name as other * /buffer command developed (buffers list, move and notify) diff --git a/weechat/po/fr.po b/weechat/po/fr.po index 0185e66c5..05a28a6e9 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.0.8-pre2\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2004-10-03 03:44+0200\n" +"POT-Creation-Date: 2004-10-17 11:02+0200\n" "PO-Revision-Date: 2004-08-08 20:47+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" @@ -20,94 +20,94 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "%s ompossible d'allouer un nouveau pseudo\n" -#: src/irc/irc-server.c:130 src/common/weeconfig.c:1227 +#: src/irc/irc-server.c:129 src/common/weeconfig.c:1231 msgid "Unable to get user's name" msgstr "Impossible de déterminer le nom d'utilisateur" -#: src/irc/irc-server.c:195 +#: src/irc/irc-server.c:194 #, c-format msgid "%s cannot allocate new server\n" msgstr "%s impossible d'allouer un nouveau serveur\n" -#: src/irc/irc-server.c:382 +#: src/irc/irc-server.c:384 #, c-format msgid "%s error sending data to IRC server\n" msgstr "%s erreur d'envoi de données au serveur IRC\n" -#: src/irc/irc-server.c:399 src/irc/irc-server.c:410 src/irc/irc-server.c:464 +#: src/irc/irc-server.c:401 src/irc/irc-server.c:412 src/irc/irc-server.c:466 #, c-format msgid "%s not enough memory for received IRC message\n" msgstr "%s mémoire insuffisante pour un message IRC reçu\n" -#: src/irc/irc-server.c:471 +#: src/irc/irc-server.c:473 #, c-format msgid "%s unable to explode received buffer\n" msgstr "%s impossible d'exploser le tampon de réception\n" -#: src/irc/irc-server.c:544 +#: src/irc/irc-server.c:546 #, c-format msgid "Command '%s' failed!\n" msgstr "La commande '%s' a échoué !\n" -#: src/irc/irc-server.c:548 +#: src/irc/irc-server.c:550 msgid "No command to execute!\n" msgstr "Pas de commande à exécuter !\n" -#: src/irc/irc-server.c:552 +#: src/irc/irc-server.c:554 #, c-format msgid "Unknown command: cmd=%s, args=%s\n" msgstr "Commande inconnue: cmd=%s, params=%s\n" -#: src/irc/irc-server.c:604 +#: src/irc/irc-server.c:606 #, c-format msgid "%s: connecting to %s:%d...\n" msgstr "%s: connexion à %s:%d...\n" -#: src/irc/irc-server.c:606 +#: src/irc/irc-server.c:608 #, c-format msgid "connecting to server %s:%d...\n" msgstr "connexion au serveur %s:%d...\n" -#: src/irc/irc-server.c:614 +#: src/irc/irc-server.c:616 #, c-format msgid "%s cannot create pipe\n" msgstr "%s impossible de créer le pipe\n" -#: src/irc/irc-server.c:628 +#: src/irc/irc-server.c:630 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "%s impossible de paramétrer l'option socket \"SO_REUSEADDR\"\n" -#: src/irc/irc-server.c:635 +#: src/irc/irc-server.c:637 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "%s impossible de paramétrer l'option socket \"SO_KEEPALIVE\"\n" -#: src/irc/irc-server.c:643 +#: src/irc/irc-server.c:645 #, c-format msgid "%s address \"%s\" not found\n" msgstr "%s adresse \"%s\" introuvable\n" -#: src/irc/irc-server.c:666 +#: src/irc/irc-server.c:668 #, c-format msgid "%s IP address not found\n" msgstr "%s adresse IP introuvable\n" -#: src/irc/irc-server.c:676 +#: src/irc/irc-server.c:678 #, c-format msgid "%s: server IP is: %s\n" msgstr "%s: l'adresse IP du serveur est : %s\n" -#: src/irc/irc-server.c:682 +#: src/irc/irc-server.c:684 #, c-format msgid "%s cannot connect to irc server\n" msgstr "%s connexion au serveur irc impossible\n" -#: src/irc/irc-server.c:732 +#: src/irc/irc-server.c:733 msgid "Disconnected from server!\n" msgstr "Déconnecté du serveur !\n" -#: src/irc/irc-channel.c:51 +#: src/irc/irc-channel.c:50 #, c-format msgid "%s cannot allocate new channel" msgstr "%s impossible d'allouer un nouveau canal" @@ -1137,7 +1137,7 @@ msgstr "drapeau de mode inconnu" msgid "can't change mode for other users" msgstr "impossible de changer le mode pour les autres utilisateurs" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2896 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2907 msgid "unknown" msgstr "inconnu" @@ -1162,12 +1162,12 @@ msgstr "" "%s la commande \"%s\" ne peut pas être exécutée dans une fenêtre serveur\n" #: src/irc/irc-send.c:556 src/irc/irc-send.c:578 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:996 +#: src/irc/irc-recv.c:1007 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n" -#: src/irc/irc-send.c:592 src/irc/irc-send.c:833 src/irc/irc-recv.c:1156 +#: src/irc/irc-send.c:592 src/irc/irc-send.c:833 src/irc/irc-recv.c:1167 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "%s impossible de créer la fenêtre privée \"%s\"\n" @@ -1191,8 +1191,8 @@ msgstr "%s impossible de cr msgid " has joined " msgstr " a rejoint " -#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:865 -#: src/irc/irc-recv.c:1005 src/irc/irc-recv.c:2396 src/irc/irc-recv.c:2461 +#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:592 src/irc/irc-recv.c:876 +#: src/irc/irc-recv.c:1016 src/irc/irc-recv.c:2407 src/irc/irc-recv.c:2472 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "%s canal non trouvé pour la commande \"%s\"\n" @@ -1205,350 +1205,350 @@ msgstr " a pouss msgid " from " msgstr " de " -#: src/irc/irc-recv.c:307 +#: src/irc/irc-recv.c:318 msgid "sets ban on" msgstr "instaure un bannissement sur" -#: src/irc/irc-recv.c:308 +#: src/irc/irc-recv.c:319 msgid "removes ban on" msgstr "supprime le banissement sur" -#: src/irc/irc-recv.c:325 +#: src/irc/irc-recv.c:336 msgid "sets invite-only channel flag" msgstr "définit le canal en mode invité seulement" -#: src/irc/irc-recv.c:326 +#: src/irc/irc-recv.c:337 msgid "removes invite-only channel flag" msgstr "supprime le mode invité seulement pour le canal" -#: src/irc/irc-recv.c:343 +#: src/irc/irc-recv.c:354 msgid "sets channel key to" msgstr "définit la clé du canal à" -#: src/irc/irc-recv.c:344 +#: src/irc/irc-recv.c:355 msgid "removes channel key" msgstr "supprime la clé du canal" -#: src/irc/irc-recv.c:375 +#: src/irc/irc-recv.c:386 msgid "sets the user limit to" msgstr "définit la limite d'utilisateurs à" -#: src/irc/irc-recv.c:376 +#: src/irc/irc-recv.c:387 msgid "removes user limit" msgstr "supprime la limite d'utilisateurs" -#: src/irc/irc-recv.c:398 +#: src/irc/irc-recv.c:409 msgid "sets moderated channel flag" msgstr "instaure la modération sur le canal" -#: src/irc/irc-recv.c:399 +#: src/irc/irc-recv.c:410 msgid "removes moderated channel flag" msgstr "supprime la modération sur le canal" -#: src/irc/irc-recv.c:409 +#: src/irc/irc-recv.c:420 msgid "sets messages from channel only flag" msgstr "interdit aux utilisateurs en dehors du canal d'y écrire" -#: src/irc/irc-recv.c:410 +#: src/irc/irc-recv.c:421 msgid "removes messages from channel only flag" msgstr "autorise tout utilisateur à écrire sur le canal" -#: src/irc/irc-recv.c:427 +#: src/irc/irc-recv.c:438 msgid "gives channel operator status to" msgstr "donne le droit opérateur à" -#: src/irc/irc-recv.c:428 +#: src/irc/irc-recv.c:439 msgid "removes channel operator status from" msgstr "supprime le droit opérateur à" -#: src/irc/irc-recv.c:455 +#: src/irc/irc-recv.c:466 msgid "sets private channel flag" msgstr "définit le canal comme privé" -#: src/irc/irc-recv.c:456 +#: src/irc/irc-recv.c:467 msgid "removes private channel flag" msgstr "supprime le mode privé pour le canal" -#: src/irc/irc-recv.c:466 +#: src/irc/irc-recv.c:477 msgid "sets secret channel flag" msgstr "définit le canal comme secret" -#: src/irc/irc-recv.c:467 +#: src/irc/irc-recv.c:478 msgid "removes secret channel flag" msgstr "supprime le mode secret pour le canal" -#: src/irc/irc-recv.c:477 +#: src/irc/irc-recv.c:488 msgid "sets topic protection" msgstr "active la protection du titre" -#: src/irc/irc-recv.c:478 +#: src/irc/irc-recv.c:489 msgid "removes topic protection" msgstr "supprime la protection du titre" -#: src/irc/irc-recv.c:495 +#: src/irc/irc-recv.c:506 msgid "gives voice to" msgstr "donne la voix à" -#: src/irc/irc-recv.c:496 +#: src/irc/irc-recv.c:507 msgid "removes voice from" msgstr "supprime la voix de" -#: src/irc/irc-recv.c:538 src/irc/irc-recv.c:611 src/irc/irc-recv.c:907 -#: src/irc/irc-recv.c:1250 +#: src/irc/irc-recv.c:549 src/irc/irc-recv.c:622 src/irc/irc-recv.c:918 +#: src/irc/irc-recv.c:1261 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "%s commande \"%s\" reçue sans host\n" -#: src/irc/irc-recv.c:552 +#: src/irc/irc-recv.c:563 #, c-format msgid "%s \"%s\" command received without channel or nickname\n" msgstr "%s commande \"%s\" reçue sans canal ou utilisateur\n" -#: src/irc/irc-recv.c:649 +#: src/irc/irc-recv.c:660 msgid "You are " msgstr "Vous êtes " -#: src/irc/irc-recv.c:656 +#: src/irc/irc-recv.c:667 msgid " is " msgstr " est " -#: src/irc/irc-recv.c:660 +#: src/irc/irc-recv.c:671 msgid "now known as " msgstr "maintenant connu sous le nom " -#: src/irc/irc-recv.c:713 +#: src/irc/irc-recv.c:724 #, c-format msgid "%s nickname not found for \"%s\" command\n" msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:726 src/irc/irc-recv.c:758 +#: src/irc/irc-recv.c:737 src/irc/irc-recv.c:769 msgid "reply from" msgstr "réponse de" -#: src/irc/irc-recv.c:761 +#: src/irc/irc-recv.c:772 #, c-format msgid ": %ld.%ld seconds\n" msgstr ": %ld.%ld secondes\n" -#: src/irc/irc-recv.c:791 +#: src/irc/irc-recv.c:802 #, c-format msgid "%s \"%s\" command received without host or channel\n" msgstr "%s commande \"%s\" reçue sans host ou canal\n" -#: src/irc/irc-recv.c:841 +#: src/irc/irc-recv.c:852 msgid " has left " msgstr " a quitté " -#: src/irc/irc-recv.c:956 src/irc/irc-recv.c:1182 +#: src/irc/irc-recv.c:967 src/irc/irc-recv.c:1193 #, c-format msgid "On %s: * %s %s" msgstr "Sur %s: * %s %s" -#: src/irc/irc-recv.c:982 +#: src/irc/irc-recv.c:993 #, c-format msgid "On %s: %s> %s" msgstr "Sur %s: %s> %s" -#: src/irc/irc-recv.c:1050 +#: src/irc/irc-recv.c:1061 msgid "Received a " msgstr "Reçu un " -#: src/irc/irc-recv.c:1052 +#: src/irc/irc-recv.c:1063 msgid "CTCP VERSION " msgstr "CTCP VERSION " -#: src/irc/irc-recv.c:1054 +#: src/irc/irc-recv.c:1065 msgid "from" msgstr "de" -#: src/irc/irc-recv.c:1089 src/irc/irc-recv.c:1103 src/irc/irc-recv.c:1118 -#: src/irc/irc-recv.c:1133 src/irc/irc-recv.c:1227 src/irc/irc-recv.c:2682 -#: src/irc/irc-recv.c:2722 +#: src/irc/irc-recv.c:1100 src/irc/irc-recv.c:1114 src/irc/irc-recv.c:1129 +#: src/irc/irc-recv.c:1144 src/irc/irc-recv.c:1238 src/irc/irc-recv.c:2693 +#: src/irc/irc-recv.c:2733 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s impossible d'analyser la commande \"%s\"\n" -#: src/irc/irc-recv.c:1208 +#: src/irc/irc-recv.c:1219 #, c-format msgid "Private %s> %s" msgstr "Privé %s> %s" -#: src/irc/irc-recv.c:1282 +#: src/irc/irc-recv.c:1293 msgid "has quit" msgstr "a quitté" -#: src/irc/irc-recv.c:1402 +#: src/irc/irc-recv.c:1413 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s commande \"%s\" reçue sans canal\n" -#: src/irc/irc-recv.c:1430 +#: src/irc/irc-recv.c:1441 msgid " has changed topic for " msgstr " a changé le titre pour " -#: src/irc/irc-recv.c:1435 +#: src/irc/irc-recv.c:1446 #, c-format msgid " to: \"%s\"\n" msgstr " en: \"%s\"\n" -#: src/irc/irc-recv.c:1441 +#: src/irc/irc-recv.c:1452 msgid " has unset topic for " msgstr " a retiré le titre pour " -#: src/irc/irc-recv.c:1532 +#: src/irc/irc-recv.c:1543 #, c-format msgid " is away: %s\n" msgstr " est absent: %s\n" -#: src/irc/irc-recv.c:1606 +#: src/irc/irc-recv.c:1617 msgid "Users online: " msgstr "Utilisateurs en ligne: " -#: src/irc/irc-recv.c:1969 +#: src/irc/irc-recv.c:1980 msgid "idle: " msgstr "inactivité: " -#: src/irc/irc-recv.c:1977 +#: src/irc/irc-recv.c:1988 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:1977 +#: src/irc/irc-recv.c:1988 msgid "day" msgstr "jour" -#: src/irc/irc-recv.c:1987 +#: src/irc/irc-recv.c:1998 msgid "hours" msgstr "heures" -#: src/irc/irc-recv.c:1987 +#: src/irc/irc-recv.c:1998 msgid "hour" msgstr "heure" -#: src/irc/irc-recv.c:1993 +#: src/irc/irc-recv.c:2004 msgid "minutes" msgstr "minutes" -#: src/irc/irc-recv.c:1993 +#: src/irc/irc-recv.c:2004 msgid "minute" msgstr "minute" -#: src/irc/irc-recv.c:1999 +#: src/irc/irc-recv.c:2010 msgid "seconds" msgstr "secondes" -#: src/irc/irc-recv.c:1999 +#: src/irc/irc-recv.c:2010 msgid "second" msgstr "seconde" -#: src/irc/irc-recv.c:2004 +#: src/irc/irc-recv.c:2015 msgid "signon at: " msgstr "signé le: " -#: src/irc/irc-recv.c:2092 +#: src/irc/irc-recv.c:2103 msgid "Channels: " msgstr "Canaux: " -#: src/irc/irc-recv.c:2343 +#: src/irc/irc-recv.c:2354 msgid "No topic set for " msgstr "Pas de titre défini pour " -#: src/irc/irc-recv.c:2385 +#: src/irc/irc-recv.c:2396 msgid "Topic for " msgstr "Le titre pour " -#: src/irc/irc-recv.c:2389 +#: src/irc/irc-recv.c:2400 #, c-format msgid " is: \"%s\"\n" msgstr " est: \"%s\"\n" -#: src/irc/irc-recv.c:2405 src/irc/irc-recv.c:2485 +#: src/irc/irc-recv.c:2416 src/irc/irc-recv.c:2496 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "%s impossible de déterminer le canal pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2451 +#: src/irc/irc-recv.c:2462 msgid "Topic set by " msgstr "Titre défini par " -#: src/irc/irc-recv.c:2469 +#: src/irc/irc-recv.c:2480 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "%s impossible d'identifier la date/heure pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2477 +#: src/irc/irc-recv.c:2488 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" "%s impossible de déterminer le nom d'utilisateur pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2606 +#: src/irc/irc-recv.c:2617 msgid " on " msgstr " sur " -#: src/irc/irc-recv.c:2713 +#: src/irc/irc-recv.c:2724 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "%s impossible de créer l'utilisateur \"%s\" pour le canal \"%s\"\n" -#: src/irc/irc-recv.c:2766 +#: src/irc/irc-recv.c:2777 msgid "Nicks " msgstr "Utilisateurs " -#: src/irc/irc-recv.c:2786 +#: src/irc/irc-recv.c:2797 msgid "Channel " msgstr "Canal " -#: src/irc/irc-recv.c:2797 +#: src/irc/irc-recv.c:2808 msgid "nicks" msgstr "utilisateurs" -#: src/irc/irc-recv.c:2797 +#: src/irc/irc-recv.c:2808 msgid "nick" msgstr "utilisateur" -#: src/irc/irc-recv.c:2805 +#: src/irc/irc-recv.c:2816 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:2805 +#: src/irc/irc-recv.c:2816 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:2814 +#: src/irc/irc-recv.c:2825 msgid "halfops" msgstr "halfops" -#: src/irc/irc-recv.c:2814 +#: src/irc/irc-recv.c:2825 msgid "halfop" msgstr "halfop" -#: src/irc/irc-recv.c:2823 +#: src/irc/irc-recv.c:2834 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:2823 +#: src/irc/irc-recv.c:2834 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:2832 +#: src/irc/irc-recv.c:2843 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:2865 +#: src/irc/irc-recv.c:2876 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 2nd " "nom d'utilisateur \"%s\"\n" -#: src/irc/irc-recv.c:2876 +#: src/irc/irc-recv.c:2887 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai du 3ème nom " "d'utilisateur \"%s\"\n" -#: src/irc/irc-recv.c:2885 +#: src/irc/irc-recv.c:2896 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1640,32 +1640,40 @@ msgid "Perl error: wrong parameters for IRC::print_infobar Perl function\n" msgstr "" "Erreur Perl: mauvais paramètres pour la fonction Perl IRC::print_infobar\n" -#: src/plugins/perl/wee-perl.c:450 +#: src/plugins/perl/wee-perl.c:256 +msgid "Perl error: server not found for IRC::command Perl function\n" +msgstr "Erreur Perl: serveur non trouvé pour la fonction Perl IRC::command\n" + +#: src/plugins/perl/wee-perl.c:357 +msgid "Perl error: server not found for IRC::get_info Perl function\n" +msgstr "Erreur Perl: serveur non trouvé pour la fonction Perl IRC::get_info\n" + +#: src/plugins/perl/wee-perl.c:526 #, c-format msgid "Perl error: %s\n" msgstr "Erreur Perl: %s\n" -#: src/plugins/perl/wee-perl.c:460 +#: src/plugins/perl/wee-perl.c:536 #, c-format msgid "Perl error: too much values from \"%s\" (%d). Expected: 1.\n" msgstr "Erreur Perl: trop de valeurs de \"%s\" (%d). Attendue: 1.\n" -#: src/plugins/perl/wee-perl.c:482 +#: src/plugins/perl/wee-perl.c:558 #, c-format msgid "loading Perl script \"%s\"\n" msgstr "chargement du script Perl \"%s\"\n" -#: src/plugins/perl/wee-perl.c:484 +#: src/plugins/perl/wee-perl.c:560 #, c-format msgid "Loading Perl script \"%s\"\n" msgstr "Chargement du script Perl \"%s\"\n" -#: src/plugins/perl/wee-perl.c:533 +#: src/plugins/perl/wee-perl.c:609 #, c-format msgid "unloading Perl script \"%s\"\n" msgstr "déchargement du script Perl \"%s\"\n" -#: src/plugins/perl/wee-perl.c:550 +#: src/plugins/perl/wee-perl.c:626 msgid "unloading all Perl scripts...\n" msgstr "déchargement de tous les scripts Perl...\n" @@ -3115,57 +3123,61 @@ msgstr "" "liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au " "serveur" -#: src/common/weeconfig.c:791 +#: src/common/weeconfig.c:572 src/common/weeconfig.c:573 +msgid "automatically rejoin channels when kicked" +msgstr "rejoindre automatiquement les canaux quand mis dehors" + +#: src/common/weeconfig.c:795 #, 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:800 +#: src/common/weeconfig.c:804 #, 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:812 +#: src/common/weeconfig.c:816 #, 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:851 +#: src/common/weeconfig.c:855 #, 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:862 +#: src/common/weeconfig.c:866 #, 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:901 +#: src/common/weeconfig.c:905 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "%s fichier de configuration \"%s\" non trouvé.\n" -#: src/common/weeconfig.c:933 +#: src/common/weeconfig.c:937 #, 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:950 +#: src/common/weeconfig.c:954 #, 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:968 +#: src/common/weeconfig.c:972 #, 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:1002 +#: src/common/weeconfig.c:1006 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "%s %s, ligne %d: option \"%s\" invalide\n" -#: src/common/weeconfig.c:1013 +#: src/common/weeconfig.c:1017 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" @@ -3174,7 +3186,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:1022 +#: src/common/weeconfig.c:1026 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3183,7 +3195,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:1033 +#: src/common/weeconfig.c:1037 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3192,26 +3204,26 @@ msgstr "" "%s %s, ligne %d: valeur invalide pour l'option '%s'\n" "Attendu: une de ces chaînes: " -#: src/common/weeconfig.c:1049 +#: src/common/weeconfig.c:1053 #, 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:1108 src/common/weeconfig.c:1276 +#: src/common/weeconfig.c:1112 src/common/weeconfig.c:1281 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "%s impossible de créer le fichier \"%s\"\n" -#: src/common/weeconfig.c:1114 +#: src/common/weeconfig.c:1118 #, 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:1115 +#: src/common/weeconfig.c:1119 msgid "creating default config file\n" msgstr "création du fichier de configuration par défaut\n" -#: src/common/weeconfig.c:1118 src/common/weeconfig.c:1285 +#: src/common/weeconfig.c:1122 src/common/weeconfig.c:1290 #, c-format msgid "" "#\n" @@ -3220,7 +3232,7 @@ msgstr "" "#\n" "# %s: fichier de configuration, créé par %s v%s le %s#\n" -#: src/common/weeconfig.c:1282 +#: src/common/weeconfig.c:1287 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 905fa45de..ff135768b 100644 --- a/weechat/po/weechat.pot +++ b/weechat/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2004-10-03 03:44+0200\n" +"POT-Creation-Date: 2004-10-17 11:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,94 +20,94 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "" -#: src/irc/irc-server.c:130 src/common/weeconfig.c:1227 +#: src/irc/irc-server.c:129 src/common/weeconfig.c:1231 msgid "Unable to get user's name" msgstr "" -#: src/irc/irc-server.c:195 +#: src/irc/irc-server.c:194 #, c-format msgid "%s cannot allocate new server\n" msgstr "" -#: src/irc/irc-server.c:382 +#: src/irc/irc-server.c:384 #, c-format msgid "%s error sending data to IRC server\n" msgstr "" -#: src/irc/irc-server.c:399 src/irc/irc-server.c:410 src/irc/irc-server.c:464 +#: src/irc/irc-server.c:401 src/irc/irc-server.c:412 src/irc/irc-server.c:466 #, c-format msgid "%s not enough memory for received IRC message\n" msgstr "" -#: src/irc/irc-server.c:471 +#: src/irc/irc-server.c:473 #, c-format msgid "%s unable to explode received buffer\n" msgstr "" -#: src/irc/irc-server.c:544 +#: src/irc/irc-server.c:546 #, c-format msgid "Command '%s' failed!\n" msgstr "" -#: src/irc/irc-server.c:548 +#: src/irc/irc-server.c:550 msgid "No command to execute!\n" msgstr "" -#: src/irc/irc-server.c:552 +#: src/irc/irc-server.c:554 #, c-format msgid "Unknown command: cmd=%s, args=%s\n" msgstr "" -#: src/irc/irc-server.c:604 +#: src/irc/irc-server.c:606 #, c-format msgid "%s: connecting to %s:%d...\n" msgstr "" -#: src/irc/irc-server.c:606 +#: src/irc/irc-server.c:608 #, c-format msgid "connecting to server %s:%d...\n" msgstr "" -#: src/irc/irc-server.c:614 +#: src/irc/irc-server.c:616 #, c-format msgid "%s cannot create pipe\n" msgstr "" -#: src/irc/irc-server.c:628 +#: src/irc/irc-server.c:630 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "" -#: src/irc/irc-server.c:635 +#: src/irc/irc-server.c:637 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "" -#: src/irc/irc-server.c:643 +#: src/irc/irc-server.c:645 #, c-format msgid "%s address \"%s\" not found\n" msgstr "" -#: src/irc/irc-server.c:666 +#: src/irc/irc-server.c:668 #, c-format msgid "%s IP address not found\n" msgstr "" -#: src/irc/irc-server.c:676 +#: src/irc/irc-server.c:678 #, c-format msgid "%s: server IP is: %s\n" msgstr "" -#: src/irc/irc-server.c:682 +#: src/irc/irc-server.c:684 #, c-format msgid "%s cannot connect to irc server\n" msgstr "" -#: src/irc/irc-server.c:732 +#: src/irc/irc-server.c:733 msgid "Disconnected from server!\n" msgstr "" -#: src/irc/irc-channel.c:51 +#: src/irc/irc-channel.c:50 #, c-format msgid "%s cannot allocate new channel" msgstr "" @@ -1046,7 +1046,7 @@ msgstr "" msgid "can't change mode for other users" msgstr "" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2896 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2907 msgid "unknown" msgstr "" @@ -1068,12 +1068,12 @@ msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" #: src/irc/irc-send.c:556 src/irc/irc-send.c:578 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:996 +#: src/irc/irc-recv.c:1007 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:592 src/irc/irc-send.c:833 src/irc/irc-recv.c:1156 +#: src/irc/irc-send.c:592 src/irc/irc-send.c:833 src/irc/irc-recv.c:1167 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "" @@ -1097,8 +1097,8 @@ msgstr "" msgid " has joined " msgstr "" -#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:865 -#: src/irc/irc-recv.c:1005 src/irc/irc-recv.c:2396 src/irc/irc-recv.c:2461 +#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:592 src/irc/irc-recv.c:876 +#: src/irc/irc-recv.c:1016 src/irc/irc-recv.c:2407 src/irc/irc-recv.c:2472 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "" @@ -1111,345 +1111,345 @@ msgstr "" msgid " from " msgstr "" -#: src/irc/irc-recv.c:307 +#: src/irc/irc-recv.c:318 msgid "sets ban on" msgstr "" -#: src/irc/irc-recv.c:308 +#: src/irc/irc-recv.c:319 msgid "removes ban on" msgstr "" -#: src/irc/irc-recv.c:325 +#: src/irc/irc-recv.c:336 msgid "sets invite-only channel flag" msgstr "" -#: src/irc/irc-recv.c:326 +#: src/irc/irc-recv.c:337 msgid "removes invite-only channel flag" msgstr "" -#: src/irc/irc-recv.c:343 +#: src/irc/irc-recv.c:354 msgid "sets channel key to" msgstr "" -#: src/irc/irc-recv.c:344 +#: src/irc/irc-recv.c:355 msgid "removes channel key" msgstr "" -#: src/irc/irc-recv.c:375 +#: src/irc/irc-recv.c:386 msgid "sets the user limit to" msgstr "" -#: src/irc/irc-recv.c:376 +#: src/irc/irc-recv.c:387 msgid "removes user limit" msgstr "" -#: src/irc/irc-recv.c:398 +#: src/irc/irc-recv.c:409 msgid "sets moderated channel flag" msgstr "" -#: src/irc/irc-recv.c:399 +#: src/irc/irc-recv.c:410 msgid "removes moderated channel flag" msgstr "" -#: src/irc/irc-recv.c:409 +#: src/irc/irc-recv.c:420 msgid "sets messages from channel only flag" msgstr "" -#: src/irc/irc-recv.c:410 +#: src/irc/irc-recv.c:421 msgid "removes messages from channel only flag" msgstr "" -#: src/irc/irc-recv.c:427 +#: src/irc/irc-recv.c:438 msgid "gives channel operator status to" msgstr "" -#: src/irc/irc-recv.c:428 +#: src/irc/irc-recv.c:439 msgid "removes channel operator status from" msgstr "" -#: src/irc/irc-recv.c:455 +#: src/irc/irc-recv.c:466 msgid "sets private channel flag" msgstr "" -#: src/irc/irc-recv.c:456 +#: src/irc/irc-recv.c:467 msgid "removes private channel flag" msgstr "" -#: src/irc/irc-recv.c:466 +#: src/irc/irc-recv.c:477 msgid "sets secret channel flag" msgstr "" -#: src/irc/irc-recv.c:467 +#: src/irc/irc-recv.c:478 msgid "removes secret channel flag" msgstr "" -#: src/irc/irc-recv.c:477 +#: src/irc/irc-recv.c:488 msgid "sets topic protection" msgstr "" -#: src/irc/irc-recv.c:478 +#: src/irc/irc-recv.c:489 msgid "removes topic protection" msgstr "" -#: src/irc/irc-recv.c:495 +#: src/irc/irc-recv.c:506 msgid "gives voice to" msgstr "" -#: src/irc/irc-recv.c:496 +#: src/irc/irc-recv.c:507 msgid "removes voice from" msgstr "" -#: src/irc/irc-recv.c:538 src/irc/irc-recv.c:611 src/irc/irc-recv.c:907 -#: src/irc/irc-recv.c:1250 +#: src/irc/irc-recv.c:549 src/irc/irc-recv.c:622 src/irc/irc-recv.c:918 +#: src/irc/irc-recv.c:1261 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "" -#: src/irc/irc-recv.c:552 +#: src/irc/irc-recv.c:563 #, c-format msgid "%s \"%s\" command received without channel or nickname\n" msgstr "" -#: src/irc/irc-recv.c:649 +#: src/irc/irc-recv.c:660 msgid "You are " msgstr "" -#: src/irc/irc-recv.c:656 +#: src/irc/irc-recv.c:667 msgid " is " msgstr "" -#: src/irc/irc-recv.c:660 +#: src/irc/irc-recv.c:671 msgid "now known as " msgstr "" -#: src/irc/irc-recv.c:713 +#: src/irc/irc-recv.c:724 #, c-format msgid "%s nickname not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:726 src/irc/irc-recv.c:758 +#: src/irc/irc-recv.c:737 src/irc/irc-recv.c:769 msgid "reply from" msgstr "" -#: src/irc/irc-recv.c:761 +#: src/irc/irc-recv.c:772 #, c-format msgid ": %ld.%ld seconds\n" msgstr "" -#: src/irc/irc-recv.c:791 +#: src/irc/irc-recv.c:802 #, c-format msgid "%s \"%s\" command received without host or channel\n" msgstr "" -#: src/irc/irc-recv.c:841 +#: src/irc/irc-recv.c:852 msgid " has left " msgstr "" -#: src/irc/irc-recv.c:956 src/irc/irc-recv.c:1182 +#: src/irc/irc-recv.c:967 src/irc/irc-recv.c:1193 #, c-format msgid "On %s: * %s %s" msgstr "" -#: src/irc/irc-recv.c:982 +#: src/irc/irc-recv.c:993 #, c-format msgid "On %s: %s> %s" msgstr "" -#: src/irc/irc-recv.c:1050 +#: src/irc/irc-recv.c:1061 msgid "Received a " msgstr "" -#: src/irc/irc-recv.c:1052 +#: src/irc/irc-recv.c:1063 msgid "CTCP VERSION " msgstr "" -#: src/irc/irc-recv.c:1054 +#: src/irc/irc-recv.c:1065 msgid "from" msgstr "" -#: src/irc/irc-recv.c:1089 src/irc/irc-recv.c:1103 src/irc/irc-recv.c:1118 -#: src/irc/irc-recv.c:1133 src/irc/irc-recv.c:1227 src/irc/irc-recv.c:2682 -#: src/irc/irc-recv.c:2722 +#: src/irc/irc-recv.c:1100 src/irc/irc-recv.c:1114 src/irc/irc-recv.c:1129 +#: src/irc/irc-recv.c:1144 src/irc/irc-recv.c:1238 src/irc/irc-recv.c:2693 +#: src/irc/irc-recv.c:2733 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:1208 +#: src/irc/irc-recv.c:1219 #, c-format msgid "Private %s> %s" msgstr "" -#: src/irc/irc-recv.c:1282 +#: src/irc/irc-recv.c:1293 msgid "has quit" msgstr "" -#: src/irc/irc-recv.c:1402 +#: src/irc/irc-recv.c:1413 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "" -#: src/irc/irc-recv.c:1430 +#: src/irc/irc-recv.c:1441 msgid " has changed topic for " msgstr "" -#: src/irc/irc-recv.c:1435 +#: src/irc/irc-recv.c:1446 #, c-format msgid " to: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:1441 +#: src/irc/irc-recv.c:1452 msgid " has unset topic for " msgstr "" -#: src/irc/irc-recv.c:1532 +#: src/irc/irc-recv.c:1543 #, c-format msgid " is away: %s\n" msgstr "" -#: src/irc/irc-recv.c:1606 +#: src/irc/irc-recv.c:1617 msgid "Users online: " msgstr "" -#: src/irc/irc-recv.c:1969 +#: src/irc/irc-recv.c:1980 msgid "idle: " msgstr "" -#: src/irc/irc-recv.c:1977 +#: src/irc/irc-recv.c:1988 msgid "days" msgstr "" -#: src/irc/irc-recv.c:1977 +#: src/irc/irc-recv.c:1988 msgid "day" msgstr "" -#: src/irc/irc-recv.c:1987 +#: src/irc/irc-recv.c:1998 msgid "hours" msgstr "" -#: src/irc/irc-recv.c:1987 +#: src/irc/irc-recv.c:1998 msgid "hour" msgstr "" -#: src/irc/irc-recv.c:1993 +#: src/irc/irc-recv.c:2004 msgid "minutes" msgstr "" -#: src/irc/irc-recv.c:1993 +#: src/irc/irc-recv.c:2004 msgid "minute" msgstr "" -#: src/irc/irc-recv.c:1999 +#: src/irc/irc-recv.c:2010 msgid "seconds" msgstr "" -#: src/irc/irc-recv.c:1999 +#: src/irc/irc-recv.c:2010 msgid "second" msgstr "" -#: src/irc/irc-recv.c:2004 +#: src/irc/irc-recv.c:2015 msgid "signon at: " msgstr "" -#: src/irc/irc-recv.c:2092 +#: src/irc/irc-recv.c:2103 msgid "Channels: " msgstr "" -#: src/irc/irc-recv.c:2343 +#: src/irc/irc-recv.c:2354 msgid "No topic set for " msgstr "" -#: src/irc/irc-recv.c:2385 +#: src/irc/irc-recv.c:2396 msgid "Topic for " msgstr "" -#: src/irc/irc-recv.c:2389 +#: src/irc/irc-recv.c:2400 #, c-format msgid " is: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2405 src/irc/irc-recv.c:2485 +#: src/irc/irc-recv.c:2416 src/irc/irc-recv.c:2496 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2451 +#: src/irc/irc-recv.c:2462 msgid "Topic set by " msgstr "" -#: src/irc/irc-recv.c:2469 +#: src/irc/irc-recv.c:2480 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2477 +#: src/irc/irc-recv.c:2488 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2606 +#: src/irc/irc-recv.c:2617 msgid " on " msgstr "" -#: src/irc/irc-recv.c:2713 +#: src/irc/irc-recv.c:2724 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2766 +#: src/irc/irc-recv.c:2777 msgid "Nicks " msgstr "" -#: src/irc/irc-recv.c:2786 +#: src/irc/irc-recv.c:2797 msgid "Channel " msgstr "" -#: src/irc/irc-recv.c:2797 +#: src/irc/irc-recv.c:2808 msgid "nicks" msgstr "" -#: src/irc/irc-recv.c:2797 +#: src/irc/irc-recv.c:2808 msgid "nick" msgstr "" -#: src/irc/irc-recv.c:2805 +#: src/irc/irc-recv.c:2816 msgid "ops" msgstr "" -#: src/irc/irc-recv.c:2805 +#: src/irc/irc-recv.c:2816 msgid "op" msgstr "" -#: src/irc/irc-recv.c:2814 +#: src/irc/irc-recv.c:2825 msgid "halfops" msgstr "" -#: src/irc/irc-recv.c:2814 +#: src/irc/irc-recv.c:2825 msgid "halfop" msgstr "" -#: src/irc/irc-recv.c:2823 +#: src/irc/irc-recv.c:2834 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:2823 +#: src/irc/irc-recv.c:2834 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:2832 +#: src/irc/irc-recv.c:2843 msgid "normal" msgstr "" -#: src/irc/irc-recv.c:2865 -#, c-format -msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" -msgstr "" - #: src/irc/irc-recv.c:2876 #, c-format +msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" +msgstr "" + +#: src/irc/irc-recv.c:2887 +#, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2885 +#: src/irc/irc-recv.c:2896 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1535,32 +1535,40 @@ msgstr "" msgid "Perl error: wrong parameters for IRC::print_infobar Perl function\n" msgstr "" -#: src/plugins/perl/wee-perl.c:450 +#: src/plugins/perl/wee-perl.c:256 +msgid "Perl error: server not found for IRC::command Perl function\n" +msgstr "" + +#: src/plugins/perl/wee-perl.c:357 +msgid "Perl error: server not found for IRC::get_info Perl function\n" +msgstr "" + +#: src/plugins/perl/wee-perl.c:526 #, c-format msgid "Perl error: %s\n" msgstr "" -#: src/plugins/perl/wee-perl.c:460 +#: src/plugins/perl/wee-perl.c:536 #, c-format msgid "Perl error: too much values from \"%s\" (%d). Expected: 1.\n" msgstr "" -#: src/plugins/perl/wee-perl.c:482 +#: src/plugins/perl/wee-perl.c:558 #, c-format msgid "loading Perl script \"%s\"\n" msgstr "" -#: src/plugins/perl/wee-perl.c:484 +#: src/plugins/perl/wee-perl.c:560 #, c-format msgid "Loading Perl script \"%s\"\n" msgstr "" -#: src/plugins/perl/wee-perl.c:533 +#: src/plugins/perl/wee-perl.c:609 #, c-format msgid "unloading Perl script \"%s\"\n" msgstr "" -#: src/plugins/perl/wee-perl.c:550 +#: src/plugins/perl/wee-perl.c:626 msgid "unloading all Perl scripts...\n" msgstr "" @@ -2921,103 +2929,107 @@ msgstr "" msgid "comma separated list of channels to join when connected to server" msgstr "" -#: src/common/weeconfig.c:791 +#: src/common/weeconfig.c:572 src/common/weeconfig.c:573 +msgid "automatically rejoin channels when kicked" +msgstr "" + +#: src/common/weeconfig.c:795 #, c-format msgid "%s %s, line %d: new server, but previous was incomplete\n" msgstr "" -#: src/common/weeconfig.c:800 +#: src/common/weeconfig.c:804 #, c-format msgid "%s %s, line %d: server '%s' already exists\n" msgstr "" -#: src/common/weeconfig.c:812 +#: src/common/weeconfig.c:816 #, c-format msgid "%s %s, line %d: unable to create server\n" msgstr "" -#: src/common/weeconfig.c:851 +#: src/common/weeconfig.c:855 #, c-format msgid "%s unable to assign default int with string (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:862 +#: src/common/weeconfig.c:866 #, c-format msgid "%s unable to assign default color (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:901 +#: src/common/weeconfig.c:905 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "" -#: src/common/weeconfig.c:933 +#: src/common/weeconfig.c:937 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"]\"\n" msgstr "" -#: src/common/weeconfig.c:950 +#: src/common/weeconfig.c:954 #, c-format msgid "%s %s, line %d: unknown section identifier (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:968 +#: src/common/weeconfig.c:972 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"=\"\n" msgstr "" -#: src/common/weeconfig.c:1002 +#: src/common/weeconfig.c:1006 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "" -#: src/common/weeconfig.c:1013 +#: src/common/weeconfig.c:1017 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" "Expected: boolean value: 'off' or 'on'\n" msgstr "" -#: src/common/weeconfig.c:1022 +#: src/common/weeconfig.c:1026 #, 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:1033 +#: src/common/weeconfig.c:1037 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" "Expected: one of these strings: " msgstr "" -#: src/common/weeconfig.c:1049 +#: src/common/weeconfig.c:1053 #, c-format msgid "%s %s, line %d: invalid color name for option '%s'\n" msgstr "" -#: src/common/weeconfig.c:1108 src/common/weeconfig.c:1276 +#: src/common/weeconfig.c:1112 src/common/weeconfig.c:1281 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "" -#: src/common/weeconfig.c:1114 +#: src/common/weeconfig.c:1118 #, c-format msgid "%s: creating default config file...\n" msgstr "" -#: src/common/weeconfig.c:1115 +#: src/common/weeconfig.c:1119 msgid "creating default config file\n" msgstr "" -#: src/common/weeconfig.c:1118 src/common/weeconfig.c:1285 +#: src/common/weeconfig.c:1122 src/common/weeconfig.c:1290 #, c-format msgid "" "#\n" "# %s configuration file, created by %s v%s on %s#\n" msgstr "" -#: src/common/weeconfig.c:1282 +#: src/common/weeconfig.c:1287 msgid "saving config to disk\n" msgstr "" diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c index c9bf9faaa..23a5226f8 100644 --- a/weechat/src/common/command.c +++ b/weechat/src/common/command.c @@ -1607,7 +1607,7 @@ weechat_cmd_server (int argc, char **argv) server.address, server.port, server.password, server.nick1, server.nick2, server.nick3, server.username, server.realname, - server.command, server.autojoin); + server.command, server.autojoin, 1); if (new_server) { irc_display_prefix (NULL, PREFIX_INFO); diff --git a/weechat/src/common/weechat.c b/weechat/src/common/weechat.c index 776ae4005..5e98c9b9a 100644 --- a/weechat/src/common/weechat.c +++ b/weechat/src/common/weechat.c @@ -232,7 +232,7 @@ wee_parse_args (int argc, char *argv[]) server_tmp.address, server_tmp.port, server_tmp.password, server_tmp.nick1, server_tmp.nick2, server_tmp.nick3, - NULL, NULL, NULL, server_tmp.autojoin)) + NULL, NULL, NULL, server_tmp.autojoin, 1)) fprintf (stderr, _("%s unable to create server ('%s'), ignored\n"), WEECHAT_WARNING, argv[i]); server_destroy (&server_tmp); diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c index ddf275d89..d78d581ee 100644 --- a/weechat/src/common/weeconfig.c +++ b/weechat/src/common/weeconfig.c @@ -569,6 +569,10 @@ t_config_option weechat_options_server[] = N_("comma separated list of channels to join when connected to server"), OPTION_TYPE_STRING, 0, 0, 0, "", NULL, NULL, &(cfg_server.autojoin), NULL }, + { "server_autorejoin", N_("automatically rejoin channels when kicked"), + N_("automatically rejoin channels when kicked"), + OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE, + NULL, NULL, &(cfg_server.autorejoin), NULL, NULL }, { NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL } }; @@ -805,7 +809,7 @@ config_allocate_server (char *filename, int line_number) cfg_server.autoconnect, 0, cfg_server.address, cfg_server.port, cfg_server.password, cfg_server.nick1, cfg_server.nick2, cfg_server.nick3, cfg_server.username, cfg_server.realname, - cfg_server.command, cfg_server.autojoin)) + cfg_server.command, cfg_server.autojoin, cfg_server.autorejoin)) { server_free_all (); gui_printf (NULL, @@ -1235,6 +1239,7 @@ config_create_default () fprintf (file, "server_command=\n"); fprintf (file, "server_autojoin=\n"); + fprintf (file, "server_autorejoin=on\n"); fclose (file); free (filename); @@ -1372,6 +1377,8 @@ config_write (char *config_name) (ptr_server->command) ? ptr_server->command : ""); fprintf (file, "server_autojoin=%s\n", (ptr_server->autojoin) ? ptr_server->autojoin : ""); + fprintf (file, "server_autorejoin=%s\n", + (ptr_server->autorejoin) ? "on" : "off"); } } diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c index 4c969e625..b41d9f257 100644 --- a/weechat/src/gui/curses/gui-display.c +++ b/weechat/src/gui/curses/gui-display.c @@ -745,7 +745,7 @@ gui_draw_buffer_nick (t_gui_buffer *buffer, int erase) } } - if (CHANNEL(buffer) && CHANNEL(buffer)->nicks) + if (gui_buffer_has_nicklist (buffer)) { max_length = nick_get_max_length (CHANNEL(buffer)); if ((buffer == gui_current_window->buffer) && @@ -956,8 +956,12 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase) wprintw (ptr_win->win_status, ":"); gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS); - wprintw (ptr_win->win_status, "%s", - CHANNEL(ptr_win->buffer)->name); + if (CHANNEL(ptr_win->buffer)->nicks) + wprintw (ptr_win->win_status, "%s", + CHANNEL(ptr_win->buffer)->name); + else + wprintw (ptr_win->win_status, "(%s)", + CHANNEL(ptr_win->buffer)->name); if (ptr_win->buffer == CHANNEL(ptr_win->buffer)->buffer) { /* display channel modes */ diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c index 70ac0118f..c328cbcbc 100644 --- a/weechat/src/irc/irc-recv.c +++ b/weechat/src/irc/irc-recv.c @@ -262,11 +262,23 @@ irc_cmd_recv_kick (t_irc_server *server, char *host, char *arguments) WEECHAT_ERROR, "kick"); return -1; } - ptr_nick = nick_search (ptr_channel, pos_nick); - if (ptr_nick) + if (strcmp (pos_nick, server->nick) == 0) { - nick_free (ptr_channel, ptr_nick); + /* my nick was kicked => free all nicks, channel is not active any more */ + nick_free_all (ptr_channel); gui_draw_buffer_nick (gui_current_window->buffer, 1); + gui_draw_buffer_status (gui_current_window->buffer, 1); + if (server->autorejoin) + irc_cmd_send_join (server, ptr_channel->name); + } + { + /* someone was kicked from channel (but not me) => remove only this nick */ + ptr_nick = nick_search (ptr_channel, pos_nick); + if (ptr_nick) + { + nick_free (ptr_channel, ptr_nick); + gui_draw_buffer_nick (gui_current_window->buffer, 1); + } } return 0; } diff --git a/weechat/src/irc/irc-server.c b/weechat/src/irc/irc-server.c index ba5e75808..b02111cc0 100644 --- a/weechat/src/irc/irc-server.c +++ b/weechat/src/irc/irc-server.c @@ -292,7 +292,8 @@ server_free_all () t_irc_server * server_new (char *name, int autoconnect, int command_line, char *address, int port, char *password, char *nick1, char *nick2, char *nick3, - char *username, char *realname, char *command, char *autojoin) + char *username, char *realname, char *command, char *autojoin, + int autorejoin) { t_irc_server *new_server; @@ -302,11 +303,12 @@ server_new (char *name, int autoconnect, int command_line, char *address, #ifdef DEBUG wee_log_printf ("creating new server (name:%s, address:%s, port:%d, pwd:%s, " "nick1:%s, nick2:%s, nick3:%s, username:%s, realname:%s, " - "command:%s, autojoin:%s)\n", + "command:%s, autojoin:%s, autorejoin:%s)\n", name, address, port, (password) ? password : "", (nick1) ? nick1 : "", (nick2) ? nick2 : "", (nick3) ? nick3 : "", (username) ? username : "", (realname) ? realname : "", - (command) ? command : "", (autojoin) ? autojoin : ""); + (command) ? command : "", (autojoin) ? autojoin : "", + (autorejoin) ? "on" : "off"); #endif if ((new_server = server_alloc ())) @@ -328,6 +330,7 @@ server_new (char *name, int autoconnect, int command_line, char *address, (command) ? strdup (command) : NULL; new_server->autojoin = (autojoin) ? strdup (autojoin) : NULL; + new_server->autorejoin = autorejoin; new_server->nick = strdup (new_server->nick1); } else diff --git a/weechat/src/irc/irc.h b/weechat/src/irc/irc.h index 15724351f..4f75db621 100644 --- a/weechat/src/irc/irc.h +++ b/weechat/src/irc/irc.h @@ -127,6 +127,7 @@ struct t_irc_server char *realname; /* real name */ char *command; /* command to run once connected */ char *autojoin; /* channels to automatically join */ + int autorejoin; /* auto rejoin channels when kicked */ /* internal vars */ char *nick; /* current nickname */ @@ -213,7 +214,8 @@ extern void server_destroy (t_irc_server *); extern void server_free (t_irc_server *); extern void server_free_all (); extern t_irc_server *server_new (char *, int, int, char *, int, char *, char *, - char *, char *, char *, char *, char *, char *); + char *, char *, char *, char *, char *, char *, + int); extern int server_send (t_irc_server *, char *, int); extern void server_sendf (t_irc_server *, char *, ...); extern void server_recv (t_irc_server *);