diff options
| -rw-r--r-- | po/fr.po | 322 | ||||
| -rw-r--r-- | po/weechat.pot | 320 | ||||
| -rw-r--r-- | src/gui/curses/gui-display.c | 12 | ||||
| -rw-r--r-- | src/irc/irc-commands.c | 2 | ||||
| -rw-r--r-- | src/irc/irc-recv.c | 494 | ||||
| -rw-r--r-- | src/irc/irc.h | 2 | ||||
| -rw-r--r-- | weechat/po/fr.po | 322 | ||||
| -rw-r--r-- | weechat/po/weechat.pot | 320 | ||||
| -rw-r--r-- | weechat/src/gui/curses/gui-display.c | 12 | ||||
| -rw-r--r-- | weechat/src/irc/irc-commands.c | 2 | ||||
| -rw-r--r-- | weechat/src/irc/irc-recv.c | 494 | ||||
| -rw-r--r-- | weechat/src/irc/irc.h | 2 |
12 files changed, 1310 insertions, 994 deletions
@@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.0.6-pre1\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2004-02-29 17:13+0100\n" -"PO-Revision-Date: 2004-02-29 17:13+0100\n" +"POT-Creation-Date: 2004-02-29 22:06+0100\n" +"PO-Revision-Date: 2004-02-29 22:06+0100\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -793,10 +793,10 @@ msgstr "" #: src/irc/irc-commands.c:265 src/irc/irc-commands.c:266 #: src/irc/irc-commands.c:267 src/irc/irc-commands.c:268 #: src/irc/irc-commands.c:269 src/irc/irc-commands.c:270 -#: src/irc/irc-commands.c:271 src/irc/irc-commands.c:307 -#: src/irc/irc-commands.c:308 src/irc/irc-commands.c:309 +#: src/irc/irc-commands.c:271 src/irc/irc-commands.c:309 #: src/irc/irc-commands.c:310 src/irc/irc-commands.c:311 -#: src/irc/irc-commands.c:312 +#: src/irc/irc-commands.c:312 src/irc/irc-commands.c:313 +#: src/irc/irc-commands.c:314 msgid "a server message" msgstr "un message du serveur" @@ -869,18 +869,22 @@ msgid "/list end" msgstr "/list fin" #: src/irc/irc-commands.c:289 +msgid "channel mode" +msgstr "mode du canal" + +#: src/irc/irc-commands.c:291 msgid "no topic for channel" msgstr "pas de titre pour le canal" -#: src/irc/irc-commands.c:290 +#: src/irc/irc-commands.c:292 msgid "topic of channel" msgstr "titre du canal" -#: src/irc/irc-commands.c:291 +#: src/irc/irc-commands.c:293 msgid "channel :topic" msgstr "canal :titre" -#: src/irc/irc-commands.c:292 +#: src/irc/irc-commands.c:294 msgid "" "channel: name of channel\n" "topic: topic of the channel" @@ -888,27 +892,27 @@ msgstr "" "canal: nom du canal\n" "titre: titre du canal" -#: src/irc/irc-commands.c:294 +#: src/irc/irc-commands.c:296 msgid "infos about topic (nick & date changed)" msgstr "infos sur le titre (utilisateur et date de changement)" -#: src/irc/irc-commands.c:297 +#: src/irc/irc-commands.c:299 msgid "server version" msgstr "version du serveur" -#: src/irc/irc-commands.c:298 +#: src/irc/irc-commands.c:300 msgid "who" msgstr "qui" -#: src/irc/irc-commands.c:299 +#: src/irc/irc-commands.c:301 msgid "list of nicks on channel" msgstr "liste des utilisateurs sur un canal" -#: src/irc/irc-commands.c:300 +#: src/irc/irc-commands.c:302 msgid "channel :[[@|+]nick ...]" msgstr "canal :[[@|+]nick ...]" -#: src/irc/irc-commands.c:301 +#: src/irc/irc-commands.c:303 msgid "" "channel: name of channel\n" "nick: nick on the channel" @@ -916,200 +920,200 @@ msgstr "" "canal: nom du canal\n" "nick: utilisateur sur le canal" -#: src/irc/irc-commands.c:303 +#: src/irc/irc-commands.c:305 msgid "links" msgstr "liens" -#: src/irc/irc-commands.c:304 +#: src/irc/irc-commands.c:306 msgid "end of /links list" msgstr "fin de /links list" -#: src/irc/irc-commands.c:305 +#: src/irc/irc-commands.c:307 msgid "end of /names list" msgstr "fin de la liste /names" -#: src/irc/irc-commands.c:306 +#: src/irc/irc-commands.c:308 msgid "end of /whowas list" msgstr "fin de /whowas list" -#: src/irc/irc-commands.c:313 +#: src/irc/irc-commands.c:315 msgid "server local time" msgstr "heure locale du serveur" -#: src/irc/irc-commands.c:314 +#: src/irc/irc-commands.c:316 msgid "no such nick/channel" msgstr "pas de tel utilisateur/canal" -#: src/irc/irc-commands.c:316 +#: src/irc/irc-commands.c:318 msgid "no such server" msgstr "pas de tel serveur" -#: src/irc/irc-commands.c:318 +#: src/irc/irc-commands.c:320 msgid "no such channel" msgstr "pas de tel canal" -#: src/irc/irc-commands.c:320 +#: src/irc/irc-commands.c:322 msgid "cannot send to channel" msgstr "impossible d'envoyer au canal" -#: src/irc/irc-commands.c:322 +#: src/irc/irc-commands.c:324 msgid "too many channels" msgstr "trop de canaux" -#: src/irc/irc-commands.c:324 src/irc/irc-commands.c:326 -#: src/irc/irc-commands.c:328 +#: src/irc/irc-commands.c:326 src/irc/irc-commands.c:328 +#: src/irc/irc-commands.c:330 msgid "was no such nick" msgstr "n'y avait pas de tel utilisateur" -#: src/irc/irc-commands.c:330 +#: src/irc/irc-commands.c:332 msgid "no origin" msgstr "pas d'origine" -#: src/irc/irc-commands.c:332 +#: src/irc/irc-commands.c:334 msgid "no recipient" msgstr "pas de destinataire" -#: src/irc/irc-commands.c:334 +#: src/irc/irc-commands.c:336 msgid "no text to send" msgstr "pas de texte à envoyer" -#: src/irc/irc-commands.c:336 +#: src/irc/irc-commands.c:338 msgid "no toplevel" msgstr "pas de niveau supérieur" -#: src/irc/irc-commands.c:338 +#: src/irc/irc-commands.c:340 msgid "wilcard in toplevel domain" msgstr "caractère joker dans le domaine de niveau supérieur" -#: src/irc/irc-commands.c:340 +#: src/irc/irc-commands.c:342 msgid "unknown command" msgstr "commande inconnue" -#: src/irc/irc-commands.c:342 +#: src/irc/irc-commands.c:344 msgid "MOTD is missing" msgstr "MOTD est manquant" -#: src/irc/irc-commands.c:344 +#: src/irc/irc-commands.c:346 msgid "no administrative info" msgstr "pas d'information administrative" -#: src/irc/irc-commands.c:346 +#: src/irc/irc-commands.c:348 msgid "file error" msgstr "erreur de fichier" -#: src/irc/irc-commands.c:348 +#: src/irc/irc-commands.c:350 msgid "no nickname given" msgstr "pas d'utilisateur donné" -#: src/irc/irc-commands.c:350 +#: src/irc/irc-commands.c:352 msgid "erroneus nickname" msgstr "nom d'utilisateur erroné" -#: src/irc/irc-commands.c:352 +#: src/irc/irc-commands.c:354 msgid "nickname already in use" msgstr "nom d'utilisateur déjà en cours d'utilisation" -#: src/irc/irc-commands.c:354 +#: src/irc/irc-commands.c:356 msgid "nickname collision" msgstr "collision sur le nom d'utilisateur" -#: src/irc/irc-commands.c:356 +#: src/irc/irc-commands.c:358 msgid "user not in channel" msgstr "utilisateur non présent dans le canal" -#: src/irc/irc-commands.c:358 +#: src/irc/irc-commands.c:360 msgid "not on channel" msgstr "non présent sur le canal" -#: src/irc/irc-commands.c:360 +#: src/irc/irc-commands.c:362 msgid "user already on channel" msgstr "utilisateur déjà sur le canal" -#: src/irc/irc-commands.c:362 +#: src/irc/irc-commands.c:364 msgid "user not logged in" msgstr "utilisateur non enregistré" -#: src/irc/irc-commands.c:364 +#: src/irc/irc-commands.c:366 msgid "summon has been disabled" msgstr "summon a été désactivé" -#: src/irc/irc-commands.c:366 +#: src/irc/irc-commands.c:368 msgid "users has been disabled" msgstr "users a été désactivé" -#: src/irc/irc-commands.c:368 +#: src/irc/irc-commands.c:370 msgid "you are not registered" msgstr "vous n'êtes pas enregistré" -#: src/irc/irc-commands.c:370 +#: src/irc/irc-commands.c:372 msgid "not enough parameters" msgstr "pas assez de paramètres" -#: src/irc/irc-commands.c:372 +#: src/irc/irc-commands.c:374 msgid "you may not register" msgstr "vous ne pouvez pas vous enregistrer" -#: src/irc/irc-commands.c:374 +#: src/irc/irc-commands.c:376 msgid "your host isn't among the privileged" msgstr "votre nom de machine n'est pas parmi les privilégiés" -#: src/irc/irc-commands.c:376 +#: src/irc/irc-commands.c:378 msgid "password incorrect" msgstr "mot de passe incorrect" -#: src/irc/irc-commands.c:378 +#: src/irc/irc-commands.c:380 msgid "you are banned from this server" msgstr "vous êtes banni de ce serveur" -#: src/irc/irc-commands.c:380 +#: src/irc/irc-commands.c:382 msgid "channel key already set" msgstr "clé du canal déjà définie" -#: src/irc/irc-commands.c:382 +#: src/irc/irc-commands.c:384 msgid "channel is already full" msgstr "le canal est déjà plein" -#: src/irc/irc-commands.c:384 +#: src/irc/irc-commands.c:386 msgid "unknown mode char to me" msgstr "caractère de mode inconnu pour moi" -#: src/irc/irc-commands.c:386 +#: src/irc/irc-commands.c:388 msgid "cannot join channel (invite only)" msgstr "impossible de rejoindre le canal (invités seulement)" -#: src/irc/irc-commands.c:388 +#: src/irc/irc-commands.c:390 msgid "cannot join channel (banned from channel)" msgstr "impossible de rejoindre le canal (banni du canal)" -#: src/irc/irc-commands.c:390 +#: src/irc/irc-commands.c:392 msgid "cannot join channel (bad channel key)" msgstr "impossible de rejoindre le canal (mauvaise clé pour le canal)" -#: src/irc/irc-commands.c:392 +#: src/irc/irc-commands.c:394 msgid "you're not an IRC operator" msgstr "vous n'êtres pas opérateur IRC" -#: src/irc/irc-commands.c:394 +#: src/irc/irc-commands.c:396 msgid "you're not channel operator" msgstr "vous n'êtes pas opérateur du canal" -#: src/irc/irc-commands.c:396 +#: src/irc/irc-commands.c:398 msgid "you can't kill a server!" msgstr "vous ne pouvez pas supprimer un serveur !" -#: src/irc/irc-commands.c:398 +#: src/irc/irc-commands.c:400 msgid "no O-lines for your host" msgstr "pas de O-lines pour votre host" -#: src/irc/irc-commands.c:400 +#: src/irc/irc-commands.c:402 msgid "unknown mode flag" msgstr "drapeau de mode inconnu" -#: src/irc/irc-commands.c:402 +#: src/irc/irc-commands.c:404 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:2704 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2844 msgid "unknown" msgstr "inconnu" @@ -1134,12 +1138,12 @@ msgstr "" "%s la commande \"%s\" ne peut pas être exécutée dans une fenêtre serveur\n" #: src/irc/irc-send.c:467 src/irc/irc-send.c:489 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:897 +#: src/irc/irc-recv.c:972 #, 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:503 src/irc/irc-recv.c:1057 +#: src/irc/irc-send.c:503 src/irc/irc-recv.c:1133 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "%s impossible de créer la fenêtre privée \"%s\"\n" @@ -1163,8 +1167,8 @@ msgstr "%s impossible de créer le nouveau canal \"%s\"\n" msgid " has joined " msgstr " a rejoint " -#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:506 src/irc/irc-recv.c:772 -#: src/irc/irc-recv.c:906 src/irc/irc-recv.c:2205 src/irc/irc-recv.c:2270 +#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:847 +#: src/irc/irc-recv.c:981 src/irc/irc-recv.c:2344 src/irc/irc-recv.c:2409 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "%s canal non trouvé pour la commande \"%s\"\n" @@ -1177,70 +1181,59 @@ msgstr " a poussé dehors " msgid " from " msgstr " de " -#: src/irc/irc-recv.c:290 src/irc/irc-recv.c:535 src/irc/irc-recv.c:814 -#: src/irc/irc-recv.c:1122 -#, c-format -msgid "%s \"%s\" command received without host\n" -msgstr "%s commande \"%s\" reçue sans host\n" - -#: src/irc/irc-recv.c:304 -#, 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:344 +#: src/irc/irc-recv.c:307 msgid "sets ban on" msgstr "instaure un bannissement sur" -#: src/irc/irc-recv.c:345 +#: src/irc/irc-recv.c:308 msgid "removes ban on" msgstr "supprime le banissement sur" -#: src/irc/irc-recv.c:352 +#: src/irc/irc-recv.c:325 msgid "sets invite-only channel flag" msgstr "définit le canal en mode invité seulement" -#: src/irc/irc-recv.c:353 +#: src/irc/irc-recv.c:326 msgid "removes invite-only channel flag" msgstr "supprime le mode invité seulement pour le canal" -#: src/irc/irc-recv.c:369 +#: src/irc/irc-recv.c:343 msgid "sets channel key to" msgstr "définit la clé du canal à" -#: src/irc/irc-recv.c:370 +#: src/irc/irc-recv.c:344 msgid "removes channel key" msgstr "supprime la clé du canal" -#: src/irc/irc-recv.c:399 +#: src/irc/irc-recv.c:375 msgid "sets the user limit to" msgstr "définit la limite d'utilisateurs à" -#: src/irc/irc-recv.c:400 +#: src/irc/irc-recv.c:376 msgid "removes user limit" msgstr "supprime la limite d'utilisateurs" -#: src/irc/irc-recv.c:420 +#: src/irc/irc-recv.c:398 msgid "sets moderated channel flag" msgstr "instaure la modération sur le canal" -#: src/irc/irc-recv.c:421 +#: src/irc/irc-recv.c:399 msgid "removes moderated channel flag" msgstr "supprime la modération sur le canal" -#: src/irc/irc-recv.c:430 +#: src/irc/irc-recv.c:409 msgid "sets messages from channel only flag" msgstr "interdit aux utilisateurs en dehors du canal d'y écrire" -#: src/irc/irc-recv.c:431 +#: src/irc/irc-recv.c:410 msgid "removes messages from channel only flag" msgstr "autorise tout utilisateur à écrire sur le canal" -#: src/irc/irc-recv.c:440 +#: src/irc/irc-recv.c:427 msgid "gives channel operator status to" msgstr "donne le droit opérateur à" -#: src/irc/irc-recv.c:441 +#: src/irc/irc-recv.c:428 msgid "removes channel operator status from" msgstr "supprime le droit opérateur à" @@ -1252,275 +1245,286 @@ msgstr "définit le canal comme privé" msgid "removes private channel flag" msgstr "supprime le mode privé pour le canal" -#: src/irc/irc-recv.c:465 +#: src/irc/irc-recv.c:466 msgid "sets secret channel flag" msgstr "définit le canal comme secret" -#: src/irc/irc-recv.c:466 +#: src/irc/irc-recv.c:467 msgid "removes secret channel flag" msgstr "supprime le mode secret pour le canal" -#: src/irc/irc-recv.c:475 +#: src/irc/irc-recv.c:477 msgid "sets topic protection" msgstr "active la protection du titre" -#: src/irc/irc-recv.c:476 +#: src/irc/irc-recv.c:478 msgid "removes topic protection" msgstr "supprime la protection du titre" -#: src/irc/irc-recv.c:485 +#: src/irc/irc-recv.c:495 msgid "gives voice to" msgstr "donne la voix à" -#: src/irc/irc-recv.c:486 +#: src/irc/irc-recv.c:496 msgid "removes voice from" msgstr "supprime la voix de" -#: src/irc/irc-recv.c:557 +#: src/irc/irc-recv.c:538 src/irc/irc-recv.c:610 src/irc/irc-recv.c:889 +#: src/irc/irc-recv.c:1198 +#, 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 +#, 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:632 msgid "You are " msgstr "Vous êtes " -#: src/irc/irc-recv.c:564 +#: src/irc/irc-recv.c:639 msgid " is " msgstr " est " -#: src/irc/irc-recv.c:568 +#: src/irc/irc-recv.c:643 msgid "now known as " msgstr "maintenant connu sous le nom " -#: src/irc/irc-recv.c:620 +#: src/irc/irc-recv.c:695 #, 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:633 src/irc/irc-recv.c:665 +#: src/irc/irc-recv.c:708 src/irc/irc-recv.c:740 msgid "reply from" msgstr "réponse de" -#: src/irc/irc-recv.c:668 +#: src/irc/irc-recv.c:743 #, c-format msgid ": %ld.%ld seconds\n" msgstr ": %ld.%ld secondes\n" -#: src/irc/irc-recv.c:698 +#: src/irc/irc-recv.c:773 #, 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:748 +#: src/irc/irc-recv.c:823 msgid " has left " msgstr " a quitté " -#: src/irc/irc-recv.c:860 +#: src/irc/irc-recv.c:935 #, c-format msgid "On %s: * %s %s" msgstr "Sur %s: * %s %s" -#: src/irc/irc-recv.c:883 +#: src/irc/irc-recv.c:958 #, c-format msgid "On %s: %s> %s" msgstr "Sur %s: %s> %s" -#: src/irc/irc-recv.c:951 +#: src/irc/irc-recv.c:1026 msgid "Received a " msgstr "Reçu un " -#: src/irc/irc-recv.c:953 +#: src/irc/irc-recv.c:1028 msgid "CTCP VERSION " msgstr "CTCP VERSION " -#: src/irc/irc-recv.c:955 +#: src/irc/irc-recv.c:1030 msgid "from" msgstr "de" -#: src/irc/irc-recv.c:990 src/irc/irc-recv.c:1004 src/irc/irc-recv.c:1019 -#: src/irc/irc-recv.c:1034 src/irc/irc-recv.c:1099 src/irc/irc-recv.c:2491 -#: src/irc/irc-recv.c:2531 +#: src/irc/irc-recv.c:1065 src/irc/irc-recv.c:1079 src/irc/irc-recv.c:1094 +#: src/irc/irc-recv.c:1109 src/irc/irc-recv.c:1175 src/irc/irc-recv.c:2630 +#: src/irc/irc-recv.c:2670 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s impossible d'analyser la commande \"%s\"\n" -#: src/irc/irc-recv.c:1081 +#: src/irc/irc-recv.c:1157 #, c-format msgid "Private %s> %s" msgstr "Privé %s> %s" -#: src/irc/irc-recv.c:1154 +#: src/irc/irc-recv.c:1230 msgid "has quit" msgstr "a quitté" -#: src/irc/irc-recv.c:1274 +#: src/irc/irc-recv.c:1350 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s commande \"%s\" reçue sans canal\n" -#: src/irc/irc-recv.c:1302 +#: src/irc/irc-recv.c:1378 msgid " has changed topic for " msgstr " a changé le titre pour " -#: src/irc/irc-recv.c:1307 +#: src/irc/irc-recv.c:1383 #, c-format msgid " to: \"%s\"\n" msgstr " en: \"%s\"\n" -#: src/irc/irc-recv.c:1313 +#: src/irc/irc-recv.c:1389 msgid " has unset topic for " msgstr " a retiré le titre pour " -#: src/irc/irc-recv.c:1404 +#: src/irc/irc-recv.c:1480 #, c-format msgid " is away: %s\n" msgstr " est absent: %s\n" -#: src/irc/irc-recv.c:1478 +#: src/irc/irc-recv.c:1554 msgid "Users online: " msgstr "Utilisateurs en ligne: " -#: src/irc/irc-recv.c:1841 +#: src/irc/irc-recv.c:1917 msgid "idle: " msgstr "inactivité: " -#: src/irc/irc-recv.c:1849 +#: src/irc/irc-recv.c:1925 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:1849 +#: src/irc/irc-recv.c:1925 msgid "day" msgstr "jour" -#: src/irc/irc-recv.c:1859 +#: src/irc/irc-recv.c:1935 msgid "hours" msgstr "heures" -#: src/irc/irc-recv.c:1859 +#: src/irc/irc-recv.c:1935 msgid "hour" msgstr "heure" -#: src/irc/irc-recv.c:1865 +#: src/irc/irc-recv.c:1941 msgid "minutes" msgstr "minutes" -#: src/irc/irc-recv.c:1865 +#: src/irc/irc-recv.c:1941 msgid "minute" msgstr "minute" -#: src/irc/irc-recv.c:1871 +#: src/irc/irc-recv.c:1947 msgid "seconds" msgstr "secondes" -#: src/irc/irc-recv.c:1871 +#: src/irc/irc-recv.c:1947 msgid "second" msgstr "seconde" -#: src/irc/irc-recv.c:1876 +#: src/irc/irc-recv.c:1952 msgid "signon at: " msgstr "signé le: " -#: src/irc/irc-recv.c:1964 +#: src/irc/irc-recv.c:2040 msgid "Channels: " msgstr "Canauxs: " -#: src/irc/irc-recv.c:2152 +#: src/irc/irc-recv.c:2291 msgid "No topic set for " msgstr "Pas de titre défini pour " -#: src/irc/irc-recv.c:2194 +#: src/irc/irc-recv.c:2333 msgid "Topic for " msgstr "Le titre pour " -#: src/irc/irc-recv.c:2198 +#: src/irc/irc-recv.c:2337 #, c-format msgid " is: \"%s\"\n" msgstr " est: \"%s\"\n" -#: src/irc/irc-recv.c:2214 src/irc/irc-recv.c:2294 +#: src/irc/irc-recv.c:2353 src/irc/irc-recv.c:2433 #, 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:2260 +#: src/irc/irc-recv.c:2399 msgid "Topic set by " msgstr "Titre défini par " -#: src/irc/irc-recv.c:2278 +#: src/irc/irc-recv.c:2417 #, 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:2286 +#: src/irc/irc-recv.c:2425 #, 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:2415 +#: src/irc/irc-recv.c:2554 msgid " on " msgstr " sur " -#: src/irc/irc-recv.c:2522 +#: src/irc/irc-recv.c:2661 #, 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:2575 +#: src/irc/irc-recv.c:2714 msgid "Nicks " msgstr "Utilisateurs " -#: src/irc/irc-recv.c:2595 +#: src/irc/irc-recv.c:2734 msgid "Channel " msgstr "Canal " -#: src/irc/irc-recv.c:2606 +#: src/irc/irc-recv.c:2745 msgid "nicks" msgstr "utilisateurs" -#: src/irc/irc-recv.c:2606 +#: src/irc/irc-recv.c:2745 msgid "nick" msgstr "utilisateur" -#: src/irc/irc-recv.c:2614 +#: src/irc/irc-recv.c:2753 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:2614 +#: src/irc/irc-recv.c:2753 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:2623 +#: src/irc/irc-recv.c:2762 msgid "halfops" msgstr "halfops" -#: src/irc/irc-recv.c:2623 +#: src/irc/irc-recv.c:2762 msgid "halfop" msgstr "halfop" -#: src/irc/irc-recv.c:2632 +#: src/irc/irc-recv.c:2771 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:2632 +#: src/irc/irc-recv.c:2771 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:2641 +#: src/irc/irc-recv.c:2780 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:2673 +#: src/irc/irc-recv.c:2813 #, 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:2684 +#: src/irc/irc-recv.c:2824 #, 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:2693 +#: src/irc/irc-recv.c:2833 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1590,11 +1594,11 @@ msgstr "" "%s impossible d'ajouter la fonction pour le message \"%s\" (mémoire " "insuffisante)\n" -#: src/gui/curses/gui-display.c:944 +#: src/gui/curses/gui-display.c:952 msgid "[not connected] " msgstr "[non connecté] " -#: src/gui/curses/gui-display.c:951 src/gui/curses/gui-display.c:954 +#: src/gui/curses/gui-display.c:959 src/gui/curses/gui-display.c:962 msgid "-MORE-" msgstr "-PLUS-" diff --git a/po/weechat.pot b/po/weechat.pot index 5f9191756..f69d13229 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-02-29 17:13+0100\n" +"POT-Creation-Date: 2004-02-29 22:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -708,10 +708,10 @@ msgstr "" #: src/irc/irc-commands.c:265 src/irc/irc-commands.c:266 #: src/irc/irc-commands.c:267 src/irc/irc-commands.c:268 #: src/irc/irc-commands.c:269 src/irc/irc-commands.c:270 -#: src/irc/irc-commands.c:271 src/irc/irc-commands.c:307 -#: src/irc/irc-commands.c:308 src/irc/irc-commands.c:309 +#: src/irc/irc-commands.c:271 src/irc/irc-commands.c:309 #: src/irc/irc-commands.c:310 src/irc/irc-commands.c:311 -#: src/irc/irc-commands.c:312 +#: src/irc/irc-commands.c:312 src/irc/irc-commands.c:313 +#: src/irc/irc-commands.c:314 msgid "a server message" msgstr "" @@ -784,243 +784,247 @@ msgid "/list end" msgstr "" #: src/irc/irc-commands.c:289 +msgid "channel mode" +msgstr "" + +#: src/irc/irc-commands.c:291 msgid "no topic for channel" msgstr "" -#: src/irc/irc-commands.c:290 +#: src/irc/irc-commands.c:292 msgid "topic of channel" msgstr "" -#: src/irc/irc-commands.c:291 +#: src/irc/irc-commands.c:293 msgid "channel :topic" msgstr "" -#: src/irc/irc-commands.c:292 +#: src/irc/irc-commands.c:294 msgid "" "channel: name of channel\n" "topic: topic of the channel" msgstr "" -#: src/irc/irc-commands.c:294 +#: src/irc/irc-commands.c:296 msgid "infos about topic (nick & date changed)" msgstr "" -#: src/irc/irc-commands.c:297 +#: src/irc/irc-commands.c:299 msgid "server version" msgstr "" -#: src/irc/irc-commands.c:298 +#: src/irc/irc-commands.c:300 msgid "who" msgstr "" -#: src/irc/irc-commands.c:299 +#: src/irc/irc-commands.c:301 msgid "list of nicks on channel" msgstr "" -#: src/irc/irc-commands.c:300 +#: src/irc/irc-commands.c:302 msgid "channel :[[@|+]nick ...]" msgstr "" -#: src/irc/irc-commands.c:301 +#: src/irc/irc-commands.c:303 msgid "" "channel: name of channel\n" "nick: nick on the channel" msgstr "" -#: src/irc/irc-commands.c:303 +#: src/irc/irc-commands.c:305 msgid "links" msgstr "" -#: src/irc/irc-commands.c:304 +#: src/irc/irc-commands.c:306 msgid "end of /links list" msgstr "" -#: src/irc/irc-commands.c:305 +#: src/irc/irc-commands.c:307 msgid "end of /names list" msgstr "" -#: src/irc/irc-commands.c:306 +#: src/irc/irc-commands.c:308 msgid "end of /whowas list" msgstr "" -#: src/irc/irc-commands.c:313 +#: src/irc/irc-commands.c:315 msgid "server local time" msgstr "" -#: src/irc/irc-commands.c:314 +#: src/irc/irc-commands.c:316 msgid "no such nick/channel" msgstr "" -#: src/irc/irc-commands.c:316 +#: src/irc/irc-commands.c:318 msgid "no such server" msgstr "" -#: src/irc/irc-commands.c:318 +#: src/irc/irc-commands.c:320 msgid "no such channel" msgstr "" -#: src/irc/irc-commands.c:320 +#: src/irc/irc-commands.c:322 msgid "cannot send to channel" msgstr "" -#: src/irc/irc-commands.c:322 +#: src/irc/irc-commands.c:324 msgid "too many channels" msgstr "" -#: src/irc/irc-commands.c:324 src/irc/irc-commands.c:326 -#: src/irc/irc-commands.c:328 +#: src/irc/irc-commands.c:326 src/irc/irc-commands.c:328 +#: src/irc/irc-commands.c:330 msgid "was no such nick" msgstr "" -#: src/irc/irc-commands.c:330 +#: src/irc/irc-commands.c:332 msgid "no origin" msgstr "" -#: src/irc/irc-commands.c:332 +#: src/irc/irc-commands.c:334 msgid "no recipient" msgstr "" -#: src/irc/irc-commands.c:334 +#: src/irc/irc-commands.c:336 msgid "no text to send" msgstr "" -#: src/irc/irc-commands.c:336 +#: src/irc/irc-commands.c:338 msgid "no toplevel" msgstr "" -#: src/irc/irc-commands.c:338 +#: src/irc/irc-commands.c:340 msgid "wilcard in toplevel domain" msgstr "" -#: src/irc/irc-commands.c:340 +#: src/irc/irc-commands.c:342 msgid "unknown command" msgstr "" -#: src/irc/irc-commands.c:342 +#: src/irc/irc-commands.c:344 msgid "MOTD is missing" msgstr "" -#: src/irc/irc-commands.c:344 +#: src/irc/irc-commands.c:346 msgid "no administrative info" msgstr "" -#: src/irc/irc-commands.c:346 +#: src/irc/irc-commands.c:348 msgid "file error" msgstr "" -#: src/irc/irc-commands.c:348 +#: src/irc/irc-commands.c:350 msgid "no nickname given" msgstr "" -#: src/irc/irc-commands.c:350 +#: src/irc/irc-commands.c:352 msgid "erroneus nickname" msgstr "" -#: src/irc/irc-commands.c:352 +#: src/irc/irc-commands.c:354 msgid "nickname already in use" msgstr "" -#: src/irc/irc-commands.c:354 +#: src/irc/irc-commands.c:356 msgid "nickname collision" msgstr "" -#: src/irc/irc-commands.c:356 +#: src/irc/irc-commands.c:358 msgid "user not in channel" msgstr "" -#: src/irc/irc-commands.c:358 +#: src/irc/irc-commands.c:360 msgid "not on channel" msgstr "" -#: src/irc/irc-commands.c:360 +#: src/irc/irc-commands.c:362 msgid "user already on channel" msgstr "" -#: src/irc/irc-commands.c:362 +#: src/irc/irc-commands.c:364 msgid "user not logged in" msgstr "" -#: src/irc/irc-commands.c:364 +#: src/irc/irc-commands.c:366 msgid "summon has been disabled" msgstr "" -#: src/irc/irc-commands.c:366 +#: src/irc/irc-commands.c:368 msgid "users has been disabled" msgstr "" -#: src/irc/irc-commands.c:368 +#: src/irc/irc-commands.c:370 msgid "you are not registered" msgstr "" -#: src/irc/irc-commands.c:370 +#: src/irc/irc-commands.c:372 msgid "not enough parameters" msgstr "" -#: src/irc/irc-commands.c:372 +#: src/irc/irc-commands.c:374 msgid "you may not register" msgstr "" -#: src/irc/irc-commands.c:374 +#: src/irc/irc-commands.c:376 msgid "your host isn't among the privileged" msgstr "" -#: src/irc/irc-commands.c:376 +#: src/irc/irc-commands.c:378 msgid "password incorrect" msgstr "" -#: src/irc/irc-commands.c:378 +#: src/irc/irc-commands.c:380 msgid "you are banned from this server" msgstr "" -#: src/irc/irc-commands.c:380 +#: src/irc/irc-commands.c:382 msgid "channel key already set" msgstr "" -#: src/irc/irc-commands.c:382 +#: src/irc/irc-commands.c:384 msgid "channel is already full" msgstr "" -#: src/irc/irc-commands.c:384 +#: src/irc/irc-commands.c:386 msgid "unknown mode char to me" msgstr "" -#: src/irc/irc-commands.c:386 +#: src/irc/irc-commands.c:388 msgid "cannot join channel (invite only)" msgstr "" -#: src/irc/irc-commands.c:388 +#: src/irc/irc-commands.c:390 msgid "cannot join channel (banned from channel)" msgstr "" -#: src/irc/irc-commands.c:390 +#: src/irc/irc-commands.c:392 msgid "cannot join channel (bad channel key)" msgstr "" -#: src/irc/irc-commands.c:392 +#: src/irc/irc-commands.c:394 msgid "you're not an IRC operator" msgstr "" -#: src/irc/irc-commands.c:394 +#: src/irc/irc-commands.c:396 msgid "you're not channel operator" msgstr "" -#: src/irc/irc-commands.c:396 +#: src/irc/irc-commands.c:398 msgid "you can't kill a server!" msgstr "" -#: src/irc/irc-commands.c:398 +#: src/irc/irc-commands.c:400 msgid "no O-lines for your host" msgstr "" -#: src/irc/irc-commands.c:400 +#: src/irc/irc-commands.c:402 msgid "unknown mode flag" msgstr "" -#: src/irc/irc-commands.c:402 +#: src/irc/irc-commands.c:404 msgid "can't change mode for other users" msgstr "" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2704 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2844 msgid "unknown" msgstr "" @@ -1042,12 +1046,12 @@ msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" #: src/irc/irc-send.c:467 src/irc/irc-send.c:489 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:897 +#: src/irc/irc-recv.c:972 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:503 src/irc/irc-recv.c:1057 +#: src/irc/irc-send.c:503 src/irc/irc-recv.c:1133 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "" @@ -1071,8 +1075,8 @@ msgstr "" msgid " has joined " msgstr "" -#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:506 src/irc/irc-recv.c:772 -#: src/irc/irc-recv.c:906 src/irc/irc-recv.c:2205 src/irc/irc-recv.c:2270 +#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:847 +#: src/irc/irc-recv.c:981 src/irc/irc-recv.c:2344 src/irc/irc-recv.c:2409 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "" @@ -1085,70 +1089,59 @@ msgstr "" msgid " from " msgstr "" -#: src/irc/irc-recv.c:290 src/irc/irc-recv.c:535 src/irc/irc-recv.c:814 -#: src/irc/irc-recv.c:1122 -#, c-format -msgid "%s \"%s\" command received without host\n" -msgstr "" - -#: src/irc/irc-recv.c:304 -#, c-format -msgid "%s \"%s\" command received without channel or nickname\n" -msgstr "" - -#: src/irc/irc-recv.c:344 +#: src/irc/irc-recv.c:307 msgid "sets ban on" msgstr "" -#: src/irc/irc-recv.c:345 +#: src/irc/irc-recv.c:308 msgid "removes ban on" msgstr "" -#: src/irc/irc-recv.c:352 +#: src/irc/irc-recv.c:325 msgid "sets invite-only channel flag" msgstr "" -#: src/irc/irc-recv.c:353 +#: src/irc/irc-recv.c:326 msgid "removes invite-only channel flag" msgstr "" -#: src/irc/irc-recv.c:369 +#: src/irc/irc-recv.c:343 msgid "sets channel key to" msgstr "" -#: src/irc/irc-recv.c:370 +#: src/irc/irc-recv.c:344 msgid "removes channel key" msgstr "" -#: src/irc/irc-recv.c:399 +#: src/irc/irc-recv.c:375 msgid "sets the user limit to" msgstr "" -#: src/irc/irc-recv.c:400 +#: src/irc/irc-recv.c:376 msgid "removes user limit" msgstr "" -#: src/irc/irc-recv.c:420 +#: src/irc/irc-recv.c:398 msgid "sets moderated channel flag" msgstr "" -#: src/irc/irc-recv.c:421 +#: src/irc/irc-recv.c:399 msgid "removes moderated channel flag" msgstr "" -#: src/irc/irc-recv.c:430 +#: src/irc/irc-recv.c:409 msgid "sets messages from channel only flag" msgstr "" -#: src/irc/irc-recv.c:431 +#: src/irc/irc-recv.c:410 msgid "removes messages from channel only flag" msgstr "" -#: src/irc/irc-recv.c:440 +#: src/irc/irc-recv.c:427 msgid "gives channel operator status to" msgstr "" -#: src/irc/irc-recv.c:441 +#: src/irc/irc-recv.c:428 msgid "removes channel operator status from" msgstr "" @@ -1160,270 +1153,281 @@ msgstr "" msgid "removes private channel flag" msgstr "" -#: src/irc/irc-recv.c:465 +#: src/irc/irc-recv.c:466 msgid "sets secret channel flag" msgstr "" -#: src/irc/irc-recv.c:466 +#: src/irc/irc-recv.c:467 msgid "removes secret channel flag" msgstr "" -#: src/irc/irc-recv.c:475 +#: src/irc/irc-recv.c:477 msgid "sets topic protection" msgstr "" -#: src/irc/irc-recv.c:476 +#: src/irc/irc-recv.c:478 msgid "removes topic protection" msgstr "" -#: src/irc/irc-recv.c:485 +#: src/irc/irc-recv.c:495 msgid "gives voice to" msgstr "" -#: src/irc/irc-recv.c:486 +#: src/irc/irc-recv.c:496 msgid "removes voice from" msgstr "" -#: src/irc/irc-recv.c:557 +#: src/irc/irc-recv.c:538 src/irc/irc-recv.c:610 src/irc/irc-recv.c:889 +#: src/irc/irc-recv.c:1198 +#, c-format +msgid "%s \"%s\" command received without host\n" +msgstr "" + +#: src/irc/irc-recv.c:552 +#, c-format +msgid "%s \"%s\" command received without channel or nickname\n" +msgstr "" + +#: src/irc/irc-recv.c:632 msgid "You are " msgstr "" -#: src/irc/irc-recv.c:564 +#: src/irc/irc-recv.c:639 msgid " is " msgstr "" -#: src/irc/irc-recv.c:568 +#: src/irc/irc-recv.c:643 msgid "now known as " msgstr "" -#: src/irc/irc-recv.c:620 +#: src/irc/irc-recv.c:695 #, c-format msgid "%s nickname not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:633 src/irc/irc-recv.c:665 +#: src/irc/irc-recv.c:708 src/irc/irc-recv.c:740 msgid "reply from" msgstr "" -#: src/irc/irc-recv.c:668 +#: src/irc/irc-recv.c:743 #, c-format msgid ": %ld.%ld seconds\n" msgstr "" -#: src/irc/irc-recv.c:698 +#: src/irc/irc-recv.c:773 #, c-format msgid "%s \"%s\" command received without host or channel\n" msgstr "" -#: src/irc/irc-recv.c:748 +#: src/irc/irc-recv.c:823 msgid " has left " msgstr "" -#: src/irc/irc-recv.c:860 +#: src/irc/irc-recv.c:935 #, c-format msgid "On %s: * %s %s" msgstr "" -#: src/irc/irc-recv.c:883 +#: src/irc/irc-recv.c:958 #, c-format msgid "On %s: %s> %s" msgstr "" -#: src/irc/irc-recv.c:951 +#: src/irc/irc-recv.c:1026 msgid "Received a " msgstr "" -#: src/irc/irc-recv.c:953 +#: src/irc/irc-recv.c:1028 msgid "CTCP VERSION " msgstr "" -#: src/irc/irc-recv.c:955 +#: src/irc/irc-recv.c:1030 msgid "from" msgstr "" -#: src/irc/irc-recv.c:990 src/irc/irc-recv.c:1004 src/irc/irc-recv.c:1019 -#: src/irc/irc-recv.c:1034 src/irc/irc-recv.c:1099 src/irc/irc-recv.c:2491 -#: src/irc/irc-recv.c:2531 +#: src/irc/irc-recv.c:1065 src/irc/irc-recv.c:1079 src/irc/irc-recv.c:1094 +#: src/irc/irc-recv.c:1109 src/irc/irc-recv.c:1175 src/irc/irc-recv.c:2630 +#: src/irc/irc-recv.c:2670 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:1081 +#: src/irc/irc-recv.c:1157 #, c-format msgid "Private %s> %s" msgstr "" -#: src/irc/irc-recv.c:1154 +#: src/irc/irc-recv.c:1230 msgid "has quit" msgstr "" -#: src/irc/irc-recv.c:1274 +#: src/irc/irc-recv.c:1350 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "" -#: src/irc/irc-recv.c:1302 +#: src/irc/irc-recv.c:1378 msgid " has changed topic for " msgstr "" -#: src/irc/irc-recv.c:1307 +#: src/irc/irc-recv.c:1383 #, c-format msgid " to: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:1313 +#: src/irc/irc-recv.c:1389 msgid " has unset topic for " msgstr "" -#: src/irc/irc-recv.c:1404 +#: src/irc/irc-recv.c:1480 #, c-format msgid " is away: %s\n" msgstr "" -#: src/irc/irc-recv.c:1478 +#: src/irc/irc-recv.c:1554 msgid "Users online: " msgstr "" -#: src/irc/irc-recv.c:1841 +#: src/irc/irc-recv.c:1917 msgid "idle: " msgstr "" -#: src/irc/irc-recv.c:1849 +#: src/irc/irc-recv.c:1925 msgid "days" msgstr "" -#: src/irc/irc-recv.c:1849 +#: src/irc/irc-recv.c:1925 msgid "day" msgstr "" -#: src/irc/irc-recv.c:1859 +#: src/irc/irc-recv.c:1935 msgid "hours" msgstr "" -#: src/irc/irc-recv.c:1859 +#: src/irc/irc-recv.c:1935 msgid "hour" msgstr "" -#: src/irc/irc-recv.c:1865 +#: src/irc/irc-recv.c:1941 msgid "minutes" msgstr "" -#: src/irc/irc-recv.c:1865 +#: src/irc/irc-recv.c:1941 msgid "minute" msgstr "" -#: src/irc/irc-recv.c:1871 +#: src/irc/irc-recv.c:1947 msgid "seconds" msgstr "" -#: src/irc/irc-recv.c:1871 +#: src/irc/irc-recv.c:1947 msgid "second" msgstr "" -#: src/irc/irc-recv.c:1876 +#: src/irc/irc-recv.c:1952 msgid "signon at: " msgstr "" -#: src/irc/irc-recv.c:1964 +#: src/irc/irc-recv.c:2040 msgid "Channels: " msgstr "" -#: src/irc/irc-recv.c:2152 +#: src/irc/irc-recv.c:2291 msgid "No topic set for " msgstr "" -#: src/irc/irc-recv.c:2194 +#: src/irc/irc-recv.c:2333 msgid "Topic for " msgstr "" -#: src/irc/irc-recv.c:2198 +#: src/irc/irc-recv.c:2337 #, c-format msgid " is: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2214 src/irc/irc-recv.c:2294 +#: src/irc/irc-recv.c:2353 src/irc/irc-recv.c:2433 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2260 +#: src/irc/irc-recv.c:2399 msgid "Topic set by " msgstr "" -#: src/irc/irc-recv.c:2278 +#: src/irc/irc-recv.c:2417 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2286 +#: src/irc/irc-recv.c:2425 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2415 +#: src/irc/irc-recv.c:2554 msgid " on " msgstr "" -#: src/irc/irc-recv.c:2522 +#: src/irc/irc-recv.c:2661 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2575 +#: src/irc/irc-recv.c:2714 msgid "Nicks " msgstr "" -#: src/irc/irc-recv.c:2595 +#: src/irc/irc-recv.c:2734 msgid "Channel " msgstr "" -#: src/irc/irc-recv.c:2606 +#: src/irc/irc-recv.c:2745 msgid "nicks" msgstr "" -#: src/irc/irc-recv.c:2606 +#: src/irc/irc-recv.c:2745 msgid "nick" msgstr "" -#: src/irc/irc-recv.c:2614 +#: src/irc/irc-recv.c:2753 msgid "ops" msgstr "" -#: src/irc/irc-recv.c:2614 +#: src/irc/irc-recv.c:2753 msgid "op" msgstr "" -#: src/irc/irc-recv.c:2623 +#: src/irc/irc-recv.c:2762 msgid "halfops" msgstr "" -#: src/irc/irc-recv.c:2623 +#: src/irc/irc-recv.c:2762 msgid "halfop" msgstr "" -#: src/irc/irc-recv.c:2632 +#: src/irc/irc-recv.c:2771 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:2632 +#: src/irc/irc-recv.c:2771 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:2641 +#: src/irc/irc-recv.c:2780 msgid "normal" msgstr "" -#: src/irc/irc-recv.c:2673 +#: src/irc/irc-recv.c:2813 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2684 +#: src/irc/irc-recv.c:2824 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2693 +#: src/irc/irc-recv.c:2833 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1485,11 +1489,11 @@ msgstr "" msgid "%s unable to add handler for \"%s\" message (not enough memory)\n" msgstr "" -#: src/gui/curses/gui-display.c:944 +#: src/gui/curses/gui-display.c:952 msgid "[not connected] " msgstr "" -#: src/gui/curses/gui-display.c:951 src/gui/curses/gui-display.c:954 +#: src/gui/curses/gui-display.c:959 src/gui/curses/gui-display.c:962 msgid "-MORE-" msgstr "" diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c index 883121251..12a314b26 100644 --- a/src/gui/curses/gui-display.c +++ b/src/gui/curses/gui-display.c @@ -826,7 +826,7 @@ gui_draw_window_status (t_gui_window *window) { t_gui_window *ptr_win; char format_more[32]; - int i; + int i, first_mode; /* TODO: manage splitted windows! */ if (window != gui_current_window) @@ -919,13 +919,21 @@ gui_draw_window_status (t_gui_window *window) if (gui_current_window == CHANNEL(ptr_win)->window) { /* display channel modes */ - wprintw (window->win_status, "(+"); + wprintw (window->win_status, "("); i = 0; + first_mode = 1; while (CHANNEL(ptr_win)->modes[i]) { if (CHANNEL(ptr_win)->modes[i] != ' ') + { + if (first_mode) + { + wprintw (window->win_status, "+"); + first_mode = 0; + } wprintw (window->win_status, "%c", CHANNEL(ptr_win)->modes[i]); + } i++; } if (CHANNEL(ptr_win)->modes[CHANNEL_MODE_KEY] != ' ') diff --git a/src/irc/irc-commands.c b/src/irc/irc-commands.c index 7acb23d70..8889718e2 100644 --- a/src/irc/irc-commands.c +++ b/src/irc/irc-commands.c @@ -286,6 +286,8 @@ t_irc_command irc_commands[] = { "321", N_("/list start"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_321 }, { "322", N_("channel (for /list)"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_322 }, { "323", N_("/list end"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_323 }, + { "324", N_("channel mode"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_324 }, + { "329", "???", "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_329 }, { "331", N_("no topic for channel"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_331 }, { "332", N_("topic of channel"), N_("channel :topic"), diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c index 189d63cc7..004dfe3a1 100644 --- a/src/irc/irc-recv.c +++ b/src/irc/irc-recv.c @@ -272,16 +272,264 @@ irc_cmd_recv_kick (t_irc_server *server, char *host, char *arguments) } /* + * irc_get_channel_modes: get channel modes + */ + +void irc_get_channel_modes (t_irc_channel *ptr_channel, char *channel_name, + char *nick_host, char *modes, char *parm) +{ + char *pos, set_flag; + t_irc_nick *ptr_nick; + + set_flag = '+'; + while (modes && modes[0]) + { + switch (modes[0]) + { + case '+': + set_flag = '+'; + break; + case '-': + set_flag = '-'; + break; + case 'b': + pos = NULL; + if (parm) + { + pos = strchr (parm, ' '); + if (pos) + pos[0] = '\0'; + } + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "b", nick_host, + (set_flag == '+') ? + _("sets ban on") : + _("removes ban on"), + (parm) ? parm : NULL); + + /* look for next parameter */ + if (parm && pos) + { + pos++; + while (pos[0] == ' ') + pos++; + parm = pos; + } + break; + case 'i': + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "i", nick_host, + (set_flag == '+') ? + _("sets invite-only channel flag") : + _("removes invite-only channel flag"), + NULL); + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_INVITE); + break; + case 'k': + pos = NULL; + if (parm) + { + pos = strchr (parm, ' '); + if (pos) + pos[0] = '\0'; + } + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "k", nick_host, + (set_flag == '+') ? + _("sets channel key to") : + _("removes channel key"), + (set_flag == '+') ? + ((parm) ? parm : NULL) : + NULL); + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_KEY); + if (ptr_channel->key) + free (ptr_channel->key); + ptr_channel->key = strdup (parm); + + /* look for next parameter */ + if (parm && pos) + { + pos++; + while (pos[0] == ' ') + pos++; + parm = pos; + } + break; + case 'l': + pos = NULL; + if (parm) + { + pos = strchr (parm, ' '); + if (pos) + pos[0] = '\0'; + } + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "l", nick_host, + (set_flag == '+') ? + _("sets the user limit to") : + _("removes user limit"), + (set_flag == '+') ? + ((parm) ? parm : NULL) : + NULL); + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_LIMIT); + ptr_channel->limit = atoi (parm); + + /* look for next parameter */ + if (parm && pos) + { + pos++; + while (pos[0] == ' ') + pos++; + parm = pos; + } + break; + case 'm': + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "m", nick_host, + (set_flag == '+') ? + _("sets moderated channel flag") : + _("removes moderated channel flag"), + NULL); + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_MODERATED); + break; + case 'n': + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "n", nick_host, + (set_flag == '+') ? + _("sets messages from channel only flag") : + _("removes messages from channel only flag"), + NULL); + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_NO_MSG_OUT); + break; + case 'o': + pos = NULL; + if (parm) + { + pos = strchr (parm, ' '); + if (pos) + pos[0] = '\0'; + } + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "o", nick_host, + (set_flag == '+') ? + _("gives channel operator status to") : + _("removes channel operator status from"), + (parm) ? parm : NULL); + if (parm) + { + ptr_nick = nick_search (ptr_channel, parm); + if (ptr_nick) + { + ptr_nick->is_op = (set_flag == '+') ? 1 : 0; + nick_resort (ptr_channel, ptr_nick); + gui_redraw_window_nick (ptr_channel->window); + } + } + + /* look for next parameter */ + if (parm && pos) + { + pos++; + while (pos[0] == ' ') + pos++; + parm = pos; + } + break; + case 'p': + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "p", nick_host, + (set_flag == '+') ? + _("sets private channel flag") : + _("removes private channel flag"), + NULL); + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_SECRET); + break; + case 's': + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "s", nick_host, + (set_flag == '+') ? + _("sets secret channel flag") : + _("removes secret channel flag"), + NULL); + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_SECRET); + break; + case 't': + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "t", nick_host, + (set_flag == '+') ? + _("sets topic protection") : + _("removes topic protection"), + NULL); + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_TOPIC); + break; + case 'v': + pos = NULL; + if (parm) + { + pos = strchr (parm, ' '); + if (pos) + pos[0] = '\0'; + } + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "v", nick_host, + (set_flag == '+') ? + _("gives voice to") : + _("removes voice from"), + (parm) ? parm : NULL); + + if (parm) + { + ptr_nick = nick_search (ptr_channel, parm); + if (ptr_nick) + { + ptr_nick->has_voice = (set_flag == '+') ? 1 : 0; + nick_resort (ptr_channel, ptr_nick); + gui_redraw_window_nick (ptr_channel->window); + } + } + + /* look for next parameter */ + if (parm && pos) + { + pos++; + while (pos[0] == ' ') + pos++; + parm = pos; + } + break; + } + modes++; + } +} + +/* * irc_cmd_recv_mode: 'mode' message received */ int irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) { - char *pos, *pos2, *pos_parm; - char set_flag; + char *pos, *pos_parm; t_irc_channel *ptr_channel; - t_irc_nick *ptr_nick; /* no host => we can't identify sender of message! */ if (host == NULL) @@ -319,186 +567,12 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) pos_parm++; } - set_flag = '+'; - if (string_is_channel (arguments)) { ptr_channel = channel_search (server, arguments); if (ptr_channel) { - /* channel modes */ - while (pos && pos[0]) - { - switch (pos[0]) - { - case '+': - set_flag = '+'; - break; - case '-': - set_flag = '-'; - break; - case 'b': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "b", host, - (set_flag == '+') ? - _("sets ban on") : - _("removes ban on"), - pos_parm); - break; - case 'i': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "i", host, - (set_flag == '+') ? - _("sets invite-only channel flag") : - _("removes invite-only channel flag"), - NULL); - SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), - CHANNEL_MODE_INVITE); - break; - case 'k': - pos2 = NULL; - if (pos_parm) - { - pos2 = strchr (pos_parm, ' '); - if (pos2) - pos2[0] = '\0'; - } - irc_display_mode (ptr_channel->window, - arguments, set_flag, "k", host, - (set_flag == '+') ? - _("sets channel key to") : - _("removes channel key"), - (set_flag == '+') ? - ((pos_parm) ? pos_parm : NULL) : - NULL); - SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), - CHANNEL_MODE_KEY); - if (ptr_channel->key) - free (ptr_channel->key); - ptr_channel->key = strdup (pos_parm); - - /* look for next parameter */ - if (pos_parm && pos2) - { - pos2++; - while (pos2[0] == ' ') - pos2++; - pos_parm = pos2; - } - break; - case 'l': - pos2 = NULL; - if (pos_parm) - { - pos2 = strchr (pos_parm, ' '); - if (pos2) - pos2[0] = '\0'; - } - irc_display_mode (ptr_channel->window, - arguments, set_flag, "l", host, - (set_flag == '+') ? - _("sets the user limit to") : - _("removes user limit"), - (set_flag == '+') ? - ((pos_parm) ? pos_parm : NULL) : - NULL); - SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), - CHANNEL_MODE_LIMIT); - ptr_channel->limit = atoi (pos_parm); - - /* look for next parameter */ - if (pos_parm && pos2) - { - pos2++; - while (pos2[0] == ' ') - pos2++; - pos_parm = pos2; - } - break; - case 'm': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "m", host, - (set_flag == '+') ? - _("sets moderated channel flag") : - _("removes moderated channel flag"), - NULL); - SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), - CHANNEL_MODE_MODERATED); - break; - case 'n': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "n", host, - (set_flag == '+') ? - _("sets messages from channel only flag") : - _("removes messages from channel only flag"), - NULL); - SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), - CHANNEL_MODE_NO_MSG_OUT); - break; - case 'o': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "o", host, - (set_flag == '+') ? - _("gives channel operator status to") : - _("removes channel operator status from"), - pos_parm); - ptr_nick = nick_search (ptr_channel, pos_parm); - if (ptr_nick) - { - ptr_nick->is_op = (set_flag == '+') ? 1 : 0; - nick_resort (ptr_channel, ptr_nick); - gui_redraw_window_nick (ptr_channel->window); - } - break; - case 'p': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "p", host, - (set_flag == '+') ? - _("sets private channel flag") : - _("removes private channel flag"), - NULL); - SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), - CHANNEL_MODE_SECRET); - break; - case 's': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "s", host, - (set_flag == '+') ? - _("sets secret channel flag") : - _("removes secret channel flag"), - NULL); - SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), - CHANNEL_MODE_SECRET); - break; - case 't': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "t", host, - (set_flag == '+') ? - _("sets topic protection") : - _("removes topic protection"), - NULL); - SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), - CHANNEL_MODE_TOPIC); - break; - case 'v': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "v", host, - (set_flag == '+') ? - _("gives voice to") : - _("removes voice from"), - pos_parm); - - ptr_nick = nick_search (ptr_channel, pos_parm); - if (ptr_nick) - { - ptr_nick->has_voice = (set_flag == '+') ? 1 : 0; - nick_resort (ptr_channel, ptr_nick); - gui_redraw_window_nick (ptr_channel->window); - } - break; - } - pos++; - } + irc_get_channel_modes (ptr_channel, arguments, host, pos, pos_parm); gui_draw_window_status (gui_current_window); } else @@ -2135,6 +2209,69 @@ irc_cmd_recv_323 (t_irc_server *server, char *host, char *arguments) } /* + * irc_cmd_recv_324: '324' command (channel mode) + */ + +int +irc_cmd_recv_324 (t_irc_server *server, char *host, char *arguments) +{ + char *pos_chan, *pos, *pos_parm; + t_irc_channel *ptr_channel; + + /* make gcc happy */ + (void) host; + + pos_chan = strchr (arguments, ' '); + if (pos_chan) + { + pos_chan[0] = '\0'; + pos_chan++; + while (pos_chan[0] == ' ') + pos_chan++; + + pos = strchr (pos_chan, ' '); + if (pos) + { + pos[0] = '\0'; + pos++; + while (pos[0] == ' ') + pos++; + + pos_parm = strchr (pos, ' '); + if (pos_parm) + { + pos_parm[0] = '\0'; + pos_parm++; + while (pos_parm[0] == ' ') + pos_parm++; + } + ptr_channel = channel_search (server, pos_chan); + if (ptr_channel) + { + irc_get_channel_modes (ptr_channel, NULL, NULL, pos, pos_parm); + gui_draw_window_status (gui_current_window); + } + } + } + return 0; +} + +/* + * irc_cmd_recv_329: '329' command (???) + */ + +int +irc_cmd_recv_329 (t_irc_server *server, char *host, char *arguments) +{ + /* make gcc happy */ + (void) server; + (void) host; + (void) arguments; + + return 0; +} + +/* * irc_cmd_recv_331: '331' command received (no topic for channel) */ @@ -2643,6 +2780,7 @@ irc_cmd_recv_366 (t_irc_server *server, char *host, char *arguments) _("normal")); gui_printf_color (ptr_channel->window, COLOR_WIN_CHAT_DARK, ")\n"); + irc_cmd_send_mode (server, ptr_channel->name); } else { diff --git a/src/irc/irc.h b/src/irc/irc.h index 1ad068aed..1279f7444 100644 --- a/src/irc/irc.h +++ b/src/irc/irc.h @@ -295,6 +295,8 @@ extern int irc_cmd_recv_320 (t_irc_server *, char *, char *); extern int irc_cmd_recv_321 (t_irc_server *, char *, char *); extern int irc_cmd_recv_322 (t_irc_server *, char *, char *); extern int irc_cmd_recv_323 (t_irc_server *, char *, char *); +extern int irc_cmd_recv_324 (t_irc_server *, char *, char *); +extern int irc_cmd_recv_329 (t_irc_server *, char *, char *); extern int irc_cmd_recv_331 (t_irc_server *, char *, char *); extern int irc_cmd_recv_332 (t_irc_server *, char *, char *); extern int irc_cmd_recv_333 (t_irc_server *, char *, char *); diff --git a/weechat/po/fr.po b/weechat/po/fr.po index b307d48a8..69b878aca 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.0.6-pre1\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2004-02-29 17:13+0100\n" -"PO-Revision-Date: 2004-02-29 17:13+0100\n" +"POT-Creation-Date: 2004-02-29 22:06+0100\n" +"PO-Revision-Date: 2004-02-29 22:06+0100\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -793,10 +793,10 @@ msgstr "" #: src/irc/irc-commands.c:265 src/irc/irc-commands.c:266 #: src/irc/irc-commands.c:267 src/irc/irc-commands.c:268 #: src/irc/irc-commands.c:269 src/irc/irc-commands.c:270 -#: src/irc/irc-commands.c:271 src/irc/irc-commands.c:307 -#: src/irc/irc-commands.c:308 src/irc/irc-commands.c:309 +#: src/irc/irc-commands.c:271 src/irc/irc-commands.c:309 #: src/irc/irc-commands.c:310 src/irc/irc-commands.c:311 -#: src/irc/irc-commands.c:312 +#: src/irc/irc-commands.c:312 src/irc/irc-commands.c:313 +#: src/irc/irc-commands.c:314 msgid "a server message" msgstr "un message du serveur" @@ -869,18 +869,22 @@ msgid "/list end" msgstr "/list fin" #: src/irc/irc-commands.c:289 +msgid "channel mode" +msgstr "mode du canal" + +#: src/irc/irc-commands.c:291 msgid "no topic for channel" msgstr "pas de titre pour le canal" -#: src/irc/irc-commands.c:290 +#: src/irc/irc-commands.c:292 msgid "topic of channel" msgstr "titre du canal" -#: src/irc/irc-commands.c:291 +#: src/irc/irc-commands.c:293 msgid "channel :topic" msgstr "canal :titre" -#: src/irc/irc-commands.c:292 +#: src/irc/irc-commands.c:294 msgid "" "channel: name of channel\n" "topic: topic of the channel" @@ -888,27 +892,27 @@ msgstr "" "canal: nom du canal\n" "titre: titre du canal" -#: src/irc/irc-commands.c:294 +#: src/irc/irc-commands.c:296 msgid "infos about topic (nick & date changed)" msgstr "infos sur le titre (utilisateur et date de changement)" -#: src/irc/irc-commands.c:297 +#: src/irc/irc-commands.c:299 msgid "server version" msgstr "version du serveur" -#: src/irc/irc-commands.c:298 +#: src/irc/irc-commands.c:300 msgid "who" msgstr "qui" -#: src/irc/irc-commands.c:299 +#: src/irc/irc-commands.c:301 msgid "list of nicks on channel" msgstr "liste des utilisateurs sur un canal" -#: src/irc/irc-commands.c:300 +#: src/irc/irc-commands.c:302 msgid "channel :[[@|+]nick ...]" msgstr "canal :[[@|+]nick ...]" -#: src/irc/irc-commands.c:301 +#: src/irc/irc-commands.c:303 msgid "" "channel: name of channel\n" "nick: nick on the channel" @@ -916,200 +920,200 @@ msgstr "" "canal: nom du canal\n" "nick: utilisateur sur le canal" -#: src/irc/irc-commands.c:303 +#: src/irc/irc-commands.c:305 msgid "links" msgstr "liens" -#: src/irc/irc-commands.c:304 +#: src/irc/irc-commands.c:306 msgid "end of /links list" msgstr "fin de /links list" -#: src/irc/irc-commands.c:305 +#: src/irc/irc-commands.c:307 msgid "end of /names list" msgstr "fin de la liste /names" -#: src/irc/irc-commands.c:306 +#: src/irc/irc-commands.c:308 msgid "end of /whowas list" msgstr "fin de /whowas list" -#: src/irc/irc-commands.c:313 +#: src/irc/irc-commands.c:315 msgid "server local time" msgstr "heure locale du serveur" -#: src/irc/irc-commands.c:314 +#: src/irc/irc-commands.c:316 msgid "no such nick/channel" msgstr "pas de tel utilisateur/canal" -#: src/irc/irc-commands.c:316 +#: src/irc/irc-commands.c:318 msgid "no such server" msgstr "pas de tel serveur" -#: src/irc/irc-commands.c:318 +#: src/irc/irc-commands.c:320 msgid "no such channel" msgstr "pas de tel canal" -#: src/irc/irc-commands.c:320 +#: src/irc/irc-commands.c:322 msgid "cannot send to channel" msgstr "impossible d'envoyer au canal" -#: src/irc/irc-commands.c:322 +#: src/irc/irc-commands.c:324 msgid "too many channels" msgstr "trop de canaux" -#: src/irc/irc-commands.c:324 src/irc/irc-commands.c:326 -#: src/irc/irc-commands.c:328 +#: src/irc/irc-commands.c:326 src/irc/irc-commands.c:328 +#: src/irc/irc-commands.c:330 msgid "was no such nick" msgstr "n'y avait pas de tel utilisateur" -#: src/irc/irc-commands.c:330 +#: src/irc/irc-commands.c:332 msgid "no origin" msgstr "pas d'origine" -#: src/irc/irc-commands.c:332 +#: src/irc/irc-commands.c:334 msgid "no recipient" msgstr "pas de destinataire" -#: src/irc/irc-commands.c:334 +#: src/irc/irc-commands.c:336 msgid "no text to send" msgstr "pas de texte à envoyer" -#: src/irc/irc-commands.c:336 +#: src/irc/irc-commands.c:338 msgid "no toplevel" msgstr "pas de niveau supérieur" -#: src/irc/irc-commands.c:338 +#: src/irc/irc-commands.c:340 msgid "wilcard in toplevel domain" msgstr "caractère joker dans le domaine de niveau supérieur" -#: src/irc/irc-commands.c:340 +#: src/irc/irc-commands.c:342 msgid "unknown command" msgstr "commande inconnue" -#: src/irc/irc-commands.c:342 +#: src/irc/irc-commands.c:344 msgid "MOTD is missing" msgstr "MOTD est manquant" -#: src/irc/irc-commands.c:344 +#: src/irc/irc-commands.c:346 msgid "no administrative info" msgstr "pas d'information administrative" -#: src/irc/irc-commands.c:346 +#: src/irc/irc-commands.c:348 msgid "file error" msgstr "erreur de fichier" -#: src/irc/irc-commands.c:348 +#: src/irc/irc-commands.c:350 msgid "no nickname given" msgstr "pas d'utilisateur donné" -#: src/irc/irc-commands.c:350 +#: src/irc/irc-commands.c:352 msgid "erroneus nickname" msgstr "nom d'utilisateur erroné" -#: src/irc/irc-commands.c:352 +#: src/irc/irc-commands.c:354 msgid "nickname already in use" msgstr "nom d'utilisateur déjà en cours d'utilisation" -#: src/irc/irc-commands.c:354 +#: src/irc/irc-commands.c:356 msgid "nickname collision" msgstr "collision sur le nom d'utilisateur" -#: src/irc/irc-commands.c:356 +#: src/irc/irc-commands.c:358 msgid "user not in channel" msgstr "utilisateur non présent dans le canal" -#: src/irc/irc-commands.c:358 +#: src/irc/irc-commands.c:360 msgid "not on channel" msgstr "non présent sur le canal" -#: src/irc/irc-commands.c:360 +#: src/irc/irc-commands.c:362 msgid "user already on channel" msgstr "utilisateur déjà sur le canal" -#: src/irc/irc-commands.c:362 +#: src/irc/irc-commands.c:364 msgid "user not logged in" msgstr "utilisateur non enregistré" -#: src/irc/irc-commands.c:364 +#: src/irc/irc-commands.c:366 msgid "summon has been disabled" msgstr "summon a été désactivé" -#: src/irc/irc-commands.c:366 +#: src/irc/irc-commands.c:368 msgid "users has been disabled" msgstr "users a été désactivé" -#: src/irc/irc-commands.c:368 +#: src/irc/irc-commands.c:370 msgid "you are not registered" msgstr "vous n'êtes pas enregistré" -#: src/irc/irc-commands.c:370 +#: src/irc/irc-commands.c:372 msgid "not enough parameters" msgstr "pas assez de paramètres" -#: src/irc/irc-commands.c:372 +#: src/irc/irc-commands.c:374 msgid "you may not register" msgstr "vous ne pouvez pas vous enregistrer" -#: src/irc/irc-commands.c:374 +#: src/irc/irc-commands.c:376 msgid "your host isn't among the privileged" msgstr "votre nom de machine n'est pas parmi les privilégiés" -#: src/irc/irc-commands.c:376 +#: src/irc/irc-commands.c:378 msgid "password incorrect" msgstr "mot de passe incorrect" -#: src/irc/irc-commands.c:378 +#: src/irc/irc-commands.c:380 msgid "you are banned from this server" msgstr "vous êtes banni de ce serveur" -#: src/irc/irc-commands.c:380 +#: src/irc/irc-commands.c:382 msgid "channel key already set" msgstr "clé du canal déjà définie" -#: src/irc/irc-commands.c:382 +#: src/irc/irc-commands.c:384 msgid "channel is already full" msgstr "le canal est déjà plein" -#: src/irc/irc-commands.c:384 +#: src/irc/irc-commands.c:386 msgid "unknown mode char to me" msgstr "caractère de mode inconnu pour moi" -#: src/irc/irc-commands.c:386 +#: src/irc/irc-commands.c:388 msgid "cannot join channel (invite only)" msgstr "impossible de rejoindre le canal (invités seulement)" -#: src/irc/irc-commands.c:388 +#: src/irc/irc-commands.c:390 msgid "cannot join channel (banned from channel)" msgstr "impossible de rejoindre le canal (banni du canal)" -#: src/irc/irc-commands.c:390 +#: src/irc/irc-commands.c:392 msgid "cannot join channel (bad channel key)" msgstr "impossible de rejoindre le canal (mauvaise clé pour le canal)" -#: src/irc/irc-commands.c:392 +#: src/irc/irc-commands.c:394 msgid "you're not an IRC operator" msgstr "vous n'êtres pas opérateur IRC" -#: src/irc/irc-commands.c:394 +#: src/irc/irc-commands.c:396 msgid "you're not channel operator" msgstr "vous n'êtes pas opérateur du canal" -#: src/irc/irc-commands.c:396 +#: src/irc/irc-commands.c:398 msgid "you can't kill a server!" msgstr "vous ne pouvez pas supprimer un serveur !" -#: src/irc/irc-commands.c:398 +#: src/irc/irc-commands.c:400 msgid "no O-lines for your host" msgstr "pas de O-lines pour votre host" -#: src/irc/irc-commands.c:400 +#: src/irc/irc-commands.c:402 msgid "unknown mode flag" msgstr "drapeau de mode inconnu" -#: src/irc/irc-commands.c:402 +#: src/irc/irc-commands.c:404 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:2704 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2844 msgid "unknown" msgstr "inconnu" @@ -1134,12 +1138,12 @@ msgstr "" "%s la commande \"%s\" ne peut pas être exécutée dans une fenêtre serveur\n" #: src/irc/irc-send.c:467 src/irc/irc-send.c:489 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:897 +#: src/irc/irc-recv.c:972 #, 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:503 src/irc/irc-recv.c:1057 +#: src/irc/irc-send.c:503 src/irc/irc-recv.c:1133 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "%s impossible de créer la fenêtre privée \"%s\"\n" @@ -1163,8 +1167,8 @@ msgstr "%s impossible de créer le nouveau canal \"%s\"\n" msgid " has joined " msgstr " a rejoint " -#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:506 src/irc/irc-recv.c:772 -#: src/irc/irc-recv.c:906 src/irc/irc-recv.c:2205 src/irc/irc-recv.c:2270 +#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:847 +#: src/irc/irc-recv.c:981 src/irc/irc-recv.c:2344 src/irc/irc-recv.c:2409 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "%s canal non trouvé pour la commande \"%s\"\n" @@ -1177,70 +1181,59 @@ msgstr " a poussé dehors " msgid " from " msgstr " de " -#: src/irc/irc-recv.c:290 src/irc/irc-recv.c:535 src/irc/irc-recv.c:814 -#: src/irc/irc-recv.c:1122 -#, c-format -msgid "%s \"%s\" command received without host\n" -msgstr "%s commande \"%s\" reçue sans host\n" - -#: src/irc/irc-recv.c:304 -#, 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:344 +#: src/irc/irc-recv.c:307 msgid "sets ban on" msgstr "instaure un bannissement sur" -#: src/irc/irc-recv.c:345 +#: src/irc/irc-recv.c:308 msgid "removes ban on" msgstr "supprime le banissement sur" -#: src/irc/irc-recv.c:352 +#: src/irc/irc-recv.c:325 msgid "sets invite-only channel flag" msgstr "définit le canal en mode invité seulement" -#: src/irc/irc-recv.c:353 +#: src/irc/irc-recv.c:326 msgid "removes invite-only channel flag" msgstr "supprime le mode invité seulement pour le canal" -#: src/irc/irc-recv.c:369 +#: src/irc/irc-recv.c:343 msgid "sets channel key to" msgstr "définit la clé du canal à" -#: src/irc/irc-recv.c:370 +#: src/irc/irc-recv.c:344 msgid "removes channel key" msgstr "supprime la clé du canal" -#: src/irc/irc-recv.c:399 +#: src/irc/irc-recv.c:375 msgid "sets the user limit to" msgstr "définit la limite d'utilisateurs à" -#: src/irc/irc-recv.c:400 +#: src/irc/irc-recv.c:376 msgid "removes user limit" msgstr "supprime la limite d'utilisateurs" -#: src/irc/irc-recv.c:420 +#: src/irc/irc-recv.c:398 msgid "sets moderated channel flag" msgstr "instaure la modération sur le canal" -#: src/irc/irc-recv.c:421 +#: src/irc/irc-recv.c:399 msgid "removes moderated channel flag" msgstr "supprime la modération sur le canal" -#: src/irc/irc-recv.c:430 +#: src/irc/irc-recv.c:409 msgid "sets messages from channel only flag" msgstr "interdit aux utilisateurs en dehors du canal d'y écrire" -#: src/irc/irc-recv.c:431 +#: src/irc/irc-recv.c:410 msgid "removes messages from channel only flag" msgstr "autorise tout utilisateur à écrire sur le canal" -#: src/irc/irc-recv.c:440 +#: src/irc/irc-recv.c:427 msgid "gives channel operator status to" msgstr "donne le droit opérateur à" -#: src/irc/irc-recv.c:441 +#: src/irc/irc-recv.c:428 msgid "removes channel operator status from" msgstr "supprime le droit opérateur à" @@ -1252,275 +1245,286 @@ msgstr "définit le canal comme privé" msgid "removes private channel flag" msgstr "supprime le mode privé pour le canal" -#: src/irc/irc-recv.c:465 +#: src/irc/irc-recv.c:466 msgid "sets secret channel flag" msgstr "définit le canal comme secret" -#: src/irc/irc-recv.c:466 +#: src/irc/irc-recv.c:467 msgid "removes secret channel flag" msgstr "supprime le mode secret pour le canal" -#: src/irc/irc-recv.c:475 +#: src/irc/irc-recv.c:477 msgid "sets topic protection" msgstr "active la protection du titre" -#: src/irc/irc-recv.c:476 +#: src/irc/irc-recv.c:478 msgid "removes topic protection" msgstr "supprime la protection du titre" -#: src/irc/irc-recv.c:485 +#: src/irc/irc-recv.c:495 msgid "gives voice to" msgstr "donne la voix à" -#: src/irc/irc-recv.c:486 +#: src/irc/irc-recv.c:496 msgid "removes voice from" msgstr "supprime la voix de" -#: src/irc/irc-recv.c:557 +#: src/irc/irc-recv.c:538 src/irc/irc-recv.c:610 src/irc/irc-recv.c:889 +#: src/irc/irc-recv.c:1198 +#, 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 +#, 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:632 msgid "You are " msgstr "Vous êtes " -#: src/irc/irc-recv.c:564 +#: src/irc/irc-recv.c:639 msgid " is " msgstr " est " -#: src/irc/irc-recv.c:568 +#: src/irc/irc-recv.c:643 msgid "now known as " msgstr "maintenant connu sous le nom " -#: src/irc/irc-recv.c:620 +#: src/irc/irc-recv.c:695 #, 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:633 src/irc/irc-recv.c:665 +#: src/irc/irc-recv.c:708 src/irc/irc-recv.c:740 msgid "reply from" msgstr "réponse de" -#: src/irc/irc-recv.c:668 +#: src/irc/irc-recv.c:743 #, c-format msgid ": %ld.%ld seconds\n" msgstr ": %ld.%ld secondes\n" -#: src/irc/irc-recv.c:698 +#: src/irc/irc-recv.c:773 #, 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:748 +#: src/irc/irc-recv.c:823 msgid " has left " msgstr " a quitté " -#: src/irc/irc-recv.c:860 +#: src/irc/irc-recv.c:935 #, c-format msgid "On %s: * %s %s" msgstr "Sur %s: * %s %s" -#: src/irc/irc-recv.c:883 +#: src/irc/irc-recv.c:958 #, c-format msgid "On %s: %s> %s" msgstr "Sur %s: %s> %s" -#: src/irc/irc-recv.c:951 +#: src/irc/irc-recv.c:1026 msgid "Received a " msgstr "Reçu un " -#: src/irc/irc-recv.c:953 +#: src/irc/irc-recv.c:1028 msgid "CTCP VERSION " msgstr "CTCP VERSION " -#: src/irc/irc-recv.c:955 +#: src/irc/irc-recv.c:1030 msgid "from" msgstr "de" -#: src/irc/irc-recv.c:990 src/irc/irc-recv.c:1004 src/irc/irc-recv.c:1019 -#: src/irc/irc-recv.c:1034 src/irc/irc-recv.c:1099 src/irc/irc-recv.c:2491 -#: src/irc/irc-recv.c:2531 +#: src/irc/irc-recv.c:1065 src/irc/irc-recv.c:1079 src/irc/irc-recv.c:1094 +#: src/irc/irc-recv.c:1109 src/irc/irc-recv.c:1175 src/irc/irc-recv.c:2630 +#: src/irc/irc-recv.c:2670 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s impossible d'analyser la commande \"%s\"\n" -#: src/irc/irc-recv.c:1081 +#: src/irc/irc-recv.c:1157 #, c-format msgid "Private %s> %s" msgstr "Privé %s> %s" -#: src/irc/irc-recv.c:1154 +#: src/irc/irc-recv.c:1230 msgid "has quit" msgstr "a quitté" -#: src/irc/irc-recv.c:1274 +#: src/irc/irc-recv.c:1350 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s commande \"%s\" reçue sans canal\n" -#: src/irc/irc-recv.c:1302 +#: src/irc/irc-recv.c:1378 msgid " has changed topic for " msgstr " a changé le titre pour " -#: src/irc/irc-recv.c:1307 +#: src/irc/irc-recv.c:1383 #, c-format msgid " to: \"%s\"\n" msgstr " en: \"%s\"\n" -#: src/irc/irc-recv.c:1313 +#: src/irc/irc-recv.c:1389 msgid " has unset topic for " msgstr " a retiré le titre pour " -#: src/irc/irc-recv.c:1404 +#: src/irc/irc-recv.c:1480 #, c-format msgid " is away: %s\n" msgstr " est absent: %s\n" -#: src/irc/irc-recv.c:1478 +#: src/irc/irc-recv.c:1554 msgid "Users online: " msgstr "Utilisateurs en ligne: " -#: src/irc/irc-recv.c:1841 +#: src/irc/irc-recv.c:1917 msgid "idle: " msgstr "inactivité: " -#: src/irc/irc-recv.c:1849 +#: src/irc/irc-recv.c:1925 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:1849 +#: src/irc/irc-recv.c:1925 msgid "day" msgstr "jour" -#: src/irc/irc-recv.c:1859 +#: src/irc/irc-recv.c:1935 msgid "hours" msgstr "heures" -#: src/irc/irc-recv.c:1859 +#: src/irc/irc-recv.c:1935 msgid "hour" msgstr "heure" -#: src/irc/irc-recv.c:1865 +#: src/irc/irc-recv.c:1941 msgid "minutes" msgstr "minutes" -#: src/irc/irc-recv.c:1865 +#: src/irc/irc-recv.c:1941 msgid "minute" msgstr "minute" -#: src/irc/irc-recv.c:1871 +#: src/irc/irc-recv.c:1947 msgid "seconds" msgstr "secondes" -#: src/irc/irc-recv.c:1871 +#: src/irc/irc-recv.c:1947 msgid "second" msgstr "seconde" -#: src/irc/irc-recv.c:1876 +#: src/irc/irc-recv.c:1952 msgid "signon at: " msgstr "signé le: " -#: src/irc/irc-recv.c:1964 +#: src/irc/irc-recv.c:2040 msgid "Channels: " msgstr "Canauxs: " -#: src/irc/irc-recv.c:2152 +#: src/irc/irc-recv.c:2291 msgid "No topic set for " msgstr "Pas de titre défini pour " -#: src/irc/irc-recv.c:2194 +#: src/irc/irc-recv.c:2333 msgid "Topic for " msgstr "Le titre pour " -#: src/irc/irc-recv.c:2198 +#: src/irc/irc-recv.c:2337 #, c-format msgid " is: \"%s\"\n" msgstr " est: \"%s\"\n" -#: src/irc/irc-recv.c:2214 src/irc/irc-recv.c:2294 +#: src/irc/irc-recv.c:2353 src/irc/irc-recv.c:2433 #, 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:2260 +#: src/irc/irc-recv.c:2399 msgid "Topic set by " msgstr "Titre défini par " -#: src/irc/irc-recv.c:2278 +#: src/irc/irc-recv.c:2417 #, 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:2286 +#: src/irc/irc-recv.c:2425 #, 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:2415 +#: src/irc/irc-recv.c:2554 msgid " on " msgstr " sur " -#: src/irc/irc-recv.c:2522 +#: src/irc/irc-recv.c:2661 #, 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:2575 +#: src/irc/irc-recv.c:2714 msgid "Nicks " msgstr "Utilisateurs " -#: src/irc/irc-recv.c:2595 +#: src/irc/irc-recv.c:2734 msgid "Channel " msgstr "Canal " -#: src/irc/irc-recv.c:2606 +#: src/irc/irc-recv.c:2745 msgid "nicks" msgstr "utilisateurs" -#: src/irc/irc-recv.c:2606 +#: src/irc/irc-recv.c:2745 msgid "nick" msgstr "utilisateur" -#: src/irc/irc-recv.c:2614 +#: src/irc/irc-recv.c:2753 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:2614 +#: src/irc/irc-recv.c:2753 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:2623 +#: src/irc/irc-recv.c:2762 msgid "halfops" msgstr "halfops" -#: src/irc/irc-recv.c:2623 +#: src/irc/irc-recv.c:2762 msgid "halfop" msgstr "halfop" -#: src/irc/irc-recv.c:2632 +#: src/irc/irc-recv.c:2771 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:2632 +#: src/irc/irc-recv.c:2771 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:2641 +#: src/irc/irc-recv.c:2780 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:2673 +#: src/irc/irc-recv.c:2813 #, 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:2684 +#: src/irc/irc-recv.c:2824 #, 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:2693 +#: src/irc/irc-recv.c:2833 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1590,11 +1594,11 @@ msgstr "" "%s impossible d'ajouter la fonction pour le message \"%s\" (mémoire " "insuffisante)\n" -#: src/gui/curses/gui-display.c:944 +#: src/gui/curses/gui-display.c:952 msgid "[not connected] " msgstr "[non connecté] " -#: src/gui/curses/gui-display.c:951 src/gui/curses/gui-display.c:954 +#: src/gui/curses/gui-display.c:959 src/gui/curses/gui-display.c:962 msgid "-MORE-" msgstr "-PLUS-" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index 5f9191756..f69d13229 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-02-29 17:13+0100\n" +"POT-Creation-Date: 2004-02-29 22:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -708,10 +708,10 @@ msgstr "" #: src/irc/irc-commands.c:265 src/irc/irc-commands.c:266 #: src/irc/irc-commands.c:267 src/irc/irc-commands.c:268 #: src/irc/irc-commands.c:269 src/irc/irc-commands.c:270 -#: src/irc/irc-commands.c:271 src/irc/irc-commands.c:307 -#: src/irc/irc-commands.c:308 src/irc/irc-commands.c:309 +#: src/irc/irc-commands.c:271 src/irc/irc-commands.c:309 #: src/irc/irc-commands.c:310 src/irc/irc-commands.c:311 -#: src/irc/irc-commands.c:312 +#: src/irc/irc-commands.c:312 src/irc/irc-commands.c:313 +#: src/irc/irc-commands.c:314 msgid "a server message" msgstr "" @@ -784,243 +784,247 @@ msgid "/list end" msgstr "" #: src/irc/irc-commands.c:289 +msgid "channel mode" +msgstr "" + +#: src/irc/irc-commands.c:291 msgid "no topic for channel" msgstr "" -#: src/irc/irc-commands.c:290 +#: src/irc/irc-commands.c:292 msgid "topic of channel" msgstr "" -#: src/irc/irc-commands.c:291 +#: src/irc/irc-commands.c:293 msgid "channel :topic" msgstr "" -#: src/irc/irc-commands.c:292 +#: src/irc/irc-commands.c:294 msgid "" "channel: name of channel\n" "topic: topic of the channel" msgstr "" -#: src/irc/irc-commands.c:294 +#: src/irc/irc-commands.c:296 msgid "infos about topic (nick & date changed)" msgstr "" -#: src/irc/irc-commands.c:297 +#: src/irc/irc-commands.c:299 msgid "server version" msgstr "" -#: src/irc/irc-commands.c:298 +#: src/irc/irc-commands.c:300 msgid "who" msgstr "" -#: src/irc/irc-commands.c:299 +#: src/irc/irc-commands.c:301 msgid "list of nicks on channel" msgstr "" -#: src/irc/irc-commands.c:300 +#: src/irc/irc-commands.c:302 msgid "channel :[[@|+]nick ...]" msgstr "" -#: src/irc/irc-commands.c:301 +#: src/irc/irc-commands.c:303 msgid "" "channel: name of channel\n" "nick: nick on the channel" msgstr "" -#: src/irc/irc-commands.c:303 +#: src/irc/irc-commands.c:305 msgid "links" msgstr "" -#: src/irc/irc-commands.c:304 +#: src/irc/irc-commands.c:306 msgid "end of /links list" msgstr "" -#: src/irc/irc-commands.c:305 +#: src/irc/irc-commands.c:307 msgid "end of /names list" msgstr "" -#: src/irc/irc-commands.c:306 +#: src/irc/irc-commands.c:308 msgid "end of /whowas list" msgstr "" -#: src/irc/irc-commands.c:313 +#: src/irc/irc-commands.c:315 msgid "server local time" msgstr "" -#: src/irc/irc-commands.c:314 +#: src/irc/irc-commands.c:316 msgid "no such nick/channel" msgstr "" -#: src/irc/irc-commands.c:316 +#: src/irc/irc-commands.c:318 msgid "no such server" msgstr "" -#: src/irc/irc-commands.c:318 +#: src/irc/irc-commands.c:320 msgid "no such channel" msgstr "" -#: src/irc/irc-commands.c:320 +#: src/irc/irc-commands.c:322 msgid "cannot send to channel" msgstr "" -#: src/irc/irc-commands.c:322 +#: src/irc/irc-commands.c:324 msgid "too many channels" msgstr "" -#: src/irc/irc-commands.c:324 src/irc/irc-commands.c:326 -#: src/irc/irc-commands.c:328 +#: src/irc/irc-commands.c:326 src/irc/irc-commands.c:328 +#: src/irc/irc-commands.c:330 msgid "was no such nick" msgstr "" -#: src/irc/irc-commands.c:330 +#: src/irc/irc-commands.c:332 msgid "no origin" msgstr "" -#: src/irc/irc-commands.c:332 +#: src/irc/irc-commands.c:334 msgid "no recipient" msgstr "" -#: src/irc/irc-commands.c:334 +#: src/irc/irc-commands.c:336 msgid "no text to send" msgstr "" -#: src/irc/irc-commands.c:336 +#: src/irc/irc-commands.c:338 msgid "no toplevel" msgstr "" -#: src/irc/irc-commands.c:338 +#: src/irc/irc-commands.c:340 msgid "wilcard in toplevel domain" msgstr "" -#: src/irc/irc-commands.c:340 +#: src/irc/irc-commands.c:342 msgid "unknown command" msgstr "" -#: src/irc/irc-commands.c:342 +#: src/irc/irc-commands.c:344 msgid "MOTD is missing" msgstr "" -#: src/irc/irc-commands.c:344 +#: src/irc/irc-commands.c:346 msgid "no administrative info" msgstr "" -#: src/irc/irc-commands.c:346 +#: src/irc/irc-commands.c:348 msgid "file error" msgstr "" -#: src/irc/irc-commands.c:348 +#: src/irc/irc-commands.c:350 msgid "no nickname given" msgstr "" -#: src/irc/irc-commands.c:350 +#: src/irc/irc-commands.c:352 msgid "erroneus nickname" msgstr "" -#: src/irc/irc-commands.c:352 +#: src/irc/irc-commands.c:354 msgid "nickname already in use" msgstr "" -#: src/irc/irc-commands.c:354 +#: src/irc/irc-commands.c:356 msgid "nickname collision" msgstr "" -#: src/irc/irc-commands.c:356 +#: src/irc/irc-commands.c:358 msgid "user not in channel" msgstr "" -#: src/irc/irc-commands.c:358 +#: src/irc/irc-commands.c:360 msgid "not on channel" msgstr "" -#: src/irc/irc-commands.c:360 +#: src/irc/irc-commands.c:362 msgid "user already on channel" msgstr "" -#: src/irc/irc-commands.c:362 +#: src/irc/irc-commands.c:364 msgid "user not logged in" msgstr "" -#: src/irc/irc-commands.c:364 +#: src/irc/irc-commands.c:366 msgid "summon has been disabled" msgstr "" -#: src/irc/irc-commands.c:366 +#: src/irc/irc-commands.c:368 msgid "users has been disabled" msgstr "" -#: src/irc/irc-commands.c:368 +#: src/irc/irc-commands.c:370 msgid "you are not registered" msgstr "" -#: src/irc/irc-commands.c:370 +#: src/irc/irc-commands.c:372 msgid "not enough parameters" msgstr "" -#: src/irc/irc-commands.c:372 +#: src/irc/irc-commands.c:374 msgid "you may not register" msgstr "" -#: src/irc/irc-commands.c:374 +#: src/irc/irc-commands.c:376 msgid "your host isn't among the privileged" msgstr "" -#: src/irc/irc-commands.c:376 +#: src/irc/irc-commands.c:378 msgid "password incorrect" msgstr "" -#: src/irc/irc-commands.c:378 +#: src/irc/irc-commands.c:380 msgid "you are banned from this server" msgstr "" -#: src/irc/irc-commands.c:380 +#: src/irc/irc-commands.c:382 msgid "channel key already set" msgstr "" -#: src/irc/irc-commands.c:382 +#: src/irc/irc-commands.c:384 msgid "channel is already full" msgstr "" -#: src/irc/irc-commands.c:384 +#: src/irc/irc-commands.c:386 msgid "unknown mode char to me" msgstr "" -#: src/irc/irc-commands.c:386 +#: src/irc/irc-commands.c:388 msgid "cannot join channel (invite only)" msgstr "" -#: src/irc/irc-commands.c:388 +#: src/irc/irc-commands.c:390 msgid "cannot join channel (banned from channel)" msgstr "" -#: src/irc/irc-commands.c:390 +#: src/irc/irc-commands.c:392 msgid "cannot join channel (bad channel key)" msgstr "" -#: src/irc/irc-commands.c:392 +#: src/irc/irc-commands.c:394 msgid "you're not an IRC operator" msgstr "" -#: src/irc/irc-commands.c:394 +#: src/irc/irc-commands.c:396 msgid "you're not channel operator" msgstr "" -#: src/irc/irc-commands.c:396 +#: src/irc/irc-commands.c:398 msgid "you can't kill a server!" msgstr "" -#: src/irc/irc-commands.c:398 +#: src/irc/irc-commands.c:400 msgid "no O-lines for your host" msgstr "" -#: src/irc/irc-commands.c:400 +#: src/irc/irc-commands.c:402 msgid "unknown mode flag" msgstr "" -#: src/irc/irc-commands.c:402 +#: src/irc/irc-commands.c:404 msgid "can't change mode for other users" msgstr "" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2704 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2844 msgid "unknown" msgstr "" @@ -1042,12 +1046,12 @@ msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" #: src/irc/irc-send.c:467 src/irc/irc-send.c:489 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:897 +#: src/irc/irc-recv.c:972 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:503 src/irc/irc-recv.c:1057 +#: src/irc/irc-send.c:503 src/irc/irc-recv.c:1133 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "" @@ -1071,8 +1075,8 @@ msgstr "" msgid " has joined " msgstr "" -#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:506 src/irc/irc-recv.c:772 -#: src/irc/irc-recv.c:906 src/irc/irc-recv.c:2205 src/irc/irc-recv.c:2270 +#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:847 +#: src/irc/irc-recv.c:981 src/irc/irc-recv.c:2344 src/irc/irc-recv.c:2409 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "" @@ -1085,70 +1089,59 @@ msgstr "" msgid " from " msgstr "" -#: src/irc/irc-recv.c:290 src/irc/irc-recv.c:535 src/irc/irc-recv.c:814 -#: src/irc/irc-recv.c:1122 -#, c-format -msgid "%s \"%s\" command received without host\n" -msgstr "" - -#: src/irc/irc-recv.c:304 -#, c-format -msgid "%s \"%s\" command received without channel or nickname\n" -msgstr "" - -#: src/irc/irc-recv.c:344 +#: src/irc/irc-recv.c:307 msgid "sets ban on" msgstr "" -#: src/irc/irc-recv.c:345 +#: src/irc/irc-recv.c:308 msgid "removes ban on" msgstr "" -#: src/irc/irc-recv.c:352 +#: src/irc/irc-recv.c:325 msgid "sets invite-only channel flag" msgstr "" -#: src/irc/irc-recv.c:353 +#: src/irc/irc-recv.c:326 msgid "removes invite-only channel flag" msgstr "" -#: src/irc/irc-recv.c:369 +#: src/irc/irc-recv.c:343 msgid "sets channel key to" msgstr "" -#: src/irc/irc-recv.c:370 +#: src/irc/irc-recv.c:344 msgid "removes channel key" msgstr "" -#: src/irc/irc-recv.c:399 +#: src/irc/irc-recv.c:375 msgid "sets the user limit to" msgstr "" -#: src/irc/irc-recv.c:400 +#: src/irc/irc-recv.c:376 msgid "removes user limit" msgstr "" -#: src/irc/irc-recv.c:420 +#: src/irc/irc-recv.c:398 msgid "sets moderated channel flag" msgstr "" -#: src/irc/irc-recv.c:421 +#: src/irc/irc-recv.c:399 msgid "removes moderated channel flag" msgstr "" -#: src/irc/irc-recv.c:430 +#: src/irc/irc-recv.c:409 msgid "sets messages from channel only flag" msgstr "" -#: src/irc/irc-recv.c:431 +#: src/irc/irc-recv.c:410 msgid "removes messages from channel only flag" msgstr "" -#: src/irc/irc-recv.c:440 +#: src/irc/irc-recv.c:427 msgid "gives channel operator status to" msgstr "" -#: src/irc/irc-recv.c:441 +#: src/irc/irc-recv.c:428 msgid "removes channel operator status from" msgstr "" @@ -1160,270 +1153,281 @@ msgstr "" msgid "removes private channel flag" msgstr "" -#: src/irc/irc-recv.c:465 +#: src/irc/irc-recv.c:466 msgid "sets secret channel flag" msgstr "" -#: src/irc/irc-recv.c:466 +#: src/irc/irc-recv.c:467 msgid "removes secret channel flag" msgstr "" -#: src/irc/irc-recv.c:475 +#: src/irc/irc-recv.c:477 msgid "sets topic protection" msgstr "" -#: src/irc/irc-recv.c:476 +#: src/irc/irc-recv.c:478 msgid "removes topic protection" msgstr "" -#: src/irc/irc-recv.c:485 +#: src/irc/irc-recv.c:495 msgid "gives voice to" msgstr "" -#: src/irc/irc-recv.c:486 +#: src/irc/irc-recv.c:496 msgid "removes voice from" msgstr "" -#: src/irc/irc-recv.c:557 +#: src/irc/irc-recv.c:538 src/irc/irc-recv.c:610 src/irc/irc-recv.c:889 +#: src/irc/irc-recv.c:1198 +#, c-format +msgid "%s \"%s\" command received without host\n" +msgstr "" + +#: src/irc/irc-recv.c:552 +#, c-format +msgid "%s \"%s\" command received without channel or nickname\n" +msgstr "" + +#: src/irc/irc-recv.c:632 msgid "You are " msgstr "" -#: src/irc/irc-recv.c:564 +#: src/irc/irc-recv.c:639 msgid " is " msgstr "" -#: src/irc/irc-recv.c:568 +#: src/irc/irc-recv.c:643 msgid "now known as " msgstr "" -#: src/irc/irc-recv.c:620 +#: src/irc/irc-recv.c:695 #, c-format msgid "%s nickname not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:633 src/irc/irc-recv.c:665 +#: src/irc/irc-recv.c:708 src/irc/irc-recv.c:740 msgid "reply from" msgstr "" -#: src/irc/irc-recv.c:668 +#: src/irc/irc-recv.c:743 #, c-format msgid ": %ld.%ld seconds\n" msgstr "" -#: src/irc/irc-recv.c:698 +#: src/irc/irc-recv.c:773 #, c-format msgid "%s \"%s\" command received without host or channel\n" msgstr "" -#: src/irc/irc-recv.c:748 +#: src/irc/irc-recv.c:823 msgid " has left " msgstr "" -#: src/irc/irc-recv.c:860 +#: src/irc/irc-recv.c:935 #, c-format msgid "On %s: * %s %s" msgstr "" -#: src/irc/irc-recv.c:883 +#: src/irc/irc-recv.c:958 #, c-format msgid "On %s: %s> %s" msgstr "" -#: src/irc/irc-recv.c:951 +#: src/irc/irc-recv.c:1026 msgid "Received a " msgstr "" -#: src/irc/irc-recv.c:953 +#: src/irc/irc-recv.c:1028 msgid "CTCP VERSION " msgstr "" -#: src/irc/irc-recv.c:955 +#: src/irc/irc-recv.c:1030 msgid "from" msgstr "" -#: src/irc/irc-recv.c:990 src/irc/irc-recv.c:1004 src/irc/irc-recv.c:1019 -#: src/irc/irc-recv.c:1034 src/irc/irc-recv.c:1099 src/irc/irc-recv.c:2491 -#: src/irc/irc-recv.c:2531 +#: src/irc/irc-recv.c:1065 src/irc/irc-recv.c:1079 src/irc/irc-recv.c:1094 +#: src/irc/irc-recv.c:1109 src/irc/irc-recv.c:1175 src/irc/irc-recv.c:2630 +#: src/irc/irc-recv.c:2670 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:1081 +#: src/irc/irc-recv.c:1157 #, c-format msgid "Private %s> %s" msgstr "" -#: src/irc/irc-recv.c:1154 +#: src/irc/irc-recv.c:1230 msgid "has quit" msgstr "" -#: src/irc/irc-recv.c:1274 +#: src/irc/irc-recv.c:1350 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "" -#: src/irc/irc-recv.c:1302 +#: src/irc/irc-recv.c:1378 msgid " has changed topic for " msgstr "" -#: src/irc/irc-recv.c:1307 +#: src/irc/irc-recv.c:1383 #, c-format msgid " to: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:1313 +#: src/irc/irc-recv.c:1389 msgid " has unset topic for " msgstr "" -#: src/irc/irc-recv.c:1404 +#: src/irc/irc-recv.c:1480 #, c-format msgid " is away: %s\n" msgstr "" -#: src/irc/irc-recv.c:1478 +#: src/irc/irc-recv.c:1554 msgid "Users online: " msgstr "" -#: src/irc/irc-recv.c:1841 +#: src/irc/irc-recv.c:1917 msgid "idle: " msgstr "" -#: src/irc/irc-recv.c:1849 +#: src/irc/irc-recv.c:1925 msgid "days" msgstr "" -#: src/irc/irc-recv.c:1849 +#: src/irc/irc-recv.c:1925 msgid "day" msgstr "" -#: src/irc/irc-recv.c:1859 +#: src/irc/irc-recv.c:1935 msgid "hours" msgstr "" -#: src/irc/irc-recv.c:1859 +#: src/irc/irc-recv.c:1935 msgid "hour" msgstr "" -#: src/irc/irc-recv.c:1865 +#: src/irc/irc-recv.c:1941 msgid "minutes" msgstr "" -#: src/irc/irc-recv.c:1865 +#: src/irc/irc-recv.c:1941 msgid "minute" msgstr "" -#: src/irc/irc-recv.c:1871 +#: src/irc/irc-recv.c:1947 msgid "seconds" msgstr "" -#: src/irc/irc-recv.c:1871 +#: src/irc/irc-recv.c:1947 msgid "second" msgstr "" -#: src/irc/irc-recv.c:1876 +#: src/irc/irc-recv.c:1952 msgid "signon at: " msgstr "" -#: src/irc/irc-recv.c:1964 +#: src/irc/irc-recv.c:2040 msgid "Channels: " msgstr "" -#: src/irc/irc-recv.c:2152 +#: src/irc/irc-recv.c:2291 msgid "No topic set for " msgstr "" -#: src/irc/irc-recv.c:2194 +#: src/irc/irc-recv.c:2333 msgid "Topic for " msgstr "" -#: src/irc/irc-recv.c:2198 +#: src/irc/irc-recv.c:2337 #, c-format msgid " is: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2214 src/irc/irc-recv.c:2294 +#: src/irc/irc-recv.c:2353 src/irc/irc-recv.c:2433 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2260 +#: src/irc/irc-recv.c:2399 msgid "Topic set by " msgstr "" -#: src/irc/irc-recv.c:2278 +#: src/irc/irc-recv.c:2417 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2286 +#: src/irc/irc-recv.c:2425 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2415 +#: src/irc/irc-recv.c:2554 msgid " on " msgstr "" -#: src/irc/irc-recv.c:2522 +#: src/irc/irc-recv.c:2661 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2575 +#: src/irc/irc-recv.c:2714 msgid "Nicks " msgstr "" -#: src/irc/irc-recv.c:2595 +#: src/irc/irc-recv.c:2734 msgid "Channel " msgstr "" -#: src/irc/irc-recv.c:2606 +#: src/irc/irc-recv.c:2745 msgid "nicks" msgstr "" -#: src/irc/irc-recv.c:2606 +#: src/irc/irc-recv.c:2745 msgid "nick" msgstr "" -#: src/irc/irc-recv.c:2614 +#: src/irc/irc-recv.c:2753 msgid "ops" msgstr "" -#: src/irc/irc-recv.c:2614 +#: src/irc/irc-recv.c:2753 msgid "op" msgstr "" -#: src/irc/irc-recv.c:2623 +#: src/irc/irc-recv.c:2762 msgid "halfops" msgstr "" -#: src/irc/irc-recv.c:2623 +#: src/irc/irc-recv.c:2762 msgid "halfop" msgstr "" -#: src/irc/irc-recv.c:2632 +#: src/irc/irc-recv.c:2771 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:2632 +#: src/irc/irc-recv.c:2771 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:2641 +#: src/irc/irc-recv.c:2780 msgid "normal" msgstr "" -#: src/irc/irc-recv.c:2673 +#: src/irc/irc-recv.c:2813 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2684 +#: src/irc/irc-recv.c:2824 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2693 +#: src/irc/irc-recv.c:2833 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1485,11 +1489,11 @@ msgstr "" msgid "%s unable to add handler for \"%s\" message (not enough memory)\n" msgstr "" -#: src/gui/curses/gui-display.c:944 +#: src/gui/curses/gui-display.c:952 msgid "[not connected] " msgstr "" -#: src/gui/curses/gui-display.c:951 src/gui/curses/gui-display.c:954 +#: src/gui/curses/gui-display.c:959 src/gui/curses/gui-display.c:962 msgid "-MORE-" msgstr "" diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c index 883121251..12a314b26 100644 --- a/weechat/src/gui/curses/gui-display.c +++ b/weechat/src/gui/curses/gui-display.c @@ -826,7 +826,7 @@ gui_draw_window_status (t_gui_window *window) { t_gui_window *ptr_win; char format_more[32]; - int i; + int i, first_mode; /* TODO: manage splitted windows! */ if (window != gui_current_window) @@ -919,13 +919,21 @@ gui_draw_window_status (t_gui_window *window) if (gui_current_window == CHANNEL(ptr_win)->window) { /* display channel modes */ - wprintw (window->win_status, "(+"); + wprintw (window->win_status, "("); i = 0; + first_mode = 1; while (CHANNEL(ptr_win)->modes[i]) { if (CHANNEL(ptr_win)->modes[i] != ' ') + { + if (first_mode) + { + wprintw (window->win_status, "+"); + first_mode = 0; + } wprintw (window->win_status, "%c", CHANNEL(ptr_win)->modes[i]); + } i++; } if (CHANNEL(ptr_win)->modes[CHANNEL_MODE_KEY] != ' ') diff --git a/weechat/src/irc/irc-commands.c b/weechat/src/irc/irc-commands.c index 7acb23d70..8889718e2 100644 --- a/weechat/src/irc/irc-commands.c +++ b/weechat/src/irc/irc-commands.c @@ -286,6 +286,8 @@ t_irc_command irc_commands[] = { "321", N_("/list start"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_321 }, { "322", N_("channel (for /list)"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_322 }, { "323", N_("/list end"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_323 }, + { "324", N_("channel mode"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_324 }, + { "329", "???", "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_329 }, { "331", N_("no topic for channel"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_331 }, { "332", N_("topic of channel"), N_("channel :topic"), diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c index 189d63cc7..004dfe3a1 100644 --- a/weechat/src/irc/irc-recv.c +++ b/weechat/src/irc/irc-recv.c @@ -272,16 +272,264 @@ irc_cmd_recv_kick (t_irc_server *server, char *host, char *arguments) } /* + * irc_get_channel_modes: get channel modes + */ + +void irc_get_channel_modes (t_irc_channel *ptr_channel, char *channel_name, + char *nick_host, char *modes, char *parm) +{ + char *pos, set_flag; + t_irc_nick *ptr_nick; + + set_flag = '+'; + while (modes && modes[0]) + { + switch (modes[0]) + { + case '+': + set_flag = '+'; + break; + case '-': + set_flag = '-'; + break; + case 'b': + pos = NULL; + if (parm) + { + pos = strchr (parm, ' '); + if (pos) + pos[0] = '\0'; + } + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "b", nick_host, + (set_flag == '+') ? + _("sets ban on") : + _("removes ban on"), + (parm) ? parm : NULL); + + /* look for next parameter */ + if (parm && pos) + { + pos++; + while (pos[0] == ' ') + pos++; + parm = pos; + } + break; + case 'i': + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "i", nick_host, + (set_flag == '+') ? + _("sets invite-only channel flag") : + _("removes invite-only channel flag"), + NULL); + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_INVITE); + break; + case 'k': + pos = NULL; + if (parm) + { + pos = strchr (parm, ' '); + if (pos) + pos[0] = '\0'; + } + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "k", nick_host, + (set_flag == '+') ? + _("sets channel key to") : + _("removes channel key"), + (set_flag == '+') ? + ((parm) ? parm : NULL) : + NULL); + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_KEY); + if (ptr_channel->key) + free (ptr_channel->key); + ptr_channel->key = strdup (parm); + + /* look for next parameter */ + if (parm && pos) + { + pos++; + while (pos[0] == ' ') + pos++; + parm = pos; + } + break; + case 'l': + pos = NULL; + if (parm) + { + pos = strchr (parm, ' '); + if (pos) + pos[0] = '\0'; + } + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "l", nick_host, + (set_flag == '+') ? + _("sets the user limit to") : + _("removes user limit"), + (set_flag == '+') ? + ((parm) ? parm : NULL) : + NULL); + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_LIMIT); + ptr_channel->limit = atoi (parm); + + /* look for next parameter */ + if (parm && pos) + { + pos++; + while (pos[0] == ' ') + pos++; + parm = pos; + } + break; + case 'm': + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "m", nick_host, + (set_flag == '+') ? + _("sets moderated channel flag") : + _("removes moderated channel flag"), + NULL); + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_MODERATED); + break; + case 'n': + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "n", nick_host, + (set_flag == '+') ? + _("sets messages from channel only flag") : + _("removes messages from channel only flag"), + NULL); + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_NO_MSG_OUT); + break; + case 'o': + pos = NULL; + if (parm) + { + pos = strchr (parm, ' '); + if (pos) + pos[0] = '\0'; + } + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "o", nick_host, + (set_flag == '+') ? + _("gives channel operator status to") : + _("removes channel operator status from"), + (parm) ? parm : NULL); + if (parm) + { + ptr_nick = nick_search (ptr_channel, parm); + if (ptr_nick) + { + ptr_nick->is_op = (set_flag == '+') ? 1 : 0; + nick_resort (ptr_channel, ptr_nick); + gui_redraw_window_nick (ptr_channel->window); + } + } + + /* look for next parameter */ + if (parm && pos) + { + pos++; + while (pos[0] == ' ') + pos++; + parm = pos; + } + break; + case 'p': + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "p", nick_host, + (set_flag == '+') ? + _("sets private channel flag") : + _("removes private channel flag"), + NULL); + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_SECRET); + break; + case 's': + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "s", nick_host, + (set_flag == '+') ? + _("sets secret channel flag") : + _("removes secret channel flag"), + NULL); + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_SECRET); + break; + case 't': + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "t", nick_host, + (set_flag == '+') ? + _("sets topic protection") : + _("removes topic protection"), + NULL); + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_TOPIC); + break; + case 'v': + pos = NULL; + if (parm) + { + pos = strchr (parm, ' '); + if (pos) + pos[0] = '\0'; + } + if (nick_host) + irc_display_mode (ptr_channel->window, + channel_name, set_flag, "v", nick_host, + (set_flag == '+') ? + _("gives voice to") : + _("removes voice from"), + (parm) ? parm : NULL); + + if (parm) + { + ptr_nick = nick_search (ptr_channel, parm); + if (ptr_nick) + { + ptr_nick->has_voice = (set_flag == '+') ? 1 : 0; + nick_resort (ptr_channel, ptr_nick); + gui_redraw_window_nick (ptr_channel->window); + } + } + + /* look for next parameter */ + if (parm && pos) + { + pos++; + while (pos[0] == ' ') + pos++; + parm = pos; + } + break; + } + modes++; + } +} + +/* * irc_cmd_recv_mode: 'mode' message received */ int irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) { - char *pos, *pos2, *pos_parm; - char set_flag; + char *pos, *pos_parm; t_irc_channel *ptr_channel; - t_irc_nick *ptr_nick; /* no host => we can't identify sender of message! */ if (host == NULL) @@ -319,186 +567,12 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) pos_parm++; } - set_flag = '+'; - if (string_is_channel (arguments)) { ptr_channel = channel_search (server, arguments); if (ptr_channel) { - /* channel modes */ - while (pos && pos[0]) - { - switch (pos[0]) - { - case '+': - set_flag = '+'; - break; - case '-': - set_flag = '-'; - break; - case 'b': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "b", host, - (set_flag == '+') ? - _("sets ban on") : - _("removes ban on"), - pos_parm); - break; - case 'i': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "i", host, - (set_flag == '+') ? - _("sets invite-only channel flag") : - _("removes invite-only channel flag"), - NULL); - SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), - CHANNEL_MODE_INVITE); - break; - case 'k': - pos2 = NULL; - if (pos_parm) - { - pos2 = strchr (pos_parm, ' '); - if (pos2) - pos2[0] = '\0'; - } - irc_display_mode (ptr_channel->window, - arguments, set_flag, "k", host, - (set_flag == '+') ? - _("sets channel key to") : - _("removes channel key"), - (set_flag == '+') ? - ((pos_parm) ? pos_parm : NULL) : - NULL); - SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), - CHANNEL_MODE_KEY); - if (ptr_channel->key) - free (ptr_channel->key); - ptr_channel->key = strdup (pos_parm); - - /* look for next parameter */ - if (pos_parm && pos2) - { - pos2++; - while (pos2[0] == ' ') - pos2++; - pos_parm = pos2; - } - break; - case 'l': - pos2 = NULL; - if (pos_parm) - { - pos2 = strchr (pos_parm, ' '); - if (pos2) - pos2[0] = '\0'; - } - irc_display_mode (ptr_channel->window, - arguments, set_flag, "l", host, - (set_flag == '+') ? - _("sets the user limit to") : - _("removes user limit"), - (set_flag == '+') ? - ((pos_parm) ? pos_parm : NULL) : - NULL); - SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), - CHANNEL_MODE_LIMIT); - ptr_channel->limit = atoi (pos_parm); - - /* look for next parameter */ - if (pos_parm && pos2) - { - pos2++; - while (pos2[0] == ' ') - pos2++; - pos_parm = pos2; - } - break; - case 'm': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "m", host, - (set_flag == '+') ? - _("sets moderated channel flag") : - _("removes moderated channel flag"), - NULL); - SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), - CHANNEL_MODE_MODERATED); - break; - case 'n': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "n", host, - (set_flag == '+') ? - _("sets messages from channel only flag") : - _("removes messages from channel only flag"), - NULL); - SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), - CHANNEL_MODE_NO_MSG_OUT); - break; - case 'o': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "o", host, - (set_flag == '+') ? - _("gives channel operator status to") : - _("removes channel operator status from"), - pos_parm); - ptr_nick = nick_search (ptr_channel, pos_parm); - if (ptr_nick) - { - ptr_nick->is_op = (set_flag == '+') ? 1 : 0; - nick_resort (ptr_channel, ptr_nick); - gui_redraw_window_nick (ptr_channel->window); - } - break; - case 'p': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "p", host, - (set_flag == '+') ? - _("sets private channel flag") : - _("removes private channel flag"), - NULL); - SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), - CHANNEL_MODE_SECRET); - break; - case 's': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "s", host, - (set_flag == '+') ? - _("sets secret channel flag") : - _("removes secret channel flag"), - NULL); - SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), - CHANNEL_MODE_SECRET); - break; - case 't': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "t", host, - (set_flag == '+') ? - _("sets topic protection") : - _("removes topic protection"), - NULL); - SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), - CHANNEL_MODE_TOPIC); - break; - case 'v': - irc_display_mode (ptr_channel->window, - arguments, set_flag, "v", host, - (set_flag == '+') ? - _("gives voice to") : - _("removes voice from"), - pos_parm); - - ptr_nick = nick_search (ptr_channel, pos_parm); - if (ptr_nick) - { - ptr_nick->has_voice = (set_flag == '+') ? 1 : 0; - nick_resort (ptr_channel, ptr_nick); - gui_redraw_window_nick (ptr_channel->window); - } - break; - } - pos++; - } + irc_get_channel_modes (ptr_channel, arguments, host, pos, pos_parm); gui_draw_window_status (gui_current_window); } else @@ -2135,6 +2209,69 @@ irc_cmd_recv_323 (t_irc_server *server, char *host, char *arguments) } /* + * irc_cmd_recv_324: '324' command (channel mode) + */ + +int +irc_cmd_recv_324 (t_irc_server *server, char *host, char *arguments) +{ + char *pos_chan, *pos, *pos_parm; + t_irc_channel *ptr_channel; + + /* make gcc happy */ + (void) host; + + pos_chan = strchr (arguments, ' '); + if (pos_chan) + { + pos_chan[0] = '\0'; + pos_chan++; + while (pos_chan[0] == ' ') + pos_chan++; + + pos = strchr (pos_chan, ' '); + if (pos) + { + pos[0] = '\0'; + pos++; + while (pos[0] == ' ') + pos++; + + pos_parm = strchr (pos, ' '); + if (pos_parm) + { + pos_parm[0] = '\0'; + pos_parm++; + while (pos_parm[0] == ' ') + pos_parm++; + } + ptr_channel = channel_search (server, pos_chan); + if (ptr_channel) + { + irc_get_channel_modes (ptr_channel, NULL, NULL, pos, pos_parm); + gui_draw_window_status (gui_current_window); + } + } + } + return 0; +} + +/* + * irc_cmd_recv_329: '329' command (???) + */ + +int +irc_cmd_recv_329 (t_irc_server *server, char *host, char *arguments) +{ + /* make gcc happy */ + (void) server; + (void) host; + (void) arguments; + + return 0; +} + +/* * irc_cmd_recv_331: '331' command received (no topic for channel) */ @@ -2643,6 +2780,7 @@ irc_cmd_recv_366 (t_irc_server *server, char *host, char *arguments) _("normal")); gui_printf_color (ptr_channel->window, COLOR_WIN_CHAT_DARK, ")\n"); + irc_cmd_send_mode (server, ptr_channel->name); } else { diff --git a/weechat/src/irc/irc.h b/weechat/src/irc/irc.h index 1ad068aed..1279f7444 100644 --- a/weechat/src/irc/irc.h +++ b/weechat/src/irc/irc.h @@ -295,6 +295,8 @@ extern int irc_cmd_recv_320 (t_irc_server *, char *, char *); extern int irc_cmd_recv_321 (t_irc_server *, char *, char *); extern int irc_cmd_recv_322 (t_irc_server *, char *, char *); extern int irc_cmd_recv_323 (t_irc_server *, char *, char *); +extern int irc_cmd_recv_324 (t_irc_server *, char *, char *); +extern int irc_cmd_recv_329 (t_irc_server *, char *, char *); extern int irc_cmd_recv_331 (t_irc_server *, char *, char *); extern int irc_cmd_recv_332 (t_irc_server *, char *, char *); extern int irc_cmd_recv_333 (t_irc_server *, char *, char *); |