summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2005-09-04 12:55:25 +0000
committerSebastien Helleu <flashcode@flashtux.org>2005-09-04 12:55:25 +0000
commit06463e59373f2fe974eb0042d0cabd6593826698 (patch)
treefe19fb50624c4bc9d777f68ff5ba7c8785265a8c
parentd80c8e9e575239553719b4991b40e2dca6e6478e (diff)
downloadweechat-06463e59373f2fe974eb0042d0cabd6593826698.zip
Added /ignore and /unignore commands
-rw-r--r--ChangeLog3
-rw-r--r--TODO5
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/es.po1343
-rw-r--r--po/fr.po1366
-rw-r--r--po/weechat.pot1329
-rw-r--r--src/common/command.c184
-rw-r--r--src/common/command.h3
-rw-r--r--src/common/completion.c85
-rw-r--r--src/common/weechat.c3
-rw-r--r--src/common/weeconfig.c50
-rw-r--r--src/common/weeconfig.h5
-rw-r--r--src/irc/Makefile.am1
-rw-r--r--src/irc/irc-channel.c8
-rw-r--r--src/irc/irc-commands.c2
-rw-r--r--src/irc/irc-ignore.c475
-rw-r--r--src/irc/irc-nick.c5
-rw-r--r--src/irc/irc-recv.c2991
-rw-r--r--src/irc/irc-server.c438
-rw-r--r--src/irc/irc.h145
-rw-r--r--weechat/ChangeLog3
-rw-r--r--weechat/TODO5
-rw-r--r--weechat/po/POTFILES.in1
-rw-r--r--weechat/po/es.po1343
-rw-r--r--weechat/po/fr.po1366
-rw-r--r--weechat/po/weechat.pot1329
-rw-r--r--weechat/src/common/command.c184
-rw-r--r--weechat/src/common/command.h3
-rw-r--r--weechat/src/common/completion.c85
-rw-r--r--weechat/src/common/weechat.c3
-rw-r--r--weechat/src/common/weeconfig.c50
-rw-r--r--weechat/src/common/weeconfig.h5
-rw-r--r--weechat/src/irc/Makefile.am1
-rw-r--r--weechat/src/irc/irc-channel.c8
-rw-r--r--weechat/src/irc/irc-commands.c2
-rw-r--r--weechat/src/irc/irc-ignore.c475
-rw-r--r--weechat/src/irc/irc-nick.c5
-rw-r--r--weechat/src/irc/irc-recv.c2991
-rw-r--r--weechat/src/irc/irc-server.c438
-rw-r--r--weechat/src/irc/irc.h145
40 files changed, 9858 insertions, 7026 deletions
diff --git a/ChangeLog b/ChangeLog
index 71729de09..e58374ef6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-ChangeLog - 2005-09-03
+ChangeLog - 2005-09-04
Version 0.1.5 (under dev!):
+ * added /ignore and /unignore commands
* fixed bug with strings comparison (str[n]casecmp) and some locales
(like turkish), now using ASCII comparison (thanks to roktas)
* signal SIGQUIT is now ignored
diff --git a/TODO b/TODO
index 035b2ba44..716bf1614 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,7 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-TODO - 2005-08-16
+TODO - 2005-09-04
Legend:
# done
@@ -30,6 +30,7 @@ v0.1.5:
* WeeChat commands
- be able to bind a key on more than one command
- be able to make an alias running more than one command
+ # /ignore and /unignore commands
* Configuration:
- be able to launch more than one command when connecting to server
@@ -42,8 +43,6 @@ Future versions:
- customizable CTCP version reply
- complete "/list" command: add regexp search, display only channels that
match regexp
- - "/ignore" and "/unignore" commands: hide all that is write by a given
- nick/host
- when we're away, WeeChat should log all the lines begenning by our nick.
When we come back from our away it should print it to the current window
- "/notify" and "/unnotify" command to be warn by WeeChat when a given
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 74592dd0c..d338c606a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,6 +6,7 @@
./src/irc/irc-send.c
./src/irc/irc-recv.c
./src/irc/irc-dcc.c
+./src/irc/irc-ignore.c
./src/irc/irc.h
./src/plugins/perl/wee-perl.c
./src/plugins/perl/wee-perl.h
diff --git a/po/es.po b/po/es.po
index 8e996764d..9c1e6b899 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,20 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.5-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-08-21 14:31+0200\n"
-"PO-Revision-Date: 2005-08-21 14:32+0200\n"
+"POT-Creation-Date: 2005-09-04 14:45+0200\n"
+"PO-Revision-Date: 2005-09-04 14:47+0200\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"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-nick.c:193
+#: src/irc/irc-nick.c:192
#, c-format
msgid "%s cannot allocate new nick\n"
msgstr "%s no ha sido posible crear un nuevo nick\n"
-#: src/irc/irc-server.c:180 src/common/weeconfig.c:1697
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1712
msgid "Unable to get user's name"
msgstr "No ha sido posible obtener el nombre de usuario"
@@ -110,7 +110,7 @@ msgstr ""
"%s el proxy ha fallado al establecer la conexión al servidor (comprueba el "
"nombre de usuario o la contraseña si es necesario)\n"
-#: src/irc/irc-server.c:1360
+#: src/irc/irc-server.c:1364
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -118,57 +118,57 @@ msgstr ""
"%s No ha sido posible conectar con SSL debido a que Weechat no fue compilado "
"con soporte GNUtls\n"
-#: src/irc/irc-server.c:1369
+#: src/irc/irc-server.c:1373
#, c-format
msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr "%s: conectando al servidor %s:%d%s%s vía %s proxy %s: %d%s...\n"
-#: src/irc/irc-server.c:1375
+#: src/irc/irc-server.c:1379
#, c-format
msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr "Conectando al servidor %s:%d%s%s vía %s proxy %s:%d%s...\n"
-#: src/irc/irc-server.c:1385
+#: src/irc/irc-server.c:1389
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr "%s: conectando al servidor %s:%d%s%s...\n"
-#: src/irc/irc-server.c:1389
+#: src/irc/irc-server.c:1393
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr "Conectando al servidor %s:%d%s%s...\n"
-#: src/irc/irc-server.c:1407
+#: src/irc/irc-server.c:1411
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s error de inicialización de gnutls\n"
-#: src/irc/irc-server.c:1422
+#: src/irc/irc-server.c:1426
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s no ha sido posible crear la interconexión\n"
-#: src/irc/irc-server.c:1437
+#: src/irc/irc-server.c:1441
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s no ha sido posible crear el socket\n"
-#: src/irc/irc-server.c:1448
+#: src/irc/irc-server.c:1452
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr "%s no ha sido posible configurar la opción socket \"SO_REUSEADDR\"\n"
-#: src/irc/irc-server.c:1459
+#: src/irc/irc-server.c:1463
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr "%s no ha sido posible configurar la opción socket \"SO_KEEPALIVE\"\n"
-#: src/irc/irc-server.c:1490
+#: src/irc/irc-server.c:1494
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Reconectando al servidor...\n"
-#: src/irc/irc-server.c:1540 src/irc/irc-server.c:1549
+#: src/irc/irc-server.c:1544 src/irc/irc-server.c:1553
msgid "Disconnected from server!\n"
msgstr "¡Desconectado del servidor!\n"
@@ -957,102 +957,103 @@ msgstr ""
#: src/irc/irc-commands.c:317 src/irc/irc-commands.c:318
#: src/irc/irc-commands.c:319 src/irc/irc-commands.c:320
#: src/irc/irc-commands.c:321 src/irc/irc-commands.c:322
-#: src/irc/irc-commands.c:323 src/irc/irc-commands.c:367
+#: src/irc/irc-commands.c:323 src/irc/irc-commands.c:324
#: src/irc/irc-commands.c:368 src/irc/irc-commands.c:369
#: src/irc/irc-commands.c:370 src/irc/irc-commands.c:371
-#: src/irc/irc-commands.c:372
+#: src/irc/irc-commands.c:372 src/irc/irc-commands.c:373
+#: src/irc/irc-commands.c:473
msgid "a server message"
msgstr "un mensaje de servidor"
-#: src/irc/irc-commands.c:324
+#: src/irc/irc-commands.c:325
msgid "away message"
msgstr "mensaje de ausencia"
-#: src/irc/irc-commands.c:325
+#: src/irc/irc-commands.c:326
msgid "userhost"
msgstr "nombre de la máquina de usuario"
-#: src/irc/irc-commands.c:326
+#: src/irc/irc-commands.c:327
msgid "ison"
msgstr "está presente"
-#: src/irc/irc-commands.c:327
+#: src/irc/irc-commands.c:328
msgid "unaway"
msgstr "no ausente"
-#: src/irc/irc-commands.c:328
+#: src/irc/irc-commands.c:329
msgid "now away"
msgstr "ahora ausente"
-#: src/irc/irc-commands.c:329
+#: src/irc/irc-commands.c:330
msgid "whois (registered nick)"
msgstr "quién es (usuario registrado)"
-#: src/irc/irc-commands.c:330
+#: src/irc/irc-commands.c:331
msgid "whois (user)"
msgstr "quién es (usuario)"
-#: src/irc/irc-commands.c:331
+#: src/irc/irc-commands.c:332
msgid "whois (server)"
msgstr "quién es (servidor)"
-#: src/irc/irc-commands.c:332
+#: src/irc/irc-commands.c:333
msgid "whois (operator)"
msgstr "quién es (operador)"
-#: src/irc/irc-commands.c:333
+#: src/irc/irc-commands.c:334
msgid "whowas"
msgstr "quién era"
-#: src/irc/irc-commands.c:334
+#: src/irc/irc-commands.c:335
msgid "end of /who list"
msgstr "fin de la lista /who"
-#: src/irc/irc-commands.c:335
+#: src/irc/irc-commands.c:336
msgid "whois (idle)"
msgstr "quién es (idle)"
-#: src/irc/irc-commands.c:336
+#: src/irc/irc-commands.c:337
msgid "whois (end)"
msgstr "quién es (fin)"
-#: src/irc/irc-commands.c:337
+#: src/irc/irc-commands.c:338
msgid "whois (channels)"
msgstr "quién es (canales)"
-#: src/irc/irc-commands.c:338
+#: src/irc/irc-commands.c:339
msgid "whois (identified user)"
msgstr "quién es (usuario identificado)"
-#: src/irc/irc-commands.c:339
+#: src/irc/irc-commands.c:340
msgid "/list start"
msgstr "/list inicio"
-#: src/irc/irc-commands.c:340
+#: src/irc/irc-commands.c:341
msgid "channel (for /list)"
msgstr "canal (para /list)"
-#: src/irc/irc-commands.c:341
+#: src/irc/irc-commands.c:342
msgid "/list end"
msgstr "/list fin"
-#: src/irc/irc-commands.c:342
+#: src/irc/irc-commands.c:343
msgid "channel mode"
msgstr "modo de canal"
-#: src/irc/irc-commands.c:344
+#: src/irc/irc-commands.c:345
msgid "no topic for channel"
msgstr "sin tema para el canal"
-#: src/irc/irc-commands.c:345
+#: src/irc/irc-commands.c:346
msgid "topic of channel"
msgstr "tema de canal"
-#: src/irc/irc-commands.c:346
+#: src/irc/irc-commands.c:347
msgid "channel :topic"
msgstr "canal :tema"
-#: src/irc/irc-commands.c:347
+#: src/irc/irc-commands.c:348
msgid ""
"channel: name of channel\n"
"topic: topic of the channel"
@@ -1060,31 +1061,31 @@ msgstr ""
"canal: nombre del canal\n"
"tema: tema del canal"
-#: src/irc/irc-commands.c:350
+#: src/irc/irc-commands.c:351
msgid "infos about topic (nick & date changed)"
msgstr "info sobre el tema (usuario y fecha de modificación)"
-#: src/irc/irc-commands.c:353
+#: src/irc/irc-commands.c:354
msgid "inviting"
msgstr "invitando"
-#: src/irc/irc-commands.c:354
+#: src/irc/irc-commands.c:355
msgid "server version"
msgstr "versión del servidor"
-#: src/irc/irc-commands.c:355
+#: src/irc/irc-commands.c:356
msgid "who"
msgstr "quién"
-#: src/irc/irc-commands.c:356
+#: src/irc/irc-commands.c:357
msgid "list of nicks on channel"
msgstr "lista de usuarios en el canal"
-#: src/irc/irc-commands.c:357
+#: src/irc/irc-commands.c:358
msgid "channel :[[@|+]nick ...]"
msgstr "canal :[[@|+]usuario ...]"
-#: src/irc/irc-commands.c:358
+#: src/irc/irc-commands.c:359
msgid ""
"channel: name of channel\n"
"nick: nick on the channel"
@@ -1092,224 +1093,223 @@ msgstr ""
"canal: nombre del canal\n"
"usuario: usuario en el canal"
-#: src/irc/irc-commands.c:361
+#: src/irc/irc-commands.c:362
msgid "links"
msgstr "enlaces"
-#: src/irc/irc-commands.c:362
+#: src/irc/irc-commands.c:363
msgid "end of /links list"
msgstr "fin de la lista /links"
-#: src/irc/irc-commands.c:363
+#: src/irc/irc-commands.c:364
msgid "end of /names list"
msgstr "fin de la lista /names"
-#: src/irc/irc-commands.c:364
+#: src/irc/irc-commands.c:365
msgid "banlist"
msgstr "lista de baneos"
-#: src/irc/irc-commands.c:365
+#: src/irc/irc-commands.c:366
msgid "end of banlist"
msgstr "fin de la lista de baneos"
-#: src/irc/irc-commands.c:366
+#: src/irc/irc-commands.c:367
msgid "end of /whowas list"
msgstr "fin de la lista /whowas"
-#: src/irc/irc-commands.c:373
+#: src/irc/irc-commands.c:374
msgid "server local time"
msgstr "hora local del servidor"
-#: src/irc/irc-commands.c:374
+#: src/irc/irc-commands.c:375
msgid "no such nick/channel"
msgstr "no existe ese usuario/canal"
-#: src/irc/irc-commands.c:376
+#: src/irc/irc-commands.c:377
msgid "no such server"
msgstr "no existe ese servidor"
-#: src/irc/irc-commands.c:378
+#: src/irc/irc-commands.c:379
msgid "no such channel"
msgstr "no existe ese canal"
-#: src/irc/irc-commands.c:380
+#: src/irc/irc-commands.c:381
msgid "cannot send to channel"
msgstr "no ha sido posible enviar al canal"
-#: src/irc/irc-commands.c:382
+#: src/irc/irc-commands.c:383
msgid "too many channels"
msgstr "demasiados canales"
-#: src/irc/irc-commands.c:384 src/irc/irc-commands.c:386
-#: src/irc/irc-commands.c:388
+#: src/irc/irc-commands.c:385 src/irc/irc-commands.c:387
msgid "was no such nick"
msgstr "no estaba ese usuario"
-#: src/irc/irc-commands.c:390
+#: src/irc/irc-commands.c:389
msgid "no origin"
msgstr "sin origen"
-#: src/irc/irc-commands.c:392
+#: src/irc/irc-commands.c:391
msgid "no services"
msgstr "sin servicios"
-#: src/irc/irc-commands.c:394
+#: src/irc/irc-commands.c:393
msgid "no recipient"
msgstr "sin destinatario"
-#: src/irc/irc-commands.c:396
+#: src/irc/irc-commands.c:395
msgid "no text to send"
msgstr "sin texto a enviar"
-#: src/irc/irc-commands.c:398
+#: src/irc/irc-commands.c:397
msgid "no toplevel"
msgstr "sin nivel superior"
-#: src/irc/irc-commands.c:400
+#: src/irc/irc-commands.c:399
msgid "wilcard in toplevel domain"
msgstr "carácter comodín en el dominio del nivel superior"
-#: src/irc/irc-commands.c:402
+#: src/irc/irc-commands.c:401
msgid "unknown command"
msgstr "comando desconocido"
-#: src/irc/irc-commands.c:404
+#: src/irc/irc-commands.c:403
msgid "MOTD is missing"
msgstr "MOTD falta"
-#: src/irc/irc-commands.c:406
+#: src/irc/irc-commands.c:405
msgid "no administrative info"
msgstr "sin información administrativa"
-#: src/irc/irc-commands.c:408
+#: src/irc/irc-commands.c:407
msgid "file error"
msgstr "error de fichero"
-#: src/irc/irc-commands.c:410
+#: src/irc/irc-commands.c:409
msgid "no nickname given"
msgstr "no se ha dado un nombre de usuario"
-#: src/irc/irc-commands.c:412
+#: src/irc/irc-commands.c:411
msgid "erroneous nickname"
msgstr "nombre de usuario erróneo"
-#: src/irc/irc-commands.c:414
+#: src/irc/irc-commands.c:413
msgid "nickname already in use"
msgstr "nombre de usuario ya en uso"
-#: src/irc/irc-commands.c:416
+#: src/irc/irc-commands.c:415
msgid "nickname collision"
msgstr "colisión en el nombre de usuario"
-#: src/irc/irc-commands.c:418
+#: src/irc/irc-commands.c:417
msgid "not authorized to change nickname"
msgstr "no autorizado a cambiar el nombre de usuario"
-#: src/irc/irc-commands.c:420
+#: src/irc/irc-commands.c:419
msgid "user not in channel"
msgstr "usuario no presente en el canal"
-#: src/irc/irc-commands.c:422
+#: src/irc/irc-commands.c:421
msgid "not on channel"
msgstr "no presente en el canal"
-#: src/irc/irc-commands.c:424
+#: src/irc/irc-commands.c:423
msgid "user already on channel"
msgstr "usuario ya en el canal"
-#: src/irc/irc-commands.c:426
+#: src/irc/irc-commands.c:425
msgid "user not logged in"
msgstr "usuario no registrado"
-#: src/irc/irc-commands.c:428
+#: src/irc/irc-commands.c:427
msgid "summon has been disabled"
msgstr "la petición de ayuda ha sido desactivada"
-#: src/irc/irc-commands.c:430
+#: src/irc/irc-commands.c:429
msgid "users has been disabled"
msgstr "los usuarios han sido desactivados"
-#: src/irc/irc-commands.c:432
+#: src/irc/irc-commands.c:431
msgid "you are not registered"
msgstr "usted no está registrado"
-#: src/irc/irc-commands.c:434
+#: src/irc/irc-commands.c:433
msgid "not enough parameters"
msgstr "no hay parámetros suficientes"
-#: src/irc/irc-commands.c:436
+#: src/irc/irc-commands.c:435
msgid "you may not register"
msgstr "usted no puede registrarse"
-#: src/irc/irc-commands.c:438
+#: src/irc/irc-commands.c:437
msgid "your host isn't among the privileged"
msgstr "su nombre de máquina no está entre los privilegiados"
-#: src/irc/irc-commands.c:440
+#: src/irc/irc-commands.c:439
msgid "password incorrect"
msgstr "contraseña incorrecta"
-#: src/irc/irc-commands.c:442
+#: src/irc/irc-commands.c:441
msgid "you are banned from this server"
msgstr "usted está baneado de este servidor"
-#: src/irc/irc-commands.c:444
+#: src/irc/irc-commands.c:443
msgid "channel key already set"
msgstr "clave de canal ya definida"
-#: src/irc/irc-commands.c:446
+#: src/irc/irc-commands.c:445
msgid "channel is already full"
msgstr "el canal ya está lleno"
-#: src/irc/irc-commands.c:448
+#: src/irc/irc-commands.c:447
msgid "unknown mode char to me"
msgstr "carácter de modo desconocido para mí"
-#: src/irc/irc-commands.c:450
+#: src/irc/irc-commands.c:449
msgid "cannot join channel (invite only)"
msgstr "no es posible unirse al canal (sólo invitados)"
-#: src/irc/irc-commands.c:452
+#: src/irc/irc-commands.c:451
msgid "cannot join channel (banned from channel)"
msgstr "no es posible unirse al canal (baneado del canal)"
-#: src/irc/irc-commands.c:454
+#: src/irc/irc-commands.c:453
msgid "cannot join channel (bad channel key)"
msgstr "no es posible unirse al canal (clave de canal incorrecta)"
-#: src/irc/irc-commands.c:456
+#: src/irc/irc-commands.c:455
msgid "bad channel mask"
msgstr "máscara de canal incorrecta"
-#: src/irc/irc-commands.c:458
+#: src/irc/irc-commands.c:457
msgid "channel doesn't support modes"
msgstr "el canal no soporta los modos"
-#: src/irc/irc-commands.c:460
+#: src/irc/irc-commands.c:459
msgid "you're not an IRC operator"
msgstr "usted no es un operador IRC"
-#: src/irc/irc-commands.c:462
+#: src/irc/irc-commands.c:461
msgid "you're not channel operator"
msgstr "usted no es operador del canal"
-#: src/irc/irc-commands.c:464
+#: src/irc/irc-commands.c:463
msgid "you can't kill a server!"
msgstr "!usted no puede matar a un servidor!"
-#: src/irc/irc-commands.c:466
+#: src/irc/irc-commands.c:465
msgid "user is immune from kick/deop"
msgstr "el usuario es inmune a kick/deop"
-#: src/irc/irc-commands.c:468
+#: src/irc/irc-commands.c:467
msgid "no O-lines for your host"
msgstr "no hay O-lines para su máquina"
-#: src/irc/irc-commands.c:470
+#: src/irc/irc-commands.c:469
msgid "unknown mode flag"
msgstr "indicador de modo desconocido"
-#: src/irc/irc-commands.c:472
+#: src/irc/irc-commands.c:471
msgid "can't change mode for other users"
msgstr "no es posible cambiar el modo para el resto de usuarios"
@@ -1317,7 +1317,7 @@ msgstr "no es posible cambiar el modo para el resto de usuarios"
msgid "whois (secure connection)"
msgstr "whois (conexión segura)"
-#: src/irc/irc-display.c:163 src/common/command.c:853
+#: src/irc/irc-display.c:163 src/common/command.c:874
msgid "Server: "
msgstr "Servidor: "
@@ -1325,7 +1325,7 @@ msgstr "Servidor: "
msgid "connected"
msgstr "conectado"
-#: src/irc/irc-display.c:168
+#: src/irc/irc-display.c:168 src/common/command.c:900
msgid "not connected"
msgstr "no conectado"
@@ -1347,7 +1347,7 @@ msgstr " (servidor temporal, no será guardado)"
msgid "(hidden)"
msgstr "(oculto)"
-#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4008
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4227
msgid "unknown"
msgstr "desconocido"
@@ -1356,7 +1356,7 @@ msgstr "desconocido"
msgid "%s: using local hostname \"%s\"\n"
msgstr "%s: utilización del nombre de máquina local \"%s\"\n"
-#: src/irc/irc-send.c:126 src/common/command.c:731
+#: src/irc/irc-send.c:126 src/common/command.c:752
#, c-format
msgid "%s cannot find nick for sending message\n"
msgstr "%s no ha sido posible encontrar el usuario al que enviar el mensaje\n"
@@ -1373,9 +1373,9 @@ msgstr ""
#: src/irc/irc-send.c:415 src/irc/irc-send.c:427 src/irc/irc-send.c:445
#: src/irc/irc-send.c:1097 src/irc/irc-send.c:1190 src/irc/irc-send.c:1722
-#: src/common/command.c:1196 src/common/command.c:1463
-#: src/common/command.c:1613 src/common/command.c:1756
-#: src/common/command.c:1899
+#: src/common/command.c:1222 src/common/command.c:1576
+#: src/common/command.c:1726 src/common/command.c:1869
+#: src/common/command.c:2012
#, c-format
msgid "%s wrong argument count for \"%s\" command\n"
msgstr "%s número de argumentos incorrecto para el comando \"%s\"\n"
@@ -1392,13 +1392,13 @@ 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:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:409
+#: src/irc/irc-send.c:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:433
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n"
-#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1822
-#: src/irc/irc-recv.c:1900
+#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1886
+#: src/irc/irc-recv.c:1974
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
@@ -1408,439 +1408,439 @@ msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
msgid "%s, compiled on %s %s\n"
msgstr "%s, compilado en %s %s\n"
-#: src/irc/irc-recv.c:269
+#: src/irc/irc-recv.c:289
msgid "You have been invited to "
msgstr "Has sido invitado a "
-#: src/irc/irc-recv.c:272
+#: src/irc/irc-recv.c:292
msgid "by"
msgstr "por"
-#: src/irc/irc-recv.c:282 src/irc/irc-recv.c:376 src/irc/irc-recv.c:875
-#: src/irc/irc-recv.c:1210 src/irc/irc-recv.c:1452 src/irc/irc-recv.c:3226
-#: src/irc/irc-recv.c:3293
+#: src/irc/irc-recv.c:303 src/irc/irc-recv.c:397 src/irc/irc-recv.c:894
+#: src/irc/irc-recv.c:1229 src/irc/irc-recv.c:1488 src/irc/irc-recv.c:3348
+#: src/irc/irc-recv.c:3409 src/irc/irc-recv.c:3481
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s canal \"%s\" no encontrado para el comando \"%s\"\n"
-#: src/irc/irc-recv.c:308
+#: src/irc/irc-recv.c:331
#, 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:328
+#: src/irc/irc-recv.c:350
msgid " has joined "
msgstr " se ha unido "
-#: src/irc/irc-recv.c:385
+#: src/irc/irc-recv.c:408
msgid " has kicked "
msgstr " se ha expulsado "
-#: src/irc/irc-recv.c:389
+#: src/irc/irc-recv.c:412 src/common/command.c:1397
msgid " from "
msgstr " de "
-#: src/irc/irc-recv.c:475
+#: src/irc/irc-recv.c:498
msgid " has killed "
msgstr "ha matado"
-#: src/irc/irc-recv.c:481
+#: src/irc/irc-recv.c:504
msgid " from server"
msgstr "del servidor"
-#: src/irc/irc-recv.c:491
+#: src/irc/irc-recv.c:514
msgid " from server\n"
msgstr "del servidor\n"
-#: src/irc/irc-recv.c:498
+#: src/irc/irc-recv.c:522
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s anfitrión \"%s\" no encontrado para el comando \"%s\"\n"
-#: src/irc/irc-recv.c:538
+#: src/irc/irc-recv.c:562
msgid "sets ban on"
msgstr "establecer baneo en"
-#: src/irc/irc-recv.c:539
+#: src/irc/irc-recv.c:563
msgid "removes ban on"
msgstr "quitar baneo en"
-#: src/irc/irc-recv.c:563
+#: src/irc/irc-recv.c:587
msgid "gives half channel operator status to"
msgstr "dar estado de media operador de canal a"
-#: src/irc/irc-recv.c:564
+#: src/irc/irc-recv.c:588
msgid "removes half channel operator status from"
msgstr "eliminar el estado de media operador de canal a"
-#: src/irc/irc-recv.c:591
+#: src/irc/irc-recv.c:615
msgid "sets invite-only channel flag"
msgstr "define el canal sólo en modo invitado"
-#: src/irc/irc-recv.c:592
+#: src/irc/irc-recv.c:616
msgid "removes invite-only channel flag"
msgstr "elimina el modo sólo invitado para el canal"
-#: src/irc/irc-recv.c:609
+#: src/irc/irc-recv.c:633
msgid "sets channel key to"
msgstr "definir clave de canal en"
-#: src/irc/irc-recv.c:610
+#: src/irc/irc-recv.c:634
msgid "removes channel key"
msgstr "elimina la clave de canal"
-#: src/irc/irc-recv.c:641
+#: src/irc/irc-recv.c:665
msgid "sets the user limit to"
msgstr "define el límite de usuarios en"
-#: src/irc/irc-recv.c:642
+#: src/irc/irc-recv.c:666
msgid "removes user limit"
msgstr "elimina el límite de usuarios"
-#: src/irc/irc-recv.c:664
+#: src/irc/irc-recv.c:688
msgid "sets moderated channel flag"
msgstr "establece la moderación en el canal"
-#: src/irc/irc-recv.c:665
+#: src/irc/irc-recv.c:689
msgid "removes moderated channel flag"
msgstr "elimina la moderación en el canal"
-#: src/irc/irc-recv.c:675
+#: src/irc/irc-recv.c:699
msgid "sets messages from channel only flag"
msgstr "establece el modo sólo mensajes de usuarios del canal"
-#: src/irc/irc-recv.c:676
+#: src/irc/irc-recv.c:700
msgid "removes messages from channel only flag"
msgstr "autoriza a todos los usuarios a escribir en el canal"
-#: src/irc/irc-recv.c:693
+#: src/irc/irc-recv.c:717
msgid "gives channel operator status to"
msgstr "dar estado de operador de canal a"
-#: src/irc/irc-recv.c:694
+#: src/irc/irc-recv.c:718
msgid "removes channel operator status from"
msgstr "eliminar el estado de operador de canal a"
-#: src/irc/irc-recv.c:721
+#: src/irc/irc-recv.c:745
msgid "sets private channel flag"
msgstr "establece el canal como privado"
-#: src/irc/irc-recv.c:722
+#: src/irc/irc-recv.c:746
msgid "removes private channel flag"
msgstr "elimina el modo privado para el canal"
-#: src/irc/irc-recv.c:739
+#: src/irc/irc-recv.c:763
msgid "sets quiet on"
msgstr ""
-#: src/irc/irc-recv.c:740
+#: src/irc/irc-recv.c:764
msgid "removes quiet on"
msgstr ""
-#: src/irc/irc-recv.c:757
+#: src/irc/irc-recv.c:781
msgid "sets secret channel flag"
msgstr "establece el canal como secreto"
-#: src/irc/irc-recv.c:758
+#: src/irc/irc-recv.c:782
msgid "removes secret channel flag"
msgstr "elimina el modo secreto para el canal"
-#: src/irc/irc-recv.c:768
+#: src/irc/irc-recv.c:792
msgid "sets topic protection"
msgstr "activa la protección de tema"
-#: src/irc/irc-recv.c:769
+#: src/irc/irc-recv.c:793
msgid "removes topic protection"
msgstr "elimina la protección de tema"
-#: src/irc/irc-recv.c:786
+#: src/irc/irc-recv.c:810
msgid "gives voice to"
msgstr "da voz a"
-#: src/irc/irc-recv.c:787
+#: src/irc/irc-recv.c:811
msgid "removes voice from"
msgstr "quita la voz a"
-#: src/irc/irc-recv.c:830 src/irc/irc-recv.c:915 src/irc/irc-recv.c:1284
-#: src/irc/irc-recv.c:1966
+#: src/irc/irc-recv.c:854 src/irc/irc-recv.c:936 src/irc/irc-recv.c:1307
+#: src/irc/irc-recv.c:2041
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s comando \"%s\" recibido sin host \n"
-#: src/irc/irc-recv.c:845
+#: src/irc/irc-recv.c:864
#, 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:890
+#: src/irc/irc-recv.c:911
msgid "mode changed by"
msgstr "modo cambiado por"
-#: src/irc/irc-recv.c:954
+#: src/irc/irc-recv.c:973
msgid "You are "
msgstr "Usted es "
-#: src/irc/irc-recv.c:961
+#: src/irc/irc-recv.c:980
msgid " is "
msgstr "es "
-#: src/irc/irc-recv.c:965
+#: src/irc/irc-recv.c:984
msgid "now known as "
msgstr "ahora conocido como"
-#: src/irc/irc-recv.c:1035
+#: src/irc/irc-recv.c:1050
#, 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:1048 src/irc/irc-recv.c:1080
+#: src/irc/irc-recv.c:1066 src/irc/irc-recv.c:1098
msgid "reply from"
msgstr "respuesta de"
-#: src/irc/irc-recv.c:1083
+#: src/irc/irc-recv.c:1101
#, c-format
msgid ": %ld.%ld seconds\n"
msgstr ": %ld.%ld segundos\n"
-#: src/irc/irc-recv.c:1135
+#: src/irc/irc-recv.c:1154
#, 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:1185
+#: src/irc/irc-recv.c:1203
msgid " has left "
msgstr " ha salido "
-#: src/irc/irc-recv.c:1333 src/irc/irc-recv.c:1846
+#: src/irc/irc-recv.c:1355 src/irc/irc-recv.c:1910
#, c-format
msgid "On %s: * %s %s"
msgstr "En %s: * %s %s"
-#: src/irc/irc-recv.c:1353
+#: src/irc/irc-recv.c:1379
#, c-format
msgid "Received a CTCP SOUND \"%s\" from "
msgstr "Recibido un sonido CTCP \\\"%s\\\" de "
-#: src/irc/irc-recv.c:1384 src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1512
-#: src/irc/irc-recv.c:1548 src/irc/irc-recv.c:1881
+#: src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1443 src/irc/irc-recv.c:1547
+#: src/irc/irc-recv.c:1587 src/irc/irc-recv.c:1950
msgid "received from"
msgstr "recibido de"
-#: src/irc/irc-recv.c:1408 src/irc/irc-recv.c:1877
+#: src/irc/irc-recv.c:1439 src/irc/irc-recv.c:1946
msgid "Unknown CTCP "
msgstr ""
-#: src/irc/irc-recv.c:1436
+#: src/irc/irc-recv.c:1471
#, c-format
msgid "On %s: %s> %s"
msgstr "En %s: %s> %s"
-#: src/irc/irc-recv.c:1563 src/irc/irc-recv.c:1580 src/irc/irc-recv.c:1596
-#: src/irc/irc-recv.c:1612 src/irc/irc-recv.c:1637 src/irc/irc-recv.c:1654
-#: src/irc/irc-recv.c:1670 src/irc/irc-recv.c:1694 src/irc/irc-recv.c:1711
-#: src/irc/irc-recv.c:1727 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1768
-#: src/irc/irc-recv.c:1783 src/irc/irc-recv.c:1942 src/irc/irc-recv.c:3592
-#: src/irc/irc-recv.c:3650 src/irc/irc-recv.c:3802 src/irc/irc-recv.c:3817
-#: src/irc/irc-recv.c:3832 src/irc/irc-recv.c:3847 src/irc/irc-recv.c:3860
-#: src/irc/irc-recv.c:3910 src/irc/irc-recv.c:3924
+#: src/irc/irc-recv.c:1603 src/irc/irc-recv.c:1624 src/irc/irc-recv.c:1640
+#: src/irc/irc-recv.c:1656 src/irc/irc-recv.c:1682 src/irc/irc-recv.c:1703
+#: src/irc/irc-recv.c:1719 src/irc/irc-recv.c:1744 src/irc/irc-recv.c:1765
+#: src/irc/irc-recv.c:1781 src/irc/irc-recv.c:1806 src/irc/irc-recv.c:1827
+#: src/irc/irc-recv.c:1842 src/irc/irc-recv.c:2017 src/irc/irc-recv.c:3791
+#: src/irc/irc-recv.c:3849 src/irc/irc-recv.c:4010 src/irc/irc-recv.c:4025
+#: src/irc/irc-recv.c:4040 src/irc/irc-recv.c:4055 src/irc/irc-recv.c:4068
+#: src/irc/irc-recv.c:4123 src/irc/irc-recv.c:4137
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s no es posible analizar el comando \"%s\"\n"
-#: src/irc/irc-recv.c:1796
+#: src/irc/irc-recv.c:1855
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr "%s tipo DCC CHAT desconocido recibido de "
-#: src/irc/irc-recv.c:1921 src/irc/irc-dcc.c:1039
+#: src/irc/irc-recv.c:1995 src/irc/irc-dcc.c:1036
#, c-format
msgid "Private %s> %s"
msgstr "Privado %s> %s"
-#: src/irc/irc-recv.c:1998
+#: src/irc/irc-recv.c:2072
msgid "has quit"
msgstr "ha salido"
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2197
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s comando \"%s\" recibido sin canal\n"
-#: src/irc/irc-recv.c:2147
+#: src/irc/irc-recv.c:2229
msgid " has changed topic for "
msgstr "ha cambiado el tema por "
-#: src/irc/irc-recv.c:2152
+#: src/irc/irc-recv.c:2234
#, c-format
msgid " to: \"%s\"\n"
msgstr " a: \"%s\"\n"
-#: src/irc/irc-recv.c:2158
+#: src/irc/irc-recv.c:2240
msgid " has unset topic for "
msgstr " ha quitado el tema por "
-#: src/irc/irc-recv.c:2276
+#: src/irc/irc-recv.c:2359
#, c-format
msgid " is away: %s\n"
msgstr " está ausente: %s\n"
-#: src/irc/irc-recv.c:2350
+#: src/irc/irc-recv.c:2441
msgid "Users online: "
msgstr "Usuarios conectados: "
-#: src/irc/irc-recv.c:2797
+#: src/irc/irc-recv.c:2927
msgid "idle: "
msgstr "sin actividad: "
-#: src/irc/irc-recv.c:2805
+#: src/irc/irc-recv.c:2935
msgid "days"
msgstr "días"
-#: src/irc/irc-recv.c:2805
+#: src/irc/irc-recv.c:2935
msgid "day"
msgstr "día"
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2945
msgid "hours"
msgstr "horas"
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2945
msgid "hour"
msgstr "hora"
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2951
msgid "minutes"
msgstr "minutos"
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2951
msgid "minute"
msgstr "minuto"
-#: src/irc/irc-recv.c:2827
+#: src/irc/irc-recv.c:2957
msgid "seconds"
msgstr "segundos"
-#: src/irc/irc-recv.c:2827
+#: src/irc/irc-recv.c:2957
msgid "second"
msgstr "segundo"
-#: src/irc/irc-recv.c:2832
+#: src/irc/irc-recv.c:2962
msgid "signon at: "
msgstr "firmado el: "
-#: src/irc/irc-recv.c:2920
+#: src/irc/irc-recv.c:3058
msgid "Channels: "
msgstr "Canales: "
-#: src/irc/irc-recv.c:3172
+#: src/irc/irc-recv.c:3339
msgid "No topic set for "
msgstr "No hay tema definido para "
-#: src/irc/irc-recv.c:3214
+#: src/irc/irc-recv.c:3396
msgid "Topic for "
msgstr "El tema para "
-#: src/irc/irc-recv.c:3218
+#: src/irc/irc-recv.c:3400
#, c-format
msgid " is: \"%s\"\n"
msgstr " es: \"%s\"\n"
-#: src/irc/irc-recv.c:3236 src/irc/irc-recv.c:3320 src/irc/irc-recv.c:3373
+#: src/irc/irc-recv.c:3419 src/irc/irc-recv.c:3508 src/irc/irc-recv.c:3561
#, 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:3282
+#: src/irc/irc-recv.c:3469
msgid "Topic set by "
msgstr "Tema definido por "
-#: src/irc/irc-recv.c:3302
+#: src/irc/irc-recv.c:3490
#, 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:3311 src/irc/irc-recv.c:3382
+#: src/irc/irc-recv.c:3499 src/irc/irc-recv.c:3570
#, 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:3361
+#: src/irc/irc-recv.c:3549
msgid "has invited"
msgstr "ha invitado"
-#: src/irc/irc-recv.c:3364 src/irc/irc-recv.c:3515
+#: src/irc/irc-recv.c:3552 src/irc/irc-recv.c:3712 src/common/command.c:1390
msgid "on"
msgstr "en"
-#: src/irc/irc-recv.c:3638
+#: src/irc/irc-recv.c:3837
#, 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:3694
+#: src/irc/irc-recv.c:3897
msgid "Nicks "
msgstr "Usuarios "
-#: src/irc/irc-recv.c:3714
+#: src/irc/irc-recv.c:3917
msgid "Channel "
msgstr "Canal "
-#: src/irc/irc-recv.c:3725
+#: src/irc/irc-recv.c:3928
msgid "nicks"
msgstr "usuarios"
-#: src/irc/irc-recv.c:3725
+#: src/irc/irc-recv.c:3928
msgid "nick"
msgstr "usuario"
-#: src/irc/irc-recv.c:3733
+#: src/irc/irc-recv.c:3936
msgid "ops"
msgstr "operadores"
-#: src/irc/irc-recv.c:3733
+#: src/irc/irc-recv.c:3936
msgid "op"
msgstr "operador"
-#: src/irc/irc-recv.c:3742
+#: src/irc/irc-recv.c:3945
msgid "halfops"
msgstr "semi-operadores"
-#: src/irc/irc-recv.c:3742
+#: src/irc/irc-recv.c:3945
msgid "halfop"
msgstr "semi-operador"
-#: src/irc/irc-recv.c:3751
+#: src/irc/irc-recv.c:3954
msgid "voices"
msgstr "voces"
-#: src/irc/irc-recv.c:3751
+#: src/irc/irc-recv.c:3954
msgid "voice"
msgstr "voz"
-#: src/irc/irc-recv.c:3760
+#: src/irc/irc-recv.c:3963
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:3873
+#: src/irc/irc-recv.c:4085
msgid "banned by"
msgstr "baneado por"
-#: src/irc/irc-recv.c:3962
+#: src/irc/irc-recv.c:4181
#, 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:3974
+#: src/irc/irc-recv.c:4193
#, 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:3986
+#: src/irc/irc-recv.c:4205
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1849,7 +1849,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:3996
+#: src/irc/irc-recv.c:4215
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
@@ -1880,35 +1880,35 @@ msgstr "Falló"
msgid "Aborted"
msgstr "Abortado"
-#: src/irc/irc-dcc.c:348 src/irc/irc-dcc.c:539 src/irc/irc-dcc.c:701
+#: src/irc/irc-dcc.c:345 src/irc/irc-dcc.c:536 src/irc/irc-dcc.c:698
msgid "DCC: file "
msgstr "DCC: fichero "
-#: src/irc/irc-dcc.c:355 src/irc/irc-dcc.c:664 src/irc/irc-dcc.c:706
+#: src/irc/irc-dcc.c:352 src/irc/irc-dcc.c:661 src/irc/irc-dcc.c:703
msgid " (local filename: "
msgstr " (nombre de fichero local: "
-#: src/irc/irc-dcc.c:363
+#: src/irc/irc-dcc.c:360
msgid " sent to "
msgstr " enviado a "
-#: src/irc/irc-dcc.c:365
+#: src/irc/irc-dcc.c:362
msgid " received from "
msgstr " recibido de "
-#: src/irc/irc-dcc.c:371
+#: src/irc/irc-dcc.c:368
msgid ": ok!\n"
msgstr ": ok!\n"
-#: src/irc/irc-dcc.c:371
+#: src/irc/irc-dcc.c:368
msgid ": FAILED\n"
msgstr ""
-#: src/irc/irc-dcc.c:383
+#: src/irc/irc-dcc.c:380
msgid "DCC chat closed with "
msgstr "DCC chat cerrada con "
-#: src/irc/irc-dcc.c:432
+#: src/irc/irc-dcc.c:429
#, c-format
msgid ""
"%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1917,91 +1917,91 @@ msgstr ""
"%s no se puede asociar la conversación DCC con el búfer privado (quizá el "
"búfer privado ya tiene DCC CHAT)\n"
-#: src/irc/irc-dcc.c:442
+#: src/irc/irc-dcc.c:439
msgid "Connected to "
msgstr "Conectado al "
-#: src/irc/irc-dcc.c:451
+#: src/irc/irc-dcc.c:448
msgid "via DCC chat\n"
msgstr "con charla DCC\n"
-#: src/irc/irc-dcc.c:544
+#: src/irc/irc-dcc.c:541
#, c-format
msgid "resumed at position %u\n"
msgstr ""
-#: src/irc/irc-dcc.c:550 src/irc/irc-dcc.c:575
+#: src/irc/irc-dcc.c:547 src/irc/irc-dcc.c:572
#, c-format
msgid ""
"%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
"ended\n"
msgstr ""
-#: src/irc/irc-dcc.c:594
+#: src/irc/irc-dcc.c:591
#, c-format
msgid "%s not enough memory for new DCC\n"
msgstr "%s no hay memoria suficiente para un nuevo DCC\n"
-#: src/irc/irc-dcc.c:613
+#: src/irc/irc-dcc.c:610
msgid "DCC chat"
msgstr "Charla DCC"
-#: src/irc/irc-dcc.c:643
+#: src/irc/irc-dcc.c:640
msgid "Incoming DCC file from "
msgstr "Recibir fichero DCC de "
-#: src/irc/irc-dcc.c:654 src/irc/irc-dcc.c:668
+#: src/irc/irc-dcc.c:651 src/irc/irc-dcc.c:665
msgid " bytes\n"
msgstr " bytes\n"
-#: src/irc/irc-dcc.c:660
+#: src/irc/irc-dcc.c:657
msgid "Sending DCC file to "
msgstr "Enviar fichero DCC a "
-#: src/irc/irc-dcc.c:674
+#: src/irc/irc-dcc.c:671
msgid "Incoming DCC chat request from "
msgstr "Recibir DCC chat de "
-#: src/irc/irc-dcc.c:686
+#: src/irc/irc-dcc.c:683
msgid "Sending DCC chat request to "
msgstr "Enviar DCC chat a "
-#: src/irc/irc-dcc.c:712
+#: src/irc/irc-dcc.c:709
#, c-format
msgid "will be resumed at position %u\n"
msgstr ""
-#: src/irc/irc-dcc.c:778
+#: src/irc/irc-dcc.c:775
#, c-format
msgid "%s not enough memory for DCC SEND\n"
msgstr "%s no hay memoria suficiente para el DCC SEND\n"
-#: src/irc/irc-dcc.c:800
+#: src/irc/irc-dcc.c:797
#, c-format
msgid "%s cannot access file \"%s\"\n"
msgstr "%s no es posible acceder al fichero \"%s\"\n"
-#: src/irc/irc-dcc.c:821
+#: src/irc/irc-dcc.c:818
#, c-format
msgid "%s cannot create socket for DCC\n"
msgstr "%s no es posible crear socket para el DCC\n"
-#: src/irc/irc-dcc.c:834
+#: src/irc/irc-dcc.c:831
#, c-format
msgid "%s cannot find port for DCC\n"
msgstr "%s no es posible encontrar el puerto para el DCC\n"
-#: src/irc/irc-dcc.c:881
+#: src/irc/irc-dcc.c:878
#, c-format
msgid "%s cannot send DCC\n"
msgstr "%s no es posible enviar el DCC\n"
-#: src/irc/irc-dcc.c:960
+#: src/irc/irc-dcc.c:957
#, c-format
msgid "%s error sending data to \"%s\" via DCC CHAT\n"
msgstr "%s error enviando datos al \"%s\" con DCC CHAT\n"
-#: src/irc/irc-dcc.c:1233
+#: src/irc/irc-dcc.c:1230
#, c-format
msgid ""
"%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -2010,11 +2010,40 @@ msgstr ""
"%s El DCC ha fallado porque el tamaño de bloque es demasiado grande. "
"Compruebe el valor de la opción \"dcc_blocksize\", el máximo es %d.\n"
-#: src/irc/irc-dcc.c:1308
+#: src/irc/irc-dcc.c:1305
#, c-format
msgid "Aborting active DCC: \"%s\" from %s\n"
msgstr "Abandonar el DCC activo: \"%s\" de %s\n"
+#: src/irc/irc-ignore.c:195
+#, c-format
+msgid "%s too few arguments for ignore\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:212
+#, c-format
+msgid "%s mask or type/command should be non generic value for ignore\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:221
+#, c-format
+msgid "%s ignore already exists\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:257
+#, c-format
+msgid "%s unknown type or IRC command \"%s\" for ignore\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:285
+#, c-format
+msgid "%s not enough memory to create ignore\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:406 src/irc/irc-ignore.c:442
+msgid "Removing ignore:"
+msgstr ""
+
#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:463
#: src/plugins/python/wee-python.c:81 src/plugins/ruby/wee-ruby.c:89
#, c-format
@@ -2083,19 +2112,19 @@ msgid "Loading %s script \"%s\"\n"
msgstr "Cargando %s script \"%s\"\n"
#: src/plugins/perl/wee-perl.c:1015 src/plugins/python/wee-python.c:686
-#: src/plugins/ruby/wee-ruby.c:722
+#: src/plugins/ruby/wee-ruby.c:555
#, c-format
msgid "Unloading %s script \"%s\"\n"
msgstr "Descarga del %s script \"%s\"\n"
#: src/plugins/perl/wee-perl.c:1032 src/plugins/python/wee-python.c:703
-#: src/plugins/ruby/wee-ruby.c:739
+#: src/plugins/ruby/wee-ruby.c:572
#, c-format
msgid "Unloading all %s scripts...\n"
msgstr "Descargando todos los %s scripts...\n"
#: src/plugins/perl/wee-perl.c:1037 src/plugins/python/wee-python.c:708
-#: src/plugins/ruby/wee-ruby.c:744
+#: src/plugins/ruby/wee-ruby.c:577
#, c-format
msgid "%s scripts unloaded\n"
msgstr "%s scripts descargados\n"
@@ -2372,7 +2401,7 @@ msgstr "limpiar hotlist"
msgid "grab a key"
msgstr ""
-#: src/gui/gui-keyboard.c:426 src/common/command.c:1478
+#: src/gui/gui-keyboard.c:426 src/common/command.c:1591
#, c-format
msgid "%s unable to bind key \"%s\"\n"
msgstr "%s No ha sido posible atar la clave \"%s\"\n"
@@ -2496,14 +2525,34 @@ msgid "command: name of a WeeChat or IRC command"
msgstr "comando: nombre de un comando de Weechat ó de IRC"
#: src/common/command.c:75
+msgid "ignore IRC messages and/or hosts"
+msgstr ""
+
+#: src/common/command.c:76
+msgid "[mask [[type | command] [channel [server]]]]"
+msgstr ""
+
+#: src/common/command.c:77
+msgid ""
+" mask: nick or host mask to ignore\n"
+" type: type of message to ignore (action, ctcp, dcc, pv)\n"
+"command: IRC command\n"
+"channel: name of channel for ignore\n"
+" server: name of server for ignore\n"
+"\n"
+"For each argument, '*' means all.\n"
+"Without argument, /ignore command lists all defined ignore."
+msgstr ""
+
+#: src/common/command.c:85
msgid "bind/unbind keys"
msgstr "atar/desatar claves"
-#: src/common/command.c:76
+#: src/common/command.c:86
msgid "[key function/command] [unbind key] [functions] [reset -yes]"
msgstr "[clave función/comando] [desatar clave] [funciones] [reset -yes]"
-#: src/common/command.c:77
+#: src/common/command.c:87
msgid ""
"key: bind this key to an internal function or a command (beginning by \"/"
"\")\n"
@@ -2520,51 +2569,57 @@ msgstr ""
"reset: restaura anclajes a los valores por defecto y elimina todos los "
"anclajes personales (usar cuidadosamente)"
-#: src/common/command.c:82
+#: src/common/command.c:92
msgid "list/load/unload Perl scripts"
msgstr "lista/carga/descarga de los Perl scripts"
-#: src/common/command.c:83 src/common/command.c:88 src/common/command.c:93
+#: src/common/command.c:93 src/common/command.c:98 src/common/command.c:103
msgid "[load filename] | [autoload] | [reload] | [unload]"
msgstr "[load fichero] | [autoload] | [reload] | [unload]"
-#: src/common/command.c:84
+#: src/common/command.c:94
msgid ""
"filename: Perl script (file) to load\n"
+"\n"
"Without argument, /perl command lists all loaded Perl scripts."
msgstr ""
"fichero: Perl script (archivo) a cargar\n"
+"\n"
"Sin argumentos, el comando /perl lista todos los Perl scripts cargados."
-#: src/common/command.c:87
+#: src/common/command.c:97
msgid "list/load/unload Python scripts"
msgstr "lista/carga/descarga de los Python scripts"
-#: src/common/command.c:89
+#: src/common/command.c:99
msgid ""
"filename: Python script (file) to load\n"
+"\n"
"Without argument, /python command lists all loaded Python scripts."
msgstr ""
"fichero: Python script (archivo) a cargar\n"
+"\n"
"Sin argumentos, el comando /python lista todos los Python scripts cargados."
-#: src/common/command.c:92
+#: src/common/command.c:102
msgid "list/load/unload Ruby scripts"
msgstr "lista/carga/descarga de los Ruby scripts"
-#: src/common/command.c:94
+#: src/common/command.c:104
msgid ""
"filename: Ruby script (file) to load\n"
+"\n"
"Without argument, /ruby command lists all loaded Ruby scripts."
msgstr ""
"fichero: Ruby script (archivo) a cargar\n"
+"\n"
"Sin argumentos, el comando /ruby lista todos los Ruby scripts cargados."
-#: src/common/command.c:97
+#: src/common/command.c:107
msgid "list, add or remove servers"
msgstr "lista, añade o elimina servidores"
-#: src/common/command.c:98
+#: src/common/command.c:108
msgid ""
"[servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-"
"pwd password] [-nicks nick1 [nick2 [nick3]]] [-username username] [-realname "
@@ -2576,7 +2631,7 @@ msgstr ""
"username nombre de usuario] [-realname nombre_real] [-command comando] [-"
"autojoin canal[,canal]] ] | [del nombre_de_servidor]"
-#: src/common/command.c:103
+#: src/common/command.c:113
msgid ""
"servername: server name, for internal & display use\n"
"hostname: name or IP address of server\n"
@@ -2602,27 +2657,27 @@ msgstr ""
"nombre_de_usuario: nombre de usuario\n"
"nombre_real: nombre real del usuario"
-#: src/common/command.c:115
+#: src/common/command.c:125
msgid "save config to disk"
msgstr "guardar configuración a disco"
-#: src/common/command.c:116
+#: src/common/command.c:126
msgid "[file]"
msgstr "[archivo]"
-#: src/common/command.c:116
+#: src/common/command.c:126
msgid "file: filename for writing config"
msgstr "archivo: fichero en el que guardar la configuración"
-#: src/common/command.c:118
+#: src/common/command.c:128
msgid "set config parameters"
msgstr "modificar parámetros de configuración"
-#: src/common/command.c:119
+#: src/common/command.c:129
msgid "[option[=value]]"
msgstr "[opción[=valor]]"
-#: src/common/command.c:119
+#: src/common/command.c:129
msgid ""
"option: name of an option\n"
"value: value for option"
@@ -2630,27 +2685,48 @@ msgstr ""
"opción: nombre de una opción\n"
"valor: valor para la opción"
-#: src/common/command.c:121
+#: src/common/command.c:131
msgid "remove an alias"
msgstr "eliminar un alias"
-#: src/common/command.c:122
+#: src/common/command.c:132
msgid "alias_name"
msgstr "alias"
-#: src/common/command.c:122
+#: src/common/command.c:132
msgid "alias_name: name of alias to remove"
msgstr "alias: nombre del alias a suprimir"
-#: src/common/command.c:124
+#: src/common/command.c:134
+msgid "unignore IRC messages and/or hosts"
+msgstr ""
+
+#: src/common/command.c:135
+msgid "[number | [mask [[type | command] [channel [server]]]]]"
+msgstr ""
+
+#: src/common/command.c:136
+msgid ""
+" number: # of ignore to unignore (number is displayed by list of ignore)\n"
+" mask: nick or host mask to unignore\n"
+" type: type of message to unignore (action, ctcp, dcc, pv)\n"
+"command: IRC command\n"
+"channel: name of channel for unignore\n"
+" server: name of server for unignore\n"
+"\n"
+"For each argument, '*' means all.\n"
+"Without argument, /unignore command lists all defined ignore."
+msgstr ""
+
+#: src/common/command.c:145
msgid "manage windows"
msgstr "gestión de ventanas"
-#: src/common/command.c:125
+#: src/common/command.c:146
msgid "[list | splith | splitv | [merge [down | up | left | right | all]]]"
msgstr "[list | splith | splitv | [merge [down | up | left | right | all]]]"
-#: src/common/command.c:126
+#: src/common/command.c:147
msgid ""
"list: list opened windows (no parameter implies this list)\n"
"splith: split current window horizontally\n"
@@ -2663,29 +2739,29 @@ msgstr ""
"splitv: dividir la ventana actual verticalmente\n"
"merge: fusionar una ventana con otra"
-#: src/common/command.c:272
+#: src/common/command.c:293
#, c-format
msgid "%s alias or command \"%s\" already exists!\n"
msgstr "%s ¡el alias o el comando \"%s\" ya existe!\n"
-#: src/common/command.c:282
+#: src/common/command.c:303
#, c-format
msgid "%s alias cannot run another alias!\n"
msgstr "%s ¡el alias no puede ejecutar otro alias!\n"
-#: src/common/command.c:289
+#: src/common/command.c:310
#, c-format
msgid "%s target command \"%s\" does not exist!\n"
msgstr "%s ¡el comando objetivo \"%s\" no existe!\n"
-#: src/common/command.c:497
+#: src/common/command.c:518
#, c-format
msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
msgstr ""
"%s número de argumentos incorrecto para el comando %s \"%s\" (esperado: %d "
"parámetro%s)\n"
-#: src/common/command.c:509
+#: src/common/command.c:530
#, c-format
msgid ""
"%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
@@ -2694,19 +2770,19 @@ msgstr ""
"%s número de argumentos incorrecto para el comando %s \"%s\" (esperado: "
"entre %d y %d parámetro%s)\n"
-#: src/common/command.c:531 src/common/command.c:601
+#: src/common/command.c:552 src/common/command.c:622
#, c-format
msgid "%s command \"%s\" failed\n"
msgstr "%s el comando \"%s\" ha fallado\n"
-#: src/common/command.c:559
+#: src/common/command.c:580
#, c-format
msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
msgstr ""
"%s número de argumentos incorrecto para el comando IRC \"%s\" (esperado: %d "
"parámetro%s)\n"
-#: src/common/command.c:571
+#: src/common/command.c:592
#, c-format
msgid ""
"%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
@@ -2715,222 +2791,238 @@ msgstr ""
"%s número de argumentos incorrecto para el comando IRC \"%s\" (esperado: "
"entre %d y %d parámetro%s)\n"
-#: src/common/command.c:586
+#: src/common/command.c:607
#, c-format
msgid "%s command \"%s\" needs a server connection!\n"
msgstr "%s ¡el comando \"%s\" requiere una conexión a servidor!\n"
-#: src/common/command.c:650
+#: src/common/command.c:671
#, c-format
msgid "%s unknown command \"%s\" (type /help for help)\n"
msgstr "%s comando \"%s\" desconocido (escriba /help para la ayuda)\n"
-#: src/common/command.c:753
+#: src/common/command.c:774
#, c-format
msgid "%s unable to call handler for message (not enough memory)\n"
msgstr ""
"%s No ha sido posible llamar al manejador para el mensaje (no hay suficiente "
"memoria)\n"
-#: src/common/command.c:761
+#: src/common/command.c:782
msgid "This window is not a channel!\n"
msgstr "¡Esta ventana no es un canal!\n"
-#: src/common/command.c:789 src/common/command.c:813 src/common/command.c:918
+#: src/common/command.c:810 src/common/command.c:834 src/common/command.c:944
#, c-format
msgid "%s missing arguments for \"%s\" command\n"
msgstr "%s faltan argumentos para el comando \"%s\"\n"
-#: src/common/command.c:798
+#: src/common/command.c:819
#, c-format
msgid "Alias \"%s\" => \"%s\" created\n"
msgstr "Alias \"%s\" => \"%s\" creado\n"
-#: src/common/command.c:804
+#: src/common/command.c:825
#, c-format
msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
msgstr ""
"No ha sido posible crear el alias \"%s\" => \"%s\" (no hay suficiente "
"memoria)\n"
-#: src/common/command.c:824
+#: src/common/command.c:845
msgid "List of aliases:\n"
msgstr "Lista de alias:\n"
-#: src/common/command.c:836
+#: src/common/command.c:857
msgid "No alias defined.\n"
msgstr "Ningún alias definido.\n"
-#: src/common/command.c:859
+#: src/common/command.c:880
msgid "Channel: "
msgstr "Canal: "
-#: src/common/command.c:862 src/common/command.c:872
+#: src/common/command.c:883 src/common/command.c:893
msgid " (server: "
msgstr " (servidor: "
-#: src/common/command.c:869
+#: src/common/command.c:890
msgid "Private with: "
msgstr "Privado con: "
-#: src/common/command.c:898
+#: src/common/command.c:924
msgid "Opened buffers:\n"
msgstr "Búfers abiertos:\n"
-#: src/common/command.c:941
+#: src/common/command.c:967
#, c-format
msgid "%s incorrect buffer number\n"
msgstr "%s número de búfer incorrecto\n"
-#: src/common/command.c:955
+#: src/common/command.c:981
#, c-format
msgid "%s can not close the single buffer\n"
msgstr "%s no es posible cerrar el único búfer\n"
-#: src/common/command.c:965
+#: src/common/command.c:991
#, c-format
msgid "%s can not close server buffer while channels are opened\n"
msgstr ""
"%s no se puede cerrar el búfer de servidor mientras haya canales abiertos\n"
-#: src/common/command.c:1006
+#: src/common/command.c:1032
msgid "Notify levels: "
msgstr "Niveles de notificación: "
-#: src/common/command.c:1034 src/common/command.c:1056
+#: src/common/command.c:1060 src/common/command.c:1082
#, c-format
msgid "%s incorrect notify level (must be between %d and %d)\n"
msgstr "%s nivel de notificación incorrecto (debe estar entre %d y %d)\n"
-#: src/common/command.c:1043
+#: src/common/command.c:1069
#, c-format
msgid "%s incorrect buffer for notify (must be channel or private)\n"
msgstr "%s búfer incorrecto para notificar (debe ser canal o privado)\n"
-#: src/common/command.c:1123
+#: src/common/command.c:1149
#, c-format
msgid "unknown parameter \"%s\" for \"%s\" command\n"
msgstr "parámetro desconocido \"%s\" para el comando \"%s\"\n"
-#: src/common/command.c:1153
+#: src/common/command.c:1179
#, c-format
msgid "%s already connected to server \"%s\"!\n"
msgstr "%s ya conectado al servidor \"%s\"!\n"
-#: src/common/command.c:1161
+#: src/common/command.c:1187
#, c-format
msgid "%s currently connecting to server \"%s\"!\n"
msgstr "%s actualmente conectando al servidor \"%s\"!\n"
-#: src/common/command.c:1179 src/common/command.c:1254
+#: src/common/command.c:1205 src/common/command.c:1280
#, c-format
msgid "%s server not found\n"
msgstr "%s servidor no encontrado\n"
-#: src/common/command.c:1209 src/common/command.c:1606
-#: src/common/command.c:1749 src/common/command.c:1892
-#: src/common/command.c:2589 src/common/command.c:2605
+#: src/common/command.c:1235 src/common/command.c:1719
+#: src/common/command.c:1862 src/common/command.c:2005
+#: src/common/command.c:2765 src/common/command.c:2781
#, c-format
msgid "%s unknown option for \"%s\" command\n"
msgstr "%s opción desconocida para el comando \"%s\"\n"
-#: src/common/command.c:1238
+#: src/common/command.c:1264
#, c-format
msgid "%s not connected to server \"%s\"!\n"
msgstr "%s ¡no conectado al servidor \"%s\"!\n"
-#: src/common/command.c:1246
+#: src/common/command.c:1272
msgid "Auto-reconnection is cancelled\n"
msgstr "La reconexión automática está anulada\n"
-#: src/common/command.c:1272 src/common/weechat.c:273
+#: src/common/command.c:1298 src/common/weechat.c:345
#, c-format
msgid "%s internal commands:\n"
msgstr "Comandos internos %s :\n"
-#: src/common/command.c:1281 src/common/weechat.c:293
+#: src/common/command.c:1307 src/common/weechat.c:365
#, c-format
msgid "IRC commands:\n"
msgstr "Comandos IRC :\n"
-#: src/common/command.c:1348
+#: src/common/command.c:1374
#, c-format
msgid "No help available, \"%s\" is an unknown command\n"
msgstr "No hay ayuda disponible, el comando \"%s\" es desconocido\n"
-#: src/common/command.c:1366
+#: src/common/command.c:1395
+msgid " ignoring "
+msgstr ""
+
+#: src/common/command.c:1419
+msgid "List of ignore:\n"
+msgstr ""
+
+#: src/common/command.c:1434
+msgid "No ignore defined.\n"
+msgstr ""
+
+#: src/common/command.c:1460
+msgid "New ignore:"
+msgstr ""
+
+#: src/common/command.c:1479
msgid "New key binding:\n"
msgstr "Nuevo anclaje de clave:\n"
-#: src/common/command.c:1399
+#: src/common/command.c:1512
msgid "Key bindings:\n"
msgstr "Anclajes de clave:\n"
-#: src/common/command.c:1411
+#: src/common/command.c:1524
#, c-format
msgid "Key \"%s\" unbinded\n"
msgstr "Clave \"%s\" desatada\n"
-#: src/common/command.c:1416
+#: src/common/command.c:1529
#, c-format
msgid "%s unable to unbind key \"%s\"\n"
msgstr "%s No ha sido posible desatar la clave \"%s\"\n"
-#: src/common/command.c:1424 src/common/weechat.c:324
+#: src/common/command.c:1537 src/common/weechat.c:396
#, c-format
msgid "Internal key functions:\n"
msgstr "Funciones de clave internas:\n"
-#: src/common/command.c:1443
+#: src/common/command.c:1556
msgid "Default key bindings restored\n"
msgstr "Anclajes de clave por defecto restaurados\n"
-#: src/common/command.c:1449
+#: src/common/command.c:1562
#, c-format
msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
msgstr ""
"%s \"-yes\" se requiere argumento para resetear las claves (por razones de "
"seguridad)\n"
-#: src/common/command.c:1505 src/common/command.c:1648
-#: src/common/command.c:1791
+#: src/common/command.c:1618 src/common/command.c:1761
+#: src/common/command.c:1904
#, c-format
msgid "Registered %s scripts:\n"
msgstr "%s scripts registrados:\n"
-#: src/common/command.c:1522 src/common/command.c:1545
-#: src/common/command.c:1568 src/common/command.c:1665
-#: src/common/command.c:1688 src/common/command.c:1711
-#: src/common/command.c:1808 src/common/command.c:1831
-#: src/common/command.c:1854
+#: src/common/command.c:1635 src/common/command.c:1658
+#: src/common/command.c:1681 src/common/command.c:1778
+#: src/common/command.c:1801 src/common/command.c:1824
+#: src/common/command.c:1921 src/common/command.c:1944
+#: src/common/command.c:1967
msgid " (none)\n"
msgstr " (ninguno)\n"
-#: src/common/command.c:1527 src/common/command.c:1670
-#: src/common/command.c:1813
+#: src/common/command.c:1640 src/common/command.c:1783
+#: src/common/command.c:1926
#, c-format
msgid "%s message handlers:\n"
msgstr "Funciones %s para mensajes:\n"
-#: src/common/command.c:1536 src/common/command.c:1679
-#: src/common/command.c:1822
+#: src/common/command.c:1649 src/common/command.c:1792
+#: src/common/command.c:1935
#, c-format
msgid " IRC(%s) => %s(%s)\n"
msgstr " IRC(%s) => %s(%s)\n"
-#: src/common/command.c:1550 src/common/command.c:1693
-#: src/common/command.c:1836
+#: src/common/command.c:1663 src/common/command.c:1806
+#: src/common/command.c:1949
#, c-format
msgid "%s command handlers:\n"
msgstr "Comandos %s :\n"
-#: src/common/command.c:1559 src/common/command.c:1702
-#: src/common/command.c:1845
+#: src/common/command.c:1672 src/common/command.c:1815
+#: src/common/command.c:1958
#, c-format
msgid " Command /%s => %s(%s)\n"
msgstr " Comando /%s => %s(%s)\n"
-#: src/common/command.c:1619
+#: src/common/command.c:1732
msgid ""
"WeeChat was build without Perl support.\n"
"Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n"
@@ -2939,7 +3031,7 @@ msgstr ""
"Por favor, recompile WeeChat con la opción \"--enable-perl\" para el "
"script ./configure\n"
-#: src/common/command.c:1762
+#: src/common/command.c:1875
msgid ""
"WeeChat was build without Python support.\n"
"Please rebuild WeeChat with \"--enable-python\" option for ./configure "
@@ -2949,40 +3041,41 @@ msgstr ""
"Por favor, recompile WeeChat con la opción \"--enable-python\" para el "
"script ./configure\n"
-#: src/common/command.c:1905
+#: src/common/command.c:2018
msgid ""
"WeeChat was build without Ruby support.\n"
"Please rebuild WeeChat with \"--enable-ruby\" option for ./configure script\n"
msgstr ""
"WeeChat ha sido compilado sin soporte para Ruby.\n"
-"Por favor, recompile WeeChat con la opción \"--enable-ruby\" para el script ./configure\n"
+"Por favor, recompile WeeChat con la opción \"--enable-ruby\" para el "
+"script ./configure\n"
-#: src/common/command.c:1953
+#: src/common/command.c:2066
msgid "No server.\n"
msgstr "Ningún servidor.\n"
-#: src/common/command.c:1964
+#: src/common/command.c:2077
#, c-format
msgid "Server '%s' not found.\n"
msgstr "Servidor '%s' no encontrado.\n"
-#: src/common/command.c:1976
+#: src/common/command.c:2089
#, c-format
msgid "%s missing servername for \"%s\" command\n"
msgstr "%s falta el nombre de servidor para el comando \"%s\"\n"
-#: src/common/command.c:1984
+#: src/common/command.c:2097
#, c-format
msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
msgstr ""
"%s demasiados argumentos para el comando \"%s\", ignorando parámetros\n"
-#: src/common/command.c:2003
+#: src/common/command.c:2116
#, c-format
msgid "%s server \"%s\" not found for \"%s\" command\n"
msgstr "%s servidor \"%s\" no encontrado para el comando \"%s\"\n"
-#: src/common/command.c:2011
+#: src/common/command.c:2124
#, c-format
msgid ""
"%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -2991,108 +3084,121 @@ msgstr ""
"%s usted no puede eliminar el servidor \"%s\" ya que está usted conectado a "
"él. Pruebe /disconnect %s antes.\n"
-#: src/common/command.c:2027 src/common/command.c:2173
+#: src/common/command.c:2140 src/common/command.c:2286
msgid "Server"
msgstr "Servidor"
-#: src/common/command.c:2030
+#: src/common/command.c:2143
msgid "has been deleted\n"
msgstr "ha sido eliminado\n"
-#: src/common/command.c:2045
+#: src/common/command.c:2158
#, c-format
msgid "%s missing parameters for \"%s\" command\n"
msgstr "%s faltan parámetros para el comando \"%s\"\n"
-#: src/common/command.c:2055
+#: src/common/command.c:2168
#, c-format
msgid "%s server \"%s\" already exists, can't create it!\n"
msgstr "%s el servidor \"%s\" ya existe, ¡no se puede crear!\n"
-#: src/common/command.c:2084 src/common/command.c:2112
-#: src/common/command.c:2125 src/common/command.c:2151
+#: src/common/command.c:2197 src/common/command.c:2225
+#: src/common/command.c:2238 src/common/command.c:2264
#, c-format
msgid "%s missing password for \"%s\" parameter\n"
msgstr "%s falta contraseña para el comando \"%s\"\n"
-#: src/common/command.c:2097
+#: src/common/command.c:2210
#, c-format
msgid "%s missing nick(s) for \"%s\" parameter\n"
msgstr "%s falta(n) usuario(s) para el parámetro \"%s\"\n"
-#: src/common/command.c:2138
+#: src/common/command.c:2251
#, c-format
msgid "%s missing command for \"%s\" parameter\n"
msgstr "%s falta comando para el parámetro \"%s\"\n"
-#: src/common/command.c:2176
+#: src/common/command.c:2289
msgid "created\n"
msgstr "creado\n"
-#: src/common/command.c:2182
+#: src/common/command.c:2295
#, c-format
msgid "%s unable to create server\n"
msgstr "%s no es posible crear el servidor\n"
-#: src/common/command.c:2237
+#: src/common/command.c:2350
msgid "(unknown)"
msgstr "(desconocido)"
-#: src/common/command.c:2260
+#: src/common/command.c:2373
msgid "(password hidden) "
msgstr "(contraseña oculta) "
-#: src/common/command.c:2324
+#: src/common/command.c:2437
#, c-format
msgid "%s server \"%s\" not found\n"
msgstr "%s servidor \"%s\" no encontrado\n"
-#: src/common/command.c:2355 src/common/command.c:2401
+#: src/common/command.c:2468 src/common/command.c:2514
#, c-format
msgid "%s config option \"%s\" not found\n"
msgstr "%s opción de configuración \"%s\" no encontrada\n"
-#: src/common/command.c:2360 src/common/command.c:2393
+#: src/common/command.c:2473 src/common/command.c:2506
#, c-format
msgid "%s incorrect value for option \"%s\"\n"
msgstr "%s valor incorrecto para la opción \"%s\"\n"
-#: src/common/command.c:2376
+#: src/common/command.c:2489
#, c-format
msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
msgstr ""
"%s la opción \"%s\" no puede ser modificada mientras WeeChat esté en "
"ejecución\n"
-#: src/common/command.c:2475
+#: src/common/command.c:2588
#, c-format
msgid "No config option found with \"%s\"\n"
msgstr "Ninguna opción de configuración encontrada con \"%s\"\n"
-#: src/common/command.c:2478
+#: src/common/command.c:2591
msgid "No config option found\n"
msgstr "Ninguna opción de configuración encontrada\n"
-#: src/common/command.c:2484
+#: src/common/command.c:2597
#, c-format
msgid "config option(s) found with \"%s\"\n"
msgstr "opción/opciones de configuración encontrada(s) con \"%s\"\n"
-#: src/common/command.c:2487
+#: src/common/command.c:2600
msgid "config option(s) found\n"
msgstr "opción/opciones de configuración encontrada(s)\n"
-#: src/common/command.c:2507
+#: src/common/command.c:2620
#, c-format
msgid "%s alias or command \"%s\" not found\n"
msgstr "%s alias o comando \"%s\" no encontrado\n"
-#: src/common/command.c:2517
+#: src/common/command.c:2630
#, c-format
msgid "Alias \"%s\" removed\n"
msgstr "Alias \"%s\" eliminado\n"
-#: src/common/command.c:2537
+#: src/common/command.c:2683
+msgid "ignore were removed.\n"
+msgstr ""
+
+#: src/common/command.c:2685
+msgid "ignore was removed.\n"
+msgstr ""
+
+#: src/common/command.c:2690
+#, c-format
+msgid "%s no ignore found\n"
+msgstr ""
+
+#: src/common/command.c:2713
msgid "Opened windows:\n"
msgstr "Ventanas abiertas:\n"
@@ -3157,7 +3263,7 @@ msgstr "**** Comienzo del log (registro) "
msgid "**** End of log "
msgstr "**** Fin del log "
-#: src/common/weechat.c:198
+#: src/common/weechat.c:270
#, c-format
msgid ""
"WeeChat configuration options (~/.weechat/weechat.rc):\n"
@@ -3166,47 +3272,47 @@ msgstr ""
"Opciones de configuración de WeeChat (~/.weechat/weechat.rc):\n"
"\n"
-#: src/common/weechat.c:211
+#: src/common/weechat.c:283
#, c-format
msgid " . type boolean (values: 'on' or 'off')\n"
msgstr " . tipo booleano (valores: 'on' u 'off')\n"
-#: src/common/weechat.c:212 src/common/weechat.c:235 src/common/weechat.c:241
-#: src/common/weechat.c:247
+#: src/common/weechat.c:284 src/common/weechat.c:307 src/common/weechat.c:313
+#: src/common/weechat.c:319
#, c-format
msgid " . default value: '%s'\n"
msgstr " . valor por defecto: '%s'\n"
-#: src/common/weechat.c:217
+#: src/common/weechat.c:289
#, c-format
msgid " . type integer (values: between %d and %d)\n"
msgstr " . tipo entero (valores: entre %d y %d)\n"
-#: src/common/weechat.c:220
+#: src/common/weechat.c:292
#, c-format
msgid " . default value: %d\n"
msgstr " . valor por defecto: %d\n"
-#: src/common/weechat.c:224
+#: src/common/weechat.c:296
#, c-format
msgid " . type string (values: "
msgstr " . tipo cadena (valores: "
-#: src/common/weechat.c:237 src/common/weechat.c:243 src/common/weechat.c:249
+#: src/common/weechat.c:309 src/common/weechat.c:315 src/common/weechat.c:321
msgid "empty"
msgstr "vacío"
-#: src/common/weechat.c:240
+#: src/common/weechat.c:312
#, c-format
msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n"
msgstr " . tipo color (color Curses ó Gtk, ver la documentación de WeeChat)\n"
-#: src/common/weechat.c:246
+#: src/common/weechat.c:318
#, c-format
msgid " . type string (any string)\n"
msgstr " . tipo cadena (cualquier cadena)\n"
-#: src/common/weechat.c:252
+#: src/common/weechat.c:324
#, c-format
msgid ""
" . description: %s\n"
@@ -3215,7 +3321,7 @@ msgstr ""
" . descripción: %s\n"
"\n"
-#: src/common/weechat.c:258
+#: src/common/weechat.c:330
#, c-format
msgid ""
"Moreover, you can define aliases in [alias] section, by adding lines like:\n"
@@ -3223,7 +3329,7 @@ msgstr ""
"Además, usted puede definir alias en la sección [alias], añadiendo líneas "
"como:\n"
-#: src/common/weechat.c:260
+#: src/common/weechat.c:332
#, c-format
msgid ""
"where 'j' is alias name, and 'join' associated command.\n"
@@ -3232,62 +3338,62 @@ msgstr ""
"donde 'j' es el nombre del alias, y 'join' el comando asociado.\n"
"\n"
-#: src/common/weechat.c:345
+#: src/common/weechat.c:417
#, c-format
msgid "%s default keys:\n"
msgstr "%s claves por defecto:\n"
-#: src/common/weechat.c:425
+#: src/common/weechat.c:497
#, c-format
msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
msgstr "%s sintaxis inválida para el servidor IRC ('%s'), ignorado\n"
-#: src/common/weechat.c:438
+#: src/common/weechat.c:510
#, c-format
msgid "%s unable to create server ('%s'), ignored\n"
msgstr "%s no es posible crear el servidor ('%s'), ignorado\n"
-#: src/common/weechat.c:447
+#: src/common/weechat.c:519
#, c-format
msgid "%s unknown parameter '%s', ignored\n"
msgstr "%s parámetro desconocido '%s', ignorado\n"
-#: src/common/weechat.c:467
+#: src/common/weechat.c:539
#, c-format
msgid "%s cannot create directory \"%s\"\n"
msgstr "%s no es posible crear el directorio \"%s\"\n"
-#: src/common/weechat.c:493
+#: src/common/weechat.c:565
#, c-format
msgid "%s unable to get HOME directory\n"
msgstr "%s no ha sido posible leer el directorio HOME\n"
-#: src/common/weechat.c:502
+#: src/common/weechat.c:574
#, c-format
msgid "%s not enough memory for home directory\n"
msgstr "%s no hay suficiente memoria para el directorio home\n"
-#: src/common/weechat.c:512
+#: src/common/weechat.c:584
#, c-format
msgid "%s unable to create ~/.weechat directory\n"
msgstr "%s no es posible crear el directorio ~/.weechat\n"
-#: src/common/weechat.c:564
+#: src/common/weechat.c:636
#, c-format
msgid "%s unable to create ~/.weechat/logs directory\n"
msgstr "%s no es posible crear el directorio ~/.weechat/logs\n"
-#: src/common/weechat.c:607
+#: src/common/weechat.c:679
#, c-format
msgid "%s unable to create/append to log file (~/.weechat/%s)"
msgstr "%s no es posible crear/añadir en el fichero de log (~/.weechat/%s)"
-#: src/common/weechat.c:630
+#: src/common/weechat.c:702
#, c-format
msgid "%sWelcome to "
msgstr "%sBienvenido a "
-#: src/common/weechat.c:643 src/common/weechat.c:652
+#: src/common/weechat.c:715 src/common/weechat.c:724
msgid "compiled on"
msgstr "compilado en"
@@ -3299,33 +3405,33 @@ msgstr "Error WeeChat:"
msgid "WeeChat Warning:"
msgstr "Advertencia WeeChat:"
-#: src/common/weeconfig.c:90 src/common/weeconfig.c:91
+#: src/common/weeconfig.c:91 src/common/weeconfig.c:92
msgid "set title for window (terminal for Curses GUI) with name & version"
msgstr ""
"define el título de la ventana (el terminal para la interfaz Curses) con el "
"nombre y la versión"
-#: src/common/weeconfig.c:94 src/common/weeconfig.c:95
+#: src/common/weeconfig.c:95 src/common/weeconfig.c:96
msgid "display WeeChat logo at startup"
msgstr "mostrar el logotipo de WeeChat en el arranque"
-#: src/common/weeconfig.c:98 src/common/weeconfig.c:99
+#: src/common/weeconfig.c:99 src/common/weeconfig.c:100
msgid "display WeeChat version at startup"
msgstr "mostrar la versión de Weechat en el arranque"
-#: src/common/weeconfig.c:102
+#: src/common/weeconfig.c:103
msgid "WeeChat slogan"
msgstr "eslógan de WeeChat"
-#: src/common/weeconfig.c:103
+#: src/common/weeconfig.c:104
msgid "WeeChat slogan (if empty, slogan is not used)"
msgstr "eslógan de WeeChat (si está vacío, el eslógan no será utilizado)"
-#: src/common/weeconfig.c:106
+#: src/common/weeconfig.c:107
msgid "charset for decoding messages from server"
msgstr "juego de caracteres para decodificar los mensajes del servidor"
-#: src/common/weeconfig.c:107
+#: src/common/weeconfig.c:108
msgid ""
"charset for decoding messages from server, examples: UTF-8, ISO-8859-1 (if "
"empty, messages are not converted)"
@@ -3333,11 +3439,11 @@ msgstr ""
"juego de caracteres para decodificar los mensajes del servidor, ejemplos: "
"UTF-8, ISO-8859-1 (si no se especifica, los mensajes no son convertidos)"
-#: src/common/weeconfig.c:110
+#: src/common/weeconfig.c:111
msgid "charset for encoding messages sent to server"
msgstr "juego de caracteres para codificar los mensajes enviados al servidor"
-#: src/common/weeconfig.c:111
+#: src/common/weeconfig.c:112
msgid ""
"charset for encoding messages sent to server, examples: UFT-8, ISO-8859-1 "
"(if empty, local charset is used)"
@@ -3346,11 +3452,11 @@ msgstr ""
"ejemplos: UFT-8, ISO-8859-1 (si no se especifica, se utiliza el juego de "
"caracteres local)"
-#: src/common/weeconfig.c:114
+#: src/common/weeconfig.c:115
msgid "internal WeeChat charset (should be ISO)"
msgstr "juego de caracteres interno de WeeChat (debería ser ISO)"
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:116
msgid ""
"internal WeeChat charset, should be ISO-xxxx even if locale is UTF-8 (if "
"empty, local charset is used)"
@@ -3359,45 +3465,45 @@ msgstr ""
"locale sea UTF-8 (si no se especifica, se utiliza el juego de caracteres "
"local)"
-#: src/common/weeconfig.c:118 src/common/weeconfig.c:119
+#: src/common/weeconfig.c:119 src/common/weeconfig.c:120
msgid "timestamp for buffers"
msgstr "fecha y hora para las búfers"
-#: src/common/weeconfig.c:122 src/common/weeconfig.c:123
+#: src/common/weeconfig.c:123 src/common/weeconfig.c:124
msgid "display nick names with different colors"
msgstr "mostrar nombres de usuario con colores diferentes"
-#: src/common/weeconfig.c:126 src/common/weeconfig.c:127
+#: src/common/weeconfig.c:127 src/common/weeconfig.c:128
msgid "display actions with different colors"
msgstr "mostrar acciones con colores diferentes"
-#: src/common/weeconfig.c:130 src/common/weeconfig.c:131
+#: src/common/weeconfig.c:131 src/common/weeconfig.c:132
msgid "remove colors from incoming messages"
msgstr "quitar colores en los mensajes entrantes"
-#: src/common/weeconfig.c:134
+#: src/common/weeconfig.c:135
msgid "display nicklist window"
msgstr "mostrar ventana de usuarios"
-#: src/common/weeconfig.c:135
+#: src/common/weeconfig.c:136
msgid "display nicklist window (for channel windows)"
msgstr "mostrar ventana de usuarios (para las ventanas de canal)"
-#: src/common/weeconfig.c:138
+#: src/common/weeconfig.c:139
msgid "nicklist position"
msgstr "posición de la ventana de usuarios"
-#: src/common/weeconfig.c:139
+#: src/common/weeconfig.c:140
msgid "nicklist position (top, left, right (default), bottom)"
msgstr ""
"posición de la ventana de usuarios (arriba (top), izquierda (left), derecha "
"(right, por defecto), abajo (bottom))"
-#: src/common/weeconfig.c:142
+#: src/common/weeconfig.c:143
msgid "min size for nicklist"
msgstr "tamaño mínimo para la ventana de usuarios"
-#: src/common/weeconfig.c:143
+#: src/common/weeconfig.c:144
msgid ""
"min size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no min size))"
@@ -3405,11 +3511,11 @@ msgstr ""
"tamaño mínimo para la ventana de usuarios (ancho o alto, dependiendo de "
"look_nicklist_position (0 = sin tamaño mínimo))"
-#: src/common/weeconfig.c:147
+#: src/common/weeconfig.c:148
msgid "max size for nicklist"
msgstr "tamaño máximo para la ventana de usuarios"
-#: src/common/weeconfig.c:148
+#: src/common/weeconfig.c:149
msgid ""
"max size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no max size; if min == max and > 0, then size is fixed))"
@@ -3418,41 +3524,41 @@ msgstr ""
"look_nicklist_position (0 = sin tamaño máximo, si min == max y > 0, entonces "
"se fija el tamaño))"
-#: src/common/weeconfig.c:152 src/common/weeconfig.c:153
+#: src/common/weeconfig.c:153 src/common/weeconfig.c:154
msgid "text to display instead of nick when not connected"
msgstr "texto a mostrar en lugar del nick cuando no se está conectado"
-#: src/common/weeconfig.c:156 src/common/weeconfig.c:157
+#: src/common/weeconfig.c:157 src/common/weeconfig.c:158
msgid "display nick mode ((half)op/voice) before each nick"
msgstr "mostrar modo del usuario ((half)op/voice) antes de cada usuario"
-#: src/common/weeconfig.c:160 src/common/weeconfig.c:161
+#: src/common/weeconfig.c:161 src/common/weeconfig.c:162
msgid "display space if nick mode is not (half)op/voice"
msgstr "mostrar un espacio si el modo de usuario no es (half)op/voice"
-#: src/common/weeconfig.c:164 src/common/weeconfig.c:165
+#: src/common/weeconfig.c:165 src/common/weeconfig.c:166
msgid "the string inserted after nick completion"
msgstr "la cadena mostrada tras la finalización de los nombres de usuario"
-#: src/common/weeconfig.c:168 src/common/weeconfig.c:169
+#: src/common/weeconfig.c:169 src/common/weeconfig.c:170
msgid "enable info bar"
msgstr "activa la barra de información"
-#: src/common/weeconfig.c:172 src/common/weeconfig.c:173
+#: src/common/weeconfig.c:173 src/common/weeconfig.c:174
msgid "timestamp for time in infobar"
msgstr "fecha y hora para las conversaciones guardadas"
-#: src/common/weeconfig.c:176 src/common/weeconfig.c:177
+#: src/common/weeconfig.c:177 src/common/weeconfig.c:178
msgid "display seconds in infobar time"
msgstr "mostrar segundos en la hora de la barra de herramientas"
-#: src/common/weeconfig.c:180
+#: src/common/weeconfig.c:181
msgid "delay (in seconds) for highlight messages in infobar"
msgstr ""
"retraso (en segundos) para la notificación de mensajes en la barra de "
"información"
-#: src/common/weeconfig.c:181
+#: src/common/weeconfig.c:182
msgid ""
"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
"notifications in infobar)"
@@ -3460,280 +3566,280 @@ msgstr ""
"retraso (en segundos) para la notificación de mensajes en la barra de "
"información (0 = desactivar las notificaciones en la barra de información)"
-#: src/common/weeconfig.c:243 src/common/weeconfig.c:244
+#: src/common/weeconfig.c:244 src/common/weeconfig.c:245
msgid "color for title bar"
msgstr "color para la barra de título"
-#: src/common/weeconfig.c:247 src/common/weeconfig.c:248
+#: src/common/weeconfig.c:248 src/common/weeconfig.c:249
msgid "background for title bar"
msgstr "color de fondo para la barra de título"
-#: src/common/weeconfig.c:253 src/common/weeconfig.c:254
+#: src/common/weeconfig.c:254 src/common/weeconfig.c:255
msgid "color for chat text"
msgstr "color para el texto de conversación"
-#: src/common/weeconfig.c:257
+#: src/common/weeconfig.c:258
msgid "color for time"
msgstr "color para la hora"
-#: src/common/weeconfig.c:258
+#: src/common/weeconfig.c:259
msgid "color for time in chat window"
msgstr "color para la hora en la ventana de conversación"
-#: src/common/weeconfig.c:261
+#: src/common/weeconfig.c:262
msgid "color for time separator"
msgstr "color para el separador de la hora"
-#: src/common/weeconfig.c:262
+#: src/common/weeconfig.c:263
msgid "color for time separator (chat window)"
msgstr "color para el separador de la hora (ventana de conversación)"
-#: src/common/weeconfig.c:265 src/common/weeconfig.c:266
+#: src/common/weeconfig.c:266 src/common/weeconfig.c:267
msgid "color for 1st and 3rd char of prefix"
msgstr "color para el primer o tercer carácter de prefijo"
-#: src/common/weeconfig.c:269 src/common/weeconfig.c:270
+#: src/common/weeconfig.c:270 src/common/weeconfig.c:271
msgid "color for middle char of prefix"
msgstr "color para el carácter de en medio del prefijo"
-#: src/common/weeconfig.c:273 src/common/weeconfig.c:274
+#: src/common/weeconfig.c:274 src/common/weeconfig.c:275
msgid "color for join arrow (prefix)"
msgstr ""
-#: src/common/weeconfig.c:277 src/common/weeconfig.c:278
+#: src/common/weeconfig.c:278 src/common/weeconfig.c:279
msgid "color for part/quit arrow (prefix)"
msgstr ""
-#: src/common/weeconfig.c:281
+#: src/common/weeconfig.c:282
msgid "color for nicks in actions"
msgstr "color para los nombres de usuario en las acciones"
-#: src/common/weeconfig.c:282
+#: src/common/weeconfig.c:283
msgid "color for nicks in actions (chat window)"
msgstr ""
"color para los nombres de usuario en las acciones (ventana de conversación)"
-#: src/common/weeconfig.c:285
+#: src/common/weeconfig.c:286
msgid "color for hostnames"
msgstr "color para los nombres de máquina"
-#: src/common/weeconfig.c:286
+#: src/common/weeconfig.c:287
msgid "color for hostnames (chat window)"
msgstr "color para los nombres de máquina (ventana de conversación)"
-#: src/common/weeconfig.c:289
+#: src/common/weeconfig.c:290
msgid "color for channel names in actions"
msgstr "color para los nombres de canal en las acciones"
-#: src/common/weeconfig.c:290
+#: src/common/weeconfig.c:291
msgid "color for channel names in actions (chat window)"
msgstr ""
"color para los nombres de canal en las acciones (ventana de conversación)"
-#: src/common/weeconfig.c:293
+#: src/common/weeconfig.c:294
msgid "color for dark separators"
msgstr "color para los separadores oscuros"
-#: src/common/weeconfig.c:294
+#: src/common/weeconfig.c:295
msgid "color for dark separators (chat window)"
msgstr "color para los separadores oscuros (ventana de conversación)"
-#: src/common/weeconfig.c:297
+#: src/common/weeconfig.c:298
msgid "color for highlighted nick"
msgstr "color para el alias subrayado"
-#: src/common/weeconfig.c:298
+#: src/common/weeconfig.c:299
msgid "color for highlighted nick (chat window)"
msgstr "color para el alias subrayado (ventana de conversación)"
-#: src/common/weeconfig.c:301
+#: src/common/weeconfig.c:302
msgid "background for chat"
msgstr "color de fondo para la conversación"
-#: src/common/weeconfig.c:302
+#: src/common/weeconfig.c:303
msgid "background for chat window"
msgstr "color de fondo para la ventana de conversación"
-#: src/common/weeconfig.c:307 src/common/weeconfig.c:308
+#: src/common/weeconfig.c:308 src/common/weeconfig.c:309
msgid "color for status bar"
msgstr "color para la barra de estado"
-#: src/common/weeconfig.c:311 src/common/weeconfig.c:312
+#: src/common/weeconfig.c:312 src/common/weeconfig.c:313
msgid "color for status bar delimiters"
msgstr "color para los delimitadores de la barra de estado"
-#: src/common/weeconfig.c:315
+#: src/common/weeconfig.c:316
msgid "color for window with new messages"
msgstr "color para una ventana con mensajes nuevos"
-#: src/common/weeconfig.c:316
+#: src/common/weeconfig.c:317
msgid "color for window with new messages (status bar)"
msgstr "color para una ventana con mensajes nuevos (barra de estado)"
-#: src/common/weeconfig.c:319
+#: src/common/weeconfig.c:320
msgid "color for window with private message"
msgstr ""
-#: src/common/weeconfig.c:320
+#: src/common/weeconfig.c:321
msgid "color for window with private message (status bar)"
msgstr ""
-#: src/common/weeconfig.c:323
+#: src/common/weeconfig.c:324
msgid "color for window with highlight"
msgstr "color para una ventana con resaltado"
-#: src/common/weeconfig.c:324
+#: src/common/weeconfig.c:325
msgid "color for window with highlight (status bar)"
msgstr "color para una ventana con resaltado (barra de estado)"
-#: src/common/weeconfig.c:327
+#: src/common/weeconfig.c:328
msgid "color for window with new data (not messages)"
msgstr "color para una ventana con nuevos datos (no mensajes)"
-#: src/common/weeconfig.c:328
+#: src/common/weeconfig.c:329
msgid "color for window with new data (not messages) (status bar)"
msgstr ""
"color para una ventana con nuevos datos (no mensajes) (barra de estado)"
-#: src/common/weeconfig.c:331
+#: src/common/weeconfig.c:332
msgid "color for \"-MORE-\" text"
msgstr "color para el texto \"-MÁS-\""
-#: src/common/weeconfig.c:332
+#: src/common/weeconfig.c:333
msgid "color for window with new data (status bar)"
msgstr "color para una ventana con nuevos datos (barra de estado)"
-#: src/common/weeconfig.c:335 src/common/weeconfig.c:336
+#: src/common/weeconfig.c:336 src/common/weeconfig.c:337
msgid "background for status window"
msgstr "color de fondo para la ventana de estado"
-#: src/common/weeconfig.c:341 src/common/weeconfig.c:342
+#: src/common/weeconfig.c:342 src/common/weeconfig.c:343
msgid "color for info bar text"
msgstr "color para el texto de la barra de información"
-#: src/common/weeconfig.c:345 src/common/weeconfig.c:346
+#: src/common/weeconfig.c:346 src/common/weeconfig.c:347
msgid "color for infobar delimiters"
msgstr "color para los delimitadores de la barra de información"
-#: src/common/weeconfig.c:349 src/common/weeconfig.c:350
+#: src/common/weeconfig.c:350 src/common/weeconfig.c:351
msgid "color for info bar highlight notification"
msgstr "color para la notificación en la barra de información"
-#: src/common/weeconfig.c:353 src/common/weeconfig.c:354
+#: src/common/weeconfig.c:354 src/common/weeconfig.c:355
msgid "background for info bar window"
msgstr "color de fondo para la ventana de la barra de información"
-#: src/common/weeconfig.c:359 src/common/weeconfig.c:360
+#: src/common/weeconfig.c:360 src/common/weeconfig.c:361
msgid "color for input text"
msgstr "color para el texto de entrada"
-#: src/common/weeconfig.c:363 src/common/weeconfig.c:364
+#: src/common/weeconfig.c:364 src/common/weeconfig.c:365
msgid "color for input text (channel name)"
msgstr "color para el texto de entrada (nombre de canal)"
-#: src/common/weeconfig.c:367 src/common/weeconfig.c:368
+#: src/common/weeconfig.c:368 src/common/weeconfig.c:369
msgid "color for input text (nick name)"
msgstr "color para el texto de entrada (alias)"
-#: src/common/weeconfig.c:371 src/common/weeconfig.c:372
+#: src/common/weeconfig.c:372 src/common/weeconfig.c:373
msgid "background for input window"
msgstr "color de fondo para la ventana de entrada"
-#: src/common/weeconfig.c:377 src/common/weeconfig.c:378
+#: src/common/weeconfig.c:378 src/common/weeconfig.c:379
msgid "color for nicknames"
msgstr "color para los nombres de usuario"
-#: src/common/weeconfig.c:381 src/common/weeconfig.c:382
+#: src/common/weeconfig.c:382 src/common/weeconfig.c:383
msgid "color for away nicknames"
msgstr "color para los usuarios ausentes"
-#: src/common/weeconfig.c:385
+#: src/common/weeconfig.c:386
msgid "color for chan owner symbol"
msgstr "color para el símbolo de propietario de canal"
-#: src/common/weeconfig.c:386
+#: src/common/weeconfig.c:387
msgid "color for chan owner symbol (specific to unrealircd)"
msgstr ""
"color para el símbolo de propietario de canal (especificado en unrealircd)"
-#: src/common/weeconfig.c:389
+#: src/common/weeconfig.c:390
msgid "color for chan admin symbol"
msgstr "color para el símbolo de administrador de canal"
-#: src/common/weeconfig.c:390
+#: src/common/weeconfig.c:391
msgid "color for chan admin symbol (specific to unrealircd)"
msgstr ""
"color para el símbolo de administrador de canal (especificado en unrealircd)"
-#: src/common/weeconfig.c:393 src/common/weeconfig.c:394
+#: src/common/weeconfig.c:394 src/common/weeconfig.c:395
msgid "color for operator symbol"
msgstr "color para el símbolo de operador"
-#: src/common/weeconfig.c:397 src/common/weeconfig.c:398
+#: src/common/weeconfig.c:398 src/common/weeconfig.c:399
msgid "color for half-operator symbol"
msgstr "color para el símbolo de semi-operador"
-#: src/common/weeconfig.c:401 src/common/weeconfig.c:402
+#: src/common/weeconfig.c:402 src/common/weeconfig.c:403
msgid "color for voice symbol"
msgstr "color para el símbolo de voz"
-#: src/common/weeconfig.c:405 src/common/weeconfig.c:406
+#: src/common/weeconfig.c:406 src/common/weeconfig.c:407
msgid "color for '+' when scrolling nicks"
msgstr "color para '+' al desplazar nicks"
-#: src/common/weeconfig.c:409 src/common/weeconfig.c:410
+#: src/common/weeconfig.c:410 src/common/weeconfig.c:411
msgid "color for nick separator"
msgstr "color para el separador de alias"
-#: src/common/weeconfig.c:413 src/common/weeconfig.c:414
+#: src/common/weeconfig.c:414 src/common/weeconfig.c:415
msgid "color for local nick"
msgstr "color para el alias local"
-#: src/common/weeconfig.c:417 src/common/weeconfig.c:418
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
msgid "color for other nick in private window"
msgstr "color para el otro alias en la ventana privada"
-#: src/common/weeconfig.c:421 src/common/weeconfig.c:422
+#: src/common/weeconfig.c:422 src/common/weeconfig.c:423
msgid "background for nicknames"
msgstr "color de fondo para los nombres de usuario"
-#: src/common/weeconfig.c:427
+#: src/common/weeconfig.c:428
msgid "color for selected DCC"
msgstr "color para el DCC seleccionado"
-#: src/common/weeconfig.c:428
+#: src/common/weeconfig.c:429
msgid "color for selected DCC (chat window)"
msgstr "color para el DCC seleccionado (ventana de conversación)"
-#: src/common/weeconfig.c:431 src/common/weeconfig.c:432
+#: src/common/weeconfig.c:432 src/common/weeconfig.c:433
msgid "color for \"waiting\" dcc status"
msgstr "color para el estado dcc \"esperando\""
-#: src/common/weeconfig.c:435 src/common/weeconfig.c:436
+#: src/common/weeconfig.c:436 src/common/weeconfig.c:437
msgid "color for \"connecting\" dcc status"
msgstr "color para el estado dcc \"conectando\""
-#: src/common/weeconfig.c:439 src/common/weeconfig.c:440
+#: src/common/weeconfig.c:440 src/common/weeconfig.c:441
msgid "color for \"active\" dcc status"
msgstr "color para el estado dcc \"activo\""
-#: src/common/weeconfig.c:443 src/common/weeconfig.c:444
+#: src/common/weeconfig.c:444 src/common/weeconfig.c:445
msgid "color for \"done\" dcc status"
msgstr "color para el estado dcc \"terminado\""
-#: src/common/weeconfig.c:447 src/common/weeconfig.c:448
+#: src/common/weeconfig.c:448 src/common/weeconfig.c:449
msgid "color for \"failed\" dcc status"
msgstr "color para el estado dcc \"fallo\""
-#: src/common/weeconfig.c:451 src/common/weeconfig.c:452
+#: src/common/weeconfig.c:452 src/common/weeconfig.c:453
msgid "color for \"aborted\" dcc status"
msgstr "color para el estado dcc \"abortado\""
-#: src/common/weeconfig.c:465
+#: src/common/weeconfig.c:466
msgid "max lines in history (per window)"
msgstr "número máximo de líneas en el histórico (por ventana)"
-#: src/common/weeconfig.c:466
+#: src/common/weeconfig.c:467
msgid ""
"maximum number of lines in history for one server/channel/private window (0 "
"= unlimited)"
@@ -3741,350 +3847,350 @@ msgstr ""
"número máximo de líneas en el histórico para un servidor/canal/privado (0 = "
"ilimitado)"
-#: src/common/weeconfig.c:470
+#: src/common/weeconfig.c:471
msgid "max user commands in history"
msgstr "número máximo de comandos de usuario en el histórico"
-#: src/common/weeconfig.c:471
+#: src/common/weeconfig.c:472
msgid "maximum number of user commands in history (0 = unlimited)"
msgstr "número máximo de comandos de usuario en el histórico (0 = ilimitado)"
-#: src/common/weeconfig.c:488 src/common/weeconfig.c:489
+#: src/common/weeconfig.c:489 src/common/weeconfig.c:490
msgid "automatically log server messages"
msgstr "registrar automáticamente los mensajes de servidor"
-#: src/common/weeconfig.c:492 src/common/weeconfig.c:493
+#: src/common/weeconfig.c:493 src/common/weeconfig.c:494
msgid "automatically log channel chats"
msgstr "registrar automáticamente las conversaciones de canal"
-#: src/common/weeconfig.c:496 src/common/weeconfig.c:497
+#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
msgid "automatically log private chats"
msgstr "registrar automáticamente las conversaciones privadas"
-#: src/common/weeconfig.c:500 src/common/weeconfig.c:501
+#: src/common/weeconfig.c:501 src/common/weeconfig.c:502
msgid "log messages from plugins (scripts)"
msgstr "registrar mensajes de plugins (scripts)"
-#: src/common/weeconfig.c:504
+#: src/common/weeconfig.c:505
msgid "path for log files"
msgstr "ruta para los archivos de registro (logs)"
-#: src/common/weeconfig.c:505
+#: src/common/weeconfig.c:506
msgid "path for WeeChat log files"
msgstr "ruta para los archivos de registro (logs) de WeeChat"
-#: src/common/weeconfig.c:508
+#: src/common/weeconfig.c:509
msgid "timestamp for log"
msgstr "fecha y hora para las conversaciones registradas"
-#: src/common/weeconfig.c:509
+#: src/common/weeconfig.c:510
msgid "timestamp for log (see man strftime for date/time specifiers)"
msgstr ""
"fecha y hora para los registros (ver man strftime para el formato de fecha/"
"hora)"
-#: src/common/weeconfig.c:512 src/common/weeconfig.c:513
+#: src/common/weeconfig.c:513 src/common/weeconfig.c:514
msgid "hide password displayed by nickserv"
msgstr "ocultar contraseña mostrada por nickserv"
-#: src/common/weeconfig.c:533
+#: src/common/weeconfig.c:534
msgid "display message to all channels when away"
msgstr "mostrar mensaje en todos los canales cuando se está ausente"
-#: src/common/weeconfig.c:534
+#: src/common/weeconfig.c:535
msgid "display message to all channels when (un)marking as away"
msgstr ""
"mostrar mensaje en todos los canales cuando se vuelva del estado ausente"
-#: src/common/weeconfig.c:537 src/common/weeconfig.c:538
+#: src/common/weeconfig.c:538 src/common/weeconfig.c:539
msgid "default message when away"
msgstr "mensaje por defecto para el estado ausente"
-#: src/common/weeconfig.c:541 src/common/weeconfig.c:542
+#: src/common/weeconfig.c:542 src/common/weeconfig.c:543
msgid "default part message (leaving channel)"
msgstr "mensaje por defecto de salida (saliendo de un canal)"
-#: src/common/weeconfig.c:545
+#: src/common/weeconfig.c:546
msgid "default quit message"
msgstr "mensaje de fin por defecto"
-#: src/common/weeconfig.c:546
+#: src/common/weeconfig.c:547
msgid ""
"default quit message ('%v' will be replaced by WeeChat version in string)"
msgstr ""
"mensaje de fin por defecto ('%v' será reemplazado por la versión de WeeChat "
"en la cadena)"
-#: src/common/weeconfig.c:549
+#: src/common/weeconfig.c:550
msgid "interval between two checks for away"
msgstr "intervalo entre dos comprobaciones de ausencia"
-#: src/common/weeconfig.c:550
+#: src/common/weeconfig.c:551
msgid "interval between two checks for away (in minutes, 0 = never check)"
msgstr ""
"intervalo entre dos comprobaciones de ausencia (en minutos, 0 = no comprobar)"
-#: src/common/weeconfig.c:553
+#: src/common/weeconfig.c:554
msgid "interval between two checks for lag"
msgstr "intervalo entre dos medidas de lag (retraso)"
-#: src/common/weeconfig.c:554
+#: src/common/weeconfig.c:555
msgid "interval between two checks for lag (in seconds)"
msgstr "intervalo entre dos medidas de lag (en segundos)"
-#: src/common/weeconfig.c:557
+#: src/common/weeconfig.c:558
msgid "minimum lag to show"
msgstr "lag (retraso) mínimo a mostrar"
-#: src/common/weeconfig.c:558
+#: src/common/weeconfig.c:559
msgid "minimum lag to show (in seconds)"
msgstr "lag mínimo a mostrar (en segundos)"
-#: src/common/weeconfig.c:561
+#: src/common/weeconfig.c:562
msgid "disconnect after important lag"
msgstr "desconexión tras un lag importante"
-#: src/common/weeconfig.c:562
+#: src/common/weeconfig.c:563
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
msgstr ""
"desconexión tras un lag importante (en minutos, 0 = no desconectar nunca)"
-#: src/common/weeconfig.c:565 src/common/weeconfig.c:566
+#: src/common/weeconfig.c:566 src/common/weeconfig.c:567
msgid "create a FIFO pipe for remote control"
msgstr "crea una tubería FIFO para control remoto"
-#: src/common/weeconfig.c:569
+#: src/common/weeconfig.c:570
msgid "list of words to highlight"
msgstr ""
-#: src/common/weeconfig.c:570
+#: src/common/weeconfig.c:571
msgid ""
"comma separated list of words to highlight (case insensitive comparison)"
msgstr ""
-#: src/common/weeconfig.c:589
+#: src/common/weeconfig.c:590
msgid "automatically accept dcc files"
msgstr "aceptar automáticamente los ficheros dcc"
-#: src/common/weeconfig.c:590
+#: src/common/weeconfig.c:591
msgid "automatically accept incoming dcc files"
msgstr "aceptar automáticamente los ficheros dcc entrantes"
-#: src/common/weeconfig.c:593
+#: src/common/weeconfig.c:594
msgid "automatically accept dcc chats"
msgstr "aceptar automáticamente las peticiones de conversación dcc"
-#: src/common/weeconfig.c:594
+#: src/common/weeconfig.c:595
msgid "automatically accept dcc chats (use carefully!)"
msgstr ""
"aceptar automáticamente las peticiones de conversación dcc (¡utilizar con "
"precaución!)"
-#: src/common/weeconfig.c:597
+#: src/common/weeconfig.c:598
msgid "timeout for dcc request"
msgstr "tiempo de espera (timeout) para la petición dcc"
-#: src/common/weeconfig.c:598
+#: src/common/weeconfig.c:599
msgid "timeout for dcc request (in seconds)"
msgstr "tiempo de espera para la petición dcc (en segundos)"
-#: src/common/weeconfig.c:601
+#: src/common/weeconfig.c:602
msgid "block size for dcc packets"
msgstr "tamaño de bloque para los paquetes dcc"
-#: src/common/weeconfig.c:602
+#: src/common/weeconfig.c:603
msgid "block size for dcc packets in bytes (default: 65536)"
msgstr "tamaño de bloque para los paquetes dcc en bytes (por defecto: 65536)"
-#: src/common/weeconfig.c:605
+#: src/common/weeconfig.c:606
msgid "path for incoming files with dcc"
msgstr "ruta para los ficheros recibidos con dcc"
-#: src/common/weeconfig.c:606
+#: src/common/weeconfig.c:607
msgid "path for writing incoming files with dcc (default: user home)"
msgstr ""
"ruta para los ficheros recibidos con dcc (por defecto: directorio home del "
"usuario)"
-#: src/common/weeconfig.c:609
+#: src/common/weeconfig.c:610
msgid "default path for sending files with dcc"
msgstr "ruta por defecto para enviar ficheros con dcc"
-#: src/common/weeconfig.c:610
+#: src/common/weeconfig.c:611
msgid ""
"path for reading files when sending thru dcc (when no path is specified)"
msgstr ""
"ruta para la lectura de ficheros cuando se envían a través de dcc (cuando no "
"se especifica una ruta)"
-#: src/common/weeconfig.c:613 src/common/weeconfig.c:614
+#: src/common/weeconfig.c:614 src/common/weeconfig.c:615
msgid "convert spaces to underscores when sending files"
msgstr "convertir los espacios a subrayados cuando se envían los ficheros"
-#: src/common/weeconfig.c:617
+#: src/common/weeconfig.c:618
msgid "automatically rename dcc files if already exists"
msgstr "renombrar automáticamente los ficheros dcc si ya existen"
-#: src/common/weeconfig.c:618
+#: src/common/weeconfig.c:619
msgid "rename incoming files if already exists (add '.1', '.2', ...)"
msgstr ""
"renombrar los ficheros recibidos si ya existen (añadir '.1', '.2', ...)"
-#: src/common/weeconfig.c:621
+#: src/common/weeconfig.c:622
msgid "automatically resume aborted transfers"
msgstr "continuar automáticamente las transferencias canceladas"
-#: src/common/weeconfig.c:622
+#: src/common/weeconfig.c:623
msgid ""
"automatically resume dcc transfer if connection with remote host is loosed"
msgstr ""
"continuar automáticamente la transferencia dcc si se ha perdido la conexión "
"con la máquina remota"
-#: src/common/weeconfig.c:641
+#: src/common/weeconfig.c:642
msgid "use proxy"
msgstr "utilizar un proxy"
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:643
msgid "use a proxy server to connect to irc server"
msgstr "utilizar un proxy para conectarse al servidor irc"
-#: src/common/weeconfig.c:645
+#: src/common/weeconfig.c:646
msgid "proxy type"
msgstr "tipo de proxy"
-#: src/common/weeconfig.c:646
+#: src/common/weeconfig.c:647
msgid "proxy type (http (default), socks4, socks5)"
msgstr "tipo de proxy(http (por defecto), socks4, socks5)"
-#: src/common/weeconfig.c:649
+#: src/common/weeconfig.c:650
msgid "use ipv6 proxy"
msgstr "usar proxy ipv6"
-#: src/common/weeconfig.c:650
+#: src/common/weeconfig.c:651
msgid "connect to proxy in ipv6"
msgstr "conectar al proxy en ipv6"
-#: src/common/weeconfig.c:653
+#: src/common/weeconfig.c:654
msgid "proxy address"
msgstr "dirección del proxy"
-#: src/common/weeconfig.c:654
+#: src/common/weeconfig.c:655
msgid "proxy server address (IP or hostname)"
msgstr "dirección del servidor proxy (IP o nombre de máquina)"
-#: src/common/weeconfig.c:657
+#: src/common/weeconfig.c:658
msgid "port for proxy"
msgstr "puerto para el proxy"
-#: src/common/weeconfig.c:658
+#: src/common/weeconfig.c:659
msgid "port for connecting to proxy server"
msgstr "puerto para conectarse al servidor proxy"
-#: src/common/weeconfig.c:661
+#: src/common/weeconfig.c:662
msgid "proxy username"
msgstr "nombre de usuario del proxy"
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:663
msgid "username for proxy server"
msgstr "nombre de usuario para el servidor proxy"
-#: src/common/weeconfig.c:665
+#: src/common/weeconfig.c:666
msgid "proxy password"
msgstr "contraseña para el proxy"
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:667
msgid "password for proxy server"
msgstr "contraseña para el servidor proxy"
-#: src/common/weeconfig.c:677
+#: src/common/weeconfig.c:678
msgid "server name"
msgstr "nombre de servidor"
-#: src/common/weeconfig.c:678
+#: src/common/weeconfig.c:679
msgid "name associated to IRC server (for display only)"
msgstr "nombre asociado al servidor IRC (para mostrar solamente)"
-#: src/common/weeconfig.c:681
+#: src/common/weeconfig.c:682
msgid "automatically connect to server"
msgstr "conexión automática al servidor"
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:683
msgid "automatically connect to server when WeeChat is starting"
msgstr "conexión automática al servidor cuando WeeChat esté arrancando"
-#: src/common/weeconfig.c:685
+#: src/common/weeconfig.c:686
msgid "automatically reconnect to server"
msgstr "reconexión automática al servidor"
-#: src/common/weeconfig.c:686
+#: src/common/weeconfig.c:687
msgid "automatically reconnect to server when disconnected"
msgstr "reconexión automática al servidor tras una desconexión"
-#: src/common/weeconfig.c:689
+#: src/common/weeconfig.c:690
msgid "delay before trying again to reconnect"
msgstr "esperar antes de intentar de nuevo una reconexión"
-#: src/common/weeconfig.c:690
+#: src/common/weeconfig.c:691
msgid "delay (in seconds) before trying again to reconnect to server"
msgstr ""
"espera (en segundos) antes de intentar de nuevo una reconexión al servidor"
-#: src/common/weeconfig.c:693
+#: src/common/weeconfig.c:694
msgid "server address or hostname"
msgstr "dirección o nombre de máquina del servidor"
-#: src/common/weeconfig.c:694
+#: src/common/weeconfig.c:695
msgid "IP address or hostname of IRC server"
msgstr "dirección IP o nombre de máquina del servidor IRC"
-#: src/common/weeconfig.c:697
+#: src/common/weeconfig.c:698
msgid "port for IRC server"
msgstr "puerto para el servidor IRC"
-#: src/common/weeconfig.c:698
+#: src/common/weeconfig.c:699
msgid "port for connecting to server"
msgstr "puerto para conectarse al servidor"
-#: src/common/weeconfig.c:701 src/common/weeconfig.c:702
+#: src/common/weeconfig.c:702 src/common/weeconfig.c:703
msgid "use IPv6 protocol for server communication"
msgstr "usar el protocolo IPv6 para la comunicación del servidor"
-#: src/common/weeconfig.c:705 src/common/weeconfig.c:706
+#: src/common/weeconfig.c:706 src/common/weeconfig.c:707
msgid "use SSL for server communication"
msgstr "usar SSL para la comunicación del servidor"
-#: src/common/weeconfig.c:709
+#: src/common/weeconfig.c:710
msgid "server password"
msgstr "contraseña para el servidor"
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:711
msgid "password for IRC server"
msgstr "contraseña para el servidor IRC"
-#: src/common/weeconfig.c:713
+#: src/common/weeconfig.c:714
msgid "nickname for server"
msgstr "nombre de usuario para el servidor"
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:715
msgid "nickname to use on IRC server"
msgstr "nombre de usuario a utilizar en el servidor IRC"
-#: src/common/weeconfig.c:717
+#: src/common/weeconfig.c:718
msgid "alternate nickname for server"
msgstr "nombre de usuario alternativo para el servidor"
-#: src/common/weeconfig.c:718
+#: src/common/weeconfig.c:719
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr ""
"nombre de usuario alternativo para el servidor IRC (si el nombre de usuario "
"ya está en uso)"
-#: src/common/weeconfig.c:721
+#: src/common/weeconfig.c:722
msgid "2nd alternate nickname for server"
msgstr "segundo nombre de usuario alternativo para el servidor"
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:723
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
@@ -4092,31 +4198,31 @@ msgstr ""
"segundo nombre de usuario alternativo a utilizar en el servidor IRC (si el "
"nombre de usuario alternativo ya está en uso)"
-#: src/common/weeconfig.c:725
+#: src/common/weeconfig.c:726
msgid "user name for server"
msgstr "nombre de usuario para el servidor"
-#: src/common/weeconfig.c:726
+#: src/common/weeconfig.c:727
msgid "user name to use on IRC server"
msgstr "nombre de usuario para el servidor IRC"
-#: src/common/weeconfig.c:729
+#: src/common/weeconfig.c:730
msgid "real name for server"
msgstr "nombre real para el servidor"
-#: src/common/weeconfig.c:730
+#: src/common/weeconfig.c:731
msgid "real name to use on IRC server"
msgstr "nombre real para el servidor IRC"
-#: src/common/weeconfig.c:733 src/common/weeconfig.c:734
+#: src/common/weeconfig.c:734 src/common/weeconfig.c:735
msgid "first command to run when connected to server"
msgstr "primer comando a ejecutar cuando se conecte a un servidor"
-#: src/common/weeconfig.c:737
+#: src/common/weeconfig.c:738
msgid "delay (in seconds) after command was executed"
msgstr "espera (en segundos) después de que el comando sea ejecutado"
-#: src/common/weeconfig.c:738
+#: src/common/weeconfig.c:739
msgid ""
"delay (in seconds) after command was executed (example: give some time for "
"authentication)"
@@ -4124,11 +4230,11 @@ msgstr ""
"espera (en segundos) después de que el comando sea ejecutado (ejemplo: dar "
"algo de tiempo para la autenticación)"
-#: src/common/weeconfig.c:741
+#: src/common/weeconfig.c:742
msgid "list of channels to join when connected to server"
msgstr "lista de canales a unirse cuando se conecte a un servidor"
-#: src/common/weeconfig.c:742
+#: src/common/weeconfig.c:743
msgid ""
"comma separated list of channels to join when connected to server (example: "
"\"#chan1,#chan2,#chan3 #key1,#key2\")"
@@ -4136,15 +4242,15 @@ msgstr ""
"lista de canales (separados por comas) a unirse cuando se conecte a un "
"servidor (ejemplo: \"#chan1,#chan2,#chan3 #key1,#key2\")"
-#: src/common/weeconfig.c:745 src/common/weeconfig.c:746
+#: src/common/weeconfig.c:746 src/common/weeconfig.c:747
msgid "automatically rejoin channels when kicked"
msgstr "unirse de nuevo automáticamente a los canales cuando sea expulsado"
-#: src/common/weeconfig.c:749
+#: src/common/weeconfig.c:750
msgid "notify levels for channels of this server"
msgstr "niveles de notificación para canales de este servidor"
-#: src/common/weeconfig.c:750
+#: src/common/weeconfig.c:751
msgid ""
"comma separated list of notify levels for channels of this server (format: "
"#channel:1,..)"
@@ -4152,62 +4258,67 @@ msgstr ""
"lista separada por comas de niveles de notificación para canales de este "
"servidor (formato: #canal:1,...)"
-#: src/common/weeconfig.c:1210
+#: src/common/weeconfig.c:1211
#, c-format
msgid "%s %s, line %d: new server, but previous was incomplete\n"
msgstr "%s %s, línea %d: nuevo servidor, pero el anterior estaba incompleto\n"
-#: src/common/weeconfig.c:1219
+#: src/common/weeconfig.c:1220
#, c-format
msgid "%s %s, line %d: server '%s' already exists\n"
msgstr "%s %s, línea %d: el servidor '%s' ya existe\n"
-#: src/common/weeconfig.c:1234
+#: src/common/weeconfig.c:1235
#, c-format
msgid "%s %s, line %d: unable to create server\n"
msgstr "%s %s, línea %d: no es posible crear el servidor\n"
-#: src/common/weeconfig.c:1274
+#: src/common/weeconfig.c:1275
#, c-format
msgid "%s unable to assign default int with string (\"%s\")\n"
msgstr "%s no es posible asignar el valor entero con la cadena (\"%s\")\n"
-#: src/common/weeconfig.c:1285
+#: src/common/weeconfig.c:1286
#, c-format
msgid "%s unable to assign default color (\"%s\")\n"
msgstr "%s no es posible asignar el color por defecto (\"%s\")\n"
-#: src/common/weeconfig.c:1324
+#: src/common/weeconfig.c:1325
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr "%s fichero de configuración \"%s\" no encontrado.\n"
-#: src/common/weeconfig.c:1356
+#: src/common/weeconfig.c:1357
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
msgstr "%s %s, línea %d: sintaxis inválida, falta \"]\"\n"
-#: src/common/weeconfig.c:1373
+#: src/common/weeconfig.c:1374
#, c-format
msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
msgstr "%s %s, línea %d: identificador de sección desconocido (\"%s\")\n"
-#: src/common/weeconfig.c:1391
+#: src/common/weeconfig.c:1392
#, c-format
msgid "%s %s, line %d: invalid section for option, line is ignored\n"
msgstr "%s %s, línea %d: sección inválida para la opción, línea ignorada\n"
-#: src/common/weeconfig.c:1399
+#: src/common/weeconfig.c:1400
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
msgstr "%s %s, línea %d: sintaxis inválida, falta \"=\"\n"
-#: src/common/weeconfig.c:1447
+#: src/common/weeconfig.c:1437 src/common/weeconfig.c:1463
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr "%s %s, línea %d: opción \"%s\" inválida\n"
-#: src/common/weeconfig.c:1458
+#: src/common/weeconfig.c:1443
+#, c-format
+msgid "%s %s, line %d: invalid ignore options \"%s\"\n"
+msgstr ""
+
+#: src/common/weeconfig.c:1474
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
@@ -4216,7 +4327,7 @@ msgstr ""
"%s %s, línea %d: valor inválido para la opción '%s'\n"
"Esperado: valor booleano: 'off' u 'on'\n"
-#: src/common/weeconfig.c:1467
+#: src/common/weeconfig.c:1483
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -4225,7 +4336,7 @@ msgstr ""
"%s %s, línea %d: valor inválido para la opción %s'\n"
"Esperado: entero comprendido entre %d y %d\n"
-#: src/common/weeconfig.c:1478
+#: src/common/weeconfig.c:1494
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -4234,26 +4345,26 @@ msgstr ""
"%s %s, línea %d: valor inválido para la opción '%s'\n"
"Esperado: una de estas cadenas: "
-#: src/common/weeconfig.c:1494
+#: src/common/weeconfig.c:1510
#, c-format
msgid "%s %s, line %d: invalid color name for option '%s'\n"
msgstr "%s %s, línea %d: nombre de color inválido para la opción '%s'\n"
-#: src/common/weeconfig.c:1556 src/common/weeconfig.c:1751
+#: src/common/weeconfig.c:1572 src/common/weeconfig.c:1767
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr "%s no es posible crear el fichero \"%s\"\n"
-#: src/common/weeconfig.c:1562
+#: src/common/weeconfig.c:1578
#, c-format
msgid "%s: creating default config file...\n"
msgstr "%s: creando fichero de configuración por defecto...\n"
-#: src/common/weeconfig.c:1563
+#: src/common/weeconfig.c:1579
msgid "Creating default config file\n"
msgstr "Creando fichero de configuración por defecto\n"
-#: src/common/weeconfig.c:1566 src/common/weeconfig.c:1760
+#: src/common/weeconfig.c:1582 src/common/weeconfig.c:1776
#, c-format
msgid ""
"#\n"
@@ -4262,6 +4373,12 @@ msgstr ""
"#\n"
"# %s: fichero de configuración, creado por %s v%s el %s#\n"
-#: src/common/weeconfig.c:1757
+#: src/common/weeconfig.c:1773
msgid "Saving config to disk\n"
msgstr "Guardar configuración a disco\n"
+
+#~ msgid "IRC command"
+#~ msgstr "comandos IRC"
+
+#~ msgid "channel"
+#~ msgstr "canal"
diff --git a/po/fr.po b/po/fr.po
index 2bd279e77..d4d86eb7c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,20 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.5-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-08-21 14:31+0200\n"
-"PO-Revision-Date: 2005-09-03 13:24+0200\n"
+"POT-Creation-Date: 2005-09-04 14:45+0200\n"
+"PO-Revision-Date: 2005-09-04 14:46+0200\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-nick.c:193
+#: src/irc/irc-nick.c:192
#, c-format
msgid "%s cannot allocate new nick\n"
msgstr "%s impossible d'allouer un nouveau pseudo\n"
-#: src/irc/irc-server.c:180 src/common/weeconfig.c:1697
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1712
msgid "Unable to get user's name"
msgstr "Impossible de déterminer le nom d'utilisateur"
@@ -110,7 +110,7 @@ msgstr ""
"%s le proxy n'a pas pu se connecter au serveur (vérifiez l'utilisateur/mot "
"de passe si utilisés)\n"
-#: src/irc/irc-server.c:1360
+#: src/irc/irc-server.c:1364
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -118,57 +118,57 @@ msgstr ""
"%s impossible de se connecter en SSL car WeeChat n'a pas été construit avec "
"le support GNUtls\n"
-#: src/irc/irc-server.c:1369
+#: src/irc/irc-server.c:1373
#, c-format
msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr "%s: connexion au serveur %s:%d%s%s via le proxy %s %s:%d%s...\n"
-#: src/irc/irc-server.c:1375
+#: src/irc/irc-server.c:1379
#, c-format
msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr "Connexion au serveur %s:%d%s%s via le proxy %s %s:%d%s...\n"
-#: src/irc/irc-server.c:1385
+#: src/irc/irc-server.c:1389
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr "%s: connexion au serveur %s:%d%s%s...\n"
-#: src/irc/irc-server.c:1389
+#: src/irc/irc-server.c:1393
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr "Connexion au serveur %s:%d%s%s...\n"
-#: src/irc/irc-server.c:1407
+#: src/irc/irc-server.c:1411
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s erreur d'initialisation gnutls\n"
-#: src/irc/irc-server.c:1422
+#: src/irc/irc-server.c:1426
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s impossible de créer le pipe\n"
-#: src/irc/irc-server.c:1437
+#: src/irc/irc-server.c:1441
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s impossible de créer la socket\n"
-#: src/irc/irc-server.c:1448
+#: src/irc/irc-server.c:1452
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr "%s impossible de paramétrer l'option socket \"SO_REUSEADDR\"\n"
-#: src/irc/irc-server.c:1459
+#: src/irc/irc-server.c:1463
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr "%s impossible de paramétrer l'option socket \"SO_KEEPALIVE\"\n"
-#: src/irc/irc-server.c:1490
+#: src/irc/irc-server.c:1494
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Reconnexion au serveur...\n"
-#: src/irc/irc-server.c:1540 src/irc/irc-server.c:1549
+#: src/irc/irc-server.c:1544 src/irc/irc-server.c:1553
msgid "Disconnected from server!\n"
msgstr "Déconnecté du serveur !\n"
@@ -958,102 +958,103 @@ msgstr ""
#: src/irc/irc-commands.c:317 src/irc/irc-commands.c:318
#: src/irc/irc-commands.c:319 src/irc/irc-commands.c:320
#: src/irc/irc-commands.c:321 src/irc/irc-commands.c:322
-#: src/irc/irc-commands.c:323 src/irc/irc-commands.c:367
+#: src/irc/irc-commands.c:323 src/irc/irc-commands.c:324
#: src/irc/irc-commands.c:368 src/irc/irc-commands.c:369
#: src/irc/irc-commands.c:370 src/irc/irc-commands.c:371
-#: src/irc/irc-commands.c:372
+#: src/irc/irc-commands.c:372 src/irc/irc-commands.c:373
+#: src/irc/irc-commands.c:473
msgid "a server message"
msgstr "un message du serveur"
-#: src/irc/irc-commands.c:324
+#: src/irc/irc-commands.c:325
msgid "away message"
msgstr "message d'absence"
-#: src/irc/irc-commands.c:325
+#: src/irc/irc-commands.c:326
msgid "userhost"
msgstr "nom de machine utilisateur"
-#: src/irc/irc-commands.c:326
+#: src/irc/irc-commands.c:327
msgid "ison"
msgstr "est présent"
-#: src/irc/irc-commands.c:327
+#: src/irc/irc-commands.c:328
msgid "unaway"
msgstr "non absent"
-#: src/irc/irc-commands.c:328
+#: src/irc/irc-commands.c:329
msgid "now away"
msgstr "maintenant absent"
-#: src/irc/irc-commands.c:329
+#: src/irc/irc-commands.c:330
msgid "whois (registered nick)"
msgstr "qui est (pseudo enregistré)"
-#: src/irc/irc-commands.c:330
+#: src/irc/irc-commands.c:331
msgid "whois (user)"
msgstr "qui est (utilisateur)"
-#: src/irc/irc-commands.c:331
+#: src/irc/irc-commands.c:332
msgid "whois (server)"
msgstr "qui est (serveur)"
-#: src/irc/irc-commands.c:332
+#: src/irc/irc-commands.c:333
msgid "whois (operator)"
msgstr "qui est (opérateur)"
-#: src/irc/irc-commands.c:333
+#: src/irc/irc-commands.c:334
msgid "whowas"
msgstr "qui était-ce"
-#: src/irc/irc-commands.c:334
+#: src/irc/irc-commands.c:335
msgid "end of /who list"
msgstr "fin de /who list"
-#: src/irc/irc-commands.c:335
+#: src/irc/irc-commands.c:336
msgid "whois (idle)"
msgstr "qui est (inactif)"
-#: src/irc/irc-commands.c:336
+#: src/irc/irc-commands.c:337
msgid "whois (end)"
msgstr "qui est (fin)"
-#: src/irc/irc-commands.c:337
+#: src/irc/irc-commands.c:338
msgid "whois (channels)"
msgstr "qui est (canaux)"
-#: src/irc/irc-commands.c:338
+#: src/irc/irc-commands.c:339
msgid "whois (identified user)"
msgstr "qui est (utilisateur identifié)"
-#: src/irc/irc-commands.c:339
+#: src/irc/irc-commands.c:340
msgid "/list start"
msgstr "/list début"
-#: src/irc/irc-commands.c:340
+#: src/irc/irc-commands.c:341
msgid "channel (for /list)"
msgstr "canal (pour /list)"
-#: src/irc/irc-commands.c:341
+#: src/irc/irc-commands.c:342
msgid "/list end"
msgstr "/list fin"
-#: src/irc/irc-commands.c:342
+#: src/irc/irc-commands.c:343
msgid "channel mode"
msgstr "mode du canal"
-#: src/irc/irc-commands.c:344
+#: src/irc/irc-commands.c:345
msgid "no topic for channel"
msgstr "pas de titre pour le canal"
-#: src/irc/irc-commands.c:345
+#: src/irc/irc-commands.c:346
msgid "topic of channel"
msgstr "titre du canal"
-#: src/irc/irc-commands.c:346
+#: src/irc/irc-commands.c:347
msgid "channel :topic"
msgstr "canal :titre"
-#: src/irc/irc-commands.c:347
+#: src/irc/irc-commands.c:348
msgid ""
"channel: name of channel\n"
"topic: topic of the channel"
@@ -1061,31 +1062,31 @@ msgstr ""
"canal: nom du canal\n"
"titre: titre du canal"
-#: src/irc/irc-commands.c:350
+#: src/irc/irc-commands.c:351
msgid "infos about topic (nick & date changed)"
msgstr "infos sur le titre (utilisateur et date de changement)"
-#: src/irc/irc-commands.c:353
+#: src/irc/irc-commands.c:354
msgid "inviting"
msgstr "invitation"
-#: src/irc/irc-commands.c:354
+#: src/irc/irc-commands.c:355
msgid "server version"
msgstr "version du serveur"
-#: src/irc/irc-commands.c:355
+#: src/irc/irc-commands.c:356
msgid "who"
msgstr "qui"
-#: src/irc/irc-commands.c:356
+#: src/irc/irc-commands.c:357
msgid "list of nicks on channel"
msgstr "liste des utilisateurs sur un canal"
-#: src/irc/irc-commands.c:357
+#: src/irc/irc-commands.c:358
msgid "channel :[[@|+]nick ...]"
msgstr "canal :[[@|+]pseudo ...]"
-#: src/irc/irc-commands.c:358
+#: src/irc/irc-commands.c:359
msgid ""
"channel: name of channel\n"
"nick: nick on the channel"
@@ -1093,224 +1094,223 @@ msgstr ""
"canal: nom du canal\n"
"pseudo: utilisateur sur le canal"
-#: src/irc/irc-commands.c:361
+#: src/irc/irc-commands.c:362
msgid "links"
msgstr "liens"
-#: src/irc/irc-commands.c:362
+#: src/irc/irc-commands.c:363
msgid "end of /links list"
msgstr "fin de /links list"
-#: src/irc/irc-commands.c:363
+#: src/irc/irc-commands.c:364
msgid "end of /names list"
msgstr "fin de la liste /names"
-#: src/irc/irc-commands.c:364
+#: src/irc/irc-commands.c:365
msgid "banlist"
msgstr "liste de bannissement"
-#: src/irc/irc-commands.c:365
+#: src/irc/irc-commands.c:366
msgid "end of banlist"
msgstr "fin de la liste de bannissement"
-#: src/irc/irc-commands.c:366
+#: src/irc/irc-commands.c:367
msgid "end of /whowas list"
msgstr "fin de /whowas list"
-#: src/irc/irc-commands.c:373
+#: src/irc/irc-commands.c:374
msgid "server local time"
msgstr "heure locale du serveur"
-#: src/irc/irc-commands.c:374
+#: src/irc/irc-commands.c:375
msgid "no such nick/channel"
msgstr "pas de tel utilisateur/canal"
-#: src/irc/irc-commands.c:376
+#: src/irc/irc-commands.c:377
msgid "no such server"
msgstr "pas de tel serveur"
-#: src/irc/irc-commands.c:378
+#: src/irc/irc-commands.c:379
msgid "no such channel"
msgstr "pas de tel canal"
-#: src/irc/irc-commands.c:380
+#: src/irc/irc-commands.c:381
msgid "cannot send to channel"
msgstr "impossible d'envoyer au canal"
-#: src/irc/irc-commands.c:382
+#: src/irc/irc-commands.c:383
msgid "too many channels"
msgstr "trop de canaux"
-#: src/irc/irc-commands.c:384 src/irc/irc-commands.c:386
-#: src/irc/irc-commands.c:388
+#: src/irc/irc-commands.c:385 src/irc/irc-commands.c:387
msgid "was no such nick"
msgstr "n'y avait pas de tel utilisateur"
-#: src/irc/irc-commands.c:390
+#: src/irc/irc-commands.c:389
msgid "no origin"
msgstr "pas d'origine"
-#: src/irc/irc-commands.c:392
+#: src/irc/irc-commands.c:391
msgid "no services"
msgstr "pas de service"
-#: src/irc/irc-commands.c:394
+#: src/irc/irc-commands.c:393
msgid "no recipient"
msgstr "pas de destinataire"
-#: src/irc/irc-commands.c:396
+#: src/irc/irc-commands.c:395
msgid "no text to send"
msgstr "pas de texte à envoyer"
-#: src/irc/irc-commands.c:398
+#: src/irc/irc-commands.c:397
msgid "no toplevel"
msgstr "pas de niveau supérieur"
-#: src/irc/irc-commands.c:400
+#: src/irc/irc-commands.c:399
msgid "wilcard in toplevel domain"
msgstr "caractère joker dans le domaine de niveau supérieur"
-#: src/irc/irc-commands.c:402
+#: src/irc/irc-commands.c:401
msgid "unknown command"
msgstr "commande inconnue"
-#: src/irc/irc-commands.c:404
+#: src/irc/irc-commands.c:403
msgid "MOTD is missing"
msgstr "MOTD est manquant"
-#: src/irc/irc-commands.c:406
+#: src/irc/irc-commands.c:405
msgid "no administrative info"
msgstr "pas d'information administrative"
-#: src/irc/irc-commands.c:408
+#: src/irc/irc-commands.c:407
msgid "file error"
msgstr "erreur de fichier"
-#: src/irc/irc-commands.c:410
+#: src/irc/irc-commands.c:409
msgid "no nickname given"
msgstr "pas d'utilisateur donné"
-#: src/irc/irc-commands.c:412
+#: src/irc/irc-commands.c:411
msgid "erroneous nickname"
msgstr "nom d'utilisateur erroné"
-#: src/irc/irc-commands.c:414
+#: src/irc/irc-commands.c:413
msgid "nickname already in use"
msgstr "nom d'utilisateur déjà en cours d'utilisation"
-#: src/irc/irc-commands.c:416
+#: src/irc/irc-commands.c:415
msgid "nickname collision"
msgstr "collision sur le nom d'utilisateur"
-#: src/irc/irc-commands.c:418
+#: src/irc/irc-commands.c:417
msgid "not authorized to change nickname"
msgstr "non autorisé à changer de pseudo"
-#: src/irc/irc-commands.c:420
+#: src/irc/irc-commands.c:419
msgid "user not in channel"
msgstr "utilisateur non présent dans le canal"
-#: src/irc/irc-commands.c:422
+#: src/irc/irc-commands.c:421
msgid "not on channel"
msgstr "non présent sur le canal"
-#: src/irc/irc-commands.c:424
+#: src/irc/irc-commands.c:423
msgid "user already on channel"
msgstr "utilisateur déjà sur le canal"
-#: src/irc/irc-commands.c:426
+#: src/irc/irc-commands.c:425
msgid "user not logged in"
msgstr "utilisateur non enregistré"
-#: src/irc/irc-commands.c:428
+#: src/irc/irc-commands.c:427
msgid "summon has been disabled"
msgstr "summon a été désactivé"
-#: src/irc/irc-commands.c:430
+#: src/irc/irc-commands.c:429
msgid "users has been disabled"
msgstr "users a été désactivé"
-#: src/irc/irc-commands.c:432
+#: src/irc/irc-commands.c:431
msgid "you are not registered"
msgstr "vous n'êtes pas enregistré"
-#: src/irc/irc-commands.c:434
+#: src/irc/irc-commands.c:433
msgid "not enough parameters"
msgstr "pas assez de paramètres"
-#: src/irc/irc-commands.c:436
+#: src/irc/irc-commands.c:435
msgid "you may not register"
msgstr "vous ne pouvez pas vous enregistrer"
-#: src/irc/irc-commands.c:438
+#: src/irc/irc-commands.c:437
msgid "your host isn't among the privileged"
msgstr "votre nom de machine n'est pas parmi les privilégiés"
-#: src/irc/irc-commands.c:440
+#: src/irc/irc-commands.c:439
msgid "password incorrect"
msgstr "mot de passe incorrect"
-#: src/irc/irc-commands.c:442
+#: src/irc/irc-commands.c:441
msgid "you are banned from this server"
msgstr "vous êtes banni de ce serveur"
-#: src/irc/irc-commands.c:444
+#: src/irc/irc-commands.c:443
msgid "channel key already set"
msgstr "clé du canal déjà définie"
-#: src/irc/irc-commands.c:446
+#: src/irc/irc-commands.c:445
msgid "channel is already full"
msgstr "le canal est déjà plein"
-#: src/irc/irc-commands.c:448
+#: src/irc/irc-commands.c:447
msgid "unknown mode char to me"
msgstr "caractère de mode inconnu pour moi"
-#: src/irc/irc-commands.c:450
+#: src/irc/irc-commands.c:449
msgid "cannot join channel (invite only)"
msgstr "impossible de rejoindre le canal (invités seulement)"
-#: src/irc/irc-commands.c:452
+#: src/irc/irc-commands.c:451
msgid "cannot join channel (banned from channel)"
msgstr "impossible de rejoindre le canal (banni du canal)"
-#: src/irc/irc-commands.c:454
+#: src/irc/irc-commands.c:453
msgid "cannot join channel (bad channel key)"
msgstr "impossible de rejoindre le canal (mauvaise clé pour le canal)"
-#: src/irc/irc-commands.c:456
+#: src/irc/irc-commands.c:455
msgid "bad channel mask"
msgstr "mauvais masque de canal"
-#: src/irc/irc-commands.c:458
+#: src/irc/irc-commands.c:457
msgid "channel doesn't support modes"
msgstr "le canal ne supporte pas les modes"
-#: src/irc/irc-commands.c:460
+#: src/irc/irc-commands.c:459
msgid "you're not an IRC operator"
msgstr "vous n'êtres pas opérateur IRC"
-#: src/irc/irc-commands.c:462
+#: src/irc/irc-commands.c:461
msgid "you're not channel operator"
msgstr "vous n'êtes pas opérateur du canal"
-#: src/irc/irc-commands.c:464
+#: src/irc/irc-commands.c:463
msgid "you can't kill a server!"
msgstr "vous ne pouvez pas supprimer un serveur !"
-#: src/irc/irc-commands.c:466
+#: src/irc/irc-commands.c:465
msgid "user is immune from kick/deop"
msgstr "l'utilisateur est protégé des kick/deop"
-#: src/irc/irc-commands.c:468
+#: src/irc/irc-commands.c:467
msgid "no O-lines for your host"
msgstr "pas de O-lines pour votre nom de machine"
-#: src/irc/irc-commands.c:470
+#: src/irc/irc-commands.c:469
msgid "unknown mode flag"
msgstr "drapeau de mode inconnu"
-#: src/irc/irc-commands.c:472
+#: src/irc/irc-commands.c:471
msgid "can't change mode for other users"
msgstr "impossible de changer le mode pour les autres utilisateurs"
@@ -1318,7 +1318,7 @@ msgstr "impossible de changer le mode pour les autres utilisateurs"
msgid "whois (secure connection)"
msgstr "qui est (connexion sécurisée)"
-#: src/irc/irc-display.c:163 src/common/command.c:853
+#: src/irc/irc-display.c:163 src/common/command.c:874
msgid "Server: "
msgstr "Serveur: "
@@ -1326,7 +1326,7 @@ msgstr "Serveur: "
msgid "connected"
msgstr "connecté"
-#: src/irc/irc-display.c:168
+#: src/irc/irc-display.c:168 src/common/command.c:900
msgid "not connected"
msgstr "non connecté"
@@ -1348,7 +1348,7 @@ msgstr " (serveur temporaire, ne sera pas sauvé)"
msgid "(hidden)"
msgstr "(caché)"
-#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4008
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4227
msgid "unknown"
msgstr "inconnu"
@@ -1357,7 +1357,7 @@ msgstr "inconnu"
msgid "%s: using local hostname \"%s\"\n"
msgstr "%s: utilisation du nom de machine local \"%s\"\n"
-#: src/irc/irc-send.c:126 src/common/command.c:731
+#: src/irc/irc-send.c:126 src/common/command.c:752
#, c-format
msgid "%s cannot find nick for sending message\n"
msgstr "%s impossible de trouver le pseudo pour envoyer le message\n"
@@ -1375,9 +1375,9 @@ msgstr ""
#: src/irc/irc-send.c:415 src/irc/irc-send.c:427 src/irc/irc-send.c:445
#: src/irc/irc-send.c:1097 src/irc/irc-send.c:1190 src/irc/irc-send.c:1722
-#: src/common/command.c:1196 src/common/command.c:1463
-#: src/common/command.c:1613 src/common/command.c:1756
-#: src/common/command.c:1899
+#: src/common/command.c:1222 src/common/command.c:1576
+#: src/common/command.c:1726 src/common/command.c:1869
+#: src/common/command.c:2012
#, c-format
msgid "%s wrong argument count for \"%s\" command\n"
msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n"
@@ -1394,13 +1394,13 @@ 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:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:409
+#: src/irc/irc-send.c:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:433
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s pseudo \"%s\" non trouvé pour la commande \"%s\"\n"
-#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1822
-#: src/irc/irc-recv.c:1900
+#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1886
+#: src/irc/irc-recv.c:1974
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
@@ -1410,439 +1410,439 @@ msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
msgid "%s, compiled on %s %s\n"
msgstr "%s, compilé le %s %s\n"
-#: src/irc/irc-recv.c:269
+#: src/irc/irc-recv.c:289
msgid "You have been invited to "
msgstr "Vous avez été invité sur "
-#: src/irc/irc-recv.c:272
+#: src/irc/irc-recv.c:292
msgid "by"
msgstr "par"
-#: src/irc/irc-recv.c:282 src/irc/irc-recv.c:376 src/irc/irc-recv.c:875
-#: src/irc/irc-recv.c:1210 src/irc/irc-recv.c:1452 src/irc/irc-recv.c:3226
-#: src/irc/irc-recv.c:3293
+#: src/irc/irc-recv.c:303 src/irc/irc-recv.c:397 src/irc/irc-recv.c:894
+#: src/irc/irc-recv.c:1229 src/irc/irc-recv.c:1488 src/irc/irc-recv.c:3348
+#: src/irc/irc-recv.c:3409 src/irc/irc-recv.c:3481
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s canal \"%s\" non trouvé pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:308
+#: src/irc/irc-recv.c:331
#, 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:328
+#: src/irc/irc-recv.c:350
msgid " has joined "
msgstr " a rejoint "
-#: src/irc/irc-recv.c:385
+#: src/irc/irc-recv.c:408
msgid " has kicked "
msgstr " a poussé dehors "
-#: src/irc/irc-recv.c:389
+#: src/irc/irc-recv.c:412 src/common/command.c:1397
msgid " from "
msgstr " de "
-#: src/irc/irc-recv.c:475
+#: src/irc/irc-recv.c:498
msgid " has killed "
msgstr " a tué "
-#: src/irc/irc-recv.c:481
+#: src/irc/irc-recv.c:504
msgid " from server"
msgstr " du serveur"
-#: src/irc/irc-recv.c:491
+#: src/irc/irc-recv.c:514
msgid " from server\n"
msgstr " du serveur\n"
-#: src/irc/irc-recv.c:498
+#: src/irc/irc-recv.c:522
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s la machine \"%s\" n'existe pas pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:538
+#: src/irc/irc-recv.c:562
msgid "sets ban on"
msgstr "instaure un bannissement sur"
-#: src/irc/irc-recv.c:539
+#: src/irc/irc-recv.c:563
msgid "removes ban on"
msgstr "supprime le banissement sur"
-#: src/irc/irc-recv.c:563
+#: src/irc/irc-recv.c:587
msgid "gives half channel operator status to"
msgstr "donne le droit demi-opérateur à"
-#: src/irc/irc-recv.c:564
+#: src/irc/irc-recv.c:588
msgid "removes half channel operator status from"
msgstr "supprime le droit demi-opérateur à"
-#: src/irc/irc-recv.c:591
+#: src/irc/irc-recv.c:615
msgid "sets invite-only channel flag"
msgstr "définit le canal en mode invité seulement"
-#: src/irc/irc-recv.c:592
+#: src/irc/irc-recv.c:616
msgid "removes invite-only channel flag"
msgstr "supprime le mode invité seulement pour le canal"
-#: src/irc/irc-recv.c:609
+#: src/irc/irc-recv.c:633
msgid "sets channel key to"
msgstr "définit la clé du canal à"
-#: src/irc/irc-recv.c:610
+#: src/irc/irc-recv.c:634
msgid "removes channel key"
msgstr "supprime la clé du canal"
-#: src/irc/irc-recv.c:641
+#: src/irc/irc-recv.c:665
msgid "sets the user limit to"
msgstr "définit la limite d'utilisateurs à"
-#: src/irc/irc-recv.c:642
+#: src/irc/irc-recv.c:666
msgid "removes user limit"
msgstr "supprime la limite d'utilisateurs"
-#: src/irc/irc-recv.c:664
+#: src/irc/irc-recv.c:688
msgid "sets moderated channel flag"
msgstr "instaure la modération sur le canal"
-#: src/irc/irc-recv.c:665
+#: src/irc/irc-recv.c:689
msgid "removes moderated channel flag"
msgstr "supprime la modération sur le canal"
-#: src/irc/irc-recv.c:675
+#: src/irc/irc-recv.c:699
msgid "sets messages from channel only flag"
msgstr "interdit aux utilisateurs en dehors du canal d'y écrire"
-#: src/irc/irc-recv.c:676
+#: src/irc/irc-recv.c:700
msgid "removes messages from channel only flag"
msgstr "autorise tout utilisateur à écrire sur le canal"
-#: src/irc/irc-recv.c:693
+#: src/irc/irc-recv.c:717
msgid "gives channel operator status to"
msgstr "donne le droit opérateur à"
-#: src/irc/irc-recv.c:694
+#: src/irc/irc-recv.c:718
msgid "removes channel operator status from"
msgstr "supprime le droit opérateur à"
-#: src/irc/irc-recv.c:721
+#: src/irc/irc-recv.c:745
msgid "sets private channel flag"
msgstr "définit le canal comme privé"
-#: src/irc/irc-recv.c:722
+#: src/irc/irc-recv.c:746
msgid "removes private channel flag"
msgstr "supprime le mode privé pour le canal"
-#: src/irc/irc-recv.c:739
+#: src/irc/irc-recv.c:763
msgid "sets quiet on"
msgstr "définit le mode muet sur"
-#: src/irc/irc-recv.c:740
+#: src/irc/irc-recv.c:764
msgid "removes quiet on"
msgstr "supprime le mode muet sur"
-#: src/irc/irc-recv.c:757
+#: src/irc/irc-recv.c:781
msgid "sets secret channel flag"
msgstr "définit le canal comme secret"
-#: src/irc/irc-recv.c:758
+#: src/irc/irc-recv.c:782
msgid "removes secret channel flag"
msgstr "supprime le mode secret pour le canal"
-#: src/irc/irc-recv.c:768
+#: src/irc/irc-recv.c:792
msgid "sets topic protection"
msgstr "active la protection du titre"
-#: src/irc/irc-recv.c:769
+#: src/irc/irc-recv.c:793
msgid "removes topic protection"
msgstr "supprime la protection du titre"
-#: src/irc/irc-recv.c:786
+#: src/irc/irc-recv.c:810
msgid "gives voice to"
msgstr "donne la voix à"
-#: src/irc/irc-recv.c:787
+#: src/irc/irc-recv.c:811
msgid "removes voice from"
msgstr "supprime la voix de"
-#: src/irc/irc-recv.c:830 src/irc/irc-recv.c:915 src/irc/irc-recv.c:1284
-#: src/irc/irc-recv.c:1966
+#: src/irc/irc-recv.c:854 src/irc/irc-recv.c:936 src/irc/irc-recv.c:1307
+#: src/irc/irc-recv.c:2041
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s commande \"%s\" reçue sans host\n"
-#: src/irc/irc-recv.c:845
+#: src/irc/irc-recv.c:864
#, 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:890
+#: src/irc/irc-recv.c:911
msgid "mode changed by"
msgstr "mode changé par"
-#: src/irc/irc-recv.c:954
+#: src/irc/irc-recv.c:973
msgid "You are "
msgstr "Vous êtes "
-#: src/irc/irc-recv.c:961
+#: src/irc/irc-recv.c:980
msgid " is "
msgstr " est "
-#: src/irc/irc-recv.c:965
+#: src/irc/irc-recv.c:984
msgid "now known as "
msgstr "maintenant connu sous le nom "
-#: src/irc/irc-recv.c:1035
+#: src/irc/irc-recv.c:1050
#, 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:1048 src/irc/irc-recv.c:1080
+#: src/irc/irc-recv.c:1066 src/irc/irc-recv.c:1098
msgid "reply from"
msgstr "réponse de"
-#: src/irc/irc-recv.c:1083
+#: src/irc/irc-recv.c:1101
#, c-format
msgid ": %ld.%ld seconds\n"
msgstr ": %ld.%ld secondes\n"
-#: src/irc/irc-recv.c:1135
+#: src/irc/irc-recv.c:1154
#, 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:1185
+#: src/irc/irc-recv.c:1203
msgid " has left "
msgstr " a quitté "
-#: src/irc/irc-recv.c:1333 src/irc/irc-recv.c:1846
+#: src/irc/irc-recv.c:1355 src/irc/irc-recv.c:1910
#, c-format
msgid "On %s: * %s %s"
msgstr "Sur %s: * %s %s"
-#: src/irc/irc-recv.c:1353
+#: src/irc/irc-recv.c:1379
#, c-format
msgid "Received a CTCP SOUND \"%s\" from "
msgstr "CTCP SOUND \"%s\" reçu de "
-#: src/irc/irc-recv.c:1384 src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1512
-#: src/irc/irc-recv.c:1548 src/irc/irc-recv.c:1881
+#: src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1443 src/irc/irc-recv.c:1547
+#: src/irc/irc-recv.c:1587 src/irc/irc-recv.c:1950
msgid "received from"
msgstr "reçu de"
-#: src/irc/irc-recv.c:1408 src/irc/irc-recv.c:1877
+#: src/irc/irc-recv.c:1439 src/irc/irc-recv.c:1946
msgid "Unknown CTCP "
msgstr "CTCP inconnu "
-#: src/irc/irc-recv.c:1436
+#: src/irc/irc-recv.c:1471
#, c-format
msgid "On %s: %s> %s"
msgstr "Sur %s: %s> %s"
-#: src/irc/irc-recv.c:1563 src/irc/irc-recv.c:1580 src/irc/irc-recv.c:1596
-#: src/irc/irc-recv.c:1612 src/irc/irc-recv.c:1637 src/irc/irc-recv.c:1654
-#: src/irc/irc-recv.c:1670 src/irc/irc-recv.c:1694 src/irc/irc-recv.c:1711
-#: src/irc/irc-recv.c:1727 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1768
-#: src/irc/irc-recv.c:1783 src/irc/irc-recv.c:1942 src/irc/irc-recv.c:3592
-#: src/irc/irc-recv.c:3650 src/irc/irc-recv.c:3802 src/irc/irc-recv.c:3817
-#: src/irc/irc-recv.c:3832 src/irc/irc-recv.c:3847 src/irc/irc-recv.c:3860
-#: src/irc/irc-recv.c:3910 src/irc/irc-recv.c:3924
+#: src/irc/irc-recv.c:1603 src/irc/irc-recv.c:1624 src/irc/irc-recv.c:1640
+#: src/irc/irc-recv.c:1656 src/irc/irc-recv.c:1682 src/irc/irc-recv.c:1703
+#: src/irc/irc-recv.c:1719 src/irc/irc-recv.c:1744 src/irc/irc-recv.c:1765
+#: src/irc/irc-recv.c:1781 src/irc/irc-recv.c:1806 src/irc/irc-recv.c:1827
+#: src/irc/irc-recv.c:1842 src/irc/irc-recv.c:2017 src/irc/irc-recv.c:3791
+#: src/irc/irc-recv.c:3849 src/irc/irc-recv.c:4010 src/irc/irc-recv.c:4025
+#: src/irc/irc-recv.c:4040 src/irc/irc-recv.c:4055 src/irc/irc-recv.c:4068
+#: src/irc/irc-recv.c:4123 src/irc/irc-recv.c:4137
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s impossible d'analyser la commande \"%s\"\n"
-#: src/irc/irc-recv.c:1796
+#: src/irc/irc-recv.c:1855
#, 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:1921 src/irc/irc-dcc.c:1039
+#: src/irc/irc-recv.c:1995 src/irc/irc-dcc.c:1036
#, c-format
msgid "Private %s> %s"
msgstr "Prive %s> %s"
-#: src/irc/irc-recv.c:1998
+#: src/irc/irc-recv.c:2072
msgid "has quit"
msgstr "a quitté"
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2197
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s commande \"%s\" reçue sans canal\n"
-#: src/irc/irc-recv.c:2147
+#: src/irc/irc-recv.c:2229
msgid " has changed topic for "
msgstr " a changé le titre pour "
-#: src/irc/irc-recv.c:2152
+#: src/irc/irc-recv.c:2234
#, c-format
msgid " to: \"%s\"\n"
msgstr " en: \"%s\"\n"
-#: src/irc/irc-recv.c:2158
+#: src/irc/irc-recv.c:2240
msgid " has unset topic for "
msgstr " a retiré le titre pour "
-#: src/irc/irc-recv.c:2276
+#: src/irc/irc-recv.c:2359
#, c-format
msgid " is away: %s\n"
msgstr " est absent: %s\n"
-#: src/irc/irc-recv.c:2350
+#: src/irc/irc-recv.c:2441
msgid "Users online: "
msgstr "Utilisateurs en ligne: "
-#: src/irc/irc-recv.c:2797
+#: src/irc/irc-recv.c:2927
msgid "idle: "
msgstr "inactivité: "
-#: src/irc/irc-recv.c:2805
+#: src/irc/irc-recv.c:2935
msgid "days"
msgstr "jours"
-#: src/irc/irc-recv.c:2805
+#: src/irc/irc-recv.c:2935
msgid "day"
msgstr "jour"
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2945
msgid "hours"
msgstr "heures"
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2945
msgid "hour"
msgstr "heure"
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2951
msgid "minutes"
msgstr "minutes"
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2951
msgid "minute"
msgstr "minute"
-#: src/irc/irc-recv.c:2827
+#: src/irc/irc-recv.c:2957
msgid "seconds"
msgstr "secondes"
-#: src/irc/irc-recv.c:2827
+#: src/irc/irc-recv.c:2957
msgid "second"
msgstr "seconde"
-#: src/irc/irc-recv.c:2832
+#: src/irc/irc-recv.c:2962
msgid "signon at: "
msgstr "signé le: "
-#: src/irc/irc-recv.c:2920
+#: src/irc/irc-recv.c:3058
msgid "Channels: "
msgstr "Canaux: "
-#: src/irc/irc-recv.c:3172
+#: src/irc/irc-recv.c:3339
msgid "No topic set for "
msgstr "Pas de titre défini pour "
-#: src/irc/irc-recv.c:3214
+#: src/irc/irc-recv.c:3396
msgid "Topic for "
msgstr "Le titre pour "
-#: src/irc/irc-recv.c:3218
+#: src/irc/irc-recv.c:3400
#, c-format
msgid " is: \"%s\"\n"
msgstr " est: \"%s\"\n"
-#: src/irc/irc-recv.c:3236 src/irc/irc-recv.c:3320 src/irc/irc-recv.c:3373
+#: src/irc/irc-recv.c:3419 src/irc/irc-recv.c:3508 src/irc/irc-recv.c:3561
#, 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:3282
+#: src/irc/irc-recv.c:3469
msgid "Topic set by "
msgstr "Titre défini par "
-#: src/irc/irc-recv.c:3302
+#: src/irc/irc-recv.c:3490
#, 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:3311 src/irc/irc-recv.c:3382
+#: src/irc/irc-recv.c:3499 src/irc/irc-recv.c:3570
#, 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:3361
+#: src/irc/irc-recv.c:3549
msgid "has invited"
msgstr "a invité"
-#: src/irc/irc-recv.c:3364 src/irc/irc-recv.c:3515
+#: src/irc/irc-recv.c:3552 src/irc/irc-recv.c:3712 src/common/command.c:1390
msgid "on"
msgstr "sur"
-#: src/irc/irc-recv.c:3638
+#: src/irc/irc-recv.c:3837
#, 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:3694
+#: src/irc/irc-recv.c:3897
msgid "Nicks "
msgstr "Utilisateurs "
-#: src/irc/irc-recv.c:3714
+#: src/irc/irc-recv.c:3917
msgid "Channel "
msgstr "Canal "
-#: src/irc/irc-recv.c:3725
+#: src/irc/irc-recv.c:3928
msgid "nicks"
msgstr "utilisateurs"
-#: src/irc/irc-recv.c:3725
+#: src/irc/irc-recv.c:3928
msgid "nick"
msgstr "utilisateur"
-#: src/irc/irc-recv.c:3733
+#: src/irc/irc-recv.c:3936
msgid "ops"
msgstr "ops"
-#: src/irc/irc-recv.c:3733
+#: src/irc/irc-recv.c:3936
msgid "op"
msgstr "op"
-#: src/irc/irc-recv.c:3742
+#: src/irc/irc-recv.c:3945
msgid "halfops"
msgstr "halfops"
-#: src/irc/irc-recv.c:3742
+#: src/irc/irc-recv.c:3945
msgid "halfop"
msgstr "halfop"
-#: src/irc/irc-recv.c:3751
+#: src/irc/irc-recv.c:3954
msgid "voices"
msgstr "voices"
-#: src/irc/irc-recv.c:3751
+#: src/irc/irc-recv.c:3954
msgid "voice"
msgstr "voice"
-#: src/irc/irc-recv.c:3760
+#: src/irc/irc-recv.c:3963
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:3873
+#: src/irc/irc-recv.c:4085
msgid "banned by"
msgstr "banni par"
-#: src/irc/irc-recv.c:3962
+#: src/irc/irc-recv.c:4181
#, 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:3974
+#: src/irc/irc-recv.c:4193
#, 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:3986
+#: src/irc/irc-recv.c:4205
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1851,7 +1851,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:3996
+#: src/irc/irc-recv.c:4215
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
@@ -1882,35 +1882,35 @@ msgstr "Echoué"
msgid "Aborted"
msgstr "Interrompu"
-#: src/irc/irc-dcc.c:348 src/irc/irc-dcc.c:539 src/irc/irc-dcc.c:701
+#: src/irc/irc-dcc.c:345 src/irc/irc-dcc.c:536 src/irc/irc-dcc.c:698
msgid "DCC: file "
msgstr "DCC: fichier "
-#: src/irc/irc-dcc.c:355 src/irc/irc-dcc.c:664 src/irc/irc-dcc.c:706
+#: src/irc/irc-dcc.c:352 src/irc/irc-dcc.c:661 src/irc/irc-dcc.c:703
msgid " (local filename: "
msgstr " (nom local: "
-#: src/irc/irc-dcc.c:363
+#: src/irc/irc-dcc.c:360
msgid " sent to "
msgstr " envoyé à "
-#: src/irc/irc-dcc.c:365
+#: src/irc/irc-dcc.c:362
msgid " received from "
msgstr " reçu de "
-#: src/irc/irc-dcc.c:371
+#: src/irc/irc-dcc.c:368
msgid ": ok!\n"
msgstr ": ok!\n"
-#: src/irc/irc-dcc.c:371
+#: src/irc/irc-dcc.c:368
msgid ": FAILED\n"
msgstr ": ECHOUE\n"
-#: src/irc/irc-dcc.c:383
+#: src/irc/irc-dcc.c:380
msgid "DCC chat closed with "
msgstr "Discussion DCC fermée avec "
-#: src/irc/irc-dcc.c:432
+#: src/irc/irc-dcc.c:429
#, c-format
msgid ""
"%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1919,20 +1919,20 @@ msgstr ""
"%s impossible d'associer la discussion DCC avec un tampon privé (le tampon "
"privé a peut-être déjà un DCC CHAT ?)\n"
-#: src/irc/irc-dcc.c:442
+#: src/irc/irc-dcc.c:439
msgid "Connected to "
msgstr "Connecté à "
-#: src/irc/irc-dcc.c:451
+#: src/irc/irc-dcc.c:448
msgid "via DCC chat\n"
msgstr "via une discussion DCC\n"
-#: src/irc/irc-dcc.c:544
+#: src/irc/irc-dcc.c:541
#, c-format
msgid "resumed at position %u\n"
msgstr "recommencé en position %u\n"
-#: src/irc/irc-dcc.c:550 src/irc/irc-dcc.c:575
+#: src/irc/irc-dcc.c:547 src/irc/irc-dcc.c:572
#, c-format
msgid ""
"%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
@@ -1941,71 +1941,71 @@ msgstr ""
"%s impossible de continuer le fichier \"%s\" (port: %d, position de départ: %"
"u): DCC non trouvé ou terminé\n"
-#: src/irc/irc-dcc.c:594
+#: src/irc/irc-dcc.c:591
#, c-format
msgid "%s not enough memory for new DCC\n"
msgstr "%s pas assez de mémoire pour un nouveau DCC\n"
-#: src/irc/irc-dcc.c:613
+#: src/irc/irc-dcc.c:610
msgid "DCC chat"
msgstr "Discussion DCC"
-#: src/irc/irc-dcc.c:643
+#: src/irc/irc-dcc.c:640
msgid "Incoming DCC file from "
msgstr "Réception fichier DCC de "
-#: src/irc/irc-dcc.c:654 src/irc/irc-dcc.c:668
+#: src/irc/irc-dcc.c:651 src/irc/irc-dcc.c:665
msgid " bytes\n"
msgstr " octets\n"
-#: src/irc/irc-dcc.c:660
+#: src/irc/irc-dcc.c:657
msgid "Sending DCC file to "
msgstr "Envoi fichier DCC à "
-#: src/irc/irc-dcc.c:674
+#: src/irc/irc-dcc.c:671
msgid "Incoming DCC chat request from "
msgstr "Demande de discussion DCC reçue de "
-#: src/irc/irc-dcc.c:686
+#: src/irc/irc-dcc.c:683
msgid "Sending DCC chat request to "
msgstr "Envoi d'une demande discussion DCC à "
-#: src/irc/irc-dcc.c:712
+#: src/irc/irc-dcc.c:709
#, c-format
msgid "will be resumed at position %u\n"
msgstr "sera redémarré à la position %u\n"
-#: src/irc/irc-dcc.c:778
+#: src/irc/irc-dcc.c:775
#, c-format
msgid "%s not enough memory for DCC SEND\n"
msgstr "%s pas assez de mémoire pour le DCC SEND\n"
-#: src/irc/irc-dcc.c:800
+#: src/irc/irc-dcc.c:797
#, c-format
msgid "%s cannot access file \"%s\"\n"
msgstr "%s impossible d'accéder au fichier \"%s\"\n"
-#: src/irc/irc-dcc.c:821
+#: src/irc/irc-dcc.c:818
#, c-format
msgid "%s cannot create socket for DCC\n"
msgstr "%s impossible de créer la socket pour le DCC\n"
-#: src/irc/irc-dcc.c:834
+#: src/irc/irc-dcc.c:831
#, c-format
msgid "%s cannot find port for DCC\n"
msgstr "%s impossible de trouver le port pour le DCC\n"
-#: src/irc/irc-dcc.c:881
+#: src/irc/irc-dcc.c:878
#, c-format
msgid "%s cannot send DCC\n"
msgstr "%s impossible d'envoyer le DCC\n"
-#: src/irc/irc-dcc.c:960
+#: src/irc/irc-dcc.c:957
#, c-format
msgid "%s error sending data to \"%s\" via DCC CHAT\n"
msgstr "%s erreur d'envoi de données à \"%s\" via DCC CHAT\n"
-#: src/irc/irc-dcc.c:1233
+#: src/irc/irc-dcc.c:1230
#, c-format
msgid ""
"%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -2014,11 +2014,42 @@ msgstr ""
"%s le DCC a échoué car la taille de bloc est trop grande. Vérifiez la valeur "
"de l'option \"dcc_blocksize\", le maximum est %d.\n"
-#: src/irc/irc-dcc.c:1308
+#: src/irc/irc-dcc.c:1305
#, c-format
msgid "Aborting active DCC: \"%s\" from %s\n"
msgstr "Abandon du DCC actif: \"%s\" de %s\n"
+#: src/irc/irc-ignore.c:195
+#, c-format
+msgid "%s too few arguments for ignore\n"
+msgstr "%s pas assez de paramètres pour le ignore\n"
+
+#: src/irc/irc-ignore.c:212
+#, c-format
+msgid "%s mask or type/command should be non generic value for ignore\n"
+msgstr ""
+"%s le masque ou le type/commande doit être une valeur non générique pour le "
+"ignore\n"
+
+#: src/irc/irc-ignore.c:221
+#, c-format
+msgid "%s ignore already exists\n"
+msgstr "%s l'ignore existe déjà\n"
+
+#: src/irc/irc-ignore.c:257
+#, c-format
+msgid "%s unknown type or IRC command \"%s\" for ignore\n"
+msgstr "%s type ou commande IRC \"%s\" inconnu pour le ignore\n"
+
+#: src/irc/irc-ignore.c:285
+#, c-format
+msgid "%s not enough memory to create ignore\n"
+msgstr "%s pas assez de mémoire pour créer un ignore\n"
+
+#: src/irc/irc-ignore.c:406 src/irc/irc-ignore.c:442
+msgid "Removing ignore:"
+msgstr "Suppression du ignore:"
+
#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:463
#: src/plugins/python/wee-python.c:81 src/plugins/ruby/wee-ruby.c:89
#, c-format
@@ -2086,19 +2117,19 @@ msgid "Loading %s script \"%s\"\n"
msgstr "Chargement du script %s \"%s\"\n"
#: src/plugins/perl/wee-perl.c:1015 src/plugins/python/wee-python.c:686
-#: src/plugins/ruby/wee-ruby.c:722
+#: src/plugins/ruby/wee-ruby.c:555
#, c-format
msgid "Unloading %s script \"%s\"\n"
msgstr "Déchargement du script %s \"%s\"\n"
#: src/plugins/perl/wee-perl.c:1032 src/plugins/python/wee-python.c:703
-#: src/plugins/ruby/wee-ruby.c:739
+#: src/plugins/ruby/wee-ruby.c:572
#, c-format
msgid "Unloading all %s scripts...\n"
msgstr "Déchargement de tous les scripts %s...\n"
#: src/plugins/perl/wee-perl.c:1037 src/plugins/python/wee-python.c:708
-#: src/plugins/ruby/wee-ruby.c:744
+#: src/plugins/ruby/wee-ruby.c:577
#, c-format
msgid "%s scripts unloaded\n"
msgstr "Scripts %s déchargés\n"
@@ -2375,7 +2406,7 @@ msgstr "effacer la liste d'activité"
msgid "grab a key"
msgstr "capturer une touche"
-#: src/gui/gui-keyboard.c:426 src/common/command.c:1478
+#: src/gui/gui-keyboard.c:426 src/common/command.c:1591
#, c-format
msgid "%s unable to bind key \"%s\"\n"
msgstr "%s impossible de créer la touche \"%s\"\n"
@@ -2498,14 +2529,42 @@ msgid "command: name of a WeeChat or IRC command"
msgstr "commande: nom d'une commande WeeChat ou IRC"
#: src/common/command.c:75
+msgid "ignore IRC messages and/or hosts"
+msgstr "ignorer des messages IRC et/ou des masques"
+
+#: src/common/command.c:76
+msgid "[mask [[type | command] [channel [server]]]]"
+msgstr "[masque [[type | commande] [canal [serveur]]]]"
+
+#: src/common/command.c:77
+msgid ""
+" mask: nick or host mask to ignore\n"
+" type: type of message to ignore (action, ctcp, dcc, pv)\n"
+"command: IRC command\n"
+"channel: name of channel for ignore\n"
+" server: name of server for ignore\n"
+"\n"
+"For each argument, '*' means all.\n"
+"Without argument, /ignore command lists all defined ignore."
+msgstr ""
+" masque: pseudo ou masque à ignorer\n"
+" type: type de message à ignorer (action, ctcp, dcc, pv)\n"
+"commande: commande IRC\n"
+" canal: nom du canal pour le ignore\n"
+" serveur: nom du serveur pour le ignore\n"
+"\n"
+"Pour chaque paramètre, '*' signifie tou(te)s.\n"
+"Sans paramètre, la commande /ignore liste les ignore définis."
+
+#: src/common/command.c:85
msgid "bind/unbind keys"
msgstr "associer/libérer des touches"
-#: src/common/command.c:76
+#: src/common/command.c:86
msgid "[key function/command] [unbind key] [functions] [reset -yes]"
msgstr "[touche fonction/commande] [unbind touche] [functions] [reset -yes]"
-#: src/common/command.c:77
+#: src/common/command.c:87
msgid ""
"key: bind this key to an internal function or a command (beginning by \"/"
"\")\n"
@@ -2523,51 +2582,57 @@ msgstr ""
"reset: restaur les touches aux valeurs par défaut et supprime TOUTES les "
"touches personnelles (utiliser avec précaution !)"
-#: src/common/command.c:82
+#: src/common/command.c:92
msgid "list/load/unload Perl scripts"
msgstr "liste/charge/décharge des scripts Perl"
-#: src/common/command.c:83 src/common/command.c:88 src/common/command.c:93
+#: src/common/command.c:93 src/common/command.c:98 src/common/command.c:103
msgid "[load filename] | [autoload] | [reload] | [unload]"
msgstr "[load fichier] | [autoload] | [reload] | [unload]"
-#: src/common/command.c:84
+#: src/common/command.c:94
msgid ""
"filename: Perl script (file) to load\n"
+"\n"
"Without argument, /perl command lists all loaded Perl scripts."
msgstr ""
"fichier: script Perl (fichier) à charger\n"
+"\n"
"Sans paramètre, la commande /perl liste tous les scripts Perl chargés."
-#: src/common/command.c:87
+#: src/common/command.c:97
msgid "list/load/unload Python scripts"
msgstr "liste/charge/décharge des scripts Python"
-#: src/common/command.c:89
+#: src/common/command.c:99
msgid ""
"filename: Python script (file) to load\n"
+"\n"
"Without argument, /python command lists all loaded Python scripts."
msgstr ""
"fichier: script Python (fichier) à charger\n"
+"\n"
"Sans paramètre, la commande /python liste tous les scripts Python chargés."
-#: src/common/command.c:92
+#: src/common/command.c:102
msgid "list/load/unload Ruby scripts"
msgstr "liste/charge/décharge des scripts Ruby"
-#: src/common/command.c:94
+#: src/common/command.c:104
msgid ""
"filename: Ruby script (file) to load\n"
+"\n"
"Without argument, /ruby command lists all loaded Ruby scripts."
msgstr ""
"fichier: script Ruby (fichier) à charger\n"
+"\n"
"Sans paramètre, la commande /ruby liste tous les scripts Ruby chargés."
-#: src/common/command.c:97
+#: src/common/command.c:107
msgid "list, add or remove servers"
msgstr "liste, ajoute ou retire des serveurs"
-#: src/common/command.c:98
+#: src/common/command.c:108
msgid ""
"[servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-"
"pwd password] [-nicks nick1 [nick2 [nick3]]] [-username username] [-realname "
@@ -2579,7 +2644,7 @@ msgstr ""
"nom_utilisateur] [-realname nom_réel] [-command commande] [-autojoin canal[,"
"canal]] ] | [del nom_serveur]"
-#: src/common/command.c:103
+#: src/common/command.c:113
msgid ""
"servername: server name, for internal & display use\n"
"hostname: name or IP address of server\n"
@@ -2605,27 +2670,27 @@ msgstr ""
"nom_utilisateur: nom d'utilisateur\n"
"nom_réel: nom réel de l'utilisateur"
-#: src/common/command.c:115
+#: src/common/command.c:125
msgid "save config to disk"
msgstr "sauvegarder la configuration sur disque"
-#: src/common/command.c:116
+#: src/common/command.c:126
msgid "[file]"
msgstr "[fichier]"
-#: src/common/command.c:116
+#: src/common/command.c:126
msgid "file: filename for writing config"
msgstr "fichier: fichier pour sauvegarder la configuration"
-#: src/common/command.c:118
+#: src/common/command.c:128
msgid "set config parameters"
msgstr "modifier des paramètres de configuration"
-#: src/common/command.c:119
+#: src/common/command.c:129
msgid "[option[=value]]"
msgstr "[option[=valeur]]"
-#: src/common/command.c:119
+#: src/common/command.c:129
msgid ""
"option: name of an option\n"
"value: value for option"
@@ -2633,27 +2698,58 @@ msgstr ""
"option: nom d'une option\n"
"valeur: valeur pour l'option"
-#: src/common/command.c:121
+#: src/common/command.c:131
msgid "remove an alias"
msgstr "supprimer un alias"
-#: src/common/command.c:122
+#: src/common/command.c:132
msgid "alias_name"
msgstr "nom_alias"
-#: src/common/command.c:122
+#: src/common/command.c:132
msgid "alias_name: name of alias to remove"
msgstr "nom_alias: nom de l'alias à supprimer"
-#: src/common/command.c:124
+#: src/common/command.c:134
+msgid "unignore IRC messages and/or hosts"
+msgstr "supprimer le ignore des messages IRC et/ou des masques"
+
+#: src/common/command.c:135
+msgid "[number | [mask [[type | command] [channel [server]]]]]"
+msgstr "[nombre | [masque [[type | commande] [canal [serveur]]]]]"
+
+#: src/common/command.c:136
+msgid ""
+" number: # of ignore to unignore (number is displayed by list of ignore)\n"
+" mask: nick or host mask to unignore\n"
+" type: type of message to unignore (action, ctcp, dcc, pv)\n"
+"command: IRC command\n"
+"channel: name of channel for unignore\n"
+" server: name of server for unignore\n"
+"\n"
+"For each argument, '*' means all.\n"
+"Without argument, /unignore command lists all defined ignore."
+msgstr ""
+" nombre: numéro de ignore à supprimer (le nombre est affiché sur la liste "
+"des ignore)\n"
+" masque: pseudo ou masque à ignorer\n"
+" type: type de message à ignorer (action, ctcp, dcc, pv)\n"
+"commande: commande IRC\n"
+" canal: nom du canal pour le ignore\n"
+" serveur: nom du serveur pour le ignore\n"
+"\n"
+"Pour chaque paramètre, '*' signifie tou(te)s.\n"
+"Sans paramètre, /ignore liste les ignore définis."
+
+#: src/common/command.c:145
msgid "manage windows"
msgstr "gestion des fenêtres"
-#: src/common/command.c:125
+#: src/common/command.c:146
msgid "[list | splith | splitv | [merge [down | up | left | right | all]]]"
msgstr "[list | splith | splitv | [merge [down | up | left | right | all]]]"
-#: src/common/command.c:126
+#: src/common/command.c:147
msgid ""
"list: list opened windows (no parameter implies this list)\n"
"splith: split current window horizontally\n"
@@ -2665,29 +2761,29 @@ msgstr ""
"splitv: éclate la fenêtre en deux verticalement\n"
"merge: fusionne la fenêtre avec une autre"
-#: src/common/command.c:272
+#: src/common/command.c:293
#, c-format
msgid "%s alias or command \"%s\" already exists!\n"
msgstr "%s l'alias ou la commande \"%s\" existe déjà !\n"
-#: src/common/command.c:282
+#: src/common/command.c:303
#, c-format
msgid "%s alias cannot run another alias!\n"
msgstr "%s l'alias ne peut pas lancer un autre alias !\n"
-#: src/common/command.c:289
+#: src/common/command.c:310
#, c-format
msgid "%s target command \"%s\" does not exist!\n"
msgstr "%s la commande cible \"%s\" n'existe pas !\n"
-#: src/common/command.c:497
+#: src/common/command.c:518
#, c-format
msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
msgstr ""
"%s nombre de paramètres incorrect pour la commande %s \"%s\" (attendu: %d "
"paramètre%s)\n"
-#: src/common/command.c:509
+#: src/common/command.c:530
#, c-format
msgid ""
"%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
@@ -2696,19 +2792,19 @@ msgstr ""
"%s nombre de paramètres incorrect pour la commande %s \"%s\" (attendu: entre "
"%d et %d paramètre%s)\n"
-#: src/common/command.c:531 src/common/command.c:601
+#: src/common/command.c:552 src/common/command.c:622
#, c-format
msgid "%s command \"%s\" failed\n"
msgstr "%s la commande \"%s\" a échoué\n"
-#: src/common/command.c:559
+#: src/common/command.c:580
#, c-format
msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
msgstr ""
"%s nombre de paramètres incorrect pour la commande IRC \"%s\" (attendu: %d "
"paramètre%s)\n"
-#: src/common/command.c:571
+#: src/common/command.c:592
#, c-format
msgid ""
"%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
@@ -2717,221 +2813,237 @@ msgstr ""
"%s nombre de paramètres incorrect pour la commande IRC \"%s\" (attendu: "
"entre %d et %d paramètre%s)\n"
-#: src/common/command.c:586
+#: src/common/command.c:607
#, c-format
msgid "%s command \"%s\" needs a server connection!\n"
msgstr "%s la commande \"%s\" nécessite une connexion au serveur !\n"
-#: src/common/command.c:650
+#: src/common/command.c:671
#, c-format
msgid "%s unknown command \"%s\" (type /help for help)\n"
msgstr "%s commande \"%s\" inconnue (tapez /help pour l'aide)\n"
-#: src/common/command.c:753
+#: src/common/command.c:774
#, c-format
msgid "%s unable to call handler for message (not enough memory)\n"
msgstr ""
"%s impossible d'appeler la fonction pour le message (mémoire insuffisante)\n"
-#: src/common/command.c:761
+#: src/common/command.c:782
msgid "This window is not a channel!\n"
msgstr "Cette fenêtre n'est pas un canal !\n"
-#: src/common/command.c:789 src/common/command.c:813 src/common/command.c:918
+#: src/common/command.c:810 src/common/command.c:834 src/common/command.c:944
#, c-format
msgid "%s missing arguments for \"%s\" command\n"
msgstr "%s paramètres manquants pour la commande \"%s\"\n"
-#: src/common/command.c:798
+#: src/common/command.c:819
#, c-format
msgid "Alias \"%s\" => \"%s\" created\n"
msgstr "Alias \"%s\" => \"%s\" créé\n"
-#: src/common/command.c:804
+#: src/common/command.c:825
#, c-format
msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
msgstr "Impossible de créer l'alias \"%s\" => \"%s\" (pas assez de mémoire)\n"
-#: src/common/command.c:824
+#: src/common/command.c:845
msgid "List of aliases:\n"
msgstr "Liste des alias:\n"
-#: src/common/command.c:836
+#: src/common/command.c:857
msgid "No alias defined.\n"
msgstr "Aucun alias défini.\n"
-#: src/common/command.c:859
+#: src/common/command.c:880
msgid "Channel: "
msgstr "Canal: "
-#: src/common/command.c:862 src/common/command.c:872
+#: src/common/command.c:883 src/common/command.c:893
msgid " (server: "
msgstr " (serveur: "
-#: src/common/command.c:869
+#: src/common/command.c:890
msgid "Private with: "
msgstr "Privé avec: "
-#: src/common/command.c:898
+#: src/common/command.c:924
msgid "Opened buffers:\n"
msgstr "Tampons ouverts:\n"
-#: src/common/command.c:941
+#: src/common/command.c:967
#, c-format
msgid "%s incorrect buffer number\n"
msgstr "%s numéro de buffer incorrect\n"
-#: src/common/command.c:955
+#: src/common/command.c:981
#, c-format
msgid "%s can not close the single buffer\n"
msgstr "%s impossible de fermer le tampon unique\n"
-#: src/common/command.c:965
+#: src/common/command.c:991
#, c-format
msgid "%s can not close server buffer while channels are opened\n"
msgstr ""
"%s impossible de fermer le tampon du serveur tant que des canaux sont "
"ouverts\n"
-#: src/common/command.c:1006
+#: src/common/command.c:1032
msgid "Notify levels: "
msgstr "Niveaux de notification: "
-#: src/common/command.c:1034 src/common/command.c:1056
+#: src/common/command.c:1060 src/common/command.c:1082
#, c-format
msgid "%s incorrect notify level (must be between %d and %d)\n"
msgstr "%s niveau de notification incorrect (doit être entre %d et %d)\n"
-#: src/common/command.c:1043
+#: src/common/command.c:1069
#, c-format
msgid "%s incorrect buffer for notify (must be channel or private)\n"
msgstr ""
"%s tampon incorrect pour la notification (doit être un canal ou un privé)\n"
-#: src/common/command.c:1123
+#: src/common/command.c:1149
#, c-format
msgid "unknown parameter \"%s\" for \"%s\" command\n"
msgstr "paramètre inconnu \"%s\" pour la commande \"%s\"\n"
-#: src/common/command.c:1153
+#: src/common/command.c:1179
#, c-format
msgid "%s already connected to server \"%s\"!\n"
msgstr "%s déjà connecté au serveur \"%s\" !\n"
-#: src/common/command.c:1161
+#: src/common/command.c:1187
#, c-format
msgid "%s currently connecting to server \"%s\"!\n"
msgstr "%s une connexion vers le serveur \"%s\" est en cours !\n"
-#: src/common/command.c:1179 src/common/command.c:1254
+#: src/common/command.c:1205 src/common/command.c:1280
#, c-format
msgid "%s server not found\n"
msgstr "%s serveur non trouvé\n"
-#: src/common/command.c:1209 src/common/command.c:1606
-#: src/common/command.c:1749 src/common/command.c:1892
-#: src/common/command.c:2589 src/common/command.c:2605
+#: src/common/command.c:1235 src/common/command.c:1719
+#: src/common/command.c:1862 src/common/command.c:2005
+#: src/common/command.c:2765 src/common/command.c:2781
#, c-format
msgid "%s unknown option for \"%s\" command\n"
msgstr "%s option inconnue pour la commande \"%s\"\n"
-#: src/common/command.c:1238
+#: src/common/command.c:1264
#, c-format
msgid "%s not connected to server \"%s\"!\n"
msgstr "%s non connecté au serveur \"%s\" !\n"
-#: src/common/command.c:1246
+#: src/common/command.c:1272
msgid "Auto-reconnection is cancelled\n"
msgstr "La reconnexion automatique est annulée\n"
-#: src/common/command.c:1272 src/common/weechat.c:273
+#: src/common/command.c:1298 src/common/weechat.c:345
#, c-format
msgid "%s internal commands:\n"
msgstr "Commandes internes %s :\n"
-#: src/common/command.c:1281 src/common/weechat.c:293
+#: src/common/command.c:1307 src/common/weechat.c:365
#, c-format
msgid "IRC commands:\n"
msgstr "Commandes IRC :\n"
-#: src/common/command.c:1348
+#: src/common/command.c:1374
#, c-format
msgid "No help available, \"%s\" is an unknown command\n"
msgstr "Pas d'aide disponible, la commande \"%s\" est inconnue\n"
-#: src/common/command.c:1366
+#: src/common/command.c:1395
+msgid " ignoring "
+msgstr " ignore "
+
+#: src/common/command.c:1419
+msgid "List of ignore:\n"
+msgstr "Liste des ignore:\n"
+
+#: src/common/command.c:1434
+msgid "No ignore defined.\n"
+msgstr "Aucun ignore défini.\n"
+
+#: src/common/command.c:1460
+msgid "New ignore:"
+msgstr "Nouveau ignore:"
+
+#: src/common/command.c:1479
msgid "New key binding:\n"
msgstr "Nouvelle touche:\n"
-#: src/common/command.c:1399
+#: src/common/command.c:1512
msgid "Key bindings:\n"
msgstr "Associations de touches:\n"
-#: src/common/command.c:1411
+#: src/common/command.c:1524
#, c-format
msgid "Key \"%s\" unbinded\n"
msgstr "Touche \"%s\" supprimée\n"
-#: src/common/command.c:1416
+#: src/common/command.c:1529
#, c-format
msgid "%s unable to unbind key \"%s\"\n"
msgstr "%s impossible de supprimer la touche \"%s\"\n"
-#: src/common/command.c:1424 src/common/weechat.c:324
+#: src/common/command.c:1537 src/common/weechat.c:396
#, c-format
msgid "Internal key functions:\n"
msgstr "Fonctions internes pour les touches:\n"
-#: src/common/command.c:1443
+#: src/common/command.c:1556
msgid "Default key bindings restored\n"
msgstr "Touches par défaut restaurées\n"
-#: src/common/command.c:1449
+#: src/common/command.c:1562
#, c-format
msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
msgstr ""
"%s le paramètre \"-yes\" est requis pour la réinitialisation des touches "
"(raison de sécurité)\n"
-#: src/common/command.c:1505 src/common/command.c:1648
-#: src/common/command.c:1791
+#: src/common/command.c:1618 src/common/command.c:1761
+#: src/common/command.c:1904
#, c-format
msgid "Registered %s scripts:\n"
msgstr "Scripts %s enregistrés :\n"
-#: src/common/command.c:1522 src/common/command.c:1545
-#: src/common/command.c:1568 src/common/command.c:1665
-#: src/common/command.c:1688 src/common/command.c:1711
-#: src/common/command.c:1808 src/common/command.c:1831
-#: src/common/command.c:1854
+#: src/common/command.c:1635 src/common/command.c:1658
+#: src/common/command.c:1681 src/common/command.c:1778
+#: src/common/command.c:1801 src/common/command.c:1824
+#: src/common/command.c:1921 src/common/command.c:1944
+#: src/common/command.c:1967
msgid " (none)\n"
msgstr " (aucun)\n"
-#: src/common/command.c:1527 src/common/command.c:1670
-#: src/common/command.c:1813
+#: src/common/command.c:1640 src/common/command.c:1783
+#: src/common/command.c:1926
#, c-format
msgid "%s message handlers:\n"
msgstr "Fonctions %s pour messages :\n"
-#: src/common/command.c:1536 src/common/command.c:1679
-#: src/common/command.c:1822
+#: src/common/command.c:1649 src/common/command.c:1792
+#: src/common/command.c:1935
#, c-format
msgid " IRC(%s) => %s(%s)\n"
msgstr " IRC(%s) => %s(%s)\n"
-#: src/common/command.c:1550 src/common/command.c:1693
-#: src/common/command.c:1836
+#: src/common/command.c:1663 src/common/command.c:1806
+#: src/common/command.c:1949
#, c-format
msgid "%s command handlers:\n"
msgstr "Commandes %s :\n"
-#: src/common/command.c:1559 src/common/command.c:1702
-#: src/common/command.c:1845
+#: src/common/command.c:1672 src/common/command.c:1815
+#: src/common/command.c:1958
#, c-format
msgid " Command /%s => %s(%s)\n"
msgstr " Commande /%s => %s(%s)\n"
-#: src/common/command.c:1619
+#: src/common/command.c:1732
msgid ""
"WeeChat was build without Perl support.\n"
"Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n"
@@ -2940,7 +3052,7 @@ msgstr ""
"Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le "
"script ./configure\n"
-#: src/common/command.c:1762
+#: src/common/command.c:1875
msgid ""
"WeeChat was build without Python support.\n"
"Please rebuild WeeChat with \"--enable-python\" option for ./configure "
@@ -2950,39 +3062,40 @@ msgstr ""
"Merci de reconstruire WeeChat avec l'option \"--enable-python\" pour le "
"script ./configure\n"
-#: src/common/command.c:1905
+#: src/common/command.c:2018
msgid ""
"WeeChat was build without Ruby support.\n"
"Please rebuild WeeChat with \"--enable-ruby\" option for ./configure script\n"
msgstr ""
"WeeChat a été construit sans le support Ruby.\n"
-"Merci de reconstruire WeeChat avec l'option \"--enable-ruby\" pour le script ./configure\n"
+"Merci de reconstruire WeeChat avec l'option \"--enable-ruby\" pour le "
+"script ./configure\n"
-#: src/common/command.c:1953
+#: src/common/command.c:2066
msgid "No server.\n"
msgstr "Pas de serveur.\n"
-#: src/common/command.c:1964
+#: src/common/command.c:2077
#, c-format
msgid "Server '%s' not found.\n"
msgstr "Serveur '%s' non trouvé.\n"
-#: src/common/command.c:1976
+#: src/common/command.c:2089
#, c-format
msgid "%s missing servername for \"%s\" command\n"
msgstr "%s il manque le nom du serveur pour la commande \"%s\"\n"
-#: src/common/command.c:1984
+#: src/common/command.c:2097
#, c-format
msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
msgstr "%s trop de paramètres pour la commande \"%s\", paramètres ignorés\n"
-#: src/common/command.c:2003
+#: src/common/command.c:2116
#, c-format
msgid "%s server \"%s\" not found for \"%s\" command\n"
msgstr "%s le serveur \"%s\" n'existe pas pour la commande \"%s\"\n"
-#: src/common/command.c:2011
+#: src/common/command.c:2124
#, c-format
msgid ""
"%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -2991,106 +3104,119 @@ msgstr ""
"%s vous ne pouvez pas supprimer le server \"%s\" car vous êtes connecté "
"dessus. Essayez /disconnect %s avant.\n"
-#: src/common/command.c:2027 src/common/command.c:2173
+#: src/common/command.c:2140 src/common/command.c:2286
msgid "Server"
msgstr "Serveur"
-#: src/common/command.c:2030
+#: src/common/command.c:2143
msgid "has been deleted\n"
msgstr "a été supprimé\n"
-#: src/common/command.c:2045
+#: src/common/command.c:2158
#, c-format
msgid "%s missing parameters for \"%s\" command\n"
msgstr "%s paramètres manquants pour la commande \"%s\"\n"
-#: src/common/command.c:2055
+#: src/common/command.c:2168
#, c-format
msgid "%s server \"%s\" already exists, can't create it!\n"
msgstr "%s le serveur \"%s\" existe déjà, impossible de le créer !\n"
-#: src/common/command.c:2084 src/common/command.c:2112
-#: src/common/command.c:2125 src/common/command.c:2151
+#: src/common/command.c:2197 src/common/command.c:2225
+#: src/common/command.c:2238 src/common/command.c:2264
#, c-format
msgid "%s missing password for \"%s\" parameter\n"
msgstr "%s mot de passe manquant pour le paramètre \"%s\"\n"
-#: src/common/command.c:2097
+#: src/common/command.c:2210
#, c-format
msgid "%s missing nick(s) for \"%s\" parameter\n"
msgstr "%s pseudo(s) manquant(s) pour le paramètre \"%s\"\n"
-#: src/common/command.c:2138
+#: src/common/command.c:2251
#, c-format
msgid "%s missing command for \"%s\" parameter\n"
msgstr "%s commande manquante pour le paramètre \"%s\"\n"
-#: src/common/command.c:2176
+#: src/common/command.c:2289
msgid "created\n"
msgstr "créé\n"
-#: src/common/command.c:2182
+#: src/common/command.c:2295
#, c-format
msgid "%s unable to create server\n"
msgstr "%s impossible de créer le serveur\n"
-#: src/common/command.c:2237
+#: src/common/command.c:2350
msgid "(unknown)"
msgstr "(inconnu)"
-#: src/common/command.c:2260
+#: src/common/command.c:2373
msgid "(password hidden) "
msgstr "(mot de passe caché) "
-#: src/common/command.c:2324
+#: src/common/command.c:2437
#, c-format
msgid "%s server \"%s\" not found\n"
msgstr "%s serveur \"%s\" non trouvé\n"
-#: src/common/command.c:2355 src/common/command.c:2401
+#: src/common/command.c:2468 src/common/command.c:2514
#, c-format
msgid "%s config option \"%s\" not found\n"
msgstr "%s option de configuration \"%s\" non trouvée\n"
-#: src/common/command.c:2360 src/common/command.c:2393
+#: src/common/command.c:2473 src/common/command.c:2506
#, c-format
msgid "%s incorrect value for option \"%s\"\n"
msgstr "%s valeur incorrecte pour l'option \"%s\"\n"
-#: src/common/command.c:2376
+#: src/common/command.c:2489
#, c-format
msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
msgstr "%s l'option \"%s\" ne peut pas être changée lorsque WeeChat tourne\n"
-#: src/common/command.c:2475
+#: src/common/command.c:2588
#, c-format
msgid "No config option found with \"%s\"\n"
msgstr "Aucune option de configuration trouvée avec \"%s\"\n"
-#: src/common/command.c:2478
+#: src/common/command.c:2591
msgid "No config option found\n"
msgstr "Aucune option de configuration trouvée\n"
-#: src/common/command.c:2484
+#: src/common/command.c:2597
#, c-format
msgid "config option(s) found with \"%s\"\n"
msgstr "option(s) de configuration trouvée(s) avec \"%s\"\n"
-#: src/common/command.c:2487
+#: src/common/command.c:2600
msgid "config option(s) found\n"
msgstr "option(s) de configuration trouvée(s)\n"
-#: src/common/command.c:2507
+#: src/common/command.c:2620
#, c-format
msgid "%s alias or command \"%s\" not found\n"
msgstr "%s alias ou commande \"%s\" non trouvé\n"
-#: src/common/command.c:2517
+#: src/common/command.c:2630
#, c-format
msgid "Alias \"%s\" removed\n"
msgstr "Alias \"%s\" supprimé\n"
-#: src/common/command.c:2537
+#: src/common/command.c:2683
+msgid "ignore were removed.\n"
+msgstr "ignore ont été supprimés.\n"
+
+#: src/common/command.c:2685
+msgid "ignore was removed.\n"
+msgstr "ignore a été supprimé.\n"
+
+#: src/common/command.c:2690
+#, c-format
+msgid "%s no ignore found\n"
+msgstr "%s aucun ignore trouvé\n"
+
+#: src/common/command.c:2713
msgid "Opened windows:\n"
msgstr "Fenêtres ouvertes:\n"
@@ -3153,7 +3279,7 @@ msgstr "**** Début du log "
msgid "**** End of log "
msgstr "**** Fin du log "
-#: src/common/weechat.c:198
+#: src/common/weechat.c:270
#, c-format
msgid ""
"WeeChat configuration options (~/.weechat/weechat.rc):\n"
@@ -3162,47 +3288,47 @@ msgstr ""
"Options de configuration de WeeChat (~/.weechat/weechat.rc):\n"
"\n"
-#: src/common/weechat.c:211
+#: src/common/weechat.c:283
#, c-format
msgid " . type boolean (values: 'on' or 'off')\n"
msgstr " . type booléen (valeurs: 'on' ou 'off')\n"
-#: src/common/weechat.c:212 src/common/weechat.c:235 src/common/weechat.c:241
-#: src/common/weechat.c:247
+#: src/common/weechat.c:284 src/common/weechat.c:307 src/common/weechat.c:313
+#: src/common/weechat.c:319
#, c-format
msgid " . default value: '%s'\n"
msgstr " . valeur par défaut: '%s'\n"
-#: src/common/weechat.c:217
+#: src/common/weechat.c:289
#, c-format
msgid " . type integer (values: between %d and %d)\n"
msgstr " . type entier (valeurs: entre %d et %d)\n"
-#: src/common/weechat.c:220
+#: src/common/weechat.c:292
#, c-format
msgid " . default value: %d\n"
msgstr " . valeur par défaut: %d\n"
-#: src/common/weechat.c:224
+#: src/common/weechat.c:296
#, c-format
msgid " . type string (values: "
msgstr " . type chaîne (valeurs: "
-#: src/common/weechat.c:237 src/common/weechat.c:243 src/common/weechat.c:249
+#: src/common/weechat.c:309 src/common/weechat.c:315 src/common/weechat.c:321
msgid "empty"
msgstr "vide"
-#: src/common/weechat.c:240
+#: src/common/weechat.c:312
#, c-format
msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n"
msgstr " . type couleur (couleur Curses ou Gtk, voir la doc WeeChat)\n"
-#: src/common/weechat.c:246
+#: src/common/weechat.c:318
#, c-format
msgid " . type string (any string)\n"
msgstr " . type chaîne (toute chaîne)\n"
-#: src/common/weechat.c:252
+#: src/common/weechat.c:324
#, c-format
msgid ""
" . description: %s\n"
@@ -3211,7 +3337,7 @@ msgstr ""
" . description: %s\n"
"\n"
-#: src/common/weechat.c:258
+#: src/common/weechat.c:330
#, c-format
msgid ""
"Moreover, you can define aliases in [alias] section, by adding lines like:\n"
@@ -3219,7 +3345,7 @@ msgstr ""
"De plus, vous pouvez définir des alias dans la section [alias], en ajoutant "
"des lignes comme :\n"
-#: src/common/weechat.c:260
+#: src/common/weechat.c:332
#, c-format
msgid ""
"where 'j' is alias name, and 'join' associated command.\n"
@@ -3228,62 +3354,62 @@ msgstr ""
"où 'j' est le nom de l'alias, et 'join' la commande associée.\n"
"\n"
-#: src/common/weechat.c:345
+#: src/common/weechat.c:417
#, c-format
msgid "%s default keys:\n"
msgstr "Touches par défaut %s:\n"
-#: src/common/weechat.c:425
+#: src/common/weechat.c:497
#, c-format
msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
msgstr "%s syntaxe invalide pour le serveur IRC ('%s'), ignoré\n"
-#: src/common/weechat.c:438
+#: src/common/weechat.c:510
#, c-format
msgid "%s unable to create server ('%s'), ignored\n"
msgstr "%s impossible de créer le serveur ('%s'), ignoré\n"
-#: src/common/weechat.c:447
+#: src/common/weechat.c:519
#, c-format
msgid "%s unknown parameter '%s', ignored\n"
msgstr "%s paramètre inconnu '%s', ignoré\n"
-#: src/common/weechat.c:467
+#: src/common/weechat.c:539
#, c-format
msgid "%s cannot create directory \"%s\"\n"
msgstr "%s impossible de créer le répertoire \"%s\"\n"
-#: src/common/weechat.c:493
+#: src/common/weechat.c:565
#, c-format
msgid "%s unable to get HOME directory\n"
msgstr "%s impossible de lire le répertoire personnel\n"
-#: src/common/weechat.c:502
+#: src/common/weechat.c:574
#, c-format
msgid "%s not enough memory for home directory\n"
msgstr "%s pas assez de mémoire pour le répertoire personnel\n"
-#: src/common/weechat.c:512
+#: src/common/weechat.c:584
#, c-format
msgid "%s unable to create ~/.weechat directory\n"
msgstr "%s impossible de créer le répertoire ~/.weechat\n"
-#: src/common/weechat.c:564
+#: src/common/weechat.c:636
#, c-format
msgid "%s unable to create ~/.weechat/logs directory\n"
msgstr "%s impossible de créer le répertoire ~/.weechat/logs\n"
-#: src/common/weechat.c:607
+#: src/common/weechat.c:679
#, c-format
msgid "%s unable to create/append to log file (~/.weechat/%s)"
msgstr "%s impossible de créer/ajouter dans le fichier de log (~/.weechat/%s)"
-#: src/common/weechat.c:630
+#: src/common/weechat.c:702
#, c-format
msgid "%sWelcome to "
msgstr "%sBienvenue dans "
-#: src/common/weechat.c:643 src/common/weechat.c:652
+#: src/common/weechat.c:715 src/common/weechat.c:724
msgid "compiled on"
msgstr "compilé le"
@@ -3295,33 +3421,33 @@ msgstr "Erreur WeeChat:"
msgid "WeeChat Warning:"
msgstr "Avertissement WeeChat:"
-#: src/common/weeconfig.c:90 src/common/weeconfig.c:91
+#: src/common/weeconfig.c:91 src/common/weeconfig.c:92
msgid "set title for window (terminal for Curses GUI) with name & version"
msgstr ""
"définit le titre de la fenêtre (terminal pour l'interface Curses) avec le "
"nom et la version"
-#: src/common/weeconfig.c:94 src/common/weeconfig.c:95
+#: src/common/weeconfig.c:95 src/common/weeconfig.c:96
msgid "display WeeChat logo at startup"
msgstr "afficher le logo WeeChat au démarrage"
-#: src/common/weeconfig.c:98 src/common/weeconfig.c:99
+#: src/common/weeconfig.c:99 src/common/weeconfig.c:100
msgid "display WeeChat version at startup"
msgstr "afficher la version de WeeChat au démarrage"
-#: src/common/weeconfig.c:102
+#: src/common/weeconfig.c:103
msgid "WeeChat slogan"
msgstr "slogan WeeChat"
-#: src/common/weeconfig.c:103
+#: src/common/weeconfig.c:104
msgid "WeeChat slogan (if empty, slogan is not used)"
msgstr "slogan WeeChat (si vide, le slogan ne sera pas utilisé)"
-#: src/common/weeconfig.c:106
+#: src/common/weeconfig.c:107
msgid "charset for decoding messages from server"
msgstr "jeu de caractères pour décoder les messages du serveur"
-#: src/common/weeconfig.c:107
+#: src/common/weeconfig.c:108
msgid ""
"charset for decoding messages from server, examples: UTF-8, ISO-8859-1 (if "
"empty, messages are not converted)"
@@ -3329,11 +3455,11 @@ msgstr ""
"jeu de caractères pour décoder les messages du serveur, exemples: UTF-8, ISO-"
"8859-1 (si non renseigné, les messages ne sont pas convertis)"
-#: src/common/weeconfig.c:110
+#: src/common/weeconfig.c:111
msgid "charset for encoding messages sent to server"
msgstr "jeu de caractères pour encoder les messages envoyés au serveur"
-#: src/common/weeconfig.c:111
+#: src/common/weeconfig.c:112
msgid ""
"charset for encoding messages sent to server, examples: UFT-8, ISO-8859-1 "
"(if empty, local charset is used)"
@@ -3341,11 +3467,11 @@ msgstr ""
"jeu de caractères pour encoder les messages envoyés au serveur, exemples: "
"UFT-8, ISO-8859-1 (si non renseigné, le jeu de caractères local est utilisé)"
-#: src/common/weeconfig.c:114
+#: src/common/weeconfig.c:115
msgid "internal WeeChat charset (should be ISO)"
msgstr "jeu de caractères interne à WeeChat (devrait être ISO)"
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:116
msgid ""
"internal WeeChat charset, should be ISO-xxxx even if locale is UTF-8 (if "
"empty, local charset is used)"
@@ -3353,45 +3479,45 @@ msgstr ""
"jeu de caractères interne à WeeChat, devrait être ISO-xxxx même si la locale "
"est UTF-8 (si non renseigné, le jeu de caractères local est utilisé)"
-#: src/common/weeconfig.c:118 src/common/weeconfig.c:119
+#: src/common/weeconfig.c:119 src/common/weeconfig.c:120
msgid "timestamp for buffers"
msgstr "horodatage pour les tampons"
-#: src/common/weeconfig.c:122 src/common/weeconfig.c:123
+#: src/common/weeconfig.c:123 src/common/weeconfig.c:124
msgid "display nick names with different colors"
msgstr "afficher les utilisateurs avec différentes couleurs"
-#: src/common/weeconfig.c:126 src/common/weeconfig.c:127
+#: src/common/weeconfig.c:127 src/common/weeconfig.c:128
msgid "display actions with different colors"
msgstr "afficher les actions avec différentes couleurs"
-#: src/common/weeconfig.c:130 src/common/weeconfig.c:131
+#: src/common/weeconfig.c:131 src/common/weeconfig.c:132
msgid "remove colors from incoming messages"
msgstr "supprimer les couleurs dans les messages entrants"
-#: src/common/weeconfig.c:134
+#: src/common/weeconfig.c:135
msgid "display nicklist window"
msgstr "afficher la fenêtre des utilisateurs"
-#: src/common/weeconfig.c:135
+#: src/common/weeconfig.c:136
msgid "display nicklist window (for channel windows)"
msgstr "afficher la fenêtre des utilisateurs (pour les fenêtres de canaux)"
-#: src/common/weeconfig.c:138
+#: src/common/weeconfig.c:139
msgid "nicklist position"
msgstr "position de la fenêtre d'utilisateurs"
-#: src/common/weeconfig.c:139
+#: src/common/weeconfig.c:140
msgid "nicklist position (top, left, right (default), bottom)"
msgstr ""
"position de la fenêtre d'utilisateurs (haut (top), gauche (left), droite "
"(right, par défaut), bas (bottom))"
-#: src/common/weeconfig.c:142
+#: src/common/weeconfig.c:143
msgid "min size for nicklist"
msgstr "taille minimum pour la fenêtre d'utilisateurs"
-#: src/common/weeconfig.c:143
+#: src/common/weeconfig.c:144
msgid ""
"min size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no min size))"
@@ -3399,11 +3525,11 @@ msgstr ""
"taille minimum pour la fenêtre d'utilisateurs (largeur ou hauteur, selon "
"look_nicklist_position (0 = pas de taille minimum))"
-#: src/common/weeconfig.c:147
+#: src/common/weeconfig.c:148
msgid "max size for nicklist"
msgstr "taille maximum pour la fenêtre d'utilisateurs"
-#: src/common/weeconfig.c:148
+#: src/common/weeconfig.c:149
msgid ""
"max size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no max size; if min == max and > 0, then size is fixed))"
@@ -3412,43 +3538,43 @@ msgstr ""
"look_nicklist_position (0 = pas de taille maximum; si min == max et > 0, "
"alors la taille est fixe))"
-#: src/common/weeconfig.c:152 src/common/weeconfig.c:153
+#: src/common/weeconfig.c:153 src/common/weeconfig.c:154
msgid "text to display instead of nick when not connected"
msgstr ""
"texte à afficher en lieu et place du nom d'utilisateur lorsque la connexion "
"n'est pas active"
-#: src/common/weeconfig.c:156 src/common/weeconfig.c:157
+#: src/common/weeconfig.c:157 src/common/weeconfig.c:158
msgid "display nick mode ((half)op/voice) before each nick"
msgstr ""
"afficher le mode de l'utilisateur ((half)op/voice) devant chaque utilisateur"
-#: src/common/weeconfig.c:160 src/common/weeconfig.c:161
+#: src/common/weeconfig.c:161 src/common/weeconfig.c:162
msgid "display space if nick mode is not (half)op/voice"
msgstr "afficher un espace si le mode utilisateur n'est pas (half)op/voice"
-#: src/common/weeconfig.c:164 src/common/weeconfig.c:165
+#: src/common/weeconfig.c:165 src/common/weeconfig.c:166
msgid "the string inserted after nick completion"
msgstr "la chaîne affichée après la complétion des utilisateurs"
-#: src/common/weeconfig.c:168 src/common/weeconfig.c:169
+#: src/common/weeconfig.c:169 src/common/weeconfig.c:170
msgid "enable info bar"
msgstr "active la barre d'infos"
-#: src/common/weeconfig.c:172 src/common/weeconfig.c:173
+#: src/common/weeconfig.c:173 src/common/weeconfig.c:174
msgid "timestamp for time in infobar"
msgstr "horodatage pour les conversations sauvegardées"
-#: src/common/weeconfig.c:176 src/common/weeconfig.c:177
+#: src/common/weeconfig.c:177 src/common/weeconfig.c:178
msgid "display seconds in infobar time"
msgstr "afficher les secondes pour l'heure dans la barre d'infos"
-#: src/common/weeconfig.c:180
+#: src/common/weeconfig.c:181
msgid "delay (in seconds) for highlight messages in infobar"
msgstr ""
"délai (en seconds) pour la notification des messages dans la barre d'infos"
-#: src/common/weeconfig.c:181
+#: src/common/weeconfig.c:182
msgid ""
"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
"notifications in infobar)"
@@ -3456,280 +3582,280 @@ msgstr ""
"délai (en secondes) pour la notification des messages dans la barre d'infos "
"(0 = désactiver les notifications dans la barre d'infos)"
-#: src/common/weeconfig.c:243 src/common/weeconfig.c:244
+#: src/common/weeconfig.c:244 src/common/weeconfig.c:245
msgid "color for title bar"
msgstr "couleur pour la barre de titre"
-#: src/common/weeconfig.c:247 src/common/weeconfig.c:248
+#: src/common/weeconfig.c:248 src/common/weeconfig.c:249
msgid "background for title bar"
msgstr "couleur de fond pour la barre de titre"
-#: src/common/weeconfig.c:253 src/common/weeconfig.c:254
+#: src/common/weeconfig.c:254 src/common/weeconfig.c:255
msgid "color for chat text"
msgstr "couleur pour le texte de discussion"
-#: src/common/weeconfig.c:257
+#: src/common/weeconfig.c:258
msgid "color for time"
msgstr "couleur pour l'heure"
-#: src/common/weeconfig.c:258
+#: src/common/weeconfig.c:259
msgid "color for time in chat window"
msgstr "couleur pour l'heure dans la fenêtre de discussion"
-#: src/common/weeconfig.c:261
+#: src/common/weeconfig.c:262
msgid "color for time separator"
msgstr "couleur pour le séparateur de l'heure"
-#: src/common/weeconfig.c:262
+#: src/common/weeconfig.c:263
msgid "color for time separator (chat window)"
msgstr "couleur pour la séparation de l'heure (fenêtre de discussion)"
-#: src/common/weeconfig.c:265 src/common/weeconfig.c:266
+#: src/common/weeconfig.c:266 src/common/weeconfig.c:267
msgid "color for 1st and 3rd char of prefix"
msgstr "couleur pour le 1er et le 3ème caractère du préfixe"
-#: src/common/weeconfig.c:269 src/common/weeconfig.c:270
+#: src/common/weeconfig.c:270 src/common/weeconfig.c:271
msgid "color for middle char of prefix"
msgstr "couleur pour le caractère du milieu du préfixe"
-#: src/common/weeconfig.c:273 src/common/weeconfig.c:274
+#: src/common/weeconfig.c:274 src/common/weeconfig.c:275
msgid "color for join arrow (prefix)"
msgstr "couleur pour la flèche du join (préfixe)"
-#: src/common/weeconfig.c:277 src/common/weeconfig.c:278
+#: src/common/weeconfig.c:278 src/common/weeconfig.c:279
msgid "color for part/quit arrow (prefix)"
msgstr "couleur pour la flèche du part/quit (préfixe)"
-#: src/common/weeconfig.c:281
+#: src/common/weeconfig.c:282
msgid "color for nicks in actions"
msgstr "couleur pour les noms d'utilisateur dans les actions"
-#: src/common/weeconfig.c:282
+#: src/common/weeconfig.c:283
msgid "color for nicks in actions (chat window)"
msgstr ""
"couleur pour les noms d'utilisateurs dans les actions (fenêtre de discussion)"
-#: src/common/weeconfig.c:285
+#: src/common/weeconfig.c:286
msgid "color for hostnames"
msgstr "couleur pour les noms de machines"
-#: src/common/weeconfig.c:286
+#: src/common/weeconfig.c:287
msgid "color for hostnames (chat window)"
msgstr "couleur pour les noms de machines (fenêtre de discussion)"
-#: src/common/weeconfig.c:289
+#: src/common/weeconfig.c:290
msgid "color for channel names in actions"
msgstr "couleur pour les canaux dans les actions"
-#: src/common/weeconfig.c:290
+#: src/common/weeconfig.c:291
msgid "color for channel names in actions (chat window)"
msgstr "couleur pour les canaux dans les actions (fenêtre de discussion)"
-#: src/common/weeconfig.c:293
+#: src/common/weeconfig.c:294
msgid "color for dark separators"
msgstr "couleur pour les séparateurs sombres"
-#: src/common/weeconfig.c:294
+#: src/common/weeconfig.c:295
msgid "color for dark separators (chat window)"
msgstr "couleur pour les séparateurs sombres (fenêtre de discussion)"
-#: src/common/weeconfig.c:297
+#: src/common/weeconfig.c:298
msgid "color for highlighted nick"
msgstr "couleur pour le pseudo surligné"
-#: src/common/weeconfig.c:298
+#: src/common/weeconfig.c:299
msgid "color for highlighted nick (chat window)"
msgstr "couleur pour le pseudo surligné (fenêtre de discussion)"
-#: src/common/weeconfig.c:301
+#: src/common/weeconfig.c:302
msgid "background for chat"
msgstr "couleur de fond pour la discussion"
-#: src/common/weeconfig.c:302
+#: src/common/weeconfig.c:303
msgid "background for chat window"
msgstr "couleur de fond pour la fenêtre de discussion"
-#: src/common/weeconfig.c:307 src/common/weeconfig.c:308
+#: src/common/weeconfig.c:308 src/common/weeconfig.c:309
msgid "color for status bar"
msgstr "couleur pour la barre de statut"
-#: src/common/weeconfig.c:311 src/common/weeconfig.c:312
+#: src/common/weeconfig.c:312 src/common/weeconfig.c:313
msgid "color for status bar delimiters"
msgstr "couleur pour les délimiteurs de la barre de statut"
-#: src/common/weeconfig.c:315
+#: src/common/weeconfig.c:316
msgid "color for window with new messages"
msgstr "couleur pour une fenêtre avec de nouvelles infos"
-#: src/common/weeconfig.c:316
+#: src/common/weeconfig.c:317
msgid "color for window with new messages (status bar)"
msgstr "couleur pour une fenêtre avec de nouvelles infos (barre de statut)"
-#: src/common/weeconfig.c:319
+#: src/common/weeconfig.c:320
msgid "color for window with private message"
msgstr "couleur pour une fenêtre avec un message privé"
-#: src/common/weeconfig.c:320
+#: src/common/weeconfig.c:321
msgid "color for window with private message (status bar)"
msgstr "couleur pour une fenêtre avec un message privé (barre de statut)"
-#: src/common/weeconfig.c:323
+#: src/common/weeconfig.c:324
msgid "color for window with highlight"
msgstr "couleur pour une fenêtre avec un highlight"
-#: src/common/weeconfig.c:324
+#: src/common/weeconfig.c:325
msgid "color for window with highlight (status bar)"
msgstr "couleur pour une fenêtre avec un highlight (barre de statut)"
-#: src/common/weeconfig.c:327
+#: src/common/weeconfig.c:328
msgid "color for window with new data (not messages)"
msgstr "couleur pour une fenêtre avec des nouvelles données (pas des infos)"
-#: src/common/weeconfig.c:328
+#: src/common/weeconfig.c:329
msgid "color for window with new data (not messages) (status bar)"
msgstr ""
"couleur pour une fenêtre avec des nouvelles données (pas des infos) (barre "
"de statut)"
-#: src/common/weeconfig.c:331
+#: src/common/weeconfig.c:332
msgid "color for \"-MORE-\" text"
msgstr "couleur pour le texte \"-PLUS-\""
-#: src/common/weeconfig.c:332
+#: src/common/weeconfig.c:333
msgid "color for window with new data (status bar)"
msgstr "couleur pour une fenêtre avec des nouvelles données (barre de statut)"
-#: src/common/weeconfig.c:335 src/common/weeconfig.c:336
+#: src/common/weeconfig.c:336 src/common/weeconfig.c:337
msgid "background for status window"
msgstr "couleur de fond pour la fenêtre de statut"
-#: src/common/weeconfig.c:341 src/common/weeconfig.c:342
+#: src/common/weeconfig.c:342 src/common/weeconfig.c:343
msgid "color for info bar text"
msgstr "couleur pour la barre d'infos"
-#: src/common/weeconfig.c:345 src/common/weeconfig.c:346
+#: src/common/weeconfig.c:346 src/common/weeconfig.c:347
msgid "color for infobar delimiters"
msgstr "couleur pour les délimiteurs de la barre d'infos"
-#: src/common/weeconfig.c:349 src/common/weeconfig.c:350
+#: src/common/weeconfig.c:350 src/common/weeconfig.c:351
msgid "color for info bar highlight notification"
msgstr "couleur pour la notification dans la barre d'infos"
-#: src/common/weeconfig.c:353 src/common/weeconfig.c:354
+#: src/common/weeconfig.c:354 src/common/weeconfig.c:355
msgid "background for info bar window"
msgstr "couleur de fond pour la fenêtre de barre d'infos"
-#: src/common/weeconfig.c:359 src/common/weeconfig.c:360
+#: src/common/weeconfig.c:360 src/common/weeconfig.c:361
msgid "color for input text"
msgstr "couleur pour le texte saisi"
-#: src/common/weeconfig.c:363 src/common/weeconfig.c:364
+#: src/common/weeconfig.c:364 src/common/weeconfig.c:365
msgid "color for input text (channel name)"
msgstr "couleur pour le texte saisi (nom du canal)"
-#: src/common/weeconfig.c:367 src/common/weeconfig.c:368
+#: src/common/weeconfig.c:368 src/common/weeconfig.c:369
msgid "color for input text (nick name)"
msgstr "couleur pour le texte saisi (pseudo)"
-#: src/common/weeconfig.c:371 src/common/weeconfig.c:372
+#: src/common/weeconfig.c:372 src/common/weeconfig.c:373
msgid "background for input window"
msgstr "couleur de fond pour la fenêtre de saisie"
-#: src/common/weeconfig.c:377 src/common/weeconfig.c:378
+#: src/common/weeconfig.c:378 src/common/weeconfig.c:379
msgid "color for nicknames"
msgstr "couleur pour les pseudos"
-#: src/common/weeconfig.c:381 src/common/weeconfig.c:382
+#: src/common/weeconfig.c:382 src/common/weeconfig.c:383
msgid "color for away nicknames"
msgstr "couleur pour les pseudos absents"
-#: src/common/weeconfig.c:385
+#: src/common/weeconfig.c:386
msgid "color for chan owner symbol"
msgstr "couleur pour le symbole du propriétaire du canal"
-#: src/common/weeconfig.c:386
+#: src/common/weeconfig.c:387
msgid "color for chan owner symbol (specific to unrealircd)"
msgstr ""
"couleur pour le symbole du propriétaire du canal (spécifique à unrealircd)"
-#: src/common/weeconfig.c:389
+#: src/common/weeconfig.c:390
msgid "color for chan admin symbol"
msgstr "couleur pour le symbole administrateur du canal"
-#: src/common/weeconfig.c:390
+#: src/common/weeconfig.c:391
msgid "color for chan admin symbol (specific to unrealircd)"
msgstr ""
"couleur pour le symbole administrateur du canal (spécifique à unrealircd)"
-#: src/common/weeconfig.c:393 src/common/weeconfig.c:394
+#: src/common/weeconfig.c:394 src/common/weeconfig.c:395
msgid "color for operator symbol"
msgstr "couleur pour le symbole opérateur"
-#: src/common/weeconfig.c:397 src/common/weeconfig.c:398
+#: src/common/weeconfig.c:398 src/common/weeconfig.c:399
msgid "color for half-operator symbol"
msgstr "couleur pour le symbole demi-opérateur"
-#: src/common/weeconfig.c:401 src/common/weeconfig.c:402
+#: src/common/weeconfig.c:402 src/common/weeconfig.c:403
msgid "color for voice symbol"
msgstr "couleur pour le symbole voix"
-#: src/common/weeconfig.c:405 src/common/weeconfig.c:406
+#: src/common/weeconfig.c:406 src/common/weeconfig.c:407
msgid "color for '+' when scrolling nicks"
msgstr "couleur pour les '+' lors du scroll sur les pseudos"
-#: src/common/weeconfig.c:409 src/common/weeconfig.c:410
+#: src/common/weeconfig.c:410 src/common/weeconfig.c:411
msgid "color for nick separator"
msgstr "couleur pour le séparateur de pseudo"
-#: src/common/weeconfig.c:413 src/common/weeconfig.c:414
+#: src/common/weeconfig.c:414 src/common/weeconfig.c:415
msgid "color for local nick"
msgstr "couleur pour le pseudo local"
-#: src/common/weeconfig.c:417 src/common/weeconfig.c:418
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
msgid "color for other nick in private window"
msgstr "couleur pour l'autre pseudo dans la fenêtre privée"
-#: src/common/weeconfig.c:421 src/common/weeconfig.c:422
+#: src/common/weeconfig.c:422 src/common/weeconfig.c:423
msgid "background for nicknames"
msgstr "couleur de fond pour les pseudos"
-#: src/common/weeconfig.c:427
+#: src/common/weeconfig.c:428
msgid "color for selected DCC"
msgstr "couleur pour le DCC sélectionné"
-#: src/common/weeconfig.c:428
+#: src/common/weeconfig.c:429
msgid "color for selected DCC (chat window)"
msgstr "couleur pour le DCC sélectionné (fenêtre de discussion)"
-#: src/common/weeconfig.c:431 src/common/weeconfig.c:432
+#: src/common/weeconfig.c:432 src/common/weeconfig.c:433
msgid "color for \"waiting\" dcc status"
msgstr "couleur pour le statut dcc \"attente\""
-#: src/common/weeconfig.c:435 src/common/weeconfig.c:436
+#: src/common/weeconfig.c:436 src/common/weeconfig.c:437
msgid "color for \"connecting\" dcc status"
msgstr "couleur pour le statut dcc \"connexion\""
-#: src/common/weeconfig.c:439 src/common/weeconfig.c:440
+#: src/common/weeconfig.c:440 src/common/weeconfig.c:441
msgid "color for \"active\" dcc status"
msgstr "couleur pour le statut dcc \"actif\""
-#: src/common/weeconfig.c:443 src/common/weeconfig.c:444
+#: src/common/weeconfig.c:444 src/common/weeconfig.c:445
msgid "color for \"done\" dcc status"
msgstr "couleur pour le statut dcc \"terminé\""
-#: src/common/weeconfig.c:447 src/common/weeconfig.c:448
+#: src/common/weeconfig.c:448 src/common/weeconfig.c:449
msgid "color for \"failed\" dcc status"
msgstr "couleur pour le statut dcc \"échoué\""
-#: src/common/weeconfig.c:451 src/common/weeconfig.c:452
+#: src/common/weeconfig.c:452 src/common/weeconfig.c:453
msgid "color for \"aborted\" dcc status"
msgstr "couleur pour le statut dcc \"interrompu\""
-#: src/common/weeconfig.c:465
+#: src/common/weeconfig.c:466
msgid "max lines in history (per window)"
msgstr "nombre maxi de lignes dans l'historique (par fenêtre)"
-#: src/common/weeconfig.c:466
+#: src/common/weeconfig.c:467
msgid ""
"maximum number of lines in history for one server/channel/private window (0 "
"= unlimited)"
@@ -3737,350 +3863,350 @@ msgstr ""
"nombre maximum de lignes dans l'historique pour un serveur/fenêtre/fenêtre "
"privée (0 = sans limite)"
-#: src/common/weeconfig.c:470
+#: src/common/weeconfig.c:471
msgid "max user commands in history"
msgstr "nombre maxi de commandes utilisateur dans l'historique"
-#: src/common/weeconfig.c:471
+#: src/common/weeconfig.c:472
msgid "maximum number of user commands in history (0 = unlimited)"
msgstr ""
"nombre maximum de commandes utilisateur dans l'historique (0 = sans limite)"
-#: src/common/weeconfig.c:488 src/common/weeconfig.c:489
+#: src/common/weeconfig.c:489 src/common/weeconfig.c:490
msgid "automatically log server messages"
msgstr "enregistrer automatiquement les messages du serveur"
-#: src/common/weeconfig.c:492 src/common/weeconfig.c:493
+#: src/common/weeconfig.c:493 src/common/weeconfig.c:494
msgid "automatically log channel chats"
msgstr "enregistrer automatiquement les conversations des canaux"
-#: src/common/weeconfig.c:496 src/common/weeconfig.c:497
+#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
msgid "automatically log private chats"
msgstr "enregistrer automatiquement les conversations privées"
-#: src/common/weeconfig.c:500 src/common/weeconfig.c:501
+#: src/common/weeconfig.c:501 src/common/weeconfig.c:502
msgid "log messages from plugins (scripts)"
msgstr "enregistrer les messages des plugins (scripts)"
-#: src/common/weeconfig.c:504
+#: src/common/weeconfig.c:505
msgid "path for log files"
msgstr "chemin pour les conversations sauvegardées"
-#: src/common/weeconfig.c:505
+#: src/common/weeconfig.c:506
msgid "path for WeeChat log files"
msgstr "chemin pour les conversations sauvegardées par WeeChat"
-#: src/common/weeconfig.c:508
+#: src/common/weeconfig.c:509
msgid "timestamp for log"
msgstr "horodatage pour les conversations sauvegardées"
-#: src/common/weeconfig.c:509
+#: src/common/weeconfig.c:510
msgid "timestamp for log (see man strftime for date/time specifiers)"
msgstr ""
"horodatage pour les conversations sauvegardées (voir man strftime pour le "
"format de date/heure)"
-#: src/common/weeconfig.c:512 src/common/weeconfig.c:513
+#: src/common/weeconfig.c:513 src/common/weeconfig.c:514
msgid "hide password displayed by nickserv"
msgstr "masquer le mot de passe affiché par nickserv"
-#: src/common/weeconfig.c:533
+#: src/common/weeconfig.c:534
msgid "display message to all channels when away"
msgstr "affiche un message sur tous les canaux pour l'absence"
-#: src/common/weeconfig.c:534
+#: src/common/weeconfig.c:535
msgid "display message to all channels when (un)marking as away"
msgstr "affiche un message sur tous les canaux pour l'absence/le retour"
-#: src/common/weeconfig.c:537 src/common/weeconfig.c:538
+#: src/common/weeconfig.c:538 src/common/weeconfig.c:539
msgid "default message when away"
msgstr "message par défaut pour l'absence"
-#: src/common/weeconfig.c:541 src/common/weeconfig.c:542
+#: src/common/weeconfig.c:542 src/common/weeconfig.c:543
msgid "default part message (leaving channel)"
msgstr "message par défaut pour le part (quitte un canal)"
-#: src/common/weeconfig.c:545
+#: src/common/weeconfig.c:546
msgid "default quit message"
msgstr "message de fin par défaut"
-#: src/common/weeconfig.c:546
+#: src/common/weeconfig.c:547
msgid ""
"default quit message ('%v' will be replaced by WeeChat version in string)"
msgstr ""
"message de fin par défaut ('%v' sera remplacé par la version de WeeChat dans "
"la chaîne)"
-#: src/common/weeconfig.c:549
+#: src/common/weeconfig.c:550
msgid "interval between two checks for away"
msgstr "intervalle entre deux vérifications des absences"
-#: src/common/weeconfig.c:550
+#: src/common/weeconfig.c:551
msgid "interval between two checks for away (in minutes, 0 = never check)"
msgstr ""
"intervalle entre deux vérifications des absences (en minutes, 0 = ne jemais "
"vérifier)"
-#: src/common/weeconfig.c:553
+#: src/common/weeconfig.c:554
msgid "interval between two checks for lag"
msgstr "intervalle entre deux mesures de lag"
-#: src/common/weeconfig.c:554
+#: src/common/weeconfig.c:555
msgid "interval between two checks for lag (in seconds)"
msgstr "intervalle entre deux mesures de lag (en secondes)"
-#: src/common/weeconfig.c:557
+#: src/common/weeconfig.c:558
msgid "minimum lag to show"
msgstr "lag minimum à afficher"
-#: src/common/weeconfig.c:558
+#: src/common/weeconfig.c:559
msgid "minimum lag to show (in seconds)"
msgstr "lag minimum à afficher (en secondes)"
-#: src/common/weeconfig.c:561
+#: src/common/weeconfig.c:562
msgid "disconnect after important lag"
msgstr "déconnexion après un lag important"
-#: src/common/weeconfig.c:562
+#: src/common/weeconfig.c:563
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
msgstr ""
"déconnexion après un lag important (en minutes, 0 = ne jamais se déconnecter)"
-#: src/common/weeconfig.c:565 src/common/weeconfig.c:566
+#: src/common/weeconfig.c:566 src/common/weeconfig.c:567
msgid "create a FIFO pipe for remote control"
msgstr "créer un tube FIFO pour le contrôle à distance"
-#: src/common/weeconfig.c:569
+#: src/common/weeconfig.c:570
msgid "list of words to highlight"
msgstr "liste de mots pour la notification"
-#: src/common/weeconfig.c:570
+#: src/common/weeconfig.c:571
msgid ""
"comma separated list of words to highlight (case insensitive comparison)"
msgstr ""
"liste des mots pour la notification (séparés par des virgules, le "
"comparaison ne tient pas compte de la casse)"
-#: src/common/weeconfig.c:589
+#: src/common/weeconfig.c:590
msgid "automatically accept dcc files"
msgstr "accepte automatiquement les fichiers dcc"
-#: src/common/weeconfig.c:590
+#: src/common/weeconfig.c:591
msgid "automatically accept incoming dcc files"
msgstr "accepte automatiquement les fichiers dcc entrants"
-#: src/common/weeconfig.c:593
+#: src/common/weeconfig.c:594
msgid "automatically accept dcc chats"
msgstr "accepte automatiquement les demandes de discussion dcc"
-#: src/common/weeconfig.c:594
+#: src/common/weeconfig.c:595
msgid "automatically accept dcc chats (use carefully!)"
msgstr ""
"accepte automatiquement les demandes de discussion dcc (à utiliser avec "
"précaution !)"
-#: src/common/weeconfig.c:597
+#: src/common/weeconfig.c:598
msgid "timeout for dcc request"
msgstr "délai d'attente pour les requêtes dcc"
-#: src/common/weeconfig.c:598
+#: src/common/weeconfig.c:599
msgid "timeout for dcc request (in seconds)"
msgstr "délai d'attente pour les requêtes dcc (en secondes)"
-#: src/common/weeconfig.c:601
+#: src/common/weeconfig.c:602
msgid "block size for dcc packets"
msgstr "taille de bloc pour les paquets dcc"
-#: src/common/weeconfig.c:602
+#: src/common/weeconfig.c:603
msgid "block size for dcc packets in bytes (default: 65536)"
msgstr "taille de bloc pour les paquets dcc en octets (défaut: 65536)"
-#: src/common/weeconfig.c:605
+#: src/common/weeconfig.c:606
msgid "path for incoming files with dcc"
msgstr "chemin les fichiers reçus par dcc"
-#: src/common/weeconfig.c:606
+#: src/common/weeconfig.c:607
msgid "path for writing incoming files with dcc (default: user home)"
msgstr ""
"chemin pour écrire les fichiers reçus par dcc (par défaut: répertoire de "
"l'utilisateur)"
-#: src/common/weeconfig.c:609
+#: src/common/weeconfig.c:610
msgid "default path for sending files with dcc"
msgstr "chemin par défaut pour envoyer les fichiers par dcc"
-#: src/common/weeconfig.c:610
+#: src/common/weeconfig.c:611
msgid ""
"path for reading files when sending thru dcc (when no path is specified)"
msgstr ""
"chemin pour lire les fichiers lorsqu'ils sont envoyés par dcc (quand aucun "
"chemin n'est spécifié)"
-#: src/common/weeconfig.c:613 src/common/weeconfig.c:614
+#: src/common/weeconfig.c:614 src/common/weeconfig.c:615
msgid "convert spaces to underscores when sending files"
msgstr "convertir les espaces en underscores lors d'envoi de fichiers"
-#: src/common/weeconfig.c:617
+#: src/common/weeconfig.c:618
msgid "automatically rename dcc files if already exists"
msgstr "renomme automatiquement les fichiers dcc s'ils existent déjà"
-#: src/common/weeconfig.c:618
+#: src/common/weeconfig.c:619
msgid "rename incoming files if already exists (add '.1', '.2', ...)"
msgstr ""
"renommer les fichiers reçus s'ils existent déjà (ajoute '.1', '.2', ...)"
-#: src/common/weeconfig.c:621
+#: src/common/weeconfig.c:622
msgid "automatically resume aborted transfers"
msgstr "continuer automatiquement les transferts non terminés"
-#: src/common/weeconfig.c:622
+#: src/common/weeconfig.c:623
msgid ""
"automatically resume dcc transfer if connection with remote host is loosed"
msgstr ""
"continuer automatiquement les transferts dcc si la connexion avec la machine "
"distante a été perdue"
-#: src/common/weeconfig.c:641
+#: src/common/weeconfig.c:642
msgid "use proxy"
msgstr "utiliser un proxy"
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:643
msgid "use a proxy server to connect to irc server"
msgstr "utiliser un proxy pour se connecter au serveur irc"
-#: src/common/weeconfig.c:645
+#: src/common/weeconfig.c:646
msgid "proxy type"
msgstr "type de proxy"
-#: src/common/weeconfig.c:646
+#: src/common/weeconfig.c:647
msgid "proxy type (http (default), socks4, socks5)"
msgstr "type de proxy (http (défaut), socks4, socks5)"
-#: src/common/weeconfig.c:649
+#: src/common/weeconfig.c:650
msgid "use ipv6 proxy"
msgstr "utiliser un proxy ipv6"
-#: src/common/weeconfig.c:650
+#: src/common/weeconfig.c:651
msgid "connect to proxy in ipv6"
msgstr "se connecter au proxy en ipv6"
-#: src/common/weeconfig.c:653
+#: src/common/weeconfig.c:654
msgid "proxy address"
msgstr "adresse du proxy"
-#: src/common/weeconfig.c:654
+#: src/common/weeconfig.c:655
msgid "proxy server address (IP or hostname)"
msgstr "adresse du serveur proxy (IP ou nom)"
-#: src/common/weeconfig.c:657
+#: src/common/weeconfig.c:658
msgid "port for proxy"
msgstr "port pour le proxy"
-#: src/common/weeconfig.c:658
+#: src/common/weeconfig.c:659
msgid "port for connecting to proxy server"
msgstr "port pour se connecter au serveur proxy"
-#: src/common/weeconfig.c:661
+#: src/common/weeconfig.c:662
msgid "proxy username"
msgstr "nom d'utilisateur proxy"
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:663
msgid "username for proxy server"
msgstr "nom d'utilisateur pour le serveur proxy"
-#: src/common/weeconfig.c:665
+#: src/common/weeconfig.c:666
msgid "proxy password"
msgstr "mot de passe pour le proxy"
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:667
msgid "password for proxy server"
msgstr "mot de passe pour le serveur proxy"
-#: src/common/weeconfig.c:677
+#: src/common/weeconfig.c:678
msgid "server name"
msgstr "nom du serveur"
-#: src/common/weeconfig.c:678
+#: src/common/weeconfig.c:679
msgid "name associated to IRC server (for display only)"
msgstr "nom associé au serveur IRC (pour affichage seulement)"
-#: src/common/weeconfig.c:681
+#: src/common/weeconfig.c:682
msgid "automatically connect to server"
msgstr "connexion automatique au serveur"
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:683
msgid "automatically connect to server when WeeChat is starting"
msgstr "connexion automatique au serveur quand WeeChat démarre"
-#: src/common/weeconfig.c:685
+#: src/common/weeconfig.c:686
msgid "automatically reconnect to server"
msgstr "reconnexion automatique au serveur"
-#: src/common/weeconfig.c:686
+#: src/common/weeconfig.c:687
msgid "automatically reconnect to server when disconnected"
msgstr "reconnexion automatique au serveur après une déconnexion"
-#: src/common/weeconfig.c:689
+#: src/common/weeconfig.c:690
msgid "delay before trying again to reconnect"
msgstr "délai avant de tenter une reconnexion"
-#: src/common/weeconfig.c:690
+#: src/common/weeconfig.c:691
msgid "delay (in seconds) before trying again to reconnect to server"
msgstr "délai (en secondes) avant de tenter une reconnexion au serveur"
-#: src/common/weeconfig.c:693
+#: src/common/weeconfig.c:694
msgid "server address or hostname"
msgstr "adresse ou nom du serveur"
-#: src/common/weeconfig.c:694
+#: src/common/weeconfig.c:695
msgid "IP address or hostname of IRC server"
msgstr "adresse IP ou nom du serveur IRC"
-#: src/common/weeconfig.c:697
+#: src/common/weeconfig.c:698
msgid "port for IRC server"
msgstr "port pour le serveur IRC"
-#: src/common/weeconfig.c:698
+#: src/common/weeconfig.c:699
msgid "port for connecting to server"
msgstr "port pour se connecter au serveur"
-#: src/common/weeconfig.c:701 src/common/weeconfig.c:702
+#: src/common/weeconfig.c:702 src/common/weeconfig.c:703
msgid "use IPv6 protocol for server communication"
msgstr "utiliser le protocole IPv6 pour la communication avec le serveur"
-#: src/common/weeconfig.c:705 src/common/weeconfig.c:706
+#: src/common/weeconfig.c:706 src/common/weeconfig.c:707
msgid "use SSL for server communication"
msgstr "utiliser SSL pour la communication avec le serveur"
-#: src/common/weeconfig.c:709
+#: src/common/weeconfig.c:710
msgid "server password"
msgstr "mot de passe pour le serveur"
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:711
msgid "password for IRC server"
msgstr "mot de passe pour le serveur IRC"
-#: src/common/weeconfig.c:713
+#: src/common/weeconfig.c:714
msgid "nickname for server"
msgstr "pseudo pour le serveur"
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:715
msgid "nickname to use on IRC server"
msgstr "pseudo à utiliser sur le serveur IRC"
-#: src/common/weeconfig.c:717
+#: src/common/weeconfig.c:718
msgid "alternate nickname for server"
msgstr "pseudo alternatif pour le serveur"
-#: src/common/weeconfig.c:718
+#: src/common/weeconfig.c:719
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr "pseudo alternatif pour le serveur IRC (si le pseudo est déjà utilisé)"
-#: src/common/weeconfig.c:721
+#: src/common/weeconfig.c:722
msgid "2nd alternate nickname for server"
msgstr "2nd pseudo alternatif pour le serveur"
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:723
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
@@ -4088,31 +4214,31 @@ msgstr ""
"2nd pseudo alternatif pour le serveur IRC (si le pseudo alternatif est déjà "
"utilisé)"
-#: src/common/weeconfig.c:725
+#: src/common/weeconfig.c:726
msgid "user name for server"
msgstr "nom d'utilisateur pour le serveur"
-#: src/common/weeconfig.c:726
+#: src/common/weeconfig.c:727
msgid "user name to use on IRC server"
msgstr "nom d'utilisateur pour le serveur IRC"
-#: src/common/weeconfig.c:729
+#: src/common/weeconfig.c:730
msgid "real name for server"
msgstr "nom réel pour le serveur"
-#: src/common/weeconfig.c:730
+#: src/common/weeconfig.c:731
msgid "real name to use on IRC server"
msgstr "nom réel pour le serveur IRC"
-#: src/common/weeconfig.c:733 src/common/weeconfig.c:734
+#: src/common/weeconfig.c:734 src/common/weeconfig.c:735
msgid "first command to run when connected to server"
msgstr "commande à exécuter en premier lorsque connecté au serveur"
-#: src/common/weeconfig.c:737
+#: src/common/weeconfig.c:738
msgid "delay (in seconds) after command was executed"
msgstr "délai (en secondes) après exécution de la commande"
-#: src/common/weeconfig.c:738
+#: src/common/weeconfig.c:739
msgid ""
"delay (in seconds) after command was executed (example: give some time for "
"authentication)"
@@ -4120,11 +4246,11 @@ msgstr ""
"délai (en secondes) après exécution de la commande (exemple: donner du temps "
"pour l'authentification)"
-#: src/common/weeconfig.c:741
+#: src/common/weeconfig.c:742
msgid "list of channels to join when connected to server"
msgstr "liste des canaux à rejoindre lorsque connecté au serveur"
-#: src/common/weeconfig.c:742
+#: src/common/weeconfig.c:743
msgid ""
"comma separated list of channels to join when connected to server (example: "
"\"#chan1,#chan2,#chan3 #key1,#key2\")"
@@ -4132,15 +4258,15 @@ msgstr ""
"liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au "
"serveur (exemple: \"#chan1,#chan2,#chan3 #key1,#key2\")"
-#: src/common/weeconfig.c:745 src/common/weeconfig.c:746
+#: src/common/weeconfig.c:746 src/common/weeconfig.c:747
msgid "automatically rejoin channels when kicked"
msgstr "rejoindre automatiquement les canaux quand mis dehors"
-#: src/common/weeconfig.c:749
+#: src/common/weeconfig.c:750
msgid "notify levels for channels of this server"
msgstr "niveaux de notification pour les canaux de ce serveur"
-#: src/common/weeconfig.c:750
+#: src/common/weeconfig.c:751
msgid ""
"comma separated list of notify levels for channels of this server (format: "
"#channel:1,..)"
@@ -4148,64 +4274,69 @@ msgstr ""
"liste des niveaux de notifications (séparés par des virgules) pour les "
"canaux de ce serveur (format: #canal:1,..)"
-#: src/common/weeconfig.c:1210
+#: src/common/weeconfig.c:1211
#, c-format
msgid "%s %s, line %d: new server, but previous was incomplete\n"
msgstr "%s %s, ligne %d: nouveau serveur, mais le précédent était incomplet\n"
-#: src/common/weeconfig.c:1219
+#: src/common/weeconfig.c:1220
#, c-format
msgid "%s %s, line %d: server '%s' already exists\n"
msgstr "%s %s, ligne %d: le serveur '%s' existe déjà\n"
-#: src/common/weeconfig.c:1234
+#: src/common/weeconfig.c:1235
#, c-format
msgid "%s %s, line %d: unable to create server\n"
msgstr "%s %s, ligne %d: impossible de créer le serveur\n"
-#: src/common/weeconfig.c:1274
+#: src/common/weeconfig.c:1275
#, c-format
msgid "%s unable to assign default int with string (\"%s\")\n"
msgstr ""
"%s impossible d'assigner la valeur entière par défaut avec la chaîne (\"%s"
"\")\n"
-#: src/common/weeconfig.c:1285
+#: src/common/weeconfig.c:1286
#, c-format
msgid "%s unable to assign default color (\"%s\")\n"
msgstr "%s impossible d'assigner la couleur par défaut (\"%s\")\n"
-#: src/common/weeconfig.c:1324
+#: src/common/weeconfig.c:1325
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr "%s fichier de configuration \"%s\" non trouvé.\n"
-#: src/common/weeconfig.c:1356
+#: src/common/weeconfig.c:1357
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"]\"\n"
-#: src/common/weeconfig.c:1373
+#: src/common/weeconfig.c:1374
#, c-format
msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
msgstr "%s %s, ligne %d: section inconnue (\"%s\")\n"
-#: src/common/weeconfig.c:1391
+#: src/common/weeconfig.c:1392
#, c-format
msgid "%s %s, line %d: invalid section for option, line is ignored\n"
msgstr "%s %s, ligne %d: section invalide pour l'option, ligne ignorée\n"
-#: src/common/weeconfig.c:1399
+#: src/common/weeconfig.c:1400
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"=\"\n"
-#: src/common/weeconfig.c:1447
+#: src/common/weeconfig.c:1437 src/common/weeconfig.c:1463
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr "%s %s, ligne %d: option \"%s\" invalide\n"
-#: src/common/weeconfig.c:1458
+#: src/common/weeconfig.c:1443
+#, c-format
+msgid "%s %s, line %d: invalid ignore options \"%s\"\n"
+msgstr "%s %s, ligne %d: options \"%s\" invalides pour le ignore\n"
+
+#: src/common/weeconfig.c:1474
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
@@ -4214,7 +4345,7 @@ msgstr ""
"%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
"Attendu: valeur booléenne: 'off' ou 'on'\n"
-#: src/common/weeconfig.c:1467
+#: src/common/weeconfig.c:1483
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -4223,7 +4354,7 @@ msgstr ""
"%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
"Attendu: entier compris entre %d et %d\n"
-#: src/common/weeconfig.c:1478
+#: src/common/weeconfig.c:1494
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -4232,26 +4363,26 @@ msgstr ""
"%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
"Attendu: une de ces chaînes: "
-#: src/common/weeconfig.c:1494
+#: src/common/weeconfig.c:1510
#, c-format
msgid "%s %s, line %d: invalid color name for option '%s'\n"
msgstr "%s %s, ligne %d: nom de couleur invalide pour l'option '%s'\n"
-#: src/common/weeconfig.c:1556 src/common/weeconfig.c:1751
+#: src/common/weeconfig.c:1572 src/common/weeconfig.c:1767
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr "%s impossible de créer le fichier \"%s\"\n"
-#: src/common/weeconfig.c:1562
+#: src/common/weeconfig.c:1578
#, c-format
msgid "%s: creating default config file...\n"
msgstr "%s: création du fichier de configuration par défaut...\n"
-#: src/common/weeconfig.c:1563
+#: src/common/weeconfig.c:1579
msgid "Creating default config file\n"
msgstr "Création du fichier de configuration par défaut\n"
-#: src/common/weeconfig.c:1566 src/common/weeconfig.c:1760
+#: src/common/weeconfig.c:1582 src/common/weeconfig.c:1776
#, c-format
msgid ""
"#\n"
@@ -4260,6 +4391,15 @@ msgstr ""
"#\n"
"# %s: fichier de configuration, créé par %s v%s le %s#\n"
-#: src/common/weeconfig.c:1757
+#: src/common/weeconfig.c:1773
msgid "Saving config to disk\n"
msgstr "Sauvegarde de la configuration sur disque\n"
+
+#~ msgid "Ignore:\n"
+#~ msgstr "Ignore:\n"
+
+#~ msgid "IRC command"
+#~ msgstr "commande IRC"
+
+#~ msgid "channel"
+#~ msgstr "canal"
diff --git a/po/weechat.pot b/po/weechat.pot
index 6c0ba3253..6f9ced29f 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-08-21 14:31+0200\n"
+"POT-Creation-Date: 2005-09-04 14:45+0200\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"
@@ -15,12 +15,12 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-nick.c:193
+#: src/irc/irc-nick.c:192
#, c-format
msgid "%s cannot allocate new nick\n"
msgstr ""
-#: src/irc/irc-server.c:180 src/common/weeconfig.c:1697
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1712
msgid "Unable to get user's name"
msgstr ""
@@ -107,63 +107,63 @@ msgid ""
"used)\n"
msgstr ""
-#: src/irc/irc-server.c:1360
+#: src/irc/irc-server.c:1364
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
msgstr ""
-#: src/irc/irc-server.c:1369
+#: src/irc/irc-server.c:1373
#, c-format
msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1375
+#: src/irc/irc-server.c:1379
#, c-format
msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1385
+#: src/irc/irc-server.c:1389
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1389
+#: src/irc/irc-server.c:1393
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1407
+#: src/irc/irc-server.c:1411
#, c-format
msgid "%s gnutls init error\n"
msgstr ""
-#: src/irc/irc-server.c:1422
+#: src/irc/irc-server.c:1426
#, c-format
msgid "%s cannot create pipe\n"
msgstr ""
-#: src/irc/irc-server.c:1437
+#: src/irc/irc-server.c:1441
#, c-format
msgid "%s cannot create socket\n"
msgstr ""
-#: src/irc/irc-server.c:1448
+#: src/irc/irc-server.c:1452
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr ""
-#: src/irc/irc-server.c:1459
+#: src/irc/irc-server.c:1463
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr ""
-#: src/irc/irc-server.c:1490
+#: src/irc/irc-server.c:1494
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr ""
-#: src/irc/irc-server.c:1540 src/irc/irc-server.c:1549
+#: src/irc/irc-server.c:1544 src/irc/irc-server.c:1553
msgid "Disconnected from server!\n"
msgstr ""
@@ -851,355 +851,355 @@ msgstr ""
#: src/irc/irc-commands.c:317 src/irc/irc-commands.c:318
#: src/irc/irc-commands.c:319 src/irc/irc-commands.c:320
#: src/irc/irc-commands.c:321 src/irc/irc-commands.c:322
-#: src/irc/irc-commands.c:323 src/irc/irc-commands.c:367
+#: src/irc/irc-commands.c:323 src/irc/irc-commands.c:324
#: src/irc/irc-commands.c:368 src/irc/irc-commands.c:369
#: src/irc/irc-commands.c:370 src/irc/irc-commands.c:371
-#: src/irc/irc-commands.c:372
+#: src/irc/irc-commands.c:372 src/irc/irc-commands.c:373
+#: src/irc/irc-commands.c:473
msgid "a server message"
msgstr ""
-#: src/irc/irc-commands.c:324
+#: src/irc/irc-commands.c:325
msgid "away message"
msgstr ""
-#: src/irc/irc-commands.c:325
+#: src/irc/irc-commands.c:326
msgid "userhost"
msgstr ""
-#: src/irc/irc-commands.c:326
+#: src/irc/irc-commands.c:327
msgid "ison"
msgstr ""
-#: src/irc/irc-commands.c:327
+#: src/irc/irc-commands.c:328
msgid "unaway"
msgstr ""
-#: src/irc/irc-commands.c:328
+#: src/irc/irc-commands.c:329
msgid "now away"
msgstr ""
-#: src/irc/irc-commands.c:329
+#: src/irc/irc-commands.c:330
msgid "whois (registered nick)"
msgstr ""
-#: src/irc/irc-commands.c:330
+#: src/irc/irc-commands.c:331
msgid "whois (user)"
msgstr ""
-#: src/irc/irc-commands.c:331
+#: src/irc/irc-commands.c:332
msgid "whois (server)"
msgstr ""
-#: src/irc/irc-commands.c:332
+#: src/irc/irc-commands.c:333
msgid "whois (operator)"
msgstr ""
-#: src/irc/irc-commands.c:333
+#: src/irc/irc-commands.c:334
msgid "whowas"
msgstr ""
-#: src/irc/irc-commands.c:334
+#: src/irc/irc-commands.c:335
msgid "end of /who list"
msgstr ""
-#: src/irc/irc-commands.c:335
+#: src/irc/irc-commands.c:336
msgid "whois (idle)"
msgstr ""
-#: src/irc/irc-commands.c:336
+#: src/irc/irc-commands.c:337
msgid "whois (end)"
msgstr ""
-#: src/irc/irc-commands.c:337
+#: src/irc/irc-commands.c:338
msgid "whois (channels)"
msgstr ""
-#: src/irc/irc-commands.c:338
+#: src/irc/irc-commands.c:339
msgid "whois (identified user)"
msgstr ""
-#: src/irc/irc-commands.c:339
+#: src/irc/irc-commands.c:340
msgid "/list start"
msgstr ""
-#: src/irc/irc-commands.c:340
+#: src/irc/irc-commands.c:341
msgid "channel (for /list)"
msgstr ""
-#: src/irc/irc-commands.c:341
+#: src/irc/irc-commands.c:342
msgid "/list end"
msgstr ""
-#: src/irc/irc-commands.c:342
+#: src/irc/irc-commands.c:343
msgid "channel mode"
msgstr ""
-#: src/irc/irc-commands.c:344
+#: src/irc/irc-commands.c:345
msgid "no topic for channel"
msgstr ""
-#: src/irc/irc-commands.c:345
+#: src/irc/irc-commands.c:346
msgid "topic of channel"
msgstr ""
-#: src/irc/irc-commands.c:346
+#: src/irc/irc-commands.c:347
msgid "channel :topic"
msgstr ""
-#: src/irc/irc-commands.c:347
+#: src/irc/irc-commands.c:348
msgid ""
"channel: name of channel\n"
"topic: topic of the channel"
msgstr ""
-#: src/irc/irc-commands.c:350
+#: src/irc/irc-commands.c:351
msgid "infos about topic (nick & date changed)"
msgstr ""
-#: src/irc/irc-commands.c:353
+#: src/irc/irc-commands.c:354
msgid "inviting"
msgstr ""
-#: src/irc/irc-commands.c:354
+#: src/irc/irc-commands.c:355
msgid "server version"
msgstr ""
-#: src/irc/irc-commands.c:355
+#: src/irc/irc-commands.c:356
msgid "who"
msgstr ""
-#: src/irc/irc-commands.c:356
+#: src/irc/irc-commands.c:357
msgid "list of nicks on channel"
msgstr ""
-#: src/irc/irc-commands.c:357
+#: src/irc/irc-commands.c:358
msgid "channel :[[@|+]nick ...]"
msgstr ""
-#: src/irc/irc-commands.c:358
+#: src/irc/irc-commands.c:359
msgid ""
"channel: name of channel\n"
"nick: nick on the channel"
msgstr ""
-#: src/irc/irc-commands.c:361
+#: src/irc/irc-commands.c:362
msgid "links"
msgstr ""
-#: src/irc/irc-commands.c:362
+#: src/irc/irc-commands.c:363
msgid "end of /links list"
msgstr ""
-#: src/irc/irc-commands.c:363
+#: src/irc/irc-commands.c:364
msgid "end of /names list"
msgstr ""
-#: src/irc/irc-commands.c:364
+#: src/irc/irc-commands.c:365
msgid "banlist"
msgstr ""
-#: src/irc/irc-commands.c:365
+#: src/irc/irc-commands.c:366
msgid "end of banlist"
msgstr ""
-#: src/irc/irc-commands.c:366
+#: src/irc/irc-commands.c:367
msgid "end of /whowas list"
msgstr ""
-#: src/irc/irc-commands.c:373
+#: src/irc/irc-commands.c:374
msgid "server local time"
msgstr ""
-#: src/irc/irc-commands.c:374
+#: src/irc/irc-commands.c:375
msgid "no such nick/channel"
msgstr ""
-#: src/irc/irc-commands.c:376
+#: src/irc/irc-commands.c:377
msgid "no such server"
msgstr ""
-#: src/irc/irc-commands.c:378
+#: src/irc/irc-commands.c:379
msgid "no such channel"
msgstr ""
-#: src/irc/irc-commands.c:380
+#: src/irc/irc-commands.c:381
msgid "cannot send to channel"
msgstr ""
-#: src/irc/irc-commands.c:382
+#: src/irc/irc-commands.c:383
msgid "too many channels"
msgstr ""
-#: src/irc/irc-commands.c:384 src/irc/irc-commands.c:386
-#: src/irc/irc-commands.c:388
+#: src/irc/irc-commands.c:385 src/irc/irc-commands.c:387
msgid "was no such nick"
msgstr ""
-#: src/irc/irc-commands.c:390
+#: src/irc/irc-commands.c:389
msgid "no origin"
msgstr ""
-#: src/irc/irc-commands.c:392
+#: src/irc/irc-commands.c:391
msgid "no services"
msgstr ""
-#: src/irc/irc-commands.c:394
+#: src/irc/irc-commands.c:393
msgid "no recipient"
msgstr ""
-#: src/irc/irc-commands.c:396
+#: src/irc/irc-commands.c:395
msgid "no text to send"
msgstr ""
-#: src/irc/irc-commands.c:398
+#: src/irc/irc-commands.c:397
msgid "no toplevel"
msgstr ""
-#: src/irc/irc-commands.c:400
+#: src/irc/irc-commands.c:399
msgid "wilcard in toplevel domain"
msgstr ""
-#: src/irc/irc-commands.c:402
+#: src/irc/irc-commands.c:401
msgid "unknown command"
msgstr ""
-#: src/irc/irc-commands.c:404
+#: src/irc/irc-commands.c:403
msgid "MOTD is missing"
msgstr ""
-#: src/irc/irc-commands.c:406
+#: src/irc/irc-commands.c:405
msgid "no administrative info"
msgstr ""
-#: src/irc/irc-commands.c:408
+#: src/irc/irc-commands.c:407
msgid "file error"
msgstr ""
-#: src/irc/irc-commands.c:410
+#: src/irc/irc-commands.c:409
msgid "no nickname given"
msgstr ""
-#: src/irc/irc-commands.c:412
+#: src/irc/irc-commands.c:411
msgid "erroneous nickname"
msgstr ""
-#: src/irc/irc-commands.c:414
+#: src/irc/irc-commands.c:413
msgid "nickname already in use"
msgstr ""
-#: src/irc/irc-commands.c:416
+#: src/irc/irc-commands.c:415
msgid "nickname collision"
msgstr ""
-#: src/irc/irc-commands.c:418
+#: src/irc/irc-commands.c:417
msgid "not authorized to change nickname"
msgstr ""
-#: src/irc/irc-commands.c:420
+#: src/irc/irc-commands.c:419
msgid "user not in channel"
msgstr ""
-#: src/irc/irc-commands.c:422
+#: src/irc/irc-commands.c:421
msgid "not on channel"
msgstr ""
-#: src/irc/irc-commands.c:424
+#: src/irc/irc-commands.c:423
msgid "user already on channel"
msgstr ""
-#: src/irc/irc-commands.c:426
+#: src/irc/irc-commands.c:425
msgid "user not logged in"
msgstr ""
-#: src/irc/irc-commands.c:428
+#: src/irc/irc-commands.c:427
msgid "summon has been disabled"
msgstr ""
-#: src/irc/irc-commands.c:430
+#: src/irc/irc-commands.c:429
msgid "users has been disabled"
msgstr ""
-#: src/irc/irc-commands.c:432
+#: src/irc/irc-commands.c:431
msgid "you are not registered"
msgstr ""
-#: src/irc/irc-commands.c:434
+#: src/irc/irc-commands.c:433
msgid "not enough parameters"
msgstr ""
-#: src/irc/irc-commands.c:436
+#: src/irc/irc-commands.c:435
msgid "you may not register"
msgstr ""
-#: src/irc/irc-commands.c:438
+#: src/irc/irc-commands.c:437
msgid "your host isn't among the privileged"
msgstr ""
-#: src/irc/irc-commands.c:440
+#: src/irc/irc-commands.c:439
msgid "password incorrect"
msgstr ""
-#: src/irc/irc-commands.c:442
+#: src/irc/irc-commands.c:441
msgid "you are banned from this server"
msgstr ""
-#: src/irc/irc-commands.c:444
+#: src/irc/irc-commands.c:443
msgid "channel key already set"
msgstr ""
-#: src/irc/irc-commands.c:446
+#: src/irc/irc-commands.c:445
msgid "channel is already full"
msgstr ""
-#: src/irc/irc-commands.c:448
+#: src/irc/irc-commands.c:447
msgid "unknown mode char to me"
msgstr ""
-#: src/irc/irc-commands.c:450
+#: src/irc/irc-commands.c:449
msgid "cannot join channel (invite only)"
msgstr ""
-#: src/irc/irc-commands.c:452
+#: src/irc/irc-commands.c:451
msgid "cannot join channel (banned from channel)"
msgstr ""
-#: src/irc/irc-commands.c:454
+#: src/irc/irc-commands.c:453
msgid "cannot join channel (bad channel key)"
msgstr ""
-#: src/irc/irc-commands.c:456
+#: src/irc/irc-commands.c:455
msgid "bad channel mask"
msgstr ""
-#: src/irc/irc-commands.c:458
+#: src/irc/irc-commands.c:457
msgid "channel doesn't support modes"
msgstr ""
-#: src/irc/irc-commands.c:460
+#: src/irc/irc-commands.c:459
msgid "you're not an IRC operator"
msgstr ""
-#: src/irc/irc-commands.c:462
+#: src/irc/irc-commands.c:461
msgid "you're not channel operator"
msgstr ""
-#: src/irc/irc-commands.c:464
+#: src/irc/irc-commands.c:463
msgid "you can't kill a server!"
msgstr ""
-#: src/irc/irc-commands.c:466
+#: src/irc/irc-commands.c:465
msgid "user is immune from kick/deop"
msgstr ""
-#: src/irc/irc-commands.c:468
+#: src/irc/irc-commands.c:467
msgid "no O-lines for your host"
msgstr ""
-#: src/irc/irc-commands.c:470
+#: src/irc/irc-commands.c:469
msgid "unknown mode flag"
msgstr ""
-#: src/irc/irc-commands.c:472
+#: src/irc/irc-commands.c:471
msgid "can't change mode for other users"
msgstr ""
@@ -1207,7 +1207,7 @@ msgstr ""
msgid "whois (secure connection)"
msgstr ""
-#: src/irc/irc-display.c:163 src/common/command.c:853
+#: src/irc/irc-display.c:163 src/common/command.c:874
msgid "Server: "
msgstr ""
@@ -1215,7 +1215,7 @@ msgstr ""
msgid "connected"
msgstr ""
-#: src/irc/irc-display.c:168
+#: src/irc/irc-display.c:168 src/common/command.c:900
msgid "not connected"
msgstr ""
@@ -1237,7 +1237,7 @@ msgstr ""
msgid "(hidden)"
msgstr ""
-#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4008
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4227
msgid "unknown"
msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
msgid "%s: using local hostname \"%s\"\n"
msgstr ""
-#: src/irc/irc-send.c:126 src/common/command.c:731
+#: src/irc/irc-send.c:126 src/common/command.c:752
#, c-format
msgid "%s cannot find nick for sending message\n"
msgstr ""
@@ -1262,9 +1262,9 @@ msgstr ""
#: src/irc/irc-send.c:415 src/irc/irc-send.c:427 src/irc/irc-send.c:445
#: src/irc/irc-send.c:1097 src/irc/irc-send.c:1190 src/irc/irc-send.c:1722
-#: src/common/command.c:1196 src/common/command.c:1463
-#: src/common/command.c:1613 src/common/command.c:1756
-#: src/common/command.c:1899
+#: src/common/command.c:1222 src/common/command.c:1576
+#: src/common/command.c:1726 src/common/command.c:1869
+#: src/common/command.c:2012
#, c-format
msgid "%s wrong argument count for \"%s\" command\n"
msgstr ""
@@ -1280,13 +1280,13 @@ msgstr ""
msgid "%s \"%s\" command can not be executed on a server window\n"
msgstr ""
-#: src/irc/irc-send.c:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:409
+#: src/irc/irc-send.c:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:433
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1822
-#: src/irc/irc-recv.c:1900
+#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1886
+#: src/irc/irc-recv.c:1974
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr ""
@@ -1296,441 +1296,441 @@ msgstr ""
msgid "%s, compiled on %s %s\n"
msgstr ""
-#: src/irc/irc-recv.c:269
+#: src/irc/irc-recv.c:289
msgid "You have been invited to "
msgstr ""
-#: src/irc/irc-recv.c:272
+#: src/irc/irc-recv.c:292
msgid "by"
msgstr ""
-#: src/irc/irc-recv.c:282 src/irc/irc-recv.c:376 src/irc/irc-recv.c:875
-#: src/irc/irc-recv.c:1210 src/irc/irc-recv.c:1452 src/irc/irc-recv.c:3226
-#: src/irc/irc-recv.c:3293
+#: src/irc/irc-recv.c:303 src/irc/irc-recv.c:397 src/irc/irc-recv.c:894
+#: src/irc/irc-recv.c:1229 src/irc/irc-recv.c:1488 src/irc/irc-recv.c:3348
+#: src/irc/irc-recv.c:3409 src/irc/irc-recv.c:3481
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:308
+#: src/irc/irc-recv.c:331
#, c-format
msgid "%s cannot create new channel \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:328
+#: src/irc/irc-recv.c:350
msgid " has joined "
msgstr ""
-#: src/irc/irc-recv.c:385
+#: src/irc/irc-recv.c:408
msgid " has kicked "
msgstr ""
-#: src/irc/irc-recv.c:389
+#: src/irc/irc-recv.c:412 src/common/command.c:1397
msgid " from "
msgstr ""
-#: src/irc/irc-recv.c:475
+#: src/irc/irc-recv.c:498
msgid " has killed "
msgstr ""
-#: src/irc/irc-recv.c:481
+#: src/irc/irc-recv.c:504
msgid " from server"
msgstr ""
-#: src/irc/irc-recv.c:491
+#: src/irc/irc-recv.c:514
msgid " from server\n"
msgstr ""
-#: src/irc/irc-recv.c:498
+#: src/irc/irc-recv.c:522
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:538
+#: src/irc/irc-recv.c:562
msgid "sets ban on"
msgstr ""
-#: src/irc/irc-recv.c:539
+#: src/irc/irc-recv.c:563
msgid "removes ban on"
msgstr ""
-#: src/irc/irc-recv.c:563
+#: src/irc/irc-recv.c:587
msgid "gives half channel operator status to"
msgstr ""
-#: src/irc/irc-recv.c:564
+#: src/irc/irc-recv.c:588
msgid "removes half channel operator status from"
msgstr ""
-#: src/irc/irc-recv.c:591
+#: src/irc/irc-recv.c:615
msgid "sets invite-only channel flag"
msgstr ""
-#: src/irc/irc-recv.c:592
+#: src/irc/irc-recv.c:616
msgid "removes invite-only channel flag"
msgstr ""
-#: src/irc/irc-recv.c:609
+#: src/irc/irc-recv.c:633
msgid "sets channel key to"
msgstr ""
-#: src/irc/irc-recv.c:610
+#: src/irc/irc-recv.c:634
msgid "removes channel key"
msgstr ""
-#: src/irc/irc-recv.c:641
+#: src/irc/irc-recv.c:665
msgid "sets the user limit to"
msgstr ""
-#: src/irc/irc-recv.c:642
+#: src/irc/irc-recv.c:666
msgid "removes user limit"
msgstr ""
-#: src/irc/irc-recv.c:664
+#: src/irc/irc-recv.c:688
msgid "sets moderated channel flag"
msgstr ""
-#: src/irc/irc-recv.c:665
+#: src/irc/irc-recv.c:689
msgid "removes moderated channel flag"
msgstr ""
-#: src/irc/irc-recv.c:675
+#: src/irc/irc-recv.c:699
msgid "sets messages from channel only flag"
msgstr ""
-#: src/irc/irc-recv.c:676
+#: src/irc/irc-recv.c:700
msgid "removes messages from channel only flag"
msgstr ""
-#: src/irc/irc-recv.c:693
+#: src/irc/irc-recv.c:717
msgid "gives channel operator status to"
msgstr ""
-#: src/irc/irc-recv.c:694
+#: src/irc/irc-recv.c:718
msgid "removes channel operator status from"
msgstr ""
-#: src/irc/irc-recv.c:721
+#: src/irc/irc-recv.c:745
msgid "sets private channel flag"
msgstr ""
-#: src/irc/irc-recv.c:722
+#: src/irc/irc-recv.c:746
msgid "removes private channel flag"
msgstr ""
-#: src/irc/irc-recv.c:739
+#: src/irc/irc-recv.c:763
msgid "sets quiet on"
msgstr ""
-#: src/irc/irc-recv.c:740
+#: src/irc/irc-recv.c:764
msgid "removes quiet on"
msgstr ""
-#: src/irc/irc-recv.c:757
+#: src/irc/irc-recv.c:781
msgid "sets secret channel flag"
msgstr ""
-#: src/irc/irc-recv.c:758
+#: src/irc/irc-recv.c:782
msgid "removes secret channel flag"
msgstr ""
-#: src/irc/irc-recv.c:768
+#: src/irc/irc-recv.c:792
msgid "sets topic protection"
msgstr ""
-#: src/irc/irc-recv.c:769
+#: src/irc/irc-recv.c:793
msgid "removes topic protection"
msgstr ""
-#: src/irc/irc-recv.c:786
+#: src/irc/irc-recv.c:810
msgid "gives voice to"
msgstr ""
-#: src/irc/irc-recv.c:787
+#: src/irc/irc-recv.c:811
msgid "removes voice from"
msgstr ""
-#: src/irc/irc-recv.c:830 src/irc/irc-recv.c:915 src/irc/irc-recv.c:1284
-#: src/irc/irc-recv.c:1966
+#: src/irc/irc-recv.c:854 src/irc/irc-recv.c:936 src/irc/irc-recv.c:1307
+#: src/irc/irc-recv.c:2041
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr ""
-#: src/irc/irc-recv.c:845
+#: src/irc/irc-recv.c:864
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr ""
-#: src/irc/irc-recv.c:890
+#: src/irc/irc-recv.c:911
msgid "mode changed by"
msgstr ""
-#: src/irc/irc-recv.c:954
+#: src/irc/irc-recv.c:973
msgid "You are "
msgstr ""
-#: src/irc/irc-recv.c:961
+#: src/irc/irc-recv.c:980
msgid " is "
msgstr ""
-#: src/irc/irc-recv.c:965
+#: src/irc/irc-recv.c:984
msgid "now known as "
msgstr ""
-#: src/irc/irc-recv.c:1035
+#: src/irc/irc-recv.c:1050
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:1048 src/irc/irc-recv.c:1080
+#: src/irc/irc-recv.c:1066 src/irc/irc-recv.c:1098
msgid "reply from"
msgstr ""
-#: src/irc/irc-recv.c:1083
+#: src/irc/irc-recv.c:1101
#, c-format
msgid ": %ld.%ld seconds\n"
msgstr ""
-#: src/irc/irc-recv.c:1135
+#: src/irc/irc-recv.c:1154
#, c-format
msgid "%s \"%s\" command received without host or channel\n"
msgstr ""
-#: src/irc/irc-recv.c:1185
+#: src/irc/irc-recv.c:1203
msgid " has left "
msgstr ""
-#: src/irc/irc-recv.c:1333 src/irc/irc-recv.c:1846
+#: src/irc/irc-recv.c:1355 src/irc/irc-recv.c:1910
#, c-format
msgid "On %s: * %s %s"
msgstr ""
-#: src/irc/irc-recv.c:1353
+#: src/irc/irc-recv.c:1379
#, c-format
msgid "Received a CTCP SOUND \"%s\" from "
msgstr ""
-#: src/irc/irc-recv.c:1384 src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1512
-#: src/irc/irc-recv.c:1548 src/irc/irc-recv.c:1881
+#: src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1443 src/irc/irc-recv.c:1547
+#: src/irc/irc-recv.c:1587 src/irc/irc-recv.c:1950
msgid "received from"
msgstr ""
-#: src/irc/irc-recv.c:1408 src/irc/irc-recv.c:1877
+#: src/irc/irc-recv.c:1439 src/irc/irc-recv.c:1946
msgid "Unknown CTCP "
msgstr ""
-#: src/irc/irc-recv.c:1436
+#: src/irc/irc-recv.c:1471
#, c-format
msgid "On %s: %s> %s"
msgstr ""
-#: src/irc/irc-recv.c:1563 src/irc/irc-recv.c:1580 src/irc/irc-recv.c:1596
-#: src/irc/irc-recv.c:1612 src/irc/irc-recv.c:1637 src/irc/irc-recv.c:1654
-#: src/irc/irc-recv.c:1670 src/irc/irc-recv.c:1694 src/irc/irc-recv.c:1711
-#: src/irc/irc-recv.c:1727 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1768
-#: src/irc/irc-recv.c:1783 src/irc/irc-recv.c:1942 src/irc/irc-recv.c:3592
-#: src/irc/irc-recv.c:3650 src/irc/irc-recv.c:3802 src/irc/irc-recv.c:3817
-#: src/irc/irc-recv.c:3832 src/irc/irc-recv.c:3847 src/irc/irc-recv.c:3860
-#: src/irc/irc-recv.c:3910 src/irc/irc-recv.c:3924
+#: src/irc/irc-recv.c:1603 src/irc/irc-recv.c:1624 src/irc/irc-recv.c:1640
+#: src/irc/irc-recv.c:1656 src/irc/irc-recv.c:1682 src/irc/irc-recv.c:1703
+#: src/irc/irc-recv.c:1719 src/irc/irc-recv.c:1744 src/irc/irc-recv.c:1765
+#: src/irc/irc-recv.c:1781 src/irc/irc-recv.c:1806 src/irc/irc-recv.c:1827
+#: src/irc/irc-recv.c:1842 src/irc/irc-recv.c:2017 src/irc/irc-recv.c:3791
+#: src/irc/irc-recv.c:3849 src/irc/irc-recv.c:4010 src/irc/irc-recv.c:4025
+#: src/irc/irc-recv.c:4040 src/irc/irc-recv.c:4055 src/irc/irc-recv.c:4068
+#: src/irc/irc-recv.c:4123 src/irc/irc-recv.c:4137
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:1796
+#: src/irc/irc-recv.c:1855
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr ""
-#: src/irc/irc-recv.c:1921 src/irc/irc-dcc.c:1039
+#: src/irc/irc-recv.c:1995 src/irc/irc-dcc.c:1036
#, c-format
msgid "Private %s> %s"
msgstr ""
-#: src/irc/irc-recv.c:1998
+#: src/irc/irc-recv.c:2072
msgid "has quit"
msgstr ""
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2197
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr ""
-#: src/irc/irc-recv.c:2147
+#: src/irc/irc-recv.c:2229
msgid " has changed topic for "
msgstr ""
-#: src/irc/irc-recv.c:2152
+#: src/irc/irc-recv.c:2234
#, c-format
msgid " to: \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:2158
+#: src/irc/irc-recv.c:2240
msgid " has unset topic for "
msgstr ""
-#: src/irc/irc-recv.c:2276
+#: src/irc/irc-recv.c:2359
#, c-format
msgid " is away: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:2350
+#: src/irc/irc-recv.c:2441
msgid "Users online: "
msgstr ""
-#: src/irc/irc-recv.c:2797
+#: src/irc/irc-recv.c:2927
msgid "idle: "
msgstr ""
-#: src/irc/irc-recv.c:2805
+#: src/irc/irc-recv.c:2935
msgid "days"
msgstr ""
-#: src/irc/irc-recv.c:2805
+#: src/irc/irc-recv.c:2935
msgid "day"
msgstr ""
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2945
msgid "hours"
msgstr ""
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2945
msgid "hour"
msgstr ""
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2951
msgid "minutes"
msgstr ""
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2951
msgid "minute"
msgstr ""
-#: src/irc/irc-recv.c:2827
+#: src/irc/irc-recv.c:2957
msgid "seconds"
msgstr ""
-#: src/irc/irc-recv.c:2827
+#: src/irc/irc-recv.c:2957
msgid "second"
msgstr ""
-#: src/irc/irc-recv.c:2832
+#: src/irc/irc-recv.c:2962
msgid "signon at: "
msgstr ""
-#: src/irc/irc-recv.c:2920
+#: src/irc/irc-recv.c:3058
msgid "Channels: "
msgstr ""
-#: src/irc/irc-recv.c:3172
+#: src/irc/irc-recv.c:3339
msgid "No topic set for "
msgstr ""
-#: src/irc/irc-recv.c:3214
+#: src/irc/irc-recv.c:3396
msgid "Topic for "
msgstr ""
-#: src/irc/irc-recv.c:3218
+#: src/irc/irc-recv.c:3400
#, c-format
msgid " is: \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:3236 src/irc/irc-recv.c:3320 src/irc/irc-recv.c:3373
+#: src/irc/irc-recv.c:3419 src/irc/irc-recv.c:3508 src/irc/irc-recv.c:3561
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:3282
+#: src/irc/irc-recv.c:3469
msgid "Topic set by "
msgstr ""
-#: src/irc/irc-recv.c:3302
+#: src/irc/irc-recv.c:3490
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:3311 src/irc/irc-recv.c:3382
+#: src/irc/irc-recv.c:3499 src/irc/irc-recv.c:3570
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:3361
+#: src/irc/irc-recv.c:3549
msgid "has invited"
msgstr ""
-#: src/irc/irc-recv.c:3364 src/irc/irc-recv.c:3515
+#: src/irc/irc-recv.c:3552 src/irc/irc-recv.c:3712 src/common/command.c:1390
msgid "on"
msgstr ""
-#: src/irc/irc-recv.c:3638
+#: src/irc/irc-recv.c:3837
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:3694
+#: src/irc/irc-recv.c:3897
msgid "Nicks "
msgstr ""
-#: src/irc/irc-recv.c:3714
+#: src/irc/irc-recv.c:3917
msgid "Channel "
msgstr ""
-#: src/irc/irc-recv.c:3725
+#: src/irc/irc-recv.c:3928
msgid "nicks"
msgstr ""
-#: src/irc/irc-recv.c:3725
+#: src/irc/irc-recv.c:3928
msgid "nick"
msgstr ""
-#: src/irc/irc-recv.c:3733
+#: src/irc/irc-recv.c:3936
msgid "ops"
msgstr ""
-#: src/irc/irc-recv.c:3733
+#: src/irc/irc-recv.c:3936
msgid "op"
msgstr ""
-#: src/irc/irc-recv.c:3742
+#: src/irc/irc-recv.c:3945
msgid "halfops"
msgstr ""
-#: src/irc/irc-recv.c:3742
+#: src/irc/irc-recv.c:3945
msgid "halfop"
msgstr ""
-#: src/irc/irc-recv.c:3751
+#: src/irc/irc-recv.c:3954
msgid "voices"
msgstr ""
-#: src/irc/irc-recv.c:3751
+#: src/irc/irc-recv.c:3954
msgid "voice"
msgstr ""
-#: src/irc/irc-recv.c:3760
+#: src/irc/irc-recv.c:3963
msgid "normal"
msgstr ""
-#: src/irc/irc-recv.c:3873
+#: src/irc/irc-recv.c:4085
msgid "banned by"
msgstr ""
-#: src/irc/irc-recv.c:3962
+#: src/irc/irc-recv.c:4181
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:3974
+#: src/irc/irc-recv.c:4193
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:3986
+#: src/irc/irc-recv.c:4205
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr ""
-#: src/irc/irc-recv.c:3996
+#: src/irc/irc-recv.c:4215
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
@@ -1759,137 +1759,166 @@ msgstr ""
msgid "Aborted"
msgstr ""
-#: src/irc/irc-dcc.c:348 src/irc/irc-dcc.c:539 src/irc/irc-dcc.c:701
+#: src/irc/irc-dcc.c:345 src/irc/irc-dcc.c:536 src/irc/irc-dcc.c:698
msgid "DCC: file "
msgstr ""
-#: src/irc/irc-dcc.c:355 src/irc/irc-dcc.c:664 src/irc/irc-dcc.c:706
+#: src/irc/irc-dcc.c:352 src/irc/irc-dcc.c:661 src/irc/irc-dcc.c:703
msgid " (local filename: "
msgstr ""
-#: src/irc/irc-dcc.c:363
+#: src/irc/irc-dcc.c:360
msgid " sent to "
msgstr ""
-#: src/irc/irc-dcc.c:365
+#: src/irc/irc-dcc.c:362
msgid " received from "
msgstr ""
-#: src/irc/irc-dcc.c:371
+#: src/irc/irc-dcc.c:368
msgid ": ok!\n"
msgstr ""
-#: src/irc/irc-dcc.c:371
+#: src/irc/irc-dcc.c:368
msgid ": FAILED\n"
msgstr ""
-#: src/irc/irc-dcc.c:383
+#: src/irc/irc-dcc.c:380
msgid "DCC chat closed with "
msgstr ""
-#: src/irc/irc-dcc.c:432
+#: src/irc/irc-dcc.c:429
#, c-format
msgid ""
"%s can't associate DCC chat with private buffer (maybe private buffer has "
"already DCC CHAT?)\n"
msgstr ""
-#: src/irc/irc-dcc.c:442
+#: src/irc/irc-dcc.c:439
msgid "Connected to "
msgstr ""
-#: src/irc/irc-dcc.c:451
+#: src/irc/irc-dcc.c:448
msgid "via DCC chat\n"
msgstr ""
-#: src/irc/irc-dcc.c:544
+#: src/irc/irc-dcc.c:541
#, c-format
msgid "resumed at position %u\n"
msgstr ""
-#: src/irc/irc-dcc.c:550 src/irc/irc-dcc.c:575
+#: src/irc/irc-dcc.c:547 src/irc/irc-dcc.c:572
#, c-format
msgid ""
"%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
"ended\n"
msgstr ""
-#: src/irc/irc-dcc.c:594
+#: src/irc/irc-dcc.c:591
#, c-format
msgid "%s not enough memory for new DCC\n"
msgstr ""
-#: src/irc/irc-dcc.c:613
+#: src/irc/irc-dcc.c:610
msgid "DCC chat"
msgstr ""
-#: src/irc/irc-dcc.c:643
+#: src/irc/irc-dcc.c:640
msgid "Incoming DCC file from "
msgstr ""
-#: src/irc/irc-dcc.c:654 src/irc/irc-dcc.c:668
+#: src/irc/irc-dcc.c:651 src/irc/irc-dcc.c:665
msgid " bytes\n"
msgstr ""
-#: src/irc/irc-dcc.c:660
+#: src/irc/irc-dcc.c:657
msgid "Sending DCC file to "
msgstr ""
-#: src/irc/irc-dcc.c:674
+#: src/irc/irc-dcc.c:671
msgid "Incoming DCC chat request from "
msgstr ""
-#: src/irc/irc-dcc.c:686
+#: src/irc/irc-dcc.c:683
msgid "Sending DCC chat request to "
msgstr ""
-#: src/irc/irc-dcc.c:712
+#: src/irc/irc-dcc.c:709
#, c-format
msgid "will be resumed at position %u\n"
msgstr ""
-#: src/irc/irc-dcc.c:778
+#: src/irc/irc-dcc.c:775
#, c-format
msgid "%s not enough memory for DCC SEND\n"
msgstr ""
-#: src/irc/irc-dcc.c:800
+#: src/irc/irc-dcc.c:797
#, c-format
msgid "%s cannot access file \"%s\"\n"
msgstr ""
-#: src/irc/irc-dcc.c:821
+#: src/irc/irc-dcc.c:818
#, c-format
msgid "%s cannot create socket for DCC\n"
msgstr ""
-#: src/irc/irc-dcc.c:834
+#: src/irc/irc-dcc.c:831
#, c-format
msgid "%s cannot find port for DCC\n"
msgstr ""
-#: src/irc/irc-dcc.c:881
+#: src/irc/irc-dcc.c:878
#, c-format
msgid "%s cannot send DCC\n"
msgstr ""
-#: src/irc/irc-dcc.c:960
+#: src/irc/irc-dcc.c:957
#, c-format
msgid "%s error sending data to \"%s\" via DCC CHAT\n"
msgstr ""
-#: src/irc/irc-dcc.c:1233
+#: src/irc/irc-dcc.c:1230
#, c-format
msgid ""
"%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
"option, max is %d.\n"
msgstr ""
-#: src/irc/irc-dcc.c:1308
+#: src/irc/irc-dcc.c:1305
#, c-format
msgid "Aborting active DCC: \"%s\" from %s\n"
msgstr ""
+#: src/irc/irc-ignore.c:195
+#, c-format
+msgid "%s too few arguments for ignore\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:212
+#, c-format
+msgid "%s mask or type/command should be non generic value for ignore\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:221
+#, c-format
+msgid "%s ignore already exists\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:257
+#, c-format
+msgid "%s unknown type or IRC command \"%s\" for ignore\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:285
+#, c-format
+msgid "%s not enough memory to create ignore\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:406 src/irc/irc-ignore.c:442
+msgid "Removing ignore:"
+msgstr ""
+
#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:463
#: src/plugins/python/wee-python.c:81 src/plugins/ruby/wee-ruby.c:89
#, c-format
@@ -1954,19 +1983,19 @@ msgid "Loading %s script \"%s\"\n"
msgstr ""
#: src/plugins/perl/wee-perl.c:1015 src/plugins/python/wee-python.c:686
-#: src/plugins/ruby/wee-ruby.c:722
+#: src/plugins/ruby/wee-ruby.c:555
#, c-format
msgid "Unloading %s script \"%s\"\n"
msgstr ""
#: src/plugins/perl/wee-perl.c:1032 src/plugins/python/wee-python.c:703
-#: src/plugins/ruby/wee-ruby.c:739
+#: src/plugins/ruby/wee-ruby.c:572
#, c-format
msgid "Unloading all %s scripts...\n"
msgstr ""
#: src/plugins/perl/wee-perl.c:1037 src/plugins/python/wee-python.c:708
-#: src/plugins/ruby/wee-ruby.c:744
+#: src/plugins/ruby/wee-ruby.c:577
#, c-format
msgid "%s scripts unloaded\n"
msgstr ""
@@ -2239,7 +2268,7 @@ msgstr ""
msgid "grab a key"
msgstr ""
-#: src/gui/gui-keyboard.c:426 src/common/command.c:1478
+#: src/gui/gui-keyboard.c:426 src/common/command.c:1591
#, c-format
msgid "%s unable to bind key \"%s\"\n"
msgstr ""
@@ -2347,15 +2376,35 @@ msgid "command: name of a WeeChat or IRC command"
msgstr ""
#: src/common/command.c:75
-msgid "bind/unbind keys"
+msgid "ignore IRC messages and/or hosts"
msgstr ""
#: src/common/command.c:76
-msgid "[key function/command] [unbind key] [functions] [reset -yes]"
+msgid "[mask [[type | command] [channel [server]]]]"
msgstr ""
#: src/common/command.c:77
msgid ""
+" mask: nick or host mask to ignore\n"
+" type: type of message to ignore (action, ctcp, dcc, pv)\n"
+"command: IRC command\n"
+"channel: name of channel for ignore\n"
+" server: name of server for ignore\n"
+"\n"
+"For each argument, '*' means all.\n"
+"Without argument, /ignore command lists all defined ignore."
+msgstr ""
+
+#: src/common/command.c:85
+msgid "bind/unbind keys"
+msgstr ""
+
+#: src/common/command.c:86
+msgid "[key function/command] [unbind key] [functions] [reset -yes]"
+msgstr ""
+
+#: src/common/command.c:87
+msgid ""
"key: bind this key to an internal function or a command (beginning by \"/"
"\")\n"
"unbind: unbind a key (if \"all\", default bindings are restored)\n"
@@ -2364,45 +2413,48 @@ msgid ""
"binding (use carefully!)"
msgstr ""
-#: src/common/command.c:82
+#: src/common/command.c:92
msgid "list/load/unload Perl scripts"
msgstr ""
-#: src/common/command.c:83 src/common/command.c:88 src/common/command.c:93
+#: src/common/command.c:93 src/common/command.c:98 src/common/command.c:103
msgid "[load filename] | [autoload] | [reload] | [unload]"
msgstr ""
-#: src/common/command.c:84
+#: src/common/command.c:94
msgid ""
"filename: Perl script (file) to load\n"
+"\n"
"Without argument, /perl command lists all loaded Perl scripts."
msgstr ""
-#: src/common/command.c:87
+#: src/common/command.c:97
msgid "list/load/unload Python scripts"
msgstr ""
-#: src/common/command.c:89
+#: src/common/command.c:99
msgid ""
"filename: Python script (file) to load\n"
+"\n"
"Without argument, /python command lists all loaded Python scripts."
msgstr ""
-#: src/common/command.c:92
+#: src/common/command.c:102
msgid "list/load/unload Ruby scripts"
msgstr ""
-#: src/common/command.c:94
+#: src/common/command.c:104
msgid ""
"filename: Ruby script (file) to load\n"
+"\n"
"Without argument, /ruby command lists all loaded Ruby scripts."
msgstr ""
-#: src/common/command.c:97
+#: src/common/command.c:107
msgid "list, add or remove servers"
msgstr ""
-#: src/common/command.c:98
+#: src/common/command.c:108
msgid ""
"[servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-"
"pwd password] [-nicks nick1 [nick2 [nick3]]] [-username username] [-realname "
@@ -2410,7 +2462,7 @@ msgid ""
"servername]"
msgstr ""
-#: src/common/command.c:103
+#: src/common/command.c:113
msgid ""
"servername: server name, for internal & display use\n"
"hostname: name or IP address of server\n"
@@ -2425,53 +2477,74 @@ msgid ""
"realname: real name of user"
msgstr ""
-#: src/common/command.c:115
+#: src/common/command.c:125
msgid "save config to disk"
msgstr ""
-#: src/common/command.c:116
+#: src/common/command.c:126
msgid "[file]"
msgstr ""
-#: src/common/command.c:116
+#: src/common/command.c:126
msgid "file: filename for writing config"
msgstr ""
-#: src/common/command.c:118
+#: src/common/command.c:128
msgid "set config parameters"
msgstr ""
-#: src/common/command.c:119
+#: src/common/command.c:129
msgid "[option[=value]]"
msgstr ""
-#: src/common/command.c:119
+#: src/common/command.c:129
msgid ""
"option: name of an option\n"
"value: value for option"
msgstr ""
-#: src/common/command.c:121
+#: src/common/command.c:131
msgid "remove an alias"
msgstr ""
-#: src/common/command.c:122
+#: src/common/command.c:132
msgid "alias_name"
msgstr ""
-#: src/common/command.c:122
+#: src/common/command.c:132
msgid "alias_name: name of alias to remove"
msgstr ""
-#: src/common/command.c:124
+#: src/common/command.c:134
+msgid "unignore IRC messages and/or hosts"
+msgstr ""
+
+#: src/common/command.c:135
+msgid "[number | [mask [[type | command] [channel [server]]]]]"
+msgstr ""
+
+#: src/common/command.c:136
+msgid ""
+" number: # of ignore to unignore (number is displayed by list of ignore)\n"
+" mask: nick or host mask to unignore\n"
+" type: type of message to unignore (action, ctcp, dcc, pv)\n"
+"command: IRC command\n"
+"channel: name of channel for unignore\n"
+" server: name of server for unignore\n"
+"\n"
+"For each argument, '*' means all.\n"
+"Without argument, /unignore command lists all defined ignore."
+msgstr ""
+
+#: src/common/command.c:145
msgid "manage windows"
msgstr ""
-#: src/common/command.c:125
+#: src/common/command.c:146
msgid "[list | splith | splitv | [merge [down | up | left | right | all]]]"
msgstr ""
-#: src/common/command.c:126
+#: src/common/command.c:147
msgid ""
"list: list opened windows (no parameter implies this list)\n"
"splith: split current window horizontally\n"
@@ -2479,408 +2552,437 @@ msgid ""
"merge: merge window with another"
msgstr ""
-#: src/common/command.c:272
+#: src/common/command.c:293
#, c-format
msgid "%s alias or command \"%s\" already exists!\n"
msgstr ""
-#: src/common/command.c:282
+#: src/common/command.c:303
#, c-format
msgid "%s alias cannot run another alias!\n"
msgstr ""
-#: src/common/command.c:289
+#: src/common/command.c:310
#, c-format
msgid "%s target command \"%s\" does not exist!\n"
msgstr ""
-#: src/common/command.c:497
+#: src/common/command.c:518
#, c-format
msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
msgstr ""
-#: src/common/command.c:509
+#: src/common/command.c:530
#, c-format
msgid ""
"%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
"arg%s)\n"
msgstr ""
-#: src/common/command.c:531 src/common/command.c:601
+#: src/common/command.c:552 src/common/command.c:622
#, c-format
msgid "%s command \"%s\" failed\n"
msgstr ""
-#: src/common/command.c:559
+#: src/common/command.c:580
#, c-format
msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
msgstr ""
-#: src/common/command.c:571
+#: src/common/command.c:592
#, c-format
msgid ""
"%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
"arg%s)\n"
msgstr ""
-#: src/common/command.c:586
+#: src/common/command.c:607
#, c-format
msgid "%s command \"%s\" needs a server connection!\n"
msgstr ""
-#: src/common/command.c:650
+#: src/common/command.c:671
#, c-format
msgid "%s unknown command \"%s\" (type /help for help)\n"
msgstr ""
-#: src/common/command.c:753
+#: src/common/command.c:774
#, c-format
msgid "%s unable to call handler for message (not enough memory)\n"
msgstr ""
-#: src/common/command.c:761
+#: src/common/command.c:782
msgid "This window is not a channel!\n"
msgstr ""
-#: src/common/command.c:789 src/common/command.c:813 src/common/command.c:918
+#: src/common/command.c:810 src/common/command.c:834 src/common/command.c:944
#, c-format
msgid "%s missing arguments for \"%s\" command\n"
msgstr ""
-#: src/common/command.c:798
+#: src/common/command.c:819
#, c-format
msgid "Alias \"%s\" => \"%s\" created\n"
msgstr ""
-#: src/common/command.c:804
+#: src/common/command.c:825
#, c-format
msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
msgstr ""
-#: src/common/command.c:824
+#: src/common/command.c:845
msgid "List of aliases:\n"
msgstr ""
-#: src/common/command.c:836
+#: src/common/command.c:857
msgid "No alias defined.\n"
msgstr ""
-#: src/common/command.c:859
+#: src/common/command.c:880
msgid "Channel: "
msgstr ""
-#: src/common/command.c:862 src/common/command.c:872
+#: src/common/command.c:883 src/common/command.c:893
msgid " (server: "
msgstr ""
-#: src/common/command.c:869
+#: src/common/command.c:890
msgid "Private with: "
msgstr ""
-#: src/common/command.c:898
+#: src/common/command.c:924
msgid "Opened buffers:\n"
msgstr ""
-#: src/common/command.c:941
+#: src/common/command.c:967
#, c-format
msgid "%s incorrect buffer number\n"
msgstr ""
-#: src/common/command.c:955
+#: src/common/command.c:981
#, c-format
msgid "%s can not close the single buffer\n"
msgstr ""
-#: src/common/command.c:965
+#: src/common/command.c:991
#, c-format
msgid "%s can not close server buffer while channels are opened\n"
msgstr ""
-#: src/common/command.c:1006
+#: src/common/command.c:1032
msgid "Notify levels: "
msgstr ""
-#: src/common/command.c:1034 src/common/command.c:1056
+#: src/common/command.c:1060 src/common/command.c:1082
#, c-format
msgid "%s incorrect notify level (must be between %d and %d)\n"
msgstr ""
-#: src/common/command.c:1043
+#: src/common/command.c:1069
#, c-format
msgid "%s incorrect buffer for notify (must be channel or private)\n"
msgstr ""
-#: src/common/command.c:1123
+#: src/common/command.c:1149
#, c-format
msgid "unknown parameter \"%s\" for \"%s\" command\n"
msgstr ""
-#: src/common/command.c:1153
+#: src/common/command.c:1179
#, c-format
msgid "%s already connected to server \"%s\"!\n"
msgstr ""
-#: src/common/command.c:1161
+#: src/common/command.c:1187
#, c-format
msgid "%s currently connecting to server \"%s\"!\n"
msgstr ""
-#: src/common/command.c:1179 src/common/command.c:1254
+#: src/common/command.c:1205 src/common/command.c:1280
#, c-format
msgid "%s server not found\n"
msgstr ""
-#: src/common/command.c:1209 src/common/command.c:1606
-#: src/common/command.c:1749 src/common/command.c:1892
-#: src/common/command.c:2589 src/common/command.c:2605
+#: src/common/command.c:1235 src/common/command.c:1719
+#: src/common/command.c:1862 src/common/command.c:2005
+#: src/common/command.c:2765 src/common/command.c:2781
#, c-format
msgid "%s unknown option for \"%s\" command\n"
msgstr ""
-#: src/common/command.c:1238
+#: src/common/command.c:1264
#, c-format
msgid "%s not connected to server \"%s\"!\n"
msgstr ""
-#: src/common/command.c:1246
+#: src/common/command.c:1272
msgid "Auto-reconnection is cancelled\n"
msgstr ""
-#: src/common/command.c:1272 src/common/weechat.c:273
+#: src/common/command.c:1298 src/common/weechat.c:345
#, c-format
msgid "%s internal commands:\n"
msgstr ""
-#: src/common/command.c:1281 src/common/weechat.c:293
+#: src/common/command.c:1307 src/common/weechat.c:365
#, c-format
msgid "IRC commands:\n"
msgstr ""
-#: src/common/command.c:1348
+#: src/common/command.c:1374
#, c-format
msgid "No help available, \"%s\" is an unknown command\n"
msgstr ""
-#: src/common/command.c:1366
+#: src/common/command.c:1395
+msgid " ignoring "
+msgstr ""
+
+#: src/common/command.c:1419
+msgid "List of ignore:\n"
+msgstr ""
+
+#: src/common/command.c:1434
+msgid "No ignore defined.\n"
+msgstr ""
+
+#: src/common/command.c:1460
+msgid "New ignore:"
+msgstr ""
+
+#: src/common/command.c:1479
msgid "New key binding:\n"
msgstr ""
-#: src/common/command.c:1399
+#: src/common/command.c:1512
msgid "Key bindings:\n"
msgstr ""
-#: src/common/command.c:1411
+#: src/common/command.c:1524
#, c-format
msgid "Key \"%s\" unbinded\n"
msgstr ""
-#: src/common/command.c:1416
+#: src/common/command.c:1529
#, c-format
msgid "%s unable to unbind key \"%s\"\n"
msgstr ""
-#: src/common/command.c:1424 src/common/weechat.c:324
+#: src/common/command.c:1537 src/common/weechat.c:396
#, c-format
msgid "Internal key functions:\n"
msgstr ""
-#: src/common/command.c:1443
+#: src/common/command.c:1556
msgid "Default key bindings restored\n"
msgstr ""
-#: src/common/command.c:1449
+#: src/common/command.c:1562
#, c-format
msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
msgstr ""
-#: src/common/command.c:1505 src/common/command.c:1648
-#: src/common/command.c:1791
+#: src/common/command.c:1618 src/common/command.c:1761
+#: src/common/command.c:1904
#, c-format
msgid "Registered %s scripts:\n"
msgstr ""
-#: src/common/command.c:1522 src/common/command.c:1545
-#: src/common/command.c:1568 src/common/command.c:1665
-#: src/common/command.c:1688 src/common/command.c:1711
-#: src/common/command.c:1808 src/common/command.c:1831
-#: src/common/command.c:1854
+#: src/common/command.c:1635 src/common/command.c:1658
+#: src/common/command.c:1681 src/common/command.c:1778
+#: src/common/command.c:1801 src/common/command.c:1824
+#: src/common/command.c:1921 src/common/command.c:1944
+#: src/common/command.c:1967
msgid " (none)\n"
msgstr ""
-#: src/common/command.c:1527 src/common/command.c:1670
-#: src/common/command.c:1813
+#: src/common/command.c:1640 src/common/command.c:1783
+#: src/common/command.c:1926
#, c-format
msgid "%s message handlers:\n"
msgstr ""
-#: src/common/command.c:1536 src/common/command.c:1679
-#: src/common/command.c:1822
+#: src/common/command.c:1649 src/common/command.c:1792
+#: src/common/command.c:1935
#, c-format
msgid " IRC(%s) => %s(%s)\n"
msgstr ""
-#: src/common/command.c:1550 src/common/command.c:1693
-#: src/common/command.c:1836
+#: src/common/command.c:1663 src/common/command.c:1806
+#: src/common/command.c:1949
#, c-format
msgid "%s command handlers:\n"
msgstr ""
-#: src/common/command.c:1559 src/common/command.c:1702
-#: src/common/command.c:1845
+#: src/common/command.c:1672 src/common/command.c:1815
+#: src/common/command.c:1958
#, c-format
msgid " Command /%s => %s(%s)\n"
msgstr ""
-#: src/common/command.c:1619
+#: src/common/command.c:1732
msgid ""
"WeeChat was build without Perl support.\n"
"Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n"
msgstr ""
-#: src/common/command.c:1762
+#: src/common/command.c:1875
msgid ""
"WeeChat was build without Python support.\n"
"Please rebuild WeeChat with \"--enable-python\" option for ./configure "
"script\n"
msgstr ""
-#: src/common/command.c:1905
+#: src/common/command.c:2018
msgid ""
"WeeChat was build without Ruby support.\n"
"Please rebuild WeeChat with \"--enable-ruby\" option for ./configure script\n"
msgstr ""
-#: src/common/command.c:1953
+#: src/common/command.c:2066
msgid "No server.\n"
msgstr ""
-#: src/common/command.c:1964
+#: src/common/command.c:2077
#, c-format
msgid "Server '%s' not found.\n"
msgstr ""
-#: src/common/command.c:1976
+#: src/common/command.c:2089
#, c-format
msgid "%s missing servername for \"%s\" command\n"
msgstr ""
-#: src/common/command.c:1984
+#: src/common/command.c:2097
#, c-format
msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
msgstr ""
-#: src/common/command.c:2003
+#: src/common/command.c:2116
#, c-format
msgid "%s server \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/common/command.c:2011
+#: src/common/command.c:2124
#, c-format
msgid ""
"%s you can not delete server \"%s\" because you are connected to. Try /"
"disconnect %s before.\n"
msgstr ""
-#: src/common/command.c:2027 src/common/command.c:2173
+#: src/common/command.c:2140 src/common/command.c:2286
msgid "Server"
msgstr ""
-#: src/common/command.c:2030
+#: src/common/command.c:2143
msgid "has been deleted\n"
msgstr ""
-#: src/common/command.c:2045
+#: src/common/command.c:2158
#, c-format
msgid "%s missing parameters for \"%s\" command\n"
msgstr ""
-#: src/common/command.c:2055
+#: src/common/command.c:2168
#, c-format
msgid "%s server \"%s\" already exists, can't create it!\n"
msgstr ""
-#: src/common/command.c:2084 src/common/command.c:2112
-#: src/common/command.c:2125 src/common/command.c:2151
+#: src/common/command.c:2197 src/common/command.c:2225
+#: src/common/command.c:2238 src/common/command.c:2264
#, c-format
msgid "%s missing password for \"%s\" parameter\n"
msgstr ""
-#: src/common/command.c:2097
+#: src/common/command.c:2210
#, c-format
msgid "%s missing nick(s) for \"%s\" parameter\n"
msgstr ""
-#: src/common/command.c:2138
+#: src/common/command.c:2251
#, c-format
msgid "%s missing command for \"%s\" parameter\n"
msgstr ""
-#: src/common/command.c:2176
+#: src/common/command.c:2289
msgid "created\n"
msgstr ""
-#: src/common/command.c:2182
+#: src/common/command.c:2295
#, c-format
msgid "%s unable to create server\n"
msgstr ""
-#: src/common/command.c:2237
+#: src/common/command.c:2350
msgid "(unknown)"
msgstr ""
-#: src/common/command.c:2260
+#: src/common/command.c:2373
msgid "(password hidden) "
msgstr ""
-#: src/common/command.c:2324
+#: src/common/command.c:2437
#, c-format
msgid "%s server \"%s\" not found\n"
msgstr ""
-#: src/common/command.c:2355 src/common/command.c:2401
+#: src/common/command.c:2468 src/common/command.c:2514
#, c-format
msgid "%s config option \"%s\" not found\n"
msgstr ""
-#: src/common/command.c:2360 src/common/command.c:2393
+#: src/common/command.c:2473 src/common/command.c:2506
#, c-format
msgid "%s incorrect value for option \"%s\"\n"
msgstr ""
-#: src/common/command.c:2376
+#: src/common/command.c:2489
#, c-format
msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
msgstr ""
-#: src/common/command.c:2475
+#: src/common/command.c:2588
#, c-format
msgid "No config option found with \"%s\"\n"
msgstr ""
-#: src/common/command.c:2478
+#: src/common/command.c:2591
msgid "No config option found\n"
msgstr ""
-#: src/common/command.c:2484
+#: src/common/command.c:2597
#, c-format
msgid "config option(s) found with \"%s\"\n"
msgstr ""
-#: src/common/command.c:2487
+#: src/common/command.c:2600
msgid "config option(s) found\n"
msgstr ""
-#: src/common/command.c:2507
+#: src/common/command.c:2620
#, c-format
msgid "%s alias or command \"%s\" not found\n"
msgstr ""
-#: src/common/command.c:2517
+#: src/common/command.c:2630
#, c-format
msgid "Alias \"%s\" removed\n"
msgstr ""
-#: src/common/command.c:2537
+#: src/common/command.c:2683
+msgid "ignore were removed.\n"
+msgstr ""
+
+#: src/common/command.c:2685
+msgid "ignore was removed.\n"
+msgstr ""
+
+#: src/common/command.c:2690
+#, c-format
+msgid "%s no ignore found\n"
+msgstr ""
+
+#: src/common/command.c:2713
msgid "Opened windows:\n"
msgstr ""
@@ -2943,129 +3045,129 @@ msgstr ""
msgid "**** End of log "
msgstr ""
-#: src/common/weechat.c:198
+#: src/common/weechat.c:270
#, c-format
msgid ""
"WeeChat configuration options (~/.weechat/weechat.rc):\n"
"\n"
msgstr ""
-#: src/common/weechat.c:211
+#: src/common/weechat.c:283
#, c-format
msgid " . type boolean (values: 'on' or 'off')\n"
msgstr ""
-#: src/common/weechat.c:212 src/common/weechat.c:235 src/common/weechat.c:241
-#: src/common/weechat.c:247
+#: src/common/weechat.c:284 src/common/weechat.c:307 src/common/weechat.c:313
+#: src/common/weechat.c:319
#, c-format
msgid " . default value: '%s'\n"
msgstr ""
-#: src/common/weechat.c:217
+#: src/common/weechat.c:289
#, c-format
msgid " . type integer (values: between %d and %d)\n"
msgstr ""
-#: src/common/weechat.c:220
+#: src/common/weechat.c:292
#, c-format
msgid " . default value: %d\n"
msgstr ""
-#: src/common/weechat.c:224
+#: src/common/weechat.c:296
#, c-format
msgid " . type string (values: "
msgstr ""
-#: src/common/weechat.c:237 src/common/weechat.c:243 src/common/weechat.c:249
+#: src/common/weechat.c:309 src/common/weechat.c:315 src/common/weechat.c:321
msgid "empty"
msgstr ""
-#: src/common/weechat.c:240
+#: src/common/weechat.c:312
#, c-format
msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n"
msgstr ""
-#: src/common/weechat.c:246
+#: src/common/weechat.c:318
#, c-format
msgid " . type string (any string)\n"
msgstr ""
-#: src/common/weechat.c:252
+#: src/common/weechat.c:324
#, c-format
msgid ""
" . description: %s\n"
"\n"
msgstr ""
-#: src/common/weechat.c:258
+#: src/common/weechat.c:330
#, c-format
msgid ""
"Moreover, you can define aliases in [alias] section, by adding lines like:\n"
msgstr ""
-#: src/common/weechat.c:260
+#: src/common/weechat.c:332
#, c-format
msgid ""
"where 'j' is alias name, and 'join' associated command.\n"
"\n"
msgstr ""
-#: src/common/weechat.c:345
+#: src/common/weechat.c:417
#, c-format
msgid "%s default keys:\n"
msgstr ""
-#: src/common/weechat.c:425
+#: src/common/weechat.c:497
#, c-format
msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
msgstr ""
-#: src/common/weechat.c:438
+#: src/common/weechat.c:510
#, c-format
msgid "%s unable to create server ('%s'), ignored\n"
msgstr ""
-#: src/common/weechat.c:447
+#: src/common/weechat.c:519
#, c-format
msgid "%s unknown parameter '%s', ignored\n"
msgstr ""
-#: src/common/weechat.c:467
+#: src/common/weechat.c:539
#, c-format
msgid "%s cannot create directory \"%s\"\n"
msgstr ""
-#: src/common/weechat.c:493
+#: src/common/weechat.c:565
#, c-format
msgid "%s unable to get HOME directory\n"
msgstr ""
-#: src/common/weechat.c:502
+#: src/common/weechat.c:574
#, c-format
msgid "%s not enough memory for home directory\n"
msgstr ""
-#: src/common/weechat.c:512
+#: src/common/weechat.c:584
#, c-format
msgid "%s unable to create ~/.weechat directory\n"
msgstr ""
-#: src/common/weechat.c:564
+#: src/common/weechat.c:636
#, c-format
msgid "%s unable to create ~/.weechat/logs directory\n"
msgstr ""
-#: src/common/weechat.c:607
+#: src/common/weechat.c:679
#, c-format
msgid "%s unable to create/append to log file (~/.weechat/%s)"
msgstr ""
-#: src/common/weechat.c:630
+#: src/common/weechat.c:702
#, c-format
msgid "%sWelcome to "
msgstr ""
-#: src/common/weechat.c:643 src/common/weechat.c:652
+#: src/common/weechat.c:715 src/common/weechat.c:724
msgid "compiled on"
msgstr ""
@@ -3077,906 +3179,911 @@ msgstr ""
msgid "WeeChat Warning:"
msgstr ""
-#: src/common/weeconfig.c:90 src/common/weeconfig.c:91
+#: src/common/weeconfig.c:91 src/common/weeconfig.c:92
msgid "set title for window (terminal for Curses GUI) with name & version"
msgstr ""
-#: src/common/weeconfig.c:94 src/common/weeconfig.c:95
+#: src/common/weeconfig.c:95 src/common/weeconfig.c:96
msgid "display WeeChat logo at startup"
msgstr ""
-#: src/common/weeconfig.c:98 src/common/weeconfig.c:99
+#: src/common/weeconfig.c:99 src/common/weeconfig.c:100
msgid "display WeeChat version at startup"
msgstr ""
-#: src/common/weeconfig.c:102
+#: src/common/weeconfig.c:103
msgid "WeeChat slogan"
msgstr ""
-#: src/common/weeconfig.c:103
+#: src/common/weeconfig.c:104
msgid "WeeChat slogan (if empty, slogan is not used)"
msgstr ""
-#: src/common/weeconfig.c:106
+#: src/common/weeconfig.c:107
msgid "charset for decoding messages from server"
msgstr ""
-#: src/common/weeconfig.c:107
+#: src/common/weeconfig.c:108
msgid ""
"charset for decoding messages from server, examples: UTF-8, ISO-8859-1 (if "
"empty, messages are not converted)"
msgstr ""
-#: src/common/weeconfig.c:110
+#: src/common/weeconfig.c:111
msgid "charset for encoding messages sent to server"
msgstr ""
-#: src/common/weeconfig.c:111
+#: src/common/weeconfig.c:112
msgid ""
"charset for encoding messages sent to server, examples: UFT-8, ISO-8859-1 "
"(if empty, local charset is used)"
msgstr ""
-#: src/common/weeconfig.c:114
+#: src/common/weeconfig.c:115
msgid "internal WeeChat charset (should be ISO)"
msgstr ""
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:116
msgid ""
"internal WeeChat charset, should be ISO-xxxx even if locale is UTF-8 (if "
"empty, local charset is used)"
msgstr ""
-#: src/common/weeconfig.c:118 src/common/weeconfig.c:119
+#: src/common/weeconfig.c:119 src/common/weeconfig.c:120
msgid "timestamp for buffers"
msgstr ""
-#: src/common/weeconfig.c:122 src/common/weeconfig.c:123
+#: src/common/weeconfig.c:123 src/common/weeconfig.c:124
msgid "display nick names with different colors"
msgstr ""
-#: src/common/weeconfig.c:126 src/common/weeconfig.c:127
+#: src/common/weeconfig.c:127 src/common/weeconfig.c:128
msgid "display actions with different colors"
msgstr ""
-#: src/common/weeconfig.c:130 src/common/weeconfig.c:131
+#: src/common/weeconfig.c:131 src/common/weeconfig.c:132
msgid "remove colors from incoming messages"
msgstr ""
-#: src/common/weeconfig.c:134
+#: src/common/weeconfig.c:135
msgid "display nicklist window"
msgstr ""
-#: src/common/weeconfig.c:135
+#: src/common/weeconfig.c:136
msgid "display nicklist window (for channel windows)"
msgstr ""
-#: src/common/weeconfig.c:138
+#: src/common/weeconfig.c:139
msgid "nicklist position"
msgstr ""
-#: src/common/weeconfig.c:139
+#: src/common/weeconfig.c:140
msgid "nicklist position (top, left, right (default), bottom)"
msgstr ""
-#: src/common/weeconfig.c:142
+#: src/common/weeconfig.c:143
msgid "min size for nicklist"
msgstr ""
-#: src/common/weeconfig.c:143
+#: src/common/weeconfig.c:144
msgid ""
"min size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no min size))"
msgstr ""
-#: src/common/weeconfig.c:147
+#: src/common/weeconfig.c:148
msgid "max size for nicklist"
msgstr ""
-#: src/common/weeconfig.c:148
+#: src/common/weeconfig.c:149
msgid ""
"max size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no max size; if min == max and > 0, then size is fixed))"
msgstr ""
-#: src/common/weeconfig.c:152 src/common/weeconfig.c:153
+#: src/common/weeconfig.c:153 src/common/weeconfig.c:154
msgid "text to display instead of nick when not connected"
msgstr ""
-#: src/common/weeconfig.c:156 src/common/weeconfig.c:157
+#: src/common/weeconfig.c:157 src/common/weeconfig.c:158
msgid "display nick mode ((half)op/voice) before each nick"
msgstr ""
-#: src/common/weeconfig.c:160 src/common/weeconfig.c:161
+#: src/common/weeconfig.c:161 src/common/weeconfig.c:162
msgid "display space if nick mode is not (half)op/voice"
msgstr ""
-#: src/common/weeconfig.c:164 src/common/weeconfig.c:165
+#: src/common/weeconfig.c:165 src/common/weeconfig.c:166
msgid "the string inserted after nick completion"
msgstr ""
-#: src/common/weeconfig.c:168 src/common/weeconfig.c:169
+#: src/common/weeconfig.c:169 src/common/weeconfig.c:170
msgid "enable info bar"
msgstr ""
-#: src/common/weeconfig.c:172 src/common/weeconfig.c:173
+#: src/common/weeconfig.c:173 src/common/weeconfig.c:174
msgid "timestamp for time in infobar"
msgstr ""
-#: src/common/weeconfig.c:176 src/common/weeconfig.c:177
+#: src/common/weeconfig.c:177 src/common/weeconfig.c:178
msgid "display seconds in infobar time"
msgstr ""
-#: src/common/weeconfig.c:180
+#: src/common/weeconfig.c:181
msgid "delay (in seconds) for highlight messages in infobar"
msgstr ""
-#: src/common/weeconfig.c:181
+#: src/common/weeconfig.c:182
msgid ""
"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
"notifications in infobar)"
msgstr ""
-#: src/common/weeconfig.c:243 src/common/weeconfig.c:244
+#: src/common/weeconfig.c:244 src/common/weeconfig.c:245
msgid "color for title bar"
msgstr ""
-#: src/common/weeconfig.c:247 src/common/weeconfig.c:248
+#: src/common/weeconfig.c:248 src/common/weeconfig.c:249
msgid "background for title bar"
msgstr ""
-#: src/common/weeconfig.c:253 src/common/weeconfig.c:254
+#: src/common/weeconfig.c:254 src/common/weeconfig.c:255
msgid "color for chat text"
msgstr ""
-#: src/common/weeconfig.c:257
+#: src/common/weeconfig.c:258
msgid "color for time"
msgstr ""
-#: src/common/weeconfig.c:258
+#: src/common/weeconfig.c:259
msgid "color for time in chat window"
msgstr ""
-#: src/common/weeconfig.c:261
+#: src/common/weeconfig.c:262
msgid "color for time separator"
msgstr ""
-#: src/common/weeconfig.c:262
+#: src/common/weeconfig.c:263
msgid "color for time separator (chat window)"
msgstr ""
-#: src/common/weeconfig.c:265 src/common/weeconfig.c:266
+#: src/common/weeconfig.c:266 src/common/weeconfig.c:267
msgid "color for 1st and 3rd char of prefix"
msgstr ""
-#: src/common/weeconfig.c:269 src/common/weeconfig.c:270
+#: src/common/weeconfig.c:270 src/common/weeconfig.c:271
msgid "color for middle char of prefix"
msgstr ""
-#: src/common/weeconfig.c:273 src/common/weeconfig.c:274
+#: src/common/weeconfig.c:274 src/common/weeconfig.c:275
msgid "color for join arrow (prefix)"
msgstr ""
-#: src/common/weeconfig.c:277 src/common/weeconfig.c:278
+#: src/common/weeconfig.c:278 src/common/weeconfig.c:279
msgid "color for part/quit arrow (prefix)"
msgstr ""
-#: src/common/weeconfig.c:281
+#: src/common/weeconfig.c:282
msgid "color for nicks in actions"
msgstr ""
-#: src/common/weeconfig.c:282
+#: src/common/weeconfig.c:283
msgid "color for nicks in actions (chat window)"
msgstr ""
-#: src/common/weeconfig.c:285
+#: src/common/weeconfig.c:286
msgid "color for hostnames"
msgstr ""
-#: src/common/weeconfig.c:286
+#: src/common/weeconfig.c:287
msgid "color for hostnames (chat window)"
msgstr ""
-#: src/common/weeconfig.c:289
+#: src/common/weeconfig.c:290
msgid "color for channel names in actions"
msgstr ""
-#: src/common/weeconfig.c:290
+#: src/common/weeconfig.c:291
msgid "color for channel names in actions (chat window)"
msgstr ""
-#: src/common/weeconfig.c:293
+#: src/common/weeconfig.c:294
msgid "color for dark separators"
msgstr ""
-#: src/common/weeconfig.c:294
+#: src/common/weeconfig.c:295
msgid "color for dark separators (chat window)"
msgstr ""
-#: src/common/weeconfig.c:297
+#: src/common/weeconfig.c:298
msgid "color for highlighted nick"
msgstr ""
-#: src/common/weeconfig.c:298
+#: src/common/weeconfig.c:299
msgid "color for highlighted nick (chat window)"
msgstr ""
-#: src/common/weeconfig.c:301
+#: src/common/weeconfig.c:302
msgid "background for chat"
msgstr ""
-#: src/common/weeconfig.c:302
+#: src/common/weeconfig.c:303
msgid "background for chat window"
msgstr ""
-#: src/common/weeconfig.c:307 src/common/weeconfig.c:308
+#: src/common/weeconfig.c:308 src/common/weeconfig.c:309
msgid "color for status bar"
msgstr ""
-#: src/common/weeconfig.c:311 src/common/weeconfig.c:312
+#: src/common/weeconfig.c:312 src/common/weeconfig.c:313
msgid "color for status bar delimiters"
msgstr ""
-#: src/common/weeconfig.c:315
+#: src/common/weeconfig.c:316
msgid "color for window with new messages"
msgstr ""
-#: src/common/weeconfig.c:316
+#: src/common/weeconfig.c:317
msgid "color for window with new messages (status bar)"
msgstr ""
-#: src/common/weeconfig.c:319
+#: src/common/weeconfig.c:320
msgid "color for window with private message"
msgstr ""
-#: src/common/weeconfig.c:320
+#: src/common/weeconfig.c:321
msgid "color for window with private message (status bar)"
msgstr ""
-#: src/common/weeconfig.c:323
+#: src/common/weeconfig.c:324
msgid "color for window with highlight"
msgstr ""
-#: src/common/weeconfig.c:324
+#: src/common/weeconfig.c:325
msgid "color for window with highlight (status bar)"
msgstr ""
-#: src/common/weeconfig.c:327
+#: src/common/weeconfig.c:328
msgid "color for window with new data (not messages)"
msgstr ""
-#: src/common/weeconfig.c:328
+#: src/common/weeconfig.c:329
msgid "color for window with new data (not messages) (status bar)"
msgstr ""
-#: src/common/weeconfig.c:331
+#: src/common/weeconfig.c:332
msgid "color for \"-MORE-\" text"
msgstr ""
-#: src/common/weeconfig.c:332
+#: src/common/weeconfig.c:333
msgid "color for window with new data (status bar)"
msgstr ""
-#: src/common/weeconfig.c:335 src/common/weeconfig.c:336
+#: src/common/weeconfig.c:336 src/common/weeconfig.c:337
msgid "background for status window"
msgstr ""
-#: src/common/weeconfig.c:341 src/common/weeconfig.c:342
+#: src/common/weeconfig.c:342 src/common/weeconfig.c:343
msgid "color for info bar text"
msgstr ""
-#: src/common/weeconfig.c:345 src/common/weeconfig.c:346
+#: src/common/weeconfig.c:346 src/common/weeconfig.c:347
msgid "color for infobar delimiters"
msgstr ""
-#: src/common/weeconfig.c:349 src/common/weeconfig.c:350
+#: src/common/weeconfig.c:350 src/common/weeconfig.c:351
msgid "color for info bar highlight notification"
msgstr ""
-#: src/common/weeconfig.c:353 src/common/weeconfig.c:354
+#: src/common/weeconfig.c:354 src/common/weeconfig.c:355
msgid "background for info bar window"
msgstr ""
-#: src/common/weeconfig.c:359 src/common/weeconfig.c:360
+#: src/common/weeconfig.c:360 src/common/weeconfig.c:361
msgid "color for input text"
msgstr ""
-#: src/common/weeconfig.c:363 src/common/weeconfig.c:364
+#: src/common/weeconfig.c:364 src/common/weeconfig.c:365
msgid "color for input text (channel name)"
msgstr ""
-#: src/common/weeconfig.c:367 src/common/weeconfig.c:368
+#: src/common/weeconfig.c:368 src/common/weeconfig.c:369
msgid "color for input text (nick name)"
msgstr ""
-#: src/common/weeconfig.c:371 src/common/weeconfig.c:372
+#: src/common/weeconfig.c:372 src/common/weeconfig.c:373
msgid "background for input window"
msgstr ""
-#: src/common/weeconfig.c:377 src/common/weeconfig.c:378
+#: src/common/weeconfig.c:378 src/common/weeconfig.c:379
msgid "color for nicknames"
msgstr ""
-#: src/common/weeconfig.c:381 src/common/weeconfig.c:382
+#: src/common/weeconfig.c:382 src/common/weeconfig.c:383
msgid "color for away nicknames"
msgstr ""
-#: src/common/weeconfig.c:385
+#: src/common/weeconfig.c:386
msgid "color for chan owner symbol"
msgstr ""
-#: src/common/weeconfig.c:386
+#: src/common/weeconfig.c:387
msgid "color for chan owner symbol (specific to unrealircd)"
msgstr ""
-#: src/common/weeconfig.c:389
+#: src/common/weeconfig.c:390
msgid "color for chan admin symbol"
msgstr ""
-#: src/common/weeconfig.c:390
+#: src/common/weeconfig.c:391
msgid "color for chan admin symbol (specific to unrealircd)"
msgstr ""
-#: src/common/weeconfig.c:393 src/common/weeconfig.c:394
+#: src/common/weeconfig.c:394 src/common/weeconfig.c:395
msgid "color for operator symbol"
msgstr ""
-#: src/common/weeconfig.c:397 src/common/weeconfig.c:398
+#: src/common/weeconfig.c:398 src/common/weeconfig.c:399
msgid "color for half-operator symbol"
msgstr ""
-#: src/common/weeconfig.c:401 src/common/weeconfig.c:402
+#: src/common/weeconfig.c:402 src/common/weeconfig.c:403
msgid "color for voice symbol"
msgstr ""
-#: src/common/weeconfig.c:405 src/common/weeconfig.c:406
+#: src/common/weeconfig.c:406 src/common/weeconfig.c:407
msgid "color for '+' when scrolling nicks"
msgstr ""
-#: src/common/weeconfig.c:409 src/common/weeconfig.c:410
+#: src/common/weeconfig.c:410 src/common/weeconfig.c:411
msgid "color for nick separator"
msgstr ""
-#: src/common/weeconfig.c:413 src/common/weeconfig.c:414
+#: src/common/weeconfig.c:414 src/common/weeconfig.c:415
msgid "color for local nick"
msgstr ""
-#: src/common/weeconfig.c:417 src/common/weeconfig.c:418
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
msgid "color for other nick in private window"
msgstr ""
-#: src/common/weeconfig.c:421 src/common/weeconfig.c:422
+#: src/common/weeconfig.c:422 src/common/weeconfig.c:423
msgid "background for nicknames"
msgstr ""
-#: src/common/weeconfig.c:427
+#: src/common/weeconfig.c:428
msgid "color for selected DCC"
msgstr ""
-#: src/common/weeconfig.c:428
+#: src/common/weeconfig.c:429
msgid "color for selected DCC (chat window)"
msgstr ""
-#: src/common/weeconfig.c:431 src/common/weeconfig.c:432
+#: src/common/weeconfig.c:432 src/common/weeconfig.c:433
msgid "color for \"waiting\" dcc status"
msgstr ""
-#: src/common/weeconfig.c:435 src/common/weeconfig.c:436
+#: src/common/weeconfig.c:436 src/common/weeconfig.c:437
msgid "color for \"connecting\" dcc status"
msgstr ""
-#: src/common/weeconfig.c:439 src/common/weeconfig.c:440
+#: src/common/weeconfig.c:440 src/common/weeconfig.c:441
msgid "color for \"active\" dcc status"
msgstr ""
-#: src/common/weeconfig.c:443 src/common/weeconfig.c:444
+#: src/common/weeconfig.c:444 src/common/weeconfig.c:445
msgid "color for \"done\" dcc status"
msgstr ""
-#: src/common/weeconfig.c:447 src/common/weeconfig.c:448
+#: src/common/weeconfig.c:448 src/common/weeconfig.c:449
msgid "color for \"failed\" dcc status"
msgstr ""
-#: src/common/weeconfig.c:451 src/common/weeconfig.c:452
+#: src/common/weeconfig.c:452 src/common/weeconfig.c:453
msgid "color for \"aborted\" dcc status"
msgstr ""
-#: src/common/weeconfig.c:465
+#: src/common/weeconfig.c:466
msgid "max lines in history (per window)"
msgstr ""
-#: src/common/weeconfig.c:466
+#: src/common/weeconfig.c:467
msgid ""
"maximum number of lines in history for one server/channel/private window (0 "
"= unlimited)"
msgstr ""
-#: src/common/weeconfig.c:470
+#: src/common/weeconfig.c:471
msgid "max user commands in history"
msgstr ""
-#: src/common/weeconfig.c:471
+#: src/common/weeconfig.c:472
msgid "maximum number of user commands in history (0 = unlimited)"
msgstr ""
-#: src/common/weeconfig.c:488 src/common/weeconfig.c:489
+#: src/common/weeconfig.c:489 src/common/weeconfig.c:490
msgid "automatically log server messages"
msgstr ""
-#: src/common/weeconfig.c:492 src/common/weeconfig.c:493
+#: src/common/weeconfig.c:493 src/common/weeconfig.c:494
msgid "automatically log channel chats"
msgstr ""
-#: src/common/weeconfig.c:496 src/common/weeconfig.c:497
+#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
msgid "automatically log private chats"
msgstr ""
-#: src/common/weeconfig.c:500 src/common/weeconfig.c:501
+#: src/common/weeconfig.c:501 src/common/weeconfig.c:502
msgid "log messages from plugins (scripts)"
msgstr ""
-#: src/common/weeconfig.c:504
+#: src/common/weeconfig.c:505
msgid "path for log files"
msgstr ""
-#: src/common/weeconfig.c:505
+#: src/common/weeconfig.c:506
msgid "path for WeeChat log files"
msgstr ""
-#: src/common/weeconfig.c:508
+#: src/common/weeconfig.c:509
msgid "timestamp for log"
msgstr ""
-#: src/common/weeconfig.c:509
+#: src/common/weeconfig.c:510
msgid "timestamp for log (see man strftime for date/time specifiers)"
msgstr ""
-#: src/common/weeconfig.c:512 src/common/weeconfig.c:513
+#: src/common/weeconfig.c:513 src/common/weeconfig.c:514
msgid "hide password displayed by nickserv"
msgstr ""
-#: src/common/weeconfig.c:533
+#: src/common/weeconfig.c:534
msgid "display message to all channels when away"
msgstr ""
-#: src/common/weeconfig.c:534
+#: src/common/weeconfig.c:535
msgid "display message to all channels when (un)marking as away"
msgstr ""
-#: src/common/weeconfig.c:537 src/common/weeconfig.c:538
+#: src/common/weeconfig.c:538 src/common/weeconfig.c:539
msgid "default message when away"
msgstr ""
-#: src/common/weeconfig.c:541 src/common/weeconfig.c:542
+#: src/common/weeconfig.c:542 src/common/weeconfig.c:543
msgid "default part message (leaving channel)"
msgstr ""
-#: src/common/weeconfig.c:545
+#: src/common/weeconfig.c:546
msgid "default quit message"
msgstr ""
-#: src/common/weeconfig.c:546
+#: src/common/weeconfig.c:547
msgid ""
"default quit message ('%v' will be replaced by WeeChat version in string)"
msgstr ""
-#: src/common/weeconfig.c:549
+#: src/common/weeconfig.c:550
msgid "interval between two checks for away"
msgstr ""
-#: src/common/weeconfig.c:550
+#: src/common/weeconfig.c:551
msgid "interval between two checks for away (in minutes, 0 = never check)"
msgstr ""
-#: src/common/weeconfig.c:553
+#: src/common/weeconfig.c:554
msgid "interval between two checks for lag"
msgstr ""
-#: src/common/weeconfig.c:554
+#: src/common/weeconfig.c:555
msgid "interval between two checks for lag (in seconds)"
msgstr ""
-#: src/common/weeconfig.c:557
+#: src/common/weeconfig.c:558
msgid "minimum lag to show"
msgstr ""
-#: src/common/weeconfig.c:558
+#: src/common/weeconfig.c:559
msgid "minimum lag to show (in seconds)"
msgstr ""
-#: src/common/weeconfig.c:561
+#: src/common/weeconfig.c:562
msgid "disconnect after important lag"
msgstr ""
-#: src/common/weeconfig.c:562
+#: src/common/weeconfig.c:563
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
msgstr ""
-#: src/common/weeconfig.c:565 src/common/weeconfig.c:566
+#: src/common/weeconfig.c:566 src/common/weeconfig.c:567
msgid "create a FIFO pipe for remote control"
msgstr ""
-#: src/common/weeconfig.c:569
+#: src/common/weeconfig.c:570
msgid "list of words to highlight"
msgstr ""
-#: src/common/weeconfig.c:570
+#: src/common/weeconfig.c:571
msgid ""
"comma separated list of words to highlight (case insensitive comparison)"
msgstr ""
-#: src/common/weeconfig.c:589
+#: src/common/weeconfig.c:590
msgid "automatically accept dcc files"
msgstr ""
-#: src/common/weeconfig.c:590
+#: src/common/weeconfig.c:591
msgid "automatically accept incoming dcc files"
msgstr ""
-#: src/common/weeconfig.c:593
+#: src/common/weeconfig.c:594
msgid "automatically accept dcc chats"
msgstr ""
-#: src/common/weeconfig.c:594
+#: src/common/weeconfig.c:595
msgid "automatically accept dcc chats (use carefully!)"
msgstr ""
-#: src/common/weeconfig.c:597
+#: src/common/weeconfig.c:598
msgid "timeout for dcc request"
msgstr ""
-#: src/common/weeconfig.c:598
+#: src/common/weeconfig.c:599
msgid "timeout for dcc request (in seconds)"
msgstr ""
-#: src/common/weeconfig.c:601
+#: src/common/weeconfig.c:602
msgid "block size for dcc packets"
msgstr ""
-#: src/common/weeconfig.c:602
+#: src/common/weeconfig.c:603
msgid "block size for dcc packets in bytes (default: 65536)"
msgstr ""
-#: src/common/weeconfig.c:605
+#: src/common/weeconfig.c:606
msgid "path for incoming files with dcc"
msgstr ""
-#: src/common/weeconfig.c:606
+#: src/common/weeconfig.c:607
msgid "path for writing incoming files with dcc (default: user home)"
msgstr ""
-#: src/common/weeconfig.c:609
+#: src/common/weeconfig.c:610
msgid "default path for sending files with dcc"
msgstr ""
-#: src/common/weeconfig.c:610
+#: src/common/weeconfig.c:611
msgid ""
"path for reading files when sending thru dcc (when no path is specified)"
msgstr ""
-#: src/common/weeconfig.c:613 src/common/weeconfig.c:614
+#: src/common/weeconfig.c:614 src/common/weeconfig.c:615
msgid "convert spaces to underscores when sending files"
msgstr ""
-#: src/common/weeconfig.c:617
+#: src/common/weeconfig.c:618
msgid "automatically rename dcc files if already exists"
msgstr ""
-#: src/common/weeconfig.c:618
+#: src/common/weeconfig.c:619
msgid "rename incoming files if already exists (add '.1', '.2', ...)"
msgstr ""
-#: src/common/weeconfig.c:621
+#: src/common/weeconfig.c:622
msgid "automatically resume aborted transfers"
msgstr ""
-#: src/common/weeconfig.c:622
+#: src/common/weeconfig.c:623
msgid ""
"automatically resume dcc transfer if connection with remote host is loosed"
msgstr ""
-#: src/common/weeconfig.c:641
+#: src/common/weeconfig.c:642
msgid "use proxy"
msgstr ""
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:643
msgid "use a proxy server to connect to irc server"
msgstr ""
-#: src/common/weeconfig.c:645
+#: src/common/weeconfig.c:646
msgid "proxy type"
msgstr ""
-#: src/common/weeconfig.c:646
+#: src/common/weeconfig.c:647
msgid "proxy type (http (default), socks4, socks5)"
msgstr ""
-#: src/common/weeconfig.c:649
+#: src/common/weeconfig.c:650
msgid "use ipv6 proxy"
msgstr ""
-#: src/common/weeconfig.c:650
+#: src/common/weeconfig.c:651
msgid "connect to proxy in ipv6"
msgstr ""
-#: src/common/weeconfig.c:653
+#: src/common/weeconfig.c:654
msgid "proxy address"
msgstr ""
-#: src/common/weeconfig.c:654
+#: src/common/weeconfig.c:655
msgid "proxy server address (IP or hostname)"
msgstr ""
-#: src/common/weeconfig.c:657
+#: src/common/weeconfig.c:658
msgid "port for proxy"
msgstr ""
-#: src/common/weeconfig.c:658
+#: src/common/weeconfig.c:659
msgid "port for connecting to proxy server"
msgstr ""
-#: src/common/weeconfig.c:661
+#: src/common/weeconfig.c:662
msgid "proxy username"
msgstr ""
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:663
msgid "username for proxy server"
msgstr ""
-#: src/common/weeconfig.c:665
+#: src/common/weeconfig.c:666
msgid "proxy password"
msgstr ""
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:667
msgid "password for proxy server"
msgstr ""
-#: src/common/weeconfig.c:677
+#: src/common/weeconfig.c:678
msgid "server name"
msgstr ""
-#: src/common/weeconfig.c:678
+#: src/common/weeconfig.c:679
msgid "name associated to IRC server (for display only)"
msgstr ""
-#: src/common/weeconfig.c:681
+#: src/common/weeconfig.c:682
msgid "automatically connect to server"
msgstr ""
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:683
msgid "automatically connect to server when WeeChat is starting"
msgstr ""
-#: src/common/weeconfig.c:685
+#: src/common/weeconfig.c:686
msgid "automatically reconnect to server"
msgstr ""
-#: src/common/weeconfig.c:686
+#: src/common/weeconfig.c:687
msgid "automatically reconnect to server when disconnected"
msgstr ""
-#: src/common/weeconfig.c:689
+#: src/common/weeconfig.c:690
msgid "delay before trying again to reconnect"
msgstr ""
-#: src/common/weeconfig.c:690
+#: src/common/weeconfig.c:691
msgid "delay (in seconds) before trying again to reconnect to server"
msgstr ""
-#: src/common/weeconfig.c:693
+#: src/common/weeconfig.c:694
msgid "server address or hostname"
msgstr ""
-#: src/common/weeconfig.c:694
+#: src/common/weeconfig.c:695
msgid "IP address or hostname of IRC server"
msgstr ""
-#: src/common/weeconfig.c:697
+#: src/common/weeconfig.c:698
msgid "port for IRC server"
msgstr ""
-#: src/common/weeconfig.c:698
+#: src/common/weeconfig.c:699
msgid "port for connecting to server"
msgstr ""
-#: src/common/weeconfig.c:701 src/common/weeconfig.c:702
+#: src/common/weeconfig.c:702 src/common/weeconfig.c:703
msgid "use IPv6 protocol for server communication"
msgstr ""
-#: src/common/weeconfig.c:705 src/common/weeconfig.c:706
+#: src/common/weeconfig.c:706 src/common/weeconfig.c:707
msgid "use SSL for server communication"
msgstr ""
-#: src/common/weeconfig.c:709
+#: src/common/weeconfig.c:710
msgid "server password"
msgstr ""
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:711
msgid "password for IRC server"
msgstr ""
-#: src/common/weeconfig.c:713
+#: src/common/weeconfig.c:714
msgid "nickname for server"
msgstr ""
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:715
msgid "nickname to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:717
+#: src/common/weeconfig.c:718
msgid "alternate nickname for server"
msgstr ""
-#: src/common/weeconfig.c:718
+#: src/common/weeconfig.c:719
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr ""
-#: src/common/weeconfig.c:721
+#: src/common/weeconfig.c:722
msgid "2nd alternate nickname for server"
msgstr ""
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:723
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
msgstr ""
-#: src/common/weeconfig.c:725
+#: src/common/weeconfig.c:726
msgid "user name for server"
msgstr ""
-#: src/common/weeconfig.c:726
+#: src/common/weeconfig.c:727
msgid "user name to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:729
+#: src/common/weeconfig.c:730
msgid "real name for server"
msgstr ""
-#: src/common/weeconfig.c:730
+#: src/common/weeconfig.c:731
msgid "real name to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:733 src/common/weeconfig.c:734
+#: src/common/weeconfig.c:734 src/common/weeconfig.c:735
msgid "first command to run when connected to server"
msgstr ""
-#: src/common/weeconfig.c:737
+#: src/common/weeconfig.c:738
msgid "delay (in seconds) after command was executed"
msgstr ""
-#: src/common/weeconfig.c:738
+#: src/common/weeconfig.c:739
msgid ""
"delay (in seconds) after command was executed (example: give some time for "
"authentication)"
msgstr ""
-#: src/common/weeconfig.c:741
+#: src/common/weeconfig.c:742
msgid "list of channels to join when connected to server"
msgstr ""
-#: src/common/weeconfig.c:742
+#: src/common/weeconfig.c:743
msgid ""
"comma separated list of channels to join when connected to server (example: "
"\"#chan1,#chan2,#chan3 #key1,#key2\")"
msgstr ""
-#: src/common/weeconfig.c:745 src/common/weeconfig.c:746
+#: src/common/weeconfig.c:746 src/common/weeconfig.c:747
msgid "automatically rejoin channels when kicked"
msgstr ""
-#: src/common/weeconfig.c:749
+#: src/common/weeconfig.c:750
msgid "notify levels for channels of this server"
msgstr ""
-#: src/common/weeconfig.c:750
+#: src/common/weeconfig.c:751
msgid ""
"comma separated list of notify levels for channels of this server (format: "
"#channel:1,..)"
msgstr ""
-#: src/common/weeconfig.c:1210
+#: src/common/weeconfig.c:1211
#, c-format
msgid "%s %s, line %d: new server, but previous was incomplete\n"
msgstr ""
-#: src/common/weeconfig.c:1219
+#: src/common/weeconfig.c:1220
#, c-format
msgid "%s %s, line %d: server '%s' already exists\n"
msgstr ""
-#: src/common/weeconfig.c:1234
+#: src/common/weeconfig.c:1235
#, c-format
msgid "%s %s, line %d: unable to create server\n"
msgstr ""
-#: src/common/weeconfig.c:1274
+#: src/common/weeconfig.c:1275
#, c-format
msgid "%s unable to assign default int with string (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:1285
+#: src/common/weeconfig.c:1286
#, c-format
msgid "%s unable to assign default color (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:1324
+#: src/common/weeconfig.c:1325
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr ""
-#: src/common/weeconfig.c:1356
+#: src/common/weeconfig.c:1357
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
msgstr ""
-#: src/common/weeconfig.c:1373
+#: src/common/weeconfig.c:1374
#, c-format
msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:1391
+#: src/common/weeconfig.c:1392
#, c-format
msgid "%s %s, line %d: invalid section for option, line is ignored\n"
msgstr ""
-#: src/common/weeconfig.c:1399
+#: src/common/weeconfig.c:1400
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
msgstr ""
-#: src/common/weeconfig.c:1447
+#: src/common/weeconfig.c:1437 src/common/weeconfig.c:1463
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr ""
-#: src/common/weeconfig.c:1458
+#: src/common/weeconfig.c:1443
+#, c-format
+msgid "%s %s, line %d: invalid ignore options \"%s\"\n"
+msgstr ""
+
+#: src/common/weeconfig.c:1474
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
"Expected: boolean value: 'off' or 'on'\n"
msgstr ""
-#: src/common/weeconfig.c:1467
+#: src/common/weeconfig.c:1483
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
"Expected: integer between %d and %d\n"
msgstr ""
-#: src/common/weeconfig.c:1478
+#: src/common/weeconfig.c:1494
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
"Expected: one of these strings: "
msgstr ""
-#: src/common/weeconfig.c:1494
+#: src/common/weeconfig.c:1510
#, c-format
msgid "%s %s, line %d: invalid color name for option '%s'\n"
msgstr ""
-#: src/common/weeconfig.c:1556 src/common/weeconfig.c:1751
+#: src/common/weeconfig.c:1572 src/common/weeconfig.c:1767
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr ""
-#: src/common/weeconfig.c:1562
+#: src/common/weeconfig.c:1578
#, c-format
msgid "%s: creating default config file...\n"
msgstr ""
-#: src/common/weeconfig.c:1563
+#: src/common/weeconfig.c:1579
msgid "Creating default config file\n"
msgstr ""
-#: src/common/weeconfig.c:1566 src/common/weeconfig.c:1760
+#: src/common/weeconfig.c:1582 src/common/weeconfig.c:1776
#, c-format
msgid ""
"#\n"
"# %s configuration file, created by %s v%s on %s#\n"
msgstr ""
-#: src/common/weeconfig.c:1757
+#: src/common/weeconfig.c:1773
msgid "Saving config to disk\n"
msgstr ""
diff --git a/src/common/command.c b/src/common/command.c
index 073ed2a82..d47bb9265 100644
--- a/src/common/command.c
+++ b/src/common/command.c
@@ -72,6 +72,16 @@ t_weechat_command weechat_commands[] =
{ "help", N_("display help about commands"),
N_("[command]"), N_("command: name of a WeeChat or IRC command"),
0, 1, weechat_cmd_help, NULL },
+ { "ignore", N_("ignore IRC messages and/or hosts"),
+ N_("[mask [[type | command] [channel [server]]]]"),
+ N_(" mask: nick or host mask to ignore\n"
+ " type: type of message to ignore (action, ctcp, dcc, pv)\n"
+ "command: IRC command\n"
+ "channel: name of channel for ignore\n"
+ " server: name of server for ignore\n\n"
+ "For each argument, '*' means all.\n"
+ "Without argument, /ignore command lists all defined ignore."),
+ 0, 4, weechat_cmd_ignore, NULL },
{ "key", N_("bind/unbind keys"),
N_("[key function/command] [unbind key] [functions] [reset -yes]"),
N_("key: bind this key to an internal function or a command (beginning by \"/\")\n"
@@ -81,17 +91,17 @@ t_weechat_command weechat_commands[] =
0, MAX_ARGS, NULL, weechat_cmd_key },
{ "perl", N_("list/load/unload Perl scripts"),
N_("[load filename] | [autoload] | [reload] | [unload]"),
- N_("filename: Perl script (file) to load\n"
+ N_("filename: Perl script (file) to load\n\n"
"Without argument, /perl command lists all loaded Perl scripts."),
0, 2, weechat_cmd_perl, NULL },
{ "python", N_("list/load/unload Python scripts"),
N_("[load filename] | [autoload] | [reload] | [unload]"),
- N_("filename: Python script (file) to load\n"
+ N_("filename: Python script (file) to load\n\n"
"Without argument, /python command lists all loaded Python scripts."),
0, 2, weechat_cmd_python, NULL },
{ "ruby", N_("list/load/unload Ruby scripts"),
N_("[load filename] | [autoload] | [reload] | [unload]"),
- N_("filename: Ruby script (file) to load\n"
+ N_("filename: Ruby script (file) to load\n\n"
"Without argument, /ruby command lists all loaded Ruby scripts."),
0, 2, weechat_cmd_ruby, NULL },
{ "server", N_("list, add or remove servers"),
@@ -121,6 +131,17 @@ t_weechat_command weechat_commands[] =
{ "unalias", N_("remove an alias"),
N_("alias_name"), N_("alias_name: name of alias to remove"),
1, 1, NULL, weechat_cmd_unalias },
+ { "unignore", N_("unignore IRC messages and/or hosts"),
+ N_("[number | [mask [[type | command] [channel [server]]]]]"),
+ N_(" number: # of ignore to unignore (number is displayed by list of ignore)\n"
+ " mask: nick or host mask to unignore\n"
+ " type: type of message to unignore (action, ctcp, dcc, pv)\n"
+ "command: IRC command\n"
+ "channel: name of channel for unignore\n"
+ " server: name of server for unignore\n\n"
+ "For each argument, '*' means all.\n"
+ "Without argument, /unignore command lists all defined ignore."),
+ 0, 4, weechat_cmd_unignore, NULL },
{ "window", N_("manage windows"),
N_("[list | splith | splitv | [merge [down | up | left | right | all]]]"),
N_("list: list opened windows (no parameter implies this list)\n"
@@ -874,6 +895,11 @@ weechat_cmd_buffer_display_info (t_gui_buffer *buffer)
"%s", SERVER(buffer)->name);
gui_printf (NULL, ")\n");
}
+ else
+ {
+ gui_printf (NULL, _("not connected"));
+ gui_printf (NULL, "\n");
+ }
}
/*
@@ -1352,6 +1378,93 @@ weechat_cmd_help (int argc, char **argv)
}
/*
+ * weechat_cmd_ignore_display: display an ignore entry
+ */
+
+void
+weechat_cmd_ignore_display (char *text, t_irc_ignore *ptr_ignore)
+{
+ if (text)
+ gui_printf (NULL, "%s ", text);
+
+ gui_printf (NULL, _("on"));
+ gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, " %s", ptr_ignore->server_name);
+ gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "/");
+ gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s", ptr_ignore->channel_name);
+ gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, ":");
+ gui_printf (NULL, _(" ignoring "));
+ gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s", ptr_ignore->type);
+ gui_printf (NULL, _(" from "));
+ gui_printf_color (NULL, COLOR_WIN_CHAT_HOST, "%s\n", ptr_ignore->mask);
+}
+
+/*
+ * weechat_cmd_ignore: ignore IRC commands and/or hosts
+ */
+
+int
+weechat_cmd_ignore (int argc, char **argv)
+{
+ t_irc_ignore *ptr_ignore;
+ int i;
+
+ ptr_ignore = NULL;
+ switch (argc)
+ {
+ case 0:
+ /* List all ignore */
+ if (irc_ignore)
+ {
+ gui_printf (NULL, "\n");
+ gui_printf (NULL, _("List of ignore:\n"));
+ i = 0;
+ for (ptr_ignore = irc_ignore; ptr_ignore;
+ ptr_ignore = ptr_ignore->next_ignore)
+ {
+ i++;
+ gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "[");
+ gui_printf (NULL, "%d", i);
+ gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "] ");
+ weechat_cmd_ignore_display (NULL, ptr_ignore);
+ }
+ }
+ else
+ {
+ irc_display_prefix (NULL, PREFIX_INFO);
+ gui_printf (NULL, _("No ignore defined.\n"));
+ }
+ return 0;
+ break;
+ case 1:
+ ptr_ignore = ignore_add (argv[0], "*", "*",
+ (SERVER(gui_current_window->buffer)) ?
+ SERVER(gui_current_window->buffer)->name : "*");
+ break;
+ case 2:
+ ptr_ignore = ignore_add (argv[0], argv[1], "*",
+ (SERVER(gui_current_window->buffer)) ?
+ SERVER(gui_current_window->buffer)->name : "*");
+ break;
+ case 3:
+ ptr_ignore = ignore_add (argv[0], argv[1], argv[2],
+ (SERVER(gui_current_window->buffer)) ?
+ SERVER(gui_current_window->buffer)->name : "*");
+ break;
+ case 4:
+ ptr_ignore = ignore_add (argv[0], argv[1], argv[2], argv[3]);
+ break;
+ }
+ if (ptr_ignore)
+ {
+ gui_printf (NULL, "\n");
+ weechat_cmd_ignore_display (_("New ignore:"), ptr_ignore);
+ return 0;
+ }
+ else
+ return -1;
+}
+
+/*
* weechat_cmd_key_display: display a key binding
*/
@@ -2410,7 +2523,7 @@ weechat_cmd_set (char *arguments)
{
section_displayed = 0;
if ((i != CONFIG_SECTION_KEYS) && (i != CONFIG_SECTION_ALIAS)
- && (i != CONFIG_SECTION_SERVER))
+ && (i != CONFIG_SECTION_IGNORE) && (i != CONFIG_SECTION_SERVER))
{
for (j = 0; weechat_options[i][j].option_name; j++)
{
@@ -2520,6 +2633,69 @@ weechat_cmd_unalias (char *arguments)
}
/*
+ * weechat_cmd_unignore: unignore IRC commands and/or hosts
+ */
+
+int
+weechat_cmd_unignore (int argc, char **argv)
+{
+ char *error;
+ int number, ret;
+
+ ret = 0;
+ switch (argc)
+ {
+ case 0:
+ /* List all ignore */
+ weechat_cmd_ignore (argc, argv);
+ return 0;
+ break;
+ case 1:
+ error = NULL;
+ number = strtol (argv[0], &error, 10);
+ if ((error) && (error[0] == '\0'))
+ ret = ignore_search_free_by_number (number);
+ else
+ ret = ignore_search_free (argv[0], "*", "*",
+ (SERVER(gui_current_window->buffer)) ?
+ SERVER(gui_current_window->buffer)->name : "*");
+ break;
+ case 2:
+ ret = ignore_search_free (argv[0], argv[1], "*",
+ (SERVER(gui_current_window->buffer)) ?
+ SERVER(gui_current_window->buffer)->name : "*");
+ break;
+ case 3:
+ ret = ignore_search_free (argv[0], argv[1], argv[2],
+ (SERVER(gui_current_window->buffer)) ?
+ SERVER(gui_current_window->buffer)->name : "*");
+ break;
+ case 4:
+ ret = ignore_search_free (argv[0], argv[1], argv[2], argv[3]);
+ break;
+ }
+
+ if (ret)
+ {
+ irc_display_prefix (NULL, PREFIX_INFO);
+ gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%d ", ret);
+ if (ret > 1)
+ gui_printf (NULL, _("ignore were removed.\n"));
+ else
+ gui_printf (NULL, _("ignore was removed.\n"));
+ }
+ else
+ {
+ irc_display_prefix (NULL, PREFIX_ERROR);
+ gui_printf (NULL, _("%s no ignore found\n"),
+ WEECHAT_ERROR);
+ return -1;
+ }
+
+ return 0;
+}
+
+/*
* weechat_cmd_window: manage windows
*/
diff --git a/src/common/command.h b/src/common/command.h
index 35c19bc5e..698290750 100644
--- a/src/common/command.h
+++ b/src/common/command.h
@@ -69,6 +69,8 @@ extern int weechat_cmd_connect (int, char **);
extern int weechat_cmd_debug (int, char **);
extern int weechat_cmd_disconnect (int, char **);
extern int weechat_cmd_help (int, char **);
+extern void weechat_cmd_ignore_display (char *, t_irc_ignore *);
+extern int weechat_cmd_ignore (int, char **);
extern int weechat_cmd_key (char *);
extern int weechat_cmd_perl (int, char **);
extern int weechat_cmd_python (int, char **);
@@ -77,6 +79,7 @@ extern int weechat_cmd_save (int, char **);
extern int weechat_cmd_server (int, char **);
extern int weechat_cmd_set (char *);
extern int weechat_cmd_unalias (char *);
+extern int weechat_cmd_unignore (int, char **);
extern int weechat_cmd_unset (char *);
extern int weechat_cmd_window (int, char **);
diff --git a/src/common/completion.c b/src/common/completion.c
index 41be8e894..a8c56461b 100644
--- a/src/common/completion.c
+++ b/src/common/completion.c
@@ -102,6 +102,7 @@ completion_build_list (t_completion *completion, void *channel)
int i, j;
t_irc_server *ptr_server;
t_irc_channel *ptr_channel;
+ t_irc_nick *ptr_nick;
char *pos, option_name[256], *string;
t_weechat_alias *ptr_alias;
t_config_option *option;
@@ -201,6 +202,88 @@ completion_build_list (t_completion *completion, void *channel)
}
return;
}
+ if (ascii_strcasecmp (completion->base_command, "ignore") == 0)
+ {
+ /* arg 1: nicks of current channel and "*" */
+ if (completion->base_command_arg == 1)
+ {
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ "*");
+ if (channel)
+ {
+ if (((t_irc_channel *)channel)->type == CHAT_CHANNEL)
+ {
+ for (ptr_nick = ((t_irc_channel *)channel)->nicks; ptr_nick;
+ ptr_nick = ptr_nick->next_nick)
+ {
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ ptr_nick->nick);
+ }
+ }
+ if (((t_irc_channel *)channel)->type == CHAT_PRIVATE)
+ {
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ ((t_irc_channel *)channel)->name);
+ }
+ }
+ return;
+ }
+
+ /* arg 2: type / command and "*" */
+ if (completion->base_command_arg == 2)
+ {
+ weelist_add(&completion->completion_list,
+ &completion->last_completion,
+ "*");
+ i = 0;
+ while (ignore_types[i])
+ {
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ ignore_types[i]);
+ i++;
+ }
+ i = 0;
+ while (irc_commands[i].command_name)
+ {
+ if (irc_commands[i].recv_function)
+ weelist_add(&completion->completion_list,
+ &completion->last_completion,
+ irc_commands[i].command_name);
+ i++;
+ }
+ return;
+ }
+
+ /* arg 3: channel and "*" */
+ if (completion->base_command_arg == 3)
+ {
+ weelist_add(&completion->completion_list,
+ &completion->last_completion,
+ "*");
+ if (((t_irc_channel *)channel)->type == CHAT_CHANNEL)
+ weelist_add(&completion->completion_list,
+ &completion->last_completion,
+ ((t_irc_channel *)channel)->name);
+ return;
+ }
+
+ /* arg 4: server */
+ if (completion->base_command_arg == 4)
+ {
+ weelist_add(&completion->completion_list,
+ &completion->last_completion,
+ "*");
+ if (SERVER(gui_current_window->buffer))
+ weelist_add(&completion->completion_list,
+ &completion->last_completion,
+ SERVER(gui_current_window->buffer)->name);
+ return;
+ }
+ }
if (ascii_strcasecmp (completion->base_command, "key") == 0)
{
if (completion->base_command_arg == 1)
@@ -254,7 +337,7 @@ completion_build_list (t_completion *completion, void *channel)
for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
{
if ((i != CONFIG_SECTION_KEYS) && (i != CONFIG_SECTION_ALIAS)
- && (i != CONFIG_SECTION_SERVER))
+ && (i != CONFIG_SECTION_IGNORE) && (i != CONFIG_SECTION_SERVER))
{
for (j = 0; weechat_options[i][j].option_name; j++)
{
diff --git a/src/common/weechat.c b/src/common/weechat.c
index f0ed84597..b5c275508 100644
--- a/src/common/weechat.c
+++ b/src/common/weechat.c
@@ -844,6 +844,9 @@ wee_dump (int crash)
wee_log_printf ("\n");
gui_buffer_print_log (ptr_buffer);
}
+
+ wee_log_printf ("\n");
+ ignore_print_log ();
wee_log_printf ("\n");
wee_log_printf ("****** End of dump ******\n");
diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c
index 2b181d1ae..6aeb9761f 100644
--- a/src/common/weeconfig.c
+++ b/src/common/weeconfig.c
@@ -55,6 +55,7 @@ t_config_section config_sections[CONFIG_NUMBER_SECTIONS] =
{ CONFIG_SECTION_PROXY, "proxy" },
{ CONFIG_SECTION_KEYS, "keys" },
{ CONFIG_SECTION_ALIAS, "alias" },
+ { CONFIG_SECTION_IGNORE, "ignore" },
{ CONFIG_SECTION_SERVER, "server" }
};
@@ -758,7 +759,7 @@ t_config_option weechat_options_server[] =
t_config_option *weechat_options[CONFIG_NUMBER_SECTIONS] =
{ weechat_options_look, weechat_options_colors, weechat_options_history,
weechat_options_log, weechat_options_irc, weechat_options_dcc,
- weechat_options_proxy, NULL, NULL, weechat_options_server
+ weechat_options_proxy, NULL, NULL, NULL, weechat_options_server
};
@@ -795,7 +796,7 @@ config_get_section (t_config_option *ptr_option)
for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
{
if ((i != CONFIG_SECTION_KEYS) && (i != CONFIG_SECTION_ALIAS)
- && (i != CONFIG_SECTION_SERVER))
+ && (i != CONFIG_SECTION_IGNORE) && (i != CONFIG_SECTION_SERVER))
{
for (j = 0; weechat_options[i][j].option_name; j++)
{
@@ -1090,7 +1091,7 @@ config_option_search (char *option_name)
for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
{
if ((i != CONFIG_SECTION_KEYS) && (i != CONFIG_SECTION_ALIAS)
- && (i != CONFIG_SECTION_SERVER))
+ && (i != CONFIG_SECTION_IGNORE) && (i != CONFIG_SECTION_SERVER))
{
for (j = 0; weechat_options[i][j].option_name; j++)
{
@@ -1254,7 +1255,7 @@ config_default_values ()
for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
{
if ((i != CONFIG_SECTION_KEYS) && (i != CONFIG_SECTION_ALIAS)
- && (i != CONFIG_SECTION_SERVER))
+ && (i != CONFIG_SECTION_IGNORE) && (i != CONFIG_SECTION_SERVER))
{
for (j = 0; weechat_options[i][j].option_name; j++)
{
@@ -1428,6 +1429,21 @@ config_read ()
if (alias_new (line, pos))
weelist_add (&index_commands, &last_index_command, line);
}
+ else if (section == CONFIG_SECTION_IGNORE)
+ {
+ /* create new ignore */
+ if (ascii_strcasecmp (line, "ignore") != 0)
+ gui_printf (NULL,
+ _("%s %s, line %d: invalid option \"%s\"\n"),
+ WEECHAT_WARNING, filename, line_number, line);
+ else
+ {
+ if (!ignore_add_from_config (pos))
+ gui_printf (NULL,
+ _("%s %s, line %d: invalid ignore options \"%s\"\n"),
+ WEECHAT_WARNING, filename, line_number, pos);
+ }
+ }
else
{
option_number = -1;
@@ -1571,7 +1587,7 @@ config_create_default ()
for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
{
if ((i != CONFIG_SECTION_KEYS) && (i != CONFIG_SECTION_ALIAS)
- && (i != CONFIG_SECTION_SERVER))
+ && (i != CONFIG_SECTION_IGNORE) && (i != CONFIG_SECTION_SERVER))
{
fprintf (file, "\n[%s]\n", config_sections[i].section_name);
for (j = 0; weechat_options[i][j].option_name; j++)
@@ -1623,7 +1639,6 @@ config_create_default ()
}
/* default aliases */
- /* TODO: remove comments when missing commands will be ok */
fprintf (file, "\n[alias]\n");
fprintf (file, "SAY=msg *\n");
fprintf (file, "BYE=quit\n");
@@ -1633,12 +1648,10 @@ config_create_default ()
fprintf (file, "CL=clear\n");
fprintf (file, "CLOSE=buffer close\n");
fprintf (file, "CHAT=dcc chat\n");
- fprintf (file, "# GET=dcc get\n");
- fprintf (file, "# IG=ignore\n");
+ fprintf (file, "IG=ignore\n");
fprintf (file, "J=join\n");
fprintf (file, "K=kick\n");
fprintf (file, "KB=kickban\n");
- fprintf (file, "# KN=knockout\n");
fprintf (file, "LEAVE=part\n");
fprintf (file, "M=msg\n");
fprintf (file, "MUB=unban *\n");
@@ -1646,12 +1659,14 @@ config_create_default ()
fprintf (file, "Q=query\n");
fprintf (file, "T=topic\n");
fprintf (file, "UB=unban\n");
- fprintf (file, "# UNIG=unignore\n");
+ fprintf (file, "UNIG=unignore\n");
fprintf (file, "W=who\n");
fprintf (file, "WC=part\n");
fprintf (file, "WI=whois\n");
fprintf (file, "WW=whowas\n");
+ /* no ignore by default */
+
/* default server is freenode */
fprintf (file, "\n[server]\n");
fprintf (file, "server_name=freenode\n");
@@ -1730,6 +1745,7 @@ config_write (char *config_name)
time_t current_time;
t_irc_server *ptr_server;
t_weechat_alias *ptr_alias;
+ t_irc_ignore *ptr_ignore;
t_gui_key *ptr_key;
char *expanded_name, *function_name;
@@ -1765,7 +1781,7 @@ config_write (char *config_name)
for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
{
if ((i != CONFIG_SECTION_KEYS) && (i != CONFIG_SECTION_ALIAS)
- && (i != CONFIG_SECTION_SERVER))
+ && (i != CONFIG_SECTION_IGNORE) && (i != CONFIG_SECTION_SERVER))
{
fprintf (file, "\n[%s]\n", config_sections[i].section_name);
for (j = 0; weechat_options[i][j].option_name; j++)
@@ -1842,6 +1858,18 @@ config_write (char *config_name)
ptr_alias->alias_name, ptr_alias->alias_command + 1);
}
+ /* ignore section */
+ fprintf (file, "\n[ignore]\n");
+ for (ptr_ignore = irc_ignore; ptr_ignore;
+ ptr_ignore = ptr_ignore->next_ignore)
+ {
+ fprintf (file, "ignore=%s,%s,%s,%s\n",
+ ptr_ignore->mask,
+ ptr_ignore->type,
+ ptr_ignore->channel_name,
+ ptr_ignore->server_name);
+ }
+
/* server section */
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
diff --git a/src/common/weeconfig.h b/src/common/weeconfig.h
index b760a8857..27119cc0b 100644
--- a/src/common/weeconfig.h
+++ b/src/common/weeconfig.h
@@ -35,8 +35,9 @@
#define CONFIG_SECTION_PROXY 6
#define CONFIG_SECTION_KEYS 7
#define CONFIG_SECTION_ALIAS 8
-#define CONFIG_SECTION_SERVER 9
-#define CONFIG_NUMBER_SECTIONS 10
+#define CONFIG_SECTION_IGNORE 9
+#define CONFIG_SECTION_SERVER 10
+#define CONFIG_NUMBER_SECTIONS 11
#define OPTION_TYPE_BOOLEAN 1 /* values: on/off */
#define OPTION_TYPE_INT 2 /* values: from min to max */
diff --git a/src/irc/Makefile.am b/src/irc/Makefile.am
index 50bd43cc6..d916bf345 100644
--- a/src/irc/Makefile.am
+++ b/src/irc/Makefile.am
@@ -27,4 +27,5 @@ lib_weechat_irc_a_SOURCES = irc.h \
irc-channel.c \
irc-nick.c \
irc-dcc.c \
+ irc-ignore.c \
irc-display.c
diff --git a/src/irc/irc-channel.c b/src/irc/irc-channel.c
index 6aec9902f..86028f952 100644
--- a/src/irc/irc-channel.c
+++ b/src/irc/irc-channel.c
@@ -143,7 +143,10 @@ t_irc_channel *
channel_search (t_irc_server *server, char *channel_name)
{
t_irc_channel *ptr_channel;
-
+
+ if (!server || !channel_name)
+ return NULL;
+
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
@@ -162,6 +165,9 @@ string_is_channel (char *string)
{
char first_char[2];
+ if (!string)
+ return 0;
+
first_char[0] = string[0];
first_char[1] = '\0';
return (strpbrk (first_char, CHANNEL_PREFIX)) ? 1 : 0;
diff --git a/src/irc/irc-commands.c b/src/irc/irc-commands.c
index 8d745090a..c9fafd06b 100644
--- a/src/irc/irc-commands.c
+++ b/src/irc/irc-commands.c
@@ -384,8 +384,6 @@ t_irc_command irc_commands[] =
"", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
{ "406", N_("was no such nick"),
"", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
- { "406", N_("was no such nick"),
- "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
{ "407", N_("was no such nick"),
"", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
{ "409", N_("no origin"),
diff --git a/src/irc/irc-ignore.c b/src/irc/irc-ignore.c
new file mode 100644
index 000000000..bf29d0684
--- /dev/null
+++ b/src/irc/irc-ignore.c
@@ -0,0 +1,475 @@
+/*
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* irc-ignore.c: manages IRC ignore list */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "../common/weechat.h"
+#include "irc.h"
+#include "../common/command.h"
+
+
+char *ignore_types[] =
+{ IGNORE_ACTION, IGNORE_CTCP, IGNORE_DCC, IGNORE_PRIVATE, NULL };
+
+t_irc_ignore *irc_ignore = NULL;
+t_irc_ignore *last_irc_ignore = NULL;
+
+
+/*
+ * ignore_check_mask: returns 1 is mask1 and mask2 are the same host
+ * anyone or both strings may have user and/or host after
+ */
+
+int
+ignore_check_mask (char *mask1, char *mask2)
+{
+ char *m1, *m2, *pos;
+ int match;
+
+ if (!mask1 || !mask1[0] || !mask2 || !mask2[0])
+ return 0;
+
+ m1 = strdup (mask1);
+ m2 = strdup (mask2);
+
+ pos = strchr (m1, '!');
+ if (!pos)
+ {
+ /* remove '!' from m2 */
+ pos = strchr (m2, '!');
+ if (pos)
+ pos[0] = '\0';
+ }
+ pos = strchr (m2, '!');
+ if (!pos)
+ {
+ /* remove '!' from m1 */
+ pos = strchr (m1, '!');
+ if (pos)
+ pos[0] = '\0';
+ }
+
+ /* TODO: use regexp to match both masks */
+ match = ascii_strcasecmp (m1, m2);
+
+ free (m1);
+ free (m2);
+
+ return (match == 0);
+}
+
+/*
+ * ignore_match: check if pointed ignore matches with arguments
+ */
+
+int
+ignore_match (t_irc_ignore *ptr_ignore, char *mask, char *type, char *channel_name, char *server_name)
+{
+ /* check mask */
+ if ((strcmp (mask, "*") != 0) && (strcmp (ptr_ignore->mask, "*") != 0)
+ && (!ignore_check_mask (ptr_ignore->mask, mask)))
+ return 0;
+
+ /* mask is matching, go on with type */
+ if ((strcmp (type, "*") != 0) && (strcmp (ptr_ignore->type, "*") != 0)
+ && (ascii_strcasecmp (ptr_ignore->type, type) != 0))
+ return 0;
+
+ /* mask and type matching, go on with server */
+ if (server_name && server_name[0])
+ {
+ if ((strcmp (server_name, "*") != 0) && (strcmp (ptr_ignore->server_name, "*") != 0)
+ && (ascii_strcasecmp (ptr_ignore->server_name, server_name) != 0))
+ return 0;
+ }
+ else
+ {
+ if (strcmp (ptr_ignore->server_name, "*") != 0)
+ return 0;
+ }
+
+ /* mask, type and server matching, go on with channel */
+ if (channel_name && channel_name[0])
+ {
+ if ((strcmp (channel_name, "*") != 0) && (strcmp (ptr_ignore->channel_name, "*") != 0)
+ && (ascii_strcasecmp (ptr_ignore->channel_name, channel_name) != 0))
+ return 0;
+ }
+ else
+ {
+ if (strcmp (ptr_ignore->channel_name, "*") != 0)
+ return 0;
+ }
+
+ /* all is matching => we find a ignore! */
+ return 1;
+}
+
+/*
+ * ignore_check: check if an ignore is set for arguments
+ * returns 1 if at least one ignore exists (message should NOT be displayed)
+ * 0 if no ignore found (message will be displayed)
+ */
+
+int
+ignore_check (char *mask, char *type, char *channel_name, char *server_name)
+{
+ t_irc_ignore *ptr_ignore;
+
+ if (!mask || !mask[0] || !type || !type[0])
+ return 0;
+
+ for (ptr_ignore = irc_ignore; ptr_ignore;
+ ptr_ignore = ptr_ignore->next_ignore)
+ {
+ if (ignore_match (ptr_ignore, mask, type, channel_name, server_name))
+ return 1;
+ }
+
+ /* no ignore found */
+ return 0;
+}
+
+/*
+ * ignore_search: search for an ignore
+ */
+
+t_irc_ignore *
+ignore_search (char *mask, char *type, char *channel_name, char *server_name)
+{
+ t_irc_ignore *ptr_ignore;
+
+ for (ptr_ignore = irc_ignore; ptr_ignore;
+ ptr_ignore = ptr_ignore->next_ignore)
+ {
+ if ((ascii_strcasecmp (ptr_ignore->mask, mask) == 0)
+ && (ascii_strcasecmp (ptr_ignore->type, type) == 0)
+ && (ascii_strcasecmp (ptr_ignore->channel_name, channel_name) == 0)
+ && (ascii_strcasecmp (ptr_ignore->server_name, server_name) == 0))
+ return ptr_ignore;
+ }
+
+ /* ignore not found */
+ return NULL;
+}
+
+/*
+ * ignore_add: add an ignore in list
+ */
+
+t_irc_ignore *
+ignore_add (char *mask, char *type, char *channel_name, char *server_name)
+{
+ int i, type_index;
+ t_irc_command *command_ptr;
+ t_irc_ignore *new_ignore;
+
+ if (!mask || !mask[0] || !type || !type[0] || !channel_name || !channel_name[0]
+ || !server_name || !server_name[0])
+ {
+ gui_printf (NULL,
+ _("%s too few arguments for ignore\n"),
+ WEECHAT_ERROR);
+ return NULL;
+ }
+
+#ifdef DEBUG
+ wee_log_printf ("Adding ignore: mask:'%s', type:'%s', channel:'%s', server:'%s'\n",
+ mask, type, channel_name, server_name);
+#endif
+
+ type_index = -1;
+ command_ptr = NULL;
+
+ if ((strcmp (mask, "*") == 0) && (strcmp (type, "*") == 0))
+ {
+ irc_display_prefix (NULL, PREFIX_ERROR);
+ gui_printf (NULL,
+ _("%s mask or type/command should be non generic value for ignore\n"),
+ WEECHAT_ERROR);
+ return NULL;
+ }
+
+ if (ignore_search (mask, type, channel_name, server_name))
+ {
+ irc_display_prefix (NULL, PREFIX_ERROR);
+ gui_printf (NULL,
+ _("%s ignore already exists\n"),
+ WEECHAT_ERROR);
+ return NULL;
+ }
+
+ if (strcmp (type, "*") != 0)
+ {
+ /* look for type in pre-defined ignore types */
+ for (i = 0; ignore_types[i]; i++)
+ {
+ if (ascii_strcasecmp (type, ignore_types[i]) == 0)
+ {
+ type_index = i;
+ break;
+ }
+ }
+
+ /* not a pre-defined ignore type, so it MUST be an IRC command */
+ if (type_index < 0)
+ {
+ for (i = 0; irc_commands[i].command_name; i++)
+ {
+ if (irc_commands[i].recv_function &&
+ (ascii_strcasecmp (type, irc_commands[i].command_name) == 0))
+ {
+ command_ptr = &irc_commands[i];
+ break;
+ }
+ }
+ }
+
+ /* not a pre-defined command and not an IRC command => error */
+ if ((type_index < 0) && (!command_ptr))
+ {
+ irc_display_prefix (NULL, PREFIX_ERROR);
+ gui_printf (NULL,
+ _("%s unknown type or IRC command \"%s\" for ignore\n"),
+ WEECHAT_ERROR, type);
+ return NULL;
+ }
+ }
+
+ /* create new ignore */
+ new_ignore = (t_irc_ignore *) malloc (sizeof (t_irc_ignore));
+ if (new_ignore)
+ {
+ new_ignore->mask = strdup (mask);
+ new_ignore->type = strdup (type);
+ new_ignore->server_name = strdup (server_name);
+ new_ignore->channel_name = strdup (channel_name);
+
+ /* add new ignore to queue */
+ new_ignore->prev_ignore = last_irc_ignore;
+ new_ignore->next_ignore = NULL;
+ if (irc_ignore)
+ last_irc_ignore->next_ignore = new_ignore;
+ else
+ irc_ignore = new_ignore;
+ last_irc_ignore = new_ignore;
+ }
+ else
+ {
+ irc_display_prefix (NULL, PREFIX_ERROR);
+ gui_printf (NULL,
+ _("%s not enough memory to create ignore\n"),
+ WEECHAT_ERROR);
+ return NULL;
+ }
+
+ return new_ignore;
+}
+
+/*
+ * ignore_add_from_config: add an ignore to list, read from config file
+ * (comma serparated values)
+ */
+
+t_irc_ignore *
+ignore_add_from_config (char *string)
+{
+ t_irc_ignore *new_ignore;
+ char *string2;
+ char *pos_mask, *pos_type, *pos_channel, *pos_server;
+
+ if (!string || !string[0])
+ return NULL;
+
+ new_ignore = NULL;
+ string2 = strdup (string);
+
+ pos_mask = string2;
+ pos_type = strchr (pos_mask, ',');
+ if (pos_type)
+ {
+ pos_type[0] = '\0';
+ pos_type++;
+ pos_channel = strchr (pos_type, ',');
+ if (pos_channel)
+ {
+ pos_channel[0] = '\0';
+ pos_channel++;
+ pos_server = strchr (pos_channel, ',');
+ if (pos_server)
+ {
+ pos_server[0] = '\0';
+ pos_server++;
+ new_ignore = ignore_add (pos_mask, pos_type, pos_channel, pos_server);
+ }
+ }
+ }
+
+ free (string2);
+ return new_ignore;
+}
+
+/*
+ * ignore_free: free an ignore
+ */
+
+void
+ignore_free (t_irc_ignore *ptr_ignore)
+{
+ t_irc_ignore *new_irc_ignore;
+
+ /* free data */
+ if (ptr_ignore->mask)
+ free (ptr_ignore->mask);
+ if (ptr_ignore->type)
+ free (ptr_ignore->type);
+ if (ptr_ignore->channel_name)
+ free (ptr_ignore->channel_name);
+ if (ptr_ignore->server_name)
+ free (ptr_ignore->server_name);
+
+ /* remove ignore from queue */
+ if (last_irc_ignore == ptr_ignore)
+ last_irc_ignore = ptr_ignore->prev_ignore;
+ if (ptr_ignore->prev_ignore)
+ {
+ (ptr_ignore->prev_ignore)->next_ignore = ptr_ignore->next_ignore;
+ new_irc_ignore = irc_ignore;
+ }
+ else
+ new_irc_ignore = ptr_ignore->next_ignore;
+
+ if (ptr_ignore->next_ignore)
+ (ptr_ignore->next_ignore)->prev_ignore = ptr_ignore->prev_ignore;
+
+ free (ptr_ignore);
+ irc_ignore = new_irc_ignore;
+}
+
+/*
+ * ignore_free_all: free all ignores
+ */
+
+void
+ignore_free_all ()
+{
+ while (irc_ignore)
+ ignore_free (irc_ignore);
+}
+
+/*
+ * ignore_search_free: search and free ignore(s)
+ * return: number of ignore found and deleted
+ * 0 if no ignore found
+ */
+
+int
+ignore_search_free (char *mask, char *type, char *channel_name, char *server_name)
+{
+ int found;
+ t_irc_ignore *ptr_ignore, *next_ignore;
+
+ found = 0;
+ ptr_ignore = irc_ignore;
+ while (ptr_ignore)
+ {
+ if (ignore_match (ptr_ignore, mask, type, channel_name, server_name))
+ {
+ found++;
+ if (found == 1)
+ gui_printf (NULL, "\n");
+ irc_display_prefix (NULL, PREFIX_INFO);
+ weechat_cmd_ignore_display (_("Removing ignore:"), ptr_ignore);
+ next_ignore = ptr_ignore->next_ignore;
+ ignore_free (ptr_ignore);
+ ptr_ignore = next_ignore;
+ }
+ else
+ ptr_ignore = ptr_ignore->next_ignore;
+ }
+
+ return found;
+}
+
+/*
+ * ignore_search_free_by_number: search and free ignore(s) by number
+ * return: 1 if ignore found and deleted
+ * 0 if ignore not found
+ */
+
+int
+ignore_search_free_by_number (int number)
+{
+ int i;
+ t_irc_ignore *ptr_ignore;
+
+ if (number < 1)
+ return 0;
+
+ i = 0;
+ for (ptr_ignore = irc_ignore; ptr_ignore;
+ ptr_ignore = ptr_ignore->next_ignore)
+ {
+ i++;
+ if (i == number)
+ {
+ gui_printf (NULL, "\n");
+ irc_display_prefix (NULL, PREFIX_INFO);
+ weechat_cmd_ignore_display (_("Removing ignore:"), ptr_ignore);
+ ignore_free (ptr_ignore);
+ return 1;
+ }
+ }
+
+ /* ignore number not found */
+ return 0;
+}
+
+/*
+ * ignore_print_log: print ignore list in log (usually for crash dump)
+ */
+
+void
+ignore_print_log ()
+{
+ t_irc_ignore *ptr_ignore;
+
+ wee_log_printf ("[ignore list]\n");
+
+ for (ptr_ignore = irc_ignore; ptr_ignore;
+ ptr_ignore = ptr_ignore->next_ignore)
+ {
+ wee_log_printf ("\n");
+ wee_log_printf (" -> ignore at 0x%X:\n", ptr_ignore);
+ wee_log_printf (" mask. . . . . . . : %s\n", ptr_ignore->mask);
+ wee_log_printf (" type. . . . . . . : %s\n", ptr_ignore->type);
+ wee_log_printf (" channel_name. . . : %s\n", ptr_ignore->channel_name);
+ wee_log_printf (" server_name . . . : %s\n", ptr_ignore->server_name);
+ wee_log_printf (" prev_ignore . . . : 0x%X\n", ptr_ignore->prev_ignore);
+ wee_log_printf (" next_ignore . . . : 0x%X\n", ptr_ignore->next_ignore);
+ }
+}
diff --git a/src/irc/irc-nick.c b/src/irc/irc-nick.c
index 37d4aaf6c..9d20d4ca8 100644
--- a/src/irc/irc-nick.c
+++ b/src/irc/irc-nick.c
@@ -314,7 +314,10 @@ t_irc_nick *
nick_search (t_irc_channel *channel, char *nickname)
{
t_irc_nick *ptr_nick;
-
+
+ if (!nickname)
+ return NULL;
+
for (ptr_nick = channel->nicks; ptr_nick;
ptr_nick = ptr_nick->next_nick)
{
diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c
index eecefc12d..6976881a2 100644
--- a/src/irc/irc-recv.c
+++ b/src/irc/irc-recv.c
@@ -43,6 +43,9 @@
#include "../plugins/plugins.h"
+int command_ignored;
+
+
/*
* irc_is_highlight: returns 1 if given message contains highlight (with given nick
* or at least one of string in "irc_higlight" setting
@@ -77,13 +80,15 @@ irc_is_highlight (char *message, char *nick)
pos = msg;
while (pos[0])
{
- pos[0] = tolower (pos[0]);
+ if ((pos[0] >= 'A') && (pos[0] <= 'Z'))
+ pos[0] += ('a' - 'A');
pos++;
}
pos = highlight;
while (pos[0])
{
- pos[0] = tolower (pos[0]);
+ if ((pos[0] >= 'A') && (pos[0] <= 'Z'))
+ pos[0] += ('a' - 'A');
pos++;
}
@@ -142,7 +147,8 @@ irc_recv_command (t_irc_server *server, char *entire_line,
char *host, char *command, char *arguments)
{
int i, cmd_found, return_code;
-
+ char *pos, *nick;
+
if (command == NULL)
return -2;
@@ -160,11 +166,24 @@ irc_recv_command (t_irc_server *server, char *entire_line,
/* command not found */
if (cmd_found < 0)
return -3;
-
+
if (irc_commands[i].recv_function != NULL)
{
- return_code = (int) (irc_commands[i].recv_function) (server, host, arguments);
- plugin_event_msg (irc_commands[i].command_name, server->name, entire_line);
+ command_ignored = ignore_check (host, irc_commands[i].command_name, NULL, server->name);
+ if (host)
+ pos = strchr (host, '!');
+ else
+ pos = NULL;
+ if (pos)
+ pos[0] = '\0';
+ nick = (host) ? strdup (host) : NULL;
+ if (pos)
+ pos[0] = '!';
+ return_code = (int) (irc_commands[i].recv_function) (server, host, nick, arguments);
+ if (nick)
+ free (nick);
+ if (!command_ignored)
+ plugin_event_msg (irc_commands[i].command_name, server->name, entire_line);
return return_code;
}
@@ -176,7 +195,7 @@ irc_recv_command (t_irc_server *server, char *entire_line,
*/
int
-irc_cmd_recv_error (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_error (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos2;
int first;
@@ -186,6 +205,7 @@ irc_cmd_recv_error (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) server;
(void) host;
+ (void) nick;
if (strncmp (arguments, "Closing Link", 12) == 0)
{
@@ -247,13 +267,9 @@ irc_cmd_recv_error (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_invite (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_invite (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos, *pos_channel;
-
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
+ char *pos_channel;
pos_channel = strchr (arguments, ' ');
if (pos_channel)
@@ -265,15 +281,20 @@ irc_cmd_recv_invite (t_irc_server *server, char *host, char *arguments)
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 (HOTLIST_HIGHLIGHT, server->buffer);
- gui_draw_buffer_status (gui_current_window->buffer, 1);
+ command_ignored |= ignore_check (host, "invite", pos_channel, server->name);
+
+ if (!command_ignored)
+ {
+ 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", nick);
+ hotlist_add (HOTLIST_HIGHLIGHT, server->buffer);
+ gui_draw_buffer_status (gui_current_window->buffer, 1);
+ }
}
else
{
@@ -292,11 +313,13 @@ irc_cmd_recv_invite (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_join (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_join (t_irc_server *server, char *host, char *nick, char *arguments)
{
t_irc_channel *ptr_channel;
char *pos;
+ command_ignored |= ignore_check (host, "join", arguments, server->name);
+
ptr_channel = channel_search (server, arguments);
if (!ptr_channel)
{
@@ -311,24 +334,24 @@ irc_cmd_recv_join (t_irc_server *server, char *host, char *arguments)
}
}
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
-
- irc_display_prefix (ptr_channel->buffer, PREFIX_JOIN);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
- "%s ", host);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
- "(");
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_HOST,
- "%s", pos + 1);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
- ")");
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- _(" has joined "));
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
- "%s\n", arguments);
- (void) nick_new (ptr_channel, host, 0, 0, 0, 0, 0);
+ if (!command_ignored)
+ {
+ pos = strchr (host, '!');
+ irc_display_prefix (ptr_channel->buffer, PREFIX_JOIN);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
+ "%s ", nick);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
+ "(");
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_HOST,
+ "%s", (pos) ? pos + 1 : "");
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
+ ")");
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
+ _(" has joined "));
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
+ "%s\n", arguments);
+ }
+ (void) nick_new (ptr_channel, nick, 0, 0, 0, 0, 0);
gui_draw_buffer_nick (ptr_channel->buffer, 1);
gui_draw_buffer_status (ptr_channel->buffer, 1);
return 0;
@@ -339,16 +362,12 @@ irc_cmd_recv_join (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_kick (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_kick (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos, *pos_nick, *pos_comment;
+ char *pos_nick, *pos_comment;
t_irc_channel *ptr_channel;
t_irc_nick *ptr_nick;
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
-
pos_nick = strchr (arguments, ' ');
if (pos_nick)
{
@@ -367,7 +386,9 @@ irc_cmd_recv_kick (t_irc_server *server, char *host, char *arguments)
if (pos_comment[0] == ':')
pos_comment++;
}
-
+
+ command_ignored |= ignore_check (host, "kick", arguments, server->name);
+
ptr_channel = channel_search (server, arguments);
if (!ptr_channel)
{
@@ -377,30 +398,33 @@ irc_cmd_recv_kick (t_irc_server *server, char *host, char *arguments)
WEECHAT_ERROR, arguments, "kick");
return -1;
}
-
- irc_display_prefix (ptr_channel->buffer, PREFIX_PART);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
- "%s", host);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- _(" has kicked "));
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
- "%s", pos_nick);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- _(" from "));
- if (pos_comment)
+
+ if (!command_ignored)
{
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
- "%s ", arguments);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
- "(");
+ irc_display_prefix (ptr_channel->buffer, PREFIX_PART);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
+ "%s", nick);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
+ _(" has kicked "));
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
+ "%s", pos_nick);
gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- "%s", pos_comment);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
- ")\n");
+ _(" from "));
+ if (pos_comment)
+ {
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
+ "%s ", arguments);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
+ "(");
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
+ "%s", pos_comment);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
+ ")\n");
+ }
+ else
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
+ "%s\n", arguments);
}
- else
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
- "%s\n", arguments);
}
else
{
@@ -437,15 +461,11 @@ irc_cmd_recv_kick (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_kill (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_kill (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos, *pos_host2, *pos_comment;
+ char *pos_host2, *pos_comment;
t_irc_channel *ptr_channel;
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
-
pos_host2 = strchr (arguments, ' ');
if (pos_host2)
{
@@ -468,27 +488,31 @@ irc_cmd_recv_kill (t_irc_server *server, char *host, char *arguments)
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
- irc_display_prefix (ptr_channel->buffer, PREFIX_PART);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
- "%s", host);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- _(" has killed "));
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
- "%s", arguments);
- if (pos_comment)
+ if (!command_ignored
+ && !ignore_check (host, "kill", ptr_channel->name, server->name))
{
+ irc_display_prefix (ptr_channel->buffer, PREFIX_PART);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
+ "%s", nick);
gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- _(" from server"));
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
- " (");
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- "%s", pos_comment);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
- ")\n");
+ _(" has killed "));
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
+ "%s", arguments);
+ if (pos_comment)
+ {
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
+ _(" from server"));
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
+ " (");
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
+ "%s", pos_comment);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
+ ")\n");
+ }
+ else
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
+ _(" from server\n"));
}
- else
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- _(" from server\n"));
}
}
else
@@ -817,7 +841,7 @@ void irc_get_channel_modes (t_irc_channel *ptr_channel, char *channel_name,
*/
int
-irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_mode (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos_parm;
t_irc_channel *ptr_channel;
@@ -832,11 +856,6 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments)
return -1;
}
- /* keep only nick name from host */
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
-
pos = strchr (arguments, ' ');
if (!pos)
{
@@ -865,7 +884,7 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments)
ptr_channel = channel_search (server, arguments);
if (ptr_channel)
{
- irc_get_channel_modes (ptr_channel, arguments, host, pos, pos_parm);
+ irc_get_channel_modes (ptr_channel, arguments, nick, pos, pos_parm);
gui_draw_buffer_status (ptr_channel->buffer, 1);
}
else
@@ -880,15 +899,18 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments)
else
{
/* nickname modes */
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, "/");
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK,
- "%s", (pos[0] == ':') ? pos + 1 : pos);
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("mode changed by"));
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s\n", host);
+ if (!command_ignored)
+ {
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, "/");
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK,
+ "%s", (pos[0] == ':') ? pos + 1 : pos);
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("mode changed by"));
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s\n", nick);
+ }
}
return 0;
}
@@ -898,9 +920,8 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_nick (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_nick (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos;
t_irc_channel *ptr_channel;
t_irc_nick *ptr_nick;
int nick_is_me;
@@ -917,11 +938,6 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *arguments)
return -1;
}
- /* keep only nick name from host */
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
-
/* change nickname in any opened private window */
for (ptr_buffer = gui_buffers; ptr_buffer;
ptr_buffer = ptr_buffer->next_buffer)
@@ -940,33 +956,37 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *arguments)
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
- ptr_nick = nick_search (ptr_channel, host);
+ ptr_nick = nick_search (ptr_channel, nick);
if (ptr_nick)
{
nick_is_me = (strcmp (ptr_nick->nick, server->nick) == 0) ? 1 : 0;
if (nick_is_me)
gui_add_hotlist = 0;
nick_change (ptr_channel, ptr_nick, arguments);
- irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
- if (nick_is_me)
+ if (!command_ignored
+ && !ignore_check (host, "nick", ptr_channel->name, server->name))
+ {
+ irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
+ if (nick_is_me)
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ _("You are "));
+ else
+ {
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_NICK,
+ "%s", nick);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _(" is "));
+ }
gui_printf_color (ptr_channel->buffer,
COLOR_WIN_CHAT,
- _("You are "));
- else
- {
+ _("now known as "));
gui_printf_color (ptr_channel->buffer,
COLOR_WIN_CHAT_NICK,
- "%s", host);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _(" is "));
+ "%s\n",
+ arguments);
}
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- _("now known as "));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_NICK,
- "%s\n",
- arguments);
if (gui_buffer_has_nicklist (ptr_channel->buffer))
gui_draw_buffer_nick (ptr_channel->buffer, 1);
gui_add_hotlist = 1;
@@ -998,7 +1018,7 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_notice (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *host2, *pos, *pos2, *pos_usec;
struct timeval tv;
@@ -1010,12 +1030,7 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments)
{
pos = strchr (host, '!');
if (pos)
- {
- pos[0] = '\0';
host2 = pos + 1;
- }
- else
- host2 = NULL;
}
pos = strchr (arguments, ' ');
@@ -1036,80 +1051,84 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments)
WEECHAT_ERROR, "notice");
return -1;
}
- if (strncmp (pos, "\01VERSION", 8) == 0)
- {
- pos += 9;
- pos2 = strchr (pos, '\01');
- if (pos2)
- pos2[0] = '\0';
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, "CTCP ");
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "VERSION ");
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("reply from"));
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s", host);
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": %s\n", pos);
- }
- else
+
+ if (!command_ignored)
{
- if (strncmp (pos, "\01PING", 5) == 0)
+ if (strncmp (pos, "\01VERSION", 8) == 0)
{
- pos += 5;
- while (pos[0] == ' ')
- pos++;
- pos_usec = strchr (pos, ' ');
- if (pos_usec)
- {
- pos_usec[0] = '\0';
- pos_usec++;
- pos2 = strchr (pos_usec, '\01');
- if (pos2)
- {
- pos2[0] = '\0';
-
- gettimeofday (&tv, &tz);
- sec1 = atol (pos);
- usec1 = atol (pos_usec);
- sec2 = tv.tv_sec;
- usec2 = tv.tv_usec;
-
- difftime = ((sec2 * 1000000) + usec2) - ((sec1 * 1000000) + usec1);
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, "CTCP ");
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "PING ");
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("reply from"));
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s", host);
- gui_printf_color (server->buffer, COLOR_WIN_CHAT,
- _(": %ld.%ld seconds\n"),
- difftime / 1000000,
- (difftime % 1000000) / 1000);
- }
- }
+ pos += 9;
+ pos2 = strchr (pos, '\01');
+ if (pos2)
+ pos2[0] = '\0';
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, "CTCP ");
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "VERSION ");
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("reply from"));
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s", nick);
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": %s\n", pos);
}
else
{
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- if (host)
+ if (strncmp (pos, "\01PING", 5) == 0)
{
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", host);
- if (host2)
+ pos += 5;
+ while (pos[0] == ' ')
+ pos++;
+ pos_usec = strchr (pos, ' ');
+ if (pos_usec)
{
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, " (");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_HOST, "%s", host2);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, ")");
+ pos_usec[0] = '\0';
+ pos_usec++;
+ pos2 = strchr (pos_usec, '\01');
+ if (pos2)
+ {
+ pos2[0] = '\0';
+
+ gettimeofday (&tv, &tz);
+ sec1 = atol (pos);
+ usec1 = atol (pos_usec);
+ sec2 = tv.tv_sec;
+ usec2 = tv.tv_usec;
+
+ difftime = ((sec2 * 1000000) + usec2) - ((sec1 * 1000000) + usec1);
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, "CTCP ");
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "PING ");
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("reply from"));
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s", nick);
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT,
+ _(": %ld.%ld seconds\n"),
+ difftime / 1000000,
+ (difftime % 1000000) / 1000);
+ }
}
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": ");
}
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", pos);
- if ((host) && (ascii_strcasecmp (host, "nickserv") != 0) &&
- (ascii_strcasecmp (host, "chanserv") != 0) &&
- (ascii_strcasecmp (host, "memoserv") != 0))
+ else
{
- hotlist_add (HOTLIST_PRIVATE, server->buffer);
- gui_draw_buffer_status (gui_current_window->buffer, 1);
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ if (host)
+ {
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);
+ if (host2)
+ {
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, " (");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_HOST, "%s", host2);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, ")");
+ }
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": ");
+ }
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", pos);
+ if ((nick) && (ascii_strcasecmp (nick, "nickserv") != 0) &&
+ (ascii_strcasecmp (nick, "chanserv") != 0) &&
+ (ascii_strcasecmp (nick, "memoserv") != 0))
+ {
+ hotlist_add (HOTLIST_PRIVATE, server->buffer);
+ gui_draw_buffer_status (gui_current_window->buffer, 1);
+ }
}
}
}
@@ -1121,7 +1140,7 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_part (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_part (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos_args;
t_irc_channel *ptr_channel;
@@ -1148,15 +1167,11 @@ irc_cmd_recv_part (t_irc_server *server, char *host, char *arguments)
pos_args++;
}
- /* keep only nick name from host */
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
-
ptr_channel = channel_search (server, arguments);
if (ptr_channel)
{
- ptr_nick = nick_search (ptr_channel, host);
+ command_ignored |= ignore_check (host, "part", ptr_channel->name, server->name);
+ ptr_nick = nick_search (ptr_channel, nick);
if (ptr_nick)
{
if (strcmp (ptr_nick->nick, server->nick) == 0)
@@ -1172,30 +1187,34 @@ irc_cmd_recv_part (t_irc_server *server, char *host, char *arguments)
/* remove nick from nick list and display message */
nick_free (ptr_channel, ptr_nick);
- irc_display_prefix (ptr_channel->buffer, PREFIX_PART);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_NICK, "%s ", host);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, "(");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_HOST, "%s", pos+1);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, ")");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _(" has left "));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%s", ptr_channel->name);
- if (pos_args && pos_args[0])
+ if (!command_ignored)
{
+ pos = strchr (host, '!');
+ irc_display_prefix (ptr_channel->buffer, PREFIX_PART);
gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, " (");
+ COLOR_WIN_CHAT_NICK, "%s ", nick);
gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, "%s", pos_args);
+ COLOR_WIN_CHAT_DARK, "(");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_HOST, "%s", (pos) ? pos + 1 : "");
gui_printf_color (ptr_channel->buffer,
COLOR_WIN_CHAT_DARK, ")");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _(" has left "));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%s", ptr_channel->name);
+ if (pos_args && pos_args[0])
+ {
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_DARK, " (");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, "%s", pos_args);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_DARK, ")");
+ }
+ gui_printf (ptr_channel->buffer, "\n");
}
- gui_printf (ptr_channel->buffer, "\n");
if (gui_buffer_has_nicklist (ptr_channel->buffer))
gui_draw_buffer_nick (ptr_channel->buffer, 1);
@@ -1220,11 +1239,13 @@ irc_cmd_recv_part (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_ping (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_ping (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
- (void)host;
+ /* make gcc happy */
+ (void) host;
+ (void) nick;
pos = strrchr (arguments, ' ');
if (pos)
pos[0] = '\0';
@@ -1237,14 +1258,16 @@ irc_cmd_recv_ping (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_pong (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_pong (t_irc_server *server, char *host, char *nick, char *arguments)
{
struct timeval tv;
struct timezone tz;
int old_lag;
- (void)host;
- (void)arguments;
+ /* make gcc happy */
+ (void) host;
+ (void) nick;
+ (void) arguments;
if (server->lag_check_time.tv_sec != 0)
{
@@ -1268,7 +1291,7 @@ irc_cmd_recv_pong (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos2, *host2;
char *pos_file, *pos_addr, *pos_port, *pos_size, *pos_start_resume; /* for DCC */
@@ -1286,13 +1309,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
return -1;
}
- /* keep only nick name from host */
pos = strchr (host, '!');
if (pos)
- {
- pos[0] = '\0';
- host2 = pos+1;
- }
+ host2 = pos + 1;
else
host2 = host;
@@ -1314,51 +1333,60 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
{
if (strncmp (pos, "\01ACTION ", 8) == 0)
{
+ command_ignored |= ignore_check (host, "action", ptr_channel->name, server->name);
pos += 8;
pos2 = strchr (pos, '\01');
if (pos2)
pos2[0] = '\0';
- irc_display_prefix (ptr_channel->buffer, PREFIX_ACTION_ME);
- if (irc_is_highlight (pos, server->nick))
+ if (!command_ignored)
{
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
- COLOR_WIN_CHAT_HIGHLIGHT,
- "%s", host);
- if ( (cfg_look_infobar)
- && (cfg_look_infobar_delay_highlight > 0)
- && (ptr_channel->buffer != gui_current_window->buffer) )
- gui_infobar_printf (cfg_look_infobar_delay_highlight,
- COLOR_WIN_INFOBAR_HIGHLIGHT,
- _("On %s: * %s %s"),
- ptr_channel->name,
- host, pos);
+ irc_display_prefix (ptr_channel->buffer, PREFIX_ACTION_ME);
+ if (irc_is_highlight (pos, server->nick))
+ {
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
+ COLOR_WIN_CHAT_HIGHLIGHT,
+ "%s", nick);
+ if ( (cfg_look_infobar)
+ && (cfg_look_infobar_delay_highlight > 0)
+ && (ptr_channel->buffer != gui_current_window->buffer) )
+ gui_infobar_printf (cfg_look_infobar_delay_highlight,
+ COLOR_WIN_INFOBAR_HIGHLIGHT,
+ _("On %s: * %s %s"),
+ ptr_channel->name,
+ nick, pos);
+ }
+ else
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_MSG,
+ COLOR_WIN_CHAT_NICK, "%s", nick);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, " %s\n", pos);
}
- else
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_MSG,
- COLOR_WIN_CHAT_NICK, "%s", host);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, " %s\n", pos);
return 0;
}
if (strncmp (pos, "\01SOUND ", 7) == 0)
{
+ command_ignored |= ignore_check (host, "ctcp", ptr_channel->name, server->name);
pos += 7;
pos2 = strchr (pos, '\01');
if (pos2)
pos2[0] = '\0';
- irc_display_prefix (ptr_channel->buffer, PREFIX_SERVER);
- gui_printf (ptr_channel->buffer,
- _("Received a CTCP SOUND \"%s\" from "),
- pos);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_NICK,
- "%s\n", host);
+ if (!command_ignored)
+ {
+ irc_display_prefix (ptr_channel->buffer, PREFIX_SERVER);
+ gui_printf (ptr_channel->buffer,
+ _("Received a CTCP SOUND \"%s\" from "),
+ pos);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_NICK,
+ "%s\n", nick);
+ }
return 0;
}
if (strncmp (pos, "\01PING", 5) == 0)
{
+ command_ignored |= ignore_check (host, "ctcp", ptr_channel->name, server->name);
pos += 5;
while (pos[0] == ' ')
pos++;
@@ -1371,10 +1399,10 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
pos = NULL;
if (pos)
server_sendf (server, "NOTICE %s :\01PING %s\01\r\n",
- host, pos);
+ nick, pos);
else
server_sendf (server, "NOTICE %s :\01PING\01\r\n",
- host);
+ nick);
irc_display_prefix (ptr_channel->buffer, PREFIX_SERVER);
gui_printf_color (ptr_channel->buffer,
COLOR_WIN_CHAT, "CTCP ");
@@ -1383,7 +1411,7 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
gui_printf_color (ptr_channel->buffer,
COLOR_WIN_CHAT, _("received from"));
gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_NICK, " %s\n", host);
+ COLOR_WIN_CHAT_NICK, " %s\n", nick);
return 0;
}
@@ -1391,6 +1419,7 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
pos2 = strchr (pos + 1, '\01');
if ((pos[0] == '\01') && pos2 && (pos2[1] == '\0'))
{
+ command_ignored |= ignore_check (host, "ctcp", ptr_channel->name, server->name);
pos++;
pos2[0] = '\0';
pos2 = strchr (pos, ' ');
@@ -1403,47 +1432,54 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
if (!pos2[0])
pos2 = NULL;
}
- irc_display_prefix (ptr_channel->buffer, PREFIX_SERVER);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _("Unknown CTCP "));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL, "%s ", pos);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _("received from"));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_NICK, " %s", host);
- if (pos2)
+ if (!command_ignored)
+ {
+ irc_display_prefix (ptr_channel->buffer, PREFIX_SERVER);
gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, ": %s\n", pos2);
- else
- gui_printf (ptr_channel->buffer, "\n");
+ COLOR_WIN_CHAT, _("Unknown CTCP "));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL, "%s ", pos);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _("received from"));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_NICK, " %s", nick);
+ if (pos2)
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, ": %s\n", pos2);
+ else
+ gui_printf (ptr_channel->buffer, "\n");
+ }
return 0;
}
/* other message */
- ptr_nick = nick_search (ptr_channel, host);
- if (irc_is_highlight (pos, server->nick))
+ command_ignored |= ignore_check (host, "privmsg", ptr_channel->name, server->name);
+ if (!command_ignored)
{
- irc_display_nick (ptr_channel->buffer, ptr_nick,
- (ptr_nick) ? NULL : host,
- MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
- 1, -1, 0);
- if ( (cfg_look_infobar)
- && (cfg_look_infobar_delay_highlight > 0)
- && (ptr_channel->buffer != gui_current_window->buffer) )
- gui_infobar_printf (cfg_look_infobar_delay_highlight,
- COLOR_WIN_INFOBAR_HIGHLIGHT,
- _("On %s: %s> %s"),
- ptr_channel->name,
- host, pos);
+ ptr_nick = nick_search (ptr_channel, nick);
+ if (irc_is_highlight (pos, server->nick))
+ {
+ irc_display_nick (ptr_channel->buffer, ptr_nick,
+ (ptr_nick) ? NULL : nick,
+ MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
+ 1, -1, 0);
+ if ( (cfg_look_infobar)
+ && (cfg_look_infobar_delay_highlight > 0)
+ && (ptr_channel->buffer != gui_current_window->buffer) )
+ gui_infobar_printf (cfg_look_infobar_delay_highlight,
+ COLOR_WIN_INFOBAR_HIGHLIGHT,
+ _("On %s: %s> %s"),
+ ptr_channel->name,
+ nick, pos);
+ }
+ else
+ irc_display_nick (ptr_channel->buffer, ptr_nick,
+ (ptr_nick) ? NULL : nick,
+ MSG_TYPE_NICK, 1, 1, 0);
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_MSG,
+ COLOR_WIN_CHAT, "%s\n", pos);
}
- else
- irc_display_nick (ptr_channel->buffer, ptr_nick,
- (ptr_nick) ? NULL : host,
- MSG_TYPE_NICK, 1, 1, 0);
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_MSG,
- COLOR_WIN_CHAT, "%s\n", pos);
}
else
{
@@ -1457,10 +1493,6 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
}
else
{
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
-
pos = strchr (arguments, ' ');
if (pos)
{
@@ -1474,80 +1506,88 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
/* version asked by another user => answer with WeeChat version */
if (strncmp (pos, "\01VERSION", 8) == 0)
{
- pos2 = strchr (pos + 8, ' ');
- if (pos2)
- {
- while (pos2[0] == ' ')
- pos2++;
- if (pos2[0] == '\01')
- pos2 = NULL;
- else if (!pos2[0])
- pos2 = NULL;
- }
-
- buf = (struct utsname *) malloc (sizeof (struct utsname));
- if (buf && (uname (buf) == 0))
+ command_ignored |= ignore_check (host, "ctcp", NULL, server->name);
+ if (!command_ignored)
{
- server_sendf (server,
- "NOTICE %s :%sVERSION %s v%s"
- " compiled on %s, running "
- "%s %s / %s%s",
- host, "\01", PACKAGE_NAME, PACKAGE_VERSION, __DATE__,
- &buf->sysname,
- &buf->release, &buf->machine, "\01\r\n");
- free (buf);
- }
- else
- server_sendf (server,
- "NOTICE %s :%sVERSION %s v%s"
- " compiled on %s%s",
- host, "\01", PACKAGE_NAME, PACKAGE_VERSION, __DATE__,
- "\01\r\n");
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "CTCP ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL, "VERSION ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, _("received from"));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, " %s", host);
- if (pos2)
+ pos2 = strchr (pos + 8, ' ');
+ if (pos2)
+ {
+ while (pos2[0] == ' ')
+ pos2++;
+ if (pos2[0] == '\01')
+ pos2 = NULL;
+ else if (!pos2[0])
+ pos2 = NULL;
+ }
+
+ buf = (struct utsname *) malloc (sizeof (struct utsname));
+ if (buf && (uname (buf) == 0))
+ {
+ server_sendf (server,
+ "NOTICE %s :%sVERSION %s v%s"
+ " compiled on %s, running "
+ "%s %s / %s%s",
+ nick, "\01", PACKAGE_NAME, PACKAGE_VERSION, __DATE__,
+ &buf->sysname,
+ &buf->release, &buf->machine, "\01\r\n");
+ free (buf);
+ }
+ else
+ server_sendf (server,
+ "NOTICE %s :%sVERSION %s v%s"
+ " compiled on %s%s",
+ nick, "\01", PACKAGE_NAME, PACKAGE_VERSION, __DATE__,
+ "\01\r\n");
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, ": %s\n", pos2);
- else
- gui_printf (server->buffer, "\n");
+ COLOR_WIN_CHAT, "CTCP ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL, "VERSION ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, _("received from"));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, " %s", nick);
+ if (pos2)
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, ": %s\n", pos2);
+ else
+ gui_printf (server->buffer, "\n");
+ }
return 0;
}
/* ping request from another user => answer */
if (strncmp (pos, "\01PING", 5) == 0)
{
- pos += 5;
- while (pos[0] == ' ')
- pos++;
- pos2 = strchr (pos, '\01');
- if (pos2)
- pos2[0] = '\0';
- else
- pos = NULL;
- if (pos && !pos[0])
- pos = NULL;
- if (pos)
- server_sendf (server, "NOTICE %s :\01PING %s\01\r\n",
- host, pos);
- else
- server_sendf (server, "NOTICE %s :\01PING\01\r\n",
- host);
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "CTCP ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL, "PING ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, _("received from"));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, " %s\n", host);
+ command_ignored |= ignore_check (host, "ctcp", NULL, server->name);
+ if (!command_ignored)
+ {
+ pos += 5;
+ while (pos[0] == ' ')
+ pos++;
+ pos2 = strchr (pos, '\01');
+ if (pos2)
+ pos2[0] = '\0';
+ else
+ pos = NULL;
+ if (pos && !pos[0])
+ pos = NULL;
+ if (pos)
+ server_sendf (server, "NOTICE %s :\01PING %s\01\r\n",
+ nick, pos);
+ else
+ server_sendf (server, "NOTICE %s :\01PING\01\r\n",
+ nick);
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "CTCP ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL, "PING ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, _("received from"));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, " %s\n", nick);
+ }
return 0;
}
@@ -1566,62 +1606,67 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
}
pos2[0] = '\0';
- /* DCC filename */
- pos_file = pos + 9;
- while (pos_file[0] == ' ')
- pos_file++;
-
- /* look for file size */
- pos_size = strrchr (pos_file, ' ');
- if (!pos_size)
- {
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
- }
- pos2 = pos_size;
- pos_size++;
- while (pos2[0] == ' ')
- pos2--;
- pos2[1] = '\0';
+ command_ignored |= ignore_check (host, "dcc", NULL, server->name);
- /* look for DCC port */
- pos_port = strrchr (pos_file, ' ');
- if (!pos_port)
+ if (!command_ignored)
{
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
- }
- pos2 = pos_port;
- pos_port++;
- while (pos2[0] == ' ')
- pos2--;
- pos2[1] = '\0';
-
- /* look for DCC IP address */
- pos_addr = strrchr (pos_file, ' ');
- if (!pos_addr)
- {
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
+ /* DCC filename */
+ pos_file = pos + 9;
+ while (pos_file[0] == ' ')
+ pos_file++;
+
+ /* look for file size */
+ pos_size = strrchr (pos_file, ' ');
+ if (!pos_size)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos2 = pos_size;
+ pos_size++;
+ while (pos2[0] == ' ')
+ pos2--;
+ pos2[1] = '\0';
+
+ /* look for DCC port */
+ pos_port = strrchr (pos_file, ' ');
+ if (!pos_port)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos2 = pos_port;
+ pos_port++;
+ while (pos2[0] == ' ')
+ pos2--;
+ pos2[1] = '\0';
+
+ /* look for DCC IP address */
+ pos_addr = strrchr (pos_file, ' ');
+ if (!pos_addr)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos2 = pos_addr;
+ pos_addr++;
+ while (pos2[0] == ' ')
+ pos2--;
+ pos2[1] = '\0';
+
+ dcc_add (server, DCC_FILE_RECV, strtoul (pos_addr, NULL, 10),
+ atoi (pos_port), nick, -1, pos_file, NULL,
+ strtoul (pos_size, NULL, 10));
}
- pos2 = pos_addr;
- pos_addr++;
- while (pos2[0] == ' ')
- pos2--;
- pos2[1] = '\0';
-
- dcc_add (server, DCC_FILE_RECV, strtoul (pos_addr, NULL, 10),
- atoi (pos_port), host, -1, pos_file, NULL,
- strtoul (pos_size, NULL, 10));
return 0;
}
@@ -1640,45 +1685,50 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
}
pos2[0] = '\0';
- /* DCC filename */
- pos_file = pos + 11;
- while (pos_file[0] == ' ')
- pos_file++;
-
- /* look for resume start position */
- pos_start_resume = strrchr (pos_file, ' ');
- if (!pos_start_resume)
- {
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
- }
- pos2 = pos_start_resume;
- pos_start_resume++;
- while (pos2[0] == ' ')
- pos2--;
- pos2[1] = '\0';
+ command_ignored |= ignore_check (host, "dcc", NULL, server->name);
- /* look for DCC port */
- pos_port = strrchr (pos_file, ' ');
- if (!pos_port)
+ if (!command_ignored)
{
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
+ /* DCC filename */
+ pos_file = pos + 11;
+ while (pos_file[0] == ' ')
+ pos_file++;
+
+ /* look for resume start position */
+ pos_start_resume = strrchr (pos_file, ' ');
+ if (!pos_start_resume)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos2 = pos_start_resume;
+ pos_start_resume++;
+ while (pos2[0] == ' ')
+ pos2--;
+ pos2[1] = '\0';
+
+ /* look for DCC port */
+ pos_port = strrchr (pos_file, ' ');
+ if (!pos_port)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos2 = pos_port;
+ pos_port++;
+ while (pos2[0] == ' ')
+ pos2--;
+ pos2[1] = '\0';
+
+ dcc_accept_resume (server, pos_file, atoi (pos_port),
+ strtoul (pos_start_resume, NULL, 10));
}
- pos2 = pos_port;
- pos_port++;
- while (pos2[0] == ' ')
- pos2--;
- pos2[1] = '\0';
-
- dcc_accept_resume (server, pos_file, atoi (pos_port),
- strtoul (pos_start_resume, NULL, 10));
return 0;
}
@@ -1697,45 +1747,50 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
}
pos2[0] = '\0';
- /* DCC filename */
- pos_file = pos + 11;
- while (pos_file[0] == ' ')
- pos_file++;
-
- /* look for resume start position */
- pos_start_resume = strrchr (pos_file, ' ');
- if (!pos_start_resume)
- {
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
- }
- pos2 = pos_start_resume;
- pos_start_resume++;
- while (pos2[0] == ' ')
- pos2--;
- pos2[1] = '\0';
+ command_ignored |= ignore_check (host, "dcc", NULL, server->name);
- /* look for DCC port */
- pos_port = strrchr (pos_file, ' ');
- if (!pos_port)
+ if (!command_ignored)
{
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
+ /* DCC filename */
+ pos_file = pos + 11;
+ while (pos_file[0] == ' ')
+ pos_file++;
+
+ /* look for resume start position */
+ pos_start_resume = strrchr (pos_file, ' ');
+ if (!pos_start_resume)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos2 = pos_start_resume;
+ pos_start_resume++;
+ while (pos2[0] == ' ')
+ pos2--;
+ pos2[1] = '\0';
+
+ /* look for DCC port */
+ pos_port = strrchr (pos_file, ' ');
+ if (!pos_port)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos2 = pos_port;
+ pos_port++;
+ while (pos2[0] == ' ')
+ pos2--;
+ pos2[1] = '\0';
+
+ dcc_start_resume (server, pos_file, atoi (pos_port),
+ strtoul (pos_start_resume, NULL, 10));
}
- pos2 = pos_port;
- pos_port++;
- while (pos2[0] == ' ')
- pos2--;
- pos2[1] = '\0';
-
- dcc_start_resume (server, pos_file, atoi (pos_port),
- strtoul (pos_start_resume, NULL, 10));
return 0;
}
@@ -1754,105 +1809,115 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
}
pos2[0] = '\0';
- /* CHAT type */
- pos_file = pos + 9;
- while (pos_file[0] == ' ')
- pos_file++;
+ command_ignored |= ignore_check (host, "dcc", NULL, server->name);
- /* DCC IP address */
- pos_addr = strchr (pos_file, ' ');
- if (!pos_addr)
+ if (!command_ignored)
{
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
- }
- pos_addr[0] = '\0';
- pos_addr++;
- while (pos_addr[0] == ' ')
+ /* CHAT type */
+ pos_file = pos + 9;
+ while (pos_file[0] == ' ')
+ pos_file++;
+
+ /* DCC IP address */
+ pos_addr = strchr (pos_file, ' ');
+ if (!pos_addr)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos_addr[0] = '\0';
pos_addr++;
-
- /* look for DCC port */
- pos_port = strchr (pos_addr, ' ');
- if (!pos_port)
- {
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
- }
- pos_port[0] = '\0';
- pos_port++;
- while (pos_port[0] == ' ')
+ while (pos_addr[0] == ' ')
+ pos_addr++;
+
+ /* look for DCC port */
+ pos_port = strchr (pos_addr, ' ');
+ if (!pos_port)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos_port[0] = '\0';
pos_port++;
-
- if (ascii_strcasecmp (pos_file, "chat") != 0)
- {
- irc_display_prefix (server->buffer, PREFIX_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);
- return -1;
+ while (pos_port[0] == ' ')
+ pos_port++;
+
+ if (ascii_strcasecmp (pos_file, "chat") != 0)
+ {
+ irc_display_prefix (server->buffer, PREFIX_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", nick);
+ gui_printf (server->buffer, ": \"%s\"\n", pos_file);
+ return -1;
+ }
+
+ dcc_add (server, DCC_CHAT_RECV, strtoul (pos_addr, NULL, 10),
+ atoi (pos_port), nick, -1, NULL, NULL, 0);
}
-
- dcc_add (server, DCC_CHAT_RECV, strtoul (pos_addr, NULL, 10),
- atoi (pos_port), host, -1, NULL, NULL, 0);
-
return 0;
}
/* private message received => display it */
- ptr_channel = channel_search (server, host);
+ ptr_channel = channel_search (server, nick);
if (strncmp (pos, "\01ACTION ", 8) == 0)
{
- if (!ptr_channel)
+ command_ignored |= ignore_check (host, "action", NULL, server->name);
+ command_ignored |= ignore_check (host, "pv", NULL, server->name);
+
+ if (!command_ignored)
{
- ptr_channel = channel_new (server, CHAT_PRIVATE, host, 0);
if (!ptr_channel)
{
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot create new private window \"%s\"\n"),
- WEECHAT_ERROR, host);
- return -1;
+ ptr_channel = channel_new (server, CHAT_PRIVATE, nick, 0);
+ if (!ptr_channel)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot create new private window \"%s\"\n"),
+ WEECHAT_ERROR, nick);
+ return -1;
+ }
}
+ if (!ptr_channel->topic)
+ ptr_channel->topic = strdup (host2);
+
+ pos += 8;
+ pos2 = strchr (pos, '\01');
+ if (pos2)
+ pos2[0] = '\0';
+ irc_display_prefix (ptr_channel->buffer, PREFIX_ACTION_ME);
+ if (irc_is_highlight (pos, server->nick))
+ {
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
+ COLOR_WIN_CHAT_HIGHLIGHT,
+ "%s", nick);
+ if ( (cfg_look_infobar)
+ && (cfg_look_infobar_delay_highlight > 0)
+ && (ptr_channel->buffer != gui_current_window->buffer) )
+ gui_infobar_printf (cfg_look_infobar_delay_highlight,
+ COLOR_WIN_INFOBAR_HIGHLIGHT,
+ _("On %s: * %s %s"),
+ ptr_channel->name,
+ nick, pos);
+ }
+ else
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_MSG,
+ COLOR_WIN_CHAT_NICK, "%s", nick);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, " %s\n", pos);
}
- if (!ptr_channel->topic)
- ptr_channel->topic = strdup (host2);
-
- pos += 8;
- pos2 = strchr (pos, '\01');
- if (pos2)
- pos2[0] = '\0';
- irc_display_prefix (ptr_channel->buffer, PREFIX_ACTION_ME);
- if (irc_is_highlight (pos, server->nick))
- {
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
- COLOR_WIN_CHAT_HIGHLIGHT,
- "%s", host);
- if ( (cfg_look_infobar)
- && (cfg_look_infobar_delay_highlight > 0)
- && (ptr_channel->buffer != gui_current_window->buffer) )
- gui_infobar_printf (cfg_look_infobar_delay_highlight,
- COLOR_WIN_INFOBAR_HIGHLIGHT,
- _("On %s: * %s %s"),
- ptr_channel->name,
- host, pos);
- }
- else
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_MSG,
- COLOR_WIN_CHAT_NICK, "%s", host);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, " %s\n", pos);
}
else
{
@@ -1860,78 +1925,88 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
pos2 = strchr (pos + 1, '\01');
if ((pos[0] == '\01') && pos2 && (pos2[1] == '\0'))
{
- pos++;
- pos2[0] = '\0';
- pos2 = strchr (pos, ' ');
- if (pos2)
+ command_ignored |= ignore_check (host, "ctcp", NULL, server->name);
+
+ if (!command_ignored)
{
+ pos++;
pos2[0] = '\0';
- pos2++;
- while (pos2[0] == ' ')
+ pos2 = strchr (pos, ' ');
+ if (pos2)
+ {
+ pos2[0] = '\0';
pos2++;
- if (!pos2[0])
- pos2 = NULL;
- }
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, _("Unknown CTCP "));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL, "%s ", pos);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, _("received from"));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, " %s", host);
- if (pos2)
+ while (pos2[0] == ' ')
+ pos2++;
+ if (!pos2[0])
+ pos2 = NULL;
+ }
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, ": %s\n", pos2);
- else
- gui_printf (server->buffer, "\n");
+ COLOR_WIN_CHAT, _("Unknown CTCP "));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL, "%s ", pos);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, _("received from"));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, " %s", nick);
+ if (pos2)
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, ": %s\n", pos2);
+ else
+ gui_printf (server->buffer, "\n");
+ }
return 0;
}
else
{
- if (!ptr_channel)
+ command_ignored |= ignore_check (host, "pv", NULL, server->name);
+
+ if (!command_ignored)
{
- ptr_channel = channel_new (server, CHAT_PRIVATE, host, 0);
if (!ptr_channel)
{
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot create new private window \"%s\"\n"),
- WEECHAT_ERROR, host);
- return -1;
+ ptr_channel = channel_new (server, CHAT_PRIVATE, nick, 0);
+ if (!ptr_channel)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot create new private window \"%s\"\n"),
+ WEECHAT_ERROR, nick);
+ return -1;
+ }
}
- }
- if (!ptr_channel->topic)
- ptr_channel->topic = strdup (host2);
-
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_NICK,
- COLOR_WIN_CHAT_DARK, "<");
- if (irc_is_highlight (pos, server->nick))
- {
+ if (!ptr_channel->topic)
+ ptr_channel->topic = strdup (host2);
+
gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
- COLOR_WIN_CHAT_HIGHLIGHT,
- "%s", host);
- if ( (cfg_look_infobar_delay_highlight > 0)
- && (ptr_channel->buffer != gui_current_window->buffer) )
- gui_infobar_printf (cfg_look_infobar_delay_highlight,
- COLOR_WIN_INFOBAR_HIGHLIGHT,
- _("Private %s> %s"),
- host, pos);
- }
- else
+ MSG_TYPE_NICK,
+ COLOR_WIN_CHAT_DARK, "<");
+ if (irc_is_highlight (pos, server->nick))
+ {
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
+ COLOR_WIN_CHAT_HIGHLIGHT,
+ "%s", nick);
+ if ( (cfg_look_infobar_delay_highlight > 0)
+ && (ptr_channel->buffer != gui_current_window->buffer) )
+ gui_infobar_printf (cfg_look_infobar_delay_highlight,
+ COLOR_WIN_INFOBAR_HIGHLIGHT,
+ _("Private %s> %s"),
+ nick, pos);
+ }
+ else
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_NICK,
+ COLOR_WIN_NICK_PRIVATE,
+ "%s", nick);
gui_printf_type_color (ptr_channel->buffer,
MSG_TYPE_NICK,
- COLOR_WIN_NICK_PRIVATE,
- "%s", host);
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_NICK,
- COLOR_WIN_CHAT_DARK, "> ");
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_MSG,
- COLOR_WIN_CHAT, "%s\n", pos);
+ COLOR_WIN_CHAT_DARK, "> ");
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_MSG,
+ COLOR_WIN_CHAT, "%s\n", pos);
+ }
}
}
}
@@ -1952,7 +2027,7 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_quit (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_quit (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
t_irc_channel *ptr_channel;
@@ -1968,41 +2043,41 @@ irc_cmd_recv_quit (t_irc_server *server, char *host, char *arguments)
return -1;
}
- /* keep only nick name from host */
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
-
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
if (ptr_channel->type == CHAT_PRIVATE)
ptr_nick = NULL;
else
- ptr_nick = nick_search (ptr_channel, host);
+ ptr_nick = nick_search (ptr_channel, nick);
- if (ptr_nick || (strcmp (ptr_channel->name, host) == 0))
+ if (ptr_nick || (strcmp (ptr_channel->name, nick) == 0))
{
if (ptr_nick)
nick_free (ptr_channel, ptr_nick);
- irc_display_prefix (ptr_channel->buffer, PREFIX_QUIT);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_NICK, "%s ", host);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, "(");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_HOST, "%s", pos + 1);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, ") ");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _("has quit"));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, " (");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, "%s",
- arguments);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, ")\n");
+ if (!command_ignored
+ && !ignore_check (host, "quit", ptr_channel->name, server->name))
+ {
+ pos = strchr (host, '!');
+ irc_display_prefix (ptr_channel->buffer, PREFIX_QUIT);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_NICK, "%s ", nick);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_DARK, "(");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_HOST, "%s", (pos) ? pos + 1 : "");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_DARK, ") ");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _("has quit"));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_DARK, " (");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, "%s",
+ arguments);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_DARK, ")\n");
+ }
if (gui_buffer_has_nicklist (ptr_channel->buffer))
gui_draw_buffer_nick (ptr_channel->buffer, 1);
gui_draw_buffer_status (ptr_channel->buffer, 1);
@@ -2017,10 +2092,11 @@ irc_cmd_recv_quit (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_server_msg (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_server_msg (t_irc_server *server, char *host, char *nick, char *arguments)
{
/* make gcc happy */
(void) host;
+ (void) nick;
/* skip nickname if at beginning of server message */
if (strncmp (server->nick, arguments, strlen (server->nick)) == 0)
@@ -2034,8 +2110,11 @@ irc_cmd_recv_server_msg (t_irc_server *server, char *host, char *arguments)
arguments++;
/* display server message */
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", arguments);
+ if (!command_ignored)
+ {
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", arguments);
+ }
return 0;
}
@@ -2044,7 +2123,7 @@ irc_cmd_recv_server_msg (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_server_reply (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_server_reply (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos2;
int first;
@@ -2052,42 +2131,46 @@ irc_cmd_recv_server_reply (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) server;
(void) host;
+ (void) nick;
- pos = strchr (arguments, ' ');
- if (pos)
+ if (!command_ignored)
{
- pos[0] = '\0';
- pos++;
- while (pos[0] == ' ')
- pos++;
- }
- else
- pos = arguments;
-
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- first = 1;
-
- while (pos && pos[0])
- {
- pos2 = strchr (pos, ' ');
- if ((pos[0] == ':') || (!pos2))
+ pos = strchr (arguments, ' ');
+ if (pos)
{
- if (pos[0] == ':')
+ pos[0] = '\0';
+ pos++;
+ while (pos[0] == ' ')
pos++;
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- "%s%s\n", (first) ? "" : ": ", pos);
- pos = NULL;
}
else
+ pos = arguments;
+
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ first = 1;
+
+ while (pos && pos[0])
{
- pos2[0] = '\0';
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%s%s\n",
- (first) ? "" : " ", pos);
- first = 0;
- pos = pos2 + 1;
+ pos2 = strchr (pos, ' ');
+ if ((pos[0] == ':') || (!pos2))
+ {
+ if (pos[0] == ':')
+ pos++;
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ "%s%s\n", (first) ? "" : ": ", pos);
+ pos = NULL;
+ }
+ else
+ {
+ pos2[0] = '\0';
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%s%s\n",
+ (first) ? "" : " ", pos);
+ first = 0;
+ pos = pos2 + 1;
+ }
}
}
return 0;
@@ -2098,19 +2181,14 @@ irc_cmd_recv_server_reply (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_topic (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_topic (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
t_irc_channel *ptr_channel;
t_gui_buffer *buffer;
/* make gcc happy */
- (void) host;
-
- /* keep only nick name from host */
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
+ (void) nick;
if (!string_is_channel (arguments))
{
@@ -2134,31 +2212,36 @@ irc_cmd_recv_topic (t_irc_server *server, char *host, char *arguments)
pos = NULL;
}
+ command_ignored |= ignore_check (host, "topic", arguments, server->name);
+
ptr_channel = channel_search (server, arguments);
buffer = (ptr_channel) ? ptr_channel->buffer : server->buffer;
- irc_display_prefix (buffer, PREFIX_INFO);
- gui_printf_color (buffer,
- COLOR_WIN_CHAT_NICK, "%s",
- host);
- if (pos)
- {
- gui_printf_color (buffer,
- COLOR_WIN_CHAT, _(" has changed topic for "));
- gui_printf_color (buffer,
- COLOR_WIN_CHAT_CHANNEL, "%s",
- arguments);
- gui_printf_color (buffer,
- COLOR_WIN_CHAT, _(" to: \"%s\"\n"),
- pos);
- }
- else
+ if (!command_ignored)
{
+ irc_display_prefix (buffer, PREFIX_INFO);
gui_printf_color (buffer,
- COLOR_WIN_CHAT, _(" has unset topic for "));
- gui_printf_color (buffer,
- COLOR_WIN_CHAT_CHANNEL, "%s\n",
- arguments);
+ COLOR_WIN_CHAT_NICK, "%s",
+ host);
+ if (pos)
+ {
+ gui_printf_color (buffer,
+ COLOR_WIN_CHAT, _(" has changed topic for "));
+ gui_printf_color (buffer,
+ COLOR_WIN_CHAT_CHANNEL, "%s",
+ arguments);
+ gui_printf_color (buffer,
+ COLOR_WIN_CHAT, _(" to: \"%s\"\n"),
+ pos);
+ }
+ else
+ {
+ gui_printf_color (buffer,
+ COLOR_WIN_CHAT, _(" has unset topic for "));
+ gui_printf_color (buffer,
+ COLOR_WIN_CHAT_CHANNEL, "%s\n",
+ arguments);
+ }
}
if (ptr_channel)
@@ -2180,14 +2263,11 @@ irc_cmd_recv_topic (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_004 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_004 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
t_irc_channel *ptr_channel;
- /* make gcc happy */
- (void) host;
-
pos = strchr (arguments, ' ');
if (pos)
pos[0] = '\0';
@@ -2197,7 +2277,7 @@ irc_cmd_recv_004 (t_irc_server *server, char *host, char *arguments)
server->nick = strdup (arguments);
}
- irc_cmd_recv_server_msg (server, host, arguments);
+ irc_cmd_recv_server_msg (server, host, nick, arguments);
/* connection to IRC server is ok! */
server->is_connected = 1;
@@ -2246,13 +2326,14 @@ irc_cmd_recv_004 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_301 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_301 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_message;
/* make gcc happy */
(void) server;
(void) host;
+ (void) nick;
pos_nick = strchr (arguments, ' ');
if (pos_nick)
@@ -2269,11 +2350,14 @@ irc_cmd_recv_301 (t_irc_server *server, char *host, char *arguments)
if (pos_message[0] == ':')
pos_message++;
- irc_display_prefix (gui_current_window->buffer, PREFIX_INFO);
- gui_printf_color (gui_current_window->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (gui_current_window->buffer,
- COLOR_WIN_CHAT, _(" is away: %s\n"), pos_message);
+ if (!command_ignored)
+ {
+ irc_display_prefix (gui_current_window->buffer, PREFIX_INFO);
+ gui_printf_color (gui_current_window->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (gui_current_window->buffer,
+ COLOR_WIN_CHAT, _(" is away: %s\n"), pos_message);
+ }
}
}
return 0;
@@ -2284,50 +2368,54 @@ irc_cmd_recv_301 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_302 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_302 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_host, *ptr_next;
/* make gcc happy */
(void) host;
+ (void) nick;
- arguments = strchr (arguments, ' ');
- if (arguments)
+ if (!command_ignored)
{
- while (arguments[0] == ' ')
- arguments++;
- if (arguments[0] == ':')
- arguments++;
- while (arguments)
+ arguments = strchr (arguments, ' ');
+ if (arguments)
{
- pos_host = strchr (arguments, '=');
- if (pos_host)
+ while (arguments[0] == ' ')
+ arguments++;
+ if (arguments[0] == ':')
+ arguments++;
+ while (arguments)
{
- pos_host[0] = '\0';
- pos_host++;
-
- ptr_next = strchr (pos_host, ' ');
- if (ptr_next)
+ pos_host = strchr (arguments, '=');
+ if (pos_host)
{
- ptr_next[0] = '\0';
- ptr_next++;
- while (ptr_next[0] == ' ')
+ pos_host[0] = '\0';
+ pos_host++;
+
+ ptr_next = strchr (pos_host, ' ');
+ if (ptr_next)
+ {
+ ptr_next[0] = '\0';
ptr_next++;
+ while (ptr_next[0] == ' ')
+ ptr_next++;
+ }
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", arguments);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "=");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_HOST, "%s\n", pos_host);
}
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", arguments);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "=");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_HOST, "%s\n", pos_host);
+ else
+ ptr_next = NULL;
+ arguments = ptr_next;
+ if (arguments && !arguments[0])
+ arguments = NULL;
}
- else
- ptr_next = NULL;
- arguments = ptr_next;
- if (arguments && !arguments[0])
- arguments = NULL;
}
}
return 0;
@@ -2338,42 +2426,46 @@ irc_cmd_recv_302 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_303 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_303 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *ptr_next;
/* make gcc happy */
(void) host;
+ (void) nick;
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, _("Users online: "));
-
- arguments = strchr (arguments, ' ');
- if (arguments)
+ if (!command_ignored)
{
- while (arguments[0] == ' ')
- arguments++;
- if (arguments[0] == ':')
- arguments++;
- while (arguments)
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, _("Users online: "));
+
+ arguments = strchr (arguments, ' ');
+ if (arguments)
{
- ptr_next = strchr (arguments, ' ');
- if (ptr_next)
+ while (arguments[0] == ' ')
+ arguments++;
+ if (arguments[0] == ':')
+ arguments++;
+ while (arguments)
{
- ptr_next[0] = '\0';
- ptr_next++;
- while (ptr_next[0] == ' ')
+ ptr_next = strchr (arguments, ' ');
+ if (ptr_next)
+ {
+ ptr_next[0] = '\0';
ptr_next++;
+ while (ptr_next[0] == ' ')
+ ptr_next++;
+ }
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s ", arguments);
+ arguments = ptr_next;
+ if (arguments && !arguments[0])
+ arguments = NULL;
}
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s ", arguments);
- arguments = ptr_next;
- if (arguments && !arguments[0])
- arguments = NULL;
}
+ gui_printf (server->buffer, "\n");
}
- gui_printf (server->buffer, "\n");
return 0;
}
@@ -2382,21 +2474,25 @@ irc_cmd_recv_303 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_305 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_305 (t_irc_server *server, char *host, char *nick, char *arguments)
{
/* make gcc happy */
(void) host;
+ (void) nick;
- arguments = strchr (arguments, ' ');
- if (arguments)
+ if (!command_ignored)
{
- while (arguments[0] == ' ')
- arguments++;
- if (arguments[0] == ':')
- arguments++;
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s\n", arguments);
+ arguments = strchr (arguments, ' ');
+ if (arguments)
+ {
+ while (arguments[0] == ' ')
+ arguments++;
+ if (arguments[0] == ':')
+ arguments++;
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s\n", arguments);
+ }
}
server->is_away = 0;
server->away_time = 0;
@@ -2408,21 +2504,25 @@ irc_cmd_recv_305 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_306 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_306 (t_irc_server *server, char *host, char *nick, char *arguments)
{
/* make gcc happy */
(void) host;
+ (void) nick;
- arguments = strchr (arguments, ' ');
- if (arguments)
+ if (!command_ignored)
{
- while (arguments[0] == ' ')
- arguments++;
- if (arguments[0] == ':')
- arguments++;
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s\n", arguments);
+ arguments = strchr (arguments, ' ');
+ if (arguments)
+ {
+ while (arguments[0] == ' ')
+ arguments++;
+ if (arguments[0] == ':')
+ arguments++;
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s\n", arguments);
+ }
}
server->is_away = 1;
server->away_time = time (NULL);
@@ -2434,38 +2534,42 @@ irc_cmd_recv_306 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_307 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_307 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_msg;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_msg = strchr (pos_nick, ' ');
- if (pos_msg)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_msg[0] = '\0';
- pos_msg++;
- while (pos_msg[0] == ' ')
- pos_msg++;
- if (pos_msg[0] == ':')
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_msg = strchr (pos_nick, ' ');
+ if (pos_msg)
+ {
+ pos_msg[0] = '\0';
pos_msg++;
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s\n",
- pos_msg);
+ while (pos_msg[0] == ' ')
+ pos_msg++;
+ if (pos_msg[0] == ':')
+ pos_msg++;
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s\n",
+ pos_msg);
+ }
}
}
return 0;
@@ -2476,60 +2580,64 @@ irc_cmd_recv_307 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_311 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_311 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_user, *pos_host, *pos_realname;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_user = strchr (pos_nick, ' ');
- if (pos_user)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_user[0] = '\0';
- pos_user++;
- while (pos_user[0] == ' ')
- pos_user++;
- pos_host = strchr (pos_user, ' ');
- if (pos_host)
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_user = strchr (pos_nick, ' ');
+ if (pos_user)
{
- pos_host[0] = '\0';
- pos_host++;
- while (pos_host[0] == ' ')
- pos_host++;
- pos_realname = strchr (pos_host, ' ');
- if (pos_realname)
+ pos_user[0] = '\0';
+ pos_user++;
+ while (pos_user[0] == ' ')
+ pos_user++;
+ pos_host = strchr (pos_user, ' ');
+ if (pos_host)
{
- pos_realname[0] = '\0';
- pos_realname++;
- while (pos_realname[0] == ' ')
- pos_realname++;
- if (pos_realname[0] == '*')
- pos_realname++;
- while (pos_realname[0] == ' ')
- pos_realname++;
- if (pos_realname[0] == ':')
+ pos_host[0] = '\0';
+ pos_host++;
+ while (pos_host[0] == ' ')
+ pos_host++;
+ pos_realname = strchr (pos_host, ' ');
+ if (pos_realname)
+ {
+ pos_realname[0] = '\0';
pos_realname++;
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] (");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_HOST, "%s@%s",
- pos_user, pos_host);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, ")");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, ": %s\n", pos_realname);
+ while (pos_realname[0] == ' ')
+ pos_realname++;
+ if (pos_realname[0] == '*')
+ pos_realname++;
+ while (pos_realname[0] == ' ')
+ pos_realname++;
+ if (pos_realname[0] == ':')
+ pos_realname++;
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] (");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_HOST, "%s@%s",
+ pos_user, pos_host);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, ")");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, ": %s\n", pos_realname);
+ }
}
}
}
@@ -2542,50 +2650,54 @@ irc_cmd_recv_311 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_312 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_312 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_server, *pos_serverinfo;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_server = strchr (pos_nick, ' ');
- if (pos_server)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_server[0] = '\0';
- pos_server++;
- while (pos_server[0] == ' ')
- pos_server++;
- pos_serverinfo = strchr (pos_server, ' ');
- if (pos_serverinfo)
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_server = strchr (pos_nick, ' ');
+ if (pos_server)
{
- pos_serverinfo[0] = '\0';
- pos_serverinfo++;
- while (pos_serverinfo[0] == ' ')
+ pos_server[0] = '\0';
+ pos_server++;
+ while (pos_server[0] == ' ')
+ pos_server++;
+ pos_serverinfo = strchr (pos_server, ' ');
+ if (pos_serverinfo)
+ {
+ pos_serverinfo[0] = '\0';
pos_serverinfo++;
- if (pos_serverinfo[0] == ':')
+ while (pos_serverinfo[0] == ' ')
pos_serverinfo++;
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s ", pos_server);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "(");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s", pos_serverinfo);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, ")\n");
+ if (pos_serverinfo[0] == ':')
+ pos_serverinfo++;
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s ", pos_server);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "(");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s", pos_serverinfo);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, ")\n");
+ }
}
}
}
@@ -2597,37 +2709,41 @@ irc_cmd_recv_312 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_313 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_313 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_message;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_message = strchr (pos_nick, ' ');
- if (pos_message)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_message[0] = '\0';
- pos_message++;
- while (pos_message[0] == ' ')
- pos_message++;
- if (pos_message[0] == ':')
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_message = strchr (pos_nick, ' ');
+ if (pos_message)
+ {
+ pos_message[0] = '\0';
pos_message++;
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s\n", pos_message);
+ while (pos_message[0] == ' ')
+ pos_message++;
+ if (pos_message[0] == ':')
+ pos_message++;
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s\n", pos_message);
+ }
}
}
return 0;
@@ -2638,62 +2754,66 @@ irc_cmd_recv_313 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_314 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_314 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_user, *pos_host, *pos_realname;
/* make gcc happy */
(void) host;
-
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ (void) nick;
+
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_user = strchr (pos_nick, ' ');
- if (pos_user)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_user[0] = '\0';
- pos_user++;
- while (pos_user[0] == ' ')
- pos_user++;
- pos_host = strchr (pos_user, ' ');
- if (pos_host)
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_user = strchr (pos_nick, ' ');
+ if (pos_user)
{
- pos_host[0] = '\0';
- pos_host++;
- while (pos_host[0] == ' ')
- pos_host++;
- pos_realname = strchr (pos_host, ' ');
- if (pos_realname)
+ pos_user[0] = '\0';
+ pos_user++;
+ while (pos_user[0] == ' ')
+ pos_user++;
+ pos_host = strchr (pos_user, ' ');
+ if (pos_host)
{
- pos_realname[0] = '\0';
- pos_realname++;
- while (pos_realname[0] == ' ')
- pos_realname++;
- pos_realname = strchr (pos_realname, ' ');
+ pos_host[0] = '\0';
+ pos_host++;
+ while (pos_host[0] == ' ')
+ pos_host++;
+ pos_realname = strchr (pos_host, ' ');
if (pos_realname)
{
pos_realname[0] = '\0';
pos_realname++;
while (pos_realname[0] == ' ')
pos_realname++;
- if (pos_realname[0] == ':')
+ pos_realname = strchr (pos_realname, ' ');
+ if (pos_realname)
+ {
+ pos_realname[0] = '\0';
pos_realname++;
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, " (");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_HOST,
- "%s@%s", pos_user, pos_host);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, ")");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- " was %s\n", pos_realname);
+ while (pos_realname[0] == ' ')
+ pos_realname++;
+ if (pos_realname[0] == ':')
+ pos_realname++;
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, " (");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_HOST,
+ "%s@%s", pos_user, pos_host);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, ")");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ " was %s\n", pos_realname);
+ }
}
}
}
@@ -2707,13 +2827,14 @@ irc_cmd_recv_314 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_315 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_315 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
t_irc_channel *ptr_channel;
/* make gcc happy */
(void) host;
+ (void) nick;
/* skip nickname if at beginning of server message */
if (strncmp (server->nick, arguments, strlen (server->nick)) == 0)
@@ -2734,11 +2855,17 @@ irc_cmd_recv_315 (t_irc_server *server, char *host, char *arguments)
ptr_channel->checking_away--;
return 0;
}
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", arguments);
- gui_printf (server->buffer, " %s\n", pos);
+ if (!command_ignored)
+ {
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", arguments);
+ gui_printf (server->buffer, " %s\n", pos);
+ }
}
else
- gui_printf (server->buffer, "%s\n", arguments);
+ {
+ if (!command_ignored)
+ gui_printf (server->buffer, "%s\n", arguments);
+ }
return 0;
}
@@ -2747,7 +2874,7 @@ irc_cmd_recv_315 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_317 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_317 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_idle, *pos_signon, *pos_message;
int idle_time, day, hour, min, sec;
@@ -2755,85 +2882,89 @@ irc_cmd_recv_317 (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_idle = strchr (pos_nick, ' ');
- if (pos_idle)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_idle[0] = '\0';
- pos_idle++;
- while (pos_idle[0] == ' ')
- pos_idle++;
- pos_signon = strchr (pos_idle, ' ');
- if (pos_signon)
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_idle = strchr (pos_nick, ' ');
+ if (pos_idle)
{
- pos_signon[0] = '\0';
- pos_signon++;
- while (pos_signon[0] == ' ')
- pos_signon++;
- pos_message = strchr (pos_signon, ' ');
- if (pos_message)
+ pos_idle[0] = '\0';
+ pos_idle++;
+ while (pos_idle[0] == ' ')
+ pos_idle++;
+ pos_signon = strchr (pos_idle, ' ');
+ if (pos_signon)
{
- pos_message[0] = '\0';
+ pos_signon[0] = '\0';
+ pos_signon++;
+ while (pos_signon[0] == ' ')
+ pos_signon++;
+ pos_message = strchr (pos_signon, ' ');
+ if (pos_message)
+ {
+ pos_message[0] = '\0';
- idle_time = atoi (pos_idle);
- day = idle_time / (60 * 60 * 24);
- hour = (idle_time % (60 * 60 * 24)) / (60 * 60);
- min = ((idle_time % (60 * 60 * 24)) % (60 * 60)) / 60;
- sec = ((idle_time % (60 * 60 * 24)) % (60 * 60)) % 60;
+ idle_time = atoi (pos_idle);
+ day = idle_time / (60 * 60 * 24);
+ hour = (idle_time % (60 * 60 * 24)) / (60 * 60);
+ min = ((idle_time % (60 * 60 * 24)) % (60 * 60)) / 60;
+ sec = ((idle_time % (60 * 60 * 24)) % (60 * 60)) % 60;
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, _("idle: "));
- if (day > 0)
- {
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, _("idle: "));
+ if (day > 0)
+ {
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%d ", day);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ (day > 1) ? _("days") : _("day"));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ ", ");
+ }
gui_printf_color (server->buffer,
COLOR_WIN_CHAT_CHANNEL,
- "%d ", day);
+ "%02d ", hour);
gui_printf_color (server->buffer,
COLOR_WIN_CHAT,
- (day > 1) ? _("days") : _("day"));
+ (hour > 1) ? _("hours") : _("hour"));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ " %02d ", min);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ (min > 1) ? _("minutes") : _("minute"));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ " %02d ", sec);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ (sec > 1) ? _("seconds") : _("second"));
gui_printf_color (server->buffer,
COLOR_WIN_CHAT,
", ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, _("signon at: "));
+ datetime = (time_t)(atol (pos_signon));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%s", ctime (&datetime));
}
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%02d ", hour);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- (hour > 1) ? _("hours") : _("hour"));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- " %02d ", min);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- (min > 1) ? _("minutes") : _("minute"));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- " %02d ", sec);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- (sec > 1) ? _("seconds") : _("second"));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- ", ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, _("signon at: "));
- datetime = (time_t)(atol (pos_signon));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%s", ctime (&datetime));
}
}
}
@@ -2846,37 +2977,41 @@ irc_cmd_recv_317 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_318 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_318 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_message;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_message = strchr (pos_nick, ' ');
- if (pos_message)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_message[0] = '\0';
- pos_message++;
- while (pos_message[0] == ' ')
- pos_message++;
- if (pos_message[0] == ':')
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_message = strchr (pos_nick, ' ');
+ if (pos_message)
+ {
+ pos_message[0] = '\0';
pos_message++;
+ while (pos_message[0] == ' ')
+ pos_message++;
+ if (pos_message[0] == ':')
+ pos_message++;
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s\n", pos_message);
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s\n", pos_message);
+ }
}
}
return 0;
@@ -2887,76 +3022,80 @@ irc_cmd_recv_318 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_319 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_319 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_channel, *pos;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_channel = strchr (pos_nick, ' ');
- if (pos_channel)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_channel[0] = '\0';
- pos_channel++;
- while (pos_channel[0] == ' ')
- pos_channel++;
- if (pos_channel[0] == ':')
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_channel = strchr (pos_nick, ' ');
+ 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_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, _("Channels: "));
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, _("Channels: "));
- while (pos_channel && pos_channel[0])
- {
- if (pos_channel[0] == '@')
+ while (pos_channel && pos_channel[0])
{
- gui_printf_color (server->buffer,
- COLOR_WIN_NICK_OP, "@");
- pos_channel++;
- }
- else
- {
- if (pos_channel[0] == '%')
+ if (pos_channel[0] == '@')
{
gui_printf_color (server->buffer,
- COLOR_WIN_NICK_HALFOP, "%");
+ COLOR_WIN_NICK_OP, "@");
pos_channel++;
}
else
- if (pos_channel[0] == '+')
+ {
+ if (pos_channel[0] == '%')
{
gui_printf_color (server->buffer,
- COLOR_WIN_NICK_VOICE, "+");
+ COLOR_WIN_NICK_HALFOP, "%");
pos_channel++;
}
- }
- pos = strchr (pos_channel, ' ');
- if (pos)
- {
- pos[0] = '\0';
- pos++;
- while (pos[0] == ' ')
+ else
+ if (pos_channel[0] == '+')
+ {
+ gui_printf_color (server->buffer,
+ COLOR_WIN_NICK_VOICE, "+");
+ pos_channel++;
+ }
+ }
+ pos = strchr (pos_channel, ' ');
+ if (pos)
+ {
+ pos[0] = '\0';
pos++;
+ while (pos[0] == ' ')
+ pos++;
+ }
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%s%s",
+ pos_channel,
+ (pos && pos[0]) ? " " : "\n");
+ pos_channel = pos;
}
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%s%s",
- pos_channel,
- (pos && pos[0]) ? " " : "\n");
- pos_channel = pos;
}
}
}
@@ -2968,37 +3107,41 @@ irc_cmd_recv_319 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_320 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_320 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_message;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_message = strchr (pos_nick, ' ');
- if (pos_message)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_message[0] = '\0';
- pos_message++;
- while (pos_message[0] == ' ')
- pos_message++;
- if (pos_message[0] == ':')
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_message = strchr (pos_nick, ' ');
+ if (pos_message)
+ {
+ pos_message[0] = '\0';
pos_message++;
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s\n", pos_message);
+ while (pos_message[0] == ' ')
+ pos_message++;
+ if (pos_message[0] == ':')
+ pos_message++;
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s\n", pos_message);
+ }
}
}
return 0;
@@ -3009,26 +3152,30 @@ irc_cmd_recv_320 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_321 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_321 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos = strchr (arguments, ' ');
- if (pos)
+ if (!command_ignored)
{
- pos[0] = '\0';
- pos++;
- while (pos[0] == ' ')
+ pos = strchr (arguments, ' ');
+ if (pos)
+ {
+ pos[0] = '\0';
pos++;
- }
- else
- pos = arguments;
+ while (pos[0] == ' ')
+ pos++;
+ }
+ else
+ pos = arguments;
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf (server->buffer, "%s\n", pos);
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf (server->buffer, "%s\n", pos);
+ }
return 0;
}
@@ -3037,26 +3184,30 @@ irc_cmd_recv_321 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_322 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_322 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos = strchr (arguments, ' ');
- if (pos)
+ if (!command_ignored)
{
- pos[0] = '\0';
- pos++;
- while (pos[0] == ' ')
+ pos = strchr (arguments, ' ');
+ if (pos)
+ {
+ pos[0] = '\0';
pos++;
- }
- else
- pos = arguments;
+ while (pos[0] == ' ')
+ pos++;
+ }
+ else
+ pos = arguments;
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf (server->buffer, "%s\n", pos);
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf (server->buffer, "%s\n", pos);
+ }
return 0;
}
@@ -3065,26 +3216,30 @@ irc_cmd_recv_322 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_323 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_323 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos = strchr (arguments, ' ');
- if (pos)
+ if (!command_ignored)
{
- pos[0] = '\0';
- pos++;
- while (pos[0] == ' ')
+ pos = strchr (arguments, ' ');
+ if (pos)
+ {
+ pos[0] = '\0';
pos++;
- }
- else
- pos = arguments;
+ while (pos[0] == ' ')
+ pos++;
+ }
+ else
+ pos = arguments;
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf (server->buffer, "%s\n", pos);
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf (server->buffer, "%s\n", pos);
+ }
return 0;
}
@@ -3093,23 +3248,24 @@ irc_cmd_recv_323 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_324 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_324 (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos_chan, *pos, *pos_parm;
+ char *pos_channel, *pos, *pos_parm;
t_irc_channel *ptr_channel;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_chan = strchr (arguments, ' ');
- if (pos_chan)
+ pos_channel = strchr (arguments, ' ');
+ if (pos_channel)
{
- pos_chan[0] = '\0';
- pos_chan++;
- while (pos_chan[0] == ' ')
- pos_chan++;
+ pos_channel[0] = '\0';
+ pos_channel++;
+ while (pos_channel[0] == ' ')
+ pos_channel++;
- pos = strchr (pos_chan, ' ');
+ pos = strchr (pos_channel, ' ');
if (pos)
{
pos[0] = '\0';
@@ -3125,7 +3281,7 @@ irc_cmd_recv_324 (t_irc_server *server, char *host, char *arguments)
while (pos_parm[0] == ' ')
pos_parm++;
}
- ptr_channel = channel_search (server, pos_chan);
+ ptr_channel = channel_search (server, pos_channel);
if (ptr_channel)
{
irc_get_channel_modes (ptr_channel, NULL, NULL, pos, pos_parm);
@@ -3141,11 +3297,12 @@ irc_cmd_recv_324 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_329 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_329 (t_irc_server *server, char *host, char *nick, char *arguments)
{
/* make gcc happy */
(void) server;
(void) host;
+ (void) nick;
(void) arguments;
return 0;
@@ -3156,22 +3313,43 @@ irc_cmd_recv_329 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_331 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_331 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
+ t_irc_channel *ptr_channel;
/* make gcc happy */
(void) server;
(void) host;
+ (void) nick;
- pos = strchr (arguments, ' ');
- if (pos)
- pos[0] = '\0';
- irc_display_prefix (gui_current_window->buffer, PREFIX_INFO);
- gui_printf_color (gui_current_window->buffer,
- COLOR_WIN_CHAT, _("No topic set for "));
- gui_printf_color (gui_current_window->buffer,
- COLOR_WIN_CHAT_CHANNEL, "%s\n", arguments);
+ if (!command_ignored)
+ {
+ pos = strchr (arguments, ' ');
+ if (pos)
+ pos[0] = '\0';
+ ptr_channel = channel_search (server, arguments);
+ if (ptr_channel)
+ {
+ command_ignored |= ignore_check (host, "331", ptr_channel->name, server->name);
+ if (!command_ignored)
+ {
+ irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _("No topic set for "));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL, "%s\n", arguments);
+ }
+ }
+ else
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s channel \"%s\" not found for \"%s\" command\n"),
+ WEECHAT_ERROR, arguments, "331");
+ return -1;
+ }
+ }
return 0;
}
@@ -3180,13 +3358,14 @@ irc_cmd_recv_331 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_332 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_332 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos2;
t_irc_channel *ptr_channel;
/* make gcc happy */
(void) host;
+ (void) nick;
pos = strchr (arguments, ' ');
if (pos)
@@ -3209,13 +3388,17 @@ irc_cmd_recv_332 (t_irc_server *server, char *host, char *arguments)
free (ptr_channel->topic);
ptr_channel->topic = strdup (pos2);
- irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _("Topic for "));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL, "%s", pos);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _(" is: \"%s\"\n"), pos2);
+ command_ignored |= ignore_check (host, "332", ptr_channel->name, server->name);
+ if (!command_ignored)
+ {
+ irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _("Topic for "));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL, "%s", pos);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _(" is: \"%s\"\n"), pos2);
+ }
gui_draw_buffer_title (ptr_channel->buffer, 1);
}
@@ -3245,7 +3428,7 @@ irc_cmd_recv_332 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_333 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_333 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_channel, *pos_nick, *pos_date;
t_irc_channel *ptr_channel;
@@ -3253,6 +3436,7 @@ irc_cmd_recv_333 (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) host;
+ (void) nick;
pos_channel = strchr (arguments, ' ');
if (pos_channel)
@@ -3277,14 +3461,18 @@ irc_cmd_recv_333 (t_irc_server *server, char *host, char *arguments)
ptr_channel = channel_search (server, pos_channel);
if (ptr_channel)
{
- irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _("Topic set by "));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- datetime = (time_t)(atol (pos_date));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, ", %s", ctime (&datetime));
+ command_ignored |= ignore_check (host, "333", ptr_channel->name, server->name);
+ if (!command_ignored)
+ {
+ irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _("Topic set by "));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ datetime = (time_t)(atol (pos_date));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, ", %s", ctime (&datetime));
+ }
}
else
{
@@ -3329,13 +3517,13 @@ irc_cmd_recv_333 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_341 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_341 (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos, *pos_nick, *pos_channel;
+ char *pos_nick, *pos_channel;
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
+ /* make gcc happy */
+ (void) host;
+ (void) nick;
pos_nick = strchr (arguments, ' ');
if (pos_nick)
@@ -3391,13 +3579,14 @@ irc_cmd_recv_341 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_351 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_351 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos2;
/* make gcc happy */
(void) server;
(void) host;
+ (void) nick;
pos = strchr (arguments, ' ');
if (pos)
@@ -3415,11 +3604,14 @@ irc_cmd_recv_351 (t_irc_server *server, char *host, char *arguments)
pos2 += 2;
}
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- if (pos2)
- gui_printf (server->buffer, "%s %s\n", pos, pos2);
- else
- gui_printf (server->buffer, "%s\n", pos);
+ if (!command_ignored)
+ {
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ if (pos2)
+ gui_printf (server->buffer, "%s %s\n", pos, pos2);
+ else
+ gui_printf (server->buffer, "%s\n", pos);
+ }
return 0;
}
@@ -3428,7 +3620,7 @@ irc_cmd_recv_351 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_352 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_352 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_channel, *pos_user, *pos_host, *pos_server, *pos_nick;
char *pos_attr, *pos_hopcount, *pos_realname;
@@ -3437,6 +3629,7 @@ irc_cmd_recv_352 (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) host;
+ (void) nick;
pos_channel = strchr (arguments, ' ');
if (pos_channel)
@@ -3495,6 +3688,8 @@ irc_cmd_recv_352 (t_irc_server *server, char *host, char *arguments)
while (pos_realname[0] == ' ')
pos_realname++;
+ command_ignored |= ignore_check (host, "352", pos_channel, server->name);
+
ptr_channel = channel_search (server, pos_channel);
if (ptr_channel && (ptr_channel->checking_away > 0))
{
@@ -3505,34 +3700,37 @@ irc_cmd_recv_352 (t_irc_server *server, char *host, char *arguments)
return 0;
}
- irc_display_prefix (server->buffer,
- PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK,
- "%s ", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- _("on"));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- " %s", pos_channel);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- " %s %s ",
- pos_attr, pos_hopcount);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_HOST,
- "%s@%s",
- pos_user, pos_host);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK,
- " (");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- "%s", pos_realname);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK,
- ")\n");
+ if (!command_ignored)
+ {
+ irc_display_prefix (server->buffer,
+ PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK,
+ "%s ", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ _("on"));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ " %s", pos_channel);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ " %s %s ",
+ pos_attr, pos_hopcount);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_HOST,
+ "%s@%s",
+ pos_user, pos_host);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK,
+ " (");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ "%s", pos_realname);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK,
+ ")\n");
+ }
}
}
}
@@ -3549,7 +3747,7 @@ irc_cmd_recv_352 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_353 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_353 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos_nick;
int is_chanowner, is_chanadmin, is_op, is_halfop, has_voice;
@@ -3557,6 +3755,7 @@ irc_cmd_recv_353 (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) host;
+ (void) nick;
pos = strstr (arguments, " = ");
if (pos)
@@ -3659,7 +3858,7 @@ irc_cmd_recv_353 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_366 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_366 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos2;
t_irc_channel *ptr_channel;
@@ -3668,6 +3867,7 @@ irc_cmd_recv_366 (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) host;
+ (void) nick;
pos = strchr (arguments, ' ');
if (pos)
@@ -3687,90 +3887,97 @@ irc_cmd_recv_366 (t_irc_server *server, char *host, char *arguments)
ptr_channel = channel_search (server, pos);
if (ptr_channel)
{
-
- /* display users on channel */
- irc_display_prefix (ptr_channel->buffer, PREFIX_SERVER);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- _("Nicks "));
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
- "%s", ptr_channel->name);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT, ": ");
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK, "[");
+ command_ignored |= ignore_check (host, "366", ptr_channel->name, server->name);
- for (ptr_nick = ptr_channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
+ if (!command_ignored)
{
- irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
- MSG_TYPE_MSG, 0, 0, 1);
- if (ptr_nick != ptr_channel->last_nick)
- gui_printf (ptr_channel->buffer, " ");
- }
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK, "]\n");
-
- /* display number of nicks, ops, halfops & voices on the channel */
- nick_count (ptr_channel, &num_nicks, &num_op, &num_halfop, &num_voice,
- &num_normal);
- irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _("Channel "));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%s", ptr_channel->name);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, ": ");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%d ", num_nicks);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- (num_nicks > 1) ? _("nicks") : _("nick"));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, " (");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%d ", num_op);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- (num_op > 1) ? _("ops") : _("op"));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- ", ");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%d ", num_halfop);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- (num_halfop > 1) ? _("halfops") : _("halfop"));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- ", ");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL,
+ /* display users on channel */
+ irc_display_prefix (ptr_channel->buffer, PREFIX_SERVER);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
+ _("Nicks "));
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
+ "%s", ptr_channel->name);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT, ": ");
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK, "[");
+
+ for (ptr_nick = ptr_channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
+ {
+ irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
+ MSG_TYPE_MSG, 0, 0, 1);
+ if (ptr_nick != ptr_channel->last_nick)
+ gui_printf (ptr_channel->buffer, " ");
+ }
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK, "]\n");
+
+ /* display number of nicks, ops, halfops & voices on the channel */
+ nick_count (ptr_channel, &num_nicks, &num_op, &num_halfop, &num_voice,
+ &num_normal);
+ irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _("Channel "));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%s", ptr_channel->name);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, ": ");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%d ", num_nicks);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ (num_nicks > 1) ? _("nicks") : _("nick"));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_DARK, " (");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%d ", num_op);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ (num_op > 1) ? _("ops") : _("op"));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ ", ");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%d ", num_halfop);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ (num_halfop > 1) ? _("halfops") : _("halfop"));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ ", ");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
"%d ", num_voice);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- (num_voice > 1) ? _("voices") : _("voice"));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- ", ");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%d ", num_normal);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- _("normal"));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, ")\n");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ (num_voice > 1) ? _("voices") : _("voice"));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ ", ");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%d ", num_normal);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ _("normal"));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_DARK, ")\n");
+ }
irc_cmd_send_mode (server, ptr_channel->name);
if (cfg_irc_away_check > 0)
channel_check_away (server, ptr_channel);
}
else
{
- irc_display_prefix (gui_current_window->buffer, PREFIX_INFO);
- gui_printf_color (gui_current_window->buffer,
- COLOR_WIN_CHAT_CHANNEL, pos);
- gui_printf_color (gui_current_window->buffer,
- COLOR_WIN_CHAT, ": %s\n", pos2);
+ if (!command_ignored)
+ {
+ irc_display_prefix (gui_current_window->buffer, PREFIX_INFO);
+ gui_printf_color (gui_current_window->buffer,
+ COLOR_WIN_CHAT_CHANNEL, pos);
+ gui_printf_color (gui_current_window->buffer,
+ COLOR_WIN_CHAT, ": %s\n", pos2);
+ }
return 0;
}
}
@@ -3783,7 +3990,7 @@ irc_cmd_recv_366 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_367 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_367 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_channel, *pos_ban, *pos_user, *pos_date, *pos;
t_irc_channel *ptr_channel;
@@ -3792,6 +3999,7 @@ irc_cmd_recv_367 (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) host;
+ (void) nick;
/* look for channel */
pos_channel = strchr (arguments, ' ');
@@ -3865,26 +4073,30 @@ irc_cmd_recv_367 (t_irc_server *server, char *host, char *arguments)
ptr_channel = channel_search (server, pos_channel);
buffer = (ptr_channel) ? ptr_channel->buffer : server->buffer;
- irc_display_prefix (buffer, PREFIX_INFO);
- gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_channel);
- gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (buffer, COLOR_WIN_CHAT_HOST, "%s ", pos_ban);
- gui_printf (buffer, _("banned by"));
- pos = strchr (pos_user, '!');
- if (pos)
- {
- pos[0] = '\0';
- gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, " %s ", pos_user);
- gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "(");
- gui_printf_color (buffer, COLOR_WIN_CHAT_HOST, "%s", pos + 1);
- gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, ")");
- }
- else
- gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, " %s", pos_user);
- datetime = (time_t)(atol (pos_date));
- gui_printf_nolog (buffer, ", %s", ctime (&datetime));
+ command_ignored |= ignore_check (host, "367", pos_channel, server->name);
+ if (!command_ignored)
+ {
+ irc_display_prefix (buffer, PREFIX_INFO);
+ gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_channel);
+ gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (buffer, COLOR_WIN_CHAT_HOST, "%s ", pos_ban);
+ gui_printf (buffer, _("banned by"));
+ pos = strchr (pos_user, '!');
+ if (pos)
+ {
+ pos[0] = '\0';
+ gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, " %s ", pos_user);
+ gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "(");
+ gui_printf_color (buffer, COLOR_WIN_CHAT_HOST, "%s", pos + 1);
+ gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, ")");
+ }
+ else
+ gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, " %s", pos_user);
+ datetime = (time_t)(atol (pos_date));
+ gui_printf_nolog (buffer, ", %s", ctime (&datetime));
+ }
return 0;
}
@@ -3893,7 +4105,7 @@ irc_cmd_recv_367 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_368 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_368 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_channel, *pos_msg;
t_irc_channel *ptr_channel;
@@ -3901,6 +4113,7 @@ irc_cmd_recv_368 (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) host;
+ (void) nick;
pos_channel = strchr (arguments, ' ');
if (!pos_channel)
@@ -3934,13 +4147,17 @@ irc_cmd_recv_368 (t_irc_server *server, char *host, char *arguments)
ptr_channel = channel_search (server, pos_channel);
buffer = (ptr_channel) ? ptr_channel->buffer : server->buffer;
+
+ command_ignored |= ignore_check (host, "368", pos_channel, server->name);
- irc_display_prefix (buffer, PREFIX_INFO);
- gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_channel);
- gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_nolog (buffer, "%s\n", pos_msg);
-
+ if (!command_ignored)
+ {
+ irc_display_prefix (buffer, PREFIX_INFO);
+ gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_channel);
+ gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_nolog (buffer, "%s\n", pos_msg);
+ }
return 0;
}
@@ -3949,10 +4166,12 @@ irc_cmd_recv_368 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_433 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_433 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char hostname[128];
-
+
+ /* Note: this IRC command can not be ignored */
+
if (!server->is_connected)
{
if (strcmp (server->nick, server->nick1) == 0)
@@ -4011,7 +4230,8 @@ irc_cmd_recv_433 (t_irc_server *server, char *host, char *arguments)
server->nick);
}
else
- return irc_cmd_recv_error (server, host, arguments);
+ return irc_cmd_recv_error (server, host, nick, arguments);
+
return 0;
}
@@ -4020,34 +4240,37 @@ irc_cmd_recv_433 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_438 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_438 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos2;
/* make gcc happy */
(void) server;
(void) host;
+ (void) nick;
- pos = strchr (arguments, ' ');
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- if (pos)
+ if (!command_ignored)
{
- pos[0] = '\0';
- pos++;
-
- pos2 = strstr (pos, " :");
- if (pos2)
+ pos = strchr (arguments, ' ');
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ if (pos)
{
- pos2[0] = '\0';
- pos2 += 2;
- gui_printf (server->buffer, "%s (%s => %s)\n", pos2, arguments, pos);
+ pos[0] = '\0';
+ pos++;
+
+ pos2 = strstr (pos, " :");
+ if (pos2)
+ {
+ pos2[0] = '\0';
+ pos2 += 2;
+ gui_printf (server->buffer, "%s (%s => %s)\n", pos2, arguments, pos);
+ }
+ else
+ gui_printf (server->buffer, "%s (%s)\n", pos, arguments);
}
else
- gui_printf (server->buffer, "%s (%s)\n", pos, arguments);
+ gui_printf (server->buffer, "%s\n", arguments);
}
- else
- gui_printf (server->buffer, "%s\n", arguments);
-
return 0;
}
@@ -4056,37 +4279,41 @@ irc_cmd_recv_438 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_671 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_671 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_message;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_message = strchr (pos_nick, ' ');
- if (pos_message)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_message[0] = '\0';
- pos_message++;
- while (pos_message[0] == ' ')
- pos_message++;
- if (pos_message[0] == ':')
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_message = strchr (pos_nick, ' ');
+ if (pos_message)
+ {
+ pos_message[0] = '\0';
pos_message++;
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s\n", pos_message);
+ while (pos_message[0] == ' ')
+ pos_message++;
+ if (pos_message[0] == ':')
+ pos_message++;
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s\n", pos_message);
+ }
}
}
return 0;
diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c
index 6645f0129..5f0fe45bd 100644
--- a/src/irc/irc-server.c
+++ b/src/irc/irc-server.c
@@ -900,12 +900,12 @@ void
convbase64_8x3_to_6x4(char *from, char* to)
{
- unsigned char base64_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ unsigned char base64_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
- to[0] = base64_table [ (from[0] & 0xfc) >> 2 ];
- to[1] = base64_table [ ((from[0] & 0x03) << 4) + ((from[1] & 0xf0) >> 4) ];
- to[2] = base64_table [ ((from[1] & 0x0f) << 2) + ((from[2] & 0xc0) >> 6) ];
- to[3] = base64_table [ from[2] & 0x3f ];
+ to[0] = base64_table [ (from[0] & 0xfc) >> 2 ];
+ to[1] = base64_table [ ((from[0] & 0x03) << 4) + ((from[1] & 0xf0) >> 4) ];
+ to[2] = base64_table [ ((from[1] & 0x0f) << 2) + ((from[2] & 0xc0) >> 6) ];
+ to[3] = base64_table [ from[2] & 0x3f ];
}
/*
@@ -916,91 +916,92 @@ void
base64encode(char *from, char *to)
{
- char *f, *t;
- int from_len;
+ char *f, *t;
+ int from_len;
- from_len = strlen(from);
+ from_len = strlen(from);
- f = from;
- t = to;
+ f = from;
+ t = to;
- while(from_len >= 3)
+ while(from_len >= 3)
{
- convbase64_8x3_to_6x4(f, t);
- f += 3 * sizeof(*f);
- t += 4 * sizeof(*t);
- from_len -= 3;
+ convbase64_8x3_to_6x4(f, t);
+ f += 3 * sizeof(*f);
+ t += 4 * sizeof(*t);
+ from_len -= 3;
}
- if (from_len > 0)
+ if (from_len > 0)
{
- char rest[3] = { 0, 0, 0 };
- switch(from_len)
+ char rest[3] = { 0, 0, 0 };
+ switch(from_len)
{
case 1 :
- rest[0] = f[0];
- convbase64_8x3_to_6x4(rest, t);
- t[2] = t[3] = '=';
- break;
+ rest[0] = f[0];
+ convbase64_8x3_to_6x4(rest, t);
+ t[2] = t[3] = '=';
+ break;
case 2 :
- rest[0] = f[0];
- rest[1] = f[1];
- convbase64_8x3_to_6x4(rest, t);
- t[3] = '=';
- break;
+ rest[0] = f[0];
+ rest[1] = f[1];
+ convbase64_8x3_to_6x4(rest, t);
+ t[3] = '=';
+ break;
}
- t[4] = 0;
+ t[4] = 0;
}
}
/*
* pass_httpproxy: establish connection/authentification to an http proxy
- * return :
- * - 0 if connexion throw proxy was successful
- * - 1 if connexion fails
+ * return :
+ * - 0 if connexion throw proxy was successful
+ * - 1 if connexion fails
*/
+
int
pass_httpproxy(int sock, char *address, int port)
{
- char buffer[256];
- char authbuf[128]; // seems to be enougth to store username + password
- char authbuf_base64[196]; // enougth to store base64 encoded authbuf
- int n, m;
+ char buffer[256];
+ char authbuf[128]; // seems to be enougth to store username + password
+ char authbuf_base64[196]; // enougth to store base64 encoded authbuf
+ int n, m;
- if (strlen(cfg_proxy_username) > 0)
+ if (strlen(cfg_proxy_username) > 0)
{
- // authentification
- snprintf(authbuf, sizeof(authbuf), "%s:%s", cfg_proxy_username, cfg_proxy_password);
- base64encode(authbuf, authbuf_base64);
- n = snprintf(buffer, sizeof(buffer), "CONNECT %s:%d HTTP/1.0\r\nProxy-Authorization: Basic %s\r\n\r\n", address, port, authbuf_base64);
+ // authentification
+ snprintf(authbuf, sizeof(authbuf), "%s:%s", cfg_proxy_username, cfg_proxy_password);
+ base64encode(authbuf, authbuf_base64);
+ n = snprintf(buffer, sizeof(buffer), "CONNECT %s:%d HTTP/1.0\r\nProxy-Authorization: Basic %s\r\n\r\n", address, port, authbuf_base64);
}
- else
+ else
{
- // no authentification
- n = snprintf(buffer, sizeof(buffer), "CONNECT %s:%d HTTP/1.0\r\n\r\n", address, port);
+ // no authentification
+ n = snprintf(buffer, sizeof(buffer), "CONNECT %s:%d HTTP/1.0\r\n\r\n", address, port);
}
- m = send (sock, buffer, n, 0);
- if (n != m)
- return 1;
+ m = send (sock, buffer, n, 0);
+ if (n != m)
+ return 1;
- n = recv(sock, buffer, sizeof(buffer), 0);
+ n = recv(sock, buffer, sizeof(buffer), 0);
- /* success result must be like : "HTTP/1.0 200 OK" */
- if (n < 12)
- return 1;
+ /* success result must be like : "HTTP/1.0 200 OK" */
+ if (n < 12)
+ return 1;
- if (memcmp (buffer, "HTTP/", 5) || memcmp (buffer + 9, "200", 3))
- return 1;
+ if (memcmp (buffer, "HTTP/", 5) || memcmp (buffer + 9, "200", 3))
+ return 1;
- return 0;
+ return 0;
}
/*
* resolve: resolve hostname on its IP address
* (works with ipv4 and ipv6)
- * return :
+ * return :
* - 0 if resolution was successful
* - 1 if resolution fails
*/
@@ -1042,207 +1043,210 @@ resolve (char *hostname, char *ip, int *version)
/*
* pass_socks4proxy: establish connection/authentification throw a socks4 proxy
- * return :
- * - 0 if connexion throw proxy was successful
- * - 1 if connexion fails
+ * return :
+ * - 0 if connexion throw proxy was successful
+ * - 1 if connexion fails
*/
+
int
pass_socks4proxy(int sock, char *address, int port, char *username)
{
- /*
- * socks4 protocol is explain here:
- * http://archive.socks.permeo.com/protocol/socks4.protocol
- *
- */
+ /*
+ * socks4 protocol is explain here:
+ * http://archive.socks.permeo.com/protocol/socks4.protocol
+ *
+ */
- struct s_socks4
- {
- char version; /* 1 byte */ /* socks version : 4 or 5 */
- char method; /* 1 byte */ /* socks method : connect (1) or bind (2) */
- unsigned short port; /* 2 bytes */ /* destination port */
- unsigned long address; /* 4 bytes */ /* destination address */
- char user[64]; /* username (64 characters seems to be enought) */
- } socks4;
- unsigned char buffer[24];
- char ip_addr[NI_MAXHOST];
-
- socks4.version = 4;
- socks4.method = 1;
- socks4.port = htons (port);
- resolve(address, ip_addr, NULL);
- socks4.address = inet_addr (ip_addr);
- strncpy (socks4.user, username, sizeof(socks4.user) - 1);
+ struct s_socks4
+ {
+ char version; /* 1 byte */ /* socks version : 4 or 5 */
+ char method; /* 1 byte */ /* socks method : connect (1) or bind (2) */
+ unsigned short port; /* 2 bytes */ /* destination port */
+ unsigned long address; /* 4 bytes */ /* destination address */
+ char user[64]; /* username (64 characters seems to be enought) */
+ } socks4;
+ unsigned char buffer[24];
+ char ip_addr[NI_MAXHOST];
+
+ socks4.version = 4;
+ socks4.method = 1;
+ socks4.port = htons (port);
+ resolve(address, ip_addr, NULL);
+ socks4.address = inet_addr (ip_addr);
+ strncpy (socks4.user, username, sizeof(socks4.user) - 1);
- send (sock, (char *) &socks4, 8 + strlen(socks4.user) + 1, 0);
- recv (sock, buffer, sizeof(buffer), 0);
+ send (sock, (char *) &socks4, 8 + strlen(socks4.user) + 1, 0);
+ recv (sock, buffer, sizeof(buffer), 0);
- if (buffer[0] == 0 && buffer[1] == 90)
- return 0;
+ if (buffer[0] == 0 && buffer[1] == 90)
+ return 0;
- return 1;
+ return 1;
}
/*
* pass_socks5proxy: establish connection/authentification throw a socks5 proxy
- * return :
- * - 0 if connexion throw proxy was successful
- * - 1 if connexion fails
+ * return :
+ * - 0 if connexion throw proxy was successful
+ * - 1 if connexion fails
*/
+
int
pass_socks5proxy(int sock, char *address, int port)
{
- /*
- * socks5 protocol is explained in RFC 1928
- * socks5 authentication with username/pass is explained in RFC 1929
- */
+ /*
+ * socks5 protocol is explained in RFC 1928
+ * socks5 authentication with username/pass is explained in RFC 1929
+ */
- struct s_sock5
- {
- char version; /* 1 byte */ /* socks version : 4 or 5 */
- char nmethods; /* 1 byte */ /* size in byte(s) of field 'method', here 1 byte */
- char method; /* 1-255 bytes */ /* socks method : noauth (0), auth(user/pass) (2), ... */
- } socks5;
- unsigned char buffer[288];
- int username_len, password_len, addr_len, addr_buffer_len;
- unsigned char *addr_buffer;
+ struct s_sock5
+ {
+ char version; /* 1 byte */ /* socks version : 4 or 5 */
+ char nmethods; /* 1 byte */ /* size in byte(s) of field 'method', here 1 byte */
+ char method; /* 1-255 bytes */ /* socks method : noauth (0), auth(user/pass) (2), ... */
+ } socks5;
+ unsigned char buffer[288];
+ int username_len, password_len, addr_len, addr_buffer_len;
+ unsigned char *addr_buffer;
- socks5.version = 5;
- socks5.nmethods = 1;
+ socks5.version = 5;
+ socks5.nmethods = 1;
- if (strlen(cfg_proxy_username) > 0)
- /* with authentication */
- socks5.method = 2;
- else
- /* without authentication */
- socks5.method = 0;
+ if (strlen(cfg_proxy_username) > 0)
+ /* with authentication */
+ socks5.method = 2;
+ else
+ /* without authentication */
+ socks5.method = 0;
- send (sock, (char *) &socks5, sizeof(socks5), 0);
- /* server socks5 must respond with 2 bytes */
- if (recv (sock, buffer, 2, 0) != 2)
- return 1;
+ send (sock, (char *) &socks5, sizeof(socks5), 0);
+ /* server socks5 must respond with 2 bytes */
+ if (recv (sock, buffer, 2, 0) != 2)
+ return 1;
- if (strlen(cfg_proxy_username) > 0)
+ if (strlen(cfg_proxy_username) > 0)
{
- /* with authentication */
- /* -> socks server must respond with :
- * - socks version (buffer[0]) = 5 => socks5
- * - socks method (buffer[1]) = 2 => authentication
- */
-
- //if (!(buffer[0] == 5 && buffer[1] == 2))
- if (buffer[0] != 5 || buffer[1] != 2)
- return 1;
-
- /* authentication as in RFC 1929 */
- username_len = strlen(cfg_proxy_username);
- password_len = strlen(cfg_proxy_password);
+ /* with authentication */
+ /* -> socks server must respond with :
+ * - socks version (buffer[0]) = 5 => socks5
+ * - socks method (buffer[1]) = 2 => authentication
+ */
+
+ //if (!(buffer[0] == 5 && buffer[1] == 2))
+ if (buffer[0] != 5 || buffer[1] != 2)
+ return 1;
+
+ /* authentication as in RFC 1929 */
+ username_len = strlen(cfg_proxy_username);
+ password_len = strlen(cfg_proxy_password);
- /* make username/password buffer */
- buffer[0] = 1;
- buffer[1] = (unsigned char) username_len;
- memcpy(buffer + 2, cfg_proxy_username, username_len);
- buffer[2 + username_len] = (unsigned char) password_len;
- memcpy(buffer + 3 + username_len, cfg_proxy_password, password_len);
+ /* make username/password buffer */
+ buffer[0] = 1;
+ buffer[1] = (unsigned char) username_len;
+ memcpy(buffer + 2, cfg_proxy_username, username_len);
+ buffer[2 + username_len] = (unsigned char) password_len;
+ memcpy(buffer + 3 + username_len, cfg_proxy_password, password_len);
- send (sock, buffer, 3 + username_len + password_len, 0);
+ send (sock, buffer, 3 + username_len + password_len, 0);
- /* server socks5 must respond with 2 bytes */
- if (recv (sock, buffer, 2, 0) != 2)
- return 1;
+ /* server socks5 must respond with 2 bytes */
+ if (recv (sock, buffer, 2, 0) != 2)
+ return 1;
- /* buffer[1] = auth state, must be 0 for success */
- if (buffer[1] != 0)
- return 1;
+ /* buffer[1] = auth state, must be 0 for success */
+ if (buffer[1] != 0)
+ return 1;
}
- else
+ else
{
- /* without authentication */
- /* -> socks server must respond with :
- * - socks version (buffer[0]) = 5 => socks5
- * - socks method (buffer[1]) = 0 => no authentication
- */
- if (!(buffer[0] == 5 && buffer[1] == 0))
- return 1;
+ /* without authentication */
+ /* -> socks server must respond with :
+ * - socks version (buffer[0]) = 5 => socks5
+ * - socks method (buffer[1]) = 0 => no authentication
+ */
+ if (!(buffer[0] == 5 && buffer[1] == 0))
+ return 1;
}
- /* authentication successful then giving address/port to connect */
- addr_len = strlen(address);
- addr_buffer_len = 4 + 1 + addr_len + 2;
- addr_buffer = (unsigned char *) malloc ( addr_buffer_len * sizeof(*addr_buffer));
- if (!addr_buffer)
- return 1;
- addr_buffer[0] = 5; /* version 5 */
- addr_buffer[1] = 1; /* command: 1 for connect */
- addr_buffer[2] = 0; /* reserved */
- addr_buffer[3] = 3; /* address type : ipv4 (1), domainname (3), ipv6 (4) */
- addr_buffer[4] = (unsigned char) addr_len;
- memcpy (addr_buffer + 5, address, addr_len); /* server address */
- *((unsigned short *) (addr_buffer + 5 + addr_len)) = htons (port); /* server port */
-
- send (sock, addr_buffer, addr_buffer_len, 0);
- free(addr_buffer);
-
- /* dialog with proxy server */
- if (recv (sock, buffer, 4, 0) != 4)
- return 1;
+ /* authentication successful then giving address/port to connect */
+ addr_len = strlen(address);
+ addr_buffer_len = 4 + 1 + addr_len + 2;
+ addr_buffer = (unsigned char *) malloc ( addr_buffer_len * sizeof(*addr_buffer));
+ if (!addr_buffer)
+ return 1;
+ addr_buffer[0] = 5; /* version 5 */
+ addr_buffer[1] = 1; /* command: 1 for connect */
+ addr_buffer[2] = 0; /* reserved */
+ addr_buffer[3] = 3; /* address type : ipv4 (1), domainname (3), ipv6 (4) */
+ addr_buffer[4] = (unsigned char) addr_len;
+ memcpy (addr_buffer + 5, address, addr_len); /* server address */
+ *((unsigned short *) (addr_buffer + 5 + addr_len)) = htons (port); /* server port */
+
+ send (sock, addr_buffer, addr_buffer_len, 0);
+ free(addr_buffer);
+
+ /* dialog with proxy server */
+ if (recv (sock, buffer, 4, 0) != 4)
+ return 1;
- if (!(buffer[0] == 5 && buffer[1] == 0))
- return 1;
+ if (!(buffer[0] == 5 && buffer[1] == 0))
+ return 1;
- switch(buffer[3]) {
- /* buffer[3] = address type */
- case 1 :
- /* ipv4
- * server socks return server bound address and port
- * address of 4 bytes and port of 2 bytes (= 6 bytes)
- */
- if (recv (sock, buffer, 6, 0) != 6)
- return 1;
- break;
- case 3:
- /* domainname
- * server socks return server bound address and port
- */
- /* reading address length */
- if (recv (sock, buffer, 1, 0) != 1)
- return 1;
- addr_len = buffer[0];
- /* reading address + port = addr_len + 2 */
- if (recv (sock, buffer, addr_len + 2, 0) != (addr_len + 2))
- return 1;
- break;
- case 4 :
- /* ipv6
- * server socks return server bound address and port
- * address of 16 bytes and port of 2 bytes (= 18 bytes)
- */
- if (recv (sock, buffer, 18, 0) != 18)
- return 1;
- break;
- default:
- return 1;
- }
+ switch(buffer[3]) {
+ /* buffer[3] = address type */
+ case 1 :
+ /* ipv4
+ * server socks return server bound address and port
+ * address of 4 bytes and port of 2 bytes (= 6 bytes)
+ */
+ if (recv (sock, buffer, 6, 0) != 6)
+ return 1;
+ break;
+ case 3:
+ /* domainname
+ * server socks return server bound address and port
+ */
+ /* reading address length */
+ if (recv (sock, buffer, 1, 0) != 1)
+ return 1;
+ addr_len = buffer[0];
+ /* reading address + port = addr_len + 2 */
+ if (recv (sock, buffer, addr_len + 2, 0) != (addr_len + 2))
+ return 1;
+ break;
+ case 4 :
+ /* ipv6
+ * server socks return server bound address and port
+ * address of 16 bytes and port of 2 bytes (= 18 bytes)
+ */
+ if (recv (sock, buffer, 18, 0) != 18)
+ return 1;
+ break;
+ default:
+ return 1;
+ }
- return 0;
+ return 0;
}
/*
* pass_proxy: establish connection/authentification to a proxy
- * return :
- * - 0 if connexion throw proxy was successful
- * - 1 if connexion fails
+ * return :
+ * - 0 if connexion throw proxy was successful
+ * - 1 if connexion fails
*/
+
int
pass_proxy(int sock, char *address, int port, char *username)
{
- if (strcmp(cfg_proxy_type_values[cfg_proxy_type], "http") == 0)
- return pass_httpproxy(sock, address, port);
- if (strcmp(cfg_proxy_type_values[cfg_proxy_type], "socks4") == 0)
- return pass_socks4proxy(sock, address, port, username);
- if (strcmp(cfg_proxy_type_values[cfg_proxy_type], "socks5") == 0)
- return pass_socks5proxy(sock, address, port);
-
- return 1;
+ if (strcmp(cfg_proxy_type_values[cfg_proxy_type], "http") == 0)
+ return pass_httpproxy(sock, address, port);
+ if (strcmp(cfg_proxy_type_values[cfg_proxy_type], "socks4") == 0)
+ return pass_socks4proxy(sock, address, port, username);
+ if (strcmp(cfg_proxy_type_values[cfg_proxy_type], "socks5") == 0)
+ return pass_socks5proxy(sock, address, port);
+
+ return 1;
}
/*
@@ -1586,6 +1590,9 @@ server_search (char *servername)
{
t_irc_server *ptr_server;
+ if (!servername)
+ return NULL;
+
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
{
@@ -1624,6 +1631,9 @@ server_name_already_exists (char *name)
{
t_irc_server *ptr_server;
+ if (!name)
+ return 0;
+
for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server)
{
if (strcmp (ptr_server->name, name) == 0)
diff --git a/src/irc/irc.h b/src/irc/irc.h
index 96b39e71e..2fb0255f1 100644
--- a/src/irc/irc.h
+++ b/src/irc/irc.h
@@ -203,7 +203,7 @@ struct t_irc_command
/* function called when user enters cmd */
int (*cmd_function_1arg)(t_irc_server *, char *);
/* function called when user enters cmd */
- int (*recv_function)(t_irc_server *, char *, char *);
+ int (*recv_function)(t_irc_server *, char *, char *, char *);
/* function called when cmd is received */
};
@@ -218,7 +218,7 @@ struct t_irc_message
t_irc_message *next_message; /* link to next message */
};
-/* DCC */
+/* DCC types */
typedef struct t_irc_dcc t_irc_dcc;
@@ -251,6 +251,30 @@ struct t_irc_dcc
t_irc_dcc *next_dcc; /* link to next dcc file/chat */
};
+/* ignore types */
+
+/* pre-defined ignore types, all other types are made with IRC commands */
+/* for example: part join quit notice invite ... */
+
+#define IGNORE_ACTION "action"
+#define IGNORE_CTCP "ctcp"
+#define IGNORE_DCC "dcc"
+#define IGNORE_PRIVATE "pv"
+
+typedef struct t_irc_ignore t_irc_ignore;
+
+struct t_irc_ignore
+{
+ char *mask; /* nickname or mask */
+ char *type; /* type of ignore */
+ char *channel_name; /* name of channel, "*" == all */
+ char *server_name; /* name of server, "*" == all */
+ t_irc_ignore *prev_ignore; /* pointer to previous ignore */
+ t_irc_ignore *next_ignore; /* pointer to next ignore */
+};
+
+/* variables */
+
extern t_irc_command irc_commands[];
extern t_irc_server *irc_servers;
extern t_irc_message *recv_msgq, *msgq_last_msg;
@@ -258,6 +282,9 @@ extern int check_away;
extern t_irc_dcc *dcc_list;
extern char *dcc_status_string[6];
extern char *channel_modes;
+extern char *ignore_types[];
+extern t_irc_ignore *irc_ignore;
+extern t_irc_ignore *irc_last_ignore;
/* server functions (irc-server.c) */
@@ -414,57 +441,67 @@ extern int irc_cmd_send_who (t_irc_server *, char *);
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_kill (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_mode (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_nick (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_notice (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_part (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_ping (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_pong (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_privmsg (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_quit (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_server_msg (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_server_reply (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_topic (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_001 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_004 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_301 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_302 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_303 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_305 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_306 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_307 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_311 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_312 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_313 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_314 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_315 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_317 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_318 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_319 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_320 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_321 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_322 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_323 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_324 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_329 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_331 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_332 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_333 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_341 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_351 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_352 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_353 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_365 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_366 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_367 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_368 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_433 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_438 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_671 (t_irc_server *, char *, char *);
+extern int irc_cmd_recv_error (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_invite (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_join (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_kick (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_kill (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_mode (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_nick (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_notice (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_part (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_ping (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_pong (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_privmsg (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_quit (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_server_msg (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_server_reply (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_topic (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_001 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_004 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_301 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_302 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_303 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_305 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_306 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_307 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_311 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_312 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_313 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_314 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_315 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_317 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_318 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_319 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_320 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_321 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_322 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_323 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_324 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_329 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_331 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_332 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_333 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_341 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_351 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_352 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_353 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_365 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_366 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_367 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_368 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_433 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_438 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_671 (t_irc_server *, char *, char *, char *);
+
+/* ignore functions (irc-ignore.c) */
+
+extern int ignore_check (char *, char *, char *, char *);
+extern t_irc_ignore *ignore_add (char *, char *, char *, char *);
+extern t_irc_ignore *ignore_add_from_config (char *);
+extern void ignore_free_all ();
+extern int ignore_search_free (char *, char *, char *, char *);
+extern int ignore_search_free_by_number (int);
+extern void ignore_print_log ();
#endif /* irc.h */
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 71729de09..e58374ef6 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,11 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-ChangeLog - 2005-09-03
+ChangeLog - 2005-09-04
Version 0.1.5 (under dev!):
+ * added /ignore and /unignore commands
* fixed bug with strings comparison (str[n]casecmp) and some locales
(like turkish), now using ASCII comparison (thanks to roktas)
* signal SIGQUIT is now ignored
diff --git a/weechat/TODO b/weechat/TODO
index 035b2ba44..716bf1614 100644
--- a/weechat/TODO
+++ b/weechat/TODO
@@ -1,7 +1,7 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-TODO - 2005-08-16
+TODO - 2005-09-04
Legend:
# done
@@ -30,6 +30,7 @@ v0.1.5:
* WeeChat commands
- be able to bind a key on more than one command
- be able to make an alias running more than one command
+ # /ignore and /unignore commands
* Configuration:
- be able to launch more than one command when connecting to server
@@ -42,8 +43,6 @@ Future versions:
- customizable CTCP version reply
- complete "/list" command: add regexp search, display only channels that
match regexp
- - "/ignore" and "/unignore" commands: hide all that is write by a given
- nick/host
- when we're away, WeeChat should log all the lines begenning by our nick.
When we come back from our away it should print it to the current window
- "/notify" and "/unnotify" command to be warn by WeeChat when a given
diff --git a/weechat/po/POTFILES.in b/weechat/po/POTFILES.in
index 74592dd0c..d338c606a 100644
--- a/weechat/po/POTFILES.in
+++ b/weechat/po/POTFILES.in
@@ -6,6 +6,7 @@
./src/irc/irc-send.c
./src/irc/irc-recv.c
./src/irc/irc-dcc.c
+./src/irc/irc-ignore.c
./src/irc/irc.h
./src/plugins/perl/wee-perl.c
./src/plugins/perl/wee-perl.h
diff --git a/weechat/po/es.po b/weechat/po/es.po
index 8e996764d..9c1e6b899 100644
--- a/weechat/po/es.po
+++ b/weechat/po/es.po
@@ -7,20 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.5-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-08-21 14:31+0200\n"
-"PO-Revision-Date: 2005-08-21 14:32+0200\n"
+"POT-Creation-Date: 2005-09-04 14:45+0200\n"
+"PO-Revision-Date: 2005-09-04 14:47+0200\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"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-nick.c:193
+#: src/irc/irc-nick.c:192
#, c-format
msgid "%s cannot allocate new nick\n"
msgstr "%s no ha sido posible crear un nuevo nick\n"
-#: src/irc/irc-server.c:180 src/common/weeconfig.c:1697
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1712
msgid "Unable to get user's name"
msgstr "No ha sido posible obtener el nombre de usuario"
@@ -110,7 +110,7 @@ msgstr ""
"%s el proxy ha fallado al establecer la conexión al servidor (comprueba el "
"nombre de usuario o la contraseña si es necesario)\n"
-#: src/irc/irc-server.c:1360
+#: src/irc/irc-server.c:1364
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -118,57 +118,57 @@ msgstr ""
"%s No ha sido posible conectar con SSL debido a que Weechat no fue compilado "
"con soporte GNUtls\n"
-#: src/irc/irc-server.c:1369
+#: src/irc/irc-server.c:1373
#, c-format
msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr "%s: conectando al servidor %s:%d%s%s vía %s proxy %s: %d%s...\n"
-#: src/irc/irc-server.c:1375
+#: src/irc/irc-server.c:1379
#, c-format
msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr "Conectando al servidor %s:%d%s%s vía %s proxy %s:%d%s...\n"
-#: src/irc/irc-server.c:1385
+#: src/irc/irc-server.c:1389
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr "%s: conectando al servidor %s:%d%s%s...\n"
-#: src/irc/irc-server.c:1389
+#: src/irc/irc-server.c:1393
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr "Conectando al servidor %s:%d%s%s...\n"
-#: src/irc/irc-server.c:1407
+#: src/irc/irc-server.c:1411
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s error de inicialización de gnutls\n"
-#: src/irc/irc-server.c:1422
+#: src/irc/irc-server.c:1426
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s no ha sido posible crear la interconexión\n"
-#: src/irc/irc-server.c:1437
+#: src/irc/irc-server.c:1441
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s no ha sido posible crear el socket\n"
-#: src/irc/irc-server.c:1448
+#: src/irc/irc-server.c:1452
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr "%s no ha sido posible configurar la opción socket \"SO_REUSEADDR\"\n"
-#: src/irc/irc-server.c:1459
+#: src/irc/irc-server.c:1463
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr "%s no ha sido posible configurar la opción socket \"SO_KEEPALIVE\"\n"
-#: src/irc/irc-server.c:1490
+#: src/irc/irc-server.c:1494
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Reconectando al servidor...\n"
-#: src/irc/irc-server.c:1540 src/irc/irc-server.c:1549
+#: src/irc/irc-server.c:1544 src/irc/irc-server.c:1553
msgid "Disconnected from server!\n"
msgstr "¡Desconectado del servidor!\n"
@@ -957,102 +957,103 @@ msgstr ""
#: src/irc/irc-commands.c:317 src/irc/irc-commands.c:318
#: src/irc/irc-commands.c:319 src/irc/irc-commands.c:320
#: src/irc/irc-commands.c:321 src/irc/irc-commands.c:322
-#: src/irc/irc-commands.c:323 src/irc/irc-commands.c:367
+#: src/irc/irc-commands.c:323 src/irc/irc-commands.c:324
#: src/irc/irc-commands.c:368 src/irc/irc-commands.c:369
#: src/irc/irc-commands.c:370 src/irc/irc-commands.c:371
-#: src/irc/irc-commands.c:372
+#: src/irc/irc-commands.c:372 src/irc/irc-commands.c:373
+#: src/irc/irc-commands.c:473
msgid "a server message"
msgstr "un mensaje de servidor"
-#: src/irc/irc-commands.c:324
+#: src/irc/irc-commands.c:325
msgid "away message"
msgstr "mensaje de ausencia"
-#: src/irc/irc-commands.c:325
+#: src/irc/irc-commands.c:326
msgid "userhost"
msgstr "nombre de la máquina de usuario"
-#: src/irc/irc-commands.c:326
+#: src/irc/irc-commands.c:327
msgid "ison"
msgstr "está presente"
-#: src/irc/irc-commands.c:327
+#: src/irc/irc-commands.c:328
msgid "unaway"
msgstr "no ausente"
-#: src/irc/irc-commands.c:328
+#: src/irc/irc-commands.c:329
msgid "now away"
msgstr "ahora ausente"
-#: src/irc/irc-commands.c:329
+#: src/irc/irc-commands.c:330
msgid "whois (registered nick)"
msgstr "quién es (usuario registrado)"
-#: src/irc/irc-commands.c:330
+#: src/irc/irc-commands.c:331
msgid "whois (user)"
msgstr "quién es (usuario)"
-#: src/irc/irc-commands.c:331
+#: src/irc/irc-commands.c:332
msgid "whois (server)"
msgstr "quién es (servidor)"
-#: src/irc/irc-commands.c:332
+#: src/irc/irc-commands.c:333
msgid "whois (operator)"
msgstr "quién es (operador)"
-#: src/irc/irc-commands.c:333
+#: src/irc/irc-commands.c:334
msgid "whowas"
msgstr "quién era"
-#: src/irc/irc-commands.c:334
+#: src/irc/irc-commands.c:335
msgid "end of /who list"
msgstr "fin de la lista /who"
-#: src/irc/irc-commands.c:335
+#: src/irc/irc-commands.c:336
msgid "whois (idle)"
msgstr "quién es (idle)"
-#: src/irc/irc-commands.c:336
+#: src/irc/irc-commands.c:337
msgid "whois (end)"
msgstr "quién es (fin)"
-#: src/irc/irc-commands.c:337
+#: src/irc/irc-commands.c:338
msgid "whois (channels)"
msgstr "quién es (canales)"
-#: src/irc/irc-commands.c:338
+#: src/irc/irc-commands.c:339
msgid "whois (identified user)"
msgstr "quién es (usuario identificado)"
-#: src/irc/irc-commands.c:339
+#: src/irc/irc-commands.c:340
msgid "/list start"
msgstr "/list inicio"
-#: src/irc/irc-commands.c:340
+#: src/irc/irc-commands.c:341
msgid "channel (for /list)"
msgstr "canal (para /list)"
-#: src/irc/irc-commands.c:341
+#: src/irc/irc-commands.c:342
msgid "/list end"
msgstr "/list fin"
-#: src/irc/irc-commands.c:342
+#: src/irc/irc-commands.c:343
msgid "channel mode"
msgstr "modo de canal"
-#: src/irc/irc-commands.c:344
+#: src/irc/irc-commands.c:345
msgid "no topic for channel"
msgstr "sin tema para el canal"
-#: src/irc/irc-commands.c:345
+#: src/irc/irc-commands.c:346
msgid "topic of channel"
msgstr "tema de canal"
-#: src/irc/irc-commands.c:346
+#: src/irc/irc-commands.c:347
msgid "channel :topic"
msgstr "canal :tema"
-#: src/irc/irc-commands.c:347
+#: src/irc/irc-commands.c:348
msgid ""
"channel: name of channel\n"
"topic: topic of the channel"
@@ -1060,31 +1061,31 @@ msgstr ""
"canal: nombre del canal\n"
"tema: tema del canal"
-#: src/irc/irc-commands.c:350
+#: src/irc/irc-commands.c:351
msgid "infos about topic (nick & date changed)"
msgstr "info sobre el tema (usuario y fecha de modificación)"
-#: src/irc/irc-commands.c:353
+#: src/irc/irc-commands.c:354
msgid "inviting"
msgstr "invitando"
-#: src/irc/irc-commands.c:354
+#: src/irc/irc-commands.c:355
msgid "server version"
msgstr "versión del servidor"
-#: src/irc/irc-commands.c:355
+#: src/irc/irc-commands.c:356
msgid "who"
msgstr "quién"
-#: src/irc/irc-commands.c:356
+#: src/irc/irc-commands.c:357
msgid "list of nicks on channel"
msgstr "lista de usuarios en el canal"
-#: src/irc/irc-commands.c:357
+#: src/irc/irc-commands.c:358
msgid "channel :[[@|+]nick ...]"
msgstr "canal :[[@|+]usuario ...]"
-#: src/irc/irc-commands.c:358
+#: src/irc/irc-commands.c:359
msgid ""
"channel: name of channel\n"
"nick: nick on the channel"
@@ -1092,224 +1093,223 @@ msgstr ""
"canal: nombre del canal\n"
"usuario: usuario en el canal"
-#: src/irc/irc-commands.c:361
+#: src/irc/irc-commands.c:362
msgid "links"
msgstr "enlaces"
-#: src/irc/irc-commands.c:362
+#: src/irc/irc-commands.c:363
msgid "end of /links list"
msgstr "fin de la lista /links"
-#: src/irc/irc-commands.c:363
+#: src/irc/irc-commands.c:364
msgid "end of /names list"
msgstr "fin de la lista /names"
-#: src/irc/irc-commands.c:364
+#: src/irc/irc-commands.c:365
msgid "banlist"
msgstr "lista de baneos"
-#: src/irc/irc-commands.c:365
+#: src/irc/irc-commands.c:366
msgid "end of banlist"
msgstr "fin de la lista de baneos"
-#: src/irc/irc-commands.c:366
+#: src/irc/irc-commands.c:367
msgid "end of /whowas list"
msgstr "fin de la lista /whowas"
-#: src/irc/irc-commands.c:373
+#: src/irc/irc-commands.c:374
msgid "server local time"
msgstr "hora local del servidor"
-#: src/irc/irc-commands.c:374
+#: src/irc/irc-commands.c:375
msgid "no such nick/channel"
msgstr "no existe ese usuario/canal"
-#: src/irc/irc-commands.c:376
+#: src/irc/irc-commands.c:377
msgid "no such server"
msgstr "no existe ese servidor"
-#: src/irc/irc-commands.c:378
+#: src/irc/irc-commands.c:379
msgid "no such channel"
msgstr "no existe ese canal"
-#: src/irc/irc-commands.c:380
+#: src/irc/irc-commands.c:381
msgid "cannot send to channel"
msgstr "no ha sido posible enviar al canal"
-#: src/irc/irc-commands.c:382
+#: src/irc/irc-commands.c:383
msgid "too many channels"
msgstr "demasiados canales"
-#: src/irc/irc-commands.c:384 src/irc/irc-commands.c:386
-#: src/irc/irc-commands.c:388
+#: src/irc/irc-commands.c:385 src/irc/irc-commands.c:387
msgid "was no such nick"
msgstr "no estaba ese usuario"
-#: src/irc/irc-commands.c:390
+#: src/irc/irc-commands.c:389
msgid "no origin"
msgstr "sin origen"
-#: src/irc/irc-commands.c:392
+#: src/irc/irc-commands.c:391
msgid "no services"
msgstr "sin servicios"
-#: src/irc/irc-commands.c:394
+#: src/irc/irc-commands.c:393
msgid "no recipient"
msgstr "sin destinatario"
-#: src/irc/irc-commands.c:396
+#: src/irc/irc-commands.c:395
msgid "no text to send"
msgstr "sin texto a enviar"
-#: src/irc/irc-commands.c:398
+#: src/irc/irc-commands.c:397
msgid "no toplevel"
msgstr "sin nivel superior"
-#: src/irc/irc-commands.c:400
+#: src/irc/irc-commands.c:399
msgid "wilcard in toplevel domain"
msgstr "carácter comodín en el dominio del nivel superior"
-#: src/irc/irc-commands.c:402
+#: src/irc/irc-commands.c:401
msgid "unknown command"
msgstr "comando desconocido"
-#: src/irc/irc-commands.c:404
+#: src/irc/irc-commands.c:403
msgid "MOTD is missing"
msgstr "MOTD falta"
-#: src/irc/irc-commands.c:406
+#: src/irc/irc-commands.c:405
msgid "no administrative info"
msgstr "sin información administrativa"
-#: src/irc/irc-commands.c:408
+#: src/irc/irc-commands.c:407
msgid "file error"
msgstr "error de fichero"
-#: src/irc/irc-commands.c:410
+#: src/irc/irc-commands.c:409
msgid "no nickname given"
msgstr "no se ha dado un nombre de usuario"
-#: src/irc/irc-commands.c:412
+#: src/irc/irc-commands.c:411
msgid "erroneous nickname"
msgstr "nombre de usuario erróneo"
-#: src/irc/irc-commands.c:414
+#: src/irc/irc-commands.c:413
msgid "nickname already in use"
msgstr "nombre de usuario ya en uso"
-#: src/irc/irc-commands.c:416
+#: src/irc/irc-commands.c:415
msgid "nickname collision"
msgstr "colisión en el nombre de usuario"
-#: src/irc/irc-commands.c:418
+#: src/irc/irc-commands.c:417
msgid "not authorized to change nickname"
msgstr "no autorizado a cambiar el nombre de usuario"
-#: src/irc/irc-commands.c:420
+#: src/irc/irc-commands.c:419
msgid "user not in channel"
msgstr "usuario no presente en el canal"
-#: src/irc/irc-commands.c:422
+#: src/irc/irc-commands.c:421
msgid "not on channel"
msgstr "no presente en el canal"
-#: src/irc/irc-commands.c:424
+#: src/irc/irc-commands.c:423
msgid "user already on channel"
msgstr "usuario ya en el canal"
-#: src/irc/irc-commands.c:426
+#: src/irc/irc-commands.c:425
msgid "user not logged in"
msgstr "usuario no registrado"
-#: src/irc/irc-commands.c:428
+#: src/irc/irc-commands.c:427
msgid "summon has been disabled"
msgstr "la petición de ayuda ha sido desactivada"
-#: src/irc/irc-commands.c:430
+#: src/irc/irc-commands.c:429
msgid "users has been disabled"
msgstr "los usuarios han sido desactivados"
-#: src/irc/irc-commands.c:432
+#: src/irc/irc-commands.c:431
msgid "you are not registered"
msgstr "usted no está registrado"
-#: src/irc/irc-commands.c:434
+#: src/irc/irc-commands.c:433
msgid "not enough parameters"
msgstr "no hay parámetros suficientes"
-#: src/irc/irc-commands.c:436
+#: src/irc/irc-commands.c:435
msgid "you may not register"
msgstr "usted no puede registrarse"
-#: src/irc/irc-commands.c:438
+#: src/irc/irc-commands.c:437
msgid "your host isn't among the privileged"
msgstr "su nombre de máquina no está entre los privilegiados"
-#: src/irc/irc-commands.c:440
+#: src/irc/irc-commands.c:439
msgid "password incorrect"
msgstr "contraseña incorrecta"
-#: src/irc/irc-commands.c:442
+#: src/irc/irc-commands.c:441
msgid "you are banned from this server"
msgstr "usted está baneado de este servidor"
-#: src/irc/irc-commands.c:444
+#: src/irc/irc-commands.c:443
msgid "channel key already set"
msgstr "clave de canal ya definida"
-#: src/irc/irc-commands.c:446
+#: src/irc/irc-commands.c:445
msgid "channel is already full"
msgstr "el canal ya está lleno"
-#: src/irc/irc-commands.c:448
+#: src/irc/irc-commands.c:447
msgid "unknown mode char to me"
msgstr "carácter de modo desconocido para mí"
-#: src/irc/irc-commands.c:450
+#: src/irc/irc-commands.c:449
msgid "cannot join channel (invite only)"
msgstr "no es posible unirse al canal (sólo invitados)"
-#: src/irc/irc-commands.c:452
+#: src/irc/irc-commands.c:451
msgid "cannot join channel (banned from channel)"
msgstr "no es posible unirse al canal (baneado del canal)"
-#: src/irc/irc-commands.c:454
+#: src/irc/irc-commands.c:453
msgid "cannot join channel (bad channel key)"
msgstr "no es posible unirse al canal (clave de canal incorrecta)"
-#: src/irc/irc-commands.c:456
+#: src/irc/irc-commands.c:455
msgid "bad channel mask"
msgstr "máscara de canal incorrecta"
-#: src/irc/irc-commands.c:458
+#: src/irc/irc-commands.c:457
msgid "channel doesn't support modes"
msgstr "el canal no soporta los modos"
-#: src/irc/irc-commands.c:460
+#: src/irc/irc-commands.c:459
msgid "you're not an IRC operator"
msgstr "usted no es un operador IRC"
-#: src/irc/irc-commands.c:462
+#: src/irc/irc-commands.c:461
msgid "you're not channel operator"
msgstr "usted no es operador del canal"
-#: src/irc/irc-commands.c:464
+#: src/irc/irc-commands.c:463
msgid "you can't kill a server!"
msgstr "!usted no puede matar a un servidor!"
-#: src/irc/irc-commands.c:466
+#: src/irc/irc-commands.c:465
msgid "user is immune from kick/deop"
msgstr "el usuario es inmune a kick/deop"
-#: src/irc/irc-commands.c:468
+#: src/irc/irc-commands.c:467
msgid "no O-lines for your host"
msgstr "no hay O-lines para su máquina"
-#: src/irc/irc-commands.c:470
+#: src/irc/irc-commands.c:469
msgid "unknown mode flag"
msgstr "indicador de modo desconocido"
-#: src/irc/irc-commands.c:472
+#: src/irc/irc-commands.c:471
msgid "can't change mode for other users"
msgstr "no es posible cambiar el modo para el resto de usuarios"
@@ -1317,7 +1317,7 @@ msgstr "no es posible cambiar el modo para el resto de usuarios"
msgid "whois (secure connection)"
msgstr "whois (conexión segura)"
-#: src/irc/irc-display.c:163 src/common/command.c:853
+#: src/irc/irc-display.c:163 src/common/command.c:874
msgid "Server: "
msgstr "Servidor: "
@@ -1325,7 +1325,7 @@ msgstr "Servidor: "
msgid "connected"
msgstr "conectado"
-#: src/irc/irc-display.c:168
+#: src/irc/irc-display.c:168 src/common/command.c:900
msgid "not connected"
msgstr "no conectado"
@@ -1347,7 +1347,7 @@ msgstr " (servidor temporal, no será guardado)"
msgid "(hidden)"
msgstr "(oculto)"
-#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4008
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4227
msgid "unknown"
msgstr "desconocido"
@@ -1356,7 +1356,7 @@ msgstr "desconocido"
msgid "%s: using local hostname \"%s\"\n"
msgstr "%s: utilización del nombre de máquina local \"%s\"\n"
-#: src/irc/irc-send.c:126 src/common/command.c:731
+#: src/irc/irc-send.c:126 src/common/command.c:752
#, c-format
msgid "%s cannot find nick for sending message\n"
msgstr "%s no ha sido posible encontrar el usuario al que enviar el mensaje\n"
@@ -1373,9 +1373,9 @@ msgstr ""
#: src/irc/irc-send.c:415 src/irc/irc-send.c:427 src/irc/irc-send.c:445
#: src/irc/irc-send.c:1097 src/irc/irc-send.c:1190 src/irc/irc-send.c:1722
-#: src/common/command.c:1196 src/common/command.c:1463
-#: src/common/command.c:1613 src/common/command.c:1756
-#: src/common/command.c:1899
+#: src/common/command.c:1222 src/common/command.c:1576
+#: src/common/command.c:1726 src/common/command.c:1869
+#: src/common/command.c:2012
#, c-format
msgid "%s wrong argument count for \"%s\" command\n"
msgstr "%s número de argumentos incorrecto para el comando \"%s\"\n"
@@ -1392,13 +1392,13 @@ 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:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:409
+#: src/irc/irc-send.c:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:433
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n"
-#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1822
-#: src/irc/irc-recv.c:1900
+#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1886
+#: src/irc/irc-recv.c:1974
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
@@ -1408,439 +1408,439 @@ msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
msgid "%s, compiled on %s %s\n"
msgstr "%s, compilado en %s %s\n"
-#: src/irc/irc-recv.c:269
+#: src/irc/irc-recv.c:289
msgid "You have been invited to "
msgstr "Has sido invitado a "
-#: src/irc/irc-recv.c:272
+#: src/irc/irc-recv.c:292
msgid "by"
msgstr "por"
-#: src/irc/irc-recv.c:282 src/irc/irc-recv.c:376 src/irc/irc-recv.c:875
-#: src/irc/irc-recv.c:1210 src/irc/irc-recv.c:1452 src/irc/irc-recv.c:3226
-#: src/irc/irc-recv.c:3293
+#: src/irc/irc-recv.c:303 src/irc/irc-recv.c:397 src/irc/irc-recv.c:894
+#: src/irc/irc-recv.c:1229 src/irc/irc-recv.c:1488 src/irc/irc-recv.c:3348
+#: src/irc/irc-recv.c:3409 src/irc/irc-recv.c:3481
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s canal \"%s\" no encontrado para el comando \"%s\"\n"
-#: src/irc/irc-recv.c:308
+#: src/irc/irc-recv.c:331
#, 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:328
+#: src/irc/irc-recv.c:350
msgid " has joined "
msgstr " se ha unido "
-#: src/irc/irc-recv.c:385
+#: src/irc/irc-recv.c:408
msgid " has kicked "
msgstr " se ha expulsado "
-#: src/irc/irc-recv.c:389
+#: src/irc/irc-recv.c:412 src/common/command.c:1397
msgid " from "
msgstr " de "
-#: src/irc/irc-recv.c:475
+#: src/irc/irc-recv.c:498
msgid " has killed "
msgstr "ha matado"
-#: src/irc/irc-recv.c:481
+#: src/irc/irc-recv.c:504
msgid " from server"
msgstr "del servidor"
-#: src/irc/irc-recv.c:491
+#: src/irc/irc-recv.c:514
msgid " from server\n"
msgstr "del servidor\n"
-#: src/irc/irc-recv.c:498
+#: src/irc/irc-recv.c:522
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s anfitrión \"%s\" no encontrado para el comando \"%s\"\n"
-#: src/irc/irc-recv.c:538
+#: src/irc/irc-recv.c:562
msgid "sets ban on"
msgstr "establecer baneo en"
-#: src/irc/irc-recv.c:539
+#: src/irc/irc-recv.c:563
msgid "removes ban on"
msgstr "quitar baneo en"
-#: src/irc/irc-recv.c:563
+#: src/irc/irc-recv.c:587
msgid "gives half channel operator status to"
msgstr "dar estado de media operador de canal a"
-#: src/irc/irc-recv.c:564
+#: src/irc/irc-recv.c:588
msgid "removes half channel operator status from"
msgstr "eliminar el estado de media operador de canal a"
-#: src/irc/irc-recv.c:591
+#: src/irc/irc-recv.c:615
msgid "sets invite-only channel flag"
msgstr "define el canal sólo en modo invitado"
-#: src/irc/irc-recv.c:592
+#: src/irc/irc-recv.c:616
msgid "removes invite-only channel flag"
msgstr "elimina el modo sólo invitado para el canal"
-#: src/irc/irc-recv.c:609
+#: src/irc/irc-recv.c:633
msgid "sets channel key to"
msgstr "definir clave de canal en"
-#: src/irc/irc-recv.c:610
+#: src/irc/irc-recv.c:634
msgid "removes channel key"
msgstr "elimina la clave de canal"
-#: src/irc/irc-recv.c:641
+#: src/irc/irc-recv.c:665
msgid "sets the user limit to"
msgstr "define el límite de usuarios en"
-#: src/irc/irc-recv.c:642
+#: src/irc/irc-recv.c:666
msgid "removes user limit"
msgstr "elimina el límite de usuarios"
-#: src/irc/irc-recv.c:664
+#: src/irc/irc-recv.c:688
msgid "sets moderated channel flag"
msgstr "establece la moderación en el canal"
-#: src/irc/irc-recv.c:665
+#: src/irc/irc-recv.c:689
msgid "removes moderated channel flag"
msgstr "elimina la moderación en el canal"
-#: src/irc/irc-recv.c:675
+#: src/irc/irc-recv.c:699
msgid "sets messages from channel only flag"
msgstr "establece el modo sólo mensajes de usuarios del canal"
-#: src/irc/irc-recv.c:676
+#: src/irc/irc-recv.c:700
msgid "removes messages from channel only flag"
msgstr "autoriza a todos los usuarios a escribir en el canal"
-#: src/irc/irc-recv.c:693
+#: src/irc/irc-recv.c:717
msgid "gives channel operator status to"
msgstr "dar estado de operador de canal a"
-#: src/irc/irc-recv.c:694
+#: src/irc/irc-recv.c:718
msgid "removes channel operator status from"
msgstr "eliminar el estado de operador de canal a"
-#: src/irc/irc-recv.c:721
+#: src/irc/irc-recv.c:745
msgid "sets private channel flag"
msgstr "establece el canal como privado"
-#: src/irc/irc-recv.c:722
+#: src/irc/irc-recv.c:746
msgid "removes private channel flag"
msgstr "elimina el modo privado para el canal"
-#: src/irc/irc-recv.c:739
+#: src/irc/irc-recv.c:763
msgid "sets quiet on"
msgstr ""
-#: src/irc/irc-recv.c:740
+#: src/irc/irc-recv.c:764
msgid "removes quiet on"
msgstr ""
-#: src/irc/irc-recv.c:757
+#: src/irc/irc-recv.c:781
msgid "sets secret channel flag"
msgstr "establece el canal como secreto"
-#: src/irc/irc-recv.c:758
+#: src/irc/irc-recv.c:782
msgid "removes secret channel flag"
msgstr "elimina el modo secreto para el canal"
-#: src/irc/irc-recv.c:768
+#: src/irc/irc-recv.c:792
msgid "sets topic protection"
msgstr "activa la protección de tema"
-#: src/irc/irc-recv.c:769
+#: src/irc/irc-recv.c:793
msgid "removes topic protection"
msgstr "elimina la protección de tema"
-#: src/irc/irc-recv.c:786
+#: src/irc/irc-recv.c:810
msgid "gives voice to"
msgstr "da voz a"
-#: src/irc/irc-recv.c:787
+#: src/irc/irc-recv.c:811
msgid "removes voice from"
msgstr "quita la voz a"
-#: src/irc/irc-recv.c:830 src/irc/irc-recv.c:915 src/irc/irc-recv.c:1284
-#: src/irc/irc-recv.c:1966
+#: src/irc/irc-recv.c:854 src/irc/irc-recv.c:936 src/irc/irc-recv.c:1307
+#: src/irc/irc-recv.c:2041
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s comando \"%s\" recibido sin host \n"
-#: src/irc/irc-recv.c:845
+#: src/irc/irc-recv.c:864
#, 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:890
+#: src/irc/irc-recv.c:911
msgid "mode changed by"
msgstr "modo cambiado por"
-#: src/irc/irc-recv.c:954
+#: src/irc/irc-recv.c:973
msgid "You are "
msgstr "Usted es "
-#: src/irc/irc-recv.c:961
+#: src/irc/irc-recv.c:980
msgid " is "
msgstr "es "
-#: src/irc/irc-recv.c:965
+#: src/irc/irc-recv.c:984
msgid "now known as "
msgstr "ahora conocido como"
-#: src/irc/irc-recv.c:1035
+#: src/irc/irc-recv.c:1050
#, 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:1048 src/irc/irc-recv.c:1080
+#: src/irc/irc-recv.c:1066 src/irc/irc-recv.c:1098
msgid "reply from"
msgstr "respuesta de"
-#: src/irc/irc-recv.c:1083
+#: src/irc/irc-recv.c:1101
#, c-format
msgid ": %ld.%ld seconds\n"
msgstr ": %ld.%ld segundos\n"
-#: src/irc/irc-recv.c:1135
+#: src/irc/irc-recv.c:1154
#, 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:1185
+#: src/irc/irc-recv.c:1203
msgid " has left "
msgstr " ha salido "
-#: src/irc/irc-recv.c:1333 src/irc/irc-recv.c:1846
+#: src/irc/irc-recv.c:1355 src/irc/irc-recv.c:1910
#, c-format
msgid "On %s: * %s %s"
msgstr "En %s: * %s %s"
-#: src/irc/irc-recv.c:1353
+#: src/irc/irc-recv.c:1379
#, c-format
msgid "Received a CTCP SOUND \"%s\" from "
msgstr "Recibido un sonido CTCP \\\"%s\\\" de "
-#: src/irc/irc-recv.c:1384 src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1512
-#: src/irc/irc-recv.c:1548 src/irc/irc-recv.c:1881
+#: src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1443 src/irc/irc-recv.c:1547
+#: src/irc/irc-recv.c:1587 src/irc/irc-recv.c:1950
msgid "received from"
msgstr "recibido de"
-#: src/irc/irc-recv.c:1408 src/irc/irc-recv.c:1877
+#: src/irc/irc-recv.c:1439 src/irc/irc-recv.c:1946
msgid "Unknown CTCP "
msgstr ""
-#: src/irc/irc-recv.c:1436
+#: src/irc/irc-recv.c:1471
#, c-format
msgid "On %s: %s> %s"
msgstr "En %s: %s> %s"
-#: src/irc/irc-recv.c:1563 src/irc/irc-recv.c:1580 src/irc/irc-recv.c:1596
-#: src/irc/irc-recv.c:1612 src/irc/irc-recv.c:1637 src/irc/irc-recv.c:1654
-#: src/irc/irc-recv.c:1670 src/irc/irc-recv.c:1694 src/irc/irc-recv.c:1711
-#: src/irc/irc-recv.c:1727 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1768
-#: src/irc/irc-recv.c:1783 src/irc/irc-recv.c:1942 src/irc/irc-recv.c:3592
-#: src/irc/irc-recv.c:3650 src/irc/irc-recv.c:3802 src/irc/irc-recv.c:3817
-#: src/irc/irc-recv.c:3832 src/irc/irc-recv.c:3847 src/irc/irc-recv.c:3860
-#: src/irc/irc-recv.c:3910 src/irc/irc-recv.c:3924
+#: src/irc/irc-recv.c:1603 src/irc/irc-recv.c:1624 src/irc/irc-recv.c:1640
+#: src/irc/irc-recv.c:1656 src/irc/irc-recv.c:1682 src/irc/irc-recv.c:1703
+#: src/irc/irc-recv.c:1719 src/irc/irc-recv.c:1744 src/irc/irc-recv.c:1765
+#: src/irc/irc-recv.c:1781 src/irc/irc-recv.c:1806 src/irc/irc-recv.c:1827
+#: src/irc/irc-recv.c:1842 src/irc/irc-recv.c:2017 src/irc/irc-recv.c:3791
+#: src/irc/irc-recv.c:3849 src/irc/irc-recv.c:4010 src/irc/irc-recv.c:4025
+#: src/irc/irc-recv.c:4040 src/irc/irc-recv.c:4055 src/irc/irc-recv.c:4068
+#: src/irc/irc-recv.c:4123 src/irc/irc-recv.c:4137
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s no es posible analizar el comando \"%s\"\n"
-#: src/irc/irc-recv.c:1796
+#: src/irc/irc-recv.c:1855
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr "%s tipo DCC CHAT desconocido recibido de "
-#: src/irc/irc-recv.c:1921 src/irc/irc-dcc.c:1039
+#: src/irc/irc-recv.c:1995 src/irc/irc-dcc.c:1036
#, c-format
msgid "Private %s> %s"
msgstr "Privado %s> %s"
-#: src/irc/irc-recv.c:1998
+#: src/irc/irc-recv.c:2072
msgid "has quit"
msgstr "ha salido"
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2197
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s comando \"%s\" recibido sin canal\n"
-#: src/irc/irc-recv.c:2147
+#: src/irc/irc-recv.c:2229
msgid " has changed topic for "
msgstr "ha cambiado el tema por "
-#: src/irc/irc-recv.c:2152
+#: src/irc/irc-recv.c:2234
#, c-format
msgid " to: \"%s\"\n"
msgstr " a: \"%s\"\n"
-#: src/irc/irc-recv.c:2158
+#: src/irc/irc-recv.c:2240
msgid " has unset topic for "
msgstr " ha quitado el tema por "
-#: src/irc/irc-recv.c:2276
+#: src/irc/irc-recv.c:2359
#, c-format
msgid " is away: %s\n"
msgstr " está ausente: %s\n"
-#: src/irc/irc-recv.c:2350
+#: src/irc/irc-recv.c:2441
msgid "Users online: "
msgstr "Usuarios conectados: "
-#: src/irc/irc-recv.c:2797
+#: src/irc/irc-recv.c:2927
msgid "idle: "
msgstr "sin actividad: "
-#: src/irc/irc-recv.c:2805
+#: src/irc/irc-recv.c:2935
msgid "days"
msgstr "días"
-#: src/irc/irc-recv.c:2805
+#: src/irc/irc-recv.c:2935
msgid "day"
msgstr "día"
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2945
msgid "hours"
msgstr "horas"
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2945
msgid "hour"
msgstr "hora"
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2951
msgid "minutes"
msgstr "minutos"
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2951
msgid "minute"
msgstr "minuto"
-#: src/irc/irc-recv.c:2827
+#: src/irc/irc-recv.c:2957
msgid "seconds"
msgstr "segundos"
-#: src/irc/irc-recv.c:2827
+#: src/irc/irc-recv.c:2957
msgid "second"
msgstr "segundo"
-#: src/irc/irc-recv.c:2832
+#: src/irc/irc-recv.c:2962
msgid "signon at: "
msgstr "firmado el: "
-#: src/irc/irc-recv.c:2920
+#: src/irc/irc-recv.c:3058
msgid "Channels: "
msgstr "Canales: "
-#: src/irc/irc-recv.c:3172
+#: src/irc/irc-recv.c:3339
msgid "No topic set for "
msgstr "No hay tema definido para "
-#: src/irc/irc-recv.c:3214
+#: src/irc/irc-recv.c:3396
msgid "Topic for "
msgstr "El tema para "
-#: src/irc/irc-recv.c:3218
+#: src/irc/irc-recv.c:3400
#, c-format
msgid " is: \"%s\"\n"
msgstr " es: \"%s\"\n"
-#: src/irc/irc-recv.c:3236 src/irc/irc-recv.c:3320 src/irc/irc-recv.c:3373
+#: src/irc/irc-recv.c:3419 src/irc/irc-recv.c:3508 src/irc/irc-recv.c:3561
#, 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:3282
+#: src/irc/irc-recv.c:3469
msgid "Topic set by "
msgstr "Tema definido por "
-#: src/irc/irc-recv.c:3302
+#: src/irc/irc-recv.c:3490
#, 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:3311 src/irc/irc-recv.c:3382
+#: src/irc/irc-recv.c:3499 src/irc/irc-recv.c:3570
#, 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:3361
+#: src/irc/irc-recv.c:3549
msgid "has invited"
msgstr "ha invitado"
-#: src/irc/irc-recv.c:3364 src/irc/irc-recv.c:3515
+#: src/irc/irc-recv.c:3552 src/irc/irc-recv.c:3712 src/common/command.c:1390
msgid "on"
msgstr "en"
-#: src/irc/irc-recv.c:3638
+#: src/irc/irc-recv.c:3837
#, 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:3694
+#: src/irc/irc-recv.c:3897
msgid "Nicks "
msgstr "Usuarios "
-#: src/irc/irc-recv.c:3714
+#: src/irc/irc-recv.c:3917
msgid "Channel "
msgstr "Canal "
-#: src/irc/irc-recv.c:3725
+#: src/irc/irc-recv.c:3928
msgid "nicks"
msgstr "usuarios"
-#: src/irc/irc-recv.c:3725
+#: src/irc/irc-recv.c:3928
msgid "nick"
msgstr "usuario"
-#: src/irc/irc-recv.c:3733
+#: src/irc/irc-recv.c:3936
msgid "ops"
msgstr "operadores"
-#: src/irc/irc-recv.c:3733
+#: src/irc/irc-recv.c:3936
msgid "op"
msgstr "operador"
-#: src/irc/irc-recv.c:3742
+#: src/irc/irc-recv.c:3945
msgid "halfops"
msgstr "semi-operadores"
-#: src/irc/irc-recv.c:3742
+#: src/irc/irc-recv.c:3945
msgid "halfop"
msgstr "semi-operador"
-#: src/irc/irc-recv.c:3751
+#: src/irc/irc-recv.c:3954
msgid "voices"
msgstr "voces"
-#: src/irc/irc-recv.c:3751
+#: src/irc/irc-recv.c:3954
msgid "voice"
msgstr "voz"
-#: src/irc/irc-recv.c:3760
+#: src/irc/irc-recv.c:3963
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:3873
+#: src/irc/irc-recv.c:4085
msgid "banned by"
msgstr "baneado por"
-#: src/irc/irc-recv.c:3962
+#: src/irc/irc-recv.c:4181
#, 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:3974
+#: src/irc/irc-recv.c:4193
#, 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:3986
+#: src/irc/irc-recv.c:4205
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1849,7 +1849,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:3996
+#: src/irc/irc-recv.c:4215
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
@@ -1880,35 +1880,35 @@ msgstr "Falló"
msgid "Aborted"
msgstr "Abortado"
-#: src/irc/irc-dcc.c:348 src/irc/irc-dcc.c:539 src/irc/irc-dcc.c:701
+#: src/irc/irc-dcc.c:345 src/irc/irc-dcc.c:536 src/irc/irc-dcc.c:698
msgid "DCC: file "
msgstr "DCC: fichero "
-#: src/irc/irc-dcc.c:355 src/irc/irc-dcc.c:664 src/irc/irc-dcc.c:706
+#: src/irc/irc-dcc.c:352 src/irc/irc-dcc.c:661 src/irc/irc-dcc.c:703
msgid " (local filename: "
msgstr " (nombre de fichero local: "
-#: src/irc/irc-dcc.c:363
+#: src/irc/irc-dcc.c:360
msgid " sent to "
msgstr " enviado a "
-#: src/irc/irc-dcc.c:365
+#: src/irc/irc-dcc.c:362
msgid " received from "
msgstr " recibido de "
-#: src/irc/irc-dcc.c:371
+#: src/irc/irc-dcc.c:368
msgid ": ok!\n"
msgstr ": ok!\n"
-#: src/irc/irc-dcc.c:371
+#: src/irc/irc-dcc.c:368
msgid ": FAILED\n"
msgstr ""
-#: src/irc/irc-dcc.c:383
+#: src/irc/irc-dcc.c:380
msgid "DCC chat closed with "
msgstr "DCC chat cerrada con "
-#: src/irc/irc-dcc.c:432
+#: src/irc/irc-dcc.c:429
#, c-format
msgid ""
"%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1917,91 +1917,91 @@ msgstr ""
"%s no se puede asociar la conversación DCC con el búfer privado (quizá el "
"búfer privado ya tiene DCC CHAT)\n"
-#: src/irc/irc-dcc.c:442
+#: src/irc/irc-dcc.c:439
msgid "Connected to "
msgstr "Conectado al "
-#: src/irc/irc-dcc.c:451
+#: src/irc/irc-dcc.c:448
msgid "via DCC chat\n"
msgstr "con charla DCC\n"
-#: src/irc/irc-dcc.c:544
+#: src/irc/irc-dcc.c:541
#, c-format
msgid "resumed at position %u\n"
msgstr ""
-#: src/irc/irc-dcc.c:550 src/irc/irc-dcc.c:575
+#: src/irc/irc-dcc.c:547 src/irc/irc-dcc.c:572
#, c-format
msgid ""
"%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
"ended\n"
msgstr ""
-#: src/irc/irc-dcc.c:594
+#: src/irc/irc-dcc.c:591
#, c-format
msgid "%s not enough memory for new DCC\n"
msgstr "%s no hay memoria suficiente para un nuevo DCC\n"
-#: src/irc/irc-dcc.c:613
+#: src/irc/irc-dcc.c:610
msgid "DCC chat"
msgstr "Charla DCC"
-#: src/irc/irc-dcc.c:643
+#: src/irc/irc-dcc.c:640
msgid "Incoming DCC file from "
msgstr "Recibir fichero DCC de "
-#: src/irc/irc-dcc.c:654 src/irc/irc-dcc.c:668
+#: src/irc/irc-dcc.c:651 src/irc/irc-dcc.c:665
msgid " bytes\n"
msgstr " bytes\n"
-#: src/irc/irc-dcc.c:660
+#: src/irc/irc-dcc.c:657
msgid "Sending DCC file to "
msgstr "Enviar fichero DCC a "
-#: src/irc/irc-dcc.c:674
+#: src/irc/irc-dcc.c:671
msgid "Incoming DCC chat request from "
msgstr "Recibir DCC chat de "
-#: src/irc/irc-dcc.c:686
+#: src/irc/irc-dcc.c:683
msgid "Sending DCC chat request to "
msgstr "Enviar DCC chat a "
-#: src/irc/irc-dcc.c:712
+#: src/irc/irc-dcc.c:709
#, c-format
msgid "will be resumed at position %u\n"
msgstr ""
-#: src/irc/irc-dcc.c:778
+#: src/irc/irc-dcc.c:775
#, c-format
msgid "%s not enough memory for DCC SEND\n"
msgstr "%s no hay memoria suficiente para el DCC SEND\n"
-#: src/irc/irc-dcc.c:800
+#: src/irc/irc-dcc.c:797
#, c-format
msgid "%s cannot access file \"%s\"\n"
msgstr "%s no es posible acceder al fichero \"%s\"\n"
-#: src/irc/irc-dcc.c:821
+#: src/irc/irc-dcc.c:818
#, c-format
msgid "%s cannot create socket for DCC\n"
msgstr "%s no es posible crear socket para el DCC\n"
-#: src/irc/irc-dcc.c:834
+#: src/irc/irc-dcc.c:831
#, c-format
msgid "%s cannot find port for DCC\n"
msgstr "%s no es posible encontrar el puerto para el DCC\n"
-#: src/irc/irc-dcc.c:881
+#: src/irc/irc-dcc.c:878
#, c-format
msgid "%s cannot send DCC\n"
msgstr "%s no es posible enviar el DCC\n"
-#: src/irc/irc-dcc.c:960
+#: src/irc/irc-dcc.c:957
#, c-format
msgid "%s error sending data to \"%s\" via DCC CHAT\n"
msgstr "%s error enviando datos al \"%s\" con DCC CHAT\n"
-#: src/irc/irc-dcc.c:1233
+#: src/irc/irc-dcc.c:1230
#, c-format
msgid ""
"%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -2010,11 +2010,40 @@ msgstr ""
"%s El DCC ha fallado porque el tamaño de bloque es demasiado grande. "
"Compruebe el valor de la opción \"dcc_blocksize\", el máximo es %d.\n"
-#: src/irc/irc-dcc.c:1308
+#: src/irc/irc-dcc.c:1305
#, c-format
msgid "Aborting active DCC: \"%s\" from %s\n"
msgstr "Abandonar el DCC activo: \"%s\" de %s\n"
+#: src/irc/irc-ignore.c:195
+#, c-format
+msgid "%s too few arguments for ignore\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:212
+#, c-format
+msgid "%s mask or type/command should be non generic value for ignore\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:221
+#, c-format
+msgid "%s ignore already exists\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:257
+#, c-format
+msgid "%s unknown type or IRC command \"%s\" for ignore\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:285
+#, c-format
+msgid "%s not enough memory to create ignore\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:406 src/irc/irc-ignore.c:442
+msgid "Removing ignore:"
+msgstr ""
+
#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:463
#: src/plugins/python/wee-python.c:81 src/plugins/ruby/wee-ruby.c:89
#, c-format
@@ -2083,19 +2112,19 @@ msgid "Loading %s script \"%s\"\n"
msgstr "Cargando %s script \"%s\"\n"
#: src/plugins/perl/wee-perl.c:1015 src/plugins/python/wee-python.c:686
-#: src/plugins/ruby/wee-ruby.c:722
+#: src/plugins/ruby/wee-ruby.c:555
#, c-format
msgid "Unloading %s script \"%s\"\n"
msgstr "Descarga del %s script \"%s\"\n"
#: src/plugins/perl/wee-perl.c:1032 src/plugins/python/wee-python.c:703
-#: src/plugins/ruby/wee-ruby.c:739
+#: src/plugins/ruby/wee-ruby.c:572
#, c-format
msgid "Unloading all %s scripts...\n"
msgstr "Descargando todos los %s scripts...\n"
#: src/plugins/perl/wee-perl.c:1037 src/plugins/python/wee-python.c:708
-#: src/plugins/ruby/wee-ruby.c:744
+#: src/plugins/ruby/wee-ruby.c:577
#, c-format
msgid "%s scripts unloaded\n"
msgstr "%s scripts descargados\n"
@@ -2372,7 +2401,7 @@ msgstr "limpiar hotlist"
msgid "grab a key"
msgstr ""
-#: src/gui/gui-keyboard.c:426 src/common/command.c:1478
+#: src/gui/gui-keyboard.c:426 src/common/command.c:1591
#, c-format
msgid "%s unable to bind key \"%s\"\n"
msgstr "%s No ha sido posible atar la clave \"%s\"\n"
@@ -2496,14 +2525,34 @@ msgid "command: name of a WeeChat or IRC command"
msgstr "comando: nombre de un comando de Weechat ó de IRC"
#: src/common/command.c:75
+msgid "ignore IRC messages and/or hosts"
+msgstr ""
+
+#: src/common/command.c:76
+msgid "[mask [[type | command] [channel [server]]]]"
+msgstr ""
+
+#: src/common/command.c:77
+msgid ""
+" mask: nick or host mask to ignore\n"
+" type: type of message to ignore (action, ctcp, dcc, pv)\n"
+"command: IRC command\n"
+"channel: name of channel for ignore\n"
+" server: name of server for ignore\n"
+"\n"
+"For each argument, '*' means all.\n"
+"Without argument, /ignore command lists all defined ignore."
+msgstr ""
+
+#: src/common/command.c:85
msgid "bind/unbind keys"
msgstr "atar/desatar claves"
-#: src/common/command.c:76
+#: src/common/command.c:86
msgid "[key function/command] [unbind key] [functions] [reset -yes]"
msgstr "[clave función/comando] [desatar clave] [funciones] [reset -yes]"
-#: src/common/command.c:77
+#: src/common/command.c:87
msgid ""
"key: bind this key to an internal function or a command (beginning by \"/"
"\")\n"
@@ -2520,51 +2569,57 @@ msgstr ""
"reset: restaura anclajes a los valores por defecto y elimina todos los "
"anclajes personales (usar cuidadosamente)"
-#: src/common/command.c:82
+#: src/common/command.c:92
msgid "list/load/unload Perl scripts"
msgstr "lista/carga/descarga de los Perl scripts"
-#: src/common/command.c:83 src/common/command.c:88 src/common/command.c:93
+#: src/common/command.c:93 src/common/command.c:98 src/common/command.c:103
msgid "[load filename] | [autoload] | [reload] | [unload]"
msgstr "[load fichero] | [autoload] | [reload] | [unload]"
-#: src/common/command.c:84
+#: src/common/command.c:94
msgid ""
"filename: Perl script (file) to load\n"
+"\n"
"Without argument, /perl command lists all loaded Perl scripts."
msgstr ""
"fichero: Perl script (archivo) a cargar\n"
+"\n"
"Sin argumentos, el comando /perl lista todos los Perl scripts cargados."
-#: src/common/command.c:87
+#: src/common/command.c:97
msgid "list/load/unload Python scripts"
msgstr "lista/carga/descarga de los Python scripts"
-#: src/common/command.c:89
+#: src/common/command.c:99
msgid ""
"filename: Python script (file) to load\n"
+"\n"
"Without argument, /python command lists all loaded Python scripts."
msgstr ""
"fichero: Python script (archivo) a cargar\n"
+"\n"
"Sin argumentos, el comando /python lista todos los Python scripts cargados."
-#: src/common/command.c:92
+#: src/common/command.c:102
msgid "list/load/unload Ruby scripts"
msgstr "lista/carga/descarga de los Ruby scripts"
-#: src/common/command.c:94
+#: src/common/command.c:104
msgid ""
"filename: Ruby script (file) to load\n"
+"\n"
"Without argument, /ruby command lists all loaded Ruby scripts."
msgstr ""
"fichero: Ruby script (archivo) a cargar\n"
+"\n"
"Sin argumentos, el comando /ruby lista todos los Ruby scripts cargados."
-#: src/common/command.c:97
+#: src/common/command.c:107
msgid "list, add or remove servers"
msgstr "lista, añade o elimina servidores"
-#: src/common/command.c:98
+#: src/common/command.c:108
msgid ""
"[servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-"
"pwd password] [-nicks nick1 [nick2 [nick3]]] [-username username] [-realname "
@@ -2576,7 +2631,7 @@ msgstr ""
"username nombre de usuario] [-realname nombre_real] [-command comando] [-"
"autojoin canal[,canal]] ] | [del nombre_de_servidor]"
-#: src/common/command.c:103
+#: src/common/command.c:113
msgid ""
"servername: server name, for internal & display use\n"
"hostname: name or IP address of server\n"
@@ -2602,27 +2657,27 @@ msgstr ""
"nombre_de_usuario: nombre de usuario\n"
"nombre_real: nombre real del usuario"
-#: src/common/command.c:115
+#: src/common/command.c:125
msgid "save config to disk"
msgstr "guardar configuración a disco"
-#: src/common/command.c:116
+#: src/common/command.c:126
msgid "[file]"
msgstr "[archivo]"
-#: src/common/command.c:116
+#: src/common/command.c:126
msgid "file: filename for writing config"
msgstr "archivo: fichero en el que guardar la configuración"
-#: src/common/command.c:118
+#: src/common/command.c:128
msgid "set config parameters"
msgstr "modificar parámetros de configuración"
-#: src/common/command.c:119
+#: src/common/command.c:129
msgid "[option[=value]]"
msgstr "[opción[=valor]]"
-#: src/common/command.c:119
+#: src/common/command.c:129
msgid ""
"option: name of an option\n"
"value: value for option"
@@ -2630,27 +2685,48 @@ msgstr ""
"opción: nombre de una opción\n"
"valor: valor para la opción"
-#: src/common/command.c:121
+#: src/common/command.c:131
msgid "remove an alias"
msgstr "eliminar un alias"
-#: src/common/command.c:122
+#: src/common/command.c:132
msgid "alias_name"
msgstr "alias"
-#: src/common/command.c:122
+#: src/common/command.c:132
msgid "alias_name: name of alias to remove"
msgstr "alias: nombre del alias a suprimir"
-#: src/common/command.c:124
+#: src/common/command.c:134
+msgid "unignore IRC messages and/or hosts"
+msgstr ""
+
+#: src/common/command.c:135
+msgid "[number | [mask [[type | command] [channel [server]]]]]"
+msgstr ""
+
+#: src/common/command.c:136
+msgid ""
+" number: # of ignore to unignore (number is displayed by list of ignore)\n"
+" mask: nick or host mask to unignore\n"
+" type: type of message to unignore (action, ctcp, dcc, pv)\n"
+"command: IRC command\n"
+"channel: name of channel for unignore\n"
+" server: name of server for unignore\n"
+"\n"
+"For each argument, '*' means all.\n"
+"Without argument, /unignore command lists all defined ignore."
+msgstr ""
+
+#: src/common/command.c:145
msgid "manage windows"
msgstr "gestión de ventanas"
-#: src/common/command.c:125
+#: src/common/command.c:146
msgid "[list | splith | splitv | [merge [down | up | left | right | all]]]"
msgstr "[list | splith | splitv | [merge [down | up | left | right | all]]]"
-#: src/common/command.c:126
+#: src/common/command.c:147
msgid ""
"list: list opened windows (no parameter implies this list)\n"
"splith: split current window horizontally\n"
@@ -2663,29 +2739,29 @@ msgstr ""
"splitv: dividir la ventana actual verticalmente\n"
"merge: fusionar una ventana con otra"
-#: src/common/command.c:272
+#: src/common/command.c:293
#, c-format
msgid "%s alias or command \"%s\" already exists!\n"
msgstr "%s ¡el alias o el comando \"%s\" ya existe!\n"
-#: src/common/command.c:282
+#: src/common/command.c:303
#, c-format
msgid "%s alias cannot run another alias!\n"
msgstr "%s ¡el alias no puede ejecutar otro alias!\n"
-#: src/common/command.c:289
+#: src/common/command.c:310
#, c-format
msgid "%s target command \"%s\" does not exist!\n"
msgstr "%s ¡el comando objetivo \"%s\" no existe!\n"
-#: src/common/command.c:497
+#: src/common/command.c:518
#, c-format
msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
msgstr ""
"%s número de argumentos incorrecto para el comando %s \"%s\" (esperado: %d "
"parámetro%s)\n"
-#: src/common/command.c:509
+#: src/common/command.c:530
#, c-format
msgid ""
"%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
@@ -2694,19 +2770,19 @@ msgstr ""
"%s número de argumentos incorrecto para el comando %s \"%s\" (esperado: "
"entre %d y %d parámetro%s)\n"
-#: src/common/command.c:531 src/common/command.c:601
+#: src/common/command.c:552 src/common/command.c:622
#, c-format
msgid "%s command \"%s\" failed\n"
msgstr "%s el comando \"%s\" ha fallado\n"
-#: src/common/command.c:559
+#: src/common/command.c:580
#, c-format
msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
msgstr ""
"%s número de argumentos incorrecto para el comando IRC \"%s\" (esperado: %d "
"parámetro%s)\n"
-#: src/common/command.c:571
+#: src/common/command.c:592
#, c-format
msgid ""
"%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
@@ -2715,222 +2791,238 @@ msgstr ""
"%s número de argumentos incorrecto para el comando IRC \"%s\" (esperado: "
"entre %d y %d parámetro%s)\n"
-#: src/common/command.c:586
+#: src/common/command.c:607
#, c-format
msgid "%s command \"%s\" needs a server connection!\n"
msgstr "%s ¡el comando \"%s\" requiere una conexión a servidor!\n"
-#: src/common/command.c:650
+#: src/common/command.c:671
#, c-format
msgid "%s unknown command \"%s\" (type /help for help)\n"
msgstr "%s comando \"%s\" desconocido (escriba /help para la ayuda)\n"
-#: src/common/command.c:753
+#: src/common/command.c:774
#, c-format
msgid "%s unable to call handler for message (not enough memory)\n"
msgstr ""
"%s No ha sido posible llamar al manejador para el mensaje (no hay suficiente "
"memoria)\n"
-#: src/common/command.c:761
+#: src/common/command.c:782
msgid "This window is not a channel!\n"
msgstr "¡Esta ventana no es un canal!\n"
-#: src/common/command.c:789 src/common/command.c:813 src/common/command.c:918
+#: src/common/command.c:810 src/common/command.c:834 src/common/command.c:944
#, c-format
msgid "%s missing arguments for \"%s\" command\n"
msgstr "%s faltan argumentos para el comando \"%s\"\n"
-#: src/common/command.c:798
+#: src/common/command.c:819
#, c-format
msgid "Alias \"%s\" => \"%s\" created\n"
msgstr "Alias \"%s\" => \"%s\" creado\n"
-#: src/common/command.c:804
+#: src/common/command.c:825
#, c-format
msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
msgstr ""
"No ha sido posible crear el alias \"%s\" => \"%s\" (no hay suficiente "
"memoria)\n"
-#: src/common/command.c:824
+#: src/common/command.c:845
msgid "List of aliases:\n"
msgstr "Lista de alias:\n"
-#: src/common/command.c:836
+#: src/common/command.c:857
msgid "No alias defined.\n"
msgstr "Ningún alias definido.\n"
-#: src/common/command.c:859
+#: src/common/command.c:880
msgid "Channel: "
msgstr "Canal: "
-#: src/common/command.c:862 src/common/command.c:872
+#: src/common/command.c:883 src/common/command.c:893
msgid " (server: "
msgstr " (servidor: "
-#: src/common/command.c:869
+#: src/common/command.c:890
msgid "Private with: "
msgstr "Privado con: "
-#: src/common/command.c:898
+#: src/common/command.c:924
msgid "Opened buffers:\n"
msgstr "Búfers abiertos:\n"
-#: src/common/command.c:941
+#: src/common/command.c:967
#, c-format
msgid "%s incorrect buffer number\n"
msgstr "%s número de búfer incorrecto\n"
-#: src/common/command.c:955
+#: src/common/command.c:981
#, c-format
msgid "%s can not close the single buffer\n"
msgstr "%s no es posible cerrar el único búfer\n"
-#: src/common/command.c:965
+#: src/common/command.c:991
#, c-format
msgid "%s can not close server buffer while channels are opened\n"
msgstr ""
"%s no se puede cerrar el búfer de servidor mientras haya canales abiertos\n"
-#: src/common/command.c:1006
+#: src/common/command.c:1032
msgid "Notify levels: "
msgstr "Niveles de notificación: "
-#: src/common/command.c:1034 src/common/command.c:1056
+#: src/common/command.c:1060 src/common/command.c:1082
#, c-format
msgid "%s incorrect notify level (must be between %d and %d)\n"
msgstr "%s nivel de notificación incorrecto (debe estar entre %d y %d)\n"
-#: src/common/command.c:1043
+#: src/common/command.c:1069
#, c-format
msgid "%s incorrect buffer for notify (must be channel or private)\n"
msgstr "%s búfer incorrecto para notificar (debe ser canal o privado)\n"
-#: src/common/command.c:1123
+#: src/common/command.c:1149
#, c-format
msgid "unknown parameter \"%s\" for \"%s\" command\n"
msgstr "parámetro desconocido \"%s\" para el comando \"%s\"\n"
-#: src/common/command.c:1153
+#: src/common/command.c:1179
#, c-format
msgid "%s already connected to server \"%s\"!\n"
msgstr "%s ya conectado al servidor \"%s\"!\n"
-#: src/common/command.c:1161
+#: src/common/command.c:1187
#, c-format
msgid "%s currently connecting to server \"%s\"!\n"
msgstr "%s actualmente conectando al servidor \"%s\"!\n"
-#: src/common/command.c:1179 src/common/command.c:1254
+#: src/common/command.c:1205 src/common/command.c:1280
#, c-format
msgid "%s server not found\n"
msgstr "%s servidor no encontrado\n"
-#: src/common/command.c:1209 src/common/command.c:1606
-#: src/common/command.c:1749 src/common/command.c:1892
-#: src/common/command.c:2589 src/common/command.c:2605
+#: src/common/command.c:1235 src/common/command.c:1719
+#: src/common/command.c:1862 src/common/command.c:2005
+#: src/common/command.c:2765 src/common/command.c:2781
#, c-format
msgid "%s unknown option for \"%s\" command\n"
msgstr "%s opción desconocida para el comando \"%s\"\n"
-#: src/common/command.c:1238
+#: src/common/command.c:1264
#, c-format
msgid "%s not connected to server \"%s\"!\n"
msgstr "%s ¡no conectado al servidor \"%s\"!\n"
-#: src/common/command.c:1246
+#: src/common/command.c:1272
msgid "Auto-reconnection is cancelled\n"
msgstr "La reconexión automática está anulada\n"
-#: src/common/command.c:1272 src/common/weechat.c:273
+#: src/common/command.c:1298 src/common/weechat.c:345
#, c-format
msgid "%s internal commands:\n"
msgstr "Comandos internos %s :\n"
-#: src/common/command.c:1281 src/common/weechat.c:293
+#: src/common/command.c:1307 src/common/weechat.c:365
#, c-format
msgid "IRC commands:\n"
msgstr "Comandos IRC :\n"
-#: src/common/command.c:1348
+#: src/common/command.c:1374
#, c-format
msgid "No help available, \"%s\" is an unknown command\n"
msgstr "No hay ayuda disponible, el comando \"%s\" es desconocido\n"
-#: src/common/command.c:1366
+#: src/common/command.c:1395
+msgid " ignoring "
+msgstr ""
+
+#: src/common/command.c:1419
+msgid "List of ignore:\n"
+msgstr ""
+
+#: src/common/command.c:1434
+msgid "No ignore defined.\n"
+msgstr ""
+
+#: src/common/command.c:1460
+msgid "New ignore:"
+msgstr ""
+
+#: src/common/command.c:1479
msgid "New key binding:\n"
msgstr "Nuevo anclaje de clave:\n"
-#: src/common/command.c:1399
+#: src/common/command.c:1512
msgid "Key bindings:\n"
msgstr "Anclajes de clave:\n"
-#: src/common/command.c:1411
+#: src/common/command.c:1524
#, c-format
msgid "Key \"%s\" unbinded\n"
msgstr "Clave \"%s\" desatada\n"
-#: src/common/command.c:1416
+#: src/common/command.c:1529
#, c-format
msgid "%s unable to unbind key \"%s\"\n"
msgstr "%s No ha sido posible desatar la clave \"%s\"\n"
-#: src/common/command.c:1424 src/common/weechat.c:324
+#: src/common/command.c:1537 src/common/weechat.c:396
#, c-format
msgid "Internal key functions:\n"
msgstr "Funciones de clave internas:\n"
-#: src/common/command.c:1443
+#: src/common/command.c:1556
msgid "Default key bindings restored\n"
msgstr "Anclajes de clave por defecto restaurados\n"
-#: src/common/command.c:1449
+#: src/common/command.c:1562
#, c-format
msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
msgstr ""
"%s \"-yes\" se requiere argumento para resetear las claves (por razones de "
"seguridad)\n"
-#: src/common/command.c:1505 src/common/command.c:1648
-#: src/common/command.c:1791
+#: src/common/command.c:1618 src/common/command.c:1761
+#: src/common/command.c:1904
#, c-format
msgid "Registered %s scripts:\n"
msgstr "%s scripts registrados:\n"
-#: src/common/command.c:1522 src/common/command.c:1545
-#: src/common/command.c:1568 src/common/command.c:1665
-#: src/common/command.c:1688 src/common/command.c:1711
-#: src/common/command.c:1808 src/common/command.c:1831
-#: src/common/command.c:1854
+#: src/common/command.c:1635 src/common/command.c:1658
+#: src/common/command.c:1681 src/common/command.c:1778
+#: src/common/command.c:1801 src/common/command.c:1824
+#: src/common/command.c:1921 src/common/command.c:1944
+#: src/common/command.c:1967
msgid " (none)\n"
msgstr " (ninguno)\n"
-#: src/common/command.c:1527 src/common/command.c:1670
-#: src/common/command.c:1813
+#: src/common/command.c:1640 src/common/command.c:1783
+#: src/common/command.c:1926
#, c-format
msgid "%s message handlers:\n"
msgstr "Funciones %s para mensajes:\n"
-#: src/common/command.c:1536 src/common/command.c:1679
-#: src/common/command.c:1822
+#: src/common/command.c:1649 src/common/command.c:1792
+#: src/common/command.c:1935
#, c-format
msgid " IRC(%s) => %s(%s)\n"
msgstr " IRC(%s) => %s(%s)\n"
-#: src/common/command.c:1550 src/common/command.c:1693
-#: src/common/command.c:1836
+#: src/common/command.c:1663 src/common/command.c:1806
+#: src/common/command.c:1949
#, c-format
msgid "%s command handlers:\n"
msgstr "Comandos %s :\n"
-#: src/common/command.c:1559 src/common/command.c:1702
-#: src/common/command.c:1845
+#: src/common/command.c:1672 src/common/command.c:1815
+#: src/common/command.c:1958
#, c-format
msgid " Command /%s => %s(%s)\n"
msgstr " Comando /%s => %s(%s)\n"
-#: src/common/command.c:1619
+#: src/common/command.c:1732
msgid ""
"WeeChat was build without Perl support.\n"
"Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n"
@@ -2939,7 +3031,7 @@ msgstr ""
"Por favor, recompile WeeChat con la opción \"--enable-perl\" para el "
"script ./configure\n"
-#: src/common/command.c:1762
+#: src/common/command.c:1875
msgid ""
"WeeChat was build without Python support.\n"
"Please rebuild WeeChat with \"--enable-python\" option for ./configure "
@@ -2949,40 +3041,41 @@ msgstr ""
"Por favor, recompile WeeChat con la opción \"--enable-python\" para el "
"script ./configure\n"
-#: src/common/command.c:1905
+#: src/common/command.c:2018
msgid ""
"WeeChat was build without Ruby support.\n"
"Please rebuild WeeChat with \"--enable-ruby\" option for ./configure script\n"
msgstr ""
"WeeChat ha sido compilado sin soporte para Ruby.\n"
-"Por favor, recompile WeeChat con la opción \"--enable-ruby\" para el script ./configure\n"
+"Por favor, recompile WeeChat con la opción \"--enable-ruby\" para el "
+"script ./configure\n"
-#: src/common/command.c:1953
+#: src/common/command.c:2066
msgid "No server.\n"
msgstr "Ningún servidor.\n"
-#: src/common/command.c:1964
+#: src/common/command.c:2077
#, c-format
msgid "Server '%s' not found.\n"
msgstr "Servidor '%s' no encontrado.\n"
-#: src/common/command.c:1976
+#: src/common/command.c:2089
#, c-format
msgid "%s missing servername for \"%s\" command\n"
msgstr "%s falta el nombre de servidor para el comando \"%s\"\n"
-#: src/common/command.c:1984
+#: src/common/command.c:2097
#, c-format
msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
msgstr ""
"%s demasiados argumentos para el comando \"%s\", ignorando parámetros\n"
-#: src/common/command.c:2003
+#: src/common/command.c:2116
#, c-format
msgid "%s server \"%s\" not found for \"%s\" command\n"
msgstr "%s servidor \"%s\" no encontrado para el comando \"%s\"\n"
-#: src/common/command.c:2011
+#: src/common/command.c:2124
#, c-format
msgid ""
"%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -2991,108 +3084,121 @@ msgstr ""
"%s usted no puede eliminar el servidor \"%s\" ya que está usted conectado a "
"él. Pruebe /disconnect %s antes.\n"
-#: src/common/command.c:2027 src/common/command.c:2173
+#: src/common/command.c:2140 src/common/command.c:2286
msgid "Server"
msgstr "Servidor"
-#: src/common/command.c:2030
+#: src/common/command.c:2143
msgid "has been deleted\n"
msgstr "ha sido eliminado\n"
-#: src/common/command.c:2045
+#: src/common/command.c:2158
#, c-format
msgid "%s missing parameters for \"%s\" command\n"
msgstr "%s faltan parámetros para el comando \"%s\"\n"
-#: src/common/command.c:2055
+#: src/common/command.c:2168
#, c-format
msgid "%s server \"%s\" already exists, can't create it!\n"
msgstr "%s el servidor \"%s\" ya existe, ¡no se puede crear!\n"
-#: src/common/command.c:2084 src/common/command.c:2112
-#: src/common/command.c:2125 src/common/command.c:2151
+#: src/common/command.c:2197 src/common/command.c:2225
+#: src/common/command.c:2238 src/common/command.c:2264
#, c-format
msgid "%s missing password for \"%s\" parameter\n"
msgstr "%s falta contraseña para el comando \"%s\"\n"
-#: src/common/command.c:2097
+#: src/common/command.c:2210
#, c-format
msgid "%s missing nick(s) for \"%s\" parameter\n"
msgstr "%s falta(n) usuario(s) para el parámetro \"%s\"\n"
-#: src/common/command.c:2138
+#: src/common/command.c:2251
#, c-format
msgid "%s missing command for \"%s\" parameter\n"
msgstr "%s falta comando para el parámetro \"%s\"\n"
-#: src/common/command.c:2176
+#: src/common/command.c:2289
msgid "created\n"
msgstr "creado\n"
-#: src/common/command.c:2182
+#: src/common/command.c:2295
#, c-format
msgid "%s unable to create server\n"
msgstr "%s no es posible crear el servidor\n"
-#: src/common/command.c:2237
+#: src/common/command.c:2350
msgid "(unknown)"
msgstr "(desconocido)"
-#: src/common/command.c:2260
+#: src/common/command.c:2373
msgid "(password hidden) "
msgstr "(contraseña oculta) "
-#: src/common/command.c:2324
+#: src/common/command.c:2437
#, c-format
msgid "%s server \"%s\" not found\n"
msgstr "%s servidor \"%s\" no encontrado\n"
-#: src/common/command.c:2355 src/common/command.c:2401
+#: src/common/command.c:2468 src/common/command.c:2514
#, c-format
msgid "%s config option \"%s\" not found\n"
msgstr "%s opción de configuración \"%s\" no encontrada\n"
-#: src/common/command.c:2360 src/common/command.c:2393
+#: src/common/command.c:2473 src/common/command.c:2506
#, c-format
msgid "%s incorrect value for option \"%s\"\n"
msgstr "%s valor incorrecto para la opción \"%s\"\n"
-#: src/common/command.c:2376
+#: src/common/command.c:2489
#, c-format
msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
msgstr ""
"%s la opción \"%s\" no puede ser modificada mientras WeeChat esté en "
"ejecución\n"
-#: src/common/command.c:2475
+#: src/common/command.c:2588
#, c-format
msgid "No config option found with \"%s\"\n"
msgstr "Ninguna opción de configuración encontrada con \"%s\"\n"
-#: src/common/command.c:2478
+#: src/common/command.c:2591
msgid "No config option found\n"
msgstr "Ninguna opción de configuración encontrada\n"
-#: src/common/command.c:2484
+#: src/common/command.c:2597
#, c-format
msgid "config option(s) found with \"%s\"\n"
msgstr "opción/opciones de configuración encontrada(s) con \"%s\"\n"
-#: src/common/command.c:2487
+#: src/common/command.c:2600
msgid "config option(s) found\n"
msgstr "opción/opciones de configuración encontrada(s)\n"
-#: src/common/command.c:2507
+#: src/common/command.c:2620
#, c-format
msgid "%s alias or command \"%s\" not found\n"
msgstr "%s alias o comando \"%s\" no encontrado\n"
-#: src/common/command.c:2517
+#: src/common/command.c:2630
#, c-format
msgid "Alias \"%s\" removed\n"
msgstr "Alias \"%s\" eliminado\n"
-#: src/common/command.c:2537
+#: src/common/command.c:2683
+msgid "ignore were removed.\n"
+msgstr ""
+
+#: src/common/command.c:2685
+msgid "ignore was removed.\n"
+msgstr ""
+
+#: src/common/command.c:2690
+#, c-format
+msgid "%s no ignore found\n"
+msgstr ""
+
+#: src/common/command.c:2713
msgid "Opened windows:\n"
msgstr "Ventanas abiertas:\n"
@@ -3157,7 +3263,7 @@ msgstr "**** Comienzo del log (registro) "
msgid "**** End of log "
msgstr "**** Fin del log "
-#: src/common/weechat.c:198
+#: src/common/weechat.c:270
#, c-format
msgid ""
"WeeChat configuration options (~/.weechat/weechat.rc):\n"
@@ -3166,47 +3272,47 @@ msgstr ""
"Opciones de configuración de WeeChat (~/.weechat/weechat.rc):\n"
"\n"
-#: src/common/weechat.c:211
+#: src/common/weechat.c:283
#, c-format
msgid " . type boolean (values: 'on' or 'off')\n"
msgstr " . tipo booleano (valores: 'on' u 'off')\n"
-#: src/common/weechat.c:212 src/common/weechat.c:235 src/common/weechat.c:241
-#: src/common/weechat.c:247
+#: src/common/weechat.c:284 src/common/weechat.c:307 src/common/weechat.c:313
+#: src/common/weechat.c:319
#, c-format
msgid " . default value: '%s'\n"
msgstr " . valor por defecto: '%s'\n"
-#: src/common/weechat.c:217
+#: src/common/weechat.c:289
#, c-format
msgid " . type integer (values: between %d and %d)\n"
msgstr " . tipo entero (valores: entre %d y %d)\n"
-#: src/common/weechat.c:220
+#: src/common/weechat.c:292
#, c-format
msgid " . default value: %d\n"
msgstr " . valor por defecto: %d\n"
-#: src/common/weechat.c:224
+#: src/common/weechat.c:296
#, c-format
msgid " . type string (values: "
msgstr " . tipo cadena (valores: "
-#: src/common/weechat.c:237 src/common/weechat.c:243 src/common/weechat.c:249
+#: src/common/weechat.c:309 src/common/weechat.c:315 src/common/weechat.c:321
msgid "empty"
msgstr "vacío"
-#: src/common/weechat.c:240
+#: src/common/weechat.c:312
#, c-format
msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n"
msgstr " . tipo color (color Curses ó Gtk, ver la documentación de WeeChat)\n"
-#: src/common/weechat.c:246
+#: src/common/weechat.c:318
#, c-format
msgid " . type string (any string)\n"
msgstr " . tipo cadena (cualquier cadena)\n"
-#: src/common/weechat.c:252
+#: src/common/weechat.c:324
#, c-format
msgid ""
" . description: %s\n"
@@ -3215,7 +3321,7 @@ msgstr ""
" . descripción: %s\n"
"\n"
-#: src/common/weechat.c:258
+#: src/common/weechat.c:330
#, c-format
msgid ""
"Moreover, you can define aliases in [alias] section, by adding lines like:\n"
@@ -3223,7 +3329,7 @@ msgstr ""
"Además, usted puede definir alias en la sección [alias], añadiendo líneas "
"como:\n"
-#: src/common/weechat.c:260
+#: src/common/weechat.c:332
#, c-format
msgid ""
"where 'j' is alias name, and 'join' associated command.\n"
@@ -3232,62 +3338,62 @@ msgstr ""
"donde 'j' es el nombre del alias, y 'join' el comando asociado.\n"
"\n"
-#: src/common/weechat.c:345
+#: src/common/weechat.c:417
#, c-format
msgid "%s default keys:\n"
msgstr "%s claves por defecto:\n"
-#: src/common/weechat.c:425
+#: src/common/weechat.c:497
#, c-format
msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
msgstr "%s sintaxis inválida para el servidor IRC ('%s'), ignorado\n"
-#: src/common/weechat.c:438
+#: src/common/weechat.c:510
#, c-format
msgid "%s unable to create server ('%s'), ignored\n"
msgstr "%s no es posible crear el servidor ('%s'), ignorado\n"
-#: src/common/weechat.c:447
+#: src/common/weechat.c:519
#, c-format
msgid "%s unknown parameter '%s', ignored\n"
msgstr "%s parámetro desconocido '%s', ignorado\n"
-#: src/common/weechat.c:467
+#: src/common/weechat.c:539
#, c-format
msgid "%s cannot create directory \"%s\"\n"
msgstr "%s no es posible crear el directorio \"%s\"\n"
-#: src/common/weechat.c:493
+#: src/common/weechat.c:565
#, c-format
msgid "%s unable to get HOME directory\n"
msgstr "%s no ha sido posible leer el directorio HOME\n"
-#: src/common/weechat.c:502
+#: src/common/weechat.c:574
#, c-format
msgid "%s not enough memory for home directory\n"
msgstr "%s no hay suficiente memoria para el directorio home\n"
-#: src/common/weechat.c:512
+#: src/common/weechat.c:584
#, c-format
msgid "%s unable to create ~/.weechat directory\n"
msgstr "%s no es posible crear el directorio ~/.weechat\n"
-#: src/common/weechat.c:564
+#: src/common/weechat.c:636
#, c-format
msgid "%s unable to create ~/.weechat/logs directory\n"
msgstr "%s no es posible crear el directorio ~/.weechat/logs\n"
-#: src/common/weechat.c:607
+#: src/common/weechat.c:679
#, c-format
msgid "%s unable to create/append to log file (~/.weechat/%s)"
msgstr "%s no es posible crear/añadir en el fichero de log (~/.weechat/%s)"
-#: src/common/weechat.c:630
+#: src/common/weechat.c:702
#, c-format
msgid "%sWelcome to "
msgstr "%sBienvenido a "
-#: src/common/weechat.c:643 src/common/weechat.c:652
+#: src/common/weechat.c:715 src/common/weechat.c:724
msgid "compiled on"
msgstr "compilado en"
@@ -3299,33 +3405,33 @@ msgstr "Error WeeChat:"
msgid "WeeChat Warning:"
msgstr "Advertencia WeeChat:"
-#: src/common/weeconfig.c:90 src/common/weeconfig.c:91
+#: src/common/weeconfig.c:91 src/common/weeconfig.c:92
msgid "set title for window (terminal for Curses GUI) with name & version"
msgstr ""
"define el título de la ventana (el terminal para la interfaz Curses) con el "
"nombre y la versión"
-#: src/common/weeconfig.c:94 src/common/weeconfig.c:95
+#: src/common/weeconfig.c:95 src/common/weeconfig.c:96
msgid "display WeeChat logo at startup"
msgstr "mostrar el logotipo de WeeChat en el arranque"
-#: src/common/weeconfig.c:98 src/common/weeconfig.c:99
+#: src/common/weeconfig.c:99 src/common/weeconfig.c:100
msgid "display WeeChat version at startup"
msgstr "mostrar la versión de Weechat en el arranque"
-#: src/common/weeconfig.c:102
+#: src/common/weeconfig.c:103
msgid "WeeChat slogan"
msgstr "eslógan de WeeChat"
-#: src/common/weeconfig.c:103
+#: src/common/weeconfig.c:104
msgid "WeeChat slogan (if empty, slogan is not used)"
msgstr "eslógan de WeeChat (si está vacío, el eslógan no será utilizado)"
-#: src/common/weeconfig.c:106
+#: src/common/weeconfig.c:107
msgid "charset for decoding messages from server"
msgstr "juego de caracteres para decodificar los mensajes del servidor"
-#: src/common/weeconfig.c:107
+#: src/common/weeconfig.c:108
msgid ""
"charset for decoding messages from server, examples: UTF-8, ISO-8859-1 (if "
"empty, messages are not converted)"
@@ -3333,11 +3439,11 @@ msgstr ""
"juego de caracteres para decodificar los mensajes del servidor, ejemplos: "
"UTF-8, ISO-8859-1 (si no se especifica, los mensajes no son convertidos)"
-#: src/common/weeconfig.c:110
+#: src/common/weeconfig.c:111
msgid "charset for encoding messages sent to server"
msgstr "juego de caracteres para codificar los mensajes enviados al servidor"
-#: src/common/weeconfig.c:111
+#: src/common/weeconfig.c:112
msgid ""
"charset for encoding messages sent to server, examples: UFT-8, ISO-8859-1 "
"(if empty, local charset is used)"
@@ -3346,11 +3452,11 @@ msgstr ""
"ejemplos: UFT-8, ISO-8859-1 (si no se especifica, se utiliza el juego de "
"caracteres local)"
-#: src/common/weeconfig.c:114
+#: src/common/weeconfig.c:115
msgid "internal WeeChat charset (should be ISO)"
msgstr "juego de caracteres interno de WeeChat (debería ser ISO)"
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:116
msgid ""
"internal WeeChat charset, should be ISO-xxxx even if locale is UTF-8 (if "
"empty, local charset is used)"
@@ -3359,45 +3465,45 @@ msgstr ""
"locale sea UTF-8 (si no se especifica, se utiliza el juego de caracteres "
"local)"
-#: src/common/weeconfig.c:118 src/common/weeconfig.c:119
+#: src/common/weeconfig.c:119 src/common/weeconfig.c:120
msgid "timestamp for buffers"
msgstr "fecha y hora para las búfers"
-#: src/common/weeconfig.c:122 src/common/weeconfig.c:123
+#: src/common/weeconfig.c:123 src/common/weeconfig.c:124
msgid "display nick names with different colors"
msgstr "mostrar nombres de usuario con colores diferentes"
-#: src/common/weeconfig.c:126 src/common/weeconfig.c:127
+#: src/common/weeconfig.c:127 src/common/weeconfig.c:128
msgid "display actions with different colors"
msgstr "mostrar acciones con colores diferentes"
-#: src/common/weeconfig.c:130 src/common/weeconfig.c:131
+#: src/common/weeconfig.c:131 src/common/weeconfig.c:132
msgid "remove colors from incoming messages"
msgstr "quitar colores en los mensajes entrantes"
-#: src/common/weeconfig.c:134
+#: src/common/weeconfig.c:135
msgid "display nicklist window"
msgstr "mostrar ventana de usuarios"
-#: src/common/weeconfig.c:135
+#: src/common/weeconfig.c:136
msgid "display nicklist window (for channel windows)"
msgstr "mostrar ventana de usuarios (para las ventanas de canal)"
-#: src/common/weeconfig.c:138
+#: src/common/weeconfig.c:139
msgid "nicklist position"
msgstr "posición de la ventana de usuarios"
-#: src/common/weeconfig.c:139
+#: src/common/weeconfig.c:140
msgid "nicklist position (top, left, right (default), bottom)"
msgstr ""
"posición de la ventana de usuarios (arriba (top), izquierda (left), derecha "
"(right, por defecto), abajo (bottom))"
-#: src/common/weeconfig.c:142
+#: src/common/weeconfig.c:143
msgid "min size for nicklist"
msgstr "tamaño mínimo para la ventana de usuarios"
-#: src/common/weeconfig.c:143
+#: src/common/weeconfig.c:144
msgid ""
"min size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no min size))"
@@ -3405,11 +3511,11 @@ msgstr ""
"tamaño mínimo para la ventana de usuarios (ancho o alto, dependiendo de "
"look_nicklist_position (0 = sin tamaño mínimo))"
-#: src/common/weeconfig.c:147
+#: src/common/weeconfig.c:148
msgid "max size for nicklist"
msgstr "tamaño máximo para la ventana de usuarios"
-#: src/common/weeconfig.c:148
+#: src/common/weeconfig.c:149
msgid ""
"max size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no max size; if min == max and > 0, then size is fixed))"
@@ -3418,41 +3524,41 @@ msgstr ""
"look_nicklist_position (0 = sin tamaño máximo, si min == max y > 0, entonces "
"se fija el tamaño))"
-#: src/common/weeconfig.c:152 src/common/weeconfig.c:153
+#: src/common/weeconfig.c:153 src/common/weeconfig.c:154
msgid "text to display instead of nick when not connected"
msgstr "texto a mostrar en lugar del nick cuando no se está conectado"
-#: src/common/weeconfig.c:156 src/common/weeconfig.c:157
+#: src/common/weeconfig.c:157 src/common/weeconfig.c:158
msgid "display nick mode ((half)op/voice) before each nick"
msgstr "mostrar modo del usuario ((half)op/voice) antes de cada usuario"
-#: src/common/weeconfig.c:160 src/common/weeconfig.c:161
+#: src/common/weeconfig.c:161 src/common/weeconfig.c:162
msgid "display space if nick mode is not (half)op/voice"
msgstr "mostrar un espacio si el modo de usuario no es (half)op/voice"
-#: src/common/weeconfig.c:164 src/common/weeconfig.c:165
+#: src/common/weeconfig.c:165 src/common/weeconfig.c:166
msgid "the string inserted after nick completion"
msgstr "la cadena mostrada tras la finalización de los nombres de usuario"
-#: src/common/weeconfig.c:168 src/common/weeconfig.c:169
+#: src/common/weeconfig.c:169 src/common/weeconfig.c:170
msgid "enable info bar"
msgstr "activa la barra de información"
-#: src/common/weeconfig.c:172 src/common/weeconfig.c:173
+#: src/common/weeconfig.c:173 src/common/weeconfig.c:174
msgid "timestamp for time in infobar"
msgstr "fecha y hora para las conversaciones guardadas"
-#: src/common/weeconfig.c:176 src/common/weeconfig.c:177
+#: src/common/weeconfig.c:177 src/common/weeconfig.c:178
msgid "display seconds in infobar time"
msgstr "mostrar segundos en la hora de la barra de herramientas"
-#: src/common/weeconfig.c:180
+#: src/common/weeconfig.c:181
msgid "delay (in seconds) for highlight messages in infobar"
msgstr ""
"retraso (en segundos) para la notificación de mensajes en la barra de "
"información"
-#: src/common/weeconfig.c:181
+#: src/common/weeconfig.c:182
msgid ""
"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
"notifications in infobar)"
@@ -3460,280 +3566,280 @@ msgstr ""
"retraso (en segundos) para la notificación de mensajes en la barra de "
"información (0 = desactivar las notificaciones en la barra de información)"
-#: src/common/weeconfig.c:243 src/common/weeconfig.c:244
+#: src/common/weeconfig.c:244 src/common/weeconfig.c:245
msgid "color for title bar"
msgstr "color para la barra de título"
-#: src/common/weeconfig.c:247 src/common/weeconfig.c:248
+#: src/common/weeconfig.c:248 src/common/weeconfig.c:249
msgid "background for title bar"
msgstr "color de fondo para la barra de título"
-#: src/common/weeconfig.c:253 src/common/weeconfig.c:254
+#: src/common/weeconfig.c:254 src/common/weeconfig.c:255
msgid "color for chat text"
msgstr "color para el texto de conversación"
-#: src/common/weeconfig.c:257
+#: src/common/weeconfig.c:258
msgid "color for time"
msgstr "color para la hora"
-#: src/common/weeconfig.c:258
+#: src/common/weeconfig.c:259
msgid "color for time in chat window"
msgstr "color para la hora en la ventana de conversación"
-#: src/common/weeconfig.c:261
+#: src/common/weeconfig.c:262
msgid "color for time separator"
msgstr "color para el separador de la hora"
-#: src/common/weeconfig.c:262
+#: src/common/weeconfig.c:263
msgid "color for time separator (chat window)"
msgstr "color para el separador de la hora (ventana de conversación)"
-#: src/common/weeconfig.c:265 src/common/weeconfig.c:266
+#: src/common/weeconfig.c:266 src/common/weeconfig.c:267
msgid "color for 1st and 3rd char of prefix"
msgstr "color para el primer o tercer carácter de prefijo"
-#: src/common/weeconfig.c:269 src/common/weeconfig.c:270
+#: src/common/weeconfig.c:270 src/common/weeconfig.c:271
msgid "color for middle char of prefix"
msgstr "color para el carácter de en medio del prefijo"
-#: src/common/weeconfig.c:273 src/common/weeconfig.c:274
+#: src/common/weeconfig.c:274 src/common/weeconfig.c:275
msgid "color for join arrow (prefix)"
msgstr ""
-#: src/common/weeconfig.c:277 src/common/weeconfig.c:278
+#: src/common/weeconfig.c:278 src/common/weeconfig.c:279
msgid "color for part/quit arrow (prefix)"
msgstr ""
-#: src/common/weeconfig.c:281
+#: src/common/weeconfig.c:282
msgid "color for nicks in actions"
msgstr "color para los nombres de usuario en las acciones"
-#: src/common/weeconfig.c:282
+#: src/common/weeconfig.c:283
msgid "color for nicks in actions (chat window)"
msgstr ""
"color para los nombres de usuario en las acciones (ventana de conversación)"
-#: src/common/weeconfig.c:285
+#: src/common/weeconfig.c:286
msgid "color for hostnames"
msgstr "color para los nombres de máquina"
-#: src/common/weeconfig.c:286
+#: src/common/weeconfig.c:287
msgid "color for hostnames (chat window)"
msgstr "color para los nombres de máquina (ventana de conversación)"
-#: src/common/weeconfig.c:289
+#: src/common/weeconfig.c:290
msgid "color for channel names in actions"
msgstr "color para los nombres de canal en las acciones"
-#: src/common/weeconfig.c:290
+#: src/common/weeconfig.c:291
msgid "color for channel names in actions (chat window)"
msgstr ""
"color para los nombres de canal en las acciones (ventana de conversación)"
-#: src/common/weeconfig.c:293
+#: src/common/weeconfig.c:294
msgid "color for dark separators"
msgstr "color para los separadores oscuros"
-#: src/common/weeconfig.c:294
+#: src/common/weeconfig.c:295
msgid "color for dark separators (chat window)"
msgstr "color para los separadores oscuros (ventana de conversación)"
-#: src/common/weeconfig.c:297
+#: src/common/weeconfig.c:298
msgid "color for highlighted nick"
msgstr "color para el alias subrayado"
-#: src/common/weeconfig.c:298
+#: src/common/weeconfig.c:299
msgid "color for highlighted nick (chat window)"
msgstr "color para el alias subrayado (ventana de conversación)"
-#: src/common/weeconfig.c:301
+#: src/common/weeconfig.c:302
msgid "background for chat"
msgstr "color de fondo para la conversación"
-#: src/common/weeconfig.c:302
+#: src/common/weeconfig.c:303
msgid "background for chat window"
msgstr "color de fondo para la ventana de conversación"
-#: src/common/weeconfig.c:307 src/common/weeconfig.c:308
+#: src/common/weeconfig.c:308 src/common/weeconfig.c:309
msgid "color for status bar"
msgstr "color para la barra de estado"
-#: src/common/weeconfig.c:311 src/common/weeconfig.c:312
+#: src/common/weeconfig.c:312 src/common/weeconfig.c:313
msgid "color for status bar delimiters"
msgstr "color para los delimitadores de la barra de estado"
-#: src/common/weeconfig.c:315
+#: src/common/weeconfig.c:316
msgid "color for window with new messages"
msgstr "color para una ventana con mensajes nuevos"
-#: src/common/weeconfig.c:316
+#: src/common/weeconfig.c:317
msgid "color for window with new messages (status bar)"
msgstr "color para una ventana con mensajes nuevos (barra de estado)"
-#: src/common/weeconfig.c:319
+#: src/common/weeconfig.c:320
msgid "color for window with private message"
msgstr ""
-#: src/common/weeconfig.c:320
+#: src/common/weeconfig.c:321
msgid "color for window with private message (status bar)"
msgstr ""
-#: src/common/weeconfig.c:323
+#: src/common/weeconfig.c:324
msgid "color for window with highlight"
msgstr "color para una ventana con resaltado"
-#: src/common/weeconfig.c:324
+#: src/common/weeconfig.c:325
msgid "color for window with highlight (status bar)"
msgstr "color para una ventana con resaltado (barra de estado)"
-#: src/common/weeconfig.c:327
+#: src/common/weeconfig.c:328
msgid "color for window with new data (not messages)"
msgstr "color para una ventana con nuevos datos (no mensajes)"
-#: src/common/weeconfig.c:328
+#: src/common/weeconfig.c:329
msgid "color for window with new data (not messages) (status bar)"
msgstr ""
"color para una ventana con nuevos datos (no mensajes) (barra de estado)"
-#: src/common/weeconfig.c:331
+#: src/common/weeconfig.c:332
msgid "color for \"-MORE-\" text"
msgstr "color para el texto \"-MÁS-\""
-#: src/common/weeconfig.c:332
+#: src/common/weeconfig.c:333
msgid "color for window with new data (status bar)"
msgstr "color para una ventana con nuevos datos (barra de estado)"
-#: src/common/weeconfig.c:335 src/common/weeconfig.c:336
+#: src/common/weeconfig.c:336 src/common/weeconfig.c:337
msgid "background for status window"
msgstr "color de fondo para la ventana de estado"
-#: src/common/weeconfig.c:341 src/common/weeconfig.c:342
+#: src/common/weeconfig.c:342 src/common/weeconfig.c:343
msgid "color for info bar text"
msgstr "color para el texto de la barra de información"
-#: src/common/weeconfig.c:345 src/common/weeconfig.c:346
+#: src/common/weeconfig.c:346 src/common/weeconfig.c:347
msgid "color for infobar delimiters"
msgstr "color para los delimitadores de la barra de información"
-#: src/common/weeconfig.c:349 src/common/weeconfig.c:350
+#: src/common/weeconfig.c:350 src/common/weeconfig.c:351
msgid "color for info bar highlight notification"
msgstr "color para la notificación en la barra de información"
-#: src/common/weeconfig.c:353 src/common/weeconfig.c:354
+#: src/common/weeconfig.c:354 src/common/weeconfig.c:355
msgid "background for info bar window"
msgstr "color de fondo para la ventana de la barra de información"
-#: src/common/weeconfig.c:359 src/common/weeconfig.c:360
+#: src/common/weeconfig.c:360 src/common/weeconfig.c:361
msgid "color for input text"
msgstr "color para el texto de entrada"
-#: src/common/weeconfig.c:363 src/common/weeconfig.c:364
+#: src/common/weeconfig.c:364 src/common/weeconfig.c:365
msgid "color for input text (channel name)"
msgstr "color para el texto de entrada (nombre de canal)"
-#: src/common/weeconfig.c:367 src/common/weeconfig.c:368
+#: src/common/weeconfig.c:368 src/common/weeconfig.c:369
msgid "color for input text (nick name)"
msgstr "color para el texto de entrada (alias)"
-#: src/common/weeconfig.c:371 src/common/weeconfig.c:372
+#: src/common/weeconfig.c:372 src/common/weeconfig.c:373
msgid "background for input window"
msgstr "color de fondo para la ventana de entrada"
-#: src/common/weeconfig.c:377 src/common/weeconfig.c:378
+#: src/common/weeconfig.c:378 src/common/weeconfig.c:379
msgid "color for nicknames"
msgstr "color para los nombres de usuario"
-#: src/common/weeconfig.c:381 src/common/weeconfig.c:382
+#: src/common/weeconfig.c:382 src/common/weeconfig.c:383
msgid "color for away nicknames"
msgstr "color para los usuarios ausentes"
-#: src/common/weeconfig.c:385
+#: src/common/weeconfig.c:386
msgid "color for chan owner symbol"
msgstr "color para el símbolo de propietario de canal"
-#: src/common/weeconfig.c:386
+#: src/common/weeconfig.c:387
msgid "color for chan owner symbol (specific to unrealircd)"
msgstr ""
"color para el símbolo de propietario de canal (especificado en unrealircd)"
-#: src/common/weeconfig.c:389
+#: src/common/weeconfig.c:390
msgid "color for chan admin symbol"
msgstr "color para el símbolo de administrador de canal"
-#: src/common/weeconfig.c:390
+#: src/common/weeconfig.c:391
msgid "color for chan admin symbol (specific to unrealircd)"
msgstr ""
"color para el símbolo de administrador de canal (especificado en unrealircd)"
-#: src/common/weeconfig.c:393 src/common/weeconfig.c:394
+#: src/common/weeconfig.c:394 src/common/weeconfig.c:395
msgid "color for operator symbol"
msgstr "color para el símbolo de operador"
-#: src/common/weeconfig.c:397 src/common/weeconfig.c:398
+#: src/common/weeconfig.c:398 src/common/weeconfig.c:399
msgid "color for half-operator symbol"
msgstr "color para el símbolo de semi-operador"
-#: src/common/weeconfig.c:401 src/common/weeconfig.c:402
+#: src/common/weeconfig.c:402 src/common/weeconfig.c:403
msgid "color for voice symbol"
msgstr "color para el símbolo de voz"
-#: src/common/weeconfig.c:405 src/common/weeconfig.c:406
+#: src/common/weeconfig.c:406 src/common/weeconfig.c:407
msgid "color for '+' when scrolling nicks"
msgstr "color para '+' al desplazar nicks"
-#: src/common/weeconfig.c:409 src/common/weeconfig.c:410
+#: src/common/weeconfig.c:410 src/common/weeconfig.c:411
msgid "color for nick separator"
msgstr "color para el separador de alias"
-#: src/common/weeconfig.c:413 src/common/weeconfig.c:414
+#: src/common/weeconfig.c:414 src/common/weeconfig.c:415
msgid "color for local nick"
msgstr "color para el alias local"
-#: src/common/weeconfig.c:417 src/common/weeconfig.c:418
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
msgid "color for other nick in private window"
msgstr "color para el otro alias en la ventana privada"
-#: src/common/weeconfig.c:421 src/common/weeconfig.c:422
+#: src/common/weeconfig.c:422 src/common/weeconfig.c:423
msgid "background for nicknames"
msgstr "color de fondo para los nombres de usuario"
-#: src/common/weeconfig.c:427
+#: src/common/weeconfig.c:428
msgid "color for selected DCC"
msgstr "color para el DCC seleccionado"
-#: src/common/weeconfig.c:428
+#: src/common/weeconfig.c:429
msgid "color for selected DCC (chat window)"
msgstr "color para el DCC seleccionado (ventana de conversación)"
-#: src/common/weeconfig.c:431 src/common/weeconfig.c:432
+#: src/common/weeconfig.c:432 src/common/weeconfig.c:433
msgid "color for \"waiting\" dcc status"
msgstr "color para el estado dcc \"esperando\""
-#: src/common/weeconfig.c:435 src/common/weeconfig.c:436
+#: src/common/weeconfig.c:436 src/common/weeconfig.c:437
msgid "color for \"connecting\" dcc status"
msgstr "color para el estado dcc \"conectando\""
-#: src/common/weeconfig.c:439 src/common/weeconfig.c:440
+#: src/common/weeconfig.c:440 src/common/weeconfig.c:441
msgid "color for \"active\" dcc status"
msgstr "color para el estado dcc \"activo\""
-#: src/common/weeconfig.c:443 src/common/weeconfig.c:444
+#: src/common/weeconfig.c:444 src/common/weeconfig.c:445
msgid "color for \"done\" dcc status"
msgstr "color para el estado dcc \"terminado\""
-#: src/common/weeconfig.c:447 src/common/weeconfig.c:448
+#: src/common/weeconfig.c:448 src/common/weeconfig.c:449
msgid "color for \"failed\" dcc status"
msgstr "color para el estado dcc \"fallo\""
-#: src/common/weeconfig.c:451 src/common/weeconfig.c:452
+#: src/common/weeconfig.c:452 src/common/weeconfig.c:453
msgid "color for \"aborted\" dcc status"
msgstr "color para el estado dcc \"abortado\""
-#: src/common/weeconfig.c:465
+#: src/common/weeconfig.c:466
msgid "max lines in history (per window)"
msgstr "número máximo de líneas en el histórico (por ventana)"
-#: src/common/weeconfig.c:466
+#: src/common/weeconfig.c:467
msgid ""
"maximum number of lines in history for one server/channel/private window (0 "
"= unlimited)"
@@ -3741,350 +3847,350 @@ msgstr ""
"número máximo de líneas en el histórico para un servidor/canal/privado (0 = "
"ilimitado)"
-#: src/common/weeconfig.c:470
+#: src/common/weeconfig.c:471
msgid "max user commands in history"
msgstr "número máximo de comandos de usuario en el histórico"
-#: src/common/weeconfig.c:471
+#: src/common/weeconfig.c:472
msgid "maximum number of user commands in history (0 = unlimited)"
msgstr "número máximo de comandos de usuario en el histórico (0 = ilimitado)"
-#: src/common/weeconfig.c:488 src/common/weeconfig.c:489
+#: src/common/weeconfig.c:489 src/common/weeconfig.c:490
msgid "automatically log server messages"
msgstr "registrar automáticamente los mensajes de servidor"
-#: src/common/weeconfig.c:492 src/common/weeconfig.c:493
+#: src/common/weeconfig.c:493 src/common/weeconfig.c:494
msgid "automatically log channel chats"
msgstr "registrar automáticamente las conversaciones de canal"
-#: src/common/weeconfig.c:496 src/common/weeconfig.c:497
+#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
msgid "automatically log private chats"
msgstr "registrar automáticamente las conversaciones privadas"
-#: src/common/weeconfig.c:500 src/common/weeconfig.c:501
+#: src/common/weeconfig.c:501 src/common/weeconfig.c:502
msgid "log messages from plugins (scripts)"
msgstr "registrar mensajes de plugins (scripts)"
-#: src/common/weeconfig.c:504
+#: src/common/weeconfig.c:505
msgid "path for log files"
msgstr "ruta para los archivos de registro (logs)"
-#: src/common/weeconfig.c:505
+#: src/common/weeconfig.c:506
msgid "path for WeeChat log files"
msgstr "ruta para los archivos de registro (logs) de WeeChat"
-#: src/common/weeconfig.c:508
+#: src/common/weeconfig.c:509
msgid "timestamp for log"
msgstr "fecha y hora para las conversaciones registradas"
-#: src/common/weeconfig.c:509
+#: src/common/weeconfig.c:510
msgid "timestamp for log (see man strftime for date/time specifiers)"
msgstr ""
"fecha y hora para los registros (ver man strftime para el formato de fecha/"
"hora)"
-#: src/common/weeconfig.c:512 src/common/weeconfig.c:513
+#: src/common/weeconfig.c:513 src/common/weeconfig.c:514
msgid "hide password displayed by nickserv"
msgstr "ocultar contraseña mostrada por nickserv"
-#: src/common/weeconfig.c:533
+#: src/common/weeconfig.c:534
msgid "display message to all channels when away"
msgstr "mostrar mensaje en todos los canales cuando se está ausente"
-#: src/common/weeconfig.c:534
+#: src/common/weeconfig.c:535
msgid "display message to all channels when (un)marking as away"
msgstr ""
"mostrar mensaje en todos los canales cuando se vuelva del estado ausente"
-#: src/common/weeconfig.c:537 src/common/weeconfig.c:538
+#: src/common/weeconfig.c:538 src/common/weeconfig.c:539
msgid "default message when away"
msgstr "mensaje por defecto para el estado ausente"
-#: src/common/weeconfig.c:541 src/common/weeconfig.c:542
+#: src/common/weeconfig.c:542 src/common/weeconfig.c:543
msgid "default part message (leaving channel)"
msgstr "mensaje por defecto de salida (saliendo de un canal)"
-#: src/common/weeconfig.c:545
+#: src/common/weeconfig.c:546
msgid "default quit message"
msgstr "mensaje de fin por defecto"
-#: src/common/weeconfig.c:546
+#: src/common/weeconfig.c:547
msgid ""
"default quit message ('%v' will be replaced by WeeChat version in string)"
msgstr ""
"mensaje de fin por defecto ('%v' será reemplazado por la versión de WeeChat "
"en la cadena)"
-#: src/common/weeconfig.c:549
+#: src/common/weeconfig.c:550
msgid "interval between two checks for away"
msgstr "intervalo entre dos comprobaciones de ausencia"
-#: src/common/weeconfig.c:550
+#: src/common/weeconfig.c:551
msgid "interval between two checks for away (in minutes, 0 = never check)"
msgstr ""
"intervalo entre dos comprobaciones de ausencia (en minutos, 0 = no comprobar)"
-#: src/common/weeconfig.c:553
+#: src/common/weeconfig.c:554
msgid "interval between two checks for lag"
msgstr "intervalo entre dos medidas de lag (retraso)"
-#: src/common/weeconfig.c:554
+#: src/common/weeconfig.c:555
msgid "interval between two checks for lag (in seconds)"
msgstr "intervalo entre dos medidas de lag (en segundos)"
-#: src/common/weeconfig.c:557
+#: src/common/weeconfig.c:558
msgid "minimum lag to show"
msgstr "lag (retraso) mínimo a mostrar"
-#: src/common/weeconfig.c:558
+#: src/common/weeconfig.c:559
msgid "minimum lag to show (in seconds)"
msgstr "lag mínimo a mostrar (en segundos)"
-#: src/common/weeconfig.c:561
+#: src/common/weeconfig.c:562
msgid "disconnect after important lag"
msgstr "desconexión tras un lag importante"
-#: src/common/weeconfig.c:562
+#: src/common/weeconfig.c:563
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
msgstr ""
"desconexión tras un lag importante (en minutos, 0 = no desconectar nunca)"
-#: src/common/weeconfig.c:565 src/common/weeconfig.c:566
+#: src/common/weeconfig.c:566 src/common/weeconfig.c:567
msgid "create a FIFO pipe for remote control"
msgstr "crea una tubería FIFO para control remoto"
-#: src/common/weeconfig.c:569
+#: src/common/weeconfig.c:570
msgid "list of words to highlight"
msgstr ""
-#: src/common/weeconfig.c:570
+#: src/common/weeconfig.c:571
msgid ""
"comma separated list of words to highlight (case insensitive comparison)"
msgstr ""
-#: src/common/weeconfig.c:589
+#: src/common/weeconfig.c:590
msgid "automatically accept dcc files"
msgstr "aceptar automáticamente los ficheros dcc"
-#: src/common/weeconfig.c:590
+#: src/common/weeconfig.c:591
msgid "automatically accept incoming dcc files"
msgstr "aceptar automáticamente los ficheros dcc entrantes"
-#: src/common/weeconfig.c:593
+#: src/common/weeconfig.c:594
msgid "automatically accept dcc chats"
msgstr "aceptar automáticamente las peticiones de conversación dcc"
-#: src/common/weeconfig.c:594
+#: src/common/weeconfig.c:595
msgid "automatically accept dcc chats (use carefully!)"
msgstr ""
"aceptar automáticamente las peticiones de conversación dcc (¡utilizar con "
"precaución!)"
-#: src/common/weeconfig.c:597
+#: src/common/weeconfig.c:598
msgid "timeout for dcc request"
msgstr "tiempo de espera (timeout) para la petición dcc"
-#: src/common/weeconfig.c:598
+#: src/common/weeconfig.c:599
msgid "timeout for dcc request (in seconds)"
msgstr "tiempo de espera para la petición dcc (en segundos)"
-#: src/common/weeconfig.c:601
+#: src/common/weeconfig.c:602
msgid "block size for dcc packets"
msgstr "tamaño de bloque para los paquetes dcc"
-#: src/common/weeconfig.c:602
+#: src/common/weeconfig.c:603
msgid "block size for dcc packets in bytes (default: 65536)"
msgstr "tamaño de bloque para los paquetes dcc en bytes (por defecto: 65536)"
-#: src/common/weeconfig.c:605
+#: src/common/weeconfig.c:606
msgid "path for incoming files with dcc"
msgstr "ruta para los ficheros recibidos con dcc"
-#: src/common/weeconfig.c:606
+#: src/common/weeconfig.c:607
msgid "path for writing incoming files with dcc (default: user home)"
msgstr ""
"ruta para los ficheros recibidos con dcc (por defecto: directorio home del "
"usuario)"
-#: src/common/weeconfig.c:609
+#: src/common/weeconfig.c:610
msgid "default path for sending files with dcc"
msgstr "ruta por defecto para enviar ficheros con dcc"
-#: src/common/weeconfig.c:610
+#: src/common/weeconfig.c:611
msgid ""
"path for reading files when sending thru dcc (when no path is specified)"
msgstr ""
"ruta para la lectura de ficheros cuando se envían a través de dcc (cuando no "
"se especifica una ruta)"
-#: src/common/weeconfig.c:613 src/common/weeconfig.c:614
+#: src/common/weeconfig.c:614 src/common/weeconfig.c:615
msgid "convert spaces to underscores when sending files"
msgstr "convertir los espacios a subrayados cuando se envían los ficheros"
-#: src/common/weeconfig.c:617
+#: src/common/weeconfig.c:618
msgid "automatically rename dcc files if already exists"
msgstr "renombrar automáticamente los ficheros dcc si ya existen"
-#: src/common/weeconfig.c:618
+#: src/common/weeconfig.c:619
msgid "rename incoming files if already exists (add '.1', '.2', ...)"
msgstr ""
"renombrar los ficheros recibidos si ya existen (añadir '.1', '.2', ...)"
-#: src/common/weeconfig.c:621
+#: src/common/weeconfig.c:622
msgid "automatically resume aborted transfers"
msgstr "continuar automáticamente las transferencias canceladas"
-#: src/common/weeconfig.c:622
+#: src/common/weeconfig.c:623
msgid ""
"automatically resume dcc transfer if connection with remote host is loosed"
msgstr ""
"continuar automáticamente la transferencia dcc si se ha perdido la conexión "
"con la máquina remota"
-#: src/common/weeconfig.c:641
+#: src/common/weeconfig.c:642
msgid "use proxy"
msgstr "utilizar un proxy"
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:643
msgid "use a proxy server to connect to irc server"
msgstr "utilizar un proxy para conectarse al servidor irc"
-#: src/common/weeconfig.c:645
+#: src/common/weeconfig.c:646
msgid "proxy type"
msgstr "tipo de proxy"
-#: src/common/weeconfig.c:646
+#: src/common/weeconfig.c:647
msgid "proxy type (http (default), socks4, socks5)"
msgstr "tipo de proxy(http (por defecto), socks4, socks5)"
-#: src/common/weeconfig.c:649
+#: src/common/weeconfig.c:650
msgid "use ipv6 proxy"
msgstr "usar proxy ipv6"
-#: src/common/weeconfig.c:650
+#: src/common/weeconfig.c:651
msgid "connect to proxy in ipv6"
msgstr "conectar al proxy en ipv6"
-#: src/common/weeconfig.c:653
+#: src/common/weeconfig.c:654
msgid "proxy address"
msgstr "dirección del proxy"
-#: src/common/weeconfig.c:654
+#: src/common/weeconfig.c:655
msgid "proxy server address (IP or hostname)"
msgstr "dirección del servidor proxy (IP o nombre de máquina)"
-#: src/common/weeconfig.c:657
+#: src/common/weeconfig.c:658
msgid "port for proxy"
msgstr "puerto para el proxy"
-#: src/common/weeconfig.c:658
+#: src/common/weeconfig.c:659
msgid "port for connecting to proxy server"
msgstr "puerto para conectarse al servidor proxy"
-#: src/common/weeconfig.c:661
+#: src/common/weeconfig.c:662
msgid "proxy username"
msgstr "nombre de usuario del proxy"
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:663
msgid "username for proxy server"
msgstr "nombre de usuario para el servidor proxy"
-#: src/common/weeconfig.c:665
+#: src/common/weeconfig.c:666
msgid "proxy password"
msgstr "contraseña para el proxy"
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:667
msgid "password for proxy server"
msgstr "contraseña para el servidor proxy"
-#: src/common/weeconfig.c:677
+#: src/common/weeconfig.c:678
msgid "server name"
msgstr "nombre de servidor"
-#: src/common/weeconfig.c:678
+#: src/common/weeconfig.c:679
msgid "name associated to IRC server (for display only)"
msgstr "nombre asociado al servidor IRC (para mostrar solamente)"
-#: src/common/weeconfig.c:681
+#: src/common/weeconfig.c:682
msgid "automatically connect to server"
msgstr "conexión automática al servidor"
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:683
msgid "automatically connect to server when WeeChat is starting"
msgstr "conexión automática al servidor cuando WeeChat esté arrancando"
-#: src/common/weeconfig.c:685
+#: src/common/weeconfig.c:686
msgid "automatically reconnect to server"
msgstr "reconexión automática al servidor"
-#: src/common/weeconfig.c:686
+#: src/common/weeconfig.c:687
msgid "automatically reconnect to server when disconnected"
msgstr "reconexión automática al servidor tras una desconexión"
-#: src/common/weeconfig.c:689
+#: src/common/weeconfig.c:690
msgid "delay before trying again to reconnect"
msgstr "esperar antes de intentar de nuevo una reconexión"
-#: src/common/weeconfig.c:690
+#: src/common/weeconfig.c:691
msgid "delay (in seconds) before trying again to reconnect to server"
msgstr ""
"espera (en segundos) antes de intentar de nuevo una reconexión al servidor"
-#: src/common/weeconfig.c:693
+#: src/common/weeconfig.c:694
msgid "server address or hostname"
msgstr "dirección o nombre de máquina del servidor"
-#: src/common/weeconfig.c:694
+#: src/common/weeconfig.c:695
msgid "IP address or hostname of IRC server"
msgstr "dirección IP o nombre de máquina del servidor IRC"
-#: src/common/weeconfig.c:697
+#: src/common/weeconfig.c:698
msgid "port for IRC server"
msgstr "puerto para el servidor IRC"
-#: src/common/weeconfig.c:698
+#: src/common/weeconfig.c:699
msgid "port for connecting to server"
msgstr "puerto para conectarse al servidor"
-#: src/common/weeconfig.c:701 src/common/weeconfig.c:702
+#: src/common/weeconfig.c:702 src/common/weeconfig.c:703
msgid "use IPv6 protocol for server communication"
msgstr "usar el protocolo IPv6 para la comunicación del servidor"
-#: src/common/weeconfig.c:705 src/common/weeconfig.c:706
+#: src/common/weeconfig.c:706 src/common/weeconfig.c:707
msgid "use SSL for server communication"
msgstr "usar SSL para la comunicación del servidor"
-#: src/common/weeconfig.c:709
+#: src/common/weeconfig.c:710
msgid "server password"
msgstr "contraseña para el servidor"
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:711
msgid "password for IRC server"
msgstr "contraseña para el servidor IRC"
-#: src/common/weeconfig.c:713
+#: src/common/weeconfig.c:714
msgid "nickname for server"
msgstr "nombre de usuario para el servidor"
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:715
msgid "nickname to use on IRC server"
msgstr "nombre de usuario a utilizar en el servidor IRC"
-#: src/common/weeconfig.c:717
+#: src/common/weeconfig.c:718
msgid "alternate nickname for server"
msgstr "nombre de usuario alternativo para el servidor"
-#: src/common/weeconfig.c:718
+#: src/common/weeconfig.c:719
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr ""
"nombre de usuario alternativo para el servidor IRC (si el nombre de usuario "
"ya está en uso)"
-#: src/common/weeconfig.c:721
+#: src/common/weeconfig.c:722
msgid "2nd alternate nickname for server"
msgstr "segundo nombre de usuario alternativo para el servidor"
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:723
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
@@ -4092,31 +4198,31 @@ msgstr ""
"segundo nombre de usuario alternativo a utilizar en el servidor IRC (si el "
"nombre de usuario alternativo ya está en uso)"
-#: src/common/weeconfig.c:725
+#: src/common/weeconfig.c:726
msgid "user name for server"
msgstr "nombre de usuario para el servidor"
-#: src/common/weeconfig.c:726
+#: src/common/weeconfig.c:727
msgid "user name to use on IRC server"
msgstr "nombre de usuario para el servidor IRC"
-#: src/common/weeconfig.c:729
+#: src/common/weeconfig.c:730
msgid "real name for server"
msgstr "nombre real para el servidor"
-#: src/common/weeconfig.c:730
+#: src/common/weeconfig.c:731
msgid "real name to use on IRC server"
msgstr "nombre real para el servidor IRC"
-#: src/common/weeconfig.c:733 src/common/weeconfig.c:734
+#: src/common/weeconfig.c:734 src/common/weeconfig.c:735
msgid "first command to run when connected to server"
msgstr "primer comando a ejecutar cuando se conecte a un servidor"
-#: src/common/weeconfig.c:737
+#: src/common/weeconfig.c:738
msgid "delay (in seconds) after command was executed"
msgstr "espera (en segundos) después de que el comando sea ejecutado"
-#: src/common/weeconfig.c:738
+#: src/common/weeconfig.c:739
msgid ""
"delay (in seconds) after command was executed (example: give some time for "
"authentication)"
@@ -4124,11 +4230,11 @@ msgstr ""
"espera (en segundos) después de que el comando sea ejecutado (ejemplo: dar "
"algo de tiempo para la autenticación)"
-#: src/common/weeconfig.c:741
+#: src/common/weeconfig.c:742
msgid "list of channels to join when connected to server"
msgstr "lista de canales a unirse cuando se conecte a un servidor"
-#: src/common/weeconfig.c:742
+#: src/common/weeconfig.c:743
msgid ""
"comma separated list of channels to join when connected to server (example: "
"\"#chan1,#chan2,#chan3 #key1,#key2\")"
@@ -4136,15 +4242,15 @@ msgstr ""
"lista de canales (separados por comas) a unirse cuando se conecte a un "
"servidor (ejemplo: \"#chan1,#chan2,#chan3 #key1,#key2\")"
-#: src/common/weeconfig.c:745 src/common/weeconfig.c:746
+#: src/common/weeconfig.c:746 src/common/weeconfig.c:747
msgid "automatically rejoin channels when kicked"
msgstr "unirse de nuevo automáticamente a los canales cuando sea expulsado"
-#: src/common/weeconfig.c:749
+#: src/common/weeconfig.c:750
msgid "notify levels for channels of this server"
msgstr "niveles de notificación para canales de este servidor"
-#: src/common/weeconfig.c:750
+#: src/common/weeconfig.c:751
msgid ""
"comma separated list of notify levels for channels of this server (format: "
"#channel:1,..)"
@@ -4152,62 +4258,67 @@ msgstr ""
"lista separada por comas de niveles de notificación para canales de este "
"servidor (formato: #canal:1,...)"
-#: src/common/weeconfig.c:1210
+#: src/common/weeconfig.c:1211
#, c-format
msgid "%s %s, line %d: new server, but previous was incomplete\n"
msgstr "%s %s, línea %d: nuevo servidor, pero el anterior estaba incompleto\n"
-#: src/common/weeconfig.c:1219
+#: src/common/weeconfig.c:1220
#, c-format
msgid "%s %s, line %d: server '%s' already exists\n"
msgstr "%s %s, línea %d: el servidor '%s' ya existe\n"
-#: src/common/weeconfig.c:1234
+#: src/common/weeconfig.c:1235
#, c-format
msgid "%s %s, line %d: unable to create server\n"
msgstr "%s %s, línea %d: no es posible crear el servidor\n"
-#: src/common/weeconfig.c:1274
+#: src/common/weeconfig.c:1275
#, c-format
msgid "%s unable to assign default int with string (\"%s\")\n"
msgstr "%s no es posible asignar el valor entero con la cadena (\"%s\")\n"
-#: src/common/weeconfig.c:1285
+#: src/common/weeconfig.c:1286
#, c-format
msgid "%s unable to assign default color (\"%s\")\n"
msgstr "%s no es posible asignar el color por defecto (\"%s\")\n"
-#: src/common/weeconfig.c:1324
+#: src/common/weeconfig.c:1325
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr "%s fichero de configuración \"%s\" no encontrado.\n"
-#: src/common/weeconfig.c:1356
+#: src/common/weeconfig.c:1357
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
msgstr "%s %s, línea %d: sintaxis inválida, falta \"]\"\n"
-#: src/common/weeconfig.c:1373
+#: src/common/weeconfig.c:1374
#, c-format
msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
msgstr "%s %s, línea %d: identificador de sección desconocido (\"%s\")\n"
-#: src/common/weeconfig.c:1391
+#: src/common/weeconfig.c:1392
#, c-format
msgid "%s %s, line %d: invalid section for option, line is ignored\n"
msgstr "%s %s, línea %d: sección inválida para la opción, línea ignorada\n"
-#: src/common/weeconfig.c:1399
+#: src/common/weeconfig.c:1400
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
msgstr "%s %s, línea %d: sintaxis inválida, falta \"=\"\n"
-#: src/common/weeconfig.c:1447
+#: src/common/weeconfig.c:1437 src/common/weeconfig.c:1463
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr "%s %s, línea %d: opción \"%s\" inválida\n"
-#: src/common/weeconfig.c:1458
+#: src/common/weeconfig.c:1443
+#, c-format
+msgid "%s %s, line %d: invalid ignore options \"%s\"\n"
+msgstr ""
+
+#: src/common/weeconfig.c:1474
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
@@ -4216,7 +4327,7 @@ msgstr ""
"%s %s, línea %d: valor inválido para la opción '%s'\n"
"Esperado: valor booleano: 'off' u 'on'\n"
-#: src/common/weeconfig.c:1467
+#: src/common/weeconfig.c:1483
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -4225,7 +4336,7 @@ msgstr ""
"%s %s, línea %d: valor inválido para la opción %s'\n"
"Esperado: entero comprendido entre %d y %d\n"
-#: src/common/weeconfig.c:1478
+#: src/common/weeconfig.c:1494
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -4234,26 +4345,26 @@ msgstr ""
"%s %s, línea %d: valor inválido para la opción '%s'\n"
"Esperado: una de estas cadenas: "
-#: src/common/weeconfig.c:1494
+#: src/common/weeconfig.c:1510
#, c-format
msgid "%s %s, line %d: invalid color name for option '%s'\n"
msgstr "%s %s, línea %d: nombre de color inválido para la opción '%s'\n"
-#: src/common/weeconfig.c:1556 src/common/weeconfig.c:1751
+#: src/common/weeconfig.c:1572 src/common/weeconfig.c:1767
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr "%s no es posible crear el fichero \"%s\"\n"
-#: src/common/weeconfig.c:1562
+#: src/common/weeconfig.c:1578
#, c-format
msgid "%s: creating default config file...\n"
msgstr "%s: creando fichero de configuración por defecto...\n"
-#: src/common/weeconfig.c:1563
+#: src/common/weeconfig.c:1579
msgid "Creating default config file\n"
msgstr "Creando fichero de configuración por defecto\n"
-#: src/common/weeconfig.c:1566 src/common/weeconfig.c:1760
+#: src/common/weeconfig.c:1582 src/common/weeconfig.c:1776
#, c-format
msgid ""
"#\n"
@@ -4262,6 +4373,12 @@ msgstr ""
"#\n"
"# %s: fichero de configuración, creado por %s v%s el %s#\n"
-#: src/common/weeconfig.c:1757
+#: src/common/weeconfig.c:1773
msgid "Saving config to disk\n"
msgstr "Guardar configuración a disco\n"
+
+#~ msgid "IRC command"
+#~ msgstr "comandos IRC"
+
+#~ msgid "channel"
+#~ msgstr "canal"
diff --git a/weechat/po/fr.po b/weechat/po/fr.po
index 2bd279e77..d4d86eb7c 100644
--- a/weechat/po/fr.po
+++ b/weechat/po/fr.po
@@ -7,20 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.5-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-08-21 14:31+0200\n"
-"PO-Revision-Date: 2005-09-03 13:24+0200\n"
+"POT-Creation-Date: 2005-09-04 14:45+0200\n"
+"PO-Revision-Date: 2005-09-04 14:46+0200\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-nick.c:193
+#: src/irc/irc-nick.c:192
#, c-format
msgid "%s cannot allocate new nick\n"
msgstr "%s impossible d'allouer un nouveau pseudo\n"
-#: src/irc/irc-server.c:180 src/common/weeconfig.c:1697
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1712
msgid "Unable to get user's name"
msgstr "Impossible de déterminer le nom d'utilisateur"
@@ -110,7 +110,7 @@ msgstr ""
"%s le proxy n'a pas pu se connecter au serveur (vérifiez l'utilisateur/mot "
"de passe si utilisés)\n"
-#: src/irc/irc-server.c:1360
+#: src/irc/irc-server.c:1364
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -118,57 +118,57 @@ msgstr ""
"%s impossible de se connecter en SSL car WeeChat n'a pas été construit avec "
"le support GNUtls\n"
-#: src/irc/irc-server.c:1369
+#: src/irc/irc-server.c:1373
#, c-format
msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr "%s: connexion au serveur %s:%d%s%s via le proxy %s %s:%d%s...\n"
-#: src/irc/irc-server.c:1375
+#: src/irc/irc-server.c:1379
#, c-format
msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr "Connexion au serveur %s:%d%s%s via le proxy %s %s:%d%s...\n"
-#: src/irc/irc-server.c:1385
+#: src/irc/irc-server.c:1389
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr "%s: connexion au serveur %s:%d%s%s...\n"
-#: src/irc/irc-server.c:1389
+#: src/irc/irc-server.c:1393
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr "Connexion au serveur %s:%d%s%s...\n"
-#: src/irc/irc-server.c:1407
+#: src/irc/irc-server.c:1411
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s erreur d'initialisation gnutls\n"
-#: src/irc/irc-server.c:1422
+#: src/irc/irc-server.c:1426
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s impossible de créer le pipe\n"
-#: src/irc/irc-server.c:1437
+#: src/irc/irc-server.c:1441
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s impossible de créer la socket\n"
-#: src/irc/irc-server.c:1448
+#: src/irc/irc-server.c:1452
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr "%s impossible de paramétrer l'option socket \"SO_REUSEADDR\"\n"
-#: src/irc/irc-server.c:1459
+#: src/irc/irc-server.c:1463
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr "%s impossible de paramétrer l'option socket \"SO_KEEPALIVE\"\n"
-#: src/irc/irc-server.c:1490
+#: src/irc/irc-server.c:1494
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Reconnexion au serveur...\n"
-#: src/irc/irc-server.c:1540 src/irc/irc-server.c:1549
+#: src/irc/irc-server.c:1544 src/irc/irc-server.c:1553
msgid "Disconnected from server!\n"
msgstr "Déconnecté du serveur !\n"
@@ -958,102 +958,103 @@ msgstr ""
#: src/irc/irc-commands.c:317 src/irc/irc-commands.c:318
#: src/irc/irc-commands.c:319 src/irc/irc-commands.c:320
#: src/irc/irc-commands.c:321 src/irc/irc-commands.c:322
-#: src/irc/irc-commands.c:323 src/irc/irc-commands.c:367
+#: src/irc/irc-commands.c:323 src/irc/irc-commands.c:324
#: src/irc/irc-commands.c:368 src/irc/irc-commands.c:369
#: src/irc/irc-commands.c:370 src/irc/irc-commands.c:371
-#: src/irc/irc-commands.c:372
+#: src/irc/irc-commands.c:372 src/irc/irc-commands.c:373
+#: src/irc/irc-commands.c:473
msgid "a server message"
msgstr "un message du serveur"
-#: src/irc/irc-commands.c:324
+#: src/irc/irc-commands.c:325
msgid "away message"
msgstr "message d'absence"
-#: src/irc/irc-commands.c:325
+#: src/irc/irc-commands.c:326
msgid "userhost"
msgstr "nom de machine utilisateur"
-#: src/irc/irc-commands.c:326
+#: src/irc/irc-commands.c:327
msgid "ison"
msgstr "est présent"
-#: src/irc/irc-commands.c:327
+#: src/irc/irc-commands.c:328
msgid "unaway"
msgstr "non absent"
-#: src/irc/irc-commands.c:328
+#: src/irc/irc-commands.c:329
msgid "now away"
msgstr "maintenant absent"
-#: src/irc/irc-commands.c:329
+#: src/irc/irc-commands.c:330
msgid "whois (registered nick)"
msgstr "qui est (pseudo enregistré)"
-#: src/irc/irc-commands.c:330
+#: src/irc/irc-commands.c:331
msgid "whois (user)"
msgstr "qui est (utilisateur)"
-#: src/irc/irc-commands.c:331
+#: src/irc/irc-commands.c:332
msgid "whois (server)"
msgstr "qui est (serveur)"
-#: src/irc/irc-commands.c:332
+#: src/irc/irc-commands.c:333
msgid "whois (operator)"
msgstr "qui est (opérateur)"
-#: src/irc/irc-commands.c:333
+#: src/irc/irc-commands.c:334
msgid "whowas"
msgstr "qui était-ce"
-#: src/irc/irc-commands.c:334
+#: src/irc/irc-commands.c:335
msgid "end of /who list"
msgstr "fin de /who list"
-#: src/irc/irc-commands.c:335
+#: src/irc/irc-commands.c:336
msgid "whois (idle)"
msgstr "qui est (inactif)"
-#: src/irc/irc-commands.c:336
+#: src/irc/irc-commands.c:337
msgid "whois (end)"
msgstr "qui est (fin)"
-#: src/irc/irc-commands.c:337
+#: src/irc/irc-commands.c:338
msgid "whois (channels)"
msgstr "qui est (canaux)"
-#: src/irc/irc-commands.c:338
+#: src/irc/irc-commands.c:339
msgid "whois (identified user)"
msgstr "qui est (utilisateur identifié)"
-#: src/irc/irc-commands.c:339
+#: src/irc/irc-commands.c:340
msgid "/list start"
msgstr "/list début"
-#: src/irc/irc-commands.c:340
+#: src/irc/irc-commands.c:341
msgid "channel (for /list)"
msgstr "canal (pour /list)"
-#: src/irc/irc-commands.c:341
+#: src/irc/irc-commands.c:342
msgid "/list end"
msgstr "/list fin"
-#: src/irc/irc-commands.c:342
+#: src/irc/irc-commands.c:343
msgid "channel mode"
msgstr "mode du canal"
-#: src/irc/irc-commands.c:344
+#: src/irc/irc-commands.c:345
msgid "no topic for channel"
msgstr "pas de titre pour le canal"
-#: src/irc/irc-commands.c:345
+#: src/irc/irc-commands.c:346
msgid "topic of channel"
msgstr "titre du canal"
-#: src/irc/irc-commands.c:346
+#: src/irc/irc-commands.c:347
msgid "channel :topic"
msgstr "canal :titre"
-#: src/irc/irc-commands.c:347
+#: src/irc/irc-commands.c:348
msgid ""
"channel: name of channel\n"
"topic: topic of the channel"
@@ -1061,31 +1062,31 @@ msgstr ""
"canal: nom du canal\n"
"titre: titre du canal"
-#: src/irc/irc-commands.c:350
+#: src/irc/irc-commands.c:351
msgid "infos about topic (nick & date changed)"
msgstr "infos sur le titre (utilisateur et date de changement)"
-#: src/irc/irc-commands.c:353
+#: src/irc/irc-commands.c:354
msgid "inviting"
msgstr "invitation"
-#: src/irc/irc-commands.c:354
+#: src/irc/irc-commands.c:355
msgid "server version"
msgstr "version du serveur"
-#: src/irc/irc-commands.c:355
+#: src/irc/irc-commands.c:356
msgid "who"
msgstr "qui"
-#: src/irc/irc-commands.c:356
+#: src/irc/irc-commands.c:357
msgid "list of nicks on channel"
msgstr "liste des utilisateurs sur un canal"
-#: src/irc/irc-commands.c:357
+#: src/irc/irc-commands.c:358
msgid "channel :[[@|+]nick ...]"
msgstr "canal :[[@|+]pseudo ...]"
-#: src/irc/irc-commands.c:358
+#: src/irc/irc-commands.c:359
msgid ""
"channel: name of channel\n"
"nick: nick on the channel"
@@ -1093,224 +1094,223 @@ msgstr ""
"canal: nom du canal\n"
"pseudo: utilisateur sur le canal"
-#: src/irc/irc-commands.c:361
+#: src/irc/irc-commands.c:362
msgid "links"
msgstr "liens"
-#: src/irc/irc-commands.c:362
+#: src/irc/irc-commands.c:363
msgid "end of /links list"
msgstr "fin de /links list"
-#: src/irc/irc-commands.c:363
+#: src/irc/irc-commands.c:364
msgid "end of /names list"
msgstr "fin de la liste /names"
-#: src/irc/irc-commands.c:364
+#: src/irc/irc-commands.c:365
msgid "banlist"
msgstr "liste de bannissement"
-#: src/irc/irc-commands.c:365
+#: src/irc/irc-commands.c:366
msgid "end of banlist"
msgstr "fin de la liste de bannissement"
-#: src/irc/irc-commands.c:366
+#: src/irc/irc-commands.c:367
msgid "end of /whowas list"
msgstr "fin de /whowas list"
-#: src/irc/irc-commands.c:373
+#: src/irc/irc-commands.c:374
msgid "server local time"
msgstr "heure locale du serveur"
-#: src/irc/irc-commands.c:374
+#: src/irc/irc-commands.c:375
msgid "no such nick/channel"
msgstr "pas de tel utilisateur/canal"
-#: src/irc/irc-commands.c:376
+#: src/irc/irc-commands.c:377
msgid "no such server"
msgstr "pas de tel serveur"
-#: src/irc/irc-commands.c:378
+#: src/irc/irc-commands.c:379
msgid "no such channel"
msgstr "pas de tel canal"
-#: src/irc/irc-commands.c:380
+#: src/irc/irc-commands.c:381
msgid "cannot send to channel"
msgstr "impossible d'envoyer au canal"
-#: src/irc/irc-commands.c:382
+#: src/irc/irc-commands.c:383
msgid "too many channels"
msgstr "trop de canaux"
-#: src/irc/irc-commands.c:384 src/irc/irc-commands.c:386
-#: src/irc/irc-commands.c:388
+#: src/irc/irc-commands.c:385 src/irc/irc-commands.c:387
msgid "was no such nick"
msgstr "n'y avait pas de tel utilisateur"
-#: src/irc/irc-commands.c:390
+#: src/irc/irc-commands.c:389
msgid "no origin"
msgstr "pas d'origine"
-#: src/irc/irc-commands.c:392
+#: src/irc/irc-commands.c:391
msgid "no services"
msgstr "pas de service"
-#: src/irc/irc-commands.c:394
+#: src/irc/irc-commands.c:393
msgid "no recipient"
msgstr "pas de destinataire"
-#: src/irc/irc-commands.c:396
+#: src/irc/irc-commands.c:395
msgid "no text to send"
msgstr "pas de texte à envoyer"
-#: src/irc/irc-commands.c:398
+#: src/irc/irc-commands.c:397
msgid "no toplevel"
msgstr "pas de niveau supérieur"
-#: src/irc/irc-commands.c:400
+#: src/irc/irc-commands.c:399
msgid "wilcard in toplevel domain"
msgstr "caractère joker dans le domaine de niveau supérieur"
-#: src/irc/irc-commands.c:402
+#: src/irc/irc-commands.c:401
msgid "unknown command"
msgstr "commande inconnue"
-#: src/irc/irc-commands.c:404
+#: src/irc/irc-commands.c:403
msgid "MOTD is missing"
msgstr "MOTD est manquant"
-#: src/irc/irc-commands.c:406
+#: src/irc/irc-commands.c:405
msgid "no administrative info"
msgstr "pas d'information administrative"
-#: src/irc/irc-commands.c:408
+#: src/irc/irc-commands.c:407
msgid "file error"
msgstr "erreur de fichier"
-#: src/irc/irc-commands.c:410
+#: src/irc/irc-commands.c:409
msgid "no nickname given"
msgstr "pas d'utilisateur donné"
-#: src/irc/irc-commands.c:412
+#: src/irc/irc-commands.c:411
msgid "erroneous nickname"
msgstr "nom d'utilisateur erroné"
-#: src/irc/irc-commands.c:414
+#: src/irc/irc-commands.c:413
msgid "nickname already in use"
msgstr "nom d'utilisateur déjà en cours d'utilisation"
-#: src/irc/irc-commands.c:416
+#: src/irc/irc-commands.c:415
msgid "nickname collision"
msgstr "collision sur le nom d'utilisateur"
-#: src/irc/irc-commands.c:418
+#: src/irc/irc-commands.c:417
msgid "not authorized to change nickname"
msgstr "non autorisé à changer de pseudo"
-#: src/irc/irc-commands.c:420
+#: src/irc/irc-commands.c:419
msgid "user not in channel"
msgstr "utilisateur non présent dans le canal"
-#: src/irc/irc-commands.c:422
+#: src/irc/irc-commands.c:421
msgid "not on channel"
msgstr "non présent sur le canal"
-#: src/irc/irc-commands.c:424
+#: src/irc/irc-commands.c:423
msgid "user already on channel"
msgstr "utilisateur déjà sur le canal"
-#: src/irc/irc-commands.c:426
+#: src/irc/irc-commands.c:425
msgid "user not logged in"
msgstr "utilisateur non enregistré"
-#: src/irc/irc-commands.c:428
+#: src/irc/irc-commands.c:427
msgid "summon has been disabled"
msgstr "summon a été désactivé"
-#: src/irc/irc-commands.c:430
+#: src/irc/irc-commands.c:429
msgid "users has been disabled"
msgstr "users a été désactivé"
-#: src/irc/irc-commands.c:432
+#: src/irc/irc-commands.c:431
msgid "you are not registered"
msgstr "vous n'êtes pas enregistré"
-#: src/irc/irc-commands.c:434
+#: src/irc/irc-commands.c:433
msgid "not enough parameters"
msgstr "pas assez de paramètres"
-#: src/irc/irc-commands.c:436
+#: src/irc/irc-commands.c:435
msgid "you may not register"
msgstr "vous ne pouvez pas vous enregistrer"
-#: src/irc/irc-commands.c:438
+#: src/irc/irc-commands.c:437
msgid "your host isn't among the privileged"
msgstr "votre nom de machine n'est pas parmi les privilégiés"
-#: src/irc/irc-commands.c:440
+#: src/irc/irc-commands.c:439
msgid "password incorrect"
msgstr "mot de passe incorrect"
-#: src/irc/irc-commands.c:442
+#: src/irc/irc-commands.c:441
msgid "you are banned from this server"
msgstr "vous êtes banni de ce serveur"
-#: src/irc/irc-commands.c:444
+#: src/irc/irc-commands.c:443
msgid "channel key already set"
msgstr "clé du canal déjà définie"
-#: src/irc/irc-commands.c:446
+#: src/irc/irc-commands.c:445
msgid "channel is already full"
msgstr "le canal est déjà plein"
-#: src/irc/irc-commands.c:448
+#: src/irc/irc-commands.c:447
msgid "unknown mode char to me"
msgstr "caractère de mode inconnu pour moi"
-#: src/irc/irc-commands.c:450
+#: src/irc/irc-commands.c:449
msgid "cannot join channel (invite only)"
msgstr "impossible de rejoindre le canal (invités seulement)"
-#: src/irc/irc-commands.c:452
+#: src/irc/irc-commands.c:451
msgid "cannot join channel (banned from channel)"
msgstr "impossible de rejoindre le canal (banni du canal)"
-#: src/irc/irc-commands.c:454
+#: src/irc/irc-commands.c:453
msgid "cannot join channel (bad channel key)"
msgstr "impossible de rejoindre le canal (mauvaise clé pour le canal)"
-#: src/irc/irc-commands.c:456
+#: src/irc/irc-commands.c:455
msgid "bad channel mask"
msgstr "mauvais masque de canal"
-#: src/irc/irc-commands.c:458
+#: src/irc/irc-commands.c:457
msgid "channel doesn't support modes"
msgstr "le canal ne supporte pas les modes"
-#: src/irc/irc-commands.c:460
+#: src/irc/irc-commands.c:459
msgid "you're not an IRC operator"
msgstr "vous n'êtres pas opérateur IRC"
-#: src/irc/irc-commands.c:462
+#: src/irc/irc-commands.c:461
msgid "you're not channel operator"
msgstr "vous n'êtes pas opérateur du canal"
-#: src/irc/irc-commands.c:464
+#: src/irc/irc-commands.c:463
msgid "you can't kill a server!"
msgstr "vous ne pouvez pas supprimer un serveur !"
-#: src/irc/irc-commands.c:466
+#: src/irc/irc-commands.c:465
msgid "user is immune from kick/deop"
msgstr "l'utilisateur est protégé des kick/deop"
-#: src/irc/irc-commands.c:468
+#: src/irc/irc-commands.c:467
msgid "no O-lines for your host"
msgstr "pas de O-lines pour votre nom de machine"
-#: src/irc/irc-commands.c:470
+#: src/irc/irc-commands.c:469
msgid "unknown mode flag"
msgstr "drapeau de mode inconnu"
-#: src/irc/irc-commands.c:472
+#: src/irc/irc-commands.c:471
msgid "can't change mode for other users"
msgstr "impossible de changer le mode pour les autres utilisateurs"
@@ -1318,7 +1318,7 @@ msgstr "impossible de changer le mode pour les autres utilisateurs"
msgid "whois (secure connection)"
msgstr "qui est (connexion sécurisée)"
-#: src/irc/irc-display.c:163 src/common/command.c:853
+#: src/irc/irc-display.c:163 src/common/command.c:874
msgid "Server: "
msgstr "Serveur: "
@@ -1326,7 +1326,7 @@ msgstr "Serveur: "
msgid "connected"
msgstr "connecté"
-#: src/irc/irc-display.c:168
+#: src/irc/irc-display.c:168 src/common/command.c:900
msgid "not connected"
msgstr "non connecté"
@@ -1348,7 +1348,7 @@ msgstr " (serveur temporaire, ne sera pas sauvé)"
msgid "(hidden)"
msgstr "(caché)"
-#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4008
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4227
msgid "unknown"
msgstr "inconnu"
@@ -1357,7 +1357,7 @@ msgstr "inconnu"
msgid "%s: using local hostname \"%s\"\n"
msgstr "%s: utilisation du nom de machine local \"%s\"\n"
-#: src/irc/irc-send.c:126 src/common/command.c:731
+#: src/irc/irc-send.c:126 src/common/command.c:752
#, c-format
msgid "%s cannot find nick for sending message\n"
msgstr "%s impossible de trouver le pseudo pour envoyer le message\n"
@@ -1375,9 +1375,9 @@ msgstr ""
#: src/irc/irc-send.c:415 src/irc/irc-send.c:427 src/irc/irc-send.c:445
#: src/irc/irc-send.c:1097 src/irc/irc-send.c:1190 src/irc/irc-send.c:1722
-#: src/common/command.c:1196 src/common/command.c:1463
-#: src/common/command.c:1613 src/common/command.c:1756
-#: src/common/command.c:1899
+#: src/common/command.c:1222 src/common/command.c:1576
+#: src/common/command.c:1726 src/common/command.c:1869
+#: src/common/command.c:2012
#, c-format
msgid "%s wrong argument count for \"%s\" command\n"
msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n"
@@ -1394,13 +1394,13 @@ 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:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:409
+#: src/irc/irc-send.c:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:433
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s pseudo \"%s\" non trouvé pour la commande \"%s\"\n"
-#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1822
-#: src/irc/irc-recv.c:1900
+#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1886
+#: src/irc/irc-recv.c:1974
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
@@ -1410,439 +1410,439 @@ msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
msgid "%s, compiled on %s %s\n"
msgstr "%s, compilé le %s %s\n"
-#: src/irc/irc-recv.c:269
+#: src/irc/irc-recv.c:289
msgid "You have been invited to "
msgstr "Vous avez été invité sur "
-#: src/irc/irc-recv.c:272
+#: src/irc/irc-recv.c:292
msgid "by"
msgstr "par"
-#: src/irc/irc-recv.c:282 src/irc/irc-recv.c:376 src/irc/irc-recv.c:875
-#: src/irc/irc-recv.c:1210 src/irc/irc-recv.c:1452 src/irc/irc-recv.c:3226
-#: src/irc/irc-recv.c:3293
+#: src/irc/irc-recv.c:303 src/irc/irc-recv.c:397 src/irc/irc-recv.c:894
+#: src/irc/irc-recv.c:1229 src/irc/irc-recv.c:1488 src/irc/irc-recv.c:3348
+#: src/irc/irc-recv.c:3409 src/irc/irc-recv.c:3481
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s canal \"%s\" non trouvé pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:308
+#: src/irc/irc-recv.c:331
#, 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:328
+#: src/irc/irc-recv.c:350
msgid " has joined "
msgstr " a rejoint "
-#: src/irc/irc-recv.c:385
+#: src/irc/irc-recv.c:408
msgid " has kicked "
msgstr " a poussé dehors "
-#: src/irc/irc-recv.c:389
+#: src/irc/irc-recv.c:412 src/common/command.c:1397
msgid " from "
msgstr " de "
-#: src/irc/irc-recv.c:475
+#: src/irc/irc-recv.c:498
msgid " has killed "
msgstr " a tué "
-#: src/irc/irc-recv.c:481
+#: src/irc/irc-recv.c:504
msgid " from server"
msgstr " du serveur"
-#: src/irc/irc-recv.c:491
+#: src/irc/irc-recv.c:514
msgid " from server\n"
msgstr " du serveur\n"
-#: src/irc/irc-recv.c:498
+#: src/irc/irc-recv.c:522
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr "%s la machine \"%s\" n'existe pas pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:538
+#: src/irc/irc-recv.c:562
msgid "sets ban on"
msgstr "instaure un bannissement sur"
-#: src/irc/irc-recv.c:539
+#: src/irc/irc-recv.c:563
msgid "removes ban on"
msgstr "supprime le banissement sur"
-#: src/irc/irc-recv.c:563
+#: src/irc/irc-recv.c:587
msgid "gives half channel operator status to"
msgstr "donne le droit demi-opérateur à"
-#: src/irc/irc-recv.c:564
+#: src/irc/irc-recv.c:588
msgid "removes half channel operator status from"
msgstr "supprime le droit demi-opérateur à"
-#: src/irc/irc-recv.c:591
+#: src/irc/irc-recv.c:615
msgid "sets invite-only channel flag"
msgstr "définit le canal en mode invité seulement"
-#: src/irc/irc-recv.c:592
+#: src/irc/irc-recv.c:616
msgid "removes invite-only channel flag"
msgstr "supprime le mode invité seulement pour le canal"
-#: src/irc/irc-recv.c:609
+#: src/irc/irc-recv.c:633
msgid "sets channel key to"
msgstr "définit la clé du canal à"
-#: src/irc/irc-recv.c:610
+#: src/irc/irc-recv.c:634
msgid "removes channel key"
msgstr "supprime la clé du canal"
-#: src/irc/irc-recv.c:641
+#: src/irc/irc-recv.c:665
msgid "sets the user limit to"
msgstr "définit la limite d'utilisateurs à"
-#: src/irc/irc-recv.c:642
+#: src/irc/irc-recv.c:666
msgid "removes user limit"
msgstr "supprime la limite d'utilisateurs"
-#: src/irc/irc-recv.c:664
+#: src/irc/irc-recv.c:688
msgid "sets moderated channel flag"
msgstr "instaure la modération sur le canal"
-#: src/irc/irc-recv.c:665
+#: src/irc/irc-recv.c:689
msgid "removes moderated channel flag"
msgstr "supprime la modération sur le canal"
-#: src/irc/irc-recv.c:675
+#: src/irc/irc-recv.c:699
msgid "sets messages from channel only flag"
msgstr "interdit aux utilisateurs en dehors du canal d'y écrire"
-#: src/irc/irc-recv.c:676
+#: src/irc/irc-recv.c:700
msgid "removes messages from channel only flag"
msgstr "autorise tout utilisateur à écrire sur le canal"
-#: src/irc/irc-recv.c:693
+#: src/irc/irc-recv.c:717
msgid "gives channel operator status to"
msgstr "donne le droit opérateur à"
-#: src/irc/irc-recv.c:694
+#: src/irc/irc-recv.c:718
msgid "removes channel operator status from"
msgstr "supprime le droit opérateur à"
-#: src/irc/irc-recv.c:721
+#: src/irc/irc-recv.c:745
msgid "sets private channel flag"
msgstr "définit le canal comme privé"
-#: src/irc/irc-recv.c:722
+#: src/irc/irc-recv.c:746
msgid "removes private channel flag"
msgstr "supprime le mode privé pour le canal"
-#: src/irc/irc-recv.c:739
+#: src/irc/irc-recv.c:763
msgid "sets quiet on"
msgstr "définit le mode muet sur"
-#: src/irc/irc-recv.c:740
+#: src/irc/irc-recv.c:764
msgid "removes quiet on"
msgstr "supprime le mode muet sur"
-#: src/irc/irc-recv.c:757
+#: src/irc/irc-recv.c:781
msgid "sets secret channel flag"
msgstr "définit le canal comme secret"
-#: src/irc/irc-recv.c:758
+#: src/irc/irc-recv.c:782
msgid "removes secret channel flag"
msgstr "supprime le mode secret pour le canal"
-#: src/irc/irc-recv.c:768
+#: src/irc/irc-recv.c:792
msgid "sets topic protection"
msgstr "active la protection du titre"
-#: src/irc/irc-recv.c:769
+#: src/irc/irc-recv.c:793
msgid "removes topic protection"
msgstr "supprime la protection du titre"
-#: src/irc/irc-recv.c:786
+#: src/irc/irc-recv.c:810
msgid "gives voice to"
msgstr "donne la voix à"
-#: src/irc/irc-recv.c:787
+#: src/irc/irc-recv.c:811
msgid "removes voice from"
msgstr "supprime la voix de"
-#: src/irc/irc-recv.c:830 src/irc/irc-recv.c:915 src/irc/irc-recv.c:1284
-#: src/irc/irc-recv.c:1966
+#: src/irc/irc-recv.c:854 src/irc/irc-recv.c:936 src/irc/irc-recv.c:1307
+#: src/irc/irc-recv.c:2041
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s commande \"%s\" reçue sans host\n"
-#: src/irc/irc-recv.c:845
+#: src/irc/irc-recv.c:864
#, 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:890
+#: src/irc/irc-recv.c:911
msgid "mode changed by"
msgstr "mode changé par"
-#: src/irc/irc-recv.c:954
+#: src/irc/irc-recv.c:973
msgid "You are "
msgstr "Vous êtes "
-#: src/irc/irc-recv.c:961
+#: src/irc/irc-recv.c:980
msgid " is "
msgstr " est "
-#: src/irc/irc-recv.c:965
+#: src/irc/irc-recv.c:984
msgid "now known as "
msgstr "maintenant connu sous le nom "
-#: src/irc/irc-recv.c:1035
+#: src/irc/irc-recv.c:1050
#, 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:1048 src/irc/irc-recv.c:1080
+#: src/irc/irc-recv.c:1066 src/irc/irc-recv.c:1098
msgid "reply from"
msgstr "réponse de"
-#: src/irc/irc-recv.c:1083
+#: src/irc/irc-recv.c:1101
#, c-format
msgid ": %ld.%ld seconds\n"
msgstr ": %ld.%ld secondes\n"
-#: src/irc/irc-recv.c:1135
+#: src/irc/irc-recv.c:1154
#, 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:1185
+#: src/irc/irc-recv.c:1203
msgid " has left "
msgstr " a quitté "
-#: src/irc/irc-recv.c:1333 src/irc/irc-recv.c:1846
+#: src/irc/irc-recv.c:1355 src/irc/irc-recv.c:1910
#, c-format
msgid "On %s: * %s %s"
msgstr "Sur %s: * %s %s"
-#: src/irc/irc-recv.c:1353
+#: src/irc/irc-recv.c:1379
#, c-format
msgid "Received a CTCP SOUND \"%s\" from "
msgstr "CTCP SOUND \"%s\" reçu de "
-#: src/irc/irc-recv.c:1384 src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1512
-#: src/irc/irc-recv.c:1548 src/irc/irc-recv.c:1881
+#: src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1443 src/irc/irc-recv.c:1547
+#: src/irc/irc-recv.c:1587 src/irc/irc-recv.c:1950
msgid "received from"
msgstr "reçu de"
-#: src/irc/irc-recv.c:1408 src/irc/irc-recv.c:1877
+#: src/irc/irc-recv.c:1439 src/irc/irc-recv.c:1946
msgid "Unknown CTCP "
msgstr "CTCP inconnu "
-#: src/irc/irc-recv.c:1436
+#: src/irc/irc-recv.c:1471
#, c-format
msgid "On %s: %s> %s"
msgstr "Sur %s: %s> %s"
-#: src/irc/irc-recv.c:1563 src/irc/irc-recv.c:1580 src/irc/irc-recv.c:1596
-#: src/irc/irc-recv.c:1612 src/irc/irc-recv.c:1637 src/irc/irc-recv.c:1654
-#: src/irc/irc-recv.c:1670 src/irc/irc-recv.c:1694 src/irc/irc-recv.c:1711
-#: src/irc/irc-recv.c:1727 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1768
-#: src/irc/irc-recv.c:1783 src/irc/irc-recv.c:1942 src/irc/irc-recv.c:3592
-#: src/irc/irc-recv.c:3650 src/irc/irc-recv.c:3802 src/irc/irc-recv.c:3817
-#: src/irc/irc-recv.c:3832 src/irc/irc-recv.c:3847 src/irc/irc-recv.c:3860
-#: src/irc/irc-recv.c:3910 src/irc/irc-recv.c:3924
+#: src/irc/irc-recv.c:1603 src/irc/irc-recv.c:1624 src/irc/irc-recv.c:1640
+#: src/irc/irc-recv.c:1656 src/irc/irc-recv.c:1682 src/irc/irc-recv.c:1703
+#: src/irc/irc-recv.c:1719 src/irc/irc-recv.c:1744 src/irc/irc-recv.c:1765
+#: src/irc/irc-recv.c:1781 src/irc/irc-recv.c:1806 src/irc/irc-recv.c:1827
+#: src/irc/irc-recv.c:1842 src/irc/irc-recv.c:2017 src/irc/irc-recv.c:3791
+#: src/irc/irc-recv.c:3849 src/irc/irc-recv.c:4010 src/irc/irc-recv.c:4025
+#: src/irc/irc-recv.c:4040 src/irc/irc-recv.c:4055 src/irc/irc-recv.c:4068
+#: src/irc/irc-recv.c:4123 src/irc/irc-recv.c:4137
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s impossible d'analyser la commande \"%s\"\n"
-#: src/irc/irc-recv.c:1796
+#: src/irc/irc-recv.c:1855
#, 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:1921 src/irc/irc-dcc.c:1039
+#: src/irc/irc-recv.c:1995 src/irc/irc-dcc.c:1036
#, c-format
msgid "Private %s> %s"
msgstr "Prive %s> %s"
-#: src/irc/irc-recv.c:1998
+#: src/irc/irc-recv.c:2072
msgid "has quit"
msgstr "a quitté"
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2197
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s commande \"%s\" reçue sans canal\n"
-#: src/irc/irc-recv.c:2147
+#: src/irc/irc-recv.c:2229
msgid " has changed topic for "
msgstr " a changé le titre pour "
-#: src/irc/irc-recv.c:2152
+#: src/irc/irc-recv.c:2234
#, c-format
msgid " to: \"%s\"\n"
msgstr " en: \"%s\"\n"
-#: src/irc/irc-recv.c:2158
+#: src/irc/irc-recv.c:2240
msgid " has unset topic for "
msgstr " a retiré le titre pour "
-#: src/irc/irc-recv.c:2276
+#: src/irc/irc-recv.c:2359
#, c-format
msgid " is away: %s\n"
msgstr " est absent: %s\n"
-#: src/irc/irc-recv.c:2350
+#: src/irc/irc-recv.c:2441
msgid "Users online: "
msgstr "Utilisateurs en ligne: "
-#: src/irc/irc-recv.c:2797
+#: src/irc/irc-recv.c:2927
msgid "idle: "
msgstr "inactivité: "
-#: src/irc/irc-recv.c:2805
+#: src/irc/irc-recv.c:2935
msgid "days"
msgstr "jours"
-#: src/irc/irc-recv.c:2805
+#: src/irc/irc-recv.c:2935
msgid "day"
msgstr "jour"
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2945
msgid "hours"
msgstr "heures"
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2945
msgid "hour"
msgstr "heure"
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2951
msgid "minutes"
msgstr "minutes"
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2951
msgid "minute"
msgstr "minute"
-#: src/irc/irc-recv.c:2827
+#: src/irc/irc-recv.c:2957
msgid "seconds"
msgstr "secondes"
-#: src/irc/irc-recv.c:2827
+#: src/irc/irc-recv.c:2957
msgid "second"
msgstr "seconde"
-#: src/irc/irc-recv.c:2832
+#: src/irc/irc-recv.c:2962
msgid "signon at: "
msgstr "signé le: "
-#: src/irc/irc-recv.c:2920
+#: src/irc/irc-recv.c:3058
msgid "Channels: "
msgstr "Canaux: "
-#: src/irc/irc-recv.c:3172
+#: src/irc/irc-recv.c:3339
msgid "No topic set for "
msgstr "Pas de titre défini pour "
-#: src/irc/irc-recv.c:3214
+#: src/irc/irc-recv.c:3396
msgid "Topic for "
msgstr "Le titre pour "
-#: src/irc/irc-recv.c:3218
+#: src/irc/irc-recv.c:3400
#, c-format
msgid " is: \"%s\"\n"
msgstr " est: \"%s\"\n"
-#: src/irc/irc-recv.c:3236 src/irc/irc-recv.c:3320 src/irc/irc-recv.c:3373
+#: src/irc/irc-recv.c:3419 src/irc/irc-recv.c:3508 src/irc/irc-recv.c:3561
#, 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:3282
+#: src/irc/irc-recv.c:3469
msgid "Topic set by "
msgstr "Titre défini par "
-#: src/irc/irc-recv.c:3302
+#: src/irc/irc-recv.c:3490
#, 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:3311 src/irc/irc-recv.c:3382
+#: src/irc/irc-recv.c:3499 src/irc/irc-recv.c:3570
#, 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:3361
+#: src/irc/irc-recv.c:3549
msgid "has invited"
msgstr "a invité"
-#: src/irc/irc-recv.c:3364 src/irc/irc-recv.c:3515
+#: src/irc/irc-recv.c:3552 src/irc/irc-recv.c:3712 src/common/command.c:1390
msgid "on"
msgstr "sur"
-#: src/irc/irc-recv.c:3638
+#: src/irc/irc-recv.c:3837
#, 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:3694
+#: src/irc/irc-recv.c:3897
msgid "Nicks "
msgstr "Utilisateurs "
-#: src/irc/irc-recv.c:3714
+#: src/irc/irc-recv.c:3917
msgid "Channel "
msgstr "Canal "
-#: src/irc/irc-recv.c:3725
+#: src/irc/irc-recv.c:3928
msgid "nicks"
msgstr "utilisateurs"
-#: src/irc/irc-recv.c:3725
+#: src/irc/irc-recv.c:3928
msgid "nick"
msgstr "utilisateur"
-#: src/irc/irc-recv.c:3733
+#: src/irc/irc-recv.c:3936
msgid "ops"
msgstr "ops"
-#: src/irc/irc-recv.c:3733
+#: src/irc/irc-recv.c:3936
msgid "op"
msgstr "op"
-#: src/irc/irc-recv.c:3742
+#: src/irc/irc-recv.c:3945
msgid "halfops"
msgstr "halfops"
-#: src/irc/irc-recv.c:3742
+#: src/irc/irc-recv.c:3945
msgid "halfop"
msgstr "halfop"
-#: src/irc/irc-recv.c:3751
+#: src/irc/irc-recv.c:3954
msgid "voices"
msgstr "voices"
-#: src/irc/irc-recv.c:3751
+#: src/irc/irc-recv.c:3954
msgid "voice"
msgstr "voice"
-#: src/irc/irc-recv.c:3760
+#: src/irc/irc-recv.c:3963
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:3873
+#: src/irc/irc-recv.c:4085
msgid "banned by"
msgstr "banni par"
-#: src/irc/irc-recv.c:3962
+#: src/irc/irc-recv.c:4181
#, 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:3974
+#: src/irc/irc-recv.c:4193
#, 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:3986
+#: src/irc/irc-recv.c:4205
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1851,7 +1851,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:3996
+#: src/irc/irc-recv.c:4215
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
@@ -1882,35 +1882,35 @@ msgstr "Echoué"
msgid "Aborted"
msgstr "Interrompu"
-#: src/irc/irc-dcc.c:348 src/irc/irc-dcc.c:539 src/irc/irc-dcc.c:701
+#: src/irc/irc-dcc.c:345 src/irc/irc-dcc.c:536 src/irc/irc-dcc.c:698
msgid "DCC: file "
msgstr "DCC: fichier "
-#: src/irc/irc-dcc.c:355 src/irc/irc-dcc.c:664 src/irc/irc-dcc.c:706
+#: src/irc/irc-dcc.c:352 src/irc/irc-dcc.c:661 src/irc/irc-dcc.c:703
msgid " (local filename: "
msgstr " (nom local: "
-#: src/irc/irc-dcc.c:363
+#: src/irc/irc-dcc.c:360
msgid " sent to "
msgstr " envoyé à "
-#: src/irc/irc-dcc.c:365
+#: src/irc/irc-dcc.c:362
msgid " received from "
msgstr " reçu de "
-#: src/irc/irc-dcc.c:371
+#: src/irc/irc-dcc.c:368
msgid ": ok!\n"
msgstr ": ok!\n"
-#: src/irc/irc-dcc.c:371
+#: src/irc/irc-dcc.c:368
msgid ": FAILED\n"
msgstr ": ECHOUE\n"
-#: src/irc/irc-dcc.c:383
+#: src/irc/irc-dcc.c:380
msgid "DCC chat closed with "
msgstr "Discussion DCC fermée avec "
-#: src/irc/irc-dcc.c:432
+#: src/irc/irc-dcc.c:429
#, c-format
msgid ""
"%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1919,20 +1919,20 @@ msgstr ""
"%s impossible d'associer la discussion DCC avec un tampon privé (le tampon "
"privé a peut-être déjà un DCC CHAT ?)\n"
-#: src/irc/irc-dcc.c:442
+#: src/irc/irc-dcc.c:439
msgid "Connected to "
msgstr "Connecté à "
-#: src/irc/irc-dcc.c:451
+#: src/irc/irc-dcc.c:448
msgid "via DCC chat\n"
msgstr "via une discussion DCC\n"
-#: src/irc/irc-dcc.c:544
+#: src/irc/irc-dcc.c:541
#, c-format
msgid "resumed at position %u\n"
msgstr "recommencé en position %u\n"
-#: src/irc/irc-dcc.c:550 src/irc/irc-dcc.c:575
+#: src/irc/irc-dcc.c:547 src/irc/irc-dcc.c:572
#, c-format
msgid ""
"%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
@@ -1941,71 +1941,71 @@ msgstr ""
"%s impossible de continuer le fichier \"%s\" (port: %d, position de départ: %"
"u): DCC non trouvé ou terminé\n"
-#: src/irc/irc-dcc.c:594
+#: src/irc/irc-dcc.c:591
#, c-format
msgid "%s not enough memory for new DCC\n"
msgstr "%s pas assez de mémoire pour un nouveau DCC\n"
-#: src/irc/irc-dcc.c:613
+#: src/irc/irc-dcc.c:610
msgid "DCC chat"
msgstr "Discussion DCC"
-#: src/irc/irc-dcc.c:643
+#: src/irc/irc-dcc.c:640
msgid "Incoming DCC file from "
msgstr "Réception fichier DCC de "
-#: src/irc/irc-dcc.c:654 src/irc/irc-dcc.c:668
+#: src/irc/irc-dcc.c:651 src/irc/irc-dcc.c:665
msgid " bytes\n"
msgstr " octets\n"
-#: src/irc/irc-dcc.c:660
+#: src/irc/irc-dcc.c:657
msgid "Sending DCC file to "
msgstr "Envoi fichier DCC à "
-#: src/irc/irc-dcc.c:674
+#: src/irc/irc-dcc.c:671
msgid "Incoming DCC chat request from "
msgstr "Demande de discussion DCC reçue de "
-#: src/irc/irc-dcc.c:686
+#: src/irc/irc-dcc.c:683
msgid "Sending DCC chat request to "
msgstr "Envoi d'une demande discussion DCC à "
-#: src/irc/irc-dcc.c:712
+#: src/irc/irc-dcc.c:709
#, c-format
msgid "will be resumed at position %u\n"
msgstr "sera redémarré à la position %u\n"
-#: src/irc/irc-dcc.c:778
+#: src/irc/irc-dcc.c:775
#, c-format
msgid "%s not enough memory for DCC SEND\n"
msgstr "%s pas assez de mémoire pour le DCC SEND\n"
-#: src/irc/irc-dcc.c:800
+#: src/irc/irc-dcc.c:797
#, c-format
msgid "%s cannot access file \"%s\"\n"
msgstr "%s impossible d'accéder au fichier \"%s\"\n"
-#: src/irc/irc-dcc.c:821
+#: src/irc/irc-dcc.c:818
#, c-format
msgid "%s cannot create socket for DCC\n"
msgstr "%s impossible de créer la socket pour le DCC\n"
-#: src/irc/irc-dcc.c:834
+#: src/irc/irc-dcc.c:831
#, c-format
msgid "%s cannot find port for DCC\n"
msgstr "%s impossible de trouver le port pour le DCC\n"
-#: src/irc/irc-dcc.c:881
+#: src/irc/irc-dcc.c:878
#, c-format
msgid "%s cannot send DCC\n"
msgstr "%s impossible d'envoyer le DCC\n"
-#: src/irc/irc-dcc.c:960
+#: src/irc/irc-dcc.c:957
#, c-format
msgid "%s error sending data to \"%s\" via DCC CHAT\n"
msgstr "%s erreur d'envoi de données à \"%s\" via DCC CHAT\n"
-#: src/irc/irc-dcc.c:1233
+#: src/irc/irc-dcc.c:1230
#, c-format
msgid ""
"%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -2014,11 +2014,42 @@ msgstr ""
"%s le DCC a échoué car la taille de bloc est trop grande. Vérifiez la valeur "
"de l'option \"dcc_blocksize\", le maximum est %d.\n"
-#: src/irc/irc-dcc.c:1308
+#: src/irc/irc-dcc.c:1305
#, c-format
msgid "Aborting active DCC: \"%s\" from %s\n"
msgstr "Abandon du DCC actif: \"%s\" de %s\n"
+#: src/irc/irc-ignore.c:195
+#, c-format
+msgid "%s too few arguments for ignore\n"
+msgstr "%s pas assez de paramètres pour le ignore\n"
+
+#: src/irc/irc-ignore.c:212
+#, c-format
+msgid "%s mask or type/command should be non generic value for ignore\n"
+msgstr ""
+"%s le masque ou le type/commande doit être une valeur non générique pour le "
+"ignore\n"
+
+#: src/irc/irc-ignore.c:221
+#, c-format
+msgid "%s ignore already exists\n"
+msgstr "%s l'ignore existe déjà\n"
+
+#: src/irc/irc-ignore.c:257
+#, c-format
+msgid "%s unknown type or IRC command \"%s\" for ignore\n"
+msgstr "%s type ou commande IRC \"%s\" inconnu pour le ignore\n"
+
+#: src/irc/irc-ignore.c:285
+#, c-format
+msgid "%s not enough memory to create ignore\n"
+msgstr "%s pas assez de mémoire pour créer un ignore\n"
+
+#: src/irc/irc-ignore.c:406 src/irc/irc-ignore.c:442
+msgid "Removing ignore:"
+msgstr "Suppression du ignore:"
+
#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:463
#: src/plugins/python/wee-python.c:81 src/plugins/ruby/wee-ruby.c:89
#, c-format
@@ -2086,19 +2117,19 @@ msgid "Loading %s script \"%s\"\n"
msgstr "Chargement du script %s \"%s\"\n"
#: src/plugins/perl/wee-perl.c:1015 src/plugins/python/wee-python.c:686
-#: src/plugins/ruby/wee-ruby.c:722
+#: src/plugins/ruby/wee-ruby.c:555
#, c-format
msgid "Unloading %s script \"%s\"\n"
msgstr "Déchargement du script %s \"%s\"\n"
#: src/plugins/perl/wee-perl.c:1032 src/plugins/python/wee-python.c:703
-#: src/plugins/ruby/wee-ruby.c:739
+#: src/plugins/ruby/wee-ruby.c:572
#, c-format
msgid "Unloading all %s scripts...\n"
msgstr "Déchargement de tous les scripts %s...\n"
#: src/plugins/perl/wee-perl.c:1037 src/plugins/python/wee-python.c:708
-#: src/plugins/ruby/wee-ruby.c:744
+#: src/plugins/ruby/wee-ruby.c:577
#, c-format
msgid "%s scripts unloaded\n"
msgstr "Scripts %s déchargés\n"
@@ -2375,7 +2406,7 @@ msgstr "effacer la liste d'activité"
msgid "grab a key"
msgstr "capturer une touche"
-#: src/gui/gui-keyboard.c:426 src/common/command.c:1478
+#: src/gui/gui-keyboard.c:426 src/common/command.c:1591
#, c-format
msgid "%s unable to bind key \"%s\"\n"
msgstr "%s impossible de créer la touche \"%s\"\n"
@@ -2498,14 +2529,42 @@ msgid "command: name of a WeeChat or IRC command"
msgstr "commande: nom d'une commande WeeChat ou IRC"
#: src/common/command.c:75
+msgid "ignore IRC messages and/or hosts"
+msgstr "ignorer des messages IRC et/ou des masques"
+
+#: src/common/command.c:76
+msgid "[mask [[type | command] [channel [server]]]]"
+msgstr "[masque [[type | commande] [canal [serveur]]]]"
+
+#: src/common/command.c:77
+msgid ""
+" mask: nick or host mask to ignore\n"
+" type: type of message to ignore (action, ctcp, dcc, pv)\n"
+"command: IRC command\n"
+"channel: name of channel for ignore\n"
+" server: name of server for ignore\n"
+"\n"
+"For each argument, '*' means all.\n"
+"Without argument, /ignore command lists all defined ignore."
+msgstr ""
+" masque: pseudo ou masque à ignorer\n"
+" type: type de message à ignorer (action, ctcp, dcc, pv)\n"
+"commande: commande IRC\n"
+" canal: nom du canal pour le ignore\n"
+" serveur: nom du serveur pour le ignore\n"
+"\n"
+"Pour chaque paramètre, '*' signifie tou(te)s.\n"
+"Sans paramètre, la commande /ignore liste les ignore définis."
+
+#: src/common/command.c:85
msgid "bind/unbind keys"
msgstr "associer/libérer des touches"
-#: src/common/command.c:76
+#: src/common/command.c:86
msgid "[key function/command] [unbind key] [functions] [reset -yes]"
msgstr "[touche fonction/commande] [unbind touche] [functions] [reset -yes]"
-#: src/common/command.c:77
+#: src/common/command.c:87
msgid ""
"key: bind this key to an internal function or a command (beginning by \"/"
"\")\n"
@@ -2523,51 +2582,57 @@ msgstr ""
"reset: restaur les touches aux valeurs par défaut et supprime TOUTES les "
"touches personnelles (utiliser avec précaution !)"
-#: src/common/command.c:82
+#: src/common/command.c:92
msgid "list/load/unload Perl scripts"
msgstr "liste/charge/décharge des scripts Perl"
-#: src/common/command.c:83 src/common/command.c:88 src/common/command.c:93
+#: src/common/command.c:93 src/common/command.c:98 src/common/command.c:103
msgid "[load filename] | [autoload] | [reload] | [unload]"
msgstr "[load fichier] | [autoload] | [reload] | [unload]"
-#: src/common/command.c:84
+#: src/common/command.c:94
msgid ""
"filename: Perl script (file) to load\n"
+"\n"
"Without argument, /perl command lists all loaded Perl scripts."
msgstr ""
"fichier: script Perl (fichier) à charger\n"
+"\n"
"Sans paramètre, la commande /perl liste tous les scripts Perl chargés."
-#: src/common/command.c:87
+#: src/common/command.c:97
msgid "list/load/unload Python scripts"
msgstr "liste/charge/décharge des scripts Python"
-#: src/common/command.c:89
+#: src/common/command.c:99
msgid ""
"filename: Python script (file) to load\n"
+"\n"
"Without argument, /python command lists all loaded Python scripts."
msgstr ""
"fichier: script Python (fichier) à charger\n"
+"\n"
"Sans paramètre, la commande /python liste tous les scripts Python chargés."
-#: src/common/command.c:92
+#: src/common/command.c:102
msgid "list/load/unload Ruby scripts"
msgstr "liste/charge/décharge des scripts Ruby"
-#: src/common/command.c:94
+#: src/common/command.c:104
msgid ""
"filename: Ruby script (file) to load\n"
+"\n"
"Without argument, /ruby command lists all loaded Ruby scripts."
msgstr ""
"fichier: script Ruby (fichier) à charger\n"
+"\n"
"Sans paramètre, la commande /ruby liste tous les scripts Ruby chargés."
-#: src/common/command.c:97
+#: src/common/command.c:107
msgid "list, add or remove servers"
msgstr "liste, ajoute ou retire des serveurs"
-#: src/common/command.c:98
+#: src/common/command.c:108
msgid ""
"[servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-"
"pwd password] [-nicks nick1 [nick2 [nick3]]] [-username username] [-realname "
@@ -2579,7 +2644,7 @@ msgstr ""
"nom_utilisateur] [-realname nom_réel] [-command commande] [-autojoin canal[,"
"canal]] ] | [del nom_serveur]"
-#: src/common/command.c:103
+#: src/common/command.c:113
msgid ""
"servername: server name, for internal & display use\n"
"hostname: name or IP address of server\n"
@@ -2605,27 +2670,27 @@ msgstr ""
"nom_utilisateur: nom d'utilisateur\n"
"nom_réel: nom réel de l'utilisateur"
-#: src/common/command.c:115
+#: src/common/command.c:125
msgid "save config to disk"
msgstr "sauvegarder la configuration sur disque"
-#: src/common/command.c:116
+#: src/common/command.c:126
msgid "[file]"
msgstr "[fichier]"
-#: src/common/command.c:116
+#: src/common/command.c:126
msgid "file: filename for writing config"
msgstr "fichier: fichier pour sauvegarder la configuration"
-#: src/common/command.c:118
+#: src/common/command.c:128
msgid "set config parameters"
msgstr "modifier des paramètres de configuration"
-#: src/common/command.c:119
+#: src/common/command.c:129
msgid "[option[=value]]"
msgstr "[option[=valeur]]"
-#: src/common/command.c:119
+#: src/common/command.c:129
msgid ""
"option: name of an option\n"
"value: value for option"
@@ -2633,27 +2698,58 @@ msgstr ""
"option: nom d'une option\n"
"valeur: valeur pour l'option"
-#: src/common/command.c:121
+#: src/common/command.c:131
msgid "remove an alias"
msgstr "supprimer un alias"
-#: src/common/command.c:122
+#: src/common/command.c:132
msgid "alias_name"
msgstr "nom_alias"
-#: src/common/command.c:122
+#: src/common/command.c:132
msgid "alias_name: name of alias to remove"
msgstr "nom_alias: nom de l'alias à supprimer"
-#: src/common/command.c:124
+#: src/common/command.c:134
+msgid "unignore IRC messages and/or hosts"
+msgstr "supprimer le ignore des messages IRC et/ou des masques"
+
+#: src/common/command.c:135
+msgid "[number | [mask [[type | command] [channel [server]]]]]"
+msgstr "[nombre | [masque [[type | commande] [canal [serveur]]]]]"
+
+#: src/common/command.c:136
+msgid ""
+" number: # of ignore to unignore (number is displayed by list of ignore)\n"
+" mask: nick or host mask to unignore\n"
+" type: type of message to unignore (action, ctcp, dcc, pv)\n"
+"command: IRC command\n"
+"channel: name of channel for unignore\n"
+" server: name of server for unignore\n"
+"\n"
+"For each argument, '*' means all.\n"
+"Without argument, /unignore command lists all defined ignore."
+msgstr ""
+" nombre: numéro de ignore à supprimer (le nombre est affiché sur la liste "
+"des ignore)\n"
+" masque: pseudo ou masque à ignorer\n"
+" type: type de message à ignorer (action, ctcp, dcc, pv)\n"
+"commande: commande IRC\n"
+" canal: nom du canal pour le ignore\n"
+" serveur: nom du serveur pour le ignore\n"
+"\n"
+"Pour chaque paramètre, '*' signifie tou(te)s.\n"
+"Sans paramètre, /ignore liste les ignore définis."
+
+#: src/common/command.c:145
msgid "manage windows"
msgstr "gestion des fenêtres"
-#: src/common/command.c:125
+#: src/common/command.c:146
msgid "[list | splith | splitv | [merge [down | up | left | right | all]]]"
msgstr "[list | splith | splitv | [merge [down | up | left | right | all]]]"
-#: src/common/command.c:126
+#: src/common/command.c:147
msgid ""
"list: list opened windows (no parameter implies this list)\n"
"splith: split current window horizontally\n"
@@ -2665,29 +2761,29 @@ msgstr ""
"splitv: éclate la fenêtre en deux verticalement\n"
"merge: fusionne la fenêtre avec une autre"
-#: src/common/command.c:272
+#: src/common/command.c:293
#, c-format
msgid "%s alias or command \"%s\" already exists!\n"
msgstr "%s l'alias ou la commande \"%s\" existe déjà !\n"
-#: src/common/command.c:282
+#: src/common/command.c:303
#, c-format
msgid "%s alias cannot run another alias!\n"
msgstr "%s l'alias ne peut pas lancer un autre alias !\n"
-#: src/common/command.c:289
+#: src/common/command.c:310
#, c-format
msgid "%s target command \"%s\" does not exist!\n"
msgstr "%s la commande cible \"%s\" n'existe pas !\n"
-#: src/common/command.c:497
+#: src/common/command.c:518
#, c-format
msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
msgstr ""
"%s nombre de paramètres incorrect pour la commande %s \"%s\" (attendu: %d "
"paramètre%s)\n"
-#: src/common/command.c:509
+#: src/common/command.c:530
#, c-format
msgid ""
"%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
@@ -2696,19 +2792,19 @@ msgstr ""
"%s nombre de paramètres incorrect pour la commande %s \"%s\" (attendu: entre "
"%d et %d paramètre%s)\n"
-#: src/common/command.c:531 src/common/command.c:601
+#: src/common/command.c:552 src/common/command.c:622
#, c-format
msgid "%s command \"%s\" failed\n"
msgstr "%s la commande \"%s\" a échoué\n"
-#: src/common/command.c:559
+#: src/common/command.c:580
#, c-format
msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
msgstr ""
"%s nombre de paramètres incorrect pour la commande IRC \"%s\" (attendu: %d "
"paramètre%s)\n"
-#: src/common/command.c:571
+#: src/common/command.c:592
#, c-format
msgid ""
"%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
@@ -2717,221 +2813,237 @@ msgstr ""
"%s nombre de paramètres incorrect pour la commande IRC \"%s\" (attendu: "
"entre %d et %d paramètre%s)\n"
-#: src/common/command.c:586
+#: src/common/command.c:607
#, c-format
msgid "%s command \"%s\" needs a server connection!\n"
msgstr "%s la commande \"%s\" nécessite une connexion au serveur !\n"
-#: src/common/command.c:650
+#: src/common/command.c:671
#, c-format
msgid "%s unknown command \"%s\" (type /help for help)\n"
msgstr "%s commande \"%s\" inconnue (tapez /help pour l'aide)\n"
-#: src/common/command.c:753
+#: src/common/command.c:774
#, c-format
msgid "%s unable to call handler for message (not enough memory)\n"
msgstr ""
"%s impossible d'appeler la fonction pour le message (mémoire insuffisante)\n"
-#: src/common/command.c:761
+#: src/common/command.c:782
msgid "This window is not a channel!\n"
msgstr "Cette fenêtre n'est pas un canal !\n"
-#: src/common/command.c:789 src/common/command.c:813 src/common/command.c:918
+#: src/common/command.c:810 src/common/command.c:834 src/common/command.c:944
#, c-format
msgid "%s missing arguments for \"%s\" command\n"
msgstr "%s paramètres manquants pour la commande \"%s\"\n"
-#: src/common/command.c:798
+#: src/common/command.c:819
#, c-format
msgid "Alias \"%s\" => \"%s\" created\n"
msgstr "Alias \"%s\" => \"%s\" créé\n"
-#: src/common/command.c:804
+#: src/common/command.c:825
#, c-format
msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
msgstr "Impossible de créer l'alias \"%s\" => \"%s\" (pas assez de mémoire)\n"
-#: src/common/command.c:824
+#: src/common/command.c:845
msgid "List of aliases:\n"
msgstr "Liste des alias:\n"
-#: src/common/command.c:836
+#: src/common/command.c:857
msgid "No alias defined.\n"
msgstr "Aucun alias défini.\n"
-#: src/common/command.c:859
+#: src/common/command.c:880
msgid "Channel: "
msgstr "Canal: "
-#: src/common/command.c:862 src/common/command.c:872
+#: src/common/command.c:883 src/common/command.c:893
msgid " (server: "
msgstr " (serveur: "
-#: src/common/command.c:869
+#: src/common/command.c:890
msgid "Private with: "
msgstr "Privé avec: "
-#: src/common/command.c:898
+#: src/common/command.c:924
msgid "Opened buffers:\n"
msgstr "Tampons ouverts:\n"
-#: src/common/command.c:941
+#: src/common/command.c:967
#, c-format
msgid "%s incorrect buffer number\n"
msgstr "%s numéro de buffer incorrect\n"
-#: src/common/command.c:955
+#: src/common/command.c:981
#, c-format
msgid "%s can not close the single buffer\n"
msgstr "%s impossible de fermer le tampon unique\n"
-#: src/common/command.c:965
+#: src/common/command.c:991
#, c-format
msgid "%s can not close server buffer while channels are opened\n"
msgstr ""
"%s impossible de fermer le tampon du serveur tant que des canaux sont "
"ouverts\n"
-#: src/common/command.c:1006
+#: src/common/command.c:1032
msgid "Notify levels: "
msgstr "Niveaux de notification: "
-#: src/common/command.c:1034 src/common/command.c:1056
+#: src/common/command.c:1060 src/common/command.c:1082
#, c-format
msgid "%s incorrect notify level (must be between %d and %d)\n"
msgstr "%s niveau de notification incorrect (doit être entre %d et %d)\n"
-#: src/common/command.c:1043
+#: src/common/command.c:1069
#, c-format
msgid "%s incorrect buffer for notify (must be channel or private)\n"
msgstr ""
"%s tampon incorrect pour la notification (doit être un canal ou un privé)\n"
-#: src/common/command.c:1123
+#: src/common/command.c:1149
#, c-format
msgid "unknown parameter \"%s\" for \"%s\" command\n"
msgstr "paramètre inconnu \"%s\" pour la commande \"%s\"\n"
-#: src/common/command.c:1153
+#: src/common/command.c:1179
#, c-format
msgid "%s already connected to server \"%s\"!\n"
msgstr "%s déjà connecté au serveur \"%s\" !\n"
-#: src/common/command.c:1161
+#: src/common/command.c:1187
#, c-format
msgid "%s currently connecting to server \"%s\"!\n"
msgstr "%s une connexion vers le serveur \"%s\" est en cours !\n"
-#: src/common/command.c:1179 src/common/command.c:1254
+#: src/common/command.c:1205 src/common/command.c:1280
#, c-format
msgid "%s server not found\n"
msgstr "%s serveur non trouvé\n"
-#: src/common/command.c:1209 src/common/command.c:1606
-#: src/common/command.c:1749 src/common/command.c:1892
-#: src/common/command.c:2589 src/common/command.c:2605
+#: src/common/command.c:1235 src/common/command.c:1719
+#: src/common/command.c:1862 src/common/command.c:2005
+#: src/common/command.c:2765 src/common/command.c:2781
#, c-format
msgid "%s unknown option for \"%s\" command\n"
msgstr "%s option inconnue pour la commande \"%s\"\n"
-#: src/common/command.c:1238
+#: src/common/command.c:1264
#, c-format
msgid "%s not connected to server \"%s\"!\n"
msgstr "%s non connecté au serveur \"%s\" !\n"
-#: src/common/command.c:1246
+#: src/common/command.c:1272
msgid "Auto-reconnection is cancelled\n"
msgstr "La reconnexion automatique est annulée\n"
-#: src/common/command.c:1272 src/common/weechat.c:273
+#: src/common/command.c:1298 src/common/weechat.c:345
#, c-format
msgid "%s internal commands:\n"
msgstr "Commandes internes %s :\n"
-#: src/common/command.c:1281 src/common/weechat.c:293
+#: src/common/command.c:1307 src/common/weechat.c:365
#, c-format
msgid "IRC commands:\n"
msgstr "Commandes IRC :\n"
-#: src/common/command.c:1348
+#: src/common/command.c:1374
#, c-format
msgid "No help available, \"%s\" is an unknown command\n"
msgstr "Pas d'aide disponible, la commande \"%s\" est inconnue\n"
-#: src/common/command.c:1366
+#: src/common/command.c:1395
+msgid " ignoring "
+msgstr " ignore "
+
+#: src/common/command.c:1419
+msgid "List of ignore:\n"
+msgstr "Liste des ignore:\n"
+
+#: src/common/command.c:1434
+msgid "No ignore defined.\n"
+msgstr "Aucun ignore défini.\n"
+
+#: src/common/command.c:1460
+msgid "New ignore:"
+msgstr "Nouveau ignore:"
+
+#: src/common/command.c:1479
msgid "New key binding:\n"
msgstr "Nouvelle touche:\n"
-#: src/common/command.c:1399
+#: src/common/command.c:1512
msgid "Key bindings:\n"
msgstr "Associations de touches:\n"
-#: src/common/command.c:1411
+#: src/common/command.c:1524
#, c-format
msgid "Key \"%s\" unbinded\n"
msgstr "Touche \"%s\" supprimée\n"
-#: src/common/command.c:1416
+#: src/common/command.c:1529
#, c-format
msgid "%s unable to unbind key \"%s\"\n"
msgstr "%s impossible de supprimer la touche \"%s\"\n"
-#: src/common/command.c:1424 src/common/weechat.c:324
+#: src/common/command.c:1537 src/common/weechat.c:396
#, c-format
msgid "Internal key functions:\n"
msgstr "Fonctions internes pour les touches:\n"
-#: src/common/command.c:1443
+#: src/common/command.c:1556
msgid "Default key bindings restored\n"
msgstr "Touches par défaut restaurées\n"
-#: src/common/command.c:1449
+#: src/common/command.c:1562
#, c-format
msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
msgstr ""
"%s le paramètre \"-yes\" est requis pour la réinitialisation des touches "
"(raison de sécurité)\n"
-#: src/common/command.c:1505 src/common/command.c:1648
-#: src/common/command.c:1791
+#: src/common/command.c:1618 src/common/command.c:1761
+#: src/common/command.c:1904
#, c-format
msgid "Registered %s scripts:\n"
msgstr "Scripts %s enregistrés :\n"
-#: src/common/command.c:1522 src/common/command.c:1545
-#: src/common/command.c:1568 src/common/command.c:1665
-#: src/common/command.c:1688 src/common/command.c:1711
-#: src/common/command.c:1808 src/common/command.c:1831
-#: src/common/command.c:1854
+#: src/common/command.c:1635 src/common/command.c:1658
+#: src/common/command.c:1681 src/common/command.c:1778
+#: src/common/command.c:1801 src/common/command.c:1824
+#: src/common/command.c:1921 src/common/command.c:1944
+#: src/common/command.c:1967
msgid " (none)\n"
msgstr " (aucun)\n"
-#: src/common/command.c:1527 src/common/command.c:1670
-#: src/common/command.c:1813
+#: src/common/command.c:1640 src/common/command.c:1783
+#: src/common/command.c:1926
#, c-format
msgid "%s message handlers:\n"
msgstr "Fonctions %s pour messages :\n"
-#: src/common/command.c:1536 src/common/command.c:1679
-#: src/common/command.c:1822
+#: src/common/command.c:1649 src/common/command.c:1792
+#: src/common/command.c:1935
#, c-format
msgid " IRC(%s) => %s(%s)\n"
msgstr " IRC(%s) => %s(%s)\n"
-#: src/common/command.c:1550 src/common/command.c:1693
-#: src/common/command.c:1836
+#: src/common/command.c:1663 src/common/command.c:1806
+#: src/common/command.c:1949
#, c-format
msgid "%s command handlers:\n"
msgstr "Commandes %s :\n"
-#: src/common/command.c:1559 src/common/command.c:1702
-#: src/common/command.c:1845
+#: src/common/command.c:1672 src/common/command.c:1815
+#: src/common/command.c:1958
#, c-format
msgid " Command /%s => %s(%s)\n"
msgstr " Commande /%s => %s(%s)\n"
-#: src/common/command.c:1619
+#: src/common/command.c:1732
msgid ""
"WeeChat was build without Perl support.\n"
"Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n"
@@ -2940,7 +3052,7 @@ msgstr ""
"Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le "
"script ./configure\n"
-#: src/common/command.c:1762
+#: src/common/command.c:1875
msgid ""
"WeeChat was build without Python support.\n"
"Please rebuild WeeChat with \"--enable-python\" option for ./configure "
@@ -2950,39 +3062,40 @@ msgstr ""
"Merci de reconstruire WeeChat avec l'option \"--enable-python\" pour le "
"script ./configure\n"
-#: src/common/command.c:1905
+#: src/common/command.c:2018
msgid ""
"WeeChat was build without Ruby support.\n"
"Please rebuild WeeChat with \"--enable-ruby\" option for ./configure script\n"
msgstr ""
"WeeChat a été construit sans le support Ruby.\n"
-"Merci de reconstruire WeeChat avec l'option \"--enable-ruby\" pour le script ./configure\n"
+"Merci de reconstruire WeeChat avec l'option \"--enable-ruby\" pour le "
+"script ./configure\n"
-#: src/common/command.c:1953
+#: src/common/command.c:2066
msgid "No server.\n"
msgstr "Pas de serveur.\n"
-#: src/common/command.c:1964
+#: src/common/command.c:2077
#, c-format
msgid "Server '%s' not found.\n"
msgstr "Serveur '%s' non trouvé.\n"
-#: src/common/command.c:1976
+#: src/common/command.c:2089
#, c-format
msgid "%s missing servername for \"%s\" command\n"
msgstr "%s il manque le nom du serveur pour la commande \"%s\"\n"
-#: src/common/command.c:1984
+#: src/common/command.c:2097
#, c-format
msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
msgstr "%s trop de paramètres pour la commande \"%s\", paramètres ignorés\n"
-#: src/common/command.c:2003
+#: src/common/command.c:2116
#, c-format
msgid "%s server \"%s\" not found for \"%s\" command\n"
msgstr "%s le serveur \"%s\" n'existe pas pour la commande \"%s\"\n"
-#: src/common/command.c:2011
+#: src/common/command.c:2124
#, c-format
msgid ""
"%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -2991,106 +3104,119 @@ msgstr ""
"%s vous ne pouvez pas supprimer le server \"%s\" car vous êtes connecté "
"dessus. Essayez /disconnect %s avant.\n"
-#: src/common/command.c:2027 src/common/command.c:2173
+#: src/common/command.c:2140 src/common/command.c:2286
msgid "Server"
msgstr "Serveur"
-#: src/common/command.c:2030
+#: src/common/command.c:2143
msgid "has been deleted\n"
msgstr "a été supprimé\n"
-#: src/common/command.c:2045
+#: src/common/command.c:2158
#, c-format
msgid "%s missing parameters for \"%s\" command\n"
msgstr "%s paramètres manquants pour la commande \"%s\"\n"
-#: src/common/command.c:2055
+#: src/common/command.c:2168
#, c-format
msgid "%s server \"%s\" already exists, can't create it!\n"
msgstr "%s le serveur \"%s\" existe déjà, impossible de le créer !\n"
-#: src/common/command.c:2084 src/common/command.c:2112
-#: src/common/command.c:2125 src/common/command.c:2151
+#: src/common/command.c:2197 src/common/command.c:2225
+#: src/common/command.c:2238 src/common/command.c:2264
#, c-format
msgid "%s missing password for \"%s\" parameter\n"
msgstr "%s mot de passe manquant pour le paramètre \"%s\"\n"
-#: src/common/command.c:2097
+#: src/common/command.c:2210
#, c-format
msgid "%s missing nick(s) for \"%s\" parameter\n"
msgstr "%s pseudo(s) manquant(s) pour le paramètre \"%s\"\n"
-#: src/common/command.c:2138
+#: src/common/command.c:2251
#, c-format
msgid "%s missing command for \"%s\" parameter\n"
msgstr "%s commande manquante pour le paramètre \"%s\"\n"
-#: src/common/command.c:2176
+#: src/common/command.c:2289
msgid "created\n"
msgstr "créé\n"
-#: src/common/command.c:2182
+#: src/common/command.c:2295
#, c-format
msgid "%s unable to create server\n"
msgstr "%s impossible de créer le serveur\n"
-#: src/common/command.c:2237
+#: src/common/command.c:2350
msgid "(unknown)"
msgstr "(inconnu)"
-#: src/common/command.c:2260
+#: src/common/command.c:2373
msgid "(password hidden) "
msgstr "(mot de passe caché) "
-#: src/common/command.c:2324
+#: src/common/command.c:2437
#, c-format
msgid "%s server \"%s\" not found\n"
msgstr "%s serveur \"%s\" non trouvé\n"
-#: src/common/command.c:2355 src/common/command.c:2401
+#: src/common/command.c:2468 src/common/command.c:2514
#, c-format
msgid "%s config option \"%s\" not found\n"
msgstr "%s option de configuration \"%s\" non trouvée\n"
-#: src/common/command.c:2360 src/common/command.c:2393
+#: src/common/command.c:2473 src/common/command.c:2506
#, c-format
msgid "%s incorrect value for option \"%s\"\n"
msgstr "%s valeur incorrecte pour l'option \"%s\"\n"
-#: src/common/command.c:2376
+#: src/common/command.c:2489
#, c-format
msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
msgstr "%s l'option \"%s\" ne peut pas être changée lorsque WeeChat tourne\n"
-#: src/common/command.c:2475
+#: src/common/command.c:2588
#, c-format
msgid "No config option found with \"%s\"\n"
msgstr "Aucune option de configuration trouvée avec \"%s\"\n"
-#: src/common/command.c:2478
+#: src/common/command.c:2591
msgid "No config option found\n"
msgstr "Aucune option de configuration trouvée\n"
-#: src/common/command.c:2484
+#: src/common/command.c:2597
#, c-format
msgid "config option(s) found with \"%s\"\n"
msgstr "option(s) de configuration trouvée(s) avec \"%s\"\n"
-#: src/common/command.c:2487
+#: src/common/command.c:2600
msgid "config option(s) found\n"
msgstr "option(s) de configuration trouvée(s)\n"
-#: src/common/command.c:2507
+#: src/common/command.c:2620
#, c-format
msgid "%s alias or command \"%s\" not found\n"
msgstr "%s alias ou commande \"%s\" non trouvé\n"
-#: src/common/command.c:2517
+#: src/common/command.c:2630
#, c-format
msgid "Alias \"%s\" removed\n"
msgstr "Alias \"%s\" supprimé\n"
-#: src/common/command.c:2537
+#: src/common/command.c:2683
+msgid "ignore were removed.\n"
+msgstr "ignore ont été supprimés.\n"
+
+#: src/common/command.c:2685
+msgid "ignore was removed.\n"
+msgstr "ignore a été supprimé.\n"
+
+#: src/common/command.c:2690
+#, c-format
+msgid "%s no ignore found\n"
+msgstr "%s aucun ignore trouvé\n"
+
+#: src/common/command.c:2713
msgid "Opened windows:\n"
msgstr "Fenêtres ouvertes:\n"
@@ -3153,7 +3279,7 @@ msgstr "**** Début du log "
msgid "**** End of log "
msgstr "**** Fin du log "
-#: src/common/weechat.c:198
+#: src/common/weechat.c:270
#, c-format
msgid ""
"WeeChat configuration options (~/.weechat/weechat.rc):\n"
@@ -3162,47 +3288,47 @@ msgstr ""
"Options de configuration de WeeChat (~/.weechat/weechat.rc):\n"
"\n"
-#: src/common/weechat.c:211
+#: src/common/weechat.c:283
#, c-format
msgid " . type boolean (values: 'on' or 'off')\n"
msgstr " . type booléen (valeurs: 'on' ou 'off')\n"
-#: src/common/weechat.c:212 src/common/weechat.c:235 src/common/weechat.c:241
-#: src/common/weechat.c:247
+#: src/common/weechat.c:284 src/common/weechat.c:307 src/common/weechat.c:313
+#: src/common/weechat.c:319
#, c-format
msgid " . default value: '%s'\n"
msgstr " . valeur par défaut: '%s'\n"
-#: src/common/weechat.c:217
+#: src/common/weechat.c:289
#, c-format
msgid " . type integer (values: between %d and %d)\n"
msgstr " . type entier (valeurs: entre %d et %d)\n"
-#: src/common/weechat.c:220
+#: src/common/weechat.c:292
#, c-format
msgid " . default value: %d\n"
msgstr " . valeur par défaut: %d\n"
-#: src/common/weechat.c:224
+#: src/common/weechat.c:296
#, c-format
msgid " . type string (values: "
msgstr " . type chaîne (valeurs: "
-#: src/common/weechat.c:237 src/common/weechat.c:243 src/common/weechat.c:249
+#: src/common/weechat.c:309 src/common/weechat.c:315 src/common/weechat.c:321
msgid "empty"
msgstr "vide"
-#: src/common/weechat.c:240
+#: src/common/weechat.c:312
#, c-format
msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n"
msgstr " . type couleur (couleur Curses ou Gtk, voir la doc WeeChat)\n"
-#: src/common/weechat.c:246
+#: src/common/weechat.c:318
#, c-format
msgid " . type string (any string)\n"
msgstr " . type chaîne (toute chaîne)\n"
-#: src/common/weechat.c:252
+#: src/common/weechat.c:324
#, c-format
msgid ""
" . description: %s\n"
@@ -3211,7 +3337,7 @@ msgstr ""
" . description: %s\n"
"\n"
-#: src/common/weechat.c:258
+#: src/common/weechat.c:330
#, c-format
msgid ""
"Moreover, you can define aliases in [alias] section, by adding lines like:\n"
@@ -3219,7 +3345,7 @@ msgstr ""
"De plus, vous pouvez définir des alias dans la section [alias], en ajoutant "
"des lignes comme :\n"
-#: src/common/weechat.c:260
+#: src/common/weechat.c:332
#, c-format
msgid ""
"where 'j' is alias name, and 'join' associated command.\n"
@@ -3228,62 +3354,62 @@ msgstr ""
"où 'j' est le nom de l'alias, et 'join' la commande associée.\n"
"\n"
-#: src/common/weechat.c:345
+#: src/common/weechat.c:417
#, c-format
msgid "%s default keys:\n"
msgstr "Touches par défaut %s:\n"
-#: src/common/weechat.c:425
+#: src/common/weechat.c:497
#, c-format
msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
msgstr "%s syntaxe invalide pour le serveur IRC ('%s'), ignoré\n"
-#: src/common/weechat.c:438
+#: src/common/weechat.c:510
#, c-format
msgid "%s unable to create server ('%s'), ignored\n"
msgstr "%s impossible de créer le serveur ('%s'), ignoré\n"
-#: src/common/weechat.c:447
+#: src/common/weechat.c:519
#, c-format
msgid "%s unknown parameter '%s', ignored\n"
msgstr "%s paramètre inconnu '%s', ignoré\n"
-#: src/common/weechat.c:467
+#: src/common/weechat.c:539
#, c-format
msgid "%s cannot create directory \"%s\"\n"
msgstr "%s impossible de créer le répertoire \"%s\"\n"
-#: src/common/weechat.c:493
+#: src/common/weechat.c:565
#, c-format
msgid "%s unable to get HOME directory\n"
msgstr "%s impossible de lire le répertoire personnel\n"
-#: src/common/weechat.c:502
+#: src/common/weechat.c:574
#, c-format
msgid "%s not enough memory for home directory\n"
msgstr "%s pas assez de mémoire pour le répertoire personnel\n"
-#: src/common/weechat.c:512
+#: src/common/weechat.c:584
#, c-format
msgid "%s unable to create ~/.weechat directory\n"
msgstr "%s impossible de créer le répertoire ~/.weechat\n"
-#: src/common/weechat.c:564
+#: src/common/weechat.c:636
#, c-format
msgid "%s unable to create ~/.weechat/logs directory\n"
msgstr "%s impossible de créer le répertoire ~/.weechat/logs\n"
-#: src/common/weechat.c:607
+#: src/common/weechat.c:679
#, c-format
msgid "%s unable to create/append to log file (~/.weechat/%s)"
msgstr "%s impossible de créer/ajouter dans le fichier de log (~/.weechat/%s)"
-#: src/common/weechat.c:630
+#: src/common/weechat.c:702
#, c-format
msgid "%sWelcome to "
msgstr "%sBienvenue dans "
-#: src/common/weechat.c:643 src/common/weechat.c:652
+#: src/common/weechat.c:715 src/common/weechat.c:724
msgid "compiled on"
msgstr "compilé le"
@@ -3295,33 +3421,33 @@ msgstr "Erreur WeeChat:"
msgid "WeeChat Warning:"
msgstr "Avertissement WeeChat:"
-#: src/common/weeconfig.c:90 src/common/weeconfig.c:91
+#: src/common/weeconfig.c:91 src/common/weeconfig.c:92
msgid "set title for window (terminal for Curses GUI) with name & version"
msgstr ""
"définit le titre de la fenêtre (terminal pour l'interface Curses) avec le "
"nom et la version"
-#: src/common/weeconfig.c:94 src/common/weeconfig.c:95
+#: src/common/weeconfig.c:95 src/common/weeconfig.c:96
msgid "display WeeChat logo at startup"
msgstr "afficher le logo WeeChat au démarrage"
-#: src/common/weeconfig.c:98 src/common/weeconfig.c:99
+#: src/common/weeconfig.c:99 src/common/weeconfig.c:100
msgid "display WeeChat version at startup"
msgstr "afficher la version de WeeChat au démarrage"
-#: src/common/weeconfig.c:102
+#: src/common/weeconfig.c:103
msgid "WeeChat slogan"
msgstr "slogan WeeChat"
-#: src/common/weeconfig.c:103
+#: src/common/weeconfig.c:104
msgid "WeeChat slogan (if empty, slogan is not used)"
msgstr "slogan WeeChat (si vide, le slogan ne sera pas utilisé)"
-#: src/common/weeconfig.c:106
+#: src/common/weeconfig.c:107
msgid "charset for decoding messages from server"
msgstr "jeu de caractères pour décoder les messages du serveur"
-#: src/common/weeconfig.c:107
+#: src/common/weeconfig.c:108
msgid ""
"charset for decoding messages from server, examples: UTF-8, ISO-8859-1 (if "
"empty, messages are not converted)"
@@ -3329,11 +3455,11 @@ msgstr ""
"jeu de caractères pour décoder les messages du serveur, exemples: UTF-8, ISO-"
"8859-1 (si non renseigné, les messages ne sont pas convertis)"
-#: src/common/weeconfig.c:110
+#: src/common/weeconfig.c:111
msgid "charset for encoding messages sent to server"
msgstr "jeu de caractères pour encoder les messages envoyés au serveur"
-#: src/common/weeconfig.c:111
+#: src/common/weeconfig.c:112
msgid ""
"charset for encoding messages sent to server, examples: UFT-8, ISO-8859-1 "
"(if empty, local charset is used)"
@@ -3341,11 +3467,11 @@ msgstr ""
"jeu de caractères pour encoder les messages envoyés au serveur, exemples: "
"UFT-8, ISO-8859-1 (si non renseigné, le jeu de caractères local est utilisé)"
-#: src/common/weeconfig.c:114
+#: src/common/weeconfig.c:115
msgid "internal WeeChat charset (should be ISO)"
msgstr "jeu de caractères interne à WeeChat (devrait être ISO)"
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:116
msgid ""
"internal WeeChat charset, should be ISO-xxxx even if locale is UTF-8 (if "
"empty, local charset is used)"
@@ -3353,45 +3479,45 @@ msgstr ""
"jeu de caractères interne à WeeChat, devrait être ISO-xxxx même si la locale "
"est UTF-8 (si non renseigné, le jeu de caractères local est utilisé)"
-#: src/common/weeconfig.c:118 src/common/weeconfig.c:119
+#: src/common/weeconfig.c:119 src/common/weeconfig.c:120
msgid "timestamp for buffers"
msgstr "horodatage pour les tampons"
-#: src/common/weeconfig.c:122 src/common/weeconfig.c:123
+#: src/common/weeconfig.c:123 src/common/weeconfig.c:124
msgid "display nick names with different colors"
msgstr "afficher les utilisateurs avec différentes couleurs"
-#: src/common/weeconfig.c:126 src/common/weeconfig.c:127
+#: src/common/weeconfig.c:127 src/common/weeconfig.c:128
msgid "display actions with different colors"
msgstr "afficher les actions avec différentes couleurs"
-#: src/common/weeconfig.c:130 src/common/weeconfig.c:131
+#: src/common/weeconfig.c:131 src/common/weeconfig.c:132
msgid "remove colors from incoming messages"
msgstr "supprimer les couleurs dans les messages entrants"
-#: src/common/weeconfig.c:134
+#: src/common/weeconfig.c:135
msgid "display nicklist window"
msgstr "afficher la fenêtre des utilisateurs"
-#: src/common/weeconfig.c:135
+#: src/common/weeconfig.c:136
msgid "display nicklist window (for channel windows)"
msgstr "afficher la fenêtre des utilisateurs (pour les fenêtres de canaux)"
-#: src/common/weeconfig.c:138
+#: src/common/weeconfig.c:139
msgid "nicklist position"
msgstr "position de la fenêtre d'utilisateurs"
-#: src/common/weeconfig.c:139
+#: src/common/weeconfig.c:140
msgid "nicklist position (top, left, right (default), bottom)"
msgstr ""
"position de la fenêtre d'utilisateurs (haut (top), gauche (left), droite "
"(right, par défaut), bas (bottom))"
-#: src/common/weeconfig.c:142
+#: src/common/weeconfig.c:143
msgid "min size for nicklist"
msgstr "taille minimum pour la fenêtre d'utilisateurs"
-#: src/common/weeconfig.c:143
+#: src/common/weeconfig.c:144
msgid ""
"min size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no min size))"
@@ -3399,11 +3525,11 @@ msgstr ""
"taille minimum pour la fenêtre d'utilisateurs (largeur ou hauteur, selon "
"look_nicklist_position (0 = pas de taille minimum))"
-#: src/common/weeconfig.c:147
+#: src/common/weeconfig.c:148
msgid "max size for nicklist"
msgstr "taille maximum pour la fenêtre d'utilisateurs"
-#: src/common/weeconfig.c:148
+#: src/common/weeconfig.c:149
msgid ""
"max size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no max size; if min == max and > 0, then size is fixed))"
@@ -3412,43 +3538,43 @@ msgstr ""
"look_nicklist_position (0 = pas de taille maximum; si min == max et > 0, "
"alors la taille est fixe))"
-#: src/common/weeconfig.c:152 src/common/weeconfig.c:153
+#: src/common/weeconfig.c:153 src/common/weeconfig.c:154
msgid "text to display instead of nick when not connected"
msgstr ""
"texte à afficher en lieu et place du nom d'utilisateur lorsque la connexion "
"n'est pas active"
-#: src/common/weeconfig.c:156 src/common/weeconfig.c:157
+#: src/common/weeconfig.c:157 src/common/weeconfig.c:158
msgid "display nick mode ((half)op/voice) before each nick"
msgstr ""
"afficher le mode de l'utilisateur ((half)op/voice) devant chaque utilisateur"
-#: src/common/weeconfig.c:160 src/common/weeconfig.c:161
+#: src/common/weeconfig.c:161 src/common/weeconfig.c:162
msgid "display space if nick mode is not (half)op/voice"
msgstr "afficher un espace si le mode utilisateur n'est pas (half)op/voice"
-#: src/common/weeconfig.c:164 src/common/weeconfig.c:165
+#: src/common/weeconfig.c:165 src/common/weeconfig.c:166
msgid "the string inserted after nick completion"
msgstr "la chaîne affichée après la complétion des utilisateurs"
-#: src/common/weeconfig.c:168 src/common/weeconfig.c:169
+#: src/common/weeconfig.c:169 src/common/weeconfig.c:170
msgid "enable info bar"
msgstr "active la barre d'infos"
-#: src/common/weeconfig.c:172 src/common/weeconfig.c:173
+#: src/common/weeconfig.c:173 src/common/weeconfig.c:174
msgid "timestamp for time in infobar"
msgstr "horodatage pour les conversations sauvegardées"
-#: src/common/weeconfig.c:176 src/common/weeconfig.c:177
+#: src/common/weeconfig.c:177 src/common/weeconfig.c:178
msgid "display seconds in infobar time"
msgstr "afficher les secondes pour l'heure dans la barre d'infos"
-#: src/common/weeconfig.c:180
+#: src/common/weeconfig.c:181
msgid "delay (in seconds) for highlight messages in infobar"
msgstr ""
"délai (en seconds) pour la notification des messages dans la barre d'infos"
-#: src/common/weeconfig.c:181
+#: src/common/weeconfig.c:182
msgid ""
"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
"notifications in infobar)"
@@ -3456,280 +3582,280 @@ msgstr ""
"délai (en secondes) pour la notification des messages dans la barre d'infos "
"(0 = désactiver les notifications dans la barre d'infos)"
-#: src/common/weeconfig.c:243 src/common/weeconfig.c:244
+#: src/common/weeconfig.c:244 src/common/weeconfig.c:245
msgid "color for title bar"
msgstr "couleur pour la barre de titre"
-#: src/common/weeconfig.c:247 src/common/weeconfig.c:248
+#: src/common/weeconfig.c:248 src/common/weeconfig.c:249
msgid "background for title bar"
msgstr "couleur de fond pour la barre de titre"
-#: src/common/weeconfig.c:253 src/common/weeconfig.c:254
+#: src/common/weeconfig.c:254 src/common/weeconfig.c:255
msgid "color for chat text"
msgstr "couleur pour le texte de discussion"
-#: src/common/weeconfig.c:257
+#: src/common/weeconfig.c:258
msgid "color for time"
msgstr "couleur pour l'heure"
-#: src/common/weeconfig.c:258
+#: src/common/weeconfig.c:259
msgid "color for time in chat window"
msgstr "couleur pour l'heure dans la fenêtre de discussion"
-#: src/common/weeconfig.c:261
+#: src/common/weeconfig.c:262
msgid "color for time separator"
msgstr "couleur pour le séparateur de l'heure"
-#: src/common/weeconfig.c:262
+#: src/common/weeconfig.c:263
msgid "color for time separator (chat window)"
msgstr "couleur pour la séparation de l'heure (fenêtre de discussion)"
-#: src/common/weeconfig.c:265 src/common/weeconfig.c:266
+#: src/common/weeconfig.c:266 src/common/weeconfig.c:267
msgid "color for 1st and 3rd char of prefix"
msgstr "couleur pour le 1er et le 3ème caractère du préfixe"
-#: src/common/weeconfig.c:269 src/common/weeconfig.c:270
+#: src/common/weeconfig.c:270 src/common/weeconfig.c:271
msgid "color for middle char of prefix"
msgstr "couleur pour le caractère du milieu du préfixe"
-#: src/common/weeconfig.c:273 src/common/weeconfig.c:274
+#: src/common/weeconfig.c:274 src/common/weeconfig.c:275
msgid "color for join arrow (prefix)"
msgstr "couleur pour la flèche du join (préfixe)"
-#: src/common/weeconfig.c:277 src/common/weeconfig.c:278
+#: src/common/weeconfig.c:278 src/common/weeconfig.c:279
msgid "color for part/quit arrow (prefix)"
msgstr "couleur pour la flèche du part/quit (préfixe)"
-#: src/common/weeconfig.c:281
+#: src/common/weeconfig.c:282
msgid "color for nicks in actions"
msgstr "couleur pour les noms d'utilisateur dans les actions"
-#: src/common/weeconfig.c:282
+#: src/common/weeconfig.c:283
msgid "color for nicks in actions (chat window)"
msgstr ""
"couleur pour les noms d'utilisateurs dans les actions (fenêtre de discussion)"
-#: src/common/weeconfig.c:285
+#: src/common/weeconfig.c:286
msgid "color for hostnames"
msgstr "couleur pour les noms de machines"
-#: src/common/weeconfig.c:286
+#: src/common/weeconfig.c:287
msgid "color for hostnames (chat window)"
msgstr "couleur pour les noms de machines (fenêtre de discussion)"
-#: src/common/weeconfig.c:289
+#: src/common/weeconfig.c:290
msgid "color for channel names in actions"
msgstr "couleur pour les canaux dans les actions"
-#: src/common/weeconfig.c:290
+#: src/common/weeconfig.c:291
msgid "color for channel names in actions (chat window)"
msgstr "couleur pour les canaux dans les actions (fenêtre de discussion)"
-#: src/common/weeconfig.c:293
+#: src/common/weeconfig.c:294
msgid "color for dark separators"
msgstr "couleur pour les séparateurs sombres"
-#: src/common/weeconfig.c:294
+#: src/common/weeconfig.c:295
msgid "color for dark separators (chat window)"
msgstr "couleur pour les séparateurs sombres (fenêtre de discussion)"
-#: src/common/weeconfig.c:297
+#: src/common/weeconfig.c:298
msgid "color for highlighted nick"
msgstr "couleur pour le pseudo surligné"
-#: src/common/weeconfig.c:298
+#: src/common/weeconfig.c:299
msgid "color for highlighted nick (chat window)"
msgstr "couleur pour le pseudo surligné (fenêtre de discussion)"
-#: src/common/weeconfig.c:301
+#: src/common/weeconfig.c:302
msgid "background for chat"
msgstr "couleur de fond pour la discussion"
-#: src/common/weeconfig.c:302
+#: src/common/weeconfig.c:303
msgid "background for chat window"
msgstr "couleur de fond pour la fenêtre de discussion"
-#: src/common/weeconfig.c:307 src/common/weeconfig.c:308
+#: src/common/weeconfig.c:308 src/common/weeconfig.c:309
msgid "color for status bar"
msgstr "couleur pour la barre de statut"
-#: src/common/weeconfig.c:311 src/common/weeconfig.c:312
+#: src/common/weeconfig.c:312 src/common/weeconfig.c:313
msgid "color for status bar delimiters"
msgstr "couleur pour les délimiteurs de la barre de statut"
-#: src/common/weeconfig.c:315
+#: src/common/weeconfig.c:316
msgid "color for window with new messages"
msgstr "couleur pour une fenêtre avec de nouvelles infos"
-#: src/common/weeconfig.c:316
+#: src/common/weeconfig.c:317
msgid "color for window with new messages (status bar)"
msgstr "couleur pour une fenêtre avec de nouvelles infos (barre de statut)"
-#: src/common/weeconfig.c:319
+#: src/common/weeconfig.c:320
msgid "color for window with private message"
msgstr "couleur pour une fenêtre avec un message privé"
-#: src/common/weeconfig.c:320
+#: src/common/weeconfig.c:321
msgid "color for window with private message (status bar)"
msgstr "couleur pour une fenêtre avec un message privé (barre de statut)"
-#: src/common/weeconfig.c:323
+#: src/common/weeconfig.c:324
msgid "color for window with highlight"
msgstr "couleur pour une fenêtre avec un highlight"
-#: src/common/weeconfig.c:324
+#: src/common/weeconfig.c:325
msgid "color for window with highlight (status bar)"
msgstr "couleur pour une fenêtre avec un highlight (barre de statut)"
-#: src/common/weeconfig.c:327
+#: src/common/weeconfig.c:328
msgid "color for window with new data (not messages)"
msgstr "couleur pour une fenêtre avec des nouvelles données (pas des infos)"
-#: src/common/weeconfig.c:328
+#: src/common/weeconfig.c:329
msgid "color for window with new data (not messages) (status bar)"
msgstr ""
"couleur pour une fenêtre avec des nouvelles données (pas des infos) (barre "
"de statut)"
-#: src/common/weeconfig.c:331
+#: src/common/weeconfig.c:332
msgid "color for \"-MORE-\" text"
msgstr "couleur pour le texte \"-PLUS-\""
-#: src/common/weeconfig.c:332
+#: src/common/weeconfig.c:333
msgid "color for window with new data (status bar)"
msgstr "couleur pour une fenêtre avec des nouvelles données (barre de statut)"
-#: src/common/weeconfig.c:335 src/common/weeconfig.c:336
+#: src/common/weeconfig.c:336 src/common/weeconfig.c:337
msgid "background for status window"
msgstr "couleur de fond pour la fenêtre de statut"
-#: src/common/weeconfig.c:341 src/common/weeconfig.c:342
+#: src/common/weeconfig.c:342 src/common/weeconfig.c:343
msgid "color for info bar text"
msgstr "couleur pour la barre d'infos"
-#: src/common/weeconfig.c:345 src/common/weeconfig.c:346
+#: src/common/weeconfig.c:346 src/common/weeconfig.c:347
msgid "color for infobar delimiters"
msgstr "couleur pour les délimiteurs de la barre d'infos"
-#: src/common/weeconfig.c:349 src/common/weeconfig.c:350
+#: src/common/weeconfig.c:350 src/common/weeconfig.c:351
msgid "color for info bar highlight notification"
msgstr "couleur pour la notification dans la barre d'infos"
-#: src/common/weeconfig.c:353 src/common/weeconfig.c:354
+#: src/common/weeconfig.c:354 src/common/weeconfig.c:355
msgid "background for info bar window"
msgstr "couleur de fond pour la fenêtre de barre d'infos"
-#: src/common/weeconfig.c:359 src/common/weeconfig.c:360
+#: src/common/weeconfig.c:360 src/common/weeconfig.c:361
msgid "color for input text"
msgstr "couleur pour le texte saisi"
-#: src/common/weeconfig.c:363 src/common/weeconfig.c:364
+#: src/common/weeconfig.c:364 src/common/weeconfig.c:365
msgid "color for input text (channel name)"
msgstr "couleur pour le texte saisi (nom du canal)"
-#: src/common/weeconfig.c:367 src/common/weeconfig.c:368
+#: src/common/weeconfig.c:368 src/common/weeconfig.c:369
msgid "color for input text (nick name)"
msgstr "couleur pour le texte saisi (pseudo)"
-#: src/common/weeconfig.c:371 src/common/weeconfig.c:372
+#: src/common/weeconfig.c:372 src/common/weeconfig.c:373
msgid "background for input window"
msgstr "couleur de fond pour la fenêtre de saisie"
-#: src/common/weeconfig.c:377 src/common/weeconfig.c:378
+#: src/common/weeconfig.c:378 src/common/weeconfig.c:379
msgid "color for nicknames"
msgstr "couleur pour les pseudos"
-#: src/common/weeconfig.c:381 src/common/weeconfig.c:382
+#: src/common/weeconfig.c:382 src/common/weeconfig.c:383
msgid "color for away nicknames"
msgstr "couleur pour les pseudos absents"
-#: src/common/weeconfig.c:385
+#: src/common/weeconfig.c:386
msgid "color for chan owner symbol"
msgstr "couleur pour le symbole du propriétaire du canal"
-#: src/common/weeconfig.c:386
+#: src/common/weeconfig.c:387
msgid "color for chan owner symbol (specific to unrealircd)"
msgstr ""
"couleur pour le symbole du propriétaire du canal (spécifique à unrealircd)"
-#: src/common/weeconfig.c:389
+#: src/common/weeconfig.c:390
msgid "color for chan admin symbol"
msgstr "couleur pour le symbole administrateur du canal"
-#: src/common/weeconfig.c:390
+#: src/common/weeconfig.c:391
msgid "color for chan admin symbol (specific to unrealircd)"
msgstr ""
"couleur pour le symbole administrateur du canal (spécifique à unrealircd)"
-#: src/common/weeconfig.c:393 src/common/weeconfig.c:394
+#: src/common/weeconfig.c:394 src/common/weeconfig.c:395
msgid "color for operator symbol"
msgstr "couleur pour le symbole opérateur"
-#: src/common/weeconfig.c:397 src/common/weeconfig.c:398
+#: src/common/weeconfig.c:398 src/common/weeconfig.c:399
msgid "color for half-operator symbol"
msgstr "couleur pour le symbole demi-opérateur"
-#: src/common/weeconfig.c:401 src/common/weeconfig.c:402
+#: src/common/weeconfig.c:402 src/common/weeconfig.c:403
msgid "color for voice symbol"
msgstr "couleur pour le symbole voix"
-#: src/common/weeconfig.c:405 src/common/weeconfig.c:406
+#: src/common/weeconfig.c:406 src/common/weeconfig.c:407
msgid "color for '+' when scrolling nicks"
msgstr "couleur pour les '+' lors du scroll sur les pseudos"
-#: src/common/weeconfig.c:409 src/common/weeconfig.c:410
+#: src/common/weeconfig.c:410 src/common/weeconfig.c:411
msgid "color for nick separator"
msgstr "couleur pour le séparateur de pseudo"
-#: src/common/weeconfig.c:413 src/common/weeconfig.c:414
+#: src/common/weeconfig.c:414 src/common/weeconfig.c:415
msgid "color for local nick"
msgstr "couleur pour le pseudo local"
-#: src/common/weeconfig.c:417 src/common/weeconfig.c:418
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
msgid "color for other nick in private window"
msgstr "couleur pour l'autre pseudo dans la fenêtre privée"
-#: src/common/weeconfig.c:421 src/common/weeconfig.c:422
+#: src/common/weeconfig.c:422 src/common/weeconfig.c:423
msgid "background for nicknames"
msgstr "couleur de fond pour les pseudos"
-#: src/common/weeconfig.c:427
+#: src/common/weeconfig.c:428
msgid "color for selected DCC"
msgstr "couleur pour le DCC sélectionné"
-#: src/common/weeconfig.c:428
+#: src/common/weeconfig.c:429
msgid "color for selected DCC (chat window)"
msgstr "couleur pour le DCC sélectionné (fenêtre de discussion)"
-#: src/common/weeconfig.c:431 src/common/weeconfig.c:432
+#: src/common/weeconfig.c:432 src/common/weeconfig.c:433
msgid "color for \"waiting\" dcc status"
msgstr "couleur pour le statut dcc \"attente\""
-#: src/common/weeconfig.c:435 src/common/weeconfig.c:436
+#: src/common/weeconfig.c:436 src/common/weeconfig.c:437
msgid "color for \"connecting\" dcc status"
msgstr "couleur pour le statut dcc \"connexion\""
-#: src/common/weeconfig.c:439 src/common/weeconfig.c:440
+#: src/common/weeconfig.c:440 src/common/weeconfig.c:441
msgid "color for \"active\" dcc status"
msgstr "couleur pour le statut dcc \"actif\""
-#: src/common/weeconfig.c:443 src/common/weeconfig.c:444
+#: src/common/weeconfig.c:444 src/common/weeconfig.c:445
msgid "color for \"done\" dcc status"
msgstr "couleur pour le statut dcc \"terminé\""
-#: src/common/weeconfig.c:447 src/common/weeconfig.c:448
+#: src/common/weeconfig.c:448 src/common/weeconfig.c:449
msgid "color for \"failed\" dcc status"
msgstr "couleur pour le statut dcc \"échoué\""
-#: src/common/weeconfig.c:451 src/common/weeconfig.c:452
+#: src/common/weeconfig.c:452 src/common/weeconfig.c:453
msgid "color for \"aborted\" dcc status"
msgstr "couleur pour le statut dcc \"interrompu\""
-#: src/common/weeconfig.c:465
+#: src/common/weeconfig.c:466
msgid "max lines in history (per window)"
msgstr "nombre maxi de lignes dans l'historique (par fenêtre)"
-#: src/common/weeconfig.c:466
+#: src/common/weeconfig.c:467
msgid ""
"maximum number of lines in history for one server/channel/private window (0 "
"= unlimited)"
@@ -3737,350 +3863,350 @@ msgstr ""
"nombre maximum de lignes dans l'historique pour un serveur/fenêtre/fenêtre "
"privée (0 = sans limite)"
-#: src/common/weeconfig.c:470
+#: src/common/weeconfig.c:471
msgid "max user commands in history"
msgstr "nombre maxi de commandes utilisateur dans l'historique"
-#: src/common/weeconfig.c:471
+#: src/common/weeconfig.c:472
msgid "maximum number of user commands in history (0 = unlimited)"
msgstr ""
"nombre maximum de commandes utilisateur dans l'historique (0 = sans limite)"
-#: src/common/weeconfig.c:488 src/common/weeconfig.c:489
+#: src/common/weeconfig.c:489 src/common/weeconfig.c:490
msgid "automatically log server messages"
msgstr "enregistrer automatiquement les messages du serveur"
-#: src/common/weeconfig.c:492 src/common/weeconfig.c:493
+#: src/common/weeconfig.c:493 src/common/weeconfig.c:494
msgid "automatically log channel chats"
msgstr "enregistrer automatiquement les conversations des canaux"
-#: src/common/weeconfig.c:496 src/common/weeconfig.c:497
+#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
msgid "automatically log private chats"
msgstr "enregistrer automatiquement les conversations privées"
-#: src/common/weeconfig.c:500 src/common/weeconfig.c:501
+#: src/common/weeconfig.c:501 src/common/weeconfig.c:502
msgid "log messages from plugins (scripts)"
msgstr "enregistrer les messages des plugins (scripts)"
-#: src/common/weeconfig.c:504
+#: src/common/weeconfig.c:505
msgid "path for log files"
msgstr "chemin pour les conversations sauvegardées"
-#: src/common/weeconfig.c:505
+#: src/common/weeconfig.c:506
msgid "path for WeeChat log files"
msgstr "chemin pour les conversations sauvegardées par WeeChat"
-#: src/common/weeconfig.c:508
+#: src/common/weeconfig.c:509
msgid "timestamp for log"
msgstr "horodatage pour les conversations sauvegardées"
-#: src/common/weeconfig.c:509
+#: src/common/weeconfig.c:510
msgid "timestamp for log (see man strftime for date/time specifiers)"
msgstr ""
"horodatage pour les conversations sauvegardées (voir man strftime pour le "
"format de date/heure)"
-#: src/common/weeconfig.c:512 src/common/weeconfig.c:513
+#: src/common/weeconfig.c:513 src/common/weeconfig.c:514
msgid "hide password displayed by nickserv"
msgstr "masquer le mot de passe affiché par nickserv"
-#: src/common/weeconfig.c:533
+#: src/common/weeconfig.c:534
msgid "display message to all channels when away"
msgstr "affiche un message sur tous les canaux pour l'absence"
-#: src/common/weeconfig.c:534
+#: src/common/weeconfig.c:535
msgid "display message to all channels when (un)marking as away"
msgstr "affiche un message sur tous les canaux pour l'absence/le retour"
-#: src/common/weeconfig.c:537 src/common/weeconfig.c:538
+#: src/common/weeconfig.c:538 src/common/weeconfig.c:539
msgid "default message when away"
msgstr "message par défaut pour l'absence"
-#: src/common/weeconfig.c:541 src/common/weeconfig.c:542
+#: src/common/weeconfig.c:542 src/common/weeconfig.c:543
msgid "default part message (leaving channel)"
msgstr "message par défaut pour le part (quitte un canal)"
-#: src/common/weeconfig.c:545
+#: src/common/weeconfig.c:546
msgid "default quit message"
msgstr "message de fin par défaut"
-#: src/common/weeconfig.c:546
+#: src/common/weeconfig.c:547
msgid ""
"default quit message ('%v' will be replaced by WeeChat version in string)"
msgstr ""
"message de fin par défaut ('%v' sera remplacé par la version de WeeChat dans "
"la chaîne)"
-#: src/common/weeconfig.c:549
+#: src/common/weeconfig.c:550
msgid "interval between two checks for away"
msgstr "intervalle entre deux vérifications des absences"
-#: src/common/weeconfig.c:550
+#: src/common/weeconfig.c:551
msgid "interval between two checks for away (in minutes, 0 = never check)"
msgstr ""
"intervalle entre deux vérifications des absences (en minutes, 0 = ne jemais "
"vérifier)"
-#: src/common/weeconfig.c:553
+#: src/common/weeconfig.c:554
msgid "interval between two checks for lag"
msgstr "intervalle entre deux mesures de lag"
-#: src/common/weeconfig.c:554
+#: src/common/weeconfig.c:555
msgid "interval between two checks for lag (in seconds)"
msgstr "intervalle entre deux mesures de lag (en secondes)"
-#: src/common/weeconfig.c:557
+#: src/common/weeconfig.c:558
msgid "minimum lag to show"
msgstr "lag minimum à afficher"
-#: src/common/weeconfig.c:558
+#: src/common/weeconfig.c:559
msgid "minimum lag to show (in seconds)"
msgstr "lag minimum à afficher (en secondes)"
-#: src/common/weeconfig.c:561
+#: src/common/weeconfig.c:562
msgid "disconnect after important lag"
msgstr "déconnexion après un lag important"
-#: src/common/weeconfig.c:562
+#: src/common/weeconfig.c:563
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
msgstr ""
"déconnexion après un lag important (en minutes, 0 = ne jamais se déconnecter)"
-#: src/common/weeconfig.c:565 src/common/weeconfig.c:566
+#: src/common/weeconfig.c:566 src/common/weeconfig.c:567
msgid "create a FIFO pipe for remote control"
msgstr "créer un tube FIFO pour le contrôle à distance"
-#: src/common/weeconfig.c:569
+#: src/common/weeconfig.c:570
msgid "list of words to highlight"
msgstr "liste de mots pour la notification"
-#: src/common/weeconfig.c:570
+#: src/common/weeconfig.c:571
msgid ""
"comma separated list of words to highlight (case insensitive comparison)"
msgstr ""
"liste des mots pour la notification (séparés par des virgules, le "
"comparaison ne tient pas compte de la casse)"
-#: src/common/weeconfig.c:589
+#: src/common/weeconfig.c:590
msgid "automatically accept dcc files"
msgstr "accepte automatiquement les fichiers dcc"
-#: src/common/weeconfig.c:590
+#: src/common/weeconfig.c:591
msgid "automatically accept incoming dcc files"
msgstr "accepte automatiquement les fichiers dcc entrants"
-#: src/common/weeconfig.c:593
+#: src/common/weeconfig.c:594
msgid "automatically accept dcc chats"
msgstr "accepte automatiquement les demandes de discussion dcc"
-#: src/common/weeconfig.c:594
+#: src/common/weeconfig.c:595
msgid "automatically accept dcc chats (use carefully!)"
msgstr ""
"accepte automatiquement les demandes de discussion dcc (à utiliser avec "
"précaution !)"
-#: src/common/weeconfig.c:597
+#: src/common/weeconfig.c:598
msgid "timeout for dcc request"
msgstr "délai d'attente pour les requêtes dcc"
-#: src/common/weeconfig.c:598
+#: src/common/weeconfig.c:599
msgid "timeout for dcc request (in seconds)"
msgstr "délai d'attente pour les requêtes dcc (en secondes)"
-#: src/common/weeconfig.c:601
+#: src/common/weeconfig.c:602
msgid "block size for dcc packets"
msgstr "taille de bloc pour les paquets dcc"
-#: src/common/weeconfig.c:602
+#: src/common/weeconfig.c:603
msgid "block size for dcc packets in bytes (default: 65536)"
msgstr "taille de bloc pour les paquets dcc en octets (défaut: 65536)"
-#: src/common/weeconfig.c:605
+#: src/common/weeconfig.c:606
msgid "path for incoming files with dcc"
msgstr "chemin les fichiers reçus par dcc"
-#: src/common/weeconfig.c:606
+#: src/common/weeconfig.c:607
msgid "path for writing incoming files with dcc (default: user home)"
msgstr ""
"chemin pour écrire les fichiers reçus par dcc (par défaut: répertoire de "
"l'utilisateur)"
-#: src/common/weeconfig.c:609
+#: src/common/weeconfig.c:610
msgid "default path for sending files with dcc"
msgstr "chemin par défaut pour envoyer les fichiers par dcc"
-#: src/common/weeconfig.c:610
+#: src/common/weeconfig.c:611
msgid ""
"path for reading files when sending thru dcc (when no path is specified)"
msgstr ""
"chemin pour lire les fichiers lorsqu'ils sont envoyés par dcc (quand aucun "
"chemin n'est spécifié)"
-#: src/common/weeconfig.c:613 src/common/weeconfig.c:614
+#: src/common/weeconfig.c:614 src/common/weeconfig.c:615
msgid "convert spaces to underscores when sending files"
msgstr "convertir les espaces en underscores lors d'envoi de fichiers"
-#: src/common/weeconfig.c:617
+#: src/common/weeconfig.c:618
msgid "automatically rename dcc files if already exists"
msgstr "renomme automatiquement les fichiers dcc s'ils existent déjà"
-#: src/common/weeconfig.c:618
+#: src/common/weeconfig.c:619
msgid "rename incoming files if already exists (add '.1', '.2', ...)"
msgstr ""
"renommer les fichiers reçus s'ils existent déjà (ajoute '.1', '.2', ...)"
-#: src/common/weeconfig.c:621
+#: src/common/weeconfig.c:622
msgid "automatically resume aborted transfers"
msgstr "continuer automatiquement les transferts non terminés"
-#: src/common/weeconfig.c:622
+#: src/common/weeconfig.c:623
msgid ""
"automatically resume dcc transfer if connection with remote host is loosed"
msgstr ""
"continuer automatiquement les transferts dcc si la connexion avec la machine "
"distante a été perdue"
-#: src/common/weeconfig.c:641
+#: src/common/weeconfig.c:642
msgid "use proxy"
msgstr "utiliser un proxy"
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:643
msgid "use a proxy server to connect to irc server"
msgstr "utiliser un proxy pour se connecter au serveur irc"
-#: src/common/weeconfig.c:645
+#: src/common/weeconfig.c:646
msgid "proxy type"
msgstr "type de proxy"
-#: src/common/weeconfig.c:646
+#: src/common/weeconfig.c:647
msgid "proxy type (http (default), socks4, socks5)"
msgstr "type de proxy (http (défaut), socks4, socks5)"
-#: src/common/weeconfig.c:649
+#: src/common/weeconfig.c:650
msgid "use ipv6 proxy"
msgstr "utiliser un proxy ipv6"
-#: src/common/weeconfig.c:650
+#: src/common/weeconfig.c:651
msgid "connect to proxy in ipv6"
msgstr "se connecter au proxy en ipv6"
-#: src/common/weeconfig.c:653
+#: src/common/weeconfig.c:654
msgid "proxy address"
msgstr "adresse du proxy"
-#: src/common/weeconfig.c:654
+#: src/common/weeconfig.c:655
msgid "proxy server address (IP or hostname)"
msgstr "adresse du serveur proxy (IP ou nom)"
-#: src/common/weeconfig.c:657
+#: src/common/weeconfig.c:658
msgid "port for proxy"
msgstr "port pour le proxy"
-#: src/common/weeconfig.c:658
+#: src/common/weeconfig.c:659
msgid "port for connecting to proxy server"
msgstr "port pour se connecter au serveur proxy"
-#: src/common/weeconfig.c:661
+#: src/common/weeconfig.c:662
msgid "proxy username"
msgstr "nom d'utilisateur proxy"
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:663
msgid "username for proxy server"
msgstr "nom d'utilisateur pour le serveur proxy"
-#: src/common/weeconfig.c:665
+#: src/common/weeconfig.c:666
msgid "proxy password"
msgstr "mot de passe pour le proxy"
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:667
msgid "password for proxy server"
msgstr "mot de passe pour le serveur proxy"
-#: src/common/weeconfig.c:677
+#: src/common/weeconfig.c:678
msgid "server name"
msgstr "nom du serveur"
-#: src/common/weeconfig.c:678
+#: src/common/weeconfig.c:679
msgid "name associated to IRC server (for display only)"
msgstr "nom associé au serveur IRC (pour affichage seulement)"
-#: src/common/weeconfig.c:681
+#: src/common/weeconfig.c:682
msgid "automatically connect to server"
msgstr "connexion automatique au serveur"
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:683
msgid "automatically connect to server when WeeChat is starting"
msgstr "connexion automatique au serveur quand WeeChat démarre"
-#: src/common/weeconfig.c:685
+#: src/common/weeconfig.c:686
msgid "automatically reconnect to server"
msgstr "reconnexion automatique au serveur"
-#: src/common/weeconfig.c:686
+#: src/common/weeconfig.c:687
msgid "automatically reconnect to server when disconnected"
msgstr "reconnexion automatique au serveur après une déconnexion"
-#: src/common/weeconfig.c:689
+#: src/common/weeconfig.c:690
msgid "delay before trying again to reconnect"
msgstr "délai avant de tenter une reconnexion"
-#: src/common/weeconfig.c:690
+#: src/common/weeconfig.c:691
msgid "delay (in seconds) before trying again to reconnect to server"
msgstr "délai (en secondes) avant de tenter une reconnexion au serveur"
-#: src/common/weeconfig.c:693
+#: src/common/weeconfig.c:694
msgid "server address or hostname"
msgstr "adresse ou nom du serveur"
-#: src/common/weeconfig.c:694
+#: src/common/weeconfig.c:695
msgid "IP address or hostname of IRC server"
msgstr "adresse IP ou nom du serveur IRC"
-#: src/common/weeconfig.c:697
+#: src/common/weeconfig.c:698
msgid "port for IRC server"
msgstr "port pour le serveur IRC"
-#: src/common/weeconfig.c:698
+#: src/common/weeconfig.c:699
msgid "port for connecting to server"
msgstr "port pour se connecter au serveur"
-#: src/common/weeconfig.c:701 src/common/weeconfig.c:702
+#: src/common/weeconfig.c:702 src/common/weeconfig.c:703
msgid "use IPv6 protocol for server communication"
msgstr "utiliser le protocole IPv6 pour la communication avec le serveur"
-#: src/common/weeconfig.c:705 src/common/weeconfig.c:706
+#: src/common/weeconfig.c:706 src/common/weeconfig.c:707
msgid "use SSL for server communication"
msgstr "utiliser SSL pour la communication avec le serveur"
-#: src/common/weeconfig.c:709
+#: src/common/weeconfig.c:710
msgid "server password"
msgstr "mot de passe pour le serveur"
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:711
msgid "password for IRC server"
msgstr "mot de passe pour le serveur IRC"
-#: src/common/weeconfig.c:713
+#: src/common/weeconfig.c:714
msgid "nickname for server"
msgstr "pseudo pour le serveur"
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:715
msgid "nickname to use on IRC server"
msgstr "pseudo à utiliser sur le serveur IRC"
-#: src/common/weeconfig.c:717
+#: src/common/weeconfig.c:718
msgid "alternate nickname for server"
msgstr "pseudo alternatif pour le serveur"
-#: src/common/weeconfig.c:718
+#: src/common/weeconfig.c:719
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr "pseudo alternatif pour le serveur IRC (si le pseudo est déjà utilisé)"
-#: src/common/weeconfig.c:721
+#: src/common/weeconfig.c:722
msgid "2nd alternate nickname for server"
msgstr "2nd pseudo alternatif pour le serveur"
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:723
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
@@ -4088,31 +4214,31 @@ msgstr ""
"2nd pseudo alternatif pour le serveur IRC (si le pseudo alternatif est déjà "
"utilisé)"
-#: src/common/weeconfig.c:725
+#: src/common/weeconfig.c:726
msgid "user name for server"
msgstr "nom d'utilisateur pour le serveur"
-#: src/common/weeconfig.c:726
+#: src/common/weeconfig.c:727
msgid "user name to use on IRC server"
msgstr "nom d'utilisateur pour le serveur IRC"
-#: src/common/weeconfig.c:729
+#: src/common/weeconfig.c:730
msgid "real name for server"
msgstr "nom réel pour le serveur"
-#: src/common/weeconfig.c:730
+#: src/common/weeconfig.c:731
msgid "real name to use on IRC server"
msgstr "nom réel pour le serveur IRC"
-#: src/common/weeconfig.c:733 src/common/weeconfig.c:734
+#: src/common/weeconfig.c:734 src/common/weeconfig.c:735
msgid "first command to run when connected to server"
msgstr "commande à exécuter en premier lorsque connecté au serveur"
-#: src/common/weeconfig.c:737
+#: src/common/weeconfig.c:738
msgid "delay (in seconds) after command was executed"
msgstr "délai (en secondes) après exécution de la commande"
-#: src/common/weeconfig.c:738
+#: src/common/weeconfig.c:739
msgid ""
"delay (in seconds) after command was executed (example: give some time for "
"authentication)"
@@ -4120,11 +4246,11 @@ msgstr ""
"délai (en secondes) après exécution de la commande (exemple: donner du temps "
"pour l'authentification)"
-#: src/common/weeconfig.c:741
+#: src/common/weeconfig.c:742
msgid "list of channels to join when connected to server"
msgstr "liste des canaux à rejoindre lorsque connecté au serveur"
-#: src/common/weeconfig.c:742
+#: src/common/weeconfig.c:743
msgid ""
"comma separated list of channels to join when connected to server (example: "
"\"#chan1,#chan2,#chan3 #key1,#key2\")"
@@ -4132,15 +4258,15 @@ msgstr ""
"liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au "
"serveur (exemple: \"#chan1,#chan2,#chan3 #key1,#key2\")"
-#: src/common/weeconfig.c:745 src/common/weeconfig.c:746
+#: src/common/weeconfig.c:746 src/common/weeconfig.c:747
msgid "automatically rejoin channels when kicked"
msgstr "rejoindre automatiquement les canaux quand mis dehors"
-#: src/common/weeconfig.c:749
+#: src/common/weeconfig.c:750
msgid "notify levels for channels of this server"
msgstr "niveaux de notification pour les canaux de ce serveur"
-#: src/common/weeconfig.c:750
+#: src/common/weeconfig.c:751
msgid ""
"comma separated list of notify levels for channels of this server (format: "
"#channel:1,..)"
@@ -4148,64 +4274,69 @@ msgstr ""
"liste des niveaux de notifications (séparés par des virgules) pour les "
"canaux de ce serveur (format: #canal:1,..)"
-#: src/common/weeconfig.c:1210
+#: src/common/weeconfig.c:1211
#, c-format
msgid "%s %s, line %d: new server, but previous was incomplete\n"
msgstr "%s %s, ligne %d: nouveau serveur, mais le précédent était incomplet\n"
-#: src/common/weeconfig.c:1219
+#: src/common/weeconfig.c:1220
#, c-format
msgid "%s %s, line %d: server '%s' already exists\n"
msgstr "%s %s, ligne %d: le serveur '%s' existe déjà\n"
-#: src/common/weeconfig.c:1234
+#: src/common/weeconfig.c:1235
#, c-format
msgid "%s %s, line %d: unable to create server\n"
msgstr "%s %s, ligne %d: impossible de créer le serveur\n"
-#: src/common/weeconfig.c:1274
+#: src/common/weeconfig.c:1275
#, c-format
msgid "%s unable to assign default int with string (\"%s\")\n"
msgstr ""
"%s impossible d'assigner la valeur entière par défaut avec la chaîne (\"%s"
"\")\n"
-#: src/common/weeconfig.c:1285
+#: src/common/weeconfig.c:1286
#, c-format
msgid "%s unable to assign default color (\"%s\")\n"
msgstr "%s impossible d'assigner la couleur par défaut (\"%s\")\n"
-#: src/common/weeconfig.c:1324
+#: src/common/weeconfig.c:1325
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr "%s fichier de configuration \"%s\" non trouvé.\n"
-#: src/common/weeconfig.c:1356
+#: src/common/weeconfig.c:1357
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"]\"\n"
-#: src/common/weeconfig.c:1373
+#: src/common/weeconfig.c:1374
#, c-format
msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
msgstr "%s %s, ligne %d: section inconnue (\"%s\")\n"
-#: src/common/weeconfig.c:1391
+#: src/common/weeconfig.c:1392
#, c-format
msgid "%s %s, line %d: invalid section for option, line is ignored\n"
msgstr "%s %s, ligne %d: section invalide pour l'option, ligne ignorée\n"
-#: src/common/weeconfig.c:1399
+#: src/common/weeconfig.c:1400
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"=\"\n"
-#: src/common/weeconfig.c:1447
+#: src/common/weeconfig.c:1437 src/common/weeconfig.c:1463
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr "%s %s, ligne %d: option \"%s\" invalide\n"
-#: src/common/weeconfig.c:1458
+#: src/common/weeconfig.c:1443
+#, c-format
+msgid "%s %s, line %d: invalid ignore options \"%s\"\n"
+msgstr "%s %s, ligne %d: options \"%s\" invalides pour le ignore\n"
+
+#: src/common/weeconfig.c:1474
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
@@ -4214,7 +4345,7 @@ msgstr ""
"%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
"Attendu: valeur booléenne: 'off' ou 'on'\n"
-#: src/common/weeconfig.c:1467
+#: src/common/weeconfig.c:1483
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -4223,7 +4354,7 @@ msgstr ""
"%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
"Attendu: entier compris entre %d et %d\n"
-#: src/common/weeconfig.c:1478
+#: src/common/weeconfig.c:1494
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -4232,26 +4363,26 @@ msgstr ""
"%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
"Attendu: une de ces chaînes: "
-#: src/common/weeconfig.c:1494
+#: src/common/weeconfig.c:1510
#, c-format
msgid "%s %s, line %d: invalid color name for option '%s'\n"
msgstr "%s %s, ligne %d: nom de couleur invalide pour l'option '%s'\n"
-#: src/common/weeconfig.c:1556 src/common/weeconfig.c:1751
+#: src/common/weeconfig.c:1572 src/common/weeconfig.c:1767
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr "%s impossible de créer le fichier \"%s\"\n"
-#: src/common/weeconfig.c:1562
+#: src/common/weeconfig.c:1578
#, c-format
msgid "%s: creating default config file...\n"
msgstr "%s: création du fichier de configuration par défaut...\n"
-#: src/common/weeconfig.c:1563
+#: src/common/weeconfig.c:1579
msgid "Creating default config file\n"
msgstr "Création du fichier de configuration par défaut\n"
-#: src/common/weeconfig.c:1566 src/common/weeconfig.c:1760
+#: src/common/weeconfig.c:1582 src/common/weeconfig.c:1776
#, c-format
msgid ""
"#\n"
@@ -4260,6 +4391,15 @@ msgstr ""
"#\n"
"# %s: fichier de configuration, créé par %s v%s le %s#\n"
-#: src/common/weeconfig.c:1757
+#: src/common/weeconfig.c:1773
msgid "Saving config to disk\n"
msgstr "Sauvegarde de la configuration sur disque\n"
+
+#~ msgid "Ignore:\n"
+#~ msgstr "Ignore:\n"
+
+#~ msgid "IRC command"
+#~ msgstr "commande IRC"
+
+#~ msgid "channel"
+#~ msgstr "canal"
diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot
index 6c0ba3253..6f9ced29f 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-08-21 14:31+0200\n"
+"POT-Creation-Date: 2005-09-04 14:45+0200\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"
@@ -15,12 +15,12 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/irc/irc-nick.c:193
+#: src/irc/irc-nick.c:192
#, c-format
msgid "%s cannot allocate new nick\n"
msgstr ""
-#: src/irc/irc-server.c:180 src/common/weeconfig.c:1697
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1712
msgid "Unable to get user's name"
msgstr ""
@@ -107,63 +107,63 @@ msgid ""
"used)\n"
msgstr ""
-#: src/irc/irc-server.c:1360
+#: src/irc/irc-server.c:1364
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
msgstr ""
-#: src/irc/irc-server.c:1369
+#: src/irc/irc-server.c:1373
#, c-format
msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1375
+#: src/irc/irc-server.c:1379
#, c-format
msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1385
+#: src/irc/irc-server.c:1389
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1389
+#: src/irc/irc-server.c:1393
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr ""
-#: src/irc/irc-server.c:1407
+#: src/irc/irc-server.c:1411
#, c-format
msgid "%s gnutls init error\n"
msgstr ""
-#: src/irc/irc-server.c:1422
+#: src/irc/irc-server.c:1426
#, c-format
msgid "%s cannot create pipe\n"
msgstr ""
-#: src/irc/irc-server.c:1437
+#: src/irc/irc-server.c:1441
#, c-format
msgid "%s cannot create socket\n"
msgstr ""
-#: src/irc/irc-server.c:1448
+#: src/irc/irc-server.c:1452
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr ""
-#: src/irc/irc-server.c:1459
+#: src/irc/irc-server.c:1463
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr ""
-#: src/irc/irc-server.c:1490
+#: src/irc/irc-server.c:1494
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr ""
-#: src/irc/irc-server.c:1540 src/irc/irc-server.c:1549
+#: src/irc/irc-server.c:1544 src/irc/irc-server.c:1553
msgid "Disconnected from server!\n"
msgstr ""
@@ -851,355 +851,355 @@ msgstr ""
#: src/irc/irc-commands.c:317 src/irc/irc-commands.c:318
#: src/irc/irc-commands.c:319 src/irc/irc-commands.c:320
#: src/irc/irc-commands.c:321 src/irc/irc-commands.c:322
-#: src/irc/irc-commands.c:323 src/irc/irc-commands.c:367
+#: src/irc/irc-commands.c:323 src/irc/irc-commands.c:324
#: src/irc/irc-commands.c:368 src/irc/irc-commands.c:369
#: src/irc/irc-commands.c:370 src/irc/irc-commands.c:371
-#: src/irc/irc-commands.c:372
+#: src/irc/irc-commands.c:372 src/irc/irc-commands.c:373
+#: src/irc/irc-commands.c:473
msgid "a server message"
msgstr ""
-#: src/irc/irc-commands.c:324
+#: src/irc/irc-commands.c:325
msgid "away message"
msgstr ""
-#: src/irc/irc-commands.c:325
+#: src/irc/irc-commands.c:326
msgid "userhost"
msgstr ""
-#: src/irc/irc-commands.c:326
+#: src/irc/irc-commands.c:327
msgid "ison"
msgstr ""
-#: src/irc/irc-commands.c:327
+#: src/irc/irc-commands.c:328
msgid "unaway"
msgstr ""
-#: src/irc/irc-commands.c:328
+#: src/irc/irc-commands.c:329
msgid "now away"
msgstr ""
-#: src/irc/irc-commands.c:329
+#: src/irc/irc-commands.c:330
msgid "whois (registered nick)"
msgstr ""
-#: src/irc/irc-commands.c:330
+#: src/irc/irc-commands.c:331
msgid "whois (user)"
msgstr ""
-#: src/irc/irc-commands.c:331
+#: src/irc/irc-commands.c:332
msgid "whois (server)"
msgstr ""
-#: src/irc/irc-commands.c:332
+#: src/irc/irc-commands.c:333
msgid "whois (operator)"
msgstr ""
-#: src/irc/irc-commands.c:333
+#: src/irc/irc-commands.c:334
msgid "whowas"
msgstr ""
-#: src/irc/irc-commands.c:334
+#: src/irc/irc-commands.c:335
msgid "end of /who list"
msgstr ""
-#: src/irc/irc-commands.c:335
+#: src/irc/irc-commands.c:336
msgid "whois (idle)"
msgstr ""
-#: src/irc/irc-commands.c:336
+#: src/irc/irc-commands.c:337
msgid "whois (end)"
msgstr ""
-#: src/irc/irc-commands.c:337
+#: src/irc/irc-commands.c:338
msgid "whois (channels)"
msgstr ""
-#: src/irc/irc-commands.c:338
+#: src/irc/irc-commands.c:339
msgid "whois (identified user)"
msgstr ""
-#: src/irc/irc-commands.c:339
+#: src/irc/irc-commands.c:340
msgid "/list start"
msgstr ""
-#: src/irc/irc-commands.c:340
+#: src/irc/irc-commands.c:341
msgid "channel (for /list)"
msgstr ""
-#: src/irc/irc-commands.c:341
+#: src/irc/irc-commands.c:342
msgid "/list end"
msgstr ""
-#: src/irc/irc-commands.c:342
+#: src/irc/irc-commands.c:343
msgid "channel mode"
msgstr ""
-#: src/irc/irc-commands.c:344
+#: src/irc/irc-commands.c:345
msgid "no topic for channel"
msgstr ""
-#: src/irc/irc-commands.c:345
+#: src/irc/irc-commands.c:346
msgid "topic of channel"
msgstr ""
-#: src/irc/irc-commands.c:346
+#: src/irc/irc-commands.c:347
msgid "channel :topic"
msgstr ""
-#: src/irc/irc-commands.c:347
+#: src/irc/irc-commands.c:348
msgid ""
"channel: name of channel\n"
"topic: topic of the channel"
msgstr ""
-#: src/irc/irc-commands.c:350
+#: src/irc/irc-commands.c:351
msgid "infos about topic (nick & date changed)"
msgstr ""
-#: src/irc/irc-commands.c:353
+#: src/irc/irc-commands.c:354
msgid "inviting"
msgstr ""
-#: src/irc/irc-commands.c:354
+#: src/irc/irc-commands.c:355
msgid "server version"
msgstr ""
-#: src/irc/irc-commands.c:355
+#: src/irc/irc-commands.c:356
msgid "who"
msgstr ""
-#: src/irc/irc-commands.c:356
+#: src/irc/irc-commands.c:357
msgid "list of nicks on channel"
msgstr ""
-#: src/irc/irc-commands.c:357
+#: src/irc/irc-commands.c:358
msgid "channel :[[@|+]nick ...]"
msgstr ""
-#: src/irc/irc-commands.c:358
+#: src/irc/irc-commands.c:359
msgid ""
"channel: name of channel\n"
"nick: nick on the channel"
msgstr ""
-#: src/irc/irc-commands.c:361
+#: src/irc/irc-commands.c:362
msgid "links"
msgstr ""
-#: src/irc/irc-commands.c:362
+#: src/irc/irc-commands.c:363
msgid "end of /links list"
msgstr ""
-#: src/irc/irc-commands.c:363
+#: src/irc/irc-commands.c:364
msgid "end of /names list"
msgstr ""
-#: src/irc/irc-commands.c:364
+#: src/irc/irc-commands.c:365
msgid "banlist"
msgstr ""
-#: src/irc/irc-commands.c:365
+#: src/irc/irc-commands.c:366
msgid "end of banlist"
msgstr ""
-#: src/irc/irc-commands.c:366
+#: src/irc/irc-commands.c:367
msgid "end of /whowas list"
msgstr ""
-#: src/irc/irc-commands.c:373
+#: src/irc/irc-commands.c:374
msgid "server local time"
msgstr ""
-#: src/irc/irc-commands.c:374
+#: src/irc/irc-commands.c:375
msgid "no such nick/channel"
msgstr ""
-#: src/irc/irc-commands.c:376
+#: src/irc/irc-commands.c:377
msgid "no such server"
msgstr ""
-#: src/irc/irc-commands.c:378
+#: src/irc/irc-commands.c:379
msgid "no such channel"
msgstr ""
-#: src/irc/irc-commands.c:380
+#: src/irc/irc-commands.c:381
msgid "cannot send to channel"
msgstr ""
-#: src/irc/irc-commands.c:382
+#: src/irc/irc-commands.c:383
msgid "too many channels"
msgstr ""
-#: src/irc/irc-commands.c:384 src/irc/irc-commands.c:386
-#: src/irc/irc-commands.c:388
+#: src/irc/irc-commands.c:385 src/irc/irc-commands.c:387
msgid "was no such nick"
msgstr ""
-#: src/irc/irc-commands.c:390
+#: src/irc/irc-commands.c:389
msgid "no origin"
msgstr ""
-#: src/irc/irc-commands.c:392
+#: src/irc/irc-commands.c:391
msgid "no services"
msgstr ""
-#: src/irc/irc-commands.c:394
+#: src/irc/irc-commands.c:393
msgid "no recipient"
msgstr ""
-#: src/irc/irc-commands.c:396
+#: src/irc/irc-commands.c:395
msgid "no text to send"
msgstr ""
-#: src/irc/irc-commands.c:398
+#: src/irc/irc-commands.c:397
msgid "no toplevel"
msgstr ""
-#: src/irc/irc-commands.c:400
+#: src/irc/irc-commands.c:399
msgid "wilcard in toplevel domain"
msgstr ""
-#: src/irc/irc-commands.c:402
+#: src/irc/irc-commands.c:401
msgid "unknown command"
msgstr ""
-#: src/irc/irc-commands.c:404
+#: src/irc/irc-commands.c:403
msgid "MOTD is missing"
msgstr ""
-#: src/irc/irc-commands.c:406
+#: src/irc/irc-commands.c:405
msgid "no administrative info"
msgstr ""
-#: src/irc/irc-commands.c:408
+#: src/irc/irc-commands.c:407
msgid "file error"
msgstr ""
-#: src/irc/irc-commands.c:410
+#: src/irc/irc-commands.c:409
msgid "no nickname given"
msgstr ""
-#: src/irc/irc-commands.c:412
+#: src/irc/irc-commands.c:411
msgid "erroneous nickname"
msgstr ""
-#: src/irc/irc-commands.c:414
+#: src/irc/irc-commands.c:413
msgid "nickname already in use"
msgstr ""
-#: src/irc/irc-commands.c:416
+#: src/irc/irc-commands.c:415
msgid "nickname collision"
msgstr ""
-#: src/irc/irc-commands.c:418
+#: src/irc/irc-commands.c:417
msgid "not authorized to change nickname"
msgstr ""
-#: src/irc/irc-commands.c:420
+#: src/irc/irc-commands.c:419
msgid "user not in channel"
msgstr ""
-#: src/irc/irc-commands.c:422
+#: src/irc/irc-commands.c:421
msgid "not on channel"
msgstr ""
-#: src/irc/irc-commands.c:424
+#: src/irc/irc-commands.c:423
msgid "user already on channel"
msgstr ""
-#: src/irc/irc-commands.c:426
+#: src/irc/irc-commands.c:425
msgid "user not logged in"
msgstr ""
-#: src/irc/irc-commands.c:428
+#: src/irc/irc-commands.c:427
msgid "summon has been disabled"
msgstr ""
-#: src/irc/irc-commands.c:430
+#: src/irc/irc-commands.c:429
msgid "users has been disabled"
msgstr ""
-#: src/irc/irc-commands.c:432
+#: src/irc/irc-commands.c:431
msgid "you are not registered"
msgstr ""
-#: src/irc/irc-commands.c:434
+#: src/irc/irc-commands.c:433
msgid "not enough parameters"
msgstr ""
-#: src/irc/irc-commands.c:436
+#: src/irc/irc-commands.c:435
msgid "you may not register"
msgstr ""
-#: src/irc/irc-commands.c:438
+#: src/irc/irc-commands.c:437
msgid "your host isn't among the privileged"
msgstr ""
-#: src/irc/irc-commands.c:440
+#: src/irc/irc-commands.c:439
msgid "password incorrect"
msgstr ""
-#: src/irc/irc-commands.c:442
+#: src/irc/irc-commands.c:441
msgid "you are banned from this server"
msgstr ""
-#: src/irc/irc-commands.c:444
+#: src/irc/irc-commands.c:443
msgid "channel key already set"
msgstr ""
-#: src/irc/irc-commands.c:446
+#: src/irc/irc-commands.c:445
msgid "channel is already full"
msgstr ""
-#: src/irc/irc-commands.c:448
+#: src/irc/irc-commands.c:447
msgid "unknown mode char to me"
msgstr ""
-#: src/irc/irc-commands.c:450
+#: src/irc/irc-commands.c:449
msgid "cannot join channel (invite only)"
msgstr ""
-#: src/irc/irc-commands.c:452
+#: src/irc/irc-commands.c:451
msgid "cannot join channel (banned from channel)"
msgstr ""
-#: src/irc/irc-commands.c:454
+#: src/irc/irc-commands.c:453
msgid "cannot join channel (bad channel key)"
msgstr ""
-#: src/irc/irc-commands.c:456
+#: src/irc/irc-commands.c:455
msgid "bad channel mask"
msgstr ""
-#: src/irc/irc-commands.c:458
+#: src/irc/irc-commands.c:457
msgid "channel doesn't support modes"
msgstr ""
-#: src/irc/irc-commands.c:460
+#: src/irc/irc-commands.c:459
msgid "you're not an IRC operator"
msgstr ""
-#: src/irc/irc-commands.c:462
+#: src/irc/irc-commands.c:461
msgid "you're not channel operator"
msgstr ""
-#: src/irc/irc-commands.c:464
+#: src/irc/irc-commands.c:463
msgid "you can't kill a server!"
msgstr ""
-#: src/irc/irc-commands.c:466
+#: src/irc/irc-commands.c:465
msgid "user is immune from kick/deop"
msgstr ""
-#: src/irc/irc-commands.c:468
+#: src/irc/irc-commands.c:467
msgid "no O-lines for your host"
msgstr ""
-#: src/irc/irc-commands.c:470
+#: src/irc/irc-commands.c:469
msgid "unknown mode flag"
msgstr ""
-#: src/irc/irc-commands.c:472
+#: src/irc/irc-commands.c:471
msgid "can't change mode for other users"
msgstr ""
@@ -1207,7 +1207,7 @@ msgstr ""
msgid "whois (secure connection)"
msgstr ""
-#: src/irc/irc-display.c:163 src/common/command.c:853
+#: src/irc/irc-display.c:163 src/common/command.c:874
msgid "Server: "
msgstr ""
@@ -1215,7 +1215,7 @@ msgstr ""
msgid "connected"
msgstr ""
-#: src/irc/irc-display.c:168
+#: src/irc/irc-display.c:168 src/common/command.c:900
msgid "not connected"
msgstr ""
@@ -1237,7 +1237,7 @@ msgstr ""
msgid "(hidden)"
msgstr ""
-#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4008
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4227
msgid "unknown"
msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
msgid "%s: using local hostname \"%s\"\n"
msgstr ""
-#: src/irc/irc-send.c:126 src/common/command.c:731
+#: src/irc/irc-send.c:126 src/common/command.c:752
#, c-format
msgid "%s cannot find nick for sending message\n"
msgstr ""
@@ -1262,9 +1262,9 @@ msgstr ""
#: src/irc/irc-send.c:415 src/irc/irc-send.c:427 src/irc/irc-send.c:445
#: src/irc/irc-send.c:1097 src/irc/irc-send.c:1190 src/irc/irc-send.c:1722
-#: src/common/command.c:1196 src/common/command.c:1463
-#: src/common/command.c:1613 src/common/command.c:1756
-#: src/common/command.c:1899
+#: src/common/command.c:1222 src/common/command.c:1576
+#: src/common/command.c:1726 src/common/command.c:1869
+#: src/common/command.c:2012
#, c-format
msgid "%s wrong argument count for \"%s\" command\n"
msgstr ""
@@ -1280,13 +1280,13 @@ msgstr ""
msgid "%s \"%s\" command can not be executed on a server window\n"
msgstr ""
-#: src/irc/irc-send.c:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:409
+#: src/irc/irc-send.c:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:433
#, c-format
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1822
-#: src/irc/irc-recv.c:1900
+#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1886
+#: src/irc/irc-recv.c:1974
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr ""
@@ -1296,441 +1296,441 @@ msgstr ""
msgid "%s, compiled on %s %s\n"
msgstr ""
-#: src/irc/irc-recv.c:269
+#: src/irc/irc-recv.c:289
msgid "You have been invited to "
msgstr ""
-#: src/irc/irc-recv.c:272
+#: src/irc/irc-recv.c:292
msgid "by"
msgstr ""
-#: src/irc/irc-recv.c:282 src/irc/irc-recv.c:376 src/irc/irc-recv.c:875
-#: src/irc/irc-recv.c:1210 src/irc/irc-recv.c:1452 src/irc/irc-recv.c:3226
-#: src/irc/irc-recv.c:3293
+#: src/irc/irc-recv.c:303 src/irc/irc-recv.c:397 src/irc/irc-recv.c:894
+#: src/irc/irc-recv.c:1229 src/irc/irc-recv.c:1488 src/irc/irc-recv.c:3348
+#: src/irc/irc-recv.c:3409 src/irc/irc-recv.c:3481
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:308
+#: src/irc/irc-recv.c:331
#, c-format
msgid "%s cannot create new channel \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:328
+#: src/irc/irc-recv.c:350
msgid " has joined "
msgstr ""
-#: src/irc/irc-recv.c:385
+#: src/irc/irc-recv.c:408
msgid " has kicked "
msgstr ""
-#: src/irc/irc-recv.c:389
+#: src/irc/irc-recv.c:412 src/common/command.c:1397
msgid " from "
msgstr ""
-#: src/irc/irc-recv.c:475
+#: src/irc/irc-recv.c:498
msgid " has killed "
msgstr ""
-#: src/irc/irc-recv.c:481
+#: src/irc/irc-recv.c:504
msgid " from server"
msgstr ""
-#: src/irc/irc-recv.c:491
+#: src/irc/irc-recv.c:514
msgid " from server\n"
msgstr ""
-#: src/irc/irc-recv.c:498
+#: src/irc/irc-recv.c:522
#, c-format
msgid "%s host \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:538
+#: src/irc/irc-recv.c:562
msgid "sets ban on"
msgstr ""
-#: src/irc/irc-recv.c:539
+#: src/irc/irc-recv.c:563
msgid "removes ban on"
msgstr ""
-#: src/irc/irc-recv.c:563
+#: src/irc/irc-recv.c:587
msgid "gives half channel operator status to"
msgstr ""
-#: src/irc/irc-recv.c:564
+#: src/irc/irc-recv.c:588
msgid "removes half channel operator status from"
msgstr ""
-#: src/irc/irc-recv.c:591
+#: src/irc/irc-recv.c:615
msgid "sets invite-only channel flag"
msgstr ""
-#: src/irc/irc-recv.c:592
+#: src/irc/irc-recv.c:616
msgid "removes invite-only channel flag"
msgstr ""
-#: src/irc/irc-recv.c:609
+#: src/irc/irc-recv.c:633
msgid "sets channel key to"
msgstr ""
-#: src/irc/irc-recv.c:610
+#: src/irc/irc-recv.c:634
msgid "removes channel key"
msgstr ""
-#: src/irc/irc-recv.c:641
+#: src/irc/irc-recv.c:665
msgid "sets the user limit to"
msgstr ""
-#: src/irc/irc-recv.c:642
+#: src/irc/irc-recv.c:666
msgid "removes user limit"
msgstr ""
-#: src/irc/irc-recv.c:664
+#: src/irc/irc-recv.c:688
msgid "sets moderated channel flag"
msgstr ""
-#: src/irc/irc-recv.c:665
+#: src/irc/irc-recv.c:689
msgid "removes moderated channel flag"
msgstr ""
-#: src/irc/irc-recv.c:675
+#: src/irc/irc-recv.c:699
msgid "sets messages from channel only flag"
msgstr ""
-#: src/irc/irc-recv.c:676
+#: src/irc/irc-recv.c:700
msgid "removes messages from channel only flag"
msgstr ""
-#: src/irc/irc-recv.c:693
+#: src/irc/irc-recv.c:717
msgid "gives channel operator status to"
msgstr ""
-#: src/irc/irc-recv.c:694
+#: src/irc/irc-recv.c:718
msgid "removes channel operator status from"
msgstr ""
-#: src/irc/irc-recv.c:721
+#: src/irc/irc-recv.c:745
msgid "sets private channel flag"
msgstr ""
-#: src/irc/irc-recv.c:722
+#: src/irc/irc-recv.c:746
msgid "removes private channel flag"
msgstr ""
-#: src/irc/irc-recv.c:739
+#: src/irc/irc-recv.c:763
msgid "sets quiet on"
msgstr ""
-#: src/irc/irc-recv.c:740
+#: src/irc/irc-recv.c:764
msgid "removes quiet on"
msgstr ""
-#: src/irc/irc-recv.c:757
+#: src/irc/irc-recv.c:781
msgid "sets secret channel flag"
msgstr ""
-#: src/irc/irc-recv.c:758
+#: src/irc/irc-recv.c:782
msgid "removes secret channel flag"
msgstr ""
-#: src/irc/irc-recv.c:768
+#: src/irc/irc-recv.c:792
msgid "sets topic protection"
msgstr ""
-#: src/irc/irc-recv.c:769
+#: src/irc/irc-recv.c:793
msgid "removes topic protection"
msgstr ""
-#: src/irc/irc-recv.c:786
+#: src/irc/irc-recv.c:810
msgid "gives voice to"
msgstr ""
-#: src/irc/irc-recv.c:787
+#: src/irc/irc-recv.c:811
msgid "removes voice from"
msgstr ""
-#: src/irc/irc-recv.c:830 src/irc/irc-recv.c:915 src/irc/irc-recv.c:1284
-#: src/irc/irc-recv.c:1966
+#: src/irc/irc-recv.c:854 src/irc/irc-recv.c:936 src/irc/irc-recv.c:1307
+#: src/irc/irc-recv.c:2041
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr ""
-#: src/irc/irc-recv.c:845
+#: src/irc/irc-recv.c:864
#, c-format
msgid "%s \"%s\" command received without channel or nickname\n"
msgstr ""
-#: src/irc/irc-recv.c:890
+#: src/irc/irc-recv.c:911
msgid "mode changed by"
msgstr ""
-#: src/irc/irc-recv.c:954
+#: src/irc/irc-recv.c:973
msgid "You are "
msgstr ""
-#: src/irc/irc-recv.c:961
+#: src/irc/irc-recv.c:980
msgid " is "
msgstr ""
-#: src/irc/irc-recv.c:965
+#: src/irc/irc-recv.c:984
msgid "now known as "
msgstr ""
-#: src/irc/irc-recv.c:1035
+#: src/irc/irc-recv.c:1050
#, c-format
msgid "%s nickname not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:1048 src/irc/irc-recv.c:1080
+#: src/irc/irc-recv.c:1066 src/irc/irc-recv.c:1098
msgid "reply from"
msgstr ""
-#: src/irc/irc-recv.c:1083
+#: src/irc/irc-recv.c:1101
#, c-format
msgid ": %ld.%ld seconds\n"
msgstr ""
-#: src/irc/irc-recv.c:1135
+#: src/irc/irc-recv.c:1154
#, c-format
msgid "%s \"%s\" command received without host or channel\n"
msgstr ""
-#: src/irc/irc-recv.c:1185
+#: src/irc/irc-recv.c:1203
msgid " has left "
msgstr ""
-#: src/irc/irc-recv.c:1333 src/irc/irc-recv.c:1846
+#: src/irc/irc-recv.c:1355 src/irc/irc-recv.c:1910
#, c-format
msgid "On %s: * %s %s"
msgstr ""
-#: src/irc/irc-recv.c:1353
+#: src/irc/irc-recv.c:1379
#, c-format
msgid "Received a CTCP SOUND \"%s\" from "
msgstr ""
-#: src/irc/irc-recv.c:1384 src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1512
-#: src/irc/irc-recv.c:1548 src/irc/irc-recv.c:1881
+#: src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1443 src/irc/irc-recv.c:1547
+#: src/irc/irc-recv.c:1587 src/irc/irc-recv.c:1950
msgid "received from"
msgstr ""
-#: src/irc/irc-recv.c:1408 src/irc/irc-recv.c:1877
+#: src/irc/irc-recv.c:1439 src/irc/irc-recv.c:1946
msgid "Unknown CTCP "
msgstr ""
-#: src/irc/irc-recv.c:1436
+#: src/irc/irc-recv.c:1471
#, c-format
msgid "On %s: %s> %s"
msgstr ""
-#: src/irc/irc-recv.c:1563 src/irc/irc-recv.c:1580 src/irc/irc-recv.c:1596
-#: src/irc/irc-recv.c:1612 src/irc/irc-recv.c:1637 src/irc/irc-recv.c:1654
-#: src/irc/irc-recv.c:1670 src/irc/irc-recv.c:1694 src/irc/irc-recv.c:1711
-#: src/irc/irc-recv.c:1727 src/irc/irc-recv.c:1751 src/irc/irc-recv.c:1768
-#: src/irc/irc-recv.c:1783 src/irc/irc-recv.c:1942 src/irc/irc-recv.c:3592
-#: src/irc/irc-recv.c:3650 src/irc/irc-recv.c:3802 src/irc/irc-recv.c:3817
-#: src/irc/irc-recv.c:3832 src/irc/irc-recv.c:3847 src/irc/irc-recv.c:3860
-#: src/irc/irc-recv.c:3910 src/irc/irc-recv.c:3924
+#: src/irc/irc-recv.c:1603 src/irc/irc-recv.c:1624 src/irc/irc-recv.c:1640
+#: src/irc/irc-recv.c:1656 src/irc/irc-recv.c:1682 src/irc/irc-recv.c:1703
+#: src/irc/irc-recv.c:1719 src/irc/irc-recv.c:1744 src/irc/irc-recv.c:1765
+#: src/irc/irc-recv.c:1781 src/irc/irc-recv.c:1806 src/irc/irc-recv.c:1827
+#: src/irc/irc-recv.c:1842 src/irc/irc-recv.c:2017 src/irc/irc-recv.c:3791
+#: src/irc/irc-recv.c:3849 src/irc/irc-recv.c:4010 src/irc/irc-recv.c:4025
+#: src/irc/irc-recv.c:4040 src/irc/irc-recv.c:4055 src/irc/irc-recv.c:4068
+#: src/irc/irc-recv.c:4123 src/irc/irc-recv.c:4137
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:1796
+#: src/irc/irc-recv.c:1855
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr ""
-#: src/irc/irc-recv.c:1921 src/irc/irc-dcc.c:1039
+#: src/irc/irc-recv.c:1995 src/irc/irc-dcc.c:1036
#, c-format
msgid "Private %s> %s"
msgstr ""
-#: src/irc/irc-recv.c:1998
+#: src/irc/irc-recv.c:2072
msgid "has quit"
msgstr ""
-#: src/irc/irc-recv.c:2119
+#: src/irc/irc-recv.c:2197
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr ""
-#: src/irc/irc-recv.c:2147
+#: src/irc/irc-recv.c:2229
msgid " has changed topic for "
msgstr ""
-#: src/irc/irc-recv.c:2152
+#: src/irc/irc-recv.c:2234
#, c-format
msgid " to: \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:2158
+#: src/irc/irc-recv.c:2240
msgid " has unset topic for "
msgstr ""
-#: src/irc/irc-recv.c:2276
+#: src/irc/irc-recv.c:2359
#, c-format
msgid " is away: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:2350
+#: src/irc/irc-recv.c:2441
msgid "Users online: "
msgstr ""
-#: src/irc/irc-recv.c:2797
+#: src/irc/irc-recv.c:2927
msgid "idle: "
msgstr ""
-#: src/irc/irc-recv.c:2805
+#: src/irc/irc-recv.c:2935
msgid "days"
msgstr ""
-#: src/irc/irc-recv.c:2805
+#: src/irc/irc-recv.c:2935
msgid "day"
msgstr ""
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2945
msgid "hours"
msgstr ""
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2945
msgid "hour"
msgstr ""
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2951
msgid "minutes"
msgstr ""
-#: src/irc/irc-recv.c:2821
+#: src/irc/irc-recv.c:2951
msgid "minute"
msgstr ""
-#: src/irc/irc-recv.c:2827
+#: src/irc/irc-recv.c:2957
msgid "seconds"
msgstr ""
-#: src/irc/irc-recv.c:2827
+#: src/irc/irc-recv.c:2957
msgid "second"
msgstr ""
-#: src/irc/irc-recv.c:2832
+#: src/irc/irc-recv.c:2962
msgid "signon at: "
msgstr ""
-#: src/irc/irc-recv.c:2920
+#: src/irc/irc-recv.c:3058
msgid "Channels: "
msgstr ""
-#: src/irc/irc-recv.c:3172
+#: src/irc/irc-recv.c:3339
msgid "No topic set for "
msgstr ""
-#: src/irc/irc-recv.c:3214
+#: src/irc/irc-recv.c:3396
msgid "Topic for "
msgstr ""
-#: src/irc/irc-recv.c:3218
+#: src/irc/irc-recv.c:3400
#, c-format
msgid " is: \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:3236 src/irc/irc-recv.c:3320 src/irc/irc-recv.c:3373
+#: src/irc/irc-recv.c:3419 src/irc/irc-recv.c:3508 src/irc/irc-recv.c:3561
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:3282
+#: src/irc/irc-recv.c:3469
msgid "Topic set by "
msgstr ""
-#: src/irc/irc-recv.c:3302
+#: src/irc/irc-recv.c:3490
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:3311 src/irc/irc-recv.c:3382
+#: src/irc/irc-recv.c:3499 src/irc/irc-recv.c:3570
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:3361
+#: src/irc/irc-recv.c:3549
msgid "has invited"
msgstr ""
-#: src/irc/irc-recv.c:3364 src/irc/irc-recv.c:3515
+#: src/irc/irc-recv.c:3552 src/irc/irc-recv.c:3712 src/common/command.c:1390
msgid "on"
msgstr ""
-#: src/irc/irc-recv.c:3638
+#: src/irc/irc-recv.c:3837
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:3694
+#: src/irc/irc-recv.c:3897
msgid "Nicks "
msgstr ""
-#: src/irc/irc-recv.c:3714
+#: src/irc/irc-recv.c:3917
msgid "Channel "
msgstr ""
-#: src/irc/irc-recv.c:3725
+#: src/irc/irc-recv.c:3928
msgid "nicks"
msgstr ""
-#: src/irc/irc-recv.c:3725
+#: src/irc/irc-recv.c:3928
msgid "nick"
msgstr ""
-#: src/irc/irc-recv.c:3733
+#: src/irc/irc-recv.c:3936
msgid "ops"
msgstr ""
-#: src/irc/irc-recv.c:3733
+#: src/irc/irc-recv.c:3936
msgid "op"
msgstr ""
-#: src/irc/irc-recv.c:3742
+#: src/irc/irc-recv.c:3945
msgid "halfops"
msgstr ""
-#: src/irc/irc-recv.c:3742
+#: src/irc/irc-recv.c:3945
msgid "halfop"
msgstr ""
-#: src/irc/irc-recv.c:3751
+#: src/irc/irc-recv.c:3954
msgid "voices"
msgstr ""
-#: src/irc/irc-recv.c:3751
+#: src/irc/irc-recv.c:3954
msgid "voice"
msgstr ""
-#: src/irc/irc-recv.c:3760
+#: src/irc/irc-recv.c:3963
msgid "normal"
msgstr ""
-#: src/irc/irc-recv.c:3873
+#: src/irc/irc-recv.c:4085
msgid "banned by"
msgstr ""
-#: src/irc/irc-recv.c:3962
+#: src/irc/irc-recv.c:4181
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:3974
+#: src/irc/irc-recv.c:4193
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:3986
+#: src/irc/irc-recv.c:4205
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr ""
-#: src/irc/irc-recv.c:3996
+#: src/irc/irc-recv.c:4215
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
@@ -1759,137 +1759,166 @@ msgstr ""
msgid "Aborted"
msgstr ""
-#: src/irc/irc-dcc.c:348 src/irc/irc-dcc.c:539 src/irc/irc-dcc.c:701
+#: src/irc/irc-dcc.c:345 src/irc/irc-dcc.c:536 src/irc/irc-dcc.c:698
msgid "DCC: file "
msgstr ""
-#: src/irc/irc-dcc.c:355 src/irc/irc-dcc.c:664 src/irc/irc-dcc.c:706
+#: src/irc/irc-dcc.c:352 src/irc/irc-dcc.c:661 src/irc/irc-dcc.c:703
msgid " (local filename: "
msgstr ""
-#: src/irc/irc-dcc.c:363
+#: src/irc/irc-dcc.c:360
msgid " sent to "
msgstr ""
-#: src/irc/irc-dcc.c:365
+#: src/irc/irc-dcc.c:362
msgid " received from "
msgstr ""
-#: src/irc/irc-dcc.c:371
+#: src/irc/irc-dcc.c:368
msgid ": ok!\n"
msgstr ""
-#: src/irc/irc-dcc.c:371
+#: src/irc/irc-dcc.c:368
msgid ": FAILED\n"
msgstr ""
-#: src/irc/irc-dcc.c:383
+#: src/irc/irc-dcc.c:380
msgid "DCC chat closed with "
msgstr ""
-#: src/irc/irc-dcc.c:432
+#: src/irc/irc-dcc.c:429
#, c-format
msgid ""
"%s can't associate DCC chat with private buffer (maybe private buffer has "
"already DCC CHAT?)\n"
msgstr ""
-#: src/irc/irc-dcc.c:442
+#: src/irc/irc-dcc.c:439
msgid "Connected to "
msgstr ""
-#: src/irc/irc-dcc.c:451
+#: src/irc/irc-dcc.c:448
msgid "via DCC chat\n"
msgstr ""
-#: src/irc/irc-dcc.c:544
+#: src/irc/irc-dcc.c:541
#, c-format
msgid "resumed at position %u\n"
msgstr ""
-#: src/irc/irc-dcc.c:550 src/irc/irc-dcc.c:575
+#: src/irc/irc-dcc.c:547 src/irc/irc-dcc.c:572
#, c-format
msgid ""
"%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
"ended\n"
msgstr ""
-#: src/irc/irc-dcc.c:594
+#: src/irc/irc-dcc.c:591
#, c-format
msgid "%s not enough memory for new DCC\n"
msgstr ""
-#: src/irc/irc-dcc.c:613
+#: src/irc/irc-dcc.c:610
msgid "DCC chat"
msgstr ""
-#: src/irc/irc-dcc.c:643
+#: src/irc/irc-dcc.c:640
msgid "Incoming DCC file from "
msgstr ""
-#: src/irc/irc-dcc.c:654 src/irc/irc-dcc.c:668
+#: src/irc/irc-dcc.c:651 src/irc/irc-dcc.c:665
msgid " bytes\n"
msgstr ""
-#: src/irc/irc-dcc.c:660
+#: src/irc/irc-dcc.c:657
msgid "Sending DCC file to "
msgstr ""
-#: src/irc/irc-dcc.c:674
+#: src/irc/irc-dcc.c:671
msgid "Incoming DCC chat request from "
msgstr ""
-#: src/irc/irc-dcc.c:686
+#: src/irc/irc-dcc.c:683
msgid "Sending DCC chat request to "
msgstr ""
-#: src/irc/irc-dcc.c:712
+#: src/irc/irc-dcc.c:709
#, c-format
msgid "will be resumed at position %u\n"
msgstr ""
-#: src/irc/irc-dcc.c:778
+#: src/irc/irc-dcc.c:775
#, c-format
msgid "%s not enough memory for DCC SEND\n"
msgstr ""
-#: src/irc/irc-dcc.c:800
+#: src/irc/irc-dcc.c:797
#, c-format
msgid "%s cannot access file \"%s\"\n"
msgstr ""
-#: src/irc/irc-dcc.c:821
+#: src/irc/irc-dcc.c:818
#, c-format
msgid "%s cannot create socket for DCC\n"
msgstr ""
-#: src/irc/irc-dcc.c:834
+#: src/irc/irc-dcc.c:831
#, c-format
msgid "%s cannot find port for DCC\n"
msgstr ""
-#: src/irc/irc-dcc.c:881
+#: src/irc/irc-dcc.c:878
#, c-format
msgid "%s cannot send DCC\n"
msgstr ""
-#: src/irc/irc-dcc.c:960
+#: src/irc/irc-dcc.c:957
#, c-format
msgid "%s error sending data to \"%s\" via DCC CHAT\n"
msgstr ""
-#: src/irc/irc-dcc.c:1233
+#: src/irc/irc-dcc.c:1230
#, c-format
msgid ""
"%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
"option, max is %d.\n"
msgstr ""
-#: src/irc/irc-dcc.c:1308
+#: src/irc/irc-dcc.c:1305
#, c-format
msgid "Aborting active DCC: \"%s\" from %s\n"
msgstr ""
+#: src/irc/irc-ignore.c:195
+#, c-format
+msgid "%s too few arguments for ignore\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:212
+#, c-format
+msgid "%s mask or type/command should be non generic value for ignore\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:221
+#, c-format
+msgid "%s ignore already exists\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:257
+#, c-format
+msgid "%s unknown type or IRC command \"%s\" for ignore\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:285
+#, c-format
+msgid "%s not enough memory to create ignore\n"
+msgstr ""
+
+#: src/irc/irc-ignore.c:406 src/irc/irc-ignore.c:442
+msgid "Removing ignore:"
+msgstr ""
+
#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:463
#: src/plugins/python/wee-python.c:81 src/plugins/ruby/wee-ruby.c:89
#, c-format
@@ -1954,19 +1983,19 @@ msgid "Loading %s script \"%s\"\n"
msgstr ""
#: src/plugins/perl/wee-perl.c:1015 src/plugins/python/wee-python.c:686
-#: src/plugins/ruby/wee-ruby.c:722
+#: src/plugins/ruby/wee-ruby.c:555
#, c-format
msgid "Unloading %s script \"%s\"\n"
msgstr ""
#: src/plugins/perl/wee-perl.c:1032 src/plugins/python/wee-python.c:703
-#: src/plugins/ruby/wee-ruby.c:739
+#: src/plugins/ruby/wee-ruby.c:572
#, c-format
msgid "Unloading all %s scripts...\n"
msgstr ""
#: src/plugins/perl/wee-perl.c:1037 src/plugins/python/wee-python.c:708
-#: src/plugins/ruby/wee-ruby.c:744
+#: src/plugins/ruby/wee-ruby.c:577
#, c-format
msgid "%s scripts unloaded\n"
msgstr ""
@@ -2239,7 +2268,7 @@ msgstr ""
msgid "grab a key"
msgstr ""
-#: src/gui/gui-keyboard.c:426 src/common/command.c:1478
+#: src/gui/gui-keyboard.c:426 src/common/command.c:1591
#, c-format
msgid "%s unable to bind key \"%s\"\n"
msgstr ""
@@ -2347,15 +2376,35 @@ msgid "command: name of a WeeChat or IRC command"
msgstr ""
#: src/common/command.c:75
-msgid "bind/unbind keys"
+msgid "ignore IRC messages and/or hosts"
msgstr ""
#: src/common/command.c:76
-msgid "[key function/command] [unbind key] [functions] [reset -yes]"
+msgid "[mask [[type | command] [channel [server]]]]"
msgstr ""
#: src/common/command.c:77
msgid ""
+" mask: nick or host mask to ignore\n"
+" type: type of message to ignore (action, ctcp, dcc, pv)\n"
+"command: IRC command\n"
+"channel: name of channel for ignore\n"
+" server: name of server for ignore\n"
+"\n"
+"For each argument, '*' means all.\n"
+"Without argument, /ignore command lists all defined ignore."
+msgstr ""
+
+#: src/common/command.c:85
+msgid "bind/unbind keys"
+msgstr ""
+
+#: src/common/command.c:86
+msgid "[key function/command] [unbind key] [functions] [reset -yes]"
+msgstr ""
+
+#: src/common/command.c:87
+msgid ""
"key: bind this key to an internal function or a command (beginning by \"/"
"\")\n"
"unbind: unbind a key (if \"all\", default bindings are restored)\n"
@@ -2364,45 +2413,48 @@ msgid ""
"binding (use carefully!)"
msgstr ""
-#: src/common/command.c:82
+#: src/common/command.c:92
msgid "list/load/unload Perl scripts"
msgstr ""
-#: src/common/command.c:83 src/common/command.c:88 src/common/command.c:93
+#: src/common/command.c:93 src/common/command.c:98 src/common/command.c:103
msgid "[load filename] | [autoload] | [reload] | [unload]"
msgstr ""
-#: src/common/command.c:84
+#: src/common/command.c:94
msgid ""
"filename: Perl script (file) to load\n"
+"\n"
"Without argument, /perl command lists all loaded Perl scripts."
msgstr ""
-#: src/common/command.c:87
+#: src/common/command.c:97
msgid "list/load/unload Python scripts"
msgstr ""
-#: src/common/command.c:89
+#: src/common/command.c:99
msgid ""
"filename: Python script (file) to load\n"
+"\n"
"Without argument, /python command lists all loaded Python scripts."
msgstr ""
-#: src/common/command.c:92
+#: src/common/command.c:102
msgid "list/load/unload Ruby scripts"
msgstr ""
-#: src/common/command.c:94
+#: src/common/command.c:104
msgid ""
"filename: Ruby script (file) to load\n"
+"\n"
"Without argument, /ruby command lists all loaded Ruby scripts."
msgstr ""
-#: src/common/command.c:97
+#: src/common/command.c:107
msgid "list, add or remove servers"
msgstr ""
-#: src/common/command.c:98
+#: src/common/command.c:108
msgid ""
"[servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-"
"pwd password] [-nicks nick1 [nick2 [nick3]]] [-username username] [-realname "
@@ -2410,7 +2462,7 @@ msgid ""
"servername]"
msgstr ""
-#: src/common/command.c:103
+#: src/common/command.c:113
msgid ""
"servername: server name, for internal & display use\n"
"hostname: name or IP address of server\n"
@@ -2425,53 +2477,74 @@ msgid ""
"realname: real name of user"
msgstr ""
-#: src/common/command.c:115
+#: src/common/command.c:125
msgid "save config to disk"
msgstr ""
-#: src/common/command.c:116
+#: src/common/command.c:126
msgid "[file]"
msgstr ""
-#: src/common/command.c:116
+#: src/common/command.c:126
msgid "file: filename for writing config"
msgstr ""
-#: src/common/command.c:118
+#: src/common/command.c:128
msgid "set config parameters"
msgstr ""
-#: src/common/command.c:119
+#: src/common/command.c:129
msgid "[option[=value]]"
msgstr ""
-#: src/common/command.c:119
+#: src/common/command.c:129
msgid ""
"option: name of an option\n"
"value: value for option"
msgstr ""
-#: src/common/command.c:121
+#: src/common/command.c:131
msgid "remove an alias"
msgstr ""
-#: src/common/command.c:122
+#: src/common/command.c:132
msgid "alias_name"
msgstr ""
-#: src/common/command.c:122
+#: src/common/command.c:132
msgid "alias_name: name of alias to remove"
msgstr ""
-#: src/common/command.c:124
+#: src/common/command.c:134
+msgid "unignore IRC messages and/or hosts"
+msgstr ""
+
+#: src/common/command.c:135
+msgid "[number | [mask [[type | command] [channel [server]]]]]"
+msgstr ""
+
+#: src/common/command.c:136
+msgid ""
+" number: # of ignore to unignore (number is displayed by list of ignore)\n"
+" mask: nick or host mask to unignore\n"
+" type: type of message to unignore (action, ctcp, dcc, pv)\n"
+"command: IRC command\n"
+"channel: name of channel for unignore\n"
+" server: name of server for unignore\n"
+"\n"
+"For each argument, '*' means all.\n"
+"Without argument, /unignore command lists all defined ignore."
+msgstr ""
+
+#: src/common/command.c:145
msgid "manage windows"
msgstr ""
-#: src/common/command.c:125
+#: src/common/command.c:146
msgid "[list | splith | splitv | [merge [down | up | left | right | all]]]"
msgstr ""
-#: src/common/command.c:126
+#: src/common/command.c:147
msgid ""
"list: list opened windows (no parameter implies this list)\n"
"splith: split current window horizontally\n"
@@ -2479,408 +2552,437 @@ msgid ""
"merge: merge window with another"
msgstr ""
-#: src/common/command.c:272
+#: src/common/command.c:293
#, c-format
msgid "%s alias or command \"%s\" already exists!\n"
msgstr ""
-#: src/common/command.c:282
+#: src/common/command.c:303
#, c-format
msgid "%s alias cannot run another alias!\n"
msgstr ""
-#: src/common/command.c:289
+#: src/common/command.c:310
#, c-format
msgid "%s target command \"%s\" does not exist!\n"
msgstr ""
-#: src/common/command.c:497
+#: src/common/command.c:518
#, c-format
msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
msgstr ""
-#: src/common/command.c:509
+#: src/common/command.c:530
#, c-format
msgid ""
"%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
"arg%s)\n"
msgstr ""
-#: src/common/command.c:531 src/common/command.c:601
+#: src/common/command.c:552 src/common/command.c:622
#, c-format
msgid "%s command \"%s\" failed\n"
msgstr ""
-#: src/common/command.c:559
+#: src/common/command.c:580
#, c-format
msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
msgstr ""
-#: src/common/command.c:571
+#: src/common/command.c:592
#, c-format
msgid ""
"%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
"arg%s)\n"
msgstr ""
-#: src/common/command.c:586
+#: src/common/command.c:607
#, c-format
msgid "%s command \"%s\" needs a server connection!\n"
msgstr ""
-#: src/common/command.c:650
+#: src/common/command.c:671
#, c-format
msgid "%s unknown command \"%s\" (type /help for help)\n"
msgstr ""
-#: src/common/command.c:753
+#: src/common/command.c:774
#, c-format
msgid "%s unable to call handler for message (not enough memory)\n"
msgstr ""
-#: src/common/command.c:761
+#: src/common/command.c:782
msgid "This window is not a channel!\n"
msgstr ""
-#: src/common/command.c:789 src/common/command.c:813 src/common/command.c:918
+#: src/common/command.c:810 src/common/command.c:834 src/common/command.c:944
#, c-format
msgid "%s missing arguments for \"%s\" command\n"
msgstr ""
-#: src/common/command.c:798
+#: src/common/command.c:819
#, c-format
msgid "Alias \"%s\" => \"%s\" created\n"
msgstr ""
-#: src/common/command.c:804
+#: src/common/command.c:825
#, c-format
msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
msgstr ""
-#: src/common/command.c:824
+#: src/common/command.c:845
msgid "List of aliases:\n"
msgstr ""
-#: src/common/command.c:836
+#: src/common/command.c:857
msgid "No alias defined.\n"
msgstr ""
-#: src/common/command.c:859
+#: src/common/command.c:880
msgid "Channel: "
msgstr ""
-#: src/common/command.c:862 src/common/command.c:872
+#: src/common/command.c:883 src/common/command.c:893
msgid " (server: "
msgstr ""
-#: src/common/command.c:869
+#: src/common/command.c:890
msgid "Private with: "
msgstr ""
-#: src/common/command.c:898
+#: src/common/command.c:924
msgid "Opened buffers:\n"
msgstr ""
-#: src/common/command.c:941
+#: src/common/command.c:967
#, c-format
msgid "%s incorrect buffer number\n"
msgstr ""
-#: src/common/command.c:955
+#: src/common/command.c:981
#, c-format
msgid "%s can not close the single buffer\n"
msgstr ""
-#: src/common/command.c:965
+#: src/common/command.c:991
#, c-format
msgid "%s can not close server buffer while channels are opened\n"
msgstr ""
-#: src/common/command.c:1006
+#: src/common/command.c:1032
msgid "Notify levels: "
msgstr ""
-#: src/common/command.c:1034 src/common/command.c:1056
+#: src/common/command.c:1060 src/common/command.c:1082
#, c-format
msgid "%s incorrect notify level (must be between %d and %d)\n"
msgstr ""
-#: src/common/command.c:1043
+#: src/common/command.c:1069
#, c-format
msgid "%s incorrect buffer for notify (must be channel or private)\n"
msgstr ""
-#: src/common/command.c:1123
+#: src/common/command.c:1149
#, c-format
msgid "unknown parameter \"%s\" for \"%s\" command\n"
msgstr ""
-#: src/common/command.c:1153
+#: src/common/command.c:1179
#, c-format
msgid "%s already connected to server \"%s\"!\n"
msgstr ""
-#: src/common/command.c:1161
+#: src/common/command.c:1187
#, c-format
msgid "%s currently connecting to server \"%s\"!\n"
msgstr ""
-#: src/common/command.c:1179 src/common/command.c:1254
+#: src/common/command.c:1205 src/common/command.c:1280
#, c-format
msgid "%s server not found\n"
msgstr ""
-#: src/common/command.c:1209 src/common/command.c:1606
-#: src/common/command.c:1749 src/common/command.c:1892
-#: src/common/command.c:2589 src/common/command.c:2605
+#: src/common/command.c:1235 src/common/command.c:1719
+#: src/common/command.c:1862 src/common/command.c:2005
+#: src/common/command.c:2765 src/common/command.c:2781
#, c-format
msgid "%s unknown option for \"%s\" command\n"
msgstr ""
-#: src/common/command.c:1238
+#: src/common/command.c:1264
#, c-format
msgid "%s not connected to server \"%s\"!\n"
msgstr ""
-#: src/common/command.c:1246
+#: src/common/command.c:1272
msgid "Auto-reconnection is cancelled\n"
msgstr ""
-#: src/common/command.c:1272 src/common/weechat.c:273
+#: src/common/command.c:1298 src/common/weechat.c:345
#, c-format
msgid "%s internal commands:\n"
msgstr ""
-#: src/common/command.c:1281 src/common/weechat.c:293
+#: src/common/command.c:1307 src/common/weechat.c:365
#, c-format
msgid "IRC commands:\n"
msgstr ""
-#: src/common/command.c:1348
+#: src/common/command.c:1374
#, c-format
msgid "No help available, \"%s\" is an unknown command\n"
msgstr ""
-#: src/common/command.c:1366
+#: src/common/command.c:1395
+msgid " ignoring "
+msgstr ""
+
+#: src/common/command.c:1419
+msgid "List of ignore:\n"
+msgstr ""
+
+#: src/common/command.c:1434
+msgid "No ignore defined.\n"
+msgstr ""
+
+#: src/common/command.c:1460
+msgid "New ignore:"
+msgstr ""
+
+#: src/common/command.c:1479
msgid "New key binding:\n"
msgstr ""
-#: src/common/command.c:1399
+#: src/common/command.c:1512
msgid "Key bindings:\n"
msgstr ""
-#: src/common/command.c:1411
+#: src/common/command.c:1524
#, c-format
msgid "Key \"%s\" unbinded\n"
msgstr ""
-#: src/common/command.c:1416
+#: src/common/command.c:1529
#, c-format
msgid "%s unable to unbind key \"%s\"\n"
msgstr ""
-#: src/common/command.c:1424 src/common/weechat.c:324
+#: src/common/command.c:1537 src/common/weechat.c:396
#, c-format
msgid "Internal key functions:\n"
msgstr ""
-#: src/common/command.c:1443
+#: src/common/command.c:1556
msgid "Default key bindings restored\n"
msgstr ""
-#: src/common/command.c:1449
+#: src/common/command.c:1562
#, c-format
msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
msgstr ""
-#: src/common/command.c:1505 src/common/command.c:1648
-#: src/common/command.c:1791
+#: src/common/command.c:1618 src/common/command.c:1761
+#: src/common/command.c:1904
#, c-format
msgid "Registered %s scripts:\n"
msgstr ""
-#: src/common/command.c:1522 src/common/command.c:1545
-#: src/common/command.c:1568 src/common/command.c:1665
-#: src/common/command.c:1688 src/common/command.c:1711
-#: src/common/command.c:1808 src/common/command.c:1831
-#: src/common/command.c:1854
+#: src/common/command.c:1635 src/common/command.c:1658
+#: src/common/command.c:1681 src/common/command.c:1778
+#: src/common/command.c:1801 src/common/command.c:1824
+#: src/common/command.c:1921 src/common/command.c:1944
+#: src/common/command.c:1967
msgid " (none)\n"
msgstr ""
-#: src/common/command.c:1527 src/common/command.c:1670
-#: src/common/command.c:1813
+#: src/common/command.c:1640 src/common/command.c:1783
+#: src/common/command.c:1926
#, c-format
msgid "%s message handlers:\n"
msgstr ""
-#: src/common/command.c:1536 src/common/command.c:1679
-#: src/common/command.c:1822
+#: src/common/command.c:1649 src/common/command.c:1792
+#: src/common/command.c:1935
#, c-format
msgid " IRC(%s) => %s(%s)\n"
msgstr ""
-#: src/common/command.c:1550 src/common/command.c:1693
-#: src/common/command.c:1836
+#: src/common/command.c:1663 src/common/command.c:1806
+#: src/common/command.c:1949
#, c-format
msgid "%s command handlers:\n"
msgstr ""
-#: src/common/command.c:1559 src/common/command.c:1702
-#: src/common/command.c:1845
+#: src/common/command.c:1672 src/common/command.c:1815
+#: src/common/command.c:1958
#, c-format
msgid " Command /%s => %s(%s)\n"
msgstr ""
-#: src/common/command.c:1619
+#: src/common/command.c:1732
msgid ""
"WeeChat was build without Perl support.\n"
"Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n"
msgstr ""
-#: src/common/command.c:1762
+#: src/common/command.c:1875
msgid ""
"WeeChat was build without Python support.\n"
"Please rebuild WeeChat with \"--enable-python\" option for ./configure "
"script\n"
msgstr ""
-#: src/common/command.c:1905
+#: src/common/command.c:2018
msgid ""
"WeeChat was build without Ruby support.\n"
"Please rebuild WeeChat with \"--enable-ruby\" option for ./configure script\n"
msgstr ""
-#: src/common/command.c:1953
+#: src/common/command.c:2066
msgid "No server.\n"
msgstr ""
-#: src/common/command.c:1964
+#: src/common/command.c:2077
#, c-format
msgid "Server '%s' not found.\n"
msgstr ""
-#: src/common/command.c:1976
+#: src/common/command.c:2089
#, c-format
msgid "%s missing servername for \"%s\" command\n"
msgstr ""
-#: src/common/command.c:1984
+#: src/common/command.c:2097
#, c-format
msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
msgstr ""
-#: src/common/command.c:2003
+#: src/common/command.c:2116
#, c-format
msgid "%s server \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/common/command.c:2011
+#: src/common/command.c:2124
#, c-format
msgid ""
"%s you can not delete server \"%s\" because you are connected to. Try /"
"disconnect %s before.\n"
msgstr ""
-#: src/common/command.c:2027 src/common/command.c:2173
+#: src/common/command.c:2140 src/common/command.c:2286
msgid "Server"
msgstr ""
-#: src/common/command.c:2030
+#: src/common/command.c:2143
msgid "has been deleted\n"
msgstr ""
-#: src/common/command.c:2045
+#: src/common/command.c:2158
#, c-format
msgid "%s missing parameters for \"%s\" command\n"
msgstr ""
-#: src/common/command.c:2055
+#: src/common/command.c:2168
#, c-format
msgid "%s server \"%s\" already exists, can't create it!\n"
msgstr ""
-#: src/common/command.c:2084 src/common/command.c:2112
-#: src/common/command.c:2125 src/common/command.c:2151
+#: src/common/command.c:2197 src/common/command.c:2225
+#: src/common/command.c:2238 src/common/command.c:2264
#, c-format
msgid "%s missing password for \"%s\" parameter\n"
msgstr ""
-#: src/common/command.c:2097
+#: src/common/command.c:2210
#, c-format
msgid "%s missing nick(s) for \"%s\" parameter\n"
msgstr ""
-#: src/common/command.c:2138
+#: src/common/command.c:2251
#, c-format
msgid "%s missing command for \"%s\" parameter\n"
msgstr ""
-#: src/common/command.c:2176
+#: src/common/command.c:2289
msgid "created\n"
msgstr ""
-#: src/common/command.c:2182
+#: src/common/command.c:2295
#, c-format
msgid "%s unable to create server\n"
msgstr ""
-#: src/common/command.c:2237
+#: src/common/command.c:2350
msgid "(unknown)"
msgstr ""
-#: src/common/command.c:2260
+#: src/common/command.c:2373
msgid "(password hidden) "
msgstr ""
-#: src/common/command.c:2324
+#: src/common/command.c:2437
#, c-format
msgid "%s server \"%s\" not found\n"
msgstr ""
-#: src/common/command.c:2355 src/common/command.c:2401
+#: src/common/command.c:2468 src/common/command.c:2514
#, c-format
msgid "%s config option \"%s\" not found\n"
msgstr ""
-#: src/common/command.c:2360 src/common/command.c:2393
+#: src/common/command.c:2473 src/common/command.c:2506
#, c-format
msgid "%s incorrect value for option \"%s\"\n"
msgstr ""
-#: src/common/command.c:2376
+#: src/common/command.c:2489
#, c-format
msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
msgstr ""
-#: src/common/command.c:2475
+#: src/common/command.c:2588
#, c-format
msgid "No config option found with \"%s\"\n"
msgstr ""
-#: src/common/command.c:2478
+#: src/common/command.c:2591
msgid "No config option found\n"
msgstr ""
-#: src/common/command.c:2484
+#: src/common/command.c:2597
#, c-format
msgid "config option(s) found with \"%s\"\n"
msgstr ""
-#: src/common/command.c:2487
+#: src/common/command.c:2600
msgid "config option(s) found\n"
msgstr ""
-#: src/common/command.c:2507
+#: src/common/command.c:2620
#, c-format
msgid "%s alias or command \"%s\" not found\n"
msgstr ""
-#: src/common/command.c:2517
+#: src/common/command.c:2630
#, c-format
msgid "Alias \"%s\" removed\n"
msgstr ""
-#: src/common/command.c:2537
+#: src/common/command.c:2683
+msgid "ignore were removed.\n"
+msgstr ""
+
+#: src/common/command.c:2685
+msgid "ignore was removed.\n"
+msgstr ""
+
+#: src/common/command.c:2690
+#, c-format
+msgid "%s no ignore found\n"
+msgstr ""
+
+#: src/common/command.c:2713
msgid "Opened windows:\n"
msgstr ""
@@ -2943,129 +3045,129 @@ msgstr ""
msgid "**** End of log "
msgstr ""
-#: src/common/weechat.c:198
+#: src/common/weechat.c:270
#, c-format
msgid ""
"WeeChat configuration options (~/.weechat/weechat.rc):\n"
"\n"
msgstr ""
-#: src/common/weechat.c:211
+#: src/common/weechat.c:283
#, c-format
msgid " . type boolean (values: 'on' or 'off')\n"
msgstr ""
-#: src/common/weechat.c:212 src/common/weechat.c:235 src/common/weechat.c:241
-#: src/common/weechat.c:247
+#: src/common/weechat.c:284 src/common/weechat.c:307 src/common/weechat.c:313
+#: src/common/weechat.c:319
#, c-format
msgid " . default value: '%s'\n"
msgstr ""
-#: src/common/weechat.c:217
+#: src/common/weechat.c:289
#, c-format
msgid " . type integer (values: between %d and %d)\n"
msgstr ""
-#: src/common/weechat.c:220
+#: src/common/weechat.c:292
#, c-format
msgid " . default value: %d\n"
msgstr ""
-#: src/common/weechat.c:224
+#: src/common/weechat.c:296
#, c-format
msgid " . type string (values: "
msgstr ""
-#: src/common/weechat.c:237 src/common/weechat.c:243 src/common/weechat.c:249
+#: src/common/weechat.c:309 src/common/weechat.c:315 src/common/weechat.c:321
msgid "empty"
msgstr ""
-#: src/common/weechat.c:240
+#: src/common/weechat.c:312
#, c-format
msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n"
msgstr ""
-#: src/common/weechat.c:246
+#: src/common/weechat.c:318
#, c-format
msgid " . type string (any string)\n"
msgstr ""
-#: src/common/weechat.c:252
+#: src/common/weechat.c:324
#, c-format
msgid ""
" . description: %s\n"
"\n"
msgstr ""
-#: src/common/weechat.c:258
+#: src/common/weechat.c:330
#, c-format
msgid ""
"Moreover, you can define aliases in [alias] section, by adding lines like:\n"
msgstr ""
-#: src/common/weechat.c:260
+#: src/common/weechat.c:332
#, c-format
msgid ""
"where 'j' is alias name, and 'join' associated command.\n"
"\n"
msgstr ""
-#: src/common/weechat.c:345
+#: src/common/weechat.c:417
#, c-format
msgid "%s default keys:\n"
msgstr ""
-#: src/common/weechat.c:425
+#: src/common/weechat.c:497
#, c-format
msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
msgstr ""
-#: src/common/weechat.c:438
+#: src/common/weechat.c:510
#, c-format
msgid "%s unable to create server ('%s'), ignored\n"
msgstr ""
-#: src/common/weechat.c:447
+#: src/common/weechat.c:519
#, c-format
msgid "%s unknown parameter '%s', ignored\n"
msgstr ""
-#: src/common/weechat.c:467
+#: src/common/weechat.c:539
#, c-format
msgid "%s cannot create directory \"%s\"\n"
msgstr ""
-#: src/common/weechat.c:493
+#: src/common/weechat.c:565
#, c-format
msgid "%s unable to get HOME directory\n"
msgstr ""
-#: src/common/weechat.c:502
+#: src/common/weechat.c:574
#, c-format
msgid "%s not enough memory for home directory\n"
msgstr ""
-#: src/common/weechat.c:512
+#: src/common/weechat.c:584
#, c-format
msgid "%s unable to create ~/.weechat directory\n"
msgstr ""
-#: src/common/weechat.c:564
+#: src/common/weechat.c:636
#, c-format
msgid "%s unable to create ~/.weechat/logs directory\n"
msgstr ""
-#: src/common/weechat.c:607
+#: src/common/weechat.c:679
#, c-format
msgid "%s unable to create/append to log file (~/.weechat/%s)"
msgstr ""
-#: src/common/weechat.c:630
+#: src/common/weechat.c:702
#, c-format
msgid "%sWelcome to "
msgstr ""
-#: src/common/weechat.c:643 src/common/weechat.c:652
+#: src/common/weechat.c:715 src/common/weechat.c:724
msgid "compiled on"
msgstr ""
@@ -3077,906 +3179,911 @@ msgstr ""
msgid "WeeChat Warning:"
msgstr ""
-#: src/common/weeconfig.c:90 src/common/weeconfig.c:91
+#: src/common/weeconfig.c:91 src/common/weeconfig.c:92
msgid "set title for window (terminal for Curses GUI) with name & version"
msgstr ""
-#: src/common/weeconfig.c:94 src/common/weeconfig.c:95
+#: src/common/weeconfig.c:95 src/common/weeconfig.c:96
msgid "display WeeChat logo at startup"
msgstr ""
-#: src/common/weeconfig.c:98 src/common/weeconfig.c:99
+#: src/common/weeconfig.c:99 src/common/weeconfig.c:100
msgid "display WeeChat version at startup"
msgstr ""
-#: src/common/weeconfig.c:102
+#: src/common/weeconfig.c:103
msgid "WeeChat slogan"
msgstr ""
-#: src/common/weeconfig.c:103
+#: src/common/weeconfig.c:104
msgid "WeeChat slogan (if empty, slogan is not used)"
msgstr ""
-#: src/common/weeconfig.c:106
+#: src/common/weeconfig.c:107
msgid "charset for decoding messages from server"
msgstr ""
-#: src/common/weeconfig.c:107
+#: src/common/weeconfig.c:108
msgid ""
"charset for decoding messages from server, examples: UTF-8, ISO-8859-1 (if "
"empty, messages are not converted)"
msgstr ""
-#: src/common/weeconfig.c:110
+#: src/common/weeconfig.c:111
msgid "charset for encoding messages sent to server"
msgstr ""
-#: src/common/weeconfig.c:111
+#: src/common/weeconfig.c:112
msgid ""
"charset for encoding messages sent to server, examples: UFT-8, ISO-8859-1 "
"(if empty, local charset is used)"
msgstr ""
-#: src/common/weeconfig.c:114
+#: src/common/weeconfig.c:115
msgid "internal WeeChat charset (should be ISO)"
msgstr ""
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:116
msgid ""
"internal WeeChat charset, should be ISO-xxxx even if locale is UTF-8 (if "
"empty, local charset is used)"
msgstr ""
-#: src/common/weeconfig.c:118 src/common/weeconfig.c:119
+#: src/common/weeconfig.c:119 src/common/weeconfig.c:120
msgid "timestamp for buffers"
msgstr ""
-#: src/common/weeconfig.c:122 src/common/weeconfig.c:123
+#: src/common/weeconfig.c:123 src/common/weeconfig.c:124
msgid "display nick names with different colors"
msgstr ""
-#: src/common/weeconfig.c:126 src/common/weeconfig.c:127
+#: src/common/weeconfig.c:127 src/common/weeconfig.c:128
msgid "display actions with different colors"
msgstr ""
-#: src/common/weeconfig.c:130 src/common/weeconfig.c:131
+#: src/common/weeconfig.c:131 src/common/weeconfig.c:132
msgid "remove colors from incoming messages"
msgstr ""
-#: src/common/weeconfig.c:134
+#: src/common/weeconfig.c:135
msgid "display nicklist window"
msgstr ""
-#: src/common/weeconfig.c:135
+#: src/common/weeconfig.c:136
msgid "display nicklist window (for channel windows)"
msgstr ""
-#: src/common/weeconfig.c:138
+#: src/common/weeconfig.c:139
msgid "nicklist position"
msgstr ""
-#: src/common/weeconfig.c:139
+#: src/common/weeconfig.c:140
msgid "nicklist position (top, left, right (default), bottom)"
msgstr ""
-#: src/common/weeconfig.c:142
+#: src/common/weeconfig.c:143
msgid "min size for nicklist"
msgstr ""
-#: src/common/weeconfig.c:143
+#: src/common/weeconfig.c:144
msgid ""
"min size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no min size))"
msgstr ""
-#: src/common/weeconfig.c:147
+#: src/common/weeconfig.c:148
msgid "max size for nicklist"
msgstr ""
-#: src/common/weeconfig.c:148
+#: src/common/weeconfig.c:149
msgid ""
"max size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no max size; if min == max and > 0, then size is fixed))"
msgstr ""
-#: src/common/weeconfig.c:152 src/common/weeconfig.c:153
+#: src/common/weeconfig.c:153 src/common/weeconfig.c:154
msgid "text to display instead of nick when not connected"
msgstr ""
-#: src/common/weeconfig.c:156 src/common/weeconfig.c:157
+#: src/common/weeconfig.c:157 src/common/weeconfig.c:158
msgid "display nick mode ((half)op/voice) before each nick"
msgstr ""
-#: src/common/weeconfig.c:160 src/common/weeconfig.c:161
+#: src/common/weeconfig.c:161 src/common/weeconfig.c:162
msgid "display space if nick mode is not (half)op/voice"
msgstr ""
-#: src/common/weeconfig.c:164 src/common/weeconfig.c:165
+#: src/common/weeconfig.c:165 src/common/weeconfig.c:166
msgid "the string inserted after nick completion"
msgstr ""
-#: src/common/weeconfig.c:168 src/common/weeconfig.c:169
+#: src/common/weeconfig.c:169 src/common/weeconfig.c:170
msgid "enable info bar"
msgstr ""
-#: src/common/weeconfig.c:172 src/common/weeconfig.c:173
+#: src/common/weeconfig.c:173 src/common/weeconfig.c:174
msgid "timestamp for time in infobar"
msgstr ""
-#: src/common/weeconfig.c:176 src/common/weeconfig.c:177
+#: src/common/weeconfig.c:177 src/common/weeconfig.c:178
msgid "display seconds in infobar time"
msgstr ""
-#: src/common/weeconfig.c:180
+#: src/common/weeconfig.c:181
msgid "delay (in seconds) for highlight messages in infobar"
msgstr ""
-#: src/common/weeconfig.c:181
+#: src/common/weeconfig.c:182
msgid ""
"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
"notifications in infobar)"
msgstr ""
-#: src/common/weeconfig.c:243 src/common/weeconfig.c:244
+#: src/common/weeconfig.c:244 src/common/weeconfig.c:245
msgid "color for title bar"
msgstr ""
-#: src/common/weeconfig.c:247 src/common/weeconfig.c:248
+#: src/common/weeconfig.c:248 src/common/weeconfig.c:249
msgid "background for title bar"
msgstr ""
-#: src/common/weeconfig.c:253 src/common/weeconfig.c:254
+#: src/common/weeconfig.c:254 src/common/weeconfig.c:255
msgid "color for chat text"
msgstr ""
-#: src/common/weeconfig.c:257
+#: src/common/weeconfig.c:258
msgid "color for time"
msgstr ""
-#: src/common/weeconfig.c:258
+#: src/common/weeconfig.c:259
msgid "color for time in chat window"
msgstr ""
-#: src/common/weeconfig.c:261
+#: src/common/weeconfig.c:262
msgid "color for time separator"
msgstr ""
-#: src/common/weeconfig.c:262
+#: src/common/weeconfig.c:263
msgid "color for time separator (chat window)"
msgstr ""
-#: src/common/weeconfig.c:265 src/common/weeconfig.c:266
+#: src/common/weeconfig.c:266 src/common/weeconfig.c:267
msgid "color for 1st and 3rd char of prefix"
msgstr ""
-#: src/common/weeconfig.c:269 src/common/weeconfig.c:270
+#: src/common/weeconfig.c:270 src/common/weeconfig.c:271
msgid "color for middle char of prefix"
msgstr ""
-#: src/common/weeconfig.c:273 src/common/weeconfig.c:274
+#: src/common/weeconfig.c:274 src/common/weeconfig.c:275
msgid "color for join arrow (prefix)"
msgstr ""
-#: src/common/weeconfig.c:277 src/common/weeconfig.c:278
+#: src/common/weeconfig.c:278 src/common/weeconfig.c:279
msgid "color for part/quit arrow (prefix)"
msgstr ""
-#: src/common/weeconfig.c:281
+#: src/common/weeconfig.c:282
msgid "color for nicks in actions"
msgstr ""
-#: src/common/weeconfig.c:282
+#: src/common/weeconfig.c:283
msgid "color for nicks in actions (chat window)"
msgstr ""
-#: src/common/weeconfig.c:285
+#: src/common/weeconfig.c:286
msgid "color for hostnames"
msgstr ""
-#: src/common/weeconfig.c:286
+#: src/common/weeconfig.c:287
msgid "color for hostnames (chat window)"
msgstr ""
-#: src/common/weeconfig.c:289
+#: src/common/weeconfig.c:290
msgid "color for channel names in actions"
msgstr ""
-#: src/common/weeconfig.c:290
+#: src/common/weeconfig.c:291
msgid "color for channel names in actions (chat window)"
msgstr ""
-#: src/common/weeconfig.c:293
+#: src/common/weeconfig.c:294
msgid "color for dark separators"
msgstr ""
-#: src/common/weeconfig.c:294
+#: src/common/weeconfig.c:295
msgid "color for dark separators (chat window)"
msgstr ""
-#: src/common/weeconfig.c:297
+#: src/common/weeconfig.c:298
msgid "color for highlighted nick"
msgstr ""
-#: src/common/weeconfig.c:298
+#: src/common/weeconfig.c:299
msgid "color for highlighted nick (chat window)"
msgstr ""
-#: src/common/weeconfig.c:301
+#: src/common/weeconfig.c:302
msgid "background for chat"
msgstr ""
-#: src/common/weeconfig.c:302
+#: src/common/weeconfig.c:303
msgid "background for chat window"
msgstr ""
-#: src/common/weeconfig.c:307 src/common/weeconfig.c:308
+#: src/common/weeconfig.c:308 src/common/weeconfig.c:309
msgid "color for status bar"
msgstr ""
-#: src/common/weeconfig.c:311 src/common/weeconfig.c:312
+#: src/common/weeconfig.c:312 src/common/weeconfig.c:313
msgid "color for status bar delimiters"
msgstr ""
-#: src/common/weeconfig.c:315
+#: src/common/weeconfig.c:316
msgid "color for window with new messages"
msgstr ""
-#: src/common/weeconfig.c:316
+#: src/common/weeconfig.c:317
msgid "color for window with new messages (status bar)"
msgstr ""
-#: src/common/weeconfig.c:319
+#: src/common/weeconfig.c:320
msgid "color for window with private message"
msgstr ""
-#: src/common/weeconfig.c:320
+#: src/common/weeconfig.c:321
msgid "color for window with private message (status bar)"
msgstr ""
-#: src/common/weeconfig.c:323
+#: src/common/weeconfig.c:324
msgid "color for window with highlight"
msgstr ""
-#: src/common/weeconfig.c:324
+#: src/common/weeconfig.c:325
msgid "color for window with highlight (status bar)"
msgstr ""
-#: src/common/weeconfig.c:327
+#: src/common/weeconfig.c:328
msgid "color for window with new data (not messages)"
msgstr ""
-#: src/common/weeconfig.c:328
+#: src/common/weeconfig.c:329
msgid "color for window with new data (not messages) (status bar)"
msgstr ""
-#: src/common/weeconfig.c:331
+#: src/common/weeconfig.c:332
msgid "color for \"-MORE-\" text"
msgstr ""
-#: src/common/weeconfig.c:332
+#: src/common/weeconfig.c:333
msgid "color for window with new data (status bar)"
msgstr ""
-#: src/common/weeconfig.c:335 src/common/weeconfig.c:336
+#: src/common/weeconfig.c:336 src/common/weeconfig.c:337
msgid "background for status window"
msgstr ""
-#: src/common/weeconfig.c:341 src/common/weeconfig.c:342
+#: src/common/weeconfig.c:342 src/common/weeconfig.c:343
msgid "color for info bar text"
msgstr ""
-#: src/common/weeconfig.c:345 src/common/weeconfig.c:346
+#: src/common/weeconfig.c:346 src/common/weeconfig.c:347
msgid "color for infobar delimiters"
msgstr ""
-#: src/common/weeconfig.c:349 src/common/weeconfig.c:350
+#: src/common/weeconfig.c:350 src/common/weeconfig.c:351
msgid "color for info bar highlight notification"
msgstr ""
-#: src/common/weeconfig.c:353 src/common/weeconfig.c:354
+#: src/common/weeconfig.c:354 src/common/weeconfig.c:355
msgid "background for info bar window"
msgstr ""
-#: src/common/weeconfig.c:359 src/common/weeconfig.c:360
+#: src/common/weeconfig.c:360 src/common/weeconfig.c:361
msgid "color for input text"
msgstr ""
-#: src/common/weeconfig.c:363 src/common/weeconfig.c:364
+#: src/common/weeconfig.c:364 src/common/weeconfig.c:365
msgid "color for input text (channel name)"
msgstr ""
-#: src/common/weeconfig.c:367 src/common/weeconfig.c:368
+#: src/common/weeconfig.c:368 src/common/weeconfig.c:369
msgid "color for input text (nick name)"
msgstr ""
-#: src/common/weeconfig.c:371 src/common/weeconfig.c:372
+#: src/common/weeconfig.c:372 src/common/weeconfig.c:373
msgid "background for input window"
msgstr ""
-#: src/common/weeconfig.c:377 src/common/weeconfig.c:378
+#: src/common/weeconfig.c:378 src/common/weeconfig.c:379
msgid "color for nicknames"
msgstr ""
-#: src/common/weeconfig.c:381 src/common/weeconfig.c:382
+#: src/common/weeconfig.c:382 src/common/weeconfig.c:383
msgid "color for away nicknames"
msgstr ""
-#: src/common/weeconfig.c:385
+#: src/common/weeconfig.c:386
msgid "color for chan owner symbol"
msgstr ""
-#: src/common/weeconfig.c:386
+#: src/common/weeconfig.c:387
msgid "color for chan owner symbol (specific to unrealircd)"
msgstr ""
-#: src/common/weeconfig.c:389
+#: src/common/weeconfig.c:390
msgid "color for chan admin symbol"
msgstr ""
-#: src/common/weeconfig.c:390
+#: src/common/weeconfig.c:391
msgid "color for chan admin symbol (specific to unrealircd)"
msgstr ""
-#: src/common/weeconfig.c:393 src/common/weeconfig.c:394
+#: src/common/weeconfig.c:394 src/common/weeconfig.c:395
msgid "color for operator symbol"
msgstr ""
-#: src/common/weeconfig.c:397 src/common/weeconfig.c:398
+#: src/common/weeconfig.c:398 src/common/weeconfig.c:399
msgid "color for half-operator symbol"
msgstr ""
-#: src/common/weeconfig.c:401 src/common/weeconfig.c:402
+#: src/common/weeconfig.c:402 src/common/weeconfig.c:403
msgid "color for voice symbol"
msgstr ""
-#: src/common/weeconfig.c:405 src/common/weeconfig.c:406
+#: src/common/weeconfig.c:406 src/common/weeconfig.c:407
msgid "color for '+' when scrolling nicks"
msgstr ""
-#: src/common/weeconfig.c:409 src/common/weeconfig.c:410
+#: src/common/weeconfig.c:410 src/common/weeconfig.c:411
msgid "color for nick separator"
msgstr ""
-#: src/common/weeconfig.c:413 src/common/weeconfig.c:414
+#: src/common/weeconfig.c:414 src/common/weeconfig.c:415
msgid "color for local nick"
msgstr ""
-#: src/common/weeconfig.c:417 src/common/weeconfig.c:418
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
msgid "color for other nick in private window"
msgstr ""
-#: src/common/weeconfig.c:421 src/common/weeconfig.c:422
+#: src/common/weeconfig.c:422 src/common/weeconfig.c:423
msgid "background for nicknames"
msgstr ""
-#: src/common/weeconfig.c:427
+#: src/common/weeconfig.c:428
msgid "color for selected DCC"
msgstr ""
-#: src/common/weeconfig.c:428
+#: src/common/weeconfig.c:429
msgid "color for selected DCC (chat window)"
msgstr ""
-#: src/common/weeconfig.c:431 src/common/weeconfig.c:432
+#: src/common/weeconfig.c:432 src/common/weeconfig.c:433
msgid "color for \"waiting\" dcc status"
msgstr ""
-#: src/common/weeconfig.c:435 src/common/weeconfig.c:436
+#: src/common/weeconfig.c:436 src/common/weeconfig.c:437
msgid "color for \"connecting\" dcc status"
msgstr ""
-#: src/common/weeconfig.c:439 src/common/weeconfig.c:440
+#: src/common/weeconfig.c:440 src/common/weeconfig.c:441
msgid "color for \"active\" dcc status"
msgstr ""
-#: src/common/weeconfig.c:443 src/common/weeconfig.c:444
+#: src/common/weeconfig.c:444 src/common/weeconfig.c:445
msgid "color for \"done\" dcc status"
msgstr ""
-#: src/common/weeconfig.c:447 src/common/weeconfig.c:448
+#: src/common/weeconfig.c:448 src/common/weeconfig.c:449
msgid "color for \"failed\" dcc status"
msgstr ""
-#: src/common/weeconfig.c:451 src/common/weeconfig.c:452
+#: src/common/weeconfig.c:452 src/common/weeconfig.c:453
msgid "color for \"aborted\" dcc status"
msgstr ""
-#: src/common/weeconfig.c:465
+#: src/common/weeconfig.c:466
msgid "max lines in history (per window)"
msgstr ""
-#: src/common/weeconfig.c:466
+#: src/common/weeconfig.c:467
msgid ""
"maximum number of lines in history for one server/channel/private window (0 "
"= unlimited)"
msgstr ""
-#: src/common/weeconfig.c:470
+#: src/common/weeconfig.c:471
msgid "max user commands in history"
msgstr ""
-#: src/common/weeconfig.c:471
+#: src/common/weeconfig.c:472
msgid "maximum number of user commands in history (0 = unlimited)"
msgstr ""
-#: src/common/weeconfig.c:488 src/common/weeconfig.c:489
+#: src/common/weeconfig.c:489 src/common/weeconfig.c:490
msgid "automatically log server messages"
msgstr ""
-#: src/common/weeconfig.c:492 src/common/weeconfig.c:493
+#: src/common/weeconfig.c:493 src/common/weeconfig.c:494
msgid "automatically log channel chats"
msgstr ""
-#: src/common/weeconfig.c:496 src/common/weeconfig.c:497
+#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
msgid "automatically log private chats"
msgstr ""
-#: src/common/weeconfig.c:500 src/common/weeconfig.c:501
+#: src/common/weeconfig.c:501 src/common/weeconfig.c:502
msgid "log messages from plugins (scripts)"
msgstr ""
-#: src/common/weeconfig.c:504
+#: src/common/weeconfig.c:505
msgid "path for log files"
msgstr ""
-#: src/common/weeconfig.c:505
+#: src/common/weeconfig.c:506
msgid "path for WeeChat log files"
msgstr ""
-#: src/common/weeconfig.c:508
+#: src/common/weeconfig.c:509
msgid "timestamp for log"
msgstr ""
-#: src/common/weeconfig.c:509
+#: src/common/weeconfig.c:510
msgid "timestamp for log (see man strftime for date/time specifiers)"
msgstr ""
-#: src/common/weeconfig.c:512 src/common/weeconfig.c:513
+#: src/common/weeconfig.c:513 src/common/weeconfig.c:514
msgid "hide password displayed by nickserv"
msgstr ""
-#: src/common/weeconfig.c:533
+#: src/common/weeconfig.c:534
msgid "display message to all channels when away"
msgstr ""
-#: src/common/weeconfig.c:534
+#: src/common/weeconfig.c:535
msgid "display message to all channels when (un)marking as away"
msgstr ""
-#: src/common/weeconfig.c:537 src/common/weeconfig.c:538
+#: src/common/weeconfig.c:538 src/common/weeconfig.c:539
msgid "default message when away"
msgstr ""
-#: src/common/weeconfig.c:541 src/common/weeconfig.c:542
+#: src/common/weeconfig.c:542 src/common/weeconfig.c:543
msgid "default part message (leaving channel)"
msgstr ""
-#: src/common/weeconfig.c:545
+#: src/common/weeconfig.c:546
msgid "default quit message"
msgstr ""
-#: src/common/weeconfig.c:546
+#: src/common/weeconfig.c:547
msgid ""
"default quit message ('%v' will be replaced by WeeChat version in string)"
msgstr ""
-#: src/common/weeconfig.c:549
+#: src/common/weeconfig.c:550
msgid "interval between two checks for away"
msgstr ""
-#: src/common/weeconfig.c:550
+#: src/common/weeconfig.c:551
msgid "interval between two checks for away (in minutes, 0 = never check)"
msgstr ""
-#: src/common/weeconfig.c:553
+#: src/common/weeconfig.c:554
msgid "interval between two checks for lag"
msgstr ""
-#: src/common/weeconfig.c:554
+#: src/common/weeconfig.c:555
msgid "interval between two checks for lag (in seconds)"
msgstr ""
-#: src/common/weeconfig.c:557
+#: src/common/weeconfig.c:558
msgid "minimum lag to show"
msgstr ""
-#: src/common/weeconfig.c:558
+#: src/common/weeconfig.c:559
msgid "minimum lag to show (in seconds)"
msgstr ""
-#: src/common/weeconfig.c:561
+#: src/common/weeconfig.c:562
msgid "disconnect after important lag"
msgstr ""
-#: src/common/weeconfig.c:562
+#: src/common/weeconfig.c:563
msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
msgstr ""
-#: src/common/weeconfig.c:565 src/common/weeconfig.c:566
+#: src/common/weeconfig.c:566 src/common/weeconfig.c:567
msgid "create a FIFO pipe for remote control"
msgstr ""
-#: src/common/weeconfig.c:569
+#: src/common/weeconfig.c:570
msgid "list of words to highlight"
msgstr ""
-#: src/common/weeconfig.c:570
+#: src/common/weeconfig.c:571
msgid ""
"comma separated list of words to highlight (case insensitive comparison)"
msgstr ""
-#: src/common/weeconfig.c:589
+#: src/common/weeconfig.c:590
msgid "automatically accept dcc files"
msgstr ""
-#: src/common/weeconfig.c:590
+#: src/common/weeconfig.c:591
msgid "automatically accept incoming dcc files"
msgstr ""
-#: src/common/weeconfig.c:593
+#: src/common/weeconfig.c:594
msgid "automatically accept dcc chats"
msgstr ""
-#: src/common/weeconfig.c:594
+#: src/common/weeconfig.c:595
msgid "automatically accept dcc chats (use carefully!)"
msgstr ""
-#: src/common/weeconfig.c:597
+#: src/common/weeconfig.c:598
msgid "timeout for dcc request"
msgstr ""
-#: src/common/weeconfig.c:598
+#: src/common/weeconfig.c:599
msgid "timeout for dcc request (in seconds)"
msgstr ""
-#: src/common/weeconfig.c:601
+#: src/common/weeconfig.c:602
msgid "block size for dcc packets"
msgstr ""
-#: src/common/weeconfig.c:602
+#: src/common/weeconfig.c:603
msgid "block size for dcc packets in bytes (default: 65536)"
msgstr ""
-#: src/common/weeconfig.c:605
+#: src/common/weeconfig.c:606
msgid "path for incoming files with dcc"
msgstr ""
-#: src/common/weeconfig.c:606
+#: src/common/weeconfig.c:607
msgid "path for writing incoming files with dcc (default: user home)"
msgstr ""
-#: src/common/weeconfig.c:609
+#: src/common/weeconfig.c:610
msgid "default path for sending files with dcc"
msgstr ""
-#: src/common/weeconfig.c:610
+#: src/common/weeconfig.c:611
msgid ""
"path for reading files when sending thru dcc (when no path is specified)"
msgstr ""
-#: src/common/weeconfig.c:613 src/common/weeconfig.c:614
+#: src/common/weeconfig.c:614 src/common/weeconfig.c:615
msgid "convert spaces to underscores when sending files"
msgstr ""
-#: src/common/weeconfig.c:617
+#: src/common/weeconfig.c:618
msgid "automatically rename dcc files if already exists"
msgstr ""
-#: src/common/weeconfig.c:618
+#: src/common/weeconfig.c:619
msgid "rename incoming files if already exists (add '.1', '.2', ...)"
msgstr ""
-#: src/common/weeconfig.c:621
+#: src/common/weeconfig.c:622
msgid "automatically resume aborted transfers"
msgstr ""
-#: src/common/weeconfig.c:622
+#: src/common/weeconfig.c:623
msgid ""
"automatically resume dcc transfer if connection with remote host is loosed"
msgstr ""
-#: src/common/weeconfig.c:641
+#: src/common/weeconfig.c:642
msgid "use proxy"
msgstr ""
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:643
msgid "use a proxy server to connect to irc server"
msgstr ""
-#: src/common/weeconfig.c:645
+#: src/common/weeconfig.c:646
msgid "proxy type"
msgstr ""
-#: src/common/weeconfig.c:646
+#: src/common/weeconfig.c:647
msgid "proxy type (http (default), socks4, socks5)"
msgstr ""
-#: src/common/weeconfig.c:649
+#: src/common/weeconfig.c:650
msgid "use ipv6 proxy"
msgstr ""
-#: src/common/weeconfig.c:650
+#: src/common/weeconfig.c:651
msgid "connect to proxy in ipv6"
msgstr ""
-#: src/common/weeconfig.c:653
+#: src/common/weeconfig.c:654
msgid "proxy address"
msgstr ""
-#: src/common/weeconfig.c:654
+#: src/common/weeconfig.c:655
msgid "proxy server address (IP or hostname)"
msgstr ""
-#: src/common/weeconfig.c:657
+#: src/common/weeconfig.c:658
msgid "port for proxy"
msgstr ""
-#: src/common/weeconfig.c:658
+#: src/common/weeconfig.c:659
msgid "port for connecting to proxy server"
msgstr ""
-#: src/common/weeconfig.c:661
+#: src/common/weeconfig.c:662
msgid "proxy username"
msgstr ""
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:663
msgid "username for proxy server"
msgstr ""
-#: src/common/weeconfig.c:665
+#: src/common/weeconfig.c:666
msgid "proxy password"
msgstr ""
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:667
msgid "password for proxy server"
msgstr ""
-#: src/common/weeconfig.c:677
+#: src/common/weeconfig.c:678
msgid "server name"
msgstr ""
-#: src/common/weeconfig.c:678
+#: src/common/weeconfig.c:679
msgid "name associated to IRC server (for display only)"
msgstr ""
-#: src/common/weeconfig.c:681
+#: src/common/weeconfig.c:682
msgid "automatically connect to server"
msgstr ""
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:683
msgid "automatically connect to server when WeeChat is starting"
msgstr ""
-#: src/common/weeconfig.c:685
+#: src/common/weeconfig.c:686
msgid "automatically reconnect to server"
msgstr ""
-#: src/common/weeconfig.c:686
+#: src/common/weeconfig.c:687
msgid "automatically reconnect to server when disconnected"
msgstr ""
-#: src/common/weeconfig.c:689
+#: src/common/weeconfig.c:690
msgid "delay before trying again to reconnect"
msgstr ""
-#: src/common/weeconfig.c:690
+#: src/common/weeconfig.c:691
msgid "delay (in seconds) before trying again to reconnect to server"
msgstr ""
-#: src/common/weeconfig.c:693
+#: src/common/weeconfig.c:694
msgid "server address or hostname"
msgstr ""
-#: src/common/weeconfig.c:694
+#: src/common/weeconfig.c:695
msgid "IP address or hostname of IRC server"
msgstr ""
-#: src/common/weeconfig.c:697
+#: src/common/weeconfig.c:698
msgid "port for IRC server"
msgstr ""
-#: src/common/weeconfig.c:698
+#: src/common/weeconfig.c:699
msgid "port for connecting to server"
msgstr ""
-#: src/common/weeconfig.c:701 src/common/weeconfig.c:702
+#: src/common/weeconfig.c:702 src/common/weeconfig.c:703
msgid "use IPv6 protocol for server communication"
msgstr ""
-#: src/common/weeconfig.c:705 src/common/weeconfig.c:706
+#: src/common/weeconfig.c:706 src/common/weeconfig.c:707
msgid "use SSL for server communication"
msgstr ""
-#: src/common/weeconfig.c:709
+#: src/common/weeconfig.c:710
msgid "server password"
msgstr ""
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:711
msgid "password for IRC server"
msgstr ""
-#: src/common/weeconfig.c:713
+#: src/common/weeconfig.c:714
msgid "nickname for server"
msgstr ""
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:715
msgid "nickname to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:717
+#: src/common/weeconfig.c:718
msgid "alternate nickname for server"
msgstr ""
-#: src/common/weeconfig.c:718
+#: src/common/weeconfig.c:719
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr ""
-#: src/common/weeconfig.c:721
+#: src/common/weeconfig.c:722
msgid "2nd alternate nickname for server"
msgstr ""
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:723
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
msgstr ""
-#: src/common/weeconfig.c:725
+#: src/common/weeconfig.c:726
msgid "user name for server"
msgstr ""
-#: src/common/weeconfig.c:726
+#: src/common/weeconfig.c:727
msgid "user name to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:729
+#: src/common/weeconfig.c:730
msgid "real name for server"
msgstr ""
-#: src/common/weeconfig.c:730
+#: src/common/weeconfig.c:731
msgid "real name to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:733 src/common/weeconfig.c:734
+#: src/common/weeconfig.c:734 src/common/weeconfig.c:735
msgid "first command to run when connected to server"
msgstr ""
-#: src/common/weeconfig.c:737
+#: src/common/weeconfig.c:738
msgid "delay (in seconds) after command was executed"
msgstr ""
-#: src/common/weeconfig.c:738
+#: src/common/weeconfig.c:739
msgid ""
"delay (in seconds) after command was executed (example: give some time for "
"authentication)"
msgstr ""
-#: src/common/weeconfig.c:741
+#: src/common/weeconfig.c:742
msgid "list of channels to join when connected to server"
msgstr ""
-#: src/common/weeconfig.c:742
+#: src/common/weeconfig.c:743
msgid ""
"comma separated list of channels to join when connected to server (example: "
"\"#chan1,#chan2,#chan3 #key1,#key2\")"
msgstr ""
-#: src/common/weeconfig.c:745 src/common/weeconfig.c:746
+#: src/common/weeconfig.c:746 src/common/weeconfig.c:747
msgid "automatically rejoin channels when kicked"
msgstr ""
-#: src/common/weeconfig.c:749
+#: src/common/weeconfig.c:750
msgid "notify levels for channels of this server"
msgstr ""
-#: src/common/weeconfig.c:750
+#: src/common/weeconfig.c:751
msgid ""
"comma separated list of notify levels for channels of this server (format: "
"#channel:1,..)"
msgstr ""
-#: src/common/weeconfig.c:1210
+#: src/common/weeconfig.c:1211
#, c-format
msgid "%s %s, line %d: new server, but previous was incomplete\n"
msgstr ""
-#: src/common/weeconfig.c:1219
+#: src/common/weeconfig.c:1220
#, c-format
msgid "%s %s, line %d: server '%s' already exists\n"
msgstr ""
-#: src/common/weeconfig.c:1234
+#: src/common/weeconfig.c:1235
#, c-format
msgid "%s %s, line %d: unable to create server\n"
msgstr ""
-#: src/common/weeconfig.c:1274
+#: src/common/weeconfig.c:1275
#, c-format
msgid "%s unable to assign default int with string (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:1285
+#: src/common/weeconfig.c:1286
#, c-format
msgid "%s unable to assign default color (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:1324
+#: src/common/weeconfig.c:1325
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr ""
-#: src/common/weeconfig.c:1356
+#: src/common/weeconfig.c:1357
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
msgstr ""
-#: src/common/weeconfig.c:1373
+#: src/common/weeconfig.c:1374
#, c-format
msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:1391
+#: src/common/weeconfig.c:1392
#, c-format
msgid "%s %s, line %d: invalid section for option, line is ignored\n"
msgstr ""
-#: src/common/weeconfig.c:1399
+#: src/common/weeconfig.c:1400
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
msgstr ""
-#: src/common/weeconfig.c:1447
+#: src/common/weeconfig.c:1437 src/common/weeconfig.c:1463
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr ""
-#: src/common/weeconfig.c:1458
+#: src/common/weeconfig.c:1443
+#, c-format
+msgid "%s %s, line %d: invalid ignore options \"%s\"\n"
+msgstr ""
+
+#: src/common/weeconfig.c:1474
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
"Expected: boolean value: 'off' or 'on'\n"
msgstr ""
-#: src/common/weeconfig.c:1467
+#: src/common/weeconfig.c:1483
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
"Expected: integer between %d and %d\n"
msgstr ""
-#: src/common/weeconfig.c:1478
+#: src/common/weeconfig.c:1494
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
"Expected: one of these strings: "
msgstr ""
-#: src/common/weeconfig.c:1494
+#: src/common/weeconfig.c:1510
#, c-format
msgid "%s %s, line %d: invalid color name for option '%s'\n"
msgstr ""
-#: src/common/weeconfig.c:1556 src/common/weeconfig.c:1751
+#: src/common/weeconfig.c:1572 src/common/weeconfig.c:1767
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr ""
-#: src/common/weeconfig.c:1562
+#: src/common/weeconfig.c:1578
#, c-format
msgid "%s: creating default config file...\n"
msgstr ""
-#: src/common/weeconfig.c:1563
+#: src/common/weeconfig.c:1579
msgid "Creating default config file\n"
msgstr ""
-#: src/common/weeconfig.c:1566 src/common/weeconfig.c:1760
+#: src/common/weeconfig.c:1582 src/common/weeconfig.c:1776
#, c-format
msgid ""
"#\n"
"# %s configuration file, created by %s v%s on %s#\n"
msgstr ""
-#: src/common/weeconfig.c:1757
+#: src/common/weeconfig.c:1773
msgid "Saving config to disk\n"
msgstr ""
diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c
index 073ed2a82..d47bb9265 100644
--- a/weechat/src/common/command.c
+++ b/weechat/src/common/command.c
@@ -72,6 +72,16 @@ t_weechat_command weechat_commands[] =
{ "help", N_("display help about commands"),
N_("[command]"), N_("command: name of a WeeChat or IRC command"),
0, 1, weechat_cmd_help, NULL },
+ { "ignore", N_("ignore IRC messages and/or hosts"),
+ N_("[mask [[type | command] [channel [server]]]]"),
+ N_(" mask: nick or host mask to ignore\n"
+ " type: type of message to ignore (action, ctcp, dcc, pv)\n"
+ "command: IRC command\n"
+ "channel: name of channel for ignore\n"
+ " server: name of server for ignore\n\n"
+ "For each argument, '*' means all.\n"
+ "Without argument, /ignore command lists all defined ignore."),
+ 0, 4, weechat_cmd_ignore, NULL },
{ "key", N_("bind/unbind keys"),
N_("[key function/command] [unbind key] [functions] [reset -yes]"),
N_("key: bind this key to an internal function or a command (beginning by \"/\")\n"
@@ -81,17 +91,17 @@ t_weechat_command weechat_commands[] =
0, MAX_ARGS, NULL, weechat_cmd_key },
{ "perl", N_("list/load/unload Perl scripts"),
N_("[load filename] | [autoload] | [reload] | [unload]"),
- N_("filename: Perl script (file) to load\n"
+ N_("filename: Perl script (file) to load\n\n"
"Without argument, /perl command lists all loaded Perl scripts."),
0, 2, weechat_cmd_perl, NULL },
{ "python", N_("list/load/unload Python scripts"),
N_("[load filename] | [autoload] | [reload] | [unload]"),
- N_("filename: Python script (file) to load\n"
+ N_("filename: Python script (file) to load\n\n"
"Without argument, /python command lists all loaded Python scripts."),
0, 2, weechat_cmd_python, NULL },
{ "ruby", N_("list/load/unload Ruby scripts"),
N_("[load filename] | [autoload] | [reload] | [unload]"),
- N_("filename: Ruby script (file) to load\n"
+ N_("filename: Ruby script (file) to load\n\n"
"Without argument, /ruby command lists all loaded Ruby scripts."),
0, 2, weechat_cmd_ruby, NULL },
{ "server", N_("list, add or remove servers"),
@@ -121,6 +131,17 @@ t_weechat_command weechat_commands[] =
{ "unalias", N_("remove an alias"),
N_("alias_name"), N_("alias_name: name of alias to remove"),
1, 1, NULL, weechat_cmd_unalias },
+ { "unignore", N_("unignore IRC messages and/or hosts"),
+ N_("[number | [mask [[type | command] [channel [server]]]]]"),
+ N_(" number: # of ignore to unignore (number is displayed by list of ignore)\n"
+ " mask: nick or host mask to unignore\n"
+ " type: type of message to unignore (action, ctcp, dcc, pv)\n"
+ "command: IRC command\n"
+ "channel: name of channel for unignore\n"
+ " server: name of server for unignore\n\n"
+ "For each argument, '*' means all.\n"
+ "Without argument, /unignore command lists all defined ignore."),
+ 0, 4, weechat_cmd_unignore, NULL },
{ "window", N_("manage windows"),
N_("[list | splith | splitv | [merge [down | up | left | right | all]]]"),
N_("list: list opened windows (no parameter implies this list)\n"
@@ -874,6 +895,11 @@ weechat_cmd_buffer_display_info (t_gui_buffer *buffer)
"%s", SERVER(buffer)->name);
gui_printf (NULL, ")\n");
}
+ else
+ {
+ gui_printf (NULL, _("not connected"));
+ gui_printf (NULL, "\n");
+ }
}
/*
@@ -1352,6 +1378,93 @@ weechat_cmd_help (int argc, char **argv)
}
/*
+ * weechat_cmd_ignore_display: display an ignore entry
+ */
+
+void
+weechat_cmd_ignore_display (char *text, t_irc_ignore *ptr_ignore)
+{
+ if (text)
+ gui_printf (NULL, "%s ", text);
+
+ gui_printf (NULL, _("on"));
+ gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, " %s", ptr_ignore->server_name);
+ gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "/");
+ gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s", ptr_ignore->channel_name);
+ gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, ":");
+ gui_printf (NULL, _(" ignoring "));
+ gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s", ptr_ignore->type);
+ gui_printf (NULL, _(" from "));
+ gui_printf_color (NULL, COLOR_WIN_CHAT_HOST, "%s\n", ptr_ignore->mask);
+}
+
+/*
+ * weechat_cmd_ignore: ignore IRC commands and/or hosts
+ */
+
+int
+weechat_cmd_ignore (int argc, char **argv)
+{
+ t_irc_ignore *ptr_ignore;
+ int i;
+
+ ptr_ignore = NULL;
+ switch (argc)
+ {
+ case 0:
+ /* List all ignore */
+ if (irc_ignore)
+ {
+ gui_printf (NULL, "\n");
+ gui_printf (NULL, _("List of ignore:\n"));
+ i = 0;
+ for (ptr_ignore = irc_ignore; ptr_ignore;
+ ptr_ignore = ptr_ignore->next_ignore)
+ {
+ i++;
+ gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "[");
+ gui_printf (NULL, "%d", i);
+ gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "] ");
+ weechat_cmd_ignore_display (NULL, ptr_ignore);
+ }
+ }
+ else
+ {
+ irc_display_prefix (NULL, PREFIX_INFO);
+ gui_printf (NULL, _("No ignore defined.\n"));
+ }
+ return 0;
+ break;
+ case 1:
+ ptr_ignore = ignore_add (argv[0], "*", "*",
+ (SERVER(gui_current_window->buffer)) ?
+ SERVER(gui_current_window->buffer)->name : "*");
+ break;
+ case 2:
+ ptr_ignore = ignore_add (argv[0], argv[1], "*",
+ (SERVER(gui_current_window->buffer)) ?
+ SERVER(gui_current_window->buffer)->name : "*");
+ break;
+ case 3:
+ ptr_ignore = ignore_add (argv[0], argv[1], argv[2],
+ (SERVER(gui_current_window->buffer)) ?
+ SERVER(gui_current_window->buffer)->name : "*");
+ break;
+ case 4:
+ ptr_ignore = ignore_add (argv[0], argv[1], argv[2], argv[3]);
+ break;
+ }
+ if (ptr_ignore)
+ {
+ gui_printf (NULL, "\n");
+ weechat_cmd_ignore_display (_("New ignore:"), ptr_ignore);
+ return 0;
+ }
+ else
+ return -1;
+}
+
+/*
* weechat_cmd_key_display: display a key binding
*/
@@ -2410,7 +2523,7 @@ weechat_cmd_set (char *arguments)
{
section_displayed = 0;
if ((i != CONFIG_SECTION_KEYS) && (i != CONFIG_SECTION_ALIAS)
- && (i != CONFIG_SECTION_SERVER))
+ && (i != CONFIG_SECTION_IGNORE) && (i != CONFIG_SECTION_SERVER))
{
for (j = 0; weechat_options[i][j].option_name; j++)
{
@@ -2520,6 +2633,69 @@ weechat_cmd_unalias (char *arguments)
}
/*
+ * weechat_cmd_unignore: unignore IRC commands and/or hosts
+ */
+
+int
+weechat_cmd_unignore (int argc, char **argv)
+{
+ char *error;
+ int number, ret;
+
+ ret = 0;
+ switch (argc)
+ {
+ case 0:
+ /* List all ignore */
+ weechat_cmd_ignore (argc, argv);
+ return 0;
+ break;
+ case 1:
+ error = NULL;
+ number = strtol (argv[0], &error, 10);
+ if ((error) && (error[0] == '\0'))
+ ret = ignore_search_free_by_number (number);
+ else
+ ret = ignore_search_free (argv[0], "*", "*",
+ (SERVER(gui_current_window->buffer)) ?
+ SERVER(gui_current_window->buffer)->name : "*");
+ break;
+ case 2:
+ ret = ignore_search_free (argv[0], argv[1], "*",
+ (SERVER(gui_current_window->buffer)) ?
+ SERVER(gui_current_window->buffer)->name : "*");
+ break;
+ case 3:
+ ret = ignore_search_free (argv[0], argv[1], argv[2],
+ (SERVER(gui_current_window->buffer)) ?
+ SERVER(gui_current_window->buffer)->name : "*");
+ break;
+ case 4:
+ ret = ignore_search_free (argv[0], argv[1], argv[2], argv[3]);
+ break;
+ }
+
+ if (ret)
+ {
+ irc_display_prefix (NULL, PREFIX_INFO);
+ gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%d ", ret);
+ if (ret > 1)
+ gui_printf (NULL, _("ignore were removed.\n"));
+ else
+ gui_printf (NULL, _("ignore was removed.\n"));
+ }
+ else
+ {
+ irc_display_prefix (NULL, PREFIX_ERROR);
+ gui_printf (NULL, _("%s no ignore found\n"),
+ WEECHAT_ERROR);
+ return -1;
+ }
+
+ return 0;
+}
+
+/*
* weechat_cmd_window: manage windows
*/
diff --git a/weechat/src/common/command.h b/weechat/src/common/command.h
index 35c19bc5e..698290750 100644
--- a/weechat/src/common/command.h
+++ b/weechat/src/common/command.h
@@ -69,6 +69,8 @@ extern int weechat_cmd_connect (int, char **);
extern int weechat_cmd_debug (int, char **);
extern int weechat_cmd_disconnect (int, char **);
extern int weechat_cmd_help (int, char **);
+extern void weechat_cmd_ignore_display (char *, t_irc_ignore *);
+extern int weechat_cmd_ignore (int, char **);
extern int weechat_cmd_key (char *);
extern int weechat_cmd_perl (int, char **);
extern int weechat_cmd_python (int, char **);
@@ -77,6 +79,7 @@ extern int weechat_cmd_save (int, char **);
extern int weechat_cmd_server (int, char **);
extern int weechat_cmd_set (char *);
extern int weechat_cmd_unalias (char *);
+extern int weechat_cmd_unignore (int, char **);
extern int weechat_cmd_unset (char *);
extern int weechat_cmd_window (int, char **);
diff --git a/weechat/src/common/completion.c b/weechat/src/common/completion.c
index 41be8e894..a8c56461b 100644
--- a/weechat/src/common/completion.c
+++ b/weechat/src/common/completion.c
@@ -102,6 +102,7 @@ completion_build_list (t_completion *completion, void *channel)
int i, j;
t_irc_server *ptr_server;
t_irc_channel *ptr_channel;
+ t_irc_nick *ptr_nick;
char *pos, option_name[256], *string;
t_weechat_alias *ptr_alias;
t_config_option *option;
@@ -201,6 +202,88 @@ completion_build_list (t_completion *completion, void *channel)
}
return;
}
+ if (ascii_strcasecmp (completion->base_command, "ignore") == 0)
+ {
+ /* arg 1: nicks of current channel and "*" */
+ if (completion->base_command_arg == 1)
+ {
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ "*");
+ if (channel)
+ {
+ if (((t_irc_channel *)channel)->type == CHAT_CHANNEL)
+ {
+ for (ptr_nick = ((t_irc_channel *)channel)->nicks; ptr_nick;
+ ptr_nick = ptr_nick->next_nick)
+ {
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ ptr_nick->nick);
+ }
+ }
+ if (((t_irc_channel *)channel)->type == CHAT_PRIVATE)
+ {
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ ((t_irc_channel *)channel)->name);
+ }
+ }
+ return;
+ }
+
+ /* arg 2: type / command and "*" */
+ if (completion->base_command_arg == 2)
+ {
+ weelist_add(&completion->completion_list,
+ &completion->last_completion,
+ "*");
+ i = 0;
+ while (ignore_types[i])
+ {
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ ignore_types[i]);
+ i++;
+ }
+ i = 0;
+ while (irc_commands[i].command_name)
+ {
+ if (irc_commands[i].recv_function)
+ weelist_add(&completion->completion_list,
+ &completion->last_completion,
+ irc_commands[i].command_name);
+ i++;
+ }
+ return;
+ }
+
+ /* arg 3: channel and "*" */
+ if (completion->base_command_arg == 3)
+ {
+ weelist_add(&completion->completion_list,
+ &completion->last_completion,
+ "*");
+ if (((t_irc_channel *)channel)->type == CHAT_CHANNEL)
+ weelist_add(&completion->completion_list,
+ &completion->last_completion,
+ ((t_irc_channel *)channel)->name);
+ return;
+ }
+
+ /* arg 4: server */
+ if (completion->base_command_arg == 4)
+ {
+ weelist_add(&completion->completion_list,
+ &completion->last_completion,
+ "*");
+ if (SERVER(gui_current_window->buffer))
+ weelist_add(&completion->completion_list,
+ &completion->last_completion,
+ SERVER(gui_current_window->buffer)->name);
+ return;
+ }
+ }
if (ascii_strcasecmp (completion->base_command, "key") == 0)
{
if (completion->base_command_arg == 1)
@@ -254,7 +337,7 @@ completion_build_list (t_completion *completion, void *channel)
for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
{
if ((i != CONFIG_SECTION_KEYS) && (i != CONFIG_SECTION_ALIAS)
- && (i != CONFIG_SECTION_SERVER))
+ && (i != CONFIG_SECTION_IGNORE) && (i != CONFIG_SECTION_SERVER))
{
for (j = 0; weechat_options[i][j].option_name; j++)
{
diff --git a/weechat/src/common/weechat.c b/weechat/src/common/weechat.c
index f0ed84597..b5c275508 100644
--- a/weechat/src/common/weechat.c
+++ b/weechat/src/common/weechat.c
@@ -844,6 +844,9 @@ wee_dump (int crash)
wee_log_printf ("\n");
gui_buffer_print_log (ptr_buffer);
}
+
+ wee_log_printf ("\n");
+ ignore_print_log ();
wee_log_printf ("\n");
wee_log_printf ("****** End of dump ******\n");
diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c
index 2b181d1ae..6aeb9761f 100644
--- a/weechat/src/common/weeconfig.c
+++ b/weechat/src/common/weeconfig.c
@@ -55,6 +55,7 @@ t_config_section config_sections[CONFIG_NUMBER_SECTIONS] =
{ CONFIG_SECTION_PROXY, "proxy" },
{ CONFIG_SECTION_KEYS, "keys" },
{ CONFIG_SECTION_ALIAS, "alias" },
+ { CONFIG_SECTION_IGNORE, "ignore" },
{ CONFIG_SECTION_SERVER, "server" }
};
@@ -758,7 +759,7 @@ t_config_option weechat_options_server[] =
t_config_option *weechat_options[CONFIG_NUMBER_SECTIONS] =
{ weechat_options_look, weechat_options_colors, weechat_options_history,
weechat_options_log, weechat_options_irc, weechat_options_dcc,
- weechat_options_proxy, NULL, NULL, weechat_options_server
+ weechat_options_proxy, NULL, NULL, NULL, weechat_options_server
};
@@ -795,7 +796,7 @@ config_get_section (t_config_option *ptr_option)
for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
{
if ((i != CONFIG_SECTION_KEYS) && (i != CONFIG_SECTION_ALIAS)
- && (i != CONFIG_SECTION_SERVER))
+ && (i != CONFIG_SECTION_IGNORE) && (i != CONFIG_SECTION_SERVER))
{
for (j = 0; weechat_options[i][j].option_name; j++)
{
@@ -1090,7 +1091,7 @@ config_option_search (char *option_name)
for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
{
if ((i != CONFIG_SECTION_KEYS) && (i != CONFIG_SECTION_ALIAS)
- && (i != CONFIG_SECTION_SERVER))
+ && (i != CONFIG_SECTION_IGNORE) && (i != CONFIG_SECTION_SERVER))
{
for (j = 0; weechat_options[i][j].option_name; j++)
{
@@ -1254,7 +1255,7 @@ config_default_values ()
for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
{
if ((i != CONFIG_SECTION_KEYS) && (i != CONFIG_SECTION_ALIAS)
- && (i != CONFIG_SECTION_SERVER))
+ && (i != CONFIG_SECTION_IGNORE) && (i != CONFIG_SECTION_SERVER))
{
for (j = 0; weechat_options[i][j].option_name; j++)
{
@@ -1428,6 +1429,21 @@ config_read ()
if (alias_new (line, pos))
weelist_add (&index_commands, &last_index_command, line);
}
+ else if (section == CONFIG_SECTION_IGNORE)
+ {
+ /* create new ignore */
+ if (ascii_strcasecmp (line, "ignore") != 0)
+ gui_printf (NULL,
+ _("%s %s, line %d: invalid option \"%s\"\n"),
+ WEECHAT_WARNING, filename, line_number, line);
+ else
+ {
+ if (!ignore_add_from_config (pos))
+ gui_printf (NULL,
+ _("%s %s, line %d: invalid ignore options \"%s\"\n"),
+ WEECHAT_WARNING, filename, line_number, pos);
+ }
+ }
else
{
option_number = -1;
@@ -1571,7 +1587,7 @@ config_create_default ()
for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
{
if ((i != CONFIG_SECTION_KEYS) && (i != CONFIG_SECTION_ALIAS)
- && (i != CONFIG_SECTION_SERVER))
+ && (i != CONFIG_SECTION_IGNORE) && (i != CONFIG_SECTION_SERVER))
{
fprintf (file, "\n[%s]\n", config_sections[i].section_name);
for (j = 0; weechat_options[i][j].option_name; j++)
@@ -1623,7 +1639,6 @@ config_create_default ()
}
/* default aliases */
- /* TODO: remove comments when missing commands will be ok */
fprintf (file, "\n[alias]\n");
fprintf (file, "SAY=msg *\n");
fprintf (file, "BYE=quit\n");
@@ -1633,12 +1648,10 @@ config_create_default ()
fprintf (file, "CL=clear\n");
fprintf (file, "CLOSE=buffer close\n");
fprintf (file, "CHAT=dcc chat\n");
- fprintf (file, "# GET=dcc get\n");
- fprintf (file, "# IG=ignore\n");
+ fprintf (file, "IG=ignore\n");
fprintf (file, "J=join\n");
fprintf (file, "K=kick\n");
fprintf (file, "KB=kickban\n");
- fprintf (file, "# KN=knockout\n");
fprintf (file, "LEAVE=part\n");
fprintf (file, "M=msg\n");
fprintf (file, "MUB=unban *\n");
@@ -1646,12 +1659,14 @@ config_create_default ()
fprintf (file, "Q=query\n");
fprintf (file, "T=topic\n");
fprintf (file, "UB=unban\n");
- fprintf (file, "# UNIG=unignore\n");
+ fprintf (file, "UNIG=unignore\n");
fprintf (file, "W=who\n");
fprintf (file, "WC=part\n");
fprintf (file, "WI=whois\n");
fprintf (file, "WW=whowas\n");
+ /* no ignore by default */
+
/* default server is freenode */
fprintf (file, "\n[server]\n");
fprintf (file, "server_name=freenode\n");
@@ -1730,6 +1745,7 @@ config_write (char *config_name)
time_t current_time;
t_irc_server *ptr_server;
t_weechat_alias *ptr_alias;
+ t_irc_ignore *ptr_ignore;
t_gui_key *ptr_key;
char *expanded_name, *function_name;
@@ -1765,7 +1781,7 @@ config_write (char *config_name)
for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
{
if ((i != CONFIG_SECTION_KEYS) && (i != CONFIG_SECTION_ALIAS)
- && (i != CONFIG_SECTION_SERVER))
+ && (i != CONFIG_SECTION_IGNORE) && (i != CONFIG_SECTION_SERVER))
{
fprintf (file, "\n[%s]\n", config_sections[i].section_name);
for (j = 0; weechat_options[i][j].option_name; j++)
@@ -1842,6 +1858,18 @@ config_write (char *config_name)
ptr_alias->alias_name, ptr_alias->alias_command + 1);
}
+ /* ignore section */
+ fprintf (file, "\n[ignore]\n");
+ for (ptr_ignore = irc_ignore; ptr_ignore;
+ ptr_ignore = ptr_ignore->next_ignore)
+ {
+ fprintf (file, "ignore=%s,%s,%s,%s\n",
+ ptr_ignore->mask,
+ ptr_ignore->type,
+ ptr_ignore->channel_name,
+ ptr_ignore->server_name);
+ }
+
/* server section */
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
diff --git a/weechat/src/common/weeconfig.h b/weechat/src/common/weeconfig.h
index b760a8857..27119cc0b 100644
--- a/weechat/src/common/weeconfig.h
+++ b/weechat/src/common/weeconfig.h
@@ -35,8 +35,9 @@
#define CONFIG_SECTION_PROXY 6
#define CONFIG_SECTION_KEYS 7
#define CONFIG_SECTION_ALIAS 8
-#define CONFIG_SECTION_SERVER 9
-#define CONFIG_NUMBER_SECTIONS 10
+#define CONFIG_SECTION_IGNORE 9
+#define CONFIG_SECTION_SERVER 10
+#define CONFIG_NUMBER_SECTIONS 11
#define OPTION_TYPE_BOOLEAN 1 /* values: on/off */
#define OPTION_TYPE_INT 2 /* values: from min to max */
diff --git a/weechat/src/irc/Makefile.am b/weechat/src/irc/Makefile.am
index 50bd43cc6..d916bf345 100644
--- a/weechat/src/irc/Makefile.am
+++ b/weechat/src/irc/Makefile.am
@@ -27,4 +27,5 @@ lib_weechat_irc_a_SOURCES = irc.h \
irc-channel.c \
irc-nick.c \
irc-dcc.c \
+ irc-ignore.c \
irc-display.c
diff --git a/weechat/src/irc/irc-channel.c b/weechat/src/irc/irc-channel.c
index 6aec9902f..86028f952 100644
--- a/weechat/src/irc/irc-channel.c
+++ b/weechat/src/irc/irc-channel.c
@@ -143,7 +143,10 @@ t_irc_channel *
channel_search (t_irc_server *server, char *channel_name)
{
t_irc_channel *ptr_channel;
-
+
+ if (!server || !channel_name)
+ return NULL;
+
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
@@ -162,6 +165,9 @@ string_is_channel (char *string)
{
char first_char[2];
+ if (!string)
+ return 0;
+
first_char[0] = string[0];
first_char[1] = '\0';
return (strpbrk (first_char, CHANNEL_PREFIX)) ? 1 : 0;
diff --git a/weechat/src/irc/irc-commands.c b/weechat/src/irc/irc-commands.c
index 8d745090a..c9fafd06b 100644
--- a/weechat/src/irc/irc-commands.c
+++ b/weechat/src/irc/irc-commands.c
@@ -384,8 +384,6 @@ t_irc_command irc_commands[] =
"", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
{ "406", N_("was no such nick"),
"", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
- { "406", N_("was no such nick"),
- "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
{ "407", N_("was no such nick"),
"", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
{ "409", N_("no origin"),
diff --git a/weechat/src/irc/irc-ignore.c b/weechat/src/irc/irc-ignore.c
new file mode 100644
index 000000000..bf29d0684
--- /dev/null
+++ b/weechat/src/irc/irc-ignore.c
@@ -0,0 +1,475 @@
+/*
+ * Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
+ * See README for License detail, AUTHORS for developers list.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* irc-ignore.c: manages IRC ignore list */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "../common/weechat.h"
+#include "irc.h"
+#include "../common/command.h"
+
+
+char *ignore_types[] =
+{ IGNORE_ACTION, IGNORE_CTCP, IGNORE_DCC, IGNORE_PRIVATE, NULL };
+
+t_irc_ignore *irc_ignore = NULL;
+t_irc_ignore *last_irc_ignore = NULL;
+
+
+/*
+ * ignore_check_mask: returns 1 is mask1 and mask2 are the same host
+ * anyone or both strings may have user and/or host after
+ */
+
+int
+ignore_check_mask (char *mask1, char *mask2)
+{
+ char *m1, *m2, *pos;
+ int match;
+
+ if (!mask1 || !mask1[0] || !mask2 || !mask2[0])
+ return 0;
+
+ m1 = strdup (mask1);
+ m2 = strdup (mask2);
+
+ pos = strchr (m1, '!');
+ if (!pos)
+ {
+ /* remove '!' from m2 */
+ pos = strchr (m2, '!');
+ if (pos)
+ pos[0] = '\0';
+ }
+ pos = strchr (m2, '!');
+ if (!pos)
+ {
+ /* remove '!' from m1 */
+ pos = strchr (m1, '!');
+ if (pos)
+ pos[0] = '\0';
+ }
+
+ /* TODO: use regexp to match both masks */
+ match = ascii_strcasecmp (m1, m2);
+
+ free (m1);
+ free (m2);
+
+ return (match == 0);
+}
+
+/*
+ * ignore_match: check if pointed ignore matches with arguments
+ */
+
+int
+ignore_match (t_irc_ignore *ptr_ignore, char *mask, char *type, char *channel_name, char *server_name)
+{
+ /* check mask */
+ if ((strcmp (mask, "*") != 0) && (strcmp (ptr_ignore->mask, "*") != 0)
+ && (!ignore_check_mask (ptr_ignore->mask, mask)))
+ return 0;
+
+ /* mask is matching, go on with type */
+ if ((strcmp (type, "*") != 0) && (strcmp (ptr_ignore->type, "*") != 0)
+ && (ascii_strcasecmp (ptr_ignore->type, type) != 0))
+ return 0;
+
+ /* mask and type matching, go on with server */
+ if (server_name && server_name[0])
+ {
+ if ((strcmp (server_name, "*") != 0) && (strcmp (ptr_ignore->server_name, "*") != 0)
+ && (ascii_strcasecmp (ptr_ignore->server_name, server_name) != 0))
+ return 0;
+ }
+ else
+ {
+ if (strcmp (ptr_ignore->server_name, "*") != 0)
+ return 0;
+ }
+
+ /* mask, type and server matching, go on with channel */
+ if (channel_name && channel_name[0])
+ {
+ if ((strcmp (channel_name, "*") != 0) && (strcmp (ptr_ignore->channel_name, "*") != 0)
+ && (ascii_strcasecmp (ptr_ignore->channel_name, channel_name) != 0))
+ return 0;
+ }
+ else
+ {
+ if (strcmp (ptr_ignore->channel_name, "*") != 0)
+ return 0;
+ }
+
+ /* all is matching => we find a ignore! */
+ return 1;
+}
+
+/*
+ * ignore_check: check if an ignore is set for arguments
+ * returns 1 if at least one ignore exists (message should NOT be displayed)
+ * 0 if no ignore found (message will be displayed)
+ */
+
+int
+ignore_check (char *mask, char *type, char *channel_name, char *server_name)
+{
+ t_irc_ignore *ptr_ignore;
+
+ if (!mask || !mask[0] || !type || !type[0])
+ return 0;
+
+ for (ptr_ignore = irc_ignore; ptr_ignore;
+ ptr_ignore = ptr_ignore->next_ignore)
+ {
+ if (ignore_match (ptr_ignore, mask, type, channel_name, server_name))
+ return 1;
+ }
+
+ /* no ignore found */
+ return 0;
+}
+
+/*
+ * ignore_search: search for an ignore
+ */
+
+t_irc_ignore *
+ignore_search (char *mask, char *type, char *channel_name, char *server_name)
+{
+ t_irc_ignore *ptr_ignore;
+
+ for (ptr_ignore = irc_ignore; ptr_ignore;
+ ptr_ignore = ptr_ignore->next_ignore)
+ {
+ if ((ascii_strcasecmp (ptr_ignore->mask, mask) == 0)
+ && (ascii_strcasecmp (ptr_ignore->type, type) == 0)
+ && (ascii_strcasecmp (ptr_ignore->channel_name, channel_name) == 0)
+ && (ascii_strcasecmp (ptr_ignore->server_name, server_name) == 0))
+ return ptr_ignore;
+ }
+
+ /* ignore not found */
+ return NULL;
+}
+
+/*
+ * ignore_add: add an ignore in list
+ */
+
+t_irc_ignore *
+ignore_add (char *mask, char *type, char *channel_name, char *server_name)
+{
+ int i, type_index;
+ t_irc_command *command_ptr;
+ t_irc_ignore *new_ignore;
+
+ if (!mask || !mask[0] || !type || !type[0] || !channel_name || !channel_name[0]
+ || !server_name || !server_name[0])
+ {
+ gui_printf (NULL,
+ _("%s too few arguments for ignore\n"),
+ WEECHAT_ERROR);
+ return NULL;
+ }
+
+#ifdef DEBUG
+ wee_log_printf ("Adding ignore: mask:'%s', type:'%s', channel:'%s', server:'%s'\n",
+ mask, type, channel_name, server_name);
+#endif
+
+ type_index = -1;
+ command_ptr = NULL;
+
+ if ((strcmp (mask, "*") == 0) && (strcmp (type, "*") == 0))
+ {
+ irc_display_prefix (NULL, PREFIX_ERROR);
+ gui_printf (NULL,
+ _("%s mask or type/command should be non generic value for ignore\n"),
+ WEECHAT_ERROR);
+ return NULL;
+ }
+
+ if (ignore_search (mask, type, channel_name, server_name))
+ {
+ irc_display_prefix (NULL, PREFIX_ERROR);
+ gui_printf (NULL,
+ _("%s ignore already exists\n"),
+ WEECHAT_ERROR);
+ return NULL;
+ }
+
+ if (strcmp (type, "*") != 0)
+ {
+ /* look for type in pre-defined ignore types */
+ for (i = 0; ignore_types[i]; i++)
+ {
+ if (ascii_strcasecmp (type, ignore_types[i]) == 0)
+ {
+ type_index = i;
+ break;
+ }
+ }
+
+ /* not a pre-defined ignore type, so it MUST be an IRC command */
+ if (type_index < 0)
+ {
+ for (i = 0; irc_commands[i].command_name; i++)
+ {
+ if (irc_commands[i].recv_function &&
+ (ascii_strcasecmp (type, irc_commands[i].command_name) == 0))
+ {
+ command_ptr = &irc_commands[i];
+ break;
+ }
+ }
+ }
+
+ /* not a pre-defined command and not an IRC command => error */
+ if ((type_index < 0) && (!command_ptr))
+ {
+ irc_display_prefix (NULL, PREFIX_ERROR);
+ gui_printf (NULL,
+ _("%s unknown type or IRC command \"%s\" for ignore\n"),
+ WEECHAT_ERROR, type);
+ return NULL;
+ }
+ }
+
+ /* create new ignore */
+ new_ignore = (t_irc_ignore *) malloc (sizeof (t_irc_ignore));
+ if (new_ignore)
+ {
+ new_ignore->mask = strdup (mask);
+ new_ignore->type = strdup (type);
+ new_ignore->server_name = strdup (server_name);
+ new_ignore->channel_name = strdup (channel_name);
+
+ /* add new ignore to queue */
+ new_ignore->prev_ignore = last_irc_ignore;
+ new_ignore->next_ignore = NULL;
+ if (irc_ignore)
+ last_irc_ignore->next_ignore = new_ignore;
+ else
+ irc_ignore = new_ignore;
+ last_irc_ignore = new_ignore;
+ }
+ else
+ {
+ irc_display_prefix (NULL, PREFIX_ERROR);
+ gui_printf (NULL,
+ _("%s not enough memory to create ignore\n"),
+ WEECHAT_ERROR);
+ return NULL;
+ }
+
+ return new_ignore;
+}
+
+/*
+ * ignore_add_from_config: add an ignore to list, read from config file
+ * (comma serparated values)
+ */
+
+t_irc_ignore *
+ignore_add_from_config (char *string)
+{
+ t_irc_ignore *new_ignore;
+ char *string2;
+ char *pos_mask, *pos_type, *pos_channel, *pos_server;
+
+ if (!string || !string[0])
+ return NULL;
+
+ new_ignore = NULL;
+ string2 = strdup (string);
+
+ pos_mask = string2;
+ pos_type = strchr (pos_mask, ',');
+ if (pos_type)
+ {
+ pos_type[0] = '\0';
+ pos_type++;
+ pos_channel = strchr (pos_type, ',');
+ if (pos_channel)
+ {
+ pos_channel[0] = '\0';
+ pos_channel++;
+ pos_server = strchr (pos_channel, ',');
+ if (pos_server)
+ {
+ pos_server[0] = '\0';
+ pos_server++;
+ new_ignore = ignore_add (pos_mask, pos_type, pos_channel, pos_server);
+ }
+ }
+ }
+
+ free (string2);
+ return new_ignore;
+}
+
+/*
+ * ignore_free: free an ignore
+ */
+
+void
+ignore_free (t_irc_ignore *ptr_ignore)
+{
+ t_irc_ignore *new_irc_ignore;
+
+ /* free data */
+ if (ptr_ignore->mask)
+ free (ptr_ignore->mask);
+ if (ptr_ignore->type)
+ free (ptr_ignore->type);
+ if (ptr_ignore->channel_name)
+ free (ptr_ignore->channel_name);
+ if (ptr_ignore->server_name)
+ free (ptr_ignore->server_name);
+
+ /* remove ignore from queue */
+ if (last_irc_ignore == ptr_ignore)
+ last_irc_ignore = ptr_ignore->prev_ignore;
+ if (ptr_ignore->prev_ignore)
+ {
+ (ptr_ignore->prev_ignore)->next_ignore = ptr_ignore->next_ignore;
+ new_irc_ignore = irc_ignore;
+ }
+ else
+ new_irc_ignore = ptr_ignore->next_ignore;
+
+ if (ptr_ignore->next_ignore)
+ (ptr_ignore->next_ignore)->prev_ignore = ptr_ignore->prev_ignore;
+
+ free (ptr_ignore);
+ irc_ignore = new_irc_ignore;
+}
+
+/*
+ * ignore_free_all: free all ignores
+ */
+
+void
+ignore_free_all ()
+{
+ while (irc_ignore)
+ ignore_free (irc_ignore);
+}
+
+/*
+ * ignore_search_free: search and free ignore(s)
+ * return: number of ignore found and deleted
+ * 0 if no ignore found
+ */
+
+int
+ignore_search_free (char *mask, char *type, char *channel_name, char *server_name)
+{
+ int found;
+ t_irc_ignore *ptr_ignore, *next_ignore;
+
+ found = 0;
+ ptr_ignore = irc_ignore;
+ while (ptr_ignore)
+ {
+ if (ignore_match (ptr_ignore, mask, type, channel_name, server_name))
+ {
+ found++;
+ if (found == 1)
+ gui_printf (NULL, "\n");
+ irc_display_prefix (NULL, PREFIX_INFO);
+ weechat_cmd_ignore_display (_("Removing ignore:"), ptr_ignore);
+ next_ignore = ptr_ignore->next_ignore;
+ ignore_free (ptr_ignore);
+ ptr_ignore = next_ignore;
+ }
+ else
+ ptr_ignore = ptr_ignore->next_ignore;
+ }
+
+ return found;
+}
+
+/*
+ * ignore_search_free_by_number: search and free ignore(s) by number
+ * return: 1 if ignore found and deleted
+ * 0 if ignore not found
+ */
+
+int
+ignore_search_free_by_number (int number)
+{
+ int i;
+ t_irc_ignore *ptr_ignore;
+
+ if (number < 1)
+ return 0;
+
+ i = 0;
+ for (ptr_ignore = irc_ignore; ptr_ignore;
+ ptr_ignore = ptr_ignore->next_ignore)
+ {
+ i++;
+ if (i == number)
+ {
+ gui_printf (NULL, "\n");
+ irc_display_prefix (NULL, PREFIX_INFO);
+ weechat_cmd_ignore_display (_("Removing ignore:"), ptr_ignore);
+ ignore_free (ptr_ignore);
+ return 1;
+ }
+ }
+
+ /* ignore number not found */
+ return 0;
+}
+
+/*
+ * ignore_print_log: print ignore list in log (usually for crash dump)
+ */
+
+void
+ignore_print_log ()
+{
+ t_irc_ignore *ptr_ignore;
+
+ wee_log_printf ("[ignore list]\n");
+
+ for (ptr_ignore = irc_ignore; ptr_ignore;
+ ptr_ignore = ptr_ignore->next_ignore)
+ {
+ wee_log_printf ("\n");
+ wee_log_printf (" -> ignore at 0x%X:\n", ptr_ignore);
+ wee_log_printf (" mask. . . . . . . : %s\n", ptr_ignore->mask);
+ wee_log_printf (" type. . . . . . . : %s\n", ptr_ignore->type);
+ wee_log_printf (" channel_name. . . : %s\n", ptr_ignore->channel_name);
+ wee_log_printf (" server_name . . . : %s\n", ptr_ignore->server_name);
+ wee_log_printf (" prev_ignore . . . : 0x%X\n", ptr_ignore->prev_ignore);
+ wee_log_printf (" next_ignore . . . : 0x%X\n", ptr_ignore->next_ignore);
+ }
+}
diff --git a/weechat/src/irc/irc-nick.c b/weechat/src/irc/irc-nick.c
index 37d4aaf6c..9d20d4ca8 100644
--- a/weechat/src/irc/irc-nick.c
+++ b/weechat/src/irc/irc-nick.c
@@ -314,7 +314,10 @@ t_irc_nick *
nick_search (t_irc_channel *channel, char *nickname)
{
t_irc_nick *ptr_nick;
-
+
+ if (!nickname)
+ return NULL;
+
for (ptr_nick = channel->nicks; ptr_nick;
ptr_nick = ptr_nick->next_nick)
{
diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c
index eecefc12d..6976881a2 100644
--- a/weechat/src/irc/irc-recv.c
+++ b/weechat/src/irc/irc-recv.c
@@ -43,6 +43,9 @@
#include "../plugins/plugins.h"
+int command_ignored;
+
+
/*
* irc_is_highlight: returns 1 if given message contains highlight (with given nick
* or at least one of string in "irc_higlight" setting
@@ -77,13 +80,15 @@ irc_is_highlight (char *message, char *nick)
pos = msg;
while (pos[0])
{
- pos[0] = tolower (pos[0]);
+ if ((pos[0] >= 'A') && (pos[0] <= 'Z'))
+ pos[0] += ('a' - 'A');
pos++;
}
pos = highlight;
while (pos[0])
{
- pos[0] = tolower (pos[0]);
+ if ((pos[0] >= 'A') && (pos[0] <= 'Z'))
+ pos[0] += ('a' - 'A');
pos++;
}
@@ -142,7 +147,8 @@ irc_recv_command (t_irc_server *server, char *entire_line,
char *host, char *command, char *arguments)
{
int i, cmd_found, return_code;
-
+ char *pos, *nick;
+
if (command == NULL)
return -2;
@@ -160,11 +166,24 @@ irc_recv_command (t_irc_server *server, char *entire_line,
/* command not found */
if (cmd_found < 0)
return -3;
-
+
if (irc_commands[i].recv_function != NULL)
{
- return_code = (int) (irc_commands[i].recv_function) (server, host, arguments);
- plugin_event_msg (irc_commands[i].command_name, server->name, entire_line);
+ command_ignored = ignore_check (host, irc_commands[i].command_name, NULL, server->name);
+ if (host)
+ pos = strchr (host, '!');
+ else
+ pos = NULL;
+ if (pos)
+ pos[0] = '\0';
+ nick = (host) ? strdup (host) : NULL;
+ if (pos)
+ pos[0] = '!';
+ return_code = (int) (irc_commands[i].recv_function) (server, host, nick, arguments);
+ if (nick)
+ free (nick);
+ if (!command_ignored)
+ plugin_event_msg (irc_commands[i].command_name, server->name, entire_line);
return return_code;
}
@@ -176,7 +195,7 @@ irc_recv_command (t_irc_server *server, char *entire_line,
*/
int
-irc_cmd_recv_error (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_error (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos2;
int first;
@@ -186,6 +205,7 @@ irc_cmd_recv_error (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) server;
(void) host;
+ (void) nick;
if (strncmp (arguments, "Closing Link", 12) == 0)
{
@@ -247,13 +267,9 @@ irc_cmd_recv_error (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_invite (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_invite (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos, *pos_channel;
-
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
+ char *pos_channel;
pos_channel = strchr (arguments, ' ');
if (pos_channel)
@@ -265,15 +281,20 @@ irc_cmd_recv_invite (t_irc_server *server, char *host, char *arguments)
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 (HOTLIST_HIGHLIGHT, server->buffer);
- gui_draw_buffer_status (gui_current_window->buffer, 1);
+ command_ignored |= ignore_check (host, "invite", pos_channel, server->name);
+
+ if (!command_ignored)
+ {
+ 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", nick);
+ hotlist_add (HOTLIST_HIGHLIGHT, server->buffer);
+ gui_draw_buffer_status (gui_current_window->buffer, 1);
+ }
}
else
{
@@ -292,11 +313,13 @@ irc_cmd_recv_invite (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_join (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_join (t_irc_server *server, char *host, char *nick, char *arguments)
{
t_irc_channel *ptr_channel;
char *pos;
+ command_ignored |= ignore_check (host, "join", arguments, server->name);
+
ptr_channel = channel_search (server, arguments);
if (!ptr_channel)
{
@@ -311,24 +334,24 @@ irc_cmd_recv_join (t_irc_server *server, char *host, char *arguments)
}
}
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
-
- irc_display_prefix (ptr_channel->buffer, PREFIX_JOIN);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
- "%s ", host);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
- "(");
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_HOST,
- "%s", pos + 1);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
- ")");
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- _(" has joined "));
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
- "%s\n", arguments);
- (void) nick_new (ptr_channel, host, 0, 0, 0, 0, 0);
+ if (!command_ignored)
+ {
+ pos = strchr (host, '!');
+ irc_display_prefix (ptr_channel->buffer, PREFIX_JOIN);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
+ "%s ", nick);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
+ "(");
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_HOST,
+ "%s", (pos) ? pos + 1 : "");
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
+ ")");
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
+ _(" has joined "));
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
+ "%s\n", arguments);
+ }
+ (void) nick_new (ptr_channel, nick, 0, 0, 0, 0, 0);
gui_draw_buffer_nick (ptr_channel->buffer, 1);
gui_draw_buffer_status (ptr_channel->buffer, 1);
return 0;
@@ -339,16 +362,12 @@ irc_cmd_recv_join (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_kick (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_kick (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos, *pos_nick, *pos_comment;
+ char *pos_nick, *pos_comment;
t_irc_channel *ptr_channel;
t_irc_nick *ptr_nick;
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
-
pos_nick = strchr (arguments, ' ');
if (pos_nick)
{
@@ -367,7 +386,9 @@ irc_cmd_recv_kick (t_irc_server *server, char *host, char *arguments)
if (pos_comment[0] == ':')
pos_comment++;
}
-
+
+ command_ignored |= ignore_check (host, "kick", arguments, server->name);
+
ptr_channel = channel_search (server, arguments);
if (!ptr_channel)
{
@@ -377,30 +398,33 @@ irc_cmd_recv_kick (t_irc_server *server, char *host, char *arguments)
WEECHAT_ERROR, arguments, "kick");
return -1;
}
-
- irc_display_prefix (ptr_channel->buffer, PREFIX_PART);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
- "%s", host);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- _(" has kicked "));
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
- "%s", pos_nick);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- _(" from "));
- if (pos_comment)
+
+ if (!command_ignored)
{
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
- "%s ", arguments);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
- "(");
+ irc_display_prefix (ptr_channel->buffer, PREFIX_PART);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
+ "%s", nick);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
+ _(" has kicked "));
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
+ "%s", pos_nick);
gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- "%s", pos_comment);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
- ")\n");
+ _(" from "));
+ if (pos_comment)
+ {
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
+ "%s ", arguments);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
+ "(");
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
+ "%s", pos_comment);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
+ ")\n");
+ }
+ else
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
+ "%s\n", arguments);
}
- else
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
- "%s\n", arguments);
}
else
{
@@ -437,15 +461,11 @@ irc_cmd_recv_kick (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_kill (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_kill (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos, *pos_host2, *pos_comment;
+ char *pos_host2, *pos_comment;
t_irc_channel *ptr_channel;
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
-
pos_host2 = strchr (arguments, ' ');
if (pos_host2)
{
@@ -468,27 +488,31 @@ irc_cmd_recv_kill (t_irc_server *server, char *host, char *arguments)
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
- irc_display_prefix (ptr_channel->buffer, PREFIX_PART);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
- "%s", host);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- _(" has killed "));
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
- "%s", arguments);
- if (pos_comment)
+ if (!command_ignored
+ && !ignore_check (host, "kill", ptr_channel->name, server->name))
{
+ irc_display_prefix (ptr_channel->buffer, PREFIX_PART);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
+ "%s", nick);
gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- _(" from server"));
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
- " (");
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- "%s", pos_comment);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
- ")\n");
+ _(" has killed "));
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
+ "%s", arguments);
+ if (pos_comment)
+ {
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
+ _(" from server"));
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
+ " (");
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
+ "%s", pos_comment);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
+ ")\n");
+ }
+ else
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
+ _(" from server\n"));
}
- else
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- _(" from server\n"));
}
}
else
@@ -817,7 +841,7 @@ void irc_get_channel_modes (t_irc_channel *ptr_channel, char *channel_name,
*/
int
-irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_mode (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos_parm;
t_irc_channel *ptr_channel;
@@ -832,11 +856,6 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments)
return -1;
}
- /* keep only nick name from host */
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
-
pos = strchr (arguments, ' ');
if (!pos)
{
@@ -865,7 +884,7 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments)
ptr_channel = channel_search (server, arguments);
if (ptr_channel)
{
- irc_get_channel_modes (ptr_channel, arguments, host, pos, pos_parm);
+ irc_get_channel_modes (ptr_channel, arguments, nick, pos, pos_parm);
gui_draw_buffer_status (ptr_channel->buffer, 1);
}
else
@@ -880,15 +899,18 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments)
else
{
/* nickname modes */
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, "/");
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK,
- "%s", (pos[0] == ':') ? pos + 1 : pos);
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("mode changed by"));
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s\n", host);
+ if (!command_ignored)
+ {
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, "/");
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK,
+ "%s", (pos[0] == ':') ? pos + 1 : pos);
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("mode changed by"));
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s\n", nick);
+ }
}
return 0;
}
@@ -898,9 +920,8 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_nick (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_nick (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos;
t_irc_channel *ptr_channel;
t_irc_nick *ptr_nick;
int nick_is_me;
@@ -917,11 +938,6 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *arguments)
return -1;
}
- /* keep only nick name from host */
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
-
/* change nickname in any opened private window */
for (ptr_buffer = gui_buffers; ptr_buffer;
ptr_buffer = ptr_buffer->next_buffer)
@@ -940,33 +956,37 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *arguments)
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
- ptr_nick = nick_search (ptr_channel, host);
+ ptr_nick = nick_search (ptr_channel, nick);
if (ptr_nick)
{
nick_is_me = (strcmp (ptr_nick->nick, server->nick) == 0) ? 1 : 0;
if (nick_is_me)
gui_add_hotlist = 0;
nick_change (ptr_channel, ptr_nick, arguments);
- irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
- if (nick_is_me)
+ if (!command_ignored
+ && !ignore_check (host, "nick", ptr_channel->name, server->name))
+ {
+ irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
+ if (nick_is_me)
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ _("You are "));
+ else
+ {
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_NICK,
+ "%s", nick);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _(" is "));
+ }
gui_printf_color (ptr_channel->buffer,
COLOR_WIN_CHAT,
- _("You are "));
- else
- {
+ _("now known as "));
gui_printf_color (ptr_channel->buffer,
COLOR_WIN_CHAT_NICK,
- "%s", host);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _(" is "));
+ "%s\n",
+ arguments);
}
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- _("now known as "));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_NICK,
- "%s\n",
- arguments);
if (gui_buffer_has_nicklist (ptr_channel->buffer))
gui_draw_buffer_nick (ptr_channel->buffer, 1);
gui_add_hotlist = 1;
@@ -998,7 +1018,7 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_notice (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *host2, *pos, *pos2, *pos_usec;
struct timeval tv;
@@ -1010,12 +1030,7 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments)
{
pos = strchr (host, '!');
if (pos)
- {
- pos[0] = '\0';
host2 = pos + 1;
- }
- else
- host2 = NULL;
}
pos = strchr (arguments, ' ');
@@ -1036,80 +1051,84 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments)
WEECHAT_ERROR, "notice");
return -1;
}
- if (strncmp (pos, "\01VERSION", 8) == 0)
- {
- pos += 9;
- pos2 = strchr (pos, '\01');
- if (pos2)
- pos2[0] = '\0';
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, "CTCP ");
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "VERSION ");
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("reply from"));
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s", host);
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": %s\n", pos);
- }
- else
+
+ if (!command_ignored)
{
- if (strncmp (pos, "\01PING", 5) == 0)
+ if (strncmp (pos, "\01VERSION", 8) == 0)
{
- pos += 5;
- while (pos[0] == ' ')
- pos++;
- pos_usec = strchr (pos, ' ');
- if (pos_usec)
- {
- pos_usec[0] = '\0';
- pos_usec++;
- pos2 = strchr (pos_usec, '\01');
- if (pos2)
- {
- pos2[0] = '\0';
-
- gettimeofday (&tv, &tz);
- sec1 = atol (pos);
- usec1 = atol (pos_usec);
- sec2 = tv.tv_sec;
- usec2 = tv.tv_usec;
-
- difftime = ((sec2 * 1000000) + usec2) - ((sec1 * 1000000) + usec1);
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, "CTCP ");
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "PING ");
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("reply from"));
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s", host);
- gui_printf_color (server->buffer, COLOR_WIN_CHAT,
- _(": %ld.%ld seconds\n"),
- difftime / 1000000,
- (difftime % 1000000) / 1000);
- }
- }
+ pos += 9;
+ pos2 = strchr (pos, '\01');
+ if (pos2)
+ pos2[0] = '\0';
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, "CTCP ");
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "VERSION ");
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("reply from"));
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s", nick);
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": %s\n", pos);
}
else
{
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- if (host)
+ if (strncmp (pos, "\01PING", 5) == 0)
{
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", host);
- if (host2)
+ pos += 5;
+ while (pos[0] == ' ')
+ pos++;
+ pos_usec = strchr (pos, ' ');
+ if (pos_usec)
{
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, " (");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_HOST, "%s", host2);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, ")");
+ pos_usec[0] = '\0';
+ pos_usec++;
+ pos2 = strchr (pos_usec, '\01');
+ if (pos2)
+ {
+ pos2[0] = '\0';
+
+ gettimeofday (&tv, &tz);
+ sec1 = atol (pos);
+ usec1 = atol (pos_usec);
+ sec2 = tv.tv_sec;
+ usec2 = tv.tv_usec;
+
+ difftime = ((sec2 * 1000000) + usec2) - ((sec1 * 1000000) + usec1);
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, "CTCP ");
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "PING ");
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("reply from"));
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s", nick);
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT,
+ _(": %ld.%ld seconds\n"),
+ difftime / 1000000,
+ (difftime % 1000000) / 1000);
+ }
}
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": ");
}
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", pos);
- if ((host) && (ascii_strcasecmp (host, "nickserv") != 0) &&
- (ascii_strcasecmp (host, "chanserv") != 0) &&
- (ascii_strcasecmp (host, "memoserv") != 0))
+ else
{
- hotlist_add (HOTLIST_PRIVATE, server->buffer);
- gui_draw_buffer_status (gui_current_window->buffer, 1);
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ if (host)
+ {
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);
+ if (host2)
+ {
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, " (");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_HOST, "%s", host2);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, ")");
+ }
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": ");
+ }
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", pos);
+ if ((nick) && (ascii_strcasecmp (nick, "nickserv") != 0) &&
+ (ascii_strcasecmp (nick, "chanserv") != 0) &&
+ (ascii_strcasecmp (nick, "memoserv") != 0))
+ {
+ hotlist_add (HOTLIST_PRIVATE, server->buffer);
+ gui_draw_buffer_status (gui_current_window->buffer, 1);
+ }
}
}
}
@@ -1121,7 +1140,7 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_part (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_part (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos_args;
t_irc_channel *ptr_channel;
@@ -1148,15 +1167,11 @@ irc_cmd_recv_part (t_irc_server *server, char *host, char *arguments)
pos_args++;
}
- /* keep only nick name from host */
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
-
ptr_channel = channel_search (server, arguments);
if (ptr_channel)
{
- ptr_nick = nick_search (ptr_channel, host);
+ command_ignored |= ignore_check (host, "part", ptr_channel->name, server->name);
+ ptr_nick = nick_search (ptr_channel, nick);
if (ptr_nick)
{
if (strcmp (ptr_nick->nick, server->nick) == 0)
@@ -1172,30 +1187,34 @@ irc_cmd_recv_part (t_irc_server *server, char *host, char *arguments)
/* remove nick from nick list and display message */
nick_free (ptr_channel, ptr_nick);
- irc_display_prefix (ptr_channel->buffer, PREFIX_PART);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_NICK, "%s ", host);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, "(");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_HOST, "%s", pos+1);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, ")");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _(" has left "));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%s", ptr_channel->name);
- if (pos_args && pos_args[0])
+ if (!command_ignored)
{
+ pos = strchr (host, '!');
+ irc_display_prefix (ptr_channel->buffer, PREFIX_PART);
gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, " (");
+ COLOR_WIN_CHAT_NICK, "%s ", nick);
gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, "%s", pos_args);
+ COLOR_WIN_CHAT_DARK, "(");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_HOST, "%s", (pos) ? pos + 1 : "");
gui_printf_color (ptr_channel->buffer,
COLOR_WIN_CHAT_DARK, ")");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _(" has left "));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%s", ptr_channel->name);
+ if (pos_args && pos_args[0])
+ {
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_DARK, " (");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, "%s", pos_args);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_DARK, ")");
+ }
+ gui_printf (ptr_channel->buffer, "\n");
}
- gui_printf (ptr_channel->buffer, "\n");
if (gui_buffer_has_nicklist (ptr_channel->buffer))
gui_draw_buffer_nick (ptr_channel->buffer, 1);
@@ -1220,11 +1239,13 @@ irc_cmd_recv_part (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_ping (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_ping (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
- (void)host;
+ /* make gcc happy */
+ (void) host;
+ (void) nick;
pos = strrchr (arguments, ' ');
if (pos)
pos[0] = '\0';
@@ -1237,14 +1258,16 @@ irc_cmd_recv_ping (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_pong (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_pong (t_irc_server *server, char *host, char *nick, char *arguments)
{
struct timeval tv;
struct timezone tz;
int old_lag;
- (void)host;
- (void)arguments;
+ /* make gcc happy */
+ (void) host;
+ (void) nick;
+ (void) arguments;
if (server->lag_check_time.tv_sec != 0)
{
@@ -1268,7 +1291,7 @@ irc_cmd_recv_pong (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos2, *host2;
char *pos_file, *pos_addr, *pos_port, *pos_size, *pos_start_resume; /* for DCC */
@@ -1286,13 +1309,9 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
return -1;
}
- /* keep only nick name from host */
pos = strchr (host, '!');
if (pos)
- {
- pos[0] = '\0';
- host2 = pos+1;
- }
+ host2 = pos + 1;
else
host2 = host;
@@ -1314,51 +1333,60 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
{
if (strncmp (pos, "\01ACTION ", 8) == 0)
{
+ command_ignored |= ignore_check (host, "action", ptr_channel->name, server->name);
pos += 8;
pos2 = strchr (pos, '\01');
if (pos2)
pos2[0] = '\0';
- irc_display_prefix (ptr_channel->buffer, PREFIX_ACTION_ME);
- if (irc_is_highlight (pos, server->nick))
+ if (!command_ignored)
{
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
- COLOR_WIN_CHAT_HIGHLIGHT,
- "%s", host);
- if ( (cfg_look_infobar)
- && (cfg_look_infobar_delay_highlight > 0)
- && (ptr_channel->buffer != gui_current_window->buffer) )
- gui_infobar_printf (cfg_look_infobar_delay_highlight,
- COLOR_WIN_INFOBAR_HIGHLIGHT,
- _("On %s: * %s %s"),
- ptr_channel->name,
- host, pos);
+ irc_display_prefix (ptr_channel->buffer, PREFIX_ACTION_ME);
+ if (irc_is_highlight (pos, server->nick))
+ {
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
+ COLOR_WIN_CHAT_HIGHLIGHT,
+ "%s", nick);
+ if ( (cfg_look_infobar)
+ && (cfg_look_infobar_delay_highlight > 0)
+ && (ptr_channel->buffer != gui_current_window->buffer) )
+ gui_infobar_printf (cfg_look_infobar_delay_highlight,
+ COLOR_WIN_INFOBAR_HIGHLIGHT,
+ _("On %s: * %s %s"),
+ ptr_channel->name,
+ nick, pos);
+ }
+ else
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_MSG,
+ COLOR_WIN_CHAT_NICK, "%s", nick);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, " %s\n", pos);
}
- else
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_MSG,
- COLOR_WIN_CHAT_NICK, "%s", host);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, " %s\n", pos);
return 0;
}
if (strncmp (pos, "\01SOUND ", 7) == 0)
{
+ command_ignored |= ignore_check (host, "ctcp", ptr_channel->name, server->name);
pos += 7;
pos2 = strchr (pos, '\01');
if (pos2)
pos2[0] = '\0';
- irc_display_prefix (ptr_channel->buffer, PREFIX_SERVER);
- gui_printf (ptr_channel->buffer,
- _("Received a CTCP SOUND \"%s\" from "),
- pos);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_NICK,
- "%s\n", host);
+ if (!command_ignored)
+ {
+ irc_display_prefix (ptr_channel->buffer, PREFIX_SERVER);
+ gui_printf (ptr_channel->buffer,
+ _("Received a CTCP SOUND \"%s\" from "),
+ pos);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_NICK,
+ "%s\n", nick);
+ }
return 0;
}
if (strncmp (pos, "\01PING", 5) == 0)
{
+ command_ignored |= ignore_check (host, "ctcp", ptr_channel->name, server->name);
pos += 5;
while (pos[0] == ' ')
pos++;
@@ -1371,10 +1399,10 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
pos = NULL;
if (pos)
server_sendf (server, "NOTICE %s :\01PING %s\01\r\n",
- host, pos);
+ nick, pos);
else
server_sendf (server, "NOTICE %s :\01PING\01\r\n",
- host);
+ nick);
irc_display_prefix (ptr_channel->buffer, PREFIX_SERVER);
gui_printf_color (ptr_channel->buffer,
COLOR_WIN_CHAT, "CTCP ");
@@ -1383,7 +1411,7 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
gui_printf_color (ptr_channel->buffer,
COLOR_WIN_CHAT, _("received from"));
gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_NICK, " %s\n", host);
+ COLOR_WIN_CHAT_NICK, " %s\n", nick);
return 0;
}
@@ -1391,6 +1419,7 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
pos2 = strchr (pos + 1, '\01');
if ((pos[0] == '\01') && pos2 && (pos2[1] == '\0'))
{
+ command_ignored |= ignore_check (host, "ctcp", ptr_channel->name, server->name);
pos++;
pos2[0] = '\0';
pos2 = strchr (pos, ' ');
@@ -1403,47 +1432,54 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
if (!pos2[0])
pos2 = NULL;
}
- irc_display_prefix (ptr_channel->buffer, PREFIX_SERVER);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _("Unknown CTCP "));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL, "%s ", pos);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _("received from"));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_NICK, " %s", host);
- if (pos2)
+ if (!command_ignored)
+ {
+ irc_display_prefix (ptr_channel->buffer, PREFIX_SERVER);
gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, ": %s\n", pos2);
- else
- gui_printf (ptr_channel->buffer, "\n");
+ COLOR_WIN_CHAT, _("Unknown CTCP "));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL, "%s ", pos);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _("received from"));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_NICK, " %s", nick);
+ if (pos2)
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, ": %s\n", pos2);
+ else
+ gui_printf (ptr_channel->buffer, "\n");
+ }
return 0;
}
/* other message */
- ptr_nick = nick_search (ptr_channel, host);
- if (irc_is_highlight (pos, server->nick))
+ command_ignored |= ignore_check (host, "privmsg", ptr_channel->name, server->name);
+ if (!command_ignored)
{
- irc_display_nick (ptr_channel->buffer, ptr_nick,
- (ptr_nick) ? NULL : host,
- MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
- 1, -1, 0);
- if ( (cfg_look_infobar)
- && (cfg_look_infobar_delay_highlight > 0)
- && (ptr_channel->buffer != gui_current_window->buffer) )
- gui_infobar_printf (cfg_look_infobar_delay_highlight,
- COLOR_WIN_INFOBAR_HIGHLIGHT,
- _("On %s: %s> %s"),
- ptr_channel->name,
- host, pos);
+ ptr_nick = nick_search (ptr_channel, nick);
+ if (irc_is_highlight (pos, server->nick))
+ {
+ irc_display_nick (ptr_channel->buffer, ptr_nick,
+ (ptr_nick) ? NULL : nick,
+ MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
+ 1, -1, 0);
+ if ( (cfg_look_infobar)
+ && (cfg_look_infobar_delay_highlight > 0)
+ && (ptr_channel->buffer != gui_current_window->buffer) )
+ gui_infobar_printf (cfg_look_infobar_delay_highlight,
+ COLOR_WIN_INFOBAR_HIGHLIGHT,
+ _("On %s: %s> %s"),
+ ptr_channel->name,
+ nick, pos);
+ }
+ else
+ irc_display_nick (ptr_channel->buffer, ptr_nick,
+ (ptr_nick) ? NULL : nick,
+ MSG_TYPE_NICK, 1, 1, 0);
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_MSG,
+ COLOR_WIN_CHAT, "%s\n", pos);
}
- else
- irc_display_nick (ptr_channel->buffer, ptr_nick,
- (ptr_nick) ? NULL : host,
- MSG_TYPE_NICK, 1, 1, 0);
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_MSG,
- COLOR_WIN_CHAT, "%s\n", pos);
}
else
{
@@ -1457,10 +1493,6 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
}
else
{
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
-
pos = strchr (arguments, ' ');
if (pos)
{
@@ -1474,80 +1506,88 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
/* version asked by another user => answer with WeeChat version */
if (strncmp (pos, "\01VERSION", 8) == 0)
{
- pos2 = strchr (pos + 8, ' ');
- if (pos2)
- {
- while (pos2[0] == ' ')
- pos2++;
- if (pos2[0] == '\01')
- pos2 = NULL;
- else if (!pos2[0])
- pos2 = NULL;
- }
-
- buf = (struct utsname *) malloc (sizeof (struct utsname));
- if (buf && (uname (buf) == 0))
+ command_ignored |= ignore_check (host, "ctcp", NULL, server->name);
+ if (!command_ignored)
{
- server_sendf (server,
- "NOTICE %s :%sVERSION %s v%s"
- " compiled on %s, running "
- "%s %s / %s%s",
- host, "\01", PACKAGE_NAME, PACKAGE_VERSION, __DATE__,
- &buf->sysname,
- &buf->release, &buf->machine, "\01\r\n");
- free (buf);
- }
- else
- server_sendf (server,
- "NOTICE %s :%sVERSION %s v%s"
- " compiled on %s%s",
- host, "\01", PACKAGE_NAME, PACKAGE_VERSION, __DATE__,
- "\01\r\n");
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "CTCP ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL, "VERSION ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, _("received from"));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, " %s", host);
- if (pos2)
+ pos2 = strchr (pos + 8, ' ');
+ if (pos2)
+ {
+ while (pos2[0] == ' ')
+ pos2++;
+ if (pos2[0] == '\01')
+ pos2 = NULL;
+ else if (!pos2[0])
+ pos2 = NULL;
+ }
+
+ buf = (struct utsname *) malloc (sizeof (struct utsname));
+ if (buf && (uname (buf) == 0))
+ {
+ server_sendf (server,
+ "NOTICE %s :%sVERSION %s v%s"
+ " compiled on %s, running "
+ "%s %s / %s%s",
+ nick, "\01", PACKAGE_NAME, PACKAGE_VERSION, __DATE__,
+ &buf->sysname,
+ &buf->release, &buf->machine, "\01\r\n");
+ free (buf);
+ }
+ else
+ server_sendf (server,
+ "NOTICE %s :%sVERSION %s v%s"
+ " compiled on %s%s",
+ nick, "\01", PACKAGE_NAME, PACKAGE_VERSION, __DATE__,
+ "\01\r\n");
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, ": %s\n", pos2);
- else
- gui_printf (server->buffer, "\n");
+ COLOR_WIN_CHAT, "CTCP ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL, "VERSION ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, _("received from"));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, " %s", nick);
+ if (pos2)
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, ": %s\n", pos2);
+ else
+ gui_printf (server->buffer, "\n");
+ }
return 0;
}
/* ping request from another user => answer */
if (strncmp (pos, "\01PING", 5) == 0)
{
- pos += 5;
- while (pos[0] == ' ')
- pos++;
- pos2 = strchr (pos, '\01');
- if (pos2)
- pos2[0] = '\0';
- else
- pos = NULL;
- if (pos && !pos[0])
- pos = NULL;
- if (pos)
- server_sendf (server, "NOTICE %s :\01PING %s\01\r\n",
- host, pos);
- else
- server_sendf (server, "NOTICE %s :\01PING\01\r\n",
- host);
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "CTCP ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL, "PING ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, _("received from"));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, " %s\n", host);
+ command_ignored |= ignore_check (host, "ctcp", NULL, server->name);
+ if (!command_ignored)
+ {
+ pos += 5;
+ while (pos[0] == ' ')
+ pos++;
+ pos2 = strchr (pos, '\01');
+ if (pos2)
+ pos2[0] = '\0';
+ else
+ pos = NULL;
+ if (pos && !pos[0])
+ pos = NULL;
+ if (pos)
+ server_sendf (server, "NOTICE %s :\01PING %s\01\r\n",
+ nick, pos);
+ else
+ server_sendf (server, "NOTICE %s :\01PING\01\r\n",
+ nick);
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "CTCP ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL, "PING ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, _("received from"));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, " %s\n", nick);
+ }
return 0;
}
@@ -1566,62 +1606,67 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
}
pos2[0] = '\0';
- /* DCC filename */
- pos_file = pos + 9;
- while (pos_file[0] == ' ')
- pos_file++;
-
- /* look for file size */
- pos_size = strrchr (pos_file, ' ');
- if (!pos_size)
- {
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
- }
- pos2 = pos_size;
- pos_size++;
- while (pos2[0] == ' ')
- pos2--;
- pos2[1] = '\0';
+ command_ignored |= ignore_check (host, "dcc", NULL, server->name);
- /* look for DCC port */
- pos_port = strrchr (pos_file, ' ');
- if (!pos_port)
+ if (!command_ignored)
{
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
- }
- pos2 = pos_port;
- pos_port++;
- while (pos2[0] == ' ')
- pos2--;
- pos2[1] = '\0';
-
- /* look for DCC IP address */
- pos_addr = strrchr (pos_file, ' ');
- if (!pos_addr)
- {
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
+ /* DCC filename */
+ pos_file = pos + 9;
+ while (pos_file[0] == ' ')
+ pos_file++;
+
+ /* look for file size */
+ pos_size = strrchr (pos_file, ' ');
+ if (!pos_size)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos2 = pos_size;
+ pos_size++;
+ while (pos2[0] == ' ')
+ pos2--;
+ pos2[1] = '\0';
+
+ /* look for DCC port */
+ pos_port = strrchr (pos_file, ' ');
+ if (!pos_port)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos2 = pos_port;
+ pos_port++;
+ while (pos2[0] == ' ')
+ pos2--;
+ pos2[1] = '\0';
+
+ /* look for DCC IP address */
+ pos_addr = strrchr (pos_file, ' ');
+ if (!pos_addr)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos2 = pos_addr;
+ pos_addr++;
+ while (pos2[0] == ' ')
+ pos2--;
+ pos2[1] = '\0';
+
+ dcc_add (server, DCC_FILE_RECV, strtoul (pos_addr, NULL, 10),
+ atoi (pos_port), nick, -1, pos_file, NULL,
+ strtoul (pos_size, NULL, 10));
}
- pos2 = pos_addr;
- pos_addr++;
- while (pos2[0] == ' ')
- pos2--;
- pos2[1] = '\0';
-
- dcc_add (server, DCC_FILE_RECV, strtoul (pos_addr, NULL, 10),
- atoi (pos_port), host, -1, pos_file, NULL,
- strtoul (pos_size, NULL, 10));
return 0;
}
@@ -1640,45 +1685,50 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
}
pos2[0] = '\0';
- /* DCC filename */
- pos_file = pos + 11;
- while (pos_file[0] == ' ')
- pos_file++;
-
- /* look for resume start position */
- pos_start_resume = strrchr (pos_file, ' ');
- if (!pos_start_resume)
- {
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
- }
- pos2 = pos_start_resume;
- pos_start_resume++;
- while (pos2[0] == ' ')
- pos2--;
- pos2[1] = '\0';
+ command_ignored |= ignore_check (host, "dcc", NULL, server->name);
- /* look for DCC port */
- pos_port = strrchr (pos_file, ' ');
- if (!pos_port)
+ if (!command_ignored)
{
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
+ /* DCC filename */
+ pos_file = pos + 11;
+ while (pos_file[0] == ' ')
+ pos_file++;
+
+ /* look for resume start position */
+ pos_start_resume = strrchr (pos_file, ' ');
+ if (!pos_start_resume)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos2 = pos_start_resume;
+ pos_start_resume++;
+ while (pos2[0] == ' ')
+ pos2--;
+ pos2[1] = '\0';
+
+ /* look for DCC port */
+ pos_port = strrchr (pos_file, ' ');
+ if (!pos_port)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos2 = pos_port;
+ pos_port++;
+ while (pos2[0] == ' ')
+ pos2--;
+ pos2[1] = '\0';
+
+ dcc_accept_resume (server, pos_file, atoi (pos_port),
+ strtoul (pos_start_resume, NULL, 10));
}
- pos2 = pos_port;
- pos_port++;
- while (pos2[0] == ' ')
- pos2--;
- pos2[1] = '\0';
-
- dcc_accept_resume (server, pos_file, atoi (pos_port),
- strtoul (pos_start_resume, NULL, 10));
return 0;
}
@@ -1697,45 +1747,50 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
}
pos2[0] = '\0';
- /* DCC filename */
- pos_file = pos + 11;
- while (pos_file[0] == ' ')
- pos_file++;
-
- /* look for resume start position */
- pos_start_resume = strrchr (pos_file, ' ');
- if (!pos_start_resume)
- {
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
- }
- pos2 = pos_start_resume;
- pos_start_resume++;
- while (pos2[0] == ' ')
- pos2--;
- pos2[1] = '\0';
+ command_ignored |= ignore_check (host, "dcc", NULL, server->name);
- /* look for DCC port */
- pos_port = strrchr (pos_file, ' ');
- if (!pos_port)
+ if (!command_ignored)
{
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
+ /* DCC filename */
+ pos_file = pos + 11;
+ while (pos_file[0] == ' ')
+ pos_file++;
+
+ /* look for resume start position */
+ pos_start_resume = strrchr (pos_file, ' ');
+ if (!pos_start_resume)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos2 = pos_start_resume;
+ pos_start_resume++;
+ while (pos2[0] == ' ')
+ pos2--;
+ pos2[1] = '\0';
+
+ /* look for DCC port */
+ pos_port = strrchr (pos_file, ' ');
+ if (!pos_port)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos2 = pos_port;
+ pos_port++;
+ while (pos2[0] == ' ')
+ pos2--;
+ pos2[1] = '\0';
+
+ dcc_start_resume (server, pos_file, atoi (pos_port),
+ strtoul (pos_start_resume, NULL, 10));
}
- pos2 = pos_port;
- pos_port++;
- while (pos2[0] == ' ')
- pos2--;
- pos2[1] = '\0';
-
- dcc_start_resume (server, pos_file, atoi (pos_port),
- strtoul (pos_start_resume, NULL, 10));
return 0;
}
@@ -1754,105 +1809,115 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
}
pos2[0] = '\0';
- /* CHAT type */
- pos_file = pos + 9;
- while (pos_file[0] == ' ')
- pos_file++;
+ command_ignored |= ignore_check (host, "dcc", NULL, server->name);
- /* DCC IP address */
- pos_addr = strchr (pos_file, ' ');
- if (!pos_addr)
+ if (!command_ignored)
{
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
- }
- pos_addr[0] = '\0';
- pos_addr++;
- while (pos_addr[0] == ' ')
+ /* CHAT type */
+ pos_file = pos + 9;
+ while (pos_file[0] == ' ')
+ pos_file++;
+
+ /* DCC IP address */
+ pos_addr = strchr (pos_file, ' ');
+ if (!pos_addr)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos_addr[0] = '\0';
pos_addr++;
-
- /* look for DCC port */
- pos_port = strchr (pos_addr, ' ');
- if (!pos_port)
- {
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot parse \"%s\" command\n"),
- WEECHAT_ERROR, "privmsg");
- return -1;
- }
- pos_port[0] = '\0';
- pos_port++;
- while (pos_port[0] == ' ')
+ while (pos_addr[0] == ' ')
+ pos_addr++;
+
+ /* look for DCC port */
+ pos_port = strchr (pos_addr, ' ');
+ if (!pos_port)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot parse \"%s\" command\n"),
+ WEECHAT_ERROR, "privmsg");
+ return -1;
+ }
+ pos_port[0] = '\0';
pos_port++;
-
- if (ascii_strcasecmp (pos_file, "chat") != 0)
- {
- irc_display_prefix (server->buffer, PREFIX_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);
- return -1;
+ while (pos_port[0] == ' ')
+ pos_port++;
+
+ if (ascii_strcasecmp (pos_file, "chat") != 0)
+ {
+ irc_display_prefix (server->buffer, PREFIX_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", nick);
+ gui_printf (server->buffer, ": \"%s\"\n", pos_file);
+ return -1;
+ }
+
+ dcc_add (server, DCC_CHAT_RECV, strtoul (pos_addr, NULL, 10),
+ atoi (pos_port), nick, -1, NULL, NULL, 0);
}
-
- dcc_add (server, DCC_CHAT_RECV, strtoul (pos_addr, NULL, 10),
- atoi (pos_port), host, -1, NULL, NULL, 0);
-
return 0;
}
/* private message received => display it */
- ptr_channel = channel_search (server, host);
+ ptr_channel = channel_search (server, nick);
if (strncmp (pos, "\01ACTION ", 8) == 0)
{
- if (!ptr_channel)
+ command_ignored |= ignore_check (host, "action", NULL, server->name);
+ command_ignored |= ignore_check (host, "pv", NULL, server->name);
+
+ if (!command_ignored)
{
- ptr_channel = channel_new (server, CHAT_PRIVATE, host, 0);
if (!ptr_channel)
{
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot create new private window \"%s\"\n"),
- WEECHAT_ERROR, host);
- return -1;
+ ptr_channel = channel_new (server, CHAT_PRIVATE, nick, 0);
+ if (!ptr_channel)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot create new private window \"%s\"\n"),
+ WEECHAT_ERROR, nick);
+ return -1;
+ }
}
+ if (!ptr_channel->topic)
+ ptr_channel->topic = strdup (host2);
+
+ pos += 8;
+ pos2 = strchr (pos, '\01');
+ if (pos2)
+ pos2[0] = '\0';
+ irc_display_prefix (ptr_channel->buffer, PREFIX_ACTION_ME);
+ if (irc_is_highlight (pos, server->nick))
+ {
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
+ COLOR_WIN_CHAT_HIGHLIGHT,
+ "%s", nick);
+ if ( (cfg_look_infobar)
+ && (cfg_look_infobar_delay_highlight > 0)
+ && (ptr_channel->buffer != gui_current_window->buffer) )
+ gui_infobar_printf (cfg_look_infobar_delay_highlight,
+ COLOR_WIN_INFOBAR_HIGHLIGHT,
+ _("On %s: * %s %s"),
+ ptr_channel->name,
+ nick, pos);
+ }
+ else
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_MSG,
+ COLOR_WIN_CHAT_NICK, "%s", nick);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, " %s\n", pos);
}
- if (!ptr_channel->topic)
- ptr_channel->topic = strdup (host2);
-
- pos += 8;
- pos2 = strchr (pos, '\01');
- if (pos2)
- pos2[0] = '\0';
- irc_display_prefix (ptr_channel->buffer, PREFIX_ACTION_ME);
- if (irc_is_highlight (pos, server->nick))
- {
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
- COLOR_WIN_CHAT_HIGHLIGHT,
- "%s", host);
- if ( (cfg_look_infobar)
- && (cfg_look_infobar_delay_highlight > 0)
- && (ptr_channel->buffer != gui_current_window->buffer) )
- gui_infobar_printf (cfg_look_infobar_delay_highlight,
- COLOR_WIN_INFOBAR_HIGHLIGHT,
- _("On %s: * %s %s"),
- ptr_channel->name,
- host, pos);
- }
- else
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_MSG,
- COLOR_WIN_CHAT_NICK, "%s", host);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, " %s\n", pos);
}
else
{
@@ -1860,78 +1925,88 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
pos2 = strchr (pos + 1, '\01');
if ((pos[0] == '\01') && pos2 && (pos2[1] == '\0'))
{
- pos++;
- pos2[0] = '\0';
- pos2 = strchr (pos, ' ');
- if (pos2)
+ command_ignored |= ignore_check (host, "ctcp", NULL, server->name);
+
+ if (!command_ignored)
{
+ pos++;
pos2[0] = '\0';
- pos2++;
- while (pos2[0] == ' ')
+ pos2 = strchr (pos, ' ');
+ if (pos2)
+ {
+ pos2[0] = '\0';
pos2++;
- if (!pos2[0])
- pos2 = NULL;
- }
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, _("Unknown CTCP "));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL, "%s ", pos);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, _("received from"));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, " %s", host);
- if (pos2)
+ while (pos2[0] == ' ')
+ pos2++;
+ if (!pos2[0])
+ pos2 = NULL;
+ }
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, ": %s\n", pos2);
- else
- gui_printf (server->buffer, "\n");
+ COLOR_WIN_CHAT, _("Unknown CTCP "));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL, "%s ", pos);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, _("received from"));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, " %s", nick);
+ if (pos2)
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, ": %s\n", pos2);
+ else
+ gui_printf (server->buffer, "\n");
+ }
return 0;
}
else
{
- if (!ptr_channel)
+ command_ignored |= ignore_check (host, "pv", NULL, server->name);
+
+ if (!command_ignored)
{
- ptr_channel = channel_new (server, CHAT_PRIVATE, host, 0);
if (!ptr_channel)
{
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s cannot create new private window \"%s\"\n"),
- WEECHAT_ERROR, host);
- return -1;
+ ptr_channel = channel_new (server, CHAT_PRIVATE, nick, 0);
+ if (!ptr_channel)
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s cannot create new private window \"%s\"\n"),
+ WEECHAT_ERROR, nick);
+ return -1;
+ }
}
- }
- if (!ptr_channel->topic)
- ptr_channel->topic = strdup (host2);
-
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_NICK,
- COLOR_WIN_CHAT_DARK, "<");
- if (irc_is_highlight (pos, server->nick))
- {
+ if (!ptr_channel->topic)
+ ptr_channel->topic = strdup (host2);
+
gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
- COLOR_WIN_CHAT_HIGHLIGHT,
- "%s", host);
- if ( (cfg_look_infobar_delay_highlight > 0)
- && (ptr_channel->buffer != gui_current_window->buffer) )
- gui_infobar_printf (cfg_look_infobar_delay_highlight,
- COLOR_WIN_INFOBAR_HIGHLIGHT,
- _("Private %s> %s"),
- host, pos);
- }
- else
+ MSG_TYPE_NICK,
+ COLOR_WIN_CHAT_DARK, "<");
+ if (irc_is_highlight (pos, server->nick))
+ {
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
+ COLOR_WIN_CHAT_HIGHLIGHT,
+ "%s", nick);
+ if ( (cfg_look_infobar_delay_highlight > 0)
+ && (ptr_channel->buffer != gui_current_window->buffer) )
+ gui_infobar_printf (cfg_look_infobar_delay_highlight,
+ COLOR_WIN_INFOBAR_HIGHLIGHT,
+ _("Private %s> %s"),
+ nick, pos);
+ }
+ else
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_NICK,
+ COLOR_WIN_NICK_PRIVATE,
+ "%s", nick);
gui_printf_type_color (ptr_channel->buffer,
MSG_TYPE_NICK,
- COLOR_WIN_NICK_PRIVATE,
- "%s", host);
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_NICK,
- COLOR_WIN_CHAT_DARK, "> ");
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_MSG,
- COLOR_WIN_CHAT, "%s\n", pos);
+ COLOR_WIN_CHAT_DARK, "> ");
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_MSG,
+ COLOR_WIN_CHAT, "%s\n", pos);
+ }
}
}
}
@@ -1952,7 +2027,7 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_quit (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_quit (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
t_irc_channel *ptr_channel;
@@ -1968,41 +2043,41 @@ irc_cmd_recv_quit (t_irc_server *server, char *host, char *arguments)
return -1;
}
- /* keep only nick name from host */
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
-
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
if (ptr_channel->type == CHAT_PRIVATE)
ptr_nick = NULL;
else
- ptr_nick = nick_search (ptr_channel, host);
+ ptr_nick = nick_search (ptr_channel, nick);
- if (ptr_nick || (strcmp (ptr_channel->name, host) == 0))
+ if (ptr_nick || (strcmp (ptr_channel->name, nick) == 0))
{
if (ptr_nick)
nick_free (ptr_channel, ptr_nick);
- irc_display_prefix (ptr_channel->buffer, PREFIX_QUIT);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_NICK, "%s ", host);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, "(");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_HOST, "%s", pos + 1);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, ") ");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _("has quit"));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, " (");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, "%s",
- arguments);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, ")\n");
+ if (!command_ignored
+ && !ignore_check (host, "quit", ptr_channel->name, server->name))
+ {
+ pos = strchr (host, '!');
+ irc_display_prefix (ptr_channel->buffer, PREFIX_QUIT);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_NICK, "%s ", nick);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_DARK, "(");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_HOST, "%s", (pos) ? pos + 1 : "");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_DARK, ") ");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _("has quit"));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_DARK, " (");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, "%s",
+ arguments);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_DARK, ")\n");
+ }
if (gui_buffer_has_nicklist (ptr_channel->buffer))
gui_draw_buffer_nick (ptr_channel->buffer, 1);
gui_draw_buffer_status (ptr_channel->buffer, 1);
@@ -2017,10 +2092,11 @@ irc_cmd_recv_quit (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_server_msg (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_server_msg (t_irc_server *server, char *host, char *nick, char *arguments)
{
/* make gcc happy */
(void) host;
+ (void) nick;
/* skip nickname if at beginning of server message */
if (strncmp (server->nick, arguments, strlen (server->nick)) == 0)
@@ -2034,8 +2110,11 @@ irc_cmd_recv_server_msg (t_irc_server *server, char *host, char *arguments)
arguments++;
/* display server message */
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", arguments);
+ if (!command_ignored)
+ {
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", arguments);
+ }
return 0;
}
@@ -2044,7 +2123,7 @@ irc_cmd_recv_server_msg (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_server_reply (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_server_reply (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos2;
int first;
@@ -2052,42 +2131,46 @@ irc_cmd_recv_server_reply (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) server;
(void) host;
+ (void) nick;
- pos = strchr (arguments, ' ');
- if (pos)
+ if (!command_ignored)
{
- pos[0] = '\0';
- pos++;
- while (pos[0] == ' ')
- pos++;
- }
- else
- pos = arguments;
-
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- first = 1;
-
- while (pos && pos[0])
- {
- pos2 = strchr (pos, ' ');
- if ((pos[0] == ':') || (!pos2))
+ pos = strchr (arguments, ' ');
+ if (pos)
{
- if (pos[0] == ':')
+ pos[0] = '\0';
+ pos++;
+ while (pos[0] == ' ')
pos++;
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- "%s%s\n", (first) ? "" : ": ", pos);
- pos = NULL;
}
else
+ pos = arguments;
+
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ first = 1;
+
+ while (pos && pos[0])
{
- pos2[0] = '\0';
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%s%s\n",
- (first) ? "" : " ", pos);
- first = 0;
- pos = pos2 + 1;
+ pos2 = strchr (pos, ' ');
+ if ((pos[0] == ':') || (!pos2))
+ {
+ if (pos[0] == ':')
+ pos++;
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ "%s%s\n", (first) ? "" : ": ", pos);
+ pos = NULL;
+ }
+ else
+ {
+ pos2[0] = '\0';
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%s%s\n",
+ (first) ? "" : " ", pos);
+ first = 0;
+ pos = pos2 + 1;
+ }
}
}
return 0;
@@ -2098,19 +2181,14 @@ irc_cmd_recv_server_reply (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_topic (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_topic (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
t_irc_channel *ptr_channel;
t_gui_buffer *buffer;
/* make gcc happy */
- (void) host;
-
- /* keep only nick name from host */
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
+ (void) nick;
if (!string_is_channel (arguments))
{
@@ -2134,31 +2212,36 @@ irc_cmd_recv_topic (t_irc_server *server, char *host, char *arguments)
pos = NULL;
}
+ command_ignored |= ignore_check (host, "topic", arguments, server->name);
+
ptr_channel = channel_search (server, arguments);
buffer = (ptr_channel) ? ptr_channel->buffer : server->buffer;
- irc_display_prefix (buffer, PREFIX_INFO);
- gui_printf_color (buffer,
- COLOR_WIN_CHAT_NICK, "%s",
- host);
- if (pos)
- {
- gui_printf_color (buffer,
- COLOR_WIN_CHAT, _(" has changed topic for "));
- gui_printf_color (buffer,
- COLOR_WIN_CHAT_CHANNEL, "%s",
- arguments);
- gui_printf_color (buffer,
- COLOR_WIN_CHAT, _(" to: \"%s\"\n"),
- pos);
- }
- else
+ if (!command_ignored)
{
+ irc_display_prefix (buffer, PREFIX_INFO);
gui_printf_color (buffer,
- COLOR_WIN_CHAT, _(" has unset topic for "));
- gui_printf_color (buffer,
- COLOR_WIN_CHAT_CHANNEL, "%s\n",
- arguments);
+ COLOR_WIN_CHAT_NICK, "%s",
+ host);
+ if (pos)
+ {
+ gui_printf_color (buffer,
+ COLOR_WIN_CHAT, _(" has changed topic for "));
+ gui_printf_color (buffer,
+ COLOR_WIN_CHAT_CHANNEL, "%s",
+ arguments);
+ gui_printf_color (buffer,
+ COLOR_WIN_CHAT, _(" to: \"%s\"\n"),
+ pos);
+ }
+ else
+ {
+ gui_printf_color (buffer,
+ COLOR_WIN_CHAT, _(" has unset topic for "));
+ gui_printf_color (buffer,
+ COLOR_WIN_CHAT_CHANNEL, "%s\n",
+ arguments);
+ }
}
if (ptr_channel)
@@ -2180,14 +2263,11 @@ irc_cmd_recv_topic (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_004 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_004 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
t_irc_channel *ptr_channel;
- /* make gcc happy */
- (void) host;
-
pos = strchr (arguments, ' ');
if (pos)
pos[0] = '\0';
@@ -2197,7 +2277,7 @@ irc_cmd_recv_004 (t_irc_server *server, char *host, char *arguments)
server->nick = strdup (arguments);
}
- irc_cmd_recv_server_msg (server, host, arguments);
+ irc_cmd_recv_server_msg (server, host, nick, arguments);
/* connection to IRC server is ok! */
server->is_connected = 1;
@@ -2246,13 +2326,14 @@ irc_cmd_recv_004 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_301 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_301 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_message;
/* make gcc happy */
(void) server;
(void) host;
+ (void) nick;
pos_nick = strchr (arguments, ' ');
if (pos_nick)
@@ -2269,11 +2350,14 @@ irc_cmd_recv_301 (t_irc_server *server, char *host, char *arguments)
if (pos_message[0] == ':')
pos_message++;
- irc_display_prefix (gui_current_window->buffer, PREFIX_INFO);
- gui_printf_color (gui_current_window->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (gui_current_window->buffer,
- COLOR_WIN_CHAT, _(" is away: %s\n"), pos_message);
+ if (!command_ignored)
+ {
+ irc_display_prefix (gui_current_window->buffer, PREFIX_INFO);
+ gui_printf_color (gui_current_window->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (gui_current_window->buffer,
+ COLOR_WIN_CHAT, _(" is away: %s\n"), pos_message);
+ }
}
}
return 0;
@@ -2284,50 +2368,54 @@ irc_cmd_recv_301 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_302 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_302 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_host, *ptr_next;
/* make gcc happy */
(void) host;
+ (void) nick;
- arguments = strchr (arguments, ' ');
- if (arguments)
+ if (!command_ignored)
{
- while (arguments[0] == ' ')
- arguments++;
- if (arguments[0] == ':')
- arguments++;
- while (arguments)
+ arguments = strchr (arguments, ' ');
+ if (arguments)
{
- pos_host = strchr (arguments, '=');
- if (pos_host)
+ while (arguments[0] == ' ')
+ arguments++;
+ if (arguments[0] == ':')
+ arguments++;
+ while (arguments)
{
- pos_host[0] = '\0';
- pos_host++;
-
- ptr_next = strchr (pos_host, ' ');
- if (ptr_next)
+ pos_host = strchr (arguments, '=');
+ if (pos_host)
{
- ptr_next[0] = '\0';
- ptr_next++;
- while (ptr_next[0] == ' ')
+ pos_host[0] = '\0';
+ pos_host++;
+
+ ptr_next = strchr (pos_host, ' ');
+ if (ptr_next)
+ {
+ ptr_next[0] = '\0';
ptr_next++;
+ while (ptr_next[0] == ' ')
+ ptr_next++;
+ }
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", arguments);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "=");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_HOST, "%s\n", pos_host);
}
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", arguments);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "=");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_HOST, "%s\n", pos_host);
+ else
+ ptr_next = NULL;
+ arguments = ptr_next;
+ if (arguments && !arguments[0])
+ arguments = NULL;
}
- else
- ptr_next = NULL;
- arguments = ptr_next;
- if (arguments && !arguments[0])
- arguments = NULL;
}
}
return 0;
@@ -2338,42 +2426,46 @@ irc_cmd_recv_302 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_303 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_303 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *ptr_next;
/* make gcc happy */
(void) host;
+ (void) nick;
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, _("Users online: "));
-
- arguments = strchr (arguments, ' ');
- if (arguments)
+ if (!command_ignored)
{
- while (arguments[0] == ' ')
- arguments++;
- if (arguments[0] == ':')
- arguments++;
- while (arguments)
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, _("Users online: "));
+
+ arguments = strchr (arguments, ' ');
+ if (arguments)
{
- ptr_next = strchr (arguments, ' ');
- if (ptr_next)
+ while (arguments[0] == ' ')
+ arguments++;
+ if (arguments[0] == ':')
+ arguments++;
+ while (arguments)
{
- ptr_next[0] = '\0';
- ptr_next++;
- while (ptr_next[0] == ' ')
+ ptr_next = strchr (arguments, ' ');
+ if (ptr_next)
+ {
+ ptr_next[0] = '\0';
ptr_next++;
+ while (ptr_next[0] == ' ')
+ ptr_next++;
+ }
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s ", arguments);
+ arguments = ptr_next;
+ if (arguments && !arguments[0])
+ arguments = NULL;
}
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s ", arguments);
- arguments = ptr_next;
- if (arguments && !arguments[0])
- arguments = NULL;
}
+ gui_printf (server->buffer, "\n");
}
- gui_printf (server->buffer, "\n");
return 0;
}
@@ -2382,21 +2474,25 @@ irc_cmd_recv_303 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_305 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_305 (t_irc_server *server, char *host, char *nick, char *arguments)
{
/* make gcc happy */
(void) host;
+ (void) nick;
- arguments = strchr (arguments, ' ');
- if (arguments)
+ if (!command_ignored)
{
- while (arguments[0] == ' ')
- arguments++;
- if (arguments[0] == ':')
- arguments++;
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s\n", arguments);
+ arguments = strchr (arguments, ' ');
+ if (arguments)
+ {
+ while (arguments[0] == ' ')
+ arguments++;
+ if (arguments[0] == ':')
+ arguments++;
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s\n", arguments);
+ }
}
server->is_away = 0;
server->away_time = 0;
@@ -2408,21 +2504,25 @@ irc_cmd_recv_305 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_306 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_306 (t_irc_server *server, char *host, char *nick, char *arguments)
{
/* make gcc happy */
(void) host;
+ (void) nick;
- arguments = strchr (arguments, ' ');
- if (arguments)
+ if (!command_ignored)
{
- while (arguments[0] == ' ')
- arguments++;
- if (arguments[0] == ':')
- arguments++;
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s\n", arguments);
+ arguments = strchr (arguments, ' ');
+ if (arguments)
+ {
+ while (arguments[0] == ' ')
+ arguments++;
+ if (arguments[0] == ':')
+ arguments++;
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s\n", arguments);
+ }
}
server->is_away = 1;
server->away_time = time (NULL);
@@ -2434,38 +2534,42 @@ irc_cmd_recv_306 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_307 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_307 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_msg;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_msg = strchr (pos_nick, ' ');
- if (pos_msg)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_msg[0] = '\0';
- pos_msg++;
- while (pos_msg[0] == ' ')
- pos_msg++;
- if (pos_msg[0] == ':')
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_msg = strchr (pos_nick, ' ');
+ if (pos_msg)
+ {
+ pos_msg[0] = '\0';
pos_msg++;
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s\n",
- pos_msg);
+ while (pos_msg[0] == ' ')
+ pos_msg++;
+ if (pos_msg[0] == ':')
+ pos_msg++;
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s\n",
+ pos_msg);
+ }
}
}
return 0;
@@ -2476,60 +2580,64 @@ irc_cmd_recv_307 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_311 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_311 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_user, *pos_host, *pos_realname;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_user = strchr (pos_nick, ' ');
- if (pos_user)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_user[0] = '\0';
- pos_user++;
- while (pos_user[0] == ' ')
- pos_user++;
- pos_host = strchr (pos_user, ' ');
- if (pos_host)
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_user = strchr (pos_nick, ' ');
+ if (pos_user)
{
- pos_host[0] = '\0';
- pos_host++;
- while (pos_host[0] == ' ')
- pos_host++;
- pos_realname = strchr (pos_host, ' ');
- if (pos_realname)
+ pos_user[0] = '\0';
+ pos_user++;
+ while (pos_user[0] == ' ')
+ pos_user++;
+ pos_host = strchr (pos_user, ' ');
+ if (pos_host)
{
- pos_realname[0] = '\0';
- pos_realname++;
- while (pos_realname[0] == ' ')
- pos_realname++;
- if (pos_realname[0] == '*')
- pos_realname++;
- while (pos_realname[0] == ' ')
- pos_realname++;
- if (pos_realname[0] == ':')
+ pos_host[0] = '\0';
+ pos_host++;
+ while (pos_host[0] == ' ')
+ pos_host++;
+ pos_realname = strchr (pos_host, ' ');
+ if (pos_realname)
+ {
+ pos_realname[0] = '\0';
pos_realname++;
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] (");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_HOST, "%s@%s",
- pos_user, pos_host);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, ")");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, ": %s\n", pos_realname);
+ while (pos_realname[0] == ' ')
+ pos_realname++;
+ if (pos_realname[0] == '*')
+ pos_realname++;
+ while (pos_realname[0] == ' ')
+ pos_realname++;
+ if (pos_realname[0] == ':')
+ pos_realname++;
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] (");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_HOST, "%s@%s",
+ pos_user, pos_host);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, ")");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, ": %s\n", pos_realname);
+ }
}
}
}
@@ -2542,50 +2650,54 @@ irc_cmd_recv_311 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_312 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_312 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_server, *pos_serverinfo;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_server = strchr (pos_nick, ' ');
- if (pos_server)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_server[0] = '\0';
- pos_server++;
- while (pos_server[0] == ' ')
- pos_server++;
- pos_serverinfo = strchr (pos_server, ' ');
- if (pos_serverinfo)
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_server = strchr (pos_nick, ' ');
+ if (pos_server)
{
- pos_serverinfo[0] = '\0';
- pos_serverinfo++;
- while (pos_serverinfo[0] == ' ')
+ pos_server[0] = '\0';
+ pos_server++;
+ while (pos_server[0] == ' ')
+ pos_server++;
+ pos_serverinfo = strchr (pos_server, ' ');
+ if (pos_serverinfo)
+ {
+ pos_serverinfo[0] = '\0';
pos_serverinfo++;
- if (pos_serverinfo[0] == ':')
+ while (pos_serverinfo[0] == ' ')
pos_serverinfo++;
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s ", pos_server);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "(");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s", pos_serverinfo);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, ")\n");
+ if (pos_serverinfo[0] == ':')
+ pos_serverinfo++;
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s ", pos_server);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "(");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s", pos_serverinfo);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, ")\n");
+ }
}
}
}
@@ -2597,37 +2709,41 @@ irc_cmd_recv_312 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_313 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_313 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_message;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_message = strchr (pos_nick, ' ');
- if (pos_message)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_message[0] = '\0';
- pos_message++;
- while (pos_message[0] == ' ')
- pos_message++;
- if (pos_message[0] == ':')
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_message = strchr (pos_nick, ' ');
+ if (pos_message)
+ {
+ pos_message[0] = '\0';
pos_message++;
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s\n", pos_message);
+ while (pos_message[0] == ' ')
+ pos_message++;
+ if (pos_message[0] == ':')
+ pos_message++;
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s\n", pos_message);
+ }
}
}
return 0;
@@ -2638,62 +2754,66 @@ irc_cmd_recv_313 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_314 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_314 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_user, *pos_host, *pos_realname;
/* make gcc happy */
(void) host;
-
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ (void) nick;
+
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_user = strchr (pos_nick, ' ');
- if (pos_user)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_user[0] = '\0';
- pos_user++;
- while (pos_user[0] == ' ')
- pos_user++;
- pos_host = strchr (pos_user, ' ');
- if (pos_host)
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_user = strchr (pos_nick, ' ');
+ if (pos_user)
{
- pos_host[0] = '\0';
- pos_host++;
- while (pos_host[0] == ' ')
- pos_host++;
- pos_realname = strchr (pos_host, ' ');
- if (pos_realname)
+ pos_user[0] = '\0';
+ pos_user++;
+ while (pos_user[0] == ' ')
+ pos_user++;
+ pos_host = strchr (pos_user, ' ');
+ if (pos_host)
{
- pos_realname[0] = '\0';
- pos_realname++;
- while (pos_realname[0] == ' ')
- pos_realname++;
- pos_realname = strchr (pos_realname, ' ');
+ pos_host[0] = '\0';
+ pos_host++;
+ while (pos_host[0] == ' ')
+ pos_host++;
+ pos_realname = strchr (pos_host, ' ');
if (pos_realname)
{
pos_realname[0] = '\0';
pos_realname++;
while (pos_realname[0] == ' ')
pos_realname++;
- if (pos_realname[0] == ':')
+ pos_realname = strchr (pos_realname, ' ');
+ if (pos_realname)
+ {
+ pos_realname[0] = '\0';
pos_realname++;
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, " (");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_HOST,
- "%s@%s", pos_user, pos_host);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, ")");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- " was %s\n", pos_realname);
+ while (pos_realname[0] == ' ')
+ pos_realname++;
+ if (pos_realname[0] == ':')
+ pos_realname++;
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, " (");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_HOST,
+ "%s@%s", pos_user, pos_host);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, ")");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ " was %s\n", pos_realname);
+ }
}
}
}
@@ -2707,13 +2827,14 @@ irc_cmd_recv_314 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_315 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_315 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
t_irc_channel *ptr_channel;
/* make gcc happy */
(void) host;
+ (void) nick;
/* skip nickname if at beginning of server message */
if (strncmp (server->nick, arguments, strlen (server->nick)) == 0)
@@ -2734,11 +2855,17 @@ irc_cmd_recv_315 (t_irc_server *server, char *host, char *arguments)
ptr_channel->checking_away--;
return 0;
}
- gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", arguments);
- gui_printf (server->buffer, " %s\n", pos);
+ if (!command_ignored)
+ {
+ gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", arguments);
+ gui_printf (server->buffer, " %s\n", pos);
+ }
}
else
- gui_printf (server->buffer, "%s\n", arguments);
+ {
+ if (!command_ignored)
+ gui_printf (server->buffer, "%s\n", arguments);
+ }
return 0;
}
@@ -2747,7 +2874,7 @@ irc_cmd_recv_315 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_317 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_317 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_idle, *pos_signon, *pos_message;
int idle_time, day, hour, min, sec;
@@ -2755,85 +2882,89 @@ irc_cmd_recv_317 (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_idle = strchr (pos_nick, ' ');
- if (pos_idle)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_idle[0] = '\0';
- pos_idle++;
- while (pos_idle[0] == ' ')
- pos_idle++;
- pos_signon = strchr (pos_idle, ' ');
- if (pos_signon)
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_idle = strchr (pos_nick, ' ');
+ if (pos_idle)
{
- pos_signon[0] = '\0';
- pos_signon++;
- while (pos_signon[0] == ' ')
- pos_signon++;
- pos_message = strchr (pos_signon, ' ');
- if (pos_message)
+ pos_idle[0] = '\0';
+ pos_idle++;
+ while (pos_idle[0] == ' ')
+ pos_idle++;
+ pos_signon = strchr (pos_idle, ' ');
+ if (pos_signon)
{
- pos_message[0] = '\0';
+ pos_signon[0] = '\0';
+ pos_signon++;
+ while (pos_signon[0] == ' ')
+ pos_signon++;
+ pos_message = strchr (pos_signon, ' ');
+ if (pos_message)
+ {
+ pos_message[0] = '\0';
- idle_time = atoi (pos_idle);
- day = idle_time / (60 * 60 * 24);
- hour = (idle_time % (60 * 60 * 24)) / (60 * 60);
- min = ((idle_time % (60 * 60 * 24)) % (60 * 60)) / 60;
- sec = ((idle_time % (60 * 60 * 24)) % (60 * 60)) % 60;
+ idle_time = atoi (pos_idle);
+ day = idle_time / (60 * 60 * 24);
+ hour = (idle_time % (60 * 60 * 24)) / (60 * 60);
+ min = ((idle_time % (60 * 60 * 24)) % (60 * 60)) / 60;
+ sec = ((idle_time % (60 * 60 * 24)) % (60 * 60)) % 60;
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, _("idle: "));
- if (day > 0)
- {
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, _("idle: "));
+ if (day > 0)
+ {
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%d ", day);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ (day > 1) ? _("days") : _("day"));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ ", ");
+ }
gui_printf_color (server->buffer,
COLOR_WIN_CHAT_CHANNEL,
- "%d ", day);
+ "%02d ", hour);
gui_printf_color (server->buffer,
COLOR_WIN_CHAT,
- (day > 1) ? _("days") : _("day"));
+ (hour > 1) ? _("hours") : _("hour"));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ " %02d ", min);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ (min > 1) ? _("minutes") : _("minute"));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ " %02d ", sec);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ (sec > 1) ? _("seconds") : _("second"));
gui_printf_color (server->buffer,
COLOR_WIN_CHAT,
", ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, _("signon at: "));
+ datetime = (time_t)(atol (pos_signon));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%s", ctime (&datetime));
}
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%02d ", hour);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- (hour > 1) ? _("hours") : _("hour"));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- " %02d ", min);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- (min > 1) ? _("minutes") : _("minute"));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- " %02d ", sec);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- (sec > 1) ? _("seconds") : _("second"));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- ", ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, _("signon at: "));
- datetime = (time_t)(atol (pos_signon));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%s", ctime (&datetime));
}
}
}
@@ -2846,37 +2977,41 @@ irc_cmd_recv_317 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_318 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_318 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_message;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_message = strchr (pos_nick, ' ');
- if (pos_message)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_message[0] = '\0';
- pos_message++;
- while (pos_message[0] == ' ')
- pos_message++;
- if (pos_message[0] == ':')
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_message = strchr (pos_nick, ' ');
+ if (pos_message)
+ {
+ pos_message[0] = '\0';
pos_message++;
+ while (pos_message[0] == ' ')
+ pos_message++;
+ if (pos_message[0] == ':')
+ pos_message++;
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s\n", pos_message);
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s\n", pos_message);
+ }
}
}
return 0;
@@ -2887,76 +3022,80 @@ irc_cmd_recv_318 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_319 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_319 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_channel, *pos;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_channel = strchr (pos_nick, ' ');
- if (pos_channel)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_channel[0] = '\0';
- pos_channel++;
- while (pos_channel[0] == ' ')
- pos_channel++;
- if (pos_channel[0] == ':')
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_channel = strchr (pos_nick, ' ');
+ 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_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, _("Channels: "));
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, _("Channels: "));
- while (pos_channel && pos_channel[0])
- {
- if (pos_channel[0] == '@')
+ while (pos_channel && pos_channel[0])
{
- gui_printf_color (server->buffer,
- COLOR_WIN_NICK_OP, "@");
- pos_channel++;
- }
- else
- {
- if (pos_channel[0] == '%')
+ if (pos_channel[0] == '@')
{
gui_printf_color (server->buffer,
- COLOR_WIN_NICK_HALFOP, "%");
+ COLOR_WIN_NICK_OP, "@");
pos_channel++;
}
else
- if (pos_channel[0] == '+')
+ {
+ if (pos_channel[0] == '%')
{
gui_printf_color (server->buffer,
- COLOR_WIN_NICK_VOICE, "+");
+ COLOR_WIN_NICK_HALFOP, "%");
pos_channel++;
}
- }
- pos = strchr (pos_channel, ' ');
- if (pos)
- {
- pos[0] = '\0';
- pos++;
- while (pos[0] == ' ')
+ else
+ if (pos_channel[0] == '+')
+ {
+ gui_printf_color (server->buffer,
+ COLOR_WIN_NICK_VOICE, "+");
+ pos_channel++;
+ }
+ }
+ pos = strchr (pos_channel, ' ');
+ if (pos)
+ {
+ pos[0] = '\0';
pos++;
+ while (pos[0] == ' ')
+ pos++;
+ }
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%s%s",
+ pos_channel,
+ (pos && pos[0]) ? " " : "\n");
+ pos_channel = pos;
}
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%s%s",
- pos_channel,
- (pos && pos[0]) ? " " : "\n");
- pos_channel = pos;
}
}
}
@@ -2968,37 +3107,41 @@ irc_cmd_recv_319 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_320 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_320 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_message;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_message = strchr (pos_nick, ' ');
- if (pos_message)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_message[0] = '\0';
- pos_message++;
- while (pos_message[0] == ' ')
- pos_message++;
- if (pos_message[0] == ':')
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_message = strchr (pos_nick, ' ');
+ if (pos_message)
+ {
+ pos_message[0] = '\0';
pos_message++;
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s\n", pos_message);
+ while (pos_message[0] == ' ')
+ pos_message++;
+ if (pos_message[0] == ':')
+ pos_message++;
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s\n", pos_message);
+ }
}
}
return 0;
@@ -3009,26 +3152,30 @@ irc_cmd_recv_320 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_321 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_321 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos = strchr (arguments, ' ');
- if (pos)
+ if (!command_ignored)
{
- pos[0] = '\0';
- pos++;
- while (pos[0] == ' ')
+ pos = strchr (arguments, ' ');
+ if (pos)
+ {
+ pos[0] = '\0';
pos++;
- }
- else
- pos = arguments;
+ while (pos[0] == ' ')
+ pos++;
+ }
+ else
+ pos = arguments;
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf (server->buffer, "%s\n", pos);
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf (server->buffer, "%s\n", pos);
+ }
return 0;
}
@@ -3037,26 +3184,30 @@ irc_cmd_recv_321 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_322 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_322 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos = strchr (arguments, ' ');
- if (pos)
+ if (!command_ignored)
{
- pos[0] = '\0';
- pos++;
- while (pos[0] == ' ')
+ pos = strchr (arguments, ' ');
+ if (pos)
+ {
+ pos[0] = '\0';
pos++;
- }
- else
- pos = arguments;
+ while (pos[0] == ' ')
+ pos++;
+ }
+ else
+ pos = arguments;
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf (server->buffer, "%s\n", pos);
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf (server->buffer, "%s\n", pos);
+ }
return 0;
}
@@ -3065,26 +3216,30 @@ irc_cmd_recv_322 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_323 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_323 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos = strchr (arguments, ' ');
- if (pos)
+ if (!command_ignored)
{
- pos[0] = '\0';
- pos++;
- while (pos[0] == ' ')
+ pos = strchr (arguments, ' ');
+ if (pos)
+ {
+ pos[0] = '\0';
pos++;
- }
- else
- pos = arguments;
+ while (pos[0] == ' ')
+ pos++;
+ }
+ else
+ pos = arguments;
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf (server->buffer, "%s\n", pos);
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf (server->buffer, "%s\n", pos);
+ }
return 0;
}
@@ -3093,23 +3248,24 @@ irc_cmd_recv_323 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_324 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_324 (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos_chan, *pos, *pos_parm;
+ char *pos_channel, *pos, *pos_parm;
t_irc_channel *ptr_channel;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_chan = strchr (arguments, ' ');
- if (pos_chan)
+ pos_channel = strchr (arguments, ' ');
+ if (pos_channel)
{
- pos_chan[0] = '\0';
- pos_chan++;
- while (pos_chan[0] == ' ')
- pos_chan++;
+ pos_channel[0] = '\0';
+ pos_channel++;
+ while (pos_channel[0] == ' ')
+ pos_channel++;
- pos = strchr (pos_chan, ' ');
+ pos = strchr (pos_channel, ' ');
if (pos)
{
pos[0] = '\0';
@@ -3125,7 +3281,7 @@ irc_cmd_recv_324 (t_irc_server *server, char *host, char *arguments)
while (pos_parm[0] == ' ')
pos_parm++;
}
- ptr_channel = channel_search (server, pos_chan);
+ ptr_channel = channel_search (server, pos_channel);
if (ptr_channel)
{
irc_get_channel_modes (ptr_channel, NULL, NULL, pos, pos_parm);
@@ -3141,11 +3297,12 @@ irc_cmd_recv_324 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_329 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_329 (t_irc_server *server, char *host, char *nick, char *arguments)
{
/* make gcc happy */
(void) server;
(void) host;
+ (void) nick;
(void) arguments;
return 0;
@@ -3156,22 +3313,43 @@ irc_cmd_recv_329 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_331 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_331 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos;
+ t_irc_channel *ptr_channel;
/* make gcc happy */
(void) server;
(void) host;
+ (void) nick;
- pos = strchr (arguments, ' ');
- if (pos)
- pos[0] = '\0';
- irc_display_prefix (gui_current_window->buffer, PREFIX_INFO);
- gui_printf_color (gui_current_window->buffer,
- COLOR_WIN_CHAT, _("No topic set for "));
- gui_printf_color (gui_current_window->buffer,
- COLOR_WIN_CHAT_CHANNEL, "%s\n", arguments);
+ if (!command_ignored)
+ {
+ pos = strchr (arguments, ' ');
+ if (pos)
+ pos[0] = '\0';
+ ptr_channel = channel_search (server, arguments);
+ if (ptr_channel)
+ {
+ command_ignored |= ignore_check (host, "331", ptr_channel->name, server->name);
+ if (!command_ignored)
+ {
+ irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _("No topic set for "));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL, "%s\n", arguments);
+ }
+ }
+ else
+ {
+ irc_display_prefix (server->buffer, PREFIX_ERROR);
+ gui_printf_nolog (server->buffer,
+ _("%s channel \"%s\" not found for \"%s\" command\n"),
+ WEECHAT_ERROR, arguments, "331");
+ return -1;
+ }
+ }
return 0;
}
@@ -3180,13 +3358,14 @@ irc_cmd_recv_331 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_332 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_332 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos2;
t_irc_channel *ptr_channel;
/* make gcc happy */
(void) host;
+ (void) nick;
pos = strchr (arguments, ' ');
if (pos)
@@ -3209,13 +3388,17 @@ irc_cmd_recv_332 (t_irc_server *server, char *host, char *arguments)
free (ptr_channel->topic);
ptr_channel->topic = strdup (pos2);
- irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _("Topic for "));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL, "%s", pos);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _(" is: \"%s\"\n"), pos2);
+ command_ignored |= ignore_check (host, "332", ptr_channel->name, server->name);
+ if (!command_ignored)
+ {
+ irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _("Topic for "));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL, "%s", pos);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _(" is: \"%s\"\n"), pos2);
+ }
gui_draw_buffer_title (ptr_channel->buffer, 1);
}
@@ -3245,7 +3428,7 @@ irc_cmd_recv_332 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_333 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_333 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_channel, *pos_nick, *pos_date;
t_irc_channel *ptr_channel;
@@ -3253,6 +3436,7 @@ irc_cmd_recv_333 (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) host;
+ (void) nick;
pos_channel = strchr (arguments, ' ');
if (pos_channel)
@@ -3277,14 +3461,18 @@ irc_cmd_recv_333 (t_irc_server *server, char *host, char *arguments)
ptr_channel = channel_search (server, pos_channel);
if (ptr_channel)
{
- irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _("Topic set by "));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- datetime = (time_t)(atol (pos_date));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, ", %s", ctime (&datetime));
+ command_ignored |= ignore_check (host, "333", ptr_channel->name, server->name);
+ if (!command_ignored)
+ {
+ irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _("Topic set by "));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ datetime = (time_t)(atol (pos_date));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, ", %s", ctime (&datetime));
+ }
}
else
{
@@ -3329,13 +3517,13 @@ irc_cmd_recv_333 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_341 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_341 (t_irc_server *server, char *host, char *nick, char *arguments)
{
- char *pos, *pos_nick, *pos_channel;
+ char *pos_nick, *pos_channel;
- pos = strchr (host, '!');
- if (pos)
- pos[0] = '\0';
+ /* make gcc happy */
+ (void) host;
+ (void) nick;
pos_nick = strchr (arguments, ' ');
if (pos_nick)
@@ -3391,13 +3579,14 @@ irc_cmd_recv_341 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_351 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_351 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos2;
/* make gcc happy */
(void) server;
(void) host;
+ (void) nick;
pos = strchr (arguments, ' ');
if (pos)
@@ -3415,11 +3604,14 @@ irc_cmd_recv_351 (t_irc_server *server, char *host, char *arguments)
pos2 += 2;
}
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- if (pos2)
- gui_printf (server->buffer, "%s %s\n", pos, pos2);
- else
- gui_printf (server->buffer, "%s\n", pos);
+ if (!command_ignored)
+ {
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ if (pos2)
+ gui_printf (server->buffer, "%s %s\n", pos, pos2);
+ else
+ gui_printf (server->buffer, "%s\n", pos);
+ }
return 0;
}
@@ -3428,7 +3620,7 @@ irc_cmd_recv_351 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_352 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_352 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_channel, *pos_user, *pos_host, *pos_server, *pos_nick;
char *pos_attr, *pos_hopcount, *pos_realname;
@@ -3437,6 +3629,7 @@ irc_cmd_recv_352 (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) host;
+ (void) nick;
pos_channel = strchr (arguments, ' ');
if (pos_channel)
@@ -3495,6 +3688,8 @@ irc_cmd_recv_352 (t_irc_server *server, char *host, char *arguments)
while (pos_realname[0] == ' ')
pos_realname++;
+ command_ignored |= ignore_check (host, "352", pos_channel, server->name);
+
ptr_channel = channel_search (server, pos_channel);
if (ptr_channel && (ptr_channel->checking_away > 0))
{
@@ -3505,34 +3700,37 @@ irc_cmd_recv_352 (t_irc_server *server, char *host, char *arguments)
return 0;
}
- irc_display_prefix (server->buffer,
- PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK,
- "%s ", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- _("on"));
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- " %s", pos_channel);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- " %s %s ",
- pos_attr, pos_hopcount);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_HOST,
- "%s@%s",
- pos_user, pos_host);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK,
- " (");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT,
- "%s", pos_realname);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK,
- ")\n");
+ if (!command_ignored)
+ {
+ irc_display_prefix (server->buffer,
+ PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK,
+ "%s ", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ _("on"));
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ " %s", pos_channel);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ " %s %s ",
+ pos_attr, pos_hopcount);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_HOST,
+ "%s@%s",
+ pos_user, pos_host);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK,
+ " (");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT,
+ "%s", pos_realname);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK,
+ ")\n");
+ }
}
}
}
@@ -3549,7 +3747,7 @@ irc_cmd_recv_352 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_353 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_353 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos_nick;
int is_chanowner, is_chanadmin, is_op, is_halfop, has_voice;
@@ -3557,6 +3755,7 @@ irc_cmd_recv_353 (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) host;
+ (void) nick;
pos = strstr (arguments, " = ");
if (pos)
@@ -3659,7 +3858,7 @@ irc_cmd_recv_353 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_366 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_366 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos2;
t_irc_channel *ptr_channel;
@@ -3668,6 +3867,7 @@ irc_cmd_recv_366 (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) host;
+ (void) nick;
pos = strchr (arguments, ' ');
if (pos)
@@ -3687,90 +3887,97 @@ irc_cmd_recv_366 (t_irc_server *server, char *host, char *arguments)
ptr_channel = channel_search (server, pos);
if (ptr_channel)
{
-
- /* display users on channel */
- irc_display_prefix (ptr_channel->buffer, PREFIX_SERVER);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
- _("Nicks "));
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
- "%s", ptr_channel->name);
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT, ": ");
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK, "[");
+ command_ignored |= ignore_check (host, "366", ptr_channel->name, server->name);
- for (ptr_nick = ptr_channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
+ if (!command_ignored)
{
- irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
- MSG_TYPE_MSG, 0, 0, 1);
- if (ptr_nick != ptr_channel->last_nick)
- gui_printf (ptr_channel->buffer, " ");
- }
- gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK, "]\n");
-
- /* display number of nicks, ops, halfops & voices on the channel */
- nick_count (ptr_channel, &num_nicks, &num_op, &num_halfop, &num_voice,
- &num_normal);
- irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, _("Channel "));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%s", ptr_channel->name);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT, ": ");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%d ", num_nicks);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- (num_nicks > 1) ? _("nicks") : _("nick"));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, " (");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%d ", num_op);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- (num_op > 1) ? _("ops") : _("op"));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- ", ");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%d ", num_halfop);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- (num_halfop > 1) ? _("halfops") : _("halfop"));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- ", ");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL,
+ /* display users on channel */
+ irc_display_prefix (ptr_channel->buffer, PREFIX_SERVER);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
+ _("Nicks "));
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
+ "%s", ptr_channel->name);
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT, ": ");
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK, "[");
+
+ for (ptr_nick = ptr_channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
+ {
+ irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
+ MSG_TYPE_MSG, 0, 0, 1);
+ if (ptr_nick != ptr_channel->last_nick)
+ gui_printf (ptr_channel->buffer, " ");
+ }
+ gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK, "]\n");
+
+ /* display number of nicks, ops, halfops & voices on the channel */
+ nick_count (ptr_channel, &num_nicks, &num_op, &num_halfop, &num_voice,
+ &num_normal);
+ irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, _("Channel "));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%s", ptr_channel->name);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT, ": ");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%d ", num_nicks);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ (num_nicks > 1) ? _("nicks") : _("nick"));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_DARK, " (");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%d ", num_op);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ (num_op > 1) ? _("ops") : _("op"));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ ", ");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%d ", num_halfop);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ (num_halfop > 1) ? _("halfops") : _("halfop"));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ ", ");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
"%d ", num_voice);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- (num_voice > 1) ? _("voices") : _("voice"));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- ", ");
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_CHANNEL,
- "%d ", num_normal);
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT,
- _("normal"));
- gui_printf_color (ptr_channel->buffer,
- COLOR_WIN_CHAT_DARK, ")\n");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ (num_voice > 1) ? _("voices") : _("voice"));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ ", ");
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_CHANNEL,
+ "%d ", num_normal);
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT,
+ _("normal"));
+ gui_printf_color (ptr_channel->buffer,
+ COLOR_WIN_CHAT_DARK, ")\n");
+ }
irc_cmd_send_mode (server, ptr_channel->name);
if (cfg_irc_away_check > 0)
channel_check_away (server, ptr_channel);
}
else
{
- irc_display_prefix (gui_current_window->buffer, PREFIX_INFO);
- gui_printf_color (gui_current_window->buffer,
- COLOR_WIN_CHAT_CHANNEL, pos);
- gui_printf_color (gui_current_window->buffer,
- COLOR_WIN_CHAT, ": %s\n", pos2);
+ if (!command_ignored)
+ {
+ irc_display_prefix (gui_current_window->buffer, PREFIX_INFO);
+ gui_printf_color (gui_current_window->buffer,
+ COLOR_WIN_CHAT_CHANNEL, pos);
+ gui_printf_color (gui_current_window->buffer,
+ COLOR_WIN_CHAT, ": %s\n", pos2);
+ }
return 0;
}
}
@@ -3783,7 +3990,7 @@ irc_cmd_recv_366 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_367 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_367 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_channel, *pos_ban, *pos_user, *pos_date, *pos;
t_irc_channel *ptr_channel;
@@ -3792,6 +3999,7 @@ irc_cmd_recv_367 (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) host;
+ (void) nick;
/* look for channel */
pos_channel = strchr (arguments, ' ');
@@ -3865,26 +4073,30 @@ irc_cmd_recv_367 (t_irc_server *server, char *host, char *arguments)
ptr_channel = channel_search (server, pos_channel);
buffer = (ptr_channel) ? ptr_channel->buffer : server->buffer;
- irc_display_prefix (buffer, PREFIX_INFO);
- gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_channel);
- gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (buffer, COLOR_WIN_CHAT_HOST, "%s ", pos_ban);
- gui_printf (buffer, _("banned by"));
- pos = strchr (pos_user, '!');
- if (pos)
- {
- pos[0] = '\0';
- gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, " %s ", pos_user);
- gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "(");
- gui_printf_color (buffer, COLOR_WIN_CHAT_HOST, "%s", pos + 1);
- gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, ")");
- }
- else
- gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, " %s", pos_user);
- datetime = (time_t)(atol (pos_date));
- gui_printf_nolog (buffer, ", %s", ctime (&datetime));
+ command_ignored |= ignore_check (host, "367", pos_channel, server->name);
+ if (!command_ignored)
+ {
+ irc_display_prefix (buffer, PREFIX_INFO);
+ gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_channel);
+ gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (buffer, COLOR_WIN_CHAT_HOST, "%s ", pos_ban);
+ gui_printf (buffer, _("banned by"));
+ pos = strchr (pos_user, '!');
+ if (pos)
+ {
+ pos[0] = '\0';
+ gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, " %s ", pos_user);
+ gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "(");
+ gui_printf_color (buffer, COLOR_WIN_CHAT_HOST, "%s", pos + 1);
+ gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, ")");
+ }
+ else
+ gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, " %s", pos_user);
+ datetime = (time_t)(atol (pos_date));
+ gui_printf_nolog (buffer, ", %s", ctime (&datetime));
+ }
return 0;
}
@@ -3893,7 +4105,7 @@ irc_cmd_recv_367 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_368 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_368 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_channel, *pos_msg;
t_irc_channel *ptr_channel;
@@ -3901,6 +4113,7 @@ irc_cmd_recv_368 (t_irc_server *server, char *host, char *arguments)
/* make gcc happy */
(void) host;
+ (void) nick;
pos_channel = strchr (arguments, ' ');
if (!pos_channel)
@@ -3934,13 +4147,17 @@ irc_cmd_recv_368 (t_irc_server *server, char *host, char *arguments)
ptr_channel = channel_search (server, pos_channel);
buffer = (ptr_channel) ? ptr_channel->buffer : server->buffer;
+
+ command_ignored |= ignore_check (host, "368", pos_channel, server->name);
- irc_display_prefix (buffer, PREFIX_INFO);
- gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_channel);
- gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_nolog (buffer, "%s\n", pos_msg);
-
+ if (!command_ignored)
+ {
+ irc_display_prefix (buffer, PREFIX_INFO);
+ gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_channel);
+ gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_nolog (buffer, "%s\n", pos_msg);
+ }
return 0;
}
@@ -3949,10 +4166,12 @@ irc_cmd_recv_368 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_433 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_433 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char hostname[128];
-
+
+ /* Note: this IRC command can not be ignored */
+
if (!server->is_connected)
{
if (strcmp (server->nick, server->nick1) == 0)
@@ -4011,7 +4230,8 @@ irc_cmd_recv_433 (t_irc_server *server, char *host, char *arguments)
server->nick);
}
else
- return irc_cmd_recv_error (server, host, arguments);
+ return irc_cmd_recv_error (server, host, nick, arguments);
+
return 0;
}
@@ -4020,34 +4240,37 @@ irc_cmd_recv_433 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_438 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_438 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos, *pos2;
/* make gcc happy */
(void) server;
(void) host;
+ (void) nick;
- pos = strchr (arguments, ' ');
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- if (pos)
+ if (!command_ignored)
{
- pos[0] = '\0';
- pos++;
-
- pos2 = strstr (pos, " :");
- if (pos2)
+ pos = strchr (arguments, ' ');
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ if (pos)
{
- pos2[0] = '\0';
- pos2 += 2;
- gui_printf (server->buffer, "%s (%s => %s)\n", pos2, arguments, pos);
+ pos[0] = '\0';
+ pos++;
+
+ pos2 = strstr (pos, " :");
+ if (pos2)
+ {
+ pos2[0] = '\0';
+ pos2 += 2;
+ gui_printf (server->buffer, "%s (%s => %s)\n", pos2, arguments, pos);
+ }
+ else
+ gui_printf (server->buffer, "%s (%s)\n", pos, arguments);
}
else
- gui_printf (server->buffer, "%s (%s)\n", pos, arguments);
+ gui_printf (server->buffer, "%s\n", arguments);
}
- else
- gui_printf (server->buffer, "%s\n", arguments);
-
return 0;
}
@@ -4056,37 +4279,41 @@ irc_cmd_recv_438 (t_irc_server *server, char *host, char *arguments)
*/
int
-irc_cmd_recv_671 (t_irc_server *server, char *host, char *arguments)
+irc_cmd_recv_671 (t_irc_server *server, char *host, char *nick, char *arguments)
{
char *pos_nick, *pos_message;
/* make gcc happy */
(void) host;
+ (void) nick;
- pos_nick = strchr (arguments, ' ');
- if (pos_nick)
+ if (!command_ignored)
{
- while (pos_nick[0] == ' ')
- pos_nick++;
- pos_message = strchr (pos_nick, ' ');
- if (pos_message)
+ pos_nick = strchr (arguments, ' ');
+ if (pos_nick)
{
- pos_message[0] = '\0';
- pos_message++;
- while (pos_message[0] == ' ')
- pos_message++;
- if (pos_message[0] == ':')
+ while (pos_nick[0] == ' ')
+ pos_nick++;
+ pos_message = strchr (pos_nick, ' ');
+ if (pos_message)
+ {
+ pos_message[0] = '\0';
pos_message++;
-
- irc_display_prefix (server->buffer, PREFIX_SERVER);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "[");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_NICK, "%s", pos_nick);
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT_DARK, "] ");
- gui_printf_color (server->buffer,
- COLOR_WIN_CHAT, "%s\n", pos_message);
+ while (pos_message[0] == ' ')
+ pos_message++;
+ if (pos_message[0] == ':')
+ pos_message++;
+
+ irc_display_prefix (server->buffer, PREFIX_SERVER);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "[");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_NICK, "%s", pos_nick);
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT_DARK, "] ");
+ gui_printf_color (server->buffer,
+ COLOR_WIN_CHAT, "%s\n", pos_message);
+ }
}
}
return 0;
diff --git a/weechat/src/irc/irc-server.c b/weechat/src/irc/irc-server.c
index 6645f0129..5f0fe45bd 100644
--- a/weechat/src/irc/irc-server.c
+++ b/weechat/src/irc/irc-server.c
@@ -900,12 +900,12 @@ void
convbase64_8x3_to_6x4(char *from, char* to)
{
- unsigned char base64_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ unsigned char base64_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
- to[0] = base64_table [ (from[0] & 0xfc) >> 2 ];
- to[1] = base64_table [ ((from[0] & 0x03) << 4) + ((from[1] & 0xf0) >> 4) ];
- to[2] = base64_table [ ((from[1] & 0x0f) << 2) + ((from[2] & 0xc0) >> 6) ];
- to[3] = base64_table [ from[2] & 0x3f ];
+ to[0] = base64_table [ (from[0] & 0xfc) >> 2 ];
+ to[1] = base64_table [ ((from[0] & 0x03) << 4) + ((from[1] & 0xf0) >> 4) ];
+ to[2] = base64_table [ ((from[1] & 0x0f) << 2) + ((from[2] & 0xc0) >> 6) ];
+ to[3] = base64_table [ from[2] & 0x3f ];
}
/*
@@ -916,91 +916,92 @@ void
base64encode(char *from, char *to)
{
- char *f, *t;
- int from_len;
+ char *f, *t;
+ int from_len;
- from_len = strlen(from);
+ from_len = strlen(from);
- f = from;
- t = to;
+ f = from;
+ t = to;
- while(from_len >= 3)
+ while(from_len >= 3)
{
- convbase64_8x3_to_6x4(f, t);
- f += 3 * sizeof(*f);
- t += 4 * sizeof(*t);
- from_len -= 3;
+ convbase64_8x3_to_6x4(f, t);
+ f += 3 * sizeof(*f);
+ t += 4 * sizeof(*t);
+ from_len -= 3;
}
- if (from_len > 0)
+ if (from_len > 0)
{
- char rest[3] = { 0, 0, 0 };
- switch(from_len)
+ char rest[3] = { 0, 0, 0 };
+ switch(from_len)
{
case 1 :
- rest[0] = f[0];
- convbase64_8x3_to_6x4(rest, t);
- t[2] = t[3] = '=';
- break;
+ rest[0] = f[0];
+ convbase64_8x3_to_6x4(rest, t);
+ t[2] = t[3] = '=';
+ break;
case 2 :
- rest[0] = f[0];
- rest[1] = f[1];
- convbase64_8x3_to_6x4(rest, t);
- t[3] = '=';
- break;
+ rest[0] = f[0];
+ rest[1] = f[1];
+ convbase64_8x3_to_6x4(rest, t);
+ t[3] = '=';
+ break;
}
- t[4] = 0;
+ t[4] = 0;
}
}
/*
* pass_httpproxy: establish connection/authentification to an http proxy
- * return :
- * - 0 if connexion throw proxy was successful
- * - 1 if connexion fails
+ * return :
+ * - 0 if connexion throw proxy was successful
+ * - 1 if connexion fails
*/
+
int
pass_httpproxy(int sock, char *address, int port)
{
- char buffer[256];
- char authbuf[128]; // seems to be enougth to store username + password
- char authbuf_base64[196]; // enougth to store base64 encoded authbuf
- int n, m;
+ char buffer[256];
+ char authbuf[128]; // seems to be enougth to store username + password
+ char authbuf_base64[196]; // enougth to store base64 encoded authbuf
+ int n, m;
- if (strlen(cfg_proxy_username) > 0)
+ if (strlen(cfg_proxy_username) > 0)
{
- // authentification
- snprintf(authbuf, sizeof(authbuf), "%s:%s", cfg_proxy_username, cfg_proxy_password);
- base64encode(authbuf, authbuf_base64);
- n = snprintf(buffer, sizeof(buffer), "CONNECT %s:%d HTTP/1.0\r\nProxy-Authorization: Basic %s\r\n\r\n", address, port, authbuf_base64);
+ // authentification
+ snprintf(authbuf, sizeof(authbuf), "%s:%s", cfg_proxy_username, cfg_proxy_password);
+ base64encode(authbuf, authbuf_base64);
+ n = snprintf(buffer, sizeof(buffer), "CONNECT %s:%d HTTP/1.0\r\nProxy-Authorization: Basic %s\r\n\r\n", address, port, authbuf_base64);
}
- else
+ else
{
- // no authentification
- n = snprintf(buffer, sizeof(buffer), "CONNECT %s:%d HTTP/1.0\r\n\r\n", address, port);
+ // no authentification
+ n = snprintf(buffer, sizeof(buffer), "CONNECT %s:%d HTTP/1.0\r\n\r\n", address, port);
}
- m = send (sock, buffer, n, 0);
- if (n != m)
- return 1;
+ m = send (sock, buffer, n, 0);
+ if (n != m)
+ return 1;
- n = recv(sock, buffer, sizeof(buffer), 0);
+ n = recv(sock, buffer, sizeof(buffer), 0);
- /* success result must be like : "HTTP/1.0 200 OK" */
- if (n < 12)
- return 1;
+ /* success result must be like : "HTTP/1.0 200 OK" */
+ if (n < 12)
+ return 1;
- if (memcmp (buffer, "HTTP/", 5) || memcmp (buffer + 9, "200", 3))
- return 1;
+ if (memcmp (buffer, "HTTP/", 5) || memcmp (buffer + 9, "200", 3))
+ return 1;
- return 0;
+ return 0;
}
/*
* resolve: resolve hostname on its IP address
* (works with ipv4 and ipv6)
- * return :
+ * return :
* - 0 if resolution was successful
* - 1 if resolution fails
*/
@@ -1042,207 +1043,210 @@ resolve (char *hostname, char *ip, int *version)
/*
* pass_socks4proxy: establish connection/authentification throw a socks4 proxy
- * return :
- * - 0 if connexion throw proxy was successful
- * - 1 if connexion fails
+ * return :
+ * - 0 if connexion throw proxy was successful
+ * - 1 if connexion fails
*/
+
int
pass_socks4proxy(int sock, char *address, int port, char *username)
{
- /*
- * socks4 protocol is explain here:
- * http://archive.socks.permeo.com/protocol/socks4.protocol
- *
- */
+ /*
+ * socks4 protocol is explain here:
+ * http://archive.socks.permeo.com/protocol/socks4.protocol
+ *
+ */
- struct s_socks4
- {
- char version; /* 1 byte */ /* socks version : 4 or 5 */
- char method; /* 1 byte */ /* socks method : connect (1) or bind (2) */
- unsigned short port; /* 2 bytes */ /* destination port */
- unsigned long address; /* 4 bytes */ /* destination address */
- char user[64]; /* username (64 characters seems to be enought) */
- } socks4;
- unsigned char buffer[24];
- char ip_addr[NI_MAXHOST];
-
- socks4.version = 4;
- socks4.method = 1;
- socks4.port = htons (port);
- resolve(address, ip_addr, NULL);
- socks4.address = inet_addr (ip_addr);
- strncpy (socks4.user, username, sizeof(socks4.user) - 1);
+ struct s_socks4
+ {
+ char version; /* 1 byte */ /* socks version : 4 or 5 */
+ char method; /* 1 byte */ /* socks method : connect (1) or bind (2) */
+ unsigned short port; /* 2 bytes */ /* destination port */
+ unsigned long address; /* 4 bytes */ /* destination address */
+ char user[64]; /* username (64 characters seems to be enought) */
+ } socks4;
+ unsigned char buffer[24];
+ char ip_addr[NI_MAXHOST];
+
+ socks4.version = 4;
+ socks4.method = 1;
+ socks4.port = htons (port);
+ resolve(address, ip_addr, NULL);
+ socks4.address = inet_addr (ip_addr);
+ strncpy (socks4.user, username, sizeof(socks4.user) - 1);
- send (sock, (char *) &socks4, 8 + strlen(socks4.user) + 1, 0);
- recv (sock, buffer, sizeof(buffer), 0);
+ send (sock, (char *) &socks4, 8 + strlen(socks4.user) + 1, 0);
+ recv (sock, buffer, sizeof(buffer), 0);
- if (buffer[0] == 0 && buffer[1] == 90)
- return 0;
+ if (buffer[0] == 0 && buffer[1] == 90)
+ return 0;
- return 1;
+ return 1;
}
/*
* pass_socks5proxy: establish connection/authentification throw a socks5 proxy
- * return :
- * - 0 if connexion throw proxy was successful
- * - 1 if connexion fails
+ * return :
+ * - 0 if connexion throw proxy was successful
+ * - 1 if connexion fails
*/
+
int
pass_socks5proxy(int sock, char *address, int port)
{
- /*
- * socks5 protocol is explained in RFC 1928
- * socks5 authentication with username/pass is explained in RFC 1929
- */
+ /*
+ * socks5 protocol is explained in RFC 1928
+ * socks5 authentication with username/pass is explained in RFC 1929
+ */
- struct s_sock5
- {
- char version; /* 1 byte */ /* socks version : 4 or 5 */
- char nmethods; /* 1 byte */ /* size in byte(s) of field 'method', here 1 byte */
- char method; /* 1-255 bytes */ /* socks method : noauth (0), auth(user/pass) (2), ... */
- } socks5;
- unsigned char buffer[288];
- int username_len, password_len, addr_len, addr_buffer_len;
- unsigned char *addr_buffer;
+ struct s_sock5
+ {
+ char version; /* 1 byte */ /* socks version : 4 or 5 */
+ char nmethods; /* 1 byte */ /* size in byte(s) of field 'method', here 1 byte */
+ char method; /* 1-255 bytes */ /* socks method : noauth (0), auth(user/pass) (2), ... */
+ } socks5;
+ unsigned char buffer[288];
+ int username_len, password_len, addr_len, addr_buffer_len;
+ unsigned char *addr_buffer;
- socks5.version = 5;
- socks5.nmethods = 1;
+ socks5.version = 5;
+ socks5.nmethods = 1;
- if (strlen(cfg_proxy_username) > 0)
- /* with authentication */
- socks5.method = 2;
- else
- /* without authentication */
- socks5.method = 0;
+ if (strlen(cfg_proxy_username) > 0)
+ /* with authentication */
+ socks5.method = 2;
+ else
+ /* without authentication */
+ socks5.method = 0;
- send (sock, (char *) &socks5, sizeof(socks5), 0);
- /* server socks5 must respond with 2 bytes */
- if (recv (sock, buffer, 2, 0) != 2)
- return 1;
+ send (sock, (char *) &socks5, sizeof(socks5), 0);
+ /* server socks5 must respond with 2 bytes */
+ if (recv (sock, buffer, 2, 0) != 2)
+ return 1;
- if (strlen(cfg_proxy_username) > 0)
+ if (strlen(cfg_proxy_username) > 0)
{
- /* with authentication */
- /* -> socks server must respond with :
- * - socks version (buffer[0]) = 5 => socks5
- * - socks method (buffer[1]) = 2 => authentication
- */
-
- //if (!(buffer[0] == 5 && buffer[1] == 2))
- if (buffer[0] != 5 || buffer[1] != 2)
- return 1;
-
- /* authentication as in RFC 1929 */
- username_len = strlen(cfg_proxy_username);
- password_len = strlen(cfg_proxy_password);
+ /* with authentication */
+ /* -> socks server must respond with :
+ * - socks version (buffer[0]) = 5 => socks5
+ * - socks method (buffer[1]) = 2 => authentication
+ */
+
+ //if (!(buffer[0] == 5 && buffer[1] == 2))
+ if (buffer[0] != 5 || buffer[1] != 2)
+ return 1;
+
+ /* authentication as in RFC 1929 */
+ username_len = strlen(cfg_proxy_username);
+ password_len = strlen(cfg_proxy_password);
- /* make username/password buffer */
- buffer[0] = 1;
- buffer[1] = (unsigned char) username_len;
- memcpy(buffer + 2, cfg_proxy_username, username_len);
- buffer[2 + username_len] = (unsigned char) password_len;
- memcpy(buffer + 3 + username_len, cfg_proxy_password, password_len);
+ /* make username/password buffer */
+ buffer[0] = 1;
+ buffer[1] = (unsigned char) username_len;
+ memcpy(buffer + 2, cfg_proxy_username, username_len);
+ buffer[2 + username_len] = (unsigned char) password_len;
+ memcpy(buffer + 3 + username_len, cfg_proxy_password, password_len);
- send (sock, buffer, 3 + username_len + password_len, 0);
+ send (sock, buffer, 3 + username_len + password_len, 0);
- /* server socks5 must respond with 2 bytes */
- if (recv (sock, buffer, 2, 0) != 2)
- return 1;
+ /* server socks5 must respond with 2 bytes */
+ if (recv (sock, buffer, 2, 0) != 2)
+ return 1;
- /* buffer[1] = auth state, must be 0 for success */
- if (buffer[1] != 0)
- return 1;
+ /* buffer[1] = auth state, must be 0 for success */
+ if (buffer[1] != 0)
+ return 1;
}
- else
+ else
{
- /* without authentication */
- /* -> socks server must respond with :
- * - socks version (buffer[0]) = 5 => socks5
- * - socks method (buffer[1]) = 0 => no authentication
- */
- if (!(buffer[0] == 5 && buffer[1] == 0))
- return 1;
+ /* without authentication */
+ /* -> socks server must respond with :
+ * - socks version (buffer[0]) = 5 => socks5
+ * - socks method (buffer[1]) = 0 => no authentication
+ */
+ if (!(buffer[0] == 5 && buffer[1] == 0))
+ return 1;
}
- /* authentication successful then giving address/port to connect */
- addr_len = strlen(address);
- addr_buffer_len = 4 + 1 + addr_len + 2;
- addr_buffer = (unsigned char *) malloc ( addr_buffer_len * sizeof(*addr_buffer));
- if (!addr_buffer)
- return 1;
- addr_buffer[0] = 5; /* version 5 */
- addr_buffer[1] = 1; /* command: 1 for connect */
- addr_buffer[2] = 0; /* reserved */
- addr_buffer[3] = 3; /* address type : ipv4 (1), domainname (3), ipv6 (4) */
- addr_buffer[4] = (unsigned char) addr_len;
- memcpy (addr_buffer + 5, address, addr_len); /* server address */
- *((unsigned short *) (addr_buffer + 5 + addr_len)) = htons (port); /* server port */
-
- send (sock, addr_buffer, addr_buffer_len, 0);
- free(addr_buffer);
-
- /* dialog with proxy server */
- if (recv (sock, buffer, 4, 0) != 4)
- return 1;
+ /* authentication successful then giving address/port to connect */
+ addr_len = strlen(address);
+ addr_buffer_len = 4 + 1 + addr_len + 2;
+ addr_buffer = (unsigned char *) malloc ( addr_buffer_len * sizeof(*addr_buffer));
+ if (!addr_buffer)
+ return 1;
+ addr_buffer[0] = 5; /* version 5 */
+ addr_buffer[1] = 1; /* command: 1 for connect */
+ addr_buffer[2] = 0; /* reserved */
+ addr_buffer[3] = 3; /* address type : ipv4 (1), domainname (3), ipv6 (4) */
+ addr_buffer[4] = (unsigned char) addr_len;
+ memcpy (addr_buffer + 5, address, addr_len); /* server address */
+ *((unsigned short *) (addr_buffer + 5 + addr_len)) = htons (port); /* server port */
+
+ send (sock, addr_buffer, addr_buffer_len, 0);
+ free(addr_buffer);
+
+ /* dialog with proxy server */
+ if (recv (sock, buffer, 4, 0) != 4)
+ return 1;
- if (!(buffer[0] == 5 && buffer[1] == 0))
- return 1;
+ if (!(buffer[0] == 5 && buffer[1] == 0))
+ return 1;
- switch(buffer[3]) {
- /* buffer[3] = address type */
- case 1 :
- /* ipv4
- * server socks return server bound address and port
- * address of 4 bytes and port of 2 bytes (= 6 bytes)
- */
- if (recv (sock, buffer, 6, 0) != 6)
- return 1;
- break;
- case 3:
- /* domainname
- * server socks return server bound address and port
- */
- /* reading address length */
- if (recv (sock, buffer, 1, 0) != 1)
- return 1;
- addr_len = buffer[0];
- /* reading address + port = addr_len + 2 */
- if (recv (sock, buffer, addr_len + 2, 0) != (addr_len + 2))
- return 1;
- break;
- case 4 :
- /* ipv6
- * server socks return server bound address and port
- * address of 16 bytes and port of 2 bytes (= 18 bytes)
- */
- if (recv (sock, buffer, 18, 0) != 18)
- return 1;
- break;
- default:
- return 1;
- }
+ switch(buffer[3]) {
+ /* buffer[3] = address type */
+ case 1 :
+ /* ipv4
+ * server socks return server bound address and port
+ * address of 4 bytes and port of 2 bytes (= 6 bytes)
+ */
+ if (recv (sock, buffer, 6, 0) != 6)
+ return 1;
+ break;
+ case 3:
+ /* domainname
+ * server socks return server bound address and port
+ */
+ /* reading address length */
+ if (recv (sock, buffer, 1, 0) != 1)
+ return 1;
+ addr_len = buffer[0];
+ /* reading address + port = addr_len + 2 */
+ if (recv (sock, buffer, addr_len + 2, 0) != (addr_len + 2))
+ return 1;
+ break;
+ case 4 :
+ /* ipv6
+ * server socks return server bound address and port
+ * address of 16 bytes and port of 2 bytes (= 18 bytes)
+ */
+ if (recv (sock, buffer, 18, 0) != 18)
+ return 1;
+ break;
+ default:
+ return 1;
+ }
- return 0;
+ return 0;
}
/*
* pass_proxy: establish connection/authentification to a proxy
- * return :
- * - 0 if connexion throw proxy was successful
- * - 1 if connexion fails
+ * return :
+ * - 0 if connexion throw proxy was successful
+ * - 1 if connexion fails
*/
+
int
pass_proxy(int sock, char *address, int port, char *username)
{
- if (strcmp(cfg_proxy_type_values[cfg_proxy_type], "http") == 0)
- return pass_httpproxy(sock, address, port);
- if (strcmp(cfg_proxy_type_values[cfg_proxy_type], "socks4") == 0)
- return pass_socks4proxy(sock, address, port, username);
- if (strcmp(cfg_proxy_type_values[cfg_proxy_type], "socks5") == 0)
- return pass_socks5proxy(sock, address, port);
-
- return 1;
+ if (strcmp(cfg_proxy_type_values[cfg_proxy_type], "http") == 0)
+ return pass_httpproxy(sock, address, port);
+ if (strcmp(cfg_proxy_type_values[cfg_proxy_type], "socks4") == 0)
+ return pass_socks4proxy(sock, address, port, username);
+ if (strcmp(cfg_proxy_type_values[cfg_proxy_type], "socks5") == 0)
+ return pass_socks5proxy(sock, address, port);
+
+ return 1;
}
/*
@@ -1586,6 +1590,9 @@ server_search (char *servername)
{
t_irc_server *ptr_server;
+ if (!servername)
+ return NULL;
+
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
{
@@ -1624,6 +1631,9 @@ server_name_already_exists (char *name)
{
t_irc_server *ptr_server;
+ if (!name)
+ return 0;
+
for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server)
{
if (strcmp (ptr_server->name, name) == 0)
diff --git a/weechat/src/irc/irc.h b/weechat/src/irc/irc.h
index 96b39e71e..2fb0255f1 100644
--- a/weechat/src/irc/irc.h
+++ b/weechat/src/irc/irc.h
@@ -203,7 +203,7 @@ struct t_irc_command
/* function called when user enters cmd */
int (*cmd_function_1arg)(t_irc_server *, char *);
/* function called when user enters cmd */
- int (*recv_function)(t_irc_server *, char *, char *);
+ int (*recv_function)(t_irc_server *, char *, char *, char *);
/* function called when cmd is received */
};
@@ -218,7 +218,7 @@ struct t_irc_message
t_irc_message *next_message; /* link to next message */
};
-/* DCC */
+/* DCC types */
typedef struct t_irc_dcc t_irc_dcc;
@@ -251,6 +251,30 @@ struct t_irc_dcc
t_irc_dcc *next_dcc; /* link to next dcc file/chat */
};
+/* ignore types */
+
+/* pre-defined ignore types, all other types are made with IRC commands */
+/* for example: part join quit notice invite ... */
+
+#define IGNORE_ACTION "action"
+#define IGNORE_CTCP "ctcp"
+#define IGNORE_DCC "dcc"
+#define IGNORE_PRIVATE "pv"
+
+typedef struct t_irc_ignore t_irc_ignore;
+
+struct t_irc_ignore
+{
+ char *mask; /* nickname or mask */
+ char *type; /* type of ignore */
+ char *channel_name; /* name of channel, "*" == all */
+ char *server_name; /* name of server, "*" == all */
+ t_irc_ignore *prev_ignore; /* pointer to previous ignore */
+ t_irc_ignore *next_ignore; /* pointer to next ignore */
+};
+
+/* variables */
+
extern t_irc_command irc_commands[];
extern t_irc_server *irc_servers;
extern t_irc_message *recv_msgq, *msgq_last_msg;
@@ -258,6 +282,9 @@ extern int check_away;
extern t_irc_dcc *dcc_list;
extern char *dcc_status_string[6];
extern char *channel_modes;
+extern char *ignore_types[];
+extern t_irc_ignore *irc_ignore;
+extern t_irc_ignore *irc_last_ignore;
/* server functions (irc-server.c) */
@@ -414,57 +441,67 @@ extern int irc_cmd_send_who (t_irc_server *, char *);
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_kill (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_mode (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_nick (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_notice (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_part (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_ping (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_pong (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_privmsg (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_quit (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_server_msg (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_server_reply (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_topic (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_001 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_004 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_301 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_302 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_303 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_305 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_306 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_307 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_311 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_312 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_313 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_314 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_315 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_317 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_318 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_319 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_320 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_321 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_322 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_323 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_324 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_329 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_331 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_332 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_333 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_341 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_351 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_352 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_353 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_365 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_366 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_367 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_368 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_433 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_438 (t_irc_server *, char *, char *);
-extern int irc_cmd_recv_671 (t_irc_server *, char *, char *);
+extern int irc_cmd_recv_error (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_invite (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_join (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_kick (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_kill (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_mode (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_nick (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_notice (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_part (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_ping (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_pong (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_privmsg (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_quit (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_server_msg (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_server_reply (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_topic (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_001 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_004 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_301 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_302 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_303 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_305 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_306 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_307 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_311 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_312 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_313 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_314 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_315 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_317 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_318 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_319 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_320 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_321 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_322 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_323 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_324 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_329 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_331 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_332 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_333 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_341 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_351 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_352 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_353 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_365 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_366 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_367 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_368 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_433 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_438 (t_irc_server *, char *, char *, char *);
+extern int irc_cmd_recv_671 (t_irc_server *, char *, char *, char *);
+
+/* ignore functions (irc-ignore.c) */
+
+extern int ignore_check (char *, char *, char *, char *);
+extern t_irc_ignore *ignore_add (char *, char *, char *, char *);
+extern t_irc_ignore *ignore_add_from_config (char *);
+extern void ignore_free_all ();
+extern int ignore_search_free (char *, char *, char *, char *);
+extern int ignore_search_free_by_number (int);
+extern void ignore_print_log ();
#endif /* irc.h */