summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog1
-rw-r--r--po/cs.po34
-rw-r--r--po/de.po40
-rw-r--r--po/es.po40
-rw-r--r--po/fr.po78
-rw-r--r--po/hu.po26
-rw-r--r--po/it.po40
-rw-r--r--po/ja.po40
-rw-r--r--po/pl.po40
-rw-r--r--po/pt_BR.po38
-rw-r--r--po/ru.po24
-rw-r--r--po/weechat.pot24
-rw-r--r--src/plugins/irc/irc-command.c4
-rw-r--r--src/plugins/irc/irc-ctcp.c4
-rw-r--r--src/plugins/irc/irc-server.c4
-rw-r--r--src/plugins/xfer/xfer-buffer.c17
-rw-r--r--src/plugins/xfer/xfer-chat.c10
-rw-r--r--src/plugins/xfer/xfer-command.c10
-rw-r--r--src/plugins/xfer/xfer-dcc.c2
-rw-r--r--src/plugins/xfer/xfer-network.c24
-rw-r--r--src/plugins/xfer/xfer.c109
-rw-r--r--src/plugins/xfer/xfer.h7
22 files changed, 351 insertions, 265 deletions
diff --git a/ChangeLog b/ChangeLog
index d8e78a6f9..89f563574 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,7 @@ Version 0.4.0 (under dev!)
"ipv4." and/or "ipv6." before protocol name, to force IPv4/IPv6 (task #12270)
* relay: add missing "ssl." in output of /relay listrelay
* script: fix compilation on OS X
+* xfer: display remote IP address for DCC chat/file (task #12289)
* xfer: limit bytes received to file size (for DCC file received), fix crash
when displaying a xfer file with pos greater than size
diff --git a/po/cs.po b/po/cs.po
index 34e9194d7..74513f579 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-26 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 22:36+0100\n"
"PO-Revision-Date: 2012-09-29 11:42+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8875,8 +8875,8 @@ msgstr "selhalo"
msgid "aborted"
msgstr "zrušeno"
-#, c-format
-msgid "%s%s: file %s %s %s: %s"
+#, fuzzy, c-format
+msgid "%s%s: file %s %s %s (%ld.%ld.%ld.%ld): %s"
msgstr "%s%s: soubor %s %s %s: %s"
msgid "sent to"
@@ -8891,8 +8891,8 @@ msgstr "OK"
msgid "FAILED"
msgstr "SELHALO"
-#, c-format
-msgid "%s: chat closed with %s (%d.%d.%d.%d)"
+#, fuzzy, c-format
+msgid "%s: chat closed with %s (%ld.%ld.%ld.%ld)"
msgstr "%s: rozhovor zavřen s %s (%d.%d.%d.%d)"
#, c-format
@@ -8905,20 +8905,20 @@ msgstr "%s%s: nedostatek paměti pro nový xfer"
#, fuzzy, c-format
msgid ""
-"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"%s: incoming file from %s (%ld.%ld.%ld.%ld, %s.%s), name: %s, %llu bytes "
"(protocol: %s)"
msgstr "%s: příchozí soubor od %s (%d.%d.%d.%d): %s, %llu bytů (protokol: %s)"
#, fuzzy, c-format
msgid ""
-"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"%s: offering file to %s (%s.%s), name: %s (local filename: %s), %llu bytes "
"(protocol: %s)"
msgstr ""
"%s: posílám soubor k %s: %s (lokální jméno souboru: %s), %llu bytů "
"(protokol: %s)"
#, fuzzy, c-format
-msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
+msgid "%s: incoming chat request from %s (%ld.%ld.%ld.%ld, %s.%s)"
msgstr "%s: příchozí požadavek rozhovoru od %s (%d.%d.%d.%d)"
#, fuzzy, c-format
@@ -8985,8 +8985,8 @@ msgstr ""
msgid "%s%s: error sending data to \"%s\" via xfer chat"
msgstr "%s%s: chyba posílání dat k \"%s\" přes xfer chat"
-#, c-format
-msgid "Connected to %s (%d.%d.%d.%d) via xfer chat"
+#, fuzzy, c-format
+msgid "Connected to %s (%ld.%ld.%ld.%ld) via xfer chat"
msgstr "Připojeno na %s (%d.%d.%d.%d) přes xfer rozhovor"
#, c-format
@@ -9009,10 +9009,10 @@ msgid "%3d. %s, chat with %s (local nick: %s), started on %s, status: %s%s"
msgstr ""
"%3d. %s, komunikace s %s (lokální přezdívka: %s), začalo %s, status: %s%s"
-#, c-format
+#, fuzzy, c-format
msgid ""
-" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %d.%d."
-"%d.%d (port %d)"
+" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %ld."
+"%ld.%ld.%ld (port %d)"
msgstr ""
" plugin: %s (id: %s), soubor: %llu bytů (pozice: %llu), adresa: %d.%d.%d."
"%d (port %d)"
@@ -9196,6 +9196,14 @@ msgstr "%s%s: nemohu zapisovat do lokálního souboru"
msgid "%s%s: unable to fork"
msgstr "%s%s: nemohu provést fork"
+#, fuzzy, c-format
+msgid ""
+"%s: sending file to %s (%ld.%ld.%ld.%ld, %s.%s), name: %s (local filename: "
+"%s), %llu bytes (protocol: %s)"
+msgstr ""
+"%s: posílám soubor k %s: %s (lokální jméno souboru: %s), %llu bytů "
+"(protokol: %s)"
+
#, c-format
msgid "%s%s: unable to create socket for sending file"
msgstr "%s%s: nemohu vytvořit soket pro odesílání souboru"
diff --git a/po/de.po b/po/de.po
index 70e7fdee3..1507d5fc7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-26 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 22:36+0100\n"
"PO-Revision-Date: 2012-11-04 15:41+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -9685,8 +9685,8 @@ msgstr "fehlgeschlagen"
msgid "aborted"
msgstr "abgebrochen"
-#, c-format
-msgid "%s%s: file %s %s %s: %s"
+#, fuzzy, c-format
+msgid "%s%s: file %s %s %s (%ld.%ld.%ld.%ld): %s"
msgstr "%s%s: Datei %s %s %s: %s"
msgid "sent to"
@@ -9701,8 +9701,8 @@ msgstr "OK"
msgid "FAILED"
msgstr "FEHLGESCHLAGEN"
-#, c-format
-msgid "%s: chat closed with %s (%d.%d.%d.%d)"
+#, fuzzy, c-format
+msgid "%s: chat closed with %s (%ld.%ld.%ld.%ld)"
msgstr "%s: Chat mit %s (%d.%d.%d.%d) geschlossen"
#, c-format
@@ -9714,24 +9714,24 @@ msgid "%s%s: not enough memory for new xfer"
msgstr ""
"%s%s: Für einen neuen Transfer steht nicht ausreichend Speicher zur Verfügung"
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"%s: incoming file from %s (%ld.%ld.%ld.%ld, %s.%s), name: %s, %llu bytes "
"(protocol: %s)"
msgstr ""
"%s: eingehende Datei von %s (%s.%s), IP: %d.%d.%d.%d, Name: %s, %llu Bytes "
"(Protokoll: %s)"
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"%s: offering file to %s (%s.%s), name: %s (local filename: %s), %llu bytes "
"(protocol: %s)"
msgstr ""
"%s: sende Datei an %s (%s.%s): %s (lokaler Dateiname: %s), %llu Bytes "
"(Protokoll: %s)"
-#, c-format
-msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
+#, fuzzy, c-format
+msgid "%s: incoming chat request from %s (%ld.%ld.%ld.%ld, %s.%s)"
msgstr "%s: eingehende Chatanforderung von %s (%s.%s), ip: %d.%d.%d.%d"
#, c-format
@@ -9801,8 +9801,8 @@ msgstr ""
msgid "%s%s: error sending data to \"%s\" via xfer chat"
msgstr "%s%s: Fehler beim Senden von Daten an \"%s\" via Transfer-Chat"
-#, c-format
-msgid "Connected to %s (%d.%d.%d.%d) via xfer chat"
+#, fuzzy, c-format
+msgid "Connected to %s (%ld.%ld.%ld.%ld) via xfer chat"
msgstr "Verbindung zu %s (%d.%d.%d.%d) via Transfer-Chat aufgebaut"
#, c-format
@@ -9825,10 +9825,10 @@ msgstr ""
"%3d. %s, Der Chat mit %s (lokaler Nick: %s), wurde am %s gestartet, Status: "
"%s%s"
-#, c-format
+#, fuzzy, c-format
msgid ""
-" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %d.%d."
-"%d.%d (port %d)"
+" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %ld."
+"%ld.%ld.%ld (port %d)"
msgstr ""
" Erweiterung: %s (id: %s), Datei: %llu Bytes (Position: %llu), Adresse: "
"%d.%d.%d.%d (Port %d)"
@@ -10017,6 +10017,14 @@ msgstr "%s%s: Die lokale Datei kann nicht erstellt werden"
msgid "%s%s: unable to fork"
msgstr "%s%s: es kann kein fork erstellt werden"
+#, fuzzy, c-format
+msgid ""
+"%s: sending file to %s (%ld.%ld.%ld.%ld, %s.%s), name: %s (local filename: "
+"%s), %llu bytes (protocol: %s)"
+msgstr ""
+"%s: sende Datei an %s (%s.%s): %s (lokaler Dateiname: %s), %llu Bytes "
+"(Protokoll: %s)"
+
#, c-format
msgid "%s%s: unable to create socket for sending file"
msgstr "%s%s: für den Dateiversand kann kein Socket erstellt werden"
diff --git a/po/es.po b/po/es.po
index f4e2a0596..a98147fc9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-26 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 22:36+0100\n"
"PO-Revision-Date: 2012-09-29 11:42+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9147,8 +9147,8 @@ msgstr "falló"
msgid "aborted"
msgstr "abortado"
-#, c-format
-msgid "%s%s: file %s %s %s: %s"
+#, fuzzy, c-format
+msgid "%s%s: file %s %s %s (%ld.%ld.%ld.%ld): %s"
msgstr "%s%s: archivo %s %s %s: %s"
msgid "sent to"
@@ -9163,8 +9163,8 @@ msgstr "OK"
msgid "FAILED"
msgstr "FALLÓ"
-#, c-format
-msgid "%s: chat closed with %s (%d.%d.%d.%d)"
+#, fuzzy, c-format
+msgid "%s: chat closed with %s (%ld.%ld.%ld.%ld)"
msgstr "%s: charla con %s cerrada (%d.%d.%d.%d)"
#, c-format
@@ -9175,24 +9175,24 @@ msgstr "%s%s: abortando la transferencia activa: \"%s\" desde %s"
msgid "%s%s: not enough memory for new xfer"
msgstr "%s%s: no hay memoria suficiente para una nueva transferencia"
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"%s: incoming file from %s (%ld.%ld.%ld.%ld, %s.%s), name: %s, %llu bytes "
"(protocol: %s)"
msgstr ""
"%s: archivo entrante desde %s (%s.%s), ip: %d.%d.%d.%d, nombre: %s, %llu "
"bytes (protocolo: %s)"
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"%s: offering file to %s (%s.%s), name: %s (local filename: %s), %llu bytes "
"(protocol: %s)"
msgstr ""
"%s: enviando archivo a %s (%s.%s): %s (nombre del archivo local: %s), %llu "
"bytes (protocolo: %s)"
-#, c-format
-msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
+#, fuzzy, c-format
+msgid "%s: incoming chat request from %s (%ld.%ld.%ld.%ld, %s.%s)"
msgstr "%s: recibida petición de charla desde %s (%s.%s), ip: %d.%d.%d.%d"
#, c-format
@@ -9263,8 +9263,8 @@ msgstr ""
msgid "%s%s: error sending data to \"%s\" via xfer chat"
msgstr "%s%s: error al enviar información a \"%s\" vía charla xfer"
-#, c-format
-msgid "Connected to %s (%d.%d.%d.%d) via xfer chat"
+#, fuzzy, c-format
+msgid "Connected to %s (%ld.%ld.%ld.%ld) via xfer chat"
msgstr "Conectado a %s (%d.%d.%d.%d) vía charla xfer"
#, c-format
@@ -9287,10 +9287,10 @@ msgid "%3d. %s, chat with %s (local nick: %s), started on %s, status: %s%s"
msgstr ""
"%3d. %s, conversación con %s (apodo local: %s), iniciado en %s, estado: %s%s"
-#, c-format
+#, fuzzy, c-format
msgid ""
-" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %d.%d."
-"%d.%d (port %d)"
+" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %ld."
+"%ld.%ld.%ld (port %d)"
msgstr ""
" plugin: %s (id: %s), archivo: %llu bytes (posición: %llu), dirección: "
"%d.%d.%d.%d (puerto %d)"
@@ -9479,6 +9479,14 @@ msgstr "%s%s: no es posible escribir el archivo local"
msgid "%s%s: unable to fork"
msgstr "%s%s: no es posible bifurcarse"
+#, fuzzy, c-format
+msgid ""
+"%s: sending file to %s (%ld.%ld.%ld.%ld, %s.%s), name: %s (local filename: "
+"%s), %llu bytes (protocol: %s)"
+msgstr ""
+"%s: enviando archivo a %s (%s.%s): %s (nombre del archivo local: %s), %llu "
+"bytes (protocolo: %s)"
+
#, c-format
msgid "%s%s: unable to create socket for sending file"
msgstr "%s%s: no es posible crear el socket para enviar el archivo"
diff --git a/po/fr.po b/po/fr.po
index 44503e805..ba006f46b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-26 17:35+0100\n"
-"PO-Revision-Date: 2012-11-26 15:08+0100\n"
+"POT-Creation-Date: 2012-11-27 22:36+0100\n"
+"PO-Revision-Date: 2012-11-27 22:28+0100\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@@ -9430,8 +9430,8 @@ msgid "aborted"
msgstr "interrompu"
#, c-format
-msgid "%s%s: file %s %s %s: %s"
-msgstr "%s%s: fichier %s %s %s: %s"
+msgid "%s%s: file %s %s %s (%ld.%ld.%ld.%ld): %s"
+msgstr "%s%s: fichier %s %s %s (%ld.%ld.%ld.%ld): %s"
msgid "sent to"
msgstr "envoyé à"
@@ -9446,8 +9446,8 @@ msgid "FAILED"
msgstr "ECHOUE"
#, c-format
-msgid "%s: chat closed with %s (%d.%d.%d.%d)"
-msgstr "%s: discussion fermée avec %s (%d.%d.%d.%d)"
+msgid "%s: chat closed with %s (%ld.%ld.%ld.%ld)"
+msgstr "%s: discussion fermée avec %s (%ld.%ld.%ld.%ld)"
#, c-format
msgid "%s%s: aborting active xfer: \"%s\" from %s"
@@ -9459,23 +9459,23 @@ msgstr "%s%s: pas assez de mémoire pour un nouveau xfer"
#, c-format
msgid ""
-"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"%s: incoming file from %s (%ld.%ld.%ld.%ld, %s.%s), name: %s, %llu bytes "
"(protocol: %s)"
msgstr ""
-"%s: réception fichier de %s (%s.%s), ip: %d.%d.%d.%d, nom: %s, %llu octets "
+"%s: réception fichier de %s (%ld.%ld.%ld.%ld, %s.%s), nom: %s, %llu octets "
"(protocole: %s)"
#, c-format
msgid ""
-"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"%s: offering file to %s (%s.%s), name: %s (local filename: %s), %llu bytes "
"(protocol: %s)"
msgstr ""
-"%s: envoi fichier à %s (%s.%s): %s (nom local: %s), %llu octets (protocole: "
-"%s)"
+"%s: offre de fichier pour %s (%s.%s), nom: %s (nom local: %s), %llu octets "
+"(protocole: %s)"
#, c-format
-msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
-msgstr "%s: demande de discussion reçue de %s (%s.%s), ip: %d.%d.%d.%d"
+msgid "%s: incoming chat request from %s (%ld.%ld.%ld.%ld, %s.%s)"
+msgstr "%s: demande de discussion reçue de %s (%ld.%ld.%ld.%ld, %s.%s)"
#, c-format
msgid "%s: sending chat request to %s (%s.%s)"
@@ -9544,8 +9544,8 @@ msgid "%s%s: error sending data to \"%s\" via xfer chat"
msgstr "%s%s: erreur d'envoi de données à \"%s\" via discussion xfer"
#, c-format
-msgid "Connected to %s (%d.%d.%d.%d) via xfer chat"
-msgstr "Connecté à %s (%d.%d.%d.%d) via discussion xfer"
+msgid "Connected to %s (%ld.%ld.%ld.%ld) via xfer chat"
+msgstr "Connecté à %s (%ld.%ld.%ld.%ld) via discussion xfer"
#, c-format
msgid "%s%s: can't find xfer for buffer \"%s\""
@@ -9569,11 +9569,11 @@ msgstr ""
#, c-format
msgid ""
-" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %d.%d."
-"%d.%d (port %d)"
+" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %ld."
+"%ld.%ld.%ld (port %d)"
msgstr ""
" extension: %s (id: %s), fichier: %llu octets (position: %llu), "
-"addresse: %d.%d.%d.%d (port %d)"
+"addresse: %ld.%ld.%ld.%ld (port %d)"
#. TRANSLATORS: "%s" after "started on" is a date
#, c-format
@@ -9760,6 +9760,14 @@ msgid "%s%s: unable to fork"
msgstr "%s%s: impossible de créer un processus"
#, c-format
+msgid ""
+"%s: sending file to %s (%ld.%ld.%ld.%ld, %s.%s), name: %s (local filename: "
+"%s), %llu bytes (protocol: %s)"
+msgstr ""
+"%s: envoi fichier à %s (%ld.%ld.%ld.%ld, %s.%s), nom: %s (nom local: %s), "
+"%llu octets (protocole: %s)"
+
+#, c-format
msgid "%s%s: unable to create socket for sending file"
msgstr "%s%s: impossible de créer la socket pour l'envoi du fichier"
@@ -9806,37 +9814,3 @@ msgstr "Type"
msgid "Constants"
msgstr "Constantes"
-
-#~ msgid ""
-#~ "condition(s) for displaying bar (for bars of type \"window\"): \"active\" "
-#~ "= window must be active, \"inactive\" = window must be inactive, "
-#~ "\"nicklist\" = buffer must have a nicklist"
-#~ msgstr ""
-#~ "condition(s) pour afficher la barre (pour les barres de type \"window\"): "
-#~ "\"active\" = la fenêtre doit être active, \"inactive\" = la fenêtre doit "
-#~ "être inactive, \"nicklist\" = le tampon doit avoir une liste de pseudos"
-
-#~ msgid ""
-#~ "server: server name\n"
-#~ " nick: nick (may be a mask)"
-#~ msgstr ""
-#~ "serveur: nom du serveur\n"
-#~ " pseudo: pseudo (peut être un masque)"
-
-#~ msgid "use IPv6 protocol for server communication"
-#~ msgstr "utiliser le protocole IPv6 pour la communication avec le serveur"
-
-#~ msgid "global decoding charset"
-#~ msgstr "charset de décodage global"
-
-#~ msgid "global encoding charset"
-#~ msgstr "charset d'encodage global"
-
-#~ msgid "alt+v=back to list"
-#~ msgstr "alt+v=retour à la liste"
-
-#~ msgid "%s: connecting to server %s/%d%s%s..."
-#~ msgstr "%s: connexion au serveur %s/%d%s%s..."
-
-#~ msgid "%s: disconnected from server"
-#~ msgstr "%s: déconnecté du serveur"
diff --git a/po/hu.po b/po/hu.po
index 8d0251e24..318189f2a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-26 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 22:36+0100\n"
"PO-Revision-Date: 2012-09-29 11:42+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8352,7 +8352,7 @@ msgid "aborted"
msgstr "Megszakítva"
#, fuzzy, c-format
-msgid "%s%s: file %s %s %s: %s"
+msgid "%s%s: file %s %s %s (%ld.%ld.%ld.%ld): %s"
msgstr "DCC: fájl %s%s%s"
#, fuzzy
@@ -8370,7 +8370,7 @@ msgid "FAILED"
msgstr "SIKERTELEN"
#, fuzzy, c-format
-msgid "%s: chat closed with %s (%d.%d.%d.%d)"
+msgid "%s: chat closed with %s (%ld.%ld.%ld.%ld)"
msgstr "DCC beszélgetés vége: %s%s %s(%s%d.%d.%d.%d%s)\n"
#, fuzzy, c-format
@@ -8383,7 +8383,7 @@ msgstr "%s nincs elegendő memória új DCC számára\n"
#, fuzzy, c-format
msgid ""
-"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"%s: incoming file from %s (%ld.%ld.%ld.%ld, %s.%s), name: %s, %llu bytes "
"(protocol: %s)"
msgstr ""
"Beérkező DCC fájl a következőtől: %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu"
@@ -8391,14 +8391,14 @@ msgstr ""
#, fuzzy, c-format
msgid ""
-"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"%s: offering file to %s (%s.%s), name: %s (local filename: %s), %llu bytes "
"(protocol: %s)"
msgstr ""
"DCC fájl küldése a következőnek: %s%s%s: %s%s%s (helyi fájlnév: %s%s%s), %s"
"%lu%s bájt\n"
#, fuzzy, c-format
-msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
+msgid "%s: incoming chat request from %s (%ld.%ld.%ld.%ld, %s.%s)"
msgstr "Beérkező DCC beszélgetés a következőtől: %s%s%s (%s%d.%d.%d.%d%s)\n"
#, fuzzy, c-format
@@ -8468,7 +8468,7 @@ msgid "%s%s: error sending data to \"%s\" via xfer chat"
msgstr "%s hiba a(z) \"%s\" felé DCC CHAT-tel történő adatküldés közben\n"
#, fuzzy, c-format
-msgid "Connected to %s (%d.%d.%d.%d) via xfer chat"
+msgid "Connected to %s (%ld.%ld.%ld.%ld) via xfer chat"
msgstr ""
"Csatlakozás a %s%s %s(%s%d.%d.%d.%d%s)%s partnerhez DCC beszélgetésen "
"keresztül\n"
@@ -8493,8 +8493,8 @@ msgstr ""
#, c-format
msgid ""
-" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %d.%d."
-"%d.%d (port %d)"
+" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %ld."
+"%ld.%ld.%ld (port %d)"
msgstr ""
#. TRANSLATORS: "%s" after "started on" is a date
@@ -8683,6 +8683,14 @@ msgid "%s%s: unable to fork"
msgstr "%s DCC: nem sikerült forkolni\n"
#, fuzzy, c-format
+msgid ""
+"%s: sending file to %s (%ld.%ld.%ld.%ld, %s.%s), name: %s (local filename: "
+"%s), %llu bytes (protocol: %s)"
+msgstr ""
+"DCC fájl küldése a következőnek: %s%s%s: %s%s%s (helyi fájlnév: %s%s%s), %s"
+"%lu%s bájt\n"
+
+#, fuzzy, c-format
msgid "%s%s: unable to create socket for sending file"
msgstr "%s DCC: nem sikerült csatornát nyitni a fájlküldéshez\n"
diff --git a/po/it.po b/po/it.po
index 9153d447e..ab9300970 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-26 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 22:36+0100\n"
"PO-Revision-Date: 2012-09-29 11:42+0200\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9146,8 +9146,8 @@ msgstr "fallito"
msgid "aborted"
msgstr "annullato"
-#, c-format
-msgid "%s%s: file %s %s %s: %s"
+#, fuzzy, c-format
+msgid "%s%s: file %s %s %s (%ld.%ld.%ld.%ld): %s"
msgstr "%s%s: file %s %s %s: %s"
msgid "sent to"
@@ -9162,8 +9162,8 @@ msgstr "OK"
msgid "FAILED"
msgstr "FALLITO"
-#, c-format
-msgid "%s: chat closed with %s (%d.%d.%d.%d)"
+#, fuzzy, c-format
+msgid "%s: chat closed with %s (%ld.%ld.%ld.%ld)"
msgstr "%s: chat con %s (%d.%d.%d.%d) chiusa"
#, c-format
@@ -9174,24 +9174,24 @@ msgstr "%s%s: annullamento xfer attivo: \"%s\" da %s"
msgid "%s%s: not enough memory for new xfer"
msgstr "%s%s: memoria non sufficiente per nuovo xfer"
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"%s: incoming file from %s (%ld.%ld.%ld.%ld, %s.%s), name: %s, %llu bytes "
"(protocol: %s)"
msgstr ""
"%s: file in arrivo da %s (%s.%s), ip: %d.%d.%d.%d, nome: %s, %llu byte "
"(protocollo: %s)"
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"%s: offering file to %s (%s.%s), name: %s (local filename: %s), %llu bytes "
"(protocol: %s)"
msgstr ""
"%s: invio file a %s (%s.%s): %s (nome file locale: %s), %llu byte "
"(protocollo: %s)"
-#, c-format
-msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
+#, fuzzy, c-format
+msgid "%s: incoming chat request from %s (%ld.%ld.%ld.%ld, %s.%s)"
msgstr "%s: richiesta di chat in arrivo da %s (%s.%s), ip: %d.%d.%d.%d"
#, c-format
@@ -9259,8 +9259,8 @@ msgstr ""
msgid "%s%s: error sending data to \"%s\" via xfer chat"
msgstr "%s%s: errore nell'invio dei dati a \"%s\" via chat xfer"
-#, c-format
-msgid "Connected to %s (%d.%d.%d.%d) via xfer chat"
+#, fuzzy, c-format
+msgid "Connected to %s (%ld.%ld.%ld.%ld) via xfer chat"
msgstr "Connesso a %s (%d.%d.%d.%d) via chat xfer"
#, c-format
@@ -9281,10 +9281,10 @@ msgstr ""
msgid "%3d. %s, chat with %s (local nick: %s), started on %s, status: %s%s"
msgstr "%3d. %s, chat con %s (nick locale: %s), iniziata il %s, stato: %s%s"
-#, c-format
+#, fuzzy, c-format
msgid ""
-" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %d.%d."
-"%d.%d (port %d)"
+" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %ld."
+"%ld.%ld.%ld (port %d)"
msgstr ""
" plugin: %s (id: %s), file: %llu byte (posizione: %llu), indirizzo: %d."
"%d.%d.%d (porta %d)"
@@ -9465,6 +9465,14 @@ msgstr "%s%s: impossibile scrivere il file locale"
msgid "%s%s: unable to fork"
msgstr "%s%s: impossibile effettuare il fork"
+#, fuzzy, c-format
+msgid ""
+"%s: sending file to %s (%ld.%ld.%ld.%ld, %s.%s), name: %s (local filename: "
+"%s), %llu bytes (protocol: %s)"
+msgstr ""
+"%s: invio file a %s (%s.%s): %s (nome file locale: %s), %llu byte "
+"(protocollo: %s)"
+
#, c-format
msgid "%s%s: unable to create socket for sending file"
msgstr "%s%s: impossibile creare il socket per inviare il file"
diff --git a/po/ja.po b/po/ja.po
index 73fcadf23..e7ca2154f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-26 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 22:36+0100\n"
"PO-Revision-Date: 2012-09-29 11:42+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -9015,8 +9015,8 @@ msgstr "失敗"
msgid "aborted"
msgstr "中止"
-#, c-format
-msgid "%s%s: file %s %s %s: %s"
+#, fuzzy, c-format
+msgid "%s%s: file %s %s %s (%ld.%ld.%ld.%ld): %s"
msgstr "%s%s: ファイル %s %s %s: %s"
msgid "sent to"
@@ -9031,8 +9031,8 @@ msgstr "OK"
msgid "FAILED"
msgstr "失敗"
-#, c-format
-msgid "%s: chat closed with %s (%d.%d.%d.%d)"
+#, fuzzy, c-format
+msgid "%s: chat closed with %s (%ld.%ld.%ld.%ld)"
msgstr "%s: %s (%d.%d.%d.%d) とのチャットを終了"
#, c-format
@@ -9043,24 +9043,24 @@ msgstr "%s%s: アクティブな xfer を中断しています: \"%s\" %s から
msgid "%s%s: not enough memory for new xfer"
msgstr "%s%s: 新しい xfer 用のメモリ不足"
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"%s: incoming file from %s (%ld.%ld.%ld.%ld, %s.%s), name: %s, %llu bytes "
"(protocol: %s)"
msgstr ""
"%s: %s (%s.%s) からファイルを受信、ip: %d.%d.%d.%d, 名前: %s, %llu バイト (プ"
"ロトコル: %s)"
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"%s: offering file to %s (%s.%s), name: %s (local filename: %s), %llu bytes "
"(protocol: %s)"
msgstr ""
"%s: %s (%s.%s) へファイルを送信: %s (ローカルファイル名: %s), %llu バイト (プ"
"ロトコル: %s)"
-#, c-format
-msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
+#, fuzzy, c-format
+msgid "%s: incoming chat request from %s (%ld.%ld.%ld.%ld, %s.%s)"
msgstr "%s: %s (%s.%s) からチャット要求を受信、ip: %d.%d.%d.%d"
#, c-format
@@ -9129,8 +9129,8 @@ msgstr ""
msgid "%s%s: error sending data to \"%s\" via xfer chat"
msgstr "%s%s: xfer チャットで \"%s\" にデータ転送中のエラー"
-#, c-format
-msgid "Connected to %s (%d.%d.%d.%d) via xfer chat"
+#, fuzzy, c-format
+msgid "Connected to %s (%ld.%ld.%ld.%ld) via xfer chat"
msgstr "xfer チャットで %s (%d.%d.%d.%d) に接続"
#, c-format
@@ -9153,10 +9153,10 @@ msgid "%3d. %s, chat with %s (local nick: %s), started on %s, status: %s%s"
msgstr ""
"%3d. %s、%s とチャット中 (ローカルニックネーム: %s)、開始日時 %s、状態: %s%s"
-#, c-format
+#, fuzzy, c-format
msgid ""
-" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %d.%d."
-"%d.%d (port %d)"
+" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %ld."
+"%ld.%ld.%ld (port %d)"
msgstr ""
" プラグイン: %s (id: %s)、ファイル: %llu バイト (位置: %llu)、アドレス: "
"%d.%d.%d.%d (ポート %d)"
@@ -9332,6 +9332,14 @@ msgstr "%s%s: ローカルファイルに書き込めません"
msgid "%s%s: unable to fork"
msgstr "%s%s: フォークできません"
+#, fuzzy, c-format
+msgid ""
+"%s: sending file to %s (%ld.%ld.%ld.%ld, %s.%s), name: %s (local filename: "
+"%s), %llu bytes (protocol: %s)"
+msgstr ""
+"%s: %s (%s.%s) へファイルを送信: %s (ローカルファイル名: %s), %llu バイト (プ"
+"ロトコル: %s)"
+
#, c-format
msgid "%s%s: unable to create socket for sending file"
msgstr "%s%s: ファイル送信用にソケットを作れません"
diff --git a/po/pl.po b/po/pl.po
index 9e1ae989c..2111e5bc2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-26 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 22:36+0100\n"
"PO-Revision-Date: 2012-09-29 11:42+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9074,8 +9074,8 @@ msgstr "nie powodzenie"
msgid "aborted"
msgstr "przerwano"
-#, c-format
-msgid "%s%s: file %s %s %s: %s"
+#, fuzzy, c-format
+msgid "%s%s: file %s %s %s (%ld.%ld.%ld.%ld): %s"
msgstr "%s%s: plik %s %s %s: %s"
msgid "sent to"
@@ -9090,8 +9090,8 @@ msgstr "OK"
msgid "FAILED"
msgstr "NIEUDANY"
-#, c-format
-msgid "%s: chat closed with %s (%d.%d.%d.%d)"
+#, fuzzy, c-format
+msgid "%s: chat closed with %s (%ld.%ld.%ld.%ld)"
msgstr "%s: rozmowa zakończona z %s (%d.%d.%d.%d)"
#, c-format
@@ -9102,24 +9102,24 @@ msgstr "%s%s: przerywam aktywny xfer: \"%s\" od %s"
msgid "%s%s: not enough memory for new xfer"
msgstr "%s%s: za mało pamięci na nowy xfer"
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"%s: incoming file from %s (%ld.%ld.%ld.%ld, %s.%s), name: %s, %llu bytes "
"(protocol: %s)"
msgstr ""
"%s: pobieranie pliku od %s (%s.%s), ip: %d.%d.%d.%d, nazwa: %s, %llu bytes "
"(protokół: %s)"
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"%s: offering file to %s (%s.%s), name: %s (local filename: %s), %llu bytes "
"(protocol: %s)"
msgstr ""
"%s: wysyłanie pliku do %s (%s.%s): %s(lokalna nazwa: %s), %llu bajtów "
"(protokół: %s)"
-#, c-format
-msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
+#, fuzzy, c-format
+msgid "%s: incoming chat request from %s (%ld.%ld.%ld.%ld, %s.%s)"
msgstr "%s: przychodzące żądanie rozmowy od %s (%s.%s), ip: %d.%d.%d.%d"
#, c-format
@@ -9186,8 +9186,8 @@ msgstr ""
msgid "%s%s: error sending data to \"%s\" via xfer chat"
msgstr "%s%s: błąd podczas wysyłania danych do \"%s\" przez rozmowę xfer"
-#, c-format
-msgid "Connected to %s (%d.%d.%d.%d) via xfer chat"
+#, fuzzy, c-format
+msgid "Connected to %s (%ld.%ld.%ld.%ld) via xfer chat"
msgstr "Połączono z %s (%d.%d.%d.%d) poprzez rozmowę xfer"
#, c-format
@@ -9209,10 +9209,10 @@ msgstr ""
msgid "%3d. %s, chat with %s (local nick: %s), started on %s, status: %s%s"
msgstr "%3d. %s, rozmowa %s (lokalny nick: %s), rozpoczęto %s, status: %s%s"
-#, c-format
+#, fuzzy, c-format
msgid ""
-" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %d.%d."
-"%d.%d (port %d)"
+" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %ld."
+"%ld.%ld.%ld (port %d)"
msgstr ""
" wtyczka: %s (id: %s), plik: %llu bajtów (pozycja: %llu), adres: %d.%d."
"%d.%d (port %d)"
@@ -9394,6 +9394,14 @@ msgstr "%s%s: nie można zapisać pliku"
msgid "%s%s: unable to fork"
msgstr "%s%s: nie można uruchomić procesu potomnego"
+#, fuzzy, c-format
+msgid ""
+"%s: sending file to %s (%ld.%ld.%ld.%ld, %s.%s), name: %s (local filename: "
+"%s), %llu bytes (protocol: %s)"
+msgstr ""
+"%s: wysyłanie pliku do %s (%s.%s): %s(lokalna nazwa: %s), %llu bajtów "
+"(protokół: %s)"
+
#, c-format
msgid "%s%s: unable to create socket for sending file"
msgstr "%s%s: nie można otworzyć gniazda do wysłania pliku"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e0cb52794..fb06d569f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-26 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 22:36+0100\n"
"PO-Revision-Date: 2012-09-29 11:43+0200\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8500,8 +8500,8 @@ msgstr "falhou"
msgid "aborted"
msgstr "abortado"
-#, c-format
-msgid "%s%s: file %s %s %s: %s"
+#, fuzzy, c-format
+msgid "%s%s: file %s %s %s (%ld.%ld.%ld.%ld): %s"
msgstr "%s%s: arquivo %s %s %s: %s"
msgid "sent to"
@@ -8516,8 +8516,8 @@ msgstr "OK"
msgid "FAILED"
msgstr "FALHOU"
-#, c-format
-msgid "%s: chat closed with %s (%d.%d.%d.%d)"
+#, fuzzy, c-format
+msgid "%s: chat closed with %s (%ld.%ld.%ld.%ld)"
msgstr "%s: chat terminado com %s (%d.%d.%d.%d)"
#, c-format
@@ -8528,24 +8528,24 @@ msgstr "%s%s: abortando transferência ativa: \"%s\" de %s"
msgid "%s%s: not enough memory for new xfer"
msgstr "%s%s: memória insuficiente para nova transferência"
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"%s: incoming file from %s (%ld.%ld.%ld.%ld, %s.%s), name: %s, %llu bytes "
"(protocol: %s)"
msgstr ""
"%s: recebendo arquivo de %s (%s.%s), ip: %d.%d.%d.%d, nome: %s, %llu bytes "
"(protocolo: %s)"
-#, c-format
+#, fuzzy, c-format
msgid ""
-"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"%s: offering file to %s (%s.%s), name: %s (local filename: %s), %llu bytes "
"(protocol: %s)"
msgstr ""
"%s: enviando arquivo para %s (%s.%s): %s (arquivo local: %s), %llu bytes "
"(protocolo: %s)"
-#, c-format
-msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
+#, fuzzy, c-format
+msgid "%s: incoming chat request from %s (%ld.%ld.%ld.%ld, %s.%s)"
msgstr "%s: requisição de chat recebida de %s (%s.%s), ip: %d.%d.%d.%d"
#, c-format
@@ -8617,8 +8617,8 @@ msgstr ""
msgid "%s%s: error sending data to \"%s\" via xfer chat"
msgstr "%s%s: erro ao enviar dados para \"%s\" via chat de transferência"
-#, c-format
-msgid "Connected to %s (%d.%d.%d.%d) via xfer chat"
+#, fuzzy, c-format
+msgid "Connected to %s (%ld.%ld.%ld.%ld) via xfer chat"
msgstr "Conectado a %s (%d.%d.%d.%d) via chat de transferência"
#, c-format
@@ -8643,8 +8643,8 @@ msgstr ""
#, c-format
msgid ""
-" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %d.%d."
-"%d.%d (port %d)"
+" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %ld."
+"%ld.%ld.%ld (port %d)"
msgstr ""
#. TRANSLATORS: "%s" after "started on" is a date
@@ -8829,6 +8829,14 @@ msgstr "%s%s: não foi possível escrever o arquivo local"
msgid "%s%s: unable to fork"
msgstr "%s%s: não foi possível efetuar o fork"
+#, fuzzy, c-format
+msgid ""
+"%s: sending file to %s (%ld.%ld.%ld.%ld, %s.%s), name: %s (local filename: "
+"%s), %llu bytes (protocol: %s)"
+msgstr ""
+"%s: enviando arquivo para %s (%s.%s): %s (arquivo local: %s), %llu bytes "
+"(protocolo: %s)"
+
#, c-format
msgid "%s%s: unable to create socket for sending file"
msgstr "%s%s: não foi possível criar o socket para enviar arquivo"
diff --git a/po/ru.po b/po/ru.po
index 9471dc942..222732ab4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-26 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 22:36+0100\n"
"PO-Revision-Date: 2012-09-29 11:43+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8375,7 +8375,7 @@ msgid "aborted"
msgstr "Отменено"
#, fuzzy, c-format
-msgid "%s%s: file %s %s %s: %s"
+msgid "%s%s: file %s %s %s (%ld.%ld.%ld.%ld): %s"
msgstr "DCC: файл %s%s%s"
#, fuzzy
@@ -8393,7 +8393,7 @@ msgid "FAILED"
msgstr "НЕУДАЧА"
#, fuzzy, c-format
-msgid "%s: chat closed with %s (%d.%d.%d.%d)"
+msgid "%s: chat closed with %s (%ld.%ld.%ld.%ld)"
msgstr "DCC-чат закончен с %s%s %s(%s%d.%d.%d.%d%s)\n"
#, fuzzy, c-format
@@ -8406,18 +8406,18 @@ msgstr "%s недостаточно памяти для нового DCC\n"
#, fuzzy, c-format
msgid ""
-"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"%s: incoming file from %s (%ld.%ld.%ld.%ld, %s.%s), name: %s, %llu bytes "
"(protocol: %s)"
msgstr "Входящий файл от %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s байт\n"
#, fuzzy, c-format
msgid ""
-"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"%s: offering file to %s (%s.%s), name: %s (local filename: %s), %llu bytes "
"(protocol: %s)"
msgstr "Отправляю файл %s%s%s: %s%s%s (файл: %s%s%s), %s%lu%s байт\n"
#, fuzzy, c-format
-msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
+msgid "%s: incoming chat request from %s (%ld.%ld.%ld.%ld, %s.%s)"
msgstr "Входящий запрос на DCC-чат от %s%s%s (%s%d.%d.%d.%d%s)\n"
#, fuzzy, c-format
@@ -8486,7 +8486,7 @@ msgid "%s%s: error sending data to \"%s\" via xfer chat"
msgstr "%s ошибка при отправке данных \"%s\" через DCC-чат\n"
#, fuzzy, c-format
-msgid "Connected to %s (%d.%d.%d.%d) via xfer chat"
+msgid "Connected to %s (%ld.%ld.%ld.%ld) via xfer chat"
msgstr "Соединён с %s%s %s(%s%d.%d.%d.%d%s)%s DCC-чатом\n"
#, fuzzy, c-format
@@ -8509,8 +8509,8 @@ msgstr ""
#, c-format
msgid ""
-" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %d.%d."
-"%d.%d (port %d)"
+" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %ld."
+"%ld.%ld.%ld (port %d)"
msgstr ""
#. TRANSLATORS: "%s" after "started on" is a date
@@ -8702,6 +8702,12 @@ msgid "%s%s: unable to fork"
msgstr "%s DCC: не могу forkнуться\n"
#, fuzzy, c-format
+msgid ""
+"%s: sending file to %s (%ld.%ld.%ld.%ld, %s.%s), name: %s (local filename: "
+"%s), %llu bytes (protocol: %s)"
+msgstr "Отправляю файл %s%s%s: %s%s%s (файл: %s%s%s), %s%lu%s байт\n"
+
+#, fuzzy, c-format
msgid "%s%s: unable to create socket for sending file"
msgstr "%s DCC: не могу создать сокет для отправки файла\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index 4c710108c..15b9dc160 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: 2012-11-26 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 22:36+0100\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"
@@ -7386,7 +7386,7 @@ msgid "aborted"
msgstr ""
#, c-format
-msgid "%s%s: file %s %s %s: %s"
+msgid "%s%s: file %s %s %s (%ld.%ld.%ld.%ld): %s"
msgstr ""
msgid "sent to"
@@ -7402,7 +7402,7 @@ msgid "FAILED"
msgstr ""
#, c-format
-msgid "%s: chat closed with %s (%d.%d.%d.%d)"
+msgid "%s: chat closed with %s (%ld.%ld.%ld.%ld)"
msgstr ""
#, c-format
@@ -7415,18 +7415,18 @@ msgstr ""
#, c-format
msgid ""
-"%s: incoming file from %s (%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+"%s: incoming file from %s (%ld.%ld.%ld.%ld, %s.%s), name: %s, %llu bytes "
"(protocol: %s)"
msgstr ""
#, c-format
msgid ""
-"%s: sending file to %s (%s.%s): %s (local filename: %s), %llu bytes "
+"%s: offering file to %s (%s.%s), name: %s (local filename: %s), %llu bytes "
"(protocol: %s)"
msgstr ""
#, c-format
-msgid "%s: incoming chat request from %s (%s.%s), ip: %d.%d.%d.%d"
+msgid "%s: incoming chat request from %s (%ld.%ld.%ld.%ld, %s.%s)"
msgstr ""
#, c-format
@@ -7490,7 +7490,7 @@ msgid "%s%s: error sending data to \"%s\" via xfer chat"
msgstr ""
#, c-format
-msgid "Connected to %s (%d.%d.%d.%d) via xfer chat"
+msgid "Connected to %s (%ld.%ld.%ld.%ld) via xfer chat"
msgstr ""
#, c-format
@@ -7512,8 +7512,8 @@ msgstr ""
#, c-format
msgid ""
-" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %d.%d."
-"%d.%d (port %d)"
+" plugin: %s (id: %s), file: %llu bytes (position: %llu), address: %ld."
+"%ld.%ld.%ld (port %d)"
msgstr ""
#. TRANSLATORS: "%s" after "started on" is a date
@@ -7669,6 +7669,12 @@ msgid "%s%s: unable to fork"
msgstr ""
#, c-format
+msgid ""
+"%s: sending file to %s (%ld.%ld.%ld.%ld, %s.%s), name: %s (local filename: "
+"%s), %llu bytes (protocol: %s)"
+msgstr ""
+
+#, c-format
msgid "%s%s: unable to create socket for sending file"
msgstr ""
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index c4e21afc6..20c0c0ec7 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -1149,7 +1149,7 @@ irc_command_dcc (void *data, struct t_gui_buffer *buffer, int argc,
weechat_infolist_new_var_string (item, "filename", argv_eol[3]);
snprintf (str_address, sizeof (str_address),
"%lu", address);
- weechat_infolist_new_var_string (item, "address", str_address);
+ weechat_infolist_new_var_string (item, "local_address", str_address);
weechat_infolist_new_var_integer (item, "socket", ptr_server->sock);
weechat_hook_signal_send ("xfer_add",
WEECHAT_HOOK_SIGNAL_POINTER,
@@ -1181,7 +1181,7 @@ irc_command_dcc (void *data, struct t_gui_buffer *buffer, int argc,
weechat_infolist_new_var_string (item, "charset_modifier", charset_modifier);
snprintf (str_address, sizeof (str_address),
"%lu", address);
- weechat_infolist_new_var_string (item, "address", str_address);
+ weechat_infolist_new_var_string (item, "local_address", str_address);
weechat_hook_signal_send ("xfer_add",
WEECHAT_HOOK_SIGNAL_POINTER,
infolist);
diff --git a/src/plugins/irc/irc-ctcp.c b/src/plugins/irc/irc-ctcp.c
index 7d90351b1..29c5bc6ac 100644
--- a/src/plugins/irc/irc-ctcp.c
+++ b/src/plugins/irc/irc-ctcp.c
@@ -572,7 +572,7 @@ irc_ctcp_recv_dcc (struct t_irc_server *server, const char *nick,
weechat_infolist_new_var_string (item, "size", pos_size);
weechat_infolist_new_var_string (item, "proxy",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_PROXY));
- weechat_infolist_new_var_string (item, "address", pos_addr);
+ weechat_infolist_new_var_string (item, "remote_address", pos_addr);
weechat_infolist_new_var_integer (item, "port", atoi (pos_port));
weechat_hook_signal_send ("xfer_add",
WEECHAT_HOOK_SIGNAL_POINTER,
@@ -878,7 +878,7 @@ irc_ctcp_recv_dcc (struct t_irc_server *server, const char *nick,
weechat_infolist_new_var_string (item, "charset_modifier", charset_modifier);
weechat_infolist_new_var_string (item, "proxy",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_PROXY));
- weechat_infolist_new_var_string (item, "address", pos_addr);
+ weechat_infolist_new_var_string (item, "remote_address", pos_addr);
weechat_infolist_new_var_integer (item, "port", atoi (pos_port));
weechat_hook_signal_send ("xfer_add",
WEECHAT_HOOK_SIGNAL_POINTER,
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index 194bb768f..b4dc4d7ee 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -4297,7 +4297,7 @@ irc_server_xfer_send_ready_cb (void *data, const char *signal,
(spaces_in_name) ? "\"" : "",
filename,
(spaces_in_name) ? "\"" : "",
- weechat_infolist_string (infolist, "address"),
+ weechat_infolist_string (infolist, "local_address"),
weechat_infolist_integer (infolist, "port"),
weechat_infolist_string (infolist, "size"));
}
@@ -4307,7 +4307,7 @@ irc_server_xfer_send_ready_cb (void *data, const char *signal,
IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"PRIVMSG %s :\01DCC CHAT chat %s %d\01",
weechat_infolist_string (infolist, "remote_nick"),
- weechat_infolist_string (infolist, "address"),
+ weechat_infolist_string (infolist, "local_address"),
weechat_infolist_integer (infolist, "port"));
}
}
diff --git a/src/plugins/xfer/xfer-buffer.c b/src/plugins/xfer/xfer-buffer.c
index e8e1f9cf7..3fe3c9b4e 100644
--- a/src/plugins/xfer/xfer-buffer.c
+++ b/src/plugins/xfer/xfer-buffer.c
@@ -46,6 +46,7 @@ xfer_buffer_refresh (const char *hotlist)
{
struct t_xfer *ptr_xfer, *xfer_selected;
char str_color[256], suffix[32], status[64], date[128], eta[128];
+ char str_ip[32];
char *progress_bar, *str_pos, *str_total, *str_bytes_per_sec;
int i, length, line, progress_bar_size, num_bars;
unsigned long long pos, pct_complete;
@@ -93,9 +94,20 @@ xfer_buffer_refresh (const char *hotlist)
weechat_config_string (xfer_config_color_text),
weechat_config_string (xfer_config_color_text_bg));
+ str_ip[0] = '\0';
+ if (ptr_xfer->remote_address != 0)
+ {
+ snprintf (str_ip, sizeof (str_ip),
+ " (%ld.%ld.%ld.%ld)",
+ ptr_xfer->remote_address >> 24,
+ (ptr_xfer->remote_address >> 16) & 0xff,
+ (ptr_xfer->remote_address >> 8) & 0xff,
+ ptr_xfer->remote_address & 0xff);
+ }
+
/* display first line with remote nick, filename and plugin name/id */
weechat_printf_y (xfer_buffer, (line * 2) + 2,
- "%s%s%-24s %s%s%s%s (%s.%s)",
+ "%s%s%-24s %s%s%s%s (%s.%s)%s",
weechat_color(str_color),
(line == xfer_buffer_selected_line) ?
"*** " : " ",
@@ -106,7 +118,8 @@ xfer_buffer_refresh (const char *hotlist)
(XFER_IS_FILE(ptr_xfer->type)) ? "\"" : "",
suffix,
ptr_xfer->plugin_name,
- ptr_xfer->plugin_id);
+ ptr_xfer->plugin_id,
+ str_ip);
snprintf (status, sizeof (status),
"%s", _(xfer_status_string[ptr_xfer->status]));
diff --git a/src/plugins/xfer/xfer-chat.c b/src/plugins/xfer/xfer-chat.c
index 3a1338d75..e13f41c54 100644
--- a/src/plugins/xfer/xfer-chat.c
+++ b/src/plugins/xfer/xfer-chat.c
@@ -341,13 +341,13 @@ xfer_chat_open_buffer (struct t_xfer *xfer)
}
weechat_printf (xfer->buffer,
- _("Connected to %s (%d.%d.%d.%d) via "
+ _("Connected to %s (%ld.%ld.%ld.%ld) via "
"xfer chat"),
xfer->remote_nick,
- xfer->address >> 24,
- (xfer->address >> 16) & 0xff,
- (xfer->address >> 8) & 0xff,
- xfer->address & 0xff);
+ xfer->remote_address >> 24,
+ (xfer->remote_address >> 16) & 0xff,
+ (xfer->remote_address >> 8) & 0xff,
+ xfer->remote_address & 0xff);
free (name);
}
diff --git a/src/plugins/xfer/xfer-command.c b/src/plugins/xfer/xfer-command.c
index c8146e829..02c834234 100644
--- a/src/plugins/xfer/xfer-command.c
+++ b/src/plugins/xfer/xfer-command.c
@@ -159,15 +159,15 @@ xfer_command_xfer_list (int full)
weechat_printf (NULL,
_(" plugin: %s (id: %s), file: %llu "
"bytes (position: %llu), address: "
- "%d.%d.%d.%d (port %d)"),
+ "%ld.%ld.%ld.%ld (port %d)"),
ptr_xfer->plugin_name,
ptr_xfer->plugin_id,
ptr_xfer->size,
ptr_xfer->pos,
- ptr_xfer->address >> 24,
- (ptr_xfer->address >> 16) & 0xff,
- (ptr_xfer->address >> 8) & 0xff,
- ptr_xfer->address & 0xff,
+ ptr_xfer->remote_address >> 24,
+ (ptr_xfer->remote_address >> 16) & 0xff,
+ (ptr_xfer->remote_address >> 8) & 0xff,
+ ptr_xfer->remote_address & 0xff,
ptr_xfer->port);
date[0] = '\0';
date_tmp = localtime (&(ptr_xfer->start_transfer));
diff --git a/src/plugins/xfer/xfer-dcc.c b/src/plugins/xfer/xfer-dcc.c
index a5fabd89b..4885c4fdb 100644
--- a/src/plugins/xfer/xfer-dcc.c
+++ b/src/plugins/xfer/xfer-dcc.c
@@ -189,7 +189,7 @@ xfer_dcc_recv_file_child (struct t_xfer *xfer)
/* first connect to sender (blocking) */
if (!weechat_network_connect_to (xfer->proxy, xfer->sock,
- xfer->address, xfer->port))
+ xfer->remote_address, xfer->port))
{
xfer_network_write_pipe (xfer, XFER_STATUS_FAILED,
XFER_ERROR_CONNECT_SENDER);
diff --git a/src/plugins/xfer/xfer-network.c b/src/plugins/xfer/xfer-network.c
index 9580bf073..e33612f67 100644
--- a/src/plugins/xfer/xfer-network.c
+++ b/src/plugins/xfer/xfer-network.c
@@ -215,6 +215,22 @@ xfer_network_send_file_fork (struct t_xfer *xfer)
_exit (EXIT_SUCCESS);
}
+ weechat_printf (NULL,
+ _("%s: sending file to %s (%ld.%ld.%ld.%ld, %s.%s), "
+ "name: %s (local filename: %s), %llu bytes (protocol: %s)"),
+ XFER_PLUGIN_NAME,
+ xfer->remote_nick,
+ xfer->remote_address >> 24,
+ (xfer->remote_address >> 16) & 0xff,
+ (xfer->remote_address >> 8) & 0xff,
+ xfer->remote_address & 0xff,
+ xfer->plugin_name,
+ xfer->plugin_id,
+ xfer->filename,
+ xfer->local_filename,
+ xfer->size,
+ xfer_protocol_string[xfer->protocol]);
+
/* parent process */
xfer->child_pid = pid;
close (xfer->child_write);
@@ -364,7 +380,7 @@ xfer_network_fd_cb (void *arg_xfer, int fd)
xfer_buffer_refresh (WEECHAT_HOTLIST_MESSAGE);
return WEECHAT_RC_OK;
}
- xfer->address = ntohl (addr.sin_addr.s_addr);
+ xfer->remote_address = ntohl (addr.sin_addr.s_addr);
xfer->status = XFER_STATUS_ACTIVE;
xfer->start_transfer = time (NULL);
xfer_buffer_refresh (WEECHAT_HOTLIST_MESSAGE);
@@ -406,7 +422,7 @@ xfer_network_fd_cb (void *arg_xfer, int fd)
xfer_buffer_refresh (WEECHAT_HOTLIST_MESSAGE);
return WEECHAT_RC_OK;
}
- xfer->address = ntohl (addr.sin_addr.s_addr);
+ xfer->remote_address = ntohl (addr.sin_addr.s_addr);
xfer->status = XFER_STATUS_ACTIVE;
xfer_buffer_refresh (WEECHAT_HOTLIST_MESSAGE);
xfer->hook_fd = weechat_hook_fd (xfer->sock,
@@ -506,8 +522,8 @@ xfer_network_connect (struct t_xfer *xfer)
flags = 0;
if (fcntl (xfer->sock, F_SETFL, flags | O_NONBLOCK) == -1)
return 0;
- weechat_network_connect_to (xfer->proxy, xfer->sock, xfer->address,
- xfer->port);
+ weechat_network_connect_to (xfer->proxy, xfer->sock,
+ xfer->remote_address, xfer->port);
xfer->hook_fd = weechat_hook_fd (xfer->sock,
1, 0, 0,
diff --git a/src/plugins/xfer/xfer.c b/src/plugins/xfer/xfer.c
index 371390293..8bc7b071b 100644
--- a/src/plugins/xfer/xfer.c
+++ b/src/plugins/xfer/xfer.c
@@ -285,16 +285,17 @@ xfer_close (struct t_xfer *xfer, enum t_xfer_status status)
if (XFER_IS_FILE(xfer->type))
{
weechat_printf (NULL,
- _("%s%s: file %s %s %s: %s"),
- (xfer->status == XFER_STATUS_DONE) ?
- "" : weechat_prefix ("error"),
+ _("%s%s: file %s %s %s (%ld.%ld.%ld.%ld): %s"),
+ (xfer->status == XFER_STATUS_DONE) ? "" : weechat_prefix ("error"),
XFER_PLUGIN_NAME,
xfer->filename,
- (xfer->type == XFER_TYPE_FILE_SEND) ?
- _("sent to") : _("received from"),
+ (xfer->type == XFER_TYPE_FILE_SEND) ? _("sent to") : _("received from"),
xfer->remote_nick,
- (xfer->status == XFER_STATUS_DONE) ?
- _("OK") : _("FAILED"));
+ xfer->remote_address >> 24,
+ (xfer->remote_address >> 16) & 0xff,
+ (xfer->remote_address >> 8) & 0xff,
+ xfer->remote_address & 0xff,
+ (xfer->status == XFER_STATUS_DONE) ? _("OK") : _("FAILED"));
xfer_network_child_kill (xfer);
}
}
@@ -304,13 +305,13 @@ xfer_close (struct t_xfer *xfer, enum t_xfer_status status)
{
weechat_printf (xfer->buffer,
_("%s: chat closed with %s "
- "(%d.%d.%d.%d)"),
+ "(%ld.%ld.%ld.%ld)"),
XFER_PLUGIN_NAME,
xfer->remote_nick,
- xfer->address >> 24,
- (xfer->address >> 16) & 0xff,
- (xfer->address >> 8) & 0xff,
- xfer->address & 0xff);
+ xfer->remote_address >> 24,
+ (xfer->remote_address >> 16) & 0xff,
+ (xfer->remote_address >> 8) & 0xff,
+ xfer->remote_address & 0xff);
}
}
@@ -412,33 +413,23 @@ xfer_send_signal (struct t_xfer *xfer, const char *signal)
item = weechat_infolist_new_item (infolist);
if (item)
{
- weechat_infolist_new_var_string (item, "plugin_name",
- xfer->plugin_name);
- weechat_infolist_new_var_string (item, "plugin_id",
- xfer->plugin_id);
- weechat_infolist_new_var_string (item, "type",
- xfer_type_string[xfer->type]);
- weechat_infolist_new_var_string (item, "protocol",
- xfer_protocol_string[xfer->protocol]);
- weechat_infolist_new_var_string (item, "remote_nick",
- xfer->remote_nick);
- weechat_infolist_new_var_string (item, "local_nick",
- xfer->local_nick);
- weechat_infolist_new_var_string (item, "charset_modifier",
- xfer->charset_modifier);
- weechat_infolist_new_var_string (item, "filename",
- xfer->filename);
+ weechat_infolist_new_var_string (item, "plugin_name", xfer->plugin_name);
+ weechat_infolist_new_var_string (item, "plugin_id", xfer->plugin_id);
+ weechat_infolist_new_var_string (item, "type", xfer_type_string[xfer->type]);
+ weechat_infolist_new_var_string (item, "protocol", xfer_protocol_string[xfer->protocol]);
+ weechat_infolist_new_var_string (item, "remote_nick", xfer->remote_nick);
+ weechat_infolist_new_var_string (item, "local_nick", xfer->local_nick);
+ weechat_infolist_new_var_string (item, "charset_modifier", xfer->charset_modifier);
+ weechat_infolist_new_var_string (item, "filename", xfer->filename);
snprintf (str_long, sizeof (str_long), "%llu", xfer->size);
- weechat_infolist_new_var_string (item, "size",
- str_long);
+ weechat_infolist_new_var_string (item, "size", str_long);
snprintf (str_long, sizeof (str_long), "%llu", xfer->start_resume);
- weechat_infolist_new_var_string (item, "start_resume",
- str_long);
- snprintf (str_long, sizeof (str_long), "%lu", xfer->address);
- weechat_infolist_new_var_string (item, "address",
- str_long);
- weechat_infolist_new_var_integer (item, "port",
- xfer->port);
+ weechat_infolist_new_var_string (item, "start_resume", str_long);
+ snprintf (str_long, sizeof (str_long), "%lu", xfer->local_address);
+ weechat_infolist_new_var_string (item, "local_address", str_long);
+ snprintf (str_long, sizeof (str_long), "%lu", xfer->remote_address);
+ weechat_infolist_new_var_string (item, "remote_address", str_long);
+ weechat_infolist_new_var_integer (item, "port", xfer->port);
weechat_hook_signal_send (signal, WEECHAT_HOOK_SIGNAL_POINTER,
infolist);
@@ -466,7 +457,8 @@ xfer_alloc ()
/* default values */
new_xfer->filename = NULL;
new_xfer->size = 0;
- new_xfer->address = 0;
+ new_xfer->local_address = 0;
+ new_xfer->remote_address = 0;
new_xfer->port = 0;
new_xfer->remote_nick = NULL;
new_xfer->local_nick = NULL;
@@ -559,7 +551,16 @@ xfer_new (const char *plugin_name, const char *plugin_id,
new_xfer->filename = strdup (_("xfer chat"));
new_xfer->size = size;
new_xfer->proxy = (proxy) ? strdup (proxy) : NULL;
- new_xfer->address = address;
+ if (XFER_IS_RECV(type))
+ {
+ new_xfer->local_address = 0;
+ new_xfer->remote_address = address;
+ }
+ else
+ {
+ new_xfer->local_address = address;
+ new_xfer->remote_address = 0;
+ }
new_xfer->port = port;
new_xfer->status = XFER_STATUS_WAITING;
@@ -575,16 +576,16 @@ xfer_new (const char *plugin_name, const char *plugin_id,
case XFER_TYPE_FILE_RECV:
weechat_printf (NULL,
_("%s: incoming file from %s "
- "(%s.%s), ip: %d.%d.%d.%d, name: %s, %llu bytes "
+ "(%ld.%ld.%ld.%ld, %s.%s), name: %s, %llu bytes "
"(protocol: %s)"),
XFER_PLUGIN_NAME,
remote_nick,
- plugin_name,
- plugin_id,
address >> 24,
(address >> 16) & 0xff,
(address >> 8) & 0xff,
address & 0xff,
+ plugin_name,
+ plugin_id,
filename,
size,
xfer_protocol_string[protocol]);
@@ -592,7 +593,7 @@ xfer_new (const char *plugin_name, const char *plugin_id,
break;
case XFER_TYPE_FILE_SEND:
weechat_printf (NULL,
- _("%s: sending file to %s (%s.%s): %s "
+ _("%s: offering file to %s (%s.%s), name: %s "
"(local filename: %s), %llu bytes (protocol: %s)"),
XFER_PLUGIN_NAME,
remote_nick,
@@ -607,15 +608,15 @@ xfer_new (const char *plugin_name, const char *plugin_id,
case XFER_TYPE_CHAT_RECV:
weechat_printf (NULL,
_("%s: incoming chat request from %s "
- "(%s.%s), ip: %d.%d.%d.%d"),
+ "(%ld.%ld.%ld.%ld, %s.%s)"),
XFER_PLUGIN_NAME,
remote_nick,
- plugin_name,
- plugin_id,
address >> 24,
(address >> 16) & 0xff,
(address >> 8) & 0xff,
- address & 0xff);
+ address & 0xff,
+ plugin_name,
+ plugin_id);
xfer_buffer_refresh (WEECHAT_HOTLIST_MESSAGE);
break;
case XFER_TYPE_CHAT_SEND:
@@ -902,13 +903,13 @@ xfer_add_cb (void *data, const char *signal, const char *type_data,
if (XFER_IS_RECV(type))
{
- sscanf (weechat_infolist_string (infolist, "address"), "%lu", &local_addr);
+ sscanf (weechat_infolist_string (infolist, "remote_address"), "%lu", &local_addr);
port = weechat_infolist_integer (infolist, "port");
}
else
{
/* get local IP address */
- sscanf (weechat_infolist_string (infolist, "address"), "%lu", &local_addr);
+ sscanf (weechat_infolist_string (infolist, "local_address"), "%lu", &local_addr);
memset (&addr, 0, sizeof (struct sockaddr_in));
addr.sin_family = AF_INET;
@@ -1306,8 +1307,11 @@ xfer_add_to_infolist (struct t_infolist *infolist, struct t_xfer *xfer)
return 0;
if (!weechat_infolist_new_var_string (ptr_item, "proxy", xfer->proxy))
return 0;
- snprintf (value, sizeof (value), "%lu", xfer->address);
- if (!weechat_infolist_new_var_string (ptr_item, "address", value))
+ snprintf (value, sizeof (value), "%lu", xfer->local_address);
+ if (!weechat_infolist_new_var_string (ptr_item, "local_address", value))
+ return 0;
+ snprintf (value, sizeof (value), "%lu", xfer->remote_address);
+ if (!weechat_infolist_new_var_string (ptr_item, "remote_address", value))
return 0;
if (!weechat_infolist_new_var_integer (ptr_item, "port", xfer->port))
return 0;
@@ -1401,7 +1405,8 @@ xfer_print_log ()
weechat_log_printf (" filename. . . . . . : '%s'", ptr_xfer->filename);
weechat_log_printf (" size. . . . . . . . : %llu", ptr_xfer->size);
weechat_log_printf (" proxy . . . . . . . : '%s'", ptr_xfer->proxy);
- weechat_log_printf (" address . . . . . . : %lu", ptr_xfer->address);
+ weechat_log_printf (" local_address . . . : %lu", ptr_xfer->local_address);
+ weechat_log_printf (" remote_address. . . : %lu", ptr_xfer->remote_address);
weechat_log_printf (" port. . . . . . . . : %d", ptr_xfer->port);
weechat_log_printf (" status. . . . . . . : %d (%s)",
diff --git a/src/plugins/xfer/xfer.h b/src/plugins/xfer/xfer.h
index 90626bc60..d854830fe 100644
--- a/src/plugins/xfer/xfer.h
+++ b/src/plugins/xfer/xfer.h
@@ -78,8 +78,8 @@ enum t_xfer_error
/* xfer blocksize */
-#define XFER_BLOCKSIZE_MIN 1024 /* min blocksize when sending file */
-#define XFER_BLOCKSIZE_MAX 102400 /* max blocksize when sending file */
+#define XFER_BLOCKSIZE_MIN 1024 /* min blocksize */
+#define XFER_BLOCKSIZE_MAX 102400 /* max blocksize */
/* separator in filenames */
@@ -119,7 +119,8 @@ struct t_xfer
char *filename; /* filename */
unsigned long long size; /* file size */
char *proxy; /* proxy to use (optional) */
- unsigned long address; /* local or remote IP address */
+ unsigned long local_address; /* local IP address */
+ unsigned long remote_address; /* remote IP address */
int port; /* remote port */
/* internal data */
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 03:39:38 +0000