diff options
author | Sebastien Helleu <flashcode@flashtux.org> | 2005-06-19 14:22:11 +0000 |
---|---|---|
committer | Sebastien Helleu <flashcode@flashtux.org> | 2005-06-19 14:22:11 +0000 |
commit | 71a76ada48d29d62b4b8c4f7b4d5f92495a9a49e (patch) | |
tree | 50a863e24a4ba35e39d744d8797359795a748696 | |
parent | a7ddb89076340084c5206a913d98224e0b49a97e (diff) | |
download | weechat-71a76ada48d29d62b4b8c4f7b4d5f92495a9a49e.zip |
Channel notify levels are saved in config file
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | TODO | 17 | ||||
-rw-r--r-- | po/es.po | 260 | ||||
-rw-r--r-- | po/fr.po | 263 | ||||
-rw-r--r-- | po/weechat.pot | 252 | ||||
-rw-r--r-- | src/common/command.c | 25 | ||||
-rw-r--r-- | src/common/weechat.c | 2 | ||||
-rw-r--r-- | src/common/weeconfig.c | 29 | ||||
-rw-r--r-- | src/common/weeconfig.h | 1 | ||||
-rw-r--r-- | src/gui/gui-common.c | 2 | ||||
-rw-r--r-- | src/gui/gui.h | 4 | ||||
-rw-r--r-- | src/irc/irc-channel.c | 131 | ||||
-rw-r--r-- | src/irc/irc-display.c | 4 | ||||
-rw-r--r-- | src/irc/irc-server.c | 14 | ||||
-rw-r--r-- | src/irc/irc.h | 6 | ||||
-rw-r--r-- | weechat/ChangeLog | 4 | ||||
-rw-r--r-- | weechat/TODO | 17 | ||||
-rw-r--r-- | weechat/po/es.po | 260 | ||||
-rw-r--r-- | weechat/po/fr.po | 263 | ||||
-rw-r--r-- | weechat/po/weechat.pot | 252 | ||||
-rw-r--r-- | weechat/src/common/command.c | 25 | ||||
-rw-r--r-- | weechat/src/common/weechat.c | 2 | ||||
-rw-r--r-- | weechat/src/common/weeconfig.c | 29 | ||||
-rw-r--r-- | weechat/src/common/weeconfig.h | 1 | ||||
-rw-r--r-- | weechat/src/gui/gui-common.c | 2 | ||||
-rw-r--r-- | weechat/src/gui/gui.h | 4 | ||||
-rw-r--r-- | weechat/src/irc/irc-channel.c | 131 | ||||
-rw-r--r-- | weechat/src/irc/irc-display.c | 4 | ||||
-rw-r--r-- | weechat/src/irc/irc-server.c | 14 | ||||
-rw-r--r-- | weechat/src/irc/irc.h | 6 |
30 files changed, 1252 insertions, 776 deletions
@@ -1,10 +1,12 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2005-06-18 +ChangeLog - 2005-06-19 Version 0.1.3 (under dev!): + * channel notify levels are saved in config file (new option + "server_notify_levels" for server sections) * part message now accepts %v (replaced by WeeChat version), like quit message * errors while loading perl scripts are now displayed in server buffer (instead of current buffer) @@ -1,7 +1,7 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -TODO - 2005-05-21 +TODO - 2005-06-19 Legend: # done @@ -10,20 +10,17 @@ Legend: ? is this really necessary? -v0.1.2: +v0.1.3: ------ * General: + Windows version + Solaris version - # *BSD version - # Mac OS X version * IRC protocol: - customizable CTCP version reply * Interface: - # nicklist scroll keys + Gtk GUI + internationalization (traduce WeeChat in many languages) @@ -32,10 +29,7 @@ v0.1.2: * Configuration: - add key bindings to config file - - * Plugins: - # Python plugin - # "/python load" and "/python unload" commands to (un)load Python scripts + # save buffer notify levels Future versions: @@ -52,15 +46,10 @@ Future versions: nick/host connect to the given irc network * WeeChat commands: - - "/reload" command: reload the WeeChat's config file - "/highlight" command: highlight a given word when it appears on channels/privates - "/completion" command: do shortcuts (for example when we type "u" in the text bar it send it to the server as "you") - - "/exec" command: execute a command as if we was in shell - and show us the output on the current window. An option to exec - like -o could send the output to the server, on the current - channel/private - "/last": command to look for text in previous messages * Interface: @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.3-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-06-15 19:08+0200\n" -"PO-Revision-Date: 2005-06-15 19:09+0200\n" +"POT-Creation-Date: 2005-06-19 15:59+0200\n" +"PO-Revision-Date: 2005-06-19 16:08+0200\n" "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -20,107 +20,107 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "%s no ha sido posible crear un nuevo nick\n" -#: src/irc/irc-server.c:146 src/common/weeconfig.c:1506 +#: src/irc/irc-server.c:147 src/common/weeconfig.c:1531 msgid "Unable to get user's name" msgstr "No ha sido posible obtener el nombre de usuario" -#: src/irc/irc-server.c:211 +#: src/irc/irc-server.c:212 #, 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:416 +#: src/irc/irc-server.c:423 #, 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:436 src/irc/irc-server.c:449 src/irc/irc-server.c:515 -#: src/irc/irc-server.c:528 +#: src/irc/irc-server.c:443 src/irc/irc-server.c:456 src/irc/irc-server.c:522 +#: src/irc/irc-server.c:535 #, 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:606 +#: src/irc/irc-server.c:613 #, c-format msgid "%s Command '%s' failed!\n" msgstr "%s ¡Ha fallado el comando '%s' !\n" -#: src/irc/irc-server.c:611 +#: src/irc/irc-server.c:618 #, c-format msgid "%s No command to execute!\n" msgstr "%s ¡Ningún comando para ejecutar!\n" -#: src/irc/irc-server.c:616 +#: src/irc/irc-server.c:623 #, 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:658 +#: src/irc/irc-server.c:665 #, 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:730 +#: src/irc/irc-server.c:737 #, 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:761 +#: src/irc/irc-server.c:768 #, c-format msgid "%s address \"%s\" not found\n" msgstr "%s dirección \"%s\" no encontrada\n" -#: src/irc/irc-server.c:770 +#: src/irc/irc-server.c:777 #, c-format msgid "%s IP address not found\n" msgstr "%s Dirección IP no encontrada\n" -#: src/irc/irc-server.c:778 +#: src/irc/irc-server.c:785 #, c-format msgid "%s connection refused\n" msgstr "%s conexión rechazada\n" -#: src/irc/irc-server.c:844 +#: src/irc/irc-server.c:851 #, c-format msgid "%s: connecting to %s:%d...\n" msgstr "%s: conectando a %s:%d...\n" -#: src/irc/irc-server.c:846 +#: src/irc/irc-server.c:853 #, c-format msgid "Connecting to server %s:%d...\n" msgstr "Conectando al servidor %s:%d...\n" -#: src/irc/irc-server.c:857 +#: src/irc/irc-server.c:864 #, c-format msgid "%s cannot create pipe\n" msgstr "%s no ha sido posible crear la interconexión\n" -#: src/irc/irc-server.c:869 +#: src/irc/irc-server.c:876 #, c-format msgid "%s cannot create socket\n" msgstr "%s no ha sido posible crear el socket\n" -#: src/irc/irc-server.c:881 +#: src/irc/irc-server.c:888 #, 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:892 +#: src/irc/irc-server.c:899 #, 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:923 +#: src/irc/irc-server.c:930 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Reconectando al servidor...\n" -#: src/irc/irc-server.c:972 src/irc/irc-server.c:981 +#: src/irc/irc-server.c:979 src/irc/irc-server.c:988 msgid "Disconnected from server!\n" msgstr "¡Desconectado del servidor!\n" -#: src/irc/irc-channel.c:51 +#: src/irc/irc-channel.c:52 #, c-format msgid "%s cannot allocate new channel" msgstr "%s no ha sido posible crear un nuevo canal" @@ -1291,17 +1291,17 @@ msgstr "%s: utilización del nombre de máquina local \"%s\"\n" #: src/irc/irc-send.c:232 src/irc/irc-send.c:260 src/irc/irc-send.c:426 #: src/irc/irc-send.c:452 src/irc/irc-send.c:478 src/irc/irc-send.c:519 #: src/irc/irc-send.c:555 src/irc/irc-send.c:619 src/irc/irc-send.c:676 -#: src/irc/irc-send.c:1018 src/irc/irc-send.c:1116 src/irc/irc-send.c:1583 -#: src/irc/irc-send.c:1690 +#: src/irc/irc-send.c:1018 src/irc/irc-send.c:1116 src/irc/irc-send.c:1595 +#: src/irc/irc-send.c:1702 #, c-format msgid "%s \"%s\" command can only be executed in a channel window\n" msgstr "" "%s el comando \"%s\" sólo puede ser ejecutado en una ventana de canal\n" #: src/irc/irc-send.c:345 src/irc/irc-send.c:357 src/irc/irc-send.c:375 -#: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1609 -#: src/common/command.c:1152 src/common/command.c:1436 -#: src/common/command.c:1579 +#: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1621 +#: src/common/command.c:1165 src/common/command.c:1449 +#: src/common/command.c:1592 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s número de argumentos incorrecto para el comando \"%s\"\n" @@ -1312,7 +1312,7 @@ msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s argumentos incorrecto para el comando \"%s\"\n" #: src/irc/irc-send.c:804 src/irc/irc-send.c:871 src/irc/irc-send.c:1164 -#: src/irc/irc-send.c:1178 src/irc/irc-send.c:1510 +#: src/irc/irc-send.c:1178 src/irc/irc-send.c:1522 #, c-format msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" @@ -1323,12 +1323,12 @@ 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:1262 src/irc/irc-recv.c:1444 +#: src/irc/irc-send.c:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1444 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n" -#: src/irc/irc-send.c:1662 +#: src/irc/irc-send.c:1674 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilado en %s %s\n" @@ -1958,22 +1958,22 @@ msgid "%s error: too much values from \"%s\" (%d). Expected: 1.\n" msgstr "Error de %s: demasiados valores desde \"%s\" (%d). Esperado: 1.\n" #: src/plugins/perl/wee-perl.c:941 src/plugins/perl/wee-perl.c:943 -#: src/plugins/python/wee-python.c:541 src/plugins/python/wee-python.c:543 +#: src/plugins/python/wee-python.c:566 src/plugins/python/wee-python.c:568 #, c-format msgid "Loading %s script \"%s\"\n" msgstr "Cargando %s script \"%s\"\n" -#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:612 +#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:637 #, c-format msgid "Unloading %s script \"%s\"\n" msgstr "Descarga del %s script \"%s\"\n" -#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:629 +#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:654 #, c-format msgid "Unloading all %s scripts...\n" msgstr "Descargando todos los %s scripts...\n" -#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:634 +#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:659 #, c-format msgid "%s scripts unloaded\n" msgstr "%s scripts descargados\n" @@ -1983,30 +1983,35 @@ msgstr "%s scripts descargados\n" msgid "%s error: error while launching interpreter\n" msgstr "" -#: src/plugins/python/wee-python.c:460 src/plugins/python/wee-python.c:488 -#: src/plugins/python/wee-python.c:520 +#: src/plugins/python/wee-python.c:432 +#, c-format +msgid "%s error: error while redirecting stdout and stderr\n" +msgstr "" + +#: src/plugins/python/wee-python.c:485 src/plugins/python/wee-python.c:513 +#: src/plugins/python/wee-python.c:545 #, c-format msgid "%s error: unable to run function \"%s\" in script (not enough memory)\n" msgstr "" "Error de %s: no ha sido posible cargar el script \"%s\" (memoria " "insuficiente)\n" -#: src/plugins/python/wee-python.c:510 +#: src/plugins/python/wee-python.c:535 #, c-format msgid "%s error: error while running function \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:549 +#: src/plugins/python/wee-python.c:574 #, c-format msgid "%s error: error while opening file \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:558 +#: src/plugins/python/wee-python.c:583 #, c-format msgid "%s error: error while parsing file \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:660 +#: src/plugins/python/wee-python.c:685 #, c-format msgid "%s error: error while freeing interpreter\n" msgstr "" @@ -2451,7 +2456,7 @@ msgstr "Privado con: " msgid "Opened buffers:\n" msgstr "Búfers abiertos:\n" -#: src/common/command.c:927 src/common/command.c:1054 +#: src/common/command.c:927 src/common/command.c:1067 #, c-format msgid "%s incorrect buffer number\n" msgstr "%s número de búfer incorrecto\n" @@ -2471,99 +2476,104 @@ msgstr "" msgid "Notify levels: " msgstr "Niveles de notificación: " -#: src/common/command.c:1017 src/common/command.c:1027 +#: src/common/command.c:1018 src/common/command.c:1040 #, c-format -msgid "%s incorrect notify level (must be between 0 and 3)\n" -msgstr "%s nivel de notificación incorrecto (debe estar entre 0 y 3)\n" +msgid "%s incorrect notify level (must be between %d and %d)\n" +msgstr "%s nivel de notificación incorrecto (debe estar entre %d y %d)\n" + +#: src/common/command.c:1027 +#, c-format +msgid "%s incorrect buffer for notify (must be channel or private)\n" +msgstr "" -#: src/common/command.c:1045 +#: src/common/command.c:1058 #, c-format msgid "%s buffer \"%s\" not found for \"%s\" command\n" msgstr "%s búfer \"%s\" no encontrado para el comando \"%s\"\n" -#: src/common/command.c:1079 +#: src/common/command.c:1092 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "parámetro desconocido \"%s\" para el comando \"%s\"\n" -#: src/common/command.c:1109 +#: src/common/command.c:1122 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s ya conectado al servidor \"%s\"!\n" -#: src/common/command.c:1117 +#: src/common/command.c:1130 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "%s actualmente conectando al servidor \"%s\"!\n" -#: src/common/command.c:1135 src/common/command.c:1210 +#: src/common/command.c:1148 src/common/command.c:1223 #, c-format msgid "%s server not found\n" msgstr "%s servidor no encontrado\n" -#: src/common/command.c:1165 src/common/command.c:1429 -#: src/common/command.c:1572 src/common/command.c:2263 -#: src/common/command.c:2275 +#: src/common/command.c:1178 src/common/command.c:1442 +#: src/common/command.c:1585 src/common/command.c:2276 +#: src/common/command.c:2288 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s opción desconocida para el comando \"%s\"\n" -#: src/common/command.c:1194 +#: src/common/command.c:1207 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s ¡no conectado al servidor \"%s\"!\n" -#: src/common/command.c:1202 +#: src/common/command.c:1215 msgid "Auto-reconnection is cancelled\n" msgstr "La reconexión automática está anulada\n" -#: src/common/command.c:1228 src/common/weechat.c:265 +#: src/common/command.c:1241 src/common/weechat.c:265 #, c-format msgid "%s internal commands:\n" msgstr "Comandos internos %s :\n" -#: src/common/command.c:1237 src/common/weechat.c:285 +#: src/common/command.c:1250 src/common/weechat.c:285 #, c-format msgid "IRC commands:\n" msgstr "Comandos IRC :\n" -#: src/common/command.c:1304 +#: src/common/command.c:1317 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "No hay ayuda disponible, el comando \"%s\" es desconocido\n" -#: src/common/command.c:1328 src/common/command.c:1471 +#: src/common/command.c:1341 src/common/command.c:1484 #, c-format msgid "Registered %s scripts:\n" msgstr "%s scripts registrados:\n" -#: src/common/command.c:1345 src/common/command.c:1368 -#: src/common/command.c:1391 src/common/command.c:1488 -#: src/common/command.c:1511 src/common/command.c:1534 +#: src/common/command.c:1358 src/common/command.c:1381 +#: src/common/command.c:1404 src/common/command.c:1501 +#: src/common/command.c:1524 src/common/command.c:1547 msgid " (none)\n" msgstr " (ninguno)\n" -#: src/common/command.c:1350 src/common/command.c:1493 +#: src/common/command.c:1363 src/common/command.c:1506 #, c-format msgid "%s message handlers:\n" msgstr "Funciones %s para mensajes:\n" -#: src/common/command.c:1359 src/common/command.c:1502 +#: src/common/command.c:1372 src/common/command.c:1515 #, c-format msgid " IRC(%s) => %s(%s)\n" msgstr " IRC(%s) => %s(%s)\n" -#: src/common/command.c:1373 src/common/command.c:1516 +#: src/common/command.c:1386 src/common/command.c:1529 #, c-format msgid "%s command handlers:\n" msgstr "Comandos %s :\n" -#: src/common/command.c:1382 src/common/command.c:1525 +#: src/common/command.c:1395 src/common/command.c:1538 #, c-format msgid " Command /%s => %s(%s)\n" msgstr " Comando /%s => %s(%s)\n" -#: src/common/command.c:1442 +#: src/common/command.c:1455 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" @@ -2572,7 +2582,7 @@ msgstr "" "Por favor, recompile WeeChat con la opción \"--enable-perl\" para el " "script ./configure\n" -#: src/common/command.c:1585 +#: src/common/command.c:1598 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " @@ -2582,32 +2592,32 @@ msgstr "" "Por favor, recompile WeeChat con la opción \"--enable-python\" para el " "script ./configure\n" -#: src/common/command.c:1633 +#: src/common/command.c:1646 msgid "No server.\n" msgstr "Ningún servidor.\n" -#: src/common/command.c:1644 +#: src/common/command.c:1657 #, c-format msgid "Server '%s' not found.\n" msgstr "Servidor '%s' no encontrado.\n" -#: src/common/command.c:1656 +#: src/common/command.c:1669 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "%s falta el nombre de servidor para el comando \"%s\"\n" -#: src/common/command.c:1664 +#: src/common/command.c:1677 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" "%s demasiados argumentos para el comando \"%s\", ignorando parámetros\n" -#: src/common/command.c:1683 +#: src/common/command.c:1696 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "%s servidor \"%s\" no encontrado para el comando \"%s\"\n" -#: src/common/command.c:1691 +#: src/common/command.c:1704 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -2616,108 +2626,108 @@ msgstr "" "%s usted no puede eliminar el servidor \"%s\" ya que está usted conectado a " "él. Pruebe /disconnect %s antes.\n" -#: src/common/command.c:1707 src/common/command.c:1848 +#: src/common/command.c:1720 src/common/command.c:1861 msgid "Server" msgstr "Servidor" -#: src/common/command.c:1710 +#: src/common/command.c:1723 msgid "has been deleted\n" msgstr "ha sido eliminado\n" -#: src/common/command.c:1725 +#: src/common/command.c:1738 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s faltan parámetros para el comando \"%s\"\n" -#: src/common/command.c:1735 +#: src/common/command.c:1748 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "%s el servidor \"%s\" ya existe, ¡no se puede crear!\n" -#: src/common/command.c:1760 src/common/command.c:1788 -#: src/common/command.c:1801 src/common/command.c:1827 +#: src/common/command.c:1773 src/common/command.c:1801 +#: src/common/command.c:1814 src/common/command.c:1840 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s falta contraseña para el comando \"%s\"\n" -#: src/common/command.c:1773 +#: src/common/command.c:1786 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "%s falta(n) usuario(s) para el parámetro \"%s\"\n" -#: src/common/command.c:1814 +#: src/common/command.c:1827 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s falta comando para el parámetro \"%s\"\n" -#: src/common/command.c:1851 +#: src/common/command.c:1864 msgid "created\n" msgstr "creado\n" -#: src/common/command.c:1857 +#: src/common/command.c:1870 #, c-format msgid "%s unable to create server\n" msgstr "%s no es posible crear el servidor\n" -#: src/common/command.c:1912 +#: src/common/command.c:1925 msgid "(unknown)" msgstr "(desconocido)" -#: src/common/command.c:1935 +#: src/common/command.c:1948 msgid "(password hidden) " msgstr "(contraseña oculta) " -#: src/common/command.c:1999 +#: src/common/command.c:2012 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s servidor \"%s\" no encontrado\n" -#: src/common/command.c:2030 src/common/command.c:2076 +#: src/common/command.c:2043 src/common/command.c:2089 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s opción de configuración \"%s\" no encontrada\n" -#: src/common/command.c:2035 src/common/command.c:2068 +#: src/common/command.c:2048 src/common/command.c:2081 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valor incorrecto para la opción \"%s\"\n" -#: src/common/command.c:2051 +#: src/common/command.c:2064 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" "%s la opción \"%s\" no puede ser modificada mientras WeeChat esté en " "ejecución\n" -#: src/common/command.c:2149 +#: src/common/command.c:2162 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Ninguna opción de configuración encontrada con \"%s\"\n" -#: src/common/command.c:2152 +#: src/common/command.c:2165 msgid "No config option found\n" msgstr "Ninguna opción de configuración encontrada\n" -#: src/common/command.c:2158 +#: src/common/command.c:2171 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "opción/opciones de configuración encontrada(s) con \"%s\"\n" -#: src/common/command.c:2161 +#: src/common/command.c:2174 msgid "config option(s) found\n" msgstr "opción/opciones de configuración encontrada(s)\n" -#: src/common/command.c:2181 +#: src/common/command.c:2194 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias o comando \"%s\" no encontrado\n" -#: src/common/command.c:2191 +#: src/common/command.c:2204 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" eliminado\n" -#: src/common/command.c:2211 +#: src/common/command.c:2224 msgid "Opened windows:\n" msgstr "Ventanas abiertas:\n" @@ -3698,62 +3708,72 @@ msgstr "" msgid "automatically rejoin channels when kicked" msgstr "unirse de nuevo automáticamente a los canales cuando sea expulsado" -#: src/common/weeconfig.c:1057 +#: src/common/weeconfig.c:693 +msgid "notify levels for channels of this server" +msgstr "" + +#: src/common/weeconfig.c:694 +msgid "" +"comma separated list of notify levels for channels of this server (format: " +"#channel:1,..)" +msgstr "" + +#: src/common/weeconfig.c:1082 #, 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:1066 +#: src/common/weeconfig.c:1091 #, 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:1080 +#: src/common/weeconfig.c:1105 #, 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:1119 +#: src/common/weeconfig.c:1144 #, 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:1130 +#: src/common/weeconfig.c:1155 #, 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:1169 +#: src/common/weeconfig.c:1194 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "%s fichero de configuración \"%s\" no encontrado.\n" -#: src/common/weeconfig.c:1201 +#: src/common/weeconfig.c:1226 #, 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:1218 +#: src/common/weeconfig.c:1243 #, 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:1236 +#: src/common/weeconfig.c:1261 #, 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:1244 +#: src/common/weeconfig.c:1269 #, 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:1278 +#: src/common/weeconfig.c:1303 #, 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:1289 +#: src/common/weeconfig.c:1314 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" @@ -3762,7 +3782,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:1298 +#: src/common/weeconfig.c:1323 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3771,7 +3791,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:1309 +#: src/common/weeconfig.c:1334 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3780,26 +3800,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:1325 +#: src/common/weeconfig.c:1350 #, 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:1385 src/common/weeconfig.c:1558 +#: src/common/weeconfig.c:1410 src/common/weeconfig.c:1583 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "%s no es posible crear el fichero \"%s\"\n" -#: src/common/weeconfig.c:1391 +#: src/common/weeconfig.c:1416 #, c-format msgid "%s: creating default config file...\n" msgstr "%s: creando fichero de configuración por defecto...\n" -#: src/common/weeconfig.c:1392 +#: src/common/weeconfig.c:1417 msgid "Creating default config file\n" msgstr "Creando fichero de configuración por defecto\n" -#: src/common/weeconfig.c:1395 src/common/weeconfig.c:1567 +#: src/common/weeconfig.c:1420 src/common/weeconfig.c:1592 #, c-format msgid "" "#\n" @@ -3808,10 +3828,6 @@ msgstr "" "#\n" "# %s: fichero de configuración, creado por %s v%s el %s#\n" -#: src/common/weeconfig.c:1564 +#: src/common/weeconfig.c:1589 msgid "Saving config to disk\n" msgstr "Guardar configuración a disco\n" - -#, fuzzy -#~ msgid "%s not enough memory to call plugin handler\n" -#~ msgstr "%s no hay memoria suficiente para un nuevo DCC\n" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.3-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-06-15 19:08+0200\n" -"PO-Revision-Date: 2005-06-15 19:08+0200\n" +"POT-Creation-Date: 2005-06-19 15:59+0200\n" +"PO-Revision-Date: 2005-06-19 16:07+0200\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -20,107 +20,107 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "%s impossible d'allouer un nouveau pseudo\n" -#: src/irc/irc-server.c:146 src/common/weeconfig.c:1506 +#: src/irc/irc-server.c:147 src/common/weeconfig.c:1531 msgid "Unable to get user's name" msgstr "Impossible de déterminer le nom d'utilisateur" -#: src/irc/irc-server.c:211 +#: src/irc/irc-server.c:212 #, c-format msgid "%s cannot allocate new server\n" msgstr "%s impossible d'allouer un nouveau serveur\n" -#: src/irc/irc-server.c:416 +#: src/irc/irc-server.c:423 #, 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:436 src/irc/irc-server.c:449 src/irc/irc-server.c:515 -#: src/irc/irc-server.c:528 +#: src/irc/irc-server.c:443 src/irc/irc-server.c:456 src/irc/irc-server.c:522 +#: src/irc/irc-server.c:535 #, 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:606 +#: src/irc/irc-server.c:613 #, c-format msgid "%s Command '%s' failed!\n" msgstr "%s La commande '%s' a échoué !\n" -#: src/irc/irc-server.c:611 +#: src/irc/irc-server.c:618 #, c-format msgid "%s No command to execute!\n" msgstr "%s Pas de commande à exécuter !\n" -#: src/irc/irc-server.c:616 +#: src/irc/irc-server.c:623 #, 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:658 +#: src/irc/irc-server.c:665 #, 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:730 +#: src/irc/irc-server.c:737 #, 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:761 +#: src/irc/irc-server.c:768 #, c-format msgid "%s address \"%s\" not found\n" msgstr "%s adresse \"%s\" introuvable\n" -#: src/irc/irc-server.c:770 +#: src/irc/irc-server.c:777 #, c-format msgid "%s IP address not found\n" msgstr "%s adresse IP introuvable\n" -#: src/irc/irc-server.c:778 +#: src/irc/irc-server.c:785 #, c-format msgid "%s connection refused\n" msgstr "%s connexion refusée\n" -#: src/irc/irc-server.c:844 +#: src/irc/irc-server.c:851 #, c-format msgid "%s: connecting to %s:%d...\n" msgstr "%s: connexion à %s:%d...\n" -#: src/irc/irc-server.c:846 +#: src/irc/irc-server.c:853 #, c-format msgid "Connecting to server %s:%d...\n" msgstr "Connexion au serveur %s:%d...\n" -#: src/irc/irc-server.c:857 +#: src/irc/irc-server.c:864 #, c-format msgid "%s cannot create pipe\n" msgstr "%s impossible de créer le pipe\n" -#: src/irc/irc-server.c:869 +#: src/irc/irc-server.c:876 #, c-format msgid "%s cannot create socket\n" msgstr "%s impossible de créer la socket\n" -#: src/irc/irc-server.c:881 +#: src/irc/irc-server.c:888 #, 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:892 +#: src/irc/irc-server.c:899 #, 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:923 +#: src/irc/irc-server.c:930 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Reconnexion au serveur...\n" -#: src/irc/irc-server.c:972 src/irc/irc-server.c:981 +#: src/irc/irc-server.c:979 src/irc/irc-server.c:988 msgid "Disconnected from server!\n" msgstr "Déconnecté du serveur !\n" -#: src/irc/irc-channel.c:51 +#: src/irc/irc-channel.c:52 #, c-format msgid "%s cannot allocate new channel" msgstr "%s impossible d'allouer un nouveau canal" @@ -1292,8 +1292,8 @@ msgstr "%s: utilisation du nom de machine local \"%s\"\n" #: src/irc/irc-send.c:232 src/irc/irc-send.c:260 src/irc/irc-send.c:426 #: src/irc/irc-send.c:452 src/irc/irc-send.c:478 src/irc/irc-send.c:519 #: src/irc/irc-send.c:555 src/irc/irc-send.c:619 src/irc/irc-send.c:676 -#: src/irc/irc-send.c:1018 src/irc/irc-send.c:1116 src/irc/irc-send.c:1583 -#: src/irc/irc-send.c:1690 +#: src/irc/irc-send.c:1018 src/irc/irc-send.c:1116 src/irc/irc-send.c:1595 +#: src/irc/irc-send.c:1702 #, c-format msgid "%s \"%s\" command can only be executed in a channel window\n" msgstr "" @@ -1301,9 +1301,9 @@ msgstr "" "canal\n" #: src/irc/irc-send.c:345 src/irc/irc-send.c:357 src/irc/irc-send.c:375 -#: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1609 -#: src/common/command.c:1152 src/common/command.c:1436 -#: src/common/command.c:1579 +#: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1621 +#: src/common/command.c:1165 src/common/command.c:1449 +#: src/common/command.c:1592 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n" @@ -1314,7 +1314,7 @@ msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s paramètres invalides pour la commande \"%s\"\n" #: src/irc/irc-send.c:804 src/irc/irc-send.c:871 src/irc/irc-send.c:1164 -#: src/irc/irc-send.c:1178 src/irc/irc-send.c:1510 +#: src/irc/irc-send.c:1178 src/irc/irc-send.c:1522 #, c-format msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" @@ -1325,12 +1325,12 @@ 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:1262 src/irc/irc-recv.c:1444 +#: src/irc/irc-send.c:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1444 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "%s impossible de créer la fenêtre privée \"%s\"\n" -#: src/irc/irc-send.c:1662 +#: src/irc/irc-send.c:1674 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilé le %s %s\n" @@ -1959,22 +1959,22 @@ msgid "%s error: too much values from \"%s\" (%d). Expected: 1.\n" msgstr "Erreur %s: trop de valeurs de \"%s\" (%d). Attendue: 1.\n" #: src/plugins/perl/wee-perl.c:941 src/plugins/perl/wee-perl.c:943 -#: src/plugins/python/wee-python.c:541 src/plugins/python/wee-python.c:543 +#: src/plugins/python/wee-python.c:566 src/plugins/python/wee-python.c:568 #, c-format msgid "Loading %s script \"%s\"\n" msgstr "Chargement du script %s \"%s\"\n" -#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:612 +#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:637 #, c-format msgid "Unloading %s script \"%s\"\n" msgstr "Déchargement du script %s \"%s\"\n" -#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:629 +#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:654 #, c-format msgid "Unloading all %s scripts...\n" msgstr "Déchargement de tous les scripts %s...\n" -#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:634 +#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:659 #, c-format msgid "%s scripts unloaded\n" msgstr "Scripts %s déchargés\n" @@ -1984,30 +1984,35 @@ msgstr "Scripts %s déchargés\n" msgid "%s error: error while launching interpreter\n" msgstr "Erreur %s: erreur pendant le chargement de l'interpréteur\n" -#: src/plugins/python/wee-python.c:460 src/plugins/python/wee-python.c:488 -#: src/plugins/python/wee-python.c:520 +#: src/plugins/python/wee-python.c:432 +#, c-format +msgid "%s error: error while redirecting stdout and stderr\n" +msgstr "Erreur %s: erreur en redirection de stdout et stderr\n" + +#: src/plugins/python/wee-python.c:485 src/plugins/python/wee-python.c:513 +#: src/plugins/python/wee-python.c:545 #, c-format msgid "%s error: unable to run function \"%s\" in script (not enough memory)\n" msgstr "" "Erreur %s: impossible d'exécuter la fonction \"%s\" dans le script (mémoire " "insuffisante)\n" -#: src/plugins/python/wee-python.c:510 +#: src/plugins/python/wee-python.c:535 #, c-format msgid "%s error: error while running function \"%s\"\n" msgstr "Erreur %s: erreur dans la fonction \"%s\"\n" -#: src/plugins/python/wee-python.c:549 +#: src/plugins/python/wee-python.c:574 #, c-format msgid "%s error: error while opening file \"%s\"\n" msgstr "Erreur %s: erreur à l'ouverture du fichier \"%s\"\n" -#: src/plugins/python/wee-python.c:558 +#: src/plugins/python/wee-python.c:583 #, c-format msgid "%s error: error while parsing file \"%s\"\n" msgstr "Erreur %s: erreur en analysant le fichier \"%s\"\n" -#: src/plugins/python/wee-python.c:660 +#: src/plugins/python/wee-python.c:685 #, c-format msgid "%s error: error while freeing interpreter\n" msgstr "Erreur %s: impossible de libérer l'interpréteur\n" @@ -2450,7 +2455,7 @@ msgstr "Privé avec: " msgid "Opened buffers:\n" msgstr "Tampons ouverts:\n" -#: src/common/command.c:927 src/common/command.c:1054 +#: src/common/command.c:927 src/common/command.c:1067 #, c-format msgid "%s incorrect buffer number\n" msgstr "%s numéro de buffer incorrect\n" @@ -2471,99 +2476,105 @@ msgstr "" msgid "Notify levels: " msgstr "Niveaux de notification: " -#: src/common/command.c:1017 src/common/command.c:1027 +#: src/common/command.c:1018 src/common/command.c:1040 #, c-format -msgid "%s incorrect notify level (must be between 0 and 3)\n" -msgstr "%s niveau de notification incorrect (doit être entre 0 et 3)\n" +msgid "%s incorrect notify level (must be between %d and %d)\n" +msgstr "%s niveau de notification incorrect (doit être entre %d et %d)\n" + +#: src/common/command.c:1027 +#, c-format +msgid "%s incorrect buffer for notify (must be channel or private)\n" +msgstr "" +"%s tampon incorrect pour la notification (doit être un canal ou un privé)\n" -#: src/common/command.c:1045 +#: src/common/command.c:1058 #, c-format msgid "%s buffer \"%s\" not found for \"%s\" command\n" msgstr "%s buffer \"%s\" non trouvé pour la commande \"%s\"\n" -#: src/common/command.c:1079 +#: src/common/command.c:1092 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "paramètre inconnu \"%s\" pour la commande \"%s\"\n" -#: src/common/command.c:1109 +#: src/common/command.c:1122 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s déjà connecté au serveur \"%s\" !\n" -#: src/common/command.c:1117 +#: src/common/command.c:1130 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "%s une connexion vers le serveur \"%s\" est en cours !\n" -#: src/common/command.c:1135 src/common/command.c:1210 +#: src/common/command.c:1148 src/common/command.c:1223 #, c-format msgid "%s server not found\n" msgstr "%s serveur non trouvé\n" -#: src/common/command.c:1165 src/common/command.c:1429 -#: src/common/command.c:1572 src/common/command.c:2263 -#: src/common/command.c:2275 +#: src/common/command.c:1178 src/common/command.c:1442 +#: src/common/command.c:1585 src/common/command.c:2276 +#: src/common/command.c:2288 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s option inconnue pour la commande \"%s\"\n" -#: src/common/command.c:1194 +#: src/common/command.c:1207 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s non connecté au serveur \"%s\" !\n" -#: src/common/command.c:1202 +#: src/common/command.c:1215 msgid "Auto-reconnection is cancelled\n" msgstr "La reconnexion automatique est annulée\n" -#: src/common/command.c:1228 src/common/weechat.c:265 +#: src/common/command.c:1241 src/common/weechat.c:265 #, c-format msgid "%s internal commands:\n" msgstr "Commandes internes %s :\n" -#: src/common/command.c:1237 src/common/weechat.c:285 +#: src/common/command.c:1250 src/common/weechat.c:285 #, c-format msgid "IRC commands:\n" msgstr "Commandes IRC :\n" -#: src/common/command.c:1304 +#: src/common/command.c:1317 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "Pas d'aide disponible, la commande \"%s\" est inconnue\n" -#: src/common/command.c:1328 src/common/command.c:1471 +#: src/common/command.c:1341 src/common/command.c:1484 #, c-format msgid "Registered %s scripts:\n" msgstr "Scripts %s enregistrés :\n" -#: src/common/command.c:1345 src/common/command.c:1368 -#: src/common/command.c:1391 src/common/command.c:1488 -#: src/common/command.c:1511 src/common/command.c:1534 +#: src/common/command.c:1358 src/common/command.c:1381 +#: src/common/command.c:1404 src/common/command.c:1501 +#: src/common/command.c:1524 src/common/command.c:1547 msgid " (none)\n" msgstr " (aucun)\n" -#: src/common/command.c:1350 src/common/command.c:1493 +#: src/common/command.c:1363 src/common/command.c:1506 #, c-format msgid "%s message handlers:\n" msgstr "Fonctions %s pour messages :\n" -#: src/common/command.c:1359 src/common/command.c:1502 +#: src/common/command.c:1372 src/common/command.c:1515 #, c-format msgid " IRC(%s) => %s(%s)\n" msgstr " IRC(%s) => %s(%s)\n" -#: src/common/command.c:1373 src/common/command.c:1516 +#: src/common/command.c:1386 src/common/command.c:1529 #, c-format msgid "%s command handlers:\n" msgstr "Commandes %s :\n" -#: src/common/command.c:1382 src/common/command.c:1525 +#: src/common/command.c:1395 src/common/command.c:1538 #, c-format msgid " Command /%s => %s(%s)\n" msgstr " Commande /%s => %s(%s)\n" -#: src/common/command.c:1442 +#: src/common/command.c:1455 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" @@ -2572,7 +2583,7 @@ msgstr "" "Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le " "script ./configure\n" -#: src/common/command.c:1585 +#: src/common/command.c:1598 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " @@ -2582,31 +2593,31 @@ msgstr "" "Merci de reconstruire WeeChat avec l'option \"--enable-python\" pour le " "script ./configure\n" -#: src/common/command.c:1633 +#: src/common/command.c:1646 msgid "No server.\n" msgstr "Pas de serveur.\n" -#: src/common/command.c:1644 +#: src/common/command.c:1657 #, c-format msgid "Server '%s' not found.\n" msgstr "Serveur '%s' non trouvé.\n" -#: src/common/command.c:1656 +#: src/common/command.c:1669 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "%s il manque le nom du serveur pour la commande \"%s\"\n" -#: src/common/command.c:1664 +#: src/common/command.c:1677 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "%s trop de paramètres pour la commande \"%s\", paramètres ignorés\n" -#: src/common/command.c:1683 +#: src/common/command.c:1696 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "%s le serveur \"%s\" n'existe pas pour la commande \"%s\"\n" -#: src/common/command.c:1691 +#: src/common/command.c:1704 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -2615,106 +2626,106 @@ msgstr "" "%s vous ne pouvez pas supprimer le server \"%s\" car vous êtes connecté " "dessus. Essayez /disconnect %s avant.\n" -#: src/common/command.c:1707 src/common/command.c:1848 +#: src/common/command.c:1720 src/common/command.c:1861 msgid "Server" msgstr "Serveur" -#: src/common/command.c:1710 +#: src/common/command.c:1723 msgid "has been deleted\n" msgstr "a été supprimé\n" -#: src/common/command.c:1725 +#: src/common/command.c:1738 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s paramètres manquants pour la commande \"%s\"\n" -#: src/common/command.c:1735 +#: src/common/command.c:1748 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "%s le serveur \"%s\" existe déjà, impossible de le créer !\n" -#: src/common/command.c:1760 src/common/command.c:1788 -#: src/common/command.c:1801 src/common/command.c:1827 +#: src/common/command.c:1773 src/common/command.c:1801 +#: src/common/command.c:1814 src/common/command.c:1840 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s mot de passe manquant pour le paramètre \"%s\"\n" -#: src/common/command.c:1773 +#: src/common/command.c:1786 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "%s pseudo(s) manquant(s) pour le paramètre \"%s\"\n" -#: src/common/command.c:1814 +#: src/common/command.c:1827 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s commande manquante pour le paramètre \"%s\"\n" -#: src/common/command.c:1851 +#: src/common/command.c:1864 msgid "created\n" msgstr "créé\n" -#: src/common/command.c:1857 +#: src/common/command.c:1870 #, c-format msgid "%s unable to create server\n" msgstr "%s impossible de créer le serveur\n" -#: src/common/command.c:1912 +#: src/common/command.c:1925 msgid "(unknown)" msgstr "(inconnu)" -#: src/common/command.c:1935 +#: src/common/command.c:1948 msgid "(password hidden) " msgstr "(mot de passe caché) " -#: src/common/command.c:1999 +#: src/common/command.c:2012 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s serveur \"%s\" non trouvé\n" -#: src/common/command.c:2030 src/common/command.c:2076 +#: src/common/command.c:2043 src/common/command.c:2089 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s option de configuration \"%s\" non trouvée\n" -#: src/common/command.c:2035 src/common/command.c:2068 +#: src/common/command.c:2048 src/common/command.c:2081 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valeur incorrecte pour l'option \"%s\"\n" -#: src/common/command.c:2051 +#: src/common/command.c:2064 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "%s l'option \"%s\" ne peut pas être changée lorsque WeeChat tourne\n" -#: src/common/command.c:2149 +#: src/common/command.c:2162 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Aucune option de configuration trouvée avec \"%s\"\n" -#: src/common/command.c:2152 +#: src/common/command.c:2165 msgid "No config option found\n" msgstr "Aucune option de configuration trouvée\n" -#: src/common/command.c:2158 +#: src/common/command.c:2171 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "option(s) de configuration trouvée(s) avec \"%s\"\n" -#: src/common/command.c:2161 +#: src/common/command.c:2174 msgid "config option(s) found\n" msgstr "option(s) de configuration trouvée(s)\n" -#: src/common/command.c:2181 +#: src/common/command.c:2194 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias ou commande \"%s\" non trouvé\n" -#: src/common/command.c:2191 +#: src/common/command.c:2204 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" supprimé\n" -#: src/common/command.c:2211 +#: src/common/command.c:2224 msgid "Opened windows:\n" msgstr "Fenêtres ouvertes:\n" @@ -3691,64 +3702,76 @@ msgstr "" msgid "automatically rejoin channels when kicked" msgstr "rejoindre automatiquement les canaux quand mis dehors" -#: src/common/weeconfig.c:1057 +#: src/common/weeconfig.c:693 +msgid "notify levels for channels of this server" +msgstr "niveaux de notification pour les canaux de ce serveur" + +#: src/common/weeconfig.c:694 +msgid "" +"comma separated list of notify levels for channels of this server (format: " +"#channel:1,..)" +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:1082 #, 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:1066 +#: src/common/weeconfig.c:1091 #, 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:1080 +#: src/common/weeconfig.c:1105 #, 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:1119 +#: src/common/weeconfig.c:1144 #, 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:1130 +#: src/common/weeconfig.c:1155 #, 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:1169 +#: src/common/weeconfig.c:1194 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "%s fichier de configuration \"%s\" non trouvé.\n" -#: src/common/weeconfig.c:1201 +#: src/common/weeconfig.c:1226 #, 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:1218 +#: src/common/weeconfig.c:1243 #, 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:1236 +#: src/common/weeconfig.c:1261 #, 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:1244 +#: src/common/weeconfig.c:1269 #, 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:1278 +#: src/common/weeconfig.c:1303 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "%s %s, ligne %d: option \"%s\" invalide\n" -#: src/common/weeconfig.c:1289 +#: src/common/weeconfig.c:1314 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" @@ -3757,7 +3780,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:1298 +#: src/common/weeconfig.c:1323 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3766,7 +3789,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:1309 +#: src/common/weeconfig.c:1334 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3775,26 +3798,26 @@ msgstr "" "%s %s, ligne %d: valeur invalide pour l'option '%s'\n" "Attendu: une de ces chaînes: " -#: src/common/weeconfig.c:1325 +#: src/common/weeconfig.c:1350 #, 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:1385 src/common/weeconfig.c:1558 +#: src/common/weeconfig.c:1410 src/common/weeconfig.c:1583 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "%s impossible de créer le fichier \"%s\"\n" -#: src/common/weeconfig.c:1391 +#: src/common/weeconfig.c:1416 #, 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:1392 +#: src/common/weeconfig.c:1417 msgid "Creating default config file\n" msgstr "Création du fichier de configuration par défaut\n" -#: src/common/weeconfig.c:1395 src/common/weeconfig.c:1567 +#: src/common/weeconfig.c:1420 src/common/weeconfig.c:1592 #, c-format msgid "" "#\n" @@ -3803,10 +3826,6 @@ msgstr "" "#\n" "# %s: fichier de configuration, créé par %s v%s le %s#\n" -#: src/common/weeconfig.c:1564 +#: src/common/weeconfig.c:1589 msgid "Saving config to disk\n" msgstr "Sauvegarde de la configuration sur disque\n" - -#, fuzzy -#~ msgid "%s not enough memory to call plugin handler\n" -#~ msgstr "%s pas assez de mémoire pour un nouveau DCC\n" diff --git a/po/weechat.pot b/po/weechat.pot index ef0095e0b..ff79a356e 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-15 19:08+0200\n" +"POT-Creation-Date: 2005-06-19 15:59+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,106 +20,106 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "" -#: src/irc/irc-server.c:146 src/common/weeconfig.c:1506 +#: src/irc/irc-server.c:147 src/common/weeconfig.c:1531 msgid "Unable to get user's name" msgstr "" -#: src/irc/irc-server.c:211 +#: src/irc/irc-server.c:212 #, c-format msgid "%s cannot allocate new server\n" msgstr "" -#: src/irc/irc-server.c:416 +#: src/irc/irc-server.c:423 #, c-format msgid "%s error sending data to IRC server\n" msgstr "" -#: src/irc/irc-server.c:436 src/irc/irc-server.c:449 src/irc/irc-server.c:515 -#: src/irc/irc-server.c:528 +#: src/irc/irc-server.c:443 src/irc/irc-server.c:456 src/irc/irc-server.c:522 +#: src/irc/irc-server.c:535 #, c-format msgid "%s not enough memory for received IRC message\n" msgstr "" -#: src/irc/irc-server.c:606 +#: src/irc/irc-server.c:613 #, c-format msgid "%s Command '%s' failed!\n" msgstr "" -#: src/irc/irc-server.c:611 +#: src/irc/irc-server.c:618 #, c-format msgid "%s No command to execute!\n" msgstr "" -#: src/irc/irc-server.c:616 +#: src/irc/irc-server.c:623 #, c-format msgid "%s Unknown command: cmd=%s, args=%s\n" msgstr "" -#: src/irc/irc-server.c:658 +#: src/irc/irc-server.c:665 #, c-format msgid "%s cannot read data from socket, disconnecting from server...\n" msgstr "" -#: src/irc/irc-server.c:730 +#: src/irc/irc-server.c:737 #, c-format msgid "%s: Reconnecting to server in %d seconds\n" msgstr "" -#: src/irc/irc-server.c:761 +#: src/irc/irc-server.c:768 #, c-format msgid "%s address \"%s\" not found\n" msgstr "" -#: src/irc/irc-server.c:770 +#: src/irc/irc-server.c:777 #, c-format msgid "%s IP address not found\n" msgstr "" -#: src/irc/irc-server.c:778 +#: src/irc/irc-server.c:785 #, c-format msgid "%s connection refused\n" msgstr "" -#: src/irc/irc-server.c:844 +#: src/irc/irc-server.c:851 #, c-format msgid "%s: connecting to %s:%d...\n" msgstr "" -#: src/irc/irc-server.c:846 +#: src/irc/irc-server.c:853 #, c-format msgid "Connecting to server %s:%d...\n" msgstr "" -#: src/irc/irc-server.c:857 +#: src/irc/irc-server.c:864 #, c-format msgid "%s cannot create pipe\n" msgstr "" -#: src/irc/irc-server.c:869 +#: src/irc/irc-server.c:876 #, c-format msgid "%s cannot create socket\n" msgstr "" -#: src/irc/irc-server.c:881 +#: src/irc/irc-server.c:888 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "" -#: src/irc/irc-server.c:892 +#: src/irc/irc-server.c:899 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "" -#: src/irc/irc-server.c:923 +#: src/irc/irc-server.c:930 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "" -#: src/irc/irc-server.c:972 src/irc/irc-server.c:981 +#: src/irc/irc-server.c:979 src/irc/irc-server.c:988 msgid "Disconnected from server!\n" msgstr "" -#: src/irc/irc-channel.c:51 +#: src/irc/irc-channel.c:52 #, c-format msgid "%s cannot allocate new channel" msgstr "" @@ -1186,16 +1186,16 @@ msgstr "" #: src/irc/irc-send.c:232 src/irc/irc-send.c:260 src/irc/irc-send.c:426 #: src/irc/irc-send.c:452 src/irc/irc-send.c:478 src/irc/irc-send.c:519 #: src/irc/irc-send.c:555 src/irc/irc-send.c:619 src/irc/irc-send.c:676 -#: src/irc/irc-send.c:1018 src/irc/irc-send.c:1116 src/irc/irc-send.c:1583 -#: src/irc/irc-send.c:1690 +#: src/irc/irc-send.c:1018 src/irc/irc-send.c:1116 src/irc/irc-send.c:1595 +#: src/irc/irc-send.c:1702 #, c-format msgid "%s \"%s\" command can only be executed in a channel window\n" msgstr "" #: src/irc/irc-send.c:345 src/irc/irc-send.c:357 src/irc/irc-send.c:375 -#: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1609 -#: src/common/command.c:1152 src/common/command.c:1436 -#: src/common/command.c:1579 +#: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1621 +#: src/common/command.c:1165 src/common/command.c:1449 +#: src/common/command.c:1592 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "" @@ -1206,7 +1206,7 @@ msgid "%s wrong arguments for \"%s\" command\n" msgstr "" #: src/irc/irc-send.c:804 src/irc/irc-send.c:871 src/irc/irc-send.c:1164 -#: src/irc/irc-send.c:1178 src/irc/irc-send.c:1510 +#: src/irc/irc-send.c:1178 src/irc/irc-send.c:1522 #, c-format msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" @@ -1216,12 +1216,12 @@ msgstr "" msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:966 src/irc/irc-send.c:1262 src/irc/irc-recv.c:1444 +#: src/irc/irc-send.c:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1444 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:1662 +#: src/irc/irc-send.c:1674 #, c-format msgid "%s, compiled on %s %s\n" msgstr "" @@ -1833,22 +1833,22 @@ msgid "%s error: too much values from \"%s\" (%d). Expected: 1.\n" msgstr "" #: src/plugins/perl/wee-perl.c:941 src/plugins/perl/wee-perl.c:943 -#: src/plugins/python/wee-python.c:541 src/plugins/python/wee-python.c:543 +#: src/plugins/python/wee-python.c:566 src/plugins/python/wee-python.c:568 #, c-format msgid "Loading %s script \"%s\"\n" msgstr "" -#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:612 +#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:637 #, c-format msgid "Unloading %s script \"%s\"\n" msgstr "" -#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:629 +#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:654 #, c-format msgid "Unloading all %s scripts...\n" msgstr "" -#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:634 +#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:659 #, c-format msgid "%s scripts unloaded\n" msgstr "" @@ -1858,28 +1858,33 @@ msgstr "" msgid "%s error: error while launching interpreter\n" msgstr "" -#: src/plugins/python/wee-python.c:460 src/plugins/python/wee-python.c:488 -#: src/plugins/python/wee-python.c:520 +#: src/plugins/python/wee-python.c:432 +#, c-format +msgid "%s error: error while redirecting stdout and stderr\n" +msgstr "" + +#: src/plugins/python/wee-python.c:485 src/plugins/python/wee-python.c:513 +#: src/plugins/python/wee-python.c:545 #, c-format msgid "%s error: unable to run function \"%s\" in script (not enough memory)\n" msgstr "" -#: src/plugins/python/wee-python.c:510 +#: src/plugins/python/wee-python.c:535 #, c-format msgid "%s error: error while running function \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:549 +#: src/plugins/python/wee-python.c:574 #, c-format msgid "%s error: error while opening file \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:558 +#: src/plugins/python/wee-python.c:583 #, c-format msgid "%s error: error while parsing file \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:660 +#: src/plugins/python/wee-python.c:685 #, c-format msgid "%s error: error while freeing interpreter\n" msgstr "" @@ -2274,7 +2279,7 @@ msgstr "" msgid "Opened buffers:\n" msgstr "" -#: src/common/command.c:927 src/common/command.c:1054 +#: src/common/command.c:927 src/common/command.c:1067 #, c-format msgid "%s incorrect buffer number\n" msgstr "" @@ -2293,242 +2298,247 @@ msgstr "" msgid "Notify levels: " msgstr "" -#: src/common/command.c:1017 src/common/command.c:1027 +#: src/common/command.c:1018 src/common/command.c:1040 +#, c-format +msgid "%s incorrect notify level (must be between %d and %d)\n" +msgstr "" + +#: src/common/command.c:1027 #, c-format -msgid "%s incorrect notify level (must be between 0 and 3)\n" +msgid "%s incorrect buffer for notify (must be channel or private)\n" msgstr "" -#: src/common/command.c:1045 +#: src/common/command.c:1058 #, c-format msgid "%s buffer \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:1079 +#: src/common/command.c:1092 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "" -#: src/common/command.c:1109 +#: src/common/command.c:1122 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1117 +#: src/common/command.c:1130 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1135 src/common/command.c:1210 +#: src/common/command.c:1148 src/common/command.c:1223 #, c-format msgid "%s server not found\n" msgstr "" -#: src/common/command.c:1165 src/common/command.c:1429 -#: src/common/command.c:1572 src/common/command.c:2263 -#: src/common/command.c:2275 +#: src/common/command.c:1178 src/common/command.c:1442 +#: src/common/command.c:1585 src/common/command.c:2276 +#: src/common/command.c:2288 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "" -#: src/common/command.c:1194 +#: src/common/command.c:1207 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1202 +#: src/common/command.c:1215 msgid "Auto-reconnection is cancelled\n" msgstr "" -#: src/common/command.c:1228 src/common/weechat.c:265 +#: src/common/command.c:1241 src/common/weechat.c:265 #, c-format msgid "%s internal commands:\n" msgstr "" -#: src/common/command.c:1237 src/common/weechat.c:285 +#: src/common/command.c:1250 src/common/weechat.c:285 #, c-format msgid "IRC commands:\n" msgstr "" -#: src/common/command.c:1304 +#: src/common/command.c:1317 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "" -#: src/common/command.c:1328 src/common/command.c:1471 +#: src/common/command.c:1341 src/common/command.c:1484 #, c-format msgid "Registered %s scripts:\n" msgstr "" -#: src/common/command.c:1345 src/common/command.c:1368 -#: src/common/command.c:1391 src/common/command.c:1488 -#: src/common/command.c:1511 src/common/command.c:1534 +#: src/common/command.c:1358 src/common/command.c:1381 +#: src/common/command.c:1404 src/common/command.c:1501 +#: src/common/command.c:1524 src/common/command.c:1547 msgid " (none)\n" msgstr "" -#: src/common/command.c:1350 src/common/command.c:1493 +#: src/common/command.c:1363 src/common/command.c:1506 #, c-format msgid "%s message handlers:\n" msgstr "" -#: src/common/command.c:1359 src/common/command.c:1502 +#: src/common/command.c:1372 src/common/command.c:1515 #, c-format msgid " IRC(%s) => %s(%s)\n" msgstr "" -#: src/common/command.c:1373 src/common/command.c:1516 +#: src/common/command.c:1386 src/common/command.c:1529 #, c-format msgid "%s command handlers:\n" msgstr "" -#: src/common/command.c:1382 src/common/command.c:1525 +#: src/common/command.c:1395 src/common/command.c:1538 #, c-format msgid " Command /%s => %s(%s)\n" msgstr "" -#: src/common/command.c:1442 +#: src/common/command.c:1455 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" msgstr "" -#: src/common/command.c:1585 +#: src/common/command.c:1598 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " "script\n" msgstr "" -#: src/common/command.c:1633 +#: src/common/command.c:1646 msgid "No server.\n" msgstr "" -#: src/common/command.c:1644 +#: src/common/command.c:1657 #, c-format msgid "Server '%s' not found.\n" msgstr "" -#: src/common/command.c:1656 +#: src/common/command.c:1669 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "" -#: src/common/command.c:1664 +#: src/common/command.c:1677 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" -#: src/common/command.c:1683 +#: src/common/command.c:1696 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:1691 +#: src/common/command.c:1704 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" "disconnect %s before.\n" msgstr "" -#: src/common/command.c:1707 src/common/command.c:1848 +#: src/common/command.c:1720 src/common/command.c:1861 msgid "Server" msgstr "" -#: src/common/command.c:1710 +#: src/common/command.c:1723 msgid "has been deleted\n" msgstr "" -#: src/common/command.c:1725 +#: src/common/command.c:1738 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "" -#: src/common/command.c:1735 +#: src/common/command.c:1748 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "" -#: src/common/command.c:1760 src/common/command.c:1788 -#: src/common/command.c:1801 src/common/command.c:1827 +#: src/common/command.c:1773 src/common/command.c:1801 +#: src/common/command.c:1814 src/common/command.c:1840 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1773 +#: src/common/command.c:1786 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1814 +#: src/common/command.c:1827 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1851 +#: src/common/command.c:1864 msgid "created\n" msgstr "" -#: src/common/command.c:1857 +#: src/common/command.c:1870 #, c-format msgid "%s unable to create server\n" msgstr "" -#: src/common/command.c:1912 +#: src/common/command.c:1925 msgid "(unknown)" msgstr "" -#: src/common/command.c:1935 +#: src/common/command.c:1948 msgid "(password hidden) " msgstr "" -#: src/common/command.c:1999 +#: src/common/command.c:2012 #, c-format msgid "%s server \"%s\" not found\n" msgstr "" -#: src/common/command.c:2030 src/common/command.c:2076 +#: src/common/command.c:2043 src/common/command.c:2089 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "" -#: src/common/command.c:2035 src/common/command.c:2068 +#: src/common/command.c:2048 src/common/command.c:2081 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "" -#: src/common/command.c:2051 +#: src/common/command.c:2064 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" -#: src/common/command.c:2149 +#: src/common/command.c:2162 #, c-format msgid "No config option found with \"%s\"\n" msgstr "" -#: src/common/command.c:2152 +#: src/common/command.c:2165 msgid "No config option found\n" msgstr "" -#: src/common/command.c:2158 +#: src/common/command.c:2171 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "" -#: src/common/command.c:2161 +#: src/common/command.c:2174 msgid "config option(s) found\n" msgstr "" -#: src/common/command.c:2181 +#: src/common/command.c:2194 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "" -#: src/common/command.c:2191 +#: src/common/command.c:2204 #, c-format msgid "Alias \"%s\" removed\n" msgstr "" -#: src/common/command.c:2211 +#: src/common/command.c:2224 msgid "Opened windows:\n" msgstr "" @@ -3446,108 +3456,118 @@ msgstr "" msgid "automatically rejoin channels when kicked" msgstr "" -#: src/common/weeconfig.c:1057 +#: src/common/weeconfig.c:693 +msgid "notify levels for channels of this server" +msgstr "" + +#: src/common/weeconfig.c:694 +msgid "" +"comma separated list of notify levels for channels of this server (format: " +"#channel:1,..)" +msgstr "" + +#: src/common/weeconfig.c:1082 #, c-format msgid "%s %s, line %d: new server, but previous was incomplete\n" msgstr "" -#: src/common/weeconfig.c:1066 +#: src/common/weeconfig.c:1091 #, c-format msgid "%s %s, line %d: server '%s' already exists\n" msgstr "" -#: src/common/weeconfig.c:1080 +#: src/common/weeconfig.c:1105 #, c-format msgid "%s %s, line %d: unable to create server\n" msgstr "" -#: src/common/weeconfig.c:1119 +#: src/common/weeconfig.c:1144 #, c-format msgid "%s unable to assign default int with string (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1130 +#: src/common/weeconfig.c:1155 #, c-format msgid "%s unable to assign default color (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1169 +#: src/common/weeconfig.c:1194 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "" -#: src/common/weeconfig.c:1201 +#: src/common/weeconfig.c:1226 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"]\"\n" msgstr "" -#: src/common/weeconfig.c:1218 +#: src/common/weeconfig.c:1243 #, c-format msgid "%s %s, line %d: unknown section identifier (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1236 +#: src/common/weeconfig.c:1261 #, c-format msgid "%s %s, line %d: invalid section for option, line is ignored\n" msgstr "" -#: src/common/weeconfig.c:1244 +#: src/common/weeconfig.c:1269 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"=\"\n" msgstr "" -#: src/common/weeconfig.c:1278 +#: src/common/weeconfig.c:1303 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "" -#: src/common/weeconfig.c:1289 +#: src/common/weeconfig.c:1314 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" "Expected: boolean value: 'off' or 'on'\n" msgstr "" -#: src/common/weeconfig.c:1298 +#: src/common/weeconfig.c:1323 #, 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:1309 +#: src/common/weeconfig.c:1334 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" "Expected: one of these strings: " msgstr "" -#: src/common/weeconfig.c:1325 +#: src/common/weeconfig.c:1350 #, c-format msgid "%s %s, line %d: invalid color name for option '%s'\n" msgstr "" -#: src/common/weeconfig.c:1385 src/common/weeconfig.c:1558 +#: src/common/weeconfig.c:1410 src/common/weeconfig.c:1583 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "" -#: src/common/weeconfig.c:1391 +#: src/common/weeconfig.c:1416 #, c-format msgid "%s: creating default config file...\n" msgstr "" -#: src/common/weeconfig.c:1392 +#: src/common/weeconfig.c:1417 msgid "Creating default config file\n" msgstr "" -#: src/common/weeconfig.c:1395 src/common/weeconfig.c:1567 +#: src/common/weeconfig.c:1420 src/common/weeconfig.c:1592 #, c-format msgid "" "#\n" "# %s configuration file, created by %s v%s on %s#\n" msgstr "" -#: src/common/weeconfig.c:1564 +#: src/common/weeconfig.c:1589 msgid "Saving config to disk\n" msgstr "" diff --git a/src/common/command.c b/src/common/command.c index 123e77922..fa8d4bdcd 100644 --- a/src/common/command.c +++ b/src/common/command.c @@ -995,7 +995,8 @@ weechat_cmd_buffer (int argc, char **argv) (ptr_buffer->dcc) ? "DCC" : ((BUFFER_IS_SERVER(ptr_buffer)) ? SERVER(ptr_buffer)->name : CHANNEL(ptr_buffer)->name)); - if (ptr_buffer->dcc) + if ((!BUFFER_IS_CHANNEL(ptr_buffer)) + && (!BUFFER_IS_PRIVATE(ptr_buffer))) gui_printf (NULL, "-"); else gui_printf (NULL, "%d", ptr_buffer->notify_level); @@ -1010,22 +1011,34 @@ weechat_cmd_buffer (int argc, char **argv) number = strtol (argv[1], &error, 10); if ((error) && (error[0] == '\0')) { - if ((number < 0) || (number > 3)) + if ((number < NOTIFY_LEVEL_MIN) || (number > NOTIFY_LEVEL_MAX)) { /* invalid highlight level */ irc_display_prefix (NULL, PREFIX_ERROR); - gui_printf (NULL, _("%s incorrect notify level (must be between 0 and 3)\n"), + gui_printf (NULL, _("%s incorrect notify level (must be between %d and %d)\n"), + WEECHAT_ERROR, NOTIFY_LEVEL_MIN, NOTIFY_LEVEL_MAX); + return -1; + } + if ((!BUFFER_IS_CHANNEL(gui_current_window->buffer)) + && (!BUFFER_IS_PRIVATE(gui_current_window->buffer))) + { + /* invalid buffer type (only ok on channel or private) */ + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, _("%s incorrect buffer for notify (must be channel or private)\n"), WEECHAT_ERROR); return -1; } gui_current_window->buffer->notify_level = number; + channel_set_notify_level (SERVER(gui_current_window->buffer), + CHANNEL(gui_current_window->buffer), + number); } else { /* invalid number */ irc_display_prefix (NULL, PREFIX_ERROR); - gui_printf (NULL, _("%s incorrect notify level (must be between 0 and 3)\n"), - WEECHAT_ERROR); + gui_printf (NULL, _("%s incorrect notify level (must be between %d and %d)\n"), + WEECHAT_ERROR, NOTIFY_LEVEL_MIN, NOTIFY_LEVEL_MAX); return -1; } } @@ -1841,7 +1854,7 @@ weechat_cmd_server (int argc, char **argv) 0, server.address, server.port, server.password, server.nick1, server.nick2, server.nick3, server.username, server.realname, - server.command, 1, server.autojoin, 1); + server.command, 1, server.autojoin, 1, NULL); if (new_server) { irc_display_prefix (NULL, PREFIX_INFO); diff --git a/src/common/weechat.c b/src/common/weechat.c index 1e45eda04..3b20f3d5a 100644 --- a/src/common/weechat.c +++ b/src/common/weechat.c @@ -371,7 +371,7 @@ wee_parse_args (int argc, char *argv[]) 1, server_tmp.address, server_tmp.port, server_tmp.password, server_tmp.nick1, server_tmp.nick2, server_tmp.nick3, - NULL, NULL, NULL, 0, server_tmp.autojoin, 1)) + NULL, NULL, NULL, 0, server_tmp.autojoin, 1, NULL)) fprintf (stderr, _("%s unable to create server ('%s'), ignored\n"), WEECHAT_WARNING, argv[i]); server_destroy (&server_tmp); diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c index 23a4c7a86..c51f29332 100644 --- a/src/common/weeconfig.c +++ b/src/common/weeconfig.c @@ -690,6 +690,10 @@ t_config_option weechat_options_server[] = N_("automatically rejoin channels when kicked"), OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE, NULL, NULL, &(cfg_server.autorejoin), NULL, NULL }, + { "server_notify_levels", N_("notify levels for channels of this server"), + N_("comma separated list of notify levels for channels of this server (format: #channel:1,..)"), + OPTION_TYPE_STRING, 0, 0, 0, + "", NULL, NULL, &(cfg_server.notify_levels), config_change_notify_levels }, { NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL } }; @@ -835,6 +839,23 @@ config_change_fifo_pipe () } /* + * config_change_notify_levels: called when notify levels is changed for a server + */ + +void +config_change_notify_levels () +{ + t_gui_buffer *ptr_buffer; + + for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer) + { + if (BUFFER_IS_CHANNEL(ptr_buffer) || BUFFER_IS_PRIVATE(ptr_buffer)) + ptr_buffer->notify_level = + channel_get_notify_level (SERVER(ptr_buffer), CHANNEL(ptr_buffer)); + } +} + +/* * config_option_set_value: set new value for an option * return: 0 if success * -1 if error (bad value) @@ -919,6 +940,8 @@ config_get_server_option_ptr (t_irc_server *server, char *option_name) return (void *)(&server->autojoin); if (strcasecmp (option_name, "server_autorejoin") == 0) return (void *)(&server->autorejoin); + if (strcasecmp (option_name, "server_notify_levels") == 0) + return (void *)(&server->notify_levels); /* option not found */ return NULL; } @@ -988,6 +1011,8 @@ config_set_server_value (t_irc_server *server, char *option_name, *((char **)ptr_data) = strdup (value); break; } + if (ptr_option->handler_change != NULL) + (void) (ptr_option->handler_change()); return 0; } @@ -1073,7 +1098,7 @@ config_allocate_server (char *filename, int line_number) cfg_server.password, cfg_server.nick1, cfg_server.nick2, cfg_server.nick3, cfg_server.username, cfg_server.realname, cfg_server.command, cfg_server.command_delay, cfg_server.autojoin, - cfg_server.autorejoin)) + cfg_server.autorejoin, cfg_server.notify_levels)) { server_free_all (); gui_printf (NULL, @@ -1661,6 +1686,8 @@ config_write (char *config_name) (ptr_server->autojoin) ? ptr_server->autojoin : ""); fprintf (file, "server_autorejoin=%s\n", (ptr_server->autorejoin) ? "on" : "off"); + fprintf (file, "server_notify_levels=%s\n", + (ptr_server->notify_levels) ? ptr_server->notify_levels : ""); } } diff --git a/src/common/weeconfig.h b/src/common/weeconfig.h index 186327a1e..016cc062e 100644 --- a/src/common/weeconfig.h +++ b/src/common/weeconfig.h @@ -193,6 +193,7 @@ extern void config_change_buffer_content (); extern void config_change_color (); extern void config_change_away_check (); 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 int config_set_value (char *, char *); diff --git a/src/gui/gui-common.c b/src/gui/gui-common.c index e1d9f9112..fb1446c86 100644 --- a/src/gui/gui-common.c +++ b/src/gui/gui-common.c @@ -186,7 +186,7 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int dcc, new_buffer->line_complete = 1; /* notify level */ - new_buffer->notify_level = 3; + new_buffer->notify_level = channel_get_notify_level (server, channel); /* create/append to log file */ new_buffer->log_filename = NULL; diff --git a/src/gui/gui.h b/src/gui/gui.h index d684f01ba..63d5ab50c 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -98,6 +98,10 @@ #define gui_printf_nolog(buffer, fmt, argz...) \ gui_printf_type_color(buffer, MSG_TYPE_INFO | MSG_TYPE_NOLOG, -1, fmt, ##argz) +#define NOTIFY_LEVEL_MIN 0 +#define NOTIFY_LEVEL_MAX 3 +#define NOTIFY_LEVEL_DEFAULT NOTIFY_LEVEL_MAX + typedef struct t_gui_message t_gui_message; struct t_gui_message diff --git a/src/irc/irc-channel.c b/src/irc/irc-channel.c index b7ffa3a5f..f17596ce5 100644 --- a/src/irc/irc-channel.c +++ b/src/irc/irc-channel.c @@ -30,6 +30,7 @@ #include "../common/weechat.h" #include "irc.h" +#include "../gui/gui.h" char *channel_modes = "iklmnst"; @@ -263,6 +264,136 @@ channel_remove_dcc (t_irc_dcc *ptr_dcc) } /* + * channel_get_notify_level: get channel notify level + */ + +int +channel_get_notify_level (t_irc_server *server, t_irc_channel *channel) +{ + char *name, *pos, *pos2, notify; + + if ((!server) || (!channel)) + return NOTIFY_LEVEL_DEFAULT; + + if ((!server->notify_levels) || (!server->notify_levels[0])) + return NOTIFY_LEVEL_DEFAULT; + + name = (char *) malloc (strlen (channel->name) + 2); + strcpy (name, channel->name); + strcat (name, ":"); + pos = strstr (server->notify_levels, name); + free (name); + if (!pos) + return NOTIFY_LEVEL_DEFAULT; + + pos2 = pos + strlen (channel->name); + if (pos2[0] != ':') + return NOTIFY_LEVEL_DEFAULT; + pos2++; + if (!pos2[0]) + return NOTIFY_LEVEL_DEFAULT; + + notify = (int)(pos2[0] - '0'); + if ((notify < NOTIFY_LEVEL_MIN) || (notify > NOTIFY_LEVEL_MAX)) + return NOTIFY_LEVEL_DEFAULT; + else + return notify; +} + +/* + * server_remove_notify_level: remove channel notify from list + */ + +void +channel_remove_notify_level (t_irc_server *server, t_irc_channel *channel) +{ + char *name, *pos, *pos2; + + if ((!server) || (!channel)) + return; + + name = (char *) malloc (strlen (channel->name) + 2); + strcpy (name, channel->name); + strcat (name, ":"); + pos = strstr (server->notify_levels, name); + free (name); + if (pos) + { + pos2 = pos + strlen (channel->name); + if (pos2[0] == ':') + { + pos2++; + if (pos2[0]) + { + pos2++; + if (pos2[0] == ',') + pos2++; + if (!pos2[0] && (pos != server->notify_levels)) + pos--; + strcpy (pos, pos2); + server->notify_levels = (char *) realloc (server->notify_levels, + strlen (server->notify_levels) + 1); + } + } + } +} + +/* + * server_set_notify_level: set channel notify level + */ + +void +channel_set_notify_level (t_irc_server *server, t_irc_channel *channel, int notify) +{ + char *name, *pos, *pos2, level_string[2]; + + if ((!server) || (!channel)) + return; + + if (notify == NOTIFY_LEVEL_DEFAULT) + { + channel_remove_notify_level (server, channel); + return; + } + + if (!server->notify_levels) + { + server->notify_levels = (char *) malloc (strlen (channel->name) + 3); + server->notify_levels[0] = '\0'; + } + else + { + name = (char *) malloc (strlen (channel->name) + 2); + strcpy (name, channel->name); + strcat (name, ":"); + pos = strstr (server->notify_levels, name); + free (name); + if (pos) + { + pos2 = pos + strlen (channel->name) + 1; + if (pos2[0]) + { + pos2[0] = '0' + notify; + return; + } + } + /* realloc notify list to add channel */ + server->notify_levels = (char *) realloc (server->notify_levels, + strlen (server->notify_levels) + 1 + + strlen (channel->name) + 2 + 1); + } + + /* channel not in notify list => add it */ + if (server->notify_levels[0]) + strcat (server->notify_levels, ","); + strcat (server->notify_levels, channel->name); + strcat (server->notify_levels, ":"); + level_string[0] = notify + '0'; + level_string[1] = '\0'; + strcat (server->notify_levels, level_string); +} + +/* * channel_print_log: print channel infos in log (usually for crash dump) */ diff --git a/src/irc/irc-display.c b/src/irc/irc-display.c index 4b5212fa3..1fd1e045c 100644 --- a/src/irc/irc-display.c +++ b/src/irc/irc-display.c @@ -202,4 +202,8 @@ irc_display_server (t_irc_server *server) " server_autojoin . . . . .: %s\n", (server->autojoin && server->autojoin[0]) ? server->autojoin : ""); + gui_printf_color (NULL, COLOR_WIN_CHAT, + " server_notify_levels . . .: %s\n", + (server->notify_levels && server->notify_levels[0]) ? + server->notify_levels : ""); } diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c index ec7312739..e1cbf5453 100644 --- a/src/irc/irc-server.c +++ b/src/irc/irc-server.c @@ -77,6 +77,7 @@ server_init (t_irc_server *server) server->command_delay = 1; server->autojoin = NULL; server->autorejoin = 0; + server->notify_levels = NULL; /* internal vars */ server->child_pid = 0; @@ -256,6 +257,10 @@ server_destroy (t_irc_server *server) free (server->command); if (server->autojoin) free (server->autojoin); + if (server->notify_levels) + free (server->notify_levels); + if (server->unterminated_message) + free (server->unterminated_message); if (server->nick) free (server->nick); if (server->channels) @@ -315,7 +320,7 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de int command_line, char *address, int port, char *password, char *nick1, char *nick2, char *nick3, char *username, char *realname, char *command, int command_delay, char *autojoin, - int autorejoin) + int autorejoin, char *notify_levels) { t_irc_server *new_server; @@ -325,12 +330,12 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de #ifdef DEBUG wee_log_printf ("Creating new server (name:%s, address:%s, port:%d, pwd:%s, " "nick1:%s, nick2:%s, nick3:%s, username:%s, realname:%s, " - "command:%s, autojoin:%s, autorejoin:%s)\n", + "command:%s, autojoin:%s, autorejoin:%s, notify_levels:%s)\n", name, address, port, (password) ? password : "", (nick1) ? nick1 : "", (nick2) ? nick2 : "", (nick3) ? nick3 : "", (username) ? username : "", (realname) ? realname : "", (command) ? command : "", (autojoin) ? autojoin : "", - (autorejoin) ? "on" : "off"); + (autorejoin) ? "on" : "off", (notify_levels) ? notify_levels : ""); #endif if ((new_server = server_alloc ())) @@ -357,6 +362,8 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de (autojoin) ? strdup (autojoin) : NULL; new_server->autorejoin = autorejoin; new_server->nick = strdup (new_server->nick1); + new_server->notify_levels = + (notify_levels) ? strdup (notify_levels) : NULL; } else return NULL; @@ -1155,6 +1162,7 @@ server_print_log (t_irc_server *server) wee_log_printf (" command_delay . . . : %d\n", server->command_delay); wee_log_printf (" autojoin. . . . . . : '%s'\n", server->autojoin); wee_log_printf (" autorejoin. . . . . : %d\n", server->autorejoin); + wee_log_printf (" notify_levels . . . : %s\n", server->notify_levels); wee_log_printf (" child_pid . . . . . : %d\n", server->child_pid); wee_log_printf (" child_read . . . . : %d\n", server->child_read); wee_log_printf (" child_write . . . . : %d\n", server->child_write); diff --git a/src/irc/irc.h b/src/irc/irc.h index 73da3e2d0..e397937d0 100644 --- a/src/irc/irc.h +++ b/src/irc/irc.h @@ -147,6 +147,7 @@ struct t_irc_server int command_delay; /* delay after execution of command */ char *autojoin; /* channels to automatically join */ int autorejoin; /* auto rejoin channels when kicked */ + char *notify_levels; /* channels notify levels */ /* internal vars */ pid_t child_pid; /* pid of child process (connecting) */ @@ -250,7 +251,7 @@ extern void server_free (t_irc_server *); extern void server_free_all (); extern t_irc_server *server_new (char *, int, int, int, int, char *, int, char *, char *, char *, char *, char *, char *, char *, - int, char *, int); + int, char *, int, char *); extern int server_send (t_irc_server *, char *, int); extern void server_sendf (t_irc_server *, char *, ...); extern void server_recv (t_irc_server *); @@ -280,6 +281,9 @@ extern void channel_check_away (t_irc_server *, t_irc_channel *); extern void channel_set_away (t_irc_channel *, char *, int); extern int channel_create_dcc (t_irc_dcc *); extern void channel_remove_dcc (t_irc_dcc *); +extern int channel_get_notify_level (t_irc_server *, t_irc_channel *); +extern void channel_remove_notify_level (t_irc_server *, t_irc_channel *); +extern void channel_set_notify_level (t_irc_server *, t_irc_channel *, int); extern void channel_print_log (t_irc_channel *); /* nick functions (irc-nick.c) */ diff --git a/weechat/ChangeLog b/weechat/ChangeLog index 8e9e11b18..aa888999d 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -1,10 +1,12 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2005-06-18 +ChangeLog - 2005-06-19 Version 0.1.3 (under dev!): + * channel notify levels are saved in config file (new option + "server_notify_levels" for server sections) * part message now accepts %v (replaced by WeeChat version), like quit message * errors while loading perl scripts are now displayed in server buffer (instead of current buffer) diff --git a/weechat/TODO b/weechat/TODO index 524439c8f..4698f1dfe 100644 --- a/weechat/TODO +++ b/weechat/TODO @@ -1,7 +1,7 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -TODO - 2005-05-21 +TODO - 2005-06-19 Legend: # done @@ -10,20 +10,17 @@ Legend: ? is this really necessary? -v0.1.2: +v0.1.3: ------ * General: + Windows version + Solaris version - # *BSD version - # Mac OS X version * IRC protocol: - customizable CTCP version reply * Interface: - # nicklist scroll keys + Gtk GUI + internationalization (traduce WeeChat in many languages) @@ -32,10 +29,7 @@ v0.1.2: * Configuration: - add key bindings to config file - - * Plugins: - # Python plugin - # "/python load" and "/python unload" commands to (un)load Python scripts + # save buffer notify levels Future versions: @@ -52,15 +46,10 @@ Future versions: nick/host connect to the given irc network * WeeChat commands: - - "/reload" command: reload the WeeChat's config file - "/highlight" command: highlight a given word when it appears on channels/privates - "/completion" command: do shortcuts (for example when we type "u" in the text bar it send it to the server as "you") - - "/exec" command: execute a command as if we was in shell - and show us the output on the current window. An option to exec - like -o could send the output to the server, on the current - channel/private - "/last": command to look for text in previous messages * Interface: diff --git a/weechat/po/es.po b/weechat/po/es.po index e9ac0a61d..d99a4143a 100644 --- a/weechat/po/es.po +++ b/weechat/po/es.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.3-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-06-15 19:08+0200\n" -"PO-Revision-Date: 2005-06-15 19:09+0200\n" +"POT-Creation-Date: 2005-06-19 15:59+0200\n" +"PO-Revision-Date: 2005-06-19 16:08+0200\n" "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -20,107 +20,107 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "%s no ha sido posible crear un nuevo nick\n" -#: src/irc/irc-server.c:146 src/common/weeconfig.c:1506 +#: src/irc/irc-server.c:147 src/common/weeconfig.c:1531 msgid "Unable to get user's name" msgstr "No ha sido posible obtener el nombre de usuario" -#: src/irc/irc-server.c:211 +#: src/irc/irc-server.c:212 #, 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:416 +#: src/irc/irc-server.c:423 #, 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:436 src/irc/irc-server.c:449 src/irc/irc-server.c:515 -#: src/irc/irc-server.c:528 +#: src/irc/irc-server.c:443 src/irc/irc-server.c:456 src/irc/irc-server.c:522 +#: src/irc/irc-server.c:535 #, 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:606 +#: src/irc/irc-server.c:613 #, c-format msgid "%s Command '%s' failed!\n" msgstr "%s ¡Ha fallado el comando '%s' !\n" -#: src/irc/irc-server.c:611 +#: src/irc/irc-server.c:618 #, c-format msgid "%s No command to execute!\n" msgstr "%s ¡Ningún comando para ejecutar!\n" -#: src/irc/irc-server.c:616 +#: src/irc/irc-server.c:623 #, 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:658 +#: src/irc/irc-server.c:665 #, 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:730 +#: src/irc/irc-server.c:737 #, 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:761 +#: src/irc/irc-server.c:768 #, c-format msgid "%s address \"%s\" not found\n" msgstr "%s dirección \"%s\" no encontrada\n" -#: src/irc/irc-server.c:770 +#: src/irc/irc-server.c:777 #, c-format msgid "%s IP address not found\n" msgstr "%s Dirección IP no encontrada\n" -#: src/irc/irc-server.c:778 +#: src/irc/irc-server.c:785 #, c-format msgid "%s connection refused\n" msgstr "%s conexión rechazada\n" -#: src/irc/irc-server.c:844 +#: src/irc/irc-server.c:851 #, c-format msgid "%s: connecting to %s:%d...\n" msgstr "%s: conectando a %s:%d...\n" -#: src/irc/irc-server.c:846 +#: src/irc/irc-server.c:853 #, c-format msgid "Connecting to server %s:%d...\n" msgstr "Conectando al servidor %s:%d...\n" -#: src/irc/irc-server.c:857 +#: src/irc/irc-server.c:864 #, c-format msgid "%s cannot create pipe\n" msgstr "%s no ha sido posible crear la interconexión\n" -#: src/irc/irc-server.c:869 +#: src/irc/irc-server.c:876 #, c-format msgid "%s cannot create socket\n" msgstr "%s no ha sido posible crear el socket\n" -#: src/irc/irc-server.c:881 +#: src/irc/irc-server.c:888 #, 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:892 +#: src/irc/irc-server.c:899 #, 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:923 +#: src/irc/irc-server.c:930 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Reconectando al servidor...\n" -#: src/irc/irc-server.c:972 src/irc/irc-server.c:981 +#: src/irc/irc-server.c:979 src/irc/irc-server.c:988 msgid "Disconnected from server!\n" msgstr "¡Desconectado del servidor!\n" -#: src/irc/irc-channel.c:51 +#: src/irc/irc-channel.c:52 #, c-format msgid "%s cannot allocate new channel" msgstr "%s no ha sido posible crear un nuevo canal" @@ -1291,17 +1291,17 @@ msgstr "%s: utilización del nombre de máquina local \"%s\"\n" #: src/irc/irc-send.c:232 src/irc/irc-send.c:260 src/irc/irc-send.c:426 #: src/irc/irc-send.c:452 src/irc/irc-send.c:478 src/irc/irc-send.c:519 #: src/irc/irc-send.c:555 src/irc/irc-send.c:619 src/irc/irc-send.c:676 -#: src/irc/irc-send.c:1018 src/irc/irc-send.c:1116 src/irc/irc-send.c:1583 -#: src/irc/irc-send.c:1690 +#: src/irc/irc-send.c:1018 src/irc/irc-send.c:1116 src/irc/irc-send.c:1595 +#: src/irc/irc-send.c:1702 #, c-format msgid "%s \"%s\" command can only be executed in a channel window\n" msgstr "" "%s el comando \"%s\" sólo puede ser ejecutado en una ventana de canal\n" #: src/irc/irc-send.c:345 src/irc/irc-send.c:357 src/irc/irc-send.c:375 -#: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1609 -#: src/common/command.c:1152 src/common/command.c:1436 -#: src/common/command.c:1579 +#: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1621 +#: src/common/command.c:1165 src/common/command.c:1449 +#: src/common/command.c:1592 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s número de argumentos incorrecto para el comando \"%s\"\n" @@ -1312,7 +1312,7 @@ msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s argumentos incorrecto para el comando \"%s\"\n" #: src/irc/irc-send.c:804 src/irc/irc-send.c:871 src/irc/irc-send.c:1164 -#: src/irc/irc-send.c:1178 src/irc/irc-send.c:1510 +#: src/irc/irc-send.c:1178 src/irc/irc-send.c:1522 #, c-format msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" @@ -1323,12 +1323,12 @@ 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:1262 src/irc/irc-recv.c:1444 +#: src/irc/irc-send.c:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1444 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n" -#: src/irc/irc-send.c:1662 +#: src/irc/irc-send.c:1674 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilado en %s %s\n" @@ -1958,22 +1958,22 @@ msgid "%s error: too much values from \"%s\" (%d). Expected: 1.\n" msgstr "Error de %s: demasiados valores desde \"%s\" (%d). Esperado: 1.\n" #: src/plugins/perl/wee-perl.c:941 src/plugins/perl/wee-perl.c:943 -#: src/plugins/python/wee-python.c:541 src/plugins/python/wee-python.c:543 +#: src/plugins/python/wee-python.c:566 src/plugins/python/wee-python.c:568 #, c-format msgid "Loading %s script \"%s\"\n" msgstr "Cargando %s script \"%s\"\n" -#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:612 +#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:637 #, c-format msgid "Unloading %s script \"%s\"\n" msgstr "Descarga del %s script \"%s\"\n" -#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:629 +#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:654 #, c-format msgid "Unloading all %s scripts...\n" msgstr "Descargando todos los %s scripts...\n" -#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:634 +#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:659 #, c-format msgid "%s scripts unloaded\n" msgstr "%s scripts descargados\n" @@ -1983,30 +1983,35 @@ msgstr "%s scripts descargados\n" msgid "%s error: error while launching interpreter\n" msgstr "" -#: src/plugins/python/wee-python.c:460 src/plugins/python/wee-python.c:488 -#: src/plugins/python/wee-python.c:520 +#: src/plugins/python/wee-python.c:432 +#, c-format +msgid "%s error: error while redirecting stdout and stderr\n" +msgstr "" + +#: src/plugins/python/wee-python.c:485 src/plugins/python/wee-python.c:513 +#: src/plugins/python/wee-python.c:545 #, c-format msgid "%s error: unable to run function \"%s\" in script (not enough memory)\n" msgstr "" "Error de %s: no ha sido posible cargar el script \"%s\" (memoria " "insuficiente)\n" -#: src/plugins/python/wee-python.c:510 +#: src/plugins/python/wee-python.c:535 #, c-format msgid "%s error: error while running function \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:549 +#: src/plugins/python/wee-python.c:574 #, c-format msgid "%s error: error while opening file \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:558 +#: src/plugins/python/wee-python.c:583 #, c-format msgid "%s error: error while parsing file \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:660 +#: src/plugins/python/wee-python.c:685 #, c-format msgid "%s error: error while freeing interpreter\n" msgstr "" @@ -2451,7 +2456,7 @@ msgstr "Privado con: " msgid "Opened buffers:\n" msgstr "Búfers abiertos:\n" -#: src/common/command.c:927 src/common/command.c:1054 +#: src/common/command.c:927 src/common/command.c:1067 #, c-format msgid "%s incorrect buffer number\n" msgstr "%s número de búfer incorrecto\n" @@ -2471,99 +2476,104 @@ msgstr "" msgid "Notify levels: " msgstr "Niveles de notificación: " -#: src/common/command.c:1017 src/common/command.c:1027 +#: src/common/command.c:1018 src/common/command.c:1040 #, c-format -msgid "%s incorrect notify level (must be between 0 and 3)\n" -msgstr "%s nivel de notificación incorrecto (debe estar entre 0 y 3)\n" +msgid "%s incorrect notify level (must be between %d and %d)\n" +msgstr "%s nivel de notificación incorrecto (debe estar entre %d y %d)\n" + +#: src/common/command.c:1027 +#, c-format +msgid "%s incorrect buffer for notify (must be channel or private)\n" +msgstr "" -#: src/common/command.c:1045 +#: src/common/command.c:1058 #, c-format msgid "%s buffer \"%s\" not found for \"%s\" command\n" msgstr "%s búfer \"%s\" no encontrado para el comando \"%s\"\n" -#: src/common/command.c:1079 +#: src/common/command.c:1092 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "parámetro desconocido \"%s\" para el comando \"%s\"\n" -#: src/common/command.c:1109 +#: src/common/command.c:1122 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s ya conectado al servidor \"%s\"!\n" -#: src/common/command.c:1117 +#: src/common/command.c:1130 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "%s actualmente conectando al servidor \"%s\"!\n" -#: src/common/command.c:1135 src/common/command.c:1210 +#: src/common/command.c:1148 src/common/command.c:1223 #, c-format msgid "%s server not found\n" msgstr "%s servidor no encontrado\n" -#: src/common/command.c:1165 src/common/command.c:1429 -#: src/common/command.c:1572 src/common/command.c:2263 -#: src/common/command.c:2275 +#: src/common/command.c:1178 src/common/command.c:1442 +#: src/common/command.c:1585 src/common/command.c:2276 +#: src/common/command.c:2288 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s opción desconocida para el comando \"%s\"\n" -#: src/common/command.c:1194 +#: src/common/command.c:1207 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s ¡no conectado al servidor \"%s\"!\n" -#: src/common/command.c:1202 +#: src/common/command.c:1215 msgid "Auto-reconnection is cancelled\n" msgstr "La reconexión automática está anulada\n" -#: src/common/command.c:1228 src/common/weechat.c:265 +#: src/common/command.c:1241 src/common/weechat.c:265 #, c-format msgid "%s internal commands:\n" msgstr "Comandos internos %s :\n" -#: src/common/command.c:1237 src/common/weechat.c:285 +#: src/common/command.c:1250 src/common/weechat.c:285 #, c-format msgid "IRC commands:\n" msgstr "Comandos IRC :\n" -#: src/common/command.c:1304 +#: src/common/command.c:1317 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "No hay ayuda disponible, el comando \"%s\" es desconocido\n" -#: src/common/command.c:1328 src/common/command.c:1471 +#: src/common/command.c:1341 src/common/command.c:1484 #, c-format msgid "Registered %s scripts:\n" msgstr "%s scripts registrados:\n" -#: src/common/command.c:1345 src/common/command.c:1368 -#: src/common/command.c:1391 src/common/command.c:1488 -#: src/common/command.c:1511 src/common/command.c:1534 +#: src/common/command.c:1358 src/common/command.c:1381 +#: src/common/command.c:1404 src/common/command.c:1501 +#: src/common/command.c:1524 src/common/command.c:1547 msgid " (none)\n" msgstr " (ninguno)\n" -#: src/common/command.c:1350 src/common/command.c:1493 +#: src/common/command.c:1363 src/common/command.c:1506 #, c-format msgid "%s message handlers:\n" msgstr "Funciones %s para mensajes:\n" -#: src/common/command.c:1359 src/common/command.c:1502 +#: src/common/command.c:1372 src/common/command.c:1515 #, c-format msgid " IRC(%s) => %s(%s)\n" msgstr " IRC(%s) => %s(%s)\n" -#: src/common/command.c:1373 src/common/command.c:1516 +#: src/common/command.c:1386 src/common/command.c:1529 #, c-format msgid "%s command handlers:\n" msgstr "Comandos %s :\n" -#: src/common/command.c:1382 src/common/command.c:1525 +#: src/common/command.c:1395 src/common/command.c:1538 #, c-format msgid " Command /%s => %s(%s)\n" msgstr " Comando /%s => %s(%s)\n" -#: src/common/command.c:1442 +#: src/common/command.c:1455 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" @@ -2572,7 +2582,7 @@ msgstr "" "Por favor, recompile WeeChat con la opción \"--enable-perl\" para el " "script ./configure\n" -#: src/common/command.c:1585 +#: src/common/command.c:1598 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " @@ -2582,32 +2592,32 @@ msgstr "" "Por favor, recompile WeeChat con la opción \"--enable-python\" para el " "script ./configure\n" -#: src/common/command.c:1633 +#: src/common/command.c:1646 msgid "No server.\n" msgstr "Ningún servidor.\n" -#: src/common/command.c:1644 +#: src/common/command.c:1657 #, c-format msgid "Server '%s' not found.\n" msgstr "Servidor '%s' no encontrado.\n" -#: src/common/command.c:1656 +#: src/common/command.c:1669 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "%s falta el nombre de servidor para el comando \"%s\"\n" -#: src/common/command.c:1664 +#: src/common/command.c:1677 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" "%s demasiados argumentos para el comando \"%s\", ignorando parámetros\n" -#: src/common/command.c:1683 +#: src/common/command.c:1696 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "%s servidor \"%s\" no encontrado para el comando \"%s\"\n" -#: src/common/command.c:1691 +#: src/common/command.c:1704 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -2616,108 +2626,108 @@ msgstr "" "%s usted no puede eliminar el servidor \"%s\" ya que está usted conectado a " "él. Pruebe /disconnect %s antes.\n" -#: src/common/command.c:1707 src/common/command.c:1848 +#: src/common/command.c:1720 src/common/command.c:1861 msgid "Server" msgstr "Servidor" -#: src/common/command.c:1710 +#: src/common/command.c:1723 msgid "has been deleted\n" msgstr "ha sido eliminado\n" -#: src/common/command.c:1725 +#: src/common/command.c:1738 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s faltan parámetros para el comando \"%s\"\n" -#: src/common/command.c:1735 +#: src/common/command.c:1748 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "%s el servidor \"%s\" ya existe, ¡no se puede crear!\n" -#: src/common/command.c:1760 src/common/command.c:1788 -#: src/common/command.c:1801 src/common/command.c:1827 +#: src/common/command.c:1773 src/common/command.c:1801 +#: src/common/command.c:1814 src/common/command.c:1840 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s falta contraseña para el comando \"%s\"\n" -#: src/common/command.c:1773 +#: src/common/command.c:1786 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "%s falta(n) usuario(s) para el parámetro \"%s\"\n" -#: src/common/command.c:1814 +#: src/common/command.c:1827 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s falta comando para el parámetro \"%s\"\n" -#: src/common/command.c:1851 +#: src/common/command.c:1864 msgid "created\n" msgstr "creado\n" -#: src/common/command.c:1857 +#: src/common/command.c:1870 #, c-format msgid "%s unable to create server\n" msgstr "%s no es posible crear el servidor\n" -#: src/common/command.c:1912 +#: src/common/command.c:1925 msgid "(unknown)" msgstr "(desconocido)" -#: src/common/command.c:1935 +#: src/common/command.c:1948 msgid "(password hidden) " msgstr "(contraseña oculta) " -#: src/common/command.c:1999 +#: src/common/command.c:2012 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s servidor \"%s\" no encontrado\n" -#: src/common/command.c:2030 src/common/command.c:2076 +#: src/common/command.c:2043 src/common/command.c:2089 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s opción de configuración \"%s\" no encontrada\n" -#: src/common/command.c:2035 src/common/command.c:2068 +#: src/common/command.c:2048 src/common/command.c:2081 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valor incorrecto para la opción \"%s\"\n" -#: src/common/command.c:2051 +#: src/common/command.c:2064 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" "%s la opción \"%s\" no puede ser modificada mientras WeeChat esté en " "ejecución\n" -#: src/common/command.c:2149 +#: src/common/command.c:2162 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Ninguna opción de configuración encontrada con \"%s\"\n" -#: src/common/command.c:2152 +#: src/common/command.c:2165 msgid "No config option found\n" msgstr "Ninguna opción de configuración encontrada\n" -#: src/common/command.c:2158 +#: src/common/command.c:2171 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "opción/opciones de configuración encontrada(s) con \"%s\"\n" -#: src/common/command.c:2161 +#: src/common/command.c:2174 msgid "config option(s) found\n" msgstr "opción/opciones de configuración encontrada(s)\n" -#: src/common/command.c:2181 +#: src/common/command.c:2194 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias o comando \"%s\" no encontrado\n" -#: src/common/command.c:2191 +#: src/common/command.c:2204 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" eliminado\n" -#: src/common/command.c:2211 +#: src/common/command.c:2224 msgid "Opened windows:\n" msgstr "Ventanas abiertas:\n" @@ -3698,62 +3708,72 @@ msgstr "" msgid "automatically rejoin channels when kicked" msgstr "unirse de nuevo automáticamente a los canales cuando sea expulsado" -#: src/common/weeconfig.c:1057 +#: src/common/weeconfig.c:693 +msgid "notify levels for channels of this server" +msgstr "" + +#: src/common/weeconfig.c:694 +msgid "" +"comma separated list of notify levels for channels of this server (format: " +"#channel:1,..)" +msgstr "" + +#: src/common/weeconfig.c:1082 #, 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:1066 +#: src/common/weeconfig.c:1091 #, 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:1080 +#: src/common/weeconfig.c:1105 #, 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:1119 +#: src/common/weeconfig.c:1144 #, 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:1130 +#: src/common/weeconfig.c:1155 #, 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:1169 +#: src/common/weeconfig.c:1194 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "%s fichero de configuración \"%s\" no encontrado.\n" -#: src/common/weeconfig.c:1201 +#: src/common/weeconfig.c:1226 #, 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:1218 +#: src/common/weeconfig.c:1243 #, 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:1236 +#: src/common/weeconfig.c:1261 #, 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:1244 +#: src/common/weeconfig.c:1269 #, 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:1278 +#: src/common/weeconfig.c:1303 #, 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:1289 +#: src/common/weeconfig.c:1314 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" @@ -3762,7 +3782,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:1298 +#: src/common/weeconfig.c:1323 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3771,7 +3791,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:1309 +#: src/common/weeconfig.c:1334 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3780,26 +3800,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:1325 +#: src/common/weeconfig.c:1350 #, 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:1385 src/common/weeconfig.c:1558 +#: src/common/weeconfig.c:1410 src/common/weeconfig.c:1583 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "%s no es posible crear el fichero \"%s\"\n" -#: src/common/weeconfig.c:1391 +#: src/common/weeconfig.c:1416 #, c-format msgid "%s: creating default config file...\n" msgstr "%s: creando fichero de configuración por defecto...\n" -#: src/common/weeconfig.c:1392 +#: src/common/weeconfig.c:1417 msgid "Creating default config file\n" msgstr "Creando fichero de configuración por defecto\n" -#: src/common/weeconfig.c:1395 src/common/weeconfig.c:1567 +#: src/common/weeconfig.c:1420 src/common/weeconfig.c:1592 #, c-format msgid "" "#\n" @@ -3808,10 +3828,6 @@ msgstr "" "#\n" "# %s: fichero de configuración, creado por %s v%s el %s#\n" -#: src/common/weeconfig.c:1564 +#: src/common/weeconfig.c:1589 msgid "Saving config to disk\n" msgstr "Guardar configuración a disco\n" - -#, fuzzy -#~ msgid "%s not enough memory to call plugin handler\n" -#~ msgstr "%s no hay memoria suficiente para un nuevo DCC\n" diff --git a/weechat/po/fr.po b/weechat/po/fr.po index b76f6b4c4..e8dd83944 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.3-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-06-15 19:08+0200\n" -"PO-Revision-Date: 2005-06-15 19:08+0200\n" +"POT-Creation-Date: 2005-06-19 15:59+0200\n" +"PO-Revision-Date: 2005-06-19 16:07+0200\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -20,107 +20,107 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "%s impossible d'allouer un nouveau pseudo\n" -#: src/irc/irc-server.c:146 src/common/weeconfig.c:1506 +#: src/irc/irc-server.c:147 src/common/weeconfig.c:1531 msgid "Unable to get user's name" msgstr "Impossible de déterminer le nom d'utilisateur" -#: src/irc/irc-server.c:211 +#: src/irc/irc-server.c:212 #, c-format msgid "%s cannot allocate new server\n" msgstr "%s impossible d'allouer un nouveau serveur\n" -#: src/irc/irc-server.c:416 +#: src/irc/irc-server.c:423 #, 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:436 src/irc/irc-server.c:449 src/irc/irc-server.c:515 -#: src/irc/irc-server.c:528 +#: src/irc/irc-server.c:443 src/irc/irc-server.c:456 src/irc/irc-server.c:522 +#: src/irc/irc-server.c:535 #, 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:606 +#: src/irc/irc-server.c:613 #, c-format msgid "%s Command '%s' failed!\n" msgstr "%s La commande '%s' a échoué !\n" -#: src/irc/irc-server.c:611 +#: src/irc/irc-server.c:618 #, c-format msgid "%s No command to execute!\n" msgstr "%s Pas de commande à exécuter !\n" -#: src/irc/irc-server.c:616 +#: src/irc/irc-server.c:623 #, 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:658 +#: src/irc/irc-server.c:665 #, 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:730 +#: src/irc/irc-server.c:737 #, 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:761 +#: src/irc/irc-server.c:768 #, c-format msgid "%s address \"%s\" not found\n" msgstr "%s adresse \"%s\" introuvable\n" -#: src/irc/irc-server.c:770 +#: src/irc/irc-server.c:777 #, c-format msgid "%s IP address not found\n" msgstr "%s adresse IP introuvable\n" -#: src/irc/irc-server.c:778 +#: src/irc/irc-server.c:785 #, c-format msgid "%s connection refused\n" msgstr "%s connexion refusée\n" -#: src/irc/irc-server.c:844 +#: src/irc/irc-server.c:851 #, c-format msgid "%s: connecting to %s:%d...\n" msgstr "%s: connexion à %s:%d...\n" -#: src/irc/irc-server.c:846 +#: src/irc/irc-server.c:853 #, c-format msgid "Connecting to server %s:%d...\n" msgstr "Connexion au serveur %s:%d...\n" -#: src/irc/irc-server.c:857 +#: src/irc/irc-server.c:864 #, c-format msgid "%s cannot create pipe\n" msgstr "%s impossible de créer le pipe\n" -#: src/irc/irc-server.c:869 +#: src/irc/irc-server.c:876 #, c-format msgid "%s cannot create socket\n" msgstr "%s impossible de créer la socket\n" -#: src/irc/irc-server.c:881 +#: src/irc/irc-server.c:888 #, 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:892 +#: src/irc/irc-server.c:899 #, 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:923 +#: src/irc/irc-server.c:930 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "%s: Reconnexion au serveur...\n" -#: src/irc/irc-server.c:972 src/irc/irc-server.c:981 +#: src/irc/irc-server.c:979 src/irc/irc-server.c:988 msgid "Disconnected from server!\n" msgstr "Déconnecté du serveur !\n" -#: src/irc/irc-channel.c:51 +#: src/irc/irc-channel.c:52 #, c-format msgid "%s cannot allocate new channel" msgstr "%s impossible d'allouer un nouveau canal" @@ -1292,8 +1292,8 @@ msgstr "%s: utilisation du nom de machine local \"%s\"\n" #: src/irc/irc-send.c:232 src/irc/irc-send.c:260 src/irc/irc-send.c:426 #: src/irc/irc-send.c:452 src/irc/irc-send.c:478 src/irc/irc-send.c:519 #: src/irc/irc-send.c:555 src/irc/irc-send.c:619 src/irc/irc-send.c:676 -#: src/irc/irc-send.c:1018 src/irc/irc-send.c:1116 src/irc/irc-send.c:1583 -#: src/irc/irc-send.c:1690 +#: src/irc/irc-send.c:1018 src/irc/irc-send.c:1116 src/irc/irc-send.c:1595 +#: src/irc/irc-send.c:1702 #, c-format msgid "%s \"%s\" command can only be executed in a channel window\n" msgstr "" @@ -1301,9 +1301,9 @@ msgstr "" "canal\n" #: src/irc/irc-send.c:345 src/irc/irc-send.c:357 src/irc/irc-send.c:375 -#: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1609 -#: src/common/command.c:1152 src/common/command.c:1436 -#: src/common/command.c:1579 +#: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1621 +#: src/common/command.c:1165 src/common/command.c:1449 +#: src/common/command.c:1592 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n" @@ -1314,7 +1314,7 @@ msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s paramètres invalides pour la commande \"%s\"\n" #: src/irc/irc-send.c:804 src/irc/irc-send.c:871 src/irc/irc-send.c:1164 -#: src/irc/irc-send.c:1178 src/irc/irc-send.c:1510 +#: src/irc/irc-send.c:1178 src/irc/irc-send.c:1522 #, c-format msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" @@ -1325,12 +1325,12 @@ 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:1262 src/irc/irc-recv.c:1444 +#: src/irc/irc-send.c:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1444 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "%s impossible de créer la fenêtre privée \"%s\"\n" -#: src/irc/irc-send.c:1662 +#: src/irc/irc-send.c:1674 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilé le %s %s\n" @@ -1959,22 +1959,22 @@ msgid "%s error: too much values from \"%s\" (%d). Expected: 1.\n" msgstr "Erreur %s: trop de valeurs de \"%s\" (%d). Attendue: 1.\n" #: src/plugins/perl/wee-perl.c:941 src/plugins/perl/wee-perl.c:943 -#: src/plugins/python/wee-python.c:541 src/plugins/python/wee-python.c:543 +#: src/plugins/python/wee-python.c:566 src/plugins/python/wee-python.c:568 #, c-format msgid "Loading %s script \"%s\"\n" msgstr "Chargement du script %s \"%s\"\n" -#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:612 +#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:637 #, c-format msgid "Unloading %s script \"%s\"\n" msgstr "Déchargement du script %s \"%s\"\n" -#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:629 +#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:654 #, c-format msgid "Unloading all %s scripts...\n" msgstr "Déchargement de tous les scripts %s...\n" -#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:634 +#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:659 #, c-format msgid "%s scripts unloaded\n" msgstr "Scripts %s déchargés\n" @@ -1984,30 +1984,35 @@ msgstr "Scripts %s déchargés\n" msgid "%s error: error while launching interpreter\n" msgstr "Erreur %s: erreur pendant le chargement de l'interpréteur\n" -#: src/plugins/python/wee-python.c:460 src/plugins/python/wee-python.c:488 -#: src/plugins/python/wee-python.c:520 +#: src/plugins/python/wee-python.c:432 +#, c-format +msgid "%s error: error while redirecting stdout and stderr\n" +msgstr "Erreur %s: erreur en redirection de stdout et stderr\n" + +#: src/plugins/python/wee-python.c:485 src/plugins/python/wee-python.c:513 +#: src/plugins/python/wee-python.c:545 #, c-format msgid "%s error: unable to run function \"%s\" in script (not enough memory)\n" msgstr "" "Erreur %s: impossible d'exécuter la fonction \"%s\" dans le script (mémoire " "insuffisante)\n" -#: src/plugins/python/wee-python.c:510 +#: src/plugins/python/wee-python.c:535 #, c-format msgid "%s error: error while running function \"%s\"\n" msgstr "Erreur %s: erreur dans la fonction \"%s\"\n" -#: src/plugins/python/wee-python.c:549 +#: src/plugins/python/wee-python.c:574 #, c-format msgid "%s error: error while opening file \"%s\"\n" msgstr "Erreur %s: erreur à l'ouverture du fichier \"%s\"\n" -#: src/plugins/python/wee-python.c:558 +#: src/plugins/python/wee-python.c:583 #, c-format msgid "%s error: error while parsing file \"%s\"\n" msgstr "Erreur %s: erreur en analysant le fichier \"%s\"\n" -#: src/plugins/python/wee-python.c:660 +#: src/plugins/python/wee-python.c:685 #, c-format msgid "%s error: error while freeing interpreter\n" msgstr "Erreur %s: impossible de libérer l'interpréteur\n" @@ -2450,7 +2455,7 @@ msgstr "Privé avec: " msgid "Opened buffers:\n" msgstr "Tampons ouverts:\n" -#: src/common/command.c:927 src/common/command.c:1054 +#: src/common/command.c:927 src/common/command.c:1067 #, c-format msgid "%s incorrect buffer number\n" msgstr "%s numéro de buffer incorrect\n" @@ -2471,99 +2476,105 @@ msgstr "" msgid "Notify levels: " msgstr "Niveaux de notification: " -#: src/common/command.c:1017 src/common/command.c:1027 +#: src/common/command.c:1018 src/common/command.c:1040 #, c-format -msgid "%s incorrect notify level (must be between 0 and 3)\n" -msgstr "%s niveau de notification incorrect (doit être entre 0 et 3)\n" +msgid "%s incorrect notify level (must be between %d and %d)\n" +msgstr "%s niveau de notification incorrect (doit être entre %d et %d)\n" + +#: src/common/command.c:1027 +#, c-format +msgid "%s incorrect buffer for notify (must be channel or private)\n" +msgstr "" +"%s tampon incorrect pour la notification (doit être un canal ou un privé)\n" -#: src/common/command.c:1045 +#: src/common/command.c:1058 #, c-format msgid "%s buffer \"%s\" not found for \"%s\" command\n" msgstr "%s buffer \"%s\" non trouvé pour la commande \"%s\"\n" -#: src/common/command.c:1079 +#: src/common/command.c:1092 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "paramètre inconnu \"%s\" pour la commande \"%s\"\n" -#: src/common/command.c:1109 +#: src/common/command.c:1122 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s déjà connecté au serveur \"%s\" !\n" -#: src/common/command.c:1117 +#: src/common/command.c:1130 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "%s une connexion vers le serveur \"%s\" est en cours !\n" -#: src/common/command.c:1135 src/common/command.c:1210 +#: src/common/command.c:1148 src/common/command.c:1223 #, c-format msgid "%s server not found\n" msgstr "%s serveur non trouvé\n" -#: src/common/command.c:1165 src/common/command.c:1429 -#: src/common/command.c:1572 src/common/command.c:2263 -#: src/common/command.c:2275 +#: src/common/command.c:1178 src/common/command.c:1442 +#: src/common/command.c:1585 src/common/command.c:2276 +#: src/common/command.c:2288 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s option inconnue pour la commande \"%s\"\n" -#: src/common/command.c:1194 +#: src/common/command.c:1207 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s non connecté au serveur \"%s\" !\n" -#: src/common/command.c:1202 +#: src/common/command.c:1215 msgid "Auto-reconnection is cancelled\n" msgstr "La reconnexion automatique est annulée\n" -#: src/common/command.c:1228 src/common/weechat.c:265 +#: src/common/command.c:1241 src/common/weechat.c:265 #, c-format msgid "%s internal commands:\n" msgstr "Commandes internes %s :\n" -#: src/common/command.c:1237 src/common/weechat.c:285 +#: src/common/command.c:1250 src/common/weechat.c:285 #, c-format msgid "IRC commands:\n" msgstr "Commandes IRC :\n" -#: src/common/command.c:1304 +#: src/common/command.c:1317 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "Pas d'aide disponible, la commande \"%s\" est inconnue\n" -#: src/common/command.c:1328 src/common/command.c:1471 +#: src/common/command.c:1341 src/common/command.c:1484 #, c-format msgid "Registered %s scripts:\n" msgstr "Scripts %s enregistrés :\n" -#: src/common/command.c:1345 src/common/command.c:1368 -#: src/common/command.c:1391 src/common/command.c:1488 -#: src/common/command.c:1511 src/common/command.c:1534 +#: src/common/command.c:1358 src/common/command.c:1381 +#: src/common/command.c:1404 src/common/command.c:1501 +#: src/common/command.c:1524 src/common/command.c:1547 msgid " (none)\n" msgstr " (aucun)\n" -#: src/common/command.c:1350 src/common/command.c:1493 +#: src/common/command.c:1363 src/common/command.c:1506 #, c-format msgid "%s message handlers:\n" msgstr "Fonctions %s pour messages :\n" -#: src/common/command.c:1359 src/common/command.c:1502 +#: src/common/command.c:1372 src/common/command.c:1515 #, c-format msgid " IRC(%s) => %s(%s)\n" msgstr " IRC(%s) => %s(%s)\n" -#: src/common/command.c:1373 src/common/command.c:1516 +#: src/common/command.c:1386 src/common/command.c:1529 #, c-format msgid "%s command handlers:\n" msgstr "Commandes %s :\n" -#: src/common/command.c:1382 src/common/command.c:1525 +#: src/common/command.c:1395 src/common/command.c:1538 #, c-format msgid " Command /%s => %s(%s)\n" msgstr " Commande /%s => %s(%s)\n" -#: src/common/command.c:1442 +#: src/common/command.c:1455 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" @@ -2572,7 +2583,7 @@ msgstr "" "Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le " "script ./configure\n" -#: src/common/command.c:1585 +#: src/common/command.c:1598 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " @@ -2582,31 +2593,31 @@ msgstr "" "Merci de reconstruire WeeChat avec l'option \"--enable-python\" pour le " "script ./configure\n" -#: src/common/command.c:1633 +#: src/common/command.c:1646 msgid "No server.\n" msgstr "Pas de serveur.\n" -#: src/common/command.c:1644 +#: src/common/command.c:1657 #, c-format msgid "Server '%s' not found.\n" msgstr "Serveur '%s' non trouvé.\n" -#: src/common/command.c:1656 +#: src/common/command.c:1669 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "%s il manque le nom du serveur pour la commande \"%s\"\n" -#: src/common/command.c:1664 +#: src/common/command.c:1677 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "%s trop de paramètres pour la commande \"%s\", paramètres ignorés\n" -#: src/common/command.c:1683 +#: src/common/command.c:1696 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "%s le serveur \"%s\" n'existe pas pour la commande \"%s\"\n" -#: src/common/command.c:1691 +#: src/common/command.c:1704 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -2615,106 +2626,106 @@ msgstr "" "%s vous ne pouvez pas supprimer le server \"%s\" car vous êtes connecté " "dessus. Essayez /disconnect %s avant.\n" -#: src/common/command.c:1707 src/common/command.c:1848 +#: src/common/command.c:1720 src/common/command.c:1861 msgid "Server" msgstr "Serveur" -#: src/common/command.c:1710 +#: src/common/command.c:1723 msgid "has been deleted\n" msgstr "a été supprimé\n" -#: src/common/command.c:1725 +#: src/common/command.c:1738 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s paramètres manquants pour la commande \"%s\"\n" -#: src/common/command.c:1735 +#: src/common/command.c:1748 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "%s le serveur \"%s\" existe déjà, impossible de le créer !\n" -#: src/common/command.c:1760 src/common/command.c:1788 -#: src/common/command.c:1801 src/common/command.c:1827 +#: src/common/command.c:1773 src/common/command.c:1801 +#: src/common/command.c:1814 src/common/command.c:1840 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s mot de passe manquant pour le paramètre \"%s\"\n" -#: src/common/command.c:1773 +#: src/common/command.c:1786 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "%s pseudo(s) manquant(s) pour le paramètre \"%s\"\n" -#: src/common/command.c:1814 +#: src/common/command.c:1827 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s commande manquante pour le paramètre \"%s\"\n" -#: src/common/command.c:1851 +#: src/common/command.c:1864 msgid "created\n" msgstr "créé\n" -#: src/common/command.c:1857 +#: src/common/command.c:1870 #, c-format msgid "%s unable to create server\n" msgstr "%s impossible de créer le serveur\n" -#: src/common/command.c:1912 +#: src/common/command.c:1925 msgid "(unknown)" msgstr "(inconnu)" -#: src/common/command.c:1935 +#: src/common/command.c:1948 msgid "(password hidden) " msgstr "(mot de passe caché) " -#: src/common/command.c:1999 +#: src/common/command.c:2012 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s serveur \"%s\" non trouvé\n" -#: src/common/command.c:2030 src/common/command.c:2076 +#: src/common/command.c:2043 src/common/command.c:2089 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s option de configuration \"%s\" non trouvée\n" -#: src/common/command.c:2035 src/common/command.c:2068 +#: src/common/command.c:2048 src/common/command.c:2081 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valeur incorrecte pour l'option \"%s\"\n" -#: src/common/command.c:2051 +#: src/common/command.c:2064 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "%s l'option \"%s\" ne peut pas être changée lorsque WeeChat tourne\n" -#: src/common/command.c:2149 +#: src/common/command.c:2162 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Aucune option de configuration trouvée avec \"%s\"\n" -#: src/common/command.c:2152 +#: src/common/command.c:2165 msgid "No config option found\n" msgstr "Aucune option de configuration trouvée\n" -#: src/common/command.c:2158 +#: src/common/command.c:2171 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "option(s) de configuration trouvée(s) avec \"%s\"\n" -#: src/common/command.c:2161 +#: src/common/command.c:2174 msgid "config option(s) found\n" msgstr "option(s) de configuration trouvée(s)\n" -#: src/common/command.c:2181 +#: src/common/command.c:2194 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias ou commande \"%s\" non trouvé\n" -#: src/common/command.c:2191 +#: src/common/command.c:2204 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" supprimé\n" -#: src/common/command.c:2211 +#: src/common/command.c:2224 msgid "Opened windows:\n" msgstr "Fenêtres ouvertes:\n" @@ -3691,64 +3702,76 @@ msgstr "" msgid "automatically rejoin channels when kicked" msgstr "rejoindre automatiquement les canaux quand mis dehors" -#: src/common/weeconfig.c:1057 +#: src/common/weeconfig.c:693 +msgid "notify levels for channels of this server" +msgstr "niveaux de notification pour les canaux de ce serveur" + +#: src/common/weeconfig.c:694 +msgid "" +"comma separated list of notify levels for channels of this server (format: " +"#channel:1,..)" +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:1082 #, 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:1066 +#: src/common/weeconfig.c:1091 #, 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:1080 +#: src/common/weeconfig.c:1105 #, 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:1119 +#: src/common/weeconfig.c:1144 #, 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:1130 +#: src/common/weeconfig.c:1155 #, 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:1169 +#: src/common/weeconfig.c:1194 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "%s fichier de configuration \"%s\" non trouvé.\n" -#: src/common/weeconfig.c:1201 +#: src/common/weeconfig.c:1226 #, 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:1218 +#: src/common/weeconfig.c:1243 #, 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:1236 +#: src/common/weeconfig.c:1261 #, 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:1244 +#: src/common/weeconfig.c:1269 #, 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:1278 +#: src/common/weeconfig.c:1303 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "%s %s, ligne %d: option \"%s\" invalide\n" -#: src/common/weeconfig.c:1289 +#: src/common/weeconfig.c:1314 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" @@ -3757,7 +3780,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:1298 +#: src/common/weeconfig.c:1323 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3766,7 +3789,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:1309 +#: src/common/weeconfig.c:1334 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" @@ -3775,26 +3798,26 @@ msgstr "" "%s %s, ligne %d: valeur invalide pour l'option '%s'\n" "Attendu: une de ces chaînes: " -#: src/common/weeconfig.c:1325 +#: src/common/weeconfig.c:1350 #, 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:1385 src/common/weeconfig.c:1558 +#: src/common/weeconfig.c:1410 src/common/weeconfig.c:1583 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "%s impossible de créer le fichier \"%s\"\n" -#: src/common/weeconfig.c:1391 +#: src/common/weeconfig.c:1416 #, 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:1392 +#: src/common/weeconfig.c:1417 msgid "Creating default config file\n" msgstr "Création du fichier de configuration par défaut\n" -#: src/common/weeconfig.c:1395 src/common/weeconfig.c:1567 +#: src/common/weeconfig.c:1420 src/common/weeconfig.c:1592 #, c-format msgid "" "#\n" @@ -3803,10 +3826,6 @@ msgstr "" "#\n" "# %s: fichier de configuration, créé par %s v%s le %s#\n" -#: src/common/weeconfig.c:1564 +#: src/common/weeconfig.c:1589 msgid "Saving config to disk\n" msgstr "Sauvegarde de la configuration sur disque\n" - -#, fuzzy -#~ msgid "%s not enough memory to call plugin handler\n" -#~ msgstr "%s pas assez de mémoire pour un nouveau DCC\n" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index ef0095e0b..ff79a356e 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-15 19:08+0200\n" +"POT-Creation-Date: 2005-06-19 15:59+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,106 +20,106 @@ msgstr "" msgid "%s cannot allocate new nick\n" msgstr "" -#: src/irc/irc-server.c:146 src/common/weeconfig.c:1506 +#: src/irc/irc-server.c:147 src/common/weeconfig.c:1531 msgid "Unable to get user's name" msgstr "" -#: src/irc/irc-server.c:211 +#: src/irc/irc-server.c:212 #, c-format msgid "%s cannot allocate new server\n" msgstr "" -#: src/irc/irc-server.c:416 +#: src/irc/irc-server.c:423 #, c-format msgid "%s error sending data to IRC server\n" msgstr "" -#: src/irc/irc-server.c:436 src/irc/irc-server.c:449 src/irc/irc-server.c:515 -#: src/irc/irc-server.c:528 +#: src/irc/irc-server.c:443 src/irc/irc-server.c:456 src/irc/irc-server.c:522 +#: src/irc/irc-server.c:535 #, c-format msgid "%s not enough memory for received IRC message\n" msgstr "" -#: src/irc/irc-server.c:606 +#: src/irc/irc-server.c:613 #, c-format msgid "%s Command '%s' failed!\n" msgstr "" -#: src/irc/irc-server.c:611 +#: src/irc/irc-server.c:618 #, c-format msgid "%s No command to execute!\n" msgstr "" -#: src/irc/irc-server.c:616 +#: src/irc/irc-server.c:623 #, c-format msgid "%s Unknown command: cmd=%s, args=%s\n" msgstr "" -#: src/irc/irc-server.c:658 +#: src/irc/irc-server.c:665 #, c-format msgid "%s cannot read data from socket, disconnecting from server...\n" msgstr "" -#: src/irc/irc-server.c:730 +#: src/irc/irc-server.c:737 #, c-format msgid "%s: Reconnecting to server in %d seconds\n" msgstr "" -#: src/irc/irc-server.c:761 +#: src/irc/irc-server.c:768 #, c-format msgid "%s address \"%s\" not found\n" msgstr "" -#: src/irc/irc-server.c:770 +#: src/irc/irc-server.c:777 #, c-format msgid "%s IP address not found\n" msgstr "" -#: src/irc/irc-server.c:778 +#: src/irc/irc-server.c:785 #, c-format msgid "%s connection refused\n" msgstr "" -#: src/irc/irc-server.c:844 +#: src/irc/irc-server.c:851 #, c-format msgid "%s: connecting to %s:%d...\n" msgstr "" -#: src/irc/irc-server.c:846 +#: src/irc/irc-server.c:853 #, c-format msgid "Connecting to server %s:%d...\n" msgstr "" -#: src/irc/irc-server.c:857 +#: src/irc/irc-server.c:864 #, c-format msgid "%s cannot create pipe\n" msgstr "" -#: src/irc/irc-server.c:869 +#: src/irc/irc-server.c:876 #, c-format msgid "%s cannot create socket\n" msgstr "" -#: src/irc/irc-server.c:881 +#: src/irc/irc-server.c:888 #, c-format msgid "%s cannot set socket option \"SO_REUSEADDR\"\n" msgstr "" -#: src/irc/irc-server.c:892 +#: src/irc/irc-server.c:899 #, c-format msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n" msgstr "" -#: src/irc/irc-server.c:923 +#: src/irc/irc-server.c:930 #, c-format msgid "%s: Reconnecting to server...\n" msgstr "" -#: src/irc/irc-server.c:972 src/irc/irc-server.c:981 +#: src/irc/irc-server.c:979 src/irc/irc-server.c:988 msgid "Disconnected from server!\n" msgstr "" -#: src/irc/irc-channel.c:51 +#: src/irc/irc-channel.c:52 #, c-format msgid "%s cannot allocate new channel" msgstr "" @@ -1186,16 +1186,16 @@ msgstr "" #: src/irc/irc-send.c:232 src/irc/irc-send.c:260 src/irc/irc-send.c:426 #: src/irc/irc-send.c:452 src/irc/irc-send.c:478 src/irc/irc-send.c:519 #: src/irc/irc-send.c:555 src/irc/irc-send.c:619 src/irc/irc-send.c:676 -#: src/irc/irc-send.c:1018 src/irc/irc-send.c:1116 src/irc/irc-send.c:1583 -#: src/irc/irc-send.c:1690 +#: src/irc/irc-send.c:1018 src/irc/irc-send.c:1116 src/irc/irc-send.c:1595 +#: src/irc/irc-send.c:1702 #, c-format msgid "%s \"%s\" command can only be executed in a channel window\n" msgstr "" #: src/irc/irc-send.c:345 src/irc/irc-send.c:357 src/irc/irc-send.c:375 -#: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1609 -#: src/common/command.c:1152 src/common/command.c:1436 -#: src/common/command.c:1579 +#: src/irc/irc-send.c:996 src/irc/irc-send.c:1089 src/irc/irc-send.c:1621 +#: src/common/command.c:1165 src/common/command.c:1449 +#: src/common/command.c:1592 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "" @@ -1206,7 +1206,7 @@ msgid "%s wrong arguments for \"%s\" command\n" msgstr "" #: src/irc/irc-send.c:804 src/irc/irc-send.c:871 src/irc/irc-send.c:1164 -#: src/irc/irc-send.c:1178 src/irc/irc-send.c:1510 +#: src/irc/irc-send.c:1178 src/irc/irc-send.c:1522 #, c-format msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" @@ -1216,12 +1216,12 @@ msgstr "" msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:966 src/irc/irc-send.c:1262 src/irc/irc-recv.c:1444 +#: src/irc/irc-send.c:966 src/irc/irc-send.c:1274 src/irc/irc-recv.c:1444 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:1662 +#: src/irc/irc-send.c:1674 #, c-format msgid "%s, compiled on %s %s\n" msgstr "" @@ -1833,22 +1833,22 @@ msgid "%s error: too much values from \"%s\" (%d). Expected: 1.\n" msgstr "" #: src/plugins/perl/wee-perl.c:941 src/plugins/perl/wee-perl.c:943 -#: src/plugins/python/wee-python.c:541 src/plugins/python/wee-python.c:543 +#: src/plugins/python/wee-python.c:566 src/plugins/python/wee-python.c:568 #, c-format msgid "Loading %s script \"%s\"\n" msgstr "" -#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:612 +#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:637 #, c-format msgid "Unloading %s script \"%s\"\n" msgstr "" -#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:629 +#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:654 #, c-format msgid "Unloading all %s scripts...\n" msgstr "" -#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:634 +#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:659 #, c-format msgid "%s scripts unloaded\n" msgstr "" @@ -1858,28 +1858,33 @@ msgstr "" msgid "%s error: error while launching interpreter\n" msgstr "" -#: src/plugins/python/wee-python.c:460 src/plugins/python/wee-python.c:488 -#: src/plugins/python/wee-python.c:520 +#: src/plugins/python/wee-python.c:432 +#, c-format +msgid "%s error: error while redirecting stdout and stderr\n" +msgstr "" + +#: src/plugins/python/wee-python.c:485 src/plugins/python/wee-python.c:513 +#: src/plugins/python/wee-python.c:545 #, c-format msgid "%s error: unable to run function \"%s\" in script (not enough memory)\n" msgstr "" -#: src/plugins/python/wee-python.c:510 +#: src/plugins/python/wee-python.c:535 #, c-format msgid "%s error: error while running function \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:549 +#: src/plugins/python/wee-python.c:574 #, c-format msgid "%s error: error while opening file \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:558 +#: src/plugins/python/wee-python.c:583 #, c-format msgid "%s error: error while parsing file \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:660 +#: src/plugins/python/wee-python.c:685 #, c-format msgid "%s error: error while freeing interpreter\n" msgstr "" @@ -2274,7 +2279,7 @@ msgstr "" msgid "Opened buffers:\n" msgstr "" -#: src/common/command.c:927 src/common/command.c:1054 +#: src/common/command.c:927 src/common/command.c:1067 #, c-format msgid "%s incorrect buffer number\n" msgstr "" @@ -2293,242 +2298,247 @@ msgstr "" msgid "Notify levels: " msgstr "" -#: src/common/command.c:1017 src/common/command.c:1027 +#: src/common/command.c:1018 src/common/command.c:1040 +#, c-format +msgid "%s incorrect notify level (must be between %d and %d)\n" +msgstr "" + +#: src/common/command.c:1027 #, c-format -msgid "%s incorrect notify level (must be between 0 and 3)\n" +msgid "%s incorrect buffer for notify (must be channel or private)\n" msgstr "" -#: src/common/command.c:1045 +#: src/common/command.c:1058 #, c-format msgid "%s buffer \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:1079 +#: src/common/command.c:1092 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "" -#: src/common/command.c:1109 +#: src/common/command.c:1122 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1117 +#: src/common/command.c:1130 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1135 src/common/command.c:1210 +#: src/common/command.c:1148 src/common/command.c:1223 #, c-format msgid "%s server not found\n" msgstr "" -#: src/common/command.c:1165 src/common/command.c:1429 -#: src/common/command.c:1572 src/common/command.c:2263 -#: src/common/command.c:2275 +#: src/common/command.c:1178 src/common/command.c:1442 +#: src/common/command.c:1585 src/common/command.c:2276 +#: src/common/command.c:2288 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "" -#: src/common/command.c:1194 +#: src/common/command.c:1207 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1202 +#: src/common/command.c:1215 msgid "Auto-reconnection is cancelled\n" msgstr "" -#: src/common/command.c:1228 src/common/weechat.c:265 +#: src/common/command.c:1241 src/common/weechat.c:265 #, c-format msgid "%s internal commands:\n" msgstr "" -#: src/common/command.c:1237 src/common/weechat.c:285 +#: src/common/command.c:1250 src/common/weechat.c:285 #, c-format msgid "IRC commands:\n" msgstr "" -#: src/common/command.c:1304 +#: src/common/command.c:1317 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "" -#: src/common/command.c:1328 src/common/command.c:1471 +#: src/common/command.c:1341 src/common/command.c:1484 #, c-format msgid "Registered %s scripts:\n" msgstr "" -#: src/common/command.c:1345 src/common/command.c:1368 -#: src/common/command.c:1391 src/common/command.c:1488 -#: src/common/command.c:1511 src/common/command.c:1534 +#: src/common/command.c:1358 src/common/command.c:1381 +#: src/common/command.c:1404 src/common/command.c:1501 +#: src/common/command.c:1524 src/common/command.c:1547 msgid " (none)\n" msgstr "" -#: src/common/command.c:1350 src/common/command.c:1493 +#: src/common/command.c:1363 src/common/command.c:1506 #, c-format msgid "%s message handlers:\n" msgstr "" -#: src/common/command.c:1359 src/common/command.c:1502 +#: src/common/command.c:1372 src/common/command.c:1515 #, c-format msgid " IRC(%s) => %s(%s)\n" msgstr "" -#: src/common/command.c:1373 src/common/command.c:1516 +#: src/common/command.c:1386 src/common/command.c:1529 #, c-format msgid "%s command handlers:\n" msgstr "" -#: src/common/command.c:1382 src/common/command.c:1525 +#: src/common/command.c:1395 src/common/command.c:1538 #, c-format msgid " Command /%s => %s(%s)\n" msgstr "" -#: src/common/command.c:1442 +#: src/common/command.c:1455 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" msgstr "" -#: src/common/command.c:1585 +#: src/common/command.c:1598 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " "script\n" msgstr "" -#: src/common/command.c:1633 +#: src/common/command.c:1646 msgid "No server.\n" msgstr "" -#: src/common/command.c:1644 +#: src/common/command.c:1657 #, c-format msgid "Server '%s' not found.\n" msgstr "" -#: src/common/command.c:1656 +#: src/common/command.c:1669 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "" -#: src/common/command.c:1664 +#: src/common/command.c:1677 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" -#: src/common/command.c:1683 +#: src/common/command.c:1696 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:1691 +#: src/common/command.c:1704 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" "disconnect %s before.\n" msgstr "" -#: src/common/command.c:1707 src/common/command.c:1848 +#: src/common/command.c:1720 src/common/command.c:1861 msgid "Server" msgstr "" -#: src/common/command.c:1710 +#: src/common/command.c:1723 msgid "has been deleted\n" msgstr "" -#: src/common/command.c:1725 +#: src/common/command.c:1738 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "" -#: src/common/command.c:1735 +#: src/common/command.c:1748 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "" -#: src/common/command.c:1760 src/common/command.c:1788 -#: src/common/command.c:1801 src/common/command.c:1827 +#: src/common/command.c:1773 src/common/command.c:1801 +#: src/common/command.c:1814 src/common/command.c:1840 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1773 +#: src/common/command.c:1786 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1814 +#: src/common/command.c:1827 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1851 +#: src/common/command.c:1864 msgid "created\n" msgstr "" -#: src/common/command.c:1857 +#: src/common/command.c:1870 #, c-format msgid "%s unable to create server\n" msgstr "" -#: src/common/command.c:1912 +#: src/common/command.c:1925 msgid "(unknown)" msgstr "" -#: src/common/command.c:1935 +#: src/common/command.c:1948 msgid "(password hidden) " msgstr "" -#: src/common/command.c:1999 +#: src/common/command.c:2012 #, c-format msgid "%s server \"%s\" not found\n" msgstr "" -#: src/common/command.c:2030 src/common/command.c:2076 +#: src/common/command.c:2043 src/common/command.c:2089 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "" -#: src/common/command.c:2035 src/common/command.c:2068 +#: src/common/command.c:2048 src/common/command.c:2081 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "" -#: src/common/command.c:2051 +#: src/common/command.c:2064 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" -#: src/common/command.c:2149 +#: src/common/command.c:2162 #, c-format msgid "No config option found with \"%s\"\n" msgstr "" -#: src/common/command.c:2152 +#: src/common/command.c:2165 msgid "No config option found\n" msgstr "" -#: src/common/command.c:2158 +#: src/common/command.c:2171 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "" -#: src/common/command.c:2161 +#: src/common/command.c:2174 msgid "config option(s) found\n" msgstr "" -#: src/common/command.c:2181 +#: src/common/command.c:2194 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "" -#: src/common/command.c:2191 +#: src/common/command.c:2204 #, c-format msgid "Alias \"%s\" removed\n" msgstr "" -#: src/common/command.c:2211 +#: src/common/command.c:2224 msgid "Opened windows:\n" msgstr "" @@ -3446,108 +3456,118 @@ msgstr "" msgid "automatically rejoin channels when kicked" msgstr "" -#: src/common/weeconfig.c:1057 +#: src/common/weeconfig.c:693 +msgid "notify levels for channels of this server" +msgstr "" + +#: src/common/weeconfig.c:694 +msgid "" +"comma separated list of notify levels for channels of this server (format: " +"#channel:1,..)" +msgstr "" + +#: src/common/weeconfig.c:1082 #, c-format msgid "%s %s, line %d: new server, but previous was incomplete\n" msgstr "" -#: src/common/weeconfig.c:1066 +#: src/common/weeconfig.c:1091 #, c-format msgid "%s %s, line %d: server '%s' already exists\n" msgstr "" -#: src/common/weeconfig.c:1080 +#: src/common/weeconfig.c:1105 #, c-format msgid "%s %s, line %d: unable to create server\n" msgstr "" -#: src/common/weeconfig.c:1119 +#: src/common/weeconfig.c:1144 #, c-format msgid "%s unable to assign default int with string (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1130 +#: src/common/weeconfig.c:1155 #, c-format msgid "%s unable to assign default color (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1169 +#: src/common/weeconfig.c:1194 #, c-format msgid "%s config file \"%s\" not found.\n" msgstr "" -#: src/common/weeconfig.c:1201 +#: src/common/weeconfig.c:1226 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"]\"\n" msgstr "" -#: src/common/weeconfig.c:1218 +#: src/common/weeconfig.c:1243 #, c-format msgid "%s %s, line %d: unknown section identifier (\"%s\")\n" msgstr "" -#: src/common/weeconfig.c:1236 +#: src/common/weeconfig.c:1261 #, c-format msgid "%s %s, line %d: invalid section for option, line is ignored\n" msgstr "" -#: src/common/weeconfig.c:1244 +#: src/common/weeconfig.c:1269 #, c-format msgid "%s %s, line %d: invalid syntax, missing \"=\"\n" msgstr "" -#: src/common/weeconfig.c:1278 +#: src/common/weeconfig.c:1303 #, c-format msgid "%s %s, line %d: invalid option \"%s\"\n" msgstr "" -#: src/common/weeconfig.c:1289 +#: src/common/weeconfig.c:1314 #, c-format msgid "" "%s %s, line %d: invalid value foroption '%s'\n" "Expected: boolean value: 'off' or 'on'\n" msgstr "" -#: src/common/weeconfig.c:1298 +#: src/common/weeconfig.c:1323 #, 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:1309 +#: src/common/weeconfig.c:1334 #, c-format msgid "" "%s %s, line %d: invalid value for option '%s'\n" "Expected: one of these strings: " msgstr "" -#: src/common/weeconfig.c:1325 +#: src/common/weeconfig.c:1350 #, c-format msgid "%s %s, line %d: invalid color name for option '%s'\n" msgstr "" -#: src/common/weeconfig.c:1385 src/common/weeconfig.c:1558 +#: src/common/weeconfig.c:1410 src/common/weeconfig.c:1583 #, c-format msgid "%s cannot create file \"%s\"\n" msgstr "" -#: src/common/weeconfig.c:1391 +#: src/common/weeconfig.c:1416 #, c-format msgid "%s: creating default config file...\n" msgstr "" -#: src/common/weeconfig.c:1392 +#: src/common/weeconfig.c:1417 msgid "Creating default config file\n" msgstr "" -#: src/common/weeconfig.c:1395 src/common/weeconfig.c:1567 +#: src/common/weeconfig.c:1420 src/common/weeconfig.c:1592 #, c-format msgid "" "#\n" "# %s configuration file, created by %s v%s on %s#\n" msgstr "" -#: src/common/weeconfig.c:1564 +#: src/common/weeconfig.c:1589 msgid "Saving config to disk\n" msgstr "" diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c index 123e77922..fa8d4bdcd 100644 --- a/weechat/src/common/command.c +++ b/weechat/src/common/command.c @@ -995,7 +995,8 @@ weechat_cmd_buffer (int argc, char **argv) (ptr_buffer->dcc) ? "DCC" : ((BUFFER_IS_SERVER(ptr_buffer)) ? SERVER(ptr_buffer)->name : CHANNEL(ptr_buffer)->name)); - if (ptr_buffer->dcc) + if ((!BUFFER_IS_CHANNEL(ptr_buffer)) + && (!BUFFER_IS_PRIVATE(ptr_buffer))) gui_printf (NULL, "-"); else gui_printf (NULL, "%d", ptr_buffer->notify_level); @@ -1010,22 +1011,34 @@ weechat_cmd_buffer (int argc, char **argv) number = strtol (argv[1], &error, 10); if ((error) && (error[0] == '\0')) { - if ((number < 0) || (number > 3)) + if ((number < NOTIFY_LEVEL_MIN) || (number > NOTIFY_LEVEL_MAX)) { /* invalid highlight level */ irc_display_prefix (NULL, PREFIX_ERROR); - gui_printf (NULL, _("%s incorrect notify level (must be between 0 and 3)\n"), + gui_printf (NULL, _("%s incorrect notify level (must be between %d and %d)\n"), + WEECHAT_ERROR, NOTIFY_LEVEL_MIN, NOTIFY_LEVEL_MAX); + return -1; + } + if ((!BUFFER_IS_CHANNEL(gui_current_window->buffer)) + && (!BUFFER_IS_PRIVATE(gui_current_window->buffer))) + { + /* invalid buffer type (only ok on channel or private) */ + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, _("%s incorrect buffer for notify (must be channel or private)\n"), WEECHAT_ERROR); return -1; } gui_current_window->buffer->notify_level = number; + channel_set_notify_level (SERVER(gui_current_window->buffer), + CHANNEL(gui_current_window->buffer), + number); } else { /* invalid number */ irc_display_prefix (NULL, PREFIX_ERROR); - gui_printf (NULL, _("%s incorrect notify level (must be between 0 and 3)\n"), - WEECHAT_ERROR); + gui_printf (NULL, _("%s incorrect notify level (must be between %d and %d)\n"), + WEECHAT_ERROR, NOTIFY_LEVEL_MIN, NOTIFY_LEVEL_MAX); return -1; } } @@ -1841,7 +1854,7 @@ weechat_cmd_server (int argc, char **argv) 0, server.address, server.port, server.password, server.nick1, server.nick2, server.nick3, server.username, server.realname, - server.command, 1, server.autojoin, 1); + server.command, 1, server.autojoin, 1, NULL); if (new_server) { irc_display_prefix (NULL, PREFIX_INFO); diff --git a/weechat/src/common/weechat.c b/weechat/src/common/weechat.c index 1e45eda04..3b20f3d5a 100644 --- a/weechat/src/common/weechat.c +++ b/weechat/src/common/weechat.c @@ -371,7 +371,7 @@ wee_parse_args (int argc, char *argv[]) 1, server_tmp.address, server_tmp.port, server_tmp.password, server_tmp.nick1, server_tmp.nick2, server_tmp.nick3, - NULL, NULL, NULL, 0, server_tmp.autojoin, 1)) + NULL, NULL, NULL, 0, server_tmp.autojoin, 1, NULL)) fprintf (stderr, _("%s unable to create server ('%s'), ignored\n"), WEECHAT_WARNING, argv[i]); server_destroy (&server_tmp); diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c index 23a4c7a86..c51f29332 100644 --- a/weechat/src/common/weeconfig.c +++ b/weechat/src/common/weeconfig.c @@ -690,6 +690,10 @@ t_config_option weechat_options_server[] = N_("automatically rejoin channels when kicked"), OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE, NULL, NULL, &(cfg_server.autorejoin), NULL, NULL }, + { "server_notify_levels", N_("notify levels for channels of this server"), + N_("comma separated list of notify levels for channels of this server (format: #channel:1,..)"), + OPTION_TYPE_STRING, 0, 0, 0, + "", NULL, NULL, &(cfg_server.notify_levels), config_change_notify_levels }, { NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL } }; @@ -835,6 +839,23 @@ config_change_fifo_pipe () } /* + * config_change_notify_levels: called when notify levels is changed for a server + */ + +void +config_change_notify_levels () +{ + t_gui_buffer *ptr_buffer; + + for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer) + { + if (BUFFER_IS_CHANNEL(ptr_buffer) || BUFFER_IS_PRIVATE(ptr_buffer)) + ptr_buffer->notify_level = + channel_get_notify_level (SERVER(ptr_buffer), CHANNEL(ptr_buffer)); + } +} + +/* * config_option_set_value: set new value for an option * return: 0 if success * -1 if error (bad value) @@ -919,6 +940,8 @@ config_get_server_option_ptr (t_irc_server *server, char *option_name) return (void *)(&server->autojoin); if (strcasecmp (option_name, "server_autorejoin") == 0) return (void *)(&server->autorejoin); + if (strcasecmp (option_name, "server_notify_levels") == 0) + return (void *)(&server->notify_levels); /* option not found */ return NULL; } @@ -988,6 +1011,8 @@ config_set_server_value (t_irc_server *server, char *option_name, *((char **)ptr_data) = strdup (value); break; } + if (ptr_option->handler_change != NULL) + (void) (ptr_option->handler_change()); return 0; } @@ -1073,7 +1098,7 @@ config_allocate_server (char *filename, int line_number) cfg_server.password, cfg_server.nick1, cfg_server.nick2, cfg_server.nick3, cfg_server.username, cfg_server.realname, cfg_server.command, cfg_server.command_delay, cfg_server.autojoin, - cfg_server.autorejoin)) + cfg_server.autorejoin, cfg_server.notify_levels)) { server_free_all (); gui_printf (NULL, @@ -1661,6 +1686,8 @@ config_write (char *config_name) (ptr_server->autojoin) ? ptr_server->autojoin : ""); fprintf (file, "server_autorejoin=%s\n", (ptr_server->autorejoin) ? "on" : "off"); + fprintf (file, "server_notify_levels=%s\n", + (ptr_server->notify_levels) ? ptr_server->notify_levels : ""); } } diff --git a/weechat/src/common/weeconfig.h b/weechat/src/common/weeconfig.h index 186327a1e..016cc062e 100644 --- a/weechat/src/common/weeconfig.h +++ b/weechat/src/common/weeconfig.h @@ -193,6 +193,7 @@ extern void config_change_buffer_content (); extern void config_change_color (); extern void config_change_away_check (); 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 int config_set_value (char *, char *); diff --git a/weechat/src/gui/gui-common.c b/weechat/src/gui/gui-common.c index e1d9f9112..fb1446c86 100644 --- a/weechat/src/gui/gui-common.c +++ b/weechat/src/gui/gui-common.c @@ -186,7 +186,7 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int dcc, new_buffer->line_complete = 1; /* notify level */ - new_buffer->notify_level = 3; + new_buffer->notify_level = channel_get_notify_level (server, channel); /* create/append to log file */ new_buffer->log_filename = NULL; diff --git a/weechat/src/gui/gui.h b/weechat/src/gui/gui.h index d684f01ba..63d5ab50c 100644 --- a/weechat/src/gui/gui.h +++ b/weechat/src/gui/gui.h @@ -98,6 +98,10 @@ #define gui_printf_nolog(buffer, fmt, argz...) \ gui_printf_type_color(buffer, MSG_TYPE_INFO | MSG_TYPE_NOLOG, -1, fmt, ##argz) +#define NOTIFY_LEVEL_MIN 0 +#define NOTIFY_LEVEL_MAX 3 +#define NOTIFY_LEVEL_DEFAULT NOTIFY_LEVEL_MAX + typedef struct t_gui_message t_gui_message; struct t_gui_message diff --git a/weechat/src/irc/irc-channel.c b/weechat/src/irc/irc-channel.c index b7ffa3a5f..f17596ce5 100644 --- a/weechat/src/irc/irc-channel.c +++ b/weechat/src/irc/irc-channel.c @@ -30,6 +30,7 @@ #include "../common/weechat.h" #include "irc.h" +#include "../gui/gui.h" char *channel_modes = "iklmnst"; @@ -263,6 +264,136 @@ channel_remove_dcc (t_irc_dcc *ptr_dcc) } /* + * channel_get_notify_level: get channel notify level + */ + +int +channel_get_notify_level (t_irc_server *server, t_irc_channel *channel) +{ + char *name, *pos, *pos2, notify; + + if ((!server) || (!channel)) + return NOTIFY_LEVEL_DEFAULT; + + if ((!server->notify_levels) || (!server->notify_levels[0])) + return NOTIFY_LEVEL_DEFAULT; + + name = (char *) malloc (strlen (channel->name) + 2); + strcpy (name, channel->name); + strcat (name, ":"); + pos = strstr (server->notify_levels, name); + free (name); + if (!pos) + return NOTIFY_LEVEL_DEFAULT; + + pos2 = pos + strlen (channel->name); + if (pos2[0] != ':') + return NOTIFY_LEVEL_DEFAULT; + pos2++; + if (!pos2[0]) + return NOTIFY_LEVEL_DEFAULT; + + notify = (int)(pos2[0] - '0'); + if ((notify < NOTIFY_LEVEL_MIN) || (notify > NOTIFY_LEVEL_MAX)) + return NOTIFY_LEVEL_DEFAULT; + else + return notify; +} + +/* + * server_remove_notify_level: remove channel notify from list + */ + +void +channel_remove_notify_level (t_irc_server *server, t_irc_channel *channel) +{ + char *name, *pos, *pos2; + + if ((!server) || (!channel)) + return; + + name = (char *) malloc (strlen (channel->name) + 2); + strcpy (name, channel->name); + strcat (name, ":"); + pos = strstr (server->notify_levels, name); + free (name); + if (pos) + { + pos2 = pos + strlen (channel->name); + if (pos2[0] == ':') + { + pos2++; + if (pos2[0]) + { + pos2++; + if (pos2[0] == ',') + pos2++; + if (!pos2[0] && (pos != server->notify_levels)) + pos--; + strcpy (pos, pos2); + server->notify_levels = (char *) realloc (server->notify_levels, + strlen (server->notify_levels) + 1); + } + } + } +} + +/* + * server_set_notify_level: set channel notify level + */ + +void +channel_set_notify_level (t_irc_server *server, t_irc_channel *channel, int notify) +{ + char *name, *pos, *pos2, level_string[2]; + + if ((!server) || (!channel)) + return; + + if (notify == NOTIFY_LEVEL_DEFAULT) + { + channel_remove_notify_level (server, channel); + return; + } + + if (!server->notify_levels) + { + server->notify_levels = (char *) malloc (strlen (channel->name) + 3); + server->notify_levels[0] = '\0'; + } + else + { + name = (char *) malloc (strlen (channel->name) + 2); + strcpy (name, channel->name); + strcat (name, ":"); + pos = strstr (server->notify_levels, name); + free (name); + if (pos) + { + pos2 = pos + strlen (channel->name) + 1; + if (pos2[0]) + { + pos2[0] = '0' + notify; + return; + } + } + /* realloc notify list to add channel */ + server->notify_levels = (char *) realloc (server->notify_levels, + strlen (server->notify_levels) + 1 + + strlen (channel->name) + 2 + 1); + } + + /* channel not in notify list => add it */ + if (server->notify_levels[0]) + strcat (server->notify_levels, ","); + strcat (server->notify_levels, channel->name); + strcat (server->notify_levels, ":"); + level_string[0] = notify + '0'; + level_string[1] = '\0'; + strcat (server->notify_levels, level_string); +} + +/* * channel_print_log: print channel infos in log (usually for crash dump) */ diff --git a/weechat/src/irc/irc-display.c b/weechat/src/irc/irc-display.c index 4b5212fa3..1fd1e045c 100644 --- a/weechat/src/irc/irc-display.c +++ b/weechat/src/irc/irc-display.c @@ -202,4 +202,8 @@ irc_display_server (t_irc_server *server) " server_autojoin . . . . .: %s\n", (server->autojoin && server->autojoin[0]) ? server->autojoin : ""); + gui_printf_color (NULL, COLOR_WIN_CHAT, + " server_notify_levels . . .: %s\n", + (server->notify_levels && server->notify_levels[0]) ? + server->notify_levels : ""); } diff --git a/weechat/src/irc/irc-server.c b/weechat/src/irc/irc-server.c index ec7312739..e1cbf5453 100644 --- a/weechat/src/irc/irc-server.c +++ b/weechat/src/irc/irc-server.c @@ -77,6 +77,7 @@ server_init (t_irc_server *server) server->command_delay = 1; server->autojoin = NULL; server->autorejoin = 0; + server->notify_levels = NULL; /* internal vars */ server->child_pid = 0; @@ -256,6 +257,10 @@ server_destroy (t_irc_server *server) free (server->command); if (server->autojoin) free (server->autojoin); + if (server->notify_levels) + free (server->notify_levels); + if (server->unterminated_message) + free (server->unterminated_message); if (server->nick) free (server->nick); if (server->channels) @@ -315,7 +320,7 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de int command_line, char *address, int port, char *password, char *nick1, char *nick2, char *nick3, char *username, char *realname, char *command, int command_delay, char *autojoin, - int autorejoin) + int autorejoin, char *notify_levels) { t_irc_server *new_server; @@ -325,12 +330,12 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de #ifdef DEBUG wee_log_printf ("Creating new server (name:%s, address:%s, port:%d, pwd:%s, " "nick1:%s, nick2:%s, nick3:%s, username:%s, realname:%s, " - "command:%s, autojoin:%s, autorejoin:%s)\n", + "command:%s, autojoin:%s, autorejoin:%s, notify_levels:%s)\n", name, address, port, (password) ? password : "", (nick1) ? nick1 : "", (nick2) ? nick2 : "", (nick3) ? nick3 : "", (username) ? username : "", (realname) ? realname : "", (command) ? command : "", (autojoin) ? autojoin : "", - (autorejoin) ? "on" : "off"); + (autorejoin) ? "on" : "off", (notify_levels) ? notify_levels : ""); #endif if ((new_server = server_alloc ())) @@ -357,6 +362,8 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de (autojoin) ? strdup (autojoin) : NULL; new_server->autorejoin = autorejoin; new_server->nick = strdup (new_server->nick1); + new_server->notify_levels = + (notify_levels) ? strdup (notify_levels) : NULL; } else return NULL; @@ -1155,6 +1162,7 @@ server_print_log (t_irc_server *server) wee_log_printf (" command_delay . . . : %d\n", server->command_delay); wee_log_printf (" autojoin. . . . . . : '%s'\n", server->autojoin); wee_log_printf (" autorejoin. . . . . : %d\n", server->autorejoin); + wee_log_printf (" notify_levels . . . : %s\n", server->notify_levels); wee_log_printf (" child_pid . . . . . : %d\n", server->child_pid); wee_log_printf (" child_read . . . . : %d\n", server->child_read); wee_log_printf (" child_write . . . . : %d\n", server->child_write); diff --git a/weechat/src/irc/irc.h b/weechat/src/irc/irc.h index 73da3e2d0..e397937d0 100644 --- a/weechat/src/irc/irc.h +++ b/weechat/src/irc/irc.h @@ -147,6 +147,7 @@ struct t_irc_server int command_delay; /* delay after execution of command */ char *autojoin; /* channels to automatically join */ int autorejoin; /* auto rejoin channels when kicked */ + char *notify_levels; /* channels notify levels */ /* internal vars */ pid_t child_pid; /* pid of child process (connecting) */ @@ -250,7 +251,7 @@ extern void server_free (t_irc_server *); extern void server_free_all (); extern t_irc_server *server_new (char *, int, int, int, int, char *, int, char *, char *, char *, char *, char *, char *, char *, - int, char *, int); + int, char *, int, char *); extern int server_send (t_irc_server *, char *, int); extern void server_sendf (t_irc_server *, char *, ...); extern void server_recv (t_irc_server *); @@ -280,6 +281,9 @@ extern void channel_check_away (t_irc_server *, t_irc_channel *); extern void channel_set_away (t_irc_channel *, char *, int); extern int channel_create_dcc (t_irc_dcc *); extern void channel_remove_dcc (t_irc_dcc *); +extern int channel_get_notify_level (t_irc_server *, t_irc_channel *); +extern void channel_remove_notify_level (t_irc_server *, t_irc_channel *); +extern void channel_set_notify_level (t_irc_server *, t_irc_channel *, int); extern void channel_print_log (t_irc_channel *); /* nick functions (irc-nick.c) */ |