summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2005-07-12 17:05:01 +0000
committerSebastien Helleu <flashcode@flashtux.org>2005-07-12 17:05:01 +0000
commit6b12f1908336c637e543aab53731430f855cdc22 (patch)
treeae0885213d075d39887775c4b4910535abf23f51
parent8a6d35cf125822357c2957492ce952cf572e596b (diff)
downloadweechat-6b12f1908336c637e543aab53731430f855cdc22.zip
- added DCC timeout
- fixed FIFO pipe (command now authorized on a buffer not connected to an IRC server) - fixed Perl bug with info reading functions
-rw-r--r--ChangeLog3
-rw-r--r--po/es.po172
-rw-r--r--po/fr.po174
-rw-r--r--po/weechat.pot169
-rw-r--r--src/common/fifo.c22
-rw-r--r--src/irc/irc-dcc.c47
-rw-r--r--src/irc/irc.h3
-rw-r--r--src/plugins/perl/wee-perl.c27
-rw-r--r--weechat/ChangeLog3
-rw-r--r--weechat/po/es.po172
-rw-r--r--weechat/po/fr.po174
-rw-r--r--weechat/po/weechat.pot169
-rw-r--r--weechat/src/common/fifo.c22
-rw-r--r--weechat/src/irc/irc-dcc.c47
-rw-r--r--weechat/src/irc/irc.h3
-rw-r--r--weechat/src/plugins/perl/wee-perl.c27
16 files changed, 638 insertions, 596 deletions
diff --git a/ChangeLog b/ChangeLog
index 3be8ff0c3..75aab1732 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,10 @@ ChangeLog - 2005-07-12
Versoin 0.1.4 (under dev!):
+ * added DCC timeout
* added function for Perl/Python to get DCC list
+ * fixed FIFO pipe (command now authorized on a buffer not connected
+ to an IRC server)
* topic completion now decodes UTF-8 string
* fixed bug with IRC URL on command line (irc://)
* new keyboard management: keys are setup in config file, new command
diff --git a/po/es.po b/po/es.po
index 89091d2a6..c30e66579 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.4-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-07-12 09:51+0200\n"
+"POT-Creation-Date: 2005-07-12 19:01+0200\n"
"PO-Revision-Date: 2005-07-11 23:57+0200\n"
"Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1627,7 +1627,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:1557 src/irc/irc-dcc.c:799
+#: src/irc/irc-recv.c:1557 src/irc/irc-dcc.c:808
#, c-format
msgid "Private %s> %s"
msgstr "Privado %s> %s"
@@ -1859,7 +1859,7 @@ msgstr "Abortado"
msgid "DCC: file "
msgstr "DCC: fichero "
-#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:454
+#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:463
msgid " (local filename: "
msgstr " (nombre de fichero local: "
@@ -1879,7 +1879,7 @@ msgstr ": ok!\n"
msgid "DCC chat closed with "
msgstr "DCC chat cerrada con "
-#: src/irc/irc-dcc.c:261
+#: src/irc/irc-dcc.c:269
#, c-format
msgid ""
"%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1888,74 +1888,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:271
+#: src/irc/irc-dcc.c:279
msgid "Connected to "
msgstr "Conectado al "
-#: src/irc/irc-dcc.c:280
+#: src/irc/irc-dcc.c:288
msgid "via DCC chat\n"
msgstr "con charla DCC\n"
-#: src/irc/irc-dcc.c:391
+#: src/irc/irc-dcc.c:399
#, 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:410
+#: src/irc/irc-dcc.c:418
msgid "DCC chat"
msgstr "Charla DCC"
-#: src/irc/irc-dcc.c:434
+#: src/irc/irc-dcc.c:443
msgid "Incoming DCC file from "
msgstr "Recibir fichero DCC de "
-#: src/irc/irc-dcc.c:445 src/irc/irc-dcc.c:458
+#: src/irc/irc-dcc.c:454 src/irc/irc-dcc.c:467
msgid " bytes\n"
msgstr " bytes\n"
-#: src/irc/irc-dcc.c:450
+#: src/irc/irc-dcc.c:459
msgid "Sending DCC file to "
msgstr "Enviar fichero DCC a "
-#: src/irc/irc-dcc.c:463
+#: src/irc/irc-dcc.c:472
msgid "Incoming DCC chat request from "
msgstr "Recibir DCC chat de "
-#: src/irc/irc-dcc.c:474
+#: src/irc/irc-dcc.c:483
msgid "Sending DCC chat request to "
msgstr "Enviar DCC chat a "
-#: src/irc/irc-dcc.c:538
+#: src/irc/irc-dcc.c:547
#, 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:560
+#: src/irc/irc-dcc.c:569
#, c-format
msgid "%s cannot access file \"%s\"\n"
msgstr "%s no es posible acceder al fichero \"%s\"\n"
-#: src/irc/irc-dcc.c:581
+#: src/irc/irc-dcc.c:590
#, 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:594
+#: src/irc/irc-dcc.c:603
#, 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:641
+#: src/irc/irc-dcc.c:650
#, c-format
msgid "%s cannot send DCC\n"
msgstr "%s no es posible enviar el DCC\n"
-#: src/irc/irc-dcc.c:720
+#: src/irc/irc-dcc.c:729
#, 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:980
+#: src/irc/irc-dcc.c:1002
#, c-format
msgid ""
"%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -1964,12 +1964,12 @@ 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:1054
+#: src/irc/irc-dcc.c:1077
#, c-format
msgid "Aborting active DCC: \"%s\" from %s\n"
msgstr "Abandonar el DCC activo: \"%s\" de %s\n"
-#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:468
+#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:463
#: src/plugins/python/wee-python.c:81
#, c-format
msgid ""
@@ -1979,13 +1979,13 @@ msgstr ""
"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:112 src/plugins/perl/wee-perl.c:492
+#: src/plugins/perl/wee-perl.c:112 src/plugins/perl/wee-perl.c:487
#: src/plugins/python/wee-python.c:105
#, c-format
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:119 src/plugins/perl/wee-perl.c:499
+#: src/plugins/perl/wee-perl.c:119 src/plugins/perl/wee-perl.c:494
#: src/plugins/python/wee-python.c:112
#, c-format
msgid "%s error: unable to load script \"%s\" (not enough memory)\n"
@@ -1993,10 +1993,10 @@ msgstr ""
"Error de %s: no ha sido posible cargar el script \"%s\" (memoria "
"insuficiente)\n"
-#: 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/perl/wee-perl.c:234 src/plugins/perl/wee-perl.c:520
+#: src/plugins/perl/wee-perl.c:568 src/plugins/perl/wee-perl.c:595
+#: src/plugins/perl/wee-perl.c:640 src/plugins/perl/wee-perl.c:670
+#: src/plugins/perl/wee-perl.c:710 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
@@ -2004,82 +2004,82 @@ msgstr ""
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:270 src/plugins/perl/wee-perl.c:378
-#: src/plugins/perl/wee-perl.c:732 src/plugins/python/wee-python.c:331
+#: src/plugins/perl/wee-perl.c:270 src/plugins/perl/wee-perl.c:374
+#: src/plugins/perl/wee-perl.c:723 src/plugins/python/wee-python.c:331
#, c-format
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:879 src/plugins/python/wee-python.c:408
+#: src/plugins/perl/wee-perl.c:873 src/plugins/python/wee-python.c:456
#, c-format
msgid "Loading %s module \"weechat\"\n"
msgstr "Cargando módulo %s \"weechat\"\n"
-#: src/plugins/perl/wee-perl.c:938
+#: src/plugins/perl/wee-perl.c:932
#, c-format
msgid "Perl error: %s"
msgstr "Error de Perl: %s"
-#: src/plugins/perl/wee-perl.c:948
+#: src/plugins/perl/wee-perl.c:942
#, c-format
msgid "%s error: too much values from \"%s\" (%d). Expected: 1.\n"
msgstr "Error de %s: demasiados valores desde \"%s\" (%d). Esperado: 1.\n"
-#: src/plugins/perl/wee-perl.c:970 src/plugins/perl/wee-perl.c:972
-#: src/plugins/python/wee-python.c:566 src/plugins/python/wee-python.c:568
+#: src/plugins/perl/wee-perl.c:964 src/plugins/perl/wee-perl.c:966
+#: src/plugins/python/wee-python.c:614 src/plugins/python/wee-python.c:616
#, c-format
msgid "Loading %s script \"%s\"\n"
msgstr "Cargando %s script \"%s\"\n"
-#: src/plugins/perl/wee-perl.c:1021 src/plugins/python/wee-python.c:637
+#: src/plugins/perl/wee-perl.c:1015 src/plugins/python/wee-python.c:685
#, c-format
msgid "Unloading %s script \"%s\"\n"
msgstr "Descarga del %s script \"%s\"\n"
-#: src/plugins/perl/wee-perl.c:1038 src/plugins/python/wee-python.c:654
+#: src/plugins/perl/wee-perl.c:1032 src/plugins/python/wee-python.c:702
#, c-format
msgid "Unloading all %s scripts...\n"
msgstr "Descargando todos los %s scripts...\n"
-#: src/plugins/perl/wee-perl.c:1043 src/plugins/python/wee-python.c:659
+#: src/plugins/perl/wee-perl.c:1037 src/plugins/python/wee-python.c:707
#, c-format
msgid "%s scripts unloaded\n"
msgstr "%s scripts descargados\n"
-#: src/plugins/python/wee-python.c:403
+#: src/plugins/python/wee-python.c:451
#, c-format
msgid "%s error: error while launching interpreter\n"
msgstr "%s error: error al lanzar el intérprete\n"
-#: src/plugins/python/wee-python.c:432
+#: src/plugins/python/wee-python.c:480
#, c-format
msgid "%s error: error while redirecting stdout and stderr\n"
msgstr "%s error: error al redireccionar stdout y stderr\n"
-#: src/plugins/python/wee-python.c:485 src/plugins/python/wee-python.c:513
-#: src/plugins/python/wee-python.c:545
+#: src/plugins/python/wee-python.c:533 src/plugins/python/wee-python.c:561
+#: src/plugins/python/wee-python.c:593
#, c-format
msgid "%s error: unable to run function \"%s\" in script (not enough memory)\n"
msgstr ""
"Error de %s: no ha sido posible cargar el script \"%s\" (memoria "
"insuficiente)\n"
-#: src/plugins/python/wee-python.c:535
+#: src/plugins/python/wee-python.c:583
#, c-format
msgid "%s error: error while running function \"%s\"\n"
msgstr "%s error: error al ejecutar la función \"%s\"\n"
-#: src/plugins/python/wee-python.c:574
+#: src/plugins/python/wee-python.c:622
#, c-format
msgid "%s error: error while opening file \"%s\"\n"
msgstr "%s error: error al abrir el fichero \"%s\"\n"
-#: src/plugins/python/wee-python.c:583
+#: src/plugins/python/wee-python.c:631
#, c-format
msgid "%s error: error while parsing file \"%s\"\n"
msgstr "%s error: error al comparar el fichero \"%s\"\n"
-#: src/plugins/python/wee-python.c:685
+#: src/plugins/python/wee-python.c:733
#, c-format
msgid "%s error: error while freeing interpreter\n"
msgstr "%s error: error al liberar el intérprete\n"
@@ -2096,7 +2096,7 @@ msgstr ""
"%s no ha sido posible añadir el manejador para el mensaje \"%s\" (memoria "
"insuficiente)\n"
-#: src/gui/curses/gui-input.c:298
+#: src/gui/curses/gui-input.c:300
#, c-format
msgid "%s lag is high, disconnecting from server...\n"
msgstr "%s el lag (retraso) es alto, desconectando del servidor...\n"
@@ -2162,15 +2162,15 @@ msgstr " [Q] Cerrar la vista DCC"
msgid "server"
msgstr "servidor"
-#: src/gui/gui-common.c:333
+#: src/gui/gui-common.c:334
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:508
+#: src/gui/gui-common.c:509
msgid "Not enough memory for new line\n"
msgstr "No hay suficiente memoria para una nueva línea\n"
-#: src/gui/gui-common.c:551
+#: src/gui/gui-common.c:552
msgid "Not enough memory for new message\n"
msgstr "No hay suficiente memoria para el mensaje de la barra de información\n"
@@ -2211,102 +2211,110 @@ msgid "delete next word"
msgstr "borrar la palabra siguiente"
#: src/gui/gui-keyboard.c:61
+msgid "paste current clipboard content"
+msgstr ""
+
+#: src/gui/gui-keyboard.c:63
+msgid "transpose chars"
+msgstr ""
+
+#: src/gui/gui-keyboard.c:65
msgid "go to beginning of line"
msgstr "ir al principio de línea"
-#: src/gui/gui-keyboard.c:63
+#: src/gui/gui-keyboard.c:67
msgid "go to end of line"
msgstr "ir al final de línea"
-#: src/gui/gui-keyboard.c:65
+#: src/gui/gui-keyboard.c:69
msgid "move one char left"
msgstr "mover un carácter a la izquierda"
-#: src/gui/gui-keyboard.c:67
+#: src/gui/gui-keyboard.c:71
msgid "move to previous word"
msgstr "mover a la palabra anterior"
-#: src/gui/gui-keyboard.c:69
+#: src/gui/gui-keyboard.c:73
msgid "move one char right"
msgstr "mover un carácter a la derecha"
-#: src/gui/gui-keyboard.c:71
+#: src/gui/gui-keyboard.c:75
msgid "move to next word"
msgstr "mover a la palabra siguiente"
-#: src/gui/gui-keyboard.c:73
+#: src/gui/gui-keyboard.c:77
msgid "call previous command in history"
msgstr "llamar al comando anterior en el historial"
-#: src/gui/gui-keyboard.c:75
+#: src/gui/gui-keyboard.c:79
msgid "call next command in history"
msgstr "llamar al comando siguiente en el historial"
-#: src/gui/gui-keyboard.c:77
+#: src/gui/gui-keyboard.c:81
msgid "scroll one page up"
msgstr "desplazarse una página hacia arriba"
-#: src/gui/gui-keyboard.c:79
+#: src/gui/gui-keyboard.c:83
msgid "scroll one page down"
msgstr "desplazarse una página hacia abajo"
-#: src/gui/gui-keyboard.c:81
+#: src/gui/gui-keyboard.c:85
msgid "clear infobar"
msgstr "limpiar barra de información"
-#: src/gui/gui-keyboard.c:83
+#: src/gui/gui-keyboard.c:87
msgid "scroll nicklist one page up"
msgstr "desplazar la lista de nicks una página hacia arriba"
-#: src/gui/gui-keyboard.c:85
+#: src/gui/gui-keyboard.c:89
msgid "scroll nicklist one page down"
msgstr "desplazar la lista de nicks una página hacia abajo"
-#: src/gui/gui-keyboard.c:87
+#: src/gui/gui-keyboard.c:91
msgid "display beginning of nicklist"
msgstr "mostrar el principio de la lista de nicks"
-#: src/gui/gui-keyboard.c:89
+#: src/gui/gui-keyboard.c:93
msgid "display end of nicklist"
msgstr "mostrar el final de la lista de nicks"
-#: src/gui/gui-keyboard.c:91
+#: src/gui/gui-keyboard.c:95
msgid "refresh screen"
msgstr "recargar la pantalla"
-#: src/gui/gui-keyboard.c:93
+#: src/gui/gui-keyboard.c:97
msgid "jump to buffer with activity"
msgstr "saltar al búfer con actividad"
-#: src/gui/gui-keyboard.c:95
+#: src/gui/gui-keyboard.c:99
msgid "jump to DCC buffer"
msgstr "saltar al búfer DCC"
-#: src/gui/gui-keyboard.c:97
+#: src/gui/gui-keyboard.c:101
msgid "jump to server buffer"
msgstr "saltar al búfer servidor"
-#: src/gui/gui-keyboard.c:99
+#: src/gui/gui-keyboard.c:103
msgid "jump to next server"
msgstr "saltar al servidor siguiente"
-#: src/gui/gui-keyboard.c:101
+#: src/gui/gui-keyboard.c:105
msgid "clear hotlist"
msgstr "limpiar hotlist"
-#: src/gui/gui-keyboard.c:399 src/common/command.c:1471
+#: src/gui/gui-keyboard.c:403 src/common/command.c:1471
#, c-format
msgid "%s unable to bind key \"%s\"\n"
msgstr "%s No ha sido posible atar la clave \"%s\"\n"
-#: src/gui/gui-keyboard.c:410
+#: src/gui/gui-keyboard.c:414
#, c-format
msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n"
msgstr ""
"%s No ha sido posible atar la clave \"%s\" (nombre de función inválido: \"%s"
"\")\n"
-#: src/gui/gui-keyboard.c:423
+#: src/gui/gui-keyboard.c:427
#, c-format
msgid "%s not enough memory for key binding\n"
msgstr "%s no hay suficiente memoria para atar la clave\n"
@@ -3011,32 +3019,27 @@ msgstr "%s no ha sido posible abrir la tubería FIFO (%s) para leer\n"
msgid "FIFO pipe is open\n"
msgstr "La tubería FIFO está abierta\n"
-#: src/common/fifo.c:121
-#, c-format
-msgid "%s invalid buffer for displaying text via FIFO pipe\n"
-msgstr "%s búfer inválido para mostrar texto mediante la tubería FIFO\n"
-
-#: src/common/fifo.c:132 src/common/fifo.c:178
+#: src/common/fifo.c:124
#, c-format
msgid "%s invalid text received on FIFO pipe\n"
msgstr "%s texto inválido recibido en la tubería FIFO\n"
-#: src/common/fifo.c:154
+#: src/common/fifo.c:146
#, c-format
msgid "%s server \"%s\" not found (FIFO pipe data)\n"
msgstr "%s servidor \"%s\" no encontrado (datos de la tubería FIFO)\n"
-#: src/common/fifo.c:166
+#: src/common/fifo.c:158
#, c-format
msgid "%s channel \"%s\" not found (FIFO pipe data)\n"
msgstr "%s canal \"%s\" no encontrado (datos de la tubería FIFO)\n"
-#: src/common/fifo.c:265 src/common/fifo.c:267
+#: src/common/fifo.c:249 src/common/fifo.c:251
#, c-format
msgid "%s error reading FIFO pipe, closing it\n"
msgstr "%s error al leer la tubería FIFO, cerrándola\n"
-#: src/common/fifo.c:309
+#: src/common/fifo.c:293
msgid "FIFO pipe is closed\n"
msgstr "La tubería FIFO está cerrada\n"
@@ -4143,3 +4146,6 @@ msgstr ""
#: src/common/weeconfig.c:1737
msgid "Saving config to disk\n"
msgstr "Guardar configuración a disco\n"
+
+#~ msgid "%s invalid buffer for displaying text via FIFO pipe\n"
+#~ msgstr "%s búfer inválido para mostrar texto mediante la tubería FIFO\n"
diff --git a/po/fr.po b/po/fr.po
index 8f780a047..37af0862d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.4-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-07-12 09:51+0200\n"
-"PO-Revision-Date: 2005-07-09 18:48+0200\n"
+"POT-Creation-Date: 2005-07-12 19:01+0200\n"
+"PO-Revision-Date: 2005-07-12 19:02+0200\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n"
@@ -1626,7 +1626,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:1557 src/irc/irc-dcc.c:799
+#: src/irc/irc-recv.c:1557 src/irc/irc-dcc.c:808
#, c-format
msgid "Private %s> %s"
msgstr "Prive %s> %s"
@@ -1858,7 +1858,7 @@ msgstr "Interrompu"
msgid "DCC: file "
msgstr "DCC: fichier "
-#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:454
+#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:463
msgid " (local filename: "
msgstr " (nom local: "
@@ -1878,7 +1878,7 @@ msgstr ": ok!\n"
msgid "DCC chat closed with "
msgstr "Discussion DCC fermée avec "
-#: src/irc/irc-dcc.c:261
+#: src/irc/irc-dcc.c:269
#, c-format
msgid ""
"%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1887,74 +1887,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:271
+#: src/irc/irc-dcc.c:279
msgid "Connected to "
msgstr "Connecté à "
-#: src/irc/irc-dcc.c:280
+#: src/irc/irc-dcc.c:288
msgid "via DCC chat\n"
msgstr "via une discussion DCC\n"
-#: src/irc/irc-dcc.c:391
+#: src/irc/irc-dcc.c:399
#, 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:410
+#: src/irc/irc-dcc.c:418
msgid "DCC chat"
msgstr "Discussion DCC"
-#: src/irc/irc-dcc.c:434
+#: src/irc/irc-dcc.c:443
msgid "Incoming DCC file from "
msgstr "Réception fichier DCC de "
-#: src/irc/irc-dcc.c:445 src/irc/irc-dcc.c:458
+#: src/irc/irc-dcc.c:454 src/irc/irc-dcc.c:467
msgid " bytes\n"
msgstr " octets\n"
-#: src/irc/irc-dcc.c:450
+#: src/irc/irc-dcc.c:459
msgid "Sending DCC file to "
msgstr "Envoi fichier DCC à "
-#: src/irc/irc-dcc.c:463
+#: src/irc/irc-dcc.c:472
msgid "Incoming DCC chat request from "
msgstr "Demande de discussion DCC reçue de "
-#: src/irc/irc-dcc.c:474
+#: src/irc/irc-dcc.c:483
msgid "Sending DCC chat request to "
msgstr "Envoi d'une demande discussion DCC à "
-#: src/irc/irc-dcc.c:538
+#: src/irc/irc-dcc.c:547
#, 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:560
+#: src/irc/irc-dcc.c:569
#, c-format
msgid "%s cannot access file \"%s\"\n"
msgstr "%s impossible d'accéder au fichier \"%s\"\n"
-#: src/irc/irc-dcc.c:581
+#: src/irc/irc-dcc.c:590
#, 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:594
+#: src/irc/irc-dcc.c:603
#, 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:641
+#: src/irc/irc-dcc.c:650
#, c-format
msgid "%s cannot send DCC\n"
msgstr "%s impossible d'envoyer le DCC\n"
-#: src/irc/irc-dcc.c:720
+#: src/irc/irc-dcc.c:729
#, 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:980
+#: src/irc/irc-dcc.c:1002
#, c-format
msgid ""
"%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -1963,12 +1963,12 @@ 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:1054
+#: src/irc/irc-dcc.c:1077
#, c-format
msgid "Aborting active DCC: \"%s\" from %s\n"
msgstr "Abandon du DCC actif: \"%s\" de %s\n"
-#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:468
+#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:463
#: src/plugins/python/wee-python.c:81
#, c-format
msgid ""
@@ -1978,23 +1978,23 @@ msgstr ""
"Erreur %s: impossible d'enregistrer le script \"%s\" (un autre script existe "
"déjà avec ce nom)\n"
-#: src/plugins/perl/wee-perl.c:112 src/plugins/perl/wee-perl.c:492
+#: src/plugins/perl/wee-perl.c:112 src/plugins/perl/wee-perl.c:487
#: src/plugins/python/wee-python.c:105
#, c-format
msgid "Registered %s script: \"%s\", version %s (%s)\n"
msgstr "Script %s enregistré: \"%s\", version %s (%s)\n"
-#: src/plugins/perl/wee-perl.c:119 src/plugins/perl/wee-perl.c:499
+#: src/plugins/perl/wee-perl.c:119 src/plugins/perl/wee-perl.c:494
#: src/plugins/python/wee-python.c:112
#, c-format
msgid "%s error: unable to load script \"%s\" (not enough memory)\n"
msgstr ""
"Erreur %s: impossible de charger le script \"%s\" (mémoire insuffisante)\n"
-#: 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/perl/wee-perl.c:234 src/plugins/perl/wee-perl.c:520
+#: src/plugins/perl/wee-perl.c:568 src/plugins/perl/wee-perl.c:595
+#: src/plugins/perl/wee-perl.c:640 src/plugins/perl/wee-perl.c:670
+#: src/plugins/perl/wee-perl.c:710 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
@@ -2002,82 +2002,82 @@ msgstr ""
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:270 src/plugins/perl/wee-perl.c:378
-#: src/plugins/perl/wee-perl.c:732 src/plugins/python/wee-python.c:331
+#: src/plugins/perl/wee-perl.c:270 src/plugins/perl/wee-perl.c:374
+#: src/plugins/perl/wee-perl.c:723 src/plugins/python/wee-python.c:331
#, c-format
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:879 src/plugins/python/wee-python.c:408
+#: src/plugins/perl/wee-perl.c:873 src/plugins/python/wee-python.c:456
#, c-format
msgid "Loading %s module \"weechat\"\n"
msgstr "Chargement du module %s \"weechat\"\n"
-#: src/plugins/perl/wee-perl.c:938
+#: src/plugins/perl/wee-perl.c:932
#, c-format
msgid "Perl error: %s"
msgstr "Erreur Perl: %s"
-#: src/plugins/perl/wee-perl.c:948
+#: src/plugins/perl/wee-perl.c:942
#, c-format
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:970 src/plugins/perl/wee-perl.c:972
-#: src/plugins/python/wee-python.c:566 src/plugins/python/wee-python.c:568
+#: src/plugins/perl/wee-perl.c:964 src/plugins/perl/wee-perl.c:966
+#: src/plugins/python/wee-python.c:614 src/plugins/python/wee-python.c:616
#, c-format
msgid "Loading %s script \"%s\"\n"
msgstr "Chargement du script %s \"%s\"\n"
-#: src/plugins/perl/wee-perl.c:1021 src/plugins/python/wee-python.c:637
+#: src/plugins/perl/wee-perl.c:1015 src/plugins/python/wee-python.c:685
#, c-format
msgid "Unloading %s script \"%s\"\n"
msgstr "Déchargement du script %s \"%s\"\n"
-#: src/plugins/perl/wee-perl.c:1038 src/plugins/python/wee-python.c:654
+#: src/plugins/perl/wee-perl.c:1032 src/plugins/python/wee-python.c:702
#, c-format
msgid "Unloading all %s scripts...\n"
msgstr "Déchargement de tous les scripts %s...\n"
-#: src/plugins/perl/wee-perl.c:1043 src/plugins/python/wee-python.c:659
+#: src/plugins/perl/wee-perl.c:1037 src/plugins/python/wee-python.c:707
#, c-format
msgid "%s scripts unloaded\n"
msgstr "Scripts %s déchargés\n"
-#: src/plugins/python/wee-python.c:403
+#: src/plugins/python/wee-python.c:451
#, c-format
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:432
+#: src/plugins/python/wee-python.c:480
#, c-format
msgid "%s error: error while redirecting stdout and stderr\n"
msgstr "Erreur %s: erreur en redirection de stdout et stderr\n"
-#: src/plugins/python/wee-python.c:485 src/plugins/python/wee-python.c:513
-#: src/plugins/python/wee-python.c:545
+#: src/plugins/python/wee-python.c:533 src/plugins/python/wee-python.c:561
+#: src/plugins/python/wee-python.c:593
#, c-format
msgid "%s error: unable to run function \"%s\" in script (not enough memory)\n"
msgstr ""
"Erreur %s: impossible d'exécuter la fonction \"%s\" dans le script (mémoire "
"insuffisante)\n"
-#: src/plugins/python/wee-python.c:535
+#: src/plugins/python/wee-python.c:583
#, c-format
msgid "%s error: error while running function \"%s\"\n"
msgstr "Erreur %s: erreur dans la fonction \"%s\"\n"
-#: src/plugins/python/wee-python.c:574
+#: src/plugins/python/wee-python.c:622
#, c-format
msgid "%s error: error while opening file \"%s\"\n"
msgstr "Erreur %s: erreur à l'ouverture du fichier \"%s\"\n"
-#: src/plugins/python/wee-python.c:583
+#: src/plugins/python/wee-python.c:631
#, c-format
msgid "%s error: error while parsing file \"%s\"\n"
msgstr "Erreur %s: erreur en analysant le fichier \"%s\"\n"
-#: src/plugins/python/wee-python.c:685
+#: src/plugins/python/wee-python.c:733
#, c-format
msgid "%s error: error while freeing interpreter\n"
msgstr "Erreur %s: impossible de libérer l'interpréteur\n"
@@ -2094,7 +2094,7 @@ msgstr ""
"%s impossible d'ajouter la fonction pour le message \"%s\" (mémoire "
"insuffisante)\n"
-#: src/gui/curses/gui-input.c:298
+#: src/gui/curses/gui-input.c:300
#, c-format
msgid "%s lag is high, disconnecting from server...\n"
msgstr "%s le lag est élevé, déconnexion du serveur...\n"
@@ -2160,15 +2160,15 @@ msgstr " [Q] Fermer la vue DCC"
msgid "server"
msgstr "serveur"
-#: src/gui/gui-common.c:333
+#: src/gui/gui-common.c:334
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:508
+#: src/gui/gui-common.c:509
msgid "Not enough memory for new line\n"
msgstr "Pas assez de mémoire pour une nouvelle ligne !\n"
-#: src/gui/gui-common.c:551
+#: src/gui/gui-common.c:552
msgid "Not enough memory for new message\n"
msgstr "Pas assez de mémoire pour un message de la barre d'infos\n"
@@ -2209,101 +2209,109 @@ msgid "delete next word"
msgstr "effacer le mot suivant"
#: src/gui/gui-keyboard.c:61
+msgid "paste current clipboard content"
+msgstr "coller le contenu du presse-papier"
+
+#: src/gui/gui-keyboard.c:63
+msgid "transpose chars"
+msgstr "inverser les caractères"
+
+#: src/gui/gui-keyboard.c:65
msgid "go to beginning of line"
msgstr "aller au début de la ligne"
-#: src/gui/gui-keyboard.c:63
+#: src/gui/gui-keyboard.c:67
msgid "go to end of line"
msgstr "aller à la fin de la ligne"
-#: src/gui/gui-keyboard.c:65
+#: src/gui/gui-keyboard.c:69
msgid "move one char left"
msgstr "se déplacer d'un caractère à gauche"
-#: src/gui/gui-keyboard.c:67
+#: src/gui/gui-keyboard.c:71
msgid "move to previous word"
msgstr "se déplacer au mot précédent"
-#: src/gui/gui-keyboard.c:69
+#: src/gui/gui-keyboard.c:73
msgid "move one char right"
msgstr "se déplacer d'un caractère à droite"
-#: src/gui/gui-keyboard.c:71
+#: src/gui/gui-keyboard.c:75
msgid "move to next word"
msgstr "se déplacer au mot suivant"
-#: src/gui/gui-keyboard.c:73
+#: src/gui/gui-keyboard.c:77
msgid "call previous command in history"
msgstr "appeler la commande précédente dans l'historique"
-#: src/gui/gui-keyboard.c:75
+#: src/gui/gui-keyboard.c:79
msgid "call next command in history"
msgstr "appeler la commande suivante dans l'historique"
-#: src/gui/gui-keyboard.c:77
+#: src/gui/gui-keyboard.c:81
msgid "scroll one page up"
msgstr "faire défiler d'une page vers le haut"
-#: src/gui/gui-keyboard.c:79
+#: src/gui/gui-keyboard.c:83
msgid "scroll one page down"
msgstr "faire défiler d'une page vers le bas"
-#: src/gui/gui-keyboard.c:81
+#: src/gui/gui-keyboard.c:85
msgid "clear infobar"
msgstr "effacer la barre d'infos"
-#: src/gui/gui-keyboard.c:83
+#: src/gui/gui-keyboard.c:87
msgid "scroll nicklist one page up"
msgstr "faire défiler la liste des pseudos d'une page vers le haut"
-#: src/gui/gui-keyboard.c:85
+#: src/gui/gui-keyboard.c:89
msgid "scroll nicklist one page down"
msgstr "faire défiler la liste des pseudos d'une page vers le bas"
-#: src/gui/gui-keyboard.c:87
+#: src/gui/gui-keyboard.c:91
msgid "display beginning of nicklist"
msgstr "afficher le début de la liste des pseudos"
-#: src/gui/gui-keyboard.c:89
+#: src/gui/gui-keyboard.c:93
msgid "display end of nicklist"
msgstr "afficher la fin de la liste des pseudos"
-#: src/gui/gui-keyboard.c:91
+#: src/gui/gui-keyboard.c:95
msgid "refresh screen"
msgstr "rafraichir l'écran"
-#: src/gui/gui-keyboard.c:93
+#: src/gui/gui-keyboard.c:97
msgid "jump to buffer with activity"
msgstr "sauter au tampon avec de l'activité"
-#: src/gui/gui-keyboard.c:95
+#: src/gui/gui-keyboard.c:99
msgid "jump to DCC buffer"
msgstr "sauter au tampon DCC"
-#: src/gui/gui-keyboard.c:97
+#: src/gui/gui-keyboard.c:101
msgid "jump to server buffer"
msgstr "sauter au tampon du serveur"
-#: src/gui/gui-keyboard.c:99
+#: src/gui/gui-keyboard.c:103
msgid "jump to next server"
msgstr "sauter au prochain serveur"
-#: src/gui/gui-keyboard.c:101
+#: src/gui/gui-keyboard.c:105
msgid "clear hotlist"
msgstr "effacer la liste d'activité"
-#: src/gui/gui-keyboard.c:399 src/common/command.c:1471
+#: src/gui/gui-keyboard.c:403 src/common/command.c:1471
#, c-format
msgid "%s unable to bind key \"%s\"\n"
msgstr "%s impossible de créer la touche \"%s\"\n"
-#: src/gui/gui-keyboard.c:410
+#: src/gui/gui-keyboard.c:414
#, c-format
msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n"
msgstr ""
"%s impossible de créer la touche \"%s\" (nom fonction incorrect: \"%s\")\n"
-#: src/gui/gui-keyboard.c:423
+#: src/gui/gui-keyboard.c:427
#, c-format
msgid "%s not enough memory for key binding\n"
msgstr "%s pas assez de mémoire pour la touche\n"
@@ -3003,32 +3011,27 @@ msgstr "%s impossible d'ouvrir le tube FIFO (%s) en lecture\n"
msgid "FIFO pipe is open\n"
msgstr "Le tube FIFO est ouvert\n"
-#: src/common/fifo.c:121
-#, c-format
-msgid "%s invalid buffer for displaying text via FIFO pipe\n"
-msgstr "%s tampon invalide pour afficher le texte via le tube FIFO\n"
-
-#: src/common/fifo.c:132 src/common/fifo.c:178
+#: src/common/fifo.c:124
#, c-format
msgid "%s invalid text received on FIFO pipe\n"
msgstr "%s texte invalide reçu sur le tube FIFO\n"
-#: src/common/fifo.c:154
+#: src/common/fifo.c:146
#, c-format
msgid "%s server \"%s\" not found (FIFO pipe data)\n"
msgstr "%s serveur \"%s\" non trouvé (données du tube FIFO)\n"
-#: src/common/fifo.c:166
+#: src/common/fifo.c:158
#, c-format
msgid "%s channel \"%s\" not found (FIFO pipe data)\n"
msgstr "%s canal \"%s\" non trouvé (données du tube FIFO)\n"
-#: src/common/fifo.c:265 src/common/fifo.c:267
+#: src/common/fifo.c:249 src/common/fifo.c:251
#, c-format
msgid "%s error reading FIFO pipe, closing it\n"
msgstr "%s erreur en lecture du tube FIFO, fermeture\n"
-#: src/common/fifo.c:309
+#: src/common/fifo.c:293
msgid "FIFO pipe is closed\n"
msgstr "Le tube FIFO est fermé\n"
@@ -4135,6 +4138,9 @@ msgstr ""
msgid "Saving config to disk\n"
msgstr "Sauvegarde de la configuration sur disque\n"
+#~ msgid "%s invalid buffer for displaying text via FIFO pipe\n"
+#~ msgstr "%s tampon invalide pour afficher le texte via le tube FIFO\n"
+
#~ msgid "%d:[not connected] "
#~ msgstr "%d:[non connecté] "
diff --git a/po/weechat.pot b/po/weechat.pot
index b90c32e31..86af75d5e 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-07-12 09:51+0200\n"
+"POT-Creation-Date: 2005-07-12 19:01+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"
@@ -1513,7 +1513,7 @@ msgstr ""
msgid "%s unknown DCC CHAT type received from "
msgstr ""
-#: src/irc/irc-recv.c:1557 src/irc/irc-dcc.c:799
+#: src/irc/irc-recv.c:1557 src/irc/irc-dcc.c:808
#, c-format
msgid "Private %s> %s"
msgstr ""
@@ -1736,7 +1736,7 @@ msgstr ""
msgid "DCC: file "
msgstr ""
-#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:454
+#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:463
msgid " (local filename: "
msgstr ""
@@ -1756,93 +1756,93 @@ msgstr ""
msgid "DCC chat closed with "
msgstr ""
-#: src/irc/irc-dcc.c:261
+#: src/irc/irc-dcc.c:269
#, 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:271
+#: src/irc/irc-dcc.c:279
msgid "Connected to "
msgstr ""
-#: src/irc/irc-dcc.c:280
+#: src/irc/irc-dcc.c:288
msgid "via DCC chat\n"
msgstr ""
-#: src/irc/irc-dcc.c:391
+#: src/irc/irc-dcc.c:399
#, c-format
msgid "%s not enough memory for new DCC\n"
msgstr ""
-#: src/irc/irc-dcc.c:410
+#: src/irc/irc-dcc.c:418
msgid "DCC chat"
msgstr ""
-#: src/irc/irc-dcc.c:434
+#: src/irc/irc-dcc.c:443
msgid "Incoming DCC file from "
msgstr ""
-#: src/irc/irc-dcc.c:445 src/irc/irc-dcc.c:458
+#: src/irc/irc-dcc.c:454 src/irc/irc-dcc.c:467
msgid " bytes\n"
msgstr ""
-#: src/irc/irc-dcc.c:450
+#: src/irc/irc-dcc.c:459
msgid "Sending DCC file to "
msgstr ""
-#: src/irc/irc-dcc.c:463
+#: src/irc/irc-dcc.c:472
msgid "Incoming DCC chat request from "
msgstr ""
-#: src/irc/irc-dcc.c:474
+#: src/irc/irc-dcc.c:483
msgid "Sending DCC chat request to "
msgstr ""
-#: src/irc/irc-dcc.c:538
+#: src/irc/irc-dcc.c:547
#, c-format
msgid "%s not enough memory for DCC SEND\n"
msgstr ""
-#: src/irc/irc-dcc.c:560
+#: src/irc/irc-dcc.c:569
#, c-format
msgid "%s cannot access file \"%s\"\n"
msgstr ""
-#: src/irc/irc-dcc.c:581
+#: src/irc/irc-dcc.c:590
#, c-format
msgid "%s cannot create socket for DCC\n"
msgstr ""
-#: src/irc/irc-dcc.c:594
+#: src/irc/irc-dcc.c:603
#, c-format
msgid "%s cannot find port for DCC\n"
msgstr ""
-#: src/irc/irc-dcc.c:641
+#: src/irc/irc-dcc.c:650
#, c-format
msgid "%s cannot send DCC\n"
msgstr ""
-#: src/irc/irc-dcc.c:720
+#: src/irc/irc-dcc.c:729
#, c-format
msgid "%s error sending data to \"%s\" via DCC CHAT\n"
msgstr ""
-#: src/irc/irc-dcc.c:980
+#: src/irc/irc-dcc.c:1002
#, 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:1054
+#: src/irc/irc-dcc.c:1077
#, c-format
msgid "Aborting active DCC: \"%s\" from %s\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:468
+#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:463
#: src/plugins/python/wee-python.c:81
#, c-format
msgid ""
@@ -1850,22 +1850,22 @@ msgid ""
"with this name)\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:112 src/plugins/perl/wee-perl.c:492
+#: src/plugins/perl/wee-perl.c:112 src/plugins/perl/wee-perl.c:487
#: src/plugins/python/wee-python.c:105
#, c-format
msgid "Registered %s script: \"%s\", version %s (%s)\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:119 src/plugins/perl/wee-perl.c:499
+#: src/plugins/perl/wee-perl.c:119 src/plugins/perl/wee-perl.c:494
#: src/plugins/python/wee-python.c:112
#, c-format
msgid "%s error: unable to load script \"%s\" (not enough memory)\n"
msgstr ""
-#: 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/perl/wee-perl.c:234 src/plugins/perl/wee-perl.c:520
+#: src/plugins/perl/wee-perl.c:568 src/plugins/perl/wee-perl.c:595
+#: src/plugins/perl/wee-perl.c:640 src/plugins/perl/wee-perl.c:670
+#: src/plugins/perl/wee-perl.c:710 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
@@ -1873,80 +1873,80 @@ msgstr ""
msgid "%s error: wrong parameters for \"%s\" function\n"
msgstr ""
-#: 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
+#: src/plugins/perl/wee-perl.c:270 src/plugins/perl/wee-perl.c:374
+#: src/plugins/perl/wee-perl.c:723 src/plugins/python/wee-python.c:331
#, c-format
msgid "%s error: server not found for \"%s\" function\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:879 src/plugins/python/wee-python.c:408
+#: src/plugins/perl/wee-perl.c:873 src/plugins/python/wee-python.c:456
#, c-format
msgid "Loading %s module \"weechat\"\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:938
+#: src/plugins/perl/wee-perl.c:932
#, c-format
msgid "Perl error: %s"
msgstr ""
-#: src/plugins/perl/wee-perl.c:948
+#: src/plugins/perl/wee-perl.c:942
#, c-format
msgid "%s error: too much values from \"%s\" (%d). Expected: 1.\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:970 src/plugins/perl/wee-perl.c:972
-#: src/plugins/python/wee-python.c:566 src/plugins/python/wee-python.c:568
+#: src/plugins/perl/wee-perl.c:964 src/plugins/perl/wee-perl.c:966
+#: src/plugins/python/wee-python.c:614 src/plugins/python/wee-python.c:616
#, c-format
msgid "Loading %s script \"%s\"\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:1021 src/plugins/python/wee-python.c:637
+#: src/plugins/perl/wee-perl.c:1015 src/plugins/python/wee-python.c:685
#, c-format
msgid "Unloading %s script \"%s\"\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:1038 src/plugins/python/wee-python.c:654
+#: src/plugins/perl/wee-perl.c:1032 src/plugins/python/wee-python.c:702
#, c-format
msgid "Unloading all %s scripts...\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:1043 src/plugins/python/wee-python.c:659
+#: src/plugins/perl/wee-perl.c:1037 src/plugins/python/wee-python.c:707
#, c-format
msgid "%s scripts unloaded\n"
msgstr ""
-#: src/plugins/python/wee-python.c:403
+#: src/plugins/python/wee-python.c:451
#, c-format
msgid "%s error: error while launching interpreter\n"
msgstr ""
-#: src/plugins/python/wee-python.c:432
+#: src/plugins/python/wee-python.c:480
#, c-format
msgid "%s error: error while redirecting stdout and stderr\n"
msgstr ""
-#: src/plugins/python/wee-python.c:485 src/plugins/python/wee-python.c:513
-#: src/plugins/python/wee-python.c:545
+#: src/plugins/python/wee-python.c:533 src/plugins/python/wee-python.c:561
+#: src/plugins/python/wee-python.c:593
#, c-format
msgid "%s error: unable to run function \"%s\" in script (not enough memory)\n"
msgstr ""
-#: src/plugins/python/wee-python.c:535
+#: src/plugins/python/wee-python.c:583
#, c-format
msgid "%s error: error while running function \"%s\"\n"
msgstr ""
-#: src/plugins/python/wee-python.c:574
+#: src/plugins/python/wee-python.c:622
#, c-format
msgid "%s error: error while opening file \"%s\"\n"
msgstr ""
-#: src/plugins/python/wee-python.c:583
+#: src/plugins/python/wee-python.c:631
#, c-format
msgid "%s error: error while parsing file \"%s\"\n"
msgstr ""
-#: src/plugins/python/wee-python.c:685
+#: src/plugins/python/wee-python.c:733
#, c-format
msgid "%s error: error while freeing interpreter\n"
msgstr ""
@@ -1961,7 +1961,7 @@ msgstr ""
msgid "%s unable to add handler for \"%s\" message (not enough memory)\n"
msgstr ""
-#: src/gui/curses/gui-input.c:298
+#: src/gui/curses/gui-input.c:300
#, c-format
msgid "%s lag is high, disconnecting from server...\n"
msgstr ""
@@ -2027,15 +2027,15 @@ msgstr ""
msgid "server"
msgstr ""
-#: src/gui/gui-common.c:333
+#: src/gui/gui-common.c:334
msgid "Not enough memory for infobar message\n"
msgstr ""
-#: src/gui/gui-common.c:508
+#: src/gui/gui-common.c:509
msgid "Not enough memory for new line\n"
msgstr ""
-#: src/gui/gui-common.c:551
+#: src/gui/gui-common.c:552
msgid "Not enough memory for new message\n"
msgstr ""
@@ -2076,100 +2076,108 @@ msgid "delete next word"
msgstr ""
#: src/gui/gui-keyboard.c:61
-msgid "go to beginning of line"
+msgid "paste current clipboard content"
msgstr ""
#: src/gui/gui-keyboard.c:63
-msgid "go to end of line"
+msgid "transpose chars"
msgstr ""
#: src/gui/gui-keyboard.c:65
-msgid "move one char left"
+msgid "go to beginning of line"
msgstr ""
#: src/gui/gui-keyboard.c:67
-msgid "move to previous word"
+msgid "go to end of line"
msgstr ""
#: src/gui/gui-keyboard.c:69
-msgid "move one char right"
+msgid "move one char left"
msgstr ""
#: src/gui/gui-keyboard.c:71
-msgid "move to next word"
+msgid "move to previous word"
msgstr ""
#: src/gui/gui-keyboard.c:73
-msgid "call previous command in history"
+msgid "move one char right"
msgstr ""
#: src/gui/gui-keyboard.c:75
-msgid "call next command in history"
+msgid "move to next word"
msgstr ""
#: src/gui/gui-keyboard.c:77
-msgid "scroll one page up"
+msgid "call previous command in history"
msgstr ""
#: src/gui/gui-keyboard.c:79
-msgid "scroll one page down"
+msgid "call next command in history"
msgstr ""
#: src/gui/gui-keyboard.c:81
-msgid "clear infobar"
+msgid "scroll one page up"
msgstr ""
#: src/gui/gui-keyboard.c:83
-msgid "scroll nicklist one page up"
+msgid "scroll one page down"
msgstr ""
#: src/gui/gui-keyboard.c:85
-msgid "scroll nicklist one page down"
+msgid "clear infobar"
msgstr ""
#: src/gui/gui-keyboard.c:87
-msgid "display beginning of nicklist"
+msgid "scroll nicklist one page up"
msgstr ""
#: src/gui/gui-keyboard.c:89
-msgid "display end of nicklist"
+msgid "scroll nicklist one page down"
msgstr ""
#: src/gui/gui-keyboard.c:91
-msgid "refresh screen"
+msgid "display beginning of nicklist"
msgstr ""
#: src/gui/gui-keyboard.c:93
-msgid "jump to buffer with activity"
+msgid "display end of nicklist"
msgstr ""
#: src/gui/gui-keyboard.c:95
-msgid "jump to DCC buffer"
+msgid "refresh screen"
msgstr ""
#: src/gui/gui-keyboard.c:97
-msgid "jump to server buffer"
+msgid "jump to buffer with activity"
msgstr ""
#: src/gui/gui-keyboard.c:99
-msgid "jump to next server"
+msgid "jump to DCC buffer"
msgstr ""
#: src/gui/gui-keyboard.c:101
+msgid "jump to server buffer"
+msgstr ""
+
+#: src/gui/gui-keyboard.c:103
+msgid "jump to next server"
+msgstr ""
+
+#: src/gui/gui-keyboard.c:105
msgid "clear hotlist"
msgstr ""
-#: src/gui/gui-keyboard.c:399 src/common/command.c:1471
+#: src/gui/gui-keyboard.c:403 src/common/command.c:1471
#, c-format
msgid "%s unable to bind key \"%s\"\n"
msgstr ""
-#: src/gui/gui-keyboard.c:410
+#: src/gui/gui-keyboard.c:414
#, c-format
msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n"
msgstr ""
-#: src/gui/gui-keyboard.c:423
+#: src/gui/gui-keyboard.c:427
#, c-format
msgid "%s not enough memory for key binding\n"
msgstr ""
@@ -2800,32 +2808,27 @@ msgstr ""
msgid "FIFO pipe is open\n"
msgstr ""
-#: src/common/fifo.c:121
-#, c-format
-msgid "%s invalid buffer for displaying text via FIFO pipe\n"
-msgstr ""
-
-#: src/common/fifo.c:132 src/common/fifo.c:178
+#: src/common/fifo.c:124
#, c-format
msgid "%s invalid text received on FIFO pipe\n"
msgstr ""
-#: src/common/fifo.c:154
+#: src/common/fifo.c:146
#, c-format
msgid "%s server \"%s\" not found (FIFO pipe data)\n"
msgstr ""
-#: src/common/fifo.c:166
+#: src/common/fifo.c:158
#, c-format
msgid "%s channel \"%s\" not found (FIFO pipe data)\n"
msgstr ""
-#: src/common/fifo.c:265 src/common/fifo.c:267
+#: src/common/fifo.c:249 src/common/fifo.c:251
#, c-format
msgid "%s error reading FIFO pipe, closing it\n"
msgstr ""
-#: src/common/fifo.c:309
+#: src/common/fifo.c:293
msgid "FIFO pipe is closed\n"
msgstr ""
diff --git a/src/common/fifo.c b/src/common/fifo.c
index 94ebce332..ec9ff701e 100644
--- a/src/common/fifo.c
+++ b/src/common/fifo.c
@@ -112,16 +112,8 @@ fifo_exec (char *text)
if (text[0] == '*')
{
pos_msg = text + 1;
- ptr_server = SERVER(gui_current_window->buffer);
- ptr_buffer = gui_current_window->buffer;
-
- if (!ptr_server)
- {
- irc_display_prefix (NULL, PREFIX_ERROR);
- gui_printf (NULL, _("%s invalid buffer for displaying text via FIFO pipe\n"),
- WEECHAT_WARNING);
- return;
- }
+ ptr_buffer = (gui_current_window->buffer->dcc) ? gui_buffers : gui_current_window->buffer;
+ ptr_server = SERVER(ptr_buffer);
}
else
{
@@ -172,20 +164,12 @@ fifo_exec (char *text)
}
}
- if (!ptr_server)
- {
- irc_display_prefix (NULL, PREFIX_ERROR);
- gui_printf (NULL, _("%s invalid text received on FIFO pipe\n"),
- WEECHAT_WARNING);
- return;
- }
-
if (!ptr_buffer)
{
if (ptr_channel)
ptr_buffer = ptr_channel->buffer;
else
- ptr_buffer = ptr_server->buffer;
+ ptr_buffer = gui_buffers;
}
user_command (ptr_server, ptr_buffer, pos_msg);
diff --git a/src/irc/irc-dcc.c b/src/irc/irc-dcc.c
index b2344ac3a..4dc9fc511 100644
--- a/src/irc/irc-dcc.c
+++ b/src/irc/irc-dcc.c
@@ -229,6 +229,14 @@ dcc_close (t_irc_dcc *ptr_dcc, int status)
}
}
+ /* remove empty file if received file failed and nothing was transfered */
+ if (((status == DCC_FAILED) || (status == DCC_ABORTED))
+ && DCC_IS_FILE(ptr_dcc->type)
+ && DCC_IS_RECV(ptr_dcc->type)
+ && ptr_dcc->local_filename
+ && ptr_dcc->pos == 0)
+ unlink (ptr_dcc->local_filename);
+
if (DCC_IS_CHAT(ptr_dcc->type))
channel_remove_dcc (ptr_dcc);
@@ -418,6 +426,7 @@ dcc_add (t_irc_server *server, int type, unsigned long addr, int port, char *nic
new_dcc->last_check_time = 0;
new_dcc->last_check_pos = 0;
new_dcc->bytes_per_sec = 0;
+ new_dcc->last_activity = time (NULL);
new_dcc->prev_dcc = NULL;
new_dcc->next_dcc = dcc_list;
if (dcc_list)
@@ -844,6 +853,17 @@ dcc_handle ()
for (ptr_dcc = dcc_list; ptr_dcc; ptr_dcc = ptr_dcc->next_dcc)
{
+ /* check DCC timeout */
+ if (DCC_IS_FILE(ptr_dcc->type) && !DCC_ENDED(ptr_dcc->status))
+ {
+ if ((cfg_dcc_timeout != 0) && (time (NULL) > ptr_dcc->last_activity + cfg_dcc_timeout))
+ {
+ dcc_close (ptr_dcc, DCC_FAILED);
+ dcc_redraw (1);
+ continue;
+ }
+ }
+
if (ptr_dcc->status == DCC_CONNECTING)
{
if (ptr_dcc->type == DCC_FILE_SEND)
@@ -858,6 +878,7 @@ dcc_handle ()
{
if (FD_ISSET (ptr_dcc->sock, &read_fd))
{
+ ptr_dcc->last_activity = time (NULL);
length = sizeof (addr);
sock = accept (ptr_dcc->sock, (struct sockaddr *) &addr, &length);
close (ptr_dcc->sock);
@@ -866,14 +887,14 @@ dcc_handle ()
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
ptr_dcc->sock = sock;
if (fcntl (ptr_dcc->sock, F_SETFL, O_NONBLOCK) == -1)
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
ptr_dcc->addr = ntohl (addr.sin_addr.s_addr);
ptr_dcc->status = DCC_ACTIVE;
@@ -907,14 +928,14 @@ dcc_handle ()
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
ptr_dcc->sock = sock;
if (fcntl (ptr_dcc->sock, F_SETFL, O_NONBLOCK) == -1)
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
ptr_dcc->addr = ntohl (addr.sin_addr.s_addr);
ptr_dcc->status = DCC_ACTIVE;
@@ -950,15 +971,16 @@ dcc_handle ()
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
if (write (ptr_dcc->file, buffer, num_read) == -1)
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
+ ptr_dcc->last_activity = time (NULL);
ptr_dcc->pos += (unsigned long) num_read;
pos = htonl (ptr_dcc->pos);
send (ptr_dcc->sock, (char *) &pos, 4, 0);
@@ -983,7 +1005,7 @@ dcc_handle ()
sizeof (buffer));
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
if (ptr_dcc->pos > ptr_dcc->ack)
{
@@ -995,10 +1017,10 @@ dcc_handle ()
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
if (num_read < 4)
- return;
+ continue;
recv (ptr_dcc->sock, (char *) &pos, 4, 0);
ptr_dcc->ack = ntohl (pos);
@@ -1007,7 +1029,7 @@ dcc_handle ()
{
dcc_close (ptr_dcc, DCC_DONE);
dcc_redraw (1);
- return;
+ continue;
}
}
}
@@ -1019,15 +1041,16 @@ dcc_handle ()
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
num_sent = send (ptr_dcc->sock, buffer, num_read, 0);
if (num_sent < 0)
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
+ ptr_dcc->last_activity = time (NULL);
ptr_dcc->pos += (unsigned long) num_sent;
dcc_calculate_speed (ptr_dcc, 0);
dcc_redraw (0);
diff --git a/src/irc/irc.h b/src/irc/irc.h
index f010e58c3..fc379603e 100644
--- a/src/irc/irc.h
+++ b/src/irc/irc.h
@@ -98,7 +98,7 @@ struct t_irc_nick
int is_chanowner; /* chan owner? (specific to unrealircd) */
int is_chanadmin; /* chan admin? (specific to unrealircd) */
int is_op; /* operator privileges? */
- int is_halfop; /* half operaor privileges? */
+ int is_halfop; /* half operator privileges? */
int has_voice; /* nick has voice? */
int is_away; /* = 1 if nick is away, otherwise 0 */
int color; /* color for nickname in chat window */
@@ -245,6 +245,7 @@ struct t_irc_dcc
time_t last_check_time; /* last time we looked at bytes sent/rcv*/
unsigned long last_check_pos; /* bytes sent/recv at last check */
unsigned long bytes_per_sec; /* bytes per second */
+ time_t last_activity; /* time of last byte received/sent */
t_irc_dcc *prev_dcc; /* link to previous dcc file/chat */
t_irc_dcc *next_dcc; /* link to next dcc file/chat */
};
diff --git a/src/plugins/perl/wee-perl.c b/src/plugins/perl/wee-perl.c
index dc4aa27f7..18dc7614f 100644
--- a/src/plugins/perl/wee-perl.c
+++ b/src/plugins/perl/wee-perl.c
@@ -354,7 +354,7 @@ static XS (XS_IRC_add_command_handler)
static XS (XS_IRC_get_info)
{
- char *arg, *info = NULL, *server;
+ char *arg, *info = NULL, *server_name;
t_irc_server *ptr_server;
int integer;
dXSARGS;
@@ -364,13 +364,9 @@ static XS (XS_IRC_get_info)
if (items == 2)
{
- server = SvPV (ST (0), integer);
+ server_name = SvPV (ST (0), integer);
arg = SvPV (ST (1), integer);
- for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server)
- {
- if (strcasecmp (ptr_server->name, server) == 0)
- break;
- }
+ ptr_server = server_search (server_name);
if (!ptr_server)
{
irc_display_prefix (NULL, PREFIX_ERROR);
@@ -720,19 +716,18 @@ static XS (XS_weechat_get_info)
{
server_name = SvPV (ST (1), integer);
ptr_server = server_search (server_name);
+ 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;
+ }
}
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)
{
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 3be8ff0c3..75aab1732 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -5,7 +5,10 @@ ChangeLog - 2005-07-12
Versoin 0.1.4 (under dev!):
+ * added DCC timeout
* added function for Perl/Python to get DCC list
+ * fixed FIFO pipe (command now authorized on a buffer not connected
+ to an IRC server)
* topic completion now decodes UTF-8 string
* fixed bug with IRC URL on command line (irc://)
* new keyboard management: keys are setup in config file, new command
diff --git a/weechat/po/es.po b/weechat/po/es.po
index 89091d2a6..c30e66579 100644
--- a/weechat/po/es.po
+++ b/weechat/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.4-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-07-12 09:51+0200\n"
+"POT-Creation-Date: 2005-07-12 19:01+0200\n"
"PO-Revision-Date: 2005-07-11 23:57+0200\n"
"Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1627,7 +1627,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:1557 src/irc/irc-dcc.c:799
+#: src/irc/irc-recv.c:1557 src/irc/irc-dcc.c:808
#, c-format
msgid "Private %s> %s"
msgstr "Privado %s> %s"
@@ -1859,7 +1859,7 @@ msgstr "Abortado"
msgid "DCC: file "
msgstr "DCC: fichero "
-#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:454
+#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:463
msgid " (local filename: "
msgstr " (nombre de fichero local: "
@@ -1879,7 +1879,7 @@ msgstr ": ok!\n"
msgid "DCC chat closed with "
msgstr "DCC chat cerrada con "
-#: src/irc/irc-dcc.c:261
+#: src/irc/irc-dcc.c:269
#, c-format
msgid ""
"%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1888,74 +1888,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:271
+#: src/irc/irc-dcc.c:279
msgid "Connected to "
msgstr "Conectado al "
-#: src/irc/irc-dcc.c:280
+#: src/irc/irc-dcc.c:288
msgid "via DCC chat\n"
msgstr "con charla DCC\n"
-#: src/irc/irc-dcc.c:391
+#: src/irc/irc-dcc.c:399
#, 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:410
+#: src/irc/irc-dcc.c:418
msgid "DCC chat"
msgstr "Charla DCC"
-#: src/irc/irc-dcc.c:434
+#: src/irc/irc-dcc.c:443
msgid "Incoming DCC file from "
msgstr "Recibir fichero DCC de "
-#: src/irc/irc-dcc.c:445 src/irc/irc-dcc.c:458
+#: src/irc/irc-dcc.c:454 src/irc/irc-dcc.c:467
msgid " bytes\n"
msgstr " bytes\n"
-#: src/irc/irc-dcc.c:450
+#: src/irc/irc-dcc.c:459
msgid "Sending DCC file to "
msgstr "Enviar fichero DCC a "
-#: src/irc/irc-dcc.c:463
+#: src/irc/irc-dcc.c:472
msgid "Incoming DCC chat request from "
msgstr "Recibir DCC chat de "
-#: src/irc/irc-dcc.c:474
+#: src/irc/irc-dcc.c:483
msgid "Sending DCC chat request to "
msgstr "Enviar DCC chat a "
-#: src/irc/irc-dcc.c:538
+#: src/irc/irc-dcc.c:547
#, 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:560
+#: src/irc/irc-dcc.c:569
#, c-format
msgid "%s cannot access file \"%s\"\n"
msgstr "%s no es posible acceder al fichero \"%s\"\n"
-#: src/irc/irc-dcc.c:581
+#: src/irc/irc-dcc.c:590
#, 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:594
+#: src/irc/irc-dcc.c:603
#, 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:641
+#: src/irc/irc-dcc.c:650
#, c-format
msgid "%s cannot send DCC\n"
msgstr "%s no es posible enviar el DCC\n"
-#: src/irc/irc-dcc.c:720
+#: src/irc/irc-dcc.c:729
#, 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:980
+#: src/irc/irc-dcc.c:1002
#, c-format
msgid ""
"%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -1964,12 +1964,12 @@ 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:1054
+#: src/irc/irc-dcc.c:1077
#, c-format
msgid "Aborting active DCC: \"%s\" from %s\n"
msgstr "Abandonar el DCC activo: \"%s\" de %s\n"
-#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:468
+#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:463
#: src/plugins/python/wee-python.c:81
#, c-format
msgid ""
@@ -1979,13 +1979,13 @@ msgstr ""
"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:112 src/plugins/perl/wee-perl.c:492
+#: src/plugins/perl/wee-perl.c:112 src/plugins/perl/wee-perl.c:487
#: src/plugins/python/wee-python.c:105
#, c-format
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:119 src/plugins/perl/wee-perl.c:499
+#: src/plugins/perl/wee-perl.c:119 src/plugins/perl/wee-perl.c:494
#: src/plugins/python/wee-python.c:112
#, c-format
msgid "%s error: unable to load script \"%s\" (not enough memory)\n"
@@ -1993,10 +1993,10 @@ msgstr ""
"Error de %s: no ha sido posible cargar el script \"%s\" (memoria "
"insuficiente)\n"
-#: 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/perl/wee-perl.c:234 src/plugins/perl/wee-perl.c:520
+#: src/plugins/perl/wee-perl.c:568 src/plugins/perl/wee-perl.c:595
+#: src/plugins/perl/wee-perl.c:640 src/plugins/perl/wee-perl.c:670
+#: src/plugins/perl/wee-perl.c:710 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
@@ -2004,82 +2004,82 @@ msgstr ""
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:270 src/plugins/perl/wee-perl.c:378
-#: src/plugins/perl/wee-perl.c:732 src/plugins/python/wee-python.c:331
+#: src/plugins/perl/wee-perl.c:270 src/plugins/perl/wee-perl.c:374
+#: src/plugins/perl/wee-perl.c:723 src/plugins/python/wee-python.c:331
#, c-format
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:879 src/plugins/python/wee-python.c:408
+#: src/plugins/perl/wee-perl.c:873 src/plugins/python/wee-python.c:456
#, c-format
msgid "Loading %s module \"weechat\"\n"
msgstr "Cargando módulo %s \"weechat\"\n"
-#: src/plugins/perl/wee-perl.c:938
+#: src/plugins/perl/wee-perl.c:932
#, c-format
msgid "Perl error: %s"
msgstr "Error de Perl: %s"
-#: src/plugins/perl/wee-perl.c:948
+#: src/plugins/perl/wee-perl.c:942
#, c-format
msgid "%s error: too much values from \"%s\" (%d). Expected: 1.\n"
msgstr "Error de %s: demasiados valores desde \"%s\" (%d). Esperado: 1.\n"
-#: src/plugins/perl/wee-perl.c:970 src/plugins/perl/wee-perl.c:972
-#: src/plugins/python/wee-python.c:566 src/plugins/python/wee-python.c:568
+#: src/plugins/perl/wee-perl.c:964 src/plugins/perl/wee-perl.c:966
+#: src/plugins/python/wee-python.c:614 src/plugins/python/wee-python.c:616
#, c-format
msgid "Loading %s script \"%s\"\n"
msgstr "Cargando %s script \"%s\"\n"
-#: src/plugins/perl/wee-perl.c:1021 src/plugins/python/wee-python.c:637
+#: src/plugins/perl/wee-perl.c:1015 src/plugins/python/wee-python.c:685
#, c-format
msgid "Unloading %s script \"%s\"\n"
msgstr "Descarga del %s script \"%s\"\n"
-#: src/plugins/perl/wee-perl.c:1038 src/plugins/python/wee-python.c:654
+#: src/plugins/perl/wee-perl.c:1032 src/plugins/python/wee-python.c:702
#, c-format
msgid "Unloading all %s scripts...\n"
msgstr "Descargando todos los %s scripts...\n"
-#: src/plugins/perl/wee-perl.c:1043 src/plugins/python/wee-python.c:659
+#: src/plugins/perl/wee-perl.c:1037 src/plugins/python/wee-python.c:707
#, c-format
msgid "%s scripts unloaded\n"
msgstr "%s scripts descargados\n"
-#: src/plugins/python/wee-python.c:403
+#: src/plugins/python/wee-python.c:451
#, c-format
msgid "%s error: error while launching interpreter\n"
msgstr "%s error: error al lanzar el intérprete\n"
-#: src/plugins/python/wee-python.c:432
+#: src/plugins/python/wee-python.c:480
#, c-format
msgid "%s error: error while redirecting stdout and stderr\n"
msgstr "%s error: error al redireccionar stdout y stderr\n"
-#: src/plugins/python/wee-python.c:485 src/plugins/python/wee-python.c:513
-#: src/plugins/python/wee-python.c:545
+#: src/plugins/python/wee-python.c:533 src/plugins/python/wee-python.c:561
+#: src/plugins/python/wee-python.c:593
#, c-format
msgid "%s error: unable to run function \"%s\" in script (not enough memory)\n"
msgstr ""
"Error de %s: no ha sido posible cargar el script \"%s\" (memoria "
"insuficiente)\n"
-#: src/plugins/python/wee-python.c:535
+#: src/plugins/python/wee-python.c:583
#, c-format
msgid "%s error: error while running function \"%s\"\n"
msgstr "%s error: error al ejecutar la función \"%s\"\n"
-#: src/plugins/python/wee-python.c:574
+#: src/plugins/python/wee-python.c:622
#, c-format
msgid "%s error: error while opening file \"%s\"\n"
msgstr "%s error: error al abrir el fichero \"%s\"\n"
-#: src/plugins/python/wee-python.c:583
+#: src/plugins/python/wee-python.c:631
#, c-format
msgid "%s error: error while parsing file \"%s\"\n"
msgstr "%s error: error al comparar el fichero \"%s\"\n"
-#: src/plugins/python/wee-python.c:685
+#: src/plugins/python/wee-python.c:733
#, c-format
msgid "%s error: error while freeing interpreter\n"
msgstr "%s error: error al liberar el intérprete\n"
@@ -2096,7 +2096,7 @@ msgstr ""
"%s no ha sido posible añadir el manejador para el mensaje \"%s\" (memoria "
"insuficiente)\n"
-#: src/gui/curses/gui-input.c:298
+#: src/gui/curses/gui-input.c:300
#, c-format
msgid "%s lag is high, disconnecting from server...\n"
msgstr "%s el lag (retraso) es alto, desconectando del servidor...\n"
@@ -2162,15 +2162,15 @@ msgstr " [Q] Cerrar la vista DCC"
msgid "server"
msgstr "servidor"
-#: src/gui/gui-common.c:333
+#: src/gui/gui-common.c:334
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:508
+#: src/gui/gui-common.c:509
msgid "Not enough memory for new line\n"
msgstr "No hay suficiente memoria para una nueva línea\n"
-#: src/gui/gui-common.c:551
+#: src/gui/gui-common.c:552
msgid "Not enough memory for new message\n"
msgstr "No hay suficiente memoria para el mensaje de la barra de información\n"
@@ -2211,102 +2211,110 @@ msgid "delete next word"
msgstr "borrar la palabra siguiente"
#: src/gui/gui-keyboard.c:61
+msgid "paste current clipboard content"
+msgstr ""
+
+#: src/gui/gui-keyboard.c:63
+msgid "transpose chars"
+msgstr ""
+
+#: src/gui/gui-keyboard.c:65
msgid "go to beginning of line"
msgstr "ir al principio de línea"
-#: src/gui/gui-keyboard.c:63
+#: src/gui/gui-keyboard.c:67
msgid "go to end of line"
msgstr "ir al final de línea"
-#: src/gui/gui-keyboard.c:65
+#: src/gui/gui-keyboard.c:69
msgid "move one char left"
msgstr "mover un carácter a la izquierda"
-#: src/gui/gui-keyboard.c:67
+#: src/gui/gui-keyboard.c:71
msgid "move to previous word"
msgstr "mover a la palabra anterior"
-#: src/gui/gui-keyboard.c:69
+#: src/gui/gui-keyboard.c:73
msgid "move one char right"
msgstr "mover un carácter a la derecha"
-#: src/gui/gui-keyboard.c:71
+#: src/gui/gui-keyboard.c:75
msgid "move to next word"
msgstr "mover a la palabra siguiente"
-#: src/gui/gui-keyboard.c:73
+#: src/gui/gui-keyboard.c:77
msgid "call previous command in history"
msgstr "llamar al comando anterior en el historial"
-#: src/gui/gui-keyboard.c:75
+#: src/gui/gui-keyboard.c:79
msgid "call next command in history"
msgstr "llamar al comando siguiente en el historial"
-#: src/gui/gui-keyboard.c:77
+#: src/gui/gui-keyboard.c:81
msgid "scroll one page up"
msgstr "desplazarse una página hacia arriba"
-#: src/gui/gui-keyboard.c:79
+#: src/gui/gui-keyboard.c:83
msgid "scroll one page down"
msgstr "desplazarse una página hacia abajo"
-#: src/gui/gui-keyboard.c:81
+#: src/gui/gui-keyboard.c:85
msgid "clear infobar"
msgstr "limpiar barra de información"
-#: src/gui/gui-keyboard.c:83
+#: src/gui/gui-keyboard.c:87
msgid "scroll nicklist one page up"
msgstr "desplazar la lista de nicks una página hacia arriba"
-#: src/gui/gui-keyboard.c:85
+#: src/gui/gui-keyboard.c:89
msgid "scroll nicklist one page down"
msgstr "desplazar la lista de nicks una página hacia abajo"
-#: src/gui/gui-keyboard.c:87
+#: src/gui/gui-keyboard.c:91
msgid "display beginning of nicklist"
msgstr "mostrar el principio de la lista de nicks"
-#: src/gui/gui-keyboard.c:89
+#: src/gui/gui-keyboard.c:93
msgid "display end of nicklist"
msgstr "mostrar el final de la lista de nicks"
-#: src/gui/gui-keyboard.c:91
+#: src/gui/gui-keyboard.c:95
msgid "refresh screen"
msgstr "recargar la pantalla"
-#: src/gui/gui-keyboard.c:93
+#: src/gui/gui-keyboard.c:97
msgid "jump to buffer with activity"
msgstr "saltar al búfer con actividad"
-#: src/gui/gui-keyboard.c:95
+#: src/gui/gui-keyboard.c:99
msgid "jump to DCC buffer"
msgstr "saltar al búfer DCC"
-#: src/gui/gui-keyboard.c:97
+#: src/gui/gui-keyboard.c:101
msgid "jump to server buffer"
msgstr "saltar al búfer servidor"
-#: src/gui/gui-keyboard.c:99
+#: src/gui/gui-keyboard.c:103
msgid "jump to next server"
msgstr "saltar al servidor siguiente"
-#: src/gui/gui-keyboard.c:101
+#: src/gui/gui-keyboard.c:105
msgid "clear hotlist"
msgstr "limpiar hotlist"
-#: src/gui/gui-keyboard.c:399 src/common/command.c:1471
+#: src/gui/gui-keyboard.c:403 src/common/command.c:1471
#, c-format
msgid "%s unable to bind key \"%s\"\n"
msgstr "%s No ha sido posible atar la clave \"%s\"\n"
-#: src/gui/gui-keyboard.c:410
+#: src/gui/gui-keyboard.c:414
#, c-format
msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n"
msgstr ""
"%s No ha sido posible atar la clave \"%s\" (nombre de función inválido: \"%s"
"\")\n"
-#: src/gui/gui-keyboard.c:423
+#: src/gui/gui-keyboard.c:427
#, c-format
msgid "%s not enough memory for key binding\n"
msgstr "%s no hay suficiente memoria para atar la clave\n"
@@ -3011,32 +3019,27 @@ msgstr "%s no ha sido posible abrir la tubería FIFO (%s) para leer\n"
msgid "FIFO pipe is open\n"
msgstr "La tubería FIFO está abierta\n"
-#: src/common/fifo.c:121
-#, c-format
-msgid "%s invalid buffer for displaying text via FIFO pipe\n"
-msgstr "%s búfer inválido para mostrar texto mediante la tubería FIFO\n"
-
-#: src/common/fifo.c:132 src/common/fifo.c:178
+#: src/common/fifo.c:124
#, c-format
msgid "%s invalid text received on FIFO pipe\n"
msgstr "%s texto inválido recibido en la tubería FIFO\n"
-#: src/common/fifo.c:154
+#: src/common/fifo.c:146
#, c-format
msgid "%s server \"%s\" not found (FIFO pipe data)\n"
msgstr "%s servidor \"%s\" no encontrado (datos de la tubería FIFO)\n"
-#: src/common/fifo.c:166
+#: src/common/fifo.c:158
#, c-format
msgid "%s channel \"%s\" not found (FIFO pipe data)\n"
msgstr "%s canal \"%s\" no encontrado (datos de la tubería FIFO)\n"
-#: src/common/fifo.c:265 src/common/fifo.c:267
+#: src/common/fifo.c:249 src/common/fifo.c:251
#, c-format
msgid "%s error reading FIFO pipe, closing it\n"
msgstr "%s error al leer la tubería FIFO, cerrándola\n"
-#: src/common/fifo.c:309
+#: src/common/fifo.c:293
msgid "FIFO pipe is closed\n"
msgstr "La tubería FIFO está cerrada\n"
@@ -4143,3 +4146,6 @@ msgstr ""
#: src/common/weeconfig.c:1737
msgid "Saving config to disk\n"
msgstr "Guardar configuración a disco\n"
+
+#~ msgid "%s invalid buffer for displaying text via FIFO pipe\n"
+#~ msgstr "%s búfer inválido para mostrar texto mediante la tubería FIFO\n"
diff --git a/weechat/po/fr.po b/weechat/po/fr.po
index 8f780a047..37af0862d 100644
--- a/weechat/po/fr.po
+++ b/weechat/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.4-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-07-12 09:51+0200\n"
-"PO-Revision-Date: 2005-07-09 18:48+0200\n"
+"POT-Creation-Date: 2005-07-12 19:01+0200\n"
+"PO-Revision-Date: 2005-07-12 19:02+0200\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n"
@@ -1626,7 +1626,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:1557 src/irc/irc-dcc.c:799
+#: src/irc/irc-recv.c:1557 src/irc/irc-dcc.c:808
#, c-format
msgid "Private %s> %s"
msgstr "Prive %s> %s"
@@ -1858,7 +1858,7 @@ msgstr "Interrompu"
msgid "DCC: file "
msgstr "DCC: fichier "
-#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:454
+#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:463
msgid " (local filename: "
msgstr " (nom local: "
@@ -1878,7 +1878,7 @@ msgstr ": ok!\n"
msgid "DCC chat closed with "
msgstr "Discussion DCC fermée avec "
-#: src/irc/irc-dcc.c:261
+#: src/irc/irc-dcc.c:269
#, c-format
msgid ""
"%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1887,74 +1887,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:271
+#: src/irc/irc-dcc.c:279
msgid "Connected to "
msgstr "Connecté à "
-#: src/irc/irc-dcc.c:280
+#: src/irc/irc-dcc.c:288
msgid "via DCC chat\n"
msgstr "via une discussion DCC\n"
-#: src/irc/irc-dcc.c:391
+#: src/irc/irc-dcc.c:399
#, 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:410
+#: src/irc/irc-dcc.c:418
msgid "DCC chat"
msgstr "Discussion DCC"
-#: src/irc/irc-dcc.c:434
+#: src/irc/irc-dcc.c:443
msgid "Incoming DCC file from "
msgstr "Réception fichier DCC de "
-#: src/irc/irc-dcc.c:445 src/irc/irc-dcc.c:458
+#: src/irc/irc-dcc.c:454 src/irc/irc-dcc.c:467
msgid " bytes\n"
msgstr " octets\n"
-#: src/irc/irc-dcc.c:450
+#: src/irc/irc-dcc.c:459
msgid "Sending DCC file to "
msgstr "Envoi fichier DCC à "
-#: src/irc/irc-dcc.c:463
+#: src/irc/irc-dcc.c:472
msgid "Incoming DCC chat request from "
msgstr "Demande de discussion DCC reçue de "
-#: src/irc/irc-dcc.c:474
+#: src/irc/irc-dcc.c:483
msgid "Sending DCC chat request to "
msgstr "Envoi d'une demande discussion DCC à "
-#: src/irc/irc-dcc.c:538
+#: src/irc/irc-dcc.c:547
#, 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:560
+#: src/irc/irc-dcc.c:569
#, c-format
msgid "%s cannot access file \"%s\"\n"
msgstr "%s impossible d'accéder au fichier \"%s\"\n"
-#: src/irc/irc-dcc.c:581
+#: src/irc/irc-dcc.c:590
#, 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:594
+#: src/irc/irc-dcc.c:603
#, 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:641
+#: src/irc/irc-dcc.c:650
#, c-format
msgid "%s cannot send DCC\n"
msgstr "%s impossible d'envoyer le DCC\n"
-#: src/irc/irc-dcc.c:720
+#: src/irc/irc-dcc.c:729
#, 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:980
+#: src/irc/irc-dcc.c:1002
#, c-format
msgid ""
"%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -1963,12 +1963,12 @@ 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:1054
+#: src/irc/irc-dcc.c:1077
#, c-format
msgid "Aborting active DCC: \"%s\" from %s\n"
msgstr "Abandon du DCC actif: \"%s\" de %s\n"
-#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:468
+#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:463
#: src/plugins/python/wee-python.c:81
#, c-format
msgid ""
@@ -1978,23 +1978,23 @@ msgstr ""
"Erreur %s: impossible d'enregistrer le script \"%s\" (un autre script existe "
"déjà avec ce nom)\n"
-#: src/plugins/perl/wee-perl.c:112 src/plugins/perl/wee-perl.c:492
+#: src/plugins/perl/wee-perl.c:112 src/plugins/perl/wee-perl.c:487
#: src/plugins/python/wee-python.c:105
#, c-format
msgid "Registered %s script: \"%s\", version %s (%s)\n"
msgstr "Script %s enregistré: \"%s\", version %s (%s)\n"
-#: src/plugins/perl/wee-perl.c:119 src/plugins/perl/wee-perl.c:499
+#: src/plugins/perl/wee-perl.c:119 src/plugins/perl/wee-perl.c:494
#: src/plugins/python/wee-python.c:112
#, c-format
msgid "%s error: unable to load script \"%s\" (not enough memory)\n"
msgstr ""
"Erreur %s: impossible de charger le script \"%s\" (mémoire insuffisante)\n"
-#: 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/perl/wee-perl.c:234 src/plugins/perl/wee-perl.c:520
+#: src/plugins/perl/wee-perl.c:568 src/plugins/perl/wee-perl.c:595
+#: src/plugins/perl/wee-perl.c:640 src/plugins/perl/wee-perl.c:670
+#: src/plugins/perl/wee-perl.c:710 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
@@ -2002,82 +2002,82 @@ msgstr ""
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:270 src/plugins/perl/wee-perl.c:378
-#: src/plugins/perl/wee-perl.c:732 src/plugins/python/wee-python.c:331
+#: src/plugins/perl/wee-perl.c:270 src/plugins/perl/wee-perl.c:374
+#: src/plugins/perl/wee-perl.c:723 src/plugins/python/wee-python.c:331
#, c-format
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:879 src/plugins/python/wee-python.c:408
+#: src/plugins/perl/wee-perl.c:873 src/plugins/python/wee-python.c:456
#, c-format
msgid "Loading %s module \"weechat\"\n"
msgstr "Chargement du module %s \"weechat\"\n"
-#: src/plugins/perl/wee-perl.c:938
+#: src/plugins/perl/wee-perl.c:932
#, c-format
msgid "Perl error: %s"
msgstr "Erreur Perl: %s"
-#: src/plugins/perl/wee-perl.c:948
+#: src/plugins/perl/wee-perl.c:942
#, c-format
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:970 src/plugins/perl/wee-perl.c:972
-#: src/plugins/python/wee-python.c:566 src/plugins/python/wee-python.c:568
+#: src/plugins/perl/wee-perl.c:964 src/plugins/perl/wee-perl.c:966
+#: src/plugins/python/wee-python.c:614 src/plugins/python/wee-python.c:616
#, c-format
msgid "Loading %s script \"%s\"\n"
msgstr "Chargement du script %s \"%s\"\n"
-#: src/plugins/perl/wee-perl.c:1021 src/plugins/python/wee-python.c:637
+#: src/plugins/perl/wee-perl.c:1015 src/plugins/python/wee-python.c:685
#, c-format
msgid "Unloading %s script \"%s\"\n"
msgstr "Déchargement du script %s \"%s\"\n"
-#: src/plugins/perl/wee-perl.c:1038 src/plugins/python/wee-python.c:654
+#: src/plugins/perl/wee-perl.c:1032 src/plugins/python/wee-python.c:702
#, c-format
msgid "Unloading all %s scripts...\n"
msgstr "Déchargement de tous les scripts %s...\n"
-#: src/plugins/perl/wee-perl.c:1043 src/plugins/python/wee-python.c:659
+#: src/plugins/perl/wee-perl.c:1037 src/plugins/python/wee-python.c:707
#, c-format
msgid "%s scripts unloaded\n"
msgstr "Scripts %s déchargés\n"
-#: src/plugins/python/wee-python.c:403
+#: src/plugins/python/wee-python.c:451
#, c-format
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:432
+#: src/plugins/python/wee-python.c:480
#, c-format
msgid "%s error: error while redirecting stdout and stderr\n"
msgstr "Erreur %s: erreur en redirection de stdout et stderr\n"
-#: src/plugins/python/wee-python.c:485 src/plugins/python/wee-python.c:513
-#: src/plugins/python/wee-python.c:545
+#: src/plugins/python/wee-python.c:533 src/plugins/python/wee-python.c:561
+#: src/plugins/python/wee-python.c:593
#, c-format
msgid "%s error: unable to run function \"%s\" in script (not enough memory)\n"
msgstr ""
"Erreur %s: impossible d'exécuter la fonction \"%s\" dans le script (mémoire "
"insuffisante)\n"
-#: src/plugins/python/wee-python.c:535
+#: src/plugins/python/wee-python.c:583
#, c-format
msgid "%s error: error while running function \"%s\"\n"
msgstr "Erreur %s: erreur dans la fonction \"%s\"\n"
-#: src/plugins/python/wee-python.c:574
+#: src/plugins/python/wee-python.c:622
#, c-format
msgid "%s error: error while opening file \"%s\"\n"
msgstr "Erreur %s: erreur à l'ouverture du fichier \"%s\"\n"
-#: src/plugins/python/wee-python.c:583
+#: src/plugins/python/wee-python.c:631
#, c-format
msgid "%s error: error while parsing file \"%s\"\n"
msgstr "Erreur %s: erreur en analysant le fichier \"%s\"\n"
-#: src/plugins/python/wee-python.c:685
+#: src/plugins/python/wee-python.c:733
#, c-format
msgid "%s error: error while freeing interpreter\n"
msgstr "Erreur %s: impossible de libérer l'interpréteur\n"
@@ -2094,7 +2094,7 @@ msgstr ""
"%s impossible d'ajouter la fonction pour le message \"%s\" (mémoire "
"insuffisante)\n"
-#: src/gui/curses/gui-input.c:298
+#: src/gui/curses/gui-input.c:300
#, c-format
msgid "%s lag is high, disconnecting from server...\n"
msgstr "%s le lag est élevé, déconnexion du serveur...\n"
@@ -2160,15 +2160,15 @@ msgstr " [Q] Fermer la vue DCC"
msgid "server"
msgstr "serveur"
-#: src/gui/gui-common.c:333
+#: src/gui/gui-common.c:334
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:508
+#: src/gui/gui-common.c:509
msgid "Not enough memory for new line\n"
msgstr "Pas assez de mémoire pour une nouvelle ligne !\n"
-#: src/gui/gui-common.c:551
+#: src/gui/gui-common.c:552
msgid "Not enough memory for new message\n"
msgstr "Pas assez de mémoire pour un message de la barre d'infos\n"
@@ -2209,101 +2209,109 @@ msgid "delete next word"
msgstr "effacer le mot suivant"
#: src/gui/gui-keyboard.c:61
+msgid "paste current clipboard content"
+msgstr "coller le contenu du presse-papier"
+
+#: src/gui/gui-keyboard.c:63
+msgid "transpose chars"
+msgstr "inverser les caractères"
+
+#: src/gui/gui-keyboard.c:65
msgid "go to beginning of line"
msgstr "aller au début de la ligne"
-#: src/gui/gui-keyboard.c:63
+#: src/gui/gui-keyboard.c:67
msgid "go to end of line"
msgstr "aller à la fin de la ligne"
-#: src/gui/gui-keyboard.c:65
+#: src/gui/gui-keyboard.c:69
msgid "move one char left"
msgstr "se déplacer d'un caractère à gauche"
-#: src/gui/gui-keyboard.c:67
+#: src/gui/gui-keyboard.c:71
msgid "move to previous word"
msgstr "se déplacer au mot précédent"
-#: src/gui/gui-keyboard.c:69
+#: src/gui/gui-keyboard.c:73
msgid "move one char right"
msgstr "se déplacer d'un caractère à droite"
-#: src/gui/gui-keyboard.c:71
+#: src/gui/gui-keyboard.c:75
msgid "move to next word"
msgstr "se déplacer au mot suivant"
-#: src/gui/gui-keyboard.c:73
+#: src/gui/gui-keyboard.c:77
msgid "call previous command in history"
msgstr "appeler la commande précédente dans l'historique"
-#: src/gui/gui-keyboard.c:75
+#: src/gui/gui-keyboard.c:79
msgid "call next command in history"
msgstr "appeler la commande suivante dans l'historique"
-#: src/gui/gui-keyboard.c:77
+#: src/gui/gui-keyboard.c:81
msgid "scroll one page up"
msgstr "faire défiler d'une page vers le haut"
-#: src/gui/gui-keyboard.c:79
+#: src/gui/gui-keyboard.c:83
msgid "scroll one page down"
msgstr "faire défiler d'une page vers le bas"
-#: src/gui/gui-keyboard.c:81
+#: src/gui/gui-keyboard.c:85
msgid "clear infobar"
msgstr "effacer la barre d'infos"
-#: src/gui/gui-keyboard.c:83
+#: src/gui/gui-keyboard.c:87
msgid "scroll nicklist one page up"
msgstr "faire défiler la liste des pseudos d'une page vers le haut"
-#: src/gui/gui-keyboard.c:85
+#: src/gui/gui-keyboard.c:89
msgid "scroll nicklist one page down"
msgstr "faire défiler la liste des pseudos d'une page vers le bas"
-#: src/gui/gui-keyboard.c:87
+#: src/gui/gui-keyboard.c:91
msgid "display beginning of nicklist"
msgstr "afficher le début de la liste des pseudos"
-#: src/gui/gui-keyboard.c:89
+#: src/gui/gui-keyboard.c:93
msgid "display end of nicklist"
msgstr "afficher la fin de la liste des pseudos"
-#: src/gui/gui-keyboard.c:91
+#: src/gui/gui-keyboard.c:95
msgid "refresh screen"
msgstr "rafraichir l'écran"
-#: src/gui/gui-keyboard.c:93
+#: src/gui/gui-keyboard.c:97
msgid "jump to buffer with activity"
msgstr "sauter au tampon avec de l'activité"
-#: src/gui/gui-keyboard.c:95
+#: src/gui/gui-keyboard.c:99
msgid "jump to DCC buffer"
msgstr "sauter au tampon DCC"
-#: src/gui/gui-keyboard.c:97
+#: src/gui/gui-keyboard.c:101
msgid "jump to server buffer"
msgstr "sauter au tampon du serveur"
-#: src/gui/gui-keyboard.c:99
+#: src/gui/gui-keyboard.c:103
msgid "jump to next server"
msgstr "sauter au prochain serveur"
-#: src/gui/gui-keyboard.c:101
+#: src/gui/gui-keyboard.c:105
msgid "clear hotlist"
msgstr "effacer la liste d'activité"
-#: src/gui/gui-keyboard.c:399 src/common/command.c:1471
+#: src/gui/gui-keyboard.c:403 src/common/command.c:1471
#, c-format
msgid "%s unable to bind key \"%s\"\n"
msgstr "%s impossible de créer la touche \"%s\"\n"
-#: src/gui/gui-keyboard.c:410
+#: src/gui/gui-keyboard.c:414
#, c-format
msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n"
msgstr ""
"%s impossible de créer la touche \"%s\" (nom fonction incorrect: \"%s\")\n"
-#: src/gui/gui-keyboard.c:423
+#: src/gui/gui-keyboard.c:427
#, c-format
msgid "%s not enough memory for key binding\n"
msgstr "%s pas assez de mémoire pour la touche\n"
@@ -3003,32 +3011,27 @@ msgstr "%s impossible d'ouvrir le tube FIFO (%s) en lecture\n"
msgid "FIFO pipe is open\n"
msgstr "Le tube FIFO est ouvert\n"
-#: src/common/fifo.c:121
-#, c-format
-msgid "%s invalid buffer for displaying text via FIFO pipe\n"
-msgstr "%s tampon invalide pour afficher le texte via le tube FIFO\n"
-
-#: src/common/fifo.c:132 src/common/fifo.c:178
+#: src/common/fifo.c:124
#, c-format
msgid "%s invalid text received on FIFO pipe\n"
msgstr "%s texte invalide reçu sur le tube FIFO\n"
-#: src/common/fifo.c:154
+#: src/common/fifo.c:146
#, c-format
msgid "%s server \"%s\" not found (FIFO pipe data)\n"
msgstr "%s serveur \"%s\" non trouvé (données du tube FIFO)\n"
-#: src/common/fifo.c:166
+#: src/common/fifo.c:158
#, c-format
msgid "%s channel \"%s\" not found (FIFO pipe data)\n"
msgstr "%s canal \"%s\" non trouvé (données du tube FIFO)\n"
-#: src/common/fifo.c:265 src/common/fifo.c:267
+#: src/common/fifo.c:249 src/common/fifo.c:251
#, c-format
msgid "%s error reading FIFO pipe, closing it\n"
msgstr "%s erreur en lecture du tube FIFO, fermeture\n"
-#: src/common/fifo.c:309
+#: src/common/fifo.c:293
msgid "FIFO pipe is closed\n"
msgstr "Le tube FIFO est fermé\n"
@@ -4135,6 +4138,9 @@ msgstr ""
msgid "Saving config to disk\n"
msgstr "Sauvegarde de la configuration sur disque\n"
+#~ msgid "%s invalid buffer for displaying text via FIFO pipe\n"
+#~ msgstr "%s tampon invalide pour afficher le texte via le tube FIFO\n"
+
#~ msgid "%d:[not connected] "
#~ msgstr "%d:[non connecté] "
diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot
index b90c32e31..86af75d5e 100644
--- a/weechat/po/weechat.pot
+++ b/weechat/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-07-12 09:51+0200\n"
+"POT-Creation-Date: 2005-07-12 19:01+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"
@@ -1513,7 +1513,7 @@ msgstr ""
msgid "%s unknown DCC CHAT type received from "
msgstr ""
-#: src/irc/irc-recv.c:1557 src/irc/irc-dcc.c:799
+#: src/irc/irc-recv.c:1557 src/irc/irc-dcc.c:808
#, c-format
msgid "Private %s> %s"
msgstr ""
@@ -1736,7 +1736,7 @@ msgstr ""
msgid "DCC: file "
msgstr ""
-#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:454
+#: src/irc/irc-dcc.c:195 src/irc/irc-dcc.c:463
msgid " (local filename: "
msgstr ""
@@ -1756,93 +1756,93 @@ msgstr ""
msgid "DCC chat closed with "
msgstr ""
-#: src/irc/irc-dcc.c:261
+#: src/irc/irc-dcc.c:269
#, 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:271
+#: src/irc/irc-dcc.c:279
msgid "Connected to "
msgstr ""
-#: src/irc/irc-dcc.c:280
+#: src/irc/irc-dcc.c:288
msgid "via DCC chat\n"
msgstr ""
-#: src/irc/irc-dcc.c:391
+#: src/irc/irc-dcc.c:399
#, c-format
msgid "%s not enough memory for new DCC\n"
msgstr ""
-#: src/irc/irc-dcc.c:410
+#: src/irc/irc-dcc.c:418
msgid "DCC chat"
msgstr ""
-#: src/irc/irc-dcc.c:434
+#: src/irc/irc-dcc.c:443
msgid "Incoming DCC file from "
msgstr ""
-#: src/irc/irc-dcc.c:445 src/irc/irc-dcc.c:458
+#: src/irc/irc-dcc.c:454 src/irc/irc-dcc.c:467
msgid " bytes\n"
msgstr ""
-#: src/irc/irc-dcc.c:450
+#: src/irc/irc-dcc.c:459
msgid "Sending DCC file to "
msgstr ""
-#: src/irc/irc-dcc.c:463
+#: src/irc/irc-dcc.c:472
msgid "Incoming DCC chat request from "
msgstr ""
-#: src/irc/irc-dcc.c:474
+#: src/irc/irc-dcc.c:483
msgid "Sending DCC chat request to "
msgstr ""
-#: src/irc/irc-dcc.c:538
+#: src/irc/irc-dcc.c:547
#, c-format
msgid "%s not enough memory for DCC SEND\n"
msgstr ""
-#: src/irc/irc-dcc.c:560
+#: src/irc/irc-dcc.c:569
#, c-format
msgid "%s cannot access file \"%s\"\n"
msgstr ""
-#: src/irc/irc-dcc.c:581
+#: src/irc/irc-dcc.c:590
#, c-format
msgid "%s cannot create socket for DCC\n"
msgstr ""
-#: src/irc/irc-dcc.c:594
+#: src/irc/irc-dcc.c:603
#, c-format
msgid "%s cannot find port for DCC\n"
msgstr ""
-#: src/irc/irc-dcc.c:641
+#: src/irc/irc-dcc.c:650
#, c-format
msgid "%s cannot send DCC\n"
msgstr ""
-#: src/irc/irc-dcc.c:720
+#: src/irc/irc-dcc.c:729
#, c-format
msgid "%s error sending data to \"%s\" via DCC CHAT\n"
msgstr ""
-#: src/irc/irc-dcc.c:980
+#: src/irc/irc-dcc.c:1002
#, 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:1054
+#: src/irc/irc-dcc.c:1077
#, c-format
msgid "Aborting active DCC: \"%s\" from %s\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:468
+#: src/plugins/perl/wee-perl.c:88 src/plugins/perl/wee-perl.c:463
#: src/plugins/python/wee-python.c:81
#, c-format
msgid ""
@@ -1850,22 +1850,22 @@ msgid ""
"with this name)\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:112 src/plugins/perl/wee-perl.c:492
+#: src/plugins/perl/wee-perl.c:112 src/plugins/perl/wee-perl.c:487
#: src/plugins/python/wee-python.c:105
#, c-format
msgid "Registered %s script: \"%s\", version %s (%s)\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:119 src/plugins/perl/wee-perl.c:499
+#: src/plugins/perl/wee-perl.c:119 src/plugins/perl/wee-perl.c:494
#: src/plugins/python/wee-python.c:112
#, c-format
msgid "%s error: unable to load script \"%s\" (not enough memory)\n"
msgstr ""
-#: 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/perl/wee-perl.c:234 src/plugins/perl/wee-perl.c:520
+#: src/plugins/perl/wee-perl.c:568 src/plugins/perl/wee-perl.c:595
+#: src/plugins/perl/wee-perl.c:640 src/plugins/perl/wee-perl.c:670
+#: src/plugins/perl/wee-perl.c:710 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
@@ -1873,80 +1873,80 @@ msgstr ""
msgid "%s error: wrong parameters for \"%s\" function\n"
msgstr ""
-#: 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
+#: src/plugins/perl/wee-perl.c:270 src/plugins/perl/wee-perl.c:374
+#: src/plugins/perl/wee-perl.c:723 src/plugins/python/wee-python.c:331
#, c-format
msgid "%s error: server not found for \"%s\" function\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:879 src/plugins/python/wee-python.c:408
+#: src/plugins/perl/wee-perl.c:873 src/plugins/python/wee-python.c:456
#, c-format
msgid "Loading %s module \"weechat\"\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:938
+#: src/plugins/perl/wee-perl.c:932
#, c-format
msgid "Perl error: %s"
msgstr ""
-#: src/plugins/perl/wee-perl.c:948
+#: src/plugins/perl/wee-perl.c:942
#, c-format
msgid "%s error: too much values from \"%s\" (%d). Expected: 1.\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:970 src/plugins/perl/wee-perl.c:972
-#: src/plugins/python/wee-python.c:566 src/plugins/python/wee-python.c:568
+#: src/plugins/perl/wee-perl.c:964 src/plugins/perl/wee-perl.c:966
+#: src/plugins/python/wee-python.c:614 src/plugins/python/wee-python.c:616
#, c-format
msgid "Loading %s script \"%s\"\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:1021 src/plugins/python/wee-python.c:637
+#: src/plugins/perl/wee-perl.c:1015 src/plugins/python/wee-python.c:685
#, c-format
msgid "Unloading %s script \"%s\"\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:1038 src/plugins/python/wee-python.c:654
+#: src/plugins/perl/wee-perl.c:1032 src/plugins/python/wee-python.c:702
#, c-format
msgid "Unloading all %s scripts...\n"
msgstr ""
-#: src/plugins/perl/wee-perl.c:1043 src/plugins/python/wee-python.c:659
+#: src/plugins/perl/wee-perl.c:1037 src/plugins/python/wee-python.c:707
#, c-format
msgid "%s scripts unloaded\n"
msgstr ""
-#: src/plugins/python/wee-python.c:403
+#: src/plugins/python/wee-python.c:451
#, c-format
msgid "%s error: error while launching interpreter\n"
msgstr ""
-#: src/plugins/python/wee-python.c:432
+#: src/plugins/python/wee-python.c:480
#, c-format
msgid "%s error: error while redirecting stdout and stderr\n"
msgstr ""
-#: src/plugins/python/wee-python.c:485 src/plugins/python/wee-python.c:513
-#: src/plugins/python/wee-python.c:545
+#: src/plugins/python/wee-python.c:533 src/plugins/python/wee-python.c:561
+#: src/plugins/python/wee-python.c:593
#, c-format
msgid "%s error: unable to run function \"%s\" in script (not enough memory)\n"
msgstr ""
-#: src/plugins/python/wee-python.c:535
+#: src/plugins/python/wee-python.c:583
#, c-format
msgid "%s error: error while running function \"%s\"\n"
msgstr ""
-#: src/plugins/python/wee-python.c:574
+#: src/plugins/python/wee-python.c:622
#, c-format
msgid "%s error: error while opening file \"%s\"\n"
msgstr ""
-#: src/plugins/python/wee-python.c:583
+#: src/plugins/python/wee-python.c:631
#, c-format
msgid "%s error: error while parsing file \"%s\"\n"
msgstr ""
-#: src/plugins/python/wee-python.c:685
+#: src/plugins/python/wee-python.c:733
#, c-format
msgid "%s error: error while freeing interpreter\n"
msgstr ""
@@ -1961,7 +1961,7 @@ msgstr ""
msgid "%s unable to add handler for \"%s\" message (not enough memory)\n"
msgstr ""
-#: src/gui/curses/gui-input.c:298
+#: src/gui/curses/gui-input.c:300
#, c-format
msgid "%s lag is high, disconnecting from server...\n"
msgstr ""
@@ -2027,15 +2027,15 @@ msgstr ""
msgid "server"
msgstr ""
-#: src/gui/gui-common.c:333
+#: src/gui/gui-common.c:334
msgid "Not enough memory for infobar message\n"
msgstr ""
-#: src/gui/gui-common.c:508
+#: src/gui/gui-common.c:509
msgid "Not enough memory for new line\n"
msgstr ""
-#: src/gui/gui-common.c:551
+#: src/gui/gui-common.c:552
msgid "Not enough memory for new message\n"
msgstr ""
@@ -2076,100 +2076,108 @@ msgid "delete next word"
msgstr ""
#: src/gui/gui-keyboard.c:61
-msgid "go to beginning of line"
+msgid "paste current clipboard content"
msgstr ""
#: src/gui/gui-keyboard.c:63
-msgid "go to end of line"
+msgid "transpose chars"
msgstr ""
#: src/gui/gui-keyboard.c:65
-msgid "move one char left"
+msgid "go to beginning of line"
msgstr ""
#: src/gui/gui-keyboard.c:67
-msgid "move to previous word"
+msgid "go to end of line"
msgstr ""
#: src/gui/gui-keyboard.c:69
-msgid "move one char right"
+msgid "move one char left"
msgstr ""
#: src/gui/gui-keyboard.c:71
-msgid "move to next word"
+msgid "move to previous word"
msgstr ""
#: src/gui/gui-keyboard.c:73
-msgid "call previous command in history"
+msgid "move one char right"
msgstr ""
#: src/gui/gui-keyboard.c:75
-msgid "call next command in history"
+msgid "move to next word"
msgstr ""
#: src/gui/gui-keyboard.c:77
-msgid "scroll one page up"
+msgid "call previous command in history"
msgstr ""
#: src/gui/gui-keyboard.c:79
-msgid "scroll one page down"
+msgid "call next command in history"
msgstr ""
#: src/gui/gui-keyboard.c:81
-msgid "clear infobar"
+msgid "scroll one page up"
msgstr ""
#: src/gui/gui-keyboard.c:83
-msgid "scroll nicklist one page up"
+msgid "scroll one page down"
msgstr ""
#: src/gui/gui-keyboard.c:85
-msgid "scroll nicklist one page down"
+msgid "clear infobar"
msgstr ""
#: src/gui/gui-keyboard.c:87
-msgid "display beginning of nicklist"
+msgid "scroll nicklist one page up"
msgstr ""
#: src/gui/gui-keyboard.c:89
-msgid "display end of nicklist"
+msgid "scroll nicklist one page down"
msgstr ""
#: src/gui/gui-keyboard.c:91
-msgid "refresh screen"
+msgid "display beginning of nicklist"
msgstr ""
#: src/gui/gui-keyboard.c:93
-msgid "jump to buffer with activity"
+msgid "display end of nicklist"
msgstr ""
#: src/gui/gui-keyboard.c:95
-msgid "jump to DCC buffer"
+msgid "refresh screen"
msgstr ""
#: src/gui/gui-keyboard.c:97
-msgid "jump to server buffer"
+msgid "jump to buffer with activity"
msgstr ""
#: src/gui/gui-keyboard.c:99
-msgid "jump to next server"
+msgid "jump to DCC buffer"
msgstr ""
#: src/gui/gui-keyboard.c:101
+msgid "jump to server buffer"
+msgstr ""
+
+#: src/gui/gui-keyboard.c:103
+msgid "jump to next server"
+msgstr ""
+
+#: src/gui/gui-keyboard.c:105
msgid "clear hotlist"
msgstr ""
-#: src/gui/gui-keyboard.c:399 src/common/command.c:1471
+#: src/gui/gui-keyboard.c:403 src/common/command.c:1471
#, c-format
msgid "%s unable to bind key \"%s\"\n"
msgstr ""
-#: src/gui/gui-keyboard.c:410
+#: src/gui/gui-keyboard.c:414
#, c-format
msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n"
msgstr ""
-#: src/gui/gui-keyboard.c:423
+#: src/gui/gui-keyboard.c:427
#, c-format
msgid "%s not enough memory for key binding\n"
msgstr ""
@@ -2800,32 +2808,27 @@ msgstr ""
msgid "FIFO pipe is open\n"
msgstr ""
-#: src/common/fifo.c:121
-#, c-format
-msgid "%s invalid buffer for displaying text via FIFO pipe\n"
-msgstr ""
-
-#: src/common/fifo.c:132 src/common/fifo.c:178
+#: src/common/fifo.c:124
#, c-format
msgid "%s invalid text received on FIFO pipe\n"
msgstr ""
-#: src/common/fifo.c:154
+#: src/common/fifo.c:146
#, c-format
msgid "%s server \"%s\" not found (FIFO pipe data)\n"
msgstr ""
-#: src/common/fifo.c:166
+#: src/common/fifo.c:158
#, c-format
msgid "%s channel \"%s\" not found (FIFO pipe data)\n"
msgstr ""
-#: src/common/fifo.c:265 src/common/fifo.c:267
+#: src/common/fifo.c:249 src/common/fifo.c:251
#, c-format
msgid "%s error reading FIFO pipe, closing it\n"
msgstr ""
-#: src/common/fifo.c:309
+#: src/common/fifo.c:293
msgid "FIFO pipe is closed\n"
msgstr ""
diff --git a/weechat/src/common/fifo.c b/weechat/src/common/fifo.c
index 94ebce332..ec9ff701e 100644
--- a/weechat/src/common/fifo.c
+++ b/weechat/src/common/fifo.c
@@ -112,16 +112,8 @@ fifo_exec (char *text)
if (text[0] == '*')
{
pos_msg = text + 1;
- ptr_server = SERVER(gui_current_window->buffer);
- ptr_buffer = gui_current_window->buffer;
-
- if (!ptr_server)
- {
- irc_display_prefix (NULL, PREFIX_ERROR);
- gui_printf (NULL, _("%s invalid buffer for displaying text via FIFO pipe\n"),
- WEECHAT_WARNING);
- return;
- }
+ ptr_buffer = (gui_current_window->buffer->dcc) ? gui_buffers : gui_current_window->buffer;
+ ptr_server = SERVER(ptr_buffer);
}
else
{
@@ -172,20 +164,12 @@ fifo_exec (char *text)
}
}
- if (!ptr_server)
- {
- irc_display_prefix (NULL, PREFIX_ERROR);
- gui_printf (NULL, _("%s invalid text received on FIFO pipe\n"),
- WEECHAT_WARNING);
- return;
- }
-
if (!ptr_buffer)
{
if (ptr_channel)
ptr_buffer = ptr_channel->buffer;
else
- ptr_buffer = ptr_server->buffer;
+ ptr_buffer = gui_buffers;
}
user_command (ptr_server, ptr_buffer, pos_msg);
diff --git a/weechat/src/irc/irc-dcc.c b/weechat/src/irc/irc-dcc.c
index b2344ac3a..4dc9fc511 100644
--- a/weechat/src/irc/irc-dcc.c
+++ b/weechat/src/irc/irc-dcc.c
@@ -229,6 +229,14 @@ dcc_close (t_irc_dcc *ptr_dcc, int status)
}
}
+ /* remove empty file if received file failed and nothing was transfered */
+ if (((status == DCC_FAILED) || (status == DCC_ABORTED))
+ && DCC_IS_FILE(ptr_dcc->type)
+ && DCC_IS_RECV(ptr_dcc->type)
+ && ptr_dcc->local_filename
+ && ptr_dcc->pos == 0)
+ unlink (ptr_dcc->local_filename);
+
if (DCC_IS_CHAT(ptr_dcc->type))
channel_remove_dcc (ptr_dcc);
@@ -418,6 +426,7 @@ dcc_add (t_irc_server *server, int type, unsigned long addr, int port, char *nic
new_dcc->last_check_time = 0;
new_dcc->last_check_pos = 0;
new_dcc->bytes_per_sec = 0;
+ new_dcc->last_activity = time (NULL);
new_dcc->prev_dcc = NULL;
new_dcc->next_dcc = dcc_list;
if (dcc_list)
@@ -844,6 +853,17 @@ dcc_handle ()
for (ptr_dcc = dcc_list; ptr_dcc; ptr_dcc = ptr_dcc->next_dcc)
{
+ /* check DCC timeout */
+ if (DCC_IS_FILE(ptr_dcc->type) && !DCC_ENDED(ptr_dcc->status))
+ {
+ if ((cfg_dcc_timeout != 0) && (time (NULL) > ptr_dcc->last_activity + cfg_dcc_timeout))
+ {
+ dcc_close (ptr_dcc, DCC_FAILED);
+ dcc_redraw (1);
+ continue;
+ }
+ }
+
if (ptr_dcc->status == DCC_CONNECTING)
{
if (ptr_dcc->type == DCC_FILE_SEND)
@@ -858,6 +878,7 @@ dcc_handle ()
{
if (FD_ISSET (ptr_dcc->sock, &read_fd))
{
+ ptr_dcc->last_activity = time (NULL);
length = sizeof (addr);
sock = accept (ptr_dcc->sock, (struct sockaddr *) &addr, &length);
close (ptr_dcc->sock);
@@ -866,14 +887,14 @@ dcc_handle ()
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
ptr_dcc->sock = sock;
if (fcntl (ptr_dcc->sock, F_SETFL, O_NONBLOCK) == -1)
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
ptr_dcc->addr = ntohl (addr.sin_addr.s_addr);
ptr_dcc->status = DCC_ACTIVE;
@@ -907,14 +928,14 @@ dcc_handle ()
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
ptr_dcc->sock = sock;
if (fcntl (ptr_dcc->sock, F_SETFL, O_NONBLOCK) == -1)
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
ptr_dcc->addr = ntohl (addr.sin_addr.s_addr);
ptr_dcc->status = DCC_ACTIVE;
@@ -950,15 +971,16 @@ dcc_handle ()
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
if (write (ptr_dcc->file, buffer, num_read) == -1)
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
+ ptr_dcc->last_activity = time (NULL);
ptr_dcc->pos += (unsigned long) num_read;
pos = htonl (ptr_dcc->pos);
send (ptr_dcc->sock, (char *) &pos, 4, 0);
@@ -983,7 +1005,7 @@ dcc_handle ()
sizeof (buffer));
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
if (ptr_dcc->pos > ptr_dcc->ack)
{
@@ -995,10 +1017,10 @@ dcc_handle ()
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
if (num_read < 4)
- return;
+ continue;
recv (ptr_dcc->sock, (char *) &pos, 4, 0);
ptr_dcc->ack = ntohl (pos);
@@ -1007,7 +1029,7 @@ dcc_handle ()
{
dcc_close (ptr_dcc, DCC_DONE);
dcc_redraw (1);
- return;
+ continue;
}
}
}
@@ -1019,15 +1041,16 @@ dcc_handle ()
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
num_sent = send (ptr_dcc->sock, buffer, num_read, 0);
if (num_sent < 0)
{
dcc_close (ptr_dcc, DCC_FAILED);
dcc_redraw (1);
- return;
+ continue;
}
+ ptr_dcc->last_activity = time (NULL);
ptr_dcc->pos += (unsigned long) num_sent;
dcc_calculate_speed (ptr_dcc, 0);
dcc_redraw (0);
diff --git a/weechat/src/irc/irc.h b/weechat/src/irc/irc.h
index f010e58c3..fc379603e 100644
--- a/weechat/src/irc/irc.h
+++ b/weechat/src/irc/irc.h
@@ -98,7 +98,7 @@ struct t_irc_nick
int is_chanowner; /* chan owner? (specific to unrealircd) */
int is_chanadmin; /* chan admin? (specific to unrealircd) */
int is_op; /* operator privileges? */
- int is_halfop; /* half operaor privileges? */
+ int is_halfop; /* half operator privileges? */
int has_voice; /* nick has voice? */
int is_away; /* = 1 if nick is away, otherwise 0 */
int color; /* color for nickname in chat window */
@@ -245,6 +245,7 @@ struct t_irc_dcc
time_t last_check_time; /* last time we looked at bytes sent/rcv*/
unsigned long last_check_pos; /* bytes sent/recv at last check */
unsigned long bytes_per_sec; /* bytes per second */
+ time_t last_activity; /* time of last byte received/sent */
t_irc_dcc *prev_dcc; /* link to previous dcc file/chat */
t_irc_dcc *next_dcc; /* link to next dcc file/chat */
};
diff --git a/weechat/src/plugins/perl/wee-perl.c b/weechat/src/plugins/perl/wee-perl.c
index dc4aa27f7..18dc7614f 100644
--- a/weechat/src/plugins/perl/wee-perl.c
+++ b/weechat/src/plugins/perl/wee-perl.c
@@ -354,7 +354,7 @@ static XS (XS_IRC_add_command_handler)
static XS (XS_IRC_get_info)
{
- char *arg, *info = NULL, *server;
+ char *arg, *info = NULL, *server_name;
t_irc_server *ptr_server;
int integer;
dXSARGS;
@@ -364,13 +364,9 @@ static XS (XS_IRC_get_info)
if (items == 2)
{
- server = SvPV (ST (0), integer);
+ server_name = SvPV (ST (0), integer);
arg = SvPV (ST (1), integer);
- for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server)
- {
- if (strcasecmp (ptr_server->name, server) == 0)
- break;
- }
+ ptr_server = server_search (server_name);
if (!ptr_server)
{
irc_display_prefix (NULL, PREFIX_ERROR);
@@ -720,19 +716,18 @@ static XS (XS_weechat_get_info)
{
server_name = SvPV (ST (1), integer);
ptr_server = server_search (server_name);
+ 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;
+ }
}
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)
{