diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2005-05-05 16:26:34 +0000 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2005-05-05 16:26:34 +0000 |
| commit | c8ad30020ba80fa1a27d21385a6f2869830b91c0 (patch) | |
| tree | 589fcc057b4641a348a0b2ca7277770069a107c1 | |
| parent | c6fc8bd1479a046e5a0e9ba5f344ebfdc9ce4bd1 (diff) | |
| download | weechat-c8ad30020ba80fa1a27d21385a6f2869830b91c0.zip | |
Improved Perl interface and some changes in Python:
- function "print_with_channel" was removed
- function "command" now runs weechat command or send text to channel
- Perl functions are now called with weechat::name (instead of IRC::name)
- IRC::xxx functions are still active for compatibility with old scripts
34 files changed, 2250 insertions, 2048 deletions
@@ -1,10 +1,10 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -WeeChat known bugs, 2005-03-20 +WeeChat known bugs, 2005-05-05 - ./configure does not check that Gtk 2.0 libraries are installed -- ./configure does not check that Perl headers & libraries are installed +- ./configure does not check that Perl/Python headers & libraries are installed - too much nicks in the channel (> height of window) => some nicks are hidden - when quitting WeeChat term title is not restored (if look_set_title is ON) - command name for /server can not contain spaces @@ -1,11 +1,11 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2005-05-01 +ChangeLog - 2005-05-05 Version 0.1.2 (under dev!): - * added Python plugin support + * added Python plugin support, improved Perl interface * added nicklist scroll keys (Alt+{home/end/pgup/pgdn} or F11/F12) * added transfer rate for DCC files * added "-all" option for /nick command @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.2-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-05-01 20:47+0200\n" -"PO-Revision-Date: 2005-05-01 20:48+0200\n" +"POT-Creation-Date: 2005-05-05 17:58+0200\n" +"PO-Revision-Date: 2005-05-05 17:02+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" @@ -88,8 +88,8 @@ msgstr "%s: conectando a %s:%d...\n" #: src/irc/irc-server.c:846 #, c-format -msgid "connecting to server %s:%d...\n" -msgstr "conectando al servidor %s:%d...\n" +msgid "Connecting to server %s:%d...\n" +msgstr "Conectando al servidor %s:%d...\n" #: src/irc/irc-server.c:857 #, c-format @@ -1300,8 +1300,8 @@ 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:1129 src/common/command.c:1411 -#: src/common/command.c:1552 +#: src/common/command.c:1129 src/common/command.c:1413 +#: src/common/command.c:1556 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s número de argumentos incorrecto para el comando \"%s\"\n" @@ -1554,7 +1554,7 @@ msgstr "%s no es posible analizar el comando \"%s\"\n" msgid "%s unknown DCC CHAT type received from " msgstr "%s tipo DCC CHAT desconocido recibido de " -#: src/irc/irc-recv.c:1496 src/irc/irc-dcc.c:801 +#: src/irc/irc-recv.c:1496 src/irc/irc-dcc.c:799 #, c-format msgid "Private %s> %s" msgstr "Privado %s> %s" @@ -1782,31 +1782,31 @@ msgstr "Falló" msgid "Aborted" msgstr "Abortado" -#: src/irc/irc-dcc.c:192 +#: src/irc/irc-dcc.c:190 msgid "DCC: file " msgstr "DCC: fichero " -#: src/irc/irc-dcc.c:197 src/irc/irc-dcc.c:456 +#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:454 msgid " (local filename: " msgstr " (nombre de fichero local: " -#: src/irc/irc-dcc.c:203 +#: src/irc/irc-dcc.c:201 msgid ") sent to " msgstr ") enviado a " -#: src/irc/irc-dcc.c:205 +#: src/irc/irc-dcc.c:203 msgid ") received from " msgstr ") recibido de " -#: src/irc/irc-dcc.c:210 +#: src/irc/irc-dcc.c:208 msgid ": ok!\n" msgstr ": ok!\n" -#: src/irc/irc-dcc.c:222 +#: src/irc/irc-dcc.c:220 msgid "DCC chat closed with " msgstr "DCC chat cerrada con " -#: src/irc/irc-dcc.c:263 +#: src/irc/irc-dcc.c:261 #, c-format msgid "" "%s can't associate DCC chat with private buffer (maybe private buffer has " @@ -1815,74 +1815,74 @@ msgstr "" "%s no se puede asociar la conversación DCC con el búfer privado (quizá el " "búfer privado ya tiene DCC CHAT)\n" -#: src/irc/irc-dcc.c:273 +#: src/irc/irc-dcc.c:271 msgid "Connected to " msgstr "Conectado al " -#: src/irc/irc-dcc.c:282 +#: src/irc/irc-dcc.c:280 msgid "via DCC chat\n" msgstr "con charla DCC\n" -#: src/irc/irc-dcc.c:393 +#: src/irc/irc-dcc.c:391 #, c-format msgid "%s not enough memory for new DCC\n" msgstr "%s no hay memoria suficiente para un nuevo DCC\n" -#: src/irc/irc-dcc.c:412 +#: src/irc/irc-dcc.c:410 msgid "DCC chat" msgstr "Charla DCC" -#: src/irc/irc-dcc.c:436 +#: src/irc/irc-dcc.c:434 msgid "Incoming DCC file from " msgstr "Recibir fichero DCC de " -#: src/irc/irc-dcc.c:447 src/irc/irc-dcc.c:460 +#: src/irc/irc-dcc.c:445 src/irc/irc-dcc.c:458 msgid " bytes\n" msgstr " bytes\n" -#: src/irc/irc-dcc.c:452 +#: src/irc/irc-dcc.c:450 msgid "Sending DCC file to " msgstr "Enviar fichero DCC a " -#: src/irc/irc-dcc.c:465 +#: src/irc/irc-dcc.c:463 msgid "Incoming DCC chat request from " msgstr "Recibir DCC chat de " -#: src/irc/irc-dcc.c:476 +#: src/irc/irc-dcc.c:474 msgid "Sending DCC chat request to " msgstr "Enviar DCC chat a " -#: src/irc/irc-dcc.c:540 +#: src/irc/irc-dcc.c:538 #, c-format msgid "%s not enough memory for DCC SEND\n" msgstr "%s no hay memoria suficiente para el DCC SEND\n" -#: src/irc/irc-dcc.c:562 +#: src/irc/irc-dcc.c:560 #, c-format msgid "%s cannot access file \"%s\"\n" msgstr "%s no es posible acceder al fichero \"%s\"\n" -#: src/irc/irc-dcc.c:583 +#: src/irc/irc-dcc.c:581 #, c-format msgid "%s cannot create socket for DCC\n" msgstr "%s no es posible crear socket para el DCC\n" -#: src/irc/irc-dcc.c:596 +#: src/irc/irc-dcc.c:594 #, c-format msgid "%s cannot find port for DCC\n" msgstr "%s no es posible encontrar el puerto para el DCC\n" -#: src/irc/irc-dcc.c:643 +#: src/irc/irc-dcc.c:641 #, c-format msgid "%s cannot send DCC\n" msgstr "%s no es posible enviar el DCC\n" -#: src/irc/irc-dcc.c:722 +#: src/irc/irc-dcc.c:720 #, c-format msgid "%s error sending data to \"%s\" via DCC CHAT\n" msgstr "%s error enviando datos al \"%s\" con DCC CHAT\n" -#: src/irc/irc-dcc.c:982 +#: src/irc/irc-dcc.c:980 #, c-format msgid "" "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" " @@ -1891,208 +1891,127 @@ msgstr "" "%s El DCC ha fallado porque el tamaño de bloque es demasiado grande. " "Compruebe el valor de la opción \"dcc_blocksize\", el máximo es %d.\n" -#: src/irc/irc-dcc.c:1056 +#: src/irc/irc-dcc.c:1054 #, c-format -msgid "aborting active DCC: \"%s\" from %s\n" -msgstr "abandonar el DCC activo: \"%s\" de %s\n" +msgid "Aborting active DCC: \"%s\" from %s\n" +msgstr "Abandonar el DCC activo: \"%s\" de %s\n" -#: src/plugins/perl/wee-perl.c:84 +#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:468 +#: src/plugins/python/wee-python.c:81 #, c-format msgid "" -"Perl error: unable to register Perl script \"%s\" (another script already " -"exists with this name)\n" +"%s error: unable to register \"%s\" script (another script already exists " +"with this name)\n" msgstr "" -"Error de Perl: no ha sido posible registrar el Perl script \"%s\" (ya existe " -"otro script con ese nombre)\n" +"Error de %s: no ha sido posible registrar el script \"%s\" (ya existe otro " +"script con ese nombre)\n" -#: src/plugins/perl/wee-perl.c:108 +#: src/plugins/perl/wee-perl.c:112 src/plugins/perl/wee-perl.c:492 +#: src/plugins/python/wee-python.c:105 #, c-format -msgid "registered Perl script: \"%s\", version %s (%s)\n" -msgstr "Perl script registrado: \"%s\", versión %s (%s)\n" +msgid "Registered %s script: \"%s\", version %s (%s)\n" +msgstr "%s script registrado: \"%s\", versión %s (%s)\n" -#: src/plugins/perl/wee-perl.c:115 +#: src/plugins/perl/wee-perl.c:119 src/plugins/perl/wee-perl.c:499 +#: src/plugins/python/wee-python.c:112 #, c-format -msgid "%s unable to load Perl script \"%s\" (not enough memory)\n" -msgstr "" -"%s no ha sido posible cargar el Perl script \"%s\" (memoria insuficiente)\n" - -#: src/plugins/perl/wee-perl.c:224 -msgid "Perl error: wrong parameters for IRC::print_infobar Perl function\n" -msgstr "" -"Error de Perl: parámetros incorrectos para la función Perl IRC::" -"print_infobar\n" - -#: src/plugins/perl/wee-perl.c:257 -msgid "Perl error: server not found for IRC::command Perl function\n" +msgid "%s error: unable to load script \"%s\" (not enough memory)\n" msgstr "" -"Error de Perl: servidor no encontrado para la función Perl IRC::command\n" - -#: src/plugins/perl/wee-perl.c:358 -msgid "Perl error: server not found for IRC::get_info Perl function\n" -msgstr "" -"Error de Perl: servidor no encontrado para la función Perl IRC::get_info\n" +"Error de %s: no ha sido posible cargar el script \"%s\" (memoria " +"insuficiente)\n" -#: src/plugins/perl/wee-perl.c:527 +#: src/plugins/perl/wee-perl.c:234 src/plugins/perl/wee-perl.c:525 +#: src/plugins/perl/wee-perl.c:573 src/plugins/perl/wee-perl.c:600 +#: src/plugins/perl/wee-perl.c:645 src/plugins/perl/wee-perl.c:675 +#: src/plugins/perl/wee-perl.c:715 src/plugins/python/wee-python.c:60 +#: src/plugins/python/wee-python.c:142 src/plugins/python/wee-python.c:179 +#: src/plugins/python/wee-python.c:211 src/plugins/python/wee-python.c:243 +#: src/plugins/python/wee-python.c:272 src/plugins/python/wee-python.c:311 #, c-format -msgid "Perl error: %s\n" -msgstr "Error de Perl: %s\n" +msgid "%s error: wrong parameters for \"%s\" function\n" +msgstr "Error de %s: parámetros incorrectos para la función \"%s\"\n" -#: src/plugins/perl/wee-perl.c:537 +#: src/plugins/perl/wee-perl.c:270 src/plugins/perl/wee-perl.c:378 +#: src/plugins/perl/wee-perl.c:732 src/plugins/python/wee-python.c:331 #, c-format -msgid "Perl error: too much values from \"%s\" (%d). Expected: 1.\n" -msgstr "Error de Perl: demasiados valores desde \"%s\" (%d). Esperado: 1.\n" +msgid "%s error: server not found for \"%s\" function\n" +msgstr "Error de %s: servidor no encontrado para el comando \"%s\"\n" -#: src/plugins/perl/wee-perl.c:559 +#: src/plugins/perl/wee-perl.c:850 src/plugins/python/wee-python.c:408 #, c-format -msgid "loading Perl script \"%s\"\n" -msgstr "carga del Perl script \"%s\"\n" +msgid "Loading %s module \"weechat\"\n" +msgstr "" -#: src/plugins/perl/wee-perl.c:561 +#: src/plugins/perl/wee-perl.c:909 #, c-format -msgid "Loading Perl script \"%s\"\n" -msgstr "Cargando Perl script \"%s\"\n" +msgid "Perl error: %s" +msgstr "Error de Perl: %s" -#: src/plugins/perl/wee-perl.c:610 +#: src/plugins/perl/wee-perl.c:919 #, c-format -msgid "unloading Perl script \"%s\"\n" -msgstr "descarga del Perl script \"%s\"\n" - -#: src/plugins/perl/wee-perl.c:627 -msgid "unloading all Perl scripts...\n" -msgstr "descargando todos los Perl scripts...\n" - -#: src/plugins/python/wee-python.c:61 src/plugins/python/wee-python.c:170 -msgid "" -"Python error: wrong parameters for 'print_with_channel' Python function\n" -msgstr "" -"Error de Python: parámetros incorrectos para la función Python " -"'print_with_channel'\n" +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/python/wee-python.c:81 +#: 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 #, c-format -msgid "" -"Python error: unable to register Python script \"%s\" (another script " -"already exists with this name)\n" -msgstr "" -"Error de Python: no ha sido posible registrar el Python script \"%s\" (ya " -"existe otro script con ese nombre)\n" +msgid "Loading %s script \"%s\"\n" +msgstr "Cargando %s script \"%s\"\n" -#: src/plugins/python/wee-python.c:105 +#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:612 #, c-format -msgid "registered Python script: \"%s\", version %s (%s)\n" -msgstr "Python script registrado: \"%s\", versión %s (%s)\n" +msgid "Unloading %s script \"%s\"\n" +msgstr "Descarga del %s script \"%s\"\n" -#: src/plugins/python/wee-python.c:112 +#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:629 #, c-format -msgid "%s unable to load Python script \"%s\" (not enough memory)\n" -msgstr "" -"%s no ha sido posible cargar el Python script \"%s\" (memoria insuficiente)\n" - -#: src/plugins/python/wee-python.c:137 -msgid "Python error: wrong parameters for 'print' Python function\n" -msgstr "" -"Error de Python: parámetros incorrectos para la función Python 'print'\n" - -#: src/plugins/python/wee-python.c:222 -msgid "Python error: wrong parameters for 'print_infobar' Python function\n" -msgstr "" -"Error de Python: parámetros incorrectos para la función Python " -"'print_infobar'\n" - -#: src/plugins/python/wee-python.c:249 -msgid "Python error: wrong parameters for 'command' Python function\n" -msgstr "" -"Error de Python: parámetros incorrectos para la función Python 'command'\n" - -#: src/plugins/python/wee-python.c:268 -msgid "Python error: server not found for 'command' Python function\n" -msgstr "" -"Error de Python: servidor no encontrado para la función Python 'command'\n" - -#: src/plugins/python/wee-python.c:303 -msgid "" -"Python error: wrong parameters for 'add_message_handler' Python function\n" -msgstr "" -"Error de Python: parámetros incorrectos para la función Python " -"'add_message_handler'\n" +msgid "Unloading all %s scripts...\n" +msgstr "Descargando todos los %s scripts...\n" -#: src/plugins/python/wee-python.c:332 -msgid "" -"Python error: wrong parameters for 'add_command_handler' Python function\n" -msgstr "" -"Error de Python: parámetros incorrectos para la función Python " -"'add_command_handler'\n" - -#: src/plugins/python/wee-python.c:371 -msgid "Python error: wrong parameters for 'get_info' Python function\n" -msgstr "" -"Error de Python: parámetros incorrectos para la función Python 'get_info'\n" - -#: src/plugins/python/wee-python.c:390 -msgid "Python error: server not found for 'get_info' Python function\n" -msgstr "" -"Error de Python: servidor no encontrado para la función Python 'get_info'\n" - -#: src/plugins/python/wee-python.c:462 -msgid "Python error: error while launching Python interpreter\n" -msgstr "" - -#: src/plugins/python/wee-python.c:468 -msgid "Loading Python module \"weechat\"\n" -msgstr "" - -#: src/plugins/python/wee-python.c:519 src/plugins/python/wee-python.c:547 -#: src/plugins/python/wee-python.c:578 +#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:634 #, c-format -msgid "" -"Python error: unable to run function \"%s\"in Python script (not enough " -"memory)\n" -msgstr "" +msgid "%s scripts unloaded\n" +msgstr "%s scripts descargados\n" -#: src/plugins/python/wee-python.c:569 +#: src/plugins/python/wee-python.c:403 #, c-format -msgid "Python error: error while running function \"%s\"\n" +msgid "%s error: error while launching interpreter\n" msgstr "" -#: src/plugins/python/wee-python.c:599 +#: src/plugins/python/wee-python.c:460 src/plugins/python/wee-python.c:488 +#: src/plugins/python/wee-python.c:520 #, c-format -msgid "loading Python script \"%s\"\n" -msgstr "carga del Python script \"%s\"\n" +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:601 +#: src/plugins/python/wee-python.c:510 #, c-format -msgid "Loading Python script \"%s\"\n" -msgstr "Cargando Python script \"%s\"\n" +msgid "%s error: error while running function \"%s\"\n" +msgstr "" -#: src/plugins/python/wee-python.c:607 +#: src/plugins/python/wee-python.c:549 #, c-format -msgid "Python error: error while opening file \"%s\"\n" +msgid "%s error: error while opening file \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:615 +#: src/plugins/python/wee-python.c:558 #, c-format -msgid "Python error: error while parsing file \"%s\"\n" +msgid "%s error: error while parsing file \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:668 +#: src/plugins/python/wee-python.c:660 #, c-format -msgid "unloading Python script \"%s\"\n" -msgstr "descarga del Python script \"%s\"\n" - -#: src/plugins/python/wee-python.c:685 -msgid "unloading all Python scripts...\n" -msgstr "descargando todos los Python scripts...\n" - -#: src/plugins/python/wee-python.c:711 -msgid "Python error: error while freeing Python interpreter\n" +msgid "%s error: error while freeing interpreter\n" msgstr "" #: src/plugins/plugins.c:93 #, c-format -msgid "auto-loading %s script: %s%s%s\n" -msgstr "carga automática del script %s : %s%s%s\n" +msgid "Auto-loading %s script: %s%s%s\n" +msgstr "Carga automática del script %s : %s%s%s\n" -#: src/plugins/plugins.c:211 +#: src/plugins/plugins.c:212 #, c-format msgid "%s unable to add handler for \"%s\" message (not enough memory)\n" msgstr "" @@ -2167,19 +2086,16 @@ msgid "server" msgstr "servidor" #: src/gui/gui-common.c:330 -#, c-format -msgid "%s not enough memory for infobar message\n" -msgstr "" -"%s no hay suficiente memoria para el mensaje de la barra de información\n" +msgid "Not enough memory for infobar message\n" +msgstr "No hay suficiente memoria para el mensaje de la barra de información\n" -#: src/gui/gui-common.c:506 -#, c-format -msgid "%s not enough memory for new line!\n" -msgstr "%s ¡no hay suficiente memoria para una nueva línea!\n" +#: src/gui/gui-common.c:505 +msgid "Not enough memory for new line\n" +msgstr "No hay suficiente memoria para una nueva línea\n" -#: src/gui/gui-common.c:549 -msgid "not enough memory!\n" -msgstr "¡no hay suficiente memoria!\n" +#: src/gui/gui-common.c:548 +msgid "Not enough memory for new message\n" +msgstr "No hay suficiente memoria para el mensaje de la barra de información\n" #: src/common/command.c:42 msgid "create an alias for a command" @@ -2292,8 +2208,8 @@ msgid "list/load/unload Perl scripts" msgstr "lista/carga/descarga de los Perl scripts" #: src/common/command.c:76 src/common/command.c:81 -msgid "[load filename] | [autoload] | [unload]" -msgstr "[load fichero] | [autoload] | [unload]" +msgid "[load filename] | [autoload] | [reload] | [unload]" +msgstr "[load fichero] | [autoload] | [reload] | [unload]" #: src/common/command.c:77 msgid "" @@ -2575,9 +2491,9 @@ msgstr "%s actualmente conectando al servidor \"%s\"!\n" msgid "%s server not found\n" msgstr "%s servidor no encontrado\n" -#: src/common/command.c:1142 src/common/command.c:1404 -#: src/common/command.c:1545 src/common/command.c:2236 -#: src/common/command.c:2248 +#: src/common/command.c:1142 src/common/command.c:1406 +#: src/common/command.c:1549 src/common/command.c:2240 +#: src/common/command.c:2252 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s opción desconocida para el comando \"%s\"\n" @@ -2606,39 +2522,38 @@ msgstr "Comandos IRC :\n" 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:1305 -msgid "Registered Perl scripts:\n" -msgstr "Perl scripts registrados:\n" +#: src/common/command.c:1305 src/common/command.c:1448 +#, c-format +msgid "Registered %s scripts:\n" +msgstr "%s scripts registrados:\n" -#: src/common/command.c:1322 src/common/command.c:1344 -#: src/common/command.c:1366 src/common/command.c:1463 -#: src/common/command.c:1485 src/common/command.c:1507 +#: src/common/command.c:1322 src/common/command.c:1345 +#: src/common/command.c:1368 src/common/command.c:1465 +#: src/common/command.c:1488 src/common/command.c:1511 msgid " (none)\n" msgstr " (ninguno)\n" -#: src/common/command.c:1327 -msgid "Perl message handlers:\n" -msgstr "Funciones Perl para mensajes:\n" - -#: src/common/command.c:1336 +#: src/common/command.c:1327 src/common/command.c:1470 #, c-format -msgid " IRC(%s) => Perl(%s)\n" -msgstr " IRC(%s) => Perl(%s)\n" +msgid "%s message handlers:\n" +msgstr "Funciones %s para mensajes:\n" -#: src/common/command.c:1349 -msgid "Perl command handlers:\n" -msgstr "Comandos Perl :\n" +#: src/common/command.c:1336 src/common/command.c:1479 +#, c-format +msgid " IRC(%s) => %s(%s)\n" +msgstr " IRC(%s) => %s(%s)\n" -#: src/common/command.c:1358 +#: src/common/command.c:1350 src/common/command.c:1493 #, c-format -msgid " Command /%s => Perl(%s)\n" -msgstr " Comando /%s => Perl(%s)\n" +msgid "%s command handlers:\n" +msgstr "Comandos %s :\n" -#: src/common/command.c:1378 -msgid "Perl scripts unloaded\n" -msgstr "Perl scripts descargados\n" +#: src/common/command.c:1359 src/common/command.c:1502 +#, c-format +msgid " Command /%s => %s(%s)\n" +msgstr " Comando /%s => %s(%s)\n" -#: src/common/command.c:1417 +#: src/common/command.c:1419 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" @@ -2647,33 +2562,7 @@ msgstr "" "Por favor, recompile WeeChat con la opción \"--enable-perl\" para el " "script ./configure\n" -#: src/common/command.c:1446 -msgid "Registered Python scripts:\n" -msgstr "Python scripts registrados:\n" - -#: src/common/command.c:1468 -msgid "Python message handlers:\n" -msgstr "Funciones Python para mensajes:\n" - -#: src/common/command.c:1477 -#, c-format -msgid " IRC(%s) => Python(%s)\n" -msgstr " IRC(%s) => Python(%s)\n" - -#: src/common/command.c:1490 -msgid "Python command handlers:\n" -msgstr "Comandos Python :\n" - -#: src/common/command.c:1499 -#, c-format -msgid " Command /%s => Python(%s)\n" -msgstr " Comando /%s => Python(%s)\n" - -#: src/common/command.c:1519 -msgid "Python scripts unloaded\n" -msgstr "Python scripts descargados\n" - -#: src/common/command.c:1558 +#: src/common/command.c:1562 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " @@ -2683,32 +2572,32 @@ msgstr "" "Por favor, recompile WeeChat con la opción \"--enable-python\" para el " "script ./configure\n" -#: src/common/command.c:1606 +#: src/common/command.c:1610 msgid "No server.\n" msgstr "Ningún servidor.\n" -#: src/common/command.c:1617 +#: src/common/command.c:1621 #, c-format msgid "Server '%s' not found.\n" msgstr "Servidor '%s' no encontrado.\n" -#: src/common/command.c:1629 +#: src/common/command.c:1633 #, 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:1637 +#: src/common/command.c:1641 #, 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:1656 +#: src/common/command.c:1660 #, 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:1664 +#: src/common/command.c:1668 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -2717,108 +2606,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:1680 src/common/command.c:1821 +#: src/common/command.c:1684 src/common/command.c:1825 msgid "Server" msgstr "Servidor" -#: src/common/command.c:1683 +#: src/common/command.c:1687 msgid "has been deleted\n" msgstr "ha sido eliminado\n" -#: src/common/command.c:1698 +#: src/common/command.c:1702 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s faltan parámetros para el comando \"%s\"\n" -#: src/common/command.c:1708 +#: src/common/command.c:1712 #, 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:1733 src/common/command.c:1761 -#: src/common/command.c:1774 src/common/command.c:1800 +#: src/common/command.c:1737 src/common/command.c:1765 +#: src/common/command.c:1778 src/common/command.c:1804 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s falta contraseña para el comando \"%s\"\n" -#: src/common/command.c:1746 +#: src/common/command.c:1750 #, 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:1787 +#: src/common/command.c:1791 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s falta comando para el parámetro \"%s\"\n" -#: src/common/command.c:1824 +#: src/common/command.c:1828 msgid "created\n" msgstr "creado\n" -#: src/common/command.c:1830 +#: src/common/command.c:1834 #, c-format msgid "%s unable to create server\n" msgstr "%s no es posible crear el servidor\n" -#: src/common/command.c:1885 +#: src/common/command.c:1889 msgid "(unknown)" msgstr "(desconocido)" -#: src/common/command.c:1908 +#: src/common/command.c:1912 msgid "(password hidden) " msgstr "(contraseña oculta) " -#: src/common/command.c:1972 +#: src/common/command.c:1976 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s servidor \"%s\" no encontrado\n" -#: src/common/command.c:2003 src/common/command.c:2049 +#: src/common/command.c:2007 src/common/command.c:2053 #, 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:2008 src/common/command.c:2041 +#: src/common/command.c:2012 src/common/command.c:2045 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valor incorrecto para la opción \"%s\"\n" -#: src/common/command.c:2024 +#: src/common/command.c:2028 #, 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:2122 +#: src/common/command.c:2126 #, 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:2125 +#: src/common/command.c:2129 msgid "No config option found\n" msgstr "Ninguna opción de configuración encontrada\n" -#: src/common/command.c:2131 +#: src/common/command.c:2135 #, 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:2134 +#: src/common/command.c:2138 msgid "config option(s) found\n" msgstr "opción/opciones de configuración encontrada(s)\n" -#: src/common/command.c:2154 +#: src/common/command.c:2158 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias o comando \"%s\" no encontrado\n" -#: src/common/command.c:2164 +#: src/common/command.c:2168 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" eliminado\n" -#: src/common/command.c:2184 +#: src/common/command.c:2188 msgid "Opened windows:\n" msgstr "Ventanas abiertas:\n" @@ -2835,7 +2724,7 @@ msgstr "%s no ha sido posible abrir la tubería FIFO (%s) para leer\n" #: src/common/fifo.c:89 msgid "FIFO pipe is open\n" -msgstr "la tubería FIFO está abierta\n" +msgstr "La tubería FIFO está abierta\n" #: src/common/fifo.c:121 #, c-format @@ -2864,7 +2753,7 @@ msgstr "%s error al leer la tubería FIFO, cerrándola\n" #: src/common/fifo.c:309 msgid "FIFO pipe is closed\n" -msgstr "la tubería FIFO está cerrada\n" +msgstr "La tubería FIFO está cerrada\n" #: src/common/hotlist.c:102 #, c-format @@ -3897,8 +3786,8 @@ msgid "%s: creating default config file...\n" msgstr "%s: creando fichero de configuración por defecto...\n" #: src/common/weeconfig.c:1392 -msgid "creating default config file\n" -msgstr "creando fichero de configuración por defecto\n" +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 #, c-format @@ -3910,5 +3799,5 @@ msgstr "" "# %s: fichero de configuración, creado por %s v%s el %s#\n" #: src/common/weeconfig.c:1564 -msgid "saving config to disk\n" -msgstr "guardar configuración a disco\n" +msgid "Saving config to disk\n" +msgstr "Guardar configuración a disco\n" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.2-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-05-01 20:47+0200\n" -"PO-Revision-Date: 2005-05-01 20:47+0200\n" +"POT-Creation-Date: 2005-05-05 17:58+0200\n" +"PO-Revision-Date: 2005-05-05 17:02+0200\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -88,8 +88,8 @@ msgstr "%s: connexion à %s:%d...\n" #: src/irc/irc-server.c:846 #, c-format -msgid "connecting to server %s:%d...\n" -msgstr "connexion au serveur %s:%d...\n" +msgid "Connecting to server %s:%d...\n" +msgstr "Connexion au serveur %s:%d...\n" #: src/irc/irc-server.c:857 #, c-format @@ -1302,8 +1302,8 @@ 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:1129 src/common/command.c:1411 -#: src/common/command.c:1552 +#: src/common/command.c:1129 src/common/command.c:1413 +#: src/common/command.c:1556 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n" @@ -1556,7 +1556,7 @@ msgstr "%s impossible d'analyser la commande \"%s\"\n" msgid "%s unknown DCC CHAT type received from " msgstr "%s type de DCC CHAT inconnu reçu de " -#: src/irc/irc-recv.c:1496 src/irc/irc-dcc.c:801 +#: src/irc/irc-recv.c:1496 src/irc/irc-dcc.c:799 #, c-format msgid "Private %s> %s" msgstr "Prive %s> %s" @@ -1784,31 +1784,31 @@ msgstr "Echoué" msgid "Aborted" msgstr "Interrompu" -#: src/irc/irc-dcc.c:192 +#: src/irc/irc-dcc.c:190 msgid "DCC: file " msgstr "DCC: fichier " -#: src/irc/irc-dcc.c:197 src/irc/irc-dcc.c:456 +#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:454 msgid " (local filename: " msgstr " (nom local: " -#: src/irc/irc-dcc.c:203 +#: src/irc/irc-dcc.c:201 msgid ") sent to " msgstr ") envoyé à " -#: src/irc/irc-dcc.c:205 +#: src/irc/irc-dcc.c:203 msgid ") received from " msgstr ") reçu de " -#: src/irc/irc-dcc.c:210 +#: src/irc/irc-dcc.c:208 msgid ": ok!\n" msgstr ": ok!\n" -#: src/irc/irc-dcc.c:222 +#: src/irc/irc-dcc.c:220 msgid "DCC chat closed with " msgstr "Discussion DCC fermée avec " -#: src/irc/irc-dcc.c:263 +#: src/irc/irc-dcc.c:261 #, c-format msgid "" "%s can't associate DCC chat with private buffer (maybe private buffer has " @@ -1817,74 +1817,74 @@ msgstr "" "%s impossible d'associer la discussion DCC avec un tampon privé (le tampon " "privé a peut-être déjà un DCC CHAT ?)\n" -#: src/irc/irc-dcc.c:273 +#: src/irc/irc-dcc.c:271 msgid "Connected to " msgstr "Connecté à " -#: src/irc/irc-dcc.c:282 +#: src/irc/irc-dcc.c:280 msgid "via DCC chat\n" msgstr "via une discussion DCC\n" -#: src/irc/irc-dcc.c:393 +#: src/irc/irc-dcc.c:391 #, c-format msgid "%s not enough memory for new DCC\n" msgstr "%s pas assez de mémoire pour un nouveau DCC\n" -#: src/irc/irc-dcc.c:412 +#: src/irc/irc-dcc.c:410 msgid "DCC chat" msgstr "Discussion DCC" -#: src/irc/irc-dcc.c:436 +#: src/irc/irc-dcc.c:434 msgid "Incoming DCC file from " msgstr "Réception fichier DCC de " -#: src/irc/irc-dcc.c:447 src/irc/irc-dcc.c:460 +#: src/irc/irc-dcc.c:445 src/irc/irc-dcc.c:458 msgid " bytes\n" msgstr " octets\n" -#: src/irc/irc-dcc.c:452 +#: src/irc/irc-dcc.c:450 msgid "Sending DCC file to " msgstr "Envoi fichier DCC à " -#: src/irc/irc-dcc.c:465 +#: src/irc/irc-dcc.c:463 msgid "Incoming DCC chat request from " msgstr "Demande de discussion DCC reçue de " -#: src/irc/irc-dcc.c:476 +#: src/irc/irc-dcc.c:474 msgid "Sending DCC chat request to " msgstr "Envoi d'une demande discussion DCC à " -#: src/irc/irc-dcc.c:540 +#: src/irc/irc-dcc.c:538 #, c-format msgid "%s not enough memory for DCC SEND\n" msgstr "%s pas assez de mémoire pour le DCC SEND\n" -#: src/irc/irc-dcc.c:562 +#: src/irc/irc-dcc.c:560 #, c-format msgid "%s cannot access file \"%s\"\n" msgstr "%s impossible d'accéder au fichier \"%s\"\n" -#: src/irc/irc-dcc.c:583 +#: src/irc/irc-dcc.c:581 #, c-format msgid "%s cannot create socket for DCC\n" msgstr "%s impossible de créer la socket pour le DCC\n" -#: src/irc/irc-dcc.c:596 +#: src/irc/irc-dcc.c:594 #, c-format msgid "%s cannot find port for DCC\n" msgstr "%s impossible de trouver le port pour le DCC\n" -#: src/irc/irc-dcc.c:643 +#: src/irc/irc-dcc.c:641 #, c-format msgid "%s cannot send DCC\n" msgstr "%s impossible d'envoyer le DCC\n" -#: src/irc/irc-dcc.c:722 +#: src/irc/irc-dcc.c:720 #, c-format msgid "%s error sending data to \"%s\" via DCC CHAT\n" msgstr "%s erreur d'envoi de données à \"%s\" via DCC CHAT\n" -#: src/irc/irc-dcc.c:982 +#: src/irc/irc-dcc.c:980 #, c-format msgid "" "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" " @@ -1893,201 +1893,126 @@ msgstr "" "%s le DCC a échoué car la taille de bloc est trop grande. Vérifiez la valeur " "de l'option \"dcc_blocksize\", le maximum est %d.\n" -#: src/irc/irc-dcc.c:1056 +#: src/irc/irc-dcc.c:1054 #, c-format -msgid "aborting active DCC: \"%s\" from %s\n" -msgstr "abandon du DCC actif: \"%s\" de %s\n" +msgid "Aborting active DCC: \"%s\" from %s\n" +msgstr "Abandon du DCC actif: \"%s\" de %s\n" -#: src/plugins/perl/wee-perl.c:84 +#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:468 +#: src/plugins/python/wee-python.c:81 #, c-format msgid "" -"Perl error: unable to register Perl script \"%s\" (another script already " -"exists with this name)\n" +"%s error: unable to register \"%s\" script (another script already exists " +"with this name)\n" msgstr "" -"Erreur Perl: impossible d'enregistrer le script Perl \"%s\" (un autre script " -"existe déjà avec ce nom)\n" +"Erreur %s: impossible d'enregistrer le script \"%s\" (un autre script existe " +"déjà avec ce nom)\n" -#: src/plugins/perl/wee-perl.c:108 +#: src/plugins/perl/wee-perl.c:112 src/plugins/perl/wee-perl.c:492 +#: src/plugins/python/wee-python.c:105 #, c-format -msgid "registered Perl script: \"%s\", version %s (%s)\n" -msgstr "script Perl enregistré: \"%s\", version %s (%s)\n" +msgid "Registered %s script: \"%s\", version %s (%s)\n" +msgstr "Script %s enregistré: \"%s\", version %s (%s)\n" -#: src/plugins/perl/wee-perl.c:115 +#: src/plugins/perl/wee-perl.c:119 src/plugins/perl/wee-perl.c:499 +#: src/plugins/python/wee-python.c:112 #, c-format -msgid "%s unable to load Perl script \"%s\" (not enough memory)\n" -msgstr "" -"%s impossible de charger le script Perl \"%s\" (mémoire insuffisante)\n" - -#: src/plugins/perl/wee-perl.c:224 -msgid "Perl error: wrong parameters for IRC::print_infobar Perl function\n" +msgid "%s error: unable to load script \"%s\" (not enough memory)\n" msgstr "" -"Erreur Perl: mauvais paramètres pour la fonction Perl IRC::print_infobar\n" +"Erreur %s: impossible de charger le script \"%s\" (mémoire insuffisante)\n" -#: src/plugins/perl/wee-perl.c:257 -msgid "Perl error: server not found for IRC::command Perl function\n" -msgstr "Erreur Perl: serveur non trouvé pour la fonction Perl IRC::command\n" - -#: src/plugins/perl/wee-perl.c:358 -msgid "Perl error: server not found for IRC::get_info Perl function\n" -msgstr "Erreur Perl: serveur non trouvé pour la fonction Perl IRC::get_info\n" - -#: src/plugins/perl/wee-perl.c:527 +#: src/plugins/perl/wee-perl.c:234 src/plugins/perl/wee-perl.c:525 +#: src/plugins/perl/wee-perl.c:573 src/plugins/perl/wee-perl.c:600 +#: src/plugins/perl/wee-perl.c:645 src/plugins/perl/wee-perl.c:675 +#: src/plugins/perl/wee-perl.c:715 src/plugins/python/wee-python.c:60 +#: src/plugins/python/wee-python.c:142 src/plugins/python/wee-python.c:179 +#: src/plugins/python/wee-python.c:211 src/plugins/python/wee-python.c:243 +#: src/plugins/python/wee-python.c:272 src/plugins/python/wee-python.c:311 #, c-format -msgid "Perl error: %s\n" -msgstr "Erreur Perl: %s\n" +msgid "%s error: wrong parameters for \"%s\" function\n" +msgstr "Erreur %s: mauvais paramètres pour la fonction \"%s\"\n" -#: src/plugins/perl/wee-perl.c:537 +#: src/plugins/perl/wee-perl.c:270 src/plugins/perl/wee-perl.c:378 +#: src/plugins/perl/wee-perl.c:732 src/plugins/python/wee-python.c:331 #, c-format -msgid "Perl error: too much values from \"%s\" (%d). Expected: 1.\n" -msgstr "Erreur Perl: trop de valeurs de \"%s\" (%d). Attendue: 1.\n" +msgid "%s error: server not found for \"%s\" function\n" +msgstr "Erreur %s: serveur non trouvé pour la fonction \"%s\"\n" -#: src/plugins/perl/wee-perl.c:559 +#: src/plugins/perl/wee-perl.c:850 src/plugins/python/wee-python.c:408 #, c-format -msgid "loading Perl script \"%s\"\n" -msgstr "chargement du script Perl \"%s\"\n" +msgid "Loading %s module \"weechat\"\n" +msgstr "Chargement du module %s \"weechat\"\n" -#: src/plugins/perl/wee-perl.c:561 +#: src/plugins/perl/wee-perl.c:909 #, c-format -msgid "Loading Perl script \"%s\"\n" -msgstr "Chargement du script Perl \"%s\"\n" +msgid "Perl error: %s" +msgstr "Erreur Perl: %s" -#: src/plugins/perl/wee-perl.c:610 +#: src/plugins/perl/wee-perl.c:919 #, c-format -msgid "unloading Perl script \"%s\"\n" -msgstr "déchargement du script Perl \"%s\"\n" +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:627 -msgid "unloading all Perl scripts...\n" -msgstr "déchargement de tous les scripts Perl...\n" - -#: src/plugins/python/wee-python.c:61 src/plugins/python/wee-python.c:170 -msgid "" -"Python error: wrong parameters for 'print_with_channel' Python function\n" -msgstr "" -"Erreur Python: mauvais paramètres pour la fonction Python " -"'print_with_channel'\n" - -#: src/plugins/python/wee-python.c:81 +#: 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 #, c-format -msgid "" -"Python error: unable to register Python script \"%s\" (another script " -"already exists with this name)\n" -msgstr "" -"Erreur Python: impossible d'enregistrer le script Python \"%s\" (un autre " -"script existe déjà avec ce nom)\n" +msgid "Loading %s script \"%s\"\n" +msgstr "Chargement du script %s \"%s\"\n" -#: src/plugins/python/wee-python.c:105 +#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:612 #, c-format -msgid "registered Python script: \"%s\", version %s (%s)\n" -msgstr "script Python enregistré: \"%s\", version %s (%s)\n" +msgid "Unloading %s script \"%s\"\n" +msgstr "Déchargement du script %s \"%s\"\n" -#: src/plugins/python/wee-python.c:112 +#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:629 #, c-format -msgid "%s unable to load Python script \"%s\" (not enough memory)\n" -msgstr "" -"%s impossible de charger le script Python \"%s\" (mémoire insuffisante)\n" - -#: src/plugins/python/wee-python.c:137 -msgid "Python error: wrong parameters for 'print' Python function\n" -msgstr "Erreur Python: mauvais paramètres pour la fonction Python 'print'\n" - -#: src/plugins/python/wee-python.c:222 -msgid "Python error: wrong parameters for 'print_infobar' Python function\n" -msgstr "" -"Erreur Python: mauvais paramètres pour la fonction Python 'print_infobar'\n" - -#: src/plugins/python/wee-python.c:249 -msgid "Python error: wrong parameters for 'command' Python function\n" -msgstr "Erreur Python: mauvais paramètres pour la fonction Python 'command'\n" +msgid "Unloading all %s scripts...\n" +msgstr "Déchargement de tous les scripts %s...\n" -#: src/plugins/python/wee-python.c:268 -msgid "Python error: server not found for 'command' Python function\n" -msgstr "Erreur Python: serveur non trouvé pour la fonction Python 'command'\n" - -#: src/plugins/python/wee-python.c:303 -msgid "" -"Python error: wrong parameters for 'add_message_handler' Python function\n" -msgstr "" -"Erreur Python: mauvais paramètres pour la fonction Python " -"'add_message_handler'\n" - -#: src/plugins/python/wee-python.c:332 -msgid "" -"Python error: wrong parameters for 'add_command_handler' Python function\n" -msgstr "" -"Erreur Python: mauvais paramètres pour la fonction Python " -"'add_command_handler'\n" - -#: src/plugins/python/wee-python.c:371 -msgid "Python error: wrong parameters for 'get_info' Python function\n" -msgstr "Erreur Python: mauvais paramètres pour la fonction Python 'get_info'\n" - -#: src/plugins/python/wee-python.c:390 -msgid "Python error: server not found for 'get_info' Python function\n" -msgstr "Erreur Python: serveur non trouvé pour la fonction Python 'get_info'\n" - -#: src/plugins/python/wee-python.c:462 -msgid "Python error: error while launching Python interpreter\n" -msgstr "Erreur Python: erreur pendant le chargement de l'interpréteur Python\n" - -#: src/plugins/python/wee-python.c:468 -msgid "Loading Python module \"weechat\"\n" -msgstr "Chargement du module Python \"weechat\"\n" - -#: src/plugins/python/wee-python.c:519 src/plugins/python/wee-python.c:547 -#: src/plugins/python/wee-python.c:578 +#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:634 #, c-format -msgid "" -"Python error: unable to run function \"%s\"in Python script (not enough " -"memory)\n" -msgstr "" -"Erreur Python: impossible de charger le script Python \"%s\" (mémoire " -"insuffisante)\n" +msgid "%s scripts unloaded\n" +msgstr "Scripts %s déchargés\n" -#: src/plugins/python/wee-python.c:569 +#: src/plugins/python/wee-python.c:403 #, c-format -msgid "Python error: error while running function \"%s\"\n" -msgstr "Erreur Python: erreur dans la fonction \"%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:599 +#: src/plugins/python/wee-python.c:460 src/plugins/python/wee-python.c:488 +#: src/plugins/python/wee-python.c:520 #, c-format -msgid "loading Python script \"%s\"\n" -msgstr "chargement du script Python \"%s\"\n" +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:601 +#: src/plugins/python/wee-python.c:510 #, c-format -msgid "Loading Python script \"%s\"\n" -msgstr "Chargement du script Python \"%s\"\n" +msgid "%s error: error while running function \"%s\"\n" +msgstr "Erreur %s: erreur dans la fonction \"%s\"\n" -#: src/plugins/python/wee-python.c:607 +#: src/plugins/python/wee-python.c:549 #, c-format -msgid "Python error: error while opening file \"%s\"\n" -msgstr "Erreur Python: erreur à l'ouverture du fichier \"%s\"\n" +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:615 +#: src/plugins/python/wee-python.c:558 #, c-format -msgid "Python error: error while parsing file \"%s\"\n" -msgstr "Erreur Python: erreur en analysant le fichier \"%s\"\n" +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:668 +#: src/plugins/python/wee-python.c:660 #, c-format -msgid "unloading Python script \"%s\"\n" -msgstr "déchargement du script Python \"%s\"\n" - -#: src/plugins/python/wee-python.c:685 -msgid "unloading all Python scripts...\n" -msgstr "déchargement de tous les scripts Python...\n" - -#: src/plugins/python/wee-python.c:711 -msgid "Python error: error while freeing Python interpreter\n" -msgstr "Erreur Python: impossible de libérer l'interpréteur Python\n" +msgid "%s error: error while freeing interpreter\n" +msgstr "Erreur %s: impossible de libérer l'interpréteur\n" #: src/plugins/plugins.c:93 #, c-format -msgid "auto-loading %s script: %s%s%s\n" -msgstr "chargement automatique du script %s : %s%s%s\n" +msgid "Auto-loading %s script: %s%s%s\n" +msgstr "Chargement automatique du script %s : %s%s%s\n" -#: src/plugins/plugins.c:211 +#: src/plugins/plugins.c:212 #, c-format msgid "%s unable to add handler for \"%s\" message (not enough memory)\n" msgstr "" @@ -2162,18 +2087,16 @@ msgid "server" msgstr "serveur" #: src/gui/gui-common.c:330 -#, c-format -msgid "%s not enough memory for infobar message\n" -msgstr "%s pas assez de mémoire pour un message de la barre d'infos\n" +msgid "Not enough memory for infobar message\n" +msgstr "Pas assez de mémoire pour un message de la barre d'infos\n" -#: src/gui/gui-common.c:506 -#, c-format -msgid "%s not enough memory for new line!\n" -msgstr "%s pas assez de mémoire pour une nouvelle ligne !\n" +#: src/gui/gui-common.c:505 +msgid "Not enough memory for new line\n" +msgstr "Pas assez de mémoire pour une nouvelle ligne !\n" -#: src/gui/gui-common.c:549 -msgid "not enough memory!\n" -msgstr "pas assez de mémoire !\n" +#: src/gui/gui-common.c:548 +msgid "Not enough memory for new message\n" +msgstr "Pas assez de mémoire pour un message de la barre d'infos\n" #: src/common/command.c:42 msgid "create an alias for a command" @@ -2286,8 +2209,8 @@ msgid "list/load/unload Perl scripts" msgstr "liste/charge/décharge des scripts Perl" #: src/common/command.c:76 src/common/command.c:81 -msgid "[load filename] | [autoload] | [unload]" -msgstr "[load fichier] | [autoload] | [unload]" +msgid "[load filename] | [autoload] | [reload] | [unload]" +msgstr "[load fichier] | [autoload] | [reload] | [unload]" #: src/common/command.c:77 msgid "" @@ -2567,9 +2490,9 @@ msgstr "%s une connexion vers le serveur \"%s\" est en cours !\n" msgid "%s server not found\n" msgstr "%s serveur non trouvé\n" -#: src/common/command.c:1142 src/common/command.c:1404 -#: src/common/command.c:1545 src/common/command.c:2236 -#: src/common/command.c:2248 +#: src/common/command.c:1142 src/common/command.c:1406 +#: src/common/command.c:1549 src/common/command.c:2240 +#: src/common/command.c:2252 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s option inconnue pour la commande \"%s\"\n" @@ -2598,39 +2521,38 @@ msgstr "Commandes IRC :\n" 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:1305 -msgid "Registered Perl scripts:\n" -msgstr "Scripts Perl enregistrés :\n" +#: src/common/command.c:1305 src/common/command.c:1448 +#, c-format +msgid "Registered %s scripts:\n" +msgstr "Scripts %s enregistrés :\n" -#: src/common/command.c:1322 src/common/command.c:1344 -#: src/common/command.c:1366 src/common/command.c:1463 -#: src/common/command.c:1485 src/common/command.c:1507 +#: src/common/command.c:1322 src/common/command.c:1345 +#: src/common/command.c:1368 src/common/command.c:1465 +#: src/common/command.c:1488 src/common/command.c:1511 msgid " (none)\n" msgstr " (aucun)\n" -#: src/common/command.c:1327 -msgid "Perl message handlers:\n" -msgstr "Fonctions Perl pour messages :\n" - -#: src/common/command.c:1336 +#: src/common/command.c:1327 src/common/command.c:1470 #, c-format -msgid " IRC(%s) => Perl(%s)\n" -msgstr " IRC(%s) => Perl(%s)\n" +msgid "%s message handlers:\n" +msgstr "Fonctions %s pour messages :\n" -#: src/common/command.c:1349 -msgid "Perl command handlers:\n" -msgstr "Commandes Perl :\n" +#: src/common/command.c:1336 src/common/command.c:1479 +#, c-format +msgid " IRC(%s) => %s(%s)\n" +msgstr " IRC(%s) => %s(%s)\n" -#: src/common/command.c:1358 +#: src/common/command.c:1350 src/common/command.c:1493 #, c-format -msgid " Command /%s => Perl(%s)\n" -msgstr " Commande /%s => Perl(%s)\n" +msgid "%s command handlers:\n" +msgstr "Commandes %s :\n" -#: src/common/command.c:1378 -msgid "Perl scripts unloaded\n" -msgstr "Scripts Perl déchargés\n" +#: src/common/command.c:1359 src/common/command.c:1502 +#, c-format +msgid " Command /%s => %s(%s)\n" +msgstr " Commande /%s => %s(%s)\n" -#: src/common/command.c:1417 +#: src/common/command.c:1419 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" @@ -2639,33 +2561,7 @@ msgstr "" "Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le " "script ./configure\n" -#: src/common/command.c:1446 -msgid "Registered Python scripts:\n" -msgstr "Scripts Python enregistrés :\n" - -#: src/common/command.c:1468 -msgid "Python message handlers:\n" -msgstr "Fonctions Python pour messages :\n" - -#: src/common/command.c:1477 -#, c-format -msgid " IRC(%s) => Python(%s)\n" -msgstr " IRC(%s) => Python(%s)\n" - -#: src/common/command.c:1490 -msgid "Python command handlers:\n" -msgstr "Commandes Python :\n" - -#: src/common/command.c:1499 -#, c-format -msgid " Command /%s => Python(%s)\n" -msgstr " Commande /%s => Python(%s)\n" - -#: src/common/command.c:1519 -msgid "Python scripts unloaded\n" -msgstr "Scripts Python déchargés\n" - -#: src/common/command.c:1558 +#: src/common/command.c:1562 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " @@ -2675,31 +2571,31 @@ msgstr "" "Merci de reconstruire WeeChat avec l'option \"--enable-python\" pour le " "script ./configure\n" -#: src/common/command.c:1606 +#: src/common/command.c:1610 msgid "No server.\n" msgstr "Pas de serveur.\n" -#: src/common/command.c:1617 +#: src/common/command.c:1621 #, c-format msgid "Server '%s' not found.\n" msgstr "Serveur '%s' non trouvé.\n" -#: src/common/command.c:1629 +#: src/common/command.c:1633 #, 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:1637 +#: src/common/command.c:1641 #, 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:1656 +#: src/common/command.c:1660 #, 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:1664 +#: src/common/command.c:1668 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -2708,106 +2604,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:1680 src/common/command.c:1821 +#: src/common/command.c:1684 src/common/command.c:1825 msgid "Server" msgstr "Serveur" -#: src/common/command.c:1683 +#: src/common/command.c:1687 msgid "has been deleted\n" msgstr "a été supprimé\n" -#: src/common/command.c:1698 +#: src/common/command.c:1702 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s paramètres manquants pour la commande \"%s\"\n" -#: src/common/command.c:1708 +#: src/common/command.c:1712 #, 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:1733 src/common/command.c:1761 -#: src/common/command.c:1774 src/common/command.c:1800 +#: src/common/command.c:1737 src/common/command.c:1765 +#: src/common/command.c:1778 src/common/command.c:1804 #, 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:1746 +#: src/common/command.c:1750 #, 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:1787 +#: src/common/command.c:1791 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s commande manquante pour le paramètre \"%s\"\n" -#: src/common/command.c:1824 +#: src/common/command.c:1828 msgid "created\n" msgstr "créé\n" -#: src/common/command.c:1830 +#: src/common/command.c:1834 #, c-format msgid "%s unable to create server\n" msgstr "%s impossible de créer le serveur\n" -#: src/common/command.c:1885 +#: src/common/command.c:1889 msgid "(unknown)" msgstr "(inconnu)" -#: src/common/command.c:1908 +#: src/common/command.c:1912 msgid "(password hidden) " msgstr "(mot de passe caché) " -#: src/common/command.c:1972 +#: src/common/command.c:1976 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s serveur \"%s\" non trouvé\n" -#: src/common/command.c:2003 src/common/command.c:2049 +#: src/common/command.c:2007 src/common/command.c:2053 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s option de configuration \"%s\" non trouvée\n" -#: src/common/command.c:2008 src/common/command.c:2041 +#: src/common/command.c:2012 src/common/command.c:2045 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valeur incorrecte pour l'option \"%s\"\n" -#: src/common/command.c:2024 +#: src/common/command.c:2028 #, 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:2122 +#: src/common/command.c:2126 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Aucune option de configuration trouvée avec \"%s\"\n" -#: src/common/command.c:2125 +#: src/common/command.c:2129 msgid "No config option found\n" msgstr "Aucune option de configuration trouvée\n" -#: src/common/command.c:2131 +#: src/common/command.c:2135 #, 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:2134 +#: src/common/command.c:2138 msgid "config option(s) found\n" msgstr "option(s) de configuration trouvée(s)\n" -#: src/common/command.c:2154 +#: src/common/command.c:2158 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias ou commande \"%s\" non trouvé\n" -#: src/common/command.c:2164 +#: src/common/command.c:2168 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" supprimé\n" -#: src/common/command.c:2184 +#: src/common/command.c:2188 msgid "Opened windows:\n" msgstr "Fenêtres ouvertes:\n" @@ -2823,7 +2719,7 @@ msgstr "%s impossible d'ouvrir le tube FIFO (%s) en lecture\n" #: src/common/fifo.c:89 msgid "FIFO pipe is open\n" -msgstr "le tube FIFO est ouvert\n" +msgstr "Le tube FIFO est ouvert\n" #: src/common/fifo.c:121 #, c-format @@ -2852,7 +2748,7 @@ msgstr "%s erreur en lecture du tube FIFO, fermeture\n" #: src/common/fifo.c:309 msgid "FIFO pipe is closed\n" -msgstr "le tube FIFO est fermé\n" +msgstr "Le tube FIFO est fermé\n" #: src/common/hotlist.c:102 #, c-format @@ -3884,8 +3780,8 @@ msgid "%s: creating default config file...\n" msgstr "%s: création du fichier de configuration par défaut...\n" #: src/common/weeconfig.c:1392 -msgid "creating default config file\n" -msgstr "création du fichier de configuration par défaut\n" +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 #, c-format @@ -3897,5 +3793,5 @@ msgstr "" "# %s: fichier de configuration, créé par %s v%s le %s#\n" #: src/common/weeconfig.c:1564 -msgid "saving config to disk\n" -msgstr "sauvegarde de la configuration sur disque\n" +msgid "Saving config to disk\n" +msgstr "Sauvegarde de la configuration sur disque\n" diff --git a/po/weechat.pot b/po/weechat.pot index 35ee1a51a..8c7d649ea 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-05-01 20:47+0200\n" +"POT-Creation-Date: 2005-05-05 17:58+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" @@ -87,7 +87,7 @@ msgstr "" #: src/irc/irc-server.c:846 #, c-format -msgid "connecting to server %s:%d...\n" +msgid "Connecting to server %s:%d...\n" msgstr "" #: src/irc/irc-server.c:857 @@ -1194,8 +1194,8 @@ 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:1129 src/common/command.c:1411 -#: src/common/command.c:1552 +#: src/common/command.c:1129 src/common/command.c:1413 +#: src/common/command.c:1556 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "" @@ -1447,7 +1447,7 @@ msgstr "" msgid "%s unknown DCC CHAT type received from " msgstr "" -#: src/irc/irc-recv.c:1496 src/irc/irc-dcc.c:801 +#: src/irc/irc-recv.c:1496 src/irc/irc-dcc.c:799 #, c-format msgid "Private %s> %s" msgstr "" @@ -1666,290 +1666,226 @@ msgstr "" msgid "Aborted" msgstr "" -#: src/irc/irc-dcc.c:192 +#: src/irc/irc-dcc.c:190 msgid "DCC: file " msgstr "" -#: src/irc/irc-dcc.c:197 src/irc/irc-dcc.c:456 +#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:454 msgid " (local filename: " msgstr "" -#: src/irc/irc-dcc.c:203 +#: src/irc/irc-dcc.c:201 msgid ") sent to " msgstr "" -#: src/irc/irc-dcc.c:205 +#: src/irc/irc-dcc.c:203 msgid ") received from " msgstr "" -#: src/irc/irc-dcc.c:210 +#: src/irc/irc-dcc.c:208 msgid ": ok!\n" msgstr "" -#: src/irc/irc-dcc.c:222 +#: src/irc/irc-dcc.c:220 msgid "DCC chat closed with " msgstr "" -#: src/irc/irc-dcc.c:263 +#: src/irc/irc-dcc.c:261 #, c-format msgid "" "%s can't associate DCC chat with private buffer (maybe private buffer has " "already DCC CHAT?)\n" msgstr "" -#: src/irc/irc-dcc.c:273 +#: src/irc/irc-dcc.c:271 msgid "Connected to " msgstr "" -#: src/irc/irc-dcc.c:282 +#: src/irc/irc-dcc.c:280 msgid "via DCC chat\n" msgstr "" -#: src/irc/irc-dcc.c:393 +#: src/irc/irc-dcc.c:391 #, c-format msgid "%s not enough memory for new DCC\n" msgstr "" -#: src/irc/irc-dcc.c:412 +#: src/irc/irc-dcc.c:410 msgid "DCC chat" msgstr "" -#: src/irc/irc-dcc.c:436 +#: src/irc/irc-dcc.c:434 msgid "Incoming DCC file from " msgstr "" -#: src/irc/irc-dcc.c:447 src/irc/irc-dcc.c:460 +#: src/irc/irc-dcc.c:445 src/irc/irc-dcc.c:458 msgid " bytes\n" msgstr "" -#: src/irc/irc-dcc.c:452 +#: src/irc/irc-dcc.c:450 msgid "Sending DCC file to " msgstr "" -#: src/irc/irc-dcc.c:465 +#: src/irc/irc-dcc.c:463 msgid "Incoming DCC chat request from " msgstr "" -#: src/irc/irc-dcc.c:476 +#: src/irc/irc-dcc.c:474 msgid "Sending DCC chat request to " msgstr "" -#: src/irc/irc-dcc.c:540 +#: src/irc/irc-dcc.c:538 #, c-format msgid "%s not enough memory for DCC SEND\n" msgstr "" -#: src/irc/irc-dcc.c:562 +#: src/irc/irc-dcc.c:560 #, c-format msgid "%s cannot access file \"%s\"\n" msgstr "" -#: src/irc/irc-dcc.c:583 +#: src/irc/irc-dcc.c:581 #, c-format msgid "%s cannot create socket for DCC\n" msgstr "" -#: src/irc/irc-dcc.c:596 +#: src/irc/irc-dcc.c:594 #, c-format msgid "%s cannot find port for DCC\n" msgstr "" -#: src/irc/irc-dcc.c:643 +#: src/irc/irc-dcc.c:641 #, c-format msgid "%s cannot send DCC\n" msgstr "" -#: src/irc/irc-dcc.c:722 +#: src/irc/irc-dcc.c:720 #, c-format msgid "%s error sending data to \"%s\" via DCC CHAT\n" msgstr "" -#: src/irc/irc-dcc.c:982 +#: src/irc/irc-dcc.c:980 #, c-format msgid "" "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" " "option, max is %d.\n" msgstr "" -#: src/irc/irc-dcc.c:1056 +#: src/irc/irc-dcc.c:1054 #, c-format -msgid "aborting active DCC: \"%s\" from %s\n" +msgid "Aborting active DCC: \"%s\" from %s\n" msgstr "" -#: src/plugins/perl/wee-perl.c:84 +#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:468 +#: src/plugins/python/wee-python.c:81 #, c-format msgid "" -"Perl error: unable to register Perl script \"%s\" (another script already " -"exists with this name)\n" +"%s error: unable to register \"%s\" script (another script already exists " +"with this name)\n" msgstr "" -#: src/plugins/perl/wee-perl.c:108 +#: src/plugins/perl/wee-perl.c:112 src/plugins/perl/wee-perl.c:492 +#: src/plugins/python/wee-python.c:105 #, c-format -msgid "registered Perl script: \"%s\", version %s (%s)\n" +msgid "Registered %s script: \"%s\", version %s (%s)\n" msgstr "" -#: src/plugins/perl/wee-perl.c:115 +#: src/plugins/perl/wee-perl.c:119 src/plugins/perl/wee-perl.c:499 +#: src/plugins/python/wee-python.c:112 #, c-format -msgid "%s unable to load Perl script \"%s\" (not enough memory)\n" -msgstr "" - -#: src/plugins/perl/wee-perl.c:224 -msgid "Perl error: wrong parameters for IRC::print_infobar Perl function\n" -msgstr "" - -#: src/plugins/perl/wee-perl.c:257 -msgid "Perl error: server not found for IRC::command Perl function\n" +msgid "%s error: unable to load script \"%s\" (not enough memory)\n" msgstr "" -#: src/plugins/perl/wee-perl.c:358 -msgid "Perl error: server not found for IRC::get_info Perl function\n" -msgstr "" - -#: src/plugins/perl/wee-perl.c:527 +#: src/plugins/perl/wee-perl.c:234 src/plugins/perl/wee-perl.c:525 +#: src/plugins/perl/wee-perl.c:573 src/plugins/perl/wee-perl.c:600 +#: src/plugins/perl/wee-perl.c:645 src/plugins/perl/wee-perl.c:675 +#: src/plugins/perl/wee-perl.c:715 src/plugins/python/wee-python.c:60 +#: src/plugins/python/wee-python.c:142 src/plugins/python/wee-python.c:179 +#: src/plugins/python/wee-python.c:211 src/plugins/python/wee-python.c:243 +#: src/plugins/python/wee-python.c:272 src/plugins/python/wee-python.c:311 #, c-format -msgid "Perl error: %s\n" +msgid "%s error: wrong parameters for \"%s\" function\n" msgstr "" -#: src/plugins/perl/wee-perl.c:537 +#: src/plugins/perl/wee-perl.c:270 src/plugins/perl/wee-perl.c:378 +#: src/plugins/perl/wee-perl.c:732 src/plugins/python/wee-python.c:331 #, c-format -msgid "Perl error: too much values from \"%s\" (%d). Expected: 1.\n" +msgid "%s error: server not found for \"%s\" function\n" msgstr "" -#: src/plugins/perl/wee-perl.c:559 +#: src/plugins/perl/wee-perl.c:850 src/plugins/python/wee-python.c:408 #, c-format -msgid "loading Perl script \"%s\"\n" +msgid "Loading %s module \"weechat\"\n" msgstr "" -#: src/plugins/perl/wee-perl.c:561 +#: src/plugins/perl/wee-perl.c:909 #, c-format -msgid "Loading Perl script \"%s\"\n" +msgid "Perl error: %s" msgstr "" -#: src/plugins/perl/wee-perl.c:610 +#: src/plugins/perl/wee-perl.c:919 #, c-format -msgid "unloading Perl script \"%s\"\n" -msgstr "" - -#: src/plugins/perl/wee-perl.c:627 -msgid "unloading all Perl scripts...\n" +msgid "%s error: too much values from \"%s\" (%d). Expected: 1.\n" msgstr "" -#: src/plugins/python/wee-python.c:61 src/plugins/python/wee-python.c:170 -msgid "" -"Python error: wrong parameters for 'print_with_channel' Python function\n" -msgstr "" - -#: src/plugins/python/wee-python.c:81 +#: 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 #, c-format -msgid "" -"Python error: unable to register Python script \"%s\" (another script " -"already exists with this name)\n" +msgid "Loading %s script \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:105 +#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:612 #, c-format -msgid "registered Python script: \"%s\", version %s (%s)\n" +msgid "Unloading %s script \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:112 +#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:629 #, c-format -msgid "%s unable to load Python script \"%s\" (not enough memory)\n" -msgstr "" - -#: src/plugins/python/wee-python.c:137 -msgid "Python error: wrong parameters for 'print' Python function\n" -msgstr "" - -#: src/plugins/python/wee-python.c:222 -msgid "Python error: wrong parameters for 'print_infobar' Python function\n" -msgstr "" - -#: src/plugins/python/wee-python.c:249 -msgid "Python error: wrong parameters for 'command' Python function\n" -msgstr "" - -#: src/plugins/python/wee-python.c:268 -msgid "Python error: server not found for 'command' Python function\n" -msgstr "" - -#: src/plugins/python/wee-python.c:303 -msgid "" -"Python error: wrong parameters for 'add_message_handler' Python function\n" -msgstr "" - -#: src/plugins/python/wee-python.c:332 -msgid "" -"Python error: wrong parameters for 'add_command_handler' Python function\n" +msgid "Unloading all %s scripts...\n" msgstr "" -#: src/plugins/python/wee-python.c:371 -msgid "Python error: wrong parameters for 'get_info' Python function\n" -msgstr "" - -#: src/plugins/python/wee-python.c:390 -msgid "Python error: server not found for 'get_info' Python function\n" -msgstr "" - -#: src/plugins/python/wee-python.c:462 -msgid "Python error: error while launching Python interpreter\n" -msgstr "" - -#: src/plugins/python/wee-python.c:468 -msgid "Loading Python module \"weechat\"\n" -msgstr "" - -#: src/plugins/python/wee-python.c:519 src/plugins/python/wee-python.c:547 -#: src/plugins/python/wee-python.c:578 +#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:634 #, c-format -msgid "" -"Python error: unable to run function \"%s\"in Python script (not enough " -"memory)\n" +msgid "%s scripts unloaded\n" msgstr "" -#: src/plugins/python/wee-python.c:569 +#: src/plugins/python/wee-python.c:403 #, c-format -msgid "Python error: error while running function \"%s\"\n" +msgid "%s error: error while launching interpreter\n" msgstr "" -#: src/plugins/python/wee-python.c:599 +#: src/plugins/python/wee-python.c:460 src/plugins/python/wee-python.c:488 +#: src/plugins/python/wee-python.c:520 #, c-format -msgid "loading Python script \"%s\"\n" +msgid "%s error: unable to run function \"%s\" in script (not enough memory)\n" msgstr "" -#: src/plugins/python/wee-python.c:601 +#: src/plugins/python/wee-python.c:510 #, c-format -msgid "Loading Python script \"%s\"\n" +msgid "%s error: error while running function \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:607 +#: src/plugins/python/wee-python.c:549 #, c-format -msgid "Python error: error while opening file \"%s\"\n" +msgid "%s error: error while opening file \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:615 +#: src/plugins/python/wee-python.c:558 #, c-format -msgid "Python error: error while parsing file \"%s\"\n" +msgid "%s error: error while parsing file \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:668 +#: src/plugins/python/wee-python.c:660 #, c-format -msgid "unloading Python script \"%s\"\n" -msgstr "" - -#: src/plugins/python/wee-python.c:685 -msgid "unloading all Python scripts...\n" -msgstr "" - -#: src/plugins/python/wee-python.c:711 -msgid "Python error: error while freeing Python interpreter\n" +msgid "%s error: error while freeing interpreter\n" msgstr "" #: src/plugins/plugins.c:93 #, c-format -msgid "auto-loading %s script: %s%s%s\n" +msgid "Auto-loading %s script: %s%s%s\n" msgstr "" -#: src/plugins/plugins.c:211 +#: src/plugins/plugins.c:212 #, c-format msgid "%s unable to add handler for \"%s\" message (not enough memory)\n" msgstr "" @@ -2022,17 +1958,15 @@ msgid "server" msgstr "" #: src/gui/gui-common.c:330 -#, c-format -msgid "%s not enough memory for infobar message\n" +msgid "Not enough memory for infobar message\n" msgstr "" -#: src/gui/gui-common.c:506 -#, c-format -msgid "%s not enough memory for new line!\n" +#: src/gui/gui-common.c:505 +msgid "Not enough memory for new line\n" msgstr "" -#: src/gui/gui-common.c:549 -msgid "not enough memory!\n" +#: src/gui/gui-common.c:548 +msgid "Not enough memory for new message\n" msgstr "" #: src/common/command.c:42 @@ -2132,7 +2066,7 @@ msgid "list/load/unload Perl scripts" msgstr "" #: src/common/command.c:76 src/common/command.c:81 -msgid "[load filename] | [autoload] | [unload]" +msgid "[load filename] | [autoload] | [reload] | [unload]" msgstr "" #: src/common/command.c:77 @@ -2380,9 +2314,9 @@ msgstr "" msgid "%s server not found\n" msgstr "" -#: src/common/command.c:1142 src/common/command.c:1404 -#: src/common/command.c:1545 src/common/command.c:2236 -#: src/common/command.c:2248 +#: src/common/command.c:1142 src/common/command.c:1406 +#: src/common/command.c:1549 src/common/command.c:2240 +#: src/common/command.c:2252 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "" @@ -2411,208 +2345,181 @@ msgstr "" msgid "No help available, \"%s\" is an unknown command\n" msgstr "" -#: src/common/command.c:1305 -msgid "Registered Perl scripts:\n" +#: src/common/command.c:1305 src/common/command.c:1448 +#, c-format +msgid "Registered %s scripts:\n" msgstr "" -#: src/common/command.c:1322 src/common/command.c:1344 -#: src/common/command.c:1366 src/common/command.c:1463 -#: src/common/command.c:1485 src/common/command.c:1507 +#: src/common/command.c:1322 src/common/command.c:1345 +#: src/common/command.c:1368 src/common/command.c:1465 +#: src/common/command.c:1488 src/common/command.c:1511 msgid " (none)\n" msgstr "" -#: src/common/command.c:1327 -msgid "Perl message handlers:\n" -msgstr "" - -#: src/common/command.c:1336 +#: src/common/command.c:1327 src/common/command.c:1470 #, c-format -msgid " IRC(%s) => Perl(%s)\n" +msgid "%s message handlers:\n" msgstr "" -#: src/common/command.c:1349 -msgid "Perl command handlers:\n" +#: src/common/command.c:1336 src/common/command.c:1479 +#, c-format +msgid " IRC(%s) => %s(%s)\n" msgstr "" -#: src/common/command.c:1358 +#: src/common/command.c:1350 src/common/command.c:1493 #, c-format -msgid " Command /%s => Perl(%s)\n" +msgid "%s command handlers:\n" msgstr "" -#: src/common/command.c:1378 -msgid "Perl scripts unloaded\n" +#: src/common/command.c:1359 src/common/command.c:1502 +#, c-format +msgid " Command /%s => %s(%s)\n" msgstr "" -#: src/common/command.c:1417 +#: src/common/command.c:1419 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" msgstr "" -#: src/common/command.c:1446 -msgid "Registered Python scripts:\n" -msgstr "" - -#: src/common/command.c:1468 -msgid "Python message handlers:\n" -msgstr "" - -#: src/common/command.c:1477 -#, c-format -msgid " IRC(%s) => Python(%s)\n" -msgstr "" - -#: src/common/command.c:1490 -msgid "Python command handlers:\n" -msgstr "" - -#: src/common/command.c:1499 -#, c-format -msgid " Command /%s => Python(%s)\n" -msgstr "" - -#: src/common/command.c:1519 -msgid "Python scripts unloaded\n" -msgstr "" - -#: src/common/command.c:1558 +#: src/common/command.c:1562 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " "script\n" msgstr "" -#: src/common/command.c:1606 +#: src/common/command.c:1610 msgid "No server.\n" msgstr "" -#: src/common/command.c:1617 +#: src/common/command.c:1621 #, c-format msgid "Server '%s' not found.\n" msgstr "" -#: src/common/command.c:1629 +#: src/common/command.c:1633 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "" -#: src/common/command.c:1637 +#: src/common/command.c:1641 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" -#: src/common/command.c:1656 +#: src/common/command.c:1660 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:1664 +#: src/common/command.c:1668 #, 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:1680 src/common/command.c:1821 +#: src/common/command.c:1684 src/common/command.c:1825 msgid "Server" msgstr "" -#: src/common/command.c:1683 +#: src/common/command.c:1687 msgid "has been deleted\n" msgstr "" -#: src/common/command.c:1698 +#: src/common/command.c:1702 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "" -#: src/common/command.c:1708 +#: src/common/command.c:1712 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "" -#: src/common/command.c:1733 src/common/command.c:1761 -#: src/common/command.c:1774 src/common/command.c:1800 +#: src/common/command.c:1737 src/common/command.c:1765 +#: src/common/command.c:1778 src/common/command.c:1804 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1746 +#: src/common/command.c:1750 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1787 +#: src/common/command.c:1791 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1824 +#: src/common/command.c:1828 msgid "created\n" msgstr "" -#: src/common/command.c:1830 +#: src/common/command.c:1834 #, c-format msgid "%s unable to create server\n" msgstr "" -#: src/common/command.c:1885 +#: src/common/command.c:1889 msgid "(unknown)" msgstr "" -#: src/common/command.c:1908 +#: src/common/command.c:1912 msgid "(password hidden) " msgstr "" -#: src/common/command.c:1972 +#: src/common/command.c:1976 #, c-format msgid "%s server \"%s\" not found\n" msgstr "" -#: src/common/command.c:2003 src/common/command.c:2049 +#: src/common/command.c:2007 src/common/command.c:2053 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "" -#: src/common/command.c:2008 src/common/command.c:2041 +#: src/common/command.c:2012 src/common/command.c:2045 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "" -#: src/common/command.c:2024 +#: src/common/command.c:2028 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" -#: src/common/command.c:2122 +#: src/common/command.c:2126 #, c-format msgid "No config option found with \"%s\"\n" msgstr "" -#: src/common/command.c:2125 +#: src/common/command.c:2129 msgid "No config option found\n" msgstr "" -#: src/common/command.c:2131 +#: src/common/command.c:2135 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "" -#: src/common/command.c:2134 +#: src/common/command.c:2138 msgid "config option(s) found\n" msgstr "" -#: src/common/command.c:2154 +#: src/common/command.c:2158 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "" -#: src/common/command.c:2164 +#: src/common/command.c:2168 #, c-format msgid "Alias \"%s\" removed\n" msgstr "" -#: src/common/command.c:2184 +#: src/common/command.c:2188 msgid "Opened windows:\n" msgstr "" @@ -3622,7 +3529,7 @@ msgid "%s: creating default config file...\n" msgstr "" #: src/common/weeconfig.c:1392 -msgid "creating default config file\n" +msgid "Creating default config file\n" msgstr "" #: src/common/weeconfig.c:1395 src/common/weeconfig.c:1567 @@ -3633,5 +3540,5 @@ msgid "" msgstr "" #: src/common/weeconfig.c:1564 -msgid "saving config to disk\n" +msgid "Saving config to disk\n" msgstr "" diff --git a/src/common/command.c b/src/common/command.c index d2a8c14f6..61d65db7e 100644 --- a/src/common/command.c +++ b/src/common/command.c @@ -73,12 +73,12 @@ t_weechat_command weechat_commands[] = N_("[command]"), N_("command: name of a WeeChat or IRC command"), 0, 1, weechat_cmd_help, NULL }, { "perl", N_("list/load/unload Perl scripts"), - N_("[load filename] | [autoload] | [unload]"), + N_("[load filename] | [autoload] | [reload] | [unload]"), N_("filename: Perl script (file) to load\n" "Without argument, /perl command lists all loaded Perl scripts."), 0, 2, weechat_cmd_perl, NULL }, { "python", N_("list/load/unload Python scripts"), - N_("[load filename] | [autoload] | [unload]"), + N_("[load filename] | [autoload] | [reload] | [unload]"), N_("filename: Python script (file) to load\n" "Without argument, /python command lists all loaded Python scripts."), 0, 2, weechat_cmd_python, NULL }, @@ -1302,7 +1302,7 @@ weechat_cmd_perl (int argc, char **argv) case 0: /* list registered Perl scripts */ gui_printf (NULL, "\n"); - gui_printf (NULL, _("Registered Perl scripts:\n")); + gui_printf (NULL, _("Registered %s scripts:\n"), "Perl"); if (perl_scripts) { for (ptr_plugin_script = perl_scripts; ptr_plugin_script; @@ -1324,7 +1324,7 @@ weechat_cmd_perl (int argc, char **argv) /* list Perl message handlers */ gui_printf (NULL, "\n"); - gui_printf (NULL, _("Perl message handlers:\n")); + gui_printf (NULL, _("%s message handlers:\n"), "Perl"); handler_found = 0; for (ptr_plugin_handler = plugin_msg_handlers; ptr_plugin_handler; ptr_plugin_handler = ptr_plugin_handler->next_handler) @@ -1333,8 +1333,9 @@ weechat_cmd_perl (int argc, char **argv) { handler_found = 1; irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _(" IRC(%s) => Perl(%s)\n"), + gui_printf (NULL, _(" IRC(%s) => %s(%s)\n"), ptr_plugin_handler->name, + "Perl", ptr_plugin_handler->function_name); } } @@ -1346,7 +1347,7 @@ weechat_cmd_perl (int argc, char **argv) /* list Perl command handlers */ gui_printf (NULL, "\n"); - gui_printf (NULL, _("Perl command handlers:\n")); + gui_printf (NULL, _("%s command handlers:\n"), "Perl"); handler_found = 0; for (ptr_plugin_handler = plugin_cmd_handlers; ptr_plugin_handler; ptr_plugin_handler = ptr_plugin_handler->next_handler) @@ -1355,8 +1356,9 @@ weechat_cmd_perl (int argc, char **argv) { handler_found = 1; irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _(" Command /%s => Perl(%s)\n"), + gui_printf (NULL, _(" Command /%s => %s(%s)\n"), ptr_plugin_handler->name, + "Perl", ptr_plugin_handler->function_name); } } @@ -1370,13 +1372,13 @@ weechat_cmd_perl (int argc, char **argv) case 1: if (strcasecmp (argv[0], "autoload") == 0) plugin_auto_load (PLUGIN_TYPE_PERL, "perl/autoload"); - if (strcasecmp (argv[0], "unload") == 0) + else if (strcasecmp (argv[0], "reload") == 0) { - /* unload all Perl scripts */ plugin_unload (PLUGIN_TYPE_PERL, NULL); - irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _("Perl scripts unloaded\n")); + plugin_auto_load (PLUGIN_TYPE_PERL, "perl/autoload"); } + else if (strcasecmp (argv[0], "unload") == 0) + plugin_unload (PLUGIN_TYPE_PERL, NULL); break; case 2: if (strcasecmp (argv[0], "load") == 0) @@ -1443,7 +1445,7 @@ weechat_cmd_python (int argc, char **argv) case 0: /* list registered Python scripts */ gui_printf (NULL, "\n"); - gui_printf (NULL, _("Registered Python scripts:\n")); + gui_printf (NULL, _("Registered %s scripts:\n"), "Python"); if (python_scripts) { for (ptr_plugin_script = python_scripts; ptr_plugin_script; @@ -1465,7 +1467,7 @@ weechat_cmd_python (int argc, char **argv) /* list Python message handlers */ gui_printf (NULL, "\n"); - gui_printf (NULL, _("Python message handlers:\n")); + gui_printf (NULL, _("%s message handlers:\n"), "Python"); handler_found = 0; for (ptr_plugin_handler = plugin_msg_handlers; ptr_plugin_handler; ptr_plugin_handler = ptr_plugin_handler->next_handler) @@ -1474,8 +1476,9 @@ weechat_cmd_python (int argc, char **argv) { handler_found = 1; irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _(" IRC(%s) => Python(%s)\n"), + gui_printf (NULL, _(" IRC(%s) => %s(%s)\n"), ptr_plugin_handler->name, + "Python", ptr_plugin_handler->function_name); } } @@ -1487,7 +1490,7 @@ weechat_cmd_python (int argc, char **argv) /* list Python command handlers */ gui_printf (NULL, "\n"); - gui_printf (NULL, _("Python command handlers:\n")); + gui_printf (NULL, _("%s command handlers:\n"), "Python"); handler_found = 0; for (ptr_plugin_handler = plugin_cmd_handlers; ptr_plugin_handler; ptr_plugin_handler = ptr_plugin_handler->next_handler) @@ -1496,8 +1499,9 @@ weechat_cmd_python (int argc, char **argv) { handler_found = 1; irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _(" Command /%s => Python(%s)\n"), + gui_printf (NULL, _(" Command /%s => %s(%s)\n"), ptr_plugin_handler->name, + "Python", ptr_plugin_handler->function_name); } } @@ -1511,13 +1515,13 @@ weechat_cmd_python (int argc, char **argv) case 1: if (strcasecmp (argv[0], "autoload") == 0) plugin_auto_load (PLUGIN_TYPE_PYTHON, "python/autoload"); - if (strcasecmp (argv[0], "unload") == 0) + else if (strcasecmp (argv[0], "reload") == 0) { - /* unload all Python scripts */ plugin_unload (PLUGIN_TYPE_PYTHON, NULL); - irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _("Python scripts unloaded\n")); + plugin_auto_load (PLUGIN_TYPE_PYTHON, "python/autoload"); } + else if (strcasecmp (argv[0], "unload") == 0) + plugin_unload (PLUGIN_TYPE_PYTHON, NULL); break; case 2: if (strcasecmp (argv[0], "load") == 0) diff --git a/src/common/completion.c b/src/common/completion.c index 03b6ada59..1975415f1 100644 --- a/src/common/completion.c +++ b/src/common/completion.c @@ -193,7 +193,8 @@ completion_build_list (t_completion *completion, void *channel) } return; } - if ((strcasecmp (completion->base_command, "perl") == 0) + if (((strcasecmp (completion->base_command, "perl") == 0) + || (strcasecmp (completion->base_command, "python") == 0)) && (completion->base_command_arg == 1)) { weelist_add (&completion->completion_list, @@ -204,18 +205,7 @@ completion_build_list (t_completion *completion, void *channel) "autoload"); weelist_add (&completion->completion_list, &completion->last_completion, - "unload"); - return; - } - if ((strcasecmp (completion->base_command, "python") == 0) - && (completion->base_command_arg == 1)) - { - weelist_add (&completion->completion_list, - &completion->last_completion, - "load"); - weelist_add (&completion->completion_list, - &completion->last_completion, - "autoload"); + "reload"); weelist_add (&completion->completion_list, &completion->last_completion, "unload"); diff --git a/src/common/weechat.c b/src/common/weechat.c index 66d5fea4d..1e45eda04 100644 --- a/src/common/weechat.c +++ b/src/common/weechat.c @@ -632,7 +632,7 @@ wee_dump (int crash) if (crash) { sigsegv = 1; - wee_log_printf ("very bad, WeeChat is crashing (SIGSEGV received)...\n"); + wee_log_printf ("Very bad, WeeChat is crashing (SIGSEGV received)...\n"); } wee_log_printf ("\n"); diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c index b341a7fcb..be77d5447 100644 --- a/src/common/weeconfig.c +++ b/src/common/weeconfig.c @@ -1389,7 +1389,7 @@ config_create_default () } printf (_("%s: creating default config file...\n"), PACKAGE_NAME); - wee_log_printf (_("creating default config file\n")); + wee_log_printf (_("Creating default config file\n")); current_time = time (NULL); fprintf (file, _("#\n# %s configuration file, created by " @@ -1561,7 +1561,7 @@ config_write (char *config_name) return -1; } - wee_log_printf (_("saving config to disk\n")); + wee_log_printf (_("Saving config to disk\n")); current_time = time (NULL); fprintf (file, _("#\n# %s configuration file, created by " diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c index c43718e76..6ef9765ae 100644 --- a/src/gui/curses/gui-display.c +++ b/src/gui/curses/gui-display.c @@ -2600,6 +2600,12 @@ gui_printf_type_color (t_gui_buffer *buffer, int type, int color, char *message, } } + if (buffer->dcc) + buffer = gui_buffers; + + if (buffer->dcc) + return; + va_start (argptr, message); vsnprintf (buf, sizeof (buf) - 1, message, argptr); va_end (argptr); diff --git a/src/gui/gui-common.c b/src/gui/gui-common.c index 72e79127f..e1d9f9112 100644 --- a/src/gui/gui-common.c +++ b/src/gui/gui-common.c @@ -66,7 +66,7 @@ gui_window_new (int x, int y, int width, int height) t_gui_window *new_window; #ifdef DEBUG - wee_log_printf ("creating new window (x:%d, y:%d, width:%d, height:%d)\n", + wee_log_printf ("Creating new window (x:%d, y:%d, width:%d, height:%d)\n", x, y, width, height); #endif if ((new_window = (t_gui_window *)(malloc (sizeof (t_gui_window))))) @@ -138,7 +138,7 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int dcc, t_gui_buffer *new_buffer; #ifdef DEBUG - wee_log_printf ("creating new buffer\n"); + wee_log_printf ("Creating new buffer\n"); #endif /* use first buffer if no server was assigned to this buffer */ @@ -327,8 +327,7 @@ gui_infobar_printf (int time_displayed, int color, char *message, ...) gui_draw_buffer_infobar (gui_current_window->buffer, 1); } else - wee_log_printf (_("%s not enough memory for infobar message\n"), - WEECHAT_ERROR); + wee_log_printf (_("Not enough memory for infobar message\n")); free (buf2); } @@ -503,7 +502,7 @@ gui_new_line (t_gui_buffer *buffer) } else { - wee_log_printf (_("%s not enough memory for new line!\n")); + wee_log_printf (_("Not enough memory for new line\n")); return NULL; } @@ -546,7 +545,7 @@ gui_new_message (t_gui_buffer *buffer) } else { - wee_log_printf (_("not enough memory!\n")); + wee_log_printf (_("Not enough memory for new message\n")); return NULL; } return new_message; diff --git a/src/irc/irc-dcc.c b/src/irc/irc-dcc.c index 09515f007..b2344ac3a 100644 --- a/src/irc/irc-dcc.c +++ b/src/irc/irc-dcc.c @@ -92,9 +92,7 @@ dcc_calculate_speed (t_irc_dcc *ptr_dcc, int ended) } ptr_dcc->last_check_time = local_time; ptr_dcc->last_check_pos = ptr_dcc->pos; - wee_log_printf ("bytes per sec calculé: %lu\n", ptr_dcc->bytes_per_sec); } - wee_log_printf ("bytes per sec calculé pas bon !!!\n"); } /* @@ -1053,7 +1051,7 @@ dcc_end () if (ptr_dcc->sock != -1) { if (ptr_dcc->status == DCC_ACTIVE) - wee_log_printf (_("aborting active DCC: \"%s\" from %s\n"), + wee_log_printf (_("Aborting active DCC: \"%s\" from %s\n"), ptr_dcc->filename, ptr_dcc->nick); dcc_close (ptr_dcc, DCC_FAILED); } diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c index 566dceed1..ec7312739 100644 --- a/src/irc/irc-server.c +++ b/src/irc/irc-server.c @@ -323,7 +323,7 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de return NULL; #ifdef DEBUG - wee_log_printf ("creating new server (name:%s, address:%s, port:%d, pwd:%s, " + 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", name, address, port, (password) ? password : "", @@ -843,7 +843,7 @@ server_connect (t_irc_server *server) gui_printf (server->buffer, _("%s: connecting to %s:%d...\n"), PACKAGE_NAME, server->address, server->port); - wee_log_printf (_("connecting to server %s:%d...\n"), + wee_log_printf (_("Connecting to server %s:%d...\n"), server->address, server->port); /* close any opened connection and kill child process if running */ diff --git a/src/plugins/perl/wee-perl.c b/src/plugins/perl/wee-perl.c index 96f5ad7d5..2bf80b997 100644 --- a/src/plugins/perl/wee-perl.c +++ b/src/plugins/perl/wee-perl.c @@ -45,10 +45,14 @@ t_plugin_script *last_perl_script = NULL; extern void boot_DynaLoader (pTHX_ CV* cv); +/******************************* Old interface ********************************/ + /* * IRC::register: startup function for all WeeChat Perl scripts */ +/*** DEPRECATED function, kept for compatibility only, please don't update! ***/ + static XS (XS_IRC_register) { char *name, *version, *shutdown_func, *description; @@ -78,12 +82,12 @@ static XS (XS_IRC_register) if (perl_script_found) { - /* error: another scripts already exists with this name! */ + /* error: another script already exists with this name! */ irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Perl error: unable to register Perl script \"%s\" (another script " + _("%s error: unable to register \"%s\" script (another script " "already exists with this name)\n"), - name); + "Perl", name); } else { @@ -105,15 +109,15 @@ static XS (XS_IRC_register) perl_scripts = new_perl_script; last_perl_script = new_perl_script; - wee_log_printf (_("registered Perl script: \"%s\", version %s (%s)\n"), - name, version, description); + wee_log_printf (_("Registered %s script: \"%s\", version %s (%s)\n"), + "Perl", name, version, description); } else { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("%s unable to load Perl script \"%s\" (not enough memory)\n"), - WEECHAT_ERROR, name); + _("%s error: unable to load script \"%s\" (not enough memory)\n"), + "Perl", name); } } XST_mPV (0, VERSION); @@ -124,6 +128,8 @@ static XS (XS_IRC_register) * IRC::print: print message to current buffer */ +/*** DEPRECATED function, kept for compatibility only, please don't update! ***/ + static XS (XS_IRC_print) { int i, integer; @@ -148,6 +154,8 @@ static XS (XS_IRC_print) * (server is optional) */ +/*** DEPRECATED function, kept for compatibility only, please don't update! ***/ + static XS (XS_IRC_print_with_channel) { int integer; @@ -207,6 +215,8 @@ static XS (XS_IRC_print_with_channel) * IRC::print_infobar: print message to infobar */ +/*** DEPRECATED function, kept for compatibility only, please don't update! ***/ + static XS (XS_IRC_print_infobar) { int integer; @@ -221,7 +231,8 @@ static XS (XS_IRC_print_infobar) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Perl error: wrong parameters for IRC::print_infobar Perl function\n")); + _("%s error: wrong parameters for \"%s\" function\n"), + "Perl", "print_infobar"); } XSRETURN_EMPTY; @@ -231,6 +242,8 @@ static XS (XS_IRC_print_infobar) * IRC::command: send command to server */ +/*** DEPRECATED function, kept for compatibility only, please don't update! ***/ + static XS (XS_IRC_command) { int integer; @@ -254,7 +267,8 @@ static XS (XS_IRC_command) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Perl error: server not found for IRC::command Perl function\n")); + _("%s error: server not found for \"%s\" function\n"), + "Perl", "command"); } } else @@ -280,6 +294,8 @@ static XS (XS_IRC_command) * IRC::add_message_handler: add handler for messages (privmsg, ...) */ +/*** DEPRECATED function, kept for compatibility only, please don't update! ***/ + static XS (XS_IRC_add_message_handler) { char *name, *function; @@ -301,6 +317,8 @@ static XS (XS_IRC_add_message_handler) * IRC::add_command_handler: add command handler (define/redefine commands) */ +/*** DEPRECATED function, kept for compatibility only, please don't update! ***/ + static XS (XS_IRC_add_command_handler) { char *name, *function; @@ -332,6 +350,8 @@ static XS (XS_IRC_add_command_handler) * IRC::get_info: get various infos */ +/*** DEPRECATED function, kept for compatibility only, please don't update! ***/ + static XS (XS_IRC_get_info) { char *arg, *info = NULL, *server; @@ -355,7 +375,8 @@ static XS (XS_IRC_get_info) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Perl error: server not found for IRC::get_info Perl function\n")); + _("%s error: server not found for \"%s\" function\n"), + "Perl", "get_info"); } } else @@ -406,6 +427,355 @@ static XS (XS_IRC_get_info) XSRETURN (1); } +/******************************* New interface ********************************/ + +/* + * weechat::register: startup function for all WeeChat Perl scripts + */ + +static XS (XS_weechat_register) +{ + char *name, *version, *shutdown_func, *description; + int integer; + t_plugin_script *ptr_perl_script, *perl_script_found, *new_perl_script; + dXSARGS; + + /* make gcc happy */ + (void) items; + (void) cv; + + name = SvPV (ST (0), integer); + version = SvPV (ST (1), integer); + shutdown_func = SvPV (ST (2), integer); + description = SvPV (ST (3), integer); + + perl_script_found = NULL; + for (ptr_perl_script = perl_scripts; ptr_perl_script; + ptr_perl_script = ptr_perl_script->next_script) + { + if (strcasecmp (ptr_perl_script->name, name) == 0) + { + perl_script_found = ptr_perl_script; + break; + } + } + + if (perl_script_found) + { + /* error: another script already exists with this name! */ + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: unable to register \"%s\" script (another script " + "already exists with this name)\n"), + "Perl", name); + } + else + { + /* registering script */ + new_perl_script = (t_plugin_script *)malloc (sizeof (t_plugin_script)); + if (new_perl_script) + { + new_perl_script->name = strdup (name); + new_perl_script->version = strdup (version); + new_perl_script->shutdown_func = strdup (shutdown_func); + new_perl_script->description = strdup (description); + + /* add new script to list */ + new_perl_script->prev_script = last_perl_script; + new_perl_script->next_script = NULL; + if (perl_scripts) + last_perl_script->next_script = new_perl_script; + else + perl_scripts = new_perl_script; + last_perl_script = new_perl_script; + + wee_log_printf (_("Registered %s script: \"%s\", version %s (%s)\n"), + "Perl", name, version, description); + } + else + { + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: unable to load script \"%s\" (not enough memory)\n"), + "Perl", name); + } + } + XST_mPV (0, VERSION); + XSRETURN (1); +} + +/* + * weechat::print: print message into a buffer (current or specified one) + */ + +static XS (XS_weechat_print) +{ + int integer; + char *message, *channel_name, *server_name; + t_gui_buffer *ptr_buffer; + dXSARGS; + + /* make gcc happy */ + (void) cv; + + if ((items < 1) || (items > 3)) + { + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: wrong parameters for \"%s\" function\n"), + "Perl", "print"); + XSRETURN_NO; + return; + } + + channel_name = NULL; + server_name = NULL; + + if (items > 1) + { + channel_name = SvPV (ST (1), integer); + if (items > 2) + server_name = SvPV (ST (2), integer); + } + + ptr_buffer = plugin_find_buffer (server_name, channel_name); + if (ptr_buffer) + { + message = SvPV (ST (0), integer); + irc_display_prefix (ptr_buffer, PREFIX_PLUGIN); + gui_printf (ptr_buffer, "%s%s", + message, + ((strlen (message) == 0) || (message[strlen (message) - 1] != '\n')) ? "\n" : ""); + + XSRETURN_YES; + } + + /* buffer not found */ + XSRETURN_NO; +} + +/* + * weechat::print_infobar: print message to infobar + */ + +static XS (XS_weechat_print_infobar) +{ + int integer; + dXSARGS; + + /* make gcc happy */ + (void) cv; + + if (items != 2) + { + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: wrong parameters for \"%s\" function\n"), + "Perl", "print_infobar"); + XSRETURN_NO; + } + + gui_infobar_printf (SvIV (ST (0)), COLOR_WIN_INFOBAR, SvPV (ST (1), integer)); + XSRETURN_YES; +} + +/* + * weechat::command: send command to server + */ + +static XS (XS_weechat_command) +{ + int integer; + char *command, *channel_name, *server_name; + t_gui_buffer *ptr_buffer; + dXSARGS; + + /* make gcc happy */ + (void) cv; + + if ((items < 1) || (items > 3)) + { + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: wrong parameters for \"%s\" function\n"), + "Perl", "command"); + XSRETURN_NO; + return; + } + + channel_name = NULL; + server_name = NULL; + + if (items > 1) + { + channel_name = SvPV (ST (1), integer); + if (items > 2) + server_name = SvPV (ST (2), integer); + } + + ptr_buffer = plugin_find_buffer (server_name, channel_name); + if (ptr_buffer) + { + command = SvPV (ST (0), integer); + user_command (SERVER(ptr_buffer), ptr_buffer, command); + XSRETURN_YES; + } + + /* buffer not found */ + XSRETURN_NO; +} + +/* + * weechat::add_message_handler: add handler for messages (privmsg, ...) + */ + +static XS (XS_weechat_add_message_handler) +{ + char *name, *function; + int integer; + dXSARGS; + + /* make gcc happy */ + (void) cv; + + if (items != 2) + { + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: wrong parameters for \"%s\" function\n"), + "Perl", "add_message_handler"); + XSRETURN_NO; + } + + name = SvPV (ST (0), integer); + function = SvPV (ST (1), integer); + plugin_handler_add (&plugin_msg_handlers, &last_plugin_msg_handler, + PLUGIN_TYPE_PERL, name, function); + XSRETURN_YES; +} + +/* + * weechat::add_command_handler: add command handler (define/redefine commands) + */ + +static XS (XS_weechat_add_command_handler) +{ + char *name, *function; + int integer; + t_plugin_handler *ptr_plugin_handler; + dXSARGS; + + /* make gcc happy */ + (void) cv; + + if (items != 2) + { + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: wrong parameters for \"%s\" function\n"), + "Perl", "add_command_handler"); + XSRETURN_NO; + } + + name = SvPV (ST (0), integer); + function = SvPV (ST (1), integer); + if (!weelist_search (index_commands, name)) + weelist_add (&index_commands, &last_index_command, name); + ptr_plugin_handler = plugin_handler_search (plugin_cmd_handlers, name); + if (ptr_plugin_handler) + { + free (ptr_plugin_handler->function_name); + ptr_plugin_handler->function_name = strdup (function); + } + else + plugin_handler_add (&plugin_cmd_handlers, &last_plugin_cmd_handler, + PLUGIN_TYPE_PERL, name, function); + + XSRETURN_YES; +} + +/* + * weechat::get_info: get various infos + */ + +static XS (XS_weechat_get_info) +{ + char *arg, *info = NULL, *server_name; + t_irc_server *ptr_server; + int integer; + dXSARGS; + + /* make gcc happy */ + (void) cv; + + if ((items < 1) || (items > 2)) + { + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: wrong parameters for \"%s\" function\n"), + "Perl", "get_info"); + XSRETURN_NO; + } + + if (items == 2) + { + server_name = SvPV (ST (1), integer); + ptr_server = server_search (server_name); + } + else + ptr_server = SERVER(gui_current_window->buffer); + + if (!ptr_server) + { + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: server not found for \"%s\" function\n"), + "Perl", "get_info"); + XSRETURN_NO; + } + + arg = SvPV (ST (0), integer); + if (arg) + { + if ( (strcasecmp (arg, "0") == 0) || (strcasecmp (arg, "version") == 0) ) + { + info = PACKAGE_STRING; + } + else if ( (strcasecmp (arg, "1") == 0) || (strcasecmp (arg, "nick") == 0) ) + { + if (ptr_server->nick) + info = ptr_server->nick; + } + else if ( (strcasecmp (arg, "2") == 0) || (strcasecmp (arg, "channel") == 0) ) + { + if (BUFFER_IS_CHANNEL (gui_current_window->buffer)) + info = CHANNEL (gui_current_window->buffer)->name; + } + else if ( (strcasecmp (arg, "3") == 0) || (strcasecmp (arg, "server") == 0) ) + { + if (ptr_server->name) + info = ptr_server->name; + } + else if ( (strcasecmp (arg, "4") == 0) || (strcasecmp (arg, "weechatdir") == 0) ) + { + info = weechat_home; + } + else if ( (strcasecmp (arg, "5") == 0) || (strcasecmp (arg, "away") == 0) ) + { + XST_mIV (0, SERVER(gui_current_window->buffer)->is_away); + XSRETURN (1); + return; + } + + if (info) + XST_mPV (0, info); + else + XST_mPV (0, ""); + } + + XSRETURN (1); +} + /* * xs_init: initialize subroutines */ @@ -414,6 +784,8 @@ void xs_init (pTHX) { newXS ("DynaLoader::boot_DynaLoader", boot_DynaLoader, __FILE__); + + /* DEPRECATED & old interface (WeeChat <= 0.1.1), kept for compatibility */ newXS ("IRC::register", XS_IRC_register, "IRC"); newXS ("IRC::print", XS_IRC_print, "IRC"); newXS ("IRC::print_with_channel", XS_IRC_print_with_channel, "IRC"); @@ -422,6 +794,15 @@ xs_init (pTHX) newXS ("IRC::add_message_handler", XS_IRC_add_message_handler, "IRC"); newXS ("IRC::add_command_handler", XS_IRC_add_command_handler, "IRC"); newXS ("IRC::get_info", XS_IRC_get_info, "IRC"); + + /* new interface (WeeChat >= 0.1.2) */ + newXS ("weechat::register", XS_weechat_register, "weechat"); + newXS ("weechat::print", XS_weechat_print, "weechat"); + newXS ("weechat::print_infobar", XS_weechat_print_infobar, "weechat"); + newXS ("weechat::command", XS_weechat_command, "weechat"); + newXS ("weechat::add_message_handler", XS_weechat_add_message_handler, "weechat"); + newXS ("weechat::add_command_handler", XS_weechat_add_command_handler, "weechat"); + newXS ("weechat::get_info", XS_weechat_get_info, "weechat"); } /* @@ -433,7 +814,7 @@ wee_perl_init () { char *perl_args[] = { "", "-e", "0" }; /* Following Perl code is extracted/modified from X-Chat IRC client */ - /* X-Chat is (c) 1998-2002 Peter Zelezny */ + /* X-Chat is (c) 1998-2005 Peter Zelezny */ char *weechat_perl_func = { "sub wee_perl_load_file" @@ -451,21 +832,22 @@ wee_perl_init () " my $content = wee_perl_load_file ($filename);" " if ($content eq \"__WEECHAT_ERROR__\")" " {" - " IRC::print \"WeeChat Error: Perl script '$filename' not found.\\n\";" + " weechat::print \"WeeChat Error: Perl script '$filename' not found.\\n\";" " return 1;" " }" " eval $content;" " if ($@)" " {" - " IRC::print \"WeeChat error: unable to load Perl script '$filename':\\n\";" - " IRC::print \"$@\\n\";" + " weechat::print \"WeeChat error: unable to load Perl script '$filename':\\n\";" + " weechat::print \"$@\\n\";" " return 2;" " }" " return 0;" "}" - "$SIG{__WARN__} = sub { IRC::print \"$_[0]\n\"; };" + "$SIG{__WARN__} = sub { weechat::print \"$_[0]\n\"; };" }; + wee_log_printf (_("Loading %s module \"weechat\"\n"), "Perl"); my_perl = perl_alloc (); perl_construct (my_perl); perl_parse (my_perl, xs_init, 3, perl_args, NULL); @@ -524,7 +906,7 @@ wee_perl_exec (char *function, char *server, char *arguments) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Perl error: %s\n"), + _("Perl error: %s"), SvPV (sv, count)); POPs; } @@ -534,8 +916,8 @@ wee_perl_exec (char *function, char *server, char *arguments) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Perl error: too much values from \"%s\" (%d). Expected: 1.\n"), - function, count); + _("%s error: too much values from \"%s\" (%d). Expected: 1.\n"), + "Perl", function, count); } else return_code = POPi; @@ -556,9 +938,9 @@ int wee_perl_load (char *filename) { /* execute Perl script */ - wee_log_printf (_("loading Perl script \"%s\"\n"), filename); + wee_log_printf (_("Loading %s script \"%s\"\n"), "Perl", filename); irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _("Loading Perl script \"%s\"\n"), filename); + gui_printf (NULL, _("Loading %s script \"%s\"\n"), "Perl", filename); return wee_perl_exec ("wee_perl_load_eval_file", filename, ""); } @@ -607,8 +989,8 @@ wee_perl_unload (t_plugin_script *ptr_perl_script) { if (ptr_perl_script) { - wee_log_printf (_("unloading Perl script \"%s\"\n"), - ptr_perl_script->name); + wee_log_printf (_("Unloading %s script \"%s\"\n"), + "Perl", ptr_perl_script->name); /* call shutdown callback function */ if (ptr_perl_script->shutdown_func[0]) @@ -624,9 +1006,12 @@ wee_perl_unload (t_plugin_script *ptr_perl_script) void wee_perl_unload_all () { - wee_log_printf (_("unloading all Perl scripts...\n")); + wee_log_printf (_("Unloading all %s scripts...\n"), "Perl"); while (perl_scripts) wee_perl_unload (perl_scripts); + + irc_display_prefix (NULL, PREFIX_PLUGIN); + gui_printf (NULL, _("%s scripts unloaded\n"), "Perl"); } /* diff --git a/src/plugins/plugins.c b/src/plugins/plugins.c index 85a3d5033..462bfe4d8 100644 --- a/src/plugins/plugins.c +++ b/src/plugins/plugins.c @@ -90,7 +90,7 @@ plugin_auto_load (int plugin_type, char *directory) lstat (entry->d_name, &statbuf); if (! S_ISDIR(statbuf.st_mode)) { - wee_log_printf (_("auto-loading %s script: %s%s%s\n"), + wee_log_printf (_("Auto-loading %s script: %s%s%s\n"), plugin_name[plugin_type], dir_name, DIR_SEPARATOR, entry->d_name); plugin_load (plugin_type, entry->d_name); @@ -194,6 +194,7 @@ plugin_handler_add (t_plugin_handler **plugin_handlers, new_plugin_handler->plugin_type = plugin_type; new_plugin_handler->name = strdup (name); new_plugin_handler->function_name = strdup (function); + new_plugin_handler->running = 0; /* add new handler to list */ new_plugin_handler->prev_handler = *last_plugin_handler; @@ -301,11 +302,25 @@ plugin_event_msg (char *irc_command, char *arguments, char *server) { #ifdef PLUGIN_PERL if (ptr_plugin_handler->plugin_type == PLUGIN_TYPE_PERL) - wee_perl_exec (ptr_plugin_handler->function_name, arguments, server); + { + if (ptr_plugin_handler->running == 0) + { + ptr_plugin_handler->running = 1; + wee_perl_exec (ptr_plugin_handler->function_name, arguments, server); + ptr_plugin_handler->running = 0; + } + } #endif #ifdef PLUGIN_PYTHON if (ptr_plugin_handler->plugin_type == PLUGIN_TYPE_PYTHON) - wee_python_exec (ptr_plugin_handler->function_name, arguments, server); + { + if (ptr_plugin_handler->running == 0) + { + ptr_plugin_handler->running = 1; + wee_python_exec (ptr_plugin_handler->function_name, arguments, server); + ptr_plugin_handler->running = 0; + } + } #endif } } @@ -334,11 +349,25 @@ plugin_exec_command (char *user_command, char *arguments, char *server) { #ifdef PLUGIN_PERL if (ptr_plugin_handler->plugin_type == PLUGIN_TYPE_PERL) - wee_perl_exec (ptr_plugin_handler->function_name, arguments, server); + { + if (ptr_plugin_handler->running == 0) + { + ptr_plugin_handler->running = 1; + wee_perl_exec (ptr_plugin_handler->function_name, arguments, server); + ptr_plugin_handler->running = 0; + } + } #endif #ifdef PLUGIN_PYTHON if (ptr_plugin_handler->plugin_type == PLUGIN_TYPE_PYTHON) - wee_python_exec (ptr_plugin_handler->function_name, arguments, server); + { + if (ptr_plugin_handler->running == 0) + { + ptr_plugin_handler->running = 1; + wee_python_exec (ptr_plugin_handler->function_name, arguments, server); + ptr_plugin_handler->running = 0; + } + } #endif /* command executed */ @@ -357,6 +386,49 @@ plugin_exec_command (char *user_command, char *arguments, char *server) } /* + * plugin_find_buffer: find a buffer for text display or command execution + */ + +t_gui_buffer * +plugin_find_buffer (char *server, char *channel) +{ + t_irc_server *ptr_server; + t_irc_channel *ptr_channel; + t_gui_buffer *ptr_buffer; + + ptr_server = NULL; + ptr_channel = NULL; + ptr_buffer = NULL; + + if (server) + { + ptr_server = server_search (server); + if (!ptr_server) + return NULL; + } + else + { + ptr_server = SERVER(gui_current_window->buffer); + if (!ptr_server) + ptr_server = SERVER(gui_buffers); + } + + if (channel && ptr_server) + { + ptr_channel = channel_search (ptr_server, channel); + if (ptr_channel) + ptr_buffer = ptr_channel->buffer; + } + else + ptr_buffer = gui_current_window->buffer; + + if (!ptr_buffer) + return NULL; + + return (ptr_buffer->dcc) ? NULL : ptr_buffer; +} + +/* * plugin_unload: unload all scripts for a plugin type */ diff --git a/src/plugins/plugins.h b/src/plugins/plugins.h index 1fc773d69..3a5bc64b5 100644 --- a/src/plugins/plugins.h +++ b/src/plugins/plugins.h @@ -21,6 +21,8 @@ #ifndef __WEECHAT_PLUGINS_H #define __WEECHAT_PLUGINS_H 1 +#include "../gui/gui.h" + #define PLUGIN_TYPE_PERL 0 #define PLUGIN_TYPE_PYTHON 1 #define PLUGIN_TYPE_RUBY 2 @@ -45,6 +47,8 @@ struct t_plugin_handler char *name; /* name of IRC command (PRIVMSG, ..) or command (without first '/') */ char *function_name; /* name of function (handler) */ + int running; /* 1 if currently running */ + /* (used to prevent circular call) */ t_plugin_handler *prev_handler; /* link to previous handler */ t_plugin_handler *next_handler; /* link to next handler */ }; @@ -66,14 +70,15 @@ extern t_plugin_script *python_scripts; extern void plugin_auto_load (int, char *); extern void plugin_init (); extern void plugin_load (int, char *); -extern void plugin_unload (int, /*@null@*/ char *); +extern void plugin_unload (int, char *); extern t_plugin_handler *plugin_handler_search (t_plugin_handler *, char *); extern void plugin_handler_add (t_plugin_handler **, t_plugin_handler **, int, char *, char *); extern void plugin_handler_free_all_type (t_plugin_handler **, t_plugin_handler **, int); extern void plugin_event_msg (char *, char *, char *); -extern int plugin_exec_command (char *, /*@null@*/ char *, char *); +extern int plugin_exec_command (char *, char *, char *); +extern t_gui_buffer *plugin_find_buffer (char *, char *); extern void plugin_end (); #endif /* plugins.h */ diff --git a/src/plugins/python/wee-python.c b/src/plugins/python/wee-python.c index 6c4e48b42..cab102ea7 100644 --- a/src/plugins/python/wee-python.c +++ b/src/plugins/python/wee-python.c @@ -41,8 +41,7 @@ t_plugin_script *last_python_script = NULL; /* - * weechat.register(nom, version, fonction, description): - * startup function for all WeeChat Python scripts + * weechat.register: startup function for all WeeChat Python scripts */ static PyObject * @@ -58,7 +57,8 @@ wee_python_register (PyObject *self, PyObject *args) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: wrong parameters for 'print_with_channel' Python function\n")); + _("%s error: wrong parameters for \"%s\" function\n"), + "Python", "print_with_channel"); return NULL; } @@ -78,9 +78,9 @@ wee_python_register (PyObject *self, PyObject *args) /* error: another scripts already exists with this name! */ irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: unable to register Python script \"%s\" (another script " - "already exists with this name)\n"), - name); + _("%s error: unable to register \"%s\" script (another script " + "already exists with this name)\n"), + "Python", name); } else { @@ -102,15 +102,15 @@ wee_python_register (PyObject *self, PyObject *args) python_scripts = new_python_script; last_python_script = new_python_script; - wee_log_printf (_("registered Python script: \"%s\", version %s (%s)\n"), - name, version, description); + wee_log_printf (_("Registered %s script: \"%s\", version %s (%s)\n"), + "Python", name, version, description); } else { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("%s unable to load Python script \"%s\" (not enough memory)\n"), - WEECHAT_ERROR, name); + _("%s error: unable to load script \"%s\" (not enough memory)\n"), + "Python", name); } } @@ -119,91 +119,45 @@ wee_python_register (PyObject *self, PyObject *args) } /* - * weechat.print(message): print message to current buffer + * weechat.print: print message into a buffer (current or specified one) */ static PyObject * wee_python_print (PyObject *self, PyObject *args) { - char *message; - - /* make gcc happy */ - (void) self; - - if (!PyArg_ParseTuple (args, "s", &message)) - { - irc_display_prefix (NULL, PREFIX_ERROR); - gui_printf (NULL, - _("Python error: wrong parameters for 'print' Python function\n")); - return NULL; - } - - irc_display_prefix (gui_current_window->buffer, PREFIX_PLUGIN); - gui_printf (gui_current_window->buffer, "%s\n", message); - - Py_INCREF (Py_None); - return Py_None; -} - -/* - * weechat.print_with_channel(message, channel, server=None): - * print message to a specific channel/server - * (server is optional) - */ - -static PyObject * -wee_python_print_with_channel (PyObject *self, PyObject *args) -{ - char *message, *channel, *server = NULL; - int ret = 0; + char *message, *channel_name, *server_name; t_gui_buffer *ptr_buffer; - t_irc_server *ptr_server; - t_irc_channel *ptr_channel; /* make gcc happy */ (void) self; - if (!PyArg_ParseTuple (args, "ss|s", &message, &channel, &server)) + message = NULL; + channel_name = NULL; + server_name = NULL; + + if (!PyArg_ParseTuple (args, "s|ss", &message, &channel_name, &server_name)) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: wrong parameters for 'print_with_channel' Python function\n")); + _("%s error: wrong parameters for \"%s\" function\n"), + "Python", "print"); return NULL; } - ptr_buffer = NULL; - for (ptr_server = irc_servers; ptr_server; - ptr_server = ptr_server->next_server) - { - if (!server || (strcasecmp (ptr_server->name, server)) == 0) - { - for (ptr_channel = ptr_server->channels; ptr_channel; - ptr_channel = ptr_channel->next_channel) - { - if (strcasecmp (ptr_channel->name, channel) == 0) - { - ptr_buffer = ptr_channel->buffer; - break; - } - } - } - if (ptr_buffer) - break; - } - - /* buffer found => display message & return 1 ~= True */ + ptr_buffer = plugin_find_buffer (server_name, channel_name); if (ptr_buffer) { irc_display_prefix (ptr_buffer, PREFIX_PLUGIN); - gui_printf (ptr_buffer, "%s", message); - ret = 1; + gui_printf (ptr_buffer, "%s\n", message); + return Py_BuildValue ("i", 1); } - return Py_BuildValue ("i", ret); + /* buffer not found */ + return Py_BuildValue ("i", 0); } /* - * weechat.print_infobar(delay, message): print message to infobar + * weechat.print_infobar: print message to infobar */ static PyObject * @@ -215,11 +169,15 @@ wee_python_print_infobar (PyObject *self, PyObject *args) /* make gcc happy */ (void) self; + delay = 1; + message = NULL; + if (!PyArg_ParseTuple (args, "is", &delay, &message)) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: wrong parameters for 'print_infobar' Python function\n")); + _("%s error: wrong parameters for \"%s\" function\n"), + "Python", "print_infobar"); return NULL; } @@ -230,62 +188,44 @@ wee_python_print_infobar (PyObject *self, PyObject *args) } /* - * weechat.command(command, server=None): send command to server + * weechat.command: send command to server */ static PyObject * wee_python_command (PyObject *self, PyObject *args) { - char *server = NULL, *command, *command2; - t_irc_server *ptr_server; + char *command, *channel_name, *server_name; + t_gui_buffer *ptr_buffer; /* make gcc happy */ (void) self; - if (!PyArg_ParseTuple (args, "s|s", &command, &server)) + command = NULL; + channel_name = NULL; + server_name = NULL; + + if (!PyArg_ParseTuple (args, "s|ss", &command, &channel_name, &server_name)) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: wrong parameters for 'command' Python function\n")); + _("%s error: wrong parameters for \"%s\" function\n"), + "Python", "command"); return NULL; } - if (server == NULL) - { - ptr_server = SERVER(gui_current_window->buffer); - } - else - { - for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server) - { - if (strcasecmp (ptr_server->name, server) == 0) - break; - } - if (!ptr_server) - { - irc_display_prefix (NULL, PREFIX_ERROR); - gui_printf (NULL, - _("Python error: server not found for 'command' Python function\n")); - } - } - - if (ptr_server) + ptr_buffer = plugin_find_buffer (server_name, channel_name); + if (ptr_buffer) { - command2 = (char *) malloc (strlen (command) + 8); - strcpy (command2, command); - if (!strstr (command2, "\r\n")) - strcat (command2, "\r\n"); - server_sendf (ptr_server, command2); - free (command2); + user_command (SERVER(ptr_buffer), ptr_buffer, command); + return Py_BuildValue ("i", 1); } - Py_INCREF (Py_None); - return Py_None; + /* buffer not found */ + return Py_BuildValue ("i", 0); } /* - * weechat.add_message_handler(message, function): - * add handler for messages + * weechat.add_message_handler: add handler for messages */ static PyObject * @@ -300,7 +240,8 @@ wee_python_add_message_handler (PyObject *self, PyObject *args) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: wrong parameters for 'add_message_handler' Python function\n")); + _("%s error: wrong parameters for \"%s\" function\n"), + "Python", "add_message_handler"); return NULL; } @@ -312,8 +253,7 @@ wee_python_add_message_handler (PyObject *self, PyObject *args) } /* - * weechat.add_command_handler(name, function): - * define/redefines commands + * weechat.add_command_handler: define/redefines commands */ static PyObject * @@ -329,7 +269,8 @@ wee_python_add_command_handler(PyObject *self, PyObject *args) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: wrong parameters for 'add_command_handler' Python function\n")); + _("%s error: wrong parameters for \"%s\" function\n"), + "Python", "add_command_handler"); return NULL; } @@ -351,8 +292,7 @@ wee_python_add_command_handler(PyObject *self, PyObject *args) } /* - * weechat.get_info(info, server=None): - * get various infos + * weechat.get_info: get various infos */ static PyObject * @@ -368,7 +308,8 @@ wee_python_get_info (PyObject *self, PyObject *args) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: wrong parameters for 'get_info' Python function\n")); + _("%s error: wrong parameters for \"%s\" function\n"), + "Python", "get_info"); return NULL; } @@ -387,7 +328,8 @@ wee_python_get_info (PyObject *self, PyObject *args) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: server not found for 'get_info' Python function\n")); + _("%s error: server not found for \"%s\" function\n"), + "Python", "get_info"); } } @@ -431,20 +373,19 @@ wee_python_get_info (PyObject *self, PyObject *args) } /* - * initialize subroutines + * Python subroutines */ static PyMethodDef weechat_funcs[] = { - {"register", wee_python_register, METH_VARARGS, ""}, - {"prnt", wee_python_print, METH_VARARGS, ""}, - {"print_with_channel", wee_python_print_with_channel, METH_VARARGS, ""}, - {"print_infobar", wee_python_print_infobar, METH_VARARGS, ""}, - {"command", wee_python_command, METH_VARARGS, ""}, - {"add_message_handler", wee_python_add_message_handler, METH_VARARGS, ""}, - {"add_command_handler", wee_python_add_command_handler, METH_VARARGS, ""}, - {"get_info", wee_python_get_info, METH_VARARGS, ""}, - {NULL, NULL, 0, NULL} + { "register", wee_python_register, METH_VARARGS, "" }, + { "prnt", wee_python_print, METH_VARARGS, "" }, + { "print_infobar", wee_python_print_infobar, METH_VARARGS, "" }, + { "command", wee_python_command, METH_VARARGS, "" }, + { "add_message_handler", wee_python_add_message_handler, METH_VARARGS, "" }, + { "add_command_handler", wee_python_add_command_handler, METH_VARARGS, "" }, + { "get_info", wee_python_get_info, METH_VARARGS, "" }, + { NULL, NULL, 0, NULL } }; /* @@ -459,13 +400,13 @@ wee_python_init () if (Py_IsInitialized () == 0) { irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _("Python error: error while launching Python interpreter\n")); + gui_printf (NULL, _("%s error: error while launching interpreter\n"), + "Python"); } else { + wee_log_printf (_("Loading %s module \"weechat\"\n"), "Python"); Py_InitModule ("weechat", weechat_funcs); - irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _("Loading Python module \"weechat\"\n")); } } @@ -516,8 +457,8 @@ wee_python_exec (char *function, char *server, char *arguments) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: unable to run function \"%s\"in Python script (not enough memory)\n"), - function); + _("%s error: unable to run function \"%s\" in script (not enough memory)\n"), + "Python", function); return 0; } @@ -544,8 +485,8 @@ wee_python_exec (char *function, char *server, char *arguments) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: unable to run function \"%s\"in Python script (not enough memory)\n"), - function); + _("%s error: unable to run function \"%s\" in script (not enough memory)\n"), + "Python", function); free (args); return 0; } @@ -566,7 +507,8 @@ wee_python_exec (char *function, char *server, char *arguments) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: error while running function \"%s\"\n"), function); + _("%s error: error while running function \"%s\"\n"), + "Python", function); return_code = 0; } free (runstring); @@ -575,8 +517,8 @@ wee_python_exec (char *function, char *server, char *arguments) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: unable to run function \"%s\"in Python script (not enough memory)\n"), - function); + _("%s error: unable to run function \"%s\" in script (not enough memory)\n"), + "Python", function); return_code = 0; } @@ -596,15 +538,16 @@ wee_python_load (char *filename) FILE *fp; /* execute Python script */ - wee_log_printf (_("loading Python script \"%s\"\n"), filename); + wee_log_printf (_("Loading %s script \"%s\"\n"), "Python", filename); irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _("Loading Python script \"%s\"\n"), filename); + gui_printf (NULL, _("Loading %s script \"%s\"\n"), "Python", filename); if ((fp = fopen (filename, "r")) == NULL) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: error while opening file \"%s\"\n"), filename); + _("%s error: error while opening file \"%s\"\n"), + "Python", filename); return 1; } @@ -612,7 +555,8 @@ wee_python_load (char *filename) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: error while parsing file \"%s\"\n"), filename); + _("%s error: error while parsing file \"%s\"\n"), + "Python", filename); return 1; } @@ -665,8 +609,8 @@ wee_python_unload (t_plugin_script *ptr_python_script) { if (ptr_python_script) { - wee_log_printf (_("unloading Python script \"%s\"\n"), - ptr_python_script->name); + wee_log_printf (_("Unloading %s script \"%s\"\n"), + "Python", ptr_python_script->name); /* call shutdown callback function */ if (ptr_python_script->shutdown_func[0]) @@ -682,9 +626,12 @@ wee_python_unload (t_plugin_script *ptr_python_script) void wee_python_unload_all () { - wee_log_printf (_("unloading all Python scripts...\n")); + wee_log_printf (_("Unloading all %s scripts...\n"), "Python"); while (python_scripts) wee_python_unload (python_scripts); + + irc_display_prefix (NULL, PREFIX_PLUGIN); + gui_printf (NULL, _("%s scripts unloaded\n"), "Python"); } /* @@ -705,9 +652,12 @@ wee_python_end () &last_plugin_cmd_handler, PLUGIN_TYPE_PYTHON); + /* free Python interpreter */ Py_Finalize (); - if (Py_IsInitialized () != 0) { - irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _("Python error: error while freeing Python interpreter\n")); + if (Py_IsInitialized () != 0) + { + irc_display_prefix (NULL, PREFIX_PLUGIN); + gui_printf (NULL, _("%s error: error while freeing interpreter\n"), + "Python"); } } diff --git a/weechat/BUGS b/weechat/BUGS index 032701a5b..90c74b2bf 100644 --- a/weechat/BUGS +++ b/weechat/BUGS @@ -1,10 +1,10 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -WeeChat known bugs, 2005-03-20 +WeeChat known bugs, 2005-05-05 - ./configure does not check that Gtk 2.0 libraries are installed -- ./configure does not check that Perl headers & libraries are installed +- ./configure does not check that Perl/Python headers & libraries are installed - too much nicks in the channel (> height of window) => some nicks are hidden - when quitting WeeChat term title is not restored (if look_set_title is ON) - command name for /server can not contain spaces diff --git a/weechat/ChangeLog b/weechat/ChangeLog index a222fddec..63e1d414b 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -1,11 +1,11 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2005-05-01 +ChangeLog - 2005-05-05 Version 0.1.2 (under dev!): - * added Python plugin support + * added Python plugin support, improved Perl interface * added nicklist scroll keys (Alt+{home/end/pgup/pgdn} or F11/F12) * added transfer rate for DCC files * added "-all" option for /nick command diff --git a/weechat/po/es.po b/weechat/po/es.po index ac980c3df..ef1165fad 100644 --- a/weechat/po/es.po +++ b/weechat/po/es.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.2-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-05-01 20:47+0200\n" -"PO-Revision-Date: 2005-05-01 20:48+0200\n" +"POT-Creation-Date: 2005-05-05 17:58+0200\n" +"PO-Revision-Date: 2005-05-05 17:02+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" @@ -88,8 +88,8 @@ msgstr "%s: conectando a %s:%d...\n" #: src/irc/irc-server.c:846 #, c-format -msgid "connecting to server %s:%d...\n" -msgstr "conectando al servidor %s:%d...\n" +msgid "Connecting to server %s:%d...\n" +msgstr "Conectando al servidor %s:%d...\n" #: src/irc/irc-server.c:857 #, c-format @@ -1300,8 +1300,8 @@ 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:1129 src/common/command.c:1411 -#: src/common/command.c:1552 +#: src/common/command.c:1129 src/common/command.c:1413 +#: src/common/command.c:1556 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s número de argumentos incorrecto para el comando \"%s\"\n" @@ -1554,7 +1554,7 @@ msgstr "%s no es posible analizar el comando \"%s\"\n" msgid "%s unknown DCC CHAT type received from " msgstr "%s tipo DCC CHAT desconocido recibido de " -#: src/irc/irc-recv.c:1496 src/irc/irc-dcc.c:801 +#: src/irc/irc-recv.c:1496 src/irc/irc-dcc.c:799 #, c-format msgid "Private %s> %s" msgstr "Privado %s> %s" @@ -1782,31 +1782,31 @@ msgstr "Falló" msgid "Aborted" msgstr "Abortado" -#: src/irc/irc-dcc.c:192 +#: src/irc/irc-dcc.c:190 msgid "DCC: file " msgstr "DCC: fichero " -#: src/irc/irc-dcc.c:197 src/irc/irc-dcc.c:456 +#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:454 msgid " (local filename: " msgstr " (nombre de fichero local: " -#: src/irc/irc-dcc.c:203 +#: src/irc/irc-dcc.c:201 msgid ") sent to " msgstr ") enviado a " -#: src/irc/irc-dcc.c:205 +#: src/irc/irc-dcc.c:203 msgid ") received from " msgstr ") recibido de " -#: src/irc/irc-dcc.c:210 +#: src/irc/irc-dcc.c:208 msgid ": ok!\n" msgstr ": ok!\n" -#: src/irc/irc-dcc.c:222 +#: src/irc/irc-dcc.c:220 msgid "DCC chat closed with " msgstr "DCC chat cerrada con " -#: src/irc/irc-dcc.c:263 +#: src/irc/irc-dcc.c:261 #, c-format msgid "" "%s can't associate DCC chat with private buffer (maybe private buffer has " @@ -1815,74 +1815,74 @@ msgstr "" "%s no se puede asociar la conversación DCC con el búfer privado (quizá el " "búfer privado ya tiene DCC CHAT)\n" -#: src/irc/irc-dcc.c:273 +#: src/irc/irc-dcc.c:271 msgid "Connected to " msgstr "Conectado al " -#: src/irc/irc-dcc.c:282 +#: src/irc/irc-dcc.c:280 msgid "via DCC chat\n" msgstr "con charla DCC\n" -#: src/irc/irc-dcc.c:393 +#: src/irc/irc-dcc.c:391 #, c-format msgid "%s not enough memory for new DCC\n" msgstr "%s no hay memoria suficiente para un nuevo DCC\n" -#: src/irc/irc-dcc.c:412 +#: src/irc/irc-dcc.c:410 msgid "DCC chat" msgstr "Charla DCC" -#: src/irc/irc-dcc.c:436 +#: src/irc/irc-dcc.c:434 msgid "Incoming DCC file from " msgstr "Recibir fichero DCC de " -#: src/irc/irc-dcc.c:447 src/irc/irc-dcc.c:460 +#: src/irc/irc-dcc.c:445 src/irc/irc-dcc.c:458 msgid " bytes\n" msgstr " bytes\n" -#: src/irc/irc-dcc.c:452 +#: src/irc/irc-dcc.c:450 msgid "Sending DCC file to " msgstr "Enviar fichero DCC a " -#: src/irc/irc-dcc.c:465 +#: src/irc/irc-dcc.c:463 msgid "Incoming DCC chat request from " msgstr "Recibir DCC chat de " -#: src/irc/irc-dcc.c:476 +#: src/irc/irc-dcc.c:474 msgid "Sending DCC chat request to " msgstr "Enviar DCC chat a " -#: src/irc/irc-dcc.c:540 +#: src/irc/irc-dcc.c:538 #, c-format msgid "%s not enough memory for DCC SEND\n" msgstr "%s no hay memoria suficiente para el DCC SEND\n" -#: src/irc/irc-dcc.c:562 +#: src/irc/irc-dcc.c:560 #, c-format msgid "%s cannot access file \"%s\"\n" msgstr "%s no es posible acceder al fichero \"%s\"\n" -#: src/irc/irc-dcc.c:583 +#: src/irc/irc-dcc.c:581 #, c-format msgid "%s cannot create socket for DCC\n" msgstr "%s no es posible crear socket para el DCC\n" -#: src/irc/irc-dcc.c:596 +#: src/irc/irc-dcc.c:594 #, c-format msgid "%s cannot find port for DCC\n" msgstr "%s no es posible encontrar el puerto para el DCC\n" -#: src/irc/irc-dcc.c:643 +#: src/irc/irc-dcc.c:641 #, c-format msgid "%s cannot send DCC\n" msgstr "%s no es posible enviar el DCC\n" -#: src/irc/irc-dcc.c:722 +#: src/irc/irc-dcc.c:720 #, c-format msgid "%s error sending data to \"%s\" via DCC CHAT\n" msgstr "%s error enviando datos al \"%s\" con DCC CHAT\n" -#: src/irc/irc-dcc.c:982 +#: src/irc/irc-dcc.c:980 #, c-format msgid "" "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" " @@ -1891,208 +1891,127 @@ msgstr "" "%s El DCC ha fallado porque el tamaño de bloque es demasiado grande. " "Compruebe el valor de la opción \"dcc_blocksize\", el máximo es %d.\n" -#: src/irc/irc-dcc.c:1056 +#: src/irc/irc-dcc.c:1054 #, c-format -msgid "aborting active DCC: \"%s\" from %s\n" -msgstr "abandonar el DCC activo: \"%s\" de %s\n" +msgid "Aborting active DCC: \"%s\" from %s\n" +msgstr "Abandonar el DCC activo: \"%s\" de %s\n" -#: src/plugins/perl/wee-perl.c:84 +#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:468 +#: src/plugins/python/wee-python.c:81 #, c-format msgid "" -"Perl error: unable to register Perl script \"%s\" (another script already " -"exists with this name)\n" +"%s error: unable to register \"%s\" script (another script already exists " +"with this name)\n" msgstr "" -"Error de Perl: no ha sido posible registrar el Perl script \"%s\" (ya existe " -"otro script con ese nombre)\n" +"Error de %s: no ha sido posible registrar el script \"%s\" (ya existe otro " +"script con ese nombre)\n" -#: src/plugins/perl/wee-perl.c:108 +#: src/plugins/perl/wee-perl.c:112 src/plugins/perl/wee-perl.c:492 +#: src/plugins/python/wee-python.c:105 #, c-format -msgid "registered Perl script: \"%s\", version %s (%s)\n" -msgstr "Perl script registrado: \"%s\", versión %s (%s)\n" +msgid "Registered %s script: \"%s\", version %s (%s)\n" +msgstr "%s script registrado: \"%s\", versión %s (%s)\n" -#: src/plugins/perl/wee-perl.c:115 +#: src/plugins/perl/wee-perl.c:119 src/plugins/perl/wee-perl.c:499 +#: src/plugins/python/wee-python.c:112 #, c-format -msgid "%s unable to load Perl script \"%s\" (not enough memory)\n" -msgstr "" -"%s no ha sido posible cargar el Perl script \"%s\" (memoria insuficiente)\n" - -#: src/plugins/perl/wee-perl.c:224 -msgid "Perl error: wrong parameters for IRC::print_infobar Perl function\n" -msgstr "" -"Error de Perl: parámetros incorrectos para la función Perl IRC::" -"print_infobar\n" - -#: src/plugins/perl/wee-perl.c:257 -msgid "Perl error: server not found for IRC::command Perl function\n" +msgid "%s error: unable to load script \"%s\" (not enough memory)\n" msgstr "" -"Error de Perl: servidor no encontrado para la función Perl IRC::command\n" - -#: src/plugins/perl/wee-perl.c:358 -msgid "Perl error: server not found for IRC::get_info Perl function\n" -msgstr "" -"Error de Perl: servidor no encontrado para la función Perl IRC::get_info\n" +"Error de %s: no ha sido posible cargar el script \"%s\" (memoria " +"insuficiente)\n" -#: src/plugins/perl/wee-perl.c:527 +#: src/plugins/perl/wee-perl.c:234 src/plugins/perl/wee-perl.c:525 +#: src/plugins/perl/wee-perl.c:573 src/plugins/perl/wee-perl.c:600 +#: src/plugins/perl/wee-perl.c:645 src/plugins/perl/wee-perl.c:675 +#: src/plugins/perl/wee-perl.c:715 src/plugins/python/wee-python.c:60 +#: src/plugins/python/wee-python.c:142 src/plugins/python/wee-python.c:179 +#: src/plugins/python/wee-python.c:211 src/plugins/python/wee-python.c:243 +#: src/plugins/python/wee-python.c:272 src/plugins/python/wee-python.c:311 #, c-format -msgid "Perl error: %s\n" -msgstr "Error de Perl: %s\n" +msgid "%s error: wrong parameters for \"%s\" function\n" +msgstr "Error de %s: parámetros incorrectos para la función \"%s\"\n" -#: src/plugins/perl/wee-perl.c:537 +#: src/plugins/perl/wee-perl.c:270 src/plugins/perl/wee-perl.c:378 +#: src/plugins/perl/wee-perl.c:732 src/plugins/python/wee-python.c:331 #, c-format -msgid "Perl error: too much values from \"%s\" (%d). Expected: 1.\n" -msgstr "Error de Perl: demasiados valores desde \"%s\" (%d). Esperado: 1.\n" +msgid "%s error: server not found for \"%s\" function\n" +msgstr "Error de %s: servidor no encontrado para el comando \"%s\"\n" -#: src/plugins/perl/wee-perl.c:559 +#: src/plugins/perl/wee-perl.c:850 src/plugins/python/wee-python.c:408 #, c-format -msgid "loading Perl script \"%s\"\n" -msgstr "carga del Perl script \"%s\"\n" +msgid "Loading %s module \"weechat\"\n" +msgstr "" -#: src/plugins/perl/wee-perl.c:561 +#: src/plugins/perl/wee-perl.c:909 #, c-format -msgid "Loading Perl script \"%s\"\n" -msgstr "Cargando Perl script \"%s\"\n" +msgid "Perl error: %s" +msgstr "Error de Perl: %s" -#: src/plugins/perl/wee-perl.c:610 +#: src/plugins/perl/wee-perl.c:919 #, c-format -msgid "unloading Perl script \"%s\"\n" -msgstr "descarga del Perl script \"%s\"\n" - -#: src/plugins/perl/wee-perl.c:627 -msgid "unloading all Perl scripts...\n" -msgstr "descargando todos los Perl scripts...\n" - -#: src/plugins/python/wee-python.c:61 src/plugins/python/wee-python.c:170 -msgid "" -"Python error: wrong parameters for 'print_with_channel' Python function\n" -msgstr "" -"Error de Python: parámetros incorrectos para la función Python " -"'print_with_channel'\n" +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/python/wee-python.c:81 +#: 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 #, c-format -msgid "" -"Python error: unable to register Python script \"%s\" (another script " -"already exists with this name)\n" -msgstr "" -"Error de Python: no ha sido posible registrar el Python script \"%s\" (ya " -"existe otro script con ese nombre)\n" +msgid "Loading %s script \"%s\"\n" +msgstr "Cargando %s script \"%s\"\n" -#: src/plugins/python/wee-python.c:105 +#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:612 #, c-format -msgid "registered Python script: \"%s\", version %s (%s)\n" -msgstr "Python script registrado: \"%s\", versión %s (%s)\n" +msgid "Unloading %s script \"%s\"\n" +msgstr "Descarga del %s script \"%s\"\n" -#: src/plugins/python/wee-python.c:112 +#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:629 #, c-format -msgid "%s unable to load Python script \"%s\" (not enough memory)\n" -msgstr "" -"%s no ha sido posible cargar el Python script \"%s\" (memoria insuficiente)\n" - -#: src/plugins/python/wee-python.c:137 -msgid "Python error: wrong parameters for 'print' Python function\n" -msgstr "" -"Error de Python: parámetros incorrectos para la función Python 'print'\n" - -#: src/plugins/python/wee-python.c:222 -msgid "Python error: wrong parameters for 'print_infobar' Python function\n" -msgstr "" -"Error de Python: parámetros incorrectos para la función Python " -"'print_infobar'\n" - -#: src/plugins/python/wee-python.c:249 -msgid "Python error: wrong parameters for 'command' Python function\n" -msgstr "" -"Error de Python: parámetros incorrectos para la función Python 'command'\n" - -#: src/plugins/python/wee-python.c:268 -msgid "Python error: server not found for 'command' Python function\n" -msgstr "" -"Error de Python: servidor no encontrado para la función Python 'command'\n" - -#: src/plugins/python/wee-python.c:303 -msgid "" -"Python error: wrong parameters for 'add_message_handler' Python function\n" -msgstr "" -"Error de Python: parámetros incorrectos para la función Python " -"'add_message_handler'\n" +msgid "Unloading all %s scripts...\n" +msgstr "Descargando todos los %s scripts...\n" -#: src/plugins/python/wee-python.c:332 -msgid "" -"Python error: wrong parameters for 'add_command_handler' Python function\n" -msgstr "" -"Error de Python: parámetros incorrectos para la función Python " -"'add_command_handler'\n" - -#: src/plugins/python/wee-python.c:371 -msgid "Python error: wrong parameters for 'get_info' Python function\n" -msgstr "" -"Error de Python: parámetros incorrectos para la función Python 'get_info'\n" - -#: src/plugins/python/wee-python.c:390 -msgid "Python error: server not found for 'get_info' Python function\n" -msgstr "" -"Error de Python: servidor no encontrado para la función Python 'get_info'\n" - -#: src/plugins/python/wee-python.c:462 -msgid "Python error: error while launching Python interpreter\n" -msgstr "" - -#: src/plugins/python/wee-python.c:468 -msgid "Loading Python module \"weechat\"\n" -msgstr "" - -#: src/plugins/python/wee-python.c:519 src/plugins/python/wee-python.c:547 -#: src/plugins/python/wee-python.c:578 +#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:634 #, c-format -msgid "" -"Python error: unable to run function \"%s\"in Python script (not enough " -"memory)\n" -msgstr "" +msgid "%s scripts unloaded\n" +msgstr "%s scripts descargados\n" -#: src/plugins/python/wee-python.c:569 +#: src/plugins/python/wee-python.c:403 #, c-format -msgid "Python error: error while running function \"%s\"\n" +msgid "%s error: error while launching interpreter\n" msgstr "" -#: src/plugins/python/wee-python.c:599 +#: src/plugins/python/wee-python.c:460 src/plugins/python/wee-python.c:488 +#: src/plugins/python/wee-python.c:520 #, c-format -msgid "loading Python script \"%s\"\n" -msgstr "carga del Python script \"%s\"\n" +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:601 +#: src/plugins/python/wee-python.c:510 #, c-format -msgid "Loading Python script \"%s\"\n" -msgstr "Cargando Python script \"%s\"\n" +msgid "%s error: error while running function \"%s\"\n" +msgstr "" -#: src/plugins/python/wee-python.c:607 +#: src/plugins/python/wee-python.c:549 #, c-format -msgid "Python error: error while opening file \"%s\"\n" +msgid "%s error: error while opening file \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:615 +#: src/plugins/python/wee-python.c:558 #, c-format -msgid "Python error: error while parsing file \"%s\"\n" +msgid "%s error: error while parsing file \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:668 +#: src/plugins/python/wee-python.c:660 #, c-format -msgid "unloading Python script \"%s\"\n" -msgstr "descarga del Python script \"%s\"\n" - -#: src/plugins/python/wee-python.c:685 -msgid "unloading all Python scripts...\n" -msgstr "descargando todos los Python scripts...\n" - -#: src/plugins/python/wee-python.c:711 -msgid "Python error: error while freeing Python interpreter\n" +msgid "%s error: error while freeing interpreter\n" msgstr "" #: src/plugins/plugins.c:93 #, c-format -msgid "auto-loading %s script: %s%s%s\n" -msgstr "carga automática del script %s : %s%s%s\n" +msgid "Auto-loading %s script: %s%s%s\n" +msgstr "Carga automática del script %s : %s%s%s\n" -#: src/plugins/plugins.c:211 +#: src/plugins/plugins.c:212 #, c-format msgid "%s unable to add handler for \"%s\" message (not enough memory)\n" msgstr "" @@ -2167,19 +2086,16 @@ msgid "server" msgstr "servidor" #: src/gui/gui-common.c:330 -#, c-format -msgid "%s not enough memory for infobar message\n" -msgstr "" -"%s no hay suficiente memoria para el mensaje de la barra de información\n" +msgid "Not enough memory for infobar message\n" +msgstr "No hay suficiente memoria para el mensaje de la barra de información\n" -#: src/gui/gui-common.c:506 -#, c-format -msgid "%s not enough memory for new line!\n" -msgstr "%s ¡no hay suficiente memoria para una nueva línea!\n" +#: src/gui/gui-common.c:505 +msgid "Not enough memory for new line\n" +msgstr "No hay suficiente memoria para una nueva línea\n" -#: src/gui/gui-common.c:549 -msgid "not enough memory!\n" -msgstr "¡no hay suficiente memoria!\n" +#: src/gui/gui-common.c:548 +msgid "Not enough memory for new message\n" +msgstr "No hay suficiente memoria para el mensaje de la barra de información\n" #: src/common/command.c:42 msgid "create an alias for a command" @@ -2292,8 +2208,8 @@ msgid "list/load/unload Perl scripts" msgstr "lista/carga/descarga de los Perl scripts" #: src/common/command.c:76 src/common/command.c:81 -msgid "[load filename] | [autoload] | [unload]" -msgstr "[load fichero] | [autoload] | [unload]" +msgid "[load filename] | [autoload] | [reload] | [unload]" +msgstr "[load fichero] | [autoload] | [reload] | [unload]" #: src/common/command.c:77 msgid "" @@ -2575,9 +2491,9 @@ msgstr "%s actualmente conectando al servidor \"%s\"!\n" msgid "%s server not found\n" msgstr "%s servidor no encontrado\n" -#: src/common/command.c:1142 src/common/command.c:1404 -#: src/common/command.c:1545 src/common/command.c:2236 -#: src/common/command.c:2248 +#: src/common/command.c:1142 src/common/command.c:1406 +#: src/common/command.c:1549 src/common/command.c:2240 +#: src/common/command.c:2252 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s opción desconocida para el comando \"%s\"\n" @@ -2606,39 +2522,38 @@ msgstr "Comandos IRC :\n" 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:1305 -msgid "Registered Perl scripts:\n" -msgstr "Perl scripts registrados:\n" +#: src/common/command.c:1305 src/common/command.c:1448 +#, c-format +msgid "Registered %s scripts:\n" +msgstr "%s scripts registrados:\n" -#: src/common/command.c:1322 src/common/command.c:1344 -#: src/common/command.c:1366 src/common/command.c:1463 -#: src/common/command.c:1485 src/common/command.c:1507 +#: src/common/command.c:1322 src/common/command.c:1345 +#: src/common/command.c:1368 src/common/command.c:1465 +#: src/common/command.c:1488 src/common/command.c:1511 msgid " (none)\n" msgstr " (ninguno)\n" -#: src/common/command.c:1327 -msgid "Perl message handlers:\n" -msgstr "Funciones Perl para mensajes:\n" - -#: src/common/command.c:1336 +#: src/common/command.c:1327 src/common/command.c:1470 #, c-format -msgid " IRC(%s) => Perl(%s)\n" -msgstr " IRC(%s) => Perl(%s)\n" +msgid "%s message handlers:\n" +msgstr "Funciones %s para mensajes:\n" -#: src/common/command.c:1349 -msgid "Perl command handlers:\n" -msgstr "Comandos Perl :\n" +#: src/common/command.c:1336 src/common/command.c:1479 +#, c-format +msgid " IRC(%s) => %s(%s)\n" +msgstr " IRC(%s) => %s(%s)\n" -#: src/common/command.c:1358 +#: src/common/command.c:1350 src/common/command.c:1493 #, c-format -msgid " Command /%s => Perl(%s)\n" -msgstr " Comando /%s => Perl(%s)\n" +msgid "%s command handlers:\n" +msgstr "Comandos %s :\n" -#: src/common/command.c:1378 -msgid "Perl scripts unloaded\n" -msgstr "Perl scripts descargados\n" +#: src/common/command.c:1359 src/common/command.c:1502 +#, c-format +msgid " Command /%s => %s(%s)\n" +msgstr " Comando /%s => %s(%s)\n" -#: src/common/command.c:1417 +#: src/common/command.c:1419 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" @@ -2647,33 +2562,7 @@ msgstr "" "Por favor, recompile WeeChat con la opción \"--enable-perl\" para el " "script ./configure\n" -#: src/common/command.c:1446 -msgid "Registered Python scripts:\n" -msgstr "Python scripts registrados:\n" - -#: src/common/command.c:1468 -msgid "Python message handlers:\n" -msgstr "Funciones Python para mensajes:\n" - -#: src/common/command.c:1477 -#, c-format -msgid " IRC(%s) => Python(%s)\n" -msgstr " IRC(%s) => Python(%s)\n" - -#: src/common/command.c:1490 -msgid "Python command handlers:\n" -msgstr "Comandos Python :\n" - -#: src/common/command.c:1499 -#, c-format -msgid " Command /%s => Python(%s)\n" -msgstr " Comando /%s => Python(%s)\n" - -#: src/common/command.c:1519 -msgid "Python scripts unloaded\n" -msgstr "Python scripts descargados\n" - -#: src/common/command.c:1558 +#: src/common/command.c:1562 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " @@ -2683,32 +2572,32 @@ msgstr "" "Por favor, recompile WeeChat con la opción \"--enable-python\" para el " "script ./configure\n" -#: src/common/command.c:1606 +#: src/common/command.c:1610 msgid "No server.\n" msgstr "Ningún servidor.\n" -#: src/common/command.c:1617 +#: src/common/command.c:1621 #, c-format msgid "Server '%s' not found.\n" msgstr "Servidor '%s' no encontrado.\n" -#: src/common/command.c:1629 +#: src/common/command.c:1633 #, 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:1637 +#: src/common/command.c:1641 #, 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:1656 +#: src/common/command.c:1660 #, 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:1664 +#: src/common/command.c:1668 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -2717,108 +2606,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:1680 src/common/command.c:1821 +#: src/common/command.c:1684 src/common/command.c:1825 msgid "Server" msgstr "Servidor" -#: src/common/command.c:1683 +#: src/common/command.c:1687 msgid "has been deleted\n" msgstr "ha sido eliminado\n" -#: src/common/command.c:1698 +#: src/common/command.c:1702 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s faltan parámetros para el comando \"%s\"\n" -#: src/common/command.c:1708 +#: src/common/command.c:1712 #, 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:1733 src/common/command.c:1761 -#: src/common/command.c:1774 src/common/command.c:1800 +#: src/common/command.c:1737 src/common/command.c:1765 +#: src/common/command.c:1778 src/common/command.c:1804 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s falta contraseña para el comando \"%s\"\n" -#: src/common/command.c:1746 +#: src/common/command.c:1750 #, 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:1787 +#: src/common/command.c:1791 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s falta comando para el parámetro \"%s\"\n" -#: src/common/command.c:1824 +#: src/common/command.c:1828 msgid "created\n" msgstr "creado\n" -#: src/common/command.c:1830 +#: src/common/command.c:1834 #, c-format msgid "%s unable to create server\n" msgstr "%s no es posible crear el servidor\n" -#: src/common/command.c:1885 +#: src/common/command.c:1889 msgid "(unknown)" msgstr "(desconocido)" -#: src/common/command.c:1908 +#: src/common/command.c:1912 msgid "(password hidden) " msgstr "(contraseña oculta) " -#: src/common/command.c:1972 +#: src/common/command.c:1976 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s servidor \"%s\" no encontrado\n" -#: src/common/command.c:2003 src/common/command.c:2049 +#: src/common/command.c:2007 src/common/command.c:2053 #, 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:2008 src/common/command.c:2041 +#: src/common/command.c:2012 src/common/command.c:2045 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valor incorrecto para la opción \"%s\"\n" -#: src/common/command.c:2024 +#: src/common/command.c:2028 #, 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:2122 +#: src/common/command.c:2126 #, 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:2125 +#: src/common/command.c:2129 msgid "No config option found\n" msgstr "Ninguna opción de configuración encontrada\n" -#: src/common/command.c:2131 +#: src/common/command.c:2135 #, 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:2134 +#: src/common/command.c:2138 msgid "config option(s) found\n" msgstr "opción/opciones de configuración encontrada(s)\n" -#: src/common/command.c:2154 +#: src/common/command.c:2158 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias o comando \"%s\" no encontrado\n" -#: src/common/command.c:2164 +#: src/common/command.c:2168 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" eliminado\n" -#: src/common/command.c:2184 +#: src/common/command.c:2188 msgid "Opened windows:\n" msgstr "Ventanas abiertas:\n" @@ -2835,7 +2724,7 @@ msgstr "%s no ha sido posible abrir la tubería FIFO (%s) para leer\n" #: src/common/fifo.c:89 msgid "FIFO pipe is open\n" -msgstr "la tubería FIFO está abierta\n" +msgstr "La tubería FIFO está abierta\n" #: src/common/fifo.c:121 #, c-format @@ -2864,7 +2753,7 @@ msgstr "%s error al leer la tubería FIFO, cerrándola\n" #: src/common/fifo.c:309 msgid "FIFO pipe is closed\n" -msgstr "la tubería FIFO está cerrada\n" +msgstr "La tubería FIFO está cerrada\n" #: src/common/hotlist.c:102 #, c-format @@ -3897,8 +3786,8 @@ msgid "%s: creating default config file...\n" msgstr "%s: creando fichero de configuración por defecto...\n" #: src/common/weeconfig.c:1392 -msgid "creating default config file\n" -msgstr "creando fichero de configuración por defecto\n" +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 #, c-format @@ -3910,5 +3799,5 @@ msgstr "" "# %s: fichero de configuración, creado por %s v%s el %s#\n" #: src/common/weeconfig.c:1564 -msgid "saving config to disk\n" -msgstr "guardar configuración a disco\n" +msgid "Saving config to disk\n" +msgstr "Guardar configuración a disco\n" diff --git a/weechat/po/fr.po b/weechat/po/fr.po index 999a8c412..84028986b 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.2-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-05-01 20:47+0200\n" -"PO-Revision-Date: 2005-05-01 20:47+0200\n" +"POT-Creation-Date: 2005-05-05 17:58+0200\n" +"PO-Revision-Date: 2005-05-05 17:02+0200\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -88,8 +88,8 @@ msgstr "%s: connexion à %s:%d...\n" #: src/irc/irc-server.c:846 #, c-format -msgid "connecting to server %s:%d...\n" -msgstr "connexion au serveur %s:%d...\n" +msgid "Connecting to server %s:%d...\n" +msgstr "Connexion au serveur %s:%d...\n" #: src/irc/irc-server.c:857 #, c-format @@ -1302,8 +1302,8 @@ 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:1129 src/common/command.c:1411 -#: src/common/command.c:1552 +#: src/common/command.c:1129 src/common/command.c:1413 +#: src/common/command.c:1556 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n" @@ -1556,7 +1556,7 @@ msgstr "%s impossible d'analyser la commande \"%s\"\n" msgid "%s unknown DCC CHAT type received from " msgstr "%s type de DCC CHAT inconnu reçu de " -#: src/irc/irc-recv.c:1496 src/irc/irc-dcc.c:801 +#: src/irc/irc-recv.c:1496 src/irc/irc-dcc.c:799 #, c-format msgid "Private %s> %s" msgstr "Prive %s> %s" @@ -1784,31 +1784,31 @@ msgstr "Echoué" msgid "Aborted" msgstr "Interrompu" -#: src/irc/irc-dcc.c:192 +#: src/irc/irc-dcc.c:190 msgid "DCC: file " msgstr "DCC: fichier " -#: src/irc/irc-dcc.c:197 src/irc/irc-dcc.c:456 +#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:454 msgid " (local filename: " msgstr " (nom local: " -#: src/irc/irc-dcc.c:203 +#: src/irc/irc-dcc.c:201 msgid ") sent to " msgstr ") envoyé à " -#: src/irc/irc-dcc.c:205 +#: src/irc/irc-dcc.c:203 msgid ") received from " msgstr ") reçu de " -#: src/irc/irc-dcc.c:210 +#: src/irc/irc-dcc.c:208 msgid ": ok!\n" msgstr ": ok!\n" -#: src/irc/irc-dcc.c:222 +#: src/irc/irc-dcc.c:220 msgid "DCC chat closed with " msgstr "Discussion DCC fermée avec " -#: src/irc/irc-dcc.c:263 +#: src/irc/irc-dcc.c:261 #, c-format msgid "" "%s can't associate DCC chat with private buffer (maybe private buffer has " @@ -1817,74 +1817,74 @@ msgstr "" "%s impossible d'associer la discussion DCC avec un tampon privé (le tampon " "privé a peut-être déjà un DCC CHAT ?)\n" -#: src/irc/irc-dcc.c:273 +#: src/irc/irc-dcc.c:271 msgid "Connected to " msgstr "Connecté à " -#: src/irc/irc-dcc.c:282 +#: src/irc/irc-dcc.c:280 msgid "via DCC chat\n" msgstr "via une discussion DCC\n" -#: src/irc/irc-dcc.c:393 +#: src/irc/irc-dcc.c:391 #, c-format msgid "%s not enough memory for new DCC\n" msgstr "%s pas assez de mémoire pour un nouveau DCC\n" -#: src/irc/irc-dcc.c:412 +#: src/irc/irc-dcc.c:410 msgid "DCC chat" msgstr "Discussion DCC" -#: src/irc/irc-dcc.c:436 +#: src/irc/irc-dcc.c:434 msgid "Incoming DCC file from " msgstr "Réception fichier DCC de " -#: src/irc/irc-dcc.c:447 src/irc/irc-dcc.c:460 +#: src/irc/irc-dcc.c:445 src/irc/irc-dcc.c:458 msgid " bytes\n" msgstr " octets\n" -#: src/irc/irc-dcc.c:452 +#: src/irc/irc-dcc.c:450 msgid "Sending DCC file to " msgstr "Envoi fichier DCC à " -#: src/irc/irc-dcc.c:465 +#: src/irc/irc-dcc.c:463 msgid "Incoming DCC chat request from " msgstr "Demande de discussion DCC reçue de " -#: src/irc/irc-dcc.c:476 +#: src/irc/irc-dcc.c:474 msgid "Sending DCC chat request to " msgstr "Envoi d'une demande discussion DCC à " -#: src/irc/irc-dcc.c:540 +#: src/irc/irc-dcc.c:538 #, c-format msgid "%s not enough memory for DCC SEND\n" msgstr "%s pas assez de mémoire pour le DCC SEND\n" -#: src/irc/irc-dcc.c:562 +#: src/irc/irc-dcc.c:560 #, c-format msgid "%s cannot access file \"%s\"\n" msgstr "%s impossible d'accéder au fichier \"%s\"\n" -#: src/irc/irc-dcc.c:583 +#: src/irc/irc-dcc.c:581 #, c-format msgid "%s cannot create socket for DCC\n" msgstr "%s impossible de créer la socket pour le DCC\n" -#: src/irc/irc-dcc.c:596 +#: src/irc/irc-dcc.c:594 #, c-format msgid "%s cannot find port for DCC\n" msgstr "%s impossible de trouver le port pour le DCC\n" -#: src/irc/irc-dcc.c:643 +#: src/irc/irc-dcc.c:641 #, c-format msgid "%s cannot send DCC\n" msgstr "%s impossible d'envoyer le DCC\n" -#: src/irc/irc-dcc.c:722 +#: src/irc/irc-dcc.c:720 #, c-format msgid "%s error sending data to \"%s\" via DCC CHAT\n" msgstr "%s erreur d'envoi de données à \"%s\" via DCC CHAT\n" -#: src/irc/irc-dcc.c:982 +#: src/irc/irc-dcc.c:980 #, c-format msgid "" "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" " @@ -1893,201 +1893,126 @@ msgstr "" "%s le DCC a échoué car la taille de bloc est trop grande. Vérifiez la valeur " "de l'option \"dcc_blocksize\", le maximum est %d.\n" -#: src/irc/irc-dcc.c:1056 +#: src/irc/irc-dcc.c:1054 #, c-format -msgid "aborting active DCC: \"%s\" from %s\n" -msgstr "abandon du DCC actif: \"%s\" de %s\n" +msgid "Aborting active DCC: \"%s\" from %s\n" +msgstr "Abandon du DCC actif: \"%s\" de %s\n" -#: src/plugins/perl/wee-perl.c:84 +#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:468 +#: src/plugins/python/wee-python.c:81 #, c-format msgid "" -"Perl error: unable to register Perl script \"%s\" (another script already " -"exists with this name)\n" +"%s error: unable to register \"%s\" script (another script already exists " +"with this name)\n" msgstr "" -"Erreur Perl: impossible d'enregistrer le script Perl \"%s\" (un autre script " -"existe déjà avec ce nom)\n" +"Erreur %s: impossible d'enregistrer le script \"%s\" (un autre script existe " +"déjà avec ce nom)\n" -#: src/plugins/perl/wee-perl.c:108 +#: src/plugins/perl/wee-perl.c:112 src/plugins/perl/wee-perl.c:492 +#: src/plugins/python/wee-python.c:105 #, c-format -msgid "registered Perl script: \"%s\", version %s (%s)\n" -msgstr "script Perl enregistré: \"%s\", version %s (%s)\n" +msgid "Registered %s script: \"%s\", version %s (%s)\n" +msgstr "Script %s enregistré: \"%s\", version %s (%s)\n" -#: src/plugins/perl/wee-perl.c:115 +#: src/plugins/perl/wee-perl.c:119 src/plugins/perl/wee-perl.c:499 +#: src/plugins/python/wee-python.c:112 #, c-format -msgid "%s unable to load Perl script \"%s\" (not enough memory)\n" -msgstr "" -"%s impossible de charger le script Perl \"%s\" (mémoire insuffisante)\n" - -#: src/plugins/perl/wee-perl.c:224 -msgid "Perl error: wrong parameters for IRC::print_infobar Perl function\n" +msgid "%s error: unable to load script \"%s\" (not enough memory)\n" msgstr "" -"Erreur Perl: mauvais paramètres pour la fonction Perl IRC::print_infobar\n" +"Erreur %s: impossible de charger le script \"%s\" (mémoire insuffisante)\n" -#: src/plugins/perl/wee-perl.c:257 -msgid "Perl error: server not found for IRC::command Perl function\n" -msgstr "Erreur Perl: serveur non trouvé pour la fonction Perl IRC::command\n" - -#: src/plugins/perl/wee-perl.c:358 -msgid "Perl error: server not found for IRC::get_info Perl function\n" -msgstr "Erreur Perl: serveur non trouvé pour la fonction Perl IRC::get_info\n" - -#: src/plugins/perl/wee-perl.c:527 +#: src/plugins/perl/wee-perl.c:234 src/plugins/perl/wee-perl.c:525 +#: src/plugins/perl/wee-perl.c:573 src/plugins/perl/wee-perl.c:600 +#: src/plugins/perl/wee-perl.c:645 src/plugins/perl/wee-perl.c:675 +#: src/plugins/perl/wee-perl.c:715 src/plugins/python/wee-python.c:60 +#: src/plugins/python/wee-python.c:142 src/plugins/python/wee-python.c:179 +#: src/plugins/python/wee-python.c:211 src/plugins/python/wee-python.c:243 +#: src/plugins/python/wee-python.c:272 src/plugins/python/wee-python.c:311 #, c-format -msgid "Perl error: %s\n" -msgstr "Erreur Perl: %s\n" +msgid "%s error: wrong parameters for \"%s\" function\n" +msgstr "Erreur %s: mauvais paramètres pour la fonction \"%s\"\n" -#: src/plugins/perl/wee-perl.c:537 +#: src/plugins/perl/wee-perl.c:270 src/plugins/perl/wee-perl.c:378 +#: src/plugins/perl/wee-perl.c:732 src/plugins/python/wee-python.c:331 #, c-format -msgid "Perl error: too much values from \"%s\" (%d). Expected: 1.\n" -msgstr "Erreur Perl: trop de valeurs de \"%s\" (%d). Attendue: 1.\n" +msgid "%s error: server not found for \"%s\" function\n" +msgstr "Erreur %s: serveur non trouvé pour la fonction \"%s\"\n" -#: src/plugins/perl/wee-perl.c:559 +#: src/plugins/perl/wee-perl.c:850 src/plugins/python/wee-python.c:408 #, c-format -msgid "loading Perl script \"%s\"\n" -msgstr "chargement du script Perl \"%s\"\n" +msgid "Loading %s module \"weechat\"\n" +msgstr "Chargement du module %s \"weechat\"\n" -#: src/plugins/perl/wee-perl.c:561 +#: src/plugins/perl/wee-perl.c:909 #, c-format -msgid "Loading Perl script \"%s\"\n" -msgstr "Chargement du script Perl \"%s\"\n" +msgid "Perl error: %s" +msgstr "Erreur Perl: %s" -#: src/plugins/perl/wee-perl.c:610 +#: src/plugins/perl/wee-perl.c:919 #, c-format -msgid "unloading Perl script \"%s\"\n" -msgstr "déchargement du script Perl \"%s\"\n" +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:627 -msgid "unloading all Perl scripts...\n" -msgstr "déchargement de tous les scripts Perl...\n" - -#: src/plugins/python/wee-python.c:61 src/plugins/python/wee-python.c:170 -msgid "" -"Python error: wrong parameters for 'print_with_channel' Python function\n" -msgstr "" -"Erreur Python: mauvais paramètres pour la fonction Python " -"'print_with_channel'\n" - -#: src/plugins/python/wee-python.c:81 +#: 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 #, c-format -msgid "" -"Python error: unable to register Python script \"%s\" (another script " -"already exists with this name)\n" -msgstr "" -"Erreur Python: impossible d'enregistrer le script Python \"%s\" (un autre " -"script existe déjà avec ce nom)\n" +msgid "Loading %s script \"%s\"\n" +msgstr "Chargement du script %s \"%s\"\n" -#: src/plugins/python/wee-python.c:105 +#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:612 #, c-format -msgid "registered Python script: \"%s\", version %s (%s)\n" -msgstr "script Python enregistré: \"%s\", version %s (%s)\n" +msgid "Unloading %s script \"%s\"\n" +msgstr "Déchargement du script %s \"%s\"\n" -#: src/plugins/python/wee-python.c:112 +#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:629 #, c-format -msgid "%s unable to load Python script \"%s\" (not enough memory)\n" -msgstr "" -"%s impossible de charger le script Python \"%s\" (mémoire insuffisante)\n" - -#: src/plugins/python/wee-python.c:137 -msgid "Python error: wrong parameters for 'print' Python function\n" -msgstr "Erreur Python: mauvais paramètres pour la fonction Python 'print'\n" - -#: src/plugins/python/wee-python.c:222 -msgid "Python error: wrong parameters for 'print_infobar' Python function\n" -msgstr "" -"Erreur Python: mauvais paramètres pour la fonction Python 'print_infobar'\n" - -#: src/plugins/python/wee-python.c:249 -msgid "Python error: wrong parameters for 'command' Python function\n" -msgstr "Erreur Python: mauvais paramètres pour la fonction Python 'command'\n" +msgid "Unloading all %s scripts...\n" +msgstr "Déchargement de tous les scripts %s...\n" -#: src/plugins/python/wee-python.c:268 -msgid "Python error: server not found for 'command' Python function\n" -msgstr "Erreur Python: serveur non trouvé pour la fonction Python 'command'\n" - -#: src/plugins/python/wee-python.c:303 -msgid "" -"Python error: wrong parameters for 'add_message_handler' Python function\n" -msgstr "" -"Erreur Python: mauvais paramètres pour la fonction Python " -"'add_message_handler'\n" - -#: src/plugins/python/wee-python.c:332 -msgid "" -"Python error: wrong parameters for 'add_command_handler' Python function\n" -msgstr "" -"Erreur Python: mauvais paramètres pour la fonction Python " -"'add_command_handler'\n" - -#: src/plugins/python/wee-python.c:371 -msgid "Python error: wrong parameters for 'get_info' Python function\n" -msgstr "Erreur Python: mauvais paramètres pour la fonction Python 'get_info'\n" - -#: src/plugins/python/wee-python.c:390 -msgid "Python error: server not found for 'get_info' Python function\n" -msgstr "Erreur Python: serveur non trouvé pour la fonction Python 'get_info'\n" - -#: src/plugins/python/wee-python.c:462 -msgid "Python error: error while launching Python interpreter\n" -msgstr "Erreur Python: erreur pendant le chargement de l'interpréteur Python\n" - -#: src/plugins/python/wee-python.c:468 -msgid "Loading Python module \"weechat\"\n" -msgstr "Chargement du module Python \"weechat\"\n" - -#: src/plugins/python/wee-python.c:519 src/plugins/python/wee-python.c:547 -#: src/plugins/python/wee-python.c:578 +#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:634 #, c-format -msgid "" -"Python error: unable to run function \"%s\"in Python script (not enough " -"memory)\n" -msgstr "" -"Erreur Python: impossible de charger le script Python \"%s\" (mémoire " -"insuffisante)\n" +msgid "%s scripts unloaded\n" +msgstr "Scripts %s déchargés\n" -#: src/plugins/python/wee-python.c:569 +#: src/plugins/python/wee-python.c:403 #, c-format -msgid "Python error: error while running function \"%s\"\n" -msgstr "Erreur Python: erreur dans la fonction \"%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:599 +#: src/plugins/python/wee-python.c:460 src/plugins/python/wee-python.c:488 +#: src/plugins/python/wee-python.c:520 #, c-format -msgid "loading Python script \"%s\"\n" -msgstr "chargement du script Python \"%s\"\n" +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:601 +#: src/plugins/python/wee-python.c:510 #, c-format -msgid "Loading Python script \"%s\"\n" -msgstr "Chargement du script Python \"%s\"\n" +msgid "%s error: error while running function \"%s\"\n" +msgstr "Erreur %s: erreur dans la fonction \"%s\"\n" -#: src/plugins/python/wee-python.c:607 +#: src/plugins/python/wee-python.c:549 #, c-format -msgid "Python error: error while opening file \"%s\"\n" -msgstr "Erreur Python: erreur à l'ouverture du fichier \"%s\"\n" +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:615 +#: src/plugins/python/wee-python.c:558 #, c-format -msgid "Python error: error while parsing file \"%s\"\n" -msgstr "Erreur Python: erreur en analysant le fichier \"%s\"\n" +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:668 +#: src/plugins/python/wee-python.c:660 #, c-format -msgid "unloading Python script \"%s\"\n" -msgstr "déchargement du script Python \"%s\"\n" - -#: src/plugins/python/wee-python.c:685 -msgid "unloading all Python scripts...\n" -msgstr "déchargement de tous les scripts Python...\n" - -#: src/plugins/python/wee-python.c:711 -msgid "Python error: error while freeing Python interpreter\n" -msgstr "Erreur Python: impossible de libérer l'interpréteur Python\n" +msgid "%s error: error while freeing interpreter\n" +msgstr "Erreur %s: impossible de libérer l'interpréteur\n" #: src/plugins/plugins.c:93 #, c-format -msgid "auto-loading %s script: %s%s%s\n" -msgstr "chargement automatique du script %s : %s%s%s\n" +msgid "Auto-loading %s script: %s%s%s\n" +msgstr "Chargement automatique du script %s : %s%s%s\n" -#: src/plugins/plugins.c:211 +#: src/plugins/plugins.c:212 #, c-format msgid "%s unable to add handler for \"%s\" message (not enough memory)\n" msgstr "" @@ -2162,18 +2087,16 @@ msgid "server" msgstr "serveur" #: src/gui/gui-common.c:330 -#, c-format -msgid "%s not enough memory for infobar message\n" -msgstr "%s pas assez de mémoire pour un message de la barre d'infos\n" +msgid "Not enough memory for infobar message\n" +msgstr "Pas assez de mémoire pour un message de la barre d'infos\n" -#: src/gui/gui-common.c:506 -#, c-format -msgid "%s not enough memory for new line!\n" -msgstr "%s pas assez de mémoire pour une nouvelle ligne !\n" +#: src/gui/gui-common.c:505 +msgid "Not enough memory for new line\n" +msgstr "Pas assez de mémoire pour une nouvelle ligne !\n" -#: src/gui/gui-common.c:549 -msgid "not enough memory!\n" -msgstr "pas assez de mémoire !\n" +#: src/gui/gui-common.c:548 +msgid "Not enough memory for new message\n" +msgstr "Pas assez de mémoire pour un message de la barre d'infos\n" #: src/common/command.c:42 msgid "create an alias for a command" @@ -2286,8 +2209,8 @@ msgid "list/load/unload Perl scripts" msgstr "liste/charge/décharge des scripts Perl" #: src/common/command.c:76 src/common/command.c:81 -msgid "[load filename] | [autoload] | [unload]" -msgstr "[load fichier] | [autoload] | [unload]" +msgid "[load filename] | [autoload] | [reload] | [unload]" +msgstr "[load fichier] | [autoload] | [reload] | [unload]" #: src/common/command.c:77 msgid "" @@ -2567,9 +2490,9 @@ msgstr "%s une connexion vers le serveur \"%s\" est en cours !\n" msgid "%s server not found\n" msgstr "%s serveur non trouvé\n" -#: src/common/command.c:1142 src/common/command.c:1404 -#: src/common/command.c:1545 src/common/command.c:2236 -#: src/common/command.c:2248 +#: src/common/command.c:1142 src/common/command.c:1406 +#: src/common/command.c:1549 src/common/command.c:2240 +#: src/common/command.c:2252 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s option inconnue pour la commande \"%s\"\n" @@ -2598,39 +2521,38 @@ msgstr "Commandes IRC :\n" 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:1305 -msgid "Registered Perl scripts:\n" -msgstr "Scripts Perl enregistrés :\n" +#: src/common/command.c:1305 src/common/command.c:1448 +#, c-format +msgid "Registered %s scripts:\n" +msgstr "Scripts %s enregistrés :\n" -#: src/common/command.c:1322 src/common/command.c:1344 -#: src/common/command.c:1366 src/common/command.c:1463 -#: src/common/command.c:1485 src/common/command.c:1507 +#: src/common/command.c:1322 src/common/command.c:1345 +#: src/common/command.c:1368 src/common/command.c:1465 +#: src/common/command.c:1488 src/common/command.c:1511 msgid " (none)\n" msgstr " (aucun)\n" -#: src/common/command.c:1327 -msgid "Perl message handlers:\n" -msgstr "Fonctions Perl pour messages :\n" - -#: src/common/command.c:1336 +#: src/common/command.c:1327 src/common/command.c:1470 #, c-format -msgid " IRC(%s) => Perl(%s)\n" -msgstr " IRC(%s) => Perl(%s)\n" +msgid "%s message handlers:\n" +msgstr "Fonctions %s pour messages :\n" -#: src/common/command.c:1349 -msgid "Perl command handlers:\n" -msgstr "Commandes Perl :\n" +#: src/common/command.c:1336 src/common/command.c:1479 +#, c-format +msgid " IRC(%s) => %s(%s)\n" +msgstr " IRC(%s) => %s(%s)\n" -#: src/common/command.c:1358 +#: src/common/command.c:1350 src/common/command.c:1493 #, c-format -msgid " Command /%s => Perl(%s)\n" -msgstr " Commande /%s => Perl(%s)\n" +msgid "%s command handlers:\n" +msgstr "Commandes %s :\n" -#: src/common/command.c:1378 -msgid "Perl scripts unloaded\n" -msgstr "Scripts Perl déchargés\n" +#: src/common/command.c:1359 src/common/command.c:1502 +#, c-format +msgid " Command /%s => %s(%s)\n" +msgstr " Commande /%s => %s(%s)\n" -#: src/common/command.c:1417 +#: src/common/command.c:1419 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" @@ -2639,33 +2561,7 @@ msgstr "" "Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le " "script ./configure\n" -#: src/common/command.c:1446 -msgid "Registered Python scripts:\n" -msgstr "Scripts Python enregistrés :\n" - -#: src/common/command.c:1468 -msgid "Python message handlers:\n" -msgstr "Fonctions Python pour messages :\n" - -#: src/common/command.c:1477 -#, c-format -msgid " IRC(%s) => Python(%s)\n" -msgstr " IRC(%s) => Python(%s)\n" - -#: src/common/command.c:1490 -msgid "Python command handlers:\n" -msgstr "Commandes Python :\n" - -#: src/common/command.c:1499 -#, c-format -msgid " Command /%s => Python(%s)\n" -msgstr " Commande /%s => Python(%s)\n" - -#: src/common/command.c:1519 -msgid "Python scripts unloaded\n" -msgstr "Scripts Python déchargés\n" - -#: src/common/command.c:1558 +#: src/common/command.c:1562 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " @@ -2675,31 +2571,31 @@ msgstr "" "Merci de reconstruire WeeChat avec l'option \"--enable-python\" pour le " "script ./configure\n" -#: src/common/command.c:1606 +#: src/common/command.c:1610 msgid "No server.\n" msgstr "Pas de serveur.\n" -#: src/common/command.c:1617 +#: src/common/command.c:1621 #, c-format msgid "Server '%s' not found.\n" msgstr "Serveur '%s' non trouvé.\n" -#: src/common/command.c:1629 +#: src/common/command.c:1633 #, 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:1637 +#: src/common/command.c:1641 #, 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:1656 +#: src/common/command.c:1660 #, 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:1664 +#: src/common/command.c:1668 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -2708,106 +2604,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:1680 src/common/command.c:1821 +#: src/common/command.c:1684 src/common/command.c:1825 msgid "Server" msgstr "Serveur" -#: src/common/command.c:1683 +#: src/common/command.c:1687 msgid "has been deleted\n" msgstr "a été supprimé\n" -#: src/common/command.c:1698 +#: src/common/command.c:1702 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s paramètres manquants pour la commande \"%s\"\n" -#: src/common/command.c:1708 +#: src/common/command.c:1712 #, 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:1733 src/common/command.c:1761 -#: src/common/command.c:1774 src/common/command.c:1800 +#: src/common/command.c:1737 src/common/command.c:1765 +#: src/common/command.c:1778 src/common/command.c:1804 #, 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:1746 +#: src/common/command.c:1750 #, 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:1787 +#: src/common/command.c:1791 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s commande manquante pour le paramètre \"%s\"\n" -#: src/common/command.c:1824 +#: src/common/command.c:1828 msgid "created\n" msgstr "créé\n" -#: src/common/command.c:1830 +#: src/common/command.c:1834 #, c-format msgid "%s unable to create server\n" msgstr "%s impossible de créer le serveur\n" -#: src/common/command.c:1885 +#: src/common/command.c:1889 msgid "(unknown)" msgstr "(inconnu)" -#: src/common/command.c:1908 +#: src/common/command.c:1912 msgid "(password hidden) " msgstr "(mot de passe caché) " -#: src/common/command.c:1972 +#: src/common/command.c:1976 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s serveur \"%s\" non trouvé\n" -#: src/common/command.c:2003 src/common/command.c:2049 +#: src/common/command.c:2007 src/common/command.c:2053 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s option de configuration \"%s\" non trouvée\n" -#: src/common/command.c:2008 src/common/command.c:2041 +#: src/common/command.c:2012 src/common/command.c:2045 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valeur incorrecte pour l'option \"%s\"\n" -#: src/common/command.c:2024 +#: src/common/command.c:2028 #, 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:2122 +#: src/common/command.c:2126 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Aucune option de configuration trouvée avec \"%s\"\n" -#: src/common/command.c:2125 +#: src/common/command.c:2129 msgid "No config option found\n" msgstr "Aucune option de configuration trouvée\n" -#: src/common/command.c:2131 +#: src/common/command.c:2135 #, 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:2134 +#: src/common/command.c:2138 msgid "config option(s) found\n" msgstr "option(s) de configuration trouvée(s)\n" -#: src/common/command.c:2154 +#: src/common/command.c:2158 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias ou commande \"%s\" non trouvé\n" -#: src/common/command.c:2164 +#: src/common/command.c:2168 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" supprimé\n" -#: src/common/command.c:2184 +#: src/common/command.c:2188 msgid "Opened windows:\n" msgstr "Fenêtres ouvertes:\n" @@ -2823,7 +2719,7 @@ msgstr "%s impossible d'ouvrir le tube FIFO (%s) en lecture\n" #: src/common/fifo.c:89 msgid "FIFO pipe is open\n" -msgstr "le tube FIFO est ouvert\n" +msgstr "Le tube FIFO est ouvert\n" #: src/common/fifo.c:121 #, c-format @@ -2852,7 +2748,7 @@ msgstr "%s erreur en lecture du tube FIFO, fermeture\n" #: src/common/fifo.c:309 msgid "FIFO pipe is closed\n" -msgstr "le tube FIFO est fermé\n" +msgstr "Le tube FIFO est fermé\n" #: src/common/hotlist.c:102 #, c-format @@ -3884,8 +3780,8 @@ msgid "%s: creating default config file...\n" msgstr "%s: création du fichier de configuration par défaut...\n" #: src/common/weeconfig.c:1392 -msgid "creating default config file\n" -msgstr "création du fichier de configuration par défaut\n" +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 #, c-format @@ -3897,5 +3793,5 @@ msgstr "" "# %s: fichier de configuration, créé par %s v%s le %s#\n" #: src/common/weeconfig.c:1564 -msgid "saving config to disk\n" -msgstr "sauvegarde de la configuration sur disque\n" +msgid "Saving config to disk\n" +msgstr "Sauvegarde de la configuration sur disque\n" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index 35ee1a51a..8c7d649ea 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-05-01 20:47+0200\n" +"POT-Creation-Date: 2005-05-05 17:58+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" @@ -87,7 +87,7 @@ msgstr "" #: src/irc/irc-server.c:846 #, c-format -msgid "connecting to server %s:%d...\n" +msgid "Connecting to server %s:%d...\n" msgstr "" #: src/irc/irc-server.c:857 @@ -1194,8 +1194,8 @@ 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:1129 src/common/command.c:1411 -#: src/common/command.c:1552 +#: src/common/command.c:1129 src/common/command.c:1413 +#: src/common/command.c:1556 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "" @@ -1447,7 +1447,7 @@ msgstr "" msgid "%s unknown DCC CHAT type received from " msgstr "" -#: src/irc/irc-recv.c:1496 src/irc/irc-dcc.c:801 +#: src/irc/irc-recv.c:1496 src/irc/irc-dcc.c:799 #, c-format msgid "Private %s> %s" msgstr "" @@ -1666,290 +1666,226 @@ msgstr "" msgid "Aborted" msgstr "" -#: src/irc/irc-dcc.c:192 +#: src/irc/irc-dcc.c:190 msgid "DCC: file " msgstr "" -#: src/irc/irc-dcc.c:197 src/irc/irc-dcc.c:456 +#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:454 msgid " (local filename: " msgstr "" -#: src/irc/irc-dcc.c:203 +#: src/irc/irc-dcc.c:201 msgid ") sent to " msgstr "" -#: src/irc/irc-dcc.c:205 +#: src/irc/irc-dcc.c:203 msgid ") received from " msgstr "" -#: src/irc/irc-dcc.c:210 +#: src/irc/irc-dcc.c:208 msgid ": ok!\n" msgstr "" -#: src/irc/irc-dcc.c:222 +#: src/irc/irc-dcc.c:220 msgid "DCC chat closed with " msgstr "" -#: src/irc/irc-dcc.c:263 +#: src/irc/irc-dcc.c:261 #, c-format msgid "" "%s can't associate DCC chat with private buffer (maybe private buffer has " "already DCC CHAT?)\n" msgstr "" -#: src/irc/irc-dcc.c:273 +#: src/irc/irc-dcc.c:271 msgid "Connected to " msgstr "" -#: src/irc/irc-dcc.c:282 +#: src/irc/irc-dcc.c:280 msgid "via DCC chat\n" msgstr "" -#: src/irc/irc-dcc.c:393 +#: src/irc/irc-dcc.c:391 #, c-format msgid "%s not enough memory for new DCC\n" msgstr "" -#: src/irc/irc-dcc.c:412 +#: src/irc/irc-dcc.c:410 msgid "DCC chat" msgstr "" -#: src/irc/irc-dcc.c:436 +#: src/irc/irc-dcc.c:434 msgid "Incoming DCC file from " msgstr "" -#: src/irc/irc-dcc.c:447 src/irc/irc-dcc.c:460 +#: src/irc/irc-dcc.c:445 src/irc/irc-dcc.c:458 msgid " bytes\n" msgstr "" -#: src/irc/irc-dcc.c:452 +#: src/irc/irc-dcc.c:450 msgid "Sending DCC file to " msgstr "" -#: src/irc/irc-dcc.c:465 +#: src/irc/irc-dcc.c:463 msgid "Incoming DCC chat request from " msgstr "" -#: src/irc/irc-dcc.c:476 +#: src/irc/irc-dcc.c:474 msgid "Sending DCC chat request to " msgstr "" -#: src/irc/irc-dcc.c:540 +#: src/irc/irc-dcc.c:538 #, c-format msgid "%s not enough memory for DCC SEND\n" msgstr "" -#: src/irc/irc-dcc.c:562 +#: src/irc/irc-dcc.c:560 #, c-format msgid "%s cannot access file \"%s\"\n" msgstr "" -#: src/irc/irc-dcc.c:583 +#: src/irc/irc-dcc.c:581 #, c-format msgid "%s cannot create socket for DCC\n" msgstr "" -#: src/irc/irc-dcc.c:596 +#: src/irc/irc-dcc.c:594 #, c-format msgid "%s cannot find port for DCC\n" msgstr "" -#: src/irc/irc-dcc.c:643 +#: src/irc/irc-dcc.c:641 #, c-format msgid "%s cannot send DCC\n" msgstr "" -#: src/irc/irc-dcc.c:722 +#: src/irc/irc-dcc.c:720 #, c-format msgid "%s error sending data to \"%s\" via DCC CHAT\n" msgstr "" -#: src/irc/irc-dcc.c:982 +#: src/irc/irc-dcc.c:980 #, c-format msgid "" "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" " "option, max is %d.\n" msgstr "" -#: src/irc/irc-dcc.c:1056 +#: src/irc/irc-dcc.c:1054 #, c-format -msgid "aborting active DCC: \"%s\" from %s\n" +msgid "Aborting active DCC: \"%s\" from %s\n" msgstr "" -#: src/plugins/perl/wee-perl.c:84 +#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:468 +#: src/plugins/python/wee-python.c:81 #, c-format msgid "" -"Perl error: unable to register Perl script \"%s\" (another script already " -"exists with this name)\n" +"%s error: unable to register \"%s\" script (another script already exists " +"with this name)\n" msgstr "" -#: src/plugins/perl/wee-perl.c:108 +#: src/plugins/perl/wee-perl.c:112 src/plugins/perl/wee-perl.c:492 +#: src/plugins/python/wee-python.c:105 #, c-format -msgid "registered Perl script: \"%s\", version %s (%s)\n" +msgid "Registered %s script: \"%s\", version %s (%s)\n" msgstr "" -#: src/plugins/perl/wee-perl.c:115 +#: src/plugins/perl/wee-perl.c:119 src/plugins/perl/wee-perl.c:499 +#: src/plugins/python/wee-python.c:112 #, c-format -msgid "%s unable to load Perl script \"%s\" (not enough memory)\n" -msgstr "" - -#: src/plugins/perl/wee-perl.c:224 -msgid "Perl error: wrong parameters for IRC::print_infobar Perl function\n" -msgstr "" - -#: src/plugins/perl/wee-perl.c:257 -msgid "Perl error: server not found for IRC::command Perl function\n" +msgid "%s error: unable to load script \"%s\" (not enough memory)\n" msgstr "" -#: src/plugins/perl/wee-perl.c:358 -msgid "Perl error: server not found for IRC::get_info Perl function\n" -msgstr "" - -#: src/plugins/perl/wee-perl.c:527 +#: src/plugins/perl/wee-perl.c:234 src/plugins/perl/wee-perl.c:525 +#: src/plugins/perl/wee-perl.c:573 src/plugins/perl/wee-perl.c:600 +#: src/plugins/perl/wee-perl.c:645 src/plugins/perl/wee-perl.c:675 +#: src/plugins/perl/wee-perl.c:715 src/plugins/python/wee-python.c:60 +#: src/plugins/python/wee-python.c:142 src/plugins/python/wee-python.c:179 +#: src/plugins/python/wee-python.c:211 src/plugins/python/wee-python.c:243 +#: src/plugins/python/wee-python.c:272 src/plugins/python/wee-python.c:311 #, c-format -msgid "Perl error: %s\n" +msgid "%s error: wrong parameters for \"%s\" function\n" msgstr "" -#: src/plugins/perl/wee-perl.c:537 +#: src/plugins/perl/wee-perl.c:270 src/plugins/perl/wee-perl.c:378 +#: src/plugins/perl/wee-perl.c:732 src/plugins/python/wee-python.c:331 #, c-format -msgid "Perl error: too much values from \"%s\" (%d). Expected: 1.\n" +msgid "%s error: server not found for \"%s\" function\n" msgstr "" -#: src/plugins/perl/wee-perl.c:559 +#: src/plugins/perl/wee-perl.c:850 src/plugins/python/wee-python.c:408 #, c-format -msgid "loading Perl script \"%s\"\n" +msgid "Loading %s module \"weechat\"\n" msgstr "" -#: src/plugins/perl/wee-perl.c:561 +#: src/plugins/perl/wee-perl.c:909 #, c-format -msgid "Loading Perl script \"%s\"\n" +msgid "Perl error: %s" msgstr "" -#: src/plugins/perl/wee-perl.c:610 +#: src/plugins/perl/wee-perl.c:919 #, c-format -msgid "unloading Perl script \"%s\"\n" -msgstr "" - -#: src/plugins/perl/wee-perl.c:627 -msgid "unloading all Perl scripts...\n" +msgid "%s error: too much values from \"%s\" (%d). Expected: 1.\n" msgstr "" -#: src/plugins/python/wee-python.c:61 src/plugins/python/wee-python.c:170 -msgid "" -"Python error: wrong parameters for 'print_with_channel' Python function\n" -msgstr "" - -#: src/plugins/python/wee-python.c:81 +#: 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 #, c-format -msgid "" -"Python error: unable to register Python script \"%s\" (another script " -"already exists with this name)\n" +msgid "Loading %s script \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:105 +#: src/plugins/perl/wee-perl.c:992 src/plugins/python/wee-python.c:612 #, c-format -msgid "registered Python script: \"%s\", version %s (%s)\n" +msgid "Unloading %s script \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:112 +#: src/plugins/perl/wee-perl.c:1009 src/plugins/python/wee-python.c:629 #, c-format -msgid "%s unable to load Python script \"%s\" (not enough memory)\n" -msgstr "" - -#: src/plugins/python/wee-python.c:137 -msgid "Python error: wrong parameters for 'print' Python function\n" -msgstr "" - -#: src/plugins/python/wee-python.c:222 -msgid "Python error: wrong parameters for 'print_infobar' Python function\n" -msgstr "" - -#: src/plugins/python/wee-python.c:249 -msgid "Python error: wrong parameters for 'command' Python function\n" -msgstr "" - -#: src/plugins/python/wee-python.c:268 -msgid "Python error: server not found for 'command' Python function\n" -msgstr "" - -#: src/plugins/python/wee-python.c:303 -msgid "" -"Python error: wrong parameters for 'add_message_handler' Python function\n" -msgstr "" - -#: src/plugins/python/wee-python.c:332 -msgid "" -"Python error: wrong parameters for 'add_command_handler' Python function\n" +msgid "Unloading all %s scripts...\n" msgstr "" -#: src/plugins/python/wee-python.c:371 -msgid "Python error: wrong parameters for 'get_info' Python function\n" -msgstr "" - -#: src/plugins/python/wee-python.c:390 -msgid "Python error: server not found for 'get_info' Python function\n" -msgstr "" - -#: src/plugins/python/wee-python.c:462 -msgid "Python error: error while launching Python interpreter\n" -msgstr "" - -#: src/plugins/python/wee-python.c:468 -msgid "Loading Python module \"weechat\"\n" -msgstr "" - -#: src/plugins/python/wee-python.c:519 src/plugins/python/wee-python.c:547 -#: src/plugins/python/wee-python.c:578 +#: src/plugins/perl/wee-perl.c:1014 src/plugins/python/wee-python.c:634 #, c-format -msgid "" -"Python error: unable to run function \"%s\"in Python script (not enough " -"memory)\n" +msgid "%s scripts unloaded\n" msgstr "" -#: src/plugins/python/wee-python.c:569 +#: src/plugins/python/wee-python.c:403 #, c-format -msgid "Python error: error while running function \"%s\"\n" +msgid "%s error: error while launching interpreter\n" msgstr "" -#: src/plugins/python/wee-python.c:599 +#: src/plugins/python/wee-python.c:460 src/plugins/python/wee-python.c:488 +#: src/plugins/python/wee-python.c:520 #, c-format -msgid "loading Python script \"%s\"\n" +msgid "%s error: unable to run function \"%s\" in script (not enough memory)\n" msgstr "" -#: src/plugins/python/wee-python.c:601 +#: src/plugins/python/wee-python.c:510 #, c-format -msgid "Loading Python script \"%s\"\n" +msgid "%s error: error while running function \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:607 +#: src/plugins/python/wee-python.c:549 #, c-format -msgid "Python error: error while opening file \"%s\"\n" +msgid "%s error: error while opening file \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:615 +#: src/plugins/python/wee-python.c:558 #, c-format -msgid "Python error: error while parsing file \"%s\"\n" +msgid "%s error: error while parsing file \"%s\"\n" msgstr "" -#: src/plugins/python/wee-python.c:668 +#: src/plugins/python/wee-python.c:660 #, c-format -msgid "unloading Python script \"%s\"\n" -msgstr "" - -#: src/plugins/python/wee-python.c:685 -msgid "unloading all Python scripts...\n" -msgstr "" - -#: src/plugins/python/wee-python.c:711 -msgid "Python error: error while freeing Python interpreter\n" +msgid "%s error: error while freeing interpreter\n" msgstr "" #: src/plugins/plugins.c:93 #, c-format -msgid "auto-loading %s script: %s%s%s\n" +msgid "Auto-loading %s script: %s%s%s\n" msgstr "" -#: src/plugins/plugins.c:211 +#: src/plugins/plugins.c:212 #, c-format msgid "%s unable to add handler for \"%s\" message (not enough memory)\n" msgstr "" @@ -2022,17 +1958,15 @@ msgid "server" msgstr "" #: src/gui/gui-common.c:330 -#, c-format -msgid "%s not enough memory for infobar message\n" +msgid "Not enough memory for infobar message\n" msgstr "" -#: src/gui/gui-common.c:506 -#, c-format -msgid "%s not enough memory for new line!\n" +#: src/gui/gui-common.c:505 +msgid "Not enough memory for new line\n" msgstr "" -#: src/gui/gui-common.c:549 -msgid "not enough memory!\n" +#: src/gui/gui-common.c:548 +msgid "Not enough memory for new message\n" msgstr "" #: src/common/command.c:42 @@ -2132,7 +2066,7 @@ msgid "list/load/unload Perl scripts" msgstr "" #: src/common/command.c:76 src/common/command.c:81 -msgid "[load filename] | [autoload] | [unload]" +msgid "[load filename] | [autoload] | [reload] | [unload]" msgstr "" #: src/common/command.c:77 @@ -2380,9 +2314,9 @@ msgstr "" msgid "%s server not found\n" msgstr "" -#: src/common/command.c:1142 src/common/command.c:1404 -#: src/common/command.c:1545 src/common/command.c:2236 -#: src/common/command.c:2248 +#: src/common/command.c:1142 src/common/command.c:1406 +#: src/common/command.c:1549 src/common/command.c:2240 +#: src/common/command.c:2252 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "" @@ -2411,208 +2345,181 @@ msgstr "" msgid "No help available, \"%s\" is an unknown command\n" msgstr "" -#: src/common/command.c:1305 -msgid "Registered Perl scripts:\n" +#: src/common/command.c:1305 src/common/command.c:1448 +#, c-format +msgid "Registered %s scripts:\n" msgstr "" -#: src/common/command.c:1322 src/common/command.c:1344 -#: src/common/command.c:1366 src/common/command.c:1463 -#: src/common/command.c:1485 src/common/command.c:1507 +#: src/common/command.c:1322 src/common/command.c:1345 +#: src/common/command.c:1368 src/common/command.c:1465 +#: src/common/command.c:1488 src/common/command.c:1511 msgid " (none)\n" msgstr "" -#: src/common/command.c:1327 -msgid "Perl message handlers:\n" -msgstr "" - -#: src/common/command.c:1336 +#: src/common/command.c:1327 src/common/command.c:1470 #, c-format -msgid " IRC(%s) => Perl(%s)\n" +msgid "%s message handlers:\n" msgstr "" -#: src/common/command.c:1349 -msgid "Perl command handlers:\n" +#: src/common/command.c:1336 src/common/command.c:1479 +#, c-format +msgid " IRC(%s) => %s(%s)\n" msgstr "" -#: src/common/command.c:1358 +#: src/common/command.c:1350 src/common/command.c:1493 #, c-format -msgid " Command /%s => Perl(%s)\n" +msgid "%s command handlers:\n" msgstr "" -#: src/common/command.c:1378 -msgid "Perl scripts unloaded\n" +#: src/common/command.c:1359 src/common/command.c:1502 +#, c-format +msgid " Command /%s => %s(%s)\n" msgstr "" -#: src/common/command.c:1417 +#: src/common/command.c:1419 msgid "" "WeeChat was build without Perl support.\n" "Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n" msgstr "" -#: src/common/command.c:1446 -msgid "Registered Python scripts:\n" -msgstr "" - -#: src/common/command.c:1468 -msgid "Python message handlers:\n" -msgstr "" - -#: src/common/command.c:1477 -#, c-format -msgid " IRC(%s) => Python(%s)\n" -msgstr "" - -#: src/common/command.c:1490 -msgid "Python command handlers:\n" -msgstr "" - -#: src/common/command.c:1499 -#, c-format -msgid " Command /%s => Python(%s)\n" -msgstr "" - -#: src/common/command.c:1519 -msgid "Python scripts unloaded\n" -msgstr "" - -#: src/common/command.c:1558 +#: src/common/command.c:1562 msgid "" "WeeChat was build without Python support.\n" "Please rebuild WeeChat with \"--enable-python\" option for ./configure " "script\n" msgstr "" -#: src/common/command.c:1606 +#: src/common/command.c:1610 msgid "No server.\n" msgstr "" -#: src/common/command.c:1617 +#: src/common/command.c:1621 #, c-format msgid "Server '%s' not found.\n" msgstr "" -#: src/common/command.c:1629 +#: src/common/command.c:1633 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "" -#: src/common/command.c:1637 +#: src/common/command.c:1641 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" -#: src/common/command.c:1656 +#: src/common/command.c:1660 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:1664 +#: src/common/command.c:1668 #, 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:1680 src/common/command.c:1821 +#: src/common/command.c:1684 src/common/command.c:1825 msgid "Server" msgstr "" -#: src/common/command.c:1683 +#: src/common/command.c:1687 msgid "has been deleted\n" msgstr "" -#: src/common/command.c:1698 +#: src/common/command.c:1702 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "" -#: src/common/command.c:1708 +#: src/common/command.c:1712 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "" -#: src/common/command.c:1733 src/common/command.c:1761 -#: src/common/command.c:1774 src/common/command.c:1800 +#: src/common/command.c:1737 src/common/command.c:1765 +#: src/common/command.c:1778 src/common/command.c:1804 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1746 +#: src/common/command.c:1750 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1787 +#: src/common/command.c:1791 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:1824 +#: src/common/command.c:1828 msgid "created\n" msgstr "" -#: src/common/command.c:1830 +#: src/common/command.c:1834 #, c-format msgid "%s unable to create server\n" msgstr "" -#: src/common/command.c:1885 +#: src/common/command.c:1889 msgid "(unknown)" msgstr "" -#: src/common/command.c:1908 +#: src/common/command.c:1912 msgid "(password hidden) " msgstr "" -#: src/common/command.c:1972 +#: src/common/command.c:1976 #, c-format msgid "%s server \"%s\" not found\n" msgstr "" -#: src/common/command.c:2003 src/common/command.c:2049 +#: src/common/command.c:2007 src/common/command.c:2053 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "" -#: src/common/command.c:2008 src/common/command.c:2041 +#: src/common/command.c:2012 src/common/command.c:2045 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "" -#: src/common/command.c:2024 +#: src/common/command.c:2028 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" -#: src/common/command.c:2122 +#: src/common/command.c:2126 #, c-format msgid "No config option found with \"%s\"\n" msgstr "" -#: src/common/command.c:2125 +#: src/common/command.c:2129 msgid "No config option found\n" msgstr "" -#: src/common/command.c:2131 +#: src/common/command.c:2135 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "" -#: src/common/command.c:2134 +#: src/common/command.c:2138 msgid "config option(s) found\n" msgstr "" -#: src/common/command.c:2154 +#: src/common/command.c:2158 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "" -#: src/common/command.c:2164 +#: src/common/command.c:2168 #, c-format msgid "Alias \"%s\" removed\n" msgstr "" -#: src/common/command.c:2184 +#: src/common/command.c:2188 msgid "Opened windows:\n" msgstr "" @@ -3622,7 +3529,7 @@ msgid "%s: creating default config file...\n" msgstr "" #: src/common/weeconfig.c:1392 -msgid "creating default config file\n" +msgid "Creating default config file\n" msgstr "" #: src/common/weeconfig.c:1395 src/common/weeconfig.c:1567 @@ -3633,5 +3540,5 @@ msgid "" msgstr "" #: src/common/weeconfig.c:1564 -msgid "saving config to disk\n" +msgid "Saving config to disk\n" msgstr "" diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c index d2a8c14f6..61d65db7e 100644 --- a/weechat/src/common/command.c +++ b/weechat/src/common/command.c @@ -73,12 +73,12 @@ t_weechat_command weechat_commands[] = N_("[command]"), N_("command: name of a WeeChat or IRC command"), 0, 1, weechat_cmd_help, NULL }, { "perl", N_("list/load/unload Perl scripts"), - N_("[load filename] | [autoload] | [unload]"), + N_("[load filename] | [autoload] | [reload] | [unload]"), N_("filename: Perl script (file) to load\n" "Without argument, /perl command lists all loaded Perl scripts."), 0, 2, weechat_cmd_perl, NULL }, { "python", N_("list/load/unload Python scripts"), - N_("[load filename] | [autoload] | [unload]"), + N_("[load filename] | [autoload] | [reload] | [unload]"), N_("filename: Python script (file) to load\n" "Without argument, /python command lists all loaded Python scripts."), 0, 2, weechat_cmd_python, NULL }, @@ -1302,7 +1302,7 @@ weechat_cmd_perl (int argc, char **argv) case 0: /* list registered Perl scripts */ gui_printf (NULL, "\n"); - gui_printf (NULL, _("Registered Perl scripts:\n")); + gui_printf (NULL, _("Registered %s scripts:\n"), "Perl"); if (perl_scripts) { for (ptr_plugin_script = perl_scripts; ptr_plugin_script; @@ -1324,7 +1324,7 @@ weechat_cmd_perl (int argc, char **argv) /* list Perl message handlers */ gui_printf (NULL, "\n"); - gui_printf (NULL, _("Perl message handlers:\n")); + gui_printf (NULL, _("%s message handlers:\n"), "Perl"); handler_found = 0; for (ptr_plugin_handler = plugin_msg_handlers; ptr_plugin_handler; ptr_plugin_handler = ptr_plugin_handler->next_handler) @@ -1333,8 +1333,9 @@ weechat_cmd_perl (int argc, char **argv) { handler_found = 1; irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _(" IRC(%s) => Perl(%s)\n"), + gui_printf (NULL, _(" IRC(%s) => %s(%s)\n"), ptr_plugin_handler->name, + "Perl", ptr_plugin_handler->function_name); } } @@ -1346,7 +1347,7 @@ weechat_cmd_perl (int argc, char **argv) /* list Perl command handlers */ gui_printf (NULL, "\n"); - gui_printf (NULL, _("Perl command handlers:\n")); + gui_printf (NULL, _("%s command handlers:\n"), "Perl"); handler_found = 0; for (ptr_plugin_handler = plugin_cmd_handlers; ptr_plugin_handler; ptr_plugin_handler = ptr_plugin_handler->next_handler) @@ -1355,8 +1356,9 @@ weechat_cmd_perl (int argc, char **argv) { handler_found = 1; irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _(" Command /%s => Perl(%s)\n"), + gui_printf (NULL, _(" Command /%s => %s(%s)\n"), ptr_plugin_handler->name, + "Perl", ptr_plugin_handler->function_name); } } @@ -1370,13 +1372,13 @@ weechat_cmd_perl (int argc, char **argv) case 1: if (strcasecmp (argv[0], "autoload") == 0) plugin_auto_load (PLUGIN_TYPE_PERL, "perl/autoload"); - if (strcasecmp (argv[0], "unload") == 0) + else if (strcasecmp (argv[0], "reload") == 0) { - /* unload all Perl scripts */ plugin_unload (PLUGIN_TYPE_PERL, NULL); - irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _("Perl scripts unloaded\n")); + plugin_auto_load (PLUGIN_TYPE_PERL, "perl/autoload"); } + else if (strcasecmp (argv[0], "unload") == 0) + plugin_unload (PLUGIN_TYPE_PERL, NULL); break; case 2: if (strcasecmp (argv[0], "load") == 0) @@ -1443,7 +1445,7 @@ weechat_cmd_python (int argc, char **argv) case 0: /* list registered Python scripts */ gui_printf (NULL, "\n"); - gui_printf (NULL, _("Registered Python scripts:\n")); + gui_printf (NULL, _("Registered %s scripts:\n"), "Python"); if (python_scripts) { for (ptr_plugin_script = python_scripts; ptr_plugin_script; @@ -1465,7 +1467,7 @@ weechat_cmd_python (int argc, char **argv) /* list Python message handlers */ gui_printf (NULL, "\n"); - gui_printf (NULL, _("Python message handlers:\n")); + gui_printf (NULL, _("%s message handlers:\n"), "Python"); handler_found = 0; for (ptr_plugin_handler = plugin_msg_handlers; ptr_plugin_handler; ptr_plugin_handler = ptr_plugin_handler->next_handler) @@ -1474,8 +1476,9 @@ weechat_cmd_python (int argc, char **argv) { handler_found = 1; irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _(" IRC(%s) => Python(%s)\n"), + gui_printf (NULL, _(" IRC(%s) => %s(%s)\n"), ptr_plugin_handler->name, + "Python", ptr_plugin_handler->function_name); } } @@ -1487,7 +1490,7 @@ weechat_cmd_python (int argc, char **argv) /* list Python command handlers */ gui_printf (NULL, "\n"); - gui_printf (NULL, _("Python command handlers:\n")); + gui_printf (NULL, _("%s command handlers:\n"), "Python"); handler_found = 0; for (ptr_plugin_handler = plugin_cmd_handlers; ptr_plugin_handler; ptr_plugin_handler = ptr_plugin_handler->next_handler) @@ -1496,8 +1499,9 @@ weechat_cmd_python (int argc, char **argv) { handler_found = 1; irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _(" Command /%s => Python(%s)\n"), + gui_printf (NULL, _(" Command /%s => %s(%s)\n"), ptr_plugin_handler->name, + "Python", ptr_plugin_handler->function_name); } } @@ -1511,13 +1515,13 @@ weechat_cmd_python (int argc, char **argv) case 1: if (strcasecmp (argv[0], "autoload") == 0) plugin_auto_load (PLUGIN_TYPE_PYTHON, "python/autoload"); - if (strcasecmp (argv[0], "unload") == 0) + else if (strcasecmp (argv[0], "reload") == 0) { - /* unload all Python scripts */ plugin_unload (PLUGIN_TYPE_PYTHON, NULL); - irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _("Python scripts unloaded\n")); + plugin_auto_load (PLUGIN_TYPE_PYTHON, "python/autoload"); } + else if (strcasecmp (argv[0], "unload") == 0) + plugin_unload (PLUGIN_TYPE_PYTHON, NULL); break; case 2: if (strcasecmp (argv[0], "load") == 0) diff --git a/weechat/src/common/completion.c b/weechat/src/common/completion.c index 03b6ada59..1975415f1 100644 --- a/weechat/src/common/completion.c +++ b/weechat/src/common/completion.c @@ -193,7 +193,8 @@ completion_build_list (t_completion *completion, void *channel) } return; } - if ((strcasecmp (completion->base_command, "perl") == 0) + if (((strcasecmp (completion->base_command, "perl") == 0) + || (strcasecmp (completion->base_command, "python") == 0)) && (completion->base_command_arg == 1)) { weelist_add (&completion->completion_list, @@ -204,18 +205,7 @@ completion_build_list (t_completion *completion, void *channel) "autoload"); weelist_add (&completion->completion_list, &completion->last_completion, - "unload"); - return; - } - if ((strcasecmp (completion->base_command, "python") == 0) - && (completion->base_command_arg == 1)) - { - weelist_add (&completion->completion_list, - &completion->last_completion, - "load"); - weelist_add (&completion->completion_list, - &completion->last_completion, - "autoload"); + "reload"); weelist_add (&completion->completion_list, &completion->last_completion, "unload"); diff --git a/weechat/src/common/weechat.c b/weechat/src/common/weechat.c index 66d5fea4d..1e45eda04 100644 --- a/weechat/src/common/weechat.c +++ b/weechat/src/common/weechat.c @@ -632,7 +632,7 @@ wee_dump (int crash) if (crash) { sigsegv = 1; - wee_log_printf ("very bad, WeeChat is crashing (SIGSEGV received)...\n"); + wee_log_printf ("Very bad, WeeChat is crashing (SIGSEGV received)...\n"); } wee_log_printf ("\n"); diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c index b341a7fcb..be77d5447 100644 --- a/weechat/src/common/weeconfig.c +++ b/weechat/src/common/weeconfig.c @@ -1389,7 +1389,7 @@ config_create_default () } printf (_("%s: creating default config file...\n"), PACKAGE_NAME); - wee_log_printf (_("creating default config file\n")); + wee_log_printf (_("Creating default config file\n")); current_time = time (NULL); fprintf (file, _("#\n# %s configuration file, created by " @@ -1561,7 +1561,7 @@ config_write (char *config_name) return -1; } - wee_log_printf (_("saving config to disk\n")); + wee_log_printf (_("Saving config to disk\n")); current_time = time (NULL); fprintf (file, _("#\n# %s configuration file, created by " diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c index c43718e76..6ef9765ae 100644 --- a/weechat/src/gui/curses/gui-display.c +++ b/weechat/src/gui/curses/gui-display.c @@ -2600,6 +2600,12 @@ gui_printf_type_color (t_gui_buffer *buffer, int type, int color, char *message, } } + if (buffer->dcc) + buffer = gui_buffers; + + if (buffer->dcc) + return; + va_start (argptr, message); vsnprintf (buf, sizeof (buf) - 1, message, argptr); va_end (argptr); diff --git a/weechat/src/gui/gui-common.c b/weechat/src/gui/gui-common.c index 72e79127f..e1d9f9112 100644 --- a/weechat/src/gui/gui-common.c +++ b/weechat/src/gui/gui-common.c @@ -66,7 +66,7 @@ gui_window_new (int x, int y, int width, int height) t_gui_window *new_window; #ifdef DEBUG - wee_log_printf ("creating new window (x:%d, y:%d, width:%d, height:%d)\n", + wee_log_printf ("Creating new window (x:%d, y:%d, width:%d, height:%d)\n", x, y, width, height); #endif if ((new_window = (t_gui_window *)(malloc (sizeof (t_gui_window))))) @@ -138,7 +138,7 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int dcc, t_gui_buffer *new_buffer; #ifdef DEBUG - wee_log_printf ("creating new buffer\n"); + wee_log_printf ("Creating new buffer\n"); #endif /* use first buffer if no server was assigned to this buffer */ @@ -327,8 +327,7 @@ gui_infobar_printf (int time_displayed, int color, char *message, ...) gui_draw_buffer_infobar (gui_current_window->buffer, 1); } else - wee_log_printf (_("%s not enough memory for infobar message\n"), - WEECHAT_ERROR); + wee_log_printf (_("Not enough memory for infobar message\n")); free (buf2); } @@ -503,7 +502,7 @@ gui_new_line (t_gui_buffer *buffer) } else { - wee_log_printf (_("%s not enough memory for new line!\n")); + wee_log_printf (_("Not enough memory for new line\n")); return NULL; } @@ -546,7 +545,7 @@ gui_new_message (t_gui_buffer *buffer) } else { - wee_log_printf (_("not enough memory!\n")); + wee_log_printf (_("Not enough memory for new message\n")); return NULL; } return new_message; diff --git a/weechat/src/irc/irc-dcc.c b/weechat/src/irc/irc-dcc.c index 09515f007..b2344ac3a 100644 --- a/weechat/src/irc/irc-dcc.c +++ b/weechat/src/irc/irc-dcc.c @@ -92,9 +92,7 @@ dcc_calculate_speed (t_irc_dcc *ptr_dcc, int ended) } ptr_dcc->last_check_time = local_time; ptr_dcc->last_check_pos = ptr_dcc->pos; - wee_log_printf ("bytes per sec calculé: %lu\n", ptr_dcc->bytes_per_sec); } - wee_log_printf ("bytes per sec calculé pas bon !!!\n"); } /* @@ -1053,7 +1051,7 @@ dcc_end () if (ptr_dcc->sock != -1) { if (ptr_dcc->status == DCC_ACTIVE) - wee_log_printf (_("aborting active DCC: \"%s\" from %s\n"), + wee_log_printf (_("Aborting active DCC: \"%s\" from %s\n"), ptr_dcc->filename, ptr_dcc->nick); dcc_close (ptr_dcc, DCC_FAILED); } diff --git a/weechat/src/irc/irc-server.c b/weechat/src/irc/irc-server.c index 566dceed1..ec7312739 100644 --- a/weechat/src/irc/irc-server.c +++ b/weechat/src/irc/irc-server.c @@ -323,7 +323,7 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de return NULL; #ifdef DEBUG - wee_log_printf ("creating new server (name:%s, address:%s, port:%d, pwd:%s, " + 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", name, address, port, (password) ? password : "", @@ -843,7 +843,7 @@ server_connect (t_irc_server *server) gui_printf (server->buffer, _("%s: connecting to %s:%d...\n"), PACKAGE_NAME, server->address, server->port); - wee_log_printf (_("connecting to server %s:%d...\n"), + wee_log_printf (_("Connecting to server %s:%d...\n"), server->address, server->port); /* close any opened connection and kill child process if running */ diff --git a/weechat/src/plugins/perl/wee-perl.c b/weechat/src/plugins/perl/wee-perl.c index 96f5ad7d5..2bf80b997 100644 --- a/weechat/src/plugins/perl/wee-perl.c +++ b/weechat/src/plugins/perl/wee-perl.c @@ -45,10 +45,14 @@ t_plugin_script *last_perl_script = NULL; extern void boot_DynaLoader (pTHX_ CV* cv); +/******************************* Old interface ********************************/ + /* * IRC::register: startup function for all WeeChat Perl scripts */ +/*** DEPRECATED function, kept for compatibility only, please don't update! ***/ + static XS (XS_IRC_register) { char *name, *version, *shutdown_func, *description; @@ -78,12 +82,12 @@ static XS (XS_IRC_register) if (perl_script_found) { - /* error: another scripts already exists with this name! */ + /* error: another script already exists with this name! */ irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Perl error: unable to register Perl script \"%s\" (another script " + _("%s error: unable to register \"%s\" script (another script " "already exists with this name)\n"), - name); + "Perl", name); } else { @@ -105,15 +109,15 @@ static XS (XS_IRC_register) perl_scripts = new_perl_script; last_perl_script = new_perl_script; - wee_log_printf (_("registered Perl script: \"%s\", version %s (%s)\n"), - name, version, description); + wee_log_printf (_("Registered %s script: \"%s\", version %s (%s)\n"), + "Perl", name, version, description); } else { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("%s unable to load Perl script \"%s\" (not enough memory)\n"), - WEECHAT_ERROR, name); + _("%s error: unable to load script \"%s\" (not enough memory)\n"), + "Perl", name); } } XST_mPV (0, VERSION); @@ -124,6 +128,8 @@ static XS (XS_IRC_register) * IRC::print: print message to current buffer */ +/*** DEPRECATED function, kept for compatibility only, please don't update! ***/ + static XS (XS_IRC_print) { int i, integer; @@ -148,6 +154,8 @@ static XS (XS_IRC_print) * (server is optional) */ +/*** DEPRECATED function, kept for compatibility only, please don't update! ***/ + static XS (XS_IRC_print_with_channel) { int integer; @@ -207,6 +215,8 @@ static XS (XS_IRC_print_with_channel) * IRC::print_infobar: print message to infobar */ +/*** DEPRECATED function, kept for compatibility only, please don't update! ***/ + static XS (XS_IRC_print_infobar) { int integer; @@ -221,7 +231,8 @@ static XS (XS_IRC_print_infobar) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Perl error: wrong parameters for IRC::print_infobar Perl function\n")); + _("%s error: wrong parameters for \"%s\" function\n"), + "Perl", "print_infobar"); } XSRETURN_EMPTY; @@ -231,6 +242,8 @@ static XS (XS_IRC_print_infobar) * IRC::command: send command to server */ +/*** DEPRECATED function, kept for compatibility only, please don't update! ***/ + static XS (XS_IRC_command) { int integer; @@ -254,7 +267,8 @@ static XS (XS_IRC_command) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Perl error: server not found for IRC::command Perl function\n")); + _("%s error: server not found for \"%s\" function\n"), + "Perl", "command"); } } else @@ -280,6 +294,8 @@ static XS (XS_IRC_command) * IRC::add_message_handler: add handler for messages (privmsg, ...) */ +/*** DEPRECATED function, kept for compatibility only, please don't update! ***/ + static XS (XS_IRC_add_message_handler) { char *name, *function; @@ -301,6 +317,8 @@ static XS (XS_IRC_add_message_handler) * IRC::add_command_handler: add command handler (define/redefine commands) */ +/*** DEPRECATED function, kept for compatibility only, please don't update! ***/ + static XS (XS_IRC_add_command_handler) { char *name, *function; @@ -332,6 +350,8 @@ static XS (XS_IRC_add_command_handler) * IRC::get_info: get various infos */ +/*** DEPRECATED function, kept for compatibility only, please don't update! ***/ + static XS (XS_IRC_get_info) { char *arg, *info = NULL, *server; @@ -355,7 +375,8 @@ static XS (XS_IRC_get_info) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Perl error: server not found for IRC::get_info Perl function\n")); + _("%s error: server not found for \"%s\" function\n"), + "Perl", "get_info"); } } else @@ -406,6 +427,355 @@ static XS (XS_IRC_get_info) XSRETURN (1); } +/******************************* New interface ********************************/ + +/* + * weechat::register: startup function for all WeeChat Perl scripts + */ + +static XS (XS_weechat_register) +{ + char *name, *version, *shutdown_func, *description; + int integer; + t_plugin_script *ptr_perl_script, *perl_script_found, *new_perl_script; + dXSARGS; + + /* make gcc happy */ + (void) items; + (void) cv; + + name = SvPV (ST (0), integer); + version = SvPV (ST (1), integer); + shutdown_func = SvPV (ST (2), integer); + description = SvPV (ST (3), integer); + + perl_script_found = NULL; + for (ptr_perl_script = perl_scripts; ptr_perl_script; + ptr_perl_script = ptr_perl_script->next_script) + { + if (strcasecmp (ptr_perl_script->name, name) == 0) + { + perl_script_found = ptr_perl_script; + break; + } + } + + if (perl_script_found) + { + /* error: another script already exists with this name! */ + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: unable to register \"%s\" script (another script " + "already exists with this name)\n"), + "Perl", name); + } + else + { + /* registering script */ + new_perl_script = (t_plugin_script *)malloc (sizeof (t_plugin_script)); + if (new_perl_script) + { + new_perl_script->name = strdup (name); + new_perl_script->version = strdup (version); + new_perl_script->shutdown_func = strdup (shutdown_func); + new_perl_script->description = strdup (description); + + /* add new script to list */ + new_perl_script->prev_script = last_perl_script; + new_perl_script->next_script = NULL; + if (perl_scripts) + last_perl_script->next_script = new_perl_script; + else + perl_scripts = new_perl_script; + last_perl_script = new_perl_script; + + wee_log_printf (_("Registered %s script: \"%s\", version %s (%s)\n"), + "Perl", name, version, description); + } + else + { + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: unable to load script \"%s\" (not enough memory)\n"), + "Perl", name); + } + } + XST_mPV (0, VERSION); + XSRETURN (1); +} + +/* + * weechat::print: print message into a buffer (current or specified one) + */ + +static XS (XS_weechat_print) +{ + int integer; + char *message, *channel_name, *server_name; + t_gui_buffer *ptr_buffer; + dXSARGS; + + /* make gcc happy */ + (void) cv; + + if ((items < 1) || (items > 3)) + { + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: wrong parameters for \"%s\" function\n"), + "Perl", "print"); + XSRETURN_NO; + return; + } + + channel_name = NULL; + server_name = NULL; + + if (items > 1) + { + channel_name = SvPV (ST (1), integer); + if (items > 2) + server_name = SvPV (ST (2), integer); + } + + ptr_buffer = plugin_find_buffer (server_name, channel_name); + if (ptr_buffer) + { + message = SvPV (ST (0), integer); + irc_display_prefix (ptr_buffer, PREFIX_PLUGIN); + gui_printf (ptr_buffer, "%s%s", + message, + ((strlen (message) == 0) || (message[strlen (message) - 1] != '\n')) ? "\n" : ""); + + XSRETURN_YES; + } + + /* buffer not found */ + XSRETURN_NO; +} + +/* + * weechat::print_infobar: print message to infobar + */ + +static XS (XS_weechat_print_infobar) +{ + int integer; + dXSARGS; + + /* make gcc happy */ + (void) cv; + + if (items != 2) + { + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: wrong parameters for \"%s\" function\n"), + "Perl", "print_infobar"); + XSRETURN_NO; + } + + gui_infobar_printf (SvIV (ST (0)), COLOR_WIN_INFOBAR, SvPV (ST (1), integer)); + XSRETURN_YES; +} + +/* + * weechat::command: send command to server + */ + +static XS (XS_weechat_command) +{ + int integer; + char *command, *channel_name, *server_name; + t_gui_buffer *ptr_buffer; + dXSARGS; + + /* make gcc happy */ + (void) cv; + + if ((items < 1) || (items > 3)) + { + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: wrong parameters for \"%s\" function\n"), + "Perl", "command"); + XSRETURN_NO; + return; + } + + channel_name = NULL; + server_name = NULL; + + if (items > 1) + { + channel_name = SvPV (ST (1), integer); + if (items > 2) + server_name = SvPV (ST (2), integer); + } + + ptr_buffer = plugin_find_buffer (server_name, channel_name); + if (ptr_buffer) + { + command = SvPV (ST (0), integer); + user_command (SERVER(ptr_buffer), ptr_buffer, command); + XSRETURN_YES; + } + + /* buffer not found */ + XSRETURN_NO; +} + +/* + * weechat::add_message_handler: add handler for messages (privmsg, ...) + */ + +static XS (XS_weechat_add_message_handler) +{ + char *name, *function; + int integer; + dXSARGS; + + /* make gcc happy */ + (void) cv; + + if (items != 2) + { + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: wrong parameters for \"%s\" function\n"), + "Perl", "add_message_handler"); + XSRETURN_NO; + } + + name = SvPV (ST (0), integer); + function = SvPV (ST (1), integer); + plugin_handler_add (&plugin_msg_handlers, &last_plugin_msg_handler, + PLUGIN_TYPE_PERL, name, function); + XSRETURN_YES; +} + +/* + * weechat::add_command_handler: add command handler (define/redefine commands) + */ + +static XS (XS_weechat_add_command_handler) +{ + char *name, *function; + int integer; + t_plugin_handler *ptr_plugin_handler; + dXSARGS; + + /* make gcc happy */ + (void) cv; + + if (items != 2) + { + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: wrong parameters for \"%s\" function\n"), + "Perl", "add_command_handler"); + XSRETURN_NO; + } + + name = SvPV (ST (0), integer); + function = SvPV (ST (1), integer); + if (!weelist_search (index_commands, name)) + weelist_add (&index_commands, &last_index_command, name); + ptr_plugin_handler = plugin_handler_search (plugin_cmd_handlers, name); + if (ptr_plugin_handler) + { + free (ptr_plugin_handler->function_name); + ptr_plugin_handler->function_name = strdup (function); + } + else + plugin_handler_add (&plugin_cmd_handlers, &last_plugin_cmd_handler, + PLUGIN_TYPE_PERL, name, function); + + XSRETURN_YES; +} + +/* + * weechat::get_info: get various infos + */ + +static XS (XS_weechat_get_info) +{ + char *arg, *info = NULL, *server_name; + t_irc_server *ptr_server; + int integer; + dXSARGS; + + /* make gcc happy */ + (void) cv; + + if ((items < 1) || (items > 2)) + { + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: wrong parameters for \"%s\" function\n"), + "Perl", "get_info"); + XSRETURN_NO; + } + + if (items == 2) + { + server_name = SvPV (ST (1), integer); + ptr_server = server_search (server_name); + } + else + ptr_server = SERVER(gui_current_window->buffer); + + if (!ptr_server) + { + irc_display_prefix (NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s error: server not found for \"%s\" function\n"), + "Perl", "get_info"); + XSRETURN_NO; + } + + arg = SvPV (ST (0), integer); + if (arg) + { + if ( (strcasecmp (arg, "0") == 0) || (strcasecmp (arg, "version") == 0) ) + { + info = PACKAGE_STRING; + } + else if ( (strcasecmp (arg, "1") == 0) || (strcasecmp (arg, "nick") == 0) ) + { + if (ptr_server->nick) + info = ptr_server->nick; + } + else if ( (strcasecmp (arg, "2") == 0) || (strcasecmp (arg, "channel") == 0) ) + { + if (BUFFER_IS_CHANNEL (gui_current_window->buffer)) + info = CHANNEL (gui_current_window->buffer)->name; + } + else if ( (strcasecmp (arg, "3") == 0) || (strcasecmp (arg, "server") == 0) ) + { + if (ptr_server->name) + info = ptr_server->name; + } + else if ( (strcasecmp (arg, "4") == 0) || (strcasecmp (arg, "weechatdir") == 0) ) + { + info = weechat_home; + } + else if ( (strcasecmp (arg, "5") == 0) || (strcasecmp (arg, "away") == 0) ) + { + XST_mIV (0, SERVER(gui_current_window->buffer)->is_away); + XSRETURN (1); + return; + } + + if (info) + XST_mPV (0, info); + else + XST_mPV (0, ""); + } + + XSRETURN (1); +} + /* * xs_init: initialize subroutines */ @@ -414,6 +784,8 @@ void xs_init (pTHX) { newXS ("DynaLoader::boot_DynaLoader", boot_DynaLoader, __FILE__); + + /* DEPRECATED & old interface (WeeChat <= 0.1.1), kept for compatibility */ newXS ("IRC::register", XS_IRC_register, "IRC"); newXS ("IRC::print", XS_IRC_print, "IRC"); newXS ("IRC::print_with_channel", XS_IRC_print_with_channel, "IRC"); @@ -422,6 +794,15 @@ xs_init (pTHX) newXS ("IRC::add_message_handler", XS_IRC_add_message_handler, "IRC"); newXS ("IRC::add_command_handler", XS_IRC_add_command_handler, "IRC"); newXS ("IRC::get_info", XS_IRC_get_info, "IRC"); + + /* new interface (WeeChat >= 0.1.2) */ + newXS ("weechat::register", XS_weechat_register, "weechat"); + newXS ("weechat::print", XS_weechat_print, "weechat"); + newXS ("weechat::print_infobar", XS_weechat_print_infobar, "weechat"); + newXS ("weechat::command", XS_weechat_command, "weechat"); + newXS ("weechat::add_message_handler", XS_weechat_add_message_handler, "weechat"); + newXS ("weechat::add_command_handler", XS_weechat_add_command_handler, "weechat"); + newXS ("weechat::get_info", XS_weechat_get_info, "weechat"); } /* @@ -433,7 +814,7 @@ wee_perl_init () { char *perl_args[] = { "", "-e", "0" }; /* Following Perl code is extracted/modified from X-Chat IRC client */ - /* X-Chat is (c) 1998-2002 Peter Zelezny */ + /* X-Chat is (c) 1998-2005 Peter Zelezny */ char *weechat_perl_func = { "sub wee_perl_load_file" @@ -451,21 +832,22 @@ wee_perl_init () " my $content = wee_perl_load_file ($filename);" " if ($content eq \"__WEECHAT_ERROR__\")" " {" - " IRC::print \"WeeChat Error: Perl script '$filename' not found.\\n\";" + " weechat::print \"WeeChat Error: Perl script '$filename' not found.\\n\";" " return 1;" " }" " eval $content;" " if ($@)" " {" - " IRC::print \"WeeChat error: unable to load Perl script '$filename':\\n\";" - " IRC::print \"$@\\n\";" + " weechat::print \"WeeChat error: unable to load Perl script '$filename':\\n\";" + " weechat::print \"$@\\n\";" " return 2;" " }" " return 0;" "}" - "$SIG{__WARN__} = sub { IRC::print \"$_[0]\n\"; };" + "$SIG{__WARN__} = sub { weechat::print \"$_[0]\n\"; };" }; + wee_log_printf (_("Loading %s module \"weechat\"\n"), "Perl"); my_perl = perl_alloc (); perl_construct (my_perl); perl_parse (my_perl, xs_init, 3, perl_args, NULL); @@ -524,7 +906,7 @@ wee_perl_exec (char *function, char *server, char *arguments) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Perl error: %s\n"), + _("Perl error: %s"), SvPV (sv, count)); POPs; } @@ -534,8 +916,8 @@ wee_perl_exec (char *function, char *server, char *arguments) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Perl error: too much values from \"%s\" (%d). Expected: 1.\n"), - function, count); + _("%s error: too much values from \"%s\" (%d). Expected: 1.\n"), + "Perl", function, count); } else return_code = POPi; @@ -556,9 +938,9 @@ int wee_perl_load (char *filename) { /* execute Perl script */ - wee_log_printf (_("loading Perl script \"%s\"\n"), filename); + wee_log_printf (_("Loading %s script \"%s\"\n"), "Perl", filename); irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _("Loading Perl script \"%s\"\n"), filename); + gui_printf (NULL, _("Loading %s script \"%s\"\n"), "Perl", filename); return wee_perl_exec ("wee_perl_load_eval_file", filename, ""); } @@ -607,8 +989,8 @@ wee_perl_unload (t_plugin_script *ptr_perl_script) { if (ptr_perl_script) { - wee_log_printf (_("unloading Perl script \"%s\"\n"), - ptr_perl_script->name); + wee_log_printf (_("Unloading %s script \"%s\"\n"), + "Perl", ptr_perl_script->name); /* call shutdown callback function */ if (ptr_perl_script->shutdown_func[0]) @@ -624,9 +1006,12 @@ wee_perl_unload (t_plugin_script *ptr_perl_script) void wee_perl_unload_all () { - wee_log_printf (_("unloading all Perl scripts...\n")); + wee_log_printf (_("Unloading all %s scripts...\n"), "Perl"); while (perl_scripts) wee_perl_unload (perl_scripts); + + irc_display_prefix (NULL, PREFIX_PLUGIN); + gui_printf (NULL, _("%s scripts unloaded\n"), "Perl"); } /* diff --git a/weechat/src/plugins/plugins.c b/weechat/src/plugins/plugins.c index 85a3d5033..462bfe4d8 100644 --- a/weechat/src/plugins/plugins.c +++ b/weechat/src/plugins/plugins.c @@ -90,7 +90,7 @@ plugin_auto_load (int plugin_type, char *directory) lstat (entry->d_name, &statbuf); if (! S_ISDIR(statbuf.st_mode)) { - wee_log_printf (_("auto-loading %s script: %s%s%s\n"), + wee_log_printf (_("Auto-loading %s script: %s%s%s\n"), plugin_name[plugin_type], dir_name, DIR_SEPARATOR, entry->d_name); plugin_load (plugin_type, entry->d_name); @@ -194,6 +194,7 @@ plugin_handler_add (t_plugin_handler **plugin_handlers, new_plugin_handler->plugin_type = plugin_type; new_plugin_handler->name = strdup (name); new_plugin_handler->function_name = strdup (function); + new_plugin_handler->running = 0; /* add new handler to list */ new_plugin_handler->prev_handler = *last_plugin_handler; @@ -301,11 +302,25 @@ plugin_event_msg (char *irc_command, char *arguments, char *server) { #ifdef PLUGIN_PERL if (ptr_plugin_handler->plugin_type == PLUGIN_TYPE_PERL) - wee_perl_exec (ptr_plugin_handler->function_name, arguments, server); + { + if (ptr_plugin_handler->running == 0) + { + ptr_plugin_handler->running = 1; + wee_perl_exec (ptr_plugin_handler->function_name, arguments, server); + ptr_plugin_handler->running = 0; + } + } #endif #ifdef PLUGIN_PYTHON if (ptr_plugin_handler->plugin_type == PLUGIN_TYPE_PYTHON) - wee_python_exec (ptr_plugin_handler->function_name, arguments, server); + { + if (ptr_plugin_handler->running == 0) + { + ptr_plugin_handler->running = 1; + wee_python_exec (ptr_plugin_handler->function_name, arguments, server); + ptr_plugin_handler->running = 0; + } + } #endif } } @@ -334,11 +349,25 @@ plugin_exec_command (char *user_command, char *arguments, char *server) { #ifdef PLUGIN_PERL if (ptr_plugin_handler->plugin_type == PLUGIN_TYPE_PERL) - wee_perl_exec (ptr_plugin_handler->function_name, arguments, server); + { + if (ptr_plugin_handler->running == 0) + { + ptr_plugin_handler->running = 1; + wee_perl_exec (ptr_plugin_handler->function_name, arguments, server); + ptr_plugin_handler->running = 0; + } + } #endif #ifdef PLUGIN_PYTHON if (ptr_plugin_handler->plugin_type == PLUGIN_TYPE_PYTHON) - wee_python_exec (ptr_plugin_handler->function_name, arguments, server); + { + if (ptr_plugin_handler->running == 0) + { + ptr_plugin_handler->running = 1; + wee_python_exec (ptr_plugin_handler->function_name, arguments, server); + ptr_plugin_handler->running = 0; + } + } #endif /* command executed */ @@ -357,6 +386,49 @@ plugin_exec_command (char *user_command, char *arguments, char *server) } /* + * plugin_find_buffer: find a buffer for text display or command execution + */ + +t_gui_buffer * +plugin_find_buffer (char *server, char *channel) +{ + t_irc_server *ptr_server; + t_irc_channel *ptr_channel; + t_gui_buffer *ptr_buffer; + + ptr_server = NULL; + ptr_channel = NULL; + ptr_buffer = NULL; + + if (server) + { + ptr_server = server_search (server); + if (!ptr_server) + return NULL; + } + else + { + ptr_server = SERVER(gui_current_window->buffer); + if (!ptr_server) + ptr_server = SERVER(gui_buffers); + } + + if (channel && ptr_server) + { + ptr_channel = channel_search (ptr_server, channel); + if (ptr_channel) + ptr_buffer = ptr_channel->buffer; + } + else + ptr_buffer = gui_current_window->buffer; + + if (!ptr_buffer) + return NULL; + + return (ptr_buffer->dcc) ? NULL : ptr_buffer; +} + +/* * plugin_unload: unload all scripts for a plugin type */ diff --git a/weechat/src/plugins/plugins.h b/weechat/src/plugins/plugins.h index 1fc773d69..3a5bc64b5 100644 --- a/weechat/src/plugins/plugins.h +++ b/weechat/src/plugins/plugins.h @@ -21,6 +21,8 @@ #ifndef __WEECHAT_PLUGINS_H #define __WEECHAT_PLUGINS_H 1 +#include "../gui/gui.h" + #define PLUGIN_TYPE_PERL 0 #define PLUGIN_TYPE_PYTHON 1 #define PLUGIN_TYPE_RUBY 2 @@ -45,6 +47,8 @@ struct t_plugin_handler char *name; /* name of IRC command (PRIVMSG, ..) or command (without first '/') */ char *function_name; /* name of function (handler) */ + int running; /* 1 if currently running */ + /* (used to prevent circular call) */ t_plugin_handler *prev_handler; /* link to previous handler */ t_plugin_handler *next_handler; /* link to next handler */ }; @@ -66,14 +70,15 @@ extern t_plugin_script *python_scripts; extern void plugin_auto_load (int, char *); extern void plugin_init (); extern void plugin_load (int, char *); -extern void plugin_unload (int, /*@null@*/ char *); +extern void plugin_unload (int, char *); extern t_plugin_handler *plugin_handler_search (t_plugin_handler *, char *); extern void plugin_handler_add (t_plugin_handler **, t_plugin_handler **, int, char *, char *); extern void plugin_handler_free_all_type (t_plugin_handler **, t_plugin_handler **, int); extern void plugin_event_msg (char *, char *, char *); -extern int plugin_exec_command (char *, /*@null@*/ char *, char *); +extern int plugin_exec_command (char *, char *, char *); +extern t_gui_buffer *plugin_find_buffer (char *, char *); extern void plugin_end (); #endif /* plugins.h */ diff --git a/weechat/src/plugins/python/wee-python.c b/weechat/src/plugins/python/wee-python.c index 6c4e48b42..cab102ea7 100644 --- a/weechat/src/plugins/python/wee-python.c +++ b/weechat/src/plugins/python/wee-python.c @@ -41,8 +41,7 @@ t_plugin_script *last_python_script = NULL; /* - * weechat.register(nom, version, fonction, description): - * startup function for all WeeChat Python scripts + * weechat.register: startup function for all WeeChat Python scripts */ static PyObject * @@ -58,7 +57,8 @@ wee_python_register (PyObject *self, PyObject *args) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: wrong parameters for 'print_with_channel' Python function\n")); + _("%s error: wrong parameters for \"%s\" function\n"), + "Python", "print_with_channel"); return NULL; } @@ -78,9 +78,9 @@ wee_python_register (PyObject *self, PyObject *args) /* error: another scripts already exists with this name! */ irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: unable to register Python script \"%s\" (another script " - "already exists with this name)\n"), - name); + _("%s error: unable to register \"%s\" script (another script " + "already exists with this name)\n"), + "Python", name); } else { @@ -102,15 +102,15 @@ wee_python_register (PyObject *self, PyObject *args) python_scripts = new_python_script; last_python_script = new_python_script; - wee_log_printf (_("registered Python script: \"%s\", version %s (%s)\n"), - name, version, description); + wee_log_printf (_("Registered %s script: \"%s\", version %s (%s)\n"), + "Python", name, version, description); } else { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("%s unable to load Python script \"%s\" (not enough memory)\n"), - WEECHAT_ERROR, name); + _("%s error: unable to load script \"%s\" (not enough memory)\n"), + "Python", name); } } @@ -119,91 +119,45 @@ wee_python_register (PyObject *self, PyObject *args) } /* - * weechat.print(message): print message to current buffer + * weechat.print: print message into a buffer (current or specified one) */ static PyObject * wee_python_print (PyObject *self, PyObject *args) { - char *message; - - /* make gcc happy */ - (void) self; - - if (!PyArg_ParseTuple (args, "s", &message)) - { - irc_display_prefix (NULL, PREFIX_ERROR); - gui_printf (NULL, - _("Python error: wrong parameters for 'print' Python function\n")); - return NULL; - } - - irc_display_prefix (gui_current_window->buffer, PREFIX_PLUGIN); - gui_printf (gui_current_window->buffer, "%s\n", message); - - Py_INCREF (Py_None); - return Py_None; -} - -/* - * weechat.print_with_channel(message, channel, server=None): - * print message to a specific channel/server - * (server is optional) - */ - -static PyObject * -wee_python_print_with_channel (PyObject *self, PyObject *args) -{ - char *message, *channel, *server = NULL; - int ret = 0; + char *message, *channel_name, *server_name; t_gui_buffer *ptr_buffer; - t_irc_server *ptr_server; - t_irc_channel *ptr_channel; /* make gcc happy */ (void) self; - if (!PyArg_ParseTuple (args, "ss|s", &message, &channel, &server)) + message = NULL; + channel_name = NULL; + server_name = NULL; + + if (!PyArg_ParseTuple (args, "s|ss", &message, &channel_name, &server_name)) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: wrong parameters for 'print_with_channel' Python function\n")); + _("%s error: wrong parameters for \"%s\" function\n"), + "Python", "print"); return NULL; } - ptr_buffer = NULL; - for (ptr_server = irc_servers; ptr_server; - ptr_server = ptr_server->next_server) - { - if (!server || (strcasecmp (ptr_server->name, server)) == 0) - { - for (ptr_channel = ptr_server->channels; ptr_channel; - ptr_channel = ptr_channel->next_channel) - { - if (strcasecmp (ptr_channel->name, channel) == 0) - { - ptr_buffer = ptr_channel->buffer; - break; - } - } - } - if (ptr_buffer) - break; - } - - /* buffer found => display message & return 1 ~= True */ + ptr_buffer = plugin_find_buffer (server_name, channel_name); if (ptr_buffer) { irc_display_prefix (ptr_buffer, PREFIX_PLUGIN); - gui_printf (ptr_buffer, "%s", message); - ret = 1; + gui_printf (ptr_buffer, "%s\n", message); + return Py_BuildValue ("i", 1); } - return Py_BuildValue ("i", ret); + /* buffer not found */ + return Py_BuildValue ("i", 0); } /* - * weechat.print_infobar(delay, message): print message to infobar + * weechat.print_infobar: print message to infobar */ static PyObject * @@ -215,11 +169,15 @@ wee_python_print_infobar (PyObject *self, PyObject *args) /* make gcc happy */ (void) self; + delay = 1; + message = NULL; + if (!PyArg_ParseTuple (args, "is", &delay, &message)) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: wrong parameters for 'print_infobar' Python function\n")); + _("%s error: wrong parameters for \"%s\" function\n"), + "Python", "print_infobar"); return NULL; } @@ -230,62 +188,44 @@ wee_python_print_infobar (PyObject *self, PyObject *args) } /* - * weechat.command(command, server=None): send command to server + * weechat.command: send command to server */ static PyObject * wee_python_command (PyObject *self, PyObject *args) { - char *server = NULL, *command, *command2; - t_irc_server *ptr_server; + char *command, *channel_name, *server_name; + t_gui_buffer *ptr_buffer; /* make gcc happy */ (void) self; - if (!PyArg_ParseTuple (args, "s|s", &command, &server)) + command = NULL; + channel_name = NULL; + server_name = NULL; + + if (!PyArg_ParseTuple (args, "s|ss", &command, &channel_name, &server_name)) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: wrong parameters for 'command' Python function\n")); + _("%s error: wrong parameters for \"%s\" function\n"), + "Python", "command"); return NULL; } - if (server == NULL) - { - ptr_server = SERVER(gui_current_window->buffer); - } - else - { - for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server) - { - if (strcasecmp (ptr_server->name, server) == 0) - break; - } - if (!ptr_server) - { - irc_display_prefix (NULL, PREFIX_ERROR); - gui_printf (NULL, - _("Python error: server not found for 'command' Python function\n")); - } - } - - if (ptr_server) + ptr_buffer = plugin_find_buffer (server_name, channel_name); + if (ptr_buffer) { - command2 = (char *) malloc (strlen (command) + 8); - strcpy (command2, command); - if (!strstr (command2, "\r\n")) - strcat (command2, "\r\n"); - server_sendf (ptr_server, command2); - free (command2); + user_command (SERVER(ptr_buffer), ptr_buffer, command); + return Py_BuildValue ("i", 1); } - Py_INCREF (Py_None); - return Py_None; + /* buffer not found */ + return Py_BuildValue ("i", 0); } /* - * weechat.add_message_handler(message, function): - * add handler for messages + * weechat.add_message_handler: add handler for messages */ static PyObject * @@ -300,7 +240,8 @@ wee_python_add_message_handler (PyObject *self, PyObject *args) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: wrong parameters for 'add_message_handler' Python function\n")); + _("%s error: wrong parameters for \"%s\" function\n"), + "Python", "add_message_handler"); return NULL; } @@ -312,8 +253,7 @@ wee_python_add_message_handler (PyObject *self, PyObject *args) } /* - * weechat.add_command_handler(name, function): - * define/redefines commands + * weechat.add_command_handler: define/redefines commands */ static PyObject * @@ -329,7 +269,8 @@ wee_python_add_command_handler(PyObject *self, PyObject *args) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: wrong parameters for 'add_command_handler' Python function\n")); + _("%s error: wrong parameters for \"%s\" function\n"), + "Python", "add_command_handler"); return NULL; } @@ -351,8 +292,7 @@ wee_python_add_command_handler(PyObject *self, PyObject *args) } /* - * weechat.get_info(info, server=None): - * get various infos + * weechat.get_info: get various infos */ static PyObject * @@ -368,7 +308,8 @@ wee_python_get_info (PyObject *self, PyObject *args) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: wrong parameters for 'get_info' Python function\n")); + _("%s error: wrong parameters for \"%s\" function\n"), + "Python", "get_info"); return NULL; } @@ -387,7 +328,8 @@ wee_python_get_info (PyObject *self, PyObject *args) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: server not found for 'get_info' Python function\n")); + _("%s error: server not found for \"%s\" function\n"), + "Python", "get_info"); } } @@ -431,20 +373,19 @@ wee_python_get_info (PyObject *self, PyObject *args) } /* - * initialize subroutines + * Python subroutines */ static PyMethodDef weechat_funcs[] = { - {"register", wee_python_register, METH_VARARGS, ""}, - {"prnt", wee_python_print, METH_VARARGS, ""}, - {"print_with_channel", wee_python_print_with_channel, METH_VARARGS, ""}, - {"print_infobar", wee_python_print_infobar, METH_VARARGS, ""}, - {"command", wee_python_command, METH_VARARGS, ""}, - {"add_message_handler", wee_python_add_message_handler, METH_VARARGS, ""}, - {"add_command_handler", wee_python_add_command_handler, METH_VARARGS, ""}, - {"get_info", wee_python_get_info, METH_VARARGS, ""}, - {NULL, NULL, 0, NULL} + { "register", wee_python_register, METH_VARARGS, "" }, + { "prnt", wee_python_print, METH_VARARGS, "" }, + { "print_infobar", wee_python_print_infobar, METH_VARARGS, "" }, + { "command", wee_python_command, METH_VARARGS, "" }, + { "add_message_handler", wee_python_add_message_handler, METH_VARARGS, "" }, + { "add_command_handler", wee_python_add_command_handler, METH_VARARGS, "" }, + { "get_info", wee_python_get_info, METH_VARARGS, "" }, + { NULL, NULL, 0, NULL } }; /* @@ -459,13 +400,13 @@ wee_python_init () if (Py_IsInitialized () == 0) { irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _("Python error: error while launching Python interpreter\n")); + gui_printf (NULL, _("%s error: error while launching interpreter\n"), + "Python"); } else { + wee_log_printf (_("Loading %s module \"weechat\"\n"), "Python"); Py_InitModule ("weechat", weechat_funcs); - irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _("Loading Python module \"weechat\"\n")); } } @@ -516,8 +457,8 @@ wee_python_exec (char *function, char *server, char *arguments) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: unable to run function \"%s\"in Python script (not enough memory)\n"), - function); + _("%s error: unable to run function \"%s\" in script (not enough memory)\n"), + "Python", function); return 0; } @@ -544,8 +485,8 @@ wee_python_exec (char *function, char *server, char *arguments) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: unable to run function \"%s\"in Python script (not enough memory)\n"), - function); + _("%s error: unable to run function \"%s\" in script (not enough memory)\n"), + "Python", function); free (args); return 0; } @@ -566,7 +507,8 @@ wee_python_exec (char *function, char *server, char *arguments) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: error while running function \"%s\"\n"), function); + _("%s error: error while running function \"%s\"\n"), + "Python", function); return_code = 0; } free (runstring); @@ -575,8 +517,8 @@ wee_python_exec (char *function, char *server, char *arguments) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: unable to run function \"%s\"in Python script (not enough memory)\n"), - function); + _("%s error: unable to run function \"%s\" in script (not enough memory)\n"), + "Python", function); return_code = 0; } @@ -596,15 +538,16 @@ wee_python_load (char *filename) FILE *fp; /* execute Python script */ - wee_log_printf (_("loading Python script \"%s\"\n"), filename); + wee_log_printf (_("Loading %s script \"%s\"\n"), "Python", filename); irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _("Loading Python script \"%s\"\n"), filename); + gui_printf (NULL, _("Loading %s script \"%s\"\n"), "Python", filename); if ((fp = fopen (filename, "r")) == NULL) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: error while opening file \"%s\"\n"), filename); + _("%s error: error while opening file \"%s\"\n"), + "Python", filename); return 1; } @@ -612,7 +555,8 @@ wee_python_load (char *filename) { irc_display_prefix (NULL, PREFIX_ERROR); gui_printf (NULL, - _("Python error: error while parsing file \"%s\"\n"), filename); + _("%s error: error while parsing file \"%s\"\n"), + "Python", filename); return 1; } @@ -665,8 +609,8 @@ wee_python_unload (t_plugin_script *ptr_python_script) { if (ptr_python_script) { - wee_log_printf (_("unloading Python script \"%s\"\n"), - ptr_python_script->name); + wee_log_printf (_("Unloading %s script \"%s\"\n"), + "Python", ptr_python_script->name); /* call shutdown callback function */ if (ptr_python_script->shutdown_func[0]) @@ -682,9 +626,12 @@ wee_python_unload (t_plugin_script *ptr_python_script) void wee_python_unload_all () { - wee_log_printf (_("unloading all Python scripts...\n")); + wee_log_printf (_("Unloading all %s scripts...\n"), "Python"); while (python_scripts) wee_python_unload (python_scripts); + + irc_display_prefix (NULL, PREFIX_PLUGIN); + gui_printf (NULL, _("%s scripts unloaded\n"), "Python"); } /* @@ -705,9 +652,12 @@ wee_python_end () &last_plugin_cmd_handler, PLUGIN_TYPE_PYTHON); + /* free Python interpreter */ Py_Finalize (); - if (Py_IsInitialized () != 0) { - irc_display_prefix (NULL, PREFIX_PLUGIN); - gui_printf (NULL, _("Python error: error while freeing Python interpreter\n")); + if (Py_IsInitialized () != 0) + { + irc_display_prefix (NULL, PREFIX_PLUGIN); + gui_printf (NULL, _("%s error: error while freeing interpreter\n"), + "Python"); } } |