summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2005-06-30 12:55:36 +0000
committerSebastien Helleu <flashcode@flashtux.org>2005-06-30 12:55:36 +0000
commit5bd56f86c6276e13cbf3a2d7bfb1a96023fc2305 (patch)
tree6a8aa5ab289e16ce58bd2e927d43384471736b9d
parent2fab4da03de5f879b7fe90ae8e9d83c7627d4285 (diff)
downloadweechat-5bd56f86c6276e13cbf3a2d7bfb1a96023fc2305.zip
* commands from users outside channel now authorized (if special user or channel without "n" flag)
* completion added for config option (with /set command)
-rw-r--r--ChangeLog5
-rw-r--r--po/es.po260
-rw-r--r--po/fr.po260
-rw-r--r--po/weechat.pot257
-rw-r--r--src/common/command.c2
-rw-r--r--src/common/completion.c102
-rw-r--r--src/common/completion.h1
-rw-r--r--src/common/weeconfig.c66
-rw-r--r--src/common/weeconfig.h1
-rw-r--r--src/irc/irc-display.c18
-rw-r--r--src/irc/irc-recv.c49
-rw-r--r--src/irc/irc-send.c4
-rw-r--r--src/irc/irc.h2
-rw-r--r--weechat/ChangeLog5
-rw-r--r--weechat/po/es.po260
-rw-r--r--weechat/po/fr.po260
-rw-r--r--weechat/po/weechat.pot257
-rw-r--r--weechat/src/common/command.c2
-rw-r--r--weechat/src/common/completion.c102
-rw-r--r--weechat/src/common/completion.h1
-rw-r--r--weechat/src/common/weeconfig.c66
-rw-r--r--weechat/src/common/weeconfig.h1
-rw-r--r--weechat/src/irc/irc-display.c18
-rw-r--r--weechat/src/irc/irc-recv.c49
-rw-r--r--weechat/src/irc/irc-send.c4
-rw-r--r--weechat/src/irc/irc.h2
26 files changed, 1140 insertions, 914 deletions
diff --git a/ChangeLog b/ChangeLog
index ee877b198..5f1af5213 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,13 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-ChangeLog - 2005-06-27
+ChangeLog - 2005-06-30
Version 0.1.3 (under dev!):
+ * completion added for config option (with /set command)
+ * commands from users outside channel now authorized (if special user or
+ channel without "n" flag)
* added IPv6 support
* kill command now received and displayed
* added SSL support
diff --git a/po/es.po b/po/es.po
index 40efae6a3..466aa376d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.3-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-06-27 18:18+0200\n"
+"POT-Creation-Date: 2005-06-30 14:30+0200\n"
"PO-Revision-Date: 2005-06-27 18:21+0200\n"
"Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -20,119 +20,119 @@ msgstr ""
msgid "%s cannot allocate new nick\n"
msgstr "%s no ha sido posible crear un nuevo nick\n"
-#: src/irc/irc-server.c:156 src/common/weeconfig.c:1546
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1612
msgid "Unable to get user's name"
msgstr "No ha sido posible obtener el nombre de usuario"
-#: src/irc/irc-server.c:221
+#: src/irc/irc-server.c:248
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s no ha sido posible crear un nuevo servidor\n"
-#: src/irc/irc-server.c:439
+#: src/irc/irc-server.c:466
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s error enviando datos al servidor IRC\n"
-#: src/irc/irc-server.c:459 src/irc/irc-server.c:472 src/irc/irc-server.c:538
-#: src/irc/irc-server.c:551
+#: src/irc/irc-server.c:486 src/irc/irc-server.c:499 src/irc/irc-server.c:565
+#: src/irc/irc-server.c:578
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s memoria insuficiente para un mensaje IRC recibido\n"
-#: src/irc/irc-server.c:629
+#: src/irc/irc-server.c:656
#, c-format
msgid "%s Command '%s' failed!\n"
msgstr "%s ¡Ha fallado el comando '%s' !\n"
-#: src/irc/irc-server.c:634
+#: src/irc/irc-server.c:661
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s ¡Ningún comando para ejecutar!\n"
-#: src/irc/irc-server.c:639
+#: src/irc/irc-server.c:666
#, c-format
msgid "%s Unknown command: cmd=%s, args=%s\n"
msgstr "%s Comando desconocido: cmd=%s, params=%s\n"
-#: src/irc/irc-server.c:690
+#: src/irc/irc-server.c:717
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
"%s no ha sido posible leer datos del socket, desconectando del servidor...\n"
-#: src/irc/irc-server.c:773
+#: src/irc/irc-server.c:800
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Reconexión al servidor en %d segundos\n"
-#: src/irc/irc-server.c:806
+#: src/irc/irc-server.c:833
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr ""
-#: src/irc/irc-server.c:822
+#: src/irc/irc-server.c:849
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s dirección \"%s\" no encontrada\n"
-#: src/irc/irc-server.c:831
+#: src/irc/irc-server.c:858
#, c-format
msgid "%s IP address not found\n"
msgstr "%s Dirección IP no encontrada\n"
-#: src/irc/irc-server.c:839
+#: src/irc/irc-server.c:866
#, c-format
msgid "%s connection refused\n"
msgstr "%s conexión rechazada\n"
-#: src/irc/irc-server.c:903
+#: src/irc/irc-server.c:930
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
msgstr ""
-#: src/irc/irc-server.c:910
+#: src/irc/irc-server.c:937
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr "%s: conectando al servidor %s:%d%s%s...\n"
-#: src/irc/irc-server.c:914
+#: src/irc/irc-server.c:941
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr "Conectando al servidor %s:%d%s%s...\n"
-#: src/irc/irc-server.c:931
+#: src/irc/irc-server.c:958
#, c-format
msgid "%s gnutls init error\n"
msgstr ""
-#: src/irc/irc-server.c:946
+#: src/irc/irc-server.c:973
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s no ha sido posible crear la interconexión\n"
-#: src/irc/irc-server.c:958
+#: src/irc/irc-server.c:985
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s no ha sido posible crear el socket\n"
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:996
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr "%s no ha sido posible configurar la opción socket \"SO_REUSEADDR\"\n"
-#: src/irc/irc-server.c:980
+#: src/irc/irc-server.c:1007
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr "%s no ha sido posible configurar la opción socket \"SO_KEEPALIVE\"\n"
-#: src/irc/irc-server.c:1011
+#: src/irc/irc-server.c:1038
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Reconectando al servidor...\n"
-#: src/irc/irc-server.c:1061 src/irc/irc-server.c:1070
+#: src/irc/irc-server.c:1088 src/irc/irc-server.c:1097
msgid "Disconnected from server!\n"
msgstr "¡Desconectado del servidor!\n"
@@ -1267,37 +1267,37 @@ msgstr "no es posible cambiar el modo para el resto de usuarios"
msgid "whois (secure connection)"
msgstr ""
-#: src/irc/irc-display.c:154 src/common/command.c:842
+#: src/irc/irc-display.c:156 src/common/command.c:842
msgid "Server: "
msgstr "Servidor: "
-#: src/irc/irc-display.c:159
+#: src/irc/irc-display.c:161
msgid "connected"
msgstr "conectado"
-#: src/irc/irc-display.c:159
+#: src/irc/irc-display.c:161
msgid "not connected"
msgstr "no conectado"
-#: src/irc/irc-display.c:163 src/irc/irc-display.c:168
-#: src/irc/irc-display.c:180 src/irc/irc-display.c:183
+#: src/irc/irc-display.c:165 src/irc/irc-display.c:170
+#: src/irc/irc-display.c:182 src/irc/irc-display.c:185
msgid "yes"
msgstr "sí"
-#: src/irc/irc-display.c:163 src/irc/irc-display.c:168
-#: src/irc/irc-display.c:180 src/irc/irc-display.c:183
+#: src/irc/irc-display.c:165 src/irc/irc-display.c:170
+#: src/irc/irc-display.c:182 src/irc/irc-display.c:185
msgid "no"
msgstr "no"
-#: src/irc/irc-display.c:165
+#: src/irc/irc-display.c:167
msgid " (temporary server, will not be saved)"
msgstr " (servidor temporal, no será guardado)"
-#: src/irc/irc-display.c:187
+#: src/irc/irc-display.c:189
msgid "(hidden)"
msgstr "(oculto)"
-#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3645
+#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3636
msgid "unknown"
msgstr "desconocido"
@@ -1341,7 +1341,7 @@ msgstr ""
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:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1514
+#: src/irc/irc-send.c:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1505
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
@@ -1360,8 +1360,8 @@ msgid "by"
msgstr "por"
#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:289 src/irc/irc-recv.c:763
-#: src/irc/irc-recv.c:1098 src/irc/irc-recv.c:1286 src/irc/irc-recv.c:2863
-#: src/irc/irc-recv.c:2930
+#: src/irc/irc-recv.c:1098 src/irc/irc-recv.c:1277 src/irc/irc-recv.c:2854
+#: src/irc/irc-recv.c:2921
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s canal \"%s\" no encontrado para el comando \"%s\"\n"
@@ -1497,7 +1497,7 @@ msgid "removes voice from"
msgstr "quita la voz a"
#: src/irc/irc-recv.c:718 src/irc/irc-recv.c:803 src/irc/irc-recv.c:1172
-#: src/irc/irc-recv.c:1610
+#: src/irc/irc-recv.c:1601
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s comando \"%s\" recibido sin host \n"
@@ -1546,7 +1546,7 @@ msgstr "%s comando \"%s\" recibido sin host o canal\n"
msgid " has left "
msgstr " ha salido "
-#: src/irc/irc-recv.c:1221 src/irc/irc-recv.c:1540
+#: src/irc/irc-recv.c:1221 src/irc/irc-recv.c:1531
#, c-format
msgid "On %s: * %s %s"
msgstr "En %s: * %s %s"
@@ -1556,233 +1556,227 @@ msgstr "En %s: * %s %s"
msgid "Received a CTCP SOUND \"%s\" from "
msgstr "Recibido un sonido CTCP \\\"%s\\\" de "
-#: src/irc/irc-recv.c:1261
+#: src/irc/irc-recv.c:1260
#, c-format
msgid "On %s: %s> %s"
msgstr "En %s: %s> %s"
-#: src/irc/irc-recv.c:1276
-#, c-format
-msgid "%s nick \"%s\" not found for \"%s\" command (message: \"%s\")\n"
-msgstr ""
-"%s usuario \"%s\" no encontrado para el comando \"%s\" (mensaje: \"%s\")\n"
-
-#: src/irc/irc-recv.c:1331
+#: src/irc/irc-recv.c:1322
msgid "Received a "
msgstr "Recibido un "
-#: src/irc/irc-recv.c:1333
+#: src/irc/irc-recv.c:1324
msgid "CTCP VERSION "
msgstr "CTCP VERSION "
-#: src/irc/irc-recv.c:1335
+#: src/irc/irc-recv.c:1326
msgid "from"
msgstr "de"
-#: src/irc/irc-recv.c:1372 src/irc/irc-recv.c:1389 src/irc/irc-recv.c:1405
-#: src/irc/irc-recv.c:1421 src/irc/irc-recv.c:1446 src/irc/irc-recv.c:1463
-#: src/irc/irc-recv.c:1478 src/irc/irc-recv.c:1586 src/irc/irc-recv.c:3229
-#: src/irc/irc-recv.c:3287 src/irc/irc-recv.c:3439 src/irc/irc-recv.c:3454
-#: src/irc/irc-recv.c:3469 src/irc/irc-recv.c:3484 src/irc/irc-recv.c:3497
-#: src/irc/irc-recv.c:3547 src/irc/irc-recv.c:3561
+#: src/irc/irc-recv.c:1363 src/irc/irc-recv.c:1380 src/irc/irc-recv.c:1396
+#: src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1437 src/irc/irc-recv.c:1454
+#: src/irc/irc-recv.c:1469 src/irc/irc-recv.c:1577 src/irc/irc-recv.c:3220
+#: src/irc/irc-recv.c:3278 src/irc/irc-recv.c:3430 src/irc/irc-recv.c:3445
+#: src/irc/irc-recv.c:3460 src/irc/irc-recv.c:3475 src/irc/irc-recv.c:3488
+#: src/irc/irc-recv.c:3538 src/irc/irc-recv.c:3552
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s no es posible analizar el comando \"%s\"\n"
-#: src/irc/irc-recv.c:1491
+#: src/irc/irc-recv.c:1482
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr "%s tipo DCC CHAT desconocido recibido de "
-#: src/irc/irc-recv.c:1566 src/irc/irc-dcc.c:799
+#: src/irc/irc-recv.c:1557 src/irc/irc-dcc.c:799
#, c-format
msgid "Private %s> %s"
msgstr "Privado %s> %s"
-#: src/irc/irc-recv.c:1642
+#: src/irc/irc-recv.c:1633
msgid "has quit"
msgstr "ha salido"
-#: src/irc/irc-recv.c:1763
+#: src/irc/irc-recv.c:1754
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s comando \"%s\" recibido sin canal\n"
-#: src/irc/irc-recv.c:1791
+#: src/irc/irc-recv.c:1782
msgid " has changed topic for "
msgstr "ha cambiado el tema por "
-#: src/irc/irc-recv.c:1796
+#: src/irc/irc-recv.c:1787
#, c-format
msgid " to: \"%s\"\n"
msgstr " a: \"%s\"\n"
-#: src/irc/irc-recv.c:1802
+#: src/irc/irc-recv.c:1793
msgid " has unset topic for "
msgstr " ha quitado el tema por "
-#: src/irc/irc-recv.c:1913
+#: src/irc/irc-recv.c:1904
#, c-format
msgid " is away: %s\n"
msgstr " está ausente: %s\n"
-#: src/irc/irc-recv.c:1987
+#: src/irc/irc-recv.c:1978
msgid "Users online: "
msgstr "Usuarios conectados: "
-#: src/irc/irc-recv.c:2434
+#: src/irc/irc-recv.c:2425
msgid "idle: "
msgstr "sin actividad: "
-#: src/irc/irc-recv.c:2442
+#: src/irc/irc-recv.c:2433
msgid "days"
msgstr "días"
-#: src/irc/irc-recv.c:2442
+#: src/irc/irc-recv.c:2433
msgid "day"
msgstr "día"
-#: src/irc/irc-recv.c:2452
+#: src/irc/irc-recv.c:2443
msgid "hours"
msgstr "horas"
-#: src/irc/irc-recv.c:2452
+#: src/irc/irc-recv.c:2443
msgid "hour"
msgstr "hora"
-#: src/irc/irc-recv.c:2458
+#: src/irc/irc-recv.c:2449
msgid "minutes"
msgstr "minutos"
-#: src/irc/irc-recv.c:2458
+#: src/irc/irc-recv.c:2449
msgid "minute"
msgstr "minuto"
-#: src/irc/irc-recv.c:2464
+#: src/irc/irc-recv.c:2455
msgid "seconds"
msgstr "segundos"
-#: src/irc/irc-recv.c:2464
+#: src/irc/irc-recv.c:2455
msgid "second"
msgstr "segundo"
-#: src/irc/irc-recv.c:2469
+#: src/irc/irc-recv.c:2460
msgid "signon at: "
msgstr "firmado el: "
-#: src/irc/irc-recv.c:2557
+#: src/irc/irc-recv.c:2548
msgid "Channels: "
msgstr "Canales: "
-#: src/irc/irc-recv.c:2809
+#: src/irc/irc-recv.c:2800
msgid "No topic set for "
msgstr "No hay tema definido para "
-#: src/irc/irc-recv.c:2851
+#: src/irc/irc-recv.c:2842
msgid "Topic for "
msgstr "El tema para "
-#: src/irc/irc-recv.c:2855
+#: src/irc/irc-recv.c:2846
#, c-format
msgid " is: \"%s\"\n"
msgstr " es: \"%s\"\n"
-#: src/irc/irc-recv.c:2873 src/irc/irc-recv.c:2957 src/irc/irc-recv.c:3010
+#: src/irc/irc-recv.c:2864 src/irc/irc-recv.c:2948 src/irc/irc-recv.c:3001
#, 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:2919
+#: src/irc/irc-recv.c:2910
msgid "Topic set by "
msgstr "Tema definido por "
-#: src/irc/irc-recv.c:2939
+#: src/irc/irc-recv.c:2930
#, 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:2948 src/irc/irc-recv.c:3019
+#: src/irc/irc-recv.c:2939 src/irc/irc-recv.c:3010
#, 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:2998
+#: src/irc/irc-recv.c:2989
msgid "has invited"
msgstr ""
-#: src/irc/irc-recv.c:3001 src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:2992 src/irc/irc-recv.c:3143
msgid "on"
msgstr "en"
-#: src/irc/irc-recv.c:3275
+#: src/irc/irc-recv.c:3266
#, 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:3331
+#: src/irc/irc-recv.c:3322
msgid "Nicks "
msgstr "Usuarios "
-#: src/irc/irc-recv.c:3351
+#: src/irc/irc-recv.c:3342
msgid "Channel "
msgstr "Canal "
-#: src/irc/irc-recv.c:3362
+#: src/irc/irc-recv.c:3353
msgid "nicks"
msgstr "usuarios"
-#: src/irc/irc-recv.c:3362
+#: src/irc/irc-recv.c:3353
msgid "nick"
msgstr "usuario"
-#: src/irc/irc-recv.c:3370
+#: src/irc/irc-recv.c:3361
msgid "ops"
msgstr "operadores"
-#: src/irc/irc-recv.c:3370
+#: src/irc/irc-recv.c:3361
msgid "op"
msgstr "operador"
-#: src/irc/irc-recv.c:3379
+#: src/irc/irc-recv.c:3370
msgid "halfops"
msgstr "semi-operadores"
-#: src/irc/irc-recv.c:3379
+#: src/irc/irc-recv.c:3370
msgid "halfop"
msgstr "semi-operador"
-#: src/irc/irc-recv.c:3388
+#: src/irc/irc-recv.c:3379
msgid "voices"
msgstr "voces"
-#: src/irc/irc-recv.c:3388
+#: src/irc/irc-recv.c:3379
msgid "voice"
msgstr "voz"
-#: src/irc/irc-recv.c:3397
+#: src/irc/irc-recv.c:3388
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:3510
+#: src/irc/irc-recv.c:3501
msgid "banned by"
msgstr "baneado por"
-#: src/irc/irc-recv.c:3599
+#: src/irc/irc-recv.c:3590
#, 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:3611
+#: src/irc/irc-recv.c:3602
#, 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:3623
+#: src/irc/irc-recv.c:3614
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1791,7 +1785,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:3633
+#: src/irc/irc-recv.c:3624
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
@@ -2917,52 +2911,52 @@ msgstr ""
msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
msgstr "%s sintaxis inválida para el servidor IRC ('%s'), ignorado\n"
-#: src/common/weechat.c:383
+#: src/common/weechat.c:384
#, c-format
msgid "%s unable to create server ('%s'), ignored\n"
msgstr "%s no es posible crear el servidor ('%s'), ignorado\n"
-#: src/common/weechat.c:392
+#: src/common/weechat.c:393
#, c-format
msgid "%s unknown parameter '%s', ignored\n"
msgstr "%s parámetro desconocido '%s', ignorado\n"
-#: src/common/weechat.c:412
+#: src/common/weechat.c:413
#, c-format
msgid "%s cannot create directory \"%s\"\n"
msgstr "%s no es posible crear el directorio \"%s\"\n"
-#: src/common/weechat.c:438
+#: src/common/weechat.c:439
#, c-format
msgid "%s unable to get HOME directory\n"
msgstr "%s no ha sido posible leer el directorio HOME\n"
-#: src/common/weechat.c:447
+#: src/common/weechat.c:448
#, c-format
msgid "%s not enough memory for home directory\n"
msgstr "%s no hay suficiente memoria para el directorio home\n"
-#: src/common/weechat.c:457
+#: src/common/weechat.c:458
#, c-format
msgid "%s unable to create ~/.weechat directory\n"
msgstr "%s no es posible crear el directorio ~/.weechat\n"
-#: src/common/weechat.c:509
+#: src/common/weechat.c:510
#, c-format
msgid "%s unable to create ~/.weechat/logs directory\n"
msgstr "%s no es posible crear el directorio ~/.weechat/logs\n"
-#: src/common/weechat.c:552
+#: src/common/weechat.c:553
#, c-format
msgid "%s unable to create/append to log file (~/.weechat/%s)"
msgstr "%s no es posible crear/añadir en el fichero de log (~/.weechat/%s)"
-#: src/common/weechat.c:575
+#: src/common/weechat.c:576
#, c-format
msgid "%sWelcome to "
msgstr "%sBienvenido a "
-#: src/common/weechat.c:588 src/common/weechat.c:597
+#: src/common/weechat.c:589 src/common/weechat.c:598
msgid "compiled on"
msgstr "compilado en"
@@ -3766,62 +3760,62 @@ msgid ""
"#channel:1,..)"
msgstr ""
-#: src/common/weeconfig.c:1094
+#: src/common/weeconfig.c:1160
#, 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:1103
+#: src/common/weeconfig.c:1169
#, 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:1118
+#: src/common/weeconfig.c:1184
#, 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:1157
+#: src/common/weeconfig.c:1223
#, 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:1168
+#: src/common/weeconfig.c:1234
#, 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:1207
+#: src/common/weeconfig.c:1273
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr "%s fichero de configuración \"%s\" no encontrado.\n"
-#: src/common/weeconfig.c:1239
+#: src/common/weeconfig.c:1305
#, 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:1256
+#: src/common/weeconfig.c:1322
#, 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:1274
+#: src/common/weeconfig.c:1340
#, 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:1282
+#: src/common/weeconfig.c:1348
#, 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:1316
+#: src/common/weeconfig.c:1382
#, 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:1327
+#: src/common/weeconfig.c:1393
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
@@ -3830,7 +3824,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:1336
+#: src/common/weeconfig.c:1402
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -3839,7 +3833,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:1347
+#: src/common/weeconfig.c:1413
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -3848,26 +3842,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:1363
+#: src/common/weeconfig.c:1429
#, 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:1423 src/common/weeconfig.c:1598
+#: src/common/weeconfig.c:1489 src/common/weeconfig.c:1664
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr "%s no es posible crear el fichero \"%s\"\n"
-#: src/common/weeconfig.c:1429
+#: src/common/weeconfig.c:1495
#, c-format
msgid "%s: creating default config file...\n"
msgstr "%s: creando fichero de configuración por defecto...\n"
-#: src/common/weeconfig.c:1430
+#: src/common/weeconfig.c:1496
msgid "Creating default config file\n"
msgstr "Creando fichero de configuración por defecto\n"
-#: src/common/weeconfig.c:1433 src/common/weeconfig.c:1607
+#: src/common/weeconfig.c:1499 src/common/weeconfig.c:1673
#, c-format
msgid ""
"#\n"
@@ -3876,9 +3870,7 @@ msgstr ""
"#\n"
"# %s: fichero de configuración, creado por %s v%s el %s#\n"
-#: src/common/weeconfig.c:1604
+#: src/common/weeconfig.c:1670
msgid "Saving config to disk\n"
msgstr "Guardar configuración a disco\n"
-#~ msgid "%s: connecting to %s:%d%s...\n"
-#~ msgstr "%s: conectando a %s:%d%s...\n"
diff --git a/po/fr.po b/po/fr.po
index ceb7db3b5..f511ca27a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.3-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-06-27 18:18+0200\n"
+"POT-Creation-Date: 2005-06-30 14:30+0200\n"
"PO-Revision-Date: 2005-06-27 18:19+0200\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -20,73 +20,73 @@ msgstr ""
msgid "%s cannot allocate new nick\n"
msgstr "%s impossible d'allouer un nouveau pseudo\n"
-#: src/irc/irc-server.c:156 src/common/weeconfig.c:1546
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1612
msgid "Unable to get user's name"
msgstr "Impossible de déterminer le nom d'utilisateur"
-#: src/irc/irc-server.c:221
+#: src/irc/irc-server.c:248
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s impossible d'allouer un nouveau serveur\n"
-#: src/irc/irc-server.c:439
+#: src/irc/irc-server.c:466
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s erreur d'envoi de données au serveur IRC\n"
-#: src/irc/irc-server.c:459 src/irc/irc-server.c:472 src/irc/irc-server.c:538
-#: src/irc/irc-server.c:551
+#: src/irc/irc-server.c:486 src/irc/irc-server.c:499 src/irc/irc-server.c:565
+#: src/irc/irc-server.c:578
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s mémoire insuffisante pour un message IRC reçu\n"
-#: src/irc/irc-server.c:629
+#: src/irc/irc-server.c:656
#, c-format
msgid "%s Command '%s' failed!\n"
msgstr "%s La commande '%s' a échoué !\n"
-#: src/irc/irc-server.c:634
+#: src/irc/irc-server.c:661
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Pas de commande à exécuter !\n"
-#: src/irc/irc-server.c:639
+#: src/irc/irc-server.c:666
#, c-format
msgid "%s Unknown command: cmd=%s, args=%s\n"
msgstr "%s Commande inconnue: cmd=%s, params=%s\n"
-#: src/irc/irc-server.c:690
+#: src/irc/irc-server.c:717
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
"%s impossible de lire des données sur la socket, déconnexion du serveur...\n"
-#: src/irc/irc-server.c:773
+#: src/irc/irc-server.c:800
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Reconnexion au serveur dans %d secondes\n"
-#: src/irc/irc-server.c:806
+#: src/irc/irc-server.c:833
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s le handshake gnutls a échoué\n"
-#: src/irc/irc-server.c:822
+#: src/irc/irc-server.c:849
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s adresse \"%s\" introuvable\n"
-#: src/irc/irc-server.c:831
+#: src/irc/irc-server.c:858
#, c-format
msgid "%s IP address not found\n"
msgstr "%s adresse IP introuvable\n"
-#: src/irc/irc-server.c:839
+#: src/irc/irc-server.c:866
#, c-format
msgid "%s connection refused\n"
msgstr "%s connexion refusée\n"
-#: src/irc/irc-server.c:903
+#: src/irc/irc-server.c:930
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -94,47 +94,47 @@ msgstr ""
"%s impossible de se connecter en SSL car WeeChat n'a pas été construit avec "
"le support GNUtls\n"
-#: src/irc/irc-server.c:910
+#: src/irc/irc-server.c:937
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr "%s: connexion au serveur %s:%d%s%s...\n"
-#: src/irc/irc-server.c:914
+#: src/irc/irc-server.c:941
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr "Connexion au serveur %s:%d%s%s...\n"
-#: src/irc/irc-server.c:931
+#: src/irc/irc-server.c:958
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s erreur d'initialisation gnutls\n"
-#: src/irc/irc-server.c:946
+#: src/irc/irc-server.c:973
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s impossible de créer le pipe\n"
-#: src/irc/irc-server.c:958
+#: src/irc/irc-server.c:985
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s impossible de créer la socket\n"
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:996
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr "%s impossible de paramétrer l'option socket \"SO_REUSEADDR\"\n"
-#: src/irc/irc-server.c:980
+#: src/irc/irc-server.c:1007
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr "%s impossible de paramétrer l'option socket \"SO_KEEPALIVE\"\n"
-#: src/irc/irc-server.c:1011
+#: src/irc/irc-server.c:1038
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Reconnexion au serveur...\n"
-#: src/irc/irc-server.c:1061 src/irc/irc-server.c:1070
+#: src/irc/irc-server.c:1088 src/irc/irc-server.c:1097
msgid "Disconnected from server!\n"
msgstr "Déconnecté du serveur !\n"
@@ -1270,37 +1270,37 @@ msgstr "impossible de changer le mode pour les autres utilisateurs"
msgid "whois (secure connection)"
msgstr "qui est (connexion sécurisée)"
-#: src/irc/irc-display.c:154 src/common/command.c:842
+#: src/irc/irc-display.c:156 src/common/command.c:842
msgid "Server: "
msgstr "Serveur: "
-#: src/irc/irc-display.c:159
+#: src/irc/irc-display.c:161
msgid "connected"
msgstr "connecté"
-#: src/irc/irc-display.c:159
+#: src/irc/irc-display.c:161
msgid "not connected"
msgstr "non connecté"
-#: src/irc/irc-display.c:163 src/irc/irc-display.c:168
-#: src/irc/irc-display.c:180 src/irc/irc-display.c:183
+#: src/irc/irc-display.c:165 src/irc/irc-display.c:170
+#: src/irc/irc-display.c:182 src/irc/irc-display.c:185
msgid "yes"
msgstr "oui"
-#: src/irc/irc-display.c:163 src/irc/irc-display.c:168
-#: src/irc/irc-display.c:180 src/irc/irc-display.c:183
+#: src/irc/irc-display.c:165 src/irc/irc-display.c:170
+#: src/irc/irc-display.c:182 src/irc/irc-display.c:185
msgid "no"
msgstr "non"
-#: src/irc/irc-display.c:165
+#: src/irc/irc-display.c:167
msgid " (temporary server, will not be saved)"
msgstr " (serveur temporaire, ne sera pas sauvé)"
-#: src/irc/irc-display.c:187
+#: src/irc/irc-display.c:189
msgid "(hidden)"
msgstr "(caché)"
-#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3645
+#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3636
msgid "unknown"
msgstr "inconnu"
@@ -1345,7 +1345,7 @@ msgstr ""
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:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1514
+#: src/irc/irc-send.c:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1505
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
@@ -1364,8 +1364,8 @@ msgid "by"
msgstr "par"
#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:289 src/irc/irc-recv.c:763
-#: src/irc/irc-recv.c:1098 src/irc/irc-recv.c:1286 src/irc/irc-recv.c:2863
-#: src/irc/irc-recv.c:2930
+#: src/irc/irc-recv.c:1098 src/irc/irc-recv.c:1277 src/irc/irc-recv.c:2854
+#: src/irc/irc-recv.c:2921
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s canal \"%s\" non trouvé pour la commande \"%s\"\n"
@@ -1501,7 +1501,7 @@ msgid "removes voice from"
msgstr "supprime la voix de"
#: src/irc/irc-recv.c:718 src/irc/irc-recv.c:803 src/irc/irc-recv.c:1172
-#: src/irc/irc-recv.c:1610
+#: src/irc/irc-recv.c:1601
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s commande \"%s\" reçue sans host\n"
@@ -1550,7 +1550,7 @@ msgstr "%s commande \"%s\" reçue sans host ou canal\n"
msgid " has left "
msgstr " a quitté "
-#: src/irc/irc-recv.c:1221 src/irc/irc-recv.c:1540
+#: src/irc/irc-recv.c:1221 src/irc/irc-recv.c:1531
#, c-format
msgid "On %s: * %s %s"
msgstr "Sur %s: * %s %s"
@@ -1560,233 +1560,227 @@ msgstr "Sur %s: * %s %s"
msgid "Received a CTCP SOUND \"%s\" from "
msgstr "CTCP SOUND \"%s\" reçu de "
-#: src/irc/irc-recv.c:1261
+#: src/irc/irc-recv.c:1260
#, c-format
msgid "On %s: %s> %s"
msgstr "Sur %s: %s> %s"
-#: src/irc/irc-recv.c:1276
-#, c-format
-msgid "%s nick \"%s\" not found for \"%s\" command (message: \"%s\")\n"
-msgstr ""
-"%s pseudo \"%s\" non trouvé pour la commande \"%s\" (message: \"%s\")\n"
-
-#: src/irc/irc-recv.c:1331
+#: src/irc/irc-recv.c:1322
msgid "Received a "
msgstr "Reçu un "
-#: src/irc/irc-recv.c:1333
+#: src/irc/irc-recv.c:1324
msgid "CTCP VERSION "
msgstr "CTCP VERSION "
-#: src/irc/irc-recv.c:1335
+#: src/irc/irc-recv.c:1326
msgid "from"
msgstr "de"
-#: src/irc/irc-recv.c:1372 src/irc/irc-recv.c:1389 src/irc/irc-recv.c:1405
-#: src/irc/irc-recv.c:1421 src/irc/irc-recv.c:1446 src/irc/irc-recv.c:1463
-#: src/irc/irc-recv.c:1478 src/irc/irc-recv.c:1586 src/irc/irc-recv.c:3229
-#: src/irc/irc-recv.c:3287 src/irc/irc-recv.c:3439 src/irc/irc-recv.c:3454
-#: src/irc/irc-recv.c:3469 src/irc/irc-recv.c:3484 src/irc/irc-recv.c:3497
-#: src/irc/irc-recv.c:3547 src/irc/irc-recv.c:3561
+#: src/irc/irc-recv.c:1363 src/irc/irc-recv.c:1380 src/irc/irc-recv.c:1396
+#: src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1437 src/irc/irc-recv.c:1454
+#: src/irc/irc-recv.c:1469 src/irc/irc-recv.c:1577 src/irc/irc-recv.c:3220
+#: src/irc/irc-recv.c:3278 src/irc/irc-recv.c:3430 src/irc/irc-recv.c:3445
+#: src/irc/irc-recv.c:3460 src/irc/irc-recv.c:3475 src/irc/irc-recv.c:3488
+#: src/irc/irc-recv.c:3538 src/irc/irc-recv.c:3552
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s impossible d'analyser la commande \"%s\"\n"
-#: src/irc/irc-recv.c:1491
+#: src/irc/irc-recv.c:1482
#, 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:1566 src/irc/irc-dcc.c:799
+#: src/irc/irc-recv.c:1557 src/irc/irc-dcc.c:799
#, c-format
msgid "Private %s> %s"
msgstr "Prive %s> %s"
-#: src/irc/irc-recv.c:1642
+#: src/irc/irc-recv.c:1633
msgid "has quit"
msgstr "a quitté"
-#: src/irc/irc-recv.c:1763
+#: src/irc/irc-recv.c:1754
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s commande \"%s\" reçue sans canal\n"
-#: src/irc/irc-recv.c:1791
+#: src/irc/irc-recv.c:1782
msgid " has changed topic for "
msgstr " a changé le titre pour "
-#: src/irc/irc-recv.c:1796
+#: src/irc/irc-recv.c:1787
#, c-format
msgid " to: \"%s\"\n"
msgstr " en: \"%s\"\n"
-#: src/irc/irc-recv.c:1802
+#: src/irc/irc-recv.c:1793
msgid " has unset topic for "
msgstr " a retiré le titre pour "
-#: src/irc/irc-recv.c:1913
+#: src/irc/irc-recv.c:1904
#, c-format
msgid " is away: %s\n"
msgstr " est absent: %s\n"
-#: src/irc/irc-recv.c:1987
+#: src/irc/irc-recv.c:1978
msgid "Users online: "
msgstr "Utilisateurs en ligne: "
-#: src/irc/irc-recv.c:2434
+#: src/irc/irc-recv.c:2425
msgid "idle: "
msgstr "inactivité: "
-#: src/irc/irc-recv.c:2442
+#: src/irc/irc-recv.c:2433
msgid "days"
msgstr "jours"
-#: src/irc/irc-recv.c:2442
+#: src/irc/irc-recv.c:2433
msgid "day"
msgstr "jour"
-#: src/irc/irc-recv.c:2452
+#: src/irc/irc-recv.c:2443
msgid "hours"
msgstr "heures"
-#: src/irc/irc-recv.c:2452
+#: src/irc/irc-recv.c:2443
msgid "hour"
msgstr "heure"
-#: src/irc/irc-recv.c:2458
+#: src/irc/irc-recv.c:2449
msgid "minutes"
msgstr "minutes"
-#: src/irc/irc-recv.c:2458
+#: src/irc/irc-recv.c:2449
msgid "minute"
msgstr "minute"
-#: src/irc/irc-recv.c:2464
+#: src/irc/irc-recv.c:2455
msgid "seconds"
msgstr "secondes"
-#: src/irc/irc-recv.c:2464
+#: src/irc/irc-recv.c:2455
msgid "second"
msgstr "seconde"
-#: src/irc/irc-recv.c:2469
+#: src/irc/irc-recv.c:2460
msgid "signon at: "
msgstr "signé le: "
-#: src/irc/irc-recv.c:2557
+#: src/irc/irc-recv.c:2548
msgid "Channels: "
msgstr "Canaux: "
-#: src/irc/irc-recv.c:2809
+#: src/irc/irc-recv.c:2800
msgid "No topic set for "
msgstr "Pas de titre défini pour "
-#: src/irc/irc-recv.c:2851
+#: src/irc/irc-recv.c:2842
msgid "Topic for "
msgstr "Le titre pour "
-#: src/irc/irc-recv.c:2855
+#: src/irc/irc-recv.c:2846
#, c-format
msgid " is: \"%s\"\n"
msgstr " est: \"%s\"\n"
-#: src/irc/irc-recv.c:2873 src/irc/irc-recv.c:2957 src/irc/irc-recv.c:3010
+#: src/irc/irc-recv.c:2864 src/irc/irc-recv.c:2948 src/irc/irc-recv.c:3001
#, 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:2919
+#: src/irc/irc-recv.c:2910
msgid "Topic set by "
msgstr "Titre défini par "
-#: src/irc/irc-recv.c:2939
+#: src/irc/irc-recv.c:2930
#, 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:2948 src/irc/irc-recv.c:3019
+#: src/irc/irc-recv.c:2939 src/irc/irc-recv.c:3010
#, 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:2998
+#: src/irc/irc-recv.c:2989
msgid "has invited"
msgstr "a invité"
-#: src/irc/irc-recv.c:3001 src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:2992 src/irc/irc-recv.c:3143
msgid "on"
msgstr "sur"
-#: src/irc/irc-recv.c:3275
+#: src/irc/irc-recv.c:3266
#, 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:3331
+#: src/irc/irc-recv.c:3322
msgid "Nicks "
msgstr "Utilisateurs "
-#: src/irc/irc-recv.c:3351
+#: src/irc/irc-recv.c:3342
msgid "Channel "
msgstr "Canal "
-#: src/irc/irc-recv.c:3362
+#: src/irc/irc-recv.c:3353
msgid "nicks"
msgstr "utilisateurs"
-#: src/irc/irc-recv.c:3362
+#: src/irc/irc-recv.c:3353
msgid "nick"
msgstr "utilisateur"
-#: src/irc/irc-recv.c:3370
+#: src/irc/irc-recv.c:3361
msgid "ops"
msgstr "ops"
-#: src/irc/irc-recv.c:3370
+#: src/irc/irc-recv.c:3361
msgid "op"
msgstr "op"
-#: src/irc/irc-recv.c:3379
+#: src/irc/irc-recv.c:3370
msgid "halfops"
msgstr "halfops"
-#: src/irc/irc-recv.c:3379
+#: src/irc/irc-recv.c:3370
msgid "halfop"
msgstr "halfop"
-#: src/irc/irc-recv.c:3388
+#: src/irc/irc-recv.c:3379
msgid "voices"
msgstr "voices"
-#: src/irc/irc-recv.c:3388
+#: src/irc/irc-recv.c:3379
msgid "voice"
msgstr "voice"
-#: src/irc/irc-recv.c:3397
+#: src/irc/irc-recv.c:3388
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:3510
+#: src/irc/irc-recv.c:3501
msgid "banned by"
msgstr "banni par"
-#: src/irc/irc-recv.c:3599
+#: src/irc/irc-recv.c:3590
#, 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:3611
+#: src/irc/irc-recv.c:3602
#, 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:3623
+#: src/irc/irc-recv.c:3614
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1795,7 +1789,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:3633
+#: src/irc/irc-recv.c:3624
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
@@ -2915,52 +2909,52 @@ msgstr ""
msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
msgstr "%s syntaxe invalide pour le serveur IRC ('%s'), ignoré\n"
-#: src/common/weechat.c:383
+#: src/common/weechat.c:384
#, c-format
msgid "%s unable to create server ('%s'), ignored\n"
msgstr "%s impossible de créer le serveur ('%s'), ignoré\n"
-#: src/common/weechat.c:392
+#: src/common/weechat.c:393
#, c-format
msgid "%s unknown parameter '%s', ignored\n"
msgstr "%s paramètre inconnu '%s', ignoré\n"
-#: src/common/weechat.c:412
+#: src/common/weechat.c:413
#, c-format
msgid "%s cannot create directory \"%s\"\n"
msgstr "%s impossible de créer le répertoire \"%s\"\n"
-#: src/common/weechat.c:438
+#: src/common/weechat.c:439
#, c-format
msgid "%s unable to get HOME directory\n"
msgstr "%s impossible de lire le répertoire personnel\n"
-#: src/common/weechat.c:447
+#: src/common/weechat.c:448
#, c-format
msgid "%s not enough memory for home directory\n"
msgstr "%s pas assez de mémoire pour le répertoire personnel\n"
-#: src/common/weechat.c:457
+#: src/common/weechat.c:458
#, c-format
msgid "%s unable to create ~/.weechat directory\n"
msgstr "%s impossible de créer le répertoire ~/.weechat\n"
-#: src/common/weechat.c:509
+#: src/common/weechat.c:510
#, c-format
msgid "%s unable to create ~/.weechat/logs directory\n"
msgstr "%s impossible de créer le répertoire ~/.weechat/logs\n"
-#: src/common/weechat.c:552
+#: src/common/weechat.c:553
#, c-format
msgid "%s unable to create/append to log file (~/.weechat/%s)"
msgstr "%s impossible de créer/ajouter dans le fichier de log (~/.weechat/%s)"
-#: src/common/weechat.c:575
+#: src/common/weechat.c:576
#, c-format
msgid "%sWelcome to "
msgstr "%sBienvenue dans "
-#: src/common/weechat.c:588 src/common/weechat.c:597
+#: src/common/weechat.c:589 src/common/weechat.c:598
msgid "compiled on"
msgstr "compilé le"
@@ -3764,64 +3758,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:1094
+#: src/common/weeconfig.c:1160
#, 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:1103
+#: src/common/weeconfig.c:1169
#, 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:1118
+#: src/common/weeconfig.c:1184
#, 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:1157
+#: src/common/weeconfig.c:1223
#, 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:1168
+#: src/common/weeconfig.c:1234
#, 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:1207
+#: src/common/weeconfig.c:1273
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr "%s fichier de configuration \"%s\" non trouvé.\n"
-#: src/common/weeconfig.c:1239
+#: src/common/weeconfig.c:1305
#, 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:1256
+#: src/common/weeconfig.c:1322
#, 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:1274
+#: src/common/weeconfig.c:1340
#, 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:1282
+#: src/common/weeconfig.c:1348
#, 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:1316
+#: src/common/weeconfig.c:1382
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr "%s %s, ligne %d: option \"%s\" invalide\n"
-#: src/common/weeconfig.c:1327
+#: src/common/weeconfig.c:1393
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
@@ -3830,7 +3824,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:1336
+#: src/common/weeconfig.c:1402
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -3839,7 +3833,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:1347
+#: src/common/weeconfig.c:1413
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -3848,26 +3842,26 @@ msgstr ""
"%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
"Attendu: une de ces chaînes: "
-#: src/common/weeconfig.c:1363
+#: src/common/weeconfig.c:1429
#, 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:1423 src/common/weeconfig.c:1598
+#: src/common/weeconfig.c:1489 src/common/weeconfig.c:1664
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr "%s impossible de créer le fichier \"%s\"\n"
-#: src/common/weeconfig.c:1429
+#: src/common/weeconfig.c:1495
#, 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:1430
+#: src/common/weeconfig.c:1496
msgid "Creating default config file\n"
msgstr "Création du fichier de configuration par défaut\n"
-#: src/common/weeconfig.c:1433 src/common/weeconfig.c:1607
+#: src/common/weeconfig.c:1499 src/common/weeconfig.c:1673
#, c-format
msgid ""
"#\n"
@@ -3876,9 +3870,7 @@ msgstr ""
"#\n"
"# %s: fichier de configuration, créé par %s v%s le %s#\n"
-#: src/common/weeconfig.c:1604
+#: src/common/weeconfig.c:1670
msgid "Saving config to disk\n"
msgstr "Sauvegarde de la configuration sur disque\n"
-#~ msgid "%s: connecting to %s:%d%s...\n"
-#~ msgstr "%s: connexion à %s:%d%s...\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index cd9fdb3bc..7ca2d7a02 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-06-27 18:18+0200\n"
+"POT-Creation-Date: 2005-06-30 14:30+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,118 +20,118 @@ msgstr ""
msgid "%s cannot allocate new nick\n"
msgstr ""
-#: src/irc/irc-server.c:156 src/common/weeconfig.c:1546
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1612
msgid "Unable to get user's name"
msgstr ""
-#: src/irc/irc-server.c:221
+#: src/irc/irc-server.c:248
#, c-format
msgid "%s cannot allocate new server\n"
msgstr ""
-#: src/irc/irc-server.c:439
+#: src/irc/irc-server.c:466
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr ""
-#: src/irc/irc-server.c:459 src/irc/irc-server.c:472 src/irc/irc-server.c:538
-#: src/irc/irc-server.c:551
+#: src/irc/irc-server.c:486 src/irc/irc-server.c:499 src/irc/irc-server.c:565
+#: src/irc/irc-server.c:578
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr ""
-#: src/irc/irc-server.c:629
+#: src/irc/irc-server.c:656
#, c-format
msgid "%s Command '%s' failed!\n"
msgstr ""
-#: src/irc/irc-server.c:634
+#: src/irc/irc-server.c:661
#, c-format
msgid "%s No command to execute!\n"
msgstr ""
-#: src/irc/irc-server.c:639
+#: src/irc/irc-server.c:666
#, c-format
msgid "%s Unknown command: cmd=%s, args=%s\n"
msgstr ""
-#: src/irc/irc-server.c:690
+#: src/irc/irc-server.c:717
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
-#: src/irc/irc-server.c:773
+#: src/irc/irc-server.c:800
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr ""
-#: src/irc/irc-server.c:806
+#: src/irc/irc-server.c:833
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr ""
-#: src/irc/irc-server.c:822
+#: src/irc/irc-server.c:849
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr ""
-#: src/irc/irc-server.c:831
+#: src/irc/irc-server.c:858
#, c-format
msgid "%s IP address not found\n"
msgstr ""
-#: src/irc/irc-server.c:839
+#: src/irc/irc-server.c:866
#, c-format
msgid "%s connection refused\n"
msgstr ""
-#: src/irc/irc-server.c:903
+#: src/irc/irc-server.c:930
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
msgstr ""
-#: src/irc/irc-server.c:910
+#: src/irc/irc-server.c:937
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr ""
-#: src/irc/irc-server.c:914
+#: src/irc/irc-server.c:941
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr ""
-#: src/irc/irc-server.c:931
+#: src/irc/irc-server.c:958
#, c-format
msgid "%s gnutls init error\n"
msgstr ""
-#: src/irc/irc-server.c:946
+#: src/irc/irc-server.c:973
#, c-format
msgid "%s cannot create pipe\n"
msgstr ""
-#: src/irc/irc-server.c:958
+#: src/irc/irc-server.c:985
#, c-format
msgid "%s cannot create socket\n"
msgstr ""
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:996
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr ""
-#: src/irc/irc-server.c:980
+#: src/irc/irc-server.c:1007
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr ""
-#: src/irc/irc-server.c:1011
+#: src/irc/irc-server.c:1038
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr ""
-#: src/irc/irc-server.c:1061 src/irc/irc-server.c:1070
+#: src/irc/irc-server.c:1088 src/irc/irc-server.c:1097
msgid "Disconnected from server!\n"
msgstr ""
@@ -1162,37 +1162,37 @@ msgstr ""
msgid "whois (secure connection)"
msgstr ""
-#: src/irc/irc-display.c:154 src/common/command.c:842
+#: src/irc/irc-display.c:156 src/common/command.c:842
msgid "Server: "
msgstr ""
-#: src/irc/irc-display.c:159
+#: src/irc/irc-display.c:161
msgid "connected"
msgstr ""
-#: src/irc/irc-display.c:159
+#: src/irc/irc-display.c:161
msgid "not connected"
msgstr ""
-#: src/irc/irc-display.c:163 src/irc/irc-display.c:168
-#: src/irc/irc-display.c:180 src/irc/irc-display.c:183
+#: src/irc/irc-display.c:165 src/irc/irc-display.c:170
+#: src/irc/irc-display.c:182 src/irc/irc-display.c:185
msgid "yes"
msgstr ""
-#: src/irc/irc-display.c:163 src/irc/irc-display.c:168
-#: src/irc/irc-display.c:180 src/irc/irc-display.c:183
+#: src/irc/irc-display.c:165 src/irc/irc-display.c:170
+#: src/irc/irc-display.c:182 src/irc/irc-display.c:185
msgid "no"
msgstr ""
-#: src/irc/irc-display.c:165
+#: src/irc/irc-display.c:167
msgid " (temporary server, will not be saved)"
msgstr ""
-#: src/irc/irc-display.c:187
+#: src/irc/irc-display.c:189
msgid "(hidden)"
msgstr ""
-#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3645
+#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3636
msgid "unknown"
msgstr ""
@@ -1234,7 +1234,7 @@ msgstr ""
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-send.c:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1514
+#: src/irc/irc-send.c:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1505
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr ""
@@ -1253,8 +1253,8 @@ msgid "by"
msgstr ""
#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:289 src/irc/irc-recv.c:763
-#: src/irc/irc-recv.c:1098 src/irc/irc-recv.c:1286 src/irc/irc-recv.c:2863
-#: src/irc/irc-recv.c:2930
+#: src/irc/irc-recv.c:1098 src/irc/irc-recv.c:1277 src/irc/irc-recv.c:2854
+#: src/irc/irc-recv.c:2921
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr ""
@@ -1390,7 +1390,7 @@ msgid "removes voice from"
msgstr ""
#: src/irc/irc-recv.c:718 src/irc/irc-recv.c:803 src/irc/irc-recv.c:1172
-#: src/irc/irc-recv.c:1610
+#: src/irc/irc-recv.c:1601
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr ""
@@ -1439,7 +1439,7 @@ msgstr ""
msgid " has left "
msgstr ""
-#: src/irc/irc-recv.c:1221 src/irc/irc-recv.c:1540
+#: src/irc/irc-recv.c:1221 src/irc/irc-recv.c:1531
#, c-format
msgid "On %s: * %s %s"
msgstr ""
@@ -1449,234 +1449,229 @@ msgstr ""
msgid "Received a CTCP SOUND \"%s\" from "
msgstr ""
-#: src/irc/irc-recv.c:1261
+#: src/irc/irc-recv.c:1260
#, c-format
msgid "On %s: %s> %s"
msgstr ""
-#: src/irc/irc-recv.c:1276
-#, c-format
-msgid "%s nick \"%s\" not found for \"%s\" command (message: \"%s\")\n"
-msgstr ""
-
-#: src/irc/irc-recv.c:1331
+#: src/irc/irc-recv.c:1322
msgid "Received a "
msgstr ""
-#: src/irc/irc-recv.c:1333
+#: src/irc/irc-recv.c:1324
msgid "CTCP VERSION "
msgstr ""
-#: src/irc/irc-recv.c:1335
+#: src/irc/irc-recv.c:1326
msgid "from"
msgstr ""
-#: src/irc/irc-recv.c:1372 src/irc/irc-recv.c:1389 src/irc/irc-recv.c:1405
-#: src/irc/irc-recv.c:1421 src/irc/irc-recv.c:1446 src/irc/irc-recv.c:1463
-#: src/irc/irc-recv.c:1478 src/irc/irc-recv.c:1586 src/irc/irc-recv.c:3229
-#: src/irc/irc-recv.c:3287 src/irc/irc-recv.c:3439 src/irc/irc-recv.c:3454
-#: src/irc/irc-recv.c:3469 src/irc/irc-recv.c:3484 src/irc/irc-recv.c:3497
-#: src/irc/irc-recv.c:3547 src/irc/irc-recv.c:3561
+#: src/irc/irc-recv.c:1363 src/irc/irc-recv.c:1380 src/irc/irc-recv.c:1396
+#: src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1437 src/irc/irc-recv.c:1454
+#: src/irc/irc-recv.c:1469 src/irc/irc-recv.c:1577 src/irc/irc-recv.c:3220
+#: src/irc/irc-recv.c:3278 src/irc/irc-recv.c:3430 src/irc/irc-recv.c:3445
+#: src/irc/irc-recv.c:3460 src/irc/irc-recv.c:3475 src/irc/irc-recv.c:3488
+#: src/irc/irc-recv.c:3538 src/irc/irc-recv.c:3552
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:1491
+#: src/irc/irc-recv.c:1482
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr ""
-#: src/irc/irc-recv.c:1566 src/irc/irc-dcc.c:799
+#: src/irc/irc-recv.c:1557 src/irc/irc-dcc.c:799
#, c-format
msgid "Private %s> %s"
msgstr ""
-#: src/irc/irc-recv.c:1642
+#: src/irc/irc-recv.c:1633
msgid "has quit"
msgstr ""
-#: src/irc/irc-recv.c:1763
+#: src/irc/irc-recv.c:1754
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr ""
-#: src/irc/irc-recv.c:1791
+#: src/irc/irc-recv.c:1782
msgid " has changed topic for "
msgstr ""
-#: src/irc/irc-recv.c:1796
+#: src/irc/irc-recv.c:1787
#, c-format
msgid " to: \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:1802
+#: src/irc/irc-recv.c:1793
msgid " has unset topic for "
msgstr ""
-#: src/irc/irc-recv.c:1913
+#: src/irc/irc-recv.c:1904
#, c-format
msgid " is away: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:1987
+#: src/irc/irc-recv.c:1978
msgid "Users online: "
msgstr ""
-#: src/irc/irc-recv.c:2434
+#: src/irc/irc-recv.c:2425
msgid "idle: "
msgstr ""
-#: src/irc/irc-recv.c:2442
+#: src/irc/irc-recv.c:2433
msgid "days"
msgstr ""
-#: src/irc/irc-recv.c:2442
+#: src/irc/irc-recv.c:2433
msgid "day"
msgstr ""
-#: src/irc/irc-recv.c:2452
+#: src/irc/irc-recv.c:2443
msgid "hours"
msgstr ""
-#: src/irc/irc-recv.c:2452
+#: src/irc/irc-recv.c:2443
msgid "hour"
msgstr ""
-#: src/irc/irc-recv.c:2458
+#: src/irc/irc-recv.c:2449
msgid "minutes"
msgstr ""
-#: src/irc/irc-recv.c:2458
+#: src/irc/irc-recv.c:2449
msgid "minute"
msgstr ""
-#: src/irc/irc-recv.c:2464
+#: src/irc/irc-recv.c:2455
msgid "seconds"
msgstr ""
-#: src/irc/irc-recv.c:2464
+#: src/irc/irc-recv.c:2455
msgid "second"
msgstr ""
-#: src/irc/irc-recv.c:2469
+#: src/irc/irc-recv.c:2460
msgid "signon at: "
msgstr ""
-#: src/irc/irc-recv.c:2557
+#: src/irc/irc-recv.c:2548
msgid "Channels: "
msgstr ""
-#: src/irc/irc-recv.c:2809
+#: src/irc/irc-recv.c:2800
msgid "No topic set for "
msgstr ""
-#: src/irc/irc-recv.c:2851
+#: src/irc/irc-recv.c:2842
msgid "Topic for "
msgstr ""
-#: src/irc/irc-recv.c:2855
+#: src/irc/irc-recv.c:2846
#, c-format
msgid " is: \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:2873 src/irc/irc-recv.c:2957 src/irc/irc-recv.c:3010
+#: src/irc/irc-recv.c:2864 src/irc/irc-recv.c:2948 src/irc/irc-recv.c:3001
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:2919
+#: src/irc/irc-recv.c:2910
msgid "Topic set by "
msgstr ""
-#: src/irc/irc-recv.c:2939
+#: src/irc/irc-recv.c:2930
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:2948 src/irc/irc-recv.c:3019
+#: src/irc/irc-recv.c:2939 src/irc/irc-recv.c:3010
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:2998
+#: src/irc/irc-recv.c:2989
msgid "has invited"
msgstr ""
-#: src/irc/irc-recv.c:3001 src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:2992 src/irc/irc-recv.c:3143
msgid "on"
msgstr ""
-#: src/irc/irc-recv.c:3275
+#: src/irc/irc-recv.c:3266
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:3331
+#: src/irc/irc-recv.c:3322
msgid "Nicks "
msgstr ""
-#: src/irc/irc-recv.c:3351
+#: src/irc/irc-recv.c:3342
msgid "Channel "
msgstr ""
-#: src/irc/irc-recv.c:3362
+#: src/irc/irc-recv.c:3353
msgid "nicks"
msgstr ""
-#: src/irc/irc-recv.c:3362
+#: src/irc/irc-recv.c:3353
msgid "nick"
msgstr ""
-#: src/irc/irc-recv.c:3370
+#: src/irc/irc-recv.c:3361
msgid "ops"
msgstr ""
-#: src/irc/irc-recv.c:3370
+#: src/irc/irc-recv.c:3361
msgid "op"
msgstr ""
-#: src/irc/irc-recv.c:3379
+#: src/irc/irc-recv.c:3370
msgid "halfops"
msgstr ""
-#: src/irc/irc-recv.c:3379
+#: src/irc/irc-recv.c:3370
msgid "halfop"
msgstr ""
-#: src/irc/irc-recv.c:3388
+#: src/irc/irc-recv.c:3379
msgid "voices"
msgstr ""
-#: src/irc/irc-recv.c:3388
+#: src/irc/irc-recv.c:3379
msgid "voice"
msgstr ""
-#: src/irc/irc-recv.c:3397
+#: src/irc/irc-recv.c:3388
msgid "normal"
msgstr ""
-#: src/irc/irc-recv.c:3510
+#: src/irc/irc-recv.c:3501
msgid "banned by"
msgstr ""
-#: src/irc/irc-recv.c:3599
+#: src/irc/irc-recv.c:3590
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:3611
+#: src/irc/irc-recv.c:3602
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:3623
+#: src/irc/irc-recv.c:3614
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr ""
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3624
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
@@ -2716,52 +2711,52 @@ msgstr ""
msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
msgstr ""
-#: src/common/weechat.c:383
+#: src/common/weechat.c:384
#, c-format
msgid "%s unable to create server ('%s'), ignored\n"
msgstr ""
-#: src/common/weechat.c:392
+#: src/common/weechat.c:393
#, c-format
msgid "%s unknown parameter '%s', ignored\n"
msgstr ""
-#: src/common/weechat.c:412
+#: src/common/weechat.c:413
#, c-format
msgid "%s cannot create directory \"%s\"\n"
msgstr ""
-#: src/common/weechat.c:438
+#: src/common/weechat.c:439
#, c-format
msgid "%s unable to get HOME directory\n"
msgstr ""
-#: src/common/weechat.c:447
+#: src/common/weechat.c:448
#, c-format
msgid "%s not enough memory for home directory\n"
msgstr ""
-#: src/common/weechat.c:457
+#: src/common/weechat.c:458
#, c-format
msgid "%s unable to create ~/.weechat directory\n"
msgstr ""
-#: src/common/weechat.c:509
+#: src/common/weechat.c:510
#, c-format
msgid "%s unable to create ~/.weechat/logs directory\n"
msgstr ""
-#: src/common/weechat.c:552
+#: src/common/weechat.c:553
#, c-format
msgid "%s unable to create/append to log file (~/.weechat/%s)"
msgstr ""
-#: src/common/weechat.c:575
+#: src/common/weechat.c:576
#, c-format
msgid "%sWelcome to "
msgstr ""
-#: src/common/weechat.c:588 src/common/weechat.c:597
+#: src/common/weechat.c:589 src/common/weechat.c:598
msgid "compiled on"
msgstr ""
@@ -3512,108 +3507,108 @@ msgid ""
"#channel:1,..)"
msgstr ""
-#: src/common/weeconfig.c:1094
+#: src/common/weeconfig.c:1160
#, c-format
msgid "%s %s, line %d: new server, but previous was incomplete\n"
msgstr ""
-#: src/common/weeconfig.c:1103
+#: src/common/weeconfig.c:1169
#, c-format
msgid "%s %s, line %d: server '%s' already exists\n"
msgstr ""
-#: src/common/weeconfig.c:1118
+#: src/common/weeconfig.c:1184
#, c-format
msgid "%s %s, line %d: unable to create server\n"
msgstr ""
-#: src/common/weeconfig.c:1157
+#: src/common/weeconfig.c:1223
#, c-format
msgid "%s unable to assign default int with string (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:1168
+#: src/common/weeconfig.c:1234
#, c-format
msgid "%s unable to assign default color (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:1207
+#: src/common/weeconfig.c:1273
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr ""
-#: src/common/weeconfig.c:1239
+#: src/common/weeconfig.c:1305
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
msgstr ""
-#: src/common/weeconfig.c:1256
+#: src/common/weeconfig.c:1322
#, c-format
msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:1274
+#: src/common/weeconfig.c:1340
#, c-format
msgid "%s %s, line %d: invalid section for option, line is ignored\n"
msgstr ""
-#: src/common/weeconfig.c:1282
+#: src/common/weeconfig.c:1348
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
msgstr ""
-#: src/common/weeconfig.c:1316
+#: src/common/weeconfig.c:1382
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr ""
-#: src/common/weeconfig.c:1327
+#: src/common/weeconfig.c:1393
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
"Expected: boolean value: 'off' or 'on'\n"
msgstr ""
-#: src/common/weeconfig.c:1336
+#: src/common/weeconfig.c:1402
#, 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:1347
+#: src/common/weeconfig.c:1413
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
"Expected: one of these strings: "
msgstr ""
-#: src/common/weeconfig.c:1363
+#: src/common/weeconfig.c:1429
#, c-format
msgid "%s %s, line %d: invalid color name for option '%s'\n"
msgstr ""
-#: src/common/weeconfig.c:1423 src/common/weeconfig.c:1598
+#: src/common/weeconfig.c:1489 src/common/weeconfig.c:1664
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr ""
-#: src/common/weeconfig.c:1429
+#: src/common/weeconfig.c:1495
#, c-format
msgid "%s: creating default config file...\n"
msgstr ""
-#: src/common/weeconfig.c:1430
+#: src/common/weeconfig.c:1496
msgid "Creating default config file\n"
msgstr ""
-#: src/common/weeconfig.c:1433 src/common/weeconfig.c:1607
+#: src/common/weeconfig.c:1499 src/common/weeconfig.c:1673
#, c-format
msgid ""
"#\n"
"# %s configuration file, created by %s v%s on %s#\n"
msgstr ""
-#: src/common/weeconfig.c:1604
+#: src/common/weeconfig.c:1670
msgid "Saving config to disk\n"
msgstr ""
diff --git a/src/common/command.c b/src/common/command.c
index 0a3b81f01..a8b97a134 100644
--- a/src/common/command.c
+++ b/src/common/command.c
@@ -708,7 +708,7 @@ user_command (t_irc_server *server, t_gui_buffer *buffer, char *command)
ptr_nick = nick_search (CHANNEL(buffer), server->nick);
if (ptr_nick)
{
- irc_display_nick (CHANNEL(buffer)->buffer, ptr_nick,
+ irc_display_nick (CHANNEL(buffer)->buffer, ptr_nick, NULL,
MSG_TYPE_NICK, 1, 1, 0);
gui_printf_color (CHANNEL(buffer)->buffer,
COLOR_WIN_CHAT, "%s\n", command);
diff --git a/src/common/completion.c b/src/common/completion.c
index 1975415f1..477f42ffc 100644
--- a/src/common/completion.c
+++ b/src/common/completion.c
@@ -47,6 +47,7 @@ completion_init (t_completion *completion)
completion->base_command_arg = 0;
completion->position = -1;
completion->base_word = NULL;
+ completion->args = NULL;
completion->completion_list = NULL;
completion->last_completion = NULL;
@@ -67,6 +68,10 @@ completion_free (t_completion *completion)
free (completion->base_word);
completion->base_word = NULL;
+ if (completion->args)
+ free (completion->args);
+ completion->args = NULL;
+
while (completion->completion_list)
weelist_remove (&completion->completion_list,
&completion->last_completion,
@@ -97,8 +102,11 @@ completion_build_list (t_completion *completion, void *channel)
int i, j;
t_irc_server *ptr_server;
t_irc_channel *ptr_channel;
- char option_name[256];
+ char *pos, option_name[256];
t_weechat_alias *ptr_alias;
+ t_config_option *option;
+ void *option_value;
+ char option_string[2048];
/* WeeChat internal commands */
@@ -211,32 +219,92 @@ completion_build_list (t_completion *completion, void *channel)
"unload");
return;
}
- if ((strcasecmp (completion->base_command, "set") == 0)
- && (completion->base_command_arg == 1))
+ if (strcasecmp (completion->base_command, "set") == 0)
{
- for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
+ if (completion->base_command_arg == 1)
{
- if ((i != CONFIG_SECTION_ALIAS) && (i != CONFIG_SECTION_SERVER))
+ for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
{
- for (j = 0; weechat_options[i][j].option_name; j++)
+ if ((i != CONFIG_SECTION_ALIAS) && (i != CONFIG_SECTION_SERVER))
{
+ for (j = 0; weechat_options[i][j].option_name; j++)
+ {
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ weechat_options[i][j].option_name);
+ }
+ }
+ }
+ for (ptr_server = irc_servers; ptr_server;
+ ptr_server = ptr_server->next_server)
+ {
+ for (i = 0; weechat_options[CONFIG_SECTION_SERVER][i].option_name; i++)
+ {
+ snprintf (option_name, sizeof (option_name), "%s.%s",
+ ptr_server->name,
+ weechat_options[CONFIG_SECTION_SERVER][i].option_name);
weelist_add (&completion->completion_list,
&completion->last_completion,
- weechat_options[i][j].option_name);
+ option_name);
}
}
}
- for (ptr_server = irc_servers; ptr_server;
- ptr_server = ptr_server->next_server)
+ else if (completion->base_command_arg == 3)
{
- for (i = 0; weechat_options[CONFIG_SECTION_SERVER][i].option_name; i++)
+ if (completion->args)
{
- snprintf (option_name, sizeof (option_name), "%s.%s",
- ptr_server->name,
- weechat_options[CONFIG_SECTION_SERVER][i].option_name);
- weelist_add (&completion->completion_list,
- &completion->last_completion,
- option_name);
+ pos = strchr (completion->args, ' ');
+ if (pos)
+ pos[0] = '\0';
+ option = NULL;
+ option_value = NULL;
+ config_option_search_option_value (completion->args, &option, &option_value);
+ if (option && option_value)
+ {
+ switch (option->option_type)
+ {
+ case OPTION_TYPE_BOOLEAN:
+ if (option_value && (*((int *)(option_value))))
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ "on");
+ else
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ "off");
+ break;
+ case OPTION_TYPE_INT:
+ snprintf (option_string, sizeof (option_string) - 1,
+ "%d", (option_value) ? *((int *)(option_value)) : option->default_int);
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ option_string);
+ break;
+ case OPTION_TYPE_INT_WITH_STRING:
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ (option_value) ?
+ option->array_values[*((int *)(option_value))] :
+ option->array_values[option->default_int]);
+ break;
+ case OPTION_TYPE_COLOR:
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ (option_value) ?
+ gui_get_color_by_value (*((int *)(option_value))) :
+ option->default_string);
+ break;
+ case OPTION_TYPE_STRING:
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ (option_value) ?
+ *((char **)(option_value)) :
+ option->default_string);
+ break;
+ }
+ }
+ if (pos)
+ pos[0] = ' ';
}
}
return;
@@ -471,6 +539,8 @@ completion_find_context (t_completion *completion, void *channel, char *buffer,
command_arg++;
i++;
while ((i < pos) && (buffer[i] == ' ')) i++;
+ if (!completion->args)
+ completion->args = strdup (buffer + i);
}
else
i++;
diff --git a/src/common/completion.h b/src/common/completion.h
index 9798a03a1..30d4fa05c 100644
--- a/src/common/completion.h
+++ b/src/common/completion.h
@@ -39,6 +39,7 @@ struct t_completion
char *base_word; /* word to complete (when Tab was pressed) */
int base_word_pos; /* beggining of base word */
int position; /* position where Tab was pressed */
+ char *args; /* command line args (including base word) */
/* for command argument completion */
t_weelist *completion_list; /* data list for completion */
diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c
index f33be90c0..0324fdb38 100644
--- a/src/common/weeconfig.c
+++ b/src/common/weeconfig.c
@@ -1055,6 +1055,72 @@ config_option_search (char *option_name)
}
/*
+ * config_option_search_option_value: look for type and value of an option
+ * (including server options)
+ * if option is not found, NULL is returned
+ */
+
+void
+config_option_search_option_value (char *option_name, t_config_option **option,
+ void **option_value)
+{
+ t_config_option *ptr_option;
+ t_irc_server *ptr_server;
+ int i;
+ void *ptr_value;
+ char *pos;
+
+ ptr_option = NULL;
+ ptr_value = NULL;
+
+ ptr_option = config_option_search (option_name);
+ if (!ptr_option)
+ {
+ pos = strchr (option_name, '.');
+ if (pos)
+ {
+ pos[0] = '\0';
+ ptr_server = server_search (option_name);
+ if (ptr_server)
+ {
+ for (i = 0; weechat_options[CONFIG_SECTION_SERVER][i].option_name; i++)
+ {
+ if (strcmp (weechat_options[CONFIG_SECTION_SERVER][i].option_name,
+ pos + 1) == 0)
+ {
+ ptr_option = &weechat_options[CONFIG_SECTION_SERVER][i];
+ ptr_value = config_get_server_option_ptr (ptr_server, pos + 1);
+ break;
+ }
+ }
+ }
+ pos[0] = '.';
+ }
+ }
+ else
+ {
+ switch (ptr_option->option_type)
+ {
+ case OPTION_TYPE_BOOLEAN:
+ case OPTION_TYPE_INT:
+ case OPTION_TYPE_INT_WITH_STRING:
+ case OPTION_TYPE_COLOR:
+ ptr_value = (void *)(ptr_option->ptr_int);
+ break;
+ case OPTION_TYPE_STRING:
+ ptr_value = (void *)(ptr_option->ptr_string);
+ break;
+ }
+ }
+
+ if (ptr_option)
+ {
+ *option = ptr_option;
+ *option_value = ptr_value;
+ }
+}
+
+/*
* config_set_value: set new value for an option (found by name)
* return: 0 if success
* -1 if bad value for option
diff --git a/src/common/weeconfig.h b/src/common/weeconfig.h
index 016cc062e..62afca6e1 100644
--- a/src/common/weeconfig.h
+++ b/src/common/weeconfig.h
@@ -196,6 +196,7 @@ extern void config_change_fifo_pipe ();
extern void config_change_notify_levels ();
extern int config_option_set_value (t_config_option *, char *);
extern t_config_option *config_option_search (char *);
+extern void config_option_search_option_value (char *, t_config_option **, void **);
extern int config_set_value (char *, char *);
extern void *config_get_server_option_ptr (t_irc_server *, char *);
extern int config_set_server_value (t_irc_server *, char *, char *);
diff --git a/src/irc/irc-display.c b/src/irc/irc-display.c
index 8aafd29b0..0e182b1e8 100644
--- a/src/irc/irc-display.c
+++ b/src/irc/irc-display.c
@@ -66,13 +66,14 @@ irc_display_prefix (t_gui_buffer *buffer, char *prefix)
*/
void
-irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, int message_type,
- int display_around, int color_nick, int no_nickmode)
+irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, char *nickname,
+ int message_type, int display_around, int color_nick, int no_nickmode)
{
if (display_around)
gui_printf_type_color (buffer,
- message_type, COLOR_WIN_CHAT_DARK, "<");
- if (cfg_look_nickmode)
+ message_type, COLOR_WIN_CHAT_DARK,
+ (nick) ? "<" : ">");
+ if (nick && cfg_look_nickmode)
{
if (nick->is_chanowner)
gui_printf_type_color (buffer,
@@ -104,19 +105,20 @@ irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, int message_type,
gui_printf_type_color (buffer,
message_type,
COLOR_WIN_CHAT_HIGHLIGHT,
- "%s", nick->nick);
+ "%s", (nick) ? nick->nick : nickname);
else
gui_printf_type_color (buffer,
message_type,
- (color_nick) ?
+ (nick && color_nick) ?
((cfg_look_color_nicks) ?
nick->color : COLOR_WIN_CHAT) :
COLOR_WIN_CHAT,
- "%s", nick->nick);
+ "%s", (nick) ? nick->nick : nickname);
if (display_around)
gui_printf_type_color (buffer,
- message_type, COLOR_WIN_CHAT_DARK, "> ");
+ message_type, COLOR_WIN_CHAT_DARK,
+ (nick) ? "> " : "< ");
}
/*
diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c
index c3b3a3e54..85bbbfbc2 100644
--- a/src/irc/irc-recv.c
+++ b/src/irc/irc-recv.c
@@ -1246,37 +1246,28 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
else
{
ptr_nick = nick_search (ptr_channel, host);
- if (ptr_nick)
+ if (strstr (pos, server->nick))
{
- if (strstr (pos, server->nick))
- {
- irc_display_nick (ptr_channel->buffer, ptr_nick,
- MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
- 1, -1, 0);
- if ( (cfg_look_infobar)
- && (cfg_look_infobar_delay_highlight > 0)
- && (ptr_channel->buffer != gui_current_window->buffer) )
- gui_infobar_printf (cfg_look_infobar_delay_highlight,
- COLOR_WIN_INFOBAR_HIGHLIGHT,
- _("On %s: %s> %s"),
- ptr_channel->name,
- host, pos);
- }
- else
- irc_display_nick (ptr_channel->buffer, ptr_nick,
- MSG_TYPE_NICK, 1, 1, 0);
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_MSG,
- COLOR_WIN_CHAT, "%s\n", pos);
+ irc_display_nick (ptr_channel->buffer, ptr_nick,
+ (ptr_nick) ? NULL : host,
+ MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
+ 1, -1, 0);
+ if ( (cfg_look_infobar)
+ && (cfg_look_infobar_delay_highlight > 0)
+ && (ptr_channel->buffer != gui_current_window->buffer) )
+ gui_infobar_printf (cfg_look_infobar_delay_highlight,
+ COLOR_WIN_INFOBAR_HIGHLIGHT,
+ _("On %s: %s> %s"),
+ ptr_channel->name,
+ host, pos);
}
else
- {
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s nick \"%s\" not found for \"%s\" command (message: \"%s\")\n"),
- WEECHAT_ERROR, host, "privmsg", pos);
- return -1;
- }
+ irc_display_nick (ptr_channel->buffer, ptr_nick,
+ (ptr_nick) ? NULL : host,
+ MSG_TYPE_NICK, 1, 1, 0);
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_MSG,
+ COLOR_WIN_CHAT, "%s\n", pos);
}
}
else
@@ -3336,7 +3327,7 @@ irc_cmd_recv_366 (t_irc_server *server, char *host, char *arguments)
for (ptr_nick = ptr_channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
{
- irc_display_nick (ptr_channel->buffer, ptr_nick,
+ irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
MSG_TYPE_MSG, 0, 0, 1);
if (ptr_nick != ptr_channel->last_nick)
gui_printf (ptr_channel->buffer, " ");
diff --git a/src/irc/irc-send.c b/src/irc/irc-send.c
index 1809c2c40..22a90b2f3 100644
--- a/src/irc/irc-send.c
+++ b/src/irc/irc-send.c
@@ -876,7 +876,7 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
ptr_nick = nick_search (ptr_channel, server->nick);
if (ptr_nick)
{
- irc_display_nick (ptr_channel->buffer, ptr_nick,
+ irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
MSG_TYPE_NICK, 1, 1, 0);
gui_printf_type_color (ptr_channel->buffer,
MSG_TYPE_MSG,
@@ -901,7 +901,7 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
ptr_nick = nick_search (ptr_channel, server->nick);
if (ptr_nick)
{
- irc_display_nick (ptr_channel->buffer, ptr_nick,
+ irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
MSG_TYPE_NICK, 1, 1, 0);
gui_printf_type_color (ptr_channel->buffer,
MSG_TYPE_MSG,
diff --git a/src/irc/irc.h b/src/irc/irc.h
index 1087a4052..bc69d163d 100644
--- a/src/irc/irc.h
+++ b/src/irc/irc.h
@@ -331,7 +331,7 @@ extern void dcc_end ();
/* IRC display (irc-diplay.c) */
extern void irc_display_prefix (/*@null@*/ t_gui_buffer *, char *);
-extern void irc_display_nick (t_gui_buffer *, t_irc_nick *, int, int, int, int);
+extern void irc_display_nick (t_gui_buffer *, t_irc_nick *, char *, int, int, int, int);
extern void irc_display_mode (t_gui_buffer *, char *, char, char *, char *,
char *, char *);
extern void irc_display_server (t_irc_server *ptr_server);
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index ee877b198..5f1af5213 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,13 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-ChangeLog - 2005-06-27
+ChangeLog - 2005-06-30
Version 0.1.3 (under dev!):
+ * completion added for config option (with /set command)
+ * commands from users outside channel now authorized (if special user or
+ channel without "n" flag)
* added IPv6 support
* kill command now received and displayed
* added SSL support
diff --git a/weechat/po/es.po b/weechat/po/es.po
index 40efae6a3..466aa376d 100644
--- a/weechat/po/es.po
+++ b/weechat/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.3-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-06-27 18:18+0200\n"
+"POT-Creation-Date: 2005-06-30 14:30+0200\n"
"PO-Revision-Date: 2005-06-27 18:21+0200\n"
"Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -20,119 +20,119 @@ msgstr ""
msgid "%s cannot allocate new nick\n"
msgstr "%s no ha sido posible crear un nuevo nick\n"
-#: src/irc/irc-server.c:156 src/common/weeconfig.c:1546
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1612
msgid "Unable to get user's name"
msgstr "No ha sido posible obtener el nombre de usuario"
-#: src/irc/irc-server.c:221
+#: src/irc/irc-server.c:248
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s no ha sido posible crear un nuevo servidor\n"
-#: src/irc/irc-server.c:439
+#: src/irc/irc-server.c:466
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s error enviando datos al servidor IRC\n"
-#: src/irc/irc-server.c:459 src/irc/irc-server.c:472 src/irc/irc-server.c:538
-#: src/irc/irc-server.c:551
+#: src/irc/irc-server.c:486 src/irc/irc-server.c:499 src/irc/irc-server.c:565
+#: src/irc/irc-server.c:578
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s memoria insuficiente para un mensaje IRC recibido\n"
-#: src/irc/irc-server.c:629
+#: src/irc/irc-server.c:656
#, c-format
msgid "%s Command '%s' failed!\n"
msgstr "%s ¡Ha fallado el comando '%s' !\n"
-#: src/irc/irc-server.c:634
+#: src/irc/irc-server.c:661
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s ¡Ningún comando para ejecutar!\n"
-#: src/irc/irc-server.c:639
+#: src/irc/irc-server.c:666
#, c-format
msgid "%s Unknown command: cmd=%s, args=%s\n"
msgstr "%s Comando desconocido: cmd=%s, params=%s\n"
-#: src/irc/irc-server.c:690
+#: src/irc/irc-server.c:717
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
"%s no ha sido posible leer datos del socket, desconectando del servidor...\n"
-#: src/irc/irc-server.c:773
+#: src/irc/irc-server.c:800
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Reconexión al servidor en %d segundos\n"
-#: src/irc/irc-server.c:806
+#: src/irc/irc-server.c:833
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr ""
-#: src/irc/irc-server.c:822
+#: src/irc/irc-server.c:849
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s dirección \"%s\" no encontrada\n"
-#: src/irc/irc-server.c:831
+#: src/irc/irc-server.c:858
#, c-format
msgid "%s IP address not found\n"
msgstr "%s Dirección IP no encontrada\n"
-#: src/irc/irc-server.c:839
+#: src/irc/irc-server.c:866
#, c-format
msgid "%s connection refused\n"
msgstr "%s conexión rechazada\n"
-#: src/irc/irc-server.c:903
+#: src/irc/irc-server.c:930
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
msgstr ""
-#: src/irc/irc-server.c:910
+#: src/irc/irc-server.c:937
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr "%s: conectando al servidor %s:%d%s%s...\n"
-#: src/irc/irc-server.c:914
+#: src/irc/irc-server.c:941
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr "Conectando al servidor %s:%d%s%s...\n"
-#: src/irc/irc-server.c:931
+#: src/irc/irc-server.c:958
#, c-format
msgid "%s gnutls init error\n"
msgstr ""
-#: src/irc/irc-server.c:946
+#: src/irc/irc-server.c:973
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s no ha sido posible crear la interconexión\n"
-#: src/irc/irc-server.c:958
+#: src/irc/irc-server.c:985
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s no ha sido posible crear el socket\n"
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:996
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr "%s no ha sido posible configurar la opción socket \"SO_REUSEADDR\"\n"
-#: src/irc/irc-server.c:980
+#: src/irc/irc-server.c:1007
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr "%s no ha sido posible configurar la opción socket \"SO_KEEPALIVE\"\n"
-#: src/irc/irc-server.c:1011
+#: src/irc/irc-server.c:1038
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Reconectando al servidor...\n"
-#: src/irc/irc-server.c:1061 src/irc/irc-server.c:1070
+#: src/irc/irc-server.c:1088 src/irc/irc-server.c:1097
msgid "Disconnected from server!\n"
msgstr "¡Desconectado del servidor!\n"
@@ -1267,37 +1267,37 @@ msgstr "no es posible cambiar el modo para el resto de usuarios"
msgid "whois (secure connection)"
msgstr ""
-#: src/irc/irc-display.c:154 src/common/command.c:842
+#: src/irc/irc-display.c:156 src/common/command.c:842
msgid "Server: "
msgstr "Servidor: "
-#: src/irc/irc-display.c:159
+#: src/irc/irc-display.c:161
msgid "connected"
msgstr "conectado"
-#: src/irc/irc-display.c:159
+#: src/irc/irc-display.c:161
msgid "not connected"
msgstr "no conectado"
-#: src/irc/irc-display.c:163 src/irc/irc-display.c:168
-#: src/irc/irc-display.c:180 src/irc/irc-display.c:183
+#: src/irc/irc-display.c:165 src/irc/irc-display.c:170
+#: src/irc/irc-display.c:182 src/irc/irc-display.c:185
msgid "yes"
msgstr "sí"
-#: src/irc/irc-display.c:163 src/irc/irc-display.c:168
-#: src/irc/irc-display.c:180 src/irc/irc-display.c:183
+#: src/irc/irc-display.c:165 src/irc/irc-display.c:170
+#: src/irc/irc-display.c:182 src/irc/irc-display.c:185
msgid "no"
msgstr "no"
-#: src/irc/irc-display.c:165
+#: src/irc/irc-display.c:167
msgid " (temporary server, will not be saved)"
msgstr " (servidor temporal, no será guardado)"
-#: src/irc/irc-display.c:187
+#: src/irc/irc-display.c:189
msgid "(hidden)"
msgstr "(oculto)"
-#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3645
+#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3636
msgid "unknown"
msgstr "desconocido"
@@ -1341,7 +1341,7 @@ msgstr ""
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:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1514
+#: src/irc/irc-send.c:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1505
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
@@ -1360,8 +1360,8 @@ msgid "by"
msgstr "por"
#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:289 src/irc/irc-recv.c:763
-#: src/irc/irc-recv.c:1098 src/irc/irc-recv.c:1286 src/irc/irc-recv.c:2863
-#: src/irc/irc-recv.c:2930
+#: src/irc/irc-recv.c:1098 src/irc/irc-recv.c:1277 src/irc/irc-recv.c:2854
+#: src/irc/irc-recv.c:2921
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s canal \"%s\" no encontrado para el comando \"%s\"\n"
@@ -1497,7 +1497,7 @@ msgid "removes voice from"
msgstr "quita la voz a"
#: src/irc/irc-recv.c:718 src/irc/irc-recv.c:803 src/irc/irc-recv.c:1172
-#: src/irc/irc-recv.c:1610
+#: src/irc/irc-recv.c:1601
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s comando \"%s\" recibido sin host \n"
@@ -1546,7 +1546,7 @@ msgstr "%s comando \"%s\" recibido sin host o canal\n"
msgid " has left "
msgstr " ha salido "
-#: src/irc/irc-recv.c:1221 src/irc/irc-recv.c:1540
+#: src/irc/irc-recv.c:1221 src/irc/irc-recv.c:1531
#, c-format
msgid "On %s: * %s %s"
msgstr "En %s: * %s %s"
@@ -1556,233 +1556,227 @@ msgstr "En %s: * %s %s"
msgid "Received a CTCP SOUND \"%s\" from "
msgstr "Recibido un sonido CTCP \\\"%s\\\" de "
-#: src/irc/irc-recv.c:1261
+#: src/irc/irc-recv.c:1260
#, c-format
msgid "On %s: %s> %s"
msgstr "En %s: %s> %s"
-#: src/irc/irc-recv.c:1276
-#, c-format
-msgid "%s nick \"%s\" not found for \"%s\" command (message: \"%s\")\n"
-msgstr ""
-"%s usuario \"%s\" no encontrado para el comando \"%s\" (mensaje: \"%s\")\n"
-
-#: src/irc/irc-recv.c:1331
+#: src/irc/irc-recv.c:1322
msgid "Received a "
msgstr "Recibido un "
-#: src/irc/irc-recv.c:1333
+#: src/irc/irc-recv.c:1324
msgid "CTCP VERSION "
msgstr "CTCP VERSION "
-#: src/irc/irc-recv.c:1335
+#: src/irc/irc-recv.c:1326
msgid "from"
msgstr "de"
-#: src/irc/irc-recv.c:1372 src/irc/irc-recv.c:1389 src/irc/irc-recv.c:1405
-#: src/irc/irc-recv.c:1421 src/irc/irc-recv.c:1446 src/irc/irc-recv.c:1463
-#: src/irc/irc-recv.c:1478 src/irc/irc-recv.c:1586 src/irc/irc-recv.c:3229
-#: src/irc/irc-recv.c:3287 src/irc/irc-recv.c:3439 src/irc/irc-recv.c:3454
-#: src/irc/irc-recv.c:3469 src/irc/irc-recv.c:3484 src/irc/irc-recv.c:3497
-#: src/irc/irc-recv.c:3547 src/irc/irc-recv.c:3561
+#: src/irc/irc-recv.c:1363 src/irc/irc-recv.c:1380 src/irc/irc-recv.c:1396
+#: src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1437 src/irc/irc-recv.c:1454
+#: src/irc/irc-recv.c:1469 src/irc/irc-recv.c:1577 src/irc/irc-recv.c:3220
+#: src/irc/irc-recv.c:3278 src/irc/irc-recv.c:3430 src/irc/irc-recv.c:3445
+#: src/irc/irc-recv.c:3460 src/irc/irc-recv.c:3475 src/irc/irc-recv.c:3488
+#: src/irc/irc-recv.c:3538 src/irc/irc-recv.c:3552
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s no es posible analizar el comando \"%s\"\n"
-#: src/irc/irc-recv.c:1491
+#: src/irc/irc-recv.c:1482
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr "%s tipo DCC CHAT desconocido recibido de "
-#: src/irc/irc-recv.c:1566 src/irc/irc-dcc.c:799
+#: src/irc/irc-recv.c:1557 src/irc/irc-dcc.c:799
#, c-format
msgid "Private %s> %s"
msgstr "Privado %s> %s"
-#: src/irc/irc-recv.c:1642
+#: src/irc/irc-recv.c:1633
msgid "has quit"
msgstr "ha salido"
-#: src/irc/irc-recv.c:1763
+#: src/irc/irc-recv.c:1754
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s comando \"%s\" recibido sin canal\n"
-#: src/irc/irc-recv.c:1791
+#: src/irc/irc-recv.c:1782
msgid " has changed topic for "
msgstr "ha cambiado el tema por "
-#: src/irc/irc-recv.c:1796
+#: src/irc/irc-recv.c:1787
#, c-format
msgid " to: \"%s\"\n"
msgstr " a: \"%s\"\n"
-#: src/irc/irc-recv.c:1802
+#: src/irc/irc-recv.c:1793
msgid " has unset topic for "
msgstr " ha quitado el tema por "
-#: src/irc/irc-recv.c:1913
+#: src/irc/irc-recv.c:1904
#, c-format
msgid " is away: %s\n"
msgstr " está ausente: %s\n"
-#: src/irc/irc-recv.c:1987
+#: src/irc/irc-recv.c:1978
msgid "Users online: "
msgstr "Usuarios conectados: "
-#: src/irc/irc-recv.c:2434
+#: src/irc/irc-recv.c:2425
msgid "idle: "
msgstr "sin actividad: "
-#: src/irc/irc-recv.c:2442
+#: src/irc/irc-recv.c:2433
msgid "days"
msgstr "días"
-#: src/irc/irc-recv.c:2442
+#: src/irc/irc-recv.c:2433
msgid "day"
msgstr "día"
-#: src/irc/irc-recv.c:2452
+#: src/irc/irc-recv.c:2443
msgid "hours"
msgstr "horas"
-#: src/irc/irc-recv.c:2452
+#: src/irc/irc-recv.c:2443
msgid "hour"
msgstr "hora"
-#: src/irc/irc-recv.c:2458
+#: src/irc/irc-recv.c:2449
msgid "minutes"
msgstr "minutos"
-#: src/irc/irc-recv.c:2458
+#: src/irc/irc-recv.c:2449
msgid "minute"
msgstr "minuto"
-#: src/irc/irc-recv.c:2464
+#: src/irc/irc-recv.c:2455
msgid "seconds"
msgstr "segundos"
-#: src/irc/irc-recv.c:2464
+#: src/irc/irc-recv.c:2455
msgid "second"
msgstr "segundo"
-#: src/irc/irc-recv.c:2469
+#: src/irc/irc-recv.c:2460
msgid "signon at: "
msgstr "firmado el: "
-#: src/irc/irc-recv.c:2557
+#: src/irc/irc-recv.c:2548
msgid "Channels: "
msgstr "Canales: "
-#: src/irc/irc-recv.c:2809
+#: src/irc/irc-recv.c:2800
msgid "No topic set for "
msgstr "No hay tema definido para "
-#: src/irc/irc-recv.c:2851
+#: src/irc/irc-recv.c:2842
msgid "Topic for "
msgstr "El tema para "
-#: src/irc/irc-recv.c:2855
+#: src/irc/irc-recv.c:2846
#, c-format
msgid " is: \"%s\"\n"
msgstr " es: \"%s\"\n"
-#: src/irc/irc-recv.c:2873 src/irc/irc-recv.c:2957 src/irc/irc-recv.c:3010
+#: src/irc/irc-recv.c:2864 src/irc/irc-recv.c:2948 src/irc/irc-recv.c:3001
#, 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:2919
+#: src/irc/irc-recv.c:2910
msgid "Topic set by "
msgstr "Tema definido por "
-#: src/irc/irc-recv.c:2939
+#: src/irc/irc-recv.c:2930
#, 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:2948 src/irc/irc-recv.c:3019
+#: src/irc/irc-recv.c:2939 src/irc/irc-recv.c:3010
#, 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:2998
+#: src/irc/irc-recv.c:2989
msgid "has invited"
msgstr ""
-#: src/irc/irc-recv.c:3001 src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:2992 src/irc/irc-recv.c:3143
msgid "on"
msgstr "en"
-#: src/irc/irc-recv.c:3275
+#: src/irc/irc-recv.c:3266
#, 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:3331
+#: src/irc/irc-recv.c:3322
msgid "Nicks "
msgstr "Usuarios "
-#: src/irc/irc-recv.c:3351
+#: src/irc/irc-recv.c:3342
msgid "Channel "
msgstr "Canal "
-#: src/irc/irc-recv.c:3362
+#: src/irc/irc-recv.c:3353
msgid "nicks"
msgstr "usuarios"
-#: src/irc/irc-recv.c:3362
+#: src/irc/irc-recv.c:3353
msgid "nick"
msgstr "usuario"
-#: src/irc/irc-recv.c:3370
+#: src/irc/irc-recv.c:3361
msgid "ops"
msgstr "operadores"
-#: src/irc/irc-recv.c:3370
+#: src/irc/irc-recv.c:3361
msgid "op"
msgstr "operador"
-#: src/irc/irc-recv.c:3379
+#: src/irc/irc-recv.c:3370
msgid "halfops"
msgstr "semi-operadores"
-#: src/irc/irc-recv.c:3379
+#: src/irc/irc-recv.c:3370
msgid "halfop"
msgstr "semi-operador"
-#: src/irc/irc-recv.c:3388
+#: src/irc/irc-recv.c:3379
msgid "voices"
msgstr "voces"
-#: src/irc/irc-recv.c:3388
+#: src/irc/irc-recv.c:3379
msgid "voice"
msgstr "voz"
-#: src/irc/irc-recv.c:3397
+#: src/irc/irc-recv.c:3388
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:3510
+#: src/irc/irc-recv.c:3501
msgid "banned by"
msgstr "baneado por"
-#: src/irc/irc-recv.c:3599
+#: src/irc/irc-recv.c:3590
#, 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:3611
+#: src/irc/irc-recv.c:3602
#, 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:3623
+#: src/irc/irc-recv.c:3614
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1791,7 +1785,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:3633
+#: src/irc/irc-recv.c:3624
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
@@ -2917,52 +2911,52 @@ msgstr ""
msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
msgstr "%s sintaxis inválida para el servidor IRC ('%s'), ignorado\n"
-#: src/common/weechat.c:383
+#: src/common/weechat.c:384
#, c-format
msgid "%s unable to create server ('%s'), ignored\n"
msgstr "%s no es posible crear el servidor ('%s'), ignorado\n"
-#: src/common/weechat.c:392
+#: src/common/weechat.c:393
#, c-format
msgid "%s unknown parameter '%s', ignored\n"
msgstr "%s parámetro desconocido '%s', ignorado\n"
-#: src/common/weechat.c:412
+#: src/common/weechat.c:413
#, c-format
msgid "%s cannot create directory \"%s\"\n"
msgstr "%s no es posible crear el directorio \"%s\"\n"
-#: src/common/weechat.c:438
+#: src/common/weechat.c:439
#, c-format
msgid "%s unable to get HOME directory\n"
msgstr "%s no ha sido posible leer el directorio HOME\n"
-#: src/common/weechat.c:447
+#: src/common/weechat.c:448
#, c-format
msgid "%s not enough memory for home directory\n"
msgstr "%s no hay suficiente memoria para el directorio home\n"
-#: src/common/weechat.c:457
+#: src/common/weechat.c:458
#, c-format
msgid "%s unable to create ~/.weechat directory\n"
msgstr "%s no es posible crear el directorio ~/.weechat\n"
-#: src/common/weechat.c:509
+#: src/common/weechat.c:510
#, c-format
msgid "%s unable to create ~/.weechat/logs directory\n"
msgstr "%s no es posible crear el directorio ~/.weechat/logs\n"
-#: src/common/weechat.c:552
+#: src/common/weechat.c:553
#, c-format
msgid "%s unable to create/append to log file (~/.weechat/%s)"
msgstr "%s no es posible crear/añadir en el fichero de log (~/.weechat/%s)"
-#: src/common/weechat.c:575
+#: src/common/weechat.c:576
#, c-format
msgid "%sWelcome to "
msgstr "%sBienvenido a "
-#: src/common/weechat.c:588 src/common/weechat.c:597
+#: src/common/weechat.c:589 src/common/weechat.c:598
msgid "compiled on"
msgstr "compilado en"
@@ -3766,62 +3760,62 @@ msgid ""
"#channel:1,..)"
msgstr ""
-#: src/common/weeconfig.c:1094
+#: src/common/weeconfig.c:1160
#, 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:1103
+#: src/common/weeconfig.c:1169
#, 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:1118
+#: src/common/weeconfig.c:1184
#, 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:1157
+#: src/common/weeconfig.c:1223
#, 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:1168
+#: src/common/weeconfig.c:1234
#, 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:1207
+#: src/common/weeconfig.c:1273
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr "%s fichero de configuración \"%s\" no encontrado.\n"
-#: src/common/weeconfig.c:1239
+#: src/common/weeconfig.c:1305
#, 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:1256
+#: src/common/weeconfig.c:1322
#, 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:1274
+#: src/common/weeconfig.c:1340
#, 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:1282
+#: src/common/weeconfig.c:1348
#, 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:1316
+#: src/common/weeconfig.c:1382
#, 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:1327
+#: src/common/weeconfig.c:1393
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
@@ -3830,7 +3824,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:1336
+#: src/common/weeconfig.c:1402
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -3839,7 +3833,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:1347
+#: src/common/weeconfig.c:1413
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -3848,26 +3842,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:1363
+#: src/common/weeconfig.c:1429
#, 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:1423 src/common/weeconfig.c:1598
+#: src/common/weeconfig.c:1489 src/common/weeconfig.c:1664
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr "%s no es posible crear el fichero \"%s\"\n"
-#: src/common/weeconfig.c:1429
+#: src/common/weeconfig.c:1495
#, c-format
msgid "%s: creating default config file...\n"
msgstr "%s: creando fichero de configuración por defecto...\n"
-#: src/common/weeconfig.c:1430
+#: src/common/weeconfig.c:1496
msgid "Creating default config file\n"
msgstr "Creando fichero de configuración por defecto\n"
-#: src/common/weeconfig.c:1433 src/common/weeconfig.c:1607
+#: src/common/weeconfig.c:1499 src/common/weeconfig.c:1673
#, c-format
msgid ""
"#\n"
@@ -3876,9 +3870,7 @@ msgstr ""
"#\n"
"# %s: fichero de configuración, creado por %s v%s el %s#\n"
-#: src/common/weeconfig.c:1604
+#: src/common/weeconfig.c:1670
msgid "Saving config to disk\n"
msgstr "Guardar configuración a disco\n"
-#~ msgid "%s: connecting to %s:%d%s...\n"
-#~ msgstr "%s: conectando a %s:%d%s...\n"
diff --git a/weechat/po/fr.po b/weechat/po/fr.po
index ceb7db3b5..f511ca27a 100644
--- a/weechat/po/fr.po
+++ b/weechat/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.3-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-06-27 18:18+0200\n"
+"POT-Creation-Date: 2005-06-30 14:30+0200\n"
"PO-Revision-Date: 2005-06-27 18:19+0200\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -20,73 +20,73 @@ msgstr ""
msgid "%s cannot allocate new nick\n"
msgstr "%s impossible d'allouer un nouveau pseudo\n"
-#: src/irc/irc-server.c:156 src/common/weeconfig.c:1546
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1612
msgid "Unable to get user's name"
msgstr "Impossible de déterminer le nom d'utilisateur"
-#: src/irc/irc-server.c:221
+#: src/irc/irc-server.c:248
#, c-format
msgid "%s cannot allocate new server\n"
msgstr "%s impossible d'allouer un nouveau serveur\n"
-#: src/irc/irc-server.c:439
+#: src/irc/irc-server.c:466
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr "%s erreur d'envoi de données au serveur IRC\n"
-#: src/irc/irc-server.c:459 src/irc/irc-server.c:472 src/irc/irc-server.c:538
-#: src/irc/irc-server.c:551
+#: src/irc/irc-server.c:486 src/irc/irc-server.c:499 src/irc/irc-server.c:565
+#: src/irc/irc-server.c:578
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr "%s mémoire insuffisante pour un message IRC reçu\n"
-#: src/irc/irc-server.c:629
+#: src/irc/irc-server.c:656
#, c-format
msgid "%s Command '%s' failed!\n"
msgstr "%s La commande '%s' a échoué !\n"
-#: src/irc/irc-server.c:634
+#: src/irc/irc-server.c:661
#, c-format
msgid "%s No command to execute!\n"
msgstr "%s Pas de commande à exécuter !\n"
-#: src/irc/irc-server.c:639
+#: src/irc/irc-server.c:666
#, c-format
msgid "%s Unknown command: cmd=%s, args=%s\n"
msgstr "%s Commande inconnue: cmd=%s, params=%s\n"
-#: src/irc/irc-server.c:690
+#: src/irc/irc-server.c:717
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
"%s impossible de lire des données sur la socket, déconnexion du serveur...\n"
-#: src/irc/irc-server.c:773
+#: src/irc/irc-server.c:800
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr "%s: Reconnexion au serveur dans %d secondes\n"
-#: src/irc/irc-server.c:806
+#: src/irc/irc-server.c:833
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr "%s le handshake gnutls a échoué\n"
-#: src/irc/irc-server.c:822
+#: src/irc/irc-server.c:849
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr "%s adresse \"%s\" introuvable\n"
-#: src/irc/irc-server.c:831
+#: src/irc/irc-server.c:858
#, c-format
msgid "%s IP address not found\n"
msgstr "%s adresse IP introuvable\n"
-#: src/irc/irc-server.c:839
+#: src/irc/irc-server.c:866
#, c-format
msgid "%s connection refused\n"
msgstr "%s connexion refusée\n"
-#: src/irc/irc-server.c:903
+#: src/irc/irc-server.c:930
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -94,47 +94,47 @@ msgstr ""
"%s impossible de se connecter en SSL car WeeChat n'a pas été construit avec "
"le support GNUtls\n"
-#: src/irc/irc-server.c:910
+#: src/irc/irc-server.c:937
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr "%s: connexion au serveur %s:%d%s%s...\n"
-#: src/irc/irc-server.c:914
+#: src/irc/irc-server.c:941
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr "Connexion au serveur %s:%d%s%s...\n"
-#: src/irc/irc-server.c:931
+#: src/irc/irc-server.c:958
#, c-format
msgid "%s gnutls init error\n"
msgstr "%s erreur d'initialisation gnutls\n"
-#: src/irc/irc-server.c:946
+#: src/irc/irc-server.c:973
#, c-format
msgid "%s cannot create pipe\n"
msgstr "%s impossible de créer le pipe\n"
-#: src/irc/irc-server.c:958
+#: src/irc/irc-server.c:985
#, c-format
msgid "%s cannot create socket\n"
msgstr "%s impossible de créer la socket\n"
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:996
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr "%s impossible de paramétrer l'option socket \"SO_REUSEADDR\"\n"
-#: src/irc/irc-server.c:980
+#: src/irc/irc-server.c:1007
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr "%s impossible de paramétrer l'option socket \"SO_KEEPALIVE\"\n"
-#: src/irc/irc-server.c:1011
+#: src/irc/irc-server.c:1038
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr "%s: Reconnexion au serveur...\n"
-#: src/irc/irc-server.c:1061 src/irc/irc-server.c:1070
+#: src/irc/irc-server.c:1088 src/irc/irc-server.c:1097
msgid "Disconnected from server!\n"
msgstr "Déconnecté du serveur !\n"
@@ -1270,37 +1270,37 @@ msgstr "impossible de changer le mode pour les autres utilisateurs"
msgid "whois (secure connection)"
msgstr "qui est (connexion sécurisée)"
-#: src/irc/irc-display.c:154 src/common/command.c:842
+#: src/irc/irc-display.c:156 src/common/command.c:842
msgid "Server: "
msgstr "Serveur: "
-#: src/irc/irc-display.c:159
+#: src/irc/irc-display.c:161
msgid "connected"
msgstr "connecté"
-#: src/irc/irc-display.c:159
+#: src/irc/irc-display.c:161
msgid "not connected"
msgstr "non connecté"
-#: src/irc/irc-display.c:163 src/irc/irc-display.c:168
-#: src/irc/irc-display.c:180 src/irc/irc-display.c:183
+#: src/irc/irc-display.c:165 src/irc/irc-display.c:170
+#: src/irc/irc-display.c:182 src/irc/irc-display.c:185
msgid "yes"
msgstr "oui"
-#: src/irc/irc-display.c:163 src/irc/irc-display.c:168
-#: src/irc/irc-display.c:180 src/irc/irc-display.c:183
+#: src/irc/irc-display.c:165 src/irc/irc-display.c:170
+#: src/irc/irc-display.c:182 src/irc/irc-display.c:185
msgid "no"
msgstr "non"
-#: src/irc/irc-display.c:165
+#: src/irc/irc-display.c:167
msgid " (temporary server, will not be saved)"
msgstr " (serveur temporaire, ne sera pas sauvé)"
-#: src/irc/irc-display.c:187
+#: src/irc/irc-display.c:189
msgid "(hidden)"
msgstr "(caché)"
-#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3645
+#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3636
msgid "unknown"
msgstr "inconnu"
@@ -1345,7 +1345,7 @@ msgstr ""
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:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1514
+#: src/irc/irc-send.c:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1505
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
@@ -1364,8 +1364,8 @@ msgid "by"
msgstr "par"
#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:289 src/irc/irc-recv.c:763
-#: src/irc/irc-recv.c:1098 src/irc/irc-recv.c:1286 src/irc/irc-recv.c:2863
-#: src/irc/irc-recv.c:2930
+#: src/irc/irc-recv.c:1098 src/irc/irc-recv.c:1277 src/irc/irc-recv.c:2854
+#: src/irc/irc-recv.c:2921
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr "%s canal \"%s\" non trouvé pour la commande \"%s\"\n"
@@ -1501,7 +1501,7 @@ msgid "removes voice from"
msgstr "supprime la voix de"
#: src/irc/irc-recv.c:718 src/irc/irc-recv.c:803 src/irc/irc-recv.c:1172
-#: src/irc/irc-recv.c:1610
+#: src/irc/irc-recv.c:1601
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s commande \"%s\" reçue sans host\n"
@@ -1550,7 +1550,7 @@ msgstr "%s commande \"%s\" reçue sans host ou canal\n"
msgid " has left "
msgstr " a quitté "
-#: src/irc/irc-recv.c:1221 src/irc/irc-recv.c:1540
+#: src/irc/irc-recv.c:1221 src/irc/irc-recv.c:1531
#, c-format
msgid "On %s: * %s %s"
msgstr "Sur %s: * %s %s"
@@ -1560,233 +1560,227 @@ msgstr "Sur %s: * %s %s"
msgid "Received a CTCP SOUND \"%s\" from "
msgstr "CTCP SOUND \"%s\" reçu de "
-#: src/irc/irc-recv.c:1261
+#: src/irc/irc-recv.c:1260
#, c-format
msgid "On %s: %s> %s"
msgstr "Sur %s: %s> %s"
-#: src/irc/irc-recv.c:1276
-#, c-format
-msgid "%s nick \"%s\" not found for \"%s\" command (message: \"%s\")\n"
-msgstr ""
-"%s pseudo \"%s\" non trouvé pour la commande \"%s\" (message: \"%s\")\n"
-
-#: src/irc/irc-recv.c:1331
+#: src/irc/irc-recv.c:1322
msgid "Received a "
msgstr "Reçu un "
-#: src/irc/irc-recv.c:1333
+#: src/irc/irc-recv.c:1324
msgid "CTCP VERSION "
msgstr "CTCP VERSION "
-#: src/irc/irc-recv.c:1335
+#: src/irc/irc-recv.c:1326
msgid "from"
msgstr "de"
-#: src/irc/irc-recv.c:1372 src/irc/irc-recv.c:1389 src/irc/irc-recv.c:1405
-#: src/irc/irc-recv.c:1421 src/irc/irc-recv.c:1446 src/irc/irc-recv.c:1463
-#: src/irc/irc-recv.c:1478 src/irc/irc-recv.c:1586 src/irc/irc-recv.c:3229
-#: src/irc/irc-recv.c:3287 src/irc/irc-recv.c:3439 src/irc/irc-recv.c:3454
-#: src/irc/irc-recv.c:3469 src/irc/irc-recv.c:3484 src/irc/irc-recv.c:3497
-#: src/irc/irc-recv.c:3547 src/irc/irc-recv.c:3561
+#: src/irc/irc-recv.c:1363 src/irc/irc-recv.c:1380 src/irc/irc-recv.c:1396
+#: src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1437 src/irc/irc-recv.c:1454
+#: src/irc/irc-recv.c:1469 src/irc/irc-recv.c:1577 src/irc/irc-recv.c:3220
+#: src/irc/irc-recv.c:3278 src/irc/irc-recv.c:3430 src/irc/irc-recv.c:3445
+#: src/irc/irc-recv.c:3460 src/irc/irc-recv.c:3475 src/irc/irc-recv.c:3488
+#: src/irc/irc-recv.c:3538 src/irc/irc-recv.c:3552
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s impossible d'analyser la commande \"%s\"\n"
-#: src/irc/irc-recv.c:1491
+#: src/irc/irc-recv.c:1482
#, 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:1566 src/irc/irc-dcc.c:799
+#: src/irc/irc-recv.c:1557 src/irc/irc-dcc.c:799
#, c-format
msgid "Private %s> %s"
msgstr "Prive %s> %s"
-#: src/irc/irc-recv.c:1642
+#: src/irc/irc-recv.c:1633
msgid "has quit"
msgstr "a quitté"
-#: src/irc/irc-recv.c:1763
+#: src/irc/irc-recv.c:1754
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s commande \"%s\" reçue sans canal\n"
-#: src/irc/irc-recv.c:1791
+#: src/irc/irc-recv.c:1782
msgid " has changed topic for "
msgstr " a changé le titre pour "
-#: src/irc/irc-recv.c:1796
+#: src/irc/irc-recv.c:1787
#, c-format
msgid " to: \"%s\"\n"
msgstr " en: \"%s\"\n"
-#: src/irc/irc-recv.c:1802
+#: src/irc/irc-recv.c:1793
msgid " has unset topic for "
msgstr " a retiré le titre pour "
-#: src/irc/irc-recv.c:1913
+#: src/irc/irc-recv.c:1904
#, c-format
msgid " is away: %s\n"
msgstr " est absent: %s\n"
-#: src/irc/irc-recv.c:1987
+#: src/irc/irc-recv.c:1978
msgid "Users online: "
msgstr "Utilisateurs en ligne: "
-#: src/irc/irc-recv.c:2434
+#: src/irc/irc-recv.c:2425
msgid "idle: "
msgstr "inactivité: "
-#: src/irc/irc-recv.c:2442
+#: src/irc/irc-recv.c:2433
msgid "days"
msgstr "jours"
-#: src/irc/irc-recv.c:2442
+#: src/irc/irc-recv.c:2433
msgid "day"
msgstr "jour"
-#: src/irc/irc-recv.c:2452
+#: src/irc/irc-recv.c:2443
msgid "hours"
msgstr "heures"
-#: src/irc/irc-recv.c:2452
+#: src/irc/irc-recv.c:2443
msgid "hour"
msgstr "heure"
-#: src/irc/irc-recv.c:2458
+#: src/irc/irc-recv.c:2449
msgid "minutes"
msgstr "minutes"
-#: src/irc/irc-recv.c:2458
+#: src/irc/irc-recv.c:2449
msgid "minute"
msgstr "minute"
-#: src/irc/irc-recv.c:2464
+#: src/irc/irc-recv.c:2455
msgid "seconds"
msgstr "secondes"
-#: src/irc/irc-recv.c:2464
+#: src/irc/irc-recv.c:2455
msgid "second"
msgstr "seconde"
-#: src/irc/irc-recv.c:2469
+#: src/irc/irc-recv.c:2460
msgid "signon at: "
msgstr "signé le: "
-#: src/irc/irc-recv.c:2557
+#: src/irc/irc-recv.c:2548
msgid "Channels: "
msgstr "Canaux: "
-#: src/irc/irc-recv.c:2809
+#: src/irc/irc-recv.c:2800
msgid "No topic set for "
msgstr "Pas de titre défini pour "
-#: src/irc/irc-recv.c:2851
+#: src/irc/irc-recv.c:2842
msgid "Topic for "
msgstr "Le titre pour "
-#: src/irc/irc-recv.c:2855
+#: src/irc/irc-recv.c:2846
#, c-format
msgid " is: \"%s\"\n"
msgstr " est: \"%s\"\n"
-#: src/irc/irc-recv.c:2873 src/irc/irc-recv.c:2957 src/irc/irc-recv.c:3010
+#: src/irc/irc-recv.c:2864 src/irc/irc-recv.c:2948 src/irc/irc-recv.c:3001
#, 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:2919
+#: src/irc/irc-recv.c:2910
msgid "Topic set by "
msgstr "Titre défini par "
-#: src/irc/irc-recv.c:2939
+#: src/irc/irc-recv.c:2930
#, 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:2948 src/irc/irc-recv.c:3019
+#: src/irc/irc-recv.c:2939 src/irc/irc-recv.c:3010
#, 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:2998
+#: src/irc/irc-recv.c:2989
msgid "has invited"
msgstr "a invité"
-#: src/irc/irc-recv.c:3001 src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:2992 src/irc/irc-recv.c:3143
msgid "on"
msgstr "sur"
-#: src/irc/irc-recv.c:3275
+#: src/irc/irc-recv.c:3266
#, 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:3331
+#: src/irc/irc-recv.c:3322
msgid "Nicks "
msgstr "Utilisateurs "
-#: src/irc/irc-recv.c:3351
+#: src/irc/irc-recv.c:3342
msgid "Channel "
msgstr "Canal "
-#: src/irc/irc-recv.c:3362
+#: src/irc/irc-recv.c:3353
msgid "nicks"
msgstr "utilisateurs"
-#: src/irc/irc-recv.c:3362
+#: src/irc/irc-recv.c:3353
msgid "nick"
msgstr "utilisateur"
-#: src/irc/irc-recv.c:3370
+#: src/irc/irc-recv.c:3361
msgid "ops"
msgstr "ops"
-#: src/irc/irc-recv.c:3370
+#: src/irc/irc-recv.c:3361
msgid "op"
msgstr "op"
-#: src/irc/irc-recv.c:3379
+#: src/irc/irc-recv.c:3370
msgid "halfops"
msgstr "halfops"
-#: src/irc/irc-recv.c:3379
+#: src/irc/irc-recv.c:3370
msgid "halfop"
msgstr "halfop"
-#: src/irc/irc-recv.c:3388
+#: src/irc/irc-recv.c:3379
msgid "voices"
msgstr "voices"
-#: src/irc/irc-recv.c:3388
+#: src/irc/irc-recv.c:3379
msgid "voice"
msgstr "voice"
-#: src/irc/irc-recv.c:3397
+#: src/irc/irc-recv.c:3388
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:3510
+#: src/irc/irc-recv.c:3501
msgid "banned by"
msgstr "banni par"
-#: src/irc/irc-recv.c:3599
+#: src/irc/irc-recv.c:3590
#, 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:3611
+#: src/irc/irc-recv.c:3602
#, 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:3623
+#: src/irc/irc-recv.c:3614
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1795,7 +1789,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:3633
+#: src/irc/irc-recv.c:3624
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
@@ -2915,52 +2909,52 @@ msgstr ""
msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
msgstr "%s syntaxe invalide pour le serveur IRC ('%s'), ignoré\n"
-#: src/common/weechat.c:383
+#: src/common/weechat.c:384
#, c-format
msgid "%s unable to create server ('%s'), ignored\n"
msgstr "%s impossible de créer le serveur ('%s'), ignoré\n"
-#: src/common/weechat.c:392
+#: src/common/weechat.c:393
#, c-format
msgid "%s unknown parameter '%s', ignored\n"
msgstr "%s paramètre inconnu '%s', ignoré\n"
-#: src/common/weechat.c:412
+#: src/common/weechat.c:413
#, c-format
msgid "%s cannot create directory \"%s\"\n"
msgstr "%s impossible de créer le répertoire \"%s\"\n"
-#: src/common/weechat.c:438
+#: src/common/weechat.c:439
#, c-format
msgid "%s unable to get HOME directory\n"
msgstr "%s impossible de lire le répertoire personnel\n"
-#: src/common/weechat.c:447
+#: src/common/weechat.c:448
#, c-format
msgid "%s not enough memory for home directory\n"
msgstr "%s pas assez de mémoire pour le répertoire personnel\n"
-#: src/common/weechat.c:457
+#: src/common/weechat.c:458
#, c-format
msgid "%s unable to create ~/.weechat directory\n"
msgstr "%s impossible de créer le répertoire ~/.weechat\n"
-#: src/common/weechat.c:509
+#: src/common/weechat.c:510
#, c-format
msgid "%s unable to create ~/.weechat/logs directory\n"
msgstr "%s impossible de créer le répertoire ~/.weechat/logs\n"
-#: src/common/weechat.c:552
+#: src/common/weechat.c:553
#, c-format
msgid "%s unable to create/append to log file (~/.weechat/%s)"
msgstr "%s impossible de créer/ajouter dans le fichier de log (~/.weechat/%s)"
-#: src/common/weechat.c:575
+#: src/common/weechat.c:576
#, c-format
msgid "%sWelcome to "
msgstr "%sBienvenue dans "
-#: src/common/weechat.c:588 src/common/weechat.c:597
+#: src/common/weechat.c:589 src/common/weechat.c:598
msgid "compiled on"
msgstr "compilé le"
@@ -3764,64 +3758,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:1094
+#: src/common/weeconfig.c:1160
#, 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:1103
+#: src/common/weeconfig.c:1169
#, 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:1118
+#: src/common/weeconfig.c:1184
#, 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:1157
+#: src/common/weeconfig.c:1223
#, 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:1168
+#: src/common/weeconfig.c:1234
#, 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:1207
+#: src/common/weeconfig.c:1273
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr "%s fichier de configuration \"%s\" non trouvé.\n"
-#: src/common/weeconfig.c:1239
+#: src/common/weeconfig.c:1305
#, 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:1256
+#: src/common/weeconfig.c:1322
#, 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:1274
+#: src/common/weeconfig.c:1340
#, 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:1282
+#: src/common/weeconfig.c:1348
#, 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:1316
+#: src/common/weeconfig.c:1382
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr "%s %s, ligne %d: option \"%s\" invalide\n"
-#: src/common/weeconfig.c:1327
+#: src/common/weeconfig.c:1393
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
@@ -3830,7 +3824,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:1336
+#: src/common/weeconfig.c:1402
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -3839,7 +3833,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:1347
+#: src/common/weeconfig.c:1413
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -3848,26 +3842,26 @@ msgstr ""
"%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
"Attendu: une de ces chaînes: "
-#: src/common/weeconfig.c:1363
+#: src/common/weeconfig.c:1429
#, 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:1423 src/common/weeconfig.c:1598
+#: src/common/weeconfig.c:1489 src/common/weeconfig.c:1664
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr "%s impossible de créer le fichier \"%s\"\n"
-#: src/common/weeconfig.c:1429
+#: src/common/weeconfig.c:1495
#, 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:1430
+#: src/common/weeconfig.c:1496
msgid "Creating default config file\n"
msgstr "Création du fichier de configuration par défaut\n"
-#: src/common/weeconfig.c:1433 src/common/weeconfig.c:1607
+#: src/common/weeconfig.c:1499 src/common/weeconfig.c:1673
#, c-format
msgid ""
"#\n"
@@ -3876,9 +3870,7 @@ msgstr ""
"#\n"
"# %s: fichier de configuration, créé par %s v%s le %s#\n"
-#: src/common/weeconfig.c:1604
+#: src/common/weeconfig.c:1670
msgid "Saving config to disk\n"
msgstr "Sauvegarde de la configuration sur disque\n"
-#~ msgid "%s: connecting to %s:%d%s...\n"
-#~ msgstr "%s: connexion à %s:%d%s...\n"
diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot
index cd9fdb3bc..7ca2d7a02 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-06-27 18:18+0200\n"
+"POT-Creation-Date: 2005-06-30 14:30+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,118 +20,118 @@ msgstr ""
msgid "%s cannot allocate new nick\n"
msgstr ""
-#: src/irc/irc-server.c:156 src/common/weeconfig.c:1546
+#: src/irc/irc-server.c:180 src/common/weeconfig.c:1612
msgid "Unable to get user's name"
msgstr ""
-#: src/irc/irc-server.c:221
+#: src/irc/irc-server.c:248
#, c-format
msgid "%s cannot allocate new server\n"
msgstr ""
-#: src/irc/irc-server.c:439
+#: src/irc/irc-server.c:466
#, c-format
msgid "%s error sending data to IRC server\n"
msgstr ""
-#: src/irc/irc-server.c:459 src/irc/irc-server.c:472 src/irc/irc-server.c:538
-#: src/irc/irc-server.c:551
+#: src/irc/irc-server.c:486 src/irc/irc-server.c:499 src/irc/irc-server.c:565
+#: src/irc/irc-server.c:578
#, c-format
msgid "%s not enough memory for received IRC message\n"
msgstr ""
-#: src/irc/irc-server.c:629
+#: src/irc/irc-server.c:656
#, c-format
msgid "%s Command '%s' failed!\n"
msgstr ""
-#: src/irc/irc-server.c:634
+#: src/irc/irc-server.c:661
#, c-format
msgid "%s No command to execute!\n"
msgstr ""
-#: src/irc/irc-server.c:639
+#: src/irc/irc-server.c:666
#, c-format
msgid "%s Unknown command: cmd=%s, args=%s\n"
msgstr ""
-#: src/irc/irc-server.c:690
+#: src/irc/irc-server.c:717
#, c-format
msgid "%s cannot read data from socket, disconnecting from server...\n"
msgstr ""
-#: src/irc/irc-server.c:773
+#: src/irc/irc-server.c:800
#, c-format
msgid "%s: Reconnecting to server in %d seconds\n"
msgstr ""
-#: src/irc/irc-server.c:806
+#: src/irc/irc-server.c:833
#, c-format
msgid "%s gnutls handshake failed\n"
msgstr ""
-#: src/irc/irc-server.c:822
+#: src/irc/irc-server.c:849
#, c-format
msgid "%s address \"%s\" not found\n"
msgstr ""
-#: src/irc/irc-server.c:831
+#: src/irc/irc-server.c:858
#, c-format
msgid "%s IP address not found\n"
msgstr ""
-#: src/irc/irc-server.c:839
+#: src/irc/irc-server.c:866
#, c-format
msgid "%s connection refused\n"
msgstr ""
-#: src/irc/irc-server.c:903
+#: src/irc/irc-server.c:930
#, c-format
msgid ""
"%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
msgstr ""
-#: src/irc/irc-server.c:910
+#: src/irc/irc-server.c:937
#, c-format
msgid "%s: connecting to server %s:%d%s%s...\n"
msgstr ""
-#: src/irc/irc-server.c:914
+#: src/irc/irc-server.c:941
#, c-format
msgid "Connecting to server %s:%d%s%s...\n"
msgstr ""
-#: src/irc/irc-server.c:931
+#: src/irc/irc-server.c:958
#, c-format
msgid "%s gnutls init error\n"
msgstr ""
-#: src/irc/irc-server.c:946
+#: src/irc/irc-server.c:973
#, c-format
msgid "%s cannot create pipe\n"
msgstr ""
-#: src/irc/irc-server.c:958
+#: src/irc/irc-server.c:985
#, c-format
msgid "%s cannot create socket\n"
msgstr ""
-#: src/irc/irc-server.c:969
+#: src/irc/irc-server.c:996
#, c-format
msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
msgstr ""
-#: src/irc/irc-server.c:980
+#: src/irc/irc-server.c:1007
#, c-format
msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
msgstr ""
-#: src/irc/irc-server.c:1011
+#: src/irc/irc-server.c:1038
#, c-format
msgid "%s: Reconnecting to server...\n"
msgstr ""
-#: src/irc/irc-server.c:1061 src/irc/irc-server.c:1070
+#: src/irc/irc-server.c:1088 src/irc/irc-server.c:1097
msgid "Disconnected from server!\n"
msgstr ""
@@ -1162,37 +1162,37 @@ msgstr ""
msgid "whois (secure connection)"
msgstr ""
-#: src/irc/irc-display.c:154 src/common/command.c:842
+#: src/irc/irc-display.c:156 src/common/command.c:842
msgid "Server: "
msgstr ""
-#: src/irc/irc-display.c:159
+#: src/irc/irc-display.c:161
msgid "connected"
msgstr ""
-#: src/irc/irc-display.c:159
+#: src/irc/irc-display.c:161
msgid "not connected"
msgstr ""
-#: src/irc/irc-display.c:163 src/irc/irc-display.c:168
-#: src/irc/irc-display.c:180 src/irc/irc-display.c:183
+#: src/irc/irc-display.c:165 src/irc/irc-display.c:170
+#: src/irc/irc-display.c:182 src/irc/irc-display.c:185
msgid "yes"
msgstr ""
-#: src/irc/irc-display.c:163 src/irc/irc-display.c:168
-#: src/irc/irc-display.c:180 src/irc/irc-display.c:183
+#: src/irc/irc-display.c:165 src/irc/irc-display.c:170
+#: src/irc/irc-display.c:182 src/irc/irc-display.c:185
msgid "no"
msgstr ""
-#: src/irc/irc-display.c:165
+#: src/irc/irc-display.c:167
msgid " (temporary server, will not be saved)"
msgstr ""
-#: src/irc/irc-display.c:187
+#: src/irc/irc-display.c:189
msgid "(hidden)"
msgstr ""
-#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3645
+#: src/irc/irc-send.c:58 src/irc/irc-recv.c:3636
msgid "unknown"
msgstr ""
@@ -1234,7 +1234,7 @@ msgstr ""
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-send.c:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1514
+#: src/irc/irc-send.c:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1505
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr ""
@@ -1253,8 +1253,8 @@ msgid "by"
msgstr ""
#: src/irc/irc-recv.c:195 src/irc/irc-recv.c:289 src/irc/irc-recv.c:763
-#: src/irc/irc-recv.c:1098 src/irc/irc-recv.c:1286 src/irc/irc-recv.c:2863
-#: src/irc/irc-recv.c:2930
+#: src/irc/irc-recv.c:1098 src/irc/irc-recv.c:1277 src/irc/irc-recv.c:2854
+#: src/irc/irc-recv.c:2921
#, c-format
msgid "%s channel \"%s\" not found for \"%s\" command\n"
msgstr ""
@@ -1390,7 +1390,7 @@ msgid "removes voice from"
msgstr ""
#: src/irc/irc-recv.c:718 src/irc/irc-recv.c:803 src/irc/irc-recv.c:1172
-#: src/irc/irc-recv.c:1610
+#: src/irc/irc-recv.c:1601
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr ""
@@ -1439,7 +1439,7 @@ msgstr ""
msgid " has left "
msgstr ""
-#: src/irc/irc-recv.c:1221 src/irc/irc-recv.c:1540
+#: src/irc/irc-recv.c:1221 src/irc/irc-recv.c:1531
#, c-format
msgid "On %s: * %s %s"
msgstr ""
@@ -1449,234 +1449,229 @@ msgstr ""
msgid "Received a CTCP SOUND \"%s\" from "
msgstr ""
-#: src/irc/irc-recv.c:1261
+#: src/irc/irc-recv.c:1260
#, c-format
msgid "On %s: %s> %s"
msgstr ""
-#: src/irc/irc-recv.c:1276
-#, c-format
-msgid "%s nick \"%s\" not found for \"%s\" command (message: \"%s\")\n"
-msgstr ""
-
-#: src/irc/irc-recv.c:1331
+#: src/irc/irc-recv.c:1322
msgid "Received a "
msgstr ""
-#: src/irc/irc-recv.c:1333
+#: src/irc/irc-recv.c:1324
msgid "CTCP VERSION "
msgstr ""
-#: src/irc/irc-recv.c:1335
+#: src/irc/irc-recv.c:1326
msgid "from"
msgstr ""
-#: src/irc/irc-recv.c:1372 src/irc/irc-recv.c:1389 src/irc/irc-recv.c:1405
-#: src/irc/irc-recv.c:1421 src/irc/irc-recv.c:1446 src/irc/irc-recv.c:1463
-#: src/irc/irc-recv.c:1478 src/irc/irc-recv.c:1586 src/irc/irc-recv.c:3229
-#: src/irc/irc-recv.c:3287 src/irc/irc-recv.c:3439 src/irc/irc-recv.c:3454
-#: src/irc/irc-recv.c:3469 src/irc/irc-recv.c:3484 src/irc/irc-recv.c:3497
-#: src/irc/irc-recv.c:3547 src/irc/irc-recv.c:3561
+#: src/irc/irc-recv.c:1363 src/irc/irc-recv.c:1380 src/irc/irc-recv.c:1396
+#: src/irc/irc-recv.c:1412 src/irc/irc-recv.c:1437 src/irc/irc-recv.c:1454
+#: src/irc/irc-recv.c:1469 src/irc/irc-recv.c:1577 src/irc/irc-recv.c:3220
+#: src/irc/irc-recv.c:3278 src/irc/irc-recv.c:3430 src/irc/irc-recv.c:3445
+#: src/irc/irc-recv.c:3460 src/irc/irc-recv.c:3475 src/irc/irc-recv.c:3488
+#: src/irc/irc-recv.c:3538 src/irc/irc-recv.c:3552
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:1491
+#: src/irc/irc-recv.c:1482
#, c-format
msgid "%s unknown DCC CHAT type received from "
msgstr ""
-#: src/irc/irc-recv.c:1566 src/irc/irc-dcc.c:799
+#: src/irc/irc-recv.c:1557 src/irc/irc-dcc.c:799
#, c-format
msgid "Private %s> %s"
msgstr ""
-#: src/irc/irc-recv.c:1642
+#: src/irc/irc-recv.c:1633
msgid "has quit"
msgstr ""
-#: src/irc/irc-recv.c:1763
+#: src/irc/irc-recv.c:1754
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr ""
-#: src/irc/irc-recv.c:1791
+#: src/irc/irc-recv.c:1782
msgid " has changed topic for "
msgstr ""
-#: src/irc/irc-recv.c:1796
+#: src/irc/irc-recv.c:1787
#, c-format
msgid " to: \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:1802
+#: src/irc/irc-recv.c:1793
msgid " has unset topic for "
msgstr ""
-#: src/irc/irc-recv.c:1913
+#: src/irc/irc-recv.c:1904
#, c-format
msgid " is away: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:1987
+#: src/irc/irc-recv.c:1978
msgid "Users online: "
msgstr ""
-#: src/irc/irc-recv.c:2434
+#: src/irc/irc-recv.c:2425
msgid "idle: "
msgstr ""
-#: src/irc/irc-recv.c:2442
+#: src/irc/irc-recv.c:2433
msgid "days"
msgstr ""
-#: src/irc/irc-recv.c:2442
+#: src/irc/irc-recv.c:2433
msgid "day"
msgstr ""
-#: src/irc/irc-recv.c:2452
+#: src/irc/irc-recv.c:2443
msgid "hours"
msgstr ""
-#: src/irc/irc-recv.c:2452
+#: src/irc/irc-recv.c:2443
msgid "hour"
msgstr ""
-#: src/irc/irc-recv.c:2458
+#: src/irc/irc-recv.c:2449
msgid "minutes"
msgstr ""
-#: src/irc/irc-recv.c:2458
+#: src/irc/irc-recv.c:2449
msgid "minute"
msgstr ""
-#: src/irc/irc-recv.c:2464
+#: src/irc/irc-recv.c:2455
msgid "seconds"
msgstr ""
-#: src/irc/irc-recv.c:2464
+#: src/irc/irc-recv.c:2455
msgid "second"
msgstr ""
-#: src/irc/irc-recv.c:2469
+#: src/irc/irc-recv.c:2460
msgid "signon at: "
msgstr ""
-#: src/irc/irc-recv.c:2557
+#: src/irc/irc-recv.c:2548
msgid "Channels: "
msgstr ""
-#: src/irc/irc-recv.c:2809
+#: src/irc/irc-recv.c:2800
msgid "No topic set for "
msgstr ""
-#: src/irc/irc-recv.c:2851
+#: src/irc/irc-recv.c:2842
msgid "Topic for "
msgstr ""
-#: src/irc/irc-recv.c:2855
+#: src/irc/irc-recv.c:2846
#, c-format
msgid " is: \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:2873 src/irc/irc-recv.c:2957 src/irc/irc-recv.c:3010
+#: src/irc/irc-recv.c:2864 src/irc/irc-recv.c:2948 src/irc/irc-recv.c:3001
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:2919
+#: src/irc/irc-recv.c:2910
msgid "Topic set by "
msgstr ""
-#: src/irc/irc-recv.c:2939
+#: src/irc/irc-recv.c:2930
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:2948 src/irc/irc-recv.c:3019
+#: src/irc/irc-recv.c:2939 src/irc/irc-recv.c:3010
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:2998
+#: src/irc/irc-recv.c:2989
msgid "has invited"
msgstr ""
-#: src/irc/irc-recv.c:3001 src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:2992 src/irc/irc-recv.c:3143
msgid "on"
msgstr ""
-#: src/irc/irc-recv.c:3275
+#: src/irc/irc-recv.c:3266
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:3331
+#: src/irc/irc-recv.c:3322
msgid "Nicks "
msgstr ""
-#: src/irc/irc-recv.c:3351
+#: src/irc/irc-recv.c:3342
msgid "Channel "
msgstr ""
-#: src/irc/irc-recv.c:3362
+#: src/irc/irc-recv.c:3353
msgid "nicks"
msgstr ""
-#: src/irc/irc-recv.c:3362
+#: src/irc/irc-recv.c:3353
msgid "nick"
msgstr ""
-#: src/irc/irc-recv.c:3370
+#: src/irc/irc-recv.c:3361
msgid "ops"
msgstr ""
-#: src/irc/irc-recv.c:3370
+#: src/irc/irc-recv.c:3361
msgid "op"
msgstr ""
-#: src/irc/irc-recv.c:3379
+#: src/irc/irc-recv.c:3370
msgid "halfops"
msgstr ""
-#: src/irc/irc-recv.c:3379
+#: src/irc/irc-recv.c:3370
msgid "halfop"
msgstr ""
-#: src/irc/irc-recv.c:3388
+#: src/irc/irc-recv.c:3379
msgid "voices"
msgstr ""
-#: src/irc/irc-recv.c:3388
+#: src/irc/irc-recv.c:3379
msgid "voice"
msgstr ""
-#: src/irc/irc-recv.c:3397
+#: src/irc/irc-recv.c:3388
msgid "normal"
msgstr ""
-#: src/irc/irc-recv.c:3510
+#: src/irc/irc-recv.c:3501
msgid "banned by"
msgstr ""
-#: src/irc/irc-recv.c:3599
+#: src/irc/irc-recv.c:3590
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:3611
+#: src/irc/irc-recv.c:3602
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:3623
+#: src/irc/irc-recv.c:3614
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr ""
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3624
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
msgstr ""
@@ -2716,52 +2711,52 @@ msgstr ""
msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
msgstr ""
-#: src/common/weechat.c:383
+#: src/common/weechat.c:384
#, c-format
msgid "%s unable to create server ('%s'), ignored\n"
msgstr ""
-#: src/common/weechat.c:392
+#: src/common/weechat.c:393
#, c-format
msgid "%s unknown parameter '%s', ignored\n"
msgstr ""
-#: src/common/weechat.c:412
+#: src/common/weechat.c:413
#, c-format
msgid "%s cannot create directory \"%s\"\n"
msgstr ""
-#: src/common/weechat.c:438
+#: src/common/weechat.c:439
#, c-format
msgid "%s unable to get HOME directory\n"
msgstr ""
-#: src/common/weechat.c:447
+#: src/common/weechat.c:448
#, c-format
msgid "%s not enough memory for home directory\n"
msgstr ""
-#: src/common/weechat.c:457
+#: src/common/weechat.c:458
#, c-format
msgid "%s unable to create ~/.weechat directory\n"
msgstr ""
-#: src/common/weechat.c:509
+#: src/common/weechat.c:510
#, c-format
msgid "%s unable to create ~/.weechat/logs directory\n"
msgstr ""
-#: src/common/weechat.c:552
+#: src/common/weechat.c:553
#, c-format
msgid "%s unable to create/append to log file (~/.weechat/%s)"
msgstr ""
-#: src/common/weechat.c:575
+#: src/common/weechat.c:576
#, c-format
msgid "%sWelcome to "
msgstr ""
-#: src/common/weechat.c:588 src/common/weechat.c:597
+#: src/common/weechat.c:589 src/common/weechat.c:598
msgid "compiled on"
msgstr ""
@@ -3512,108 +3507,108 @@ msgid ""
"#channel:1,..)"
msgstr ""
-#: src/common/weeconfig.c:1094
+#: src/common/weeconfig.c:1160
#, c-format
msgid "%s %s, line %d: new server, but previous was incomplete\n"
msgstr ""
-#: src/common/weeconfig.c:1103
+#: src/common/weeconfig.c:1169
#, c-format
msgid "%s %s, line %d: server '%s' already exists\n"
msgstr ""
-#: src/common/weeconfig.c:1118
+#: src/common/weeconfig.c:1184
#, c-format
msgid "%s %s, line %d: unable to create server\n"
msgstr ""
-#: src/common/weeconfig.c:1157
+#: src/common/weeconfig.c:1223
#, c-format
msgid "%s unable to assign default int with string (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:1168
+#: src/common/weeconfig.c:1234
#, c-format
msgid "%s unable to assign default color (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:1207
+#: src/common/weeconfig.c:1273
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr ""
-#: src/common/weeconfig.c:1239
+#: src/common/weeconfig.c:1305
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
msgstr ""
-#: src/common/weeconfig.c:1256
+#: src/common/weeconfig.c:1322
#, c-format
msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:1274
+#: src/common/weeconfig.c:1340
#, c-format
msgid "%s %s, line %d: invalid section for option, line is ignored\n"
msgstr ""
-#: src/common/weeconfig.c:1282
+#: src/common/weeconfig.c:1348
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
msgstr ""
-#: src/common/weeconfig.c:1316
+#: src/common/weeconfig.c:1382
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr ""
-#: src/common/weeconfig.c:1327
+#: src/common/weeconfig.c:1393
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
"Expected: boolean value: 'off' or 'on'\n"
msgstr ""
-#: src/common/weeconfig.c:1336
+#: src/common/weeconfig.c:1402
#, 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:1347
+#: src/common/weeconfig.c:1413
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
"Expected: one of these strings: "
msgstr ""
-#: src/common/weeconfig.c:1363
+#: src/common/weeconfig.c:1429
#, c-format
msgid "%s %s, line %d: invalid color name for option '%s'\n"
msgstr ""
-#: src/common/weeconfig.c:1423 src/common/weeconfig.c:1598
+#: src/common/weeconfig.c:1489 src/common/weeconfig.c:1664
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr ""
-#: src/common/weeconfig.c:1429
+#: src/common/weeconfig.c:1495
#, c-format
msgid "%s: creating default config file...\n"
msgstr ""
-#: src/common/weeconfig.c:1430
+#: src/common/weeconfig.c:1496
msgid "Creating default config file\n"
msgstr ""
-#: src/common/weeconfig.c:1433 src/common/weeconfig.c:1607
+#: src/common/weeconfig.c:1499 src/common/weeconfig.c:1673
#, c-format
msgid ""
"#\n"
"# %s configuration file, created by %s v%s on %s#\n"
msgstr ""
-#: src/common/weeconfig.c:1604
+#: src/common/weeconfig.c:1670
msgid "Saving config to disk\n"
msgstr ""
diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c
index 0a3b81f01..a8b97a134 100644
--- a/weechat/src/common/command.c
+++ b/weechat/src/common/command.c
@@ -708,7 +708,7 @@ user_command (t_irc_server *server, t_gui_buffer *buffer, char *command)
ptr_nick = nick_search (CHANNEL(buffer), server->nick);
if (ptr_nick)
{
- irc_display_nick (CHANNEL(buffer)->buffer, ptr_nick,
+ irc_display_nick (CHANNEL(buffer)->buffer, ptr_nick, NULL,
MSG_TYPE_NICK, 1, 1, 0);
gui_printf_color (CHANNEL(buffer)->buffer,
COLOR_WIN_CHAT, "%s\n", command);
diff --git a/weechat/src/common/completion.c b/weechat/src/common/completion.c
index 1975415f1..477f42ffc 100644
--- a/weechat/src/common/completion.c
+++ b/weechat/src/common/completion.c
@@ -47,6 +47,7 @@ completion_init (t_completion *completion)
completion->base_command_arg = 0;
completion->position = -1;
completion->base_word = NULL;
+ completion->args = NULL;
completion->completion_list = NULL;
completion->last_completion = NULL;
@@ -67,6 +68,10 @@ completion_free (t_completion *completion)
free (completion->base_word);
completion->base_word = NULL;
+ if (completion->args)
+ free (completion->args);
+ completion->args = NULL;
+
while (completion->completion_list)
weelist_remove (&completion->completion_list,
&completion->last_completion,
@@ -97,8 +102,11 @@ completion_build_list (t_completion *completion, void *channel)
int i, j;
t_irc_server *ptr_server;
t_irc_channel *ptr_channel;
- char option_name[256];
+ char *pos, option_name[256];
t_weechat_alias *ptr_alias;
+ t_config_option *option;
+ void *option_value;
+ char option_string[2048];
/* WeeChat internal commands */
@@ -211,32 +219,92 @@ completion_build_list (t_completion *completion, void *channel)
"unload");
return;
}
- if ((strcasecmp (completion->base_command, "set") == 0)
- && (completion->base_command_arg == 1))
+ if (strcasecmp (completion->base_command, "set") == 0)
{
- for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
+ if (completion->base_command_arg == 1)
{
- if ((i != CONFIG_SECTION_ALIAS) && (i != CONFIG_SECTION_SERVER))
+ for (i = 0; i < CONFIG_NUMBER_SECTIONS; i++)
{
- for (j = 0; weechat_options[i][j].option_name; j++)
+ if ((i != CONFIG_SECTION_ALIAS) && (i != CONFIG_SECTION_SERVER))
{
+ for (j = 0; weechat_options[i][j].option_name; j++)
+ {
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ weechat_options[i][j].option_name);
+ }
+ }
+ }
+ for (ptr_server = irc_servers; ptr_server;
+ ptr_server = ptr_server->next_server)
+ {
+ for (i = 0; weechat_options[CONFIG_SECTION_SERVER][i].option_name; i++)
+ {
+ snprintf (option_name, sizeof (option_name), "%s.%s",
+ ptr_server->name,
+ weechat_options[CONFIG_SECTION_SERVER][i].option_name);
weelist_add (&completion->completion_list,
&completion->last_completion,
- weechat_options[i][j].option_name);
+ option_name);
}
}
}
- for (ptr_server = irc_servers; ptr_server;
- ptr_server = ptr_server->next_server)
+ else if (completion->base_command_arg == 3)
{
- for (i = 0; weechat_options[CONFIG_SECTION_SERVER][i].option_name; i++)
+ if (completion->args)
{
- snprintf (option_name, sizeof (option_name), "%s.%s",
- ptr_server->name,
- weechat_options[CONFIG_SECTION_SERVER][i].option_name);
- weelist_add (&completion->completion_list,
- &completion->last_completion,
- option_name);
+ pos = strchr (completion->args, ' ');
+ if (pos)
+ pos[0] = '\0';
+ option = NULL;
+ option_value = NULL;
+ config_option_search_option_value (completion->args, &option, &option_value);
+ if (option && option_value)
+ {
+ switch (option->option_type)
+ {
+ case OPTION_TYPE_BOOLEAN:
+ if (option_value && (*((int *)(option_value))))
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ "on");
+ else
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ "off");
+ break;
+ case OPTION_TYPE_INT:
+ snprintf (option_string, sizeof (option_string) - 1,
+ "%d", (option_value) ? *((int *)(option_value)) : option->default_int);
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ option_string);
+ break;
+ case OPTION_TYPE_INT_WITH_STRING:
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ (option_value) ?
+ option->array_values[*((int *)(option_value))] :
+ option->array_values[option->default_int]);
+ break;
+ case OPTION_TYPE_COLOR:
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ (option_value) ?
+ gui_get_color_by_value (*((int *)(option_value))) :
+ option->default_string);
+ break;
+ case OPTION_TYPE_STRING:
+ weelist_add (&completion->completion_list,
+ &completion->last_completion,
+ (option_value) ?
+ *((char **)(option_value)) :
+ option->default_string);
+ break;
+ }
+ }
+ if (pos)
+ pos[0] = ' ';
}
}
return;
@@ -471,6 +539,8 @@ completion_find_context (t_completion *completion, void *channel, char *buffer,
command_arg++;
i++;
while ((i < pos) && (buffer[i] == ' ')) i++;
+ if (!completion->args)
+ completion->args = strdup (buffer + i);
}
else
i++;
diff --git a/weechat/src/common/completion.h b/weechat/src/common/completion.h
index 9798a03a1..30d4fa05c 100644
--- a/weechat/src/common/completion.h
+++ b/weechat/src/common/completion.h
@@ -39,6 +39,7 @@ struct t_completion
char *base_word; /* word to complete (when Tab was pressed) */
int base_word_pos; /* beggining of base word */
int position; /* position where Tab was pressed */
+ char *args; /* command line args (including base word) */
/* for command argument completion */
t_weelist *completion_list; /* data list for completion */
diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c
index f33be90c0..0324fdb38 100644
--- a/weechat/src/common/weeconfig.c
+++ b/weechat/src/common/weeconfig.c
@@ -1055,6 +1055,72 @@ config_option_search (char *option_name)
}
/*
+ * config_option_search_option_value: look for type and value of an option
+ * (including server options)
+ * if option is not found, NULL is returned
+ */
+
+void
+config_option_search_option_value (char *option_name, t_config_option **option,
+ void **option_value)
+{
+ t_config_option *ptr_option;
+ t_irc_server *ptr_server;
+ int i;
+ void *ptr_value;
+ char *pos;
+
+ ptr_option = NULL;
+ ptr_value = NULL;
+
+ ptr_option = config_option_search (option_name);
+ if (!ptr_option)
+ {
+ pos = strchr (option_name, '.');
+ if (pos)
+ {
+ pos[0] = '\0';
+ ptr_server = server_search (option_name);
+ if (ptr_server)
+ {
+ for (i = 0; weechat_options[CONFIG_SECTION_SERVER][i].option_name; i++)
+ {
+ if (strcmp (weechat_options[CONFIG_SECTION_SERVER][i].option_name,
+ pos + 1) == 0)
+ {
+ ptr_option = &weechat_options[CONFIG_SECTION_SERVER][i];
+ ptr_value = config_get_server_option_ptr (ptr_server, pos + 1);
+ break;
+ }
+ }
+ }
+ pos[0] = '.';
+ }
+ }
+ else
+ {
+ switch (ptr_option->option_type)
+ {
+ case OPTION_TYPE_BOOLEAN:
+ case OPTION_TYPE_INT:
+ case OPTION_TYPE_INT_WITH_STRING:
+ case OPTION_TYPE_COLOR:
+ ptr_value = (void *)(ptr_option->ptr_int);
+ break;
+ case OPTION_TYPE_STRING:
+ ptr_value = (void *)(ptr_option->ptr_string);
+ break;
+ }
+ }
+
+ if (ptr_option)
+ {
+ *option = ptr_option;
+ *option_value = ptr_value;
+ }
+}
+
+/*
* config_set_value: set new value for an option (found by name)
* return: 0 if success
* -1 if bad value for option
diff --git a/weechat/src/common/weeconfig.h b/weechat/src/common/weeconfig.h
index 016cc062e..62afca6e1 100644
--- a/weechat/src/common/weeconfig.h
+++ b/weechat/src/common/weeconfig.h
@@ -196,6 +196,7 @@ extern void config_change_fifo_pipe ();
extern void config_change_notify_levels ();
extern int config_option_set_value (t_config_option *, char *);
extern t_config_option *config_option_search (char *);
+extern void config_option_search_option_value (char *, t_config_option **, void **);
extern int config_set_value (char *, char *);
extern void *config_get_server_option_ptr (t_irc_server *, char *);
extern int config_set_server_value (t_irc_server *, char *, char *);
diff --git a/weechat/src/irc/irc-display.c b/weechat/src/irc/irc-display.c
index 8aafd29b0..0e182b1e8 100644
--- a/weechat/src/irc/irc-display.c
+++ b/weechat/src/irc/irc-display.c
@@ -66,13 +66,14 @@ irc_display_prefix (t_gui_buffer *buffer, char *prefix)
*/
void
-irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, int message_type,
- int display_around, int color_nick, int no_nickmode)
+irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, char *nickname,
+ int message_type, int display_around, int color_nick, int no_nickmode)
{
if (display_around)
gui_printf_type_color (buffer,
- message_type, COLOR_WIN_CHAT_DARK, "<");
- if (cfg_look_nickmode)
+ message_type, COLOR_WIN_CHAT_DARK,
+ (nick) ? "<" : ">");
+ if (nick && cfg_look_nickmode)
{
if (nick->is_chanowner)
gui_printf_type_color (buffer,
@@ -104,19 +105,20 @@ irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, int message_type,
gui_printf_type_color (buffer,
message_type,
COLOR_WIN_CHAT_HIGHLIGHT,
- "%s", nick->nick);
+ "%s", (nick) ? nick->nick : nickname);
else
gui_printf_type_color (buffer,
message_type,
- (color_nick) ?
+ (nick && color_nick) ?
((cfg_look_color_nicks) ?
nick->color : COLOR_WIN_CHAT) :
COLOR_WIN_CHAT,
- "%s", nick->nick);
+ "%s", (nick) ? nick->nick : nickname);
if (display_around)
gui_printf_type_color (buffer,
- message_type, COLOR_WIN_CHAT_DARK, "> ");
+ message_type, COLOR_WIN_CHAT_DARK,
+ (nick) ? "> " : "< ");
}
/*
diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c
index c3b3a3e54..85bbbfbc2 100644
--- a/weechat/src/irc/irc-recv.c
+++ b/weechat/src/irc/irc-recv.c
@@ -1246,37 +1246,28 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
else
{
ptr_nick = nick_search (ptr_channel, host);
- if (ptr_nick)
+ if (strstr (pos, server->nick))
{
- if (strstr (pos, server->nick))
- {
- irc_display_nick (ptr_channel->buffer, ptr_nick,
- MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
- 1, -1, 0);
- if ( (cfg_look_infobar)
- && (cfg_look_infobar_delay_highlight > 0)
- && (ptr_channel->buffer != gui_current_window->buffer) )
- gui_infobar_printf (cfg_look_infobar_delay_highlight,
- COLOR_WIN_INFOBAR_HIGHLIGHT,
- _("On %s: %s> %s"),
- ptr_channel->name,
- host, pos);
- }
- else
- irc_display_nick (ptr_channel->buffer, ptr_nick,
- MSG_TYPE_NICK, 1, 1, 0);
- gui_printf_type_color (ptr_channel->buffer,
- MSG_TYPE_MSG,
- COLOR_WIN_CHAT, "%s\n", pos);
+ irc_display_nick (ptr_channel->buffer, ptr_nick,
+ (ptr_nick) ? NULL : host,
+ MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
+ 1, -1, 0);
+ if ( (cfg_look_infobar)
+ && (cfg_look_infobar_delay_highlight > 0)
+ && (ptr_channel->buffer != gui_current_window->buffer) )
+ gui_infobar_printf (cfg_look_infobar_delay_highlight,
+ COLOR_WIN_INFOBAR_HIGHLIGHT,
+ _("On %s: %s> %s"),
+ ptr_channel->name,
+ host, pos);
}
else
- {
- irc_display_prefix (server->buffer, PREFIX_ERROR);
- gui_printf_nolog (server->buffer,
- _("%s nick \"%s\" not found for \"%s\" command (message: \"%s\")\n"),
- WEECHAT_ERROR, host, "privmsg", pos);
- return -1;
- }
+ irc_display_nick (ptr_channel->buffer, ptr_nick,
+ (ptr_nick) ? NULL : host,
+ MSG_TYPE_NICK, 1, 1, 0);
+ gui_printf_type_color (ptr_channel->buffer,
+ MSG_TYPE_MSG,
+ COLOR_WIN_CHAT, "%s\n", pos);
}
}
else
@@ -3336,7 +3327,7 @@ irc_cmd_recv_366 (t_irc_server *server, char *host, char *arguments)
for (ptr_nick = ptr_channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
{
- irc_display_nick (ptr_channel->buffer, ptr_nick,
+ irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
MSG_TYPE_MSG, 0, 0, 1);
if (ptr_nick != ptr_channel->last_nick)
gui_printf (ptr_channel->buffer, " ");
diff --git a/weechat/src/irc/irc-send.c b/weechat/src/irc/irc-send.c
index 1809c2c40..22a90b2f3 100644
--- a/weechat/src/irc/irc-send.c
+++ b/weechat/src/irc/irc-send.c
@@ -876,7 +876,7 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
ptr_nick = nick_search (ptr_channel, server->nick);
if (ptr_nick)
{
- irc_display_nick (ptr_channel->buffer, ptr_nick,
+ irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
MSG_TYPE_NICK, 1, 1, 0);
gui_printf_type_color (ptr_channel->buffer,
MSG_TYPE_MSG,
@@ -901,7 +901,7 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
ptr_nick = nick_search (ptr_channel, server->nick);
if (ptr_nick)
{
- irc_display_nick (ptr_channel->buffer, ptr_nick,
+ irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
MSG_TYPE_NICK, 1, 1, 0);
gui_printf_type_color (ptr_channel->buffer,
MSG_TYPE_MSG,
diff --git a/weechat/src/irc/irc.h b/weechat/src/irc/irc.h
index 1087a4052..bc69d163d 100644
--- a/weechat/src/irc/irc.h
+++ b/weechat/src/irc/irc.h
@@ -331,7 +331,7 @@ extern void dcc_end ();
/* IRC display (irc-diplay.c) */
extern void irc_display_prefix (/*@null@*/ t_gui_buffer *, char *);
-extern void irc_display_nick (t_gui_buffer *, t_irc_nick *, int, int, int, int);
+extern void irc_display_nick (t_gui_buffer *, t_irc_nick *, char *, int, int, int, int);
extern void irc_display_mode (t_gui_buffer *, char *, char, char *, char *,
char *, char *);
extern void irc_display_server (t_irc_server *ptr_server);