diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2005-03-12 20:08:08 +0000 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2005-03-12 20:08:08 +0000 |
| commit | 4322501ebdc42fb0102152baa7a28a39ba872cb5 (patch) | |
| tree | fe93b574d2bbe05707b719d26999f3f0ad5d4dae | |
| parent | 39d14185a18a8ffd4822593a495ab3a02e551c07 (diff) | |
| download | weechat-4322501ebdc42fb0102152baa7a28a39ba872cb5.zip | |
Fixed /invite command (and now invite requests are displayed)
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | po/es.po | 230 | ||||
| -rw-r--r-- | po/fr.po | 230 | ||||
| -rw-r--r-- | po/weechat.pot | 226 | ||||
| -rw-r--r-- | src/irc/irc-commands.c | 2 | ||||
| -rw-r--r-- | src/irc/irc-recv.c | 252 | ||||
| -rw-r--r-- | src/irc/irc-send.c | 18 | ||||
| -rw-r--r-- | src/irc/irc.h | 3 | ||||
| -rw-r--r-- | weechat/ChangeLog | 1 | ||||
| -rw-r--r-- | weechat/po/es.po | 230 | ||||
| -rw-r--r-- | weechat/po/fr.po | 230 | ||||
| -rw-r--r-- | weechat/po/weechat.pot | 226 | ||||
| -rw-r--r-- | weechat/src/irc/irc-commands.c | 2 | ||||
| -rw-r--r-- | weechat/src/irc/irc-recv.c | 252 | ||||
| -rw-r--r-- | weechat/src/irc/irc-send.c | 18 | ||||
| -rw-r--r-- | weechat/src/irc/irc.h | 3 |
16 files changed, 1056 insertions, 868 deletions
@@ -17,6 +17,7 @@ Version 0.1.1 (under dev!): * on server buffer, only server messages are logged * improved /help command output * plugins messages are logged with new config option (log_plugin_msg) + * fixed /invite command (and now invite requests are displayed) * fixed /buffer close command (now ok when disconnected from server) * fixed display bugs when many windows are opened @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.1-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-03-12 14:40+0100\n" -"PO-Revision-Date: 2005-03-12 04:10+0100\n" +"POT-Creation-Date: 2005-03-12 21:03+0100\n" +"PO-Revision-Date: 2005-03-12 21:05+0100\n" "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1194,7 +1194,7 @@ msgstr " (servidor temporal, no será guardado)" msgid "(hidden)" msgstr "(oculto)" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3211 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3259 msgid "unknown" msgstr "desconocido" @@ -1204,7 +1204,7 @@ msgid "%s: using local hostname \"%s\"\n" msgstr "%s: utilización del nombre de máquina local \"%s\"\n" #: src/irc/irc-send.c:265 src/irc/irc-send.c:277 src/irc/irc-send.c:295 -#: src/irc/irc-send.c:775 src/irc/irc-send.c:849 src/common/command.c:1124 +#: src/irc/irc-send.c:789 src/irc/irc-send.c:863 src/common/command.c:1124 #: src/common/command.c:1399 #, c-format msgid "%s wrong argument count for \"%s\" command\n" @@ -1215,418 +1215,428 @@ msgstr "%s número de argumentos incorrecto para el comando \"%s\"\n" msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s argumentos incorrecto para el comando \"%s\"\n" -#: src/irc/irc-send.c:346 src/irc/irc-send.c:372 src/irc/irc-send.c:473 -#: src/irc/irc-send.c:797 src/irc/irc-send.c:876 src/irc/irc-send.c:1376 +#: src/irc/irc-send.c:346 src/irc/irc-send.c:372 src/irc/irc-send.c:422 +#: src/irc/irc-send.c:487 src/irc/irc-send.c:811 src/irc/irc-send.c:890 +#: src/irc/irc-send.c:1390 #, c-format msgid "%s \"%s\" command can only be executed in a channel window\n" msgstr "" "%s el comando \"%s\" sólo puede ser ejecutado en una ventana de canal\n" -#: src/irc/irc-send.c:583 src/irc/irc-send.c:650 src/irc/irc-send.c:924 -#: src/irc/irc-send.c:938 src/irc/irc-send.c:1270 +#: src/irc/irc-send.c:597 src/irc/irc-send.c:664 src/irc/irc-send.c:938 +#: src/irc/irc-send.c:952 src/irc/irc-send.c:1284 #, c-format msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" "%s el comando \"%s\" no puede ser ejecutado en una ventana de servidor\n" -#: src/irc/irc-send.c:668 src/irc/irc-send.c:693 src/irc/irc-recv.c:275 -#: src/irc/irc-recv.c:1114 +#: src/irc/irc-send.c:682 src/irc/irc-send.c:707 src/irc/irc-recv.c:321 +#: src/irc/irc-recv.c:1162 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "%s usuario no encontrado para el comando \"%s\"\n" -#: src/irc/irc-send.c:745 src/irc/irc-send.c:1022 src/irc/irc-recv.c:1352 +#: src/irc/irc-send.c:759 src/irc/irc-send.c:1036 src/irc/irc-recv.c:1400 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n" -#: src/irc/irc-send.c:1348 +#: src/irc/irc-send.c:1362 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilado en %s %s\n" -#: src/irc/irc-recv.c:175 +#: src/irc/irc-recv.c:182 +msgid "You have been invited to " +msgstr "" + +#: src/irc/irc-recv.c:185 +msgid "by" +msgstr "por" + +#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:288 src/irc/irc-recv.c:656 +#: src/irc/irc-recv.c:984 src/irc/irc-recv.c:1172 src/irc/irc-recv.c:2706 +#: src/irc/irc-recv.c:2773 +#, c-format +msgid "%s channel not found for \"%s\" command\n" +msgstr "%s canal no encontrado para el comando \"%s\"\n" + +#: src/irc/irc-recv.c:221 #, c-format msgid "%s cannot create new channel \"%s\"\n" msgstr "%s no es posible crear un nuevo canal \"%s\"\n" -#: src/irc/irc-recv.c:195 +#: src/irc/irc-recv.c:241 msgid " has joined " msgstr " se ha unido " -#: src/irc/irc-recv.c:242 src/irc/irc-recv.c:610 src/irc/irc-recv.c:936 -#: src/irc/irc-recv.c:1124 src/irc/irc-recv.c:2658 src/irc/irc-recv.c:2725 -#, c-format -msgid "%s channel not found for \"%s\" command\n" -msgstr "%s canal no encontrado para el comando \"%s\"\n" - -#: src/irc/irc-recv.c:251 +#: src/irc/irc-recv.c:297 msgid " has kicked " msgstr " se ha expulsado " -#: src/irc/irc-recv.c:255 +#: src/irc/irc-recv.c:301 msgid " from " msgstr " de " -#: src/irc/irc-recv.c:333 +#: src/irc/irc-recv.c:379 msgid "sets ban on" msgstr "establecer baneo en" -#: src/irc/irc-recv.c:334 +#: src/irc/irc-recv.c:380 msgid "removes ban on" msgstr "quitar baneo en" -#: src/irc/irc-recv.c:351 +#: src/irc/irc-recv.c:397 msgid "sets invite-only channel flag" msgstr "define el canal sólo en modo invitado" -#: src/irc/irc-recv.c:352 +#: src/irc/irc-recv.c:398 msgid "removes invite-only channel flag" msgstr "elimina el modo sólo invitado para el canal" -#: src/irc/irc-recv.c:369 +#: src/irc/irc-recv.c:415 msgid "sets channel key to" msgstr "definir clave de canal en" -#: src/irc/irc-recv.c:370 +#: src/irc/irc-recv.c:416 msgid "removes channel key" msgstr "elimina la clave de canal" -#: src/irc/irc-recv.c:401 +#: src/irc/irc-recv.c:447 msgid "sets the user limit to" msgstr "define el límite de usuarios en" -#: src/irc/irc-recv.c:402 +#: src/irc/irc-recv.c:448 msgid "removes user limit" msgstr "elimina el límite de usuarios" -#: src/irc/irc-recv.c:424 +#: src/irc/irc-recv.c:470 msgid "sets moderated channel flag" msgstr "establece la moderación en el canal" -#: src/irc/irc-recv.c:425 +#: src/irc/irc-recv.c:471 msgid "removes moderated channel flag" msgstr "elimina la moderación en el canal" -#: src/irc/irc-recv.c:435 +#: src/irc/irc-recv.c:481 msgid "sets messages from channel only flag" msgstr "establece el modo sólo mensajes de usuarios del canal" -#: src/irc/irc-recv.c:436 +#: src/irc/irc-recv.c:482 msgid "removes messages from channel only flag" msgstr "autoriza a todos los usuarios a escribir en el canal" -#: src/irc/irc-recv.c:453 +#: src/irc/irc-recv.c:499 msgid "gives channel operator status to" msgstr "dar estado de operador de canal a" -#: src/irc/irc-recv.c:454 +#: src/irc/irc-recv.c:500 msgid "removes channel operator status from" msgstr "eliminar el estado de operador de canal a" -#: src/irc/irc-recv.c:481 +#: src/irc/irc-recv.c:527 msgid "sets private channel flag" msgstr "establece el canal como privado" -#: src/irc/irc-recv.c:482 +#: src/irc/irc-recv.c:528 msgid "removes private channel flag" msgstr "elimina el modo privado para el canal" -#: src/irc/irc-recv.c:492 +#: src/irc/irc-recv.c:538 msgid "sets secret channel flag" msgstr "establece el canal como secreto" -#: src/irc/irc-recv.c:493 +#: src/irc/irc-recv.c:539 msgid "removes secret channel flag" msgstr "elimina el modo secreto para el canal" -#: src/irc/irc-recv.c:503 +#: src/irc/irc-recv.c:549 msgid "sets topic protection" msgstr "activa la protección de tema" -#: src/irc/irc-recv.c:504 +#: src/irc/irc-recv.c:550 msgid "removes topic protection" msgstr "elimina la protección de tema" -#: src/irc/irc-recv.c:521 +#: src/irc/irc-recv.c:567 msgid "gives voice to" msgstr "da voz a" -#: src/irc/irc-recv.c:522 +#: src/irc/irc-recv.c:568 msgid "removes voice from" msgstr "quita la voz a" -#: src/irc/irc-recv.c:565 src/irc/irc-recv.c:650 src/irc/irc-recv.c:1010 -#: src/irc/irc-recv.c:1448 +#: src/irc/irc-recv.c:611 src/irc/irc-recv.c:696 src/irc/irc-recv.c:1058 +#: src/irc/irc-recv.c:1496 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "%s comando \"%s\" recibido sin host \n" -#: src/irc/irc-recv.c:580 +#: src/irc/irc-recv.c:626 #, c-format msgid "%s \"%s\" command received without channel or nickname\n" msgstr "%s comando \"%s\" recibido sin canal ó usuario\n" -#: src/irc/irc-recv.c:625 +#: src/irc/irc-recv.c:671 msgid "mode changed by" msgstr "modo cambiado por" -#: src/irc/irc-recv.c:688 +#: src/irc/irc-recv.c:734 msgid "You are " msgstr "Usted es " -#: src/irc/irc-recv.c:695 +#: src/irc/irc-recv.c:741 msgid " is " msgstr "es " -#: src/irc/irc-recv.c:699 +#: src/irc/irc-recv.c:745 msgid "now known as " msgstr "ahora conocido como" -#: src/irc/irc-recv.c:768 +#: src/irc/irc-recv.c:814 #, c-format msgid "%s nickname not found for \"%s\" command\n" msgstr "%s nombre de usuario no encontrado para el comando \"%s\"\n" -#: src/irc/irc-recv.c:781 src/irc/irc-recv.c:813 +#: src/irc/irc-recv.c:827 src/irc/irc-recv.c:859 msgid "reply from" msgstr "respuesta de" -#: src/irc/irc-recv.c:816 +#: src/irc/irc-recv.c:862 #, c-format msgid ": %ld.%ld seconds\n" msgstr ": %ld.%ld segundos\n" -#: src/irc/irc-recv.c:861 +#: src/irc/irc-recv.c:909 #, c-format msgid "%s \"%s\" command received without host or channel\n" msgstr "%s comando \"%s\" recibido sin host o canal\n" -#: src/irc/irc-recv.c:911 +#: src/irc/irc-recv.c:959 msgid " has left " msgstr " ha salido " -#: src/irc/irc-recv.c:1059 src/irc/irc-recv.c:1378 +#: src/irc/irc-recv.c:1107 src/irc/irc-recv.c:1426 #, c-format msgid "On %s: * %s %s" msgstr "En %s: * %s %s" -#: src/irc/irc-recv.c:1078 +#: src/irc/irc-recv.c:1126 #, c-format msgid "Received a CTCP SOUND \"%s\" from " msgstr "" -#: src/irc/irc-recv.c:1099 +#: src/irc/irc-recv.c:1147 #, c-format msgid "On %s: %s> %s" msgstr "En %s: %s> %s" -#: src/irc/irc-recv.c:1169 +#: src/irc/irc-recv.c:1217 msgid "Received a " msgstr "Recibido un " -#: src/irc/irc-recv.c:1171 +#: src/irc/irc-recv.c:1219 msgid "CTCP VERSION " msgstr "CTCP VERSION " -#: src/irc/irc-recv.c:1173 +#: src/irc/irc-recv.c:1221 msgid "from" msgstr "de" -#: src/irc/irc-recv.c:1210 src/irc/irc-recv.c:1227 src/irc/irc-recv.c:1243 -#: src/irc/irc-recv.c:1259 src/irc/irc-recv.c:1284 src/irc/irc-recv.c:1301 -#: src/irc/irc-recv.c:1316 src/irc/irc-recv.c:1424 src/irc/irc-recv.c:2962 -#: src/irc/irc-recv.c:3019 +#: src/irc/irc-recv.c:1258 src/irc/irc-recv.c:1275 src/irc/irc-recv.c:1291 +#: src/irc/irc-recv.c:1307 src/irc/irc-recv.c:1332 src/irc/irc-recv.c:1349 +#: src/irc/irc-recv.c:1364 src/irc/irc-recv.c:1472 src/irc/irc-recv.c:3010 +#: src/irc/irc-recv.c:3067 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s no es posible analizar el comando \"%s\"\n" -#: src/irc/irc-recv.c:1329 +#: src/irc/irc-recv.c:1377 #, c-format msgid "%s unknown DCC CHAT type received from " msgstr "%s tipo DCC CHAT desconocido recibido de " -#: src/irc/irc-recv.c:1404 src/irc/irc-dcc.c:759 +#: src/irc/irc-recv.c:1452 src/irc/irc-dcc.c:759 #, c-format msgid "Private %s> %s" msgstr "Privado %s> %s" -#: src/irc/irc-recv.c:1480 +#: src/irc/irc-recv.c:1528 msgid "has quit" msgstr "ha salido" -#: src/irc/irc-recv.c:1600 +#: src/irc/irc-recv.c:1648 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s comando \"%s\" recibido sin canal\n" -#: src/irc/irc-recv.c:1628 +#: src/irc/irc-recv.c:1676 msgid " has changed topic for " msgstr "ha cambiado el tema por " -#: src/irc/irc-recv.c:1633 +#: src/irc/irc-recv.c:1681 #, c-format msgid " to: \"%s\"\n" msgstr " a: \"%s\"\n" -#: src/irc/irc-recv.c:1639 +#: src/irc/irc-recv.c:1687 msgid " has unset topic for " msgstr " ha quitado el tema por " -#: src/irc/irc-recv.c:1750 +#: src/irc/irc-recv.c:1798 #, c-format msgid " is away: %s\n" msgstr " está ausente: %s\n" -#: src/irc/irc-recv.c:1824 +#: src/irc/irc-recv.c:1872 msgid "Users online: " msgstr "Usuarios conectados: " -#: src/irc/irc-recv.c:2229 +#: src/irc/irc-recv.c:2277 msgid "idle: " msgstr "sin actividad: " -#: src/irc/irc-recv.c:2237 +#: src/irc/irc-recv.c:2285 msgid "days" msgstr "días" -#: src/irc/irc-recv.c:2237 +#: src/irc/irc-recv.c:2285 msgid "day" msgstr "día" -#: src/irc/irc-recv.c:2247 +#: src/irc/irc-recv.c:2295 msgid "hours" msgstr "horas" -#: src/irc/irc-recv.c:2247 +#: src/irc/irc-recv.c:2295 msgid "hour" msgstr "hora" -#: src/irc/irc-recv.c:2253 +#: src/irc/irc-recv.c:2301 msgid "minutes" msgstr "minutos" -#: src/irc/irc-recv.c:2253 +#: src/irc/irc-recv.c:2301 msgid "minute" msgstr "minuto" -#: src/irc/irc-recv.c:2259 +#: src/irc/irc-recv.c:2307 msgid "seconds" msgstr "segundos" -#: src/irc/irc-recv.c:2259 +#: src/irc/irc-recv.c:2307 msgid "second" msgstr "segundo" -#: src/irc/irc-recv.c:2264 +#: src/irc/irc-recv.c:2312 msgid "signon at: " msgstr "firmado el: " -#: src/irc/irc-recv.c:2352 +#: src/irc/irc-recv.c:2400 msgid "Channels: " msgstr "Canales: " -#: src/irc/irc-recv.c:2604 +#: src/irc/irc-recv.c:2652 msgid "No topic set for " msgstr "No hay tema definido para " -#: src/irc/irc-recv.c:2646 +#: src/irc/irc-recv.c:2694 msgid "Topic for " msgstr "El tema para " -#: src/irc/irc-recv.c:2650 +#: src/irc/irc-recv.c:2698 #, c-format msgid " is: \"%s\"\n" msgstr " es: \"%s\"\n" -#: src/irc/irc-recv.c:2668 src/irc/irc-recv.c:2752 +#: src/irc/irc-recv.c:2716 src/irc/irc-recv.c:2800 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "%s no es posible identificar el canal para el comando \"%s\"\n" -#: src/irc/irc-recv.c:2714 +#: src/irc/irc-recv.c:2762 msgid "Topic set by " msgstr "Tema definido por " -#: src/irc/irc-recv.c:2734 +#: src/irc/irc-recv.c:2782 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "%s no es posible identificar la fecha/hora para el comando \"%s\"\n" -#: src/irc/irc-recv.c:2743 +#: src/irc/irc-recv.c:2791 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" "%s no es posible determinar el nombre de usuario para el comando \"%s\"\n" -#: src/irc/irc-recv.c:2885 +#: src/irc/irc-recv.c:2933 msgid " on " msgstr " en " -#: src/irc/irc-recv.c:3008 +#: src/irc/irc-recv.c:3056 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "%s no es posible crear el usuario \"%s\" para el canal \"%s\"\n" -#: src/irc/irc-recv.c:3063 +#: src/irc/irc-recv.c:3111 msgid "Nicks " msgstr "Usuarios " -#: src/irc/irc-recv.c:3083 +#: src/irc/irc-recv.c:3131 msgid "Channel " msgstr "Canal " -#: src/irc/irc-recv.c:3094 +#: src/irc/irc-recv.c:3142 msgid "nicks" msgstr "usuarios" -#: src/irc/irc-recv.c:3094 +#: src/irc/irc-recv.c:3142 msgid "nick" msgstr "usuario" -#: src/irc/irc-recv.c:3102 +#: src/irc/irc-recv.c:3150 msgid "ops" msgstr "operadores" -#: src/irc/irc-recv.c:3102 +#: src/irc/irc-recv.c:3150 msgid "op" msgstr "operador" -#: src/irc/irc-recv.c:3111 +#: src/irc/irc-recv.c:3159 msgid "halfops" msgstr "semi-operadores" -#: src/irc/irc-recv.c:3111 +#: src/irc/irc-recv.c:3159 msgid "halfop" msgstr "semi-operador" -#: src/irc/irc-recv.c:3120 +#: src/irc/irc-recv.c:3168 msgid "voices" msgstr "voces" -#: src/irc/irc-recv.c:3120 +#: src/irc/irc-recv.c:3168 msgid "voice" msgstr "voz" -#: src/irc/irc-recv.c:3129 +#: src/irc/irc-recv.c:3177 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:3165 +#: src/irc/irc-recv.c:3213 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 2º nombre de " "usuario \"%s\"\n" -#: src/irc/irc-recv.c:3177 +#: src/irc/irc-recv.c:3225 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 3º nombre de " "usuario \"%s\"\n" -#: src/irc/irc-recv.c:3189 +#: src/irc/irc-recv.c:3237 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1635,7 +1645,7 @@ msgstr "" "%s: ¡todos los nombres de usuario declarados ya están en uso, cerrando la " "conexión con el servidor!\n" -#: src/irc/irc-recv.c:3199 +#: src/irc/irc-recv.c:3247 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.1-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-03-12 14:40+0100\n" -"PO-Revision-Date: 2005-03-12 14:41+0100\n" +"POT-Creation-Date: 2005-03-12 21:03+0100\n" +"PO-Revision-Date: 2005-03-12 21:04+0100\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1193,7 +1193,7 @@ msgstr " (serveur temporaire, ne sera pas sauvé)" msgid "(hidden)" msgstr "(caché)" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3211 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3259 msgid "unknown" msgstr "inconnu" @@ -1203,7 +1203,7 @@ msgid "%s: using local hostname \"%s\"\n" msgstr "%s: utilisation du nom de machine local \"%s\"\n" #: src/irc/irc-send.c:265 src/irc/irc-send.c:277 src/irc/irc-send.c:295 -#: src/irc/irc-send.c:775 src/irc/irc-send.c:849 src/common/command.c:1124 +#: src/irc/irc-send.c:789 src/irc/irc-send.c:863 src/common/command.c:1124 #: src/common/command.c:1399 #, c-format msgid "%s wrong argument count for \"%s\" command\n" @@ -1214,419 +1214,429 @@ msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n" msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s paramètres invalides pour la commande \"%s\"\n" -#: src/irc/irc-send.c:346 src/irc/irc-send.c:372 src/irc/irc-send.c:473 -#: src/irc/irc-send.c:797 src/irc/irc-send.c:876 src/irc/irc-send.c:1376 +#: src/irc/irc-send.c:346 src/irc/irc-send.c:372 src/irc/irc-send.c:422 +#: src/irc/irc-send.c:487 src/irc/irc-send.c:811 src/irc/irc-send.c:890 +#: src/irc/irc-send.c:1390 #, 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:583 src/irc/irc-send.c:650 src/irc/irc-send.c:924 -#: src/irc/irc-send.c:938 src/irc/irc-send.c:1270 +#: src/irc/irc-send.c:597 src/irc/irc-send.c:664 src/irc/irc-send.c:938 +#: src/irc/irc-send.c:952 src/irc/irc-send.c:1284 #, 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:668 src/irc/irc-send.c:693 src/irc/irc-recv.c:275 -#: src/irc/irc-recv.c:1114 +#: src/irc/irc-send.c:682 src/irc/irc-send.c:707 src/irc/irc-recv.c:321 +#: src/irc/irc-recv.c:1162 #, 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:745 src/irc/irc-send.c:1022 src/irc/irc-recv.c:1352 +#: src/irc/irc-send.c:759 src/irc/irc-send.c:1036 src/irc/irc-recv.c:1400 #, 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:1348 +#: src/irc/irc-send.c:1362 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilé le %s %s\n" -#: src/irc/irc-recv.c:175 +#: src/irc/irc-recv.c:182 +msgid "You have been invited to " +msgstr "Vous avez été invité sur " + +#: src/irc/irc-recv.c:185 +msgid "by" +msgstr "par" + +#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:288 src/irc/irc-recv.c:656 +#: src/irc/irc-recv.c:984 src/irc/irc-recv.c:1172 src/irc/irc-recv.c:2706 +#: src/irc/irc-recv.c:2773 +#, c-format +msgid "%s channel not found for \"%s\" command\n" +msgstr "%s canal non trouvé pour la commande \"%s\"\n" + +#: src/irc/irc-recv.c:221 #, c-format msgid "%s cannot create new channel \"%s\"\n" msgstr "%s impossible de créer le nouveau canal \"%s\"\n" -#: src/irc/irc-recv.c:195 +#: src/irc/irc-recv.c:241 msgid " has joined " msgstr " a rejoint " -#: src/irc/irc-recv.c:242 src/irc/irc-recv.c:610 src/irc/irc-recv.c:936 -#: src/irc/irc-recv.c:1124 src/irc/irc-recv.c:2658 src/irc/irc-recv.c:2725 -#, c-format -msgid "%s channel not found for \"%s\" command\n" -msgstr "%s canal non trouvé pour la commande \"%s\"\n" - -#: src/irc/irc-recv.c:251 +#: src/irc/irc-recv.c:297 msgid " has kicked " msgstr " a poussé dehors " -#: src/irc/irc-recv.c:255 +#: src/irc/irc-recv.c:301 msgid " from " msgstr " de " -#: src/irc/irc-recv.c:333 +#: src/irc/irc-recv.c:379 msgid "sets ban on" msgstr "instaure un bannissement sur" -#: src/irc/irc-recv.c:334 +#: src/irc/irc-recv.c:380 msgid "removes ban on" msgstr "supprime le banissement sur" -#: src/irc/irc-recv.c:351 +#: src/irc/irc-recv.c:397 msgid "sets invite-only channel flag" msgstr "définit le canal en mode invité seulement" -#: src/irc/irc-recv.c:352 +#: src/irc/irc-recv.c:398 msgid "removes invite-only channel flag" msgstr "supprime le mode invité seulement pour le canal" -#: src/irc/irc-recv.c:369 +#: src/irc/irc-recv.c:415 msgid "sets channel key to" msgstr "définit la clé du canal à" -#: src/irc/irc-recv.c:370 +#: src/irc/irc-recv.c:416 msgid "removes channel key" msgstr "supprime la clé du canal" -#: src/irc/irc-recv.c:401 +#: src/irc/irc-recv.c:447 msgid "sets the user limit to" msgstr "définit la limite d'utilisateurs à" -#: src/irc/irc-recv.c:402 +#: src/irc/irc-recv.c:448 msgid "removes user limit" msgstr "supprime la limite d'utilisateurs" -#: src/irc/irc-recv.c:424 +#: src/irc/irc-recv.c:470 msgid "sets moderated channel flag" msgstr "instaure la modération sur le canal" -#: src/irc/irc-recv.c:425 +#: src/irc/irc-recv.c:471 msgid "removes moderated channel flag" msgstr "supprime la modération sur le canal" -#: src/irc/irc-recv.c:435 +#: src/irc/irc-recv.c:481 msgid "sets messages from channel only flag" msgstr "interdit aux utilisateurs en dehors du canal d'y écrire" -#: src/irc/irc-recv.c:436 +#: src/irc/irc-recv.c:482 msgid "removes messages from channel only flag" msgstr "autorise tout utilisateur à écrire sur le canal" -#: src/irc/irc-recv.c:453 +#: src/irc/irc-recv.c:499 msgid "gives channel operator status to" msgstr "donne le droit opérateur à" -#: src/irc/irc-recv.c:454 +#: src/irc/irc-recv.c:500 msgid "removes channel operator status from" msgstr "supprime le droit opérateur à" -#: src/irc/irc-recv.c:481 +#: src/irc/irc-recv.c:527 msgid "sets private channel flag" msgstr "définit le canal comme privé" -#: src/irc/irc-recv.c:482 +#: src/irc/irc-recv.c:528 msgid "removes private channel flag" msgstr "supprime le mode privé pour le canal" -#: src/irc/irc-recv.c:492 +#: src/irc/irc-recv.c:538 msgid "sets secret channel flag" msgstr "définit le canal comme secret" -#: src/irc/irc-recv.c:493 +#: src/irc/irc-recv.c:539 msgid "removes secret channel flag" msgstr "supprime le mode secret pour le canal" -#: src/irc/irc-recv.c:503 +#: src/irc/irc-recv.c:549 msgid "sets topic protection" msgstr "active la protection du titre" -#: src/irc/irc-recv.c:504 +#: src/irc/irc-recv.c:550 msgid "removes topic protection" msgstr "supprime la protection du titre" -#: src/irc/irc-recv.c:521 +#: src/irc/irc-recv.c:567 msgid "gives voice to" msgstr "donne la voix à" -#: src/irc/irc-recv.c:522 +#: src/irc/irc-recv.c:568 msgid "removes voice from" msgstr "supprime la voix de" -#: src/irc/irc-recv.c:565 src/irc/irc-recv.c:650 src/irc/irc-recv.c:1010 -#: src/irc/irc-recv.c:1448 +#: src/irc/irc-recv.c:611 src/irc/irc-recv.c:696 src/irc/irc-recv.c:1058 +#: src/irc/irc-recv.c:1496 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "%s commande \"%s\" reçue sans host\n" -#: src/irc/irc-recv.c:580 +#: src/irc/irc-recv.c:626 #, c-format msgid "%s \"%s\" command received without channel or nickname\n" msgstr "%s commande \"%s\" reçue sans canal ou utilisateur\n" -#: src/irc/irc-recv.c:625 +#: src/irc/irc-recv.c:671 msgid "mode changed by" msgstr "mode changé par" -#: src/irc/irc-recv.c:688 +#: src/irc/irc-recv.c:734 msgid "You are " msgstr "Vous êtes " -#: src/irc/irc-recv.c:695 +#: src/irc/irc-recv.c:741 msgid " is " msgstr " est " -#: src/irc/irc-recv.c:699 +#: src/irc/irc-recv.c:745 msgid "now known as " msgstr "maintenant connu sous le nom " -#: src/irc/irc-recv.c:768 +#: src/irc/irc-recv.c:814 #, 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:781 src/irc/irc-recv.c:813 +#: src/irc/irc-recv.c:827 src/irc/irc-recv.c:859 msgid "reply from" msgstr "réponse de" -#: src/irc/irc-recv.c:816 +#: src/irc/irc-recv.c:862 #, c-format msgid ": %ld.%ld seconds\n" msgstr ": %ld.%ld secondes\n" -#: src/irc/irc-recv.c:861 +#: src/irc/irc-recv.c:909 #, 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:911 +#: src/irc/irc-recv.c:959 msgid " has left " msgstr " a quitté " -#: src/irc/irc-recv.c:1059 src/irc/irc-recv.c:1378 +#: src/irc/irc-recv.c:1107 src/irc/irc-recv.c:1426 #, c-format msgid "On %s: * %s %s" msgstr "Sur %s: * %s %s" -#: src/irc/irc-recv.c:1078 +#: src/irc/irc-recv.c:1126 #, c-format msgid "Received a CTCP SOUND \"%s\" from " msgstr "CTCP SOUND \"%s\" reçu de " -#: src/irc/irc-recv.c:1099 +#: src/irc/irc-recv.c:1147 #, c-format msgid "On %s: %s> %s" msgstr "Sur %s: %s> %s" -#: src/irc/irc-recv.c:1169 +#: src/irc/irc-recv.c:1217 msgid "Received a " msgstr "Reçu un " -#: src/irc/irc-recv.c:1171 +#: src/irc/irc-recv.c:1219 msgid "CTCP VERSION " msgstr "CTCP VERSION " -#: src/irc/irc-recv.c:1173 +#: src/irc/irc-recv.c:1221 msgid "from" msgstr "de" -#: src/irc/irc-recv.c:1210 src/irc/irc-recv.c:1227 src/irc/irc-recv.c:1243 -#: src/irc/irc-recv.c:1259 src/irc/irc-recv.c:1284 src/irc/irc-recv.c:1301 -#: src/irc/irc-recv.c:1316 src/irc/irc-recv.c:1424 src/irc/irc-recv.c:2962 -#: src/irc/irc-recv.c:3019 +#: src/irc/irc-recv.c:1258 src/irc/irc-recv.c:1275 src/irc/irc-recv.c:1291 +#: src/irc/irc-recv.c:1307 src/irc/irc-recv.c:1332 src/irc/irc-recv.c:1349 +#: src/irc/irc-recv.c:1364 src/irc/irc-recv.c:1472 src/irc/irc-recv.c:3010 +#: src/irc/irc-recv.c:3067 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s impossible d'analyser la commande \"%s\"\n" -#: src/irc/irc-recv.c:1329 +#: src/irc/irc-recv.c:1377 #, c-format msgid "%s unknown DCC CHAT type received from " msgstr "%s type de DCC CHAT inconnu reçu de " -#: src/irc/irc-recv.c:1404 src/irc/irc-dcc.c:759 +#: src/irc/irc-recv.c:1452 src/irc/irc-dcc.c:759 #, c-format msgid "Private %s> %s" msgstr "Prive %s> %s" -#: src/irc/irc-recv.c:1480 +#: src/irc/irc-recv.c:1528 msgid "has quit" msgstr "a quitté" -#: src/irc/irc-recv.c:1600 +#: src/irc/irc-recv.c:1648 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s commande \"%s\" reçue sans canal\n" -#: src/irc/irc-recv.c:1628 +#: src/irc/irc-recv.c:1676 msgid " has changed topic for " msgstr " a changé le titre pour " -#: src/irc/irc-recv.c:1633 +#: src/irc/irc-recv.c:1681 #, c-format msgid " to: \"%s\"\n" msgstr " en: \"%s\"\n" -#: src/irc/irc-recv.c:1639 +#: src/irc/irc-recv.c:1687 msgid " has unset topic for " msgstr " a retiré le titre pour " -#: src/irc/irc-recv.c:1750 +#: src/irc/irc-recv.c:1798 #, c-format msgid " is away: %s\n" msgstr " est absent: %s\n" -#: src/irc/irc-recv.c:1824 +#: src/irc/irc-recv.c:1872 msgid "Users online: " msgstr "Utilisateurs en ligne: " -#: src/irc/irc-recv.c:2229 +#: src/irc/irc-recv.c:2277 msgid "idle: " msgstr "inactivité: " -#: src/irc/irc-recv.c:2237 +#: src/irc/irc-recv.c:2285 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:2237 +#: src/irc/irc-recv.c:2285 msgid "day" msgstr "jour" -#: src/irc/irc-recv.c:2247 +#: src/irc/irc-recv.c:2295 msgid "hours" msgstr "heures" -#: src/irc/irc-recv.c:2247 +#: src/irc/irc-recv.c:2295 msgid "hour" msgstr "heure" -#: src/irc/irc-recv.c:2253 +#: src/irc/irc-recv.c:2301 msgid "minutes" msgstr "minutes" -#: src/irc/irc-recv.c:2253 +#: src/irc/irc-recv.c:2301 msgid "minute" msgstr "minute" -#: src/irc/irc-recv.c:2259 +#: src/irc/irc-recv.c:2307 msgid "seconds" msgstr "secondes" -#: src/irc/irc-recv.c:2259 +#: src/irc/irc-recv.c:2307 msgid "second" msgstr "seconde" -#: src/irc/irc-recv.c:2264 +#: src/irc/irc-recv.c:2312 msgid "signon at: " msgstr "signé le: " -#: src/irc/irc-recv.c:2352 +#: src/irc/irc-recv.c:2400 msgid "Channels: " msgstr "Canaux: " -#: src/irc/irc-recv.c:2604 +#: src/irc/irc-recv.c:2652 msgid "No topic set for " msgstr "Pas de titre défini pour " -#: src/irc/irc-recv.c:2646 +#: src/irc/irc-recv.c:2694 msgid "Topic for " msgstr "Le titre pour " -#: src/irc/irc-recv.c:2650 +#: src/irc/irc-recv.c:2698 #, c-format msgid " is: \"%s\"\n" msgstr " est: \"%s\"\n" -#: src/irc/irc-recv.c:2668 src/irc/irc-recv.c:2752 +#: src/irc/irc-recv.c:2716 src/irc/irc-recv.c:2800 #, 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:2714 +#: src/irc/irc-recv.c:2762 msgid "Topic set by " msgstr "Titre défini par " -#: src/irc/irc-recv.c:2734 +#: src/irc/irc-recv.c:2782 #, 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:2743 +#: src/irc/irc-recv.c:2791 #, 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:2885 +#: src/irc/irc-recv.c:2933 msgid " on " msgstr " sur " -#: src/irc/irc-recv.c:3008 +#: src/irc/irc-recv.c:3056 #, 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:3063 +#: src/irc/irc-recv.c:3111 msgid "Nicks " msgstr "Utilisateurs " -#: src/irc/irc-recv.c:3083 +#: src/irc/irc-recv.c:3131 msgid "Channel " msgstr "Canal " -#: src/irc/irc-recv.c:3094 +#: src/irc/irc-recv.c:3142 msgid "nicks" msgstr "utilisateurs" -#: src/irc/irc-recv.c:3094 +#: src/irc/irc-recv.c:3142 msgid "nick" msgstr "utilisateur" -#: src/irc/irc-recv.c:3102 +#: src/irc/irc-recv.c:3150 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:3102 +#: src/irc/irc-recv.c:3150 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:3111 +#: src/irc/irc-recv.c:3159 msgid "halfops" msgstr "halfops" -#: src/irc/irc-recv.c:3111 +#: src/irc/irc-recv.c:3159 msgid "halfop" msgstr "halfop" -#: src/irc/irc-recv.c:3120 +#: src/irc/irc-recv.c:3168 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:3120 +#: src/irc/irc-recv.c:3168 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:3129 +#: src/irc/irc-recv.c:3177 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:3165 +#: src/irc/irc-recv.c:3213 #, 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:3177 +#: src/irc/irc-recv.c:3225 #, 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 avec le 3ème " "nom d'utilisateur \"%s\"\n" -#: src/irc/irc-recv.c:3189 +#: src/irc/irc-recv.c:3237 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1635,7 +1645,7 @@ msgstr "" "%s: tous les noms d'utilisateurs déclarés sont déjà en cours d'utilisation, " "fermeture de la connexion avec le serveur !\n" -#: src/irc/irc-recv.c:3199 +#: src/irc/irc-recv.c:3247 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" diff --git a/po/weechat.pot b/po/weechat.pot index 25a3d943d..1ad725d2b 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-03-12 14:40+0100\n" +"POT-Creation-Date: 2005-03-12 21:03+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" @@ -1096,7 +1096,7 @@ msgstr "" msgid "(hidden)" msgstr "" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3211 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3259 msgid "unknown" msgstr "" @@ -1106,7 +1106,7 @@ msgid "%s: using local hostname \"%s\"\n" msgstr "" #: src/irc/irc-send.c:265 src/irc/irc-send.c:277 src/irc/irc-send.c:295 -#: src/irc/irc-send.c:775 src/irc/irc-send.c:849 src/common/command.c:1124 +#: src/irc/irc-send.c:789 src/irc/irc-send.c:863 src/common/command.c:1124 #: src/common/command.c:1399 #, c-format msgid "%s wrong argument count for \"%s\" command\n" @@ -1117,418 +1117,428 @@ msgstr "" msgid "%s wrong arguments for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:346 src/irc/irc-send.c:372 src/irc/irc-send.c:473 -#: src/irc/irc-send.c:797 src/irc/irc-send.c:876 src/irc/irc-send.c:1376 +#: src/irc/irc-send.c:346 src/irc/irc-send.c:372 src/irc/irc-send.c:422 +#: src/irc/irc-send.c:487 src/irc/irc-send.c:811 src/irc/irc-send.c:890 +#: src/irc/irc-send.c:1390 #, c-format msgid "%s \"%s\" command can only be executed in a channel window\n" msgstr "" -#: src/irc/irc-send.c:583 src/irc/irc-send.c:650 src/irc/irc-send.c:924 -#: src/irc/irc-send.c:938 src/irc/irc-send.c:1270 +#: src/irc/irc-send.c:597 src/irc/irc-send.c:664 src/irc/irc-send.c:938 +#: src/irc/irc-send.c:952 src/irc/irc-send.c:1284 #, c-format msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" -#: src/irc/irc-send.c:668 src/irc/irc-send.c:693 src/irc/irc-recv.c:275 -#: src/irc/irc-recv.c:1114 +#: src/irc/irc-send.c:682 src/irc/irc-send.c:707 src/irc/irc-recv.c:321 +#: src/irc/irc-recv.c:1162 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:745 src/irc/irc-send.c:1022 src/irc/irc-recv.c:1352 +#: src/irc/irc-send.c:759 src/irc/irc-send.c:1036 src/irc/irc-recv.c:1400 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:1348 +#: src/irc/irc-send.c:1362 #, c-format msgid "%s, compiled on %s %s\n" msgstr "" -#: src/irc/irc-recv.c:175 -#, c-format -msgid "%s cannot create new channel \"%s\"\n" +#: src/irc/irc-recv.c:182 +msgid "You have been invited to " msgstr "" -#: src/irc/irc-recv.c:195 -msgid " has joined " +#: src/irc/irc-recv.c:185 +msgid "by" msgstr "" -#: src/irc/irc-recv.c:242 src/irc/irc-recv.c:610 src/irc/irc-recv.c:936 -#: src/irc/irc-recv.c:1124 src/irc/irc-recv.c:2658 src/irc/irc-recv.c:2725 +#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:288 src/irc/irc-recv.c:656 +#: src/irc/irc-recv.c:984 src/irc/irc-recv.c:1172 src/irc/irc-recv.c:2706 +#: src/irc/irc-recv.c:2773 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:251 +#: src/irc/irc-recv.c:221 +#, c-format +msgid "%s cannot create new channel \"%s\"\n" +msgstr "" + +#: src/irc/irc-recv.c:241 +msgid " has joined " +msgstr "" + +#: src/irc/irc-recv.c:297 msgid " has kicked " msgstr "" -#: src/irc/irc-recv.c:255 +#: src/irc/irc-recv.c:301 msgid " from " msgstr "" -#: src/irc/irc-recv.c:333 +#: src/irc/irc-recv.c:379 msgid "sets ban on" msgstr "" -#: src/irc/irc-recv.c:334 +#: src/irc/irc-recv.c:380 msgid "removes ban on" msgstr "" -#: src/irc/irc-recv.c:351 +#: src/irc/irc-recv.c:397 msgid "sets invite-only channel flag" msgstr "" -#: src/irc/irc-recv.c:352 +#: src/irc/irc-recv.c:398 msgid "removes invite-only channel flag" msgstr "" -#: src/irc/irc-recv.c:369 +#: src/irc/irc-recv.c:415 msgid "sets channel key to" msgstr "" -#: src/irc/irc-recv.c:370 +#: src/irc/irc-recv.c:416 msgid "removes channel key" msgstr "" -#: src/irc/irc-recv.c:401 +#: src/irc/irc-recv.c:447 msgid "sets the user limit to" msgstr "" -#: src/irc/irc-recv.c:402 +#: src/irc/irc-recv.c:448 msgid "removes user limit" msgstr "" -#: src/irc/irc-recv.c:424 +#: src/irc/irc-recv.c:470 msgid "sets moderated channel flag" msgstr "" -#: src/irc/irc-recv.c:425 +#: src/irc/irc-recv.c:471 msgid "removes moderated channel flag" msgstr "" -#: src/irc/irc-recv.c:435 +#: src/irc/irc-recv.c:481 msgid "sets messages from channel only flag" msgstr "" -#: src/irc/irc-recv.c:436 +#: src/irc/irc-recv.c:482 msgid "removes messages from channel only flag" msgstr "" -#: src/irc/irc-recv.c:453 +#: src/irc/irc-recv.c:499 msgid "gives channel operator status to" msgstr "" -#: src/irc/irc-recv.c:454 +#: src/irc/irc-recv.c:500 msgid "removes channel operator status from" msgstr "" -#: src/irc/irc-recv.c:481 +#: src/irc/irc-recv.c:527 msgid "sets private channel flag" msgstr "" -#: src/irc/irc-recv.c:482 +#: src/irc/irc-recv.c:528 msgid "removes private channel flag" msgstr "" -#: src/irc/irc-recv.c:492 +#: src/irc/irc-recv.c:538 msgid "sets secret channel flag" msgstr "" -#: src/irc/irc-recv.c:493 +#: src/irc/irc-recv.c:539 msgid "removes secret channel flag" msgstr "" -#: src/irc/irc-recv.c:503 +#: src/irc/irc-recv.c:549 msgid "sets topic protection" msgstr "" -#: src/irc/irc-recv.c:504 +#: src/irc/irc-recv.c:550 msgid "removes topic protection" msgstr "" -#: src/irc/irc-recv.c:521 +#: src/irc/irc-recv.c:567 msgid "gives voice to" msgstr "" -#: src/irc/irc-recv.c:522 +#: src/irc/irc-recv.c:568 msgid "removes voice from" msgstr "" -#: src/irc/irc-recv.c:565 src/irc/irc-recv.c:650 src/irc/irc-recv.c:1010 -#: src/irc/irc-recv.c:1448 +#: src/irc/irc-recv.c:611 src/irc/irc-recv.c:696 src/irc/irc-recv.c:1058 +#: src/irc/irc-recv.c:1496 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "" -#: src/irc/irc-recv.c:580 +#: src/irc/irc-recv.c:626 #, c-format msgid "%s \"%s\" command received without channel or nickname\n" msgstr "" -#: src/irc/irc-recv.c:625 +#: src/irc/irc-recv.c:671 msgid "mode changed by" msgstr "" -#: src/irc/irc-recv.c:688 +#: src/irc/irc-recv.c:734 msgid "You are " msgstr "" -#: src/irc/irc-recv.c:695 +#: src/irc/irc-recv.c:741 msgid " is " msgstr "" -#: src/irc/irc-recv.c:699 +#: src/irc/irc-recv.c:745 msgid "now known as " msgstr "" -#: src/irc/irc-recv.c:768 +#: src/irc/irc-recv.c:814 #, c-format msgid "%s nickname not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:781 src/irc/irc-recv.c:813 +#: src/irc/irc-recv.c:827 src/irc/irc-recv.c:859 msgid "reply from" msgstr "" -#: src/irc/irc-recv.c:816 +#: src/irc/irc-recv.c:862 #, c-format msgid ": %ld.%ld seconds\n" msgstr "" -#: src/irc/irc-recv.c:861 +#: src/irc/irc-recv.c:909 #, c-format msgid "%s \"%s\" command received without host or channel\n" msgstr "" -#: src/irc/irc-recv.c:911 +#: src/irc/irc-recv.c:959 msgid " has left " msgstr "" -#: src/irc/irc-recv.c:1059 src/irc/irc-recv.c:1378 +#: src/irc/irc-recv.c:1107 src/irc/irc-recv.c:1426 #, c-format msgid "On %s: * %s %s" msgstr "" -#: src/irc/irc-recv.c:1078 +#: src/irc/irc-recv.c:1126 #, c-format msgid "Received a CTCP SOUND \"%s\" from " msgstr "" -#: src/irc/irc-recv.c:1099 +#: src/irc/irc-recv.c:1147 #, c-format msgid "On %s: %s> %s" msgstr "" -#: src/irc/irc-recv.c:1169 +#: src/irc/irc-recv.c:1217 msgid "Received a " msgstr "" -#: src/irc/irc-recv.c:1171 +#: src/irc/irc-recv.c:1219 msgid "CTCP VERSION " msgstr "" -#: src/irc/irc-recv.c:1173 +#: src/irc/irc-recv.c:1221 msgid "from" msgstr "" -#: src/irc/irc-recv.c:1210 src/irc/irc-recv.c:1227 src/irc/irc-recv.c:1243 -#: src/irc/irc-recv.c:1259 src/irc/irc-recv.c:1284 src/irc/irc-recv.c:1301 -#: src/irc/irc-recv.c:1316 src/irc/irc-recv.c:1424 src/irc/irc-recv.c:2962 -#: src/irc/irc-recv.c:3019 +#: src/irc/irc-recv.c:1258 src/irc/irc-recv.c:1275 src/irc/irc-recv.c:1291 +#: src/irc/irc-recv.c:1307 src/irc/irc-recv.c:1332 src/irc/irc-recv.c:1349 +#: src/irc/irc-recv.c:1364 src/irc/irc-recv.c:1472 src/irc/irc-recv.c:3010 +#: src/irc/irc-recv.c:3067 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:1329 +#: src/irc/irc-recv.c:1377 #, c-format msgid "%s unknown DCC CHAT type received from " msgstr "" -#: src/irc/irc-recv.c:1404 src/irc/irc-dcc.c:759 +#: src/irc/irc-recv.c:1452 src/irc/irc-dcc.c:759 #, c-format msgid "Private %s> %s" msgstr "" -#: src/irc/irc-recv.c:1480 +#: src/irc/irc-recv.c:1528 msgid "has quit" msgstr "" -#: src/irc/irc-recv.c:1600 +#: src/irc/irc-recv.c:1648 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "" -#: src/irc/irc-recv.c:1628 +#: src/irc/irc-recv.c:1676 msgid " has changed topic for " msgstr "" -#: src/irc/irc-recv.c:1633 +#: src/irc/irc-recv.c:1681 #, c-format msgid " to: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:1639 +#: src/irc/irc-recv.c:1687 msgid " has unset topic for " msgstr "" -#: src/irc/irc-recv.c:1750 +#: src/irc/irc-recv.c:1798 #, c-format msgid " is away: %s\n" msgstr "" -#: src/irc/irc-recv.c:1824 +#: src/irc/irc-recv.c:1872 msgid "Users online: " msgstr "" -#: src/irc/irc-recv.c:2229 +#: src/irc/irc-recv.c:2277 msgid "idle: " msgstr "" -#: src/irc/irc-recv.c:2237 +#: src/irc/irc-recv.c:2285 msgid "days" msgstr "" -#: src/irc/irc-recv.c:2237 +#: src/irc/irc-recv.c:2285 msgid "day" msgstr "" -#: src/irc/irc-recv.c:2247 +#: src/irc/irc-recv.c:2295 msgid "hours" msgstr "" -#: src/irc/irc-recv.c:2247 +#: src/irc/irc-recv.c:2295 msgid "hour" msgstr "" -#: src/irc/irc-recv.c:2253 +#: src/irc/irc-recv.c:2301 msgid "minutes" msgstr "" -#: src/irc/irc-recv.c:2253 +#: src/irc/irc-recv.c:2301 msgid "minute" msgstr "" -#: src/irc/irc-recv.c:2259 +#: src/irc/irc-recv.c:2307 msgid "seconds" msgstr "" -#: src/irc/irc-recv.c:2259 +#: src/irc/irc-recv.c:2307 msgid "second" msgstr "" -#: src/irc/irc-recv.c:2264 +#: src/irc/irc-recv.c:2312 msgid "signon at: " msgstr "" -#: src/irc/irc-recv.c:2352 +#: src/irc/irc-recv.c:2400 msgid "Channels: " msgstr "" -#: src/irc/irc-recv.c:2604 +#: src/irc/irc-recv.c:2652 msgid "No topic set for " msgstr "" -#: src/irc/irc-recv.c:2646 +#: src/irc/irc-recv.c:2694 msgid "Topic for " msgstr "" -#: src/irc/irc-recv.c:2650 +#: src/irc/irc-recv.c:2698 #, c-format msgid " is: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2668 src/irc/irc-recv.c:2752 +#: src/irc/irc-recv.c:2716 src/irc/irc-recv.c:2800 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2714 +#: src/irc/irc-recv.c:2762 msgid "Topic set by " msgstr "" -#: src/irc/irc-recv.c:2734 +#: src/irc/irc-recv.c:2782 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2743 +#: src/irc/irc-recv.c:2791 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2885 +#: src/irc/irc-recv.c:2933 msgid " on " msgstr "" -#: src/irc/irc-recv.c:3008 +#: src/irc/irc-recv.c:3056 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:3063 +#: src/irc/irc-recv.c:3111 msgid "Nicks " msgstr "" -#: src/irc/irc-recv.c:3083 +#: src/irc/irc-recv.c:3131 msgid "Channel " msgstr "" -#: src/irc/irc-recv.c:3094 +#: src/irc/irc-recv.c:3142 msgid "nicks" msgstr "" -#: src/irc/irc-recv.c:3094 +#: src/irc/irc-recv.c:3142 msgid "nick" msgstr "" -#: src/irc/irc-recv.c:3102 +#: src/irc/irc-recv.c:3150 msgid "ops" msgstr "" -#: src/irc/irc-recv.c:3102 +#: src/irc/irc-recv.c:3150 msgid "op" msgstr "" -#: src/irc/irc-recv.c:3111 +#: src/irc/irc-recv.c:3159 msgid "halfops" msgstr "" -#: src/irc/irc-recv.c:3111 +#: src/irc/irc-recv.c:3159 msgid "halfop" msgstr "" -#: src/irc/irc-recv.c:3120 +#: src/irc/irc-recv.c:3168 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:3120 +#: src/irc/irc-recv.c:3168 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:3129 +#: src/irc/irc-recv.c:3177 msgid "normal" msgstr "" -#: src/irc/irc-recv.c:3165 +#: src/irc/irc-recv.c:3213 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:3177 +#: src/irc/irc-recv.c:3225 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:3189 +#: src/irc/irc-recv.c:3237 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " "server!\n" msgstr "" -#: src/irc/irc-recv.c:3199 +#: src/irc/irc-recv.c:3247 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" diff --git a/src/irc/irc-commands.c b/src/irc/irc-commands.c index 2769e536a..1588f3ccb 100644 --- a/src/irc/irc-commands.c +++ b/src/irc/irc-commands.c @@ -67,7 +67,7 @@ t_irc_command irc_commands[] = { "invite", N_("invite a nick on a channel"), N_("nickname channel"), N_("nickname: nick to invite\nchannel: channel to invite"), - 2, 2, 1, NULL, irc_cmd_send_invite, NULL }, + 1, 2, 1, irc_cmd_send_invite, NULL, irc_cmd_recv_invite }, { "ison", N_("check if a nickname is currently on IRC"), N_("nickname [nickname ...]"), N_("nickname: nickname"), diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c index 67b8d06df..1f42b1758 100644 --- a/src/irc/irc-recv.c +++ b/src/irc/irc-recv.c @@ -36,6 +36,7 @@ #include "../common/weechat.h" #include "irc.h" #include "../common/command.h" +#include "../common/hotlist.h" #include "../common/weeconfig.h" #include "../gui/gui.h" #include "../plugins/plugins.h" @@ -155,6 +156,51 @@ irc_cmd_recv_error (t_irc_server *server, char *host, char *arguments) } /* + * irc_cmd_recv_invite: 'invite' message received + */ + +int +irc_cmd_recv_invite (t_irc_server *server, char *host, char *arguments) +{ + char *pos, *pos_channel; + + pos = strchr (host, '!'); + if (pos) + pos[0] = '\0'; + + pos_channel = strchr (arguments, ' '); + if (pos_channel) + { + pos_channel[0] = '\0'; + pos_channel++; + while (pos_channel[0] == ' ') + pos_channel++; + if (pos_channel[0] == ':') + pos_channel++; + + irc_display_prefix (server->buffer, PREFIX_SERVER); + gui_printf (server->buffer, _("You have been invited to ")); + gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, + "%s ", pos_channel); + gui_printf (server->buffer, _("by")); + gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, + " %s\n", host); + hotlist_add (2, server->buffer); + gui_draw_buffer_status (gui_current_window->buffer, 1); + } + else + { + irc_display_prefix (server->buffer, PREFIX_ERROR); + gui_printf_nolog (server->buffer, + _("%s channel not found for \"%s\" command\n"), + WEECHAT_ERROR, "invite"); + return -1; + } + return 0; +} + + +/* * irc_cmd_recv_join: 'join' message received */ @@ -171,9 +217,9 @@ irc_cmd_recv_join (t_irc_server *server, char *host, char *arguments) if (!ptr_channel) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot create new channel \"%s\"\n"), - WEECHAT_ERROR, arguments); + gui_printf_nolog (server->buffer, + _("%s cannot create new channel \"%s\"\n"), + WEECHAT_ERROR, arguments); return -1; } } @@ -238,9 +284,9 @@ irc_cmd_recv_kick (t_irc_server *server, char *host, char *arguments) if (!ptr_channel) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s channel not found for \"%s\" command\n"), - WEECHAT_ERROR, "kick"); + gui_printf_nolog (server->buffer, + _("%s channel not found for \"%s\" command\n"), + WEECHAT_ERROR, "kick"); return -1; } @@ -271,9 +317,9 @@ irc_cmd_recv_kick (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s nick not found for \"%s\" command\n"), - WEECHAT_ERROR, "kick"); + gui_printf_nolog (server->buffer, + _("%s nick not found for \"%s\" command\n"), + WEECHAT_ERROR, "kick"); return -1; } if (strcmp (pos_nick, server->nick) == 0) @@ -561,9 +607,9 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) if (host == NULL) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s \"%s\" command received without host\n"), - WEECHAT_ERROR, "mode"); + gui_printf_nolog (server->buffer, + _("%s \"%s\" command received without host\n"), + WEECHAT_ERROR, "mode"); return -1; } @@ -576,9 +622,9 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) if (!pos) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s \"%s\" command received without channel or nickname\n"), - WEECHAT_ERROR, "mode"); + gui_printf_nolog (server->buffer, + _("%s \"%s\" command received without channel or nickname\n"), + WEECHAT_ERROR, "mode"); return -1; } pos[0] = '\0'; @@ -606,9 +652,9 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s channel not found for \"%s\" command\n"), - WEECHAT_ERROR, "mode"); + gui_printf_nolog (server->buffer, + _("%s channel not found for \"%s\" command\n"), + WEECHAT_ERROR, "mode"); return -1; } } @@ -646,9 +692,9 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *arguments) if (host == NULL) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s \"%s\" command received without host\n"), - WEECHAT_ERROR, "nick"); + gui_printf_nolog (server->buffer, + _("%s \"%s\" command received without host\n"), + WEECHAT_ERROR, "nick"); return -1; } @@ -764,9 +810,9 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s nickname not found for \"%s\" command\n"), - WEECHAT_ERROR, "notice"); + gui_printf_nolog (server->buffer, + _("%s nickname not found for \"%s\" command\n"), + WEECHAT_ERROR, "notice"); return -1; } if (strncmp (pos, "\01VERSION", 8) == 0) @@ -837,6 +883,8 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments) gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": "); } gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", pos); + hotlist_add (2, server->buffer); + gui_draw_buffer_status (gui_current_window->buffer, 1); } } return 0; @@ -857,9 +905,9 @@ irc_cmd_recv_part (t_irc_server *server, char *host, char *arguments) if (!host || !arguments) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s \"%s\" command received without host or channel\n"), - WEECHAT_ERROR, "part"); + gui_printf_nolog (server->buffer, + _("%s \"%s\" command received without host or channel\n"), + WEECHAT_ERROR, "part"); return -1; } @@ -932,9 +980,9 @@ irc_cmd_recv_part (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s channel not found for \"%s\" command\n"), - WEECHAT_ERROR, "part"); + gui_printf_nolog (server->buffer, + _("%s channel not found for \"%s\" command\n"), + WEECHAT_ERROR, "part"); return -1; } @@ -1006,9 +1054,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (host == NULL) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s \"%s\" command received without host\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s \"%s\" command received without host\n"), + WEECHAT_ERROR, "privmsg"); return -1; } @@ -1110,9 +1158,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s nick not found for \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s nick not found for \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } } @@ -1120,9 +1168,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s channel not found for \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s channel not found for \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } } @@ -1206,9 +1254,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (!pos2) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } pos2[0] = '\0'; @@ -1223,9 +1271,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (!pos_size) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } pos2 = pos_size; @@ -1239,9 +1287,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (!pos_port) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } pos2 = pos_port; @@ -1255,9 +1303,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (!pos_addr) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } pos2 = pos_addr; @@ -1280,9 +1328,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (!pos2) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } pos2[0] = '\0'; @@ -1297,9 +1345,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (!pos_addr) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } pos_addr[0] = '\0'; @@ -1312,9 +1360,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (!pos_port) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } pos_port[0] = '\0'; @@ -1325,9 +1373,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (strcasecmp (pos_file, "chat") != 0) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s unknown DCC CHAT type received from "), - WEECHAT_ERROR); + gui_printf_nolog (server->buffer, + _("%s unknown DCC CHAT type received from "), + WEECHAT_ERROR); gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", host); gui_printf (server->buffer, ": \"%s\"\n", pos_file); @@ -1348,9 +1396,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (!ptr_channel) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot create new private window \"%s\"\n"), - WEECHAT_ERROR, host); + gui_printf_nolog (server->buffer, + _("%s cannot create new private window \"%s\"\n"), + WEECHAT_ERROR, host); return -1; } } @@ -1420,9 +1468,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } } @@ -1444,9 +1492,9 @@ irc_cmd_recv_quit (t_irc_server *server, char *host, char *arguments) if (host == NULL) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s \"%s\" command received without host\n"), - WEECHAT_ERROR, "quit"); + gui_printf_nolog (server->buffer, + _("%s \"%s\" command received without host\n"), + WEECHAT_ERROR, "quit"); return -1; } @@ -1596,9 +1644,9 @@ irc_cmd_recv_topic (t_irc_server *server, char *host, char *arguments) if (!string_is_channel (arguments)) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s \"%s\" command received without channel\n"), - WEECHAT_ERROR, "topic"); + gui_printf_nolog (server->buffer, + _("%s \"%s\" command received without channel\n"), + WEECHAT_ERROR, "topic"); return -1; } @@ -2654,9 +2702,9 @@ irc_cmd_recv_332 (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s channel not found for \"%s\" command\n"), - WEECHAT_ERROR, "332"); + gui_printf_nolog (server->buffer, + _("%s channel not found for \"%s\" command\n"), + WEECHAT_ERROR, "332"); return -1; } } @@ -2664,9 +2712,9 @@ irc_cmd_recv_332 (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot identify channel for \"%s\" command\n"), - WEECHAT_ERROR, "332"); + gui_printf_nolog (server->buffer, + _("%s cannot identify channel for \"%s\" command\n"), + WEECHAT_ERROR, "332"); return -1; } return 0; @@ -2721,36 +2769,36 @@ irc_cmd_recv_333 (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s channel not found for \"%s\" command\n"), - WEECHAT_ERROR, "333"); + gui_printf_nolog (server->buffer, + _("%s channel not found for \"%s\" command\n"), + WEECHAT_ERROR, "333"); return -1; } } else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot identify date/time for \"%s\" command\n"), - WEECHAT_ERROR, "333"); + gui_printf_nolog (server->buffer, + _("%s cannot identify date/time for \"%s\" command\n"), + WEECHAT_ERROR, "333"); return -1; } } else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot identify nickname for \"%s\" command\n"), - WEECHAT_ERROR, "333"); + gui_printf_nolog (server->buffer, + _("%s cannot identify nickname for \"%s\" command\n"), + WEECHAT_ERROR, "333"); return -1; } } else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot identify channel for \"%s\" command\n"), - WEECHAT_ERROR, "333"); + gui_printf_nolog (server->buffer, + _("%s cannot identify channel for \"%s\" command\n"), + WEECHAT_ERROR, "333"); return -1; } return 0; @@ -2958,9 +3006,9 @@ irc_cmd_recv_353 (t_irc_server *server, char *host, char *arguments) if (pos[0] != ':') { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "353"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "353"); return -1; } pos++; @@ -3004,9 +3052,9 @@ irc_cmd_recv_353 (t_irc_server *server, char *host, char *arguments) is_op, is_halfop, has_voice)) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot create nick \"%s\" for channel \"%s\"\n"), - WEECHAT_ERROR, pos_nick, ptr_channel->name); + gui_printf_nolog (server->buffer, + _("%s cannot create nick \"%s\" for channel \"%s\"\n"), + WEECHAT_ERROR, pos_nick, ptr_channel->name); } } } @@ -3015,9 +3063,9 @@ irc_cmd_recv_353 (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "353"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "353"); return -1; } return 0; diff --git a/src/irc/irc-send.c b/src/irc/irc-send.c index 8fc1ec071..1d17350d8 100644 --- a/src/irc/irc-send.c +++ b/src/irc/irc-send.c @@ -409,9 +409,23 @@ irc_cmd_send_info (t_irc_server *server, char *arguments) */ int -irc_cmd_send_invite (t_irc_server *server, char *arguments) +irc_cmd_send_invite (t_irc_server *server, int argc, char **argv) { - server_sendf (server, "INVITE %s\r\n", arguments); + if (argc == 2) + server_sendf (server, "INVITE %s %s\r\n", argv[0], argv[1]); + else + { + if (!BUFFER_IS_CHANNEL(gui_current_window->buffer)) + { + irc_display_prefix (server->buffer, PREFIX_ERROR); + gui_printf_nolog (server->buffer, + _("%s \"%s\" command can only be executed in a channel window\n"), + WEECHAT_ERROR, "invite"); + return -1; + } + server_sendf (server, "INVITE %s %s\r\n", + argv[0], CHANNEL(gui_current_window->buffer)->name); + } return 0; } diff --git a/src/irc/irc.h b/src/irc/irc.h index dd01de6e0..b7b9b8453 100644 --- a/src/irc/irc.h +++ b/src/irc/irc.h @@ -324,7 +324,7 @@ 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 *); extern int irc_cmd_send_info (t_irc_server *, char *); -extern int irc_cmd_send_invite (t_irc_server *, char *); +extern int irc_cmd_send_invite (t_irc_server *, int, char **); extern int irc_cmd_send_ison (t_irc_server *, char *); extern int irc_cmd_send_join (t_irc_server *, char *); extern int irc_cmd_send_kick (t_irc_server *, char *); @@ -370,6 +370,7 @@ extern int irc_cmd_send_whois (t_irc_server *, char *); extern int irc_cmd_send_whowas (t_irc_server *, char *); /* IRC commands executed when received from server */ extern int irc_cmd_recv_error (t_irc_server *, char *, char *); +extern int irc_cmd_recv_invite (t_irc_server *, char *, char *); extern int irc_cmd_recv_join (t_irc_server *, char *, char *); extern int irc_cmd_recv_kick (t_irc_server *, char *, char *); extern int irc_cmd_recv_mode (t_irc_server *, char *, char *); diff --git a/weechat/ChangeLog b/weechat/ChangeLog index bdf334e9f..acffbf100 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -17,6 +17,7 @@ Version 0.1.1 (under dev!): * on server buffer, only server messages are logged * improved /help command output * plugins messages are logged with new config option (log_plugin_msg) + * fixed /invite command (and now invite requests are displayed) * fixed /buffer close command (now ok when disconnected from server) * fixed display bugs when many windows are opened diff --git a/weechat/po/es.po b/weechat/po/es.po index e9e99a460..482048ee2 100644 --- a/weechat/po/es.po +++ b/weechat/po/es.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.1-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-03-12 14:40+0100\n" -"PO-Revision-Date: 2005-03-12 04:10+0100\n" +"POT-Creation-Date: 2005-03-12 21:03+0100\n" +"PO-Revision-Date: 2005-03-12 21:05+0100\n" "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1194,7 +1194,7 @@ msgstr " (servidor temporal, no será guardado)" msgid "(hidden)" msgstr "(oculto)" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3211 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3259 msgid "unknown" msgstr "desconocido" @@ -1204,7 +1204,7 @@ msgid "%s: using local hostname \"%s\"\n" msgstr "%s: utilización del nombre de máquina local \"%s\"\n" #: src/irc/irc-send.c:265 src/irc/irc-send.c:277 src/irc/irc-send.c:295 -#: src/irc/irc-send.c:775 src/irc/irc-send.c:849 src/common/command.c:1124 +#: src/irc/irc-send.c:789 src/irc/irc-send.c:863 src/common/command.c:1124 #: src/common/command.c:1399 #, c-format msgid "%s wrong argument count for \"%s\" command\n" @@ -1215,418 +1215,428 @@ msgstr "%s número de argumentos incorrecto para el comando \"%s\"\n" msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s argumentos incorrecto para el comando \"%s\"\n" -#: src/irc/irc-send.c:346 src/irc/irc-send.c:372 src/irc/irc-send.c:473 -#: src/irc/irc-send.c:797 src/irc/irc-send.c:876 src/irc/irc-send.c:1376 +#: src/irc/irc-send.c:346 src/irc/irc-send.c:372 src/irc/irc-send.c:422 +#: src/irc/irc-send.c:487 src/irc/irc-send.c:811 src/irc/irc-send.c:890 +#: src/irc/irc-send.c:1390 #, c-format msgid "%s \"%s\" command can only be executed in a channel window\n" msgstr "" "%s el comando \"%s\" sólo puede ser ejecutado en una ventana de canal\n" -#: src/irc/irc-send.c:583 src/irc/irc-send.c:650 src/irc/irc-send.c:924 -#: src/irc/irc-send.c:938 src/irc/irc-send.c:1270 +#: src/irc/irc-send.c:597 src/irc/irc-send.c:664 src/irc/irc-send.c:938 +#: src/irc/irc-send.c:952 src/irc/irc-send.c:1284 #, c-format msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" "%s el comando \"%s\" no puede ser ejecutado en una ventana de servidor\n" -#: src/irc/irc-send.c:668 src/irc/irc-send.c:693 src/irc/irc-recv.c:275 -#: src/irc/irc-recv.c:1114 +#: src/irc/irc-send.c:682 src/irc/irc-send.c:707 src/irc/irc-recv.c:321 +#: src/irc/irc-recv.c:1162 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "%s usuario no encontrado para el comando \"%s\"\n" -#: src/irc/irc-send.c:745 src/irc/irc-send.c:1022 src/irc/irc-recv.c:1352 +#: src/irc/irc-send.c:759 src/irc/irc-send.c:1036 src/irc/irc-recv.c:1400 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n" -#: src/irc/irc-send.c:1348 +#: src/irc/irc-send.c:1362 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilado en %s %s\n" -#: src/irc/irc-recv.c:175 +#: src/irc/irc-recv.c:182 +msgid "You have been invited to " +msgstr "" + +#: src/irc/irc-recv.c:185 +msgid "by" +msgstr "por" + +#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:288 src/irc/irc-recv.c:656 +#: src/irc/irc-recv.c:984 src/irc/irc-recv.c:1172 src/irc/irc-recv.c:2706 +#: src/irc/irc-recv.c:2773 +#, c-format +msgid "%s channel not found for \"%s\" command\n" +msgstr "%s canal no encontrado para el comando \"%s\"\n" + +#: src/irc/irc-recv.c:221 #, c-format msgid "%s cannot create new channel \"%s\"\n" msgstr "%s no es posible crear un nuevo canal \"%s\"\n" -#: src/irc/irc-recv.c:195 +#: src/irc/irc-recv.c:241 msgid " has joined " msgstr " se ha unido " -#: src/irc/irc-recv.c:242 src/irc/irc-recv.c:610 src/irc/irc-recv.c:936 -#: src/irc/irc-recv.c:1124 src/irc/irc-recv.c:2658 src/irc/irc-recv.c:2725 -#, c-format -msgid "%s channel not found for \"%s\" command\n" -msgstr "%s canal no encontrado para el comando \"%s\"\n" - -#: src/irc/irc-recv.c:251 +#: src/irc/irc-recv.c:297 msgid " has kicked " msgstr " se ha expulsado " -#: src/irc/irc-recv.c:255 +#: src/irc/irc-recv.c:301 msgid " from " msgstr " de " -#: src/irc/irc-recv.c:333 +#: src/irc/irc-recv.c:379 msgid "sets ban on" msgstr "establecer baneo en" -#: src/irc/irc-recv.c:334 +#: src/irc/irc-recv.c:380 msgid "removes ban on" msgstr "quitar baneo en" -#: src/irc/irc-recv.c:351 +#: src/irc/irc-recv.c:397 msgid "sets invite-only channel flag" msgstr "define el canal sólo en modo invitado" -#: src/irc/irc-recv.c:352 +#: src/irc/irc-recv.c:398 msgid "removes invite-only channel flag" msgstr "elimina el modo sólo invitado para el canal" -#: src/irc/irc-recv.c:369 +#: src/irc/irc-recv.c:415 msgid "sets channel key to" msgstr "definir clave de canal en" -#: src/irc/irc-recv.c:370 +#: src/irc/irc-recv.c:416 msgid "removes channel key" msgstr "elimina la clave de canal" -#: src/irc/irc-recv.c:401 +#: src/irc/irc-recv.c:447 msgid "sets the user limit to" msgstr "define el límite de usuarios en" -#: src/irc/irc-recv.c:402 +#: src/irc/irc-recv.c:448 msgid "removes user limit" msgstr "elimina el límite de usuarios" -#: src/irc/irc-recv.c:424 +#: src/irc/irc-recv.c:470 msgid "sets moderated channel flag" msgstr "establece la moderación en el canal" -#: src/irc/irc-recv.c:425 +#: src/irc/irc-recv.c:471 msgid "removes moderated channel flag" msgstr "elimina la moderación en el canal" -#: src/irc/irc-recv.c:435 +#: src/irc/irc-recv.c:481 msgid "sets messages from channel only flag" msgstr "establece el modo sólo mensajes de usuarios del canal" -#: src/irc/irc-recv.c:436 +#: src/irc/irc-recv.c:482 msgid "removes messages from channel only flag" msgstr "autoriza a todos los usuarios a escribir en el canal" -#: src/irc/irc-recv.c:453 +#: src/irc/irc-recv.c:499 msgid "gives channel operator status to" msgstr "dar estado de operador de canal a" -#: src/irc/irc-recv.c:454 +#: src/irc/irc-recv.c:500 msgid "removes channel operator status from" msgstr "eliminar el estado de operador de canal a" -#: src/irc/irc-recv.c:481 +#: src/irc/irc-recv.c:527 msgid "sets private channel flag" msgstr "establece el canal como privado" -#: src/irc/irc-recv.c:482 +#: src/irc/irc-recv.c:528 msgid "removes private channel flag" msgstr "elimina el modo privado para el canal" -#: src/irc/irc-recv.c:492 +#: src/irc/irc-recv.c:538 msgid "sets secret channel flag" msgstr "establece el canal como secreto" -#: src/irc/irc-recv.c:493 +#: src/irc/irc-recv.c:539 msgid "removes secret channel flag" msgstr "elimina el modo secreto para el canal" -#: src/irc/irc-recv.c:503 +#: src/irc/irc-recv.c:549 msgid "sets topic protection" msgstr "activa la protección de tema" -#: src/irc/irc-recv.c:504 +#: src/irc/irc-recv.c:550 msgid "removes topic protection" msgstr "elimina la protección de tema" -#: src/irc/irc-recv.c:521 +#: src/irc/irc-recv.c:567 msgid "gives voice to" msgstr "da voz a" -#: src/irc/irc-recv.c:522 +#: src/irc/irc-recv.c:568 msgid "removes voice from" msgstr "quita la voz a" -#: src/irc/irc-recv.c:565 src/irc/irc-recv.c:650 src/irc/irc-recv.c:1010 -#: src/irc/irc-recv.c:1448 +#: src/irc/irc-recv.c:611 src/irc/irc-recv.c:696 src/irc/irc-recv.c:1058 +#: src/irc/irc-recv.c:1496 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "%s comando \"%s\" recibido sin host \n" -#: src/irc/irc-recv.c:580 +#: src/irc/irc-recv.c:626 #, c-format msgid "%s \"%s\" command received without channel or nickname\n" msgstr "%s comando \"%s\" recibido sin canal ó usuario\n" -#: src/irc/irc-recv.c:625 +#: src/irc/irc-recv.c:671 msgid "mode changed by" msgstr "modo cambiado por" -#: src/irc/irc-recv.c:688 +#: src/irc/irc-recv.c:734 msgid "You are " msgstr "Usted es " -#: src/irc/irc-recv.c:695 +#: src/irc/irc-recv.c:741 msgid " is " msgstr "es " -#: src/irc/irc-recv.c:699 +#: src/irc/irc-recv.c:745 msgid "now known as " msgstr "ahora conocido como" -#: src/irc/irc-recv.c:768 +#: src/irc/irc-recv.c:814 #, c-format msgid "%s nickname not found for \"%s\" command\n" msgstr "%s nombre de usuario no encontrado para el comando \"%s\"\n" -#: src/irc/irc-recv.c:781 src/irc/irc-recv.c:813 +#: src/irc/irc-recv.c:827 src/irc/irc-recv.c:859 msgid "reply from" msgstr "respuesta de" -#: src/irc/irc-recv.c:816 +#: src/irc/irc-recv.c:862 #, c-format msgid ": %ld.%ld seconds\n" msgstr ": %ld.%ld segundos\n" -#: src/irc/irc-recv.c:861 +#: src/irc/irc-recv.c:909 #, c-format msgid "%s \"%s\" command received without host or channel\n" msgstr "%s comando \"%s\" recibido sin host o canal\n" -#: src/irc/irc-recv.c:911 +#: src/irc/irc-recv.c:959 msgid " has left " msgstr " ha salido " -#: src/irc/irc-recv.c:1059 src/irc/irc-recv.c:1378 +#: src/irc/irc-recv.c:1107 src/irc/irc-recv.c:1426 #, c-format msgid "On %s: * %s %s" msgstr "En %s: * %s %s" -#: src/irc/irc-recv.c:1078 +#: src/irc/irc-recv.c:1126 #, c-format msgid "Received a CTCP SOUND \"%s\" from " msgstr "" -#: src/irc/irc-recv.c:1099 +#: src/irc/irc-recv.c:1147 #, c-format msgid "On %s: %s> %s" msgstr "En %s: %s> %s" -#: src/irc/irc-recv.c:1169 +#: src/irc/irc-recv.c:1217 msgid "Received a " msgstr "Recibido un " -#: src/irc/irc-recv.c:1171 +#: src/irc/irc-recv.c:1219 msgid "CTCP VERSION " msgstr "CTCP VERSION " -#: src/irc/irc-recv.c:1173 +#: src/irc/irc-recv.c:1221 msgid "from" msgstr "de" -#: src/irc/irc-recv.c:1210 src/irc/irc-recv.c:1227 src/irc/irc-recv.c:1243 -#: src/irc/irc-recv.c:1259 src/irc/irc-recv.c:1284 src/irc/irc-recv.c:1301 -#: src/irc/irc-recv.c:1316 src/irc/irc-recv.c:1424 src/irc/irc-recv.c:2962 -#: src/irc/irc-recv.c:3019 +#: src/irc/irc-recv.c:1258 src/irc/irc-recv.c:1275 src/irc/irc-recv.c:1291 +#: src/irc/irc-recv.c:1307 src/irc/irc-recv.c:1332 src/irc/irc-recv.c:1349 +#: src/irc/irc-recv.c:1364 src/irc/irc-recv.c:1472 src/irc/irc-recv.c:3010 +#: src/irc/irc-recv.c:3067 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s no es posible analizar el comando \"%s\"\n" -#: src/irc/irc-recv.c:1329 +#: src/irc/irc-recv.c:1377 #, c-format msgid "%s unknown DCC CHAT type received from " msgstr "%s tipo DCC CHAT desconocido recibido de " -#: src/irc/irc-recv.c:1404 src/irc/irc-dcc.c:759 +#: src/irc/irc-recv.c:1452 src/irc/irc-dcc.c:759 #, c-format msgid "Private %s> %s" msgstr "Privado %s> %s" -#: src/irc/irc-recv.c:1480 +#: src/irc/irc-recv.c:1528 msgid "has quit" msgstr "ha salido" -#: src/irc/irc-recv.c:1600 +#: src/irc/irc-recv.c:1648 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s comando \"%s\" recibido sin canal\n" -#: src/irc/irc-recv.c:1628 +#: src/irc/irc-recv.c:1676 msgid " has changed topic for " msgstr "ha cambiado el tema por " -#: src/irc/irc-recv.c:1633 +#: src/irc/irc-recv.c:1681 #, c-format msgid " to: \"%s\"\n" msgstr " a: \"%s\"\n" -#: src/irc/irc-recv.c:1639 +#: src/irc/irc-recv.c:1687 msgid " has unset topic for " msgstr " ha quitado el tema por " -#: src/irc/irc-recv.c:1750 +#: src/irc/irc-recv.c:1798 #, c-format msgid " is away: %s\n" msgstr " está ausente: %s\n" -#: src/irc/irc-recv.c:1824 +#: src/irc/irc-recv.c:1872 msgid "Users online: " msgstr "Usuarios conectados: " -#: src/irc/irc-recv.c:2229 +#: src/irc/irc-recv.c:2277 msgid "idle: " msgstr "sin actividad: " -#: src/irc/irc-recv.c:2237 +#: src/irc/irc-recv.c:2285 msgid "days" msgstr "días" -#: src/irc/irc-recv.c:2237 +#: src/irc/irc-recv.c:2285 msgid "day" msgstr "día" -#: src/irc/irc-recv.c:2247 +#: src/irc/irc-recv.c:2295 msgid "hours" msgstr "horas" -#: src/irc/irc-recv.c:2247 +#: src/irc/irc-recv.c:2295 msgid "hour" msgstr "hora" -#: src/irc/irc-recv.c:2253 +#: src/irc/irc-recv.c:2301 msgid "minutes" msgstr "minutos" -#: src/irc/irc-recv.c:2253 +#: src/irc/irc-recv.c:2301 msgid "minute" msgstr "minuto" -#: src/irc/irc-recv.c:2259 +#: src/irc/irc-recv.c:2307 msgid "seconds" msgstr "segundos" -#: src/irc/irc-recv.c:2259 +#: src/irc/irc-recv.c:2307 msgid "second" msgstr "segundo" -#: src/irc/irc-recv.c:2264 +#: src/irc/irc-recv.c:2312 msgid "signon at: " msgstr "firmado el: " -#: src/irc/irc-recv.c:2352 +#: src/irc/irc-recv.c:2400 msgid "Channels: " msgstr "Canales: " -#: src/irc/irc-recv.c:2604 +#: src/irc/irc-recv.c:2652 msgid "No topic set for " msgstr "No hay tema definido para " -#: src/irc/irc-recv.c:2646 +#: src/irc/irc-recv.c:2694 msgid "Topic for " msgstr "El tema para " -#: src/irc/irc-recv.c:2650 +#: src/irc/irc-recv.c:2698 #, c-format msgid " is: \"%s\"\n" msgstr " es: \"%s\"\n" -#: src/irc/irc-recv.c:2668 src/irc/irc-recv.c:2752 +#: src/irc/irc-recv.c:2716 src/irc/irc-recv.c:2800 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "%s no es posible identificar el canal para el comando \"%s\"\n" -#: src/irc/irc-recv.c:2714 +#: src/irc/irc-recv.c:2762 msgid "Topic set by " msgstr "Tema definido por " -#: src/irc/irc-recv.c:2734 +#: src/irc/irc-recv.c:2782 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "%s no es posible identificar la fecha/hora para el comando \"%s\"\n" -#: src/irc/irc-recv.c:2743 +#: src/irc/irc-recv.c:2791 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" "%s no es posible determinar el nombre de usuario para el comando \"%s\"\n" -#: src/irc/irc-recv.c:2885 +#: src/irc/irc-recv.c:2933 msgid " on " msgstr " en " -#: src/irc/irc-recv.c:3008 +#: src/irc/irc-recv.c:3056 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "%s no es posible crear el usuario \"%s\" para el canal \"%s\"\n" -#: src/irc/irc-recv.c:3063 +#: src/irc/irc-recv.c:3111 msgid "Nicks " msgstr "Usuarios " -#: src/irc/irc-recv.c:3083 +#: src/irc/irc-recv.c:3131 msgid "Channel " msgstr "Canal " -#: src/irc/irc-recv.c:3094 +#: src/irc/irc-recv.c:3142 msgid "nicks" msgstr "usuarios" -#: src/irc/irc-recv.c:3094 +#: src/irc/irc-recv.c:3142 msgid "nick" msgstr "usuario" -#: src/irc/irc-recv.c:3102 +#: src/irc/irc-recv.c:3150 msgid "ops" msgstr "operadores" -#: src/irc/irc-recv.c:3102 +#: src/irc/irc-recv.c:3150 msgid "op" msgstr "operador" -#: src/irc/irc-recv.c:3111 +#: src/irc/irc-recv.c:3159 msgid "halfops" msgstr "semi-operadores" -#: src/irc/irc-recv.c:3111 +#: src/irc/irc-recv.c:3159 msgid "halfop" msgstr "semi-operador" -#: src/irc/irc-recv.c:3120 +#: src/irc/irc-recv.c:3168 msgid "voices" msgstr "voces" -#: src/irc/irc-recv.c:3120 +#: src/irc/irc-recv.c:3168 msgid "voice" msgstr "voz" -#: src/irc/irc-recv.c:3129 +#: src/irc/irc-recv.c:3177 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:3165 +#: src/irc/irc-recv.c:3213 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 2º nombre de " "usuario \"%s\"\n" -#: src/irc/irc-recv.c:3177 +#: src/irc/irc-recv.c:3225 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 3º nombre de " "usuario \"%s\"\n" -#: src/irc/irc-recv.c:3189 +#: src/irc/irc-recv.c:3237 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1635,7 +1645,7 @@ msgstr "" "%s: ¡todos los nombres de usuario declarados ya están en uso, cerrando la " "conexión con el servidor!\n" -#: src/irc/irc-recv.c:3199 +#: src/irc/irc-recv.c:3247 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" diff --git a/weechat/po/fr.po b/weechat/po/fr.po index a98ddde85..57ed14a41 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.1-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-03-12 14:40+0100\n" -"PO-Revision-Date: 2005-03-12 14:41+0100\n" +"POT-Creation-Date: 2005-03-12 21:03+0100\n" +"PO-Revision-Date: 2005-03-12 21:04+0100\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1193,7 +1193,7 @@ msgstr " (serveur temporaire, ne sera pas sauvé)" msgid "(hidden)" msgstr "(caché)" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3211 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3259 msgid "unknown" msgstr "inconnu" @@ -1203,7 +1203,7 @@ msgid "%s: using local hostname \"%s\"\n" msgstr "%s: utilisation du nom de machine local \"%s\"\n" #: src/irc/irc-send.c:265 src/irc/irc-send.c:277 src/irc/irc-send.c:295 -#: src/irc/irc-send.c:775 src/irc/irc-send.c:849 src/common/command.c:1124 +#: src/irc/irc-send.c:789 src/irc/irc-send.c:863 src/common/command.c:1124 #: src/common/command.c:1399 #, c-format msgid "%s wrong argument count for \"%s\" command\n" @@ -1214,419 +1214,429 @@ msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n" msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s paramètres invalides pour la commande \"%s\"\n" -#: src/irc/irc-send.c:346 src/irc/irc-send.c:372 src/irc/irc-send.c:473 -#: src/irc/irc-send.c:797 src/irc/irc-send.c:876 src/irc/irc-send.c:1376 +#: src/irc/irc-send.c:346 src/irc/irc-send.c:372 src/irc/irc-send.c:422 +#: src/irc/irc-send.c:487 src/irc/irc-send.c:811 src/irc/irc-send.c:890 +#: src/irc/irc-send.c:1390 #, 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:583 src/irc/irc-send.c:650 src/irc/irc-send.c:924 -#: src/irc/irc-send.c:938 src/irc/irc-send.c:1270 +#: src/irc/irc-send.c:597 src/irc/irc-send.c:664 src/irc/irc-send.c:938 +#: src/irc/irc-send.c:952 src/irc/irc-send.c:1284 #, 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:668 src/irc/irc-send.c:693 src/irc/irc-recv.c:275 -#: src/irc/irc-recv.c:1114 +#: src/irc/irc-send.c:682 src/irc/irc-send.c:707 src/irc/irc-recv.c:321 +#: src/irc/irc-recv.c:1162 #, 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:745 src/irc/irc-send.c:1022 src/irc/irc-recv.c:1352 +#: src/irc/irc-send.c:759 src/irc/irc-send.c:1036 src/irc/irc-recv.c:1400 #, 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:1348 +#: src/irc/irc-send.c:1362 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilé le %s %s\n" -#: src/irc/irc-recv.c:175 +#: src/irc/irc-recv.c:182 +msgid "You have been invited to " +msgstr "Vous avez été invité sur " + +#: src/irc/irc-recv.c:185 +msgid "by" +msgstr "par" + +#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:288 src/irc/irc-recv.c:656 +#: src/irc/irc-recv.c:984 src/irc/irc-recv.c:1172 src/irc/irc-recv.c:2706 +#: src/irc/irc-recv.c:2773 +#, c-format +msgid "%s channel not found for \"%s\" command\n" +msgstr "%s canal non trouvé pour la commande \"%s\"\n" + +#: src/irc/irc-recv.c:221 #, c-format msgid "%s cannot create new channel \"%s\"\n" msgstr "%s impossible de créer le nouveau canal \"%s\"\n" -#: src/irc/irc-recv.c:195 +#: src/irc/irc-recv.c:241 msgid " has joined " msgstr " a rejoint " -#: src/irc/irc-recv.c:242 src/irc/irc-recv.c:610 src/irc/irc-recv.c:936 -#: src/irc/irc-recv.c:1124 src/irc/irc-recv.c:2658 src/irc/irc-recv.c:2725 -#, c-format -msgid "%s channel not found for \"%s\" command\n" -msgstr "%s canal non trouvé pour la commande \"%s\"\n" - -#: src/irc/irc-recv.c:251 +#: src/irc/irc-recv.c:297 msgid " has kicked " msgstr " a poussé dehors " -#: src/irc/irc-recv.c:255 +#: src/irc/irc-recv.c:301 msgid " from " msgstr " de " -#: src/irc/irc-recv.c:333 +#: src/irc/irc-recv.c:379 msgid "sets ban on" msgstr "instaure un bannissement sur" -#: src/irc/irc-recv.c:334 +#: src/irc/irc-recv.c:380 msgid "removes ban on" msgstr "supprime le banissement sur" -#: src/irc/irc-recv.c:351 +#: src/irc/irc-recv.c:397 msgid "sets invite-only channel flag" msgstr "définit le canal en mode invité seulement" -#: src/irc/irc-recv.c:352 +#: src/irc/irc-recv.c:398 msgid "removes invite-only channel flag" msgstr "supprime le mode invité seulement pour le canal" -#: src/irc/irc-recv.c:369 +#: src/irc/irc-recv.c:415 msgid "sets channel key to" msgstr "définit la clé du canal à" -#: src/irc/irc-recv.c:370 +#: src/irc/irc-recv.c:416 msgid "removes channel key" msgstr "supprime la clé du canal" -#: src/irc/irc-recv.c:401 +#: src/irc/irc-recv.c:447 msgid "sets the user limit to" msgstr "définit la limite d'utilisateurs à" -#: src/irc/irc-recv.c:402 +#: src/irc/irc-recv.c:448 msgid "removes user limit" msgstr "supprime la limite d'utilisateurs" -#: src/irc/irc-recv.c:424 +#: src/irc/irc-recv.c:470 msgid "sets moderated channel flag" msgstr "instaure la modération sur le canal" -#: src/irc/irc-recv.c:425 +#: src/irc/irc-recv.c:471 msgid "removes moderated channel flag" msgstr "supprime la modération sur le canal" -#: src/irc/irc-recv.c:435 +#: src/irc/irc-recv.c:481 msgid "sets messages from channel only flag" msgstr "interdit aux utilisateurs en dehors du canal d'y écrire" -#: src/irc/irc-recv.c:436 +#: src/irc/irc-recv.c:482 msgid "removes messages from channel only flag" msgstr "autorise tout utilisateur à écrire sur le canal" -#: src/irc/irc-recv.c:453 +#: src/irc/irc-recv.c:499 msgid "gives channel operator status to" msgstr "donne le droit opérateur à" -#: src/irc/irc-recv.c:454 +#: src/irc/irc-recv.c:500 msgid "removes channel operator status from" msgstr "supprime le droit opérateur à" -#: src/irc/irc-recv.c:481 +#: src/irc/irc-recv.c:527 msgid "sets private channel flag" msgstr "définit le canal comme privé" -#: src/irc/irc-recv.c:482 +#: src/irc/irc-recv.c:528 msgid "removes private channel flag" msgstr "supprime le mode privé pour le canal" -#: src/irc/irc-recv.c:492 +#: src/irc/irc-recv.c:538 msgid "sets secret channel flag" msgstr "définit le canal comme secret" -#: src/irc/irc-recv.c:493 +#: src/irc/irc-recv.c:539 msgid "removes secret channel flag" msgstr "supprime le mode secret pour le canal" -#: src/irc/irc-recv.c:503 +#: src/irc/irc-recv.c:549 msgid "sets topic protection" msgstr "active la protection du titre" -#: src/irc/irc-recv.c:504 +#: src/irc/irc-recv.c:550 msgid "removes topic protection" msgstr "supprime la protection du titre" -#: src/irc/irc-recv.c:521 +#: src/irc/irc-recv.c:567 msgid "gives voice to" msgstr "donne la voix à" -#: src/irc/irc-recv.c:522 +#: src/irc/irc-recv.c:568 msgid "removes voice from" msgstr "supprime la voix de" -#: src/irc/irc-recv.c:565 src/irc/irc-recv.c:650 src/irc/irc-recv.c:1010 -#: src/irc/irc-recv.c:1448 +#: src/irc/irc-recv.c:611 src/irc/irc-recv.c:696 src/irc/irc-recv.c:1058 +#: src/irc/irc-recv.c:1496 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "%s commande \"%s\" reçue sans host\n" -#: src/irc/irc-recv.c:580 +#: src/irc/irc-recv.c:626 #, c-format msgid "%s \"%s\" command received without channel or nickname\n" msgstr "%s commande \"%s\" reçue sans canal ou utilisateur\n" -#: src/irc/irc-recv.c:625 +#: src/irc/irc-recv.c:671 msgid "mode changed by" msgstr "mode changé par" -#: src/irc/irc-recv.c:688 +#: src/irc/irc-recv.c:734 msgid "You are " msgstr "Vous êtes " -#: src/irc/irc-recv.c:695 +#: src/irc/irc-recv.c:741 msgid " is " msgstr " est " -#: src/irc/irc-recv.c:699 +#: src/irc/irc-recv.c:745 msgid "now known as " msgstr "maintenant connu sous le nom " -#: src/irc/irc-recv.c:768 +#: src/irc/irc-recv.c:814 #, 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:781 src/irc/irc-recv.c:813 +#: src/irc/irc-recv.c:827 src/irc/irc-recv.c:859 msgid "reply from" msgstr "réponse de" -#: src/irc/irc-recv.c:816 +#: src/irc/irc-recv.c:862 #, c-format msgid ": %ld.%ld seconds\n" msgstr ": %ld.%ld secondes\n" -#: src/irc/irc-recv.c:861 +#: src/irc/irc-recv.c:909 #, 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:911 +#: src/irc/irc-recv.c:959 msgid " has left " msgstr " a quitté " -#: src/irc/irc-recv.c:1059 src/irc/irc-recv.c:1378 +#: src/irc/irc-recv.c:1107 src/irc/irc-recv.c:1426 #, c-format msgid "On %s: * %s %s" msgstr "Sur %s: * %s %s" -#: src/irc/irc-recv.c:1078 +#: src/irc/irc-recv.c:1126 #, c-format msgid "Received a CTCP SOUND \"%s\" from " msgstr "CTCP SOUND \"%s\" reçu de " -#: src/irc/irc-recv.c:1099 +#: src/irc/irc-recv.c:1147 #, c-format msgid "On %s: %s> %s" msgstr "Sur %s: %s> %s" -#: src/irc/irc-recv.c:1169 +#: src/irc/irc-recv.c:1217 msgid "Received a " msgstr "Reçu un " -#: src/irc/irc-recv.c:1171 +#: src/irc/irc-recv.c:1219 msgid "CTCP VERSION " msgstr "CTCP VERSION " -#: src/irc/irc-recv.c:1173 +#: src/irc/irc-recv.c:1221 msgid "from" msgstr "de" -#: src/irc/irc-recv.c:1210 src/irc/irc-recv.c:1227 src/irc/irc-recv.c:1243 -#: src/irc/irc-recv.c:1259 src/irc/irc-recv.c:1284 src/irc/irc-recv.c:1301 -#: src/irc/irc-recv.c:1316 src/irc/irc-recv.c:1424 src/irc/irc-recv.c:2962 -#: src/irc/irc-recv.c:3019 +#: src/irc/irc-recv.c:1258 src/irc/irc-recv.c:1275 src/irc/irc-recv.c:1291 +#: src/irc/irc-recv.c:1307 src/irc/irc-recv.c:1332 src/irc/irc-recv.c:1349 +#: src/irc/irc-recv.c:1364 src/irc/irc-recv.c:1472 src/irc/irc-recv.c:3010 +#: src/irc/irc-recv.c:3067 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s impossible d'analyser la commande \"%s\"\n" -#: src/irc/irc-recv.c:1329 +#: src/irc/irc-recv.c:1377 #, c-format msgid "%s unknown DCC CHAT type received from " msgstr "%s type de DCC CHAT inconnu reçu de " -#: src/irc/irc-recv.c:1404 src/irc/irc-dcc.c:759 +#: src/irc/irc-recv.c:1452 src/irc/irc-dcc.c:759 #, c-format msgid "Private %s> %s" msgstr "Prive %s> %s" -#: src/irc/irc-recv.c:1480 +#: src/irc/irc-recv.c:1528 msgid "has quit" msgstr "a quitté" -#: src/irc/irc-recv.c:1600 +#: src/irc/irc-recv.c:1648 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s commande \"%s\" reçue sans canal\n" -#: src/irc/irc-recv.c:1628 +#: src/irc/irc-recv.c:1676 msgid " has changed topic for " msgstr " a changé le titre pour " -#: src/irc/irc-recv.c:1633 +#: src/irc/irc-recv.c:1681 #, c-format msgid " to: \"%s\"\n" msgstr " en: \"%s\"\n" -#: src/irc/irc-recv.c:1639 +#: src/irc/irc-recv.c:1687 msgid " has unset topic for " msgstr " a retiré le titre pour " -#: src/irc/irc-recv.c:1750 +#: src/irc/irc-recv.c:1798 #, c-format msgid " is away: %s\n" msgstr " est absent: %s\n" -#: src/irc/irc-recv.c:1824 +#: src/irc/irc-recv.c:1872 msgid "Users online: " msgstr "Utilisateurs en ligne: " -#: src/irc/irc-recv.c:2229 +#: src/irc/irc-recv.c:2277 msgid "idle: " msgstr "inactivité: " -#: src/irc/irc-recv.c:2237 +#: src/irc/irc-recv.c:2285 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:2237 +#: src/irc/irc-recv.c:2285 msgid "day" msgstr "jour" -#: src/irc/irc-recv.c:2247 +#: src/irc/irc-recv.c:2295 msgid "hours" msgstr "heures" -#: src/irc/irc-recv.c:2247 +#: src/irc/irc-recv.c:2295 msgid "hour" msgstr "heure" -#: src/irc/irc-recv.c:2253 +#: src/irc/irc-recv.c:2301 msgid "minutes" msgstr "minutes" -#: src/irc/irc-recv.c:2253 +#: src/irc/irc-recv.c:2301 msgid "minute" msgstr "minute" -#: src/irc/irc-recv.c:2259 +#: src/irc/irc-recv.c:2307 msgid "seconds" msgstr "secondes" -#: src/irc/irc-recv.c:2259 +#: src/irc/irc-recv.c:2307 msgid "second" msgstr "seconde" -#: src/irc/irc-recv.c:2264 +#: src/irc/irc-recv.c:2312 msgid "signon at: " msgstr "signé le: " -#: src/irc/irc-recv.c:2352 +#: src/irc/irc-recv.c:2400 msgid "Channels: " msgstr "Canaux: " -#: src/irc/irc-recv.c:2604 +#: src/irc/irc-recv.c:2652 msgid "No topic set for " msgstr "Pas de titre défini pour " -#: src/irc/irc-recv.c:2646 +#: src/irc/irc-recv.c:2694 msgid "Topic for " msgstr "Le titre pour " -#: src/irc/irc-recv.c:2650 +#: src/irc/irc-recv.c:2698 #, c-format msgid " is: \"%s\"\n" msgstr " est: \"%s\"\n" -#: src/irc/irc-recv.c:2668 src/irc/irc-recv.c:2752 +#: src/irc/irc-recv.c:2716 src/irc/irc-recv.c:2800 #, 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:2714 +#: src/irc/irc-recv.c:2762 msgid "Topic set by " msgstr "Titre défini par " -#: src/irc/irc-recv.c:2734 +#: src/irc/irc-recv.c:2782 #, 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:2743 +#: src/irc/irc-recv.c:2791 #, 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:2885 +#: src/irc/irc-recv.c:2933 msgid " on " msgstr " sur " -#: src/irc/irc-recv.c:3008 +#: src/irc/irc-recv.c:3056 #, 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:3063 +#: src/irc/irc-recv.c:3111 msgid "Nicks " msgstr "Utilisateurs " -#: src/irc/irc-recv.c:3083 +#: src/irc/irc-recv.c:3131 msgid "Channel " msgstr "Canal " -#: src/irc/irc-recv.c:3094 +#: src/irc/irc-recv.c:3142 msgid "nicks" msgstr "utilisateurs" -#: src/irc/irc-recv.c:3094 +#: src/irc/irc-recv.c:3142 msgid "nick" msgstr "utilisateur" -#: src/irc/irc-recv.c:3102 +#: src/irc/irc-recv.c:3150 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:3102 +#: src/irc/irc-recv.c:3150 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:3111 +#: src/irc/irc-recv.c:3159 msgid "halfops" msgstr "halfops" -#: src/irc/irc-recv.c:3111 +#: src/irc/irc-recv.c:3159 msgid "halfop" msgstr "halfop" -#: src/irc/irc-recv.c:3120 +#: src/irc/irc-recv.c:3168 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:3120 +#: src/irc/irc-recv.c:3168 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:3129 +#: src/irc/irc-recv.c:3177 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:3165 +#: src/irc/irc-recv.c:3213 #, 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:3177 +#: src/irc/irc-recv.c:3225 #, 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 avec le 3ème " "nom d'utilisateur \"%s\"\n" -#: src/irc/irc-recv.c:3189 +#: src/irc/irc-recv.c:3237 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1635,7 +1645,7 @@ msgstr "" "%s: tous les noms d'utilisateurs déclarés sont déjà en cours d'utilisation, " "fermeture de la connexion avec le serveur !\n" -#: src/irc/irc-recv.c:3199 +#: src/irc/irc-recv.c:3247 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index 25a3d943d..1ad725d2b 100644 --- a/weechat/po/weechat.pot +++ b/weechat/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-03-12 14:40+0100\n" +"POT-Creation-Date: 2005-03-12 21:03+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" @@ -1096,7 +1096,7 @@ msgstr "" msgid "(hidden)" msgstr "" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3211 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3259 msgid "unknown" msgstr "" @@ -1106,7 +1106,7 @@ msgid "%s: using local hostname \"%s\"\n" msgstr "" #: src/irc/irc-send.c:265 src/irc/irc-send.c:277 src/irc/irc-send.c:295 -#: src/irc/irc-send.c:775 src/irc/irc-send.c:849 src/common/command.c:1124 +#: src/irc/irc-send.c:789 src/irc/irc-send.c:863 src/common/command.c:1124 #: src/common/command.c:1399 #, c-format msgid "%s wrong argument count for \"%s\" command\n" @@ -1117,418 +1117,428 @@ msgstr "" msgid "%s wrong arguments for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:346 src/irc/irc-send.c:372 src/irc/irc-send.c:473 -#: src/irc/irc-send.c:797 src/irc/irc-send.c:876 src/irc/irc-send.c:1376 +#: src/irc/irc-send.c:346 src/irc/irc-send.c:372 src/irc/irc-send.c:422 +#: src/irc/irc-send.c:487 src/irc/irc-send.c:811 src/irc/irc-send.c:890 +#: src/irc/irc-send.c:1390 #, c-format msgid "%s \"%s\" command can only be executed in a channel window\n" msgstr "" -#: src/irc/irc-send.c:583 src/irc/irc-send.c:650 src/irc/irc-send.c:924 -#: src/irc/irc-send.c:938 src/irc/irc-send.c:1270 +#: src/irc/irc-send.c:597 src/irc/irc-send.c:664 src/irc/irc-send.c:938 +#: src/irc/irc-send.c:952 src/irc/irc-send.c:1284 #, c-format msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" -#: src/irc/irc-send.c:668 src/irc/irc-send.c:693 src/irc/irc-recv.c:275 -#: src/irc/irc-recv.c:1114 +#: src/irc/irc-send.c:682 src/irc/irc-send.c:707 src/irc/irc-recv.c:321 +#: src/irc/irc-recv.c:1162 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:745 src/irc/irc-send.c:1022 src/irc/irc-recv.c:1352 +#: src/irc/irc-send.c:759 src/irc/irc-send.c:1036 src/irc/irc-recv.c:1400 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:1348 +#: src/irc/irc-send.c:1362 #, c-format msgid "%s, compiled on %s %s\n" msgstr "" -#: src/irc/irc-recv.c:175 -#, c-format -msgid "%s cannot create new channel \"%s\"\n" +#: src/irc/irc-recv.c:182 +msgid "You have been invited to " msgstr "" -#: src/irc/irc-recv.c:195 -msgid " has joined " +#: src/irc/irc-recv.c:185 +msgid "by" msgstr "" -#: src/irc/irc-recv.c:242 src/irc/irc-recv.c:610 src/irc/irc-recv.c:936 -#: src/irc/irc-recv.c:1124 src/irc/irc-recv.c:2658 src/irc/irc-recv.c:2725 +#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:288 src/irc/irc-recv.c:656 +#: src/irc/irc-recv.c:984 src/irc/irc-recv.c:1172 src/irc/irc-recv.c:2706 +#: src/irc/irc-recv.c:2773 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:251 +#: src/irc/irc-recv.c:221 +#, c-format +msgid "%s cannot create new channel \"%s\"\n" +msgstr "" + +#: src/irc/irc-recv.c:241 +msgid " has joined " +msgstr "" + +#: src/irc/irc-recv.c:297 msgid " has kicked " msgstr "" -#: src/irc/irc-recv.c:255 +#: src/irc/irc-recv.c:301 msgid " from " msgstr "" -#: src/irc/irc-recv.c:333 +#: src/irc/irc-recv.c:379 msgid "sets ban on" msgstr "" -#: src/irc/irc-recv.c:334 +#: src/irc/irc-recv.c:380 msgid "removes ban on" msgstr "" -#: src/irc/irc-recv.c:351 +#: src/irc/irc-recv.c:397 msgid "sets invite-only channel flag" msgstr "" -#: src/irc/irc-recv.c:352 +#: src/irc/irc-recv.c:398 msgid "removes invite-only channel flag" msgstr "" -#: src/irc/irc-recv.c:369 +#: src/irc/irc-recv.c:415 msgid "sets channel key to" msgstr "" -#: src/irc/irc-recv.c:370 +#: src/irc/irc-recv.c:416 msgid "removes channel key" msgstr "" -#: src/irc/irc-recv.c:401 +#: src/irc/irc-recv.c:447 msgid "sets the user limit to" msgstr "" -#: src/irc/irc-recv.c:402 +#: src/irc/irc-recv.c:448 msgid "removes user limit" msgstr "" -#: src/irc/irc-recv.c:424 +#: src/irc/irc-recv.c:470 msgid "sets moderated channel flag" msgstr "" -#: src/irc/irc-recv.c:425 +#: src/irc/irc-recv.c:471 msgid "removes moderated channel flag" msgstr "" -#: src/irc/irc-recv.c:435 +#: src/irc/irc-recv.c:481 msgid "sets messages from channel only flag" msgstr "" -#: src/irc/irc-recv.c:436 +#: src/irc/irc-recv.c:482 msgid "removes messages from channel only flag" msgstr "" -#: src/irc/irc-recv.c:453 +#: src/irc/irc-recv.c:499 msgid "gives channel operator status to" msgstr "" -#: src/irc/irc-recv.c:454 +#: src/irc/irc-recv.c:500 msgid "removes channel operator status from" msgstr "" -#: src/irc/irc-recv.c:481 +#: src/irc/irc-recv.c:527 msgid "sets private channel flag" msgstr "" -#: src/irc/irc-recv.c:482 +#: src/irc/irc-recv.c:528 msgid "removes private channel flag" msgstr "" -#: src/irc/irc-recv.c:492 +#: src/irc/irc-recv.c:538 msgid "sets secret channel flag" msgstr "" -#: src/irc/irc-recv.c:493 +#: src/irc/irc-recv.c:539 msgid "removes secret channel flag" msgstr "" -#: src/irc/irc-recv.c:503 +#: src/irc/irc-recv.c:549 msgid "sets topic protection" msgstr "" -#: src/irc/irc-recv.c:504 +#: src/irc/irc-recv.c:550 msgid "removes topic protection" msgstr "" -#: src/irc/irc-recv.c:521 +#: src/irc/irc-recv.c:567 msgid "gives voice to" msgstr "" -#: src/irc/irc-recv.c:522 +#: src/irc/irc-recv.c:568 msgid "removes voice from" msgstr "" -#: src/irc/irc-recv.c:565 src/irc/irc-recv.c:650 src/irc/irc-recv.c:1010 -#: src/irc/irc-recv.c:1448 +#: src/irc/irc-recv.c:611 src/irc/irc-recv.c:696 src/irc/irc-recv.c:1058 +#: src/irc/irc-recv.c:1496 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "" -#: src/irc/irc-recv.c:580 +#: src/irc/irc-recv.c:626 #, c-format msgid "%s \"%s\" command received without channel or nickname\n" msgstr "" -#: src/irc/irc-recv.c:625 +#: src/irc/irc-recv.c:671 msgid "mode changed by" msgstr "" -#: src/irc/irc-recv.c:688 +#: src/irc/irc-recv.c:734 msgid "You are " msgstr "" -#: src/irc/irc-recv.c:695 +#: src/irc/irc-recv.c:741 msgid " is " msgstr "" -#: src/irc/irc-recv.c:699 +#: src/irc/irc-recv.c:745 msgid "now known as " msgstr "" -#: src/irc/irc-recv.c:768 +#: src/irc/irc-recv.c:814 #, c-format msgid "%s nickname not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:781 src/irc/irc-recv.c:813 +#: src/irc/irc-recv.c:827 src/irc/irc-recv.c:859 msgid "reply from" msgstr "" -#: src/irc/irc-recv.c:816 +#: src/irc/irc-recv.c:862 #, c-format msgid ": %ld.%ld seconds\n" msgstr "" -#: src/irc/irc-recv.c:861 +#: src/irc/irc-recv.c:909 #, c-format msgid "%s \"%s\" command received without host or channel\n" msgstr "" -#: src/irc/irc-recv.c:911 +#: src/irc/irc-recv.c:959 msgid " has left " msgstr "" -#: src/irc/irc-recv.c:1059 src/irc/irc-recv.c:1378 +#: src/irc/irc-recv.c:1107 src/irc/irc-recv.c:1426 #, c-format msgid "On %s: * %s %s" msgstr "" -#: src/irc/irc-recv.c:1078 +#: src/irc/irc-recv.c:1126 #, c-format msgid "Received a CTCP SOUND \"%s\" from " msgstr "" -#: src/irc/irc-recv.c:1099 +#: src/irc/irc-recv.c:1147 #, c-format msgid "On %s: %s> %s" msgstr "" -#: src/irc/irc-recv.c:1169 +#: src/irc/irc-recv.c:1217 msgid "Received a " msgstr "" -#: src/irc/irc-recv.c:1171 +#: src/irc/irc-recv.c:1219 msgid "CTCP VERSION " msgstr "" -#: src/irc/irc-recv.c:1173 +#: src/irc/irc-recv.c:1221 msgid "from" msgstr "" -#: src/irc/irc-recv.c:1210 src/irc/irc-recv.c:1227 src/irc/irc-recv.c:1243 -#: src/irc/irc-recv.c:1259 src/irc/irc-recv.c:1284 src/irc/irc-recv.c:1301 -#: src/irc/irc-recv.c:1316 src/irc/irc-recv.c:1424 src/irc/irc-recv.c:2962 -#: src/irc/irc-recv.c:3019 +#: src/irc/irc-recv.c:1258 src/irc/irc-recv.c:1275 src/irc/irc-recv.c:1291 +#: src/irc/irc-recv.c:1307 src/irc/irc-recv.c:1332 src/irc/irc-recv.c:1349 +#: src/irc/irc-recv.c:1364 src/irc/irc-recv.c:1472 src/irc/irc-recv.c:3010 +#: src/irc/irc-recv.c:3067 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:1329 +#: src/irc/irc-recv.c:1377 #, c-format msgid "%s unknown DCC CHAT type received from " msgstr "" -#: src/irc/irc-recv.c:1404 src/irc/irc-dcc.c:759 +#: src/irc/irc-recv.c:1452 src/irc/irc-dcc.c:759 #, c-format msgid "Private %s> %s" msgstr "" -#: src/irc/irc-recv.c:1480 +#: src/irc/irc-recv.c:1528 msgid "has quit" msgstr "" -#: src/irc/irc-recv.c:1600 +#: src/irc/irc-recv.c:1648 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "" -#: src/irc/irc-recv.c:1628 +#: src/irc/irc-recv.c:1676 msgid " has changed topic for " msgstr "" -#: src/irc/irc-recv.c:1633 +#: src/irc/irc-recv.c:1681 #, c-format msgid " to: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:1639 +#: src/irc/irc-recv.c:1687 msgid " has unset topic for " msgstr "" -#: src/irc/irc-recv.c:1750 +#: src/irc/irc-recv.c:1798 #, c-format msgid " is away: %s\n" msgstr "" -#: src/irc/irc-recv.c:1824 +#: src/irc/irc-recv.c:1872 msgid "Users online: " msgstr "" -#: src/irc/irc-recv.c:2229 +#: src/irc/irc-recv.c:2277 msgid "idle: " msgstr "" -#: src/irc/irc-recv.c:2237 +#: src/irc/irc-recv.c:2285 msgid "days" msgstr "" -#: src/irc/irc-recv.c:2237 +#: src/irc/irc-recv.c:2285 msgid "day" msgstr "" -#: src/irc/irc-recv.c:2247 +#: src/irc/irc-recv.c:2295 msgid "hours" msgstr "" -#: src/irc/irc-recv.c:2247 +#: src/irc/irc-recv.c:2295 msgid "hour" msgstr "" -#: src/irc/irc-recv.c:2253 +#: src/irc/irc-recv.c:2301 msgid "minutes" msgstr "" -#: src/irc/irc-recv.c:2253 +#: src/irc/irc-recv.c:2301 msgid "minute" msgstr "" -#: src/irc/irc-recv.c:2259 +#: src/irc/irc-recv.c:2307 msgid "seconds" msgstr "" -#: src/irc/irc-recv.c:2259 +#: src/irc/irc-recv.c:2307 msgid "second" msgstr "" -#: src/irc/irc-recv.c:2264 +#: src/irc/irc-recv.c:2312 msgid "signon at: " msgstr "" -#: src/irc/irc-recv.c:2352 +#: src/irc/irc-recv.c:2400 msgid "Channels: " msgstr "" -#: src/irc/irc-recv.c:2604 +#: src/irc/irc-recv.c:2652 msgid "No topic set for " msgstr "" -#: src/irc/irc-recv.c:2646 +#: src/irc/irc-recv.c:2694 msgid "Topic for " msgstr "" -#: src/irc/irc-recv.c:2650 +#: src/irc/irc-recv.c:2698 #, c-format msgid " is: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2668 src/irc/irc-recv.c:2752 +#: src/irc/irc-recv.c:2716 src/irc/irc-recv.c:2800 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2714 +#: src/irc/irc-recv.c:2762 msgid "Topic set by " msgstr "" -#: src/irc/irc-recv.c:2734 +#: src/irc/irc-recv.c:2782 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2743 +#: src/irc/irc-recv.c:2791 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2885 +#: src/irc/irc-recv.c:2933 msgid " on " msgstr "" -#: src/irc/irc-recv.c:3008 +#: src/irc/irc-recv.c:3056 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:3063 +#: src/irc/irc-recv.c:3111 msgid "Nicks " msgstr "" -#: src/irc/irc-recv.c:3083 +#: src/irc/irc-recv.c:3131 msgid "Channel " msgstr "" -#: src/irc/irc-recv.c:3094 +#: src/irc/irc-recv.c:3142 msgid "nicks" msgstr "" -#: src/irc/irc-recv.c:3094 +#: src/irc/irc-recv.c:3142 msgid "nick" msgstr "" -#: src/irc/irc-recv.c:3102 +#: src/irc/irc-recv.c:3150 msgid "ops" msgstr "" -#: src/irc/irc-recv.c:3102 +#: src/irc/irc-recv.c:3150 msgid "op" msgstr "" -#: src/irc/irc-recv.c:3111 +#: src/irc/irc-recv.c:3159 msgid "halfops" msgstr "" -#: src/irc/irc-recv.c:3111 +#: src/irc/irc-recv.c:3159 msgid "halfop" msgstr "" -#: src/irc/irc-recv.c:3120 +#: src/irc/irc-recv.c:3168 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:3120 +#: src/irc/irc-recv.c:3168 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:3129 +#: src/irc/irc-recv.c:3177 msgid "normal" msgstr "" -#: src/irc/irc-recv.c:3165 +#: src/irc/irc-recv.c:3213 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:3177 +#: src/irc/irc-recv.c:3225 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:3189 +#: src/irc/irc-recv.c:3237 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " "server!\n" msgstr "" -#: src/irc/irc-recv.c:3199 +#: src/irc/irc-recv.c:3247 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n" msgstr "" diff --git a/weechat/src/irc/irc-commands.c b/weechat/src/irc/irc-commands.c index 2769e536a..1588f3ccb 100644 --- a/weechat/src/irc/irc-commands.c +++ b/weechat/src/irc/irc-commands.c @@ -67,7 +67,7 @@ t_irc_command irc_commands[] = { "invite", N_("invite a nick on a channel"), N_("nickname channel"), N_("nickname: nick to invite\nchannel: channel to invite"), - 2, 2, 1, NULL, irc_cmd_send_invite, NULL }, + 1, 2, 1, irc_cmd_send_invite, NULL, irc_cmd_recv_invite }, { "ison", N_("check if a nickname is currently on IRC"), N_("nickname [nickname ...]"), N_("nickname: nickname"), diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c index 67b8d06df..1f42b1758 100644 --- a/weechat/src/irc/irc-recv.c +++ b/weechat/src/irc/irc-recv.c @@ -36,6 +36,7 @@ #include "../common/weechat.h" #include "irc.h" #include "../common/command.h" +#include "../common/hotlist.h" #include "../common/weeconfig.h" #include "../gui/gui.h" #include "../plugins/plugins.h" @@ -155,6 +156,51 @@ irc_cmd_recv_error (t_irc_server *server, char *host, char *arguments) } /* + * irc_cmd_recv_invite: 'invite' message received + */ + +int +irc_cmd_recv_invite (t_irc_server *server, char *host, char *arguments) +{ + char *pos, *pos_channel; + + pos = strchr (host, '!'); + if (pos) + pos[0] = '\0'; + + pos_channel = strchr (arguments, ' '); + if (pos_channel) + { + pos_channel[0] = '\0'; + pos_channel++; + while (pos_channel[0] == ' ') + pos_channel++; + if (pos_channel[0] == ':') + pos_channel++; + + irc_display_prefix (server->buffer, PREFIX_SERVER); + gui_printf (server->buffer, _("You have been invited to ")); + gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, + "%s ", pos_channel); + gui_printf (server->buffer, _("by")); + gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, + " %s\n", host); + hotlist_add (2, server->buffer); + gui_draw_buffer_status (gui_current_window->buffer, 1); + } + else + { + irc_display_prefix (server->buffer, PREFIX_ERROR); + gui_printf_nolog (server->buffer, + _("%s channel not found for \"%s\" command\n"), + WEECHAT_ERROR, "invite"); + return -1; + } + return 0; +} + + +/* * irc_cmd_recv_join: 'join' message received */ @@ -171,9 +217,9 @@ irc_cmd_recv_join (t_irc_server *server, char *host, char *arguments) if (!ptr_channel) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot create new channel \"%s\"\n"), - WEECHAT_ERROR, arguments); + gui_printf_nolog (server->buffer, + _("%s cannot create new channel \"%s\"\n"), + WEECHAT_ERROR, arguments); return -1; } } @@ -238,9 +284,9 @@ irc_cmd_recv_kick (t_irc_server *server, char *host, char *arguments) if (!ptr_channel) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s channel not found for \"%s\" command\n"), - WEECHAT_ERROR, "kick"); + gui_printf_nolog (server->buffer, + _("%s channel not found for \"%s\" command\n"), + WEECHAT_ERROR, "kick"); return -1; } @@ -271,9 +317,9 @@ irc_cmd_recv_kick (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s nick not found for \"%s\" command\n"), - WEECHAT_ERROR, "kick"); + gui_printf_nolog (server->buffer, + _("%s nick not found for \"%s\" command\n"), + WEECHAT_ERROR, "kick"); return -1; } if (strcmp (pos_nick, server->nick) == 0) @@ -561,9 +607,9 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) if (host == NULL) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s \"%s\" command received without host\n"), - WEECHAT_ERROR, "mode"); + gui_printf_nolog (server->buffer, + _("%s \"%s\" command received without host\n"), + WEECHAT_ERROR, "mode"); return -1; } @@ -576,9 +622,9 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) if (!pos) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s \"%s\" command received without channel or nickname\n"), - WEECHAT_ERROR, "mode"); + gui_printf_nolog (server->buffer, + _("%s \"%s\" command received without channel or nickname\n"), + WEECHAT_ERROR, "mode"); return -1; } pos[0] = '\0'; @@ -606,9 +652,9 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s channel not found for \"%s\" command\n"), - WEECHAT_ERROR, "mode"); + gui_printf_nolog (server->buffer, + _("%s channel not found for \"%s\" command\n"), + WEECHAT_ERROR, "mode"); return -1; } } @@ -646,9 +692,9 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *arguments) if (host == NULL) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s \"%s\" command received without host\n"), - WEECHAT_ERROR, "nick"); + gui_printf_nolog (server->buffer, + _("%s \"%s\" command received without host\n"), + WEECHAT_ERROR, "nick"); return -1; } @@ -764,9 +810,9 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s nickname not found for \"%s\" command\n"), - WEECHAT_ERROR, "notice"); + gui_printf_nolog (server->buffer, + _("%s nickname not found for \"%s\" command\n"), + WEECHAT_ERROR, "notice"); return -1; } if (strncmp (pos, "\01VERSION", 8) == 0) @@ -837,6 +883,8 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments) gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": "); } gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", pos); + hotlist_add (2, server->buffer); + gui_draw_buffer_status (gui_current_window->buffer, 1); } } return 0; @@ -857,9 +905,9 @@ irc_cmd_recv_part (t_irc_server *server, char *host, char *arguments) if (!host || !arguments) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s \"%s\" command received without host or channel\n"), - WEECHAT_ERROR, "part"); + gui_printf_nolog (server->buffer, + _("%s \"%s\" command received without host or channel\n"), + WEECHAT_ERROR, "part"); return -1; } @@ -932,9 +980,9 @@ irc_cmd_recv_part (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s channel not found for \"%s\" command\n"), - WEECHAT_ERROR, "part"); + gui_printf_nolog (server->buffer, + _("%s channel not found for \"%s\" command\n"), + WEECHAT_ERROR, "part"); return -1; } @@ -1006,9 +1054,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (host == NULL) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s \"%s\" command received without host\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s \"%s\" command received without host\n"), + WEECHAT_ERROR, "privmsg"); return -1; } @@ -1110,9 +1158,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s nick not found for \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s nick not found for \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } } @@ -1120,9 +1168,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s channel not found for \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s channel not found for \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } } @@ -1206,9 +1254,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (!pos2) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } pos2[0] = '\0'; @@ -1223,9 +1271,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (!pos_size) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } pos2 = pos_size; @@ -1239,9 +1287,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (!pos_port) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } pos2 = pos_port; @@ -1255,9 +1303,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (!pos_addr) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } pos2 = pos_addr; @@ -1280,9 +1328,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (!pos2) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } pos2[0] = '\0'; @@ -1297,9 +1345,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (!pos_addr) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } pos_addr[0] = '\0'; @@ -1312,9 +1360,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (!pos_port) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } pos_port[0] = '\0'; @@ -1325,9 +1373,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (strcasecmp (pos_file, "chat") != 0) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s unknown DCC CHAT type received from "), - WEECHAT_ERROR); + gui_printf_nolog (server->buffer, + _("%s unknown DCC CHAT type received from "), + WEECHAT_ERROR); gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", host); gui_printf (server->buffer, ": \"%s\"\n", pos_file); @@ -1348,9 +1396,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) if (!ptr_channel) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot create new private window \"%s\"\n"), - WEECHAT_ERROR, host); + gui_printf_nolog (server->buffer, + _("%s cannot create new private window \"%s\"\n"), + WEECHAT_ERROR, host); return -1; } } @@ -1420,9 +1468,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "privmsg"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "privmsg"); return -1; } } @@ -1444,9 +1492,9 @@ irc_cmd_recv_quit (t_irc_server *server, char *host, char *arguments) if (host == NULL) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s \"%s\" command received without host\n"), - WEECHAT_ERROR, "quit"); + gui_printf_nolog (server->buffer, + _("%s \"%s\" command received without host\n"), + WEECHAT_ERROR, "quit"); return -1; } @@ -1596,9 +1644,9 @@ irc_cmd_recv_topic (t_irc_server *server, char *host, char *arguments) if (!string_is_channel (arguments)) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s \"%s\" command received without channel\n"), - WEECHAT_ERROR, "topic"); + gui_printf_nolog (server->buffer, + _("%s \"%s\" command received without channel\n"), + WEECHAT_ERROR, "topic"); return -1; } @@ -2654,9 +2702,9 @@ irc_cmd_recv_332 (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s channel not found for \"%s\" command\n"), - WEECHAT_ERROR, "332"); + gui_printf_nolog (server->buffer, + _("%s channel not found for \"%s\" command\n"), + WEECHAT_ERROR, "332"); return -1; } } @@ -2664,9 +2712,9 @@ irc_cmd_recv_332 (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot identify channel for \"%s\" command\n"), - WEECHAT_ERROR, "332"); + gui_printf_nolog (server->buffer, + _("%s cannot identify channel for \"%s\" command\n"), + WEECHAT_ERROR, "332"); return -1; } return 0; @@ -2721,36 +2769,36 @@ irc_cmd_recv_333 (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s channel not found for \"%s\" command\n"), - WEECHAT_ERROR, "333"); + gui_printf_nolog (server->buffer, + _("%s channel not found for \"%s\" command\n"), + WEECHAT_ERROR, "333"); return -1; } } else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot identify date/time for \"%s\" command\n"), - WEECHAT_ERROR, "333"); + gui_printf_nolog (server->buffer, + _("%s cannot identify date/time for \"%s\" command\n"), + WEECHAT_ERROR, "333"); return -1; } } else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot identify nickname for \"%s\" command\n"), - WEECHAT_ERROR, "333"); + gui_printf_nolog (server->buffer, + _("%s cannot identify nickname for \"%s\" command\n"), + WEECHAT_ERROR, "333"); return -1; } } else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot identify channel for \"%s\" command\n"), - WEECHAT_ERROR, "333"); + gui_printf_nolog (server->buffer, + _("%s cannot identify channel for \"%s\" command\n"), + WEECHAT_ERROR, "333"); return -1; } return 0; @@ -2958,9 +3006,9 @@ irc_cmd_recv_353 (t_irc_server *server, char *host, char *arguments) if (pos[0] != ':') { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "353"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "353"); return -1; } pos++; @@ -3004,9 +3052,9 @@ irc_cmd_recv_353 (t_irc_server *server, char *host, char *arguments) is_op, is_halfop, has_voice)) { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot create nick \"%s\" for channel \"%s\"\n"), - WEECHAT_ERROR, pos_nick, ptr_channel->name); + gui_printf_nolog (server->buffer, + _("%s cannot create nick \"%s\" for channel \"%s\"\n"), + WEECHAT_ERROR, pos_nick, ptr_channel->name); } } } @@ -3015,9 +3063,9 @@ irc_cmd_recv_353 (t_irc_server *server, char *host, char *arguments) else { irc_display_prefix (server->buffer, PREFIX_ERROR); - gui_printf (server->buffer, - _("%s cannot parse \"%s\" command\n"), - WEECHAT_ERROR, "353"); + gui_printf_nolog (server->buffer, + _("%s cannot parse \"%s\" command\n"), + WEECHAT_ERROR, "353"); return -1; } return 0; diff --git a/weechat/src/irc/irc-send.c b/weechat/src/irc/irc-send.c index 8fc1ec071..1d17350d8 100644 --- a/weechat/src/irc/irc-send.c +++ b/weechat/src/irc/irc-send.c @@ -409,9 +409,23 @@ irc_cmd_send_info (t_irc_server *server, char *arguments) */ int -irc_cmd_send_invite (t_irc_server *server, char *arguments) +irc_cmd_send_invite (t_irc_server *server, int argc, char **argv) { - server_sendf (server, "INVITE %s\r\n", arguments); + if (argc == 2) + server_sendf (server, "INVITE %s %s\r\n", argv[0], argv[1]); + else + { + if (!BUFFER_IS_CHANNEL(gui_current_window->buffer)) + { + irc_display_prefix (server->buffer, PREFIX_ERROR); + gui_printf_nolog (server->buffer, + _("%s \"%s\" command can only be executed in a channel window\n"), + WEECHAT_ERROR, "invite"); + return -1; + } + server_sendf (server, "INVITE %s %s\r\n", + argv[0], CHANNEL(gui_current_window->buffer)->name); + } return 0; } diff --git a/weechat/src/irc/irc.h b/weechat/src/irc/irc.h index dd01de6e0..b7b9b8453 100644 --- a/weechat/src/irc/irc.h +++ b/weechat/src/irc/irc.h @@ -324,7 +324,7 @@ 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 *); extern int irc_cmd_send_info (t_irc_server *, char *); -extern int irc_cmd_send_invite (t_irc_server *, char *); +extern int irc_cmd_send_invite (t_irc_server *, int, char **); extern int irc_cmd_send_ison (t_irc_server *, char *); extern int irc_cmd_send_join (t_irc_server *, char *); extern int irc_cmd_send_kick (t_irc_server *, char *); @@ -370,6 +370,7 @@ extern int irc_cmd_send_whois (t_irc_server *, char *); extern int irc_cmd_send_whowas (t_irc_server *, char *); /* IRC commands executed when received from server */ extern int irc_cmd_recv_error (t_irc_server *, char *, char *); +extern int irc_cmd_recv_invite (t_irc_server *, char *, char *); extern int irc_cmd_recv_join (t_irc_server *, char *, char *); extern int irc_cmd_recv_kick (t_irc_server *, char *, char *); extern int irc_cmd_recv_mode (t_irc_server *, char *, char *); |