diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | TODO | 26 | ||||
| -rw-r--r-- | po/fr.po | 646 | ||||
| -rw-r--r-- | po/weechat.pot | 635 | ||||
| -rw-r--r-- | src/gui/curses/gui-display.c | 25 | ||||
| -rw-r--r-- | src/irc/Makefile.am | 1 | ||||
| -rw-r--r-- | src/irc/irc-channel.c | 5 | ||||
| -rw-r--r-- | src/irc/irc-commands.c | 6 | ||||
| -rw-r--r-- | src/irc/irc-recv.c | 284 | ||||
| -rw-r--r-- | src/irc/irc-send.c | 11 | ||||
| -rw-r--r-- | src/irc/irc.h | 23 | ||||
| -rw-r--r-- | weechat/ChangeLog | 3 | ||||
| -rw-r--r-- | weechat/TODO | 26 | ||||
| -rw-r--r-- | weechat/po/fr.po | 646 | ||||
| -rw-r--r-- | weechat/po/weechat.pot | 635 | ||||
| -rw-r--r-- | weechat/src/gui/curses/gui-display.c | 25 | ||||
| -rw-r--r-- | weechat/src/irc/Makefile.am | 1 | ||||
| -rw-r--r-- | weechat/src/irc/irc-channel.c | 5 | ||||
| -rw-r--r-- | weechat/src/irc/irc-commands.c | 6 | ||||
| -rw-r--r-- | weechat/src/irc/irc-recv.c | 284 | ||||
| -rw-r--r-- | weechat/src/irc/irc-send.c | 11 | ||||
| -rw-r--r-- | weechat/src/irc/irc.h | 23 |
22 files changed, 1900 insertions, 1430 deletions
@@ -1,10 +1,11 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2004-02-25 +ChangeLog - 2004-02-29 Version 0.0.6 (under dev!): + * /mode command is now ok and channel flags are displayed in status bar * fixed display bug (text was blinking when scrolling) * CTCP Version reply is now in english only and doesn't show host (security reason) @@ -1,7 +1,7 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -TODO - 2004-02-07 +TODO - 2004-02-29 Legend: # done @@ -10,38 +10,33 @@ Legend: ? is this really necessary? -v0.0.5: +v0.0.6: ------ * General: - # debug messages can be enabled via ./configure --enbale-debug option + - Windows version + Solaris version - * WeeChat commands: - # "/set" command: allow the user to set the WeeChat variables - under WeeChat without editing the config file (colors, time - format, etc) - + * IRC protocol: + + "/mode" command: change the user/channels modes + + "/dcc" command (for chat and sending/receiving files) + * Interface: + internationalization (traduce WeeChat in many languages) - # info bar - # add clock + - display current channel modes (example : #weechat(+nt)) * Configuration: + add missing options for config file - + add key bindings to config file - + - add key bindings to config file + Future versions: --------------- * General: - - Windows version - *BSD version * IRC protocol: - + "/mode" command: change the user/channels modes - - "/dcc" command (for chat and sending/receiving files) - complete "/list" command: add regexp search, display only channels that match regexp - "/ignore" and "/unignore" commands: hide all that is write by a given @@ -64,7 +59,6 @@ Future versions: * Interface: + Gtk GUI - - display current channel modes (example : #weechat(+nt)) - interpret special chars in messages (color & bold for example) - many channel windows in one window/term (window split) - add lag indicator @@ -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-07 20:17+0100\n" -"PO-Revision-Date: 2004-02-07 20:17+0100\n" +"POT-Creation-Date: 2004-02-29 17:13+0100\n" +"PO-Revision-Date: 2004-02-29 17:13+0100\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -107,7 +107,7 @@ msgstr "%s connexion au serveur irc impossible\n" msgid "Disconnected from server!\n" msgstr "Déconnecté du serveur !\n" -#: src/irc/irc-channel.c:50 +#: src/irc/irc-channel.c:51 #, c-format msgid "%s cannot allocate new channel" msgstr "%s impossible d'allouer un nouveau canal" @@ -116,14 +116,14 @@ msgstr "%s impossible d'allouer un nouveau canal" msgid "find information about the administrator of the server" msgstr "trouver les informations sur l'administrateur du serveur" -#: src/irc/irc-commands.c:35 src/irc/irc-commands.c:58 -#: src/irc/irc-commands.c:128 src/irc/irc-commands.c:200 -#: src/irc/irc-commands.c:207 src/irc/irc-commands.c:213 +#: src/irc/irc-commands.c:35 src/irc/irc-commands.c:64 +#: src/irc/irc-commands.c:134 src/irc/irc-commands.c:206 +#: src/irc/irc-commands.c:213 src/irc/irc-commands.c:219 msgid "[target]" msgstr "[cible]" -#: src/irc/irc-commands.c:36 src/irc/irc-commands.c:207 -#: src/irc/irc-commands.c:213 +#: src/irc/irc-commands.c:36 src/irc/irc-commands.c:213 +#: src/irc/irc-commands.c:219 msgid "target: server" msgstr "cible: serveur" @@ -161,43 +161,61 @@ msgstr "" "type: \"action\" ou \"version\"" #: src/irc/irc-commands.c:47 +msgid "starts DCC (file or chat)" +msgstr "démarre le DCC (fichier ou discussion)" + +#: src/irc/irc-commands.c:48 +msgid "action nickname [file]" +msgstr "action pseudo [fichier]" + +#: src/irc/irc-commands.c:49 +msgid "" +"action: 'send' (file) or 'chat'\n" +"nickname: nickname to send file or chat\n" +"file: filename (on local host)" +msgstr "" +"action: 'send' (envoi de fichier) ou 'chat' (disuccion)\n" +"pseudo: pseudo pour envoyer le fichier ou discuter\n" +"fichier: nom du fichier (sur la machine locale)" + +#: src/irc/irc-commands.c:53 msgid "removes channel operator status from nickname(s)" msgstr "retire le statut d'opérateur du canal à/aux nick(s)" -#: src/irc/irc-commands.c:48 src/irc/irc-commands.c:51 -#: src/irc/irc-commands.c:141 src/irc/irc-commands.c:219 +#: src/irc/irc-commands.c:54 src/irc/irc-commands.c:57 +#: src/irc/irc-commands.c:147 src/irc/irc-commands.c:225 msgid "nickname [nickname]" msgstr "nickname [nickname]" -#: src/irc/irc-commands.c:50 +#: src/irc/irc-commands.c:56 msgid "removes voice from nickname(s)" msgstr "retire la voix du/des pseudo(s)" -#: src/irc/irc-commands.c:53 +#: src/irc/irc-commands.c:59 msgid "shutdown the server" msgstr "arrêter le serveur" -#: src/irc/irc-commands.c:56 +#: src/irc/irc-commands.c:62 msgid "error received from IRC server" msgstr "erreur reçue du serveur IRC" -#: src/irc/irc-commands.c:57 +#: src/irc/irc-commands.c:63 msgid "get information describing the server" msgstr "voir les informations concernant le serveur" -#: src/irc/irc-commands.c:59 src/irc/irc-commands.c:129 +#: src/irc/irc-commands.c:65 src/irc/irc-commands.c:135 msgid "target: server name" msgstr "cible: nom du serveur" -#: src/irc/irc-commands.c:61 +#: src/irc/irc-commands.c:67 msgid "invite a nick on a channel" msgstr "inviter un utilisateur sur un canal" -#: src/irc/irc-commands.c:62 +#: src/irc/irc-commands.c:68 msgid "nickname channel" msgstr "nick canal" -#: src/irc/irc-commands.c:63 +#: src/irc/irc-commands.c:69 msgid "" "nickname: nick to invite\n" "channel: channel to invite" @@ -205,27 +223,27 @@ msgstr "" "nickname: utilisateur à inviter\n" "channel: canal pour l'invitation" -#: src/irc/irc-commands.c:65 +#: src/irc/irc-commands.c:71 msgid "check if a nickname is currently on IRC" msgstr "vérifier si un utilisateur est actuellement sur IRC" -#: src/irc/irc-commands.c:66 src/irc/irc-commands.c:210 +#: src/irc/irc-commands.c:72 src/irc/irc-commands.c:216 msgid "nickname [nickname ...]" msgstr "nick [nick ...]" -#: src/irc/irc-commands.c:67 src/irc/irc-commands.c:210 +#: src/irc/irc-commands.c:73 src/irc/irc-commands.c:216 msgid "nickname: nickname" msgstr "nick: pseudo" -#: src/irc/irc-commands.c:69 +#: src/irc/irc-commands.c:75 msgid "join a channel" msgstr "joindre un canal" -#: src/irc/irc-commands.c:70 +#: src/irc/irc-commands.c:76 msgid "channel[,channel] [key[,key]]" msgstr "canal[,canal] [clé[,clé]]" -#: src/irc/irc-commands.c:71 +#: src/irc/irc-commands.c:77 msgid "" "channel: channel name to join\n" "key: key to join the channel" @@ -233,15 +251,15 @@ msgstr "" "canal: nom du canal à rejoindre\n" "clé: clé pour rejoindre le canal" -#: src/irc/irc-commands.c:73 +#: src/irc/irc-commands.c:79 msgid "forcibly remove a user from a channel" msgstr "retirer par la force un utilisateur d'un canal" -#: src/irc/irc-commands.c:74 +#: src/irc/irc-commands.c:80 msgid "[channel] nickname [comment]" msgstr "[canal] nick [commentaire]" -#: src/irc/irc-commands.c:75 +#: src/irc/irc-commands.c:81 msgid "" "channel: channel where user is\n" "nickname: nickname to kick\n" @@ -251,15 +269,15 @@ msgstr "" "nick: utilisateur à éliminer\n" "commentaire: commentaire pour l'élimination" -#: src/irc/irc-commands.c:77 +#: src/irc/irc-commands.c:83 msgid "close client-server connection" msgstr "fermer la connexion client-serveur" -#: src/irc/irc-commands.c:78 +#: src/irc/irc-commands.c:84 msgid "nickname comment" msgstr "nick commentaire" -#: src/irc/irc-commands.c:79 +#: src/irc/irc-commands.c:85 msgid "" "nickname: nickname\n" "comment: comment for kill" @@ -267,16 +285,16 @@ msgstr "" "nick: utilisateur\n" "commentaire: commentaire pour la mort" -#: src/irc/irc-commands.c:81 +#: src/irc/irc-commands.c:87 msgid "list all servernames which are known by the server answering the query" msgstr "" "lister tous les noms de serveurs connus du serveur qui répond à la requête" -#: src/irc/irc-commands.c:82 +#: src/irc/irc-commands.c:88 msgid "[[remove_server] server_mask]" msgstr "[[serveur] masque_serveur]" -#: src/irc/irc-commands.c:83 +#: src/irc/irc-commands.c:89 msgid "" "remote_server: this server should answer the query\n" "server_mask: list of servers must match this mask" @@ -284,15 +302,15 @@ msgstr "" "serveur: ce serveur doit répondre à la requête\n" "masque_serveur: liste des serveurs correspondant au masque" -#: src/irc/irc-commands.c:86 +#: src/irc/irc-commands.c:92 msgid "list channels and their topic" msgstr "lister les canaux et leur sujet" -#: src/irc/irc-commands.c:87 +#: src/irc/irc-commands.c:93 msgid "[channel[,channel] [server]]" msgstr "[canal[,canall] [serveur]]" -#: src/irc/irc-commands.c:88 +#: src/irc/irc-commands.c:94 msgid "" "channel: channel to list\n" "server: server name" @@ -300,15 +318,15 @@ msgstr "" "canal: canal à lister\n" "serveur: nom du serveur" -#: src/irc/irc-commands.c:90 +#: src/irc/irc-commands.c:96 msgid "get statistics about ths size of the IRC network" msgstr "obtenir des statistiques sur la taille du réseau IRC" -#: src/irc/irc-commands.c:91 +#: src/irc/irc-commands.c:97 msgid "[mask [target]]" msgstr "[masque [cible]]" -#: src/irc/irc-commands.c:92 +#: src/irc/irc-commands.c:98 msgid "" "mask: servers matching the mask only\n" "target: server for forwarding request" @@ -316,23 +334,23 @@ msgstr "" "masque: serveurs qui correspondent au masque seulement\n" "cible: serveur pour faire suivre la requête" -#: src/irc/irc-commands.c:95 +#: src/irc/irc-commands.c:101 msgid "send a ctcp action to the current channel" msgstr "envoyer une action ctcp au canal courant" -#: src/irc/irc-commands.c:96 +#: src/irc/irc-commands.c:102 msgid "message" msgstr "message" -#: src/irc/irc-commands.c:97 +#: src/irc/irc-commands.c:103 msgid "message: message to send" msgstr "message: message à envoyer" -#: src/irc/irc-commands.c:99 +#: src/irc/irc-commands.c:105 msgid "change channel or user mode" msgstr "changer le mode du canal ou de l'utilisateur" -#: src/irc/irc-commands.c:100 +#: src/irc/irc-commands.c:106 msgid "" "{ channel {[+|-]|o|p|s|i|t|n|b|v} [limit] [user] [ban mask] } | { nickname " "{[+|-]|i|w|s|o}" @@ -340,7 +358,7 @@ msgstr "" "{ canal {[+|-]|o|p|s|i|t|n|b|v} [limite] [utilisateur] [masque de " "banissement] } | { nick {[+|-]|i|w|s|o}" -#: src/irc/irc-commands.c:102 +#: src/irc/irc-commands.c:108 msgid "" "channel modes:\n" " channel: channel name to modify\n" @@ -383,15 +401,15 @@ msgstr "" " w: l'utilisateur reçoit les wallops\n" " o: drapeau opérateur\n" -#: src/irc/irc-commands.c:122 +#: src/irc/irc-commands.c:128 msgid "send message to a nick or channel" msgstr "envoyer un message à un utilisateur ou canal" -#: src/irc/irc-commands.c:123 +#: src/irc/irc-commands.c:129 msgid "receiver[,receiver] text" msgstr "cible[,cible] texte" -#: src/irc/irc-commands.c:124 +#: src/irc/irc-commands.c:130 msgid "" "receiver: nick or channel (may be mask, '*' = current channel)\n" "text: text to send" @@ -399,43 +417,43 @@ msgstr "" "cible: utilisateur ou canal (peut-être un masque, '*' = canal courant)\n" "texte: texte à envoyer" -#: src/irc/irc-commands.c:127 +#: src/irc/irc-commands.c:133 msgid "get the \"Message Of The Day\"" msgstr "obtenir le message du jour" -#: src/irc/irc-commands.c:131 +#: src/irc/irc-commands.c:137 msgid "list nicknames on channels" msgstr "lister les utilisateurs sur des canaux" -#: src/irc/irc-commands.c:132 src/irc/irc-commands.c:148 +#: src/irc/irc-commands.c:138 src/irc/irc-commands.c:154 msgid "[channel[,channel]]" msgstr "[canal[,canal]]" -#: src/irc/irc-commands.c:132 +#: src/irc/irc-commands.c:138 msgid "channel: channel name" msgstr "canal: nom du canal" -#: src/irc/irc-commands.c:134 +#: src/irc/irc-commands.c:140 msgid "change current nickname" msgstr "changer le nick courant" -#: src/irc/irc-commands.c:135 +#: src/irc/irc-commands.c:141 msgid "nickname" msgstr "nick" -#: src/irc/irc-commands.c:135 +#: src/irc/irc-commands.c:141 msgid "nickname: new nickname for current IRC server" msgstr "nick: nouveau nick pour le serveur IRC courant" -#: src/irc/irc-commands.c:137 +#: src/irc/irc-commands.c:143 msgid "send notice message to user" msgstr "envoyer un message notice à un utilisateur" -#: src/irc/irc-commands.c:138 +#: src/irc/irc-commands.c:144 msgid "nickname text" msgstr "nick texte" -#: src/irc/irc-commands.c:138 +#: src/irc/irc-commands.c:144 msgid "" "nickname: user to send notice to\n" "text: text to send" @@ -443,41 +461,41 @@ msgstr "" "nick: utilisateur cible pour la notice\n" "texte: texte à envoyer" -#: src/irc/irc-commands.c:140 +#: src/irc/irc-commands.c:146 msgid "gives channel operator status to nickname(s)" msgstr "donner le statut opérateur à un/des utilisateur(s)" -#: src/irc/irc-commands.c:143 +#: src/irc/irc-commands.c:149 msgid "get operator privileges" msgstr "obtenir le statut d'opérateur" -#: src/irc/irc-commands.c:144 +#: src/irc/irc-commands.c:150 msgid "user password" msgstr "utilisateur mot_de_passe" -#: src/irc/irc-commands.c:145 +#: src/irc/irc-commands.c:151 msgid "user/password: used to get privileges on current IRC server" msgstr "" "utilisateur/mot_de_passe: utilisé pour obtenir les privilèges sur le serveur " "IRC courant" -#: src/irc/irc-commands.c:147 +#: src/irc/irc-commands.c:153 msgid "leave a channel" msgstr "quitter un canal" -#: src/irc/irc-commands.c:148 +#: src/irc/irc-commands.c:154 msgid "channel: channel name to leave" msgstr "canal: nom du canal à quitter" -#: src/irc/irc-commands.c:150 +#: src/irc/irc-commands.c:156 msgid "ping server" msgstr "pinguer un serveur" -#: src/irc/irc-commands.c:151 +#: src/irc/irc-commands.c:157 msgid "server1 [server2]" msgstr "serveur1 [serveur2]" -#: src/irc/irc-commands.c:152 +#: src/irc/irc-commands.c:158 msgid "" "server1: server to ping\n" "server2: forward ping to this server" @@ -485,15 +503,15 @@ msgstr "" "serveur1: serveur à pinguer\n" "serveur2: faire suivre le ping à ce serveur" -#: src/irc/irc-commands.c:154 +#: src/irc/irc-commands.c:160 msgid "answer to a ping message" msgstr "répondre à un message ping" -#: src/irc/irc-commands.c:155 +#: src/irc/irc-commands.c:161 msgid "daemon [daemon2]" msgstr "démon [démon2]" -#: src/irc/irc-commands.c:155 +#: src/irc/irc-commands.c:161 msgid "" "daemon: daemon who has responded to Ping message\n" "daemon2: forward message to this daemon" @@ -501,51 +519,51 @@ msgstr "" "démon: démon qui a répondu au message Ping\n" "démon2: faire suivre le message à ce démon" -#: src/irc/irc-commands.c:158 +#: src/irc/irc-commands.c:164 msgid "message received" msgstr "message reçu" -#: src/irc/irc-commands.c:161 +#: src/irc/irc-commands.c:167 msgid "close all connections & quit " msgstr "fermer toutes les connexions et quitter " -#: src/irc/irc-commands.c:162 +#: src/irc/irc-commands.c:168 msgid "[quit_message]" msgstr "[message_de_fin]" -#: src/irc/irc-commands.c:163 +#: src/irc/irc-commands.c:169 msgid "quit_message: quit message (displayed to other users)" msgstr "quit_message: quit message (displayed to other users)" -#: src/irc/irc-commands.c:165 +#: src/irc/irc-commands.c:171 msgid "send raw data to server without parsing" msgstr "envoyer des données brutes au serveur sans analyse" -#: src/irc/irc-commands.c:166 +#: src/irc/irc-commands.c:172 msgid "data" msgstr "données" -#: src/irc/irc-commands.c:167 +#: src/irc/irc-commands.c:173 msgid "data: raw data to send" msgstr "données: données brutes à envoyer" -#: src/irc/irc-commands.c:169 +#: src/irc/irc-commands.c:175 msgid "tell the server to reload its config file" msgstr "demander au serveur de recharger son fichier de config" -#: src/irc/irc-commands.c:172 +#: src/irc/irc-commands.c:178 msgid "tell the server to restart itself" msgstr "demander au serveur de redémarrer" -#: src/irc/irc-commands.c:175 +#: src/irc/irc-commands.c:181 msgid "register a new service" msgstr "enregister un nouveau service" -#: src/irc/irc-commands.c:176 +#: src/irc/irc-commands.c:182 msgid "nickname reserved distribution type reserved info" msgstr "nick réservé distribution type réservé info" -#: src/irc/irc-commands.c:177 +#: src/irc/irc-commands.c:183 msgid "" "distribution: visibility of service\n" "type: reserved for future usage" @@ -553,15 +571,15 @@ msgstr "" "distribution: visibilité du service\n" "type: réservé pour une utilisation future" -#: src/irc/irc-commands.c:180 +#: src/irc/irc-commands.c:186 msgid "list services currently connected to the network" msgstr "lister les services actuellement connectés au réseau" -#: src/irc/irc-commands.c:181 +#: src/irc/irc-commands.c:187 msgid "[mask [type]]" msgstr "[masque [type]]" -#: src/irc/irc-commands.c:181 +#: src/irc/irc-commands.c:187 msgid "" "mask: list only services matching this mask\n" "type: list only services of this type" @@ -569,15 +587,15 @@ msgstr "" "masque: lister seulement les services qui correspondent à ce masque\n" "type: lister seulement les services de ce type" -#: src/irc/irc-commands.c:184 +#: src/irc/irc-commands.c:190 msgid "deliver a message to a service" msgstr "envoyer un message à un service" -#: src/irc/irc-commands.c:185 +#: src/irc/irc-commands.c:191 msgid "service text" msgstr "service texte" -#: src/irc/irc-commands.c:185 +#: src/irc/irc-commands.c:191 msgid "" "service: name of service\n" "text: text to send" @@ -585,15 +603,15 @@ msgstr "" "service: nom du service\n" "texte: texte à envoyer" -#: src/irc/irc-commands.c:187 +#: src/irc/irc-commands.c:193 msgid "disconnect server links" msgstr "déconnecter les liens vers un serveur" -#: src/irc/irc-commands.c:188 +#: src/irc/irc-commands.c:194 msgid "server commnent" msgstr "serveur commentaire" -#: src/irc/irc-commands.c:188 +#: src/irc/irc-commands.c:194 msgid "" "server: server name\n" "comment: comment for quit" @@ -601,15 +619,15 @@ msgstr "" "serveur: nom du serveur\n" "commentaire: commentaire pour quitter" -#: src/irc/irc-commands.c:190 +#: src/irc/irc-commands.c:196 msgid "query statistics about server" msgstr "demande les informations sur le serveur" -#: src/irc/irc-commands.c:191 +#: src/irc/irc-commands.c:197 msgid "[query [server]]" msgstr "[requête [serveur]]" -#: src/irc/irc-commands.c:192 +#: src/irc/irc-commands.c:198 msgid "" "query: c/h/i/k/l/m/o/y/u (see RFC1459)\n" "server: server name" @@ -617,17 +635,17 @@ msgstr "" "requête: c/h/i/k/l/m/o/y/u (voir la RFC1459)\n" "serveur: nom du serveur" -#: src/irc/irc-commands.c:194 +#: src/irc/irc-commands.c:200 msgid "" "give users who are on a host running an IRC server a message asking them to " "please join IRC" msgstr "envoyer un message aux serveurs leur demandant de rejoindre IRC" -#: src/irc/irc-commands.c:196 +#: src/irc/irc-commands.c:202 msgid "user [target [channel]]" msgstr "utilisateur [cible [canal]]" -#: src/irc/irc-commands.c:197 +#: src/irc/irc-commands.c:203 msgid "" "user: username\n" "target: server name\n" @@ -637,23 +655,23 @@ msgstr "" "cible: nom du serveur\n" "canal: nom du canal" -#: src/irc/irc-commands.c:199 +#: src/irc/irc-commands.c:205 msgid "query local time from server" msgstr "demander l'heure locale d'un serveur" -#: src/irc/irc-commands.c:200 +#: src/irc/irc-commands.c:206 msgid "target: query time from specified server" msgstr "cible: demander l'heure de ce serveur" -#: src/irc/irc-commands.c:202 +#: src/irc/irc-commands.c:208 msgid "get/set channel topic" msgstr "recevoir/définir le titre du canal" -#: src/irc/irc-commands.c:203 +#: src/irc/irc-commands.c:209 msgid "[channel] [topic]" msgstr "[canal] [titre]" -#: src/irc/irc-commands.c:203 +#: src/irc/irc-commands.c:209 msgid "" "channel: channel name\n" "topic: new topic for channel (if topic is \"-delete\" then topic is deleted)" @@ -662,28 +680,28 @@ msgstr "" "titre: nouveau titre pour le canal (si le titre est \"-delete\" alors le " "titre est supprimé)" -#: src/irc/irc-commands.c:206 +#: src/irc/irc-commands.c:212 msgid "find the route to specific server" msgstr "trouver le chemin jusqu'à un serveur spécifique" -#: src/irc/irc-commands.c:209 +#: src/irc/irc-commands.c:215 msgid "return a list of information about nicknames" msgstr "retourne une liste d'informations sur des utilisateurs" -#: src/irc/irc-commands.c:212 +#: src/irc/irc-commands.c:218 msgid "list of users logged into the server" msgstr "liste des utilisateurs connectés au serveur" -#: src/irc/irc-commands.c:215 +#: src/irc/irc-commands.c:221 msgid "gives the version info of nick or server (current or specified)" msgstr "" "retourne la version de l'utilisateur ou du serveur (courant ou spécifié)" -#: src/irc/irc-commands.c:216 +#: src/irc/irc-commands.c:222 msgid "[server | nickname]" msgstr "[serveur | nick]" -#: src/irc/irc-commands.c:216 +#: src/irc/irc-commands.c:222 msgid "" "server: server name\n" "nickname: nickname" @@ -691,11 +709,11 @@ msgstr "" "serveur: nom du serveur\n" "nick: utilisateur" -#: src/irc/irc-commands.c:218 +#: src/irc/irc-commands.c:224 msgid "gives voice to nickname(s)" msgstr "donne la voix à/aux utilisateur(s)" -#: src/irc/irc-commands.c:221 +#: src/irc/irc-commands.c:227 msgid "" "send a message to all currently connected users who have set the 'w' user " "mode for themselves" @@ -703,23 +721,23 @@ msgstr "" "envoyer un message à tous les utilisateurs connectés qui ont activé le mode " "utilisateur 'w' pour eux-mêmes" -#: src/irc/irc-commands.c:223 +#: src/irc/irc-commands.c:229 msgid "text" msgstr "texte" -#: src/irc/irc-commands.c:223 +#: src/irc/irc-commands.c:229 msgid "text to send" msgstr "texte à envoyer" -#: src/irc/irc-commands.c:225 +#: src/irc/irc-commands.c:231 msgid "generate a query which returns a list of information" msgstr "génère une requête qui retourne une liste d'information" -#: src/irc/irc-commands.c:226 +#: src/irc/irc-commands.c:232 msgid "[mask [\"o\"]]" msgstr "[masque [\"o\"]]" -#: src/irc/irc-commands.c:226 +#: src/irc/irc-commands.c:232 msgid "" "mask: only information which match this mask\n" "o: only operators are returned according to the mask supplied\n" @@ -727,15 +745,15 @@ msgstr "" "masque: information qui correspond à ce masque uniquement\n" "o: seul les opérateurs sont retournés correspondant au masque fourni\n" -#: src/irc/irc-commands.c:229 +#: src/irc/irc-commands.c:235 msgid "query information about user(s)" msgstr "demande les informations sur le(s) utilisateur(s)" -#: src/irc/irc-commands.c:230 +#: src/irc/irc-commands.c:236 msgid "[server] nickname[,nickname]" msgstr "[serveur] nick[,nick]" -#: src/irc/irc-commands.c:230 +#: src/irc/irc-commands.c:236 msgid "" "server: server name\n" "nickname: nickname (may be a mask)" @@ -743,15 +761,15 @@ msgstr "" "serveur: nom du serveur\n" "nick: utilisateur (peut être un masque)" -#: src/irc/irc-commands.c:233 +#: src/irc/irc-commands.c:239 msgid "ask for information about a nickname which no longer exists" msgstr "demander de l'information sur un nick qui n'existe plus" -#: src/irc/irc-commands.c:234 +#: src/irc/irc-commands.c:240 msgid "nickname [,nickname [,nickname ...]] [count [target]]" msgstr "nick [,nick [,nick ...]] [nombre [cible]]" -#: src/irc/irc-commands.c:235 +#: src/irc/irc-commands.c:241 msgid "" "nickname: nickname to search\n" "count: number of replies to return (full search if negative number)\n" @@ -762,9 +780,6 @@ msgstr "" "négatif)\n" "cible: la réponse doit correspondre à ce masque" -#: src/irc/irc-commands.c:239 src/irc/irc-commands.c:240 -#: src/irc/irc-commands.c:241 src/irc/irc-commands.c:242 -#: src/irc/irc-commands.c:243 src/irc/irc-commands.c:244 #: src/irc/irc-commands.c:245 src/irc/irc-commands.c:246 #: src/irc/irc-commands.c:247 src/irc/irc-commands.c:248 #: src/irc/irc-commands.c:249 src/irc/irc-commands.c:250 @@ -775,94 +790,97 @@ msgstr "" #: src/irc/irc-commands.c:259 src/irc/irc-commands.c:260 #: src/irc/irc-commands.c:261 src/irc/irc-commands.c:262 #: src/irc/irc-commands.c:263 src/irc/irc-commands.c:264 -#: src/irc/irc-commands.c:265 src/irc/irc-commands.c:301 -#: src/irc/irc-commands.c:302 src/irc/irc-commands.c:303 -#: src/irc/irc-commands.c:304 src/irc/irc-commands.c:305 -#: src/irc/irc-commands.c:306 +#: 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:310 src/irc/irc-commands.c:311 +#: src/irc/irc-commands.c:312 msgid "a server message" msgstr "un message du serveur" -#: src/irc/irc-commands.c:266 +#: src/irc/irc-commands.c:272 msgid "away message" msgstr "message d'absence" -#: src/irc/irc-commands.c:267 +#: src/irc/irc-commands.c:273 msgid "userhost" msgstr "nom de machine utilisateur" -#: src/irc/irc-commands.c:268 +#: src/irc/irc-commands.c:274 msgid "ison" msgstr "est présent" -#: src/irc/irc-commands.c:269 +#: src/irc/irc-commands.c:275 msgid "unaway" msgstr "non absent" -#: src/irc/irc-commands.c:270 +#: src/irc/irc-commands.c:276 msgid "now away" msgstr "maintenant absent" -#: src/irc/irc-commands.c:271 +#: src/irc/irc-commands.c:277 msgid "whois (user)" msgstr "qui est (utilisateur)" -#: src/irc/irc-commands.c:272 +#: src/irc/irc-commands.c:278 msgid "whois (server)" msgstr "qui est (serveur)" -#: src/irc/irc-commands.c:273 +#: src/irc/irc-commands.c:279 msgid "whois (operator)" msgstr "qui est (opérateur)" -#: src/irc/irc-commands.c:274 +#: src/irc/irc-commands.c:280 msgid "whowas" msgstr "qui était-ce" -#: src/irc/irc-commands.c:275 +#: src/irc/irc-commands.c:281 msgid "end of /who list" msgstr "fin de /who list" -#: src/irc/irc-commands.c:276 +#: src/irc/irc-commands.c:282 msgid "whois (idle)" msgstr "qui est (idle)" -#: src/irc/irc-commands.c:277 +#: src/irc/irc-commands.c:283 msgid "whois (end)" msgstr "qui est (fin)" -#: src/irc/irc-commands.c:278 +#: src/irc/irc-commands.c:284 msgid "whois (channels)" msgstr "qui est (canaux)" -#: src/irc/irc-commands.c:279 +#: src/irc/irc-commands.c:285 msgid "whois (identified user)" msgstr "qui est (utilisateur identifié)" -#: src/irc/irc-commands.c:280 +#: src/irc/irc-commands.c:286 msgid "/list start" msgstr "/list début" -#: src/irc/irc-commands.c:281 +#: src/irc/irc-commands.c:287 msgid "channel (for /list)" msgstr "canal (pour /list)" -#: src/irc/irc-commands.c:282 +#: src/irc/irc-commands.c:288 msgid "/list end" msgstr "/list fin" -#: src/irc/irc-commands.c:283 +#: src/irc/irc-commands.c:289 msgid "no topic for channel" msgstr "pas de titre pour le canal" -#: src/irc/irc-commands.c:284 +#: src/irc/irc-commands.c:290 msgid "topic of channel" msgstr "titre du canal" -#: src/irc/irc-commands.c:285 +#: src/irc/irc-commands.c:291 msgid "channel :topic" msgstr "canal :titre" -#: src/irc/irc-commands.c:286 +#: src/irc/irc-commands.c:292 msgid "" "channel: name of channel\n" "topic: topic of the channel" @@ -870,27 +888,27 @@ msgstr "" "canal: nom du canal\n" "titre: titre du canal" -#: src/irc/irc-commands.c:288 +#: src/irc/irc-commands.c:294 msgid "infos about topic (nick & date changed)" msgstr "infos sur le titre (utilisateur et date de changement)" -#: src/irc/irc-commands.c:291 +#: src/irc/irc-commands.c:297 msgid "server version" msgstr "version du serveur" -#: src/irc/irc-commands.c:292 +#: src/irc/irc-commands.c:298 msgid "who" msgstr "qui" -#: src/irc/irc-commands.c:293 +#: src/irc/irc-commands.c:299 msgid "list of nicks on channel" msgstr "liste des utilisateurs sur un canal" -#: src/irc/irc-commands.c:294 +#: src/irc/irc-commands.c:300 msgid "channel :[[@|+]nick ...]" msgstr "canal :[[@|+]nick ...]" -#: src/irc/irc-commands.c:295 +#: src/irc/irc-commands.c:301 msgid "" "channel: name of channel\n" "nick: nick on the channel" @@ -898,200 +916,200 @@ msgstr "" "canal: nom du canal\n" "nick: utilisateur sur le canal" -#: src/irc/irc-commands.c:297 +#: src/irc/irc-commands.c:303 msgid "links" msgstr "liens" -#: src/irc/irc-commands.c:298 +#: src/irc/irc-commands.c:304 msgid "end of /links list" msgstr "fin de /links list" -#: src/irc/irc-commands.c:299 +#: src/irc/irc-commands.c:305 msgid "end of /names list" msgstr "fin de la liste /names" -#: src/irc/irc-commands.c:300 +#: src/irc/irc-commands.c:306 msgid "end of /whowas list" msgstr "fin de /whowas list" -#: src/irc/irc-commands.c:307 +#: src/irc/irc-commands.c:313 msgid "server local time" msgstr "heure locale du serveur" -#: src/irc/irc-commands.c:308 +#: src/irc/irc-commands.c:314 msgid "no such nick/channel" msgstr "pas de tel utilisateur/canal" -#: src/irc/irc-commands.c:310 +#: src/irc/irc-commands.c:316 msgid "no such server" msgstr "pas de tel serveur" -#: src/irc/irc-commands.c:312 +#: src/irc/irc-commands.c:318 msgid "no such channel" msgstr "pas de tel canal" -#: src/irc/irc-commands.c:314 +#: src/irc/irc-commands.c:320 msgid "cannot send to channel" msgstr "impossible d'envoyer au canal" -#: src/irc/irc-commands.c:316 +#: src/irc/irc-commands.c:322 msgid "too many channels" msgstr "trop de canaux" -#: src/irc/irc-commands.c:318 src/irc/irc-commands.c:320 -#: src/irc/irc-commands.c:322 +#: src/irc/irc-commands.c:324 src/irc/irc-commands.c:326 +#: src/irc/irc-commands.c:328 msgid "was no such nick" msgstr "n'y avait pas de tel utilisateur" -#: src/irc/irc-commands.c:324 +#: src/irc/irc-commands.c:330 msgid "no origin" msgstr "pas d'origine" -#: src/irc/irc-commands.c:326 +#: src/irc/irc-commands.c:332 msgid "no recipient" msgstr "pas de destinataire" -#: src/irc/irc-commands.c:328 +#: src/irc/irc-commands.c:334 msgid "no text to send" msgstr "pas de texte à envoyer" -#: src/irc/irc-commands.c:330 +#: src/irc/irc-commands.c:336 msgid "no toplevel" msgstr "pas de niveau supérieur" -#: src/irc/irc-commands.c:332 +#: src/irc/irc-commands.c:338 msgid "wilcard in toplevel domain" msgstr "caractère joker dans le domaine de niveau supérieur" -#: src/irc/irc-commands.c:334 +#: src/irc/irc-commands.c:340 msgid "unknown command" msgstr "commande inconnue" -#: src/irc/irc-commands.c:336 +#: src/irc/irc-commands.c:342 msgid "MOTD is missing" msgstr "MOTD est manquant" -#: src/irc/irc-commands.c:338 +#: src/irc/irc-commands.c:344 msgid "no administrative info" msgstr "pas d'information administrative" -#: src/irc/irc-commands.c:340 +#: src/irc/irc-commands.c:346 msgid "file error" msgstr "erreur de fichier" -#: src/irc/irc-commands.c:342 +#: src/irc/irc-commands.c:348 msgid "no nickname given" msgstr "pas d'utilisateur donné" -#: src/irc/irc-commands.c:344 +#: src/irc/irc-commands.c:350 msgid "erroneus nickname" msgstr "nom d'utilisateur erroné" -#: src/irc/irc-commands.c:346 +#: src/irc/irc-commands.c:352 msgid "nickname already in use" msgstr "nom d'utilisateur déjà en cours d'utilisation" -#: src/irc/irc-commands.c:348 +#: src/irc/irc-commands.c:354 msgid "nickname collision" msgstr "collision sur le nom d'utilisateur" -#: src/irc/irc-commands.c:350 +#: src/irc/irc-commands.c:356 msgid "user not in channel" msgstr "utilisateur non présent dans le canal" -#: src/irc/irc-commands.c:352 +#: src/irc/irc-commands.c:358 msgid "not on channel" msgstr "non présent sur le canal" -#: src/irc/irc-commands.c:354 +#: src/irc/irc-commands.c:360 msgid "user already on channel" msgstr "utilisateur déjà sur le canal" -#: src/irc/irc-commands.c:356 +#: src/irc/irc-commands.c:362 msgid "user not logged in" msgstr "utilisateur non enregistré" -#: src/irc/irc-commands.c:358 +#: src/irc/irc-commands.c:364 msgid "summon has been disabled" msgstr "summon a été désactivé" -#: src/irc/irc-commands.c:360 +#: src/irc/irc-commands.c:366 msgid "users has been disabled" msgstr "users a été désactivé" -#: src/irc/irc-commands.c:362 +#: src/irc/irc-commands.c:368 msgid "you are not registered" msgstr "vous n'êtes pas enregistré" -#: src/irc/irc-commands.c:364 +#: src/irc/irc-commands.c:370 msgid "not enough parameters" msgstr "pas assez de paramètres" -#: src/irc/irc-commands.c:366 +#: src/irc/irc-commands.c:372 msgid "you may not register" msgstr "vous ne pouvez pas vous enregistrer" -#: src/irc/irc-commands.c:368 +#: src/irc/irc-commands.c:374 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:370 +#: src/irc/irc-commands.c:376 msgid "password incorrect" msgstr "mot de passe incorrect" -#: src/irc/irc-commands.c:372 +#: src/irc/irc-commands.c:378 msgid "you are banned from this server" msgstr "vous êtes banni de ce serveur" -#: src/irc/irc-commands.c:374 +#: src/irc/irc-commands.c:380 msgid "channel key already set" msgstr "clé du canal déjà définie" -#: src/irc/irc-commands.c:376 +#: src/irc/irc-commands.c:382 msgid "channel is already full" msgstr "le canal est déjà plein" -#: src/irc/irc-commands.c:378 +#: src/irc/irc-commands.c:384 msgid "unknown mode char to me" msgstr "caractère de mode inconnu pour moi" -#: src/irc/irc-commands.c:380 +#: src/irc/irc-commands.c:386 msgid "cannot join channel (invite only)" msgstr "impossible de rejoindre le canal (invités seulement)" -#: src/irc/irc-commands.c:382 +#: src/irc/irc-commands.c:388 msgid "cannot join channel (banned from channel)" msgstr "impossible de rejoindre le canal (banni du canal)" -#: src/irc/irc-commands.c:384 +#: src/irc/irc-commands.c:390 msgid "cannot join channel (bad channel key)" msgstr "impossible de rejoindre le canal (mauvaise clé pour le canal)" -#: src/irc/irc-commands.c:386 +#: src/irc/irc-commands.c:392 msgid "you're not an IRC operator" msgstr "vous n'êtres pas opérateur IRC" -#: src/irc/irc-commands.c:388 +#: src/irc/irc-commands.c:394 msgid "you're not channel operator" msgstr "vous n'êtes pas opérateur du canal" -#: src/irc/irc-commands.c:390 +#: src/irc/irc-commands.c:396 msgid "you can't kill a server!" msgstr "vous ne pouvez pas supprimer un serveur !" -#: src/irc/irc-commands.c:392 +#: src/irc/irc-commands.c:398 msgid "no O-lines for your host" msgstr "pas de O-lines pour votre host" -#: src/irc/irc-commands.c:394 +#: src/irc/irc-commands.c:400 msgid "unknown mode flag" msgstr "drapeau de mode inconnu" -#: src/irc/irc-commands.c:396 +#: src/irc/irc-commands.c:402 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:2578 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2704 msgid "unknown" msgstr "inconnu" @@ -1100,38 +1118,38 @@ msgstr "inconnu" msgid "%s: using local hostname \"%s\"\n" msgstr "%s: utilisation du nom de machine local \"%s\"\n" -#: src/irc/irc-send.c:199 src/irc/irc-send.c:223 src/irc/irc-send.c:311 -#: src/irc/irc-send.c:557 src/irc/irc-send.c:611 src/irc/irc-send.c:1012 +#: src/irc/irc-send.c:210 src/irc/irc-send.c:234 src/irc/irc-send.c:322 +#: src/irc/irc-send.c:568 src/irc/irc-send.c:622 src/irc/irc-send.c:1023 #, c-format msgid "%s \"%s\" command can only be executed in a channel window\n" msgstr "" "%s la commande \"%s\" peut seulement être exécutée dans une fenêtre de " "canal\n" -#: src/irc/irc-send.c:383 src/irc/irc-send.c:440 src/irc/irc-send.c:658 -#: src/irc/irc-send.c:671 src/irc/irc-send.c:907 +#: src/irc/irc-send.c:394 src/irc/irc-send.c:451 src/irc/irc-send.c:669 +#: src/irc/irc-send.c:682 src/irc/irc-send.c:918 #, c-format msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" "%s la commande \"%s\" ne peut pas être exécutée dans une fenêtre serveur\n" -#: src/irc/irc-send.c:456 src/irc/irc-send.c:478 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:835 +#: src/irc/irc-send.c:467 src/irc/irc-send.c:489 src/irc/irc-recv.c:261 +#: src/irc/irc-recv.c:897 #, 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:492 src/irc/irc-recv.c:929 +#: src/irc/irc-send.c:503 src/irc/irc-recv.c:1057 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "%s impossible de créer la fenêtre privée \"%s\"\n" -#: src/irc/irc-send.c:522 src/common/command.c:1118 +#: src/irc/irc-send.c:533 src/common/command.c:1118 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n" -#: src/irc/irc-send.c:985 +#: src/irc/irc-send.c:996 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilé le %s %s\n" @@ -1145,8 +1163,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:445 src/irc/irc-recv.c:711 -#: src/irc/irc-recv.c:844 src/irc/irc-recv.c:2079 src/irc/irc-recv.c:2144 +#: 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 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "%s canal non trouvé pour la commande \"%s\"\n" @@ -1159,8 +1177,8 @@ msgstr " a poussé dehors " msgid " from " msgstr " de " -#: src/irc/irc-recv.c:290 src/irc/irc-recv.c:474 src/irc/irc-recv.c:752 -#: src/irc/irc-recv.c:996 +#: 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" @@ -1170,335 +1188,339 @@ msgstr "%s commande \"%s\" reçue sans host\n" 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:347 +#: src/irc/irc-recv.c:344 msgid "sets ban on" msgstr "instaure un bannissement sur" -#: src/irc/irc-recv.c:348 +#: src/irc/irc-recv.c:345 msgid "removes ban on" msgstr "supprime le banissement sur" -#: src/irc/irc-recv.c:356 +#: src/irc/irc-recv.c:352 msgid "sets invite-only channel flag" msgstr "définit le canal en mode invité seulement" -#: src/irc/irc-recv.c:357 +#: src/irc/irc-recv.c:353 msgid "removes invite-only channel flag" msgstr "supprime le mode invité seulement pour le canal" -#: src/irc/irc-recv.c:365 +#: src/irc/irc-recv.c:369 +msgid "sets channel key to" +msgstr "définit la clé du canal à" + +#: src/irc/irc-recv.c:370 +msgid "removes channel key" +msgstr "supprime la clé du canal" + +#: src/irc/irc-recv.c:399 msgid "sets the user limit to" msgstr "définit la limite d'utilisateurs à" -#: src/irc/irc-recv.c:366 +#: src/irc/irc-recv.c:400 msgid "removes user limit" msgstr "supprime la limite d'utilisateurs" -#: src/irc/irc-recv.c:374 +#: src/irc/irc-recv.c:420 msgid "sets moderated channel flag" msgstr "instaure la modération sur le canal" -#: src/irc/irc-recv.c:375 +#: src/irc/irc-recv.c:421 msgid "removes moderated channel flag" msgstr "supprime la modération sur le canal" -#: src/irc/irc-recv.c:383 +#: src/irc/irc-recv.c:430 +msgid "sets messages from channel only flag" +msgstr "interdit aux utilisateurs en dehors du canal d'y écrire" + +#: src/irc/irc-recv.c:431 +msgid "removes messages from channel only flag" +msgstr "autorise tout utilisateur à écrire sur le canal" + +#: src/irc/irc-recv.c:440 msgid "gives channel operator status to" msgstr "donne le droit opérateur à" -#: src/irc/irc-recv.c:384 +#: src/irc/irc-recv.c:441 msgid "removes channel operator status from" msgstr "supprime le droit opérateur à" -#: src/irc/irc-recv.c:399 +#: src/irc/irc-recv.c:455 msgid "sets private channel flag" msgstr "définit le canal comme privé" -#: src/irc/irc-recv.c:400 +#: src/irc/irc-recv.c:456 msgid "removes private channel flag" msgstr "supprime le mode privé pour le canal" -#: src/irc/irc-recv.c:408 +#: src/irc/irc-recv.c:465 msgid "sets secret channel flag" msgstr "définit le canal comme secret" -#: src/irc/irc-recv.c:409 +#: src/irc/irc-recv.c:466 msgid "removes secret channel flag" msgstr "supprime le mode secret pour le canal" -#: src/irc/irc-recv.c:417 +#: src/irc/irc-recv.c:475 msgid "sets topic protection" msgstr "active la protection du titre" -#: src/irc/irc-recv.c:418 +#: src/irc/irc-recv.c:476 msgid "removes topic protection" msgstr "supprime la protection du titre" -#: src/irc/irc-recv.c:426 +#: src/irc/irc-recv.c:485 msgid "gives voice to" msgstr "donne la voix à" -#: src/irc/irc-recv.c:427 +#: src/irc/irc-recv.c:486 msgid "removes voice from" msgstr "supprime la voix de" -#: src/irc/irc-recv.c:496 +#: src/irc/irc-recv.c:557 msgid "You are " msgstr "Vous êtes " -#: src/irc/irc-recv.c:503 +#: src/irc/irc-recv.c:564 msgid " is " msgstr " est " -#: src/irc/irc-recv.c:507 +#: src/irc/irc-recv.c:568 msgid "now known as " msgstr "maintenant connu sous le nom " -#: src/irc/irc-recv.c:559 +#: src/irc/irc-recv.c:620 #, 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:572 src/irc/irc-recv.c:604 +#: src/irc/irc-recv.c:633 src/irc/irc-recv.c:665 msgid "reply from" msgstr "réponse de" -#: src/irc/irc-recv.c:607 +#: src/irc/irc-recv.c:668 #, c-format msgid ": %ld.%ld seconds\n" msgstr ": %ld.%ld secondes\n" -#: src/irc/irc-recv.c:637 +#: src/irc/irc-recv.c:698 #, 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:687 +#: src/irc/irc-recv.c:748 msgid " has left " msgstr " a quitté " -#: src/irc/irc-recv.c:798 +#: src/irc/irc-recv.c:860 #, c-format msgid "On %s: * %s %s" msgstr "Sur %s: * %s %s" -#: src/irc/irc-recv.c:821 +#: src/irc/irc-recv.c:883 #, c-format msgid "On %s: %s> %s" msgstr "Sur %s: %s> %s" -#: src/irc/irc-recv.c:873 -#, c-format -msgid "" -"NOTICE %s :%sVERSION %s v%s compiled on %s, host \"%s\" is running %s %s / %s" -"%s" -msgstr "" -"NOTICE %s :%sVERSION %s v%s compilée le %s, machine \"%s\" fait tourner %s %" -"s / %s%s" - -#: src/irc/irc-recv.c:883 -#, c-format -msgid "NOTICE %s :%sVERSION %s v%s compiled on %s%s" -msgstr "NOTICE %s :%sVERSION %s v%s compilée le %s%s" - -#: src/irc/irc-recv.c:889 +#: src/irc/irc-recv.c:951 msgid "Received a " msgstr "Reçu un " -#: src/irc/irc-recv.c:891 +#: src/irc/irc-recv.c:953 msgid "CTCP VERSION " msgstr "CTCP VERSION " -#: src/irc/irc-recv.c:893 +#: src/irc/irc-recv.c:955 msgid "from" msgstr "de" -#: src/irc/irc-recv.c:953 -#, c-format -msgid "Private %s> %s" -msgstr "Privé %s> %s" - -#: src/irc/irc-recv.c:973 src/irc/irc-recv.c:2365 src/irc/irc-recv.c:2405 +#: 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 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s impossible d'analyser la commande \"%s\"\n" -#: src/irc/irc-recv.c:1028 +#: src/irc/irc-recv.c:1081 +#, c-format +msgid "Private %s> %s" +msgstr "Privé %s> %s" + +#: src/irc/irc-recv.c:1154 msgid "has quit" msgstr "a quitté" -#: src/irc/irc-recv.c:1148 +#: src/irc/irc-recv.c:1274 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s commande \"%s\" reçue sans canal\n" -#: src/irc/irc-recv.c:1176 +#: src/irc/irc-recv.c:1302 msgid " has changed topic for " msgstr " a changé le titre pour " -#: src/irc/irc-recv.c:1181 +#: src/irc/irc-recv.c:1307 #, c-format msgid " to: \"%s\"\n" msgstr " en: \"%s\"\n" -#: src/irc/irc-recv.c:1187 +#: src/irc/irc-recv.c:1313 msgid " has unset topic for " msgstr " a retiré le titre pour " -#: src/irc/irc-recv.c:1278 +#: src/irc/irc-recv.c:1404 #, c-format msgid " is away: %s\n" msgstr " est absent: %s\n" -#: src/irc/irc-recv.c:1352 +#: src/irc/irc-recv.c:1478 msgid "Users online: " msgstr "Utilisateurs en ligne: " -#: src/irc/irc-recv.c:1715 +#: src/irc/irc-recv.c:1841 msgid "idle: " msgstr "inactivité: " -#: src/irc/irc-recv.c:1723 +#: src/irc/irc-recv.c:1849 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:1723 +#: src/irc/irc-recv.c:1849 msgid "day" msgstr "jour" -#: src/irc/irc-recv.c:1733 +#: src/irc/irc-recv.c:1859 msgid "hours" msgstr "heures" -#: src/irc/irc-recv.c:1733 +#: src/irc/irc-recv.c:1859 msgid "hour" msgstr "heure" -#: src/irc/irc-recv.c:1739 +#: src/irc/irc-recv.c:1865 msgid "minutes" msgstr "minutes" -#: src/irc/irc-recv.c:1739 +#: src/irc/irc-recv.c:1865 msgid "minute" msgstr "minute" -#: src/irc/irc-recv.c:1745 +#: src/irc/irc-recv.c:1871 msgid "seconds" msgstr "secondes" -#: src/irc/irc-recv.c:1745 +#: src/irc/irc-recv.c:1871 msgid "second" msgstr "seconde" -#: src/irc/irc-recv.c:1750 +#: src/irc/irc-recv.c:1876 msgid "signon at: " msgstr "signé le: " -#: src/irc/irc-recv.c:1838 +#: src/irc/irc-recv.c:1964 msgid "Channels: " msgstr "Canauxs: " -#: src/irc/irc-recv.c:2026 +#: src/irc/irc-recv.c:2152 msgid "No topic set for " msgstr "Pas de titre défini pour " -#: src/irc/irc-recv.c:2068 +#: src/irc/irc-recv.c:2194 msgid "Topic for " msgstr "Le titre pour " -#: src/irc/irc-recv.c:2072 +#: src/irc/irc-recv.c:2198 #, c-format msgid " is: \"%s\"\n" msgstr " est: \"%s\"\n" -#: src/irc/irc-recv.c:2088 src/irc/irc-recv.c:2168 +#: src/irc/irc-recv.c:2214 src/irc/irc-recv.c:2294 #, 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:2134 +#: src/irc/irc-recv.c:2260 msgid "Topic set by " msgstr "Titre défini par " -#: src/irc/irc-recv.c:2152 +#: src/irc/irc-recv.c:2278 #, 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:2160 +#: src/irc/irc-recv.c:2286 #, 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:2289 +#: src/irc/irc-recv.c:2415 msgid " on " msgstr " sur " -#: src/irc/irc-recv.c:2396 +#: src/irc/irc-recv.c:2522 #, 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:2449 +#: src/irc/irc-recv.c:2575 msgid "Nicks " msgstr "Utilisateurs " -#: src/irc/irc-recv.c:2469 +#: src/irc/irc-recv.c:2595 msgid "Channel " msgstr "Canal " -#: src/irc/irc-recv.c:2480 +#: src/irc/irc-recv.c:2606 msgid "nicks" msgstr "utilisateurs" -#: src/irc/irc-recv.c:2480 +#: src/irc/irc-recv.c:2606 msgid "nick" msgstr "utilisateur" -#: src/irc/irc-recv.c:2488 +#: src/irc/irc-recv.c:2614 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:2488 +#: src/irc/irc-recv.c:2614 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:2497 +#: src/irc/irc-recv.c:2623 msgid "halfops" msgstr "halfops" -#: src/irc/irc-recv.c:2497 +#: src/irc/irc-recv.c:2623 msgid "halfop" msgstr "halfop" -#: src/irc/irc-recv.c:2506 +#: src/irc/irc-recv.c:2632 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:2506 +#: src/irc/irc-recv.c:2632 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:2515 +#: src/irc/irc-recv.c:2641 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:2547 +#: src/irc/irc-recv.c:2673 #, 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:2558 +#: src/irc/irc-recv.c:2684 #, 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:2567 +#: src/irc/irc-recv.c:2693 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1568,11 +1590,11 @@ msgstr "" "%s impossible d'ajouter la fonction pour le message \"%s\" (mémoire " "insuffisante)\n" -#: src/gui/curses/gui-display.c:887 +#: src/gui/curses/gui-display.c:944 msgid "[not connected] " msgstr "[non connecté] " -#: src/gui/curses/gui-display.c:894 src/gui/curses/gui-display.c:897 +#: src/gui/curses/gui-display.c:951 src/gui/curses/gui-display.c:954 msgid "-MORE-" msgstr "-PLUS-" diff --git a/po/weechat.pot b/po/weechat.pot index 2658e4cc8..5f9191756 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-07 20:17+0100\n" +"POT-Creation-Date: 2004-02-29 17:13+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" @@ -107,7 +107,7 @@ msgstr "" msgid "Disconnected from server!\n" msgstr "" -#: src/irc/irc-channel.c:50 +#: src/irc/irc-channel.c:51 #, c-format msgid "%s cannot allocate new channel" msgstr "" @@ -116,14 +116,14 @@ msgstr "" msgid "find information about the administrator of the server" msgstr "" -#: src/irc/irc-commands.c:35 src/irc/irc-commands.c:58 -#: src/irc/irc-commands.c:128 src/irc/irc-commands.c:200 -#: src/irc/irc-commands.c:207 src/irc/irc-commands.c:213 +#: src/irc/irc-commands.c:35 src/irc/irc-commands.c:64 +#: src/irc/irc-commands.c:134 src/irc/irc-commands.c:206 +#: src/irc/irc-commands.c:213 src/irc/irc-commands.c:219 msgid "[target]" msgstr "" -#: src/irc/irc-commands.c:36 src/irc/irc-commands.c:207 -#: src/irc/irc-commands.c:213 +#: src/irc/irc-commands.c:36 src/irc/irc-commands.c:213 +#: src/irc/irc-commands.c:219 msgid "target: server" msgstr "" @@ -156,168 +156,183 @@ msgid "" msgstr "" #: src/irc/irc-commands.c:47 +msgid "starts DCC (file or chat)" +msgstr "" + +#: src/irc/irc-commands.c:48 +msgid "action nickname [file]" +msgstr "" + +#: src/irc/irc-commands.c:49 +msgid "" +"action: 'send' (file) or 'chat'\n" +"nickname: nickname to send file or chat\n" +"file: filename (on local host)" +msgstr "" + +#: src/irc/irc-commands.c:53 msgid "removes channel operator status from nickname(s)" msgstr "" -#: src/irc/irc-commands.c:48 src/irc/irc-commands.c:51 -#: src/irc/irc-commands.c:141 src/irc/irc-commands.c:219 +#: src/irc/irc-commands.c:54 src/irc/irc-commands.c:57 +#: src/irc/irc-commands.c:147 src/irc/irc-commands.c:225 msgid "nickname [nickname]" msgstr "" -#: src/irc/irc-commands.c:50 +#: src/irc/irc-commands.c:56 msgid "removes voice from nickname(s)" msgstr "" -#: src/irc/irc-commands.c:53 +#: src/irc/irc-commands.c:59 msgid "shutdown the server" msgstr "" -#: src/irc/irc-commands.c:56 +#: src/irc/irc-commands.c:62 msgid "error received from IRC server" msgstr "" -#: src/irc/irc-commands.c:57 +#: src/irc/irc-commands.c:63 msgid "get information describing the server" msgstr "" -#: src/irc/irc-commands.c:59 src/irc/irc-commands.c:129 +#: src/irc/irc-commands.c:65 src/irc/irc-commands.c:135 msgid "target: server name" msgstr "" -#: src/irc/irc-commands.c:61 +#: src/irc/irc-commands.c:67 msgid "invite a nick on a channel" msgstr "" -#: src/irc/irc-commands.c:62 +#: src/irc/irc-commands.c:68 msgid "nickname channel" msgstr "" -#: src/irc/irc-commands.c:63 +#: src/irc/irc-commands.c:69 msgid "" "nickname: nick to invite\n" "channel: channel to invite" msgstr "" -#: src/irc/irc-commands.c:65 +#: src/irc/irc-commands.c:71 msgid "check if a nickname is currently on IRC" msgstr "" -#: src/irc/irc-commands.c:66 src/irc/irc-commands.c:210 +#: src/irc/irc-commands.c:72 src/irc/irc-commands.c:216 msgid "nickname [nickname ...]" msgstr "" -#: src/irc/irc-commands.c:67 src/irc/irc-commands.c:210 +#: src/irc/irc-commands.c:73 src/irc/irc-commands.c:216 msgid "nickname: nickname" msgstr "" -#: src/irc/irc-commands.c:69 +#: src/irc/irc-commands.c:75 msgid "join a channel" msgstr "" -#: src/irc/irc-commands.c:70 +#: src/irc/irc-commands.c:76 msgid "channel[,channel] [key[,key]]" msgstr "" -#: src/irc/irc-commands.c:71 +#: src/irc/irc-commands.c:77 msgid "" "channel: channel name to join\n" "key: key to join the channel" msgstr "" -#: src/irc/irc-commands.c:73 +#: src/irc/irc-commands.c:79 msgid "forcibly remove a user from a channel" msgstr "" -#: src/irc/irc-commands.c:74 +#: src/irc/irc-commands.c:80 msgid "[channel] nickname [comment]" msgstr "" -#: src/irc/irc-commands.c:75 +#: src/irc/irc-commands.c:81 msgid "" "channel: channel where user is\n" "nickname: nickname to kick\n" "comment: comment for kick" msgstr "" -#: src/irc/irc-commands.c:77 +#: src/irc/irc-commands.c:83 msgid "close client-server connection" msgstr "" -#: src/irc/irc-commands.c:78 +#: src/irc/irc-commands.c:84 msgid "nickname comment" msgstr "" -#: src/irc/irc-commands.c:79 +#: src/irc/irc-commands.c:85 msgid "" "nickname: nickname\n" "comment: comment for kill" msgstr "" -#: src/irc/irc-commands.c:81 +#: src/irc/irc-commands.c:87 msgid "list all servernames which are known by the server answering the query" msgstr "" -#: src/irc/irc-commands.c:82 +#: src/irc/irc-commands.c:88 msgid "[[remove_server] server_mask]" msgstr "" -#: src/irc/irc-commands.c:83 +#: src/irc/irc-commands.c:89 msgid "" "remote_server: this server should answer the query\n" "server_mask: list of servers must match this mask" msgstr "" -#: src/irc/irc-commands.c:86 +#: src/irc/irc-commands.c:92 msgid "list channels and their topic" msgstr "" -#: src/irc/irc-commands.c:87 +#: src/irc/irc-commands.c:93 msgid "[channel[,channel] [server]]" msgstr "" -#: src/irc/irc-commands.c:88 +#: src/irc/irc-commands.c:94 msgid "" "channel: channel to list\n" "server: server name" msgstr "" -#: src/irc/irc-commands.c:90 +#: src/irc/irc-commands.c:96 msgid "get statistics about ths size of the IRC network" msgstr "" -#: src/irc/irc-commands.c:91 +#: src/irc/irc-commands.c:97 msgid "[mask [target]]" msgstr "" -#: src/irc/irc-commands.c:92 +#: src/irc/irc-commands.c:98 msgid "" "mask: servers matching the mask only\n" "target: server for forwarding request" msgstr "" -#: src/irc/irc-commands.c:95 +#: src/irc/irc-commands.c:101 msgid "send a ctcp action to the current channel" msgstr "" -#: src/irc/irc-commands.c:96 +#: src/irc/irc-commands.c:102 msgid "message" msgstr "" -#: src/irc/irc-commands.c:97 +#: src/irc/irc-commands.c:103 msgid "message: message to send" msgstr "" -#: src/irc/irc-commands.c:99 +#: src/irc/irc-commands.c:105 msgid "change channel or user mode" msgstr "" -#: src/irc/irc-commands.c:100 +#: src/irc/irc-commands.c:106 msgid "" "{ channel {[+|-]|o|p|s|i|t|n|b|v} [limit] [user] [ban mask] } | { nickname " "{[+|-]|i|w|s|o}" msgstr "" -#: src/irc/irc-commands.c:102 +#: src/irc/irc-commands.c:108 msgid "" "channel modes:\n" " channel: channel name to modify\n" @@ -340,349 +355,346 @@ msgid "" " o: operator flag\n" msgstr "" -#: src/irc/irc-commands.c:122 +#: src/irc/irc-commands.c:128 msgid "send message to a nick or channel" msgstr "" -#: src/irc/irc-commands.c:123 +#: src/irc/irc-commands.c:129 msgid "receiver[,receiver] text" msgstr "" -#: src/irc/irc-commands.c:124 +#: src/irc/irc-commands.c:130 msgid "" "receiver: nick or channel (may be mask, '*' = current channel)\n" "text: text to send" msgstr "" -#: src/irc/irc-commands.c:127 +#: src/irc/irc-commands.c:133 msgid "get the \"Message Of The Day\"" msgstr "" -#: src/irc/irc-commands.c:131 +#: src/irc/irc-commands.c:137 msgid "list nicknames on channels" msgstr "" -#: src/irc/irc-commands.c:132 src/irc/irc-commands.c:148 +#: src/irc/irc-commands.c:138 src/irc/irc-commands.c:154 msgid "[channel[,channel]]" msgstr "" -#: src/irc/irc-commands.c:132 +#: src/irc/irc-commands.c:138 msgid "channel: channel name" msgstr "" -#: src/irc/irc-commands.c:134 +#: src/irc/irc-commands.c:140 msgid "change current nickname" msgstr "" -#: src/irc/irc-commands.c:135 +#: src/irc/irc-commands.c:141 msgid "nickname" msgstr "" -#: src/irc/irc-commands.c:135 +#: src/irc/irc-commands.c:141 msgid "nickname: new nickname for current IRC server" msgstr "" -#: src/irc/irc-commands.c:137 +#: src/irc/irc-commands.c:143 msgid "send notice message to user" msgstr "" -#: src/irc/irc-commands.c:138 +#: src/irc/irc-commands.c:144 msgid "nickname text" msgstr "" -#: src/irc/irc-commands.c:138 +#: src/irc/irc-commands.c:144 msgid "" "nickname: user to send notice to\n" "text: text to send" msgstr "" -#: src/irc/irc-commands.c:140 +#: src/irc/irc-commands.c:146 msgid "gives channel operator status to nickname(s)" msgstr "" -#: src/irc/irc-commands.c:143 +#: src/irc/irc-commands.c:149 msgid "get operator privileges" msgstr "" -#: src/irc/irc-commands.c:144 +#: src/irc/irc-commands.c:150 msgid "user password" msgstr "" -#: src/irc/irc-commands.c:145 +#: src/irc/irc-commands.c:151 msgid "user/password: used to get privileges on current IRC server" msgstr "" -#: src/irc/irc-commands.c:147 +#: src/irc/irc-commands.c:153 msgid "leave a channel" msgstr "" -#: src/irc/irc-commands.c:148 +#: src/irc/irc-commands.c:154 msgid "channel: channel name to leave" msgstr "" -#: src/irc/irc-commands.c:150 +#: src/irc/irc-commands.c:156 msgid "ping server" msgstr "" -#: src/irc/irc-commands.c:151 +#: src/irc/irc-commands.c:157 msgid "server1 [server2]" msgstr "" -#: src/irc/irc-commands.c:152 +#: src/irc/irc-commands.c:158 msgid "" "server1: server to ping\n" "server2: forward ping to this server" msgstr "" -#: src/irc/irc-commands.c:154 +#: src/irc/irc-commands.c:160 msgid "answer to a ping message" msgstr "" -#: src/irc/irc-commands.c:155 +#: src/irc/irc-commands.c:161 msgid "daemon [daemon2]" msgstr "" -#: src/irc/irc-commands.c:155 +#: src/irc/irc-commands.c:161 msgid "" "daemon: daemon who has responded to Ping message\n" "daemon2: forward message to this daemon" msgstr "" -#: src/irc/irc-commands.c:158 +#: src/irc/irc-commands.c:164 msgid "message received" msgstr "" -#: src/irc/irc-commands.c:161 +#: src/irc/irc-commands.c:167 msgid "close all connections & quit " msgstr "" -#: src/irc/irc-commands.c:162 +#: src/irc/irc-commands.c:168 msgid "[quit_message]" msgstr "" -#: src/irc/irc-commands.c:163 +#: src/irc/irc-commands.c:169 msgid "quit_message: quit message (displayed to other users)" msgstr "" -#: src/irc/irc-commands.c:165 +#: src/irc/irc-commands.c:171 msgid "send raw data to server without parsing" msgstr "" -#: src/irc/irc-commands.c:166 +#: src/irc/irc-commands.c:172 msgid "data" msgstr "" -#: src/irc/irc-commands.c:167 +#: src/irc/irc-commands.c:173 msgid "data: raw data to send" msgstr "" -#: src/irc/irc-commands.c:169 +#: src/irc/irc-commands.c:175 msgid "tell the server to reload its config file" msgstr "" -#: src/irc/irc-commands.c:172 +#: src/irc/irc-commands.c:178 msgid "tell the server to restart itself" msgstr "" -#: src/irc/irc-commands.c:175 +#: src/irc/irc-commands.c:181 msgid "register a new service" msgstr "" -#: src/irc/irc-commands.c:176 +#: src/irc/irc-commands.c:182 msgid "nickname reserved distribution type reserved info" msgstr "" -#: src/irc/irc-commands.c:177 +#: src/irc/irc-commands.c:183 msgid "" "distribution: visibility of service\n" "type: reserved for future usage" msgstr "" -#: src/irc/irc-commands.c:180 +#: src/irc/irc-commands.c:186 msgid "list services currently connected to the network" msgstr "" -#: src/irc/irc-commands.c:181 +#: src/irc/irc-commands.c:187 msgid "[mask [type]]" msgstr "" -#: src/irc/irc-commands.c:181 +#: src/irc/irc-commands.c:187 msgid "" "mask: list only services matching this mask\n" "type: list only services of this type" msgstr "" -#: src/irc/irc-commands.c:184 +#: src/irc/irc-commands.c:190 msgid "deliver a message to a service" msgstr "" -#: src/irc/irc-commands.c:185 +#: src/irc/irc-commands.c:191 msgid "service text" msgstr "" -#: src/irc/irc-commands.c:185 +#: src/irc/irc-commands.c:191 msgid "" "service: name of service\n" "text: text to send" msgstr "" -#: src/irc/irc-commands.c:187 +#: src/irc/irc-commands.c:193 msgid "disconnect server links" msgstr "" -#: src/irc/irc-commands.c:188 +#: src/irc/irc-commands.c:194 msgid "server commnent" msgstr "" -#: src/irc/irc-commands.c:188 +#: src/irc/irc-commands.c:194 msgid "" "server: server name\n" "comment: comment for quit" msgstr "" -#: src/irc/irc-commands.c:190 +#: src/irc/irc-commands.c:196 msgid "query statistics about server" msgstr "" -#: src/irc/irc-commands.c:191 +#: src/irc/irc-commands.c:197 msgid "[query [server]]" msgstr "" -#: src/irc/irc-commands.c:192 +#: src/irc/irc-commands.c:198 msgid "" "query: c/h/i/k/l/m/o/y/u (see RFC1459)\n" "server: server name" msgstr "" -#: src/irc/irc-commands.c:194 +#: src/irc/irc-commands.c:200 msgid "" "give users who are on a host running an IRC server a message asking them to " "please join IRC" msgstr "" -#: src/irc/irc-commands.c:196 +#: src/irc/irc-commands.c:202 msgid "user [target [channel]]" msgstr "" -#: src/irc/irc-commands.c:197 +#: src/irc/irc-commands.c:203 msgid "" "user: username\n" "target: server name\n" "channel: channel name" msgstr "" -#: src/irc/irc-commands.c:199 +#: src/irc/irc-commands.c:205 msgid "query local time from server" msgstr "" -#: src/irc/irc-commands.c:200 +#: src/irc/irc-commands.c:206 msgid "target: query time from specified server" msgstr "" -#: src/irc/irc-commands.c:202 +#: src/irc/irc-commands.c:208 msgid "get/set channel topic" msgstr "" -#: src/irc/irc-commands.c:203 +#: src/irc/irc-commands.c:209 msgid "[channel] [topic]" msgstr "" -#: src/irc/irc-commands.c:203 +#: src/irc/irc-commands.c:209 msgid "" "channel: channel name\n" "topic: new topic for channel (if topic is \"-delete\" then topic is deleted)" msgstr "" -#: src/irc/irc-commands.c:206 +#: src/irc/irc-commands.c:212 msgid "find the route to specific server" msgstr "" -#: src/irc/irc-commands.c:209 +#: src/irc/irc-commands.c:215 msgid "return a list of information about nicknames" msgstr "" -#: src/irc/irc-commands.c:212 +#: src/irc/irc-commands.c:218 msgid "list of users logged into the server" msgstr "" -#: src/irc/irc-commands.c:215 +#: src/irc/irc-commands.c:221 msgid "gives the version info of nick or server (current or specified)" msgstr "" -#: src/irc/irc-commands.c:216 +#: src/irc/irc-commands.c:222 msgid "[server | nickname]" msgstr "" -#: src/irc/irc-commands.c:216 +#: src/irc/irc-commands.c:222 msgid "" "server: server name\n" "nickname: nickname" msgstr "" -#: src/irc/irc-commands.c:218 +#: src/irc/irc-commands.c:224 msgid "gives voice to nickname(s)" msgstr "" -#: src/irc/irc-commands.c:221 +#: src/irc/irc-commands.c:227 msgid "" "send a message to all currently connected users who have set the 'w' user " "mode for themselves" msgstr "" -#: src/irc/irc-commands.c:223 +#: src/irc/irc-commands.c:229 msgid "text" msgstr "" -#: src/irc/irc-commands.c:223 +#: src/irc/irc-commands.c:229 msgid "text to send" msgstr "" -#: src/irc/irc-commands.c:225 +#: src/irc/irc-commands.c:231 msgid "generate a query which returns a list of information" msgstr "" -#: src/irc/irc-commands.c:226 +#: src/irc/irc-commands.c:232 msgid "[mask [\"o\"]]" msgstr "" -#: src/irc/irc-commands.c:226 +#: src/irc/irc-commands.c:232 msgid "" "mask: only information which match this mask\n" "o: only operators are returned according to the mask supplied\n" msgstr "" -#: src/irc/irc-commands.c:229 +#: src/irc/irc-commands.c:235 msgid "query information about user(s)" msgstr "" -#: src/irc/irc-commands.c:230 +#: src/irc/irc-commands.c:236 msgid "[server] nickname[,nickname]" msgstr "" -#: src/irc/irc-commands.c:230 +#: src/irc/irc-commands.c:236 msgid "" "server: server name\n" "nickname: nickname (may be a mask)" msgstr "" -#: src/irc/irc-commands.c:233 +#: src/irc/irc-commands.c:239 msgid "ask for information about a nickname which no longer exists" msgstr "" -#: src/irc/irc-commands.c:234 +#: src/irc/irc-commands.c:240 msgid "nickname [,nickname [,nickname ...]] [count [target]]" msgstr "" -#: src/irc/irc-commands.c:235 +#: src/irc/irc-commands.c:241 msgid "" "nickname: nickname to search\n" "count: number of replies to return (full search if negative number)\n" "target: reply should match this mask" msgstr "" -#: src/irc/irc-commands.c:239 src/irc/irc-commands.c:240 -#: src/irc/irc-commands.c:241 src/irc/irc-commands.c:242 -#: src/irc/irc-commands.c:243 src/irc/irc-commands.c:244 #: src/irc/irc-commands.c:245 src/irc/irc-commands.c:246 #: src/irc/irc-commands.c:247 src/irc/irc-commands.c:248 #: src/irc/irc-commands.c:249 src/irc/irc-commands.c:250 @@ -693,319 +705,322 @@ msgstr "" #: src/irc/irc-commands.c:259 src/irc/irc-commands.c:260 #: src/irc/irc-commands.c:261 src/irc/irc-commands.c:262 #: src/irc/irc-commands.c:263 src/irc/irc-commands.c:264 -#: src/irc/irc-commands.c:265 src/irc/irc-commands.c:301 -#: src/irc/irc-commands.c:302 src/irc/irc-commands.c:303 -#: src/irc/irc-commands.c:304 src/irc/irc-commands.c:305 -#: src/irc/irc-commands.c:306 +#: 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:310 src/irc/irc-commands.c:311 +#: src/irc/irc-commands.c:312 msgid "a server message" msgstr "" -#: src/irc/irc-commands.c:266 +#: src/irc/irc-commands.c:272 msgid "away message" msgstr "" -#: src/irc/irc-commands.c:267 +#: src/irc/irc-commands.c:273 msgid "userhost" msgstr "" -#: src/irc/irc-commands.c:268 +#: src/irc/irc-commands.c:274 msgid "ison" msgstr "" -#: src/irc/irc-commands.c:269 +#: src/irc/irc-commands.c:275 msgid "unaway" msgstr "" -#: src/irc/irc-commands.c:270 +#: src/irc/irc-commands.c:276 msgid "now away" msgstr "" -#: src/irc/irc-commands.c:271 +#: src/irc/irc-commands.c:277 msgid "whois (user)" msgstr "" -#: src/irc/irc-commands.c:272 +#: src/irc/irc-commands.c:278 msgid "whois (server)" msgstr "" -#: src/irc/irc-commands.c:273 +#: src/irc/irc-commands.c:279 msgid "whois (operator)" msgstr "" -#: src/irc/irc-commands.c:274 +#: src/irc/irc-commands.c:280 msgid "whowas" msgstr "" -#: src/irc/irc-commands.c:275 +#: src/irc/irc-commands.c:281 msgid "end of /who list" msgstr "" -#: src/irc/irc-commands.c:276 +#: src/irc/irc-commands.c:282 msgid "whois (idle)" msgstr "" -#: src/irc/irc-commands.c:277 +#: src/irc/irc-commands.c:283 msgid "whois (end)" msgstr "" -#: src/irc/irc-commands.c:278 +#: src/irc/irc-commands.c:284 msgid "whois (channels)" msgstr "" -#: src/irc/irc-commands.c:279 +#: src/irc/irc-commands.c:285 msgid "whois (identified user)" msgstr "" -#: src/irc/irc-commands.c:280 +#: src/irc/irc-commands.c:286 msgid "/list start" msgstr "" -#: src/irc/irc-commands.c:281 +#: src/irc/irc-commands.c:287 msgid "channel (for /list)" msgstr "" -#: src/irc/irc-commands.c:282 +#: src/irc/irc-commands.c:288 msgid "/list end" msgstr "" -#: src/irc/irc-commands.c:283 +#: src/irc/irc-commands.c:289 msgid "no topic for channel" msgstr "" -#: src/irc/irc-commands.c:284 +#: src/irc/irc-commands.c:290 msgid "topic of channel" msgstr "" -#: src/irc/irc-commands.c:285 +#: src/irc/irc-commands.c:291 msgid "channel :topic" msgstr "" -#: src/irc/irc-commands.c:286 +#: src/irc/irc-commands.c:292 msgid "" "channel: name of channel\n" "topic: topic of the channel" msgstr "" -#: src/irc/irc-commands.c:288 +#: src/irc/irc-commands.c:294 msgid "infos about topic (nick & date changed)" msgstr "" -#: src/irc/irc-commands.c:291 +#: src/irc/irc-commands.c:297 msgid "server version" msgstr "" -#: src/irc/irc-commands.c:292 +#: src/irc/irc-commands.c:298 msgid "who" msgstr "" -#: src/irc/irc-commands.c:293 +#: src/irc/irc-commands.c:299 msgid "list of nicks on channel" msgstr "" -#: src/irc/irc-commands.c:294 +#: src/irc/irc-commands.c:300 msgid "channel :[[@|+]nick ...]" msgstr "" -#: src/irc/irc-commands.c:295 +#: src/irc/irc-commands.c:301 msgid "" "channel: name of channel\n" "nick: nick on the channel" msgstr "" -#: src/irc/irc-commands.c:297 +#: src/irc/irc-commands.c:303 msgid "links" msgstr "" -#: src/irc/irc-commands.c:298 +#: src/irc/irc-commands.c:304 msgid "end of /links list" msgstr "" -#: src/irc/irc-commands.c:299 +#: src/irc/irc-commands.c:305 msgid "end of /names list" msgstr "" -#: src/irc/irc-commands.c:300 +#: src/irc/irc-commands.c:306 msgid "end of /whowas list" msgstr "" -#: src/irc/irc-commands.c:307 +#: src/irc/irc-commands.c:313 msgid "server local time" msgstr "" -#: src/irc/irc-commands.c:308 +#: src/irc/irc-commands.c:314 msgid "no such nick/channel" msgstr "" -#: src/irc/irc-commands.c:310 +#: src/irc/irc-commands.c:316 msgid "no such server" msgstr "" -#: src/irc/irc-commands.c:312 +#: src/irc/irc-commands.c:318 msgid "no such channel" msgstr "" -#: src/irc/irc-commands.c:314 +#: src/irc/irc-commands.c:320 msgid "cannot send to channel" msgstr "" -#: src/irc/irc-commands.c:316 +#: src/irc/irc-commands.c:322 msgid "too many channels" msgstr "" -#: src/irc/irc-commands.c:318 src/irc/irc-commands.c:320 -#: src/irc/irc-commands.c:322 +#: src/irc/irc-commands.c:324 src/irc/irc-commands.c:326 +#: src/irc/irc-commands.c:328 msgid "was no such nick" msgstr "" -#: src/irc/irc-commands.c:324 +#: src/irc/irc-commands.c:330 msgid "no origin" msgstr "" -#: src/irc/irc-commands.c:326 +#: src/irc/irc-commands.c:332 msgid "no recipient" msgstr "" -#: src/irc/irc-commands.c:328 +#: src/irc/irc-commands.c:334 msgid "no text to send" msgstr "" -#: src/irc/irc-commands.c:330 +#: src/irc/irc-commands.c:336 msgid "no toplevel" msgstr "" -#: src/irc/irc-commands.c:332 +#: src/irc/irc-commands.c:338 msgid "wilcard in toplevel domain" msgstr "" -#: src/irc/irc-commands.c:334 +#: src/irc/irc-commands.c:340 msgid "unknown command" msgstr "" -#: src/irc/irc-commands.c:336 +#: src/irc/irc-commands.c:342 msgid "MOTD is missing" msgstr "" -#: src/irc/irc-commands.c:338 +#: src/irc/irc-commands.c:344 msgid "no administrative info" msgstr "" -#: src/irc/irc-commands.c:340 +#: src/irc/irc-commands.c:346 msgid "file error" msgstr "" -#: src/irc/irc-commands.c:342 +#: src/irc/irc-commands.c:348 msgid "no nickname given" msgstr "" -#: src/irc/irc-commands.c:344 +#: src/irc/irc-commands.c:350 msgid "erroneus nickname" msgstr "" -#: src/irc/irc-commands.c:346 +#: src/irc/irc-commands.c:352 msgid "nickname already in use" msgstr "" -#: src/irc/irc-commands.c:348 +#: src/irc/irc-commands.c:354 msgid "nickname collision" msgstr "" -#: src/irc/irc-commands.c:350 +#: src/irc/irc-commands.c:356 msgid "user not in channel" msgstr "" -#: src/irc/irc-commands.c:352 +#: src/irc/irc-commands.c:358 msgid "not on channel" msgstr "" -#: src/irc/irc-commands.c:354 +#: src/irc/irc-commands.c:360 msgid "user already on channel" msgstr "" -#: src/irc/irc-commands.c:356 +#: src/irc/irc-commands.c:362 msgid "user not logged in" msgstr "" -#: src/irc/irc-commands.c:358 +#: src/irc/irc-commands.c:364 msgid "summon has been disabled" msgstr "" -#: src/irc/irc-commands.c:360 +#: src/irc/irc-commands.c:366 msgid "users has been disabled" msgstr "" -#: src/irc/irc-commands.c:362 +#: src/irc/irc-commands.c:368 msgid "you are not registered" msgstr "" -#: src/irc/irc-commands.c:364 +#: src/irc/irc-commands.c:370 msgid "not enough parameters" msgstr "" -#: src/irc/irc-commands.c:366 +#: src/irc/irc-commands.c:372 msgid "you may not register" msgstr "" -#: src/irc/irc-commands.c:368 +#: src/irc/irc-commands.c:374 msgid "your host isn't among the privileged" msgstr "" -#: src/irc/irc-commands.c:370 +#: src/irc/irc-commands.c:376 msgid "password incorrect" msgstr "" -#: src/irc/irc-commands.c:372 +#: src/irc/irc-commands.c:378 msgid "you are banned from this server" msgstr "" -#: src/irc/irc-commands.c:374 +#: src/irc/irc-commands.c:380 msgid "channel key already set" msgstr "" -#: src/irc/irc-commands.c:376 +#: src/irc/irc-commands.c:382 msgid "channel is already full" msgstr "" -#: src/irc/irc-commands.c:378 +#: src/irc/irc-commands.c:384 msgid "unknown mode char to me" msgstr "" -#: src/irc/irc-commands.c:380 +#: src/irc/irc-commands.c:386 msgid "cannot join channel (invite only)" msgstr "" -#: src/irc/irc-commands.c:382 +#: src/irc/irc-commands.c:388 msgid "cannot join channel (banned from channel)" msgstr "" -#: src/irc/irc-commands.c:384 +#: src/irc/irc-commands.c:390 msgid "cannot join channel (bad channel key)" msgstr "" -#: src/irc/irc-commands.c:386 +#: src/irc/irc-commands.c:392 msgid "you're not an IRC operator" msgstr "" -#: src/irc/irc-commands.c:388 +#: src/irc/irc-commands.c:394 msgid "you're not channel operator" msgstr "" -#: src/irc/irc-commands.c:390 +#: src/irc/irc-commands.c:396 msgid "you can't kill a server!" msgstr "" -#: src/irc/irc-commands.c:392 +#: src/irc/irc-commands.c:398 msgid "no O-lines for your host" msgstr "" -#: src/irc/irc-commands.c:394 +#: src/irc/irc-commands.c:400 msgid "unknown mode flag" msgstr "" -#: src/irc/irc-commands.c:396 +#: src/irc/irc-commands.c:402 msgid "can't change mode for other users" msgstr "" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2578 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2704 msgid "unknown" msgstr "" @@ -1014,35 +1029,35 @@ msgstr "" msgid "%s: using local hostname \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:199 src/irc/irc-send.c:223 src/irc/irc-send.c:311 -#: src/irc/irc-send.c:557 src/irc/irc-send.c:611 src/irc/irc-send.c:1012 +#: src/irc/irc-send.c:210 src/irc/irc-send.c:234 src/irc/irc-send.c:322 +#: src/irc/irc-send.c:568 src/irc/irc-send.c:622 src/irc/irc-send.c:1023 #, c-format msgid "%s \"%s\" command can only be executed in a channel window\n" msgstr "" -#: src/irc/irc-send.c:383 src/irc/irc-send.c:440 src/irc/irc-send.c:658 -#: src/irc/irc-send.c:671 src/irc/irc-send.c:907 +#: src/irc/irc-send.c:394 src/irc/irc-send.c:451 src/irc/irc-send.c:669 +#: src/irc/irc-send.c:682 src/irc/irc-send.c:918 #, c-format msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" -#: src/irc/irc-send.c:456 src/irc/irc-send.c:478 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:835 +#: src/irc/irc-send.c:467 src/irc/irc-send.c:489 src/irc/irc-recv.c:261 +#: src/irc/irc-recv.c:897 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:492 src/irc/irc-recv.c:929 +#: src/irc/irc-send.c:503 src/irc/irc-recv.c:1057 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:522 src/common/command.c:1118 +#: src/irc/irc-send.c:533 src/common/command.c:1118 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:985 +#: src/irc/irc-send.c:996 #, c-format msgid "%s, compiled on %s %s\n" msgstr "" @@ -1056,8 +1071,8 @@ msgstr "" msgid " has joined " msgstr "" -#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:445 src/irc/irc-recv.c:711 -#: src/irc/irc-recv.c:844 src/irc/irc-recv.c:2079 src/irc/irc-recv.c:2144 +#: 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 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "" @@ -1070,8 +1085,8 @@ msgstr "" msgid " from " msgstr "" -#: src/irc/irc-recv.c:290 src/irc/irc-recv.c:474 src/irc/irc-recv.c:752 -#: src/irc/irc-recv.c:996 +#: 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 "" @@ -1081,328 +1096,334 @@ msgstr "" msgid "%s \"%s\" command received without channel or nickname\n" msgstr "" -#: src/irc/irc-recv.c:347 +#: src/irc/irc-recv.c:344 msgid "sets ban on" msgstr "" -#: src/irc/irc-recv.c:348 +#: src/irc/irc-recv.c:345 msgid "removes ban on" msgstr "" -#: src/irc/irc-recv.c:356 +#: src/irc/irc-recv.c:352 msgid "sets invite-only channel flag" msgstr "" -#: src/irc/irc-recv.c:357 +#: src/irc/irc-recv.c:353 msgid "removes invite-only channel flag" msgstr "" -#: src/irc/irc-recv.c:365 +#: src/irc/irc-recv.c:369 +msgid "sets channel key to" +msgstr "" + +#: src/irc/irc-recv.c:370 +msgid "removes channel key" +msgstr "" + +#: src/irc/irc-recv.c:399 msgid "sets the user limit to" msgstr "" -#: src/irc/irc-recv.c:366 +#: src/irc/irc-recv.c:400 msgid "removes user limit" msgstr "" -#: src/irc/irc-recv.c:374 +#: src/irc/irc-recv.c:420 msgid "sets moderated channel flag" msgstr "" -#: src/irc/irc-recv.c:375 +#: src/irc/irc-recv.c:421 msgid "removes moderated channel flag" msgstr "" -#: src/irc/irc-recv.c:383 +#: src/irc/irc-recv.c:430 +msgid "sets messages from channel only flag" +msgstr "" + +#: src/irc/irc-recv.c:431 +msgid "removes messages from channel only flag" +msgstr "" + +#: src/irc/irc-recv.c:440 msgid "gives channel operator status to" msgstr "" -#: src/irc/irc-recv.c:384 +#: src/irc/irc-recv.c:441 msgid "removes channel operator status from" msgstr "" -#: src/irc/irc-recv.c:399 +#: src/irc/irc-recv.c:455 msgid "sets private channel flag" msgstr "" -#: src/irc/irc-recv.c:400 +#: src/irc/irc-recv.c:456 msgid "removes private channel flag" msgstr "" -#: src/irc/irc-recv.c:408 +#: src/irc/irc-recv.c:465 msgid "sets secret channel flag" msgstr "" -#: src/irc/irc-recv.c:409 +#: src/irc/irc-recv.c:466 msgid "removes secret channel flag" msgstr "" -#: src/irc/irc-recv.c:417 +#: src/irc/irc-recv.c:475 msgid "sets topic protection" msgstr "" -#: src/irc/irc-recv.c:418 +#: src/irc/irc-recv.c:476 msgid "removes topic protection" msgstr "" -#: src/irc/irc-recv.c:426 +#: src/irc/irc-recv.c:485 msgid "gives voice to" msgstr "" -#: src/irc/irc-recv.c:427 +#: src/irc/irc-recv.c:486 msgid "removes voice from" msgstr "" -#: src/irc/irc-recv.c:496 +#: src/irc/irc-recv.c:557 msgid "You are " msgstr "" -#: src/irc/irc-recv.c:503 +#: src/irc/irc-recv.c:564 msgid " is " msgstr "" -#: src/irc/irc-recv.c:507 +#: src/irc/irc-recv.c:568 msgid "now known as " msgstr "" -#: src/irc/irc-recv.c:559 +#: src/irc/irc-recv.c:620 #, c-format msgid "%s nickname not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:572 src/irc/irc-recv.c:604 +#: src/irc/irc-recv.c:633 src/irc/irc-recv.c:665 msgid "reply from" msgstr "" -#: src/irc/irc-recv.c:607 +#: src/irc/irc-recv.c:668 #, c-format msgid ": %ld.%ld seconds\n" msgstr "" -#: src/irc/irc-recv.c:637 +#: src/irc/irc-recv.c:698 #, c-format msgid "%s \"%s\" command received without host or channel\n" msgstr "" -#: src/irc/irc-recv.c:687 +#: src/irc/irc-recv.c:748 msgid " has left " msgstr "" -#: src/irc/irc-recv.c:798 +#: src/irc/irc-recv.c:860 #, c-format msgid "On %s: * %s %s" msgstr "" -#: src/irc/irc-recv.c:821 -#, c-format -msgid "On %s: %s> %s" -msgstr "" - -#: src/irc/irc-recv.c:873 -#, c-format -msgid "" -"NOTICE %s :%sVERSION %s v%s compiled on %s, host \"%s\" is running %s %s / %s" -"%s" -msgstr "" - #: src/irc/irc-recv.c:883 #, c-format -msgid "NOTICE %s :%sVERSION %s v%s compiled on %s%s" +msgid "On %s: %s> %s" msgstr "" -#: src/irc/irc-recv.c:889 +#: src/irc/irc-recv.c:951 msgid "Received a " msgstr "" -#: src/irc/irc-recv.c:891 +#: src/irc/irc-recv.c:953 msgid "CTCP VERSION " msgstr "" -#: src/irc/irc-recv.c:893 +#: src/irc/irc-recv.c:955 msgid "from" msgstr "" -#: src/irc/irc-recv.c:953 +#: 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 #, c-format -msgid "Private %s> %s" +msgid "%s cannot parse \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:973 src/irc/irc-recv.c:2365 src/irc/irc-recv.c:2405 +#: src/irc/irc-recv.c:1081 #, c-format -msgid "%s cannot parse \"%s\" command\n" +msgid "Private %s> %s" msgstr "" -#: src/irc/irc-recv.c:1028 +#: src/irc/irc-recv.c:1154 msgid "has quit" msgstr "" -#: src/irc/irc-recv.c:1148 +#: src/irc/irc-recv.c:1274 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "" -#: src/irc/irc-recv.c:1176 +#: src/irc/irc-recv.c:1302 msgid " has changed topic for " msgstr "" -#: src/irc/irc-recv.c:1181 +#: src/irc/irc-recv.c:1307 #, c-format msgid " to: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:1187 +#: src/irc/irc-recv.c:1313 msgid " has unset topic for " msgstr "" -#: src/irc/irc-recv.c:1278 +#: src/irc/irc-recv.c:1404 #, c-format msgid " is away: %s\n" msgstr "" -#: src/irc/irc-recv.c:1352 +#: src/irc/irc-recv.c:1478 msgid "Users online: " msgstr "" -#: src/irc/irc-recv.c:1715 +#: src/irc/irc-recv.c:1841 msgid "idle: " msgstr "" -#: src/irc/irc-recv.c:1723 +#: src/irc/irc-recv.c:1849 msgid "days" msgstr "" -#: src/irc/irc-recv.c:1723 +#: src/irc/irc-recv.c:1849 msgid "day" msgstr "" -#: src/irc/irc-recv.c:1733 +#: src/irc/irc-recv.c:1859 msgid "hours" msgstr "" -#: src/irc/irc-recv.c:1733 +#: src/irc/irc-recv.c:1859 msgid "hour" msgstr "" -#: src/irc/irc-recv.c:1739 +#: src/irc/irc-recv.c:1865 msgid "minutes" msgstr "" -#: src/irc/irc-recv.c:1739 +#: src/irc/irc-recv.c:1865 msgid "minute" msgstr "" -#: src/irc/irc-recv.c:1745 +#: src/irc/irc-recv.c:1871 msgid "seconds" msgstr "" -#: src/irc/irc-recv.c:1745 +#: src/irc/irc-recv.c:1871 msgid "second" msgstr "" -#: src/irc/irc-recv.c:1750 +#: src/irc/irc-recv.c:1876 msgid "signon at: " msgstr "" -#: src/irc/irc-recv.c:1838 +#: src/irc/irc-recv.c:1964 msgid "Channels: " msgstr "" -#: src/irc/irc-recv.c:2026 +#: src/irc/irc-recv.c:2152 msgid "No topic set for " msgstr "" -#: src/irc/irc-recv.c:2068 +#: src/irc/irc-recv.c:2194 msgid "Topic for " msgstr "" -#: src/irc/irc-recv.c:2072 +#: src/irc/irc-recv.c:2198 #, c-format msgid " is: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2088 src/irc/irc-recv.c:2168 +#: src/irc/irc-recv.c:2214 src/irc/irc-recv.c:2294 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2134 +#: src/irc/irc-recv.c:2260 msgid "Topic set by " msgstr "" -#: src/irc/irc-recv.c:2152 +#: src/irc/irc-recv.c:2278 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2160 +#: src/irc/irc-recv.c:2286 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2289 +#: src/irc/irc-recv.c:2415 msgid " on " msgstr "" -#: src/irc/irc-recv.c:2396 +#: src/irc/irc-recv.c:2522 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2449 +#: src/irc/irc-recv.c:2575 msgid "Nicks " msgstr "" -#: src/irc/irc-recv.c:2469 +#: src/irc/irc-recv.c:2595 msgid "Channel " msgstr "" -#: src/irc/irc-recv.c:2480 +#: src/irc/irc-recv.c:2606 msgid "nicks" msgstr "" -#: src/irc/irc-recv.c:2480 +#: src/irc/irc-recv.c:2606 msgid "nick" msgstr "" -#: src/irc/irc-recv.c:2488 +#: src/irc/irc-recv.c:2614 msgid "ops" msgstr "" -#: src/irc/irc-recv.c:2488 +#: src/irc/irc-recv.c:2614 msgid "op" msgstr "" -#: src/irc/irc-recv.c:2497 +#: src/irc/irc-recv.c:2623 msgid "halfops" msgstr "" -#: src/irc/irc-recv.c:2497 +#: src/irc/irc-recv.c:2623 msgid "halfop" msgstr "" -#: src/irc/irc-recv.c:2506 +#: src/irc/irc-recv.c:2632 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:2506 +#: src/irc/irc-recv.c:2632 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:2515 +#: src/irc/irc-recv.c:2641 msgid "normal" msgstr "" -#: src/irc/irc-recv.c:2547 +#: src/irc/irc-recv.c:2673 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2558 +#: src/irc/irc-recv.c:2684 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2567 +#: src/irc/irc-recv.c:2693 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1464,11 +1485,11 @@ msgstr "" msgid "%s unable to add handler for \"%s\" message (not enough memory)\n" msgstr "" -#: src/gui/curses/gui-display.c:887 +#: src/gui/curses/gui-display.c:944 msgid "[not connected] " msgstr "" -#: src/gui/curses/gui-display.c:894 src/gui/curses/gui-display.c:897 +#: src/gui/curses/gui-display.c:951 src/gui/curses/gui-display.c:954 msgid "-MORE-" msgstr "" diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c index 01eb182a3..883121251 100644 --- a/src/gui/curses/gui-display.c +++ b/src/gui/curses/gui-display.c @@ -808,6 +808,7 @@ gui_redraw_window_nick (t_gui_window *window) if (has_colors ()) gui_window_set_color (window->win_nick, COLOR_WIN_NICK); + snprintf (format_empty, 32, "%%-%ds", window->win_nick_width); for (i = 0; i < window->win_nick_height; i++) { mvwprintw (window->win_nick, i, 0, format_empty, " "); @@ -825,6 +826,7 @@ gui_draw_window_status (t_gui_window *window) { t_gui_window *ptr_win; char format_more[32]; + int i; /* TODO: manage splitted windows! */ if (window != gui_current_window) @@ -913,7 +915,28 @@ gui_draw_window_status (t_gui_window *window) gui_window_set_color (window->win_status, COLOR_WIN_STATUS); } - wprintw (window->win_status, "%s ", CHANNEL(ptr_win)->name); + wprintw (window->win_status, "%s", CHANNEL(ptr_win)->name); + if (gui_current_window == CHANNEL(ptr_win)->window) + { + /* display channel modes */ + wprintw (window->win_status, "(+"); + i = 0; + while (CHANNEL(ptr_win)->modes[i]) + { + if (CHANNEL(ptr_win)->modes[i] != ' ') + wprintw (window->win_status, "%c", + CHANNEL(ptr_win)->modes[i]); + i++; + } + if (CHANNEL(ptr_win)->modes[CHANNEL_MODE_KEY] != ' ') + wprintw (window->win_status, ",%s", + CHANNEL(ptr_win)->key); + if (CHANNEL(ptr_win)->modes[CHANNEL_MODE_LIMIT] != ' ') + wprintw (window->win_status, ",%d", + CHANNEL(ptr_win)->limit); + wprintw (window->win_status, ")"); + } + wprintw (window->win_status, " "); } if (!SERVER(ptr_win)) { diff --git a/src/irc/Makefile.am b/src/irc/Makefile.am index 8bdc84cd8..5a0d5a5a7 100644 --- a/src/irc/Makefile.am +++ b/src/irc/Makefile.am @@ -26,4 +26,5 @@ lib_weechat_irc_a_SOURCES = irc.h \ irc-server.c \ irc-channel.c \ irc-nick.c \ + irc-dcc.c \ irc-display.c diff --git a/src/irc/irc-channel.c b/src/irc/irc-channel.c index 06dcd338a..7095d2053 100644 --- a/src/irc/irc-channel.c +++ b/src/irc/irc-channel.c @@ -32,6 +32,7 @@ t_irc_channel *current_channel = NULL; +char *channel_modes = "iklmnst"; /* @@ -55,6 +56,10 @@ channel_new (t_irc_server *server, int channel_type, char *channel_name, new_channel->type = channel_type; new_channel->name = strdup (channel_name); new_channel->topic = NULL; + memset (new_channel->modes, ' ', sizeof (new_channel->modes)); + new_channel->modes[sizeof (new_channel->modes) - 1] = '\0'; + new_channel->limit = 0; + new_channel->key = NULL; new_channel->nicks = NULL; new_channel->last_nick = NULL; diff --git a/src/irc/irc-commands.c b/src/irc/irc-commands.c index d3bc5bd8c..7acb23d70 100644 --- a/src/irc/irc-commands.c +++ b/src/irc/irc-commands.c @@ -44,6 +44,12 @@ t_irc_command irc_commands[] = N_("nickname type"), N_("nickname: user to send ctcp to\ntype: \"action\" or \"version\""), 2, MAX_ARGS, 1, NULL, irc_cmd_send_ctcp, NULL }, + { "dcc", N_("starts DCC (file or chat)"), + N_("action nickname [file]"), + N_("action: 'send' (file) or 'chat'\n" + "nickname: nickname to send file or chat\n" + "file: filename (on local host)"), + 2, 3, 1, NULL, irc_cmd_send_dcc, NULL }, { "deop", N_("removes channel operator status from nickname(s)"), N_("nickname [nickname]"), "", 1, 1, 1, irc_cmd_send_deop, NULL, NULL }, diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c index 31a3cf2ed..189d63cc7 100644 --- a/src/irc/irc-recv.c +++ b/src/irc/irc-recv.c @@ -317,9 +317,6 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) pos_parm++; while (pos_parm[0] == ' ') pos_parm++; - pos2 = strchr (pos_parm, ' '); - if (pos2) - pos2[0] = '\0'; } set_flag = '+'; @@ -347,7 +344,6 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) _("sets ban on") : _("removes ban on"), pos_parm); - /* TODO: change & redraw channel modes */ break; case 'i': irc_display_mode (ptr_channel->window, @@ -356,16 +352,68 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) _("sets invite-only channel flag") : _("removes invite-only channel flag"), NULL); - /* TODO: change & redraw channel modes */ + 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 : NULL); - /* TODO: change & redraw channel modes */ + (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, @@ -374,7 +422,18 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) _("sets moderated channel flag") : _("removes moderated channel flag"), NULL); - /* TODO: change & redraw channel modes */ + 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, @@ -391,7 +450,6 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) gui_redraw_window_nick (ptr_channel->window); } break; - /* TODO: remove this obsolete (?) channel flag? */ case 'p': irc_display_mode (ptr_channel->window, arguments, set_flag, "p", host, @@ -399,7 +457,8 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) _("sets private channel flag") : _("removes private channel flag"), NULL); - /* TODO: change & redraw channel modes */ + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_SECRET); break; case 's': irc_display_mode (ptr_channel->window, @@ -408,7 +467,8 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) _("sets secret channel flag") : _("removes secret channel flag"), NULL); - /* TODO: change & redraw channel modes */ + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_SECRET); break; case 't': irc_display_mode (ptr_channel->window, @@ -417,7 +477,8 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) _("sets topic protection") : _("removes topic protection"), NULL); - /* TODO: change & redraw channel modes */ + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_TOPIC); break; case 'v': irc_display_mode (ptr_channel->window, @@ -438,6 +499,7 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) } pos++; } + gui_draw_window_status (gui_current_window); } else { @@ -741,6 +803,7 @@ int irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) { char *pos, *pos2, *host2; + char *pos_file, *pos_addr, *pos_port, *pos_size; /* for DCC */ t_irc_channel *ptr_channel; t_irc_nick *ptr_nick; struct utsname *buf; @@ -893,79 +956,144 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) COLOR_WIN_CHAT, _("from")); gui_printf_color (server->window, COLOR_WIN_CHAT_NICK, " %s\n", host); + return 0; } - else + + /* ping request from another user => answer */ + if (strncmp (pos, "\01PING", 5) == 0) { - /* ping request from another user => answer */ - if (strncmp (pos, "\01PING", 5) == 0) + pos += 5; + while (pos[0] == ' ') + pos++; + pos2 = strchr (pos, '\01'); + if (pos2) + pos2[0] = '\0'; + else + pos = NULL; + if (pos && !pos[0]) + pos = NULL; + if (pos) + server_sendf (server, "NOTICE %s :\01PING %s\01\r\n", + host, pos); + else + server_sendf (server, "NOTICE %s :\01PING\01\r\n", + host); + return 0; + } + + /* incoming DCC file */ + if (strncmp (pos, "\01DCC SEND", 9) == 0) + { + pos2 = strchr (pos, '\01'); + if (!pos2) { - pos += 5; - while (pos[0] == ' ') - pos++; - pos2 = strchr (pos, '\01'); - if (pos2) - pos2[0] = '\0'; - else - pos = NULL; - if (pos && !pos[0]) - pos = NULL; - if (pos) - server_sendf (server, "NOTICE %s :\01PING %s\01\r\n", - host, pos); - else - server_sendf (server, "NOTICE %s :\01PING\01\r\n", - host); + gui_printf (server->window, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); + return -1; } - else + pos2[0] = '\0'; + pos_file = pos + 9; + while (pos_file[0] == ' ') + pos_file++; + + /* look for file size */ + pos_size = strrchr (pos_file, ' '); + if (!pos_size) { - /* private message received => display it */ - ptr_channel = channel_search (server, host); - if (!ptr_channel) - { - ptr_channel = channel_new (server, CHAT_PRIVATE, host, 0); - if (!ptr_channel) - { - gui_printf (server->window, - _("%s cannot create new private window \"%s\"\n"), - WEECHAT_ERROR, host); - return -1; - } - } - if (!ptr_channel->topic) - { - ptr_channel->topic = strdup (host2); - gui_redraw_window_title (ptr_channel->window); - } - - gui_printf_color_type (ptr_channel->window, - MSG_TYPE_NICK, - COLOR_WIN_CHAT_DARK, "<"); - if (strstr (pos, server->nick)) - { - gui_printf_color_type (ptr_channel->window, - MSG_TYPE_NICK, - COLOR_WIN_CHAT_HIGHLIGHT, - "%s", host); - if ( (cfg_look_infobar_delay_highlight > 0) - && (ptr_channel->window != gui_current_window) ) - gui_infobar_printf (cfg_look_infobar_delay_highlight, - COLOR_WIN_INFOBAR_HIGHLIGHT, - _("Private %s> %s"), - host, pos); - } - else - gui_printf_color_type (ptr_channel->window, - MSG_TYPE_NICK, - COLOR_WIN_NICK_PRIVATE, - "%s", host); - gui_printf_color_type (ptr_channel->window, - MSG_TYPE_NICK, - COLOR_WIN_CHAT_DARK, "> "); - gui_printf_color_type (ptr_channel->window, - MSG_TYPE_MSG, - COLOR_WIN_CHAT, "%s\n", pos); + gui_printf (server->window, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); + return -1; + } + pos2 = pos_size; + pos_size++; + while (pos2[0] == ' ') + pos2--; + pos2[1] = '\0'; + + /* look for DCC port */ + pos_port = strrchr (pos_file, ' '); + if (!pos_port) + { + gui_printf (server->window, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); + return -1; } + pos2 = pos_port; + pos_port++; + while (pos2[0] == ' ') + pos2--; + pos2[1] = '\0'; + + /* look for DCC address (IP) */ + pos_addr = strrchr (pos_file, ' '); + if (!pos_addr) + { + gui_printf (server->window, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); + return -1; + } + pos2 = pos_addr; + pos_addr++; + while (pos2[0] == ' ') + pos2--; + pos2[1] = '\0'; + + wee_log_printf ("Incoming DCC file (NOT DEVELOPED!): " + "\"%s\", address=\"%s\", port=\"%s\", size=\"%s\"\n", + pos_file, pos_addr, pos_port, pos_size); + return 0; } + + /* private message received => display it */ + ptr_channel = channel_search (server, host); + if (!ptr_channel) + { + ptr_channel = channel_new (server, CHAT_PRIVATE, host, 0); + if (!ptr_channel) + { + gui_printf (server->window, + _("%s cannot create new private window \"%s\"\n"), + WEECHAT_ERROR, host); + return -1; + } + } + if (!ptr_channel->topic) + { + ptr_channel->topic = strdup (host2); + gui_redraw_window_title (ptr_channel->window); + } + + gui_printf_color_type (ptr_channel->window, + MSG_TYPE_NICK, + COLOR_WIN_CHAT_DARK, "<"); + if (strstr (pos, server->nick)) + { + gui_printf_color_type (ptr_channel->window, + MSG_TYPE_NICK, + COLOR_WIN_CHAT_HIGHLIGHT, + "%s", host); + if ( (cfg_look_infobar_delay_highlight > 0) + && (ptr_channel->window != gui_current_window) ) + gui_infobar_printf (cfg_look_infobar_delay_highlight, + COLOR_WIN_INFOBAR_HIGHLIGHT, + _("Private %s> %s"), + host, pos); + } + else + gui_printf_color_type (ptr_channel->window, + MSG_TYPE_NICK, + COLOR_WIN_NICK_PRIVATE, + "%s", host); + gui_printf_color_type (ptr_channel->window, + MSG_TYPE_NICK, + COLOR_WIN_CHAT_DARK, "> "); + gui_printf_color_type (ptr_channel->window, + MSG_TYPE_MSG, + COLOR_WIN_CHAT, "%s\n", pos); } else { diff --git a/src/irc/irc-send.c b/src/irc/irc-send.c index e0890d978..ff7c9bc52 100644 --- a/src/irc/irc-send.c +++ b/src/irc/irc-send.c @@ -179,6 +179,17 @@ irc_cmd_send_ctcp (t_irc_server *server, char *arguments) } /* + * irc_cmd_send_dcc: starts DCC (file or chat) + */ + +int +irc_cmd_send_dcc (t_irc_server *server, char *arguments) +{ + /* TODO: write this command! */ + return 0; +} + +/* * irc_cmd_send_deop: remove operator privileges from nickname(s) */ diff --git a/src/irc/irc.h b/src/irc/irc.h index 112018892..1ad068aed 100644 --- a/src/irc/irc.h +++ b/src/irc/irc.h @@ -34,6 +34,20 @@ #define CHANNEL_PREFIX "#&+!" +#define NUM_CHANNEL_MODES 7 +#define CHANNEL_MODE_INVITE 0 +#define CHANNEL_MODE_KEY 1 +#define CHANNEL_MODE_LIMIT 2 +#define CHANNEL_MODE_MODERATED 3 +#define CHANNEL_MODE_NO_MSG_OUT 4 +#define CHANNEL_MODE_SECRET 5 +#define CHANNEL_MODE_TOPIC 6 +#define SET_CHANNEL_MODE(channel, set, mode) \ + if (set) \ + channel->modes[mode] = channel_modes[mode]; \ + else \ + channel->modes[mode] = ' '; + #define DEFAULT_IRC_PORT 6667 /* nick types */ @@ -64,6 +78,9 @@ struct t_irc_channel int type; /* channel type */ char *name; /* name of channel (exemple: "#abc") */ char *topic; /* topic of channel (host for private) */ + char modes[NUM_CHANNEL_MODES+1];/* channel modes */ + int limit; /* user limit (0 is limit not set) */ + char *key; /* channel key (NULL if no key is set) */ t_irc_nick *nicks; /* nicks on the channel */ t_irc_nick *last_nick; /* last nick on the channel */ t_gui_window *window; /* GUI window allocated for channel */ @@ -139,6 +156,7 @@ extern t_irc_command irc_commands[]; extern t_irc_server *irc_servers, *current_irc_server; extern t_irc_message *recv_msgq, *msgq_last_msg; extern t_irc_channel *current_channel; +extern char *channel_modes; /* server functions (irc-server.c) */ @@ -180,6 +198,10 @@ extern t_irc_nick *nick_search (t_irc_channel *, char *); extern void nick_count (t_irc_channel *, int *, int *, int *, int *, int *); extern int nick_get_max_length (t_irc_channel *); +/* DCC functions (irc-dcc.c) */ + +extern void dcc_send (); + /* IRC display (irc-diplay.c) */ extern void irc_display_prefix (/*@null@*/ t_gui_window *, char *); @@ -195,6 +217,7 @@ extern void irc_login (t_irc_server *); extern int irc_cmd_send_admin (t_irc_server *, char *); extern int irc_cmd_send_away (t_irc_server *, char *); extern int irc_cmd_send_ctcp (t_irc_server *, char *); +extern int irc_cmd_send_dcc (t_irc_server *, char *); extern int irc_cmd_send_deop (t_irc_server *, int, char **); extern int irc_cmd_send_devoice (t_irc_server *, int, char **); extern int irc_cmd_send_die (t_irc_server *, char *); diff --git a/weechat/ChangeLog b/weechat/ChangeLog index b5939b5d0..119cf351d 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -1,10 +1,11 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2004-02-25 +ChangeLog - 2004-02-29 Version 0.0.6 (under dev!): + * /mode command is now ok and channel flags are displayed in status bar * fixed display bug (text was blinking when scrolling) * CTCP Version reply is now in english only and doesn't show host (security reason) diff --git a/weechat/TODO b/weechat/TODO index f2be8e30d..1911635ee 100644 --- a/weechat/TODO +++ b/weechat/TODO @@ -1,7 +1,7 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -TODO - 2004-02-07 +TODO - 2004-02-29 Legend: # done @@ -10,38 +10,33 @@ Legend: ? is this really necessary? -v0.0.5: +v0.0.6: ------ * General: - # debug messages can be enabled via ./configure --enbale-debug option + - Windows version + Solaris version - * WeeChat commands: - # "/set" command: allow the user to set the WeeChat variables - under WeeChat without editing the config file (colors, time - format, etc) - + * IRC protocol: + + "/mode" command: change the user/channels modes + + "/dcc" command (for chat and sending/receiving files) + * Interface: + internationalization (traduce WeeChat in many languages) - # info bar - # add clock + - display current channel modes (example : #weechat(+nt)) * Configuration: + add missing options for config file - + add key bindings to config file - + - add key bindings to config file + Future versions: --------------- * General: - - Windows version - *BSD version * IRC protocol: - + "/mode" command: change the user/channels modes - - "/dcc" command (for chat and sending/receiving files) - complete "/list" command: add regexp search, display only channels that match regexp - "/ignore" and "/unignore" commands: hide all that is write by a given @@ -64,7 +59,6 @@ Future versions: * Interface: + Gtk GUI - - display current channel modes (example : #weechat(+nt)) - interpret special chars in messages (color & bold for example) - many channel windows in one window/term (window split) - add lag indicator diff --git a/weechat/po/fr.po b/weechat/po/fr.po index bed853c54..b307d48a8 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-07 20:17+0100\n" -"PO-Revision-Date: 2004-02-07 20:17+0100\n" +"POT-Creation-Date: 2004-02-29 17:13+0100\n" +"PO-Revision-Date: 2004-02-29 17:13+0100\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -107,7 +107,7 @@ msgstr "%s connexion au serveur irc impossible\n" msgid "Disconnected from server!\n" msgstr "Déconnecté du serveur !\n" -#: src/irc/irc-channel.c:50 +#: src/irc/irc-channel.c:51 #, c-format msgid "%s cannot allocate new channel" msgstr "%s impossible d'allouer un nouveau canal" @@ -116,14 +116,14 @@ msgstr "%s impossible d'allouer un nouveau canal" msgid "find information about the administrator of the server" msgstr "trouver les informations sur l'administrateur du serveur" -#: src/irc/irc-commands.c:35 src/irc/irc-commands.c:58 -#: src/irc/irc-commands.c:128 src/irc/irc-commands.c:200 -#: src/irc/irc-commands.c:207 src/irc/irc-commands.c:213 +#: src/irc/irc-commands.c:35 src/irc/irc-commands.c:64 +#: src/irc/irc-commands.c:134 src/irc/irc-commands.c:206 +#: src/irc/irc-commands.c:213 src/irc/irc-commands.c:219 msgid "[target]" msgstr "[cible]" -#: src/irc/irc-commands.c:36 src/irc/irc-commands.c:207 -#: src/irc/irc-commands.c:213 +#: src/irc/irc-commands.c:36 src/irc/irc-commands.c:213 +#: src/irc/irc-commands.c:219 msgid "target: server" msgstr "cible: serveur" @@ -161,43 +161,61 @@ msgstr "" "type: \"action\" ou \"version\"" #: src/irc/irc-commands.c:47 +msgid "starts DCC (file or chat)" +msgstr "démarre le DCC (fichier ou discussion)" + +#: src/irc/irc-commands.c:48 +msgid "action nickname [file]" +msgstr "action pseudo [fichier]" + +#: src/irc/irc-commands.c:49 +msgid "" +"action: 'send' (file) or 'chat'\n" +"nickname: nickname to send file or chat\n" +"file: filename (on local host)" +msgstr "" +"action: 'send' (envoi de fichier) ou 'chat' (disuccion)\n" +"pseudo: pseudo pour envoyer le fichier ou discuter\n" +"fichier: nom du fichier (sur la machine locale)" + +#: src/irc/irc-commands.c:53 msgid "removes channel operator status from nickname(s)" msgstr "retire le statut d'opérateur du canal à/aux nick(s)" -#: src/irc/irc-commands.c:48 src/irc/irc-commands.c:51 -#: src/irc/irc-commands.c:141 src/irc/irc-commands.c:219 +#: src/irc/irc-commands.c:54 src/irc/irc-commands.c:57 +#: src/irc/irc-commands.c:147 src/irc/irc-commands.c:225 msgid "nickname [nickname]" msgstr "nickname [nickname]" -#: src/irc/irc-commands.c:50 +#: src/irc/irc-commands.c:56 msgid "removes voice from nickname(s)" msgstr "retire la voix du/des pseudo(s)" -#: src/irc/irc-commands.c:53 +#: src/irc/irc-commands.c:59 msgid "shutdown the server" msgstr "arrêter le serveur" -#: src/irc/irc-commands.c:56 +#: src/irc/irc-commands.c:62 msgid "error received from IRC server" msgstr "erreur reçue du serveur IRC" -#: src/irc/irc-commands.c:57 +#: src/irc/irc-commands.c:63 msgid "get information describing the server" msgstr "voir les informations concernant le serveur" -#: src/irc/irc-commands.c:59 src/irc/irc-commands.c:129 +#: src/irc/irc-commands.c:65 src/irc/irc-commands.c:135 msgid "target: server name" msgstr "cible: nom du serveur" -#: src/irc/irc-commands.c:61 +#: src/irc/irc-commands.c:67 msgid "invite a nick on a channel" msgstr "inviter un utilisateur sur un canal" -#: src/irc/irc-commands.c:62 +#: src/irc/irc-commands.c:68 msgid "nickname channel" msgstr "nick canal" -#: src/irc/irc-commands.c:63 +#: src/irc/irc-commands.c:69 msgid "" "nickname: nick to invite\n" "channel: channel to invite" @@ -205,27 +223,27 @@ msgstr "" "nickname: utilisateur à inviter\n" "channel: canal pour l'invitation" -#: src/irc/irc-commands.c:65 +#: src/irc/irc-commands.c:71 msgid "check if a nickname is currently on IRC" msgstr "vérifier si un utilisateur est actuellement sur IRC" -#: src/irc/irc-commands.c:66 src/irc/irc-commands.c:210 +#: src/irc/irc-commands.c:72 src/irc/irc-commands.c:216 msgid "nickname [nickname ...]" msgstr "nick [nick ...]" -#: src/irc/irc-commands.c:67 src/irc/irc-commands.c:210 +#: src/irc/irc-commands.c:73 src/irc/irc-commands.c:216 msgid "nickname: nickname" msgstr "nick: pseudo" -#: src/irc/irc-commands.c:69 +#: src/irc/irc-commands.c:75 msgid "join a channel" msgstr "joindre un canal" -#: src/irc/irc-commands.c:70 +#: src/irc/irc-commands.c:76 msgid "channel[,channel] [key[,key]]" msgstr "canal[,canal] [clé[,clé]]" -#: src/irc/irc-commands.c:71 +#: src/irc/irc-commands.c:77 msgid "" "channel: channel name to join\n" "key: key to join the channel" @@ -233,15 +251,15 @@ msgstr "" "canal: nom du canal à rejoindre\n" "clé: clé pour rejoindre le canal" -#: src/irc/irc-commands.c:73 +#: src/irc/irc-commands.c:79 msgid "forcibly remove a user from a channel" msgstr "retirer par la force un utilisateur d'un canal" -#: src/irc/irc-commands.c:74 +#: src/irc/irc-commands.c:80 msgid "[channel] nickname [comment]" msgstr "[canal] nick [commentaire]" -#: src/irc/irc-commands.c:75 +#: src/irc/irc-commands.c:81 msgid "" "channel: channel where user is\n" "nickname: nickname to kick\n" @@ -251,15 +269,15 @@ msgstr "" "nick: utilisateur à éliminer\n" "commentaire: commentaire pour l'élimination" -#: src/irc/irc-commands.c:77 +#: src/irc/irc-commands.c:83 msgid "close client-server connection" msgstr "fermer la connexion client-serveur" -#: src/irc/irc-commands.c:78 +#: src/irc/irc-commands.c:84 msgid "nickname comment" msgstr "nick commentaire" -#: src/irc/irc-commands.c:79 +#: src/irc/irc-commands.c:85 msgid "" "nickname: nickname\n" "comment: comment for kill" @@ -267,16 +285,16 @@ msgstr "" "nick: utilisateur\n" "commentaire: commentaire pour la mort" -#: src/irc/irc-commands.c:81 +#: src/irc/irc-commands.c:87 msgid "list all servernames which are known by the server answering the query" msgstr "" "lister tous les noms de serveurs connus du serveur qui répond à la requête" -#: src/irc/irc-commands.c:82 +#: src/irc/irc-commands.c:88 msgid "[[remove_server] server_mask]" msgstr "[[serveur] masque_serveur]" -#: src/irc/irc-commands.c:83 +#: src/irc/irc-commands.c:89 msgid "" "remote_server: this server should answer the query\n" "server_mask: list of servers must match this mask" @@ -284,15 +302,15 @@ msgstr "" "serveur: ce serveur doit répondre à la requête\n" "masque_serveur: liste des serveurs correspondant au masque" -#: src/irc/irc-commands.c:86 +#: src/irc/irc-commands.c:92 msgid "list channels and their topic" msgstr "lister les canaux et leur sujet" -#: src/irc/irc-commands.c:87 +#: src/irc/irc-commands.c:93 msgid "[channel[,channel] [server]]" msgstr "[canal[,canall] [serveur]]" -#: src/irc/irc-commands.c:88 +#: src/irc/irc-commands.c:94 msgid "" "channel: channel to list\n" "server: server name" @@ -300,15 +318,15 @@ msgstr "" "canal: canal à lister\n" "serveur: nom du serveur" -#: src/irc/irc-commands.c:90 +#: src/irc/irc-commands.c:96 msgid "get statistics about ths size of the IRC network" msgstr "obtenir des statistiques sur la taille du réseau IRC" -#: src/irc/irc-commands.c:91 +#: src/irc/irc-commands.c:97 msgid "[mask [target]]" msgstr "[masque [cible]]" -#: src/irc/irc-commands.c:92 +#: src/irc/irc-commands.c:98 msgid "" "mask: servers matching the mask only\n" "target: server for forwarding request" @@ -316,23 +334,23 @@ msgstr "" "masque: serveurs qui correspondent au masque seulement\n" "cible: serveur pour faire suivre la requête" -#: src/irc/irc-commands.c:95 +#: src/irc/irc-commands.c:101 msgid "send a ctcp action to the current channel" msgstr "envoyer une action ctcp au canal courant" -#: src/irc/irc-commands.c:96 +#: src/irc/irc-commands.c:102 msgid "message" msgstr "message" -#: src/irc/irc-commands.c:97 +#: src/irc/irc-commands.c:103 msgid "message: message to send" msgstr "message: message à envoyer" -#: src/irc/irc-commands.c:99 +#: src/irc/irc-commands.c:105 msgid "change channel or user mode" msgstr "changer le mode du canal ou de l'utilisateur" -#: src/irc/irc-commands.c:100 +#: src/irc/irc-commands.c:106 msgid "" "{ channel {[+|-]|o|p|s|i|t|n|b|v} [limit] [user] [ban mask] } | { nickname " "{[+|-]|i|w|s|o}" @@ -340,7 +358,7 @@ msgstr "" "{ canal {[+|-]|o|p|s|i|t|n|b|v} [limite] [utilisateur] [masque de " "banissement] } | { nick {[+|-]|i|w|s|o}" -#: src/irc/irc-commands.c:102 +#: src/irc/irc-commands.c:108 msgid "" "channel modes:\n" " channel: channel name to modify\n" @@ -383,15 +401,15 @@ msgstr "" " w: l'utilisateur reçoit les wallops\n" " o: drapeau opérateur\n" -#: src/irc/irc-commands.c:122 +#: src/irc/irc-commands.c:128 msgid "send message to a nick or channel" msgstr "envoyer un message à un utilisateur ou canal" -#: src/irc/irc-commands.c:123 +#: src/irc/irc-commands.c:129 msgid "receiver[,receiver] text" msgstr "cible[,cible] texte" -#: src/irc/irc-commands.c:124 +#: src/irc/irc-commands.c:130 msgid "" "receiver: nick or channel (may be mask, '*' = current channel)\n" "text: text to send" @@ -399,43 +417,43 @@ msgstr "" "cible: utilisateur ou canal (peut-être un masque, '*' = canal courant)\n" "texte: texte à envoyer" -#: src/irc/irc-commands.c:127 +#: src/irc/irc-commands.c:133 msgid "get the \"Message Of The Day\"" msgstr "obtenir le message du jour" -#: src/irc/irc-commands.c:131 +#: src/irc/irc-commands.c:137 msgid "list nicknames on channels" msgstr "lister les utilisateurs sur des canaux" -#: src/irc/irc-commands.c:132 src/irc/irc-commands.c:148 +#: src/irc/irc-commands.c:138 src/irc/irc-commands.c:154 msgid "[channel[,channel]]" msgstr "[canal[,canal]]" -#: src/irc/irc-commands.c:132 +#: src/irc/irc-commands.c:138 msgid "channel: channel name" msgstr "canal: nom du canal" -#: src/irc/irc-commands.c:134 +#: src/irc/irc-commands.c:140 msgid "change current nickname" msgstr "changer le nick courant" -#: src/irc/irc-commands.c:135 +#: src/irc/irc-commands.c:141 msgid "nickname" msgstr "nick" -#: src/irc/irc-commands.c:135 +#: src/irc/irc-commands.c:141 msgid "nickname: new nickname for current IRC server" msgstr "nick: nouveau nick pour le serveur IRC courant" -#: src/irc/irc-commands.c:137 +#: src/irc/irc-commands.c:143 msgid "send notice message to user" msgstr "envoyer un message notice à un utilisateur" -#: src/irc/irc-commands.c:138 +#: src/irc/irc-commands.c:144 msgid "nickname text" msgstr "nick texte" -#: src/irc/irc-commands.c:138 +#: src/irc/irc-commands.c:144 msgid "" "nickname: user to send notice to\n" "text: text to send" @@ -443,41 +461,41 @@ msgstr "" "nick: utilisateur cible pour la notice\n" "texte: texte à envoyer" -#: src/irc/irc-commands.c:140 +#: src/irc/irc-commands.c:146 msgid "gives channel operator status to nickname(s)" msgstr "donner le statut opérateur à un/des utilisateur(s)" -#: src/irc/irc-commands.c:143 +#: src/irc/irc-commands.c:149 msgid "get operator privileges" msgstr "obtenir le statut d'opérateur" -#: src/irc/irc-commands.c:144 +#: src/irc/irc-commands.c:150 msgid "user password" msgstr "utilisateur mot_de_passe" -#: src/irc/irc-commands.c:145 +#: src/irc/irc-commands.c:151 msgid "user/password: used to get privileges on current IRC server" msgstr "" "utilisateur/mot_de_passe: utilisé pour obtenir les privilèges sur le serveur " "IRC courant" -#: src/irc/irc-commands.c:147 +#: src/irc/irc-commands.c:153 msgid "leave a channel" msgstr "quitter un canal" -#: src/irc/irc-commands.c:148 +#: src/irc/irc-commands.c:154 msgid "channel: channel name to leave" msgstr "canal: nom du canal à quitter" -#: src/irc/irc-commands.c:150 +#: src/irc/irc-commands.c:156 msgid "ping server" msgstr "pinguer un serveur" -#: src/irc/irc-commands.c:151 +#: src/irc/irc-commands.c:157 msgid "server1 [server2]" msgstr "serveur1 [serveur2]" -#: src/irc/irc-commands.c:152 +#: src/irc/irc-commands.c:158 msgid "" "server1: server to ping\n" "server2: forward ping to this server" @@ -485,15 +503,15 @@ msgstr "" "serveur1: serveur à pinguer\n" "serveur2: faire suivre le ping à ce serveur" -#: src/irc/irc-commands.c:154 +#: src/irc/irc-commands.c:160 msgid "answer to a ping message" msgstr "répondre à un message ping" -#: src/irc/irc-commands.c:155 +#: src/irc/irc-commands.c:161 msgid "daemon [daemon2]" msgstr "démon [démon2]" -#: src/irc/irc-commands.c:155 +#: src/irc/irc-commands.c:161 msgid "" "daemon: daemon who has responded to Ping message\n" "daemon2: forward message to this daemon" @@ -501,51 +519,51 @@ msgstr "" "démon: démon qui a répondu au message Ping\n" "démon2: faire suivre le message à ce démon" -#: src/irc/irc-commands.c:158 +#: src/irc/irc-commands.c:164 msgid "message received" msgstr "message reçu" -#: src/irc/irc-commands.c:161 +#: src/irc/irc-commands.c:167 msgid "close all connections & quit " msgstr "fermer toutes les connexions et quitter " -#: src/irc/irc-commands.c:162 +#: src/irc/irc-commands.c:168 msgid "[quit_message]" msgstr "[message_de_fin]" -#: src/irc/irc-commands.c:163 +#: src/irc/irc-commands.c:169 msgid "quit_message: quit message (displayed to other users)" msgstr "quit_message: quit message (displayed to other users)" -#: src/irc/irc-commands.c:165 +#: src/irc/irc-commands.c:171 msgid "send raw data to server without parsing" msgstr "envoyer des données brutes au serveur sans analyse" -#: src/irc/irc-commands.c:166 +#: src/irc/irc-commands.c:172 msgid "data" msgstr "données" -#: src/irc/irc-commands.c:167 +#: src/irc/irc-commands.c:173 msgid "data: raw data to send" msgstr "données: données brutes à envoyer" -#: src/irc/irc-commands.c:169 +#: src/irc/irc-commands.c:175 msgid "tell the server to reload its config file" msgstr "demander au serveur de recharger son fichier de config" -#: src/irc/irc-commands.c:172 +#: src/irc/irc-commands.c:178 msgid "tell the server to restart itself" msgstr "demander au serveur de redémarrer" -#: src/irc/irc-commands.c:175 +#: src/irc/irc-commands.c:181 msgid "register a new service" msgstr "enregister un nouveau service" -#: src/irc/irc-commands.c:176 +#: src/irc/irc-commands.c:182 msgid "nickname reserved distribution type reserved info" msgstr "nick réservé distribution type réservé info" -#: src/irc/irc-commands.c:177 +#: src/irc/irc-commands.c:183 msgid "" "distribution: visibility of service\n" "type: reserved for future usage" @@ -553,15 +571,15 @@ msgstr "" "distribution: visibilité du service\n" "type: réservé pour une utilisation future" -#: src/irc/irc-commands.c:180 +#: src/irc/irc-commands.c:186 msgid "list services currently connected to the network" msgstr "lister les services actuellement connectés au réseau" -#: src/irc/irc-commands.c:181 +#: src/irc/irc-commands.c:187 msgid "[mask [type]]" msgstr "[masque [type]]" -#: src/irc/irc-commands.c:181 +#: src/irc/irc-commands.c:187 msgid "" "mask: list only services matching this mask\n" "type: list only services of this type" @@ -569,15 +587,15 @@ msgstr "" "masque: lister seulement les services qui correspondent à ce masque\n" "type: lister seulement les services de ce type" -#: src/irc/irc-commands.c:184 +#: src/irc/irc-commands.c:190 msgid "deliver a message to a service" msgstr "envoyer un message à un service" -#: src/irc/irc-commands.c:185 +#: src/irc/irc-commands.c:191 msgid "service text" msgstr "service texte" -#: src/irc/irc-commands.c:185 +#: src/irc/irc-commands.c:191 msgid "" "service: name of service\n" "text: text to send" @@ -585,15 +603,15 @@ msgstr "" "service: nom du service\n" "texte: texte à envoyer" -#: src/irc/irc-commands.c:187 +#: src/irc/irc-commands.c:193 msgid "disconnect server links" msgstr "déconnecter les liens vers un serveur" -#: src/irc/irc-commands.c:188 +#: src/irc/irc-commands.c:194 msgid "server commnent" msgstr "serveur commentaire" -#: src/irc/irc-commands.c:188 +#: src/irc/irc-commands.c:194 msgid "" "server: server name\n" "comment: comment for quit" @@ -601,15 +619,15 @@ msgstr "" "serveur: nom du serveur\n" "commentaire: commentaire pour quitter" -#: src/irc/irc-commands.c:190 +#: src/irc/irc-commands.c:196 msgid "query statistics about server" msgstr "demande les informations sur le serveur" -#: src/irc/irc-commands.c:191 +#: src/irc/irc-commands.c:197 msgid "[query [server]]" msgstr "[requête [serveur]]" -#: src/irc/irc-commands.c:192 +#: src/irc/irc-commands.c:198 msgid "" "query: c/h/i/k/l/m/o/y/u (see RFC1459)\n" "server: server name" @@ -617,17 +635,17 @@ msgstr "" "requête: c/h/i/k/l/m/o/y/u (voir la RFC1459)\n" "serveur: nom du serveur" -#: src/irc/irc-commands.c:194 +#: src/irc/irc-commands.c:200 msgid "" "give users who are on a host running an IRC server a message asking them to " "please join IRC" msgstr "envoyer un message aux serveurs leur demandant de rejoindre IRC" -#: src/irc/irc-commands.c:196 +#: src/irc/irc-commands.c:202 msgid "user [target [channel]]" msgstr "utilisateur [cible [canal]]" -#: src/irc/irc-commands.c:197 +#: src/irc/irc-commands.c:203 msgid "" "user: username\n" "target: server name\n" @@ -637,23 +655,23 @@ msgstr "" "cible: nom du serveur\n" "canal: nom du canal" -#: src/irc/irc-commands.c:199 +#: src/irc/irc-commands.c:205 msgid "query local time from server" msgstr "demander l'heure locale d'un serveur" -#: src/irc/irc-commands.c:200 +#: src/irc/irc-commands.c:206 msgid "target: query time from specified server" msgstr "cible: demander l'heure de ce serveur" -#: src/irc/irc-commands.c:202 +#: src/irc/irc-commands.c:208 msgid "get/set channel topic" msgstr "recevoir/définir le titre du canal" -#: src/irc/irc-commands.c:203 +#: src/irc/irc-commands.c:209 msgid "[channel] [topic]" msgstr "[canal] [titre]" -#: src/irc/irc-commands.c:203 +#: src/irc/irc-commands.c:209 msgid "" "channel: channel name\n" "topic: new topic for channel (if topic is \"-delete\" then topic is deleted)" @@ -662,28 +680,28 @@ msgstr "" "titre: nouveau titre pour le canal (si le titre est \"-delete\" alors le " "titre est supprimé)" -#: src/irc/irc-commands.c:206 +#: src/irc/irc-commands.c:212 msgid "find the route to specific server" msgstr "trouver le chemin jusqu'à un serveur spécifique" -#: src/irc/irc-commands.c:209 +#: src/irc/irc-commands.c:215 msgid "return a list of information about nicknames" msgstr "retourne une liste d'informations sur des utilisateurs" -#: src/irc/irc-commands.c:212 +#: src/irc/irc-commands.c:218 msgid "list of users logged into the server" msgstr "liste des utilisateurs connectés au serveur" -#: src/irc/irc-commands.c:215 +#: src/irc/irc-commands.c:221 msgid "gives the version info of nick or server (current or specified)" msgstr "" "retourne la version de l'utilisateur ou du serveur (courant ou spécifié)" -#: src/irc/irc-commands.c:216 +#: src/irc/irc-commands.c:222 msgid "[server | nickname]" msgstr "[serveur | nick]" -#: src/irc/irc-commands.c:216 +#: src/irc/irc-commands.c:222 msgid "" "server: server name\n" "nickname: nickname" @@ -691,11 +709,11 @@ msgstr "" "serveur: nom du serveur\n" "nick: utilisateur" -#: src/irc/irc-commands.c:218 +#: src/irc/irc-commands.c:224 msgid "gives voice to nickname(s)" msgstr "donne la voix à/aux utilisateur(s)" -#: src/irc/irc-commands.c:221 +#: src/irc/irc-commands.c:227 msgid "" "send a message to all currently connected users who have set the 'w' user " "mode for themselves" @@ -703,23 +721,23 @@ msgstr "" "envoyer un message à tous les utilisateurs connectés qui ont activé le mode " "utilisateur 'w' pour eux-mêmes" -#: src/irc/irc-commands.c:223 +#: src/irc/irc-commands.c:229 msgid "text" msgstr "texte" -#: src/irc/irc-commands.c:223 +#: src/irc/irc-commands.c:229 msgid "text to send" msgstr "texte à envoyer" -#: src/irc/irc-commands.c:225 +#: src/irc/irc-commands.c:231 msgid "generate a query which returns a list of information" msgstr "génère une requête qui retourne une liste d'information" -#: src/irc/irc-commands.c:226 +#: src/irc/irc-commands.c:232 msgid "[mask [\"o\"]]" msgstr "[masque [\"o\"]]" -#: src/irc/irc-commands.c:226 +#: src/irc/irc-commands.c:232 msgid "" "mask: only information which match this mask\n" "o: only operators are returned according to the mask supplied\n" @@ -727,15 +745,15 @@ msgstr "" "masque: information qui correspond à ce masque uniquement\n" "o: seul les opérateurs sont retournés correspondant au masque fourni\n" -#: src/irc/irc-commands.c:229 +#: src/irc/irc-commands.c:235 msgid "query information about user(s)" msgstr "demande les informations sur le(s) utilisateur(s)" -#: src/irc/irc-commands.c:230 +#: src/irc/irc-commands.c:236 msgid "[server] nickname[,nickname]" msgstr "[serveur] nick[,nick]" -#: src/irc/irc-commands.c:230 +#: src/irc/irc-commands.c:236 msgid "" "server: server name\n" "nickname: nickname (may be a mask)" @@ -743,15 +761,15 @@ msgstr "" "serveur: nom du serveur\n" "nick: utilisateur (peut être un masque)" -#: src/irc/irc-commands.c:233 +#: src/irc/irc-commands.c:239 msgid "ask for information about a nickname which no longer exists" msgstr "demander de l'information sur un nick qui n'existe plus" -#: src/irc/irc-commands.c:234 +#: src/irc/irc-commands.c:240 msgid "nickname [,nickname [,nickname ...]] [count [target]]" msgstr "nick [,nick [,nick ...]] [nombre [cible]]" -#: src/irc/irc-commands.c:235 +#: src/irc/irc-commands.c:241 msgid "" "nickname: nickname to search\n" "count: number of replies to return (full search if negative number)\n" @@ -762,9 +780,6 @@ msgstr "" "négatif)\n" "cible: la réponse doit correspondre à ce masque" -#: src/irc/irc-commands.c:239 src/irc/irc-commands.c:240 -#: src/irc/irc-commands.c:241 src/irc/irc-commands.c:242 -#: src/irc/irc-commands.c:243 src/irc/irc-commands.c:244 #: src/irc/irc-commands.c:245 src/irc/irc-commands.c:246 #: src/irc/irc-commands.c:247 src/irc/irc-commands.c:248 #: src/irc/irc-commands.c:249 src/irc/irc-commands.c:250 @@ -775,94 +790,97 @@ msgstr "" #: src/irc/irc-commands.c:259 src/irc/irc-commands.c:260 #: src/irc/irc-commands.c:261 src/irc/irc-commands.c:262 #: src/irc/irc-commands.c:263 src/irc/irc-commands.c:264 -#: src/irc/irc-commands.c:265 src/irc/irc-commands.c:301 -#: src/irc/irc-commands.c:302 src/irc/irc-commands.c:303 -#: src/irc/irc-commands.c:304 src/irc/irc-commands.c:305 -#: src/irc/irc-commands.c:306 +#: 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:310 src/irc/irc-commands.c:311 +#: src/irc/irc-commands.c:312 msgid "a server message" msgstr "un message du serveur" -#: src/irc/irc-commands.c:266 +#: src/irc/irc-commands.c:272 msgid "away message" msgstr "message d'absence" -#: src/irc/irc-commands.c:267 +#: src/irc/irc-commands.c:273 msgid "userhost" msgstr "nom de machine utilisateur" -#: src/irc/irc-commands.c:268 +#: src/irc/irc-commands.c:274 msgid "ison" msgstr "est présent" -#: src/irc/irc-commands.c:269 +#: src/irc/irc-commands.c:275 msgid "unaway" msgstr "non absent" -#: src/irc/irc-commands.c:270 +#: src/irc/irc-commands.c:276 msgid "now away" msgstr "maintenant absent" -#: src/irc/irc-commands.c:271 +#: src/irc/irc-commands.c:277 msgid "whois (user)" msgstr "qui est (utilisateur)" -#: src/irc/irc-commands.c:272 +#: src/irc/irc-commands.c:278 msgid "whois (server)" msgstr "qui est (serveur)" -#: src/irc/irc-commands.c:273 +#: src/irc/irc-commands.c:279 msgid "whois (operator)" msgstr "qui est (opérateur)" -#: src/irc/irc-commands.c:274 +#: src/irc/irc-commands.c:280 msgid "whowas" msgstr "qui était-ce" -#: src/irc/irc-commands.c:275 +#: src/irc/irc-commands.c:281 msgid "end of /who list" msgstr "fin de /who list" -#: src/irc/irc-commands.c:276 +#: src/irc/irc-commands.c:282 msgid "whois (idle)" msgstr "qui est (idle)" -#: src/irc/irc-commands.c:277 +#: src/irc/irc-commands.c:283 msgid "whois (end)" msgstr "qui est (fin)" -#: src/irc/irc-commands.c:278 +#: src/irc/irc-commands.c:284 msgid "whois (channels)" msgstr "qui est (canaux)" -#: src/irc/irc-commands.c:279 +#: src/irc/irc-commands.c:285 msgid "whois (identified user)" msgstr "qui est (utilisateur identifié)" -#: src/irc/irc-commands.c:280 +#: src/irc/irc-commands.c:286 msgid "/list start" msgstr "/list début" -#: src/irc/irc-commands.c:281 +#: src/irc/irc-commands.c:287 msgid "channel (for /list)" msgstr "canal (pour /list)" -#: src/irc/irc-commands.c:282 +#: src/irc/irc-commands.c:288 msgid "/list end" msgstr "/list fin" -#: src/irc/irc-commands.c:283 +#: src/irc/irc-commands.c:289 msgid "no topic for channel" msgstr "pas de titre pour le canal" -#: src/irc/irc-commands.c:284 +#: src/irc/irc-commands.c:290 msgid "topic of channel" msgstr "titre du canal" -#: src/irc/irc-commands.c:285 +#: src/irc/irc-commands.c:291 msgid "channel :topic" msgstr "canal :titre" -#: src/irc/irc-commands.c:286 +#: src/irc/irc-commands.c:292 msgid "" "channel: name of channel\n" "topic: topic of the channel" @@ -870,27 +888,27 @@ msgstr "" "canal: nom du canal\n" "titre: titre du canal" -#: src/irc/irc-commands.c:288 +#: src/irc/irc-commands.c:294 msgid "infos about topic (nick & date changed)" msgstr "infos sur le titre (utilisateur et date de changement)" -#: src/irc/irc-commands.c:291 +#: src/irc/irc-commands.c:297 msgid "server version" msgstr "version du serveur" -#: src/irc/irc-commands.c:292 +#: src/irc/irc-commands.c:298 msgid "who" msgstr "qui" -#: src/irc/irc-commands.c:293 +#: src/irc/irc-commands.c:299 msgid "list of nicks on channel" msgstr "liste des utilisateurs sur un canal" -#: src/irc/irc-commands.c:294 +#: src/irc/irc-commands.c:300 msgid "channel :[[@|+]nick ...]" msgstr "canal :[[@|+]nick ...]" -#: src/irc/irc-commands.c:295 +#: src/irc/irc-commands.c:301 msgid "" "channel: name of channel\n" "nick: nick on the channel" @@ -898,200 +916,200 @@ msgstr "" "canal: nom du canal\n" "nick: utilisateur sur le canal" -#: src/irc/irc-commands.c:297 +#: src/irc/irc-commands.c:303 msgid "links" msgstr "liens" -#: src/irc/irc-commands.c:298 +#: src/irc/irc-commands.c:304 msgid "end of /links list" msgstr "fin de /links list" -#: src/irc/irc-commands.c:299 +#: src/irc/irc-commands.c:305 msgid "end of /names list" msgstr "fin de la liste /names" -#: src/irc/irc-commands.c:300 +#: src/irc/irc-commands.c:306 msgid "end of /whowas list" msgstr "fin de /whowas list" -#: src/irc/irc-commands.c:307 +#: src/irc/irc-commands.c:313 msgid "server local time" msgstr "heure locale du serveur" -#: src/irc/irc-commands.c:308 +#: src/irc/irc-commands.c:314 msgid "no such nick/channel" msgstr "pas de tel utilisateur/canal" -#: src/irc/irc-commands.c:310 +#: src/irc/irc-commands.c:316 msgid "no such server" msgstr "pas de tel serveur" -#: src/irc/irc-commands.c:312 +#: src/irc/irc-commands.c:318 msgid "no such channel" msgstr "pas de tel canal" -#: src/irc/irc-commands.c:314 +#: src/irc/irc-commands.c:320 msgid "cannot send to channel" msgstr "impossible d'envoyer au canal" -#: src/irc/irc-commands.c:316 +#: src/irc/irc-commands.c:322 msgid "too many channels" msgstr "trop de canaux" -#: src/irc/irc-commands.c:318 src/irc/irc-commands.c:320 -#: src/irc/irc-commands.c:322 +#: src/irc/irc-commands.c:324 src/irc/irc-commands.c:326 +#: src/irc/irc-commands.c:328 msgid "was no such nick" msgstr "n'y avait pas de tel utilisateur" -#: src/irc/irc-commands.c:324 +#: src/irc/irc-commands.c:330 msgid "no origin" msgstr "pas d'origine" -#: src/irc/irc-commands.c:326 +#: src/irc/irc-commands.c:332 msgid "no recipient" msgstr "pas de destinataire" -#: src/irc/irc-commands.c:328 +#: src/irc/irc-commands.c:334 msgid "no text to send" msgstr "pas de texte à envoyer" -#: src/irc/irc-commands.c:330 +#: src/irc/irc-commands.c:336 msgid "no toplevel" msgstr "pas de niveau supérieur" -#: src/irc/irc-commands.c:332 +#: src/irc/irc-commands.c:338 msgid "wilcard in toplevel domain" msgstr "caractère joker dans le domaine de niveau supérieur" -#: src/irc/irc-commands.c:334 +#: src/irc/irc-commands.c:340 msgid "unknown command" msgstr "commande inconnue" -#: src/irc/irc-commands.c:336 +#: src/irc/irc-commands.c:342 msgid "MOTD is missing" msgstr "MOTD est manquant" -#: src/irc/irc-commands.c:338 +#: src/irc/irc-commands.c:344 msgid "no administrative info" msgstr "pas d'information administrative" -#: src/irc/irc-commands.c:340 +#: src/irc/irc-commands.c:346 msgid "file error" msgstr "erreur de fichier" -#: src/irc/irc-commands.c:342 +#: src/irc/irc-commands.c:348 msgid "no nickname given" msgstr "pas d'utilisateur donné" -#: src/irc/irc-commands.c:344 +#: src/irc/irc-commands.c:350 msgid "erroneus nickname" msgstr "nom d'utilisateur erroné" -#: src/irc/irc-commands.c:346 +#: src/irc/irc-commands.c:352 msgid "nickname already in use" msgstr "nom d'utilisateur déjà en cours d'utilisation" -#: src/irc/irc-commands.c:348 +#: src/irc/irc-commands.c:354 msgid "nickname collision" msgstr "collision sur le nom d'utilisateur" -#: src/irc/irc-commands.c:350 +#: src/irc/irc-commands.c:356 msgid "user not in channel" msgstr "utilisateur non présent dans le canal" -#: src/irc/irc-commands.c:352 +#: src/irc/irc-commands.c:358 msgid "not on channel" msgstr "non présent sur le canal" -#: src/irc/irc-commands.c:354 +#: src/irc/irc-commands.c:360 msgid "user already on channel" msgstr "utilisateur déjà sur le canal" -#: src/irc/irc-commands.c:356 +#: src/irc/irc-commands.c:362 msgid "user not logged in" msgstr "utilisateur non enregistré" -#: src/irc/irc-commands.c:358 +#: src/irc/irc-commands.c:364 msgid "summon has been disabled" msgstr "summon a été désactivé" -#: src/irc/irc-commands.c:360 +#: src/irc/irc-commands.c:366 msgid "users has been disabled" msgstr "users a été désactivé" -#: src/irc/irc-commands.c:362 +#: src/irc/irc-commands.c:368 msgid "you are not registered" msgstr "vous n'êtes pas enregistré" -#: src/irc/irc-commands.c:364 +#: src/irc/irc-commands.c:370 msgid "not enough parameters" msgstr "pas assez de paramètres" -#: src/irc/irc-commands.c:366 +#: src/irc/irc-commands.c:372 msgid "you may not register" msgstr "vous ne pouvez pas vous enregistrer" -#: src/irc/irc-commands.c:368 +#: src/irc/irc-commands.c:374 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:370 +#: src/irc/irc-commands.c:376 msgid "password incorrect" msgstr "mot de passe incorrect" -#: src/irc/irc-commands.c:372 +#: src/irc/irc-commands.c:378 msgid "you are banned from this server" msgstr "vous êtes banni de ce serveur" -#: src/irc/irc-commands.c:374 +#: src/irc/irc-commands.c:380 msgid "channel key already set" msgstr "clé du canal déjà définie" -#: src/irc/irc-commands.c:376 +#: src/irc/irc-commands.c:382 msgid "channel is already full" msgstr "le canal est déjà plein" -#: src/irc/irc-commands.c:378 +#: src/irc/irc-commands.c:384 msgid "unknown mode char to me" msgstr "caractère de mode inconnu pour moi" -#: src/irc/irc-commands.c:380 +#: src/irc/irc-commands.c:386 msgid "cannot join channel (invite only)" msgstr "impossible de rejoindre le canal (invités seulement)" -#: src/irc/irc-commands.c:382 +#: src/irc/irc-commands.c:388 msgid "cannot join channel (banned from channel)" msgstr "impossible de rejoindre le canal (banni du canal)" -#: src/irc/irc-commands.c:384 +#: src/irc/irc-commands.c:390 msgid "cannot join channel (bad channel key)" msgstr "impossible de rejoindre le canal (mauvaise clé pour le canal)" -#: src/irc/irc-commands.c:386 +#: src/irc/irc-commands.c:392 msgid "you're not an IRC operator" msgstr "vous n'êtres pas opérateur IRC" -#: src/irc/irc-commands.c:388 +#: src/irc/irc-commands.c:394 msgid "you're not channel operator" msgstr "vous n'êtes pas opérateur du canal" -#: src/irc/irc-commands.c:390 +#: src/irc/irc-commands.c:396 msgid "you can't kill a server!" msgstr "vous ne pouvez pas supprimer un serveur !" -#: src/irc/irc-commands.c:392 +#: src/irc/irc-commands.c:398 msgid "no O-lines for your host" msgstr "pas de O-lines pour votre host" -#: src/irc/irc-commands.c:394 +#: src/irc/irc-commands.c:400 msgid "unknown mode flag" msgstr "drapeau de mode inconnu" -#: src/irc/irc-commands.c:396 +#: src/irc/irc-commands.c:402 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:2578 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2704 msgid "unknown" msgstr "inconnu" @@ -1100,38 +1118,38 @@ msgstr "inconnu" msgid "%s: using local hostname \"%s\"\n" msgstr "%s: utilisation du nom de machine local \"%s\"\n" -#: src/irc/irc-send.c:199 src/irc/irc-send.c:223 src/irc/irc-send.c:311 -#: src/irc/irc-send.c:557 src/irc/irc-send.c:611 src/irc/irc-send.c:1012 +#: src/irc/irc-send.c:210 src/irc/irc-send.c:234 src/irc/irc-send.c:322 +#: src/irc/irc-send.c:568 src/irc/irc-send.c:622 src/irc/irc-send.c:1023 #, c-format msgid "%s \"%s\" command can only be executed in a channel window\n" msgstr "" "%s la commande \"%s\" peut seulement être exécutée dans une fenêtre de " "canal\n" -#: src/irc/irc-send.c:383 src/irc/irc-send.c:440 src/irc/irc-send.c:658 -#: src/irc/irc-send.c:671 src/irc/irc-send.c:907 +#: src/irc/irc-send.c:394 src/irc/irc-send.c:451 src/irc/irc-send.c:669 +#: src/irc/irc-send.c:682 src/irc/irc-send.c:918 #, c-format msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" "%s la commande \"%s\" ne peut pas être exécutée dans une fenêtre serveur\n" -#: src/irc/irc-send.c:456 src/irc/irc-send.c:478 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:835 +#: src/irc/irc-send.c:467 src/irc/irc-send.c:489 src/irc/irc-recv.c:261 +#: src/irc/irc-recv.c:897 #, 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:492 src/irc/irc-recv.c:929 +#: src/irc/irc-send.c:503 src/irc/irc-recv.c:1057 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "%s impossible de créer la fenêtre privée \"%s\"\n" -#: src/irc/irc-send.c:522 src/common/command.c:1118 +#: src/irc/irc-send.c:533 src/common/command.c:1118 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n" -#: src/irc/irc-send.c:985 +#: src/irc/irc-send.c:996 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilé le %s %s\n" @@ -1145,8 +1163,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:445 src/irc/irc-recv.c:711 -#: src/irc/irc-recv.c:844 src/irc/irc-recv.c:2079 src/irc/irc-recv.c:2144 +#: 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 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "%s canal non trouvé pour la commande \"%s\"\n" @@ -1159,8 +1177,8 @@ msgstr " a poussé dehors " msgid " from " msgstr " de " -#: src/irc/irc-recv.c:290 src/irc/irc-recv.c:474 src/irc/irc-recv.c:752 -#: src/irc/irc-recv.c:996 +#: 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" @@ -1170,335 +1188,339 @@ msgstr "%s commande \"%s\" reçue sans host\n" 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:347 +#: src/irc/irc-recv.c:344 msgid "sets ban on" msgstr "instaure un bannissement sur" -#: src/irc/irc-recv.c:348 +#: src/irc/irc-recv.c:345 msgid "removes ban on" msgstr "supprime le banissement sur" -#: src/irc/irc-recv.c:356 +#: src/irc/irc-recv.c:352 msgid "sets invite-only channel flag" msgstr "définit le canal en mode invité seulement" -#: src/irc/irc-recv.c:357 +#: src/irc/irc-recv.c:353 msgid "removes invite-only channel flag" msgstr "supprime le mode invité seulement pour le canal" -#: src/irc/irc-recv.c:365 +#: src/irc/irc-recv.c:369 +msgid "sets channel key to" +msgstr "définit la clé du canal à" + +#: src/irc/irc-recv.c:370 +msgid "removes channel key" +msgstr "supprime la clé du canal" + +#: src/irc/irc-recv.c:399 msgid "sets the user limit to" msgstr "définit la limite d'utilisateurs à" -#: src/irc/irc-recv.c:366 +#: src/irc/irc-recv.c:400 msgid "removes user limit" msgstr "supprime la limite d'utilisateurs" -#: src/irc/irc-recv.c:374 +#: src/irc/irc-recv.c:420 msgid "sets moderated channel flag" msgstr "instaure la modération sur le canal" -#: src/irc/irc-recv.c:375 +#: src/irc/irc-recv.c:421 msgid "removes moderated channel flag" msgstr "supprime la modération sur le canal" -#: src/irc/irc-recv.c:383 +#: src/irc/irc-recv.c:430 +msgid "sets messages from channel only flag" +msgstr "interdit aux utilisateurs en dehors du canal d'y écrire" + +#: src/irc/irc-recv.c:431 +msgid "removes messages from channel only flag" +msgstr "autorise tout utilisateur à écrire sur le canal" + +#: src/irc/irc-recv.c:440 msgid "gives channel operator status to" msgstr "donne le droit opérateur à" -#: src/irc/irc-recv.c:384 +#: src/irc/irc-recv.c:441 msgid "removes channel operator status from" msgstr "supprime le droit opérateur à" -#: src/irc/irc-recv.c:399 +#: src/irc/irc-recv.c:455 msgid "sets private channel flag" msgstr "définit le canal comme privé" -#: src/irc/irc-recv.c:400 +#: src/irc/irc-recv.c:456 msgid "removes private channel flag" msgstr "supprime le mode privé pour le canal" -#: src/irc/irc-recv.c:408 +#: src/irc/irc-recv.c:465 msgid "sets secret channel flag" msgstr "définit le canal comme secret" -#: src/irc/irc-recv.c:409 +#: src/irc/irc-recv.c:466 msgid "removes secret channel flag" msgstr "supprime le mode secret pour le canal" -#: src/irc/irc-recv.c:417 +#: src/irc/irc-recv.c:475 msgid "sets topic protection" msgstr "active la protection du titre" -#: src/irc/irc-recv.c:418 +#: src/irc/irc-recv.c:476 msgid "removes topic protection" msgstr "supprime la protection du titre" -#: src/irc/irc-recv.c:426 +#: src/irc/irc-recv.c:485 msgid "gives voice to" msgstr "donne la voix à" -#: src/irc/irc-recv.c:427 +#: src/irc/irc-recv.c:486 msgid "removes voice from" msgstr "supprime la voix de" -#: src/irc/irc-recv.c:496 +#: src/irc/irc-recv.c:557 msgid "You are " msgstr "Vous êtes " -#: src/irc/irc-recv.c:503 +#: src/irc/irc-recv.c:564 msgid " is " msgstr " est " -#: src/irc/irc-recv.c:507 +#: src/irc/irc-recv.c:568 msgid "now known as " msgstr "maintenant connu sous le nom " -#: src/irc/irc-recv.c:559 +#: src/irc/irc-recv.c:620 #, 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:572 src/irc/irc-recv.c:604 +#: src/irc/irc-recv.c:633 src/irc/irc-recv.c:665 msgid "reply from" msgstr "réponse de" -#: src/irc/irc-recv.c:607 +#: src/irc/irc-recv.c:668 #, c-format msgid ": %ld.%ld seconds\n" msgstr ": %ld.%ld secondes\n" -#: src/irc/irc-recv.c:637 +#: src/irc/irc-recv.c:698 #, 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:687 +#: src/irc/irc-recv.c:748 msgid " has left " msgstr " a quitté " -#: src/irc/irc-recv.c:798 +#: src/irc/irc-recv.c:860 #, c-format msgid "On %s: * %s %s" msgstr "Sur %s: * %s %s" -#: src/irc/irc-recv.c:821 +#: src/irc/irc-recv.c:883 #, c-format msgid "On %s: %s> %s" msgstr "Sur %s: %s> %s" -#: src/irc/irc-recv.c:873 -#, c-format -msgid "" -"NOTICE %s :%sVERSION %s v%s compiled on %s, host \"%s\" is running %s %s / %s" -"%s" -msgstr "" -"NOTICE %s :%sVERSION %s v%s compilée le %s, machine \"%s\" fait tourner %s %" -"s / %s%s" - -#: src/irc/irc-recv.c:883 -#, c-format -msgid "NOTICE %s :%sVERSION %s v%s compiled on %s%s" -msgstr "NOTICE %s :%sVERSION %s v%s compilée le %s%s" - -#: src/irc/irc-recv.c:889 +#: src/irc/irc-recv.c:951 msgid "Received a " msgstr "Reçu un " -#: src/irc/irc-recv.c:891 +#: src/irc/irc-recv.c:953 msgid "CTCP VERSION " msgstr "CTCP VERSION " -#: src/irc/irc-recv.c:893 +#: src/irc/irc-recv.c:955 msgid "from" msgstr "de" -#: src/irc/irc-recv.c:953 -#, c-format -msgid "Private %s> %s" -msgstr "Privé %s> %s" - -#: src/irc/irc-recv.c:973 src/irc/irc-recv.c:2365 src/irc/irc-recv.c:2405 +#: 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 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s impossible d'analyser la commande \"%s\"\n" -#: src/irc/irc-recv.c:1028 +#: src/irc/irc-recv.c:1081 +#, c-format +msgid "Private %s> %s" +msgstr "Privé %s> %s" + +#: src/irc/irc-recv.c:1154 msgid "has quit" msgstr "a quitté" -#: src/irc/irc-recv.c:1148 +#: src/irc/irc-recv.c:1274 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s commande \"%s\" reçue sans canal\n" -#: src/irc/irc-recv.c:1176 +#: src/irc/irc-recv.c:1302 msgid " has changed topic for " msgstr " a changé le titre pour " -#: src/irc/irc-recv.c:1181 +#: src/irc/irc-recv.c:1307 #, c-format msgid " to: \"%s\"\n" msgstr " en: \"%s\"\n" -#: src/irc/irc-recv.c:1187 +#: src/irc/irc-recv.c:1313 msgid " has unset topic for " msgstr " a retiré le titre pour " -#: src/irc/irc-recv.c:1278 +#: src/irc/irc-recv.c:1404 #, c-format msgid " is away: %s\n" msgstr " est absent: %s\n" -#: src/irc/irc-recv.c:1352 +#: src/irc/irc-recv.c:1478 msgid "Users online: " msgstr "Utilisateurs en ligne: " -#: src/irc/irc-recv.c:1715 +#: src/irc/irc-recv.c:1841 msgid "idle: " msgstr "inactivité: " -#: src/irc/irc-recv.c:1723 +#: src/irc/irc-recv.c:1849 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:1723 +#: src/irc/irc-recv.c:1849 msgid "day" msgstr "jour" -#: src/irc/irc-recv.c:1733 +#: src/irc/irc-recv.c:1859 msgid "hours" msgstr "heures" -#: src/irc/irc-recv.c:1733 +#: src/irc/irc-recv.c:1859 msgid "hour" msgstr "heure" -#: src/irc/irc-recv.c:1739 +#: src/irc/irc-recv.c:1865 msgid "minutes" msgstr "minutes" -#: src/irc/irc-recv.c:1739 +#: src/irc/irc-recv.c:1865 msgid "minute" msgstr "minute" -#: src/irc/irc-recv.c:1745 +#: src/irc/irc-recv.c:1871 msgid "seconds" msgstr "secondes" -#: src/irc/irc-recv.c:1745 +#: src/irc/irc-recv.c:1871 msgid "second" msgstr "seconde" -#: src/irc/irc-recv.c:1750 +#: src/irc/irc-recv.c:1876 msgid "signon at: " msgstr "signé le: " -#: src/irc/irc-recv.c:1838 +#: src/irc/irc-recv.c:1964 msgid "Channels: " msgstr "Canauxs: " -#: src/irc/irc-recv.c:2026 +#: src/irc/irc-recv.c:2152 msgid "No topic set for " msgstr "Pas de titre défini pour " -#: src/irc/irc-recv.c:2068 +#: src/irc/irc-recv.c:2194 msgid "Topic for " msgstr "Le titre pour " -#: src/irc/irc-recv.c:2072 +#: src/irc/irc-recv.c:2198 #, c-format msgid " is: \"%s\"\n" msgstr " est: \"%s\"\n" -#: src/irc/irc-recv.c:2088 src/irc/irc-recv.c:2168 +#: src/irc/irc-recv.c:2214 src/irc/irc-recv.c:2294 #, 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:2134 +#: src/irc/irc-recv.c:2260 msgid "Topic set by " msgstr "Titre défini par " -#: src/irc/irc-recv.c:2152 +#: src/irc/irc-recv.c:2278 #, 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:2160 +#: src/irc/irc-recv.c:2286 #, 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:2289 +#: src/irc/irc-recv.c:2415 msgid " on " msgstr " sur " -#: src/irc/irc-recv.c:2396 +#: src/irc/irc-recv.c:2522 #, 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:2449 +#: src/irc/irc-recv.c:2575 msgid "Nicks " msgstr "Utilisateurs " -#: src/irc/irc-recv.c:2469 +#: src/irc/irc-recv.c:2595 msgid "Channel " msgstr "Canal " -#: src/irc/irc-recv.c:2480 +#: src/irc/irc-recv.c:2606 msgid "nicks" msgstr "utilisateurs" -#: src/irc/irc-recv.c:2480 +#: src/irc/irc-recv.c:2606 msgid "nick" msgstr "utilisateur" -#: src/irc/irc-recv.c:2488 +#: src/irc/irc-recv.c:2614 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:2488 +#: src/irc/irc-recv.c:2614 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:2497 +#: src/irc/irc-recv.c:2623 msgid "halfops" msgstr "halfops" -#: src/irc/irc-recv.c:2497 +#: src/irc/irc-recv.c:2623 msgid "halfop" msgstr "halfop" -#: src/irc/irc-recv.c:2506 +#: src/irc/irc-recv.c:2632 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:2506 +#: src/irc/irc-recv.c:2632 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:2515 +#: src/irc/irc-recv.c:2641 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:2547 +#: src/irc/irc-recv.c:2673 #, 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:2558 +#: src/irc/irc-recv.c:2684 #, 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:2567 +#: src/irc/irc-recv.c:2693 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1568,11 +1590,11 @@ msgstr "" "%s impossible d'ajouter la fonction pour le message \"%s\" (mémoire " "insuffisante)\n" -#: src/gui/curses/gui-display.c:887 +#: src/gui/curses/gui-display.c:944 msgid "[not connected] " msgstr "[non connecté] " -#: src/gui/curses/gui-display.c:894 src/gui/curses/gui-display.c:897 +#: src/gui/curses/gui-display.c:951 src/gui/curses/gui-display.c:954 msgid "-MORE-" msgstr "-PLUS-" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index 2658e4cc8..5f9191756 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-07 20:17+0100\n" +"POT-Creation-Date: 2004-02-29 17:13+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" @@ -107,7 +107,7 @@ msgstr "" msgid "Disconnected from server!\n" msgstr "" -#: src/irc/irc-channel.c:50 +#: src/irc/irc-channel.c:51 #, c-format msgid "%s cannot allocate new channel" msgstr "" @@ -116,14 +116,14 @@ msgstr "" msgid "find information about the administrator of the server" msgstr "" -#: src/irc/irc-commands.c:35 src/irc/irc-commands.c:58 -#: src/irc/irc-commands.c:128 src/irc/irc-commands.c:200 -#: src/irc/irc-commands.c:207 src/irc/irc-commands.c:213 +#: src/irc/irc-commands.c:35 src/irc/irc-commands.c:64 +#: src/irc/irc-commands.c:134 src/irc/irc-commands.c:206 +#: src/irc/irc-commands.c:213 src/irc/irc-commands.c:219 msgid "[target]" msgstr "" -#: src/irc/irc-commands.c:36 src/irc/irc-commands.c:207 -#: src/irc/irc-commands.c:213 +#: src/irc/irc-commands.c:36 src/irc/irc-commands.c:213 +#: src/irc/irc-commands.c:219 msgid "target: server" msgstr "" @@ -156,168 +156,183 @@ msgid "" msgstr "" #: src/irc/irc-commands.c:47 +msgid "starts DCC (file or chat)" +msgstr "" + +#: src/irc/irc-commands.c:48 +msgid "action nickname [file]" +msgstr "" + +#: src/irc/irc-commands.c:49 +msgid "" +"action: 'send' (file) or 'chat'\n" +"nickname: nickname to send file or chat\n" +"file: filename (on local host)" +msgstr "" + +#: src/irc/irc-commands.c:53 msgid "removes channel operator status from nickname(s)" msgstr "" -#: src/irc/irc-commands.c:48 src/irc/irc-commands.c:51 -#: src/irc/irc-commands.c:141 src/irc/irc-commands.c:219 +#: src/irc/irc-commands.c:54 src/irc/irc-commands.c:57 +#: src/irc/irc-commands.c:147 src/irc/irc-commands.c:225 msgid "nickname [nickname]" msgstr "" -#: src/irc/irc-commands.c:50 +#: src/irc/irc-commands.c:56 msgid "removes voice from nickname(s)" msgstr "" -#: src/irc/irc-commands.c:53 +#: src/irc/irc-commands.c:59 msgid "shutdown the server" msgstr "" -#: src/irc/irc-commands.c:56 +#: src/irc/irc-commands.c:62 msgid "error received from IRC server" msgstr "" -#: src/irc/irc-commands.c:57 +#: src/irc/irc-commands.c:63 msgid "get information describing the server" msgstr "" -#: src/irc/irc-commands.c:59 src/irc/irc-commands.c:129 +#: src/irc/irc-commands.c:65 src/irc/irc-commands.c:135 msgid "target: server name" msgstr "" -#: src/irc/irc-commands.c:61 +#: src/irc/irc-commands.c:67 msgid "invite a nick on a channel" msgstr "" -#: src/irc/irc-commands.c:62 +#: src/irc/irc-commands.c:68 msgid "nickname channel" msgstr "" -#: src/irc/irc-commands.c:63 +#: src/irc/irc-commands.c:69 msgid "" "nickname: nick to invite\n" "channel: channel to invite" msgstr "" -#: src/irc/irc-commands.c:65 +#: src/irc/irc-commands.c:71 msgid "check if a nickname is currently on IRC" msgstr "" -#: src/irc/irc-commands.c:66 src/irc/irc-commands.c:210 +#: src/irc/irc-commands.c:72 src/irc/irc-commands.c:216 msgid "nickname [nickname ...]" msgstr "" -#: src/irc/irc-commands.c:67 src/irc/irc-commands.c:210 +#: src/irc/irc-commands.c:73 src/irc/irc-commands.c:216 msgid "nickname: nickname" msgstr "" -#: src/irc/irc-commands.c:69 +#: src/irc/irc-commands.c:75 msgid "join a channel" msgstr "" -#: src/irc/irc-commands.c:70 +#: src/irc/irc-commands.c:76 msgid "channel[,channel] [key[,key]]" msgstr "" -#: src/irc/irc-commands.c:71 +#: src/irc/irc-commands.c:77 msgid "" "channel: channel name to join\n" "key: key to join the channel" msgstr "" -#: src/irc/irc-commands.c:73 +#: src/irc/irc-commands.c:79 msgid "forcibly remove a user from a channel" msgstr "" -#: src/irc/irc-commands.c:74 +#: src/irc/irc-commands.c:80 msgid "[channel] nickname [comment]" msgstr "" -#: src/irc/irc-commands.c:75 +#: src/irc/irc-commands.c:81 msgid "" "channel: channel where user is\n" "nickname: nickname to kick\n" "comment: comment for kick" msgstr "" -#: src/irc/irc-commands.c:77 +#: src/irc/irc-commands.c:83 msgid "close client-server connection" msgstr "" -#: src/irc/irc-commands.c:78 +#: src/irc/irc-commands.c:84 msgid "nickname comment" msgstr "" -#: src/irc/irc-commands.c:79 +#: src/irc/irc-commands.c:85 msgid "" "nickname: nickname\n" "comment: comment for kill" msgstr "" -#: src/irc/irc-commands.c:81 +#: src/irc/irc-commands.c:87 msgid "list all servernames which are known by the server answering the query" msgstr "" -#: src/irc/irc-commands.c:82 +#: src/irc/irc-commands.c:88 msgid "[[remove_server] server_mask]" msgstr "" -#: src/irc/irc-commands.c:83 +#: src/irc/irc-commands.c:89 msgid "" "remote_server: this server should answer the query\n" "server_mask: list of servers must match this mask" msgstr "" -#: src/irc/irc-commands.c:86 +#: src/irc/irc-commands.c:92 msgid "list channels and their topic" msgstr "" -#: src/irc/irc-commands.c:87 +#: src/irc/irc-commands.c:93 msgid "[channel[,channel] [server]]" msgstr "" -#: src/irc/irc-commands.c:88 +#: src/irc/irc-commands.c:94 msgid "" "channel: channel to list\n" "server: server name" msgstr "" -#: src/irc/irc-commands.c:90 +#: src/irc/irc-commands.c:96 msgid "get statistics about ths size of the IRC network" msgstr "" -#: src/irc/irc-commands.c:91 +#: src/irc/irc-commands.c:97 msgid "[mask [target]]" msgstr "" -#: src/irc/irc-commands.c:92 +#: src/irc/irc-commands.c:98 msgid "" "mask: servers matching the mask only\n" "target: server for forwarding request" msgstr "" -#: src/irc/irc-commands.c:95 +#: src/irc/irc-commands.c:101 msgid "send a ctcp action to the current channel" msgstr "" -#: src/irc/irc-commands.c:96 +#: src/irc/irc-commands.c:102 msgid "message" msgstr "" -#: src/irc/irc-commands.c:97 +#: src/irc/irc-commands.c:103 msgid "message: message to send" msgstr "" -#: src/irc/irc-commands.c:99 +#: src/irc/irc-commands.c:105 msgid "change channel or user mode" msgstr "" -#: src/irc/irc-commands.c:100 +#: src/irc/irc-commands.c:106 msgid "" "{ channel {[+|-]|o|p|s|i|t|n|b|v} [limit] [user] [ban mask] } | { nickname " "{[+|-]|i|w|s|o}" msgstr "" -#: src/irc/irc-commands.c:102 +#: src/irc/irc-commands.c:108 msgid "" "channel modes:\n" " channel: channel name to modify\n" @@ -340,349 +355,346 @@ msgid "" " o: operator flag\n" msgstr "" -#: src/irc/irc-commands.c:122 +#: src/irc/irc-commands.c:128 msgid "send message to a nick or channel" msgstr "" -#: src/irc/irc-commands.c:123 +#: src/irc/irc-commands.c:129 msgid "receiver[,receiver] text" msgstr "" -#: src/irc/irc-commands.c:124 +#: src/irc/irc-commands.c:130 msgid "" "receiver: nick or channel (may be mask, '*' = current channel)\n" "text: text to send" msgstr "" -#: src/irc/irc-commands.c:127 +#: src/irc/irc-commands.c:133 msgid "get the \"Message Of The Day\"" msgstr "" -#: src/irc/irc-commands.c:131 +#: src/irc/irc-commands.c:137 msgid "list nicknames on channels" msgstr "" -#: src/irc/irc-commands.c:132 src/irc/irc-commands.c:148 +#: src/irc/irc-commands.c:138 src/irc/irc-commands.c:154 msgid "[channel[,channel]]" msgstr "" -#: src/irc/irc-commands.c:132 +#: src/irc/irc-commands.c:138 msgid "channel: channel name" msgstr "" -#: src/irc/irc-commands.c:134 +#: src/irc/irc-commands.c:140 msgid "change current nickname" msgstr "" -#: src/irc/irc-commands.c:135 +#: src/irc/irc-commands.c:141 msgid "nickname" msgstr "" -#: src/irc/irc-commands.c:135 +#: src/irc/irc-commands.c:141 msgid "nickname: new nickname for current IRC server" msgstr "" -#: src/irc/irc-commands.c:137 +#: src/irc/irc-commands.c:143 msgid "send notice message to user" msgstr "" -#: src/irc/irc-commands.c:138 +#: src/irc/irc-commands.c:144 msgid "nickname text" msgstr "" -#: src/irc/irc-commands.c:138 +#: src/irc/irc-commands.c:144 msgid "" "nickname: user to send notice to\n" "text: text to send" msgstr "" -#: src/irc/irc-commands.c:140 +#: src/irc/irc-commands.c:146 msgid "gives channel operator status to nickname(s)" msgstr "" -#: src/irc/irc-commands.c:143 +#: src/irc/irc-commands.c:149 msgid "get operator privileges" msgstr "" -#: src/irc/irc-commands.c:144 +#: src/irc/irc-commands.c:150 msgid "user password" msgstr "" -#: src/irc/irc-commands.c:145 +#: src/irc/irc-commands.c:151 msgid "user/password: used to get privileges on current IRC server" msgstr "" -#: src/irc/irc-commands.c:147 +#: src/irc/irc-commands.c:153 msgid "leave a channel" msgstr "" -#: src/irc/irc-commands.c:148 +#: src/irc/irc-commands.c:154 msgid "channel: channel name to leave" msgstr "" -#: src/irc/irc-commands.c:150 +#: src/irc/irc-commands.c:156 msgid "ping server" msgstr "" -#: src/irc/irc-commands.c:151 +#: src/irc/irc-commands.c:157 msgid "server1 [server2]" msgstr "" -#: src/irc/irc-commands.c:152 +#: src/irc/irc-commands.c:158 msgid "" "server1: server to ping\n" "server2: forward ping to this server" msgstr "" -#: src/irc/irc-commands.c:154 +#: src/irc/irc-commands.c:160 msgid "answer to a ping message" msgstr "" -#: src/irc/irc-commands.c:155 +#: src/irc/irc-commands.c:161 msgid "daemon [daemon2]" msgstr "" -#: src/irc/irc-commands.c:155 +#: src/irc/irc-commands.c:161 msgid "" "daemon: daemon who has responded to Ping message\n" "daemon2: forward message to this daemon" msgstr "" -#: src/irc/irc-commands.c:158 +#: src/irc/irc-commands.c:164 msgid "message received" msgstr "" -#: src/irc/irc-commands.c:161 +#: src/irc/irc-commands.c:167 msgid "close all connections & quit " msgstr "" -#: src/irc/irc-commands.c:162 +#: src/irc/irc-commands.c:168 msgid "[quit_message]" msgstr "" -#: src/irc/irc-commands.c:163 +#: src/irc/irc-commands.c:169 msgid "quit_message: quit message (displayed to other users)" msgstr "" -#: src/irc/irc-commands.c:165 +#: src/irc/irc-commands.c:171 msgid "send raw data to server without parsing" msgstr "" -#: src/irc/irc-commands.c:166 +#: src/irc/irc-commands.c:172 msgid "data" msgstr "" -#: src/irc/irc-commands.c:167 +#: src/irc/irc-commands.c:173 msgid "data: raw data to send" msgstr "" -#: src/irc/irc-commands.c:169 +#: src/irc/irc-commands.c:175 msgid "tell the server to reload its config file" msgstr "" -#: src/irc/irc-commands.c:172 +#: src/irc/irc-commands.c:178 msgid "tell the server to restart itself" msgstr "" -#: src/irc/irc-commands.c:175 +#: src/irc/irc-commands.c:181 msgid "register a new service" msgstr "" -#: src/irc/irc-commands.c:176 +#: src/irc/irc-commands.c:182 msgid "nickname reserved distribution type reserved info" msgstr "" -#: src/irc/irc-commands.c:177 +#: src/irc/irc-commands.c:183 msgid "" "distribution: visibility of service\n" "type: reserved for future usage" msgstr "" -#: src/irc/irc-commands.c:180 +#: src/irc/irc-commands.c:186 msgid "list services currently connected to the network" msgstr "" -#: src/irc/irc-commands.c:181 +#: src/irc/irc-commands.c:187 msgid "[mask [type]]" msgstr "" -#: src/irc/irc-commands.c:181 +#: src/irc/irc-commands.c:187 msgid "" "mask: list only services matching this mask\n" "type: list only services of this type" msgstr "" -#: src/irc/irc-commands.c:184 +#: src/irc/irc-commands.c:190 msgid "deliver a message to a service" msgstr "" -#: src/irc/irc-commands.c:185 +#: src/irc/irc-commands.c:191 msgid "service text" msgstr "" -#: src/irc/irc-commands.c:185 +#: src/irc/irc-commands.c:191 msgid "" "service: name of service\n" "text: text to send" msgstr "" -#: src/irc/irc-commands.c:187 +#: src/irc/irc-commands.c:193 msgid "disconnect server links" msgstr "" -#: src/irc/irc-commands.c:188 +#: src/irc/irc-commands.c:194 msgid "server commnent" msgstr "" -#: src/irc/irc-commands.c:188 +#: src/irc/irc-commands.c:194 msgid "" "server: server name\n" "comment: comment for quit" msgstr "" -#: src/irc/irc-commands.c:190 +#: src/irc/irc-commands.c:196 msgid "query statistics about server" msgstr "" -#: src/irc/irc-commands.c:191 +#: src/irc/irc-commands.c:197 msgid "[query [server]]" msgstr "" -#: src/irc/irc-commands.c:192 +#: src/irc/irc-commands.c:198 msgid "" "query: c/h/i/k/l/m/o/y/u (see RFC1459)\n" "server: server name" msgstr "" -#: src/irc/irc-commands.c:194 +#: src/irc/irc-commands.c:200 msgid "" "give users who are on a host running an IRC server a message asking them to " "please join IRC" msgstr "" -#: src/irc/irc-commands.c:196 +#: src/irc/irc-commands.c:202 msgid "user [target [channel]]" msgstr "" -#: src/irc/irc-commands.c:197 +#: src/irc/irc-commands.c:203 msgid "" "user: username\n" "target: server name\n" "channel: channel name" msgstr "" -#: src/irc/irc-commands.c:199 +#: src/irc/irc-commands.c:205 msgid "query local time from server" msgstr "" -#: src/irc/irc-commands.c:200 +#: src/irc/irc-commands.c:206 msgid "target: query time from specified server" msgstr "" -#: src/irc/irc-commands.c:202 +#: src/irc/irc-commands.c:208 msgid "get/set channel topic" msgstr "" -#: src/irc/irc-commands.c:203 +#: src/irc/irc-commands.c:209 msgid "[channel] [topic]" msgstr "" -#: src/irc/irc-commands.c:203 +#: src/irc/irc-commands.c:209 msgid "" "channel: channel name\n" "topic: new topic for channel (if topic is \"-delete\" then topic is deleted)" msgstr "" -#: src/irc/irc-commands.c:206 +#: src/irc/irc-commands.c:212 msgid "find the route to specific server" msgstr "" -#: src/irc/irc-commands.c:209 +#: src/irc/irc-commands.c:215 msgid "return a list of information about nicknames" msgstr "" -#: src/irc/irc-commands.c:212 +#: src/irc/irc-commands.c:218 msgid "list of users logged into the server" msgstr "" -#: src/irc/irc-commands.c:215 +#: src/irc/irc-commands.c:221 msgid "gives the version info of nick or server (current or specified)" msgstr "" -#: src/irc/irc-commands.c:216 +#: src/irc/irc-commands.c:222 msgid "[server | nickname]" msgstr "" -#: src/irc/irc-commands.c:216 +#: src/irc/irc-commands.c:222 msgid "" "server: server name\n" "nickname: nickname" msgstr "" -#: src/irc/irc-commands.c:218 +#: src/irc/irc-commands.c:224 msgid "gives voice to nickname(s)" msgstr "" -#: src/irc/irc-commands.c:221 +#: src/irc/irc-commands.c:227 msgid "" "send a message to all currently connected users who have set the 'w' user " "mode for themselves" msgstr "" -#: src/irc/irc-commands.c:223 +#: src/irc/irc-commands.c:229 msgid "text" msgstr "" -#: src/irc/irc-commands.c:223 +#: src/irc/irc-commands.c:229 msgid "text to send" msgstr "" -#: src/irc/irc-commands.c:225 +#: src/irc/irc-commands.c:231 msgid "generate a query which returns a list of information" msgstr "" -#: src/irc/irc-commands.c:226 +#: src/irc/irc-commands.c:232 msgid "[mask [\"o\"]]" msgstr "" -#: src/irc/irc-commands.c:226 +#: src/irc/irc-commands.c:232 msgid "" "mask: only information which match this mask\n" "o: only operators are returned according to the mask supplied\n" msgstr "" -#: src/irc/irc-commands.c:229 +#: src/irc/irc-commands.c:235 msgid "query information about user(s)" msgstr "" -#: src/irc/irc-commands.c:230 +#: src/irc/irc-commands.c:236 msgid "[server] nickname[,nickname]" msgstr "" -#: src/irc/irc-commands.c:230 +#: src/irc/irc-commands.c:236 msgid "" "server: server name\n" "nickname: nickname (may be a mask)" msgstr "" -#: src/irc/irc-commands.c:233 +#: src/irc/irc-commands.c:239 msgid "ask for information about a nickname which no longer exists" msgstr "" -#: src/irc/irc-commands.c:234 +#: src/irc/irc-commands.c:240 msgid "nickname [,nickname [,nickname ...]] [count [target]]" msgstr "" -#: src/irc/irc-commands.c:235 +#: src/irc/irc-commands.c:241 msgid "" "nickname: nickname to search\n" "count: number of replies to return (full search if negative number)\n" "target: reply should match this mask" msgstr "" -#: src/irc/irc-commands.c:239 src/irc/irc-commands.c:240 -#: src/irc/irc-commands.c:241 src/irc/irc-commands.c:242 -#: src/irc/irc-commands.c:243 src/irc/irc-commands.c:244 #: src/irc/irc-commands.c:245 src/irc/irc-commands.c:246 #: src/irc/irc-commands.c:247 src/irc/irc-commands.c:248 #: src/irc/irc-commands.c:249 src/irc/irc-commands.c:250 @@ -693,319 +705,322 @@ msgstr "" #: src/irc/irc-commands.c:259 src/irc/irc-commands.c:260 #: src/irc/irc-commands.c:261 src/irc/irc-commands.c:262 #: src/irc/irc-commands.c:263 src/irc/irc-commands.c:264 -#: src/irc/irc-commands.c:265 src/irc/irc-commands.c:301 -#: src/irc/irc-commands.c:302 src/irc/irc-commands.c:303 -#: src/irc/irc-commands.c:304 src/irc/irc-commands.c:305 -#: src/irc/irc-commands.c:306 +#: 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:310 src/irc/irc-commands.c:311 +#: src/irc/irc-commands.c:312 msgid "a server message" msgstr "" -#: src/irc/irc-commands.c:266 +#: src/irc/irc-commands.c:272 msgid "away message" msgstr "" -#: src/irc/irc-commands.c:267 +#: src/irc/irc-commands.c:273 msgid "userhost" msgstr "" -#: src/irc/irc-commands.c:268 +#: src/irc/irc-commands.c:274 msgid "ison" msgstr "" -#: src/irc/irc-commands.c:269 +#: src/irc/irc-commands.c:275 msgid "unaway" msgstr "" -#: src/irc/irc-commands.c:270 +#: src/irc/irc-commands.c:276 msgid "now away" msgstr "" -#: src/irc/irc-commands.c:271 +#: src/irc/irc-commands.c:277 msgid "whois (user)" msgstr "" -#: src/irc/irc-commands.c:272 +#: src/irc/irc-commands.c:278 msgid "whois (server)" msgstr "" -#: src/irc/irc-commands.c:273 +#: src/irc/irc-commands.c:279 msgid "whois (operator)" msgstr "" -#: src/irc/irc-commands.c:274 +#: src/irc/irc-commands.c:280 msgid "whowas" msgstr "" -#: src/irc/irc-commands.c:275 +#: src/irc/irc-commands.c:281 msgid "end of /who list" msgstr "" -#: src/irc/irc-commands.c:276 +#: src/irc/irc-commands.c:282 msgid "whois (idle)" msgstr "" -#: src/irc/irc-commands.c:277 +#: src/irc/irc-commands.c:283 msgid "whois (end)" msgstr "" -#: src/irc/irc-commands.c:278 +#: src/irc/irc-commands.c:284 msgid "whois (channels)" msgstr "" -#: src/irc/irc-commands.c:279 +#: src/irc/irc-commands.c:285 msgid "whois (identified user)" msgstr "" -#: src/irc/irc-commands.c:280 +#: src/irc/irc-commands.c:286 msgid "/list start" msgstr "" -#: src/irc/irc-commands.c:281 +#: src/irc/irc-commands.c:287 msgid "channel (for /list)" msgstr "" -#: src/irc/irc-commands.c:282 +#: src/irc/irc-commands.c:288 msgid "/list end" msgstr "" -#: src/irc/irc-commands.c:283 +#: src/irc/irc-commands.c:289 msgid "no topic for channel" msgstr "" -#: src/irc/irc-commands.c:284 +#: src/irc/irc-commands.c:290 msgid "topic of channel" msgstr "" -#: src/irc/irc-commands.c:285 +#: src/irc/irc-commands.c:291 msgid "channel :topic" msgstr "" -#: src/irc/irc-commands.c:286 +#: src/irc/irc-commands.c:292 msgid "" "channel: name of channel\n" "topic: topic of the channel" msgstr "" -#: src/irc/irc-commands.c:288 +#: src/irc/irc-commands.c:294 msgid "infos about topic (nick & date changed)" msgstr "" -#: src/irc/irc-commands.c:291 +#: src/irc/irc-commands.c:297 msgid "server version" msgstr "" -#: src/irc/irc-commands.c:292 +#: src/irc/irc-commands.c:298 msgid "who" msgstr "" -#: src/irc/irc-commands.c:293 +#: src/irc/irc-commands.c:299 msgid "list of nicks on channel" msgstr "" -#: src/irc/irc-commands.c:294 +#: src/irc/irc-commands.c:300 msgid "channel :[[@|+]nick ...]" msgstr "" -#: src/irc/irc-commands.c:295 +#: src/irc/irc-commands.c:301 msgid "" "channel: name of channel\n" "nick: nick on the channel" msgstr "" -#: src/irc/irc-commands.c:297 +#: src/irc/irc-commands.c:303 msgid "links" msgstr "" -#: src/irc/irc-commands.c:298 +#: src/irc/irc-commands.c:304 msgid "end of /links list" msgstr "" -#: src/irc/irc-commands.c:299 +#: src/irc/irc-commands.c:305 msgid "end of /names list" msgstr "" -#: src/irc/irc-commands.c:300 +#: src/irc/irc-commands.c:306 msgid "end of /whowas list" msgstr "" -#: src/irc/irc-commands.c:307 +#: src/irc/irc-commands.c:313 msgid "server local time" msgstr "" -#: src/irc/irc-commands.c:308 +#: src/irc/irc-commands.c:314 msgid "no such nick/channel" msgstr "" -#: src/irc/irc-commands.c:310 +#: src/irc/irc-commands.c:316 msgid "no such server" msgstr "" -#: src/irc/irc-commands.c:312 +#: src/irc/irc-commands.c:318 msgid "no such channel" msgstr "" -#: src/irc/irc-commands.c:314 +#: src/irc/irc-commands.c:320 msgid "cannot send to channel" msgstr "" -#: src/irc/irc-commands.c:316 +#: src/irc/irc-commands.c:322 msgid "too many channels" msgstr "" -#: src/irc/irc-commands.c:318 src/irc/irc-commands.c:320 -#: src/irc/irc-commands.c:322 +#: src/irc/irc-commands.c:324 src/irc/irc-commands.c:326 +#: src/irc/irc-commands.c:328 msgid "was no such nick" msgstr "" -#: src/irc/irc-commands.c:324 +#: src/irc/irc-commands.c:330 msgid "no origin" msgstr "" -#: src/irc/irc-commands.c:326 +#: src/irc/irc-commands.c:332 msgid "no recipient" msgstr "" -#: src/irc/irc-commands.c:328 +#: src/irc/irc-commands.c:334 msgid "no text to send" msgstr "" -#: src/irc/irc-commands.c:330 +#: src/irc/irc-commands.c:336 msgid "no toplevel" msgstr "" -#: src/irc/irc-commands.c:332 +#: src/irc/irc-commands.c:338 msgid "wilcard in toplevel domain" msgstr "" -#: src/irc/irc-commands.c:334 +#: src/irc/irc-commands.c:340 msgid "unknown command" msgstr "" -#: src/irc/irc-commands.c:336 +#: src/irc/irc-commands.c:342 msgid "MOTD is missing" msgstr "" -#: src/irc/irc-commands.c:338 +#: src/irc/irc-commands.c:344 msgid "no administrative info" msgstr "" -#: src/irc/irc-commands.c:340 +#: src/irc/irc-commands.c:346 msgid "file error" msgstr "" -#: src/irc/irc-commands.c:342 +#: src/irc/irc-commands.c:348 msgid "no nickname given" msgstr "" -#: src/irc/irc-commands.c:344 +#: src/irc/irc-commands.c:350 msgid "erroneus nickname" msgstr "" -#: src/irc/irc-commands.c:346 +#: src/irc/irc-commands.c:352 msgid "nickname already in use" msgstr "" -#: src/irc/irc-commands.c:348 +#: src/irc/irc-commands.c:354 msgid "nickname collision" msgstr "" -#: src/irc/irc-commands.c:350 +#: src/irc/irc-commands.c:356 msgid "user not in channel" msgstr "" -#: src/irc/irc-commands.c:352 +#: src/irc/irc-commands.c:358 msgid "not on channel" msgstr "" -#: src/irc/irc-commands.c:354 +#: src/irc/irc-commands.c:360 msgid "user already on channel" msgstr "" -#: src/irc/irc-commands.c:356 +#: src/irc/irc-commands.c:362 msgid "user not logged in" msgstr "" -#: src/irc/irc-commands.c:358 +#: src/irc/irc-commands.c:364 msgid "summon has been disabled" msgstr "" -#: src/irc/irc-commands.c:360 +#: src/irc/irc-commands.c:366 msgid "users has been disabled" msgstr "" -#: src/irc/irc-commands.c:362 +#: src/irc/irc-commands.c:368 msgid "you are not registered" msgstr "" -#: src/irc/irc-commands.c:364 +#: src/irc/irc-commands.c:370 msgid "not enough parameters" msgstr "" -#: src/irc/irc-commands.c:366 +#: src/irc/irc-commands.c:372 msgid "you may not register" msgstr "" -#: src/irc/irc-commands.c:368 +#: src/irc/irc-commands.c:374 msgid "your host isn't among the privileged" msgstr "" -#: src/irc/irc-commands.c:370 +#: src/irc/irc-commands.c:376 msgid "password incorrect" msgstr "" -#: src/irc/irc-commands.c:372 +#: src/irc/irc-commands.c:378 msgid "you are banned from this server" msgstr "" -#: src/irc/irc-commands.c:374 +#: src/irc/irc-commands.c:380 msgid "channel key already set" msgstr "" -#: src/irc/irc-commands.c:376 +#: src/irc/irc-commands.c:382 msgid "channel is already full" msgstr "" -#: src/irc/irc-commands.c:378 +#: src/irc/irc-commands.c:384 msgid "unknown mode char to me" msgstr "" -#: src/irc/irc-commands.c:380 +#: src/irc/irc-commands.c:386 msgid "cannot join channel (invite only)" msgstr "" -#: src/irc/irc-commands.c:382 +#: src/irc/irc-commands.c:388 msgid "cannot join channel (banned from channel)" msgstr "" -#: src/irc/irc-commands.c:384 +#: src/irc/irc-commands.c:390 msgid "cannot join channel (bad channel key)" msgstr "" -#: src/irc/irc-commands.c:386 +#: src/irc/irc-commands.c:392 msgid "you're not an IRC operator" msgstr "" -#: src/irc/irc-commands.c:388 +#: src/irc/irc-commands.c:394 msgid "you're not channel operator" msgstr "" -#: src/irc/irc-commands.c:390 +#: src/irc/irc-commands.c:396 msgid "you can't kill a server!" msgstr "" -#: src/irc/irc-commands.c:392 +#: src/irc/irc-commands.c:398 msgid "no O-lines for your host" msgstr "" -#: src/irc/irc-commands.c:394 +#: src/irc/irc-commands.c:400 msgid "unknown mode flag" msgstr "" -#: src/irc/irc-commands.c:396 +#: src/irc/irc-commands.c:402 msgid "can't change mode for other users" msgstr "" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2578 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2704 msgid "unknown" msgstr "" @@ -1014,35 +1029,35 @@ msgstr "" msgid "%s: using local hostname \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:199 src/irc/irc-send.c:223 src/irc/irc-send.c:311 -#: src/irc/irc-send.c:557 src/irc/irc-send.c:611 src/irc/irc-send.c:1012 +#: src/irc/irc-send.c:210 src/irc/irc-send.c:234 src/irc/irc-send.c:322 +#: src/irc/irc-send.c:568 src/irc/irc-send.c:622 src/irc/irc-send.c:1023 #, c-format msgid "%s \"%s\" command can only be executed in a channel window\n" msgstr "" -#: src/irc/irc-send.c:383 src/irc/irc-send.c:440 src/irc/irc-send.c:658 -#: src/irc/irc-send.c:671 src/irc/irc-send.c:907 +#: src/irc/irc-send.c:394 src/irc/irc-send.c:451 src/irc/irc-send.c:669 +#: src/irc/irc-send.c:682 src/irc/irc-send.c:918 #, c-format msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" -#: src/irc/irc-send.c:456 src/irc/irc-send.c:478 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:835 +#: src/irc/irc-send.c:467 src/irc/irc-send.c:489 src/irc/irc-recv.c:261 +#: src/irc/irc-recv.c:897 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:492 src/irc/irc-recv.c:929 +#: src/irc/irc-send.c:503 src/irc/irc-recv.c:1057 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:522 src/common/command.c:1118 +#: src/irc/irc-send.c:533 src/common/command.c:1118 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:985 +#: src/irc/irc-send.c:996 #, c-format msgid "%s, compiled on %s %s\n" msgstr "" @@ -1056,8 +1071,8 @@ msgstr "" msgid " has joined " msgstr "" -#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:445 src/irc/irc-recv.c:711 -#: src/irc/irc-recv.c:844 src/irc/irc-recv.c:2079 src/irc/irc-recv.c:2144 +#: 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 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "" @@ -1070,8 +1085,8 @@ msgstr "" msgid " from " msgstr "" -#: src/irc/irc-recv.c:290 src/irc/irc-recv.c:474 src/irc/irc-recv.c:752 -#: src/irc/irc-recv.c:996 +#: 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 "" @@ -1081,328 +1096,334 @@ msgstr "" msgid "%s \"%s\" command received without channel or nickname\n" msgstr "" -#: src/irc/irc-recv.c:347 +#: src/irc/irc-recv.c:344 msgid "sets ban on" msgstr "" -#: src/irc/irc-recv.c:348 +#: src/irc/irc-recv.c:345 msgid "removes ban on" msgstr "" -#: src/irc/irc-recv.c:356 +#: src/irc/irc-recv.c:352 msgid "sets invite-only channel flag" msgstr "" -#: src/irc/irc-recv.c:357 +#: src/irc/irc-recv.c:353 msgid "removes invite-only channel flag" msgstr "" -#: src/irc/irc-recv.c:365 +#: src/irc/irc-recv.c:369 +msgid "sets channel key to" +msgstr "" + +#: src/irc/irc-recv.c:370 +msgid "removes channel key" +msgstr "" + +#: src/irc/irc-recv.c:399 msgid "sets the user limit to" msgstr "" -#: src/irc/irc-recv.c:366 +#: src/irc/irc-recv.c:400 msgid "removes user limit" msgstr "" -#: src/irc/irc-recv.c:374 +#: src/irc/irc-recv.c:420 msgid "sets moderated channel flag" msgstr "" -#: src/irc/irc-recv.c:375 +#: src/irc/irc-recv.c:421 msgid "removes moderated channel flag" msgstr "" -#: src/irc/irc-recv.c:383 +#: src/irc/irc-recv.c:430 +msgid "sets messages from channel only flag" +msgstr "" + +#: src/irc/irc-recv.c:431 +msgid "removes messages from channel only flag" +msgstr "" + +#: src/irc/irc-recv.c:440 msgid "gives channel operator status to" msgstr "" -#: src/irc/irc-recv.c:384 +#: src/irc/irc-recv.c:441 msgid "removes channel operator status from" msgstr "" -#: src/irc/irc-recv.c:399 +#: src/irc/irc-recv.c:455 msgid "sets private channel flag" msgstr "" -#: src/irc/irc-recv.c:400 +#: src/irc/irc-recv.c:456 msgid "removes private channel flag" msgstr "" -#: src/irc/irc-recv.c:408 +#: src/irc/irc-recv.c:465 msgid "sets secret channel flag" msgstr "" -#: src/irc/irc-recv.c:409 +#: src/irc/irc-recv.c:466 msgid "removes secret channel flag" msgstr "" -#: src/irc/irc-recv.c:417 +#: src/irc/irc-recv.c:475 msgid "sets topic protection" msgstr "" -#: src/irc/irc-recv.c:418 +#: src/irc/irc-recv.c:476 msgid "removes topic protection" msgstr "" -#: src/irc/irc-recv.c:426 +#: src/irc/irc-recv.c:485 msgid "gives voice to" msgstr "" -#: src/irc/irc-recv.c:427 +#: src/irc/irc-recv.c:486 msgid "removes voice from" msgstr "" -#: src/irc/irc-recv.c:496 +#: src/irc/irc-recv.c:557 msgid "You are " msgstr "" -#: src/irc/irc-recv.c:503 +#: src/irc/irc-recv.c:564 msgid " is " msgstr "" -#: src/irc/irc-recv.c:507 +#: src/irc/irc-recv.c:568 msgid "now known as " msgstr "" -#: src/irc/irc-recv.c:559 +#: src/irc/irc-recv.c:620 #, c-format msgid "%s nickname not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:572 src/irc/irc-recv.c:604 +#: src/irc/irc-recv.c:633 src/irc/irc-recv.c:665 msgid "reply from" msgstr "" -#: src/irc/irc-recv.c:607 +#: src/irc/irc-recv.c:668 #, c-format msgid ": %ld.%ld seconds\n" msgstr "" -#: src/irc/irc-recv.c:637 +#: src/irc/irc-recv.c:698 #, c-format msgid "%s \"%s\" command received without host or channel\n" msgstr "" -#: src/irc/irc-recv.c:687 +#: src/irc/irc-recv.c:748 msgid " has left " msgstr "" -#: src/irc/irc-recv.c:798 +#: src/irc/irc-recv.c:860 #, c-format msgid "On %s: * %s %s" msgstr "" -#: src/irc/irc-recv.c:821 -#, c-format -msgid "On %s: %s> %s" -msgstr "" - -#: src/irc/irc-recv.c:873 -#, c-format -msgid "" -"NOTICE %s :%sVERSION %s v%s compiled on %s, host \"%s\" is running %s %s / %s" -"%s" -msgstr "" - #: src/irc/irc-recv.c:883 #, c-format -msgid "NOTICE %s :%sVERSION %s v%s compiled on %s%s" +msgid "On %s: %s> %s" msgstr "" -#: src/irc/irc-recv.c:889 +#: src/irc/irc-recv.c:951 msgid "Received a " msgstr "" -#: src/irc/irc-recv.c:891 +#: src/irc/irc-recv.c:953 msgid "CTCP VERSION " msgstr "" -#: src/irc/irc-recv.c:893 +#: src/irc/irc-recv.c:955 msgid "from" msgstr "" -#: src/irc/irc-recv.c:953 +#: 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 #, c-format -msgid "Private %s> %s" +msgid "%s cannot parse \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:973 src/irc/irc-recv.c:2365 src/irc/irc-recv.c:2405 +#: src/irc/irc-recv.c:1081 #, c-format -msgid "%s cannot parse \"%s\" command\n" +msgid "Private %s> %s" msgstr "" -#: src/irc/irc-recv.c:1028 +#: src/irc/irc-recv.c:1154 msgid "has quit" msgstr "" -#: src/irc/irc-recv.c:1148 +#: src/irc/irc-recv.c:1274 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "" -#: src/irc/irc-recv.c:1176 +#: src/irc/irc-recv.c:1302 msgid " has changed topic for " msgstr "" -#: src/irc/irc-recv.c:1181 +#: src/irc/irc-recv.c:1307 #, c-format msgid " to: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:1187 +#: src/irc/irc-recv.c:1313 msgid " has unset topic for " msgstr "" -#: src/irc/irc-recv.c:1278 +#: src/irc/irc-recv.c:1404 #, c-format msgid " is away: %s\n" msgstr "" -#: src/irc/irc-recv.c:1352 +#: src/irc/irc-recv.c:1478 msgid "Users online: " msgstr "" -#: src/irc/irc-recv.c:1715 +#: src/irc/irc-recv.c:1841 msgid "idle: " msgstr "" -#: src/irc/irc-recv.c:1723 +#: src/irc/irc-recv.c:1849 msgid "days" msgstr "" -#: src/irc/irc-recv.c:1723 +#: src/irc/irc-recv.c:1849 msgid "day" msgstr "" -#: src/irc/irc-recv.c:1733 +#: src/irc/irc-recv.c:1859 msgid "hours" msgstr "" -#: src/irc/irc-recv.c:1733 +#: src/irc/irc-recv.c:1859 msgid "hour" msgstr "" -#: src/irc/irc-recv.c:1739 +#: src/irc/irc-recv.c:1865 msgid "minutes" msgstr "" -#: src/irc/irc-recv.c:1739 +#: src/irc/irc-recv.c:1865 msgid "minute" msgstr "" -#: src/irc/irc-recv.c:1745 +#: src/irc/irc-recv.c:1871 msgid "seconds" msgstr "" -#: src/irc/irc-recv.c:1745 +#: src/irc/irc-recv.c:1871 msgid "second" msgstr "" -#: src/irc/irc-recv.c:1750 +#: src/irc/irc-recv.c:1876 msgid "signon at: " msgstr "" -#: src/irc/irc-recv.c:1838 +#: src/irc/irc-recv.c:1964 msgid "Channels: " msgstr "" -#: src/irc/irc-recv.c:2026 +#: src/irc/irc-recv.c:2152 msgid "No topic set for " msgstr "" -#: src/irc/irc-recv.c:2068 +#: src/irc/irc-recv.c:2194 msgid "Topic for " msgstr "" -#: src/irc/irc-recv.c:2072 +#: src/irc/irc-recv.c:2198 #, c-format msgid " is: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2088 src/irc/irc-recv.c:2168 +#: src/irc/irc-recv.c:2214 src/irc/irc-recv.c:2294 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2134 +#: src/irc/irc-recv.c:2260 msgid "Topic set by " msgstr "" -#: src/irc/irc-recv.c:2152 +#: src/irc/irc-recv.c:2278 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2160 +#: src/irc/irc-recv.c:2286 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2289 +#: src/irc/irc-recv.c:2415 msgid " on " msgstr "" -#: src/irc/irc-recv.c:2396 +#: src/irc/irc-recv.c:2522 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2449 +#: src/irc/irc-recv.c:2575 msgid "Nicks " msgstr "" -#: src/irc/irc-recv.c:2469 +#: src/irc/irc-recv.c:2595 msgid "Channel " msgstr "" -#: src/irc/irc-recv.c:2480 +#: src/irc/irc-recv.c:2606 msgid "nicks" msgstr "" -#: src/irc/irc-recv.c:2480 +#: src/irc/irc-recv.c:2606 msgid "nick" msgstr "" -#: src/irc/irc-recv.c:2488 +#: src/irc/irc-recv.c:2614 msgid "ops" msgstr "" -#: src/irc/irc-recv.c:2488 +#: src/irc/irc-recv.c:2614 msgid "op" msgstr "" -#: src/irc/irc-recv.c:2497 +#: src/irc/irc-recv.c:2623 msgid "halfops" msgstr "" -#: src/irc/irc-recv.c:2497 +#: src/irc/irc-recv.c:2623 msgid "halfop" msgstr "" -#: src/irc/irc-recv.c:2506 +#: src/irc/irc-recv.c:2632 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:2506 +#: src/irc/irc-recv.c:2632 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:2515 +#: src/irc/irc-recv.c:2641 msgid "normal" msgstr "" -#: src/irc/irc-recv.c:2547 +#: src/irc/irc-recv.c:2673 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2558 +#: src/irc/irc-recv.c:2684 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2567 +#: src/irc/irc-recv.c:2693 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1464,11 +1485,11 @@ msgstr "" msgid "%s unable to add handler for \"%s\" message (not enough memory)\n" msgstr "" -#: src/gui/curses/gui-display.c:887 +#: src/gui/curses/gui-display.c:944 msgid "[not connected] " msgstr "" -#: src/gui/curses/gui-display.c:894 src/gui/curses/gui-display.c:897 +#: src/gui/curses/gui-display.c:951 src/gui/curses/gui-display.c:954 msgid "-MORE-" msgstr "" diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c index 01eb182a3..883121251 100644 --- a/weechat/src/gui/curses/gui-display.c +++ b/weechat/src/gui/curses/gui-display.c @@ -808,6 +808,7 @@ gui_redraw_window_nick (t_gui_window *window) if (has_colors ()) gui_window_set_color (window->win_nick, COLOR_WIN_NICK); + snprintf (format_empty, 32, "%%-%ds", window->win_nick_width); for (i = 0; i < window->win_nick_height; i++) { mvwprintw (window->win_nick, i, 0, format_empty, " "); @@ -825,6 +826,7 @@ gui_draw_window_status (t_gui_window *window) { t_gui_window *ptr_win; char format_more[32]; + int i; /* TODO: manage splitted windows! */ if (window != gui_current_window) @@ -913,7 +915,28 @@ gui_draw_window_status (t_gui_window *window) gui_window_set_color (window->win_status, COLOR_WIN_STATUS); } - wprintw (window->win_status, "%s ", CHANNEL(ptr_win)->name); + wprintw (window->win_status, "%s", CHANNEL(ptr_win)->name); + if (gui_current_window == CHANNEL(ptr_win)->window) + { + /* display channel modes */ + wprintw (window->win_status, "(+"); + i = 0; + while (CHANNEL(ptr_win)->modes[i]) + { + if (CHANNEL(ptr_win)->modes[i] != ' ') + wprintw (window->win_status, "%c", + CHANNEL(ptr_win)->modes[i]); + i++; + } + if (CHANNEL(ptr_win)->modes[CHANNEL_MODE_KEY] != ' ') + wprintw (window->win_status, ",%s", + CHANNEL(ptr_win)->key); + if (CHANNEL(ptr_win)->modes[CHANNEL_MODE_LIMIT] != ' ') + wprintw (window->win_status, ",%d", + CHANNEL(ptr_win)->limit); + wprintw (window->win_status, ")"); + } + wprintw (window->win_status, " "); } if (!SERVER(ptr_win)) { diff --git a/weechat/src/irc/Makefile.am b/weechat/src/irc/Makefile.am index 8bdc84cd8..5a0d5a5a7 100644 --- a/weechat/src/irc/Makefile.am +++ b/weechat/src/irc/Makefile.am @@ -26,4 +26,5 @@ lib_weechat_irc_a_SOURCES = irc.h \ irc-server.c \ irc-channel.c \ irc-nick.c \ + irc-dcc.c \ irc-display.c diff --git a/weechat/src/irc/irc-channel.c b/weechat/src/irc/irc-channel.c index 06dcd338a..7095d2053 100644 --- a/weechat/src/irc/irc-channel.c +++ b/weechat/src/irc/irc-channel.c @@ -32,6 +32,7 @@ t_irc_channel *current_channel = NULL; +char *channel_modes = "iklmnst"; /* @@ -55,6 +56,10 @@ channel_new (t_irc_server *server, int channel_type, char *channel_name, new_channel->type = channel_type; new_channel->name = strdup (channel_name); new_channel->topic = NULL; + memset (new_channel->modes, ' ', sizeof (new_channel->modes)); + new_channel->modes[sizeof (new_channel->modes) - 1] = '\0'; + new_channel->limit = 0; + new_channel->key = NULL; new_channel->nicks = NULL; new_channel->last_nick = NULL; diff --git a/weechat/src/irc/irc-commands.c b/weechat/src/irc/irc-commands.c index d3bc5bd8c..7acb23d70 100644 --- a/weechat/src/irc/irc-commands.c +++ b/weechat/src/irc/irc-commands.c @@ -44,6 +44,12 @@ t_irc_command irc_commands[] = N_("nickname type"), N_("nickname: user to send ctcp to\ntype: \"action\" or \"version\""), 2, MAX_ARGS, 1, NULL, irc_cmd_send_ctcp, NULL }, + { "dcc", N_("starts DCC (file or chat)"), + N_("action nickname [file]"), + N_("action: 'send' (file) or 'chat'\n" + "nickname: nickname to send file or chat\n" + "file: filename (on local host)"), + 2, 3, 1, NULL, irc_cmd_send_dcc, NULL }, { "deop", N_("removes channel operator status from nickname(s)"), N_("nickname [nickname]"), "", 1, 1, 1, irc_cmd_send_deop, NULL, NULL }, diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c index 31a3cf2ed..189d63cc7 100644 --- a/weechat/src/irc/irc-recv.c +++ b/weechat/src/irc/irc-recv.c @@ -317,9 +317,6 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) pos_parm++; while (pos_parm[0] == ' ') pos_parm++; - pos2 = strchr (pos_parm, ' '); - if (pos2) - pos2[0] = '\0'; } set_flag = '+'; @@ -347,7 +344,6 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) _("sets ban on") : _("removes ban on"), pos_parm); - /* TODO: change & redraw channel modes */ break; case 'i': irc_display_mode (ptr_channel->window, @@ -356,16 +352,68 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) _("sets invite-only channel flag") : _("removes invite-only channel flag"), NULL); - /* TODO: change & redraw channel modes */ + 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 : NULL); - /* TODO: change & redraw channel modes */ + (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, @@ -374,7 +422,18 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) _("sets moderated channel flag") : _("removes moderated channel flag"), NULL); - /* TODO: change & redraw channel modes */ + 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, @@ -391,7 +450,6 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) gui_redraw_window_nick (ptr_channel->window); } break; - /* TODO: remove this obsolete (?) channel flag? */ case 'p': irc_display_mode (ptr_channel->window, arguments, set_flag, "p", host, @@ -399,7 +457,8 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) _("sets private channel flag") : _("removes private channel flag"), NULL); - /* TODO: change & redraw channel modes */ + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_SECRET); break; case 's': irc_display_mode (ptr_channel->window, @@ -408,7 +467,8 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) _("sets secret channel flag") : _("removes secret channel flag"), NULL); - /* TODO: change & redraw channel modes */ + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_SECRET); break; case 't': irc_display_mode (ptr_channel->window, @@ -417,7 +477,8 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) _("sets topic protection") : _("removes topic protection"), NULL); - /* TODO: change & redraw channel modes */ + SET_CHANNEL_MODE(ptr_channel, (set_flag == '+'), + CHANNEL_MODE_TOPIC); break; case 'v': irc_display_mode (ptr_channel->window, @@ -438,6 +499,7 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) } pos++; } + gui_draw_window_status (gui_current_window); } else { @@ -741,6 +803,7 @@ int irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) { char *pos, *pos2, *host2; + char *pos_file, *pos_addr, *pos_port, *pos_size; /* for DCC */ t_irc_channel *ptr_channel; t_irc_nick *ptr_nick; struct utsname *buf; @@ -893,79 +956,144 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) COLOR_WIN_CHAT, _("from")); gui_printf_color (server->window, COLOR_WIN_CHAT_NICK, " %s\n", host); + return 0; } - else + + /* ping request from another user => answer */ + if (strncmp (pos, "\01PING", 5) == 0) { - /* ping request from another user => answer */ - if (strncmp (pos, "\01PING", 5) == 0) + pos += 5; + while (pos[0] == ' ') + pos++; + pos2 = strchr (pos, '\01'); + if (pos2) + pos2[0] = '\0'; + else + pos = NULL; + if (pos && !pos[0]) + pos = NULL; + if (pos) + server_sendf (server, "NOTICE %s :\01PING %s\01\r\n", + host, pos); + else + server_sendf (server, "NOTICE %s :\01PING\01\r\n", + host); + return 0; + } + + /* incoming DCC file */ + if (strncmp (pos, "\01DCC SEND", 9) == 0) + { + pos2 = strchr (pos, '\01'); + if (!pos2) { - pos += 5; - while (pos[0] == ' ') - pos++; - pos2 = strchr (pos, '\01'); - if (pos2) - pos2[0] = '\0'; - else - pos = NULL; - if (pos && !pos[0]) - pos = NULL; - if (pos) - server_sendf (server, "NOTICE %s :\01PING %s\01\r\n", - host, pos); - else - server_sendf (server, "NOTICE %s :\01PING\01\r\n", - host); + gui_printf (server->window, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); + return -1; } - else + pos2[0] = '\0'; + pos_file = pos + 9; + while (pos_file[0] == ' ') + pos_file++; + + /* look for file size */ + pos_size = strrchr (pos_file, ' '); + if (!pos_size) { - /* private message received => display it */ - ptr_channel = channel_search (server, host); - if (!ptr_channel) - { - ptr_channel = channel_new (server, CHAT_PRIVATE, host, 0); - if (!ptr_channel) - { - gui_printf (server->window, - _("%s cannot create new private window \"%s\"\n"), - WEECHAT_ERROR, host); - return -1; - } - } - if (!ptr_channel->topic) - { - ptr_channel->topic = strdup (host2); - gui_redraw_window_title (ptr_channel->window); - } - - gui_printf_color_type (ptr_channel->window, - MSG_TYPE_NICK, - COLOR_WIN_CHAT_DARK, "<"); - if (strstr (pos, server->nick)) - { - gui_printf_color_type (ptr_channel->window, - MSG_TYPE_NICK, - COLOR_WIN_CHAT_HIGHLIGHT, - "%s", host); - if ( (cfg_look_infobar_delay_highlight > 0) - && (ptr_channel->window != gui_current_window) ) - gui_infobar_printf (cfg_look_infobar_delay_highlight, - COLOR_WIN_INFOBAR_HIGHLIGHT, - _("Private %s> %s"), - host, pos); - } - else - gui_printf_color_type (ptr_channel->window, - MSG_TYPE_NICK, - COLOR_WIN_NICK_PRIVATE, - "%s", host); - gui_printf_color_type (ptr_channel->window, - MSG_TYPE_NICK, - COLOR_WIN_CHAT_DARK, "> "); - gui_printf_color_type (ptr_channel->window, - MSG_TYPE_MSG, - COLOR_WIN_CHAT, "%s\n", pos); + gui_printf (server->window, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); + return -1; + } + pos2 = pos_size; + pos_size++; + while (pos2[0] == ' ') + pos2--; + pos2[1] = '\0'; + + /* look for DCC port */ + pos_port = strrchr (pos_file, ' '); + if (!pos_port) + { + gui_printf (server->window, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); + return -1; } + pos2 = pos_port; + pos_port++; + while (pos2[0] == ' ') + pos2--; + pos2[1] = '\0'; + + /* look for DCC address (IP) */ + pos_addr = strrchr (pos_file, ' '); + if (!pos_addr) + { + gui_printf (server->window, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); + return -1; + } + pos2 = pos_addr; + pos_addr++; + while (pos2[0] == ' ') + pos2--; + pos2[1] = '\0'; + + wee_log_printf ("Incoming DCC file (NOT DEVELOPED!): " + "\"%s\", address=\"%s\", port=\"%s\", size=\"%s\"\n", + pos_file, pos_addr, pos_port, pos_size); + return 0; } + + /* private message received => display it */ + ptr_channel = channel_search (server, host); + if (!ptr_channel) + { + ptr_channel = channel_new (server, CHAT_PRIVATE, host, 0); + if (!ptr_channel) + { + gui_printf (server->window, + _("%s cannot create new private window \"%s\"\n"), + WEECHAT_ERROR, host); + return -1; + } + } + if (!ptr_channel->topic) + { + ptr_channel->topic = strdup (host2); + gui_redraw_window_title (ptr_channel->window); + } + + gui_printf_color_type (ptr_channel->window, + MSG_TYPE_NICK, + COLOR_WIN_CHAT_DARK, "<"); + if (strstr (pos, server->nick)) + { + gui_printf_color_type (ptr_channel->window, + MSG_TYPE_NICK, + COLOR_WIN_CHAT_HIGHLIGHT, + "%s", host); + if ( (cfg_look_infobar_delay_highlight > 0) + && (ptr_channel->window != gui_current_window) ) + gui_infobar_printf (cfg_look_infobar_delay_highlight, + COLOR_WIN_INFOBAR_HIGHLIGHT, + _("Private %s> %s"), + host, pos); + } + else + gui_printf_color_type (ptr_channel->window, + MSG_TYPE_NICK, + COLOR_WIN_NICK_PRIVATE, + "%s", host); + gui_printf_color_type (ptr_channel->window, + MSG_TYPE_NICK, + COLOR_WIN_CHAT_DARK, "> "); + gui_printf_color_type (ptr_channel->window, + MSG_TYPE_MSG, + COLOR_WIN_CHAT, "%s\n", pos); } else { diff --git a/weechat/src/irc/irc-send.c b/weechat/src/irc/irc-send.c index e0890d978..ff7c9bc52 100644 --- a/weechat/src/irc/irc-send.c +++ b/weechat/src/irc/irc-send.c @@ -179,6 +179,17 @@ irc_cmd_send_ctcp (t_irc_server *server, char *arguments) } /* + * irc_cmd_send_dcc: starts DCC (file or chat) + */ + +int +irc_cmd_send_dcc (t_irc_server *server, char *arguments) +{ + /* TODO: write this command! */ + return 0; +} + +/* * irc_cmd_send_deop: remove operator privileges from nickname(s) */ diff --git a/weechat/src/irc/irc.h b/weechat/src/irc/irc.h index 112018892..1ad068aed 100644 --- a/weechat/src/irc/irc.h +++ b/weechat/src/irc/irc.h @@ -34,6 +34,20 @@ #define CHANNEL_PREFIX "#&+!" +#define NUM_CHANNEL_MODES 7 +#define CHANNEL_MODE_INVITE 0 +#define CHANNEL_MODE_KEY 1 +#define CHANNEL_MODE_LIMIT 2 +#define CHANNEL_MODE_MODERATED 3 +#define CHANNEL_MODE_NO_MSG_OUT 4 +#define CHANNEL_MODE_SECRET 5 +#define CHANNEL_MODE_TOPIC 6 +#define SET_CHANNEL_MODE(channel, set, mode) \ + if (set) \ + channel->modes[mode] = channel_modes[mode]; \ + else \ + channel->modes[mode] = ' '; + #define DEFAULT_IRC_PORT 6667 /* nick types */ @@ -64,6 +78,9 @@ struct t_irc_channel int type; /* channel type */ char *name; /* name of channel (exemple: "#abc") */ char *topic; /* topic of channel (host for private) */ + char modes[NUM_CHANNEL_MODES+1];/* channel modes */ + int limit; /* user limit (0 is limit not set) */ + char *key; /* channel key (NULL if no key is set) */ t_irc_nick *nicks; /* nicks on the channel */ t_irc_nick *last_nick; /* last nick on the channel */ t_gui_window *window; /* GUI window allocated for channel */ @@ -139,6 +156,7 @@ extern t_irc_command irc_commands[]; extern t_irc_server *irc_servers, *current_irc_server; extern t_irc_message *recv_msgq, *msgq_last_msg; extern t_irc_channel *current_channel; +extern char *channel_modes; /* server functions (irc-server.c) */ @@ -180,6 +198,10 @@ extern t_irc_nick *nick_search (t_irc_channel *, char *); extern void nick_count (t_irc_channel *, int *, int *, int *, int *, int *); extern int nick_get_max_length (t_irc_channel *); +/* DCC functions (irc-dcc.c) */ + +extern void dcc_send (); + /* IRC display (irc-diplay.c) */ extern void irc_display_prefix (/*@null@*/ t_gui_window *, char *); @@ -195,6 +217,7 @@ extern void irc_login (t_irc_server *); extern int irc_cmd_send_admin (t_irc_server *, char *); extern int irc_cmd_send_away (t_irc_server *, char *); extern int irc_cmd_send_ctcp (t_irc_server *, char *); +extern int irc_cmd_send_dcc (t_irc_server *, char *); extern int irc_cmd_send_deop (t_irc_server *, int, char **); extern int irc_cmd_send_devoice (t_irc_server *, int, char **); extern int irc_cmd_send_die (t_irc_server *, char *); |