Added "irc_highlight" setting, fixed crash when doing /part on an active DCC chat buffer

20 files changed, 1514 insertions, 1322 deletions

diff --git a/ChangeLog b/ChangeLog
index 674441b1d..eaae10918 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ ChangeLog - 2005-07-19
 
 
 Version 0.1.4 (under dev!):
+   * added "irc_highlight" setting, to get highlight with any word
    * fixed auto-rejoin for channels with key
    * fixed /ctcp command (now any command/data allowed)
    * added /amsg command (send text to all channels of all connected servers)
diff --git a/po/es.po b/po/es.po
index 76f219ac7..da2400a35 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.4-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-07-19 14:19+0200\n"
-"PO-Revision-Date: 2005-07-19 14:20+0200\n"
+"POT-Creation-Date: 2005-07-19 19:09+0200\n"
+"PO-Revision-Date: 2005-07-19 19:12+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"
@@ -20,7 +20,7 @@ msgstr ""
 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:1682
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1687
 msgid "Unable to get user's name"
 msgstr "No ha sido posible obtener el nombre de usuario"
 
@@ -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:3840
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:3904
 msgid "unknown"
 msgstr "desconocido"
 
@@ -1391,12 +1391,12 @@ 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:322
+#: src/irc/irc-send.c:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:386
 #, 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:1702
+#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1766
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
@@ -1406,438 +1406,438 @@ 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:182
+#: src/irc/irc-recv.c:246
 msgid "You have been invited to "
 msgstr "Has sido invitado a "
 
-#: src/irc/irc-recv.c:185
+#: src/irc/irc-recv.c:249
 msgid "by"
 msgstr "por"
 
-#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:289 src/irc/irc-recv.c:788
-#: src/irc/irc-recv.c:1123 src/irc/irc-recv.c:1302 src/irc/irc-recv.c:3058
-#: src/irc/irc-recv.c:3125
+#: src/irc/irc-recv.c:259 src/irc/irc-recv.c:353 src/irc/irc-recv.c:852
+#: src/irc/irc-recv.c:1187 src/irc/irc-recv.c:1366 src/irc/irc-recv.c:3122
+#: src/irc/irc-recv.c:3189
 #, 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:221
+#: src/irc/irc-recv.c:285
 #, 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:241
+#: src/irc/irc-recv.c:305
 msgid " has joined "
 msgstr " se ha unido "
 
-#: src/irc/irc-recv.c:298
+#: src/irc/irc-recv.c:362
 msgid " has kicked "
 msgstr " se ha expulsado "
 
-#: src/irc/irc-recv.c:302
+#: src/irc/irc-recv.c:366
 msgid " from "
 msgstr " de "
 
-#: src/irc/irc-recv.c:388
+#: src/irc/irc-recv.c:452
 msgid " has killed "
 msgstr "ha matado"
 
-#: src/irc/irc-recv.c:394
+#: src/irc/irc-recv.c:458
 msgid " from server"
 msgstr "del servidor"
 
-#: src/irc/irc-recv.c:404
+#: src/irc/irc-recv.c:468
 msgid " from server\n"
 msgstr "del servidor\n"
 
-#: src/irc/irc-recv.c:411
+#: src/irc/irc-recv.c:475
 #, 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:451
+#: src/irc/irc-recv.c:515
 msgid "sets ban on"
 msgstr "establecer baneo en"
 
-#: src/irc/irc-recv.c:452
+#: src/irc/irc-recv.c:516
 msgid "removes ban on"
 msgstr "quitar baneo en"
 
-#: src/irc/irc-recv.c:476
+#: src/irc/irc-recv.c:540
 msgid "gives half channel operator status to"
 msgstr "dar estado de media operador de canal a"
 
-#: src/irc/irc-recv.c:477
+#: src/irc/irc-recv.c:541
 msgid "removes half channel operator status from"
 msgstr "eliminar el estado de media operador de canal a"
 
-#: src/irc/irc-recv.c:504
+#: src/irc/irc-recv.c:568
 msgid "sets invite-only channel flag"
 msgstr "define el canal sólo en modo invitado"
 
-#: src/irc/irc-recv.c:505
+#: src/irc/irc-recv.c:569
 msgid "removes invite-only channel flag"
 msgstr "elimina el modo sólo invitado para el canal"
 
-#: src/irc/irc-recv.c:522
+#: src/irc/irc-recv.c:586
 msgid "sets channel key to"
 msgstr "definir clave de canal en"
 
-#: src/irc/irc-recv.c:523
+#: src/irc/irc-recv.c:587
 msgid "removes channel key"
 msgstr "elimina la clave de canal"
 
-#: src/irc/irc-recv.c:554
+#: src/irc/irc-recv.c:618
 msgid "sets the user limit to"
 msgstr "define el límite de usuarios en"
 
-#: src/irc/irc-recv.c:555
+#: src/irc/irc-recv.c:619
 msgid "removes user limit"
 msgstr "elimina el límite de usuarios"
 
-#: src/irc/irc-recv.c:577
+#: src/irc/irc-recv.c:641
 msgid "sets moderated channel flag"
 msgstr "establece la moderación en el canal"
 
-#: src/irc/irc-recv.c:578
+#: src/irc/irc-recv.c:642
 msgid "removes moderated channel flag"
 msgstr "elimina la moderación en el canal"
 
-#: src/irc/irc-recv.c:588
+#: src/irc/irc-recv.c:652
 msgid "sets messages from channel only flag"
 msgstr "establece el modo sólo mensajes de usuarios del canal"
 
-#: src/irc/irc-recv.c:589
+#: src/irc/irc-recv.c:653
 msgid "removes messages from channel only flag"
 msgstr "autoriza a todos los usuarios a escribir en el canal"
 
-#: src/irc/irc-recv.c:606
+#: src/irc/irc-recv.c:670
 msgid "gives channel operator status to"
 msgstr "dar estado de operador de canal a"
 
-#: src/irc/irc-recv.c:607
+#: src/irc/irc-recv.c:671
 msgid "removes channel operator status from"
 msgstr "eliminar el estado de operador de canal a"
 
-#: src/irc/irc-recv.c:634
+#: src/irc/irc-recv.c:698
 msgid "sets private channel flag"
 msgstr "establece el canal como privado"
 
-#: src/irc/irc-recv.c:635
+#: src/irc/irc-recv.c:699
 msgid "removes private channel flag"
 msgstr "elimina el modo privado para el canal"
 
-#: src/irc/irc-recv.c:652
+#: src/irc/irc-recv.c:716
 msgid "sets quiet on"
 msgstr ""
 
-#: src/irc/irc-recv.c:653
+#: src/irc/irc-recv.c:717
 msgid "removes quiet on"
 msgstr ""
 
-#: src/irc/irc-recv.c:670
+#: src/irc/irc-recv.c:734
 msgid "sets secret channel flag"
 msgstr "establece el canal como secreto"
 
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:735
 msgid "removes secret channel flag"
 msgstr "elimina el modo secreto para el canal"
 
-#: src/irc/irc-recv.c:681
+#: src/irc/irc-recv.c:745
 msgid "sets topic protection"
 msgstr "activa la protección de tema"
 
-#: src/irc/irc-recv.c:682
+#: src/irc/irc-recv.c:746
 msgid "removes topic protection"
 msgstr "elimina la protección de tema"
 
-#: src/irc/irc-recv.c:699
+#: src/irc/irc-recv.c:763
 msgid "gives voice to"
 msgstr "da voz a"
 
-#: src/irc/irc-recv.c:700
+#: src/irc/irc-recv.c:764
 msgid "removes voice from"
 msgstr "quita la voz a"
 
-#: src/irc/irc-recv.c:743 src/irc/irc-recv.c:828 src/irc/irc-recv.c:1197
-#: src/irc/irc-recv.c:1798
+#: src/irc/irc-recv.c:807 src/irc/irc-recv.c:892 src/irc/irc-recv.c:1261
+#: src/irc/irc-recv.c:1862
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr "%s comando \"%s\" recibido sin host \n"
 
-#: src/irc/irc-recv.c:758
+#: src/irc/irc-recv.c:822
 #, 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:803
+#: src/irc/irc-recv.c:867
 msgid "mode changed by"
 msgstr "modo cambiado por"
 
-#: src/irc/irc-recv.c:867
+#: src/irc/irc-recv.c:931
 msgid "You are "
 msgstr "Usted es "
 
-#: src/irc/irc-recv.c:874
+#: src/irc/irc-recv.c:938
 msgid " is "
 msgstr "es "
 
-#: src/irc/irc-recv.c:878
+#: src/irc/irc-recv.c:942
 msgid "now known as "
 msgstr "ahora conocido como"
 
-#: src/irc/irc-recv.c:948
+#: src/irc/irc-recv.c:1012
 #, 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:961 src/irc/irc-recv.c:993
+#: src/irc/irc-recv.c:1025 src/irc/irc-recv.c:1057
 msgid "reply from"
 msgstr "respuesta de"
 
-#: src/irc/irc-recv.c:996
+#: src/irc/irc-recv.c:1060
 #, c-format
 msgid ": %ld.%ld seconds\n"
 msgstr ": %ld.%ld segundos\n"
 
-#: src/irc/irc-recv.c:1048
+#: src/irc/irc-recv.c:1112
 #, 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:1098
+#: src/irc/irc-recv.c:1162
 msgid " has left "
 msgstr " ha salido "
 
-#: src/irc/irc-recv.c:1246 src/irc/irc-recv.c:1728
+#: src/irc/irc-recv.c:1310 src/irc/irc-recv.c:1792
 #, c-format
 msgid "On %s: * %s %s"
 msgstr "En %s: * %s %s"
 
-#: src/irc/irc-recv.c:1265
+#: src/irc/irc-recv.c:1329
 #, c-format
 msgid "Received a CTCP SOUND \"%s\" from "
 msgstr "Recibido un sonido CTCP \\\"%s\\\" de "
 
-#: src/irc/irc-recv.c:1285
+#: src/irc/irc-recv.c:1349
 #, c-format
 msgid "On %s: %s> %s"
 msgstr "En %s: %s> %s"
 
-#: src/irc/irc-recv.c:1362 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1682
+#: src/irc/irc-recv.c:1426 src/irc/irc-recv.c:1462 src/irc/irc-recv.c:1746
 msgid "received from"
 msgstr "recibido de"
 
-#: src/irc/irc-recv.c:1413 src/irc/irc-recv.c:1430 src/irc/irc-recv.c:1446
-#: src/irc/irc-recv.c:1462 src/irc/irc-recv.c:1487 src/irc/irc-recv.c:1504
-#: src/irc/irc-recv.c:1520 src/irc/irc-recv.c:1544 src/irc/irc-recv.c:1561
-#: src/irc/irc-recv.c:1577 src/irc/irc-recv.c:1601 src/irc/irc-recv.c:1618
-#: src/irc/irc-recv.c:1633 src/irc/irc-recv.c:1774 src/irc/irc-recv.c:3424
-#: src/irc/irc-recv.c:3482 src/irc/irc-recv.c:3634 src/irc/irc-recv.c:3649
-#: src/irc/irc-recv.c:3664 src/irc/irc-recv.c:3679 src/irc/irc-recv.c:3692
-#: src/irc/irc-recv.c:3742 src/irc/irc-recv.c:3756
+#: src/irc/irc-recv.c:1477 src/irc/irc-recv.c:1494 src/irc/irc-recv.c:1510
+#: src/irc/irc-recv.c:1526 src/irc/irc-recv.c:1551 src/irc/irc-recv.c:1568
+#: src/irc/irc-recv.c:1584 src/irc/irc-recv.c:1608 src/irc/irc-recv.c:1625
+#: src/irc/irc-recv.c:1641 src/irc/irc-recv.c:1665 src/irc/irc-recv.c:1682
+#: src/irc/irc-recv.c:1697 src/irc/irc-recv.c:1838 src/irc/irc-recv.c:3488
+#: src/irc/irc-recv.c:3546 src/irc/irc-recv.c:3698 src/irc/irc-recv.c:3713
+#: src/irc/irc-recv.c:3728 src/irc/irc-recv.c:3743 src/irc/irc-recv.c:3756
+#: src/irc/irc-recv.c:3806 src/irc/irc-recv.c:3820
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr "%s no es posible analizar el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:1646
+#: src/irc/irc-recv.c:1710
 #, c-format
 msgid "%s unknown DCC CHAT type received from "
 msgstr "%s tipo DCC CHAT desconocido recibido de "
 
-#: src/irc/irc-recv.c:1678
+#: src/irc/irc-recv.c:1742
 msgid "Unknown CTCP "
 msgstr ""
 
-#: src/irc/irc-recv.c:1754 src/irc/irc-dcc.c:1011
+#: src/irc/irc-recv.c:1818 src/irc/irc-dcc.c:1011
 #, c-format
 msgid "Private %s> %s"
 msgstr "Privado %s> %s"
 
-#: src/irc/irc-recv.c:1830
+#: src/irc/irc-recv.c:1894
 msgid "has quit"
 msgstr "ha salido"
 
-#: src/irc/irc-recv.c:1951
+#: src/irc/irc-recv.c:2015
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr "%s comando \"%s\" recibido sin canal\n"
 
-#: src/irc/irc-recv.c:1979
+#: src/irc/irc-recv.c:2043
 msgid " has changed topic for "
 msgstr "ha cambiado el tema por "
 
-#: src/irc/irc-recv.c:1984
+#: src/irc/irc-recv.c:2048
 #, c-format
 msgid " to: \"%s\"\n"
 msgstr " a: \"%s\"\n"
 
-#: src/irc/irc-recv.c:1990
+#: src/irc/irc-recv.c:2054
 msgid " has unset topic for "
 msgstr " ha quitado el tema por "
 
-#: src/irc/irc-recv.c:2108
+#: src/irc/irc-recv.c:2172
 #, c-format
 msgid " is away: %s\n"
 msgstr " está ausente: %s\n"
 
-#: src/irc/irc-recv.c:2182
+#: src/irc/irc-recv.c:2246
 msgid "Users online: "
 msgstr "Usuarios conectados: "
 
-#: src/irc/irc-recv.c:2629
+#: src/irc/irc-recv.c:2693
 msgid "idle: "
 msgstr "sin actividad: "
 
-#: src/irc/irc-recv.c:2637
+#: src/irc/irc-recv.c:2701
 msgid "days"
 msgstr "días"
 
-#: src/irc/irc-recv.c:2637
+#: src/irc/irc-recv.c:2701
 msgid "day"
 msgstr "día"
 
-#: src/irc/irc-recv.c:2647
+#: src/irc/irc-recv.c:2711
 msgid "hours"
 msgstr "horas"
 
-#: src/irc/irc-recv.c:2647
+#: src/irc/irc-recv.c:2711
 msgid "hour"
 msgstr "hora"
 
-#: src/irc/irc-recv.c:2653
+#: src/irc/irc-recv.c:2717
 msgid "minutes"
 msgstr "minutos"
 
-#: src/irc/irc-recv.c:2653
+#: src/irc/irc-recv.c:2717
 msgid "minute"
 msgstr "minuto"
 
-#: src/irc/irc-recv.c:2659
+#: src/irc/irc-recv.c:2723
 msgid "seconds"
 msgstr "segundos"
 
-#: src/irc/irc-recv.c:2659
+#: src/irc/irc-recv.c:2723
 msgid "second"
 msgstr "segundo"
 
-#: src/irc/irc-recv.c:2664
+#: src/irc/irc-recv.c:2728
 msgid "signon at: "
 msgstr "firmado el: "
 
-#: src/irc/irc-recv.c:2752
+#: src/irc/irc-recv.c:2816
 msgid "Channels: "
 msgstr "Canales: "
 
-#: src/irc/irc-recv.c:3004
+#: src/irc/irc-recv.c:3068
 msgid "No topic set for "
 msgstr "No hay tema definido para "
 
-#: src/irc/irc-recv.c:3046
+#: src/irc/irc-recv.c:3110
 msgid "Topic for "
 msgstr "El tema para "
 
-#: src/irc/irc-recv.c:3050
+#: src/irc/irc-recv.c:3114
 #, c-format
 msgid " is: \"%s\"\n"
 msgstr " es: \"%s\"\n"
 
-#: src/irc/irc-recv.c:3068 src/irc/irc-recv.c:3152 src/irc/irc-recv.c:3205
+#: src/irc/irc-recv.c:3132 src/irc/irc-recv.c:3216 src/irc/irc-recv.c:3269
 #, 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:3114
+#: src/irc/irc-recv.c:3178
 msgid "Topic set by "
 msgstr "Tema definido por "
 
-#: src/irc/irc-recv.c:3134
+#: src/irc/irc-recv.c:3198
 #, 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:3143 src/irc/irc-recv.c:3214
+#: src/irc/irc-recv.c:3207 src/irc/irc-recv.c:3278
 #, 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:3193
+#: src/irc/irc-recv.c:3257
 msgid "has invited"
 msgstr "ha invitado"
 
-#: src/irc/irc-recv.c:3196 src/irc/irc-recv.c:3347
+#: src/irc/irc-recv.c:3260 src/irc/irc-recv.c:3411
 msgid "on"
 msgstr "en"
 
-#: src/irc/irc-recv.c:3470
+#: src/irc/irc-recv.c:3534
 #, 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:3526
+#: src/irc/irc-recv.c:3590
 msgid "Nicks "
 msgstr "Usuarios "
 
-#: src/irc/irc-recv.c:3546
+#: src/irc/irc-recv.c:3610
 msgid "Channel "
 msgstr "Canal "
 
-#: src/irc/irc-recv.c:3557
+#: src/irc/irc-recv.c:3621
 msgid "nicks"
 msgstr "usuarios"
 
-#: src/irc/irc-recv.c:3557
+#: src/irc/irc-recv.c:3621
 msgid "nick"
 msgstr "usuario"
 
-#: src/irc/irc-recv.c:3565
+#: src/irc/irc-recv.c:3629
 msgid "ops"
 msgstr "operadores"
 
-#: src/irc/irc-recv.c:3565
+#: src/irc/irc-recv.c:3629
 msgid "op"
 msgstr "operador"
 
-#: src/irc/irc-recv.c:3574
+#: src/irc/irc-recv.c:3638
 msgid "halfops"
 msgstr "semi-operadores"
 
-#: src/irc/irc-recv.c:3574
+#: src/irc/irc-recv.c:3638
 msgid "halfop"
 msgstr "semi-operador"
 
-#: src/irc/irc-recv.c:3583
+#: src/irc/irc-recv.c:3647
 msgid "voices"
 msgstr "voces"
 
-#: src/irc/irc-recv.c:3583
+#: src/irc/irc-recv.c:3647
 msgid "voice"
 msgstr "voz"
 
-#: src/irc/irc-recv.c:3592
+#: src/irc/irc-recv.c:3656
 msgid "normal"
 msgstr "normal"
 
-#: src/irc/irc-recv.c:3705
+#: src/irc/irc-recv.c:3769
 msgid "banned by"
 msgstr "baneado por"
 
-#: src/irc/irc-recv.c:3794
+#: src/irc/irc-recv.c:3858
 #, 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:3806
+#: src/irc/irc-recv.c:3870
 #, 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:3818
+#: src/irc/irc-recv.c:3882
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
@@ -1846,7 +1846,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:3828
+#: src/irc/irc-recv.c:3892
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
 msgstr ""
@@ -3733,295 +3733,303 @@ msgstr ""
 msgid "hide password displayed by nickserv"
 msgstr "ocultar contraseña mostrada por nickserv"
 
-#: src/common/weeconfig.c:522
+#: src/common/weeconfig.c:523
 msgid "display message to all channels when away"
 msgstr "mostrar mensaje en todos los canales cuando se está ausente"
 
-#: src/common/weeconfig.c:523
+#: src/common/weeconfig.c:524
 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:526 src/common/weeconfig.c:527
+#: src/common/weeconfig.c:527 src/common/weeconfig.c:528
 msgid "default message when away"
 msgstr "mensaje por defecto para el estado ausente"
 
-#: src/common/weeconfig.c:530 src/common/weeconfig.c:531
+#: src/common/weeconfig.c:531 src/common/weeconfig.c:532
 msgid "default part message (leaving channel)"
 msgstr "mensaje por defecto de salida (saliendo de un canal)"
 
-#: src/common/weeconfig.c:534
+#: src/common/weeconfig.c:535
 msgid "default quit message"
 msgstr "mensaje de fin por defecto"
 
-#: src/common/weeconfig.c:535
+#: src/common/weeconfig.c:536
 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:538
+#: src/common/weeconfig.c:539
 msgid "interval between two checks for away"
 msgstr "intervalo entre dos comprobaciones de ausencia"
 
-#: src/common/weeconfig.c:539
+#: src/common/weeconfig.c:540
 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:542
+#: src/common/weeconfig.c:543
 msgid "interval between two checks for lag"
 msgstr "intervalo entre dos medidas de lag (retraso)"
 
-#: src/common/weeconfig.c:543
+#: src/common/weeconfig.c:544
 msgid "interval between two checks for lag (in seconds)"
 msgstr "intervalo entre dos medidas de lag (en segundos)"
 
-#: src/common/weeconfig.c:546
+#: src/common/weeconfig.c:547
 msgid "minimum lag to show"
 msgstr "lag (retraso) mínimo a mostrar"
 
-#: src/common/weeconfig.c:547
+#: src/common/weeconfig.c:548
 msgid "minimum lag to show (in seconds)"
 msgstr "lag mínimo a mostrar (en segundos)"
 
-#: src/common/weeconfig.c:550
+#: src/common/weeconfig.c:551
 msgid "disconnect after important lag"
 msgstr "desconexión tras un lag importante"
 
-#: src/common/weeconfig.c:551
+#: src/common/weeconfig.c:552
 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:554 src/common/weeconfig.c:555
+#: src/common/weeconfig.c:555 src/common/weeconfig.c:556
 msgid "create a FIFO pipe for remote control"
 msgstr "crea una tubería FIFO para control remoto"
 
-#: src/common/weeconfig.c:574
+#: src/common/weeconfig.c:559
+msgid "list of words to highlight"
+msgstr ""
+
+#: src/common/weeconfig.c:560
+msgid "comma separated list of words to highlight (case sensitive comparison)"
+msgstr ""
+
+#: src/common/weeconfig.c:579
 msgid "automatically accept dcc files"
 msgstr "aceptar automáticamente los ficheros dcc"
 
-#: src/common/weeconfig.c:575
+#: src/common/weeconfig.c:580
 msgid "automatically accept incoming dcc files"
 msgstr "aceptar automáticamente los ficheros dcc entrantes"
 
-#: src/common/weeconfig.c:578
+#: src/common/weeconfig.c:583
 msgid "automatically accept dcc chats"
 msgstr "aceptar automáticamente las peticiones de conversación dcc"
 
-#: src/common/weeconfig.c:579
+#: src/common/weeconfig.c:584
 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:582
+#: src/common/weeconfig.c:587
 msgid "timeout for dcc request"
 msgstr "tiempo de espera (timeout) para la petición dcc"
 
-#: src/common/weeconfig.c:583
+#: src/common/weeconfig.c:588
 msgid "timeout for dcc request (in seconds)"
 msgstr "tiempo de espera para la petición dcc (en segundos)"
 
-#: src/common/weeconfig.c:586
+#: src/common/weeconfig.c:591
 msgid "block size for dcc packets"
 msgstr "tamaño de bloque para los paquetes dcc"
 
-#: src/common/weeconfig.c:587
+#: src/common/weeconfig.c:592
 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:590
+#: src/common/weeconfig.c:595
 msgid "path for incoming files with dcc"
 msgstr "ruta para los ficheros recibidos con dcc"
 
-#: src/common/weeconfig.c:591
+#: src/common/weeconfig.c:596
 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:594
+#: src/common/weeconfig.c:599
 msgid "default path for sending files with dcc"
 msgstr "ruta por defecto para enviar ficheros con dcc"
 
-#: src/common/weeconfig.c:595
+#: src/common/weeconfig.c:600
 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:598 src/common/weeconfig.c:599
+#: src/common/weeconfig.c:603 src/common/weeconfig.c:604
 msgid "convert spaces to underscores when sending files"
 msgstr "convertir los espacios a subrayados cuando se envían los ficheros"
 
-#: src/common/weeconfig.c:602
+#: src/common/weeconfig.c:607
 msgid "automatically rename dcc files if already exists"
 msgstr "renombrar automáticamente los ficheros dcc si ya existen"
 
-#: src/common/weeconfig.c:603
+#: src/common/weeconfig.c:608
 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:606
+#: src/common/weeconfig.c:611
 msgid "automatically resume aborted transfers"
 msgstr "continuar automáticamente las transferencias canceladas"
 
-#: src/common/weeconfig.c:607
+#: src/common/weeconfig.c:612
 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:626
+#: src/common/weeconfig.c:631
 msgid "use proxy"
 msgstr "utilizar un proxy"
 
-#: src/common/weeconfig.c:627
+#: src/common/weeconfig.c:632
 msgid "use a proxy server to connect to irc server"
 msgstr "utilizar un proxy para conectarse al servidor irc"
 
-#: src/common/weeconfig.c:630
+#: src/common/weeconfig.c:635
 msgid "proxy type"
 msgstr "tipo de proxy"
 
-#: src/common/weeconfig.c:631
+#: src/common/weeconfig.c:636
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "tipo de proxy(http (por defecto), socks4, socks5)"
 
-#: src/common/weeconfig.c:634
+#: src/common/weeconfig.c:639
 msgid "use ipv6 proxy"
 msgstr "usar proxy ipv6"
 
-#: src/common/weeconfig.c:635
+#: src/common/weeconfig.c:640
 msgid "connect to proxy in ipv6"
 msgstr "conectar al proxy en ipv6"
 
-#: src/common/weeconfig.c:638
+#: src/common/weeconfig.c:643
 msgid "proxy address"
 msgstr "dirección del proxy"
 
-#: src/common/weeconfig.c:639
+#: src/common/weeconfig.c:644
 msgid "proxy server address (IP or hostname)"
 msgstr "dirección del servidor proxy (IP o nombre de máquina)"
 
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:647
 msgid "port for proxy"
 msgstr "puerto para el proxy"
 
-#: src/common/weeconfig.c:643
+#: src/common/weeconfig.c:648
 msgid "port for connecting to proxy server"
 msgstr "puerto para conectarse al servidor proxy"
 
-#: src/common/weeconfig.c:646
+#: src/common/weeconfig.c:651
 msgid "proxy username"
 msgstr "nombre de usuario del proxy"
 
-#: src/common/weeconfig.c:647
+#: src/common/weeconfig.c:652
 msgid "username for proxy server"
 msgstr "nombre de usuario para el servidor proxy"
 
-#: src/common/weeconfig.c:650
+#: src/common/weeconfig.c:655
 msgid "proxy password"
 msgstr "contraseña para el proxy"
 
-#: src/common/weeconfig.c:651
+#: src/common/weeconfig.c:656
 msgid "password for proxy server"
 msgstr "contraseña para el servidor proxy"
 
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:667
 msgid "server name"
 msgstr "nombre de servidor"
 
-#: src/common/weeconfig.c:663
+#: src/common/weeconfig.c:668
 msgid "name associated to IRC server (for display only)"
 msgstr "nombre asociado al servidor IRC (para mostrar solamente)"
 
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:671
 msgid "automatically connect to server"
 msgstr "conexión automática al servidor"
 
-#: src/common/weeconfig.c:667
+#: src/common/weeconfig.c:672
 msgid "automatically connect to server when WeeChat is starting"
 msgstr "conexión automática al servidor cuando WeeChat esté arrancando"
 
-#: src/common/weeconfig.c:670
+#: src/common/weeconfig.c:675
 msgid "automatically reconnect to server"
 msgstr "reconexión automática al servidor"
 
-#: src/common/weeconfig.c:671
+#: src/common/weeconfig.c:676
 msgid "automatically reconnect to server when disconnected"
 msgstr "reconexión automática al servidor tras una desconexión"
 
-#: src/common/weeconfig.c:674
+#: src/common/weeconfig.c:679
 msgid "delay before trying again to reconnect"
 msgstr "esperar antes de intentar de nuevo una reconexión"
 
-#: src/common/weeconfig.c:675
+#: src/common/weeconfig.c:680
 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:678
+#: src/common/weeconfig.c:683
 msgid "server address or hostname"
 msgstr "dirección o nombre de máquina del servidor"
 
-#: src/common/weeconfig.c:679
+#: src/common/weeconfig.c:684
 msgid "IP address or hostname of IRC server"
 msgstr "dirección IP o nombre de máquina del servidor IRC"
 
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:687
 msgid "port for IRC server"
 msgstr "puerto para el servidor IRC"
 
-#: src/common/weeconfig.c:683
+#: src/common/weeconfig.c:688
 msgid "port for connecting to server"
 msgstr "puerto para conectarse al servidor"
 
-#: src/common/weeconfig.c:686 src/common/weeconfig.c:687
+#: src/common/weeconfig.c:691 src/common/weeconfig.c:692
 msgid "use IPv6 protocol for server communication"
 msgstr "usar el protocolo IPv6 para la comunicación del servidor"
 
-#: src/common/weeconfig.c:690 src/common/weeconfig.c:691
+#: src/common/weeconfig.c:695 src/common/weeconfig.c:696
 msgid "use SSL for server communication"
 msgstr "usar SSL para la comunicación del servidor"
 
-#: src/common/weeconfig.c:694
+#: src/common/weeconfig.c:699
 msgid "server password"
 msgstr "contraseña para el servidor"
 
-#: src/common/weeconfig.c:695
+#: src/common/weeconfig.c:700
 msgid "password for IRC server"
 msgstr "contraseña para el servidor IRC"
 
-#: src/common/weeconfig.c:698
+#: src/common/weeconfig.c:703
 msgid "nickname for server"
 msgstr "nombre de usuario para el servidor"
 
-#: src/common/weeconfig.c:699
+#: src/common/weeconfig.c:704
 msgid "nickname to use on IRC server"
 msgstr "nombre de usuario a utilizar en el servidor IRC"
 
-#: src/common/weeconfig.c:702
+#: src/common/weeconfig.c:707
 msgid "alternate nickname for server"
 msgstr "nombre de usuario alternativo para el servidor"
 
-#: src/common/weeconfig.c:703
+#: src/common/weeconfig.c:708
 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:706
+#: src/common/weeconfig.c:711
 msgid "2nd alternate nickname for server"
 msgstr "segundo nombre de usuario alternativo para el servidor"
 
-#: src/common/weeconfig.c:707
+#: src/common/weeconfig.c:712
 msgid ""
 "2nd alternate nickname to use on IRC server (if alternate nickname is "
 "already used)"
@@ -4029,31 +4037,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:710
+#: src/common/weeconfig.c:715
 msgid "user name for server"
 msgstr "nombre de usuario para el servidor"
 
-#: src/common/weeconfig.c:711
+#: src/common/weeconfig.c:716
 msgid "user name to use on IRC server"
 msgstr "nombre de usuario para el servidor IRC"
 
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:719
 msgid "real name for server"
 msgstr "nombre real para el servidor"
 
-#: src/common/weeconfig.c:715
+#: src/common/weeconfig.c:720
 msgid "real name to use on IRC server"
 msgstr "nombre real para el servidor IRC"
 
-#: src/common/weeconfig.c:718 src/common/weeconfig.c:719
+#: src/common/weeconfig.c:723 src/common/weeconfig.c:724
 msgid "first command to run when connected to server"
 msgstr "primer comando a ejecutar cuando se conecte a un servidor"
 
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:727
 msgid "delay (in seconds) after command was executed"
 msgstr "espera (en segundos) después de que el comando sea ejecutado"
 
-#: src/common/weeconfig.c:723
+#: src/common/weeconfig.c:728
 msgid ""
 "delay (in seconds) after command was executed (example: give some time for "
 "authentication)"
@@ -4061,25 +4069,25 @@ 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:726
+#: src/common/weeconfig.c:731
 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:727
+#: src/common/weeconfig.c:732
 msgid "comma separated list of channels to join when connected to server"
 msgstr ""
 "lista de canales (separados por comas) a unirse cuando se conecte a un "
 "servidor"
 
-#: src/common/weeconfig.c:730 src/common/weeconfig.c:731
+#: src/common/weeconfig.c:735 src/common/weeconfig.c:736
 msgid "automatically rejoin channels when kicked"
 msgstr "unirse de nuevo automáticamente a los canales cuando sea expulsado"
 
-#: src/common/weeconfig.c:734
+#: src/common/weeconfig.c:739
 msgid "notify levels for channels of this server"
 msgstr "niveles de notificación para canales de este servidor"
 
-#: src/common/weeconfig.c:735
+#: src/common/weeconfig.c:740
 msgid ""
 "comma separated list of notify levels for channels of this server (format: "
 "#channel:1,..)"
@@ -4087,62 +4095,62 @@ msgstr ""
 "lista separada por comas de niveles de notificación para canales de este "
 "servidor (formato: #canal:1,...)"
 
-#: src/common/weeconfig.c:1195
+#: src/common/weeconfig.c:1200
 #, 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:1204
+#: src/common/weeconfig.c:1209
 #, 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:1219
+#: src/common/weeconfig.c:1224
 #, 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:1259
+#: src/common/weeconfig.c:1264
 #, 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:1270
+#: src/common/weeconfig.c:1275
 #, 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:1309
+#: src/common/weeconfig.c:1314
 #, c-format
 msgid "%s config file \"%s\" not found.\n"
 msgstr "%s fichero de configuración \"%s\" no encontrado.\n"
 
-#: src/common/weeconfig.c:1341
+#: src/common/weeconfig.c:1346
 #, 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:1358
+#: src/common/weeconfig.c:1363
 #, 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:1376
+#: src/common/weeconfig.c:1381
 #, 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:1384
+#: src/common/weeconfig.c:1389
 #, 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:1432
+#: src/common/weeconfig.c:1437
 #, 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:1443
+#: src/common/weeconfig.c:1448
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value foroption '%s'\n"
@@ -4151,7 +4159,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:1452
+#: src/common/weeconfig.c:1457
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4160,7 +4168,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:1463
+#: src/common/weeconfig.c:1468
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4169,26 +4177,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:1479
+#: src/common/weeconfig.c:1484
 #, 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:1541 src/common/weeconfig.c:1736
+#: src/common/weeconfig.c:1546 src/common/weeconfig.c:1741
 #, c-format
 msgid "%s cannot create file \"%s\"\n"
 msgstr "%s no es posible crear el fichero \"%s\"\n"
 
-#: src/common/weeconfig.c:1547
+#: src/common/weeconfig.c:1552
 #, c-format
 msgid "%s: creating default config file...\n"
 msgstr "%s: creando fichero de configuración por defecto...\n"
 
-#: src/common/weeconfig.c:1548
+#: src/common/weeconfig.c:1553
 msgid "Creating default config file\n"
 msgstr "Creando fichero de configuración por defecto\n"
 
-#: src/common/weeconfig.c:1551 src/common/weeconfig.c:1745
+#: src/common/weeconfig.c:1556 src/common/weeconfig.c:1750
 #, c-format
 msgid ""
 "#\n"
@@ -4197,6 +4205,6 @@ msgstr ""
 "#\n"
 "# %s: fichero de configuración, creado por %s v%s el %s#\n"
 
-#: src/common/weeconfig.c:1742
+#: src/common/weeconfig.c:1747
 msgid "Saving config to disk\n"
 msgstr "Guardar configuración a disco\n"
diff --git a/po/fr.po b/po/fr.po
index eb871e69c..1fb078433 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.4-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-07-19 14:19+0200\n"
-"PO-Revision-Date: 2005-07-19 14:19+0200\n"
+"POT-Creation-Date: 2005-07-19 19:09+0200\n"
+"PO-Revision-Date: 2005-07-19 19:12+0200\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 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:1682
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1687
 msgid "Unable to get user's name"
 msgstr "Impossible de déterminer le nom d'utilisateur"
 
@@ -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:3840
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:3904
 msgid "unknown"
 msgstr "inconnu"
 
@@ -1393,12 +1393,12 @@ 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:322
+#: src/irc/irc-send.c:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:386
 #, 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:1702
+#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1766
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
@@ -1408,438 +1408,438 @@ 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:182
+#: src/irc/irc-recv.c:246
 msgid "You have been invited to "
 msgstr "Vous avez été invité sur "
 
-#: src/irc/irc-recv.c:185
+#: src/irc/irc-recv.c:249
 msgid "by"
 msgstr "par"
 
-#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:289 src/irc/irc-recv.c:788
-#: src/irc/irc-recv.c:1123 src/irc/irc-recv.c:1302 src/irc/irc-recv.c:3058
-#: src/irc/irc-recv.c:3125
+#: src/irc/irc-recv.c:259 src/irc/irc-recv.c:353 src/irc/irc-recv.c:852
+#: src/irc/irc-recv.c:1187 src/irc/irc-recv.c:1366 src/irc/irc-recv.c:3122
+#: src/irc/irc-recv.c:3189
 #, 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:221
+#: src/irc/irc-recv.c:285
 #, 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:241
+#: src/irc/irc-recv.c:305
 msgid " has joined "
 msgstr " a rejoint "
 
-#: src/irc/irc-recv.c:298
+#: src/irc/irc-recv.c:362
 msgid " has kicked "
 msgstr " a poussé dehors "
 
-#: src/irc/irc-recv.c:302
+#: src/irc/irc-recv.c:366
 msgid " from "
 msgstr " de "
 
-#: src/irc/irc-recv.c:388
+#: src/irc/irc-recv.c:452
 msgid " has killed "
 msgstr " a tué "
 
-#: src/irc/irc-recv.c:394
+#: src/irc/irc-recv.c:458
 msgid " from server"
 msgstr " du serveur"
 
-#: src/irc/irc-recv.c:404
+#: src/irc/irc-recv.c:468
 msgid " from server\n"
 msgstr " du serveur\n"
 
-#: src/irc/irc-recv.c:411
+#: src/irc/irc-recv.c:475
 #, 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:451
+#: src/irc/irc-recv.c:515
 msgid "sets ban on"
 msgstr "instaure un bannissement sur"
 
-#: src/irc/irc-recv.c:452
+#: src/irc/irc-recv.c:516
 msgid "removes ban on"
 msgstr "supprime le banissement sur"
 
-#: src/irc/irc-recv.c:476
+#: src/irc/irc-recv.c:540
 msgid "gives half channel operator status to"
 msgstr "donne le droit demi-opérateur à"
 
-#: src/irc/irc-recv.c:477
+#: src/irc/irc-recv.c:541
 msgid "removes half channel operator status from"
 msgstr "supprime le droit demi-opérateur à"
 
-#: src/irc/irc-recv.c:504
+#: src/irc/irc-recv.c:568
 msgid "sets invite-only channel flag"
 msgstr "définit le canal en mode invité seulement"
 
-#: src/irc/irc-recv.c:505
+#: src/irc/irc-recv.c:569
 msgid "removes invite-only channel flag"
 msgstr "supprime le mode invité seulement pour le canal"
 
-#: src/irc/irc-recv.c:522
+#: src/irc/irc-recv.c:586
 msgid "sets channel key to"
 msgstr "définit la clé du canal à"
 
-#: src/irc/irc-recv.c:523
+#: src/irc/irc-recv.c:587
 msgid "removes channel key"
 msgstr "supprime la clé du canal"
 
-#: src/irc/irc-recv.c:554
+#: src/irc/irc-recv.c:618
 msgid "sets the user limit to"
 msgstr "définit la limite d'utilisateurs à"
 
-#: src/irc/irc-recv.c:555
+#: src/irc/irc-recv.c:619
 msgid "removes user limit"
 msgstr "supprime la limite d'utilisateurs"
 
-#: src/irc/irc-recv.c:577
+#: src/irc/irc-recv.c:641
 msgid "sets moderated channel flag"
 msgstr "instaure la modération sur le canal"
 
-#: src/irc/irc-recv.c:578
+#: src/irc/irc-recv.c:642
 msgid "removes moderated channel flag"
 msgstr "supprime la modération sur le canal"
 
-#: src/irc/irc-recv.c:588
+#: src/irc/irc-recv.c:652
 msgid "sets messages from channel only flag"
 msgstr "interdit aux utilisateurs en dehors du canal d'y écrire"
 
-#: src/irc/irc-recv.c:589
+#: src/irc/irc-recv.c:653
 msgid "removes messages from channel only flag"
 msgstr "autorise tout utilisateur à écrire sur le canal"
 
-#: src/irc/irc-recv.c:606
+#: src/irc/irc-recv.c:670
 msgid "gives channel operator status to"
 msgstr "donne le droit opérateur à"
 
-#: src/irc/irc-recv.c:607
+#: src/irc/irc-recv.c:671
 msgid "removes channel operator status from"
 msgstr "supprime le droit opérateur à"
 
-#: src/irc/irc-recv.c:634
+#: src/irc/irc-recv.c:698
 msgid "sets private channel flag"
 msgstr "définit le canal comme privé"
 
-#: src/irc/irc-recv.c:635
+#: src/irc/irc-recv.c:699
 msgid "removes private channel flag"
 msgstr "supprime le mode privé pour le canal"
 
-#: src/irc/irc-recv.c:652
+#: src/irc/irc-recv.c:716
 msgid "sets quiet on"
 msgstr "définit le mode muet sur"
 
-#: src/irc/irc-recv.c:653
+#: src/irc/irc-recv.c:717
 msgid "removes quiet on"
 msgstr "supprime le mode muet sur"
 
-#: src/irc/irc-recv.c:670
+#: src/irc/irc-recv.c:734
 msgid "sets secret channel flag"
 msgstr "définit le canal comme secret"
 
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:735
 msgid "removes secret channel flag"
 msgstr "supprime le mode secret pour le canal"
 
-#: src/irc/irc-recv.c:681
+#: src/irc/irc-recv.c:745
 msgid "sets topic protection"
 msgstr "active la protection du titre"
 
-#: src/irc/irc-recv.c:682
+#: src/irc/irc-recv.c:746
 msgid "removes topic protection"
 msgstr "supprime la protection du titre"
 
-#: src/irc/irc-recv.c:699
+#: src/irc/irc-recv.c:763
 msgid "gives voice to"
 msgstr "donne la voix à"
 
-#: src/irc/irc-recv.c:700
+#: src/irc/irc-recv.c:764
 msgid "removes voice from"
 msgstr "supprime la voix de"
 
-#: src/irc/irc-recv.c:743 src/irc/irc-recv.c:828 src/irc/irc-recv.c:1197
-#: src/irc/irc-recv.c:1798
+#: src/irc/irc-recv.c:807 src/irc/irc-recv.c:892 src/irc/irc-recv.c:1261
+#: src/irc/irc-recv.c:1862
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr "%s commande \"%s\" reçue sans host\n"
 
-#: src/irc/irc-recv.c:758
+#: src/irc/irc-recv.c:822
 #, 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:803
+#: src/irc/irc-recv.c:867
 msgid "mode changed by"
 msgstr "mode changé par"
 
-#: src/irc/irc-recv.c:867
+#: src/irc/irc-recv.c:931
 msgid "You are "
 msgstr "Vous êtes "
 
-#: src/irc/irc-recv.c:874
+#: src/irc/irc-recv.c:938
 msgid " is "
 msgstr " est "
 
-#: src/irc/irc-recv.c:878
+#: src/irc/irc-recv.c:942
 msgid "now known as "
 msgstr "maintenant connu sous le nom "
 
-#: src/irc/irc-recv.c:948
+#: src/irc/irc-recv.c:1012
 #, 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:961 src/irc/irc-recv.c:993
+#: src/irc/irc-recv.c:1025 src/irc/irc-recv.c:1057
 msgid "reply from"
 msgstr "réponse de"
 
-#: src/irc/irc-recv.c:996
+#: src/irc/irc-recv.c:1060
 #, c-format
 msgid ": %ld.%ld seconds\n"
 msgstr ": %ld.%ld secondes\n"
 
-#: src/irc/irc-recv.c:1048
+#: src/irc/irc-recv.c:1112
 #, 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:1098
+#: src/irc/irc-recv.c:1162
 msgid " has left "
 msgstr " a quitté "
 
-#: src/irc/irc-recv.c:1246 src/irc/irc-recv.c:1728
+#: src/irc/irc-recv.c:1310 src/irc/irc-recv.c:1792
 #, c-format
 msgid "On %s: * %s %s"
 msgstr "Sur %s: * %s %s"
 
-#: src/irc/irc-recv.c:1265
+#: src/irc/irc-recv.c:1329
 #, c-format
 msgid "Received a CTCP SOUND \"%s\" from "
 msgstr "CTCP SOUND \"%s\" reçu de "
 
-#: src/irc/irc-recv.c:1285
+#: src/irc/irc-recv.c:1349
 #, c-format
 msgid "On %s: %s> %s"
 msgstr "Sur %s: %s> %s"
 
-#: src/irc/irc-recv.c:1362 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1682
+#: src/irc/irc-recv.c:1426 src/irc/irc-recv.c:1462 src/irc/irc-recv.c:1746
 msgid "received from"
 msgstr "reçu de"
 
-#: src/irc/irc-recv.c:1413 src/irc/irc-recv.c:1430 src/irc/irc-recv.c:1446
-#: src/irc/irc-recv.c:1462 src/irc/irc-recv.c:1487 src/irc/irc-recv.c:1504
-#: src/irc/irc-recv.c:1520 src/irc/irc-recv.c:1544 src/irc/irc-recv.c:1561
-#: src/irc/irc-recv.c:1577 src/irc/irc-recv.c:1601 src/irc/irc-recv.c:1618
-#: src/irc/irc-recv.c:1633 src/irc/irc-recv.c:1774 src/irc/irc-recv.c:3424
-#: src/irc/irc-recv.c:3482 src/irc/irc-recv.c:3634 src/irc/irc-recv.c:3649
-#: src/irc/irc-recv.c:3664 src/irc/irc-recv.c:3679 src/irc/irc-recv.c:3692
-#: src/irc/irc-recv.c:3742 src/irc/irc-recv.c:3756
+#: src/irc/irc-recv.c:1477 src/irc/irc-recv.c:1494 src/irc/irc-recv.c:1510
+#: src/irc/irc-recv.c:1526 src/irc/irc-recv.c:1551 src/irc/irc-recv.c:1568
+#: src/irc/irc-recv.c:1584 src/irc/irc-recv.c:1608 src/irc/irc-recv.c:1625
+#: src/irc/irc-recv.c:1641 src/irc/irc-recv.c:1665 src/irc/irc-recv.c:1682
+#: src/irc/irc-recv.c:1697 src/irc/irc-recv.c:1838 src/irc/irc-recv.c:3488
+#: src/irc/irc-recv.c:3546 src/irc/irc-recv.c:3698 src/irc/irc-recv.c:3713
+#: src/irc/irc-recv.c:3728 src/irc/irc-recv.c:3743 src/irc/irc-recv.c:3756
+#: src/irc/irc-recv.c:3806 src/irc/irc-recv.c:3820
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr "%s impossible d'analyser la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:1646
+#: src/irc/irc-recv.c:1710
 #, 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:1678
+#: src/irc/irc-recv.c:1742
 msgid "Unknown CTCP "
 msgstr "CTCP inconnu "
 
-#: src/irc/irc-recv.c:1754 src/irc/irc-dcc.c:1011
+#: src/irc/irc-recv.c:1818 src/irc/irc-dcc.c:1011
 #, c-format
 msgid "Private %s> %s"
 msgstr "Prive %s> %s"
 
-#: src/irc/irc-recv.c:1830
+#: src/irc/irc-recv.c:1894
 msgid "has quit"
 msgstr "a quitté"
 
-#: src/irc/irc-recv.c:1951
+#: src/irc/irc-recv.c:2015
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr "%s commande \"%s\" reçue sans canal\n"
 
-#: src/irc/irc-recv.c:1979
+#: src/irc/irc-recv.c:2043
 msgid " has changed topic for "
 msgstr " a changé le titre pour "
 
-#: src/irc/irc-recv.c:1984
+#: src/irc/irc-recv.c:2048
 #, c-format
 msgid " to: \"%s\"\n"
 msgstr " en: \"%s\"\n"
 
-#: src/irc/irc-recv.c:1990
+#: src/irc/irc-recv.c:2054
 msgid " has unset topic for "
 msgstr " a retiré le titre pour "
 
-#: src/irc/irc-recv.c:2108
+#: src/irc/irc-recv.c:2172
 #, c-format
 msgid " is away: %s\n"
 msgstr " est absent: %s\n"
 
-#: src/irc/irc-recv.c:2182
+#: src/irc/irc-recv.c:2246
 msgid "Users online: "
 msgstr "Utilisateurs en ligne: "
 
-#: src/irc/irc-recv.c:2629
+#: src/irc/irc-recv.c:2693
 msgid "idle: "
 msgstr "inactivité: "
 
-#: src/irc/irc-recv.c:2637
+#: src/irc/irc-recv.c:2701
 msgid "days"
 msgstr "jours"
 
-#: src/irc/irc-recv.c:2637
+#: src/irc/irc-recv.c:2701
 msgid "day"
 msgstr "jour"
 
-#: src/irc/irc-recv.c:2647
+#: src/irc/irc-recv.c:2711
 msgid "hours"
 msgstr "heures"
 
-#: src/irc/irc-recv.c:2647
+#: src/irc/irc-recv.c:2711
 msgid "hour"
 msgstr "heure"
 
-#: src/irc/irc-recv.c:2653
+#: src/irc/irc-recv.c:2717
 msgid "minutes"
 msgstr "minutes"
 
-#: src/irc/irc-recv.c:2653
+#: src/irc/irc-recv.c:2717
 msgid "minute"
 msgstr "minute"
 
-#: src/irc/irc-recv.c:2659
+#: src/irc/irc-recv.c:2723
 msgid "seconds"
 msgstr "secondes"
 
-#: src/irc/irc-recv.c:2659
+#: src/irc/irc-recv.c:2723
 msgid "second"
 msgstr "seconde"
 
-#: src/irc/irc-recv.c:2664
+#: src/irc/irc-recv.c:2728
 msgid "signon at: "
 msgstr "signé le: "
 
-#: src/irc/irc-recv.c:2752
+#: src/irc/irc-recv.c:2816
 msgid "Channels: "
 msgstr "Canaux: "
 
-#: src/irc/irc-recv.c:3004
+#: src/irc/irc-recv.c:3068
 msgid "No topic set for "
 msgstr "Pas de titre défini pour "
 
-#: src/irc/irc-recv.c:3046
+#: src/irc/irc-recv.c:3110
 msgid "Topic for "
 msgstr "Le titre pour "
 
-#: src/irc/irc-recv.c:3050
+#: src/irc/irc-recv.c:3114
 #, c-format
 msgid " is: \"%s\"\n"
 msgstr " est: \"%s\"\n"
 
-#: src/irc/irc-recv.c:3068 src/irc/irc-recv.c:3152 src/irc/irc-recv.c:3205
+#: src/irc/irc-recv.c:3132 src/irc/irc-recv.c:3216 src/irc/irc-recv.c:3269
 #, 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:3114
+#: src/irc/irc-recv.c:3178
 msgid "Topic set by "
 msgstr "Titre défini par "
 
-#: src/irc/irc-recv.c:3134
+#: src/irc/irc-recv.c:3198
 #, 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:3143 src/irc/irc-recv.c:3214
+#: src/irc/irc-recv.c:3207 src/irc/irc-recv.c:3278
 #, 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:3193
+#: src/irc/irc-recv.c:3257
 msgid "has invited"
 msgstr "a invité"
 
-#: src/irc/irc-recv.c:3196 src/irc/irc-recv.c:3347
+#: src/irc/irc-recv.c:3260 src/irc/irc-recv.c:3411
 msgid "on"
 msgstr "sur"
 
-#: src/irc/irc-recv.c:3470
+#: src/irc/irc-recv.c:3534
 #, 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:3526
+#: src/irc/irc-recv.c:3590
 msgid "Nicks "
 msgstr "Utilisateurs "
 
-#: src/irc/irc-recv.c:3546
+#: src/irc/irc-recv.c:3610
 msgid "Channel "
 msgstr "Canal "
 
-#: src/irc/irc-recv.c:3557
+#: src/irc/irc-recv.c:3621
 msgid "nicks"
 msgstr "utilisateurs"
 
-#: src/irc/irc-recv.c:3557
+#: src/irc/irc-recv.c:3621
 msgid "nick"
 msgstr "utilisateur"
 
-#: src/irc/irc-recv.c:3565
+#: src/irc/irc-recv.c:3629
 msgid "ops"
 msgstr "ops"
 
-#: src/irc/irc-recv.c:3565
+#: src/irc/irc-recv.c:3629
 msgid "op"
 msgstr "op"
 
-#: src/irc/irc-recv.c:3574
+#: src/irc/irc-recv.c:3638
 msgid "halfops"
 msgstr "halfops"
 
-#: src/irc/irc-recv.c:3574
+#: src/irc/irc-recv.c:3638
 msgid "halfop"
 msgstr "halfop"
 
-#: src/irc/irc-recv.c:3583
+#: src/irc/irc-recv.c:3647
 msgid "voices"
 msgstr "voices"
 
-#: src/irc/irc-recv.c:3583
+#: src/irc/irc-recv.c:3647
 msgid "voice"
 msgstr "voice"
 
-#: src/irc/irc-recv.c:3592
+#: src/irc/irc-recv.c:3656
 msgid "normal"
 msgstr "normal"
 
-#: src/irc/irc-recv.c:3705
+#: src/irc/irc-recv.c:3769
 msgid "banned by"
 msgstr "banni par"
 
-#: src/irc/irc-recv.c:3794
+#: src/irc/irc-recv.c:3858
 #, 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:3806
+#: src/irc/irc-recv.c:3870
 #, 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:3818
+#: src/irc/irc-recv.c:3882
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
@@ -1848,7 +1848,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:3828
+#: src/irc/irc-recv.c:3892
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
 msgstr ""
@@ -3730,292 +3730,300 @@ msgstr ""
 msgid "hide password displayed by nickserv"
 msgstr "masquer le mot de passe affiché par nickserv"
 
-#: src/common/weeconfig.c:522
+#: src/common/weeconfig.c:523
 msgid "display message to all channels when away"
 msgstr "affiche un message sur tous les canaux pour l'absence"
 
-#: src/common/weeconfig.c:523
+#: src/common/weeconfig.c:524
 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:526 src/common/weeconfig.c:527
+#: src/common/weeconfig.c:527 src/common/weeconfig.c:528
 msgid "default message when away"
 msgstr "message par défaut pour l'absence"
 
-#: src/common/weeconfig.c:530 src/common/weeconfig.c:531
+#: src/common/weeconfig.c:531 src/common/weeconfig.c:532
 msgid "default part message (leaving channel)"
 msgstr "message par défaut pour le part (quitte un canal)"
 
-#: src/common/weeconfig.c:534
+#: src/common/weeconfig.c:535
 msgid "default quit message"
 msgstr "message de fin par défaut"
 
-#: src/common/weeconfig.c:535
+#: src/common/weeconfig.c:536
 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:538
+#: src/common/weeconfig.c:539
 msgid "interval between two checks for away"
 msgstr "intervalle entre deux vérifications des absences"
 
-#: src/common/weeconfig.c:539
+#: src/common/weeconfig.c:540
 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:542
+#: src/common/weeconfig.c:543
 msgid "interval between two checks for lag"
 msgstr "intervalle entre deux mesures de lag"
 
-#: src/common/weeconfig.c:543
+#: src/common/weeconfig.c:544
 msgid "interval between two checks for lag (in seconds)"
 msgstr "intervalle entre deux mesures de lag (en secondes)"
 
-#: src/common/weeconfig.c:546
+#: src/common/weeconfig.c:547
 msgid "minimum lag to show"
 msgstr "lag minimum à afficher"
 
-#: src/common/weeconfig.c:547
+#: src/common/weeconfig.c:548
 msgid "minimum lag to show (in seconds)"
 msgstr "lag minimum à afficher (en secondes)"
 
-#: src/common/weeconfig.c:550
+#: src/common/weeconfig.c:551
 msgid "disconnect after important lag"
 msgstr "déconnexion après un lag important"
 
-#: src/common/weeconfig.c:551
+#: src/common/weeconfig.c:552
 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:554 src/common/weeconfig.c:555
+#: src/common/weeconfig.c:555 src/common/weeconfig.c:556
 msgid "create a FIFO pipe for remote control"
 msgstr "créer un tube FIFO pour le contrôle à distance"
 
-#: src/common/weeconfig.c:574
+#: src/common/weeconfig.c:559
+msgid "list of words to highlight"
+msgstr "liste de mots pour la notification"
+
+#: src/common/weeconfig.c:560
+msgid "comma separated list of words to highlight (case sensitive comparison)"
+msgstr "liste des mots pour la notification (séparés par des virgules, le comparaison tient compte de la casse)"
+
+#: src/common/weeconfig.c:579
 msgid "automatically accept dcc files"
 msgstr "accepte automatiquement les fichiers dcc"
 
-#: src/common/weeconfig.c:575
+#: src/common/weeconfig.c:580
 msgid "automatically accept incoming dcc files"
 msgstr "accepte automatiquement les fichiers dcc entrants"
 
-#: src/common/weeconfig.c:578
+#: src/common/weeconfig.c:583
 msgid "automatically accept dcc chats"
 msgstr "accepte automatiquement les demandes de discussion dcc"
 
-#: src/common/weeconfig.c:579
+#: src/common/weeconfig.c:584
 msgid "automatically accept dcc chats (use carefully!)"
 msgstr ""
 "accepte automatiquement les demandes de discussion dcc (à utiliser avec "
 "précaution !)"
 
-#: src/common/weeconfig.c:582
+#: src/common/weeconfig.c:587
 msgid "timeout for dcc request"
 msgstr "délai d'attente pour les requêtes dcc"
 
-#: src/common/weeconfig.c:583
+#: src/common/weeconfig.c:588
 msgid "timeout for dcc request (in seconds)"
 msgstr "délai d'attente pour les requêtes dcc (en secondes)"
 
-#: src/common/weeconfig.c:586
+#: src/common/weeconfig.c:591
 msgid "block size for dcc packets"
 msgstr "taille de bloc pour les paquets dcc"
 
-#: src/common/weeconfig.c:587
+#: src/common/weeconfig.c:592
 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:590
+#: src/common/weeconfig.c:595
 msgid "path for incoming files with dcc"
 msgstr "chemin les fichiers reçus par dcc"
 
-#: src/common/weeconfig.c:591
+#: src/common/weeconfig.c:596
 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:594
+#: src/common/weeconfig.c:599
 msgid "default path for sending files with dcc"
 msgstr "chemin par défaut pour envoyer les fichiers par dcc"
 
-#: src/common/weeconfig.c:595
+#: src/common/weeconfig.c:600
 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:598 src/common/weeconfig.c:599
+#: src/common/weeconfig.c:603 src/common/weeconfig.c:604
 msgid "convert spaces to underscores when sending files"
 msgstr "convertir les espaces en underscores lors d'envoi de fichiers"
 
-#: src/common/weeconfig.c:602
+#: src/common/weeconfig.c:607
 msgid "automatically rename dcc files if already exists"
 msgstr "renomme automatiquement les fichiers dcc s'ils existent déjà"
 
-#: src/common/weeconfig.c:603
+#: src/common/weeconfig.c:608
 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:606
+#: src/common/weeconfig.c:611
 msgid "automatically resume aborted transfers"
 msgstr "continuer automatiquement les transferts non terminés"
 
-#: src/common/weeconfig.c:607
+#: src/common/weeconfig.c:612
 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:626
+#: src/common/weeconfig.c:631
 msgid "use proxy"
 msgstr "utiliser un proxy"
 
-#: src/common/weeconfig.c:627
+#: src/common/weeconfig.c:632
 msgid "use a proxy server to connect to irc server"
 msgstr "utiliser un proxy pour se connecter au serveur irc"
 
-#: src/common/weeconfig.c:630
+#: src/common/weeconfig.c:635
 msgid "proxy type"
 msgstr "type de proxy"
 
-#: src/common/weeconfig.c:631
+#: src/common/weeconfig.c:636
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "type de proxy (http (défaut), socks4, socks5)"
 
-#: src/common/weeconfig.c:634
+#: src/common/weeconfig.c:639
 msgid "use ipv6 proxy"
 msgstr "utiliser un proxy ipv6"
 
-#: src/common/weeconfig.c:635
+#: src/common/weeconfig.c:640
 msgid "connect to proxy in ipv6"
 msgstr "se connecter au proxy en ipv6"
 
-#: src/common/weeconfig.c:638
+#: src/common/weeconfig.c:643
 msgid "proxy address"
 msgstr "adresse du proxy"
 
-#: src/common/weeconfig.c:639
+#: src/common/weeconfig.c:644
 msgid "proxy server address (IP or hostname)"
 msgstr "adresse du serveur proxy (IP ou nom)"
 
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:647
 msgid "port for proxy"
 msgstr "port pour le proxy"
 
-#: src/common/weeconfig.c:643
+#: src/common/weeconfig.c:648
 msgid "port for connecting to proxy server"
 msgstr "port pour se connecter au serveur proxy"
 
-#: src/common/weeconfig.c:646
+#: src/common/weeconfig.c:651
 msgid "proxy username"
 msgstr "nom d'utilisateur proxy"
 
-#: src/common/weeconfig.c:647
+#: src/common/weeconfig.c:652
 msgid "username for proxy server"
 msgstr "nom d'utilisateur pour le serveur proxy"
 
-#: src/common/weeconfig.c:650
+#: src/common/weeconfig.c:655
 msgid "proxy password"
 msgstr "mot de passe pour le proxy"
 
-#: src/common/weeconfig.c:651
+#: src/common/weeconfig.c:656
 msgid "password for proxy server"
 msgstr "mot de passe pour le serveur proxy"
 
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:667
 msgid "server name"
 msgstr "nom du serveur"
 
-#: src/common/weeconfig.c:663
+#: src/common/weeconfig.c:668
 msgid "name associated to IRC server (for display only)"
 msgstr "nom associé au serveur IRC (pour affichage seulement)"
 
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:671
 msgid "automatically connect to server"
 msgstr "connexion automatique au serveur"
 
-#: src/common/weeconfig.c:667
+#: src/common/weeconfig.c:672
 msgid "automatically connect to server when WeeChat is starting"
 msgstr "connexion automatique au serveur quand WeeChat démarre"
 
-#: src/common/weeconfig.c:670
+#: src/common/weeconfig.c:675
 msgid "automatically reconnect to server"
 msgstr "reconnexion automatique au serveur"
 
-#: src/common/weeconfig.c:671
+#: src/common/weeconfig.c:676
 msgid "automatically reconnect to server when disconnected"
 msgstr "reconnexion automatique au serveur après une déconnexion"
 
-#: src/common/weeconfig.c:674
+#: src/common/weeconfig.c:679
 msgid "delay before trying again to reconnect"
 msgstr "délai avant de tenter une reconnexion"
 
-#: src/common/weeconfig.c:675
+#: src/common/weeconfig.c:680
 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:678
+#: src/common/weeconfig.c:683
 msgid "server address or hostname"
 msgstr "adresse ou nom du serveur"
 
-#: src/common/weeconfig.c:679
+#: src/common/weeconfig.c:684
 msgid "IP address or hostname of IRC server"
 msgstr "adresse IP ou nom du serveur IRC"
 
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:687
 msgid "port for IRC server"
 msgstr "port pour le serveur IRC"
 
-#: src/common/weeconfig.c:683
+#: src/common/weeconfig.c:688
 msgid "port for connecting to server"
 msgstr "port pour se connecter au serveur"
 
-#: src/common/weeconfig.c:686 src/common/weeconfig.c:687
+#: src/common/weeconfig.c:691 src/common/weeconfig.c:692
 msgid "use IPv6 protocol for server communication"
 msgstr "utiliser le protocole IPv6 pour la communication avec le serveur"
 
-#: src/common/weeconfig.c:690 src/common/weeconfig.c:691
+#: src/common/weeconfig.c:695 src/common/weeconfig.c:696
 msgid "use SSL for server communication"
 msgstr "utiliser SSL pour la communication avec le serveur"
 
-#: src/common/weeconfig.c:694
+#: src/common/weeconfig.c:699
 msgid "server password"
 msgstr "mot de passe pour le serveur"
 
-#: src/common/weeconfig.c:695
+#: src/common/weeconfig.c:700
 msgid "password for IRC server"
 msgstr "mot de passe pour le serveur IRC"
 
-#: src/common/weeconfig.c:698
+#: src/common/weeconfig.c:703
 msgid "nickname for server"
 msgstr "pseudo pour le serveur"
 
-#: src/common/weeconfig.c:699
+#: src/common/weeconfig.c:704
 msgid "nickname to use on IRC server"
 msgstr "pseudo à utiliser sur le serveur IRC"
 
-#: src/common/weeconfig.c:702
+#: src/common/weeconfig.c:707
 msgid "alternate nickname for server"
 msgstr "pseudo alternatif pour le serveur"
 
-#: src/common/weeconfig.c:703
+#: src/common/weeconfig.c:708
 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:706
+#: src/common/weeconfig.c:711
 msgid "2nd alternate nickname for server"
 msgstr "2nd pseudo alternatif pour le serveur"
 
-#: src/common/weeconfig.c:707
+#: src/common/weeconfig.c:712
 msgid ""
 "2nd alternate nickname to use on IRC server (if alternate nickname is "
 "already used)"
@@ -4023,31 +4031,31 @@ msgstr ""
 "2nd pseudo alternatif pour le serveur IRC (si le pseudo alternatif est déjà "
 "utilisé)"
 
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:715
 msgid "user name for server"
 msgstr "nom d'utilisateur pour le serveur"
 
-#: src/common/weeconfig.c:711
+#: src/common/weeconfig.c:716
 msgid "user name to use on IRC server"
 msgstr "nom d'utilisateur pour le serveur IRC"
 
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:719
 msgid "real name for server"
 msgstr "nom réel pour le serveur"
 
-#: src/common/weeconfig.c:715
+#: src/common/weeconfig.c:720
 msgid "real name to use on IRC server"
 msgstr "nom réel pour le serveur IRC"
 
-#: src/common/weeconfig.c:718 src/common/weeconfig.c:719
+#: src/common/weeconfig.c:723 src/common/weeconfig.c:724
 msgid "first command to run when connected to server"
 msgstr "commande à exécuter en premier lorsque connecté au serveur"
 
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:727
 msgid "delay (in seconds) after command was executed"
 msgstr "délai (en secondes) après exécution de la commande"
 
-#: src/common/weeconfig.c:723
+#: src/common/weeconfig.c:728
 msgid ""
 "delay (in seconds) after command was executed (example: give some time for "
 "authentication)"
@@ -4055,25 +4063,25 @@ msgstr ""
 "délai (en secondes) après exécution de la commande (exemple: donner du temps "
 "pour l'authentification)"
 
-#: src/common/weeconfig.c:726
+#: src/common/weeconfig.c:731
 msgid "list of channels to join when connected to server"
 msgstr "liste des canaux à rejoindre lorsque connecté au serveur"
 
-#: src/common/weeconfig.c:727
+#: src/common/weeconfig.c:732
 msgid "comma separated list of channels to join when connected to server"
 msgstr ""
 "liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au "
 "serveur"
 
-#: src/common/weeconfig.c:730 src/common/weeconfig.c:731
+#: src/common/weeconfig.c:735 src/common/weeconfig.c:736
 msgid "automatically rejoin channels when kicked"
 msgstr "rejoindre automatiquement les canaux quand mis dehors"
 
-#: src/common/weeconfig.c:734
+#: src/common/weeconfig.c:739
 msgid "notify levels for channels of this server"
 msgstr "niveaux de notification pour les canaux de ce serveur"
 
-#: src/common/weeconfig.c:735
+#: src/common/weeconfig.c:740
 msgid ""
 "comma separated list of notify levels for channels of this server (format: "
 "#channel:1,..)"
@@ -4081,64 +4089,64 @@ 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:1195
+#: src/common/weeconfig.c:1200
 #, 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:1204
+#: src/common/weeconfig.c:1209
 #, 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:1219
+#: src/common/weeconfig.c:1224
 #, 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:1259
+#: src/common/weeconfig.c:1264
 #, 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:1270
+#: src/common/weeconfig.c:1275
 #, 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:1309
+#: src/common/weeconfig.c:1314
 #, c-format
 msgid "%s config file \"%s\" not found.\n"
 msgstr "%s fichier de configuration \"%s\" non trouvé.\n"
 
-#: src/common/weeconfig.c:1341
+#: src/common/weeconfig.c:1346
 #, 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:1358
+#: src/common/weeconfig.c:1363
 #, 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:1376
+#: src/common/weeconfig.c:1381
 #, 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:1384
+#: src/common/weeconfig.c:1389
 #, 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:1432
+#: src/common/weeconfig.c:1437
 #, c-format
 msgid "%s %s, line %d: invalid option \"%s\"\n"
 msgstr "%s %s, ligne %d: option \"%s\" invalide\n"
 
-#: src/common/weeconfig.c:1443
+#: src/common/weeconfig.c:1448
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value foroption '%s'\n"
@@ -4147,7 +4155,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:1452
+#: src/common/weeconfig.c:1457
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4156,7 +4164,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:1463
+#: src/common/weeconfig.c:1468
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4165,26 +4173,26 @@ msgstr ""
 "%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
 "Attendu: une de ces chaînes: "
 
-#: src/common/weeconfig.c:1479
+#: src/common/weeconfig.c:1484
 #, 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:1541 src/common/weeconfig.c:1736
+#: src/common/weeconfig.c:1546 src/common/weeconfig.c:1741
 #, c-format
 msgid "%s cannot create file \"%s\"\n"
 msgstr "%s impossible de créer le fichier \"%s\"\n"
 
-#: src/common/weeconfig.c:1547
+#: src/common/weeconfig.c:1552
 #, 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:1548
+#: src/common/weeconfig.c:1553
 msgid "Creating default config file\n"
 msgstr "Création du fichier de configuration par défaut\n"
 
-#: src/common/weeconfig.c:1551 src/common/weeconfig.c:1745
+#: src/common/weeconfig.c:1556 src/common/weeconfig.c:1750
 #, c-format
 msgid ""
 "#\n"
@@ -4193,6 +4201,6 @@ msgstr ""
 "#\n"
 "# %s: fichier de configuration, créé par %s v%s le %s#\n"
 
-#: src/common/weeconfig.c:1742
+#: src/common/weeconfig.c:1747
 msgid "Saving config to disk\n"
 msgstr "Sauvegarde de la configuration sur disque\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index 6275822bb..925241760 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-07-19 14:19+0200\n"
+"POT-Creation-Date: 2005-07-19 19:09+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"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "%s cannot allocate new nick\n"
 msgstr ""
 
-#: src/irc/irc-server.c:180 src/common/weeconfig.c:1682
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1687
 msgid "Unable to get user's name"
 msgstr ""
 
@@ -1237,7 +1237,7 @@ msgstr ""
 msgid "(hidden)"
 msgstr ""
 
-#: src/irc/irc-send.c:59 src/irc/irc-recv.c:3840
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:3904
 msgid "unknown"
 msgstr ""
 
@@ -1279,12 +1279,12 @@ 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:322
+#: src/irc/irc-send.c:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:386
 #, 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:1702
+#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1766
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr ""
@@ -1294,440 +1294,440 @@ msgstr ""
 msgid "%s, compiled on %s %s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:182
+#: src/irc/irc-recv.c:246
 msgid "You have been invited to "
 msgstr ""
 
-#: src/irc/irc-recv.c:185
+#: src/irc/irc-recv.c:249
 msgid "by"
 msgstr ""
 
-#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:289 src/irc/irc-recv.c:788
-#: src/irc/irc-recv.c:1123 src/irc/irc-recv.c:1302 src/irc/irc-recv.c:3058
-#: src/irc/irc-recv.c:3125
+#: src/irc/irc-recv.c:259 src/irc/irc-recv.c:353 src/irc/irc-recv.c:852
+#: src/irc/irc-recv.c:1187 src/irc/irc-recv.c:1366 src/irc/irc-recv.c:3122
+#: src/irc/irc-recv.c:3189
 #, c-format
 msgid "%s channel \"%s\" not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:221
+#: src/irc/irc-recv.c:285
 #, c-format
 msgid "%s cannot create new channel \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:241
+#: src/irc/irc-recv.c:305
 msgid " has joined "
 msgstr ""
 
-#: src/irc/irc-recv.c:298
+#: src/irc/irc-recv.c:362
 msgid " has kicked "
 msgstr ""
 
-#: src/irc/irc-recv.c:302
+#: src/irc/irc-recv.c:366
 msgid " from "
 msgstr ""
 
-#: src/irc/irc-recv.c:388
+#: src/irc/irc-recv.c:452
 msgid " has killed "
 msgstr ""
 
-#: src/irc/irc-recv.c:394
+#: src/irc/irc-recv.c:458
 msgid " from server"
 msgstr ""
 
-#: src/irc/irc-recv.c:404
+#: src/irc/irc-recv.c:468
 msgid " from server\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:411
+#: src/irc/irc-recv.c:475
 #, c-format
 msgid "%s host \"%s\" not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:451
+#: src/irc/irc-recv.c:515
 msgid "sets ban on"
 msgstr ""
 
-#: src/irc/irc-recv.c:452
+#: src/irc/irc-recv.c:516
 msgid "removes ban on"
 msgstr ""
 
-#: src/irc/irc-recv.c:476
+#: src/irc/irc-recv.c:540
 msgid "gives half channel operator status to"
 msgstr ""
 
-#: src/irc/irc-recv.c:477
+#: src/irc/irc-recv.c:541
 msgid "removes half channel operator status from"
 msgstr ""
 
-#: src/irc/irc-recv.c:504
+#: src/irc/irc-recv.c:568
 msgid "sets invite-only channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:505
+#: src/irc/irc-recv.c:569
 msgid "removes invite-only channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:522
+#: src/irc/irc-recv.c:586
 msgid "sets channel key to"
 msgstr ""
 
-#: src/irc/irc-recv.c:523
+#: src/irc/irc-recv.c:587
 msgid "removes channel key"
 msgstr ""
 
-#: src/irc/irc-recv.c:554
+#: src/irc/irc-recv.c:618
 msgid "sets the user limit to"
 msgstr ""
 
-#: src/irc/irc-recv.c:555
+#: src/irc/irc-recv.c:619
 msgid "removes user limit"
 msgstr ""
 
-#: src/irc/irc-recv.c:577
+#: src/irc/irc-recv.c:641
 msgid "sets moderated channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:578
+#: src/irc/irc-recv.c:642
 msgid "removes moderated channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:588
+#: src/irc/irc-recv.c:652
 msgid "sets messages from channel only flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:589
+#: src/irc/irc-recv.c:653
 msgid "removes messages from channel only flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:606
+#: src/irc/irc-recv.c:670
 msgid "gives channel operator status to"
 msgstr ""
 
-#: src/irc/irc-recv.c:607
+#: src/irc/irc-recv.c:671
 msgid "removes channel operator status from"
 msgstr ""
 
-#: src/irc/irc-recv.c:634
+#: src/irc/irc-recv.c:698
 msgid "sets private channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:635
+#: src/irc/irc-recv.c:699
 msgid "removes private channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:652
+#: src/irc/irc-recv.c:716
 msgid "sets quiet on"
 msgstr ""
 
-#: src/irc/irc-recv.c:653
+#: src/irc/irc-recv.c:717
 msgid "removes quiet on"
 msgstr ""
 
-#: src/irc/irc-recv.c:670
+#: src/irc/irc-recv.c:734
 msgid "sets secret channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:735
 msgid "removes secret channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:681
+#: src/irc/irc-recv.c:745
 msgid "sets topic protection"
 msgstr ""
 
-#: src/irc/irc-recv.c:682
+#: src/irc/irc-recv.c:746
 msgid "removes topic protection"
 msgstr ""
 
-#: src/irc/irc-recv.c:699
+#: src/irc/irc-recv.c:763
 msgid "gives voice to"
 msgstr ""
 
-#: src/irc/irc-recv.c:700
+#: src/irc/irc-recv.c:764
 msgid "removes voice from"
 msgstr ""
 
-#: src/irc/irc-recv.c:743 src/irc/irc-recv.c:828 src/irc/irc-recv.c:1197
-#: src/irc/irc-recv.c:1798
+#: src/irc/irc-recv.c:807 src/irc/irc-recv.c:892 src/irc/irc-recv.c:1261
+#: src/irc/irc-recv.c:1862
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:758
+#: src/irc/irc-recv.c:822
 #, c-format
 msgid "%s \"%s\" command received without channel or nickname\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:803
+#: src/irc/irc-recv.c:867
 msgid "mode changed by"
 msgstr ""
 
-#: src/irc/irc-recv.c:867
+#: src/irc/irc-recv.c:931
 msgid "You are "
 msgstr ""
 
-#: src/irc/irc-recv.c:874
+#: src/irc/irc-recv.c:938
 msgid " is "
 msgstr ""
 
-#: src/irc/irc-recv.c:878
+#: src/irc/irc-recv.c:942
 msgid "now known as "
 msgstr ""
 
-#: src/irc/irc-recv.c:948
+#: src/irc/irc-recv.c:1012
 #, c-format
 msgid "%s nickname not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:961 src/irc/irc-recv.c:993
+#: src/irc/irc-recv.c:1025 src/irc/irc-recv.c:1057
 msgid "reply from"
 msgstr ""
 
-#: src/irc/irc-recv.c:996
+#: src/irc/irc-recv.c:1060
 #, c-format
 msgid ": %ld.%ld seconds\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1048
+#: src/irc/irc-recv.c:1112
 #, c-format
 msgid "%s \"%s\" command received without host or channel\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1098
+#: src/irc/irc-recv.c:1162
 msgid " has left "
 msgstr ""
 
-#: src/irc/irc-recv.c:1246 src/irc/irc-recv.c:1728
+#: src/irc/irc-recv.c:1310 src/irc/irc-recv.c:1792
 #, c-format
 msgid "On %s: * %s %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1265
+#: src/irc/irc-recv.c:1329
 #, c-format
 msgid "Received a CTCP SOUND \"%s\" from "
 msgstr ""
 
-#: src/irc/irc-recv.c:1285
+#: src/irc/irc-recv.c:1349
 #, c-format
 msgid "On %s: %s> %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1362 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1682
+#: src/irc/irc-recv.c:1426 src/irc/irc-recv.c:1462 src/irc/irc-recv.c:1746
 msgid "received from"
 msgstr ""
 
-#: src/irc/irc-recv.c:1413 src/irc/irc-recv.c:1430 src/irc/irc-recv.c:1446
-#: src/irc/irc-recv.c:1462 src/irc/irc-recv.c:1487 src/irc/irc-recv.c:1504
-#: src/irc/irc-recv.c:1520 src/irc/irc-recv.c:1544 src/irc/irc-recv.c:1561
-#: src/irc/irc-recv.c:1577 src/irc/irc-recv.c:1601 src/irc/irc-recv.c:1618
-#: src/irc/irc-recv.c:1633 src/irc/irc-recv.c:1774 src/irc/irc-recv.c:3424
-#: src/irc/irc-recv.c:3482 src/irc/irc-recv.c:3634 src/irc/irc-recv.c:3649
-#: src/irc/irc-recv.c:3664 src/irc/irc-recv.c:3679 src/irc/irc-recv.c:3692
-#: src/irc/irc-recv.c:3742 src/irc/irc-recv.c:3756
+#: src/irc/irc-recv.c:1477 src/irc/irc-recv.c:1494 src/irc/irc-recv.c:1510
+#: src/irc/irc-recv.c:1526 src/irc/irc-recv.c:1551 src/irc/irc-recv.c:1568
+#: src/irc/irc-recv.c:1584 src/irc/irc-recv.c:1608 src/irc/irc-recv.c:1625
+#: src/irc/irc-recv.c:1641 src/irc/irc-recv.c:1665 src/irc/irc-recv.c:1682
+#: src/irc/irc-recv.c:1697 src/irc/irc-recv.c:1838 src/irc/irc-recv.c:3488
+#: src/irc/irc-recv.c:3546 src/irc/irc-recv.c:3698 src/irc/irc-recv.c:3713
+#: src/irc/irc-recv.c:3728 src/irc/irc-recv.c:3743 src/irc/irc-recv.c:3756
+#: src/irc/irc-recv.c:3806 src/irc/irc-recv.c:3820
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1646
+#: src/irc/irc-recv.c:1710
 #, c-format
 msgid "%s unknown DCC CHAT type received from "
 msgstr ""
 
-#: src/irc/irc-recv.c:1678
+#: src/irc/irc-recv.c:1742
 msgid "Unknown CTCP "
 msgstr ""
 
-#: src/irc/irc-recv.c:1754 src/irc/irc-dcc.c:1011
+#: src/irc/irc-recv.c:1818 src/irc/irc-dcc.c:1011
 #, c-format
 msgid "Private %s> %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1830
+#: src/irc/irc-recv.c:1894
 msgid "has quit"
 msgstr ""
 
-#: src/irc/irc-recv.c:1951
+#: src/irc/irc-recv.c:2015
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1979
+#: src/irc/irc-recv.c:2043
 msgid " has changed topic for "
 msgstr ""
 
-#: src/irc/irc-recv.c:1984
+#: src/irc/irc-recv.c:2048
 #, c-format
 msgid " to: \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1990
+#: src/irc/irc-recv.c:2054
 msgid " has unset topic for "
 msgstr ""
 
-#: src/irc/irc-recv.c:2108
+#: src/irc/irc-recv.c:2172
 #, c-format
 msgid " is away: %s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2182
+#: src/irc/irc-recv.c:2246
 msgid "Users online: "
 msgstr ""
 
-#: src/irc/irc-recv.c:2629
+#: src/irc/irc-recv.c:2693
 msgid "idle: "
 msgstr ""
 
-#: src/irc/irc-recv.c:2637
+#: src/irc/irc-recv.c:2701
 msgid "days"
 msgstr ""
 
-#: src/irc/irc-recv.c:2637
+#: src/irc/irc-recv.c:2701
 msgid "day"
 msgstr ""
 
-#: src/irc/irc-recv.c:2647
+#: src/irc/irc-recv.c:2711
 msgid "hours"
 msgstr ""
 
-#: src/irc/irc-recv.c:2647
+#: src/irc/irc-recv.c:2711
 msgid "hour"
 msgstr ""
 
-#: src/irc/irc-recv.c:2653
+#: src/irc/irc-recv.c:2717
 msgid "minutes"
 msgstr ""
 
-#: src/irc/irc-recv.c:2653
+#: src/irc/irc-recv.c:2717
 msgid "minute"
 msgstr ""
 
-#: src/irc/irc-recv.c:2659
+#: src/irc/irc-recv.c:2723
 msgid "seconds"
 msgstr ""
 
-#: src/irc/irc-recv.c:2659
+#: src/irc/irc-recv.c:2723
 msgid "second"
 msgstr ""
 
-#: src/irc/irc-recv.c:2664
+#: src/irc/irc-recv.c:2728
 msgid "signon at: "
 msgstr ""
 
-#: src/irc/irc-recv.c:2752
+#: src/irc/irc-recv.c:2816
 msgid "Channels: "
 msgstr ""
 
-#: src/irc/irc-recv.c:3004
+#: src/irc/irc-recv.c:3068
 msgid "No topic set for "
 msgstr ""
 
-#: src/irc/irc-recv.c:3046
+#: src/irc/irc-recv.c:3110
 msgid "Topic for "
 msgstr ""
 
-#: src/irc/irc-recv.c:3050
+#: src/irc/irc-recv.c:3114
 #, c-format
 msgid " is: \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3068 src/irc/irc-recv.c:3152 src/irc/irc-recv.c:3205
+#: src/irc/irc-recv.c:3132 src/irc/irc-recv.c:3216 src/irc/irc-recv.c:3269
 #, c-format
 msgid "%s cannot identify channel for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3114
+#: src/irc/irc-recv.c:3178
 msgid "Topic set by "
 msgstr ""
 
-#: src/irc/irc-recv.c:3134
+#: src/irc/irc-recv.c:3198
 #, c-format
 msgid "%s cannot identify date/time for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3143 src/irc/irc-recv.c:3214
+#: src/irc/irc-recv.c:3207 src/irc/irc-recv.c:3278
 #, c-format
 msgid "%s cannot identify nickname for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3193
+#: src/irc/irc-recv.c:3257
 msgid "has invited"
 msgstr ""
 
-#: src/irc/irc-recv.c:3196 src/irc/irc-recv.c:3347
+#: src/irc/irc-recv.c:3260 src/irc/irc-recv.c:3411
 msgid "on"
 msgstr ""
 
-#: src/irc/irc-recv.c:3470
+#: src/irc/irc-recv.c:3534
 #, c-format
 msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3526
+#: src/irc/irc-recv.c:3590
 msgid "Nicks "
 msgstr ""
 
-#: src/irc/irc-recv.c:3546
+#: src/irc/irc-recv.c:3610
 msgid "Channel "
 msgstr ""
 
-#: src/irc/irc-recv.c:3557
+#: src/irc/irc-recv.c:3621
 msgid "nicks"
 msgstr ""
 
-#: src/irc/irc-recv.c:3557
+#: src/irc/irc-recv.c:3621
 msgid "nick"
 msgstr ""
 
-#: src/irc/irc-recv.c:3565
+#: src/irc/irc-recv.c:3629
 msgid "ops"
 msgstr ""
 
-#: src/irc/irc-recv.c:3565
+#: src/irc/irc-recv.c:3629
 msgid "op"
 msgstr ""
 
-#: src/irc/irc-recv.c:3574
+#: src/irc/irc-recv.c:3638
 msgid "halfops"
 msgstr ""
 
-#: src/irc/irc-recv.c:3574
+#: src/irc/irc-recv.c:3638
 msgid "halfop"
 msgstr ""
 
-#: src/irc/irc-recv.c:3583
+#: src/irc/irc-recv.c:3647
 msgid "voices"
 msgstr ""
 
-#: src/irc/irc-recv.c:3583
+#: src/irc/irc-recv.c:3647
 msgid "voice"
 msgstr ""
 
-#: src/irc/irc-recv.c:3592
+#: src/irc/irc-recv.c:3656
 msgid "normal"
 msgstr ""
 
-#: src/irc/irc-recv.c:3705
+#: src/irc/irc-recv.c:3769
 msgid "banned by"
 msgstr ""
 
-#: src/irc/irc-recv.c:3794
+#: src/irc/irc-recv.c:3858
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3806
+#: src/irc/irc-recv.c:3870
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3818
+#: src/irc/irc-recv.c:3882
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
 "server!\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3828
+#: src/irc/irc-recv.c:3892
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
 msgstr ""
@@ -3485,437 +3485,445 @@ msgstr ""
 msgid "hide password displayed by nickserv"
 msgstr ""
 
-#: src/common/weeconfig.c:522
+#: src/common/weeconfig.c:523
 msgid "display message to all channels when away"
 msgstr ""
 
-#: src/common/weeconfig.c:523
+#: src/common/weeconfig.c:524
 msgid "display message to all channels when (un)marking as away"
 msgstr ""
 
-#: src/common/weeconfig.c:526 src/common/weeconfig.c:527
+#: src/common/weeconfig.c:527 src/common/weeconfig.c:528
 msgid "default message when away"
 msgstr ""
 
-#: src/common/weeconfig.c:530 src/common/weeconfig.c:531
+#: src/common/weeconfig.c:531 src/common/weeconfig.c:532
 msgid "default part message (leaving channel)"
 msgstr ""
 
-#: src/common/weeconfig.c:534
+#: src/common/weeconfig.c:535
 msgid "default quit message"
 msgstr ""
 
-#: src/common/weeconfig.c:535
+#: src/common/weeconfig.c:536
 msgid ""
 "default quit message ('%v' will be replaced by WeeChat version in string)"
 msgstr ""
 
-#: src/common/weeconfig.c:538
+#: src/common/weeconfig.c:539
 msgid "interval between two checks for away"
 msgstr ""
 
-#: src/common/weeconfig.c:539
+#: src/common/weeconfig.c:540
 msgid "interval between two checks for away (in minutes, 0 = never check)"
 msgstr ""
 
-#: src/common/weeconfig.c:542
+#: src/common/weeconfig.c:543
 msgid "interval between two checks for lag"
 msgstr ""
 
-#: src/common/weeconfig.c:543
+#: src/common/weeconfig.c:544
 msgid "interval between two checks for lag (in seconds)"
 msgstr ""
 
-#: src/common/weeconfig.c:546
+#: src/common/weeconfig.c:547
 msgid "minimum lag to show"
 msgstr ""
 
-#: src/common/weeconfig.c:547
+#: src/common/weeconfig.c:548
 msgid "minimum lag to show (in seconds)"
 msgstr ""
 
-#: src/common/weeconfig.c:550
+#: src/common/weeconfig.c:551
 msgid "disconnect after important lag"
 msgstr ""
 
-#: src/common/weeconfig.c:551
+#: src/common/weeconfig.c:552
 msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
 msgstr ""
 
-#: src/common/weeconfig.c:554 src/common/weeconfig.c:555
+#: src/common/weeconfig.c:555 src/common/weeconfig.c:556
 msgid "create a FIFO pipe for remote control"
 msgstr ""
 
-#: src/common/weeconfig.c:574
+#: src/common/weeconfig.c:559
+msgid "list of words to highlight"
+msgstr ""
+
+#: src/common/weeconfig.c:560
+msgid "comma separated list of words to highlight (case sensitive comparison)"
+msgstr ""
+
+#: src/common/weeconfig.c:579
 msgid "automatically accept dcc files"
 msgstr ""
 
-#: src/common/weeconfig.c:575
+#: src/common/weeconfig.c:580
 msgid "automatically accept incoming dcc files"
 msgstr ""
 
-#: src/common/weeconfig.c:578
+#: src/common/weeconfig.c:583
 msgid "automatically accept dcc chats"
 msgstr ""
 
-#: src/common/weeconfig.c:579
+#: src/common/weeconfig.c:584
 msgid "automatically accept dcc chats (use carefully!)"
 msgstr ""
 
-#: src/common/weeconfig.c:582
+#: src/common/weeconfig.c:587
 msgid "timeout for dcc request"
 msgstr ""
 
-#: src/common/weeconfig.c:583
+#: src/common/weeconfig.c:588
 msgid "timeout for dcc request (in seconds)"
 msgstr ""
 
-#: src/common/weeconfig.c:586
+#: src/common/weeconfig.c:591
 msgid "block size for dcc packets"
 msgstr ""
 
-#: src/common/weeconfig.c:587
+#: src/common/weeconfig.c:592
 msgid "block size for dcc packets in bytes (default: 65536)"
 msgstr ""
 
-#: src/common/weeconfig.c:590
+#: src/common/weeconfig.c:595
 msgid "path for incoming files with dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:591
+#: src/common/weeconfig.c:596
 msgid "path for writing incoming files with dcc (default: user home)"
 msgstr ""
 
-#: src/common/weeconfig.c:594
+#: src/common/weeconfig.c:599
 msgid "default path for sending files with dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:595
+#: src/common/weeconfig.c:600
 msgid ""
 "path for reading files when sending thru dcc (when no path is specified)"
 msgstr ""
 
-#: src/common/weeconfig.c:598 src/common/weeconfig.c:599
+#: src/common/weeconfig.c:603 src/common/weeconfig.c:604
 msgid "convert spaces to underscores when sending files"
 msgstr ""
 
-#: src/common/weeconfig.c:602
+#: src/common/weeconfig.c:607
 msgid "automatically rename dcc files if already exists"
 msgstr ""
 
-#: src/common/weeconfig.c:603
+#: src/common/weeconfig.c:608
 msgid "rename incoming files if already exists (add '.1', '.2', ...)"
 msgstr ""
 
-#: src/common/weeconfig.c:606
+#: src/common/weeconfig.c:611
 msgid "automatically resume aborted transfers"
 msgstr ""
 
-#: src/common/weeconfig.c:607
+#: src/common/weeconfig.c:612
 msgid ""
 "automatically resume dcc transfer if connection with remote host is loosed"
 msgstr ""
 
-#: src/common/weeconfig.c:626
+#: src/common/weeconfig.c:631
 msgid "use proxy"
 msgstr ""
 
-#: src/common/weeconfig.c:627
+#: src/common/weeconfig.c:632
 msgid "use a proxy server to connect to irc server"
 msgstr ""
 
-#: src/common/weeconfig.c:630
+#: src/common/weeconfig.c:635
 msgid "proxy type"
 msgstr ""
 
-#: src/common/weeconfig.c:631
+#: src/common/weeconfig.c:636
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr ""
 
-#: src/common/weeconfig.c:634
+#: src/common/weeconfig.c:639
 msgid "use ipv6 proxy"
 msgstr ""
 
-#: src/common/weeconfig.c:635
+#: src/common/weeconfig.c:640
 msgid "connect to proxy in ipv6"
 msgstr ""
 
-#: src/common/weeconfig.c:638
+#: src/common/weeconfig.c:643
 msgid "proxy address"
 msgstr ""
 
-#: src/common/weeconfig.c:639
+#: src/common/weeconfig.c:644
 msgid "proxy server address (IP or hostname)"
 msgstr ""
 
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:647
 msgid "port for proxy"
 msgstr ""
 
-#: src/common/weeconfig.c:643
+#: src/common/weeconfig.c:648
 msgid "port for connecting to proxy server"
 msgstr ""
 
-#: src/common/weeconfig.c:646
+#: src/common/weeconfig.c:651
 msgid "proxy username"
 msgstr ""
 
-#: src/common/weeconfig.c:647
+#: src/common/weeconfig.c:652
 msgid "username for proxy server"
 msgstr ""
 
-#: src/common/weeconfig.c:650
+#: src/common/weeconfig.c:655
 msgid "proxy password"
 msgstr ""
 
-#: src/common/weeconfig.c:651
+#: src/common/weeconfig.c:656
 msgid "password for proxy server"
 msgstr ""
 
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:667
 msgid "server name"
 msgstr ""
 
-#: src/common/weeconfig.c:663
+#: src/common/weeconfig.c:668
 msgid "name associated to IRC server (for display only)"
 msgstr ""
 
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:671
 msgid "automatically connect to server"
 msgstr ""
 
-#: src/common/weeconfig.c:667
+#: src/common/weeconfig.c:672
 msgid "automatically connect to server when WeeChat is starting"
 msgstr ""
 
-#: src/common/weeconfig.c:670
+#: src/common/weeconfig.c:675
 msgid "automatically reconnect to server"
 msgstr ""
 
-#: src/common/weeconfig.c:671
+#: src/common/weeconfig.c:676
 msgid "automatically reconnect to server when disconnected"
 msgstr ""
 
-#: src/common/weeconfig.c:674
+#: src/common/weeconfig.c:679
 msgid "delay before trying again to reconnect"
 msgstr ""
 
-#: src/common/weeconfig.c:675
+#: src/common/weeconfig.c:680
 msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr ""
 
-#: src/common/weeconfig.c:678
+#: src/common/weeconfig.c:683
 msgid "server address or hostname"
 msgstr ""
 
-#: src/common/weeconfig.c:679
+#: src/common/weeconfig.c:684
 msgid "IP address or hostname of IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:687
 msgid "port for IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:683
+#: src/common/weeconfig.c:688
 msgid "port for connecting to server"
 msgstr ""
 
-#: src/common/weeconfig.c:686 src/common/weeconfig.c:687
+#: src/common/weeconfig.c:691 src/common/weeconfig.c:692
 msgid "use IPv6 protocol for server communication"
 msgstr ""
 
-#: src/common/weeconfig.c:690 src/common/weeconfig.c:691
+#: src/common/weeconfig.c:695 src/common/weeconfig.c:696
 msgid "use SSL for server communication"
 msgstr ""
 
-#: src/common/weeconfig.c:694
+#: src/common/weeconfig.c:699
 msgid "server password"
 msgstr ""
 
-#: src/common/weeconfig.c:695
+#: src/common/weeconfig.c:700
 msgid "password for IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:698
+#: src/common/weeconfig.c:703
 msgid "nickname for server"
 msgstr ""
 
-#: src/common/weeconfig.c:699
+#: src/common/weeconfig.c:704
 msgid "nickname to use on IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:702
+#: src/common/weeconfig.c:707
 msgid "alternate nickname for server"
 msgstr ""
 
-#: src/common/weeconfig.c:703
+#: src/common/weeconfig.c:708
 msgid "alternate nickname to use on IRC server (if nickname is already used)"
 msgstr ""
 
-#: src/common/weeconfig.c:706
+#: src/common/weeconfig.c:711
 msgid "2nd alternate nickname for server"
 msgstr ""
 
-#: src/common/weeconfig.c:707
+#: src/common/weeconfig.c:712
 msgid ""
 "2nd alternate nickname to use on IRC server (if alternate nickname is "
 "already used)"
 msgstr ""
 
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:715
 msgid "user name for server"
 msgstr ""
 
-#: src/common/weeconfig.c:711
+#: src/common/weeconfig.c:716
 msgid "user name to use on IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:719
 msgid "real name for server"
 msgstr ""
 
-#: src/common/weeconfig.c:715
+#: src/common/weeconfig.c:720
 msgid "real name to use on IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:718 src/common/weeconfig.c:719
+#: src/common/weeconfig.c:723 src/common/weeconfig.c:724
 msgid "first command to run when connected to server"
 msgstr ""
 
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:727
 msgid "delay (in seconds) after command was executed"
 msgstr ""
 
-#: src/common/weeconfig.c:723
+#: src/common/weeconfig.c:728
 msgid ""
 "delay (in seconds) after command was executed (example: give some time for "
 "authentication)"
 msgstr ""
 
-#: src/common/weeconfig.c:726
+#: src/common/weeconfig.c:731
 msgid "list of channels to join when connected to server"
 msgstr ""
 
-#: src/common/weeconfig.c:727
+#: src/common/weeconfig.c:732
 msgid "comma separated list of channels to join when connected to server"
 msgstr ""
 
-#: src/common/weeconfig.c:730 src/common/weeconfig.c:731
+#: src/common/weeconfig.c:735 src/common/weeconfig.c:736
 msgid "automatically rejoin channels when kicked"
 msgstr ""
 
-#: src/common/weeconfig.c:734
+#: src/common/weeconfig.c:739
 msgid "notify levels for channels of this server"
 msgstr ""
 
-#: src/common/weeconfig.c:735
+#: src/common/weeconfig.c:740
 msgid ""
 "comma separated list of notify levels for channels of this server (format: "
 "#channel:1,..)"
 msgstr ""
 
-#: src/common/weeconfig.c:1195
+#: src/common/weeconfig.c:1200
 #, c-format
 msgid "%s %s, line %d: new server, but previous was incomplete\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1204
+#: src/common/weeconfig.c:1209
 #, c-format
 msgid "%s %s, line %d: server '%s' already exists\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1219
+#: src/common/weeconfig.c:1224
 #, c-format
 msgid "%s %s, line %d: unable to create server\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1259
+#: src/common/weeconfig.c:1264
 #, c-format
 msgid "%s unable to assign default int with string (\"%s\")\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1270
+#: src/common/weeconfig.c:1275
 #, c-format
 msgid "%s unable to assign default color (\"%s\")\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1309
+#: src/common/weeconfig.c:1314
 #, c-format
 msgid "%s config file \"%s\" not found.\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1341
+#: src/common/weeconfig.c:1346
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1358
+#: src/common/weeconfig.c:1363
 #, c-format
 msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1376
+#: src/common/weeconfig.c:1381
 #, c-format
 msgid "%s %s, line %d: invalid section for option, line is ignored\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1384
+#: src/common/weeconfig.c:1389
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1432
+#: src/common/weeconfig.c:1437
 #, c-format
 msgid "%s %s, line %d: invalid option \"%s\"\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1443
+#: src/common/weeconfig.c:1448
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value foroption '%s'\n"
 "Expected: boolean value: 'off' or 'on'\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1452
+#: src/common/weeconfig.c:1457
 #, 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:1463
+#: src/common/weeconfig.c:1468
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
 "Expected: one of these strings: "
 msgstr ""
 
-#: src/common/weeconfig.c:1479
+#: src/common/weeconfig.c:1484
 #, c-format
 msgid "%s %s, line %d: invalid color name for option '%s'\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1541 src/common/weeconfig.c:1736
+#: src/common/weeconfig.c:1546 src/common/weeconfig.c:1741
 #, c-format
 msgid "%s cannot create file \"%s\"\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1547
+#: src/common/weeconfig.c:1552
 #, c-format
 msgid "%s: creating default config file...\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1548
+#: src/common/weeconfig.c:1553
 msgid "Creating default config file\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1551 src/common/weeconfig.c:1745
+#: src/common/weeconfig.c:1556 src/common/weeconfig.c:1750
 #, c-format
 msgid ""
 "#\n"
 "# %s configuration file, created by %s v%s on %s#\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1742
+#: src/common/weeconfig.c:1747
 msgid "Saving config to disk\n"
 msgstr ""
diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c
index aefe60edb..334a8afac 100644
--- a/src/common/weeconfig.c
+++ b/src/common/weeconfig.c
@@ -517,6 +517,7 @@ int cfg_irc_lag_check;
 int cfg_irc_lag_min_show;
 int cfg_irc_lag_disconnect;
 int cfg_irc_fifo_pipe;
+char *cfg_irc_highlight;
 
 t_config_option weechat_options_irc[] =
 { { "irc_display_away", N_("display message to all channels when away"),
@@ -555,6 +556,10 @@ t_config_option weechat_options_irc[] =
     N_("create a FIFO pipe for remote control"),
     OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE,
     NULL, NULL, &cfg_irc_fifo_pipe, NULL, config_change_fifo_pipe },
+  { "irc_highlight", N_("list of words to highlight"),
+    N_("comma separated list of words to highlight (case sensitive comparison)"),
+    OPTION_TYPE_STRING, 0, 0, 0,
+    "", NULL, NULL, &cfg_irc_highlight, config_change_noop },
   { NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
 };
 
diff --git a/src/common/weeconfig.h b/src/common/weeconfig.h
index 244cf3bc9..18e4768b5 100644
--- a/src/common/weeconfig.h
+++ b/src/common/weeconfig.h
@@ -170,6 +170,7 @@ extern int cfg_irc_lag_check;
 extern int cfg_irc_lag_min_show;
 extern int cfg_irc_lag_disconnect;
 extern int cfg_irc_fifo_pipe;
+extern char *cfg_irc_highlight;
 
 extern int cfg_dcc_auto_accept_files;
 extern int cfg_dcc_auto_accept_chats;
diff --git a/src/irc/irc-channel.c b/src/irc/irc-channel.c
index f17596ce5..0323b7869 100644
--- a/src/irc/irc-channel.c
+++ b/src/irc/irc-channel.c
@@ -90,7 +90,15 @@ void
 channel_free (t_irc_server *server, t_irc_channel *channel)
 {
     t_irc_channel *new_channels;
-
+    
+    /* close DCC CHAT */
+    if ((t_irc_dcc *)(channel->dcc_chat) &&
+        (!DCC_ENDED(((t_irc_dcc *)(channel->dcc_chat))->status)))
+    {
+        dcc_close ((t_irc_dcc *)(channel->dcc_chat), DCC_ABORTED);
+        dcc_redraw (1);
+    }
+    
     /* remove channel from queue */
     if (server->last_channel == channel)
         server->last_channel = channel->prev_channel;
@@ -104,14 +112,6 @@ channel_free (t_irc_server *server, t_irc_channel *channel)
     
     if (channel->next_channel)
         (channel->next_channel)->prev_channel = channel->prev_channel;
-
-    /* close DCC CHAT */
-    if ((t_irc_dcc *)(channel->dcc_chat) &&
-        (!DCC_ENDED(((t_irc_dcc *)(channel->dcc_chat))->status)))
-    {
-        dcc_close ((t_irc_dcc *)(channel->dcc_chat), DCC_ABORTED);
-        dcc_redraw (1);
-    }
     
     /* free data */
     if (channel->name)
diff --git a/src/irc/irc-dcc.c b/src/irc/irc-dcc.c
index 53f637c97..1309a2475 100644
--- a/src/irc/irc-dcc.c
+++ b/src/irc/irc-dcc.c
@@ -998,7 +998,7 @@ dcc_chat_recv (t_irc_dcc *ptr_dcc)
                 gui_printf_type_color (ptr_dcc->channel->buffer,
                                        MSG_TYPE_NICK,
                                        COLOR_WIN_CHAT_DARK, "<");
-                if (strstr (ptr_buf, ptr_dcc->server->nick))
+                if (irc_is_highlight (ptr_buf, ptr_dcc->server->nick))
                 {
                     gui_printf_type_color (ptr_dcc->channel->buffer,
                                            MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c
index f84e9286f..9faa298b5 100644
--- a/src/irc/irc-recv.c
+++ b/src/irc/irc-recv.c
@@ -43,6 +43,70 @@
 
 
 /*
+ * irc_is_highlight: returns 1 if given message contains highlight (with given nick
+ *                   or at least one of string in "irc_higlight" setting
+ */
+
+int
+irc_is_highlight (char *message, char *nick)
+{
+    char *highlight, *pos, *pos_end;
+    int end, length;
+    
+    /* empty message ? */
+    if (!message || !message[0])
+        return 0;
+    
+    /* highlight by nickname */
+    if (strstr (message, nick))
+        return 1;
+    
+    /* no highlight by nickname and "irc_highlight" is empty */
+    if (!cfg_irc_highlight || !cfg_irc_highlight[0])
+        return 0;
+    
+    /* look in "irc_highlight" for highlight */
+    if ((highlight = strdup (cfg_irc_highlight)) == NULL)
+        return 0;
+    pos = highlight;
+    end = 0;
+    while (!end)
+    {
+        pos_end = strchr (pos, ',');
+        if (!pos_end)
+        {
+            pos_end = strchr (pos, '\0');
+            end = 1;
+        }
+        /* error parsing string! */
+        if (!pos_end)
+        {
+            free (highlight);
+            return 0;
+        }
+        
+        length = pos_end - pos;
+        pos_end[0] = '\0';
+        if (length > 0)
+        {
+            /* highlight found! */
+            if (strstr (message, pos))
+            {
+                free (highlight);
+                return 1;
+            }
+        }
+        
+        if (!end)
+            pos = pos_end + 1;
+    }
+    
+    /* no highlight found with "irc_highlight" list */
+    free (highlight);
+    return 0;
+}
+
+/*
  * irc_recv_command: executes action when receiving IRC command
  *                   returns:  0 = all ok, command executed
  *                            -1 = command failed
@@ -1232,7 +1296,7 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
                     if (pos2)
                         pos2[0] = '\0';
                     irc_display_prefix (ptr_channel->buffer, PREFIX_ACTION_ME);
-                    if (strstr (pos, server->nick))
+                    if (irc_is_highlight (pos, server->nick))
                     {
                         gui_printf_type_color (ptr_channel->buffer,
                                                MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
@@ -1271,7 +1335,7 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
                 else
                 {
                     ptr_nick = nick_search (ptr_channel, host);
-                    if (strstr (pos, server->nick))
+                    if (irc_is_highlight (pos, server->nick))
                     {
                         irc_display_nick (ptr_channel->buffer, ptr_nick,
                                           (ptr_nick) ? NULL : host,
@@ -1714,7 +1778,7 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
                 if (pos2)
                     pos2[0] = '\0';
                 irc_display_prefix (ptr_channel->buffer, PREFIX_ACTION_ME);
-                if (strstr (pos, server->nick))
+                if (irc_is_highlight (pos, server->nick))
                 {
                     gui_printf_type_color (ptr_channel->buffer,
                                            MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
@@ -1741,7 +1805,7 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
                 gui_printf_type_color (ptr_channel->buffer,
                                        MSG_TYPE_NICK,
                                        COLOR_WIN_CHAT_DARK, "<");
-                if (strstr (pos, server->nick))
+                if (irc_is_highlight (pos, server->nick))
                 {
                     gui_printf_type_color (ptr_channel->buffer,
                                            MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
diff --git a/src/irc/irc.h b/src/irc/irc.h
index d20dff257..915f91e3e 100644
--- a/src/irc/irc.h
+++ b/src/irc/irc.h
@@ -351,6 +351,7 @@ extern void irc_display_server (t_irc_server *ptr_server);
 
 /* IRC protocol (irc-commands.c) */
 
+extern int irc_is_highlight (char *, char *);
 extern int irc_recv_command (t_irc_server *, char *, char *, char *, char *);
 extern void irc_login (t_irc_server *);
 /* IRC commands issued by user */
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 674441b1d..eaae10918 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -5,6 +5,7 @@ ChangeLog - 2005-07-19
 
 
 Version 0.1.4 (under dev!):
+   * added "irc_highlight" setting, to get highlight with any word
    * fixed auto-rejoin for channels with key
    * fixed /ctcp command (now any command/data allowed)
    * added /amsg command (send text to all channels of all connected servers)
diff --git a/weechat/po/es.po b/weechat/po/es.po
index 76f219ac7..da2400a35 100644
--- a/weechat/po/es.po
+++ b/weechat/po/es.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.4-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-07-19 14:19+0200\n"
-"PO-Revision-Date: 2005-07-19 14:20+0200\n"
+"POT-Creation-Date: 2005-07-19 19:09+0200\n"
+"PO-Revision-Date: 2005-07-19 19:12+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"
@@ -20,7 +20,7 @@ msgstr ""
 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:1682
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1687
 msgid "Unable to get user's name"
 msgstr "No ha sido posible obtener el nombre de usuario"
 
@@ -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:3840
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:3904
 msgid "unknown"
 msgstr "desconocido"
 
@@ -1391,12 +1391,12 @@ 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:322
+#: src/irc/irc-send.c:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:386
 #, 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:1702
+#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1766
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
@@ -1406,438 +1406,438 @@ 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:182
+#: src/irc/irc-recv.c:246
 msgid "You have been invited to "
 msgstr "Has sido invitado a "
 
-#: src/irc/irc-recv.c:185
+#: src/irc/irc-recv.c:249
 msgid "by"
 msgstr "por"
 
-#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:289 src/irc/irc-recv.c:788
-#: src/irc/irc-recv.c:1123 src/irc/irc-recv.c:1302 src/irc/irc-recv.c:3058
-#: src/irc/irc-recv.c:3125
+#: src/irc/irc-recv.c:259 src/irc/irc-recv.c:353 src/irc/irc-recv.c:852
+#: src/irc/irc-recv.c:1187 src/irc/irc-recv.c:1366 src/irc/irc-recv.c:3122
+#: src/irc/irc-recv.c:3189
 #, 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:221
+#: src/irc/irc-recv.c:285
 #, 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:241
+#: src/irc/irc-recv.c:305
 msgid " has joined "
 msgstr " se ha unido "
 
-#: src/irc/irc-recv.c:298
+#: src/irc/irc-recv.c:362
 msgid " has kicked "
 msgstr " se ha expulsado "
 
-#: src/irc/irc-recv.c:302
+#: src/irc/irc-recv.c:366
 msgid " from "
 msgstr " de "
 
-#: src/irc/irc-recv.c:388
+#: src/irc/irc-recv.c:452
 msgid " has killed "
 msgstr "ha matado"
 
-#: src/irc/irc-recv.c:394
+#: src/irc/irc-recv.c:458
 msgid " from server"
 msgstr "del servidor"
 
-#: src/irc/irc-recv.c:404
+#: src/irc/irc-recv.c:468
 msgid " from server\n"
 msgstr "del servidor\n"
 
-#: src/irc/irc-recv.c:411
+#: src/irc/irc-recv.c:475
 #, 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:451
+#: src/irc/irc-recv.c:515
 msgid "sets ban on"
 msgstr "establecer baneo en"
 
-#: src/irc/irc-recv.c:452
+#: src/irc/irc-recv.c:516
 msgid "removes ban on"
 msgstr "quitar baneo en"
 
-#: src/irc/irc-recv.c:476
+#: src/irc/irc-recv.c:540
 msgid "gives half channel operator status to"
 msgstr "dar estado de media operador de canal a"
 
-#: src/irc/irc-recv.c:477
+#: src/irc/irc-recv.c:541
 msgid "removes half channel operator status from"
 msgstr "eliminar el estado de media operador de canal a"
 
-#: src/irc/irc-recv.c:504
+#: src/irc/irc-recv.c:568
 msgid "sets invite-only channel flag"
 msgstr "define el canal sólo en modo invitado"
 
-#: src/irc/irc-recv.c:505
+#: src/irc/irc-recv.c:569
 msgid "removes invite-only channel flag"
 msgstr "elimina el modo sólo invitado para el canal"
 
-#: src/irc/irc-recv.c:522
+#: src/irc/irc-recv.c:586
 msgid "sets channel key to"
 msgstr "definir clave de canal en"
 
-#: src/irc/irc-recv.c:523
+#: src/irc/irc-recv.c:587
 msgid "removes channel key"
 msgstr "elimina la clave de canal"
 
-#: src/irc/irc-recv.c:554
+#: src/irc/irc-recv.c:618
 msgid "sets the user limit to"
 msgstr "define el límite de usuarios en"
 
-#: src/irc/irc-recv.c:555
+#: src/irc/irc-recv.c:619
 msgid "removes user limit"
 msgstr "elimina el límite de usuarios"
 
-#: src/irc/irc-recv.c:577
+#: src/irc/irc-recv.c:641
 msgid "sets moderated channel flag"
 msgstr "establece la moderación en el canal"
 
-#: src/irc/irc-recv.c:578
+#: src/irc/irc-recv.c:642
 msgid "removes moderated channel flag"
 msgstr "elimina la moderación en el canal"
 
-#: src/irc/irc-recv.c:588
+#: src/irc/irc-recv.c:652
 msgid "sets messages from channel only flag"
 msgstr "establece el modo sólo mensajes de usuarios del canal"
 
-#: src/irc/irc-recv.c:589
+#: src/irc/irc-recv.c:653
 msgid "removes messages from channel only flag"
 msgstr "autoriza a todos los usuarios a escribir en el canal"
 
-#: src/irc/irc-recv.c:606
+#: src/irc/irc-recv.c:670
 msgid "gives channel operator status to"
 msgstr "dar estado de operador de canal a"
 
-#: src/irc/irc-recv.c:607
+#: src/irc/irc-recv.c:671
 msgid "removes channel operator status from"
 msgstr "eliminar el estado de operador de canal a"
 
-#: src/irc/irc-recv.c:634
+#: src/irc/irc-recv.c:698
 msgid "sets private channel flag"
 msgstr "establece el canal como privado"
 
-#: src/irc/irc-recv.c:635
+#: src/irc/irc-recv.c:699
 msgid "removes private channel flag"
 msgstr "elimina el modo privado para el canal"
 
-#: src/irc/irc-recv.c:652
+#: src/irc/irc-recv.c:716
 msgid "sets quiet on"
 msgstr ""
 
-#: src/irc/irc-recv.c:653
+#: src/irc/irc-recv.c:717
 msgid "removes quiet on"
 msgstr ""
 
-#: src/irc/irc-recv.c:670
+#: src/irc/irc-recv.c:734
 msgid "sets secret channel flag"
 msgstr "establece el canal como secreto"
 
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:735
 msgid "removes secret channel flag"
 msgstr "elimina el modo secreto para el canal"
 
-#: src/irc/irc-recv.c:681
+#: src/irc/irc-recv.c:745
 msgid "sets topic protection"
 msgstr "activa la protección de tema"
 
-#: src/irc/irc-recv.c:682
+#: src/irc/irc-recv.c:746
 msgid "removes topic protection"
 msgstr "elimina la protección de tema"
 
-#: src/irc/irc-recv.c:699
+#: src/irc/irc-recv.c:763
 msgid "gives voice to"
 msgstr "da voz a"
 
-#: src/irc/irc-recv.c:700
+#: src/irc/irc-recv.c:764
 msgid "removes voice from"
 msgstr "quita la voz a"
 
-#: src/irc/irc-recv.c:743 src/irc/irc-recv.c:828 src/irc/irc-recv.c:1197
-#: src/irc/irc-recv.c:1798
+#: src/irc/irc-recv.c:807 src/irc/irc-recv.c:892 src/irc/irc-recv.c:1261
+#: src/irc/irc-recv.c:1862
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr "%s comando \"%s\" recibido sin host \n"
 
-#: src/irc/irc-recv.c:758
+#: src/irc/irc-recv.c:822
 #, 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:803
+#: src/irc/irc-recv.c:867
 msgid "mode changed by"
 msgstr "modo cambiado por"
 
-#: src/irc/irc-recv.c:867
+#: src/irc/irc-recv.c:931
 msgid "You are "
 msgstr "Usted es "
 
-#: src/irc/irc-recv.c:874
+#: src/irc/irc-recv.c:938
 msgid " is "
 msgstr "es "
 
-#: src/irc/irc-recv.c:878
+#: src/irc/irc-recv.c:942
 msgid "now known as "
 msgstr "ahora conocido como"
 
-#: src/irc/irc-recv.c:948
+#: src/irc/irc-recv.c:1012
 #, 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:961 src/irc/irc-recv.c:993
+#: src/irc/irc-recv.c:1025 src/irc/irc-recv.c:1057
 msgid "reply from"
 msgstr "respuesta de"
 
-#: src/irc/irc-recv.c:996
+#: src/irc/irc-recv.c:1060
 #, c-format
 msgid ": %ld.%ld seconds\n"
 msgstr ": %ld.%ld segundos\n"
 
-#: src/irc/irc-recv.c:1048
+#: src/irc/irc-recv.c:1112
 #, 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:1098
+#: src/irc/irc-recv.c:1162
 msgid " has left "
 msgstr " ha salido "
 
-#: src/irc/irc-recv.c:1246 src/irc/irc-recv.c:1728
+#: src/irc/irc-recv.c:1310 src/irc/irc-recv.c:1792
 #, c-format
 msgid "On %s: * %s %s"
 msgstr "En %s: * %s %s"
 
-#: src/irc/irc-recv.c:1265
+#: src/irc/irc-recv.c:1329
 #, c-format
 msgid "Received a CTCP SOUND \"%s\" from "
 msgstr "Recibido un sonido CTCP \\\"%s\\\" de "
 
-#: src/irc/irc-recv.c:1285
+#: src/irc/irc-recv.c:1349
 #, c-format
 msgid "On %s: %s> %s"
 msgstr "En %s: %s> %s"
 
-#: src/irc/irc-recv.c:1362 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1682
+#: src/irc/irc-recv.c:1426 src/irc/irc-recv.c:1462 src/irc/irc-recv.c:1746
 msgid "received from"
 msgstr "recibido de"
 
-#: src/irc/irc-recv.c:1413 src/irc/irc-recv.c:1430 src/irc/irc-recv.c:1446
-#: src/irc/irc-recv.c:1462 src/irc/irc-recv.c:1487 src/irc/irc-recv.c:1504
-#: src/irc/irc-recv.c:1520 src/irc/irc-recv.c:1544 src/irc/irc-recv.c:1561
-#: src/irc/irc-recv.c:1577 src/irc/irc-recv.c:1601 src/irc/irc-recv.c:1618
-#: src/irc/irc-recv.c:1633 src/irc/irc-recv.c:1774 src/irc/irc-recv.c:3424
-#: src/irc/irc-recv.c:3482 src/irc/irc-recv.c:3634 src/irc/irc-recv.c:3649
-#: src/irc/irc-recv.c:3664 src/irc/irc-recv.c:3679 src/irc/irc-recv.c:3692
-#: src/irc/irc-recv.c:3742 src/irc/irc-recv.c:3756
+#: src/irc/irc-recv.c:1477 src/irc/irc-recv.c:1494 src/irc/irc-recv.c:1510
+#: src/irc/irc-recv.c:1526 src/irc/irc-recv.c:1551 src/irc/irc-recv.c:1568
+#: src/irc/irc-recv.c:1584 src/irc/irc-recv.c:1608 src/irc/irc-recv.c:1625
+#: src/irc/irc-recv.c:1641 src/irc/irc-recv.c:1665 src/irc/irc-recv.c:1682
+#: src/irc/irc-recv.c:1697 src/irc/irc-recv.c:1838 src/irc/irc-recv.c:3488
+#: src/irc/irc-recv.c:3546 src/irc/irc-recv.c:3698 src/irc/irc-recv.c:3713
+#: src/irc/irc-recv.c:3728 src/irc/irc-recv.c:3743 src/irc/irc-recv.c:3756
+#: src/irc/irc-recv.c:3806 src/irc/irc-recv.c:3820
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr "%s no es posible analizar el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:1646
+#: src/irc/irc-recv.c:1710
 #, c-format
 msgid "%s unknown DCC CHAT type received from "
 msgstr "%s tipo DCC CHAT desconocido recibido de "
 
-#: src/irc/irc-recv.c:1678
+#: src/irc/irc-recv.c:1742
 msgid "Unknown CTCP "
 msgstr ""
 
-#: src/irc/irc-recv.c:1754 src/irc/irc-dcc.c:1011
+#: src/irc/irc-recv.c:1818 src/irc/irc-dcc.c:1011
 #, c-format
 msgid "Private %s> %s"
 msgstr "Privado %s> %s"
 
-#: src/irc/irc-recv.c:1830
+#: src/irc/irc-recv.c:1894
 msgid "has quit"
 msgstr "ha salido"
 
-#: src/irc/irc-recv.c:1951
+#: src/irc/irc-recv.c:2015
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr "%s comando \"%s\" recibido sin canal\n"
 
-#: src/irc/irc-recv.c:1979
+#: src/irc/irc-recv.c:2043
 msgid " has changed topic for "
 msgstr "ha cambiado el tema por "
 
-#: src/irc/irc-recv.c:1984
+#: src/irc/irc-recv.c:2048
 #, c-format
 msgid " to: \"%s\"\n"
 msgstr " a: \"%s\"\n"
 
-#: src/irc/irc-recv.c:1990
+#: src/irc/irc-recv.c:2054
 msgid " has unset topic for "
 msgstr " ha quitado el tema por "
 
-#: src/irc/irc-recv.c:2108
+#: src/irc/irc-recv.c:2172
 #, c-format
 msgid " is away: %s\n"
 msgstr " está ausente: %s\n"
 
-#: src/irc/irc-recv.c:2182
+#: src/irc/irc-recv.c:2246
 msgid "Users online: "
 msgstr "Usuarios conectados: "
 
-#: src/irc/irc-recv.c:2629
+#: src/irc/irc-recv.c:2693
 msgid "idle: "
 msgstr "sin actividad: "
 
-#: src/irc/irc-recv.c:2637
+#: src/irc/irc-recv.c:2701
 msgid "days"
 msgstr "días"
 
-#: src/irc/irc-recv.c:2637
+#: src/irc/irc-recv.c:2701
 msgid "day"
 msgstr "día"
 
-#: src/irc/irc-recv.c:2647
+#: src/irc/irc-recv.c:2711
 msgid "hours"
 msgstr "horas"
 
-#: src/irc/irc-recv.c:2647
+#: src/irc/irc-recv.c:2711
 msgid "hour"
 msgstr "hora"
 
-#: src/irc/irc-recv.c:2653
+#: src/irc/irc-recv.c:2717
 msgid "minutes"
 msgstr "minutos"
 
-#: src/irc/irc-recv.c:2653
+#: src/irc/irc-recv.c:2717
 msgid "minute"
 msgstr "minuto"
 
-#: src/irc/irc-recv.c:2659
+#: src/irc/irc-recv.c:2723
 msgid "seconds"
 msgstr "segundos"
 
-#: src/irc/irc-recv.c:2659
+#: src/irc/irc-recv.c:2723
 msgid "second"
 msgstr "segundo"
 
-#: src/irc/irc-recv.c:2664
+#: src/irc/irc-recv.c:2728
 msgid "signon at: "
 msgstr "firmado el: "
 
-#: src/irc/irc-recv.c:2752
+#: src/irc/irc-recv.c:2816
 msgid "Channels: "
 msgstr "Canales: "
 
-#: src/irc/irc-recv.c:3004
+#: src/irc/irc-recv.c:3068
 msgid "No topic set for "
 msgstr "No hay tema definido para "
 
-#: src/irc/irc-recv.c:3046
+#: src/irc/irc-recv.c:3110
 msgid "Topic for "
 msgstr "El tema para "
 
-#: src/irc/irc-recv.c:3050
+#: src/irc/irc-recv.c:3114
 #, c-format
 msgid " is: \"%s\"\n"
 msgstr " es: \"%s\"\n"
 
-#: src/irc/irc-recv.c:3068 src/irc/irc-recv.c:3152 src/irc/irc-recv.c:3205
+#: src/irc/irc-recv.c:3132 src/irc/irc-recv.c:3216 src/irc/irc-recv.c:3269
 #, 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:3114
+#: src/irc/irc-recv.c:3178
 msgid "Topic set by "
 msgstr "Tema definido por "
 
-#: src/irc/irc-recv.c:3134
+#: src/irc/irc-recv.c:3198
 #, 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:3143 src/irc/irc-recv.c:3214
+#: src/irc/irc-recv.c:3207 src/irc/irc-recv.c:3278
 #, 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:3193
+#: src/irc/irc-recv.c:3257
 msgid "has invited"
 msgstr "ha invitado"
 
-#: src/irc/irc-recv.c:3196 src/irc/irc-recv.c:3347
+#: src/irc/irc-recv.c:3260 src/irc/irc-recv.c:3411
 msgid "on"
 msgstr "en"
 
-#: src/irc/irc-recv.c:3470
+#: src/irc/irc-recv.c:3534
 #, 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:3526
+#: src/irc/irc-recv.c:3590
 msgid "Nicks "
 msgstr "Usuarios "
 
-#: src/irc/irc-recv.c:3546
+#: src/irc/irc-recv.c:3610
 msgid "Channel "
 msgstr "Canal "
 
-#: src/irc/irc-recv.c:3557
+#: src/irc/irc-recv.c:3621
 msgid "nicks"
 msgstr "usuarios"
 
-#: src/irc/irc-recv.c:3557
+#: src/irc/irc-recv.c:3621
 msgid "nick"
 msgstr "usuario"
 
-#: src/irc/irc-recv.c:3565
+#: src/irc/irc-recv.c:3629
 msgid "ops"
 msgstr "operadores"
 
-#: src/irc/irc-recv.c:3565
+#: src/irc/irc-recv.c:3629
 msgid "op"
 msgstr "operador"
 
-#: src/irc/irc-recv.c:3574
+#: src/irc/irc-recv.c:3638
 msgid "halfops"
 msgstr "semi-operadores"
 
-#: src/irc/irc-recv.c:3574
+#: src/irc/irc-recv.c:3638
 msgid "halfop"
 msgstr "semi-operador"
 
-#: src/irc/irc-recv.c:3583
+#: src/irc/irc-recv.c:3647
 msgid "voices"
 msgstr "voces"
 
-#: src/irc/irc-recv.c:3583
+#: src/irc/irc-recv.c:3647
 msgid "voice"
 msgstr "voz"
 
-#: src/irc/irc-recv.c:3592
+#: src/irc/irc-recv.c:3656
 msgid "normal"
 msgstr "normal"
 
-#: src/irc/irc-recv.c:3705
+#: src/irc/irc-recv.c:3769
 msgid "banned by"
 msgstr "baneado por"
 
-#: src/irc/irc-recv.c:3794
+#: src/irc/irc-recv.c:3858
 #, 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:3806
+#: src/irc/irc-recv.c:3870
 #, 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:3818
+#: src/irc/irc-recv.c:3882
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
@@ -1846,7 +1846,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:3828
+#: src/irc/irc-recv.c:3892
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
 msgstr ""
@@ -3733,295 +3733,303 @@ msgstr ""
 msgid "hide password displayed by nickserv"
 msgstr "ocultar contraseña mostrada por nickserv"
 
-#: src/common/weeconfig.c:522
+#: src/common/weeconfig.c:523
 msgid "display message to all channels when away"
 msgstr "mostrar mensaje en todos los canales cuando se está ausente"
 
-#: src/common/weeconfig.c:523
+#: src/common/weeconfig.c:524
 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:526 src/common/weeconfig.c:527
+#: src/common/weeconfig.c:527 src/common/weeconfig.c:528
 msgid "default message when away"
 msgstr "mensaje por defecto para el estado ausente"
 
-#: src/common/weeconfig.c:530 src/common/weeconfig.c:531
+#: src/common/weeconfig.c:531 src/common/weeconfig.c:532
 msgid "default part message (leaving channel)"
 msgstr "mensaje por defecto de salida (saliendo de un canal)"
 
-#: src/common/weeconfig.c:534
+#: src/common/weeconfig.c:535
 msgid "default quit message"
 msgstr "mensaje de fin por defecto"
 
-#: src/common/weeconfig.c:535
+#: src/common/weeconfig.c:536
 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:538
+#: src/common/weeconfig.c:539
 msgid "interval between two checks for away"
 msgstr "intervalo entre dos comprobaciones de ausencia"
 
-#: src/common/weeconfig.c:539
+#: src/common/weeconfig.c:540
 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:542
+#: src/common/weeconfig.c:543
 msgid "interval between two checks for lag"
 msgstr "intervalo entre dos medidas de lag (retraso)"
 
-#: src/common/weeconfig.c:543
+#: src/common/weeconfig.c:544
 msgid "interval between two checks for lag (in seconds)"
 msgstr "intervalo entre dos medidas de lag (en segundos)"
 
-#: src/common/weeconfig.c:546
+#: src/common/weeconfig.c:547
 msgid "minimum lag to show"
 msgstr "lag (retraso) mínimo a mostrar"
 
-#: src/common/weeconfig.c:547
+#: src/common/weeconfig.c:548
 msgid "minimum lag to show (in seconds)"
 msgstr "lag mínimo a mostrar (en segundos)"
 
-#: src/common/weeconfig.c:550
+#: src/common/weeconfig.c:551
 msgid "disconnect after important lag"
 msgstr "desconexión tras un lag importante"
 
-#: src/common/weeconfig.c:551
+#: src/common/weeconfig.c:552
 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:554 src/common/weeconfig.c:555
+#: src/common/weeconfig.c:555 src/common/weeconfig.c:556
 msgid "create a FIFO pipe for remote control"
 msgstr "crea una tubería FIFO para control remoto"
 
-#: src/common/weeconfig.c:574
+#: src/common/weeconfig.c:559
+msgid "list of words to highlight"
+msgstr ""
+
+#: src/common/weeconfig.c:560
+msgid "comma separated list of words to highlight (case sensitive comparison)"
+msgstr ""
+
+#: src/common/weeconfig.c:579
 msgid "automatically accept dcc files"
 msgstr "aceptar automáticamente los ficheros dcc"
 
-#: src/common/weeconfig.c:575
+#: src/common/weeconfig.c:580
 msgid "automatically accept incoming dcc files"
 msgstr "aceptar automáticamente los ficheros dcc entrantes"
 
-#: src/common/weeconfig.c:578
+#: src/common/weeconfig.c:583
 msgid "automatically accept dcc chats"
 msgstr "aceptar automáticamente las peticiones de conversación dcc"
 
-#: src/common/weeconfig.c:579
+#: src/common/weeconfig.c:584
 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:582
+#: src/common/weeconfig.c:587
 msgid "timeout for dcc request"
 msgstr "tiempo de espera (timeout) para la petición dcc"
 
-#: src/common/weeconfig.c:583
+#: src/common/weeconfig.c:588
 msgid "timeout for dcc request (in seconds)"
 msgstr "tiempo de espera para la petición dcc (en segundos)"
 
-#: src/common/weeconfig.c:586
+#: src/common/weeconfig.c:591
 msgid "block size for dcc packets"
 msgstr "tamaño de bloque para los paquetes dcc"
 
-#: src/common/weeconfig.c:587
+#: src/common/weeconfig.c:592
 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:590
+#: src/common/weeconfig.c:595
 msgid "path for incoming files with dcc"
 msgstr "ruta para los ficheros recibidos con dcc"
 
-#: src/common/weeconfig.c:591
+#: src/common/weeconfig.c:596
 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:594
+#: src/common/weeconfig.c:599
 msgid "default path for sending files with dcc"
 msgstr "ruta por defecto para enviar ficheros con dcc"
 
-#: src/common/weeconfig.c:595
+#: src/common/weeconfig.c:600
 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:598 src/common/weeconfig.c:599
+#: src/common/weeconfig.c:603 src/common/weeconfig.c:604
 msgid "convert spaces to underscores when sending files"
 msgstr "convertir los espacios a subrayados cuando se envían los ficheros"
 
-#: src/common/weeconfig.c:602
+#: src/common/weeconfig.c:607
 msgid "automatically rename dcc files if already exists"
 msgstr "renombrar automáticamente los ficheros dcc si ya existen"
 
-#: src/common/weeconfig.c:603
+#: src/common/weeconfig.c:608
 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:606
+#: src/common/weeconfig.c:611
 msgid "automatically resume aborted transfers"
 msgstr "continuar automáticamente las transferencias canceladas"
 
-#: src/common/weeconfig.c:607
+#: src/common/weeconfig.c:612
 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:626
+#: src/common/weeconfig.c:631
 msgid "use proxy"
 msgstr "utilizar un proxy"
 
-#: src/common/weeconfig.c:627
+#: src/common/weeconfig.c:632
 msgid "use a proxy server to connect to irc server"
 msgstr "utilizar un proxy para conectarse al servidor irc"
 
-#: src/common/weeconfig.c:630
+#: src/common/weeconfig.c:635
 msgid "proxy type"
 msgstr "tipo de proxy"
 
-#: src/common/weeconfig.c:631
+#: src/common/weeconfig.c:636
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "tipo de proxy(http (por defecto), socks4, socks5)"
 
-#: src/common/weeconfig.c:634
+#: src/common/weeconfig.c:639
 msgid "use ipv6 proxy"
 msgstr "usar proxy ipv6"
 
-#: src/common/weeconfig.c:635
+#: src/common/weeconfig.c:640
 msgid "connect to proxy in ipv6"
 msgstr "conectar al proxy en ipv6"
 
-#: src/common/weeconfig.c:638
+#: src/common/weeconfig.c:643
 msgid "proxy address"
 msgstr "dirección del proxy"
 
-#: src/common/weeconfig.c:639
+#: src/common/weeconfig.c:644
 msgid "proxy server address (IP or hostname)"
 msgstr "dirección del servidor proxy (IP o nombre de máquina)"
 
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:647
 msgid "port for proxy"
 msgstr "puerto para el proxy"
 
-#: src/common/weeconfig.c:643
+#: src/common/weeconfig.c:648
 msgid "port for connecting to proxy server"
 msgstr "puerto para conectarse al servidor proxy"
 
-#: src/common/weeconfig.c:646
+#: src/common/weeconfig.c:651
 msgid "proxy username"
 msgstr "nombre de usuario del proxy"
 
-#: src/common/weeconfig.c:647
+#: src/common/weeconfig.c:652
 msgid "username for proxy server"
 msgstr "nombre de usuario para el servidor proxy"
 
-#: src/common/weeconfig.c:650
+#: src/common/weeconfig.c:655
 msgid "proxy password"
 msgstr "contraseña para el proxy"
 
-#: src/common/weeconfig.c:651
+#: src/common/weeconfig.c:656
 msgid "password for proxy server"
 msgstr "contraseña para el servidor proxy"
 
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:667
 msgid "server name"
 msgstr "nombre de servidor"
 
-#: src/common/weeconfig.c:663
+#: src/common/weeconfig.c:668
 msgid "name associated to IRC server (for display only)"
 msgstr "nombre asociado al servidor IRC (para mostrar solamente)"
 
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:671
 msgid "automatically connect to server"
 msgstr "conexión automática al servidor"
 
-#: src/common/weeconfig.c:667
+#: src/common/weeconfig.c:672
 msgid "automatically connect to server when WeeChat is starting"
 msgstr "conexión automática al servidor cuando WeeChat esté arrancando"
 
-#: src/common/weeconfig.c:670
+#: src/common/weeconfig.c:675
 msgid "automatically reconnect to server"
 msgstr "reconexión automática al servidor"
 
-#: src/common/weeconfig.c:671
+#: src/common/weeconfig.c:676
 msgid "automatically reconnect to server when disconnected"
 msgstr "reconexión automática al servidor tras una desconexión"
 
-#: src/common/weeconfig.c:674
+#: src/common/weeconfig.c:679
 msgid "delay before trying again to reconnect"
 msgstr "esperar antes de intentar de nuevo una reconexión"
 
-#: src/common/weeconfig.c:675
+#: src/common/weeconfig.c:680
 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:678
+#: src/common/weeconfig.c:683
 msgid "server address or hostname"
 msgstr "dirección o nombre de máquina del servidor"
 
-#: src/common/weeconfig.c:679
+#: src/common/weeconfig.c:684
 msgid "IP address or hostname of IRC server"
 msgstr "dirección IP o nombre de máquina del servidor IRC"
 
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:687
 msgid "port for IRC server"
 msgstr "puerto para el servidor IRC"
 
-#: src/common/weeconfig.c:683
+#: src/common/weeconfig.c:688
 msgid "port for connecting to server"
 msgstr "puerto para conectarse al servidor"
 
-#: src/common/weeconfig.c:686 src/common/weeconfig.c:687
+#: src/common/weeconfig.c:691 src/common/weeconfig.c:692
 msgid "use IPv6 protocol for server communication"
 msgstr "usar el protocolo IPv6 para la comunicación del servidor"
 
-#: src/common/weeconfig.c:690 src/common/weeconfig.c:691
+#: src/common/weeconfig.c:695 src/common/weeconfig.c:696
 msgid "use SSL for server communication"
 msgstr "usar SSL para la comunicación del servidor"
 
-#: src/common/weeconfig.c:694
+#: src/common/weeconfig.c:699
 msgid "server password"
 msgstr "contraseña para el servidor"
 
-#: src/common/weeconfig.c:695
+#: src/common/weeconfig.c:700
 msgid "password for IRC server"
 msgstr "contraseña para el servidor IRC"
 
-#: src/common/weeconfig.c:698
+#: src/common/weeconfig.c:703
 msgid "nickname for server"
 msgstr "nombre de usuario para el servidor"
 
-#: src/common/weeconfig.c:699
+#: src/common/weeconfig.c:704
 msgid "nickname to use on IRC server"
 msgstr "nombre de usuario a utilizar en el servidor IRC"
 
-#: src/common/weeconfig.c:702
+#: src/common/weeconfig.c:707
 msgid "alternate nickname for server"
 msgstr "nombre de usuario alternativo para el servidor"
 
-#: src/common/weeconfig.c:703
+#: src/common/weeconfig.c:708
 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:706
+#: src/common/weeconfig.c:711
 msgid "2nd alternate nickname for server"
 msgstr "segundo nombre de usuario alternativo para el servidor"
 
-#: src/common/weeconfig.c:707
+#: src/common/weeconfig.c:712
 msgid ""
 "2nd alternate nickname to use on IRC server (if alternate nickname is "
 "already used)"
@@ -4029,31 +4037,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:710
+#: src/common/weeconfig.c:715
 msgid "user name for server"
 msgstr "nombre de usuario para el servidor"
 
-#: src/common/weeconfig.c:711
+#: src/common/weeconfig.c:716
 msgid "user name to use on IRC server"
 msgstr "nombre de usuario para el servidor IRC"
 
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:719
 msgid "real name for server"
 msgstr "nombre real para el servidor"
 
-#: src/common/weeconfig.c:715
+#: src/common/weeconfig.c:720
 msgid "real name to use on IRC server"
 msgstr "nombre real para el servidor IRC"
 
-#: src/common/weeconfig.c:718 src/common/weeconfig.c:719
+#: src/common/weeconfig.c:723 src/common/weeconfig.c:724
 msgid "first command to run when connected to server"
 msgstr "primer comando a ejecutar cuando se conecte a un servidor"
 
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:727
 msgid "delay (in seconds) after command was executed"
 msgstr "espera (en segundos) después de que el comando sea ejecutado"
 
-#: src/common/weeconfig.c:723
+#: src/common/weeconfig.c:728
 msgid ""
 "delay (in seconds) after command was executed (example: give some time for "
 "authentication)"
@@ -4061,25 +4069,25 @@ 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:726
+#: src/common/weeconfig.c:731
 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:727
+#: src/common/weeconfig.c:732
 msgid "comma separated list of channels to join when connected to server"
 msgstr ""
 "lista de canales (separados por comas) a unirse cuando se conecte a un "
 "servidor"
 
-#: src/common/weeconfig.c:730 src/common/weeconfig.c:731
+#: src/common/weeconfig.c:735 src/common/weeconfig.c:736
 msgid "automatically rejoin channels when kicked"
 msgstr "unirse de nuevo automáticamente a los canales cuando sea expulsado"
 
-#: src/common/weeconfig.c:734
+#: src/common/weeconfig.c:739
 msgid "notify levels for channels of this server"
 msgstr "niveles de notificación para canales de este servidor"
 
-#: src/common/weeconfig.c:735
+#: src/common/weeconfig.c:740
 msgid ""
 "comma separated list of notify levels for channels of this server (format: "
 "#channel:1,..)"
@@ -4087,62 +4095,62 @@ msgstr ""
 "lista separada por comas de niveles de notificación para canales de este "
 "servidor (formato: #canal:1,...)"
 
-#: src/common/weeconfig.c:1195
+#: src/common/weeconfig.c:1200
 #, 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:1204
+#: src/common/weeconfig.c:1209
 #, 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:1219
+#: src/common/weeconfig.c:1224
 #, 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:1259
+#: src/common/weeconfig.c:1264
 #, 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:1270
+#: src/common/weeconfig.c:1275
 #, 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:1309
+#: src/common/weeconfig.c:1314
 #, c-format
 msgid "%s config file \"%s\" not found.\n"
 msgstr "%s fichero de configuración \"%s\" no encontrado.\n"
 
-#: src/common/weeconfig.c:1341
+#: src/common/weeconfig.c:1346
 #, 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:1358
+#: src/common/weeconfig.c:1363
 #, 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:1376
+#: src/common/weeconfig.c:1381
 #, 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:1384
+#: src/common/weeconfig.c:1389
 #, 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:1432
+#: src/common/weeconfig.c:1437
 #, 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:1443
+#: src/common/weeconfig.c:1448
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value foroption '%s'\n"
@@ -4151,7 +4159,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:1452
+#: src/common/weeconfig.c:1457
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4160,7 +4168,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:1463
+#: src/common/weeconfig.c:1468
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4169,26 +4177,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:1479
+#: src/common/weeconfig.c:1484
 #, 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:1541 src/common/weeconfig.c:1736
+#: src/common/weeconfig.c:1546 src/common/weeconfig.c:1741
 #, c-format
 msgid "%s cannot create file \"%s\"\n"
 msgstr "%s no es posible crear el fichero \"%s\"\n"
 
-#: src/common/weeconfig.c:1547
+#: src/common/weeconfig.c:1552
 #, c-format
 msgid "%s: creating default config file...\n"
 msgstr "%s: creando fichero de configuración por defecto...\n"
 
-#: src/common/weeconfig.c:1548
+#: src/common/weeconfig.c:1553
 msgid "Creating default config file\n"
 msgstr "Creando fichero de configuración por defecto\n"
 
-#: src/common/weeconfig.c:1551 src/common/weeconfig.c:1745
+#: src/common/weeconfig.c:1556 src/common/weeconfig.c:1750
 #, c-format
 msgid ""
 "#\n"
@@ -4197,6 +4205,6 @@ msgstr ""
 "#\n"
 "# %s: fichero de configuración, creado por %s v%s el %s#\n"
 
-#: src/common/weeconfig.c:1742
+#: src/common/weeconfig.c:1747
 msgid "Saving config to disk\n"
 msgstr "Guardar configuración a disco\n"
diff --git a/weechat/po/fr.po b/weechat/po/fr.po
index eb871e69c..1fb078433 100644
--- a/weechat/po/fr.po
+++ b/weechat/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.4-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-07-19 14:19+0200\n"
-"PO-Revision-Date: 2005-07-19 14:19+0200\n"
+"POT-Creation-Date: 2005-07-19 19:09+0200\n"
+"PO-Revision-Date: 2005-07-19 19:12+0200\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 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:1682
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1687
 msgid "Unable to get user's name"
 msgstr "Impossible de déterminer le nom d'utilisateur"
 
@@ -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:3840
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:3904
 msgid "unknown"
 msgstr "inconnu"
 
@@ -1393,12 +1393,12 @@ 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:322
+#: src/irc/irc-send.c:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:386
 #, 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:1702
+#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1766
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
@@ -1408,438 +1408,438 @@ 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:182
+#: src/irc/irc-recv.c:246
 msgid "You have been invited to "
 msgstr "Vous avez été invité sur "
 
-#: src/irc/irc-recv.c:185
+#: src/irc/irc-recv.c:249
 msgid "by"
 msgstr "par"
 
-#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:289 src/irc/irc-recv.c:788
-#: src/irc/irc-recv.c:1123 src/irc/irc-recv.c:1302 src/irc/irc-recv.c:3058
-#: src/irc/irc-recv.c:3125
+#: src/irc/irc-recv.c:259 src/irc/irc-recv.c:353 src/irc/irc-recv.c:852
+#: src/irc/irc-recv.c:1187 src/irc/irc-recv.c:1366 src/irc/irc-recv.c:3122
+#: src/irc/irc-recv.c:3189
 #, 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:221
+#: src/irc/irc-recv.c:285
 #, 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:241
+#: src/irc/irc-recv.c:305
 msgid " has joined "
 msgstr " a rejoint "
 
-#: src/irc/irc-recv.c:298
+#: src/irc/irc-recv.c:362
 msgid " has kicked "
 msgstr " a poussé dehors "
 
-#: src/irc/irc-recv.c:302
+#: src/irc/irc-recv.c:366
 msgid " from "
 msgstr " de "
 
-#: src/irc/irc-recv.c:388
+#: src/irc/irc-recv.c:452
 msgid " has killed "
 msgstr " a tué "
 
-#: src/irc/irc-recv.c:394
+#: src/irc/irc-recv.c:458
 msgid " from server"
 msgstr " du serveur"
 
-#: src/irc/irc-recv.c:404
+#: src/irc/irc-recv.c:468
 msgid " from server\n"
 msgstr " du serveur\n"
 
-#: src/irc/irc-recv.c:411
+#: src/irc/irc-recv.c:475
 #, 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:451
+#: src/irc/irc-recv.c:515
 msgid "sets ban on"
 msgstr "instaure un bannissement sur"
 
-#: src/irc/irc-recv.c:452
+#: src/irc/irc-recv.c:516
 msgid "removes ban on"
 msgstr "supprime le banissement sur"
 
-#: src/irc/irc-recv.c:476
+#: src/irc/irc-recv.c:540
 msgid "gives half channel operator status to"
 msgstr "donne le droit demi-opérateur à"
 
-#: src/irc/irc-recv.c:477
+#: src/irc/irc-recv.c:541
 msgid "removes half channel operator status from"
 msgstr "supprime le droit demi-opérateur à"
 
-#: src/irc/irc-recv.c:504
+#: src/irc/irc-recv.c:568
 msgid "sets invite-only channel flag"
 msgstr "définit le canal en mode invité seulement"
 
-#: src/irc/irc-recv.c:505
+#: src/irc/irc-recv.c:569
 msgid "removes invite-only channel flag"
 msgstr "supprime le mode invité seulement pour le canal"
 
-#: src/irc/irc-recv.c:522
+#: src/irc/irc-recv.c:586
 msgid "sets channel key to"
 msgstr "définit la clé du canal à"
 
-#: src/irc/irc-recv.c:523
+#: src/irc/irc-recv.c:587
 msgid "removes channel key"
 msgstr "supprime la clé du canal"
 
-#: src/irc/irc-recv.c:554
+#: src/irc/irc-recv.c:618
 msgid "sets the user limit to"
 msgstr "définit la limite d'utilisateurs à"
 
-#: src/irc/irc-recv.c:555
+#: src/irc/irc-recv.c:619
 msgid "removes user limit"
 msgstr "supprime la limite d'utilisateurs"
 
-#: src/irc/irc-recv.c:577
+#: src/irc/irc-recv.c:641
 msgid "sets moderated channel flag"
 msgstr "instaure la modération sur le canal"
 
-#: src/irc/irc-recv.c:578
+#: src/irc/irc-recv.c:642
 msgid "removes moderated channel flag"
 msgstr "supprime la modération sur le canal"
 
-#: src/irc/irc-recv.c:588
+#: src/irc/irc-recv.c:652
 msgid "sets messages from channel only flag"
 msgstr "interdit aux utilisateurs en dehors du canal d'y écrire"
 
-#: src/irc/irc-recv.c:589
+#: src/irc/irc-recv.c:653
 msgid "removes messages from channel only flag"
 msgstr "autorise tout utilisateur à écrire sur le canal"
 
-#: src/irc/irc-recv.c:606
+#: src/irc/irc-recv.c:670
 msgid "gives channel operator status to"
 msgstr "donne le droit opérateur à"
 
-#: src/irc/irc-recv.c:607
+#: src/irc/irc-recv.c:671
 msgid "removes channel operator status from"
 msgstr "supprime le droit opérateur à"
 
-#: src/irc/irc-recv.c:634
+#: src/irc/irc-recv.c:698
 msgid "sets private channel flag"
 msgstr "définit le canal comme privé"
 
-#: src/irc/irc-recv.c:635
+#: src/irc/irc-recv.c:699
 msgid "removes private channel flag"
 msgstr "supprime le mode privé pour le canal"
 
-#: src/irc/irc-recv.c:652
+#: src/irc/irc-recv.c:716
 msgid "sets quiet on"
 msgstr "définit le mode muet sur"
 
-#: src/irc/irc-recv.c:653
+#: src/irc/irc-recv.c:717
 msgid "removes quiet on"
 msgstr "supprime le mode muet sur"
 
-#: src/irc/irc-recv.c:670
+#: src/irc/irc-recv.c:734
 msgid "sets secret channel flag"
 msgstr "définit le canal comme secret"
 
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:735
 msgid "removes secret channel flag"
 msgstr "supprime le mode secret pour le canal"
 
-#: src/irc/irc-recv.c:681
+#: src/irc/irc-recv.c:745
 msgid "sets topic protection"
 msgstr "active la protection du titre"
 
-#: src/irc/irc-recv.c:682
+#: src/irc/irc-recv.c:746
 msgid "removes topic protection"
 msgstr "supprime la protection du titre"
 
-#: src/irc/irc-recv.c:699
+#: src/irc/irc-recv.c:763
 msgid "gives voice to"
 msgstr "donne la voix à"
 
-#: src/irc/irc-recv.c:700
+#: src/irc/irc-recv.c:764
 msgid "removes voice from"
 msgstr "supprime la voix de"
 
-#: src/irc/irc-recv.c:743 src/irc/irc-recv.c:828 src/irc/irc-recv.c:1197
-#: src/irc/irc-recv.c:1798
+#: src/irc/irc-recv.c:807 src/irc/irc-recv.c:892 src/irc/irc-recv.c:1261
+#: src/irc/irc-recv.c:1862
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr "%s commande \"%s\" reçue sans host\n"
 
-#: src/irc/irc-recv.c:758
+#: src/irc/irc-recv.c:822
 #, 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:803
+#: src/irc/irc-recv.c:867
 msgid "mode changed by"
 msgstr "mode changé par"
 
-#: src/irc/irc-recv.c:867
+#: src/irc/irc-recv.c:931
 msgid "You are "
 msgstr "Vous êtes "
 
-#: src/irc/irc-recv.c:874
+#: src/irc/irc-recv.c:938
 msgid " is "
 msgstr " est "
 
-#: src/irc/irc-recv.c:878
+#: src/irc/irc-recv.c:942
 msgid "now known as "
 msgstr "maintenant connu sous le nom "
 
-#: src/irc/irc-recv.c:948
+#: src/irc/irc-recv.c:1012
 #, 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:961 src/irc/irc-recv.c:993
+#: src/irc/irc-recv.c:1025 src/irc/irc-recv.c:1057
 msgid "reply from"
 msgstr "réponse de"
 
-#: src/irc/irc-recv.c:996
+#: src/irc/irc-recv.c:1060
 #, c-format
 msgid ": %ld.%ld seconds\n"
 msgstr ": %ld.%ld secondes\n"
 
-#: src/irc/irc-recv.c:1048
+#: src/irc/irc-recv.c:1112
 #, 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:1098
+#: src/irc/irc-recv.c:1162
 msgid " has left "
 msgstr " a quitté "
 
-#: src/irc/irc-recv.c:1246 src/irc/irc-recv.c:1728
+#: src/irc/irc-recv.c:1310 src/irc/irc-recv.c:1792
 #, c-format
 msgid "On %s: * %s %s"
 msgstr "Sur %s: * %s %s"
 
-#: src/irc/irc-recv.c:1265
+#: src/irc/irc-recv.c:1329
 #, c-format
 msgid "Received a CTCP SOUND \"%s\" from "
 msgstr "CTCP SOUND \"%s\" reçu de "
 
-#: src/irc/irc-recv.c:1285
+#: src/irc/irc-recv.c:1349
 #, c-format
 msgid "On %s: %s> %s"
 msgstr "Sur %s: %s> %s"
 
-#: src/irc/irc-recv.c:1362 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1682
+#: src/irc/irc-recv.c:1426 src/irc/irc-recv.c:1462 src/irc/irc-recv.c:1746
 msgid "received from"
 msgstr "reçu de"
 
-#: src/irc/irc-recv.c:1413 src/irc/irc-recv.c:1430 src/irc/irc-recv.c:1446
-#: src/irc/irc-recv.c:1462 src/irc/irc-recv.c:1487 src/irc/irc-recv.c:1504
-#: src/irc/irc-recv.c:1520 src/irc/irc-recv.c:1544 src/irc/irc-recv.c:1561
-#: src/irc/irc-recv.c:1577 src/irc/irc-recv.c:1601 src/irc/irc-recv.c:1618
-#: src/irc/irc-recv.c:1633 src/irc/irc-recv.c:1774 src/irc/irc-recv.c:3424
-#: src/irc/irc-recv.c:3482 src/irc/irc-recv.c:3634 src/irc/irc-recv.c:3649
-#: src/irc/irc-recv.c:3664 src/irc/irc-recv.c:3679 src/irc/irc-recv.c:3692
-#: src/irc/irc-recv.c:3742 src/irc/irc-recv.c:3756
+#: src/irc/irc-recv.c:1477 src/irc/irc-recv.c:1494 src/irc/irc-recv.c:1510
+#: src/irc/irc-recv.c:1526 src/irc/irc-recv.c:1551 src/irc/irc-recv.c:1568
+#: src/irc/irc-recv.c:1584 src/irc/irc-recv.c:1608 src/irc/irc-recv.c:1625
+#: src/irc/irc-recv.c:1641 src/irc/irc-recv.c:1665 src/irc/irc-recv.c:1682
+#: src/irc/irc-recv.c:1697 src/irc/irc-recv.c:1838 src/irc/irc-recv.c:3488
+#: src/irc/irc-recv.c:3546 src/irc/irc-recv.c:3698 src/irc/irc-recv.c:3713
+#: src/irc/irc-recv.c:3728 src/irc/irc-recv.c:3743 src/irc/irc-recv.c:3756
+#: src/irc/irc-recv.c:3806 src/irc/irc-recv.c:3820
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr "%s impossible d'analyser la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:1646
+#: src/irc/irc-recv.c:1710
 #, 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:1678
+#: src/irc/irc-recv.c:1742
 msgid "Unknown CTCP "
 msgstr "CTCP inconnu "
 
-#: src/irc/irc-recv.c:1754 src/irc/irc-dcc.c:1011
+#: src/irc/irc-recv.c:1818 src/irc/irc-dcc.c:1011
 #, c-format
 msgid "Private %s> %s"
 msgstr "Prive %s> %s"
 
-#: src/irc/irc-recv.c:1830
+#: src/irc/irc-recv.c:1894
 msgid "has quit"
 msgstr "a quitté"
 
-#: src/irc/irc-recv.c:1951
+#: src/irc/irc-recv.c:2015
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr "%s commande \"%s\" reçue sans canal\n"
 
-#: src/irc/irc-recv.c:1979
+#: src/irc/irc-recv.c:2043
 msgid " has changed topic for "
 msgstr " a changé le titre pour "
 
-#: src/irc/irc-recv.c:1984
+#: src/irc/irc-recv.c:2048
 #, c-format
 msgid " to: \"%s\"\n"
 msgstr " en: \"%s\"\n"
 
-#: src/irc/irc-recv.c:1990
+#: src/irc/irc-recv.c:2054
 msgid " has unset topic for "
 msgstr " a retiré le titre pour "
 
-#: src/irc/irc-recv.c:2108
+#: src/irc/irc-recv.c:2172
 #, c-format
 msgid " is away: %s\n"
 msgstr " est absent: %s\n"
 
-#: src/irc/irc-recv.c:2182
+#: src/irc/irc-recv.c:2246
 msgid "Users online: "
 msgstr "Utilisateurs en ligne: "
 
-#: src/irc/irc-recv.c:2629
+#: src/irc/irc-recv.c:2693
 msgid "idle: "
 msgstr "inactivité: "
 
-#: src/irc/irc-recv.c:2637
+#: src/irc/irc-recv.c:2701
 msgid "days"
 msgstr "jours"
 
-#: src/irc/irc-recv.c:2637
+#: src/irc/irc-recv.c:2701
 msgid "day"
 msgstr "jour"
 
-#: src/irc/irc-recv.c:2647
+#: src/irc/irc-recv.c:2711
 msgid "hours"
 msgstr "heures"
 
-#: src/irc/irc-recv.c:2647
+#: src/irc/irc-recv.c:2711
 msgid "hour"
 msgstr "heure"
 
-#: src/irc/irc-recv.c:2653
+#: src/irc/irc-recv.c:2717
 msgid "minutes"
 msgstr "minutes"
 
-#: src/irc/irc-recv.c:2653
+#: src/irc/irc-recv.c:2717
 msgid "minute"
 msgstr "minute"
 
-#: src/irc/irc-recv.c:2659
+#: src/irc/irc-recv.c:2723
 msgid "seconds"
 msgstr "secondes"
 
-#: src/irc/irc-recv.c:2659
+#: src/irc/irc-recv.c:2723
 msgid "second"
 msgstr "seconde"
 
-#: src/irc/irc-recv.c:2664
+#: src/irc/irc-recv.c:2728
 msgid "signon at: "
 msgstr "signé le: "
 
-#: src/irc/irc-recv.c:2752
+#: src/irc/irc-recv.c:2816
 msgid "Channels: "
 msgstr "Canaux: "
 
-#: src/irc/irc-recv.c:3004
+#: src/irc/irc-recv.c:3068
 msgid "No topic set for "
 msgstr "Pas de titre défini pour "
 
-#: src/irc/irc-recv.c:3046
+#: src/irc/irc-recv.c:3110
 msgid "Topic for "
 msgstr "Le titre pour "
 
-#: src/irc/irc-recv.c:3050
+#: src/irc/irc-recv.c:3114
 #, c-format
 msgid " is: \"%s\"\n"
 msgstr " est: \"%s\"\n"
 
-#: src/irc/irc-recv.c:3068 src/irc/irc-recv.c:3152 src/irc/irc-recv.c:3205
+#: src/irc/irc-recv.c:3132 src/irc/irc-recv.c:3216 src/irc/irc-recv.c:3269
 #, 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:3114
+#: src/irc/irc-recv.c:3178
 msgid "Topic set by "
 msgstr "Titre défini par "
 
-#: src/irc/irc-recv.c:3134
+#: src/irc/irc-recv.c:3198
 #, 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:3143 src/irc/irc-recv.c:3214
+#: src/irc/irc-recv.c:3207 src/irc/irc-recv.c:3278
 #, 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:3193
+#: src/irc/irc-recv.c:3257
 msgid "has invited"
 msgstr "a invité"
 
-#: src/irc/irc-recv.c:3196 src/irc/irc-recv.c:3347
+#: src/irc/irc-recv.c:3260 src/irc/irc-recv.c:3411
 msgid "on"
 msgstr "sur"
 
-#: src/irc/irc-recv.c:3470
+#: src/irc/irc-recv.c:3534
 #, 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:3526
+#: src/irc/irc-recv.c:3590
 msgid "Nicks "
 msgstr "Utilisateurs "
 
-#: src/irc/irc-recv.c:3546
+#: src/irc/irc-recv.c:3610
 msgid "Channel "
 msgstr "Canal "
 
-#: src/irc/irc-recv.c:3557
+#: src/irc/irc-recv.c:3621
 msgid "nicks"
 msgstr "utilisateurs"
 
-#: src/irc/irc-recv.c:3557
+#: src/irc/irc-recv.c:3621
 msgid "nick"
 msgstr "utilisateur"
 
-#: src/irc/irc-recv.c:3565
+#: src/irc/irc-recv.c:3629
 msgid "ops"
 msgstr "ops"
 
-#: src/irc/irc-recv.c:3565
+#: src/irc/irc-recv.c:3629
 msgid "op"
 msgstr "op"
 
-#: src/irc/irc-recv.c:3574
+#: src/irc/irc-recv.c:3638
 msgid "halfops"
 msgstr "halfops"
 
-#: src/irc/irc-recv.c:3574
+#: src/irc/irc-recv.c:3638
 msgid "halfop"
 msgstr "halfop"
 
-#: src/irc/irc-recv.c:3583
+#: src/irc/irc-recv.c:3647
 msgid "voices"
 msgstr "voices"
 
-#: src/irc/irc-recv.c:3583
+#: src/irc/irc-recv.c:3647
 msgid "voice"
 msgstr "voice"
 
-#: src/irc/irc-recv.c:3592
+#: src/irc/irc-recv.c:3656
 msgid "normal"
 msgstr "normal"
 
-#: src/irc/irc-recv.c:3705
+#: src/irc/irc-recv.c:3769
 msgid "banned by"
 msgstr "banni par"
 
-#: src/irc/irc-recv.c:3794
+#: src/irc/irc-recv.c:3858
 #, 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:3806
+#: src/irc/irc-recv.c:3870
 #, 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:3818
+#: src/irc/irc-recv.c:3882
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
@@ -1848,7 +1848,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:3828
+#: src/irc/irc-recv.c:3892
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
 msgstr ""
@@ -3730,292 +3730,300 @@ msgstr ""
 msgid "hide password displayed by nickserv"
 msgstr "masquer le mot de passe affiché par nickserv"
 
-#: src/common/weeconfig.c:522
+#: src/common/weeconfig.c:523
 msgid "display message to all channels when away"
 msgstr "affiche un message sur tous les canaux pour l'absence"
 
-#: src/common/weeconfig.c:523
+#: src/common/weeconfig.c:524
 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:526 src/common/weeconfig.c:527
+#: src/common/weeconfig.c:527 src/common/weeconfig.c:528
 msgid "default message when away"
 msgstr "message par défaut pour l'absence"
 
-#: src/common/weeconfig.c:530 src/common/weeconfig.c:531
+#: src/common/weeconfig.c:531 src/common/weeconfig.c:532
 msgid "default part message (leaving channel)"
 msgstr "message par défaut pour le part (quitte un canal)"
 
-#: src/common/weeconfig.c:534
+#: src/common/weeconfig.c:535
 msgid "default quit message"
 msgstr "message de fin par défaut"
 
-#: src/common/weeconfig.c:535
+#: src/common/weeconfig.c:536
 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:538
+#: src/common/weeconfig.c:539
 msgid "interval between two checks for away"
 msgstr "intervalle entre deux vérifications des absences"
 
-#: src/common/weeconfig.c:539
+#: src/common/weeconfig.c:540
 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:542
+#: src/common/weeconfig.c:543
 msgid "interval between two checks for lag"
 msgstr "intervalle entre deux mesures de lag"
 
-#: src/common/weeconfig.c:543
+#: src/common/weeconfig.c:544
 msgid "interval between two checks for lag (in seconds)"
 msgstr "intervalle entre deux mesures de lag (en secondes)"
 
-#: src/common/weeconfig.c:546
+#: src/common/weeconfig.c:547
 msgid "minimum lag to show"
 msgstr "lag minimum à afficher"
 
-#: src/common/weeconfig.c:547
+#: src/common/weeconfig.c:548
 msgid "minimum lag to show (in seconds)"
 msgstr "lag minimum à afficher (en secondes)"
 
-#: src/common/weeconfig.c:550
+#: src/common/weeconfig.c:551
 msgid "disconnect after important lag"
 msgstr "déconnexion après un lag important"
 
-#: src/common/weeconfig.c:551
+#: src/common/weeconfig.c:552
 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:554 src/common/weeconfig.c:555
+#: src/common/weeconfig.c:555 src/common/weeconfig.c:556
 msgid "create a FIFO pipe for remote control"
 msgstr "créer un tube FIFO pour le contrôle à distance"
 
-#: src/common/weeconfig.c:574
+#: src/common/weeconfig.c:559
+msgid "list of words to highlight"
+msgstr "liste de mots pour la notification"
+
+#: src/common/weeconfig.c:560
+msgid "comma separated list of words to highlight (case sensitive comparison)"
+msgstr "liste des mots pour la notification (séparés par des virgules, le comparaison tient compte de la casse)"
+
+#: src/common/weeconfig.c:579
 msgid "automatically accept dcc files"
 msgstr "accepte automatiquement les fichiers dcc"
 
-#: src/common/weeconfig.c:575
+#: src/common/weeconfig.c:580
 msgid "automatically accept incoming dcc files"
 msgstr "accepte automatiquement les fichiers dcc entrants"
 
-#: src/common/weeconfig.c:578
+#: src/common/weeconfig.c:583
 msgid "automatically accept dcc chats"
 msgstr "accepte automatiquement les demandes de discussion dcc"
 
-#: src/common/weeconfig.c:579
+#: src/common/weeconfig.c:584
 msgid "automatically accept dcc chats (use carefully!)"
 msgstr ""
 "accepte automatiquement les demandes de discussion dcc (à utiliser avec "
 "précaution !)"
 
-#: src/common/weeconfig.c:582
+#: src/common/weeconfig.c:587
 msgid "timeout for dcc request"
 msgstr "délai d'attente pour les requêtes dcc"
 
-#: src/common/weeconfig.c:583
+#: src/common/weeconfig.c:588
 msgid "timeout for dcc request (in seconds)"
 msgstr "délai d'attente pour les requêtes dcc (en secondes)"
 
-#: src/common/weeconfig.c:586
+#: src/common/weeconfig.c:591
 msgid "block size for dcc packets"
 msgstr "taille de bloc pour les paquets dcc"
 
-#: src/common/weeconfig.c:587
+#: src/common/weeconfig.c:592
 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:590
+#: src/common/weeconfig.c:595
 msgid "path for incoming files with dcc"
 msgstr "chemin les fichiers reçus par dcc"
 
-#: src/common/weeconfig.c:591
+#: src/common/weeconfig.c:596
 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:594
+#: src/common/weeconfig.c:599
 msgid "default path for sending files with dcc"
 msgstr "chemin par défaut pour envoyer les fichiers par dcc"
 
-#: src/common/weeconfig.c:595
+#: src/common/weeconfig.c:600
 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:598 src/common/weeconfig.c:599
+#: src/common/weeconfig.c:603 src/common/weeconfig.c:604
 msgid "convert spaces to underscores when sending files"
 msgstr "convertir les espaces en underscores lors d'envoi de fichiers"
 
-#: src/common/weeconfig.c:602
+#: src/common/weeconfig.c:607
 msgid "automatically rename dcc files if already exists"
 msgstr "renomme automatiquement les fichiers dcc s'ils existent déjà"
 
-#: src/common/weeconfig.c:603
+#: src/common/weeconfig.c:608
 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:606
+#: src/common/weeconfig.c:611
 msgid "automatically resume aborted transfers"
 msgstr "continuer automatiquement les transferts non terminés"
 
-#: src/common/weeconfig.c:607
+#: src/common/weeconfig.c:612
 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:626
+#: src/common/weeconfig.c:631
 msgid "use proxy"
 msgstr "utiliser un proxy"
 
-#: src/common/weeconfig.c:627
+#: src/common/weeconfig.c:632
 msgid "use a proxy server to connect to irc server"
 msgstr "utiliser un proxy pour se connecter au serveur irc"
 
-#: src/common/weeconfig.c:630
+#: src/common/weeconfig.c:635
 msgid "proxy type"
 msgstr "type de proxy"
 
-#: src/common/weeconfig.c:631
+#: src/common/weeconfig.c:636
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "type de proxy (http (défaut), socks4, socks5)"
 
-#: src/common/weeconfig.c:634
+#: src/common/weeconfig.c:639
 msgid "use ipv6 proxy"
 msgstr "utiliser un proxy ipv6"
 
-#: src/common/weeconfig.c:635
+#: src/common/weeconfig.c:640
 msgid "connect to proxy in ipv6"
 msgstr "se connecter au proxy en ipv6"
 
-#: src/common/weeconfig.c:638
+#: src/common/weeconfig.c:643
 msgid "proxy address"
 msgstr "adresse du proxy"
 
-#: src/common/weeconfig.c:639
+#: src/common/weeconfig.c:644
 msgid "proxy server address (IP or hostname)"
 msgstr "adresse du serveur proxy (IP ou nom)"
 
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:647
 msgid "port for proxy"
 msgstr "port pour le proxy"
 
-#: src/common/weeconfig.c:643
+#: src/common/weeconfig.c:648
 msgid "port for connecting to proxy server"
 msgstr "port pour se connecter au serveur proxy"
 
-#: src/common/weeconfig.c:646
+#: src/common/weeconfig.c:651
 msgid "proxy username"
 msgstr "nom d'utilisateur proxy"
 
-#: src/common/weeconfig.c:647
+#: src/common/weeconfig.c:652
 msgid "username for proxy server"
 msgstr "nom d'utilisateur pour le serveur proxy"
 
-#: src/common/weeconfig.c:650
+#: src/common/weeconfig.c:655
 msgid "proxy password"
 msgstr "mot de passe pour le proxy"
 
-#: src/common/weeconfig.c:651
+#: src/common/weeconfig.c:656
 msgid "password for proxy server"
 msgstr "mot de passe pour le serveur proxy"
 
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:667
 msgid "server name"
 msgstr "nom du serveur"
 
-#: src/common/weeconfig.c:663
+#: src/common/weeconfig.c:668
 msgid "name associated to IRC server (for display only)"
 msgstr "nom associé au serveur IRC (pour affichage seulement)"
 
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:671
 msgid "automatically connect to server"
 msgstr "connexion automatique au serveur"
 
-#: src/common/weeconfig.c:667
+#: src/common/weeconfig.c:672
 msgid "automatically connect to server when WeeChat is starting"
 msgstr "connexion automatique au serveur quand WeeChat démarre"
 
-#: src/common/weeconfig.c:670
+#: src/common/weeconfig.c:675
 msgid "automatically reconnect to server"
 msgstr "reconnexion automatique au serveur"
 
-#: src/common/weeconfig.c:671
+#: src/common/weeconfig.c:676
 msgid "automatically reconnect to server when disconnected"
 msgstr "reconnexion automatique au serveur après une déconnexion"
 
-#: src/common/weeconfig.c:674
+#: src/common/weeconfig.c:679
 msgid "delay before trying again to reconnect"
 msgstr "délai avant de tenter une reconnexion"
 
-#: src/common/weeconfig.c:675
+#: src/common/weeconfig.c:680
 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:678
+#: src/common/weeconfig.c:683
 msgid "server address or hostname"
 msgstr "adresse ou nom du serveur"
 
-#: src/common/weeconfig.c:679
+#: src/common/weeconfig.c:684
 msgid "IP address or hostname of IRC server"
 msgstr "adresse IP ou nom du serveur IRC"
 
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:687
 msgid "port for IRC server"
 msgstr "port pour le serveur IRC"
 
-#: src/common/weeconfig.c:683
+#: src/common/weeconfig.c:688
 msgid "port for connecting to server"
 msgstr "port pour se connecter au serveur"
 
-#: src/common/weeconfig.c:686 src/common/weeconfig.c:687
+#: src/common/weeconfig.c:691 src/common/weeconfig.c:692
 msgid "use IPv6 protocol for server communication"
 msgstr "utiliser le protocole IPv6 pour la communication avec le serveur"
 
-#: src/common/weeconfig.c:690 src/common/weeconfig.c:691
+#: src/common/weeconfig.c:695 src/common/weeconfig.c:696
 msgid "use SSL for server communication"
 msgstr "utiliser SSL pour la communication avec le serveur"
 
-#: src/common/weeconfig.c:694
+#: src/common/weeconfig.c:699
 msgid "server password"
 msgstr "mot de passe pour le serveur"
 
-#: src/common/weeconfig.c:695
+#: src/common/weeconfig.c:700
 msgid "password for IRC server"
 msgstr "mot de passe pour le serveur IRC"
 
-#: src/common/weeconfig.c:698
+#: src/common/weeconfig.c:703
 msgid "nickname for server"
 msgstr "pseudo pour le serveur"
 
-#: src/common/weeconfig.c:699
+#: src/common/weeconfig.c:704
 msgid "nickname to use on IRC server"
 msgstr "pseudo à utiliser sur le serveur IRC"
 
-#: src/common/weeconfig.c:702
+#: src/common/weeconfig.c:707
 msgid "alternate nickname for server"
 msgstr "pseudo alternatif pour le serveur"
 
-#: src/common/weeconfig.c:703
+#: src/common/weeconfig.c:708
 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:706
+#: src/common/weeconfig.c:711
 msgid "2nd alternate nickname for server"
 msgstr "2nd pseudo alternatif pour le serveur"
 
-#: src/common/weeconfig.c:707
+#: src/common/weeconfig.c:712
 msgid ""
 "2nd alternate nickname to use on IRC server (if alternate nickname is "
 "already used)"
@@ -4023,31 +4031,31 @@ msgstr ""
 "2nd pseudo alternatif pour le serveur IRC (si le pseudo alternatif est déjà "
 "utilisé)"
 
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:715
 msgid "user name for server"
 msgstr "nom d'utilisateur pour le serveur"
 
-#: src/common/weeconfig.c:711
+#: src/common/weeconfig.c:716
 msgid "user name to use on IRC server"
 msgstr "nom d'utilisateur pour le serveur IRC"
 
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:719
 msgid "real name for server"
 msgstr "nom réel pour le serveur"
 
-#: src/common/weeconfig.c:715
+#: src/common/weeconfig.c:720
 msgid "real name to use on IRC server"
 msgstr "nom réel pour le serveur IRC"
 
-#: src/common/weeconfig.c:718 src/common/weeconfig.c:719
+#: src/common/weeconfig.c:723 src/common/weeconfig.c:724
 msgid "first command to run when connected to server"
 msgstr "commande à exécuter en premier lorsque connecté au serveur"
 
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:727
 msgid "delay (in seconds) after command was executed"
 msgstr "délai (en secondes) après exécution de la commande"
 
-#: src/common/weeconfig.c:723
+#: src/common/weeconfig.c:728
 msgid ""
 "delay (in seconds) after command was executed (example: give some time for "
 "authentication)"
@@ -4055,25 +4063,25 @@ msgstr ""
 "délai (en secondes) après exécution de la commande (exemple: donner du temps "
 "pour l'authentification)"
 
-#: src/common/weeconfig.c:726
+#: src/common/weeconfig.c:731
 msgid "list of channels to join when connected to server"
 msgstr "liste des canaux à rejoindre lorsque connecté au serveur"
 
-#: src/common/weeconfig.c:727
+#: src/common/weeconfig.c:732
 msgid "comma separated list of channels to join when connected to server"
 msgstr ""
 "liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au "
 "serveur"
 
-#: src/common/weeconfig.c:730 src/common/weeconfig.c:731
+#: src/common/weeconfig.c:735 src/common/weeconfig.c:736
 msgid "automatically rejoin channels when kicked"
 msgstr "rejoindre automatiquement les canaux quand mis dehors"
 
-#: src/common/weeconfig.c:734
+#: src/common/weeconfig.c:739
 msgid "notify levels for channels of this server"
 msgstr "niveaux de notification pour les canaux de ce serveur"
 
-#: src/common/weeconfig.c:735
+#: src/common/weeconfig.c:740
 msgid ""
 "comma separated list of notify levels for channels of this server (format: "
 "#channel:1,..)"
@@ -4081,64 +4089,64 @@ 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:1195
+#: src/common/weeconfig.c:1200
 #, 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:1204
+#: src/common/weeconfig.c:1209
 #, 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:1219
+#: src/common/weeconfig.c:1224
 #, 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:1259
+#: src/common/weeconfig.c:1264
 #, 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:1270
+#: src/common/weeconfig.c:1275
 #, 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:1309
+#: src/common/weeconfig.c:1314
 #, c-format
 msgid "%s config file \"%s\" not found.\n"
 msgstr "%s fichier de configuration \"%s\" non trouvé.\n"
 
-#: src/common/weeconfig.c:1341
+#: src/common/weeconfig.c:1346
 #, 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:1358
+#: src/common/weeconfig.c:1363
 #, 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:1376
+#: src/common/weeconfig.c:1381
 #, 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:1384
+#: src/common/weeconfig.c:1389
 #, 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:1432
+#: src/common/weeconfig.c:1437
 #, c-format
 msgid "%s %s, line %d: invalid option \"%s\"\n"
 msgstr "%s %s, ligne %d: option \"%s\" invalide\n"
 
-#: src/common/weeconfig.c:1443
+#: src/common/weeconfig.c:1448
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value foroption '%s'\n"
@@ -4147,7 +4155,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:1452
+#: src/common/weeconfig.c:1457
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4156,7 +4164,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:1463
+#: src/common/weeconfig.c:1468
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4165,26 +4173,26 @@ msgstr ""
 "%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
 "Attendu: une de ces chaînes: "
 
-#: src/common/weeconfig.c:1479
+#: src/common/weeconfig.c:1484
 #, 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:1541 src/common/weeconfig.c:1736
+#: src/common/weeconfig.c:1546 src/common/weeconfig.c:1741
 #, c-format
 msgid "%s cannot create file \"%s\"\n"
 msgstr "%s impossible de créer le fichier \"%s\"\n"
 
-#: src/common/weeconfig.c:1547
+#: src/common/weeconfig.c:1552
 #, 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:1548
+#: src/common/weeconfig.c:1553
 msgid "Creating default config file\n"
 msgstr "Création du fichier de configuration par défaut\n"
 
-#: src/common/weeconfig.c:1551 src/common/weeconfig.c:1745
+#: src/common/weeconfig.c:1556 src/common/weeconfig.c:1750
 #, c-format
 msgid ""
 "#\n"
@@ -4193,6 +4201,6 @@ msgstr ""
 "#\n"
 "# %s: fichier de configuration, créé par %s v%s le %s#\n"
 
-#: src/common/weeconfig.c:1742
+#: src/common/weeconfig.c:1747
 msgid "Saving config to disk\n"
 msgstr "Sauvegarde de la configuration sur disque\n"
diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot
index 6275822bb..925241760 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-07-19 14:19+0200\n"
+"POT-Creation-Date: 2005-07-19 19:09+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"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "%s cannot allocate new nick\n"
 msgstr ""
 
-#: src/irc/irc-server.c:180 src/common/weeconfig.c:1682
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1687
 msgid "Unable to get user's name"
 msgstr ""
 
@@ -1237,7 +1237,7 @@ msgstr ""
 msgid "(hidden)"
 msgstr ""
 
-#: src/irc/irc-send.c:59 src/irc/irc-recv.c:3840
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:3904
 msgid "unknown"
 msgstr ""
 
@@ -1279,12 +1279,12 @@ 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:322
+#: src/irc/irc-send.c:990 src/irc/irc-send.c:1015 src/irc/irc-recv.c:386
 #, 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:1702
+#: src/irc/irc-send.c:1067 src/irc/irc-send.c:1375 src/irc/irc-recv.c:1766
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr ""
@@ -1294,440 +1294,440 @@ msgstr ""
 msgid "%s, compiled on %s %s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:182
+#: src/irc/irc-recv.c:246
 msgid "You have been invited to "
 msgstr ""
 
-#: src/irc/irc-recv.c:185
+#: src/irc/irc-recv.c:249
 msgid "by"
 msgstr ""
 
-#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:289 src/irc/irc-recv.c:788
-#: src/irc/irc-recv.c:1123 src/irc/irc-recv.c:1302 src/irc/irc-recv.c:3058
-#: src/irc/irc-recv.c:3125
+#: src/irc/irc-recv.c:259 src/irc/irc-recv.c:353 src/irc/irc-recv.c:852
+#: src/irc/irc-recv.c:1187 src/irc/irc-recv.c:1366 src/irc/irc-recv.c:3122
+#: src/irc/irc-recv.c:3189
 #, c-format
 msgid "%s channel \"%s\" not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:221
+#: src/irc/irc-recv.c:285
 #, c-format
 msgid "%s cannot create new channel \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:241
+#: src/irc/irc-recv.c:305
 msgid " has joined "
 msgstr ""
 
-#: src/irc/irc-recv.c:298
+#: src/irc/irc-recv.c:362
 msgid " has kicked "
 msgstr ""
 
-#: src/irc/irc-recv.c:302
+#: src/irc/irc-recv.c:366
 msgid " from "
 msgstr ""
 
-#: src/irc/irc-recv.c:388
+#: src/irc/irc-recv.c:452
 msgid " has killed "
 msgstr ""
 
-#: src/irc/irc-recv.c:394
+#: src/irc/irc-recv.c:458
 msgid " from server"
 msgstr ""
 
-#: src/irc/irc-recv.c:404
+#: src/irc/irc-recv.c:468
 msgid " from server\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:411
+#: src/irc/irc-recv.c:475
 #, c-format
 msgid "%s host \"%s\" not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:451
+#: src/irc/irc-recv.c:515
 msgid "sets ban on"
 msgstr ""
 
-#: src/irc/irc-recv.c:452
+#: src/irc/irc-recv.c:516
 msgid "removes ban on"
 msgstr ""
 
-#: src/irc/irc-recv.c:476
+#: src/irc/irc-recv.c:540
 msgid "gives half channel operator status to"
 msgstr ""
 
-#: src/irc/irc-recv.c:477
+#: src/irc/irc-recv.c:541
 msgid "removes half channel operator status from"
 msgstr ""
 
-#: src/irc/irc-recv.c:504
+#: src/irc/irc-recv.c:568
 msgid "sets invite-only channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:505
+#: src/irc/irc-recv.c:569
 msgid "removes invite-only channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:522
+#: src/irc/irc-recv.c:586
 msgid "sets channel key to"
 msgstr ""
 
-#: src/irc/irc-recv.c:523
+#: src/irc/irc-recv.c:587
 msgid "removes channel key"
 msgstr ""
 
-#: src/irc/irc-recv.c:554
+#: src/irc/irc-recv.c:618
 msgid "sets the user limit to"
 msgstr ""
 
-#: src/irc/irc-recv.c:555
+#: src/irc/irc-recv.c:619
 msgid "removes user limit"
 msgstr ""
 
-#: src/irc/irc-recv.c:577
+#: src/irc/irc-recv.c:641
 msgid "sets moderated channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:578
+#: src/irc/irc-recv.c:642
 msgid "removes moderated channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:588
+#: src/irc/irc-recv.c:652
 msgid "sets messages from channel only flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:589
+#: src/irc/irc-recv.c:653
 msgid "removes messages from channel only flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:606
+#: src/irc/irc-recv.c:670
 msgid "gives channel operator status to"
 msgstr ""
 
-#: src/irc/irc-recv.c:607
+#: src/irc/irc-recv.c:671
 msgid "removes channel operator status from"
 msgstr ""
 
-#: src/irc/irc-recv.c:634
+#: src/irc/irc-recv.c:698
 msgid "sets private channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:635
+#: src/irc/irc-recv.c:699
 msgid "removes private channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:652
+#: src/irc/irc-recv.c:716
 msgid "sets quiet on"
 msgstr ""
 
-#: src/irc/irc-recv.c:653
+#: src/irc/irc-recv.c:717
 msgid "removes quiet on"
 msgstr ""
 
-#: src/irc/irc-recv.c:670
+#: src/irc/irc-recv.c:734
 msgid "sets secret channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:671
+#: src/irc/irc-recv.c:735
 msgid "removes secret channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:681
+#: src/irc/irc-recv.c:745
 msgid "sets topic protection"
 msgstr ""
 
-#: src/irc/irc-recv.c:682
+#: src/irc/irc-recv.c:746
 msgid "removes topic protection"
 msgstr ""
 
-#: src/irc/irc-recv.c:699
+#: src/irc/irc-recv.c:763
 msgid "gives voice to"
 msgstr ""
 
-#: src/irc/irc-recv.c:700
+#: src/irc/irc-recv.c:764
 msgid "removes voice from"
 msgstr ""
 
-#: src/irc/irc-recv.c:743 src/irc/irc-recv.c:828 src/irc/irc-recv.c:1197
-#: src/irc/irc-recv.c:1798
+#: src/irc/irc-recv.c:807 src/irc/irc-recv.c:892 src/irc/irc-recv.c:1261
+#: src/irc/irc-recv.c:1862
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:758
+#: src/irc/irc-recv.c:822
 #, c-format
 msgid "%s \"%s\" command received without channel or nickname\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:803
+#: src/irc/irc-recv.c:867
 msgid "mode changed by"
 msgstr ""
 
-#: src/irc/irc-recv.c:867
+#: src/irc/irc-recv.c:931
 msgid "You are "
 msgstr ""
 
-#: src/irc/irc-recv.c:874
+#: src/irc/irc-recv.c:938
 msgid " is "
 msgstr ""
 
-#: src/irc/irc-recv.c:878
+#: src/irc/irc-recv.c:942
 msgid "now known as "
 msgstr ""
 
-#: src/irc/irc-recv.c:948
+#: src/irc/irc-recv.c:1012
 #, c-format
 msgid "%s nickname not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:961 src/irc/irc-recv.c:993
+#: src/irc/irc-recv.c:1025 src/irc/irc-recv.c:1057
 msgid "reply from"
 msgstr ""
 
-#: src/irc/irc-recv.c:996
+#: src/irc/irc-recv.c:1060
 #, c-format
 msgid ": %ld.%ld seconds\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1048
+#: src/irc/irc-recv.c:1112
 #, c-format
 msgid "%s \"%s\" command received without host or channel\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1098
+#: src/irc/irc-recv.c:1162
 msgid " has left "
 msgstr ""
 
-#: src/irc/irc-recv.c:1246 src/irc/irc-recv.c:1728
+#: src/irc/irc-recv.c:1310 src/irc/irc-recv.c:1792
 #, c-format
 msgid "On %s: * %s %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1265
+#: src/irc/irc-recv.c:1329
 #, c-format
 msgid "Received a CTCP SOUND \"%s\" from "
 msgstr ""
 
-#: src/irc/irc-recv.c:1285
+#: src/irc/irc-recv.c:1349
 #, c-format
 msgid "On %s: %s> %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1362 src/irc/irc-recv.c:1398 src/irc/irc-recv.c:1682
+#: src/irc/irc-recv.c:1426 src/irc/irc-recv.c:1462 src/irc/irc-recv.c:1746
 msgid "received from"
 msgstr ""
 
-#: src/irc/irc-recv.c:1413 src/irc/irc-recv.c:1430 src/irc/irc-recv.c:1446
-#: src/irc/irc-recv.c:1462 src/irc/irc-recv.c:1487 src/irc/irc-recv.c:1504
-#: src/irc/irc-recv.c:1520 src/irc/irc-recv.c:1544 src/irc/irc-recv.c:1561
-#: src/irc/irc-recv.c:1577 src/irc/irc-recv.c:1601 src/irc/irc-recv.c:1618
-#: src/irc/irc-recv.c:1633 src/irc/irc-recv.c:1774 src/irc/irc-recv.c:3424
-#: src/irc/irc-recv.c:3482 src/irc/irc-recv.c:3634 src/irc/irc-recv.c:3649
-#: src/irc/irc-recv.c:3664 src/irc/irc-recv.c:3679 src/irc/irc-recv.c:3692
-#: src/irc/irc-recv.c:3742 src/irc/irc-recv.c:3756
+#: src/irc/irc-recv.c:1477 src/irc/irc-recv.c:1494 src/irc/irc-recv.c:1510
+#: src/irc/irc-recv.c:1526 src/irc/irc-recv.c:1551 src/irc/irc-recv.c:1568
+#: src/irc/irc-recv.c:1584 src/irc/irc-recv.c:1608 src/irc/irc-recv.c:1625
+#: src/irc/irc-recv.c:1641 src/irc/irc-recv.c:1665 src/irc/irc-recv.c:1682
+#: src/irc/irc-recv.c:1697 src/irc/irc-recv.c:1838 src/irc/irc-recv.c:3488
+#: src/irc/irc-recv.c:3546 src/irc/irc-recv.c:3698 src/irc/irc-recv.c:3713
+#: src/irc/irc-recv.c:3728 src/irc/irc-recv.c:3743 src/irc/irc-recv.c:3756
+#: src/irc/irc-recv.c:3806 src/irc/irc-recv.c:3820
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1646
+#: src/irc/irc-recv.c:1710
 #, c-format
 msgid "%s unknown DCC CHAT type received from "
 msgstr ""
 
-#: src/irc/irc-recv.c:1678
+#: src/irc/irc-recv.c:1742
 msgid "Unknown CTCP "
 msgstr ""
 
-#: src/irc/irc-recv.c:1754 src/irc/irc-dcc.c:1011
+#: src/irc/irc-recv.c:1818 src/irc/irc-dcc.c:1011
 #, c-format
 msgid "Private %s> %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1830
+#: src/irc/irc-recv.c:1894
 msgid "has quit"
 msgstr ""
 
-#: src/irc/irc-recv.c:1951
+#: src/irc/irc-recv.c:2015
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1979
+#: src/irc/irc-recv.c:2043
 msgid " has changed topic for "
 msgstr ""
 
-#: src/irc/irc-recv.c:1984
+#: src/irc/irc-recv.c:2048
 #, c-format
 msgid " to: \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1990
+#: src/irc/irc-recv.c:2054
 msgid " has unset topic for "
 msgstr ""
 
-#: src/irc/irc-recv.c:2108
+#: src/irc/irc-recv.c:2172
 #, c-format
 msgid " is away: %s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2182
+#: src/irc/irc-recv.c:2246
 msgid "Users online: "
 msgstr ""
 
-#: src/irc/irc-recv.c:2629
+#: src/irc/irc-recv.c:2693
 msgid "idle: "
 msgstr ""
 
-#: src/irc/irc-recv.c:2637
+#: src/irc/irc-recv.c:2701
 msgid "days"
 msgstr ""
 
-#: src/irc/irc-recv.c:2637
+#: src/irc/irc-recv.c:2701
 msgid "day"
 msgstr ""
 
-#: src/irc/irc-recv.c:2647
+#: src/irc/irc-recv.c:2711
 msgid "hours"
 msgstr ""
 
-#: src/irc/irc-recv.c:2647
+#: src/irc/irc-recv.c:2711
 msgid "hour"
 msgstr ""
 
-#: src/irc/irc-recv.c:2653
+#: src/irc/irc-recv.c:2717
 msgid "minutes"
 msgstr ""
 
-#: src/irc/irc-recv.c:2653
+#: src/irc/irc-recv.c:2717
 msgid "minute"
 msgstr ""
 
-#: src/irc/irc-recv.c:2659
+#: src/irc/irc-recv.c:2723
 msgid "seconds"
 msgstr ""
 
-#: src/irc/irc-recv.c:2659
+#: src/irc/irc-recv.c:2723
 msgid "second"
 msgstr ""
 
-#: src/irc/irc-recv.c:2664
+#: src/irc/irc-recv.c:2728
 msgid "signon at: "
 msgstr ""
 
-#: src/irc/irc-recv.c:2752
+#: src/irc/irc-recv.c:2816
 msgid "Channels: "
 msgstr ""
 
-#: src/irc/irc-recv.c:3004
+#: src/irc/irc-recv.c:3068
 msgid "No topic set for "
 msgstr ""
 
-#: src/irc/irc-recv.c:3046
+#: src/irc/irc-recv.c:3110
 msgid "Topic for "
 msgstr ""
 
-#: src/irc/irc-recv.c:3050
+#: src/irc/irc-recv.c:3114
 #, c-format
 msgid " is: \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3068 src/irc/irc-recv.c:3152 src/irc/irc-recv.c:3205
+#: src/irc/irc-recv.c:3132 src/irc/irc-recv.c:3216 src/irc/irc-recv.c:3269
 #, c-format
 msgid "%s cannot identify channel for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3114
+#: src/irc/irc-recv.c:3178
 msgid "Topic set by "
 msgstr ""
 
-#: src/irc/irc-recv.c:3134
+#: src/irc/irc-recv.c:3198
 #, c-format
 msgid "%s cannot identify date/time for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3143 src/irc/irc-recv.c:3214
+#: src/irc/irc-recv.c:3207 src/irc/irc-recv.c:3278
 #, c-format
 msgid "%s cannot identify nickname for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3193
+#: src/irc/irc-recv.c:3257
 msgid "has invited"
 msgstr ""
 
-#: src/irc/irc-recv.c:3196 src/irc/irc-recv.c:3347
+#: src/irc/irc-recv.c:3260 src/irc/irc-recv.c:3411
 msgid "on"
 msgstr ""
 
-#: src/irc/irc-recv.c:3470
+#: src/irc/irc-recv.c:3534
 #, c-format
 msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3526
+#: src/irc/irc-recv.c:3590
 msgid "Nicks "
 msgstr ""
 
-#: src/irc/irc-recv.c:3546
+#: src/irc/irc-recv.c:3610
 msgid "Channel "
 msgstr ""
 
-#: src/irc/irc-recv.c:3557
+#: src/irc/irc-recv.c:3621
 msgid "nicks"
 msgstr ""
 
-#: src/irc/irc-recv.c:3557
+#: src/irc/irc-recv.c:3621
 msgid "nick"
 msgstr ""
 
-#: src/irc/irc-recv.c:3565
+#: src/irc/irc-recv.c:3629
 msgid "ops"
 msgstr ""
 
-#: src/irc/irc-recv.c:3565
+#: src/irc/irc-recv.c:3629
 msgid "op"
 msgstr ""
 
-#: src/irc/irc-recv.c:3574
+#: src/irc/irc-recv.c:3638
 msgid "halfops"
 msgstr ""
 
-#: src/irc/irc-recv.c:3574
+#: src/irc/irc-recv.c:3638
 msgid "halfop"
 msgstr ""
 
-#: src/irc/irc-recv.c:3583
+#: src/irc/irc-recv.c:3647
 msgid "voices"
 msgstr ""
 
-#: src/irc/irc-recv.c:3583
+#: src/irc/irc-recv.c:3647
 msgid "voice"
 msgstr ""
 
-#: src/irc/irc-recv.c:3592
+#: src/irc/irc-recv.c:3656
 msgid "normal"
 msgstr ""
 
-#: src/irc/irc-recv.c:3705
+#: src/irc/irc-recv.c:3769
 msgid "banned by"
 msgstr ""
 
-#: src/irc/irc-recv.c:3794
+#: src/irc/irc-recv.c:3858
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3806
+#: src/irc/irc-recv.c:3870
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3818
+#: src/irc/irc-recv.c:3882
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
 "server!\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3828
+#: src/irc/irc-recv.c:3892
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
 msgstr ""
@@ -3485,437 +3485,445 @@ msgstr ""
 msgid "hide password displayed by nickserv"
 msgstr ""
 
-#: src/common/weeconfig.c:522
+#: src/common/weeconfig.c:523
 msgid "display message to all channels when away"
 msgstr ""
 
-#: src/common/weeconfig.c:523
+#: src/common/weeconfig.c:524
 msgid "display message to all channels when (un)marking as away"
 msgstr ""
 
-#: src/common/weeconfig.c:526 src/common/weeconfig.c:527
+#: src/common/weeconfig.c:527 src/common/weeconfig.c:528
 msgid "default message when away"
 msgstr ""
 
-#: src/common/weeconfig.c:530 src/common/weeconfig.c:531
+#: src/common/weeconfig.c:531 src/common/weeconfig.c:532
 msgid "default part message (leaving channel)"
 msgstr ""
 
-#: src/common/weeconfig.c:534
+#: src/common/weeconfig.c:535
 msgid "default quit message"
 msgstr ""
 
-#: src/common/weeconfig.c:535
+#: src/common/weeconfig.c:536
 msgid ""
 "default quit message ('%v' will be replaced by WeeChat version in string)"
 msgstr ""
 
-#: src/common/weeconfig.c:538
+#: src/common/weeconfig.c:539
 msgid "interval between two checks for away"
 msgstr ""
 
-#: src/common/weeconfig.c:539
+#: src/common/weeconfig.c:540
 msgid "interval between two checks for away (in minutes, 0 = never check)"
 msgstr ""
 
-#: src/common/weeconfig.c:542
+#: src/common/weeconfig.c:543
 msgid "interval between two checks for lag"
 msgstr ""
 
-#: src/common/weeconfig.c:543
+#: src/common/weeconfig.c:544
 msgid "interval between two checks for lag (in seconds)"
 msgstr ""
 
-#: src/common/weeconfig.c:546
+#: src/common/weeconfig.c:547
 msgid "minimum lag to show"
 msgstr ""
 
-#: src/common/weeconfig.c:547
+#: src/common/weeconfig.c:548
 msgid "minimum lag to show (in seconds)"
 msgstr ""
 
-#: src/common/weeconfig.c:550
+#: src/common/weeconfig.c:551
 msgid "disconnect after important lag"
 msgstr ""
 
-#: src/common/weeconfig.c:551
+#: src/common/weeconfig.c:552
 msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
 msgstr ""
 
-#: src/common/weeconfig.c:554 src/common/weeconfig.c:555
+#: src/common/weeconfig.c:555 src/common/weeconfig.c:556
 msgid "create a FIFO pipe for remote control"
 msgstr ""
 
-#: src/common/weeconfig.c:574
+#: src/common/weeconfig.c:559
+msgid "list of words to highlight"
+msgstr ""
+
+#: src/common/weeconfig.c:560
+msgid "comma separated list of words to highlight (case sensitive comparison)"
+msgstr ""
+
+#: src/common/weeconfig.c:579
 msgid "automatically accept dcc files"
 msgstr ""
 
-#: src/common/weeconfig.c:575
+#: src/common/weeconfig.c:580
 msgid "automatically accept incoming dcc files"
 msgstr ""
 
-#: src/common/weeconfig.c:578
+#: src/common/weeconfig.c:583
 msgid "automatically accept dcc chats"
 msgstr ""
 
-#: src/common/weeconfig.c:579
+#: src/common/weeconfig.c:584
 msgid "automatically accept dcc chats (use carefully!)"
 msgstr ""
 
-#: src/common/weeconfig.c:582
+#: src/common/weeconfig.c:587
 msgid "timeout for dcc request"
 msgstr ""
 
-#: src/common/weeconfig.c:583
+#: src/common/weeconfig.c:588
 msgid "timeout for dcc request (in seconds)"
 msgstr ""
 
-#: src/common/weeconfig.c:586
+#: src/common/weeconfig.c:591
 msgid "block size for dcc packets"
 msgstr ""
 
-#: src/common/weeconfig.c:587
+#: src/common/weeconfig.c:592
 msgid "block size for dcc packets in bytes (default: 65536)"
 msgstr ""
 
-#: src/common/weeconfig.c:590
+#: src/common/weeconfig.c:595
 msgid "path for incoming files with dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:591
+#: src/common/weeconfig.c:596
 msgid "path for writing incoming files with dcc (default: user home)"
 msgstr ""
 
-#: src/common/weeconfig.c:594
+#: src/common/weeconfig.c:599
 msgid "default path for sending files with dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:595
+#: src/common/weeconfig.c:600
 msgid ""
 "path for reading files when sending thru dcc (when no path is specified)"
 msgstr ""
 
-#: src/common/weeconfig.c:598 src/common/weeconfig.c:599
+#: src/common/weeconfig.c:603 src/common/weeconfig.c:604
 msgid "convert spaces to underscores when sending files"
 msgstr ""
 
-#: src/common/weeconfig.c:602
+#: src/common/weeconfig.c:607
 msgid "automatically rename dcc files if already exists"
 msgstr ""
 
-#: src/common/weeconfig.c:603
+#: src/common/weeconfig.c:608
 msgid "rename incoming files if already exists (add '.1', '.2', ...)"
 msgstr ""
 
-#: src/common/weeconfig.c:606
+#: src/common/weeconfig.c:611
 msgid "automatically resume aborted transfers"
 msgstr ""
 
-#: src/common/weeconfig.c:607
+#: src/common/weeconfig.c:612
 msgid ""
 "automatically resume dcc transfer if connection with remote host is loosed"
 msgstr ""
 
-#: src/common/weeconfig.c:626
+#: src/common/weeconfig.c:631
 msgid "use proxy"
 msgstr ""
 
-#: src/common/weeconfig.c:627
+#: src/common/weeconfig.c:632
 msgid "use a proxy server to connect to irc server"
 msgstr ""
 
-#: src/common/weeconfig.c:630
+#: src/common/weeconfig.c:635
 msgid "proxy type"
 msgstr ""
 
-#: src/common/weeconfig.c:631
+#: src/common/weeconfig.c:636
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr ""
 
-#: src/common/weeconfig.c:634
+#: src/common/weeconfig.c:639
 msgid "use ipv6 proxy"
 msgstr ""
 
-#: src/common/weeconfig.c:635
+#: src/common/weeconfig.c:640
 msgid "connect to proxy in ipv6"
 msgstr ""
 
-#: src/common/weeconfig.c:638
+#: src/common/weeconfig.c:643
 msgid "proxy address"
 msgstr ""
 
-#: src/common/weeconfig.c:639
+#: src/common/weeconfig.c:644
 msgid "proxy server address (IP or hostname)"
 msgstr ""
 
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:647
 msgid "port for proxy"
 msgstr ""
 
-#: src/common/weeconfig.c:643
+#: src/common/weeconfig.c:648
 msgid "port for connecting to proxy server"
 msgstr ""
 
-#: src/common/weeconfig.c:646
+#: src/common/weeconfig.c:651
 msgid "proxy username"
 msgstr ""
 
-#: src/common/weeconfig.c:647
+#: src/common/weeconfig.c:652
 msgid "username for proxy server"
 msgstr ""
 
-#: src/common/weeconfig.c:650
+#: src/common/weeconfig.c:655
 msgid "proxy password"
 msgstr ""
 
-#: src/common/weeconfig.c:651
+#: src/common/weeconfig.c:656
 msgid "password for proxy server"
 msgstr ""
 
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:667
 msgid "server name"
 msgstr ""
 
-#: src/common/weeconfig.c:663
+#: src/common/weeconfig.c:668
 msgid "name associated to IRC server (for display only)"
 msgstr ""
 
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:671
 msgid "automatically connect to server"
 msgstr ""
 
-#: src/common/weeconfig.c:667
+#: src/common/weeconfig.c:672
 msgid "automatically connect to server when WeeChat is starting"
 msgstr ""
 
-#: src/common/weeconfig.c:670
+#: src/common/weeconfig.c:675
 msgid "automatically reconnect to server"
 msgstr ""
 
-#: src/common/weeconfig.c:671
+#: src/common/weeconfig.c:676
 msgid "automatically reconnect to server when disconnected"
 msgstr ""
 
-#: src/common/weeconfig.c:674
+#: src/common/weeconfig.c:679
 msgid "delay before trying again to reconnect"
 msgstr ""
 
-#: src/common/weeconfig.c:675
+#: src/common/weeconfig.c:680
 msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr ""
 
-#: src/common/weeconfig.c:678
+#: src/common/weeconfig.c:683
 msgid "server address or hostname"
 msgstr ""
 
-#: src/common/weeconfig.c:679
+#: src/common/weeconfig.c:684
 msgid "IP address or hostname of IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:687
 msgid "port for IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:683
+#: src/common/weeconfig.c:688
 msgid "port for connecting to server"
 msgstr ""
 
-#: src/common/weeconfig.c:686 src/common/weeconfig.c:687
+#: src/common/weeconfig.c:691 src/common/weeconfig.c:692
 msgid "use IPv6 protocol for server communication"
 msgstr ""
 
-#: src/common/weeconfig.c:690 src/common/weeconfig.c:691
+#: src/common/weeconfig.c:695 src/common/weeconfig.c:696
 msgid "use SSL for server communication"
 msgstr ""
 
-#: src/common/weeconfig.c:694
+#: src/common/weeconfig.c:699
 msgid "server password"
 msgstr ""
 
-#: src/common/weeconfig.c:695
+#: src/common/weeconfig.c:700
 msgid "password for IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:698
+#: src/common/weeconfig.c:703
 msgid "nickname for server"
 msgstr ""
 
-#: src/common/weeconfig.c:699
+#: src/common/weeconfig.c:704
 msgid "nickname to use on IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:702
+#: src/common/weeconfig.c:707
 msgid "alternate nickname for server"
 msgstr ""
 
-#: src/common/weeconfig.c:703
+#: src/common/weeconfig.c:708
 msgid "alternate nickname to use on IRC server (if nickname is already used)"
 msgstr ""
 
-#: src/common/weeconfig.c:706
+#: src/common/weeconfig.c:711
 msgid "2nd alternate nickname for server"
 msgstr ""
 
-#: src/common/weeconfig.c:707
+#: src/common/weeconfig.c:712
 msgid ""
 "2nd alternate nickname to use on IRC server (if alternate nickname is "
 "already used)"
 msgstr ""
 
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:715
 msgid "user name for server"
 msgstr ""
 
-#: src/common/weeconfig.c:711
+#: src/common/weeconfig.c:716
 msgid "user name to use on IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:719
 msgid "real name for server"
 msgstr ""
 
-#: src/common/weeconfig.c:715
+#: src/common/weeconfig.c:720
 msgid "real name to use on IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:718 src/common/weeconfig.c:719
+#: src/common/weeconfig.c:723 src/common/weeconfig.c:724
 msgid "first command to run when connected to server"
 msgstr ""
 
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:727
 msgid "delay (in seconds) after command was executed"
 msgstr ""
 
-#: src/common/weeconfig.c:723
+#: src/common/weeconfig.c:728
 msgid ""
 "delay (in seconds) after command was executed (example: give some time for "
 "authentication)"
 msgstr ""
 
-#: src/common/weeconfig.c:726
+#: src/common/weeconfig.c:731
 msgid "list of channels to join when connected to server"
 msgstr ""
 
-#: src/common/weeconfig.c:727
+#: src/common/weeconfig.c:732
 msgid "comma separated list of channels to join when connected to server"
 msgstr ""
 
-#: src/common/weeconfig.c:730 src/common/weeconfig.c:731
+#: src/common/weeconfig.c:735 src/common/weeconfig.c:736
 msgid "automatically rejoin channels when kicked"
 msgstr ""
 
-#: src/common/weeconfig.c:734
+#: src/common/weeconfig.c:739
 msgid "notify levels for channels of this server"
 msgstr ""
 
-#: src/common/weeconfig.c:735
+#: src/common/weeconfig.c:740
 msgid ""
 "comma separated list of notify levels for channels of this server (format: "
 "#channel:1,..)"
 msgstr ""
 
-#: src/common/weeconfig.c:1195
+#: src/common/weeconfig.c:1200
 #, c-format
 msgid "%s %s, line %d: new server, but previous was incomplete\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1204
+#: src/common/weeconfig.c:1209
 #, c-format
 msgid "%s %s, line %d: server '%s' already exists\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1219
+#: src/common/weeconfig.c:1224
 #, c-format
 msgid "%s %s, line %d: unable to create server\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1259
+#: src/common/weeconfig.c:1264
 #, c-format
 msgid "%s unable to assign default int with string (\"%s\")\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1270
+#: src/common/weeconfig.c:1275
 #, c-format
 msgid "%s unable to assign default color (\"%s\")\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1309
+#: src/common/weeconfig.c:1314
 #, c-format
 msgid "%s config file \"%s\" not found.\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1341
+#: src/common/weeconfig.c:1346
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1358
+#: src/common/weeconfig.c:1363
 #, c-format
 msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1376
+#: src/common/weeconfig.c:1381
 #, c-format
 msgid "%s %s, line %d: invalid section for option, line is ignored\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1384
+#: src/common/weeconfig.c:1389
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1432
+#: src/common/weeconfig.c:1437
 #, c-format
 msgid "%s %s, line %d: invalid option \"%s\"\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1443
+#: src/common/weeconfig.c:1448
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value foroption '%s'\n"
 "Expected: boolean value: 'off' or 'on'\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1452
+#: src/common/weeconfig.c:1457
 #, 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:1463
+#: src/common/weeconfig.c:1468
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
 "Expected: one of these strings: "
 msgstr ""
 
-#: src/common/weeconfig.c:1479
+#: src/common/weeconfig.c:1484
 #, c-format
 msgid "%s %s, line %d: invalid color name for option '%s'\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1541 src/common/weeconfig.c:1736
+#: src/common/weeconfig.c:1546 src/common/weeconfig.c:1741
 #, c-format
 msgid "%s cannot create file \"%s\"\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1547
+#: src/common/weeconfig.c:1552
 #, c-format
 msgid "%s: creating default config file...\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1548
+#: src/common/weeconfig.c:1553
 msgid "Creating default config file\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1551 src/common/weeconfig.c:1745
+#: src/common/weeconfig.c:1556 src/common/weeconfig.c:1750
 #, c-format
 msgid ""
 "#\n"
 "# %s configuration file, created by %s v%s on %s#\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1742
+#: src/common/weeconfig.c:1747
 msgid "Saving config to disk\n"
 msgstr ""
diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c
index aefe60edb..334a8afac 100644
--- a/weechat/src/common/weeconfig.c
+++ b/weechat/src/common/weeconfig.c
@@ -517,6 +517,7 @@ int cfg_irc_lag_check;
 int cfg_irc_lag_min_show;
 int cfg_irc_lag_disconnect;
 int cfg_irc_fifo_pipe;
+char *cfg_irc_highlight;
 
 t_config_option weechat_options_irc[] =
 { { "irc_display_away", N_("display message to all channels when away"),
@@ -555,6 +556,10 @@ t_config_option weechat_options_irc[] =
     N_("create a FIFO pipe for remote control"),
     OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE,
     NULL, NULL, &cfg_irc_fifo_pipe, NULL, config_change_fifo_pipe },
+  { "irc_highlight", N_("list of words to highlight"),
+    N_("comma separated list of words to highlight (case sensitive comparison)"),
+    OPTION_TYPE_STRING, 0, 0, 0,
+    "", NULL, NULL, &cfg_irc_highlight, config_change_noop },
   { NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
 };
 
diff --git a/weechat/src/common/weeconfig.h b/weechat/src/common/weeconfig.h
index 244cf3bc9..18e4768b5 100644
--- a/weechat/src/common/weeconfig.h
+++ b/weechat/src/common/weeconfig.h
@@ -170,6 +170,7 @@ extern int cfg_irc_lag_check;
 extern int cfg_irc_lag_min_show;
 extern int cfg_irc_lag_disconnect;
 extern int cfg_irc_fifo_pipe;
+extern char *cfg_irc_highlight;
 
 extern int cfg_dcc_auto_accept_files;
 extern int cfg_dcc_auto_accept_chats;
diff --git a/weechat/src/irc/irc-channel.c b/weechat/src/irc/irc-channel.c
index f17596ce5..0323b7869 100644
--- a/weechat/src/irc/irc-channel.c
+++ b/weechat/src/irc/irc-channel.c
@@ -90,7 +90,15 @@ void
 channel_free (t_irc_server *server, t_irc_channel *channel)
 {
     t_irc_channel *new_channels;
-
+    
+    /* close DCC CHAT */
+    if ((t_irc_dcc *)(channel->dcc_chat) &&
+        (!DCC_ENDED(((t_irc_dcc *)(channel->dcc_chat))->status)))
+    {
+        dcc_close ((t_irc_dcc *)(channel->dcc_chat), DCC_ABORTED);
+        dcc_redraw (1);
+    }
+    
     /* remove channel from queue */
     if (server->last_channel == channel)
         server->last_channel = channel->prev_channel;
@@ -104,14 +112,6 @@ channel_free (t_irc_server *server, t_irc_channel *channel)
     
     if (channel->next_channel)
         (channel->next_channel)->prev_channel = channel->prev_channel;
-
-    /* close DCC CHAT */
-    if ((t_irc_dcc *)(channel->dcc_chat) &&
-        (!DCC_ENDED(((t_irc_dcc *)(channel->dcc_chat))->status)))
-    {
-        dcc_close ((t_irc_dcc *)(channel->dcc_chat), DCC_ABORTED);
-        dcc_redraw (1);
-    }
     
     /* free data */
     if (channel->name)
diff --git a/weechat/src/irc/irc-dcc.c b/weechat/src/irc/irc-dcc.c
index 53f637c97..1309a2475 100644
--- a/weechat/src/irc/irc-dcc.c
+++ b/weechat/src/irc/irc-dcc.c
@@ -998,7 +998,7 @@ dcc_chat_recv (t_irc_dcc *ptr_dcc)
                 gui_printf_type_color (ptr_dcc->channel->buffer,
                                        MSG_TYPE_NICK,
                                        COLOR_WIN_CHAT_DARK, "<");
-                if (strstr (ptr_buf, ptr_dcc->server->nick))
+                if (irc_is_highlight (ptr_buf, ptr_dcc->server->nick))
                 {
                     gui_printf_type_color (ptr_dcc->channel->buffer,
                                            MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c
index f84e9286f..9faa298b5 100644
--- a/weechat/src/irc/irc-recv.c
+++ b/weechat/src/irc/irc-recv.c
@@ -43,6 +43,70 @@
 
 
 /*
+ * irc_is_highlight: returns 1 if given message contains highlight (with given nick
+ *                   or at least one of string in "irc_higlight" setting
+ */
+
+int
+irc_is_highlight (char *message, char *nick)
+{
+    char *highlight, *pos, *pos_end;
+    int end, length;
+    
+    /* empty message ? */
+    if (!message || !message[0])
+        return 0;
+    
+    /* highlight by nickname */
+    if (strstr (message, nick))
+        return 1;
+    
+    /* no highlight by nickname and "irc_highlight" is empty */
+    if (!cfg_irc_highlight || !cfg_irc_highlight[0])
+        return 0;
+    
+    /* look in "irc_highlight" for highlight */
+    if ((highlight = strdup (cfg_irc_highlight)) == NULL)
+        return 0;
+    pos = highlight;
+    end = 0;
+    while (!end)
+    {
+        pos_end = strchr (pos, ',');
+        if (!pos_end)
+        {
+            pos_end = strchr (pos, '\0');
+            end = 1;
+        }
+        /* error parsing string! */
+        if (!pos_end)
+        {
+            free (highlight);
+            return 0;
+        }
+        
+        length = pos_end - pos;
+        pos_end[0] = '\0';
+        if (length > 0)
+        {
+            /* highlight found! */
+            if (strstr (message, pos))
+            {
+                free (highlight);
+                return 1;
+            }
+        }
+        
+        if (!end)
+            pos = pos_end + 1;
+    }
+    
+    /* no highlight found with "irc_highlight" list */
+    free (highlight);
+    return 0;
+}
+
+/*
  * irc_recv_command: executes action when receiving IRC command
  *                   returns:  0 = all ok, command executed
  *                            -1 = command failed
@@ -1232,7 +1296,7 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
                     if (pos2)
                         pos2[0] = '\0';
                     irc_display_prefix (ptr_channel->buffer, PREFIX_ACTION_ME);
-                    if (strstr (pos, server->nick))
+                    if (irc_is_highlight (pos, server->nick))
                     {
                         gui_printf_type_color (ptr_channel->buffer,
                                                MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
@@ -1271,7 +1335,7 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
                 else
                 {
                     ptr_nick = nick_search (ptr_channel, host);
-                    if (strstr (pos, server->nick))
+                    if (irc_is_highlight (pos, server->nick))
                     {
                         irc_display_nick (ptr_channel->buffer, ptr_nick,
                                           (ptr_nick) ? NULL : host,
@@ -1714,7 +1778,7 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
                 if (pos2)
                     pos2[0] = '\0';
                 irc_display_prefix (ptr_channel->buffer, PREFIX_ACTION_ME);
-                if (strstr (pos, server->nick))
+                if (irc_is_highlight (pos, server->nick))
                 {
                     gui_printf_type_color (ptr_channel->buffer,
                                            MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
@@ -1741,7 +1805,7 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
                 gui_printf_type_color (ptr_channel->buffer,
                                        MSG_TYPE_NICK,
                                        COLOR_WIN_CHAT_DARK, "<");
-                if (strstr (pos, server->nick))
+                if (irc_is_highlight (pos, server->nick))
                 {
                     gui_printf_type_color (ptr_channel->buffer,
                                            MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
diff --git a/weechat/src/irc/irc.h b/weechat/src/irc/irc.h
index d20dff257..915f91e3e 100644
--- a/weechat/src/irc/irc.h
+++ b/weechat/src/irc/irc.h
@@ -351,6 +351,7 @@ extern void irc_display_server (t_irc_server *ptr_server);
 
 /* IRC protocol (irc-commands.c) */
 
+extern int irc_is_highlight (char *, char *);
 extern int irc_recv_command (t_irc_server *, char *, char *, char *, char *);
 extern void irc_login (t_irc_server *);
 /* IRC commands issued by user */