summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog4
-rw-r--r--configure.in4
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/fr.po463
-rw-r--r--po/weechat.pot455
-rw-r--r--src/common/weeconfig.c40
-rw-r--r--src/common/weeconfig.h7
-rw-r--r--src/gui/curses/gui-display.c101
-rw-r--r--src/gui/gui.h8
-rw-r--r--src/irc/irc-dcc.c60
-rw-r--r--src/irc/irc-recv.c5
-rw-r--r--src/irc/irc-send.c13
-rw-r--r--src/irc/irc.h43
-rw-r--r--weechat/ChangeLog4
-rw-r--r--weechat/configure.in4
-rw-r--r--weechat/po/POTFILES.in1
-rw-r--r--weechat/po/fr.po463
-rw-r--r--weechat/po/weechat.pot455
-rw-r--r--weechat/src/common/weeconfig.c40
-rw-r--r--weechat/src/common/weeconfig.h7
-rw-r--r--weechat/src/gui/curses/gui-display.c101
-rw-r--r--weechat/src/gui/gui.h8
-rw-r--r--weechat/src/irc/irc-dcc.c60
-rw-r--r--weechat/src/irc/irc-recv.c5
-rw-r--r--weechat/src/irc/irc-send.c13
-rw-r--r--weechat/src/irc/irc.h43
26 files changed, 1592 insertions, 816 deletions
diff --git a/ChangeLog b/ChangeLog
index 95f06b03f..a39e1eb59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,12 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-ChangeLog - 2004-08-25
+ChangeLog - 2004-09-01
Version 0.0.8 (under dev!):
+ * DCC window with Alt-D
+ * /query command now reopens private buffer if already opened
* added key for redrawing terminal (Ctrl-L)
* added key for clearing hotlist (Alt-R)
diff --git a/configure.in b/configure.in
index ffbef1274..ae93a6352 100644
--- a/configure.in
+++ b/configure.in
@@ -19,10 +19,10 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.0.8-pre1, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.0.8-pre2, flashcode@flashtux.org)
AC_CONFIG_SRCDIR([src/common/weechat.c])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.0.8-pre1])
+AM_INIT_AUTOMAKE([weechat], [0.0.8-pre2])
# Checks for programs.
AC_PROG_CC
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ff801a86e..1727c1dbb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,6 +6,7 @@
./src/irc/irc-display.c
./src/irc/irc-send.c
./src/irc/irc-recv.c
+./src/irc/irc-dcc.c
./src/plugins/perl/wee-perl.c
./src/plugins/perl/wee-perl.h
./src/plugins/plugins.c
diff --git a/po/fr.po b/po/fr.po
index 2f83be93a..9deeedf82 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: WeeChat 0.0.8-pre1\n"
+"Project-Id-Version: WeeChat 0.0.8-pre2\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2004-08-08 20:47+0200\n"
+"POT-Creation-Date: 2004-09-01 00:46+0200\n"
"PO-Revision-Date: 2004-08-08 20:47+0200\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
msgid "%s cannot allocate new nick\n"
msgstr "%s ompossible d'allouer un nouveau pseudo\n"
-#: src/irc/irc-server.c:130 src/common/weeconfig.c:1198
+#: src/irc/irc-server.c:130 src/common/weeconfig.c:1235
msgid "Unable to get user's name"
msgstr "Impossible de déterminer le nom d'utilisateur"
@@ -1137,7 +1137,7 @@ msgstr "drapeau de mode inconnu"
msgid "can't change mode for other users"
msgstr "impossible de changer le mode pour les autres utilisateurs"
-#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2897
+#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2896
msgid "unknown"
msgstr "inconnu"
@@ -1147,7 +1147,7 @@ msgid "%s: using local hostname \"%s\"\n"
msgstr "%s: utilisation du nom de machine local \"%s\"\n"
#: src/irc/irc-send.c:210 src/irc/irc-send.c:234 src/irc/irc-send.c:322
-#: src/irc/irc-send.c:568 src/irc/irc-send.c:622 src/irc/irc-send.c:1081
+#: src/irc/irc-send.c:568 src/irc/irc-send.c:622 src/irc/irc-send.c:1094
#, c-format
msgid "%s \"%s\" command can only be executed in a channel window\n"
msgstr ""
@@ -1155,7 +1155,7 @@ msgstr ""
"canal\n"
#: src/irc/irc-send.c:394 src/irc/irc-send.c:465 src/irc/irc-send.c:669
-#: src/irc/irc-send.c:682 src/irc/irc-send.c:976
+#: src/irc/irc-send.c:682 src/irc/irc-send.c:989
#, c-format
msgid "%s \"%s\" command can not be executed on a server window\n"
msgstr ""
@@ -1167,7 +1167,7 @@ msgstr ""
msgid "%s nick not found for \"%s\" command\n"
msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n"
-#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1157
+#: src/irc/irc-send.c:517 src/irc/irc-send.c:758 src/irc/irc-recv.c:1156
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
@@ -1177,7 +1177,7 @@ msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
msgid "%s wrong argument count for \"%s\" command\n"
msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n"
-#: src/irc/irc-send.c:1054
+#: src/irc/irc-send.c:1067
#, c-format
msgid "%s, compiled on %s %s\n"
msgstr "%s, compilé le %s %s\n"
@@ -1192,7 +1192,7 @@ msgid " has joined "
msgstr " a rejoint "
#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:865
-#: src/irc/irc-recv.c:1005 src/irc/irc-recv.c:2397 src/irc/irc-recv.c:2462
+#: src/irc/irc-recv.c:1005 src/irc/irc-recv.c:2396 src/irc/irc-recv.c:2461
#, c-format
msgid "%s channel not found for \"%s\" command\n"
msgstr "%s canal non trouvé pour la commande \"%s\"\n"
@@ -1294,7 +1294,7 @@ msgid "removes voice from"
msgstr "supprime la voix de"
#: src/irc/irc-recv.c:538 src/irc/irc-recv.c:611 src/irc/irc-recv.c:907
-#: src/irc/irc-recv.c:1251
+#: src/irc/irc-recv.c:1250
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s commande \"%s\" reçue sans host\n"
@@ -1339,7 +1339,7 @@ msgstr "%s commande \"%s\" reçue sans host ou canal\n"
msgid " has left "
msgstr " a quitté "
-#: src/irc/irc-recv.c:956 src/irc/irc-recv.c:1183
+#: src/irc/irc-recv.c:956 src/irc/irc-recv.c:1182
#, c-format
msgid "On %s: * %s %s"
msgstr "Sur %s: * %s %s"
@@ -1362,193 +1362,193 @@ msgid "from"
msgstr "de"
#: src/irc/irc-recv.c:1089 src/irc/irc-recv.c:1103 src/irc/irc-recv.c:1118
-#: src/irc/irc-recv.c:1133 src/irc/irc-recv.c:1228 src/irc/irc-recv.c:2683
-#: src/irc/irc-recv.c:2723
+#: src/irc/irc-recv.c:1133 src/irc/irc-recv.c:1227 src/irc/irc-recv.c:2682
+#: src/irc/irc-recv.c:2722
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s impossible d'analyser la commande \"%s\"\n"
-#: src/irc/irc-recv.c:1209
+#: src/irc/irc-recv.c:1208
#, c-format
msgid "Private %s> %s"
msgstr "Privé %s> %s"
-#: src/irc/irc-recv.c:1283
+#: src/irc/irc-recv.c:1282
msgid "has quit"
msgstr "a quitté"
-#: src/irc/irc-recv.c:1403
+#: src/irc/irc-recv.c:1402
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s commande \"%s\" reçue sans canal\n"
-#: src/irc/irc-recv.c:1431
+#: src/irc/irc-recv.c:1430
msgid " has changed topic for "
msgstr " a changé le titre pour "
-#: src/irc/irc-recv.c:1436
+#: src/irc/irc-recv.c:1435
#, c-format
msgid " to: \"%s\"\n"
msgstr " en: \"%s\"\n"
-#: src/irc/irc-recv.c:1442
+#: src/irc/irc-recv.c:1441
msgid " has unset topic for "
msgstr " a retiré le titre pour "
-#: src/irc/irc-recv.c:1533
+#: src/irc/irc-recv.c:1532
#, c-format
msgid " is away: %s\n"
msgstr " est absent: %s\n"
-#: src/irc/irc-recv.c:1607
+#: src/irc/irc-recv.c:1606
msgid "Users online: "
msgstr "Utilisateurs en ligne: "
-#: src/irc/irc-recv.c:1970
+#: src/irc/irc-recv.c:1969
msgid "idle: "
msgstr "inactivité: "
-#: src/irc/irc-recv.c:1978
+#: src/irc/irc-recv.c:1977
msgid "days"
msgstr "jours"
-#: src/irc/irc-recv.c:1978
+#: src/irc/irc-recv.c:1977
msgid "day"
msgstr "jour"
-#: src/irc/irc-recv.c:1988
+#: src/irc/irc-recv.c:1987
msgid "hours"
msgstr "heures"
-#: src/irc/irc-recv.c:1988
+#: src/irc/irc-recv.c:1987
msgid "hour"
msgstr "heure"
-#: src/irc/irc-recv.c:1994
+#: src/irc/irc-recv.c:1993
msgid "minutes"
msgstr "minutes"
-#: src/irc/irc-recv.c:1994
+#: src/irc/irc-recv.c:1993
msgid "minute"
msgstr "minute"
-#: src/irc/irc-recv.c:2000
+#: src/irc/irc-recv.c:1999
msgid "seconds"
msgstr "secondes"
-#: src/irc/irc-recv.c:2000
+#: src/irc/irc-recv.c:1999
msgid "second"
msgstr "seconde"
-#: src/irc/irc-recv.c:2005
+#: src/irc/irc-recv.c:2004
msgid "signon at: "
msgstr "signé le: "
-#: src/irc/irc-recv.c:2093
+#: src/irc/irc-recv.c:2092
msgid "Channels: "
msgstr "Canaux: "
-#: src/irc/irc-recv.c:2344
+#: src/irc/irc-recv.c:2343
msgid "No topic set for "
msgstr "Pas de titre défini pour "
-#: src/irc/irc-recv.c:2386
+#: src/irc/irc-recv.c:2385
msgid "Topic for "
msgstr "Le titre pour "
-#: src/irc/irc-recv.c:2390
+#: src/irc/irc-recv.c:2389
#, c-format
msgid " is: \"%s\"\n"
msgstr " est: \"%s\"\n"
-#: src/irc/irc-recv.c:2406 src/irc/irc-recv.c:2486
+#: src/irc/irc-recv.c:2405 src/irc/irc-recv.c:2485
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s impossible de déterminer le canal pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:2452
+#: src/irc/irc-recv.c:2451
msgid "Topic set by "
msgstr "Titre défini par "
-#: src/irc/irc-recv.c:2470
+#: src/irc/irc-recv.c:2469
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr "%s impossible d'identifier la date/heure pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:2478
+#: src/irc/irc-recv.c:2477
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr ""
"%s impossible de déterminer le nom d'utilisateur pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:2607
+#: src/irc/irc-recv.c:2606
msgid " on "
msgstr " sur "
-#: src/irc/irc-recv.c:2714
+#: src/irc/irc-recv.c:2713
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr "%s impossible de créer l'utilisateur \"%s\" pour le canal \"%s\"\n"
-#: src/irc/irc-recv.c:2767
+#: src/irc/irc-recv.c:2766
msgid "Nicks "
msgstr "Utilisateurs "
-#: src/irc/irc-recv.c:2787
+#: src/irc/irc-recv.c:2786
msgid "Channel "
msgstr "Canal "
-#: src/irc/irc-recv.c:2798
+#: src/irc/irc-recv.c:2797
msgid "nicks"
msgstr "utilisateurs"
-#: src/irc/irc-recv.c:2798
+#: src/irc/irc-recv.c:2797
msgid "nick"
msgstr "utilisateur"
-#: src/irc/irc-recv.c:2806
+#: src/irc/irc-recv.c:2805
msgid "ops"
msgstr "ops"
-#: src/irc/irc-recv.c:2806
+#: src/irc/irc-recv.c:2805
msgid "op"
msgstr "op"
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2814
msgid "halfops"
msgstr "halfops"
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2814
msgid "halfop"
msgstr "halfop"
-#: src/irc/irc-recv.c:2824
+#: src/irc/irc-recv.c:2823
msgid "voices"
msgstr "voices"
-#: src/irc/irc-recv.c:2824
+#: src/irc/irc-recv.c:2823
msgid "voice"
msgstr "voice"
-#: src/irc/irc-recv.c:2833
+#: src/irc/irc-recv.c:2832
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:2866
+#: src/irc/irc-recv.c:2865
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
"%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 2nd "
"nom d'utilisateur \"%s\"\n"
-#: src/irc/irc-recv.c:2877
+#: src/irc/irc-recv.c:2876
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
"%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai du 3ème nom "
"d'utilisateur \"%s\"\n"
-#: src/irc/irc-recv.c:2886
+#: src/irc/irc-recv.c:2885
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1557,6 +1557,35 @@ msgstr ""
"%s: tous les noms d'utilisateurs déclarés sont déjà en cours d'utilisation, "
"fermeture de la connexion avec le serveur !\n"
+#: src/irc/irc-dcc.c:38
+msgid "Waiting"
+msgstr "Attente"
+
+#: src/irc/irc-dcc.c:38
+msgid "Connecting"
+msgstr "Connexion"
+
+#: src/irc/irc-dcc.c:38
+msgid "Active"
+msgstr "Actif"
+
+#: src/irc/irc-dcc.c:38
+msgid "Done"
+msgstr "Terminé"
+
+#: src/irc/irc-dcc.c:38
+msgid "Failed"
+msgstr "Echoué"
+
+#: src/irc/irc-dcc.c:39
+msgid "Aborted"
+msgstr "Interrompu"
+
+#: src/irc/irc-dcc.c:85
+#, c-format
+msgid "%s not enough memory for new DCC\n"
+msgstr "%s pas assez de mémoire pour un nouveau DCC\n"
+
#: src/plugins/perl/wee-perl.c:83
#, c-format
msgid ""
@@ -1618,16 +1647,32 @@ msgstr ""
"%s impossible d'ajouter la fonction pour le message \"%s\" (mémoire "
"insuffisante)\n"
-#: src/gui/curses/gui-display.c:896
+#: src/gui/curses/gui-display.c:559
+msgid "bytes"
+msgstr "octets"
+
+#: src/gui/curses/gui-display.c:559
+msgid "Kb"
+msgstr "Ko"
+
+#: src/gui/curses/gui-display.c:559
+msgid "Mb"
+msgstr "Mo"
+
+#: src/gui/curses/gui-display.c:559
+msgid "Gb"
+msgstr "Go"
+
+#: src/gui/curses/gui-display.c:966
#, c-format
msgid "%d:[not connected] "
msgstr "%d:[non connecté] "
-#: src/gui/curses/gui-display.c:904
+#: src/gui/curses/gui-display.c:974
msgid "[Act: "
msgstr "[Act: "
-#: src/gui/curses/gui-display.c:939 src/gui/curses/gui-display.c:942
+#: src/gui/curses/gui-display.c:1009 src/gui/curses/gui-display.c:1012
msgid "-MORE-"
msgstr "-PLUS-"
@@ -1635,17 +1680,17 @@ msgstr "-PLUS-"
msgid "server"
msgstr "serveur"
-#: src/gui/gui-common.c:301
+#: src/gui/gui-common.c:302
#, c-format
msgid "%s not enough memory for infobar message\n"
msgstr "%s pas assez de mémoire pour un message de la barre d'infos\n"
-#: src/gui/gui-common.c:436
+#: src/gui/gui-common.c:437
#, c-format
msgid "%s not enough memory for new line!\n"
msgstr "%s pas assez de mémoire pour une nouvelle ligne !\n"
-#: src/gui/gui-common.c:479
+#: src/gui/gui-common.c:480
msgid "not enough memory!\n"
msgstr "pas assez de mémoire !\n"
@@ -2480,203 +2525,226 @@ msgstr ""
"délai (en secondes) pour la notification des messages dans la barre d'infos "
"(0 = désactiver les notifications dans la barre d'infos)"
-#: src/common/weeconfig.c:199 src/common/weeconfig.c:200
+#: src/common/weeconfig.c:205 src/common/weeconfig.c:206
msgid "color for title bar"
msgstr "couleur pour la barre de titre"
-#: src/common/weeconfig.c:203 src/common/weeconfig.c:204
+#: src/common/weeconfig.c:209 src/common/weeconfig.c:210
msgid "background for title bar"
msgstr "couleur de fond pour la barre de titre"
-#: src/common/weeconfig.c:209 src/common/weeconfig.c:210
+#: src/common/weeconfig.c:215 src/common/weeconfig.c:216
msgid "color for chat text"
msgstr "couleur pour le texte de discussion"
-#: src/common/weeconfig.c:213
+#: src/common/weeconfig.c:219
msgid "color for time"
msgstr "couleur pour l'heure"
-#: src/common/weeconfig.c:214
+#: src/common/weeconfig.c:220
msgid "color for time in chat window"
msgstr "couleur pour l'heure dans la fenêtre de discussion"
-#: src/common/weeconfig.c:217
+#: src/common/weeconfig.c:223
msgid "color for time separator"
msgstr "couleur pour le séparateur de l'heure"
-#: src/common/weeconfig.c:218
+#: src/common/weeconfig.c:224
msgid "color for time separator (chat window)"
msgstr "couleur pour la séparation de l'heure (fenêtre de discussion)"
-#: src/common/weeconfig.c:221 src/common/weeconfig.c:222
+#: src/common/weeconfig.c:227 src/common/weeconfig.c:228
msgid "color for 1st and 3rd char of prefix"
msgstr "couleur pour le 1er et le 3ème caractère du préfixe"
-#: src/common/weeconfig.c:225 src/common/weeconfig.c:226
+#: src/common/weeconfig.c:231 src/common/weeconfig.c:232
msgid "color for middle char of prefix"
msgstr "couleur pour le caractère du milieu du préfixe"
-#: src/common/weeconfig.c:229
+#: src/common/weeconfig.c:235
msgid "color for nicks in actions"
msgstr "couleur pour les noms d'utilisateur dans les actions"
-#: src/common/weeconfig.c:230
+#: src/common/weeconfig.c:236
msgid "color for nicks in actions (chat window)"
msgstr ""
"couleur pour les noms d'utilisateurs dans les actions (fenêtre de discussion)"
-#: src/common/weeconfig.c:233
+#: src/common/weeconfig.c:239
msgid "color for hostnames"
msgstr "couleur pour les noms de machines"
-#: src/common/weeconfig.c:234
+#: src/common/weeconfig.c:240
msgid "color for hostnames (chat window)"
msgstr "couleur pour les noms de machines (fenêtre de discussion)"
-#: src/common/weeconfig.c:237
+#: src/common/weeconfig.c:243
msgid "color for channel names in actions"
msgstr "couleur pour les canaux dans les actions"
-#: src/common/weeconfig.c:238
+#: src/common/weeconfig.c:244
msgid "color for channel names in actions (chat window)"
msgstr "couleur pour les canaux dans les actions (fenêtre de discussion)"
-#: src/common/weeconfig.c:241
+#: src/common/weeconfig.c:247
msgid "color for dark separators"
msgstr "couleur pour les séparateurs sombres"
-#: src/common/weeconfig.c:242
+#: src/common/weeconfig.c:248
msgid "color for dark separators (chat window)"
msgstr "couleur pour les séparateurs sombres (fenêtre de discussion)"
-#: src/common/weeconfig.c:245
+#: src/common/weeconfig.c:251
msgid "color for highlighted nick"
msgstr "couleur pour le pseudo surligné"
-#: src/common/weeconfig.c:246
+#: src/common/weeconfig.c:252
msgid "color for highlighted nick (chat window)"
msgstr "couleur pour le pseudo surligné (fenêtre de discussion)"
-#: src/common/weeconfig.c:249
+#: src/common/weeconfig.c:255
msgid "background for chat"
msgstr "couleur de fond pour la discussion"
-#: src/common/weeconfig.c:250
+#: src/common/weeconfig.c:256
msgid "background for chat window"
msgstr "couleur de fond pour la fenêtre de discussion"
-#: src/common/weeconfig.c:255 src/common/weeconfig.c:256
+#: src/common/weeconfig.c:261 src/common/weeconfig.c:262
msgid "color for status bar"
msgstr "couleur pour la barre de statut"
-#: src/common/weeconfig.c:259 src/common/weeconfig.c:260
-#, fuzzy
+#: src/common/weeconfig.c:265 src/common/weeconfig.c:266
msgid "color for status bar delimiters"
-msgstr "couleur pour la barre de statut"
+msgstr "couleur pour les délimiteurs de la barre de statut"
-#: src/common/weeconfig.c:263
+#: src/common/weeconfig.c:269
msgid "color for window with new messages"
msgstr "couleur pour une fenêtre avec de nouvelles infos"
-#: src/common/weeconfig.c:264
+#: src/common/weeconfig.c:270
msgid "color for window with new messages (status bar)"
msgstr "couleur pour une fenêtre avec de nouvelles infos (barre de statut)"
-#: src/common/weeconfig.c:267
+#: src/common/weeconfig.c:273
msgid "color for window with highlight"
msgstr "couleur pour une fenêtre avec un highlight"
-#: src/common/weeconfig.c:268
+#: src/common/weeconfig.c:274
msgid "color for window with highlight (status bar)"
msgstr "couleur pour une fenêtre avec un highlight (barre de statut)"
-#: src/common/weeconfig.c:271
+#: src/common/weeconfig.c:277
msgid "color for window with new data (not messages)"
msgstr "couleur pour une fenêtre avec des nouvelles données (pas des infos)"
-#: src/common/weeconfig.c:272
+#: src/common/weeconfig.c:278
msgid "color for window with new data (not messages) (status bar)"
msgstr ""
"couleur pour une fenêtre avec des nouvelles données (pas des infos) (barre "
"de statut)"
-#: src/common/weeconfig.c:275
+#: src/common/weeconfig.c:281
msgid "color for \"*MORE*\" text"
msgstr "couleur pour le texte \"*MORE*\""
-#: src/common/weeconfig.c:276
+#: src/common/weeconfig.c:282
msgid "color for window with new data (status bar)"
msgstr "couleur pour une fenêtre avec des nouvelles données (barre de statut)"
-#: src/common/weeconfig.c:279 src/common/weeconfig.c:280
+#: src/common/weeconfig.c:285 src/common/weeconfig.c:286
msgid "background for status window"
msgstr "couleur de fond pour la fenêtre de statut"
-#: src/common/weeconfig.c:285 src/common/weeconfig.c:286
+#: src/common/weeconfig.c:291 src/common/weeconfig.c:292
msgid "color for info bar text"
msgstr "couleur pour la barre d'infos"
-#: src/common/weeconfig.c:289 src/common/weeconfig.c:290
+#: src/common/weeconfig.c:295 src/common/weeconfig.c:296
msgid "color for info bar highlight notification"
msgstr "couleur pour la notification dans la barre d'infos"
-#: src/common/weeconfig.c:293 src/common/weeconfig.c:294
+#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
msgid "background for info bar window"
msgstr "couleur de fond pour la fenêtre de barre d'infos"
-#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
+#: src/common/weeconfig.c:305 src/common/weeconfig.c:306
msgid "color for input text"
msgstr "couleur pour le texte saisi"
-#: src/common/weeconfig.c:303 src/common/weeconfig.c:304
+#: src/common/weeconfig.c:309 src/common/weeconfig.c:310
msgid "color for input text (channel name)"
msgstr "couleur pour le texte saisi (nom du canal)"
-#: src/common/weeconfig.c:307 src/common/weeconfig.c:308
+#: src/common/weeconfig.c:313 src/common/weeconfig.c:314
msgid "color for input text (nick name)"
msgstr "couleur pour le texte saisi (pseudo)"
-#: src/common/weeconfig.c:311 src/common/weeconfig.c:312
+#: src/common/weeconfig.c:317 src/common/weeconfig.c:318
msgid "background for input window"
msgstr "couleur de fond pour la fenêtre de saisie"
-#: src/common/weeconfig.c:317 src/common/weeconfig.c:318
+#: src/common/weeconfig.c:323 src/common/weeconfig.c:324
msgid "color for nicknames"
msgstr "couleur pour les pseudos"
-#: src/common/weeconfig.c:321 src/common/weeconfig.c:322
+#: src/common/weeconfig.c:327 src/common/weeconfig.c:328
msgid "color for operator symbol"
msgstr "couleur pour le symbole opérateur"
-#: src/common/weeconfig.c:325 src/common/weeconfig.c:326
+#: src/common/weeconfig.c:331 src/common/weeconfig.c:332
msgid "color for half-operator symbol"
msgstr "couleur pour le symbole demi-opérateur"
-#: src/common/weeconfig.c:329 src/common/weeconfig.c:330
+#: src/common/weeconfig.c:335 src/common/weeconfig.c:336
msgid "color for voice symbol"
msgstr "couleur pour le symbole voix"
-#: src/common/weeconfig.c:333 src/common/weeconfig.c:334
+#: src/common/weeconfig.c:339 src/common/weeconfig.c:340
msgid "color for nick separator"
msgstr "couleur pour le séparateur de pseudo"
-#: src/common/weeconfig.c:337 src/common/weeconfig.c:338
+#: src/common/weeconfig.c:343 src/common/weeconfig.c:344
msgid "color for local nick"
msgstr "couleur pour le pseudo local"
-#: src/common/weeconfig.c:341 src/common/weeconfig.c:342
+#: src/common/weeconfig.c:347 src/common/weeconfig.c:348
msgid "color for other nick in private window"
msgstr "couleur pour l'autre pseudo dans la fenêtre privée"
-#: src/common/weeconfig.c:345 src/common/weeconfig.c:346
+#: src/common/weeconfig.c:351 src/common/weeconfig.c:352
msgid "background for nicknames"
msgstr "couleur de fond pour les pseudos"
-#: src/common/weeconfig.c:359
+#: src/common/weeconfig.c:357 src/common/weeconfig.c:358
+msgid "color for \"waiting\" dcc status"
+msgstr "couleur pour le statut dcc \"attente\""
+
+#: src/common/weeconfig.c:361 src/common/weeconfig.c:362
+msgid "color for \"connecting\" dcc status"
+msgstr "couleur pour le statut dcc \"connexion\""
+
+#: src/common/weeconfig.c:365 src/common/weeconfig.c:366
+msgid "color for \"active\" dcc status"
+msgstr "couleur pour le statut dcc \"actif\""
+
+#: src/common/weeconfig.c:369 src/common/weeconfig.c:370
+msgid "color for \"done\" dcc status"
+msgstr "couleur pour le statut dcc \"terminé\""
+
+#: src/common/weeconfig.c:373 src/common/weeconfig.c:374
+msgid "color for \"failed\" dcc status"
+msgstr "couleur pour le statut dcc \"échoué\""
+
+#: src/common/weeconfig.c:377 src/common/weeconfig.c:378
+msgid "color for \"aborted\" dcc status"
+msgstr "couleur pour le statut dcc \"interrompu\""
+
+#: src/common/weeconfig.c:391
msgid "max lines in history (per window)"
msgstr "nombre maxi de lignes dans l'historique (par fenêtre)"
-#: src/common/weeconfig.c:360
+#: src/common/weeconfig.c:392
msgid ""
"maximum number of lines in history for one server/channel/private window (0 "
"= unlimited)"
@@ -2684,36 +2752,36 @@ msgstr ""
"nombre maximum de lignes dans l'historique pour un serveur/fenêtre/fenêtre "
"privée (0 = sans limite)"
-#: src/common/weeconfig.c:364
+#: src/common/weeconfig.c:396
msgid "max user commands in history"
msgstr "nombre maxi de commandes utilisateur dans l'historique"
-#: src/common/weeconfig.c:365
+#: src/common/weeconfig.c:397
msgid "maximum number of user commands in history (0 = unlimited)"
msgstr ""
"nombre maximum de commandes utilisateur dans l'historique (0 = sans limite)"
-#: src/common/weeconfig.c:382 src/common/weeconfig.c:383
+#: src/common/weeconfig.c:414 src/common/weeconfig.c:415
msgid "automatically log channel chats"
msgstr "enregistrer automatiquement les conversations des canaux"
-#: src/common/weeconfig.c:386 src/common/weeconfig.c:387
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
msgid "automatically log private chats"
msgstr "enregistrer automatiquement les conversations privées"
-#: src/common/weeconfig.c:390
+#: src/common/weeconfig.c:422
msgid "path for log files"
msgstr "chemin pour les conversations sauvegardées"
-#: src/common/weeconfig.c:391
+#: src/common/weeconfig.c:423
msgid "path for WeeChat log files"
msgstr "chemin pour les conversations sauvegardées par WeeChat"
-#: src/common/weeconfig.c:394
+#: src/common/weeconfig.c:426
msgid "name for log files"
msgstr "nom des conversations sauvegardées"
-#: src/common/weeconfig.c:395
+#: src/common/weeconfig.c:427
msgid ""
"name for log files (%S == irc server name, %N == channel name (or nickname "
"if private chat)"
@@ -2721,21 +2789,21 @@ msgstr ""
"nom des conversations saivegardées (%S == nom du serveur irc, %N == nom du "
"canal (ou pseudo si fenêtre privée)"
-#: src/common/weeconfig.c:399
+#: src/common/weeconfig.c:431
msgid "timestamp for log"
msgstr "horodatage pour les conversations sauvegardées"
-#: src/common/weeconfig.c:400
+#: src/common/weeconfig.c:432
msgid "timestamp for log (see man strftime for date/time specifiers)"
msgstr ""
"horodatage pour les conversations sauvegardées (voir man strftime pour le "
"format de date/heure)"
-#: src/common/weeconfig.c:403
+#: src/common/weeconfig.c:435
msgid "start string for log files"
msgstr "chaîne de début pour les conversations sauvegardées"
-#: src/common/weeconfig.c:404
+#: src/common/weeconfig.c:436
msgid ""
"text written when starting new log file (see man strftime for date/time "
"specifiers)"
@@ -2743,186 +2811,194 @@ msgstr ""
"texte écrit en démarrant la sauvegarde d'une discussion (voir man strftime "
"pour le format de date/heure)"
-#: src/common/weeconfig.c:408
+#: src/common/weeconfig.c:440
msgid "end string for log files"
msgstr "chaîne de fin pour les conversations sauvegardées"
-#: src/common/weeconfig.c:409
+#: src/common/weeconfig.c:441
msgid ""
"text written when ending log file (see man strftime for date/time specifiers)"
msgstr ""
"texte écrit à la fin d'une discussion sauvegardées (voir man strftime pour "
"le format de date/heure)"
-#: src/common/weeconfig.c:428
+#: src/common/weeconfig.c:461
msgid "automatically accept dcc files"
msgstr "accepte automatiquement les fichiers dcc"
-#: src/common/weeconfig.c:429
+#: src/common/weeconfig.c:462
msgid "automatically accept incoming dcc files"
msgstr "accepte automatiquement les fichiers dcc entrants"
-#: src/common/weeconfig.c:432
+#: src/common/weeconfig.c:465
msgid "max size when auto accepting file"
msgstr "taille maxi pour accepter un fichier"
-#: src/common/weeconfig.c:433
+#: src/common/weeconfig.c:466
msgid "maximum size for incoming file when automatically accepted"
msgstr ""
"taille maximum pour un fichier entrant lorsqu'il est accepté automatiquement"
-#: src/common/weeconfig.c:436
+#: src/common/weeconfig.c:469
msgid "automatically accept dcc chats"
msgstr "accepte automatiquement les demandes de discussion dcc"
-#: src/common/weeconfig.c:437
+#: src/common/weeconfig.c:470
msgid "automatically accept dcc chats (use carefully!)"
msgstr ""
"accepte automatiquement les demandes de discussion dcc (à utiliser avec "
"précaution !)"
-#: src/common/weeconfig.c:440
+#: src/common/weeconfig.c:473
msgid "timeout for dcc request"
msgstr "délai d'attente pour les requêtes dcc"
-#: src/common/weeconfig.c:441
+#: src/common/weeconfig.c:474
msgid "timeout for dcc request (in seconds)"
msgstr "délai d'attente pour les requêtes dcc (en secondes)"
-#: src/common/weeconfig.c:444
+#: src/common/weeconfig.c:477
+msgid "block size for dcc packets"
+msgstr "taille de bloc pour les paquets dcc"
+
+#: src/common/weeconfig.c:478
+msgid "block size for dcc packets in bytes (default: 1024)"
+msgstr "taille de bloc pour les paquets dcc en octets (défaut: 1024)"
+
+#: src/common/weeconfig.c:481
msgid "path for incoming files with dcc"
msgstr "chemin les fichiers reçus par dcc"
-#: src/common/weeconfig.c:445
+#: src/common/weeconfig.c:482
msgid "path for writing incoming files with dcc (default: user home)"
msgstr ""
"chemin pour écrire les fichiers reçus par dcc (par défaut: répertoire de "
"l'utilisateur)"
-#: src/common/weeconfig.c:448
+#: src/common/weeconfig.c:485
msgid "default path for sending files with dcc"
msgstr "chemin par défaut pour envoyer les fichiers par dcc"
-#: src/common/weeconfig.c:449
+#: src/common/weeconfig.c:486
msgid ""
"path for reading files when sending thru dcc (when no path is specified)"
msgstr ""
"chemin pour lire les fichiers lorsqu'ils sont envoyés par dcc (quand aucun "
"chemin n'est spécifié)"
-#: src/common/weeconfig.c:452
+#: src/common/weeconfig.c:489
msgid "automatically rename dcc files if already exists"
msgstr "renomme automatiquement les fichiers dcc s'ils existent déjà"
-#: src/common/weeconfig.c:453
+#: src/common/weeconfig.c:490
msgid "rename incoming files if already exists (add '.1', '.2', ...)"
msgstr ""
"renommer les fichiers reçus s'ils existent déjà (ajoute '.1', '.2', ...)"
-#: src/common/weeconfig.c:456
+#: src/common/weeconfig.c:493
msgid "automatically resume aborted transfers"
msgstr "continuer automatiquement les transferts non terminés"
-#: src/common/weeconfig.c:457
+#: src/common/weeconfig.c:494
msgid ""
"automatically resume dcc transfer if connection with remote host is loosed"
msgstr ""
"continuer automatiquement les transferts dcc si la connexion avec la machine "
"distante a été perdue"
-#: src/common/weeconfig.c:471
+#: src/common/weeconfig.c:508
msgid "use proxy"
msgstr "utiliser un proxy"
-#: src/common/weeconfig.c:472
+#: src/common/weeconfig.c:509
msgid "use a proxy server to connect to irc server"
msgstr "utiliser un proxy pour se connecter au serveur irc"
-#: src/common/weeconfig.c:475
+#: src/common/weeconfig.c:512
msgid "proxy address"
msgstr "adresse du proxy"
-#: src/common/weeconfig.c:476
+#: src/common/weeconfig.c:513
msgid "proxy server address (IP or hostname)"
msgstr "adresse du serveur proxy (IP ou nom)"
-#: src/common/weeconfig.c:479
+#: src/common/weeconfig.c:516
msgid "port for proxy"
msgstr "port pour le proxy"
-#: src/common/weeconfig.c:480
+#: src/common/weeconfig.c:517
msgid "port for connecting to proxy server"
msgstr "port pour se connecter au serveur proxy"
-#: src/common/weeconfig.c:483
+#: src/common/weeconfig.c:520
msgid "proxy password"
msgstr "mot de passe pour le proxy"
-#: src/common/weeconfig.c:484
+#: src/common/weeconfig.c:521
msgid "password for proxy server"
msgstr "mot de passe pour le serveur proxy"
-#: src/common/weeconfig.c:495
+#: src/common/weeconfig.c:532
msgid "server name"
msgstr "nom du serveur"
-#: src/common/weeconfig.c:496
+#: src/common/weeconfig.c:533
msgid "name associated to IRC server (for display only)"
msgstr "nom associé au serveur IRC (pour affichage seulement)"
-#: src/common/weeconfig.c:499
+#: src/common/weeconfig.c:536
msgid "automatically connect to server"
msgstr "connexion automatique au serveur"
-#: src/common/weeconfig.c:500
+#: src/common/weeconfig.c:537
msgid "automatically connect to server when WeeChat is starting"
msgstr "connexion automatique au serveur quand WeeChat démarre"
-#: src/common/weeconfig.c:503
+#: src/common/weeconfig.c:540
msgid "server address or hostname"
msgstr "adresse ou nom du serveur"
-#: src/common/weeconfig.c:504
+#: src/common/weeconfig.c:541
msgid "IP address or hostname of IRC server"
msgstr "adresse IP ou nom du serveur IRC"
-#: src/common/weeconfig.c:507
+#: src/common/weeconfig.c:544
msgid "port for IRC server"
msgstr "port pour le serveur IRC"
-#: src/common/weeconfig.c:508
+#: src/common/weeconfig.c:545
msgid "port for connecting to server"
msgstr "port pour se connecter au serveur"
-#: src/common/weeconfig.c:511
+#: src/common/weeconfig.c:548
msgid "server password"
msgstr "mot de passe pour le serveur"
-#: src/common/weeconfig.c:512
+#: src/common/weeconfig.c:549
msgid "password for IRC server"
msgstr "mot de passe pour le serveur IRC"
-#: src/common/weeconfig.c:515
+#: src/common/weeconfig.c:552
msgid "nickname for server"
msgstr "pseudo pour le serveur"
-#: src/common/weeconfig.c:516
+#: src/common/weeconfig.c:553
msgid "nickname to use on IRC server"
msgstr "pseudo à utiliser sur le serveur IRC"
-#: src/common/weeconfig.c:519
+#: src/common/weeconfig.c:556
msgid "alternate nickname for server"
msgstr "pseudo alternatif pour le serveur"
-#: src/common/weeconfig.c:520
+#: src/common/weeconfig.c:557
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr "pseudo alternatif pour le serveur IRC (si le pseudo est déjà utilisé)"
-#: src/common/weeconfig.c:523
+#: src/common/weeconfig.c:560
msgid "2nd alternate nickname for server"
msgstr "2nd pseudo alternatif pour le serveur"
-#: src/common/weeconfig.c:524
+#: src/common/weeconfig.c:561
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
@@ -2930,87 +3006,87 @@ msgstr ""
"2nd pseudo alternatif pour le serveur IRC (si le pseudo alternatif est déjà "
"utilisé)"
-#: src/common/weeconfig.c:527
+#: src/common/weeconfig.c:564
msgid "user name for server"
msgstr "nom d'utilisateur pour le serveur"
-#: src/common/weeconfig.c:528
+#: src/common/weeconfig.c:565
msgid "user name to use on IRC server"
msgstr "nom d'utilisateur pour le serveur IRC"
-#: src/common/weeconfig.c:531
+#: src/common/weeconfig.c:568
msgid "real name for server"
msgstr "nom réel pour le serveur"
-#: src/common/weeconfig.c:532
+#: src/common/weeconfig.c:569
msgid "real name to use on IRC server"
msgstr "nom réel pour le serveur IRC"
-#: src/common/weeconfig.c:535 src/common/weeconfig.c:536
+#: src/common/weeconfig.c:572 src/common/weeconfig.c:573
msgid "first command to run when connected to server"
msgstr "commande à exécuter en premier lorsque connecté au serveur"
-#: src/common/weeconfig.c:539
+#: src/common/weeconfig.c:576
msgid "list of channels to join when connected to server"
msgstr "liste des canaux à rejoindre lorsque connecté au serveur"
-#: src/common/weeconfig.c:540
+#: src/common/weeconfig.c:577
msgid "comma separated list of channels to join when connected to server"
msgstr ""
"liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au "
"serveur"
-#: src/common/weeconfig.c:762
+#: src/common/weeconfig.c:799
#, c-format
msgid "%s %s, line %d: new server, but previous was incomplete\n"
msgstr "%s %s, ligne %d: nouveau serveur, mais le précédent était incomplet\n"
-#: src/common/weeconfig.c:771
+#: src/common/weeconfig.c:808
#, c-format
msgid "%s %s, line %d: server '%s' already exists\n"
msgstr "%s %s, ligne %d: le serveur '%s' existe déjà\n"
-#: src/common/weeconfig.c:783
+#: src/common/weeconfig.c:820
#, c-format
msgid "%s %s, line %d: unable to create server\n"
msgstr "%s %s, ligne %d: impossible de créer le serveur\n"
-#: src/common/weeconfig.c:822
+#: src/common/weeconfig.c:859
#, c-format
msgid "%s unable to assign default int with string (\"%s\")\n"
msgstr "%s impossible d'assigner la valeur entière avec la chaîne (\"%s\")\n"
-#: src/common/weeconfig.c:833
+#: src/common/weeconfig.c:870
#, c-format
msgid "%s unable to assign default color (\"%s\")\n"
msgstr "%s impossible d'assigner la couleur par défaut (\"%s\")\n"
-#: src/common/weeconfig.c:872
+#: src/common/weeconfig.c:909
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr "%s fichier de configuration \"%s\" non trouvé.\n"
-#: src/common/weeconfig.c:904
+#: src/common/weeconfig.c:941
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"]\"\n"
-#: src/common/weeconfig.c:921
+#: src/common/weeconfig.c:958
#, c-format
msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
msgstr "%s %s, ligne %d: section inconnue (\"%s\")\n"
-#: src/common/weeconfig.c:939
+#: src/common/weeconfig.c:976
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"=\"\n"
-#: src/common/weeconfig.c:973
+#: src/common/weeconfig.c:1010
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr "%s %s, ligne %d: option \"%s\" invalide\n"
-#: src/common/weeconfig.c:984
+#: src/common/weeconfig.c:1021
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
@@ -3019,7 +3095,7 @@ msgstr ""
"%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
"Attendu: valeur booléenne: 'off' ou 'on'\n"
-#: src/common/weeconfig.c:993
+#: src/common/weeconfig.c:1030
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -3028,7 +3104,7 @@ msgstr ""
"%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
"Attendu: entier compris entre %d et %d\n"
-#: src/common/weeconfig.c:1004
+#: src/common/weeconfig.c:1041
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -3037,26 +3113,26 @@ msgstr ""
"%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
"Attendu: une de ces chaînes: "
-#: src/common/weeconfig.c:1020
+#: src/common/weeconfig.c:1057
#, c-format
msgid "%s %s, line %d: invalid color name for option '%s'\n"
msgstr "%s %s, ligne %d: nom de couleur invalide pour l'option '%s'\n"
-#: src/common/weeconfig.c:1079 src/common/weeconfig.c:1247
+#: src/common/weeconfig.c:1116 src/common/weeconfig.c:1284
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr "%s impossible de créer le fichier \"%s\"\n"
-#: src/common/weeconfig.c:1085
+#: src/common/weeconfig.c:1122
#, c-format
msgid "%s: creating default config file...\n"
msgstr "%s: création du fichier de configuration par défaut...\n"
-#: src/common/weeconfig.c:1086
+#: src/common/weeconfig.c:1123
msgid "creating default config file\n"
msgstr "création du fichier de configuration par défaut\n"
-#: src/common/weeconfig.c:1089 src/common/weeconfig.c:1256
+#: src/common/weeconfig.c:1126 src/common/weeconfig.c:1293
#, c-format
msgid ""
"#\n"
@@ -3065,12 +3141,9 @@ msgstr ""
"#\n"
"# %s: fichier de configuration, créé par %s v%s le %s#\n"
-#: src/common/weeconfig.c:1253
+#: src/common/weeconfig.c:1290
msgid "saving config to disk\n"
msgstr "sauvegarde de la configuration sur disque\n"
#~ msgid "color for active window"
#~ msgstr "couleur pour la fenêtre active"
-
-#~ msgid "color for active window (status bar)"
-#~ msgstr "couleur pour la fenêtre active (barre de statut)"
diff --git a/po/weechat.pot b/po/weechat.pot
index e82060901..4934830d5 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: 2004-08-08 20:47+0200\n"
+"POT-Creation-Date: 2004-09-01 00:46+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
msgid "%s cannot allocate new nick\n"
msgstr ""
-#: src/irc/irc-server.c:130 src/common/weeconfig.c:1198
+#: src/irc/irc-server.c:130 src/common/weeconfig.c:1235
msgid "Unable to get user's name"
msgstr ""
@@ -1046,7 +1046,7 @@ msgstr ""
msgid "can't change mode for other users"
msgstr ""
-#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2897
+#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2896
msgid "unknown"
msgstr ""
@@ -1056,13 +1056,13 @@ msgid "%s: using local hostname \"%s\"\n"
msgstr ""
#: src/irc/irc-send.c:210 src/irc/irc-send.c:234 src/irc/irc-send.c:322
-#: src/irc/irc-send.c:568 src/irc/irc-send.c:622 src/irc/irc-send.c:1081
+#: src/irc/irc-send.c:568 src/irc/irc-send.c:622 src/irc/irc-send.c:1094
#, c-format
msgid "%s \"%s\" command can only be executed in a channel window\n"
msgstr ""
#: src/irc/irc-send.c:394 src/irc/irc-send.c:465 src/irc/irc-send.c:669
-#: src/irc/irc-send.c:682 src/irc/irc-send.c:976
+#: src/irc/irc-send.c:682 src/irc/irc-send.c:989
#, c-format
msgid "%s \"%s\" command can not be executed on a server window\n"
msgstr ""
@@ -1073,7 +1073,7 @@ msgstr ""
msgid "%s nick not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1157
+#: src/irc/irc-send.c:517 src/irc/irc-send.c:758 src/irc/irc-recv.c:1156
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr ""
@@ -1083,7 +1083,7 @@ msgstr ""
msgid "%s wrong argument count for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-send.c:1054
+#: src/irc/irc-send.c:1067
#, c-format
msgid "%s, compiled on %s %s\n"
msgstr ""
@@ -1098,7 +1098,7 @@ msgid " has joined "
msgstr ""
#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:865
-#: src/irc/irc-recv.c:1005 src/irc/irc-recv.c:2397 src/irc/irc-recv.c:2462
+#: src/irc/irc-recv.c:1005 src/irc/irc-recv.c:2396 src/irc/irc-recv.c:2461
#, c-format
msgid "%s channel not found for \"%s\" command\n"
msgstr ""
@@ -1200,7 +1200,7 @@ msgid "removes voice from"
msgstr ""
#: src/irc/irc-recv.c:538 src/irc/irc-recv.c:611 src/irc/irc-recv.c:907
-#: src/irc/irc-recv.c:1251
+#: src/irc/irc-recv.c:1250
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr ""
@@ -1245,7 +1245,7 @@ msgstr ""
msgid " has left "
msgstr ""
-#: src/irc/irc-recv.c:956 src/irc/irc-recv.c:1183
+#: src/irc/irc-recv.c:956 src/irc/irc-recv.c:1182
#, c-format
msgid "On %s: * %s %s"
msgstr ""
@@ -1268,194 +1268,223 @@ msgid "from"
msgstr ""
#: src/irc/irc-recv.c:1089 src/irc/irc-recv.c:1103 src/irc/irc-recv.c:1118
-#: src/irc/irc-recv.c:1133 src/irc/irc-recv.c:1228 src/irc/irc-recv.c:2683
-#: src/irc/irc-recv.c:2723
+#: src/irc/irc-recv.c:1133 src/irc/irc-recv.c:1227 src/irc/irc-recv.c:2682
+#: src/irc/irc-recv.c:2722
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:1209
+#: src/irc/irc-recv.c:1208
#, c-format
msgid "Private %s> %s"
msgstr ""
-#: src/irc/irc-recv.c:1283
+#: src/irc/irc-recv.c:1282
msgid "has quit"
msgstr ""
-#: src/irc/irc-recv.c:1403
+#: src/irc/irc-recv.c:1402
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr ""
-#: src/irc/irc-recv.c:1431
+#: src/irc/irc-recv.c:1430
msgid " has changed topic for "
msgstr ""
-#: src/irc/irc-recv.c:1436
+#: src/irc/irc-recv.c:1435
#, c-format
msgid " to: \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:1442
+#: src/irc/irc-recv.c:1441
msgid " has unset topic for "
msgstr ""
-#: src/irc/irc-recv.c:1533
+#: src/irc/irc-recv.c:1532
#, c-format
msgid " is away: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:1607
+#: src/irc/irc-recv.c:1606
msgid "Users online: "
msgstr ""
-#: src/irc/irc-recv.c:1970
+#: src/irc/irc-recv.c:1969
msgid "idle: "
msgstr ""
-#: src/irc/irc-recv.c:1978
+#: src/irc/irc-recv.c:1977
msgid "days"
msgstr ""
-#: src/irc/irc-recv.c:1978
+#: src/irc/irc-recv.c:1977
msgid "day"
msgstr ""
-#: src/irc/irc-recv.c:1988
+#: src/irc/irc-recv.c:1987
msgid "hours"
msgstr ""
-#: src/irc/irc-recv.c:1988
+#: src/irc/irc-recv.c:1987
msgid "hour"
msgstr ""
-#: src/irc/irc-recv.c:1994
+#: src/irc/irc-recv.c:1993
msgid "minutes"
msgstr ""
-#: src/irc/irc-recv.c:1994
+#: src/irc/irc-recv.c:1993
msgid "minute"
msgstr ""
-#: src/irc/irc-recv.c:2000
+#: src/irc/irc-recv.c:1999
msgid "seconds"
msgstr ""
-#: src/irc/irc-recv.c:2000
+#: src/irc/irc-recv.c:1999
msgid "second"
msgstr ""
-#: src/irc/irc-recv.c:2005
+#: src/irc/irc-recv.c:2004
msgid "signon at: "
msgstr ""
-#: src/irc/irc-recv.c:2093
+#: src/irc/irc-recv.c:2092
msgid "Channels: "
msgstr ""
-#: src/irc/irc-recv.c:2344
+#: src/irc/irc-recv.c:2343
msgid "No topic set for "
msgstr ""
-#: src/irc/irc-recv.c:2386
+#: src/irc/irc-recv.c:2385
msgid "Topic for "
msgstr ""
-#: src/irc/irc-recv.c:2390
+#: src/irc/irc-recv.c:2389
#, c-format
msgid " is: \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:2406 src/irc/irc-recv.c:2486
+#: src/irc/irc-recv.c:2405 src/irc/irc-recv.c:2485
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:2452
+#: src/irc/irc-recv.c:2451
msgid "Topic set by "
msgstr ""
-#: src/irc/irc-recv.c:2470
+#: src/irc/irc-recv.c:2469
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:2478
+#: src/irc/irc-recv.c:2477
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:2607
+#: src/irc/irc-recv.c:2606
msgid " on "
msgstr ""
-#: src/irc/irc-recv.c:2714
+#: src/irc/irc-recv.c:2713
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:2767
+#: src/irc/irc-recv.c:2766
msgid "Nicks "
msgstr ""
-#: src/irc/irc-recv.c:2787
+#: src/irc/irc-recv.c:2786
msgid "Channel "
msgstr ""
-#: src/irc/irc-recv.c:2798
+#: src/irc/irc-recv.c:2797
msgid "nicks"
msgstr ""
-#: src/irc/irc-recv.c:2798
+#: src/irc/irc-recv.c:2797
msgid "nick"
msgstr ""
-#: src/irc/irc-recv.c:2806
+#: src/irc/irc-recv.c:2805
msgid "ops"
msgstr ""
-#: src/irc/irc-recv.c:2806
+#: src/irc/irc-recv.c:2805
msgid "op"
msgstr ""
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2814
msgid "halfops"
msgstr ""
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2814
msgid "halfop"
msgstr ""
-#: src/irc/irc-recv.c:2824
+#: src/irc/irc-recv.c:2823
msgid "voices"
msgstr ""
-#: src/irc/irc-recv.c:2824
+#: src/irc/irc-recv.c:2823
msgid "voice"
msgstr ""
-#: src/irc/irc-recv.c:2833
+#: src/irc/irc-recv.c:2832
msgid "normal"
msgstr ""
-#: src/irc/irc-recv.c:2866
+#: src/irc/irc-recv.c:2865
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:2877
+#: src/irc/irc-recv.c:2876
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:2886
+#: src/irc/irc-recv.c:2885
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr ""
+#: src/irc/irc-dcc.c:38
+msgid "Waiting"
+msgstr ""
+
+#: src/irc/irc-dcc.c:38
+msgid "Connecting"
+msgstr ""
+
+#: src/irc/irc-dcc.c:38
+msgid "Active"
+msgstr ""
+
+#: src/irc/irc-dcc.c:38
+msgid "Done"
+msgstr ""
+
+#: src/irc/irc-dcc.c:38
+msgid "Failed"
+msgstr ""
+
+#: src/irc/irc-dcc.c:39
+msgid "Aborted"
+msgstr ""
+
+#: src/irc/irc-dcc.c:85
+#, c-format
+msgid "%s not enough memory for new DCC\n"
+msgstr ""
+
#: src/plugins/perl/wee-perl.c:83
#, c-format
msgid ""
@@ -1511,16 +1540,32 @@ msgstr ""
msgid "%s unable to add handler for \"%s\" message (not enough memory)\n"
msgstr ""
-#: src/gui/curses/gui-display.c:896
+#: src/gui/curses/gui-display.c:559
+msgid "bytes"
+msgstr ""
+
+#: src/gui/curses/gui-display.c:559
+msgid "Kb"
+msgstr ""
+
+#: src/gui/curses/gui-display.c:559
+msgid "Mb"
+msgstr ""
+
+#: src/gui/curses/gui-display.c:559
+msgid "Gb"
+msgstr ""
+
+#: src/gui/curses/gui-display.c:966
#, c-format
msgid "%d:[not connected] "
msgstr ""
-#: src/gui/curses/gui-display.c:904
+#: src/gui/curses/gui-display.c:974
msgid "[Act: "
msgstr ""
-#: src/gui/curses/gui-display.c:939 src/gui/curses/gui-display.c:942
+#: src/gui/curses/gui-display.c:1009 src/gui/curses/gui-display.c:1012
msgid "-MORE-"
msgstr ""
@@ -1528,17 +1573,17 @@ msgstr ""
msgid "server"
msgstr ""
-#: src/gui/gui-common.c:301
+#: src/gui/gui-common.c:302
#, c-format
msgid "%s not enough memory for infobar message\n"
msgstr ""
-#: src/gui/gui-common.c:436
+#: src/gui/gui-common.c:437
#, c-format
msgid "%s not enough memory for new line!\n"
msgstr ""
-#: src/gui/gui-common.c:479
+#: src/gui/gui-common.c:480
msgid "not enough memory!\n"
msgstr ""
@@ -2309,554 +2354,586 @@ msgid ""
"notifications in infobar)"
msgstr ""
-#: src/common/weeconfig.c:199 src/common/weeconfig.c:200
+#: src/common/weeconfig.c:205 src/common/weeconfig.c:206
msgid "color for title bar"
msgstr ""
-#: src/common/weeconfig.c:203 src/common/weeconfig.c:204
+#: src/common/weeconfig.c:209 src/common/weeconfig.c:210
msgid "background for title bar"
msgstr ""
-#: src/common/weeconfig.c:209 src/common/weeconfig.c:210
+#: src/common/weeconfig.c:215 src/common/weeconfig.c:216
msgid "color for chat text"
msgstr ""
-#: src/common/weeconfig.c:213
+#: src/common/weeconfig.c:219
msgid "color for time"
msgstr ""
-#: src/common/weeconfig.c:214
+#: src/common/weeconfig.c:220
msgid "color for time in chat window"
msgstr ""
-#: src/common/weeconfig.c:217
+#: src/common/weeconfig.c:223
msgid "color for time separator"
msgstr ""
-#: src/common/weeconfig.c:218
+#: src/common/weeconfig.c:224
msgid "color for time separator (chat window)"
msgstr ""
-#: src/common/weeconfig.c:221 src/common/weeconfig.c:222
+#: src/common/weeconfig.c:227 src/common/weeconfig.c:228
msgid "color for 1st and 3rd char of prefix"
msgstr ""
-#: src/common/weeconfig.c:225 src/common/weeconfig.c:226
+#: src/common/weeconfig.c:231 src/common/weeconfig.c:232
msgid "color for middle char of prefix"
msgstr ""
-#: src/common/weeconfig.c:229
+#: src/common/weeconfig.c:235
msgid "color for nicks in actions"
msgstr ""
-#: src/common/weeconfig.c:230
+#: src/common/weeconfig.c:236
msgid "color for nicks in actions (chat window)"
msgstr ""
-#: src/common/weeconfig.c:233
+#: src/common/weeconfig.c:239
msgid "color for hostnames"
msgstr ""
-#: src/common/weeconfig.c:234
+#: src/common/weeconfig.c:240
msgid "color for hostnames (chat window)"
msgstr ""
-#: src/common/weeconfig.c:237
+#: src/common/weeconfig.c:243
msgid "color for channel names in actions"
msgstr ""
-#: src/common/weeconfig.c:238
+#: src/common/weeconfig.c:244
msgid "color for channel names in actions (chat window)"
msgstr ""
-#: src/common/weeconfig.c:241
+#: src/common/weeconfig.c:247
msgid "color for dark separators"
msgstr ""
-#: src/common/weeconfig.c:242
+#: src/common/weeconfig.c:248
msgid "color for dark separators (chat window)"
msgstr ""
-#: src/common/weeconfig.c:245
+#: src/common/weeconfig.c:251
msgid "color for highlighted nick"
msgstr ""
-#: src/common/weeconfig.c:246
+#: src/common/weeconfig.c:252
msgid "color for highlighted nick (chat window)"
msgstr ""
-#: src/common/weeconfig.c:249
+#: src/common/weeconfig.c:255
msgid "background for chat"
msgstr ""
-#: src/common/weeconfig.c:250
+#: src/common/weeconfig.c:256
msgid "background for chat window"
msgstr ""
-#: src/common/weeconfig.c:255 src/common/weeconfig.c:256
+#: src/common/weeconfig.c:261 src/common/weeconfig.c:262
msgid "color for status bar"
msgstr ""
-#: src/common/weeconfig.c:259 src/common/weeconfig.c:260
+#: src/common/weeconfig.c:265 src/common/weeconfig.c:266
msgid "color for status bar delimiters"
msgstr ""
-#: src/common/weeconfig.c:263
+#: src/common/weeconfig.c:269
msgid "color for window with new messages"
msgstr ""
-#: src/common/weeconfig.c:264
+#: src/common/weeconfig.c:270
msgid "color for window with new messages (status bar)"
msgstr ""
-#: src/common/weeconfig.c:267
+#: src/common/weeconfig.c:273
msgid "color for window with highlight"
msgstr ""
-#: src/common/weeconfig.c:268
+#: src/common/weeconfig.c:274
msgid "color for window with highlight (status bar)"
msgstr ""
-#: src/common/weeconfig.c:271
+#: src/common/weeconfig.c:277
msgid "color for window with new data (not messages)"
msgstr ""
-#: src/common/weeconfig.c:272
+#: src/common/weeconfig.c:278
msgid "color for window with new data (not messages) (status bar)"
msgstr ""
-#: src/common/weeconfig.c:275
+#: src/common/weeconfig.c:281
msgid "color for \"*MORE*\" text"
msgstr ""
-#: src/common/weeconfig.c:276
+#: src/common/weeconfig.c:282
msgid "color for window with new data (status bar)"
msgstr ""
-#: src/common/weeconfig.c:279 src/common/weeconfig.c:280
+#: src/common/weeconfig.c:285 src/common/weeconfig.c:286
msgid "background for status window"
msgstr ""
-#: src/common/weeconfig.c:285 src/common/weeconfig.c:286
+#: src/common/weeconfig.c:291 src/common/weeconfig.c:292
msgid "color for info bar text"
msgstr ""
-#: src/common/weeconfig.c:289 src/common/weeconfig.c:290
+#: src/common/weeconfig.c:295 src/common/weeconfig.c:296
msgid "color for info bar highlight notification"
msgstr ""
-#: src/common/weeconfig.c:293 src/common/weeconfig.c:294
+#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
msgid "background for info bar window"
msgstr ""
-#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
+#: src/common/weeconfig.c:305 src/common/weeconfig.c:306
msgid "color for input text"
msgstr ""
-#: src/common/weeconfig.c:303 src/common/weeconfig.c:304
+#: src/common/weeconfig.c:309 src/common/weeconfig.c:310
msgid "color for input text (channel name)"
msgstr ""
-#: src/common/weeconfig.c:307 src/common/weeconfig.c:308
+#: src/common/weeconfig.c:313 src/common/weeconfig.c:314
msgid "color for input text (nick name)"
msgstr ""
-#: src/common/weeconfig.c:311 src/common/weeconfig.c:312
+#: src/common/weeconfig.c:317 src/common/weeconfig.c:318
msgid "background for input window"
msgstr ""
-#: src/common/weeconfig.c:317 src/common/weeconfig.c:318
+#: src/common/weeconfig.c:323 src/common/weeconfig.c:324
msgid "color for nicknames"
msgstr ""
-#: src/common/weeconfig.c:321 src/common/weeconfig.c:322
+#: src/common/weeconfig.c:327 src/common/weeconfig.c:328
msgid "color for operator symbol"
msgstr ""
-#: src/common/weeconfig.c:325 src/common/weeconfig.c:326
+#: src/common/weeconfig.c:331 src/common/weeconfig.c:332
msgid "color for half-operator symbol"
msgstr ""
-#: src/common/weeconfig.c:329 src/common/weeconfig.c:330
+#: src/common/weeconfig.c:335 src/common/weeconfig.c:336
msgid "color for voice symbol"
msgstr ""
-#: src/common/weeconfig.c:333 src/common/weeconfig.c:334
+#: src/common/weeconfig.c:339 src/common/weeconfig.c:340
msgid "color for nick separator"
msgstr ""
-#: src/common/weeconfig.c:337 src/common/weeconfig.c:338
+#: src/common/weeconfig.c:343 src/common/weeconfig.c:344
msgid "color for local nick"
msgstr ""
-#: src/common/weeconfig.c:341 src/common/weeconfig.c:342
+#: src/common/weeconfig.c:347 src/common/weeconfig.c:348
msgid "color for other nick in private window"
msgstr ""
-#: src/common/weeconfig.c:345 src/common/weeconfig.c:346
+#: src/common/weeconfig.c:351 src/common/weeconfig.c:352
msgid "background for nicknames"
msgstr ""
-#: src/common/weeconfig.c:359
+#: src/common/weeconfig.c:357 src/common/weeconfig.c:358
+msgid "color for \"waiting\" dcc status"
+msgstr ""
+
+#: src/common/weeconfig.c:361 src/common/weeconfig.c:362
+msgid "color for \"connecting\" dcc status"
+msgstr ""
+
+#: src/common/weeconfig.c:365 src/common/weeconfig.c:366
+msgid "color for \"active\" dcc status"
+msgstr ""
+
+#: src/common/weeconfig.c:369 src/common/weeconfig.c:370
+msgid "color for \"done\" dcc status"
+msgstr ""
+
+#: src/common/weeconfig.c:373 src/common/weeconfig.c:374
+msgid "color for \"failed\" dcc status"
+msgstr ""
+
+#: src/common/weeconfig.c:377 src/common/weeconfig.c:378
+msgid "color for \"aborted\" dcc status"
+msgstr ""
+
+#: src/common/weeconfig.c:391
msgid "max lines in history (per window)"
msgstr ""
-#: src/common/weeconfig.c:360
+#: src/common/weeconfig.c:392
msgid ""
"maximum number of lines in history for one server/channel/private window (0 "
"= unlimited)"
msgstr ""
-#: src/common/weeconfig.c:364
+#: src/common/weeconfig.c:396
msgid "max user commands in history"
msgstr ""
-#: src/common/weeconfig.c:365
+#: src/common/weeconfig.c:397
msgid "maximum number of user commands in history (0 = unlimited)"
msgstr ""
-#: src/common/weeconfig.c:382 src/common/weeconfig.c:383
+#: src/common/weeconfig.c:414 src/common/weeconfig.c:415
msgid "automatically log channel chats"
msgstr ""
-#: src/common/weeconfig.c:386 src/common/weeconfig.c:387
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
msgid "automatically log private chats"
msgstr ""
-#: src/common/weeconfig.c:390
+#: src/common/weeconfig.c:422
msgid "path for log files"
msgstr ""
-#: src/common/weeconfig.c:391
+#: src/common/weeconfig.c:423
msgid "path for WeeChat log files"
msgstr ""
-#: src/common/weeconfig.c:394
+#: src/common/weeconfig.c:426
msgid "name for log files"
msgstr ""
-#: src/common/weeconfig.c:395
+#: src/common/weeconfig.c:427
msgid ""
"name for log files (%S == irc server name, %N == channel name (or nickname "
"if private chat)"
msgstr ""
-#: src/common/weeconfig.c:399
+#: src/common/weeconfig.c:431
msgid "timestamp for log"
msgstr ""
-#: src/common/weeconfig.c:400
+#: src/common/weeconfig.c:432
msgid "timestamp for log (see man strftime for date/time specifiers)"
msgstr ""
-#: src/common/weeconfig.c:403
+#: src/common/weeconfig.c:435
msgid "start string for log files"
msgstr ""
-#: src/common/weeconfig.c:404
+#: src/common/weeconfig.c:436
msgid ""
"text written when starting new log file (see man strftime for date/time "
"specifiers)"
msgstr ""
-#: src/common/weeconfig.c:408
+#: src/common/weeconfig.c:440
msgid "end string for log files"
msgstr ""
-#: src/common/weeconfig.c:409
+#: src/common/weeconfig.c:441
msgid ""
"text written when ending log file (see man strftime for date/time specifiers)"
msgstr ""
-#: src/common/weeconfig.c:428
+#: src/common/weeconfig.c:461
msgid "automatically accept dcc files"
msgstr ""
-#: src/common/weeconfig.c:429
+#: src/common/weeconfig.c:462
msgid "automatically accept incoming dcc files"
msgstr ""
-#: src/common/weeconfig.c:432
+#: src/common/weeconfig.c:465
msgid "max size when auto accepting file"
msgstr ""
-#: src/common/weeconfig.c:433
+#: src/common/weeconfig.c:466
msgid "maximum size for incoming file when automatically accepted"
msgstr ""
-#: src/common/weeconfig.c:436
+#: src/common/weeconfig.c:469
msgid "automatically accept dcc chats"
msgstr ""
-#: src/common/weeconfig.c:437
+#: src/common/weeconfig.c:470
msgid "automatically accept dcc chats (use carefully!)"
msgstr ""
-#: src/common/weeconfig.c:440
+#: src/common/weeconfig.c:473
msgid "timeout for dcc request"
msgstr ""
-#: src/common/weeconfig.c:441
+#: src/common/weeconfig.c:474
msgid "timeout for dcc request (in seconds)"
msgstr ""
-#: src/common/weeconfig.c:444
+#: src/common/weeconfig.c:477
+msgid "block size for dcc packets"
+msgstr ""
+
+#: src/common/weeconfig.c:478
+msgid "block size for dcc packets in bytes (default: 1024)"
+msgstr ""
+
+#: src/common/weeconfig.c:481
msgid "path for incoming files with dcc"
msgstr ""
-#: src/common/weeconfig.c:445
+#: src/common/weeconfig.c:482
msgid "path for writing incoming files with dcc (default: user home)"
msgstr ""
-#: src/common/weeconfig.c:448
+#: src/common/weeconfig.c:485
msgid "default path for sending files with dcc"
msgstr ""
-#: src/common/weeconfig.c:449
+#: src/common/weeconfig.c:486
msgid ""
"path for reading files when sending thru dcc (when no path is specified)"
msgstr ""
-#: src/common/weeconfig.c:452
+#: src/common/weeconfig.c:489
msgid "automatically rename dcc files if already exists"
msgstr ""
-#: src/common/weeconfig.c:453
+#: src/common/weeconfig.c:490
msgid "rename incoming files if already exists (add '.1', '.2', ...)"
msgstr ""
-#: src/common/weeconfig.c:456
+#: src/common/weeconfig.c:493
msgid "automatically resume aborted transfers"
msgstr ""
-#: src/common/weeconfig.c:457
+#: src/common/weeconfig.c:494
msgid ""
"automatically resume dcc transfer if connection with remote host is loosed"
msgstr ""
-#: src/common/weeconfig.c:471
+#: src/common/weeconfig.c:508
msgid "use proxy"
msgstr ""
-#: src/common/weeconfig.c:472
+#: src/common/weeconfig.c:509
msgid "use a proxy server to connect to irc server"
msgstr ""
-#: src/common/weeconfig.c:475
+#: src/common/weeconfig.c:512
msgid "proxy address"
msgstr ""
-#: src/common/weeconfig.c:476
+#: src/common/weeconfig.c:513
msgid "proxy server address (IP or hostname)"
msgstr ""
-#: src/common/weeconfig.c:479
+#: src/common/weeconfig.c:516
msgid "port for proxy"
msgstr ""
-#: src/common/weeconfig.c:480
+#: src/common/weeconfig.c:517
msgid "port for connecting to proxy server"
msgstr ""
-#: src/common/weeconfig.c:483
+#: src/common/weeconfig.c:520
msgid "proxy password"
msgstr ""
-#: src/common/weeconfig.c:484
+#: src/common/weeconfig.c:521
msgid "password for proxy server"
msgstr ""
-#: src/common/weeconfig.c:495
+#: src/common/weeconfig.c:532
msgid "server name"
msgstr ""
-#: src/common/weeconfig.c:496
+#: src/common/weeconfig.c:533
msgid "name associated to IRC server (for display only)"
msgstr ""
-#: src/common/weeconfig.c:499
+#: src/common/weeconfig.c:536
msgid "automatically connect to server"
msgstr ""
-#: src/common/weeconfig.c:500
+#: src/common/weeconfig.c:537
msgid "automatically connect to server when WeeChat is starting"
msgstr ""
-#: src/common/weeconfig.c:503
+#: src/common/weeconfig.c:540
msgid "server address or hostname"
msgstr ""
-#: src/common/weeconfig.c:504
+#: src/common/weeconfig.c:541
msgid "IP address or hostname of IRC server"
msgstr ""
-#: src/common/weeconfig.c:507
+#: src/common/weeconfig.c:544
msgid "port for IRC server"
msgstr ""
-#: src/common/weeconfig.c:508
+#: src/common/weeconfig.c:545
msgid "port for connecting to server"
msgstr ""
-#: src/common/weeconfig.c:511
+#: src/common/weeconfig.c:548
msgid "server password"
msgstr ""
-#: src/common/weeconfig.c:512
+#: src/common/weeconfig.c:549
msgid "password for IRC server"
msgstr ""
-#: src/common/weeconfig.c:515
+#: src/common/weeconfig.c:552
msgid "nickname for server"
msgstr ""
-#: src/common/weeconfig.c:516
+#: src/common/weeconfig.c:553
msgid "nickname to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:519
+#: src/common/weeconfig.c:556
msgid "alternate nickname for server"
msgstr ""
-#: src/common/weeconfig.c:520
+#: src/common/weeconfig.c:557
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr ""
-#: src/common/weeconfig.c:523
+#: src/common/weeconfig.c:560
msgid "2nd alternate nickname for server"
msgstr ""
-#: src/common/weeconfig.c:524
+#: src/common/weeconfig.c:561
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
msgstr ""
-#: src/common/weeconfig.c:527
+#: src/common/weeconfig.c:564
msgid "user name for server"
msgstr ""
-#: src/common/weeconfig.c:528
+#: src/common/weeconfig.c:565
msgid "user name to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:531
+#: src/common/weeconfig.c:568
msgid "real name for server"
msgstr ""
-#: src/common/weeconfig.c:532
+#: src/common/weeconfig.c:569
msgid "real name to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:535 src/common/weeconfig.c:536
+#: src/common/weeconfig.c:572 src/common/weeconfig.c:573
msgid "first command to run when connected to server"
msgstr ""
-#: src/common/weeconfig.c:539
+#: src/common/weeconfig.c:576
msgid "list of channels to join when connected to server"
msgstr ""
-#: src/common/weeconfig.c:540
+#: src/common/weeconfig.c:577
msgid "comma separated list of channels to join when connected to server"
msgstr ""
-#: src/common/weeconfig.c:762
+#: src/common/weeconfig.c:799
#, c-format
msgid "%s %s, line %d: new server, but previous was incomplete\n"
msgstr ""
-#: src/common/weeconfig.c:771
+#: src/common/weeconfig.c:808
#, c-format
msgid "%s %s, line %d: server '%s' already exists\n"
msgstr ""
-#: src/common/weeconfig.c:783
+#: src/common/weeconfig.c:820
#, c-format
msgid "%s %s, line %d: unable to create server\n"
msgstr ""
-#: src/common/weeconfig.c:822
+#: src/common/weeconfig.c:859
#, c-format
msgid "%s unable to assign default int with string (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:833
+#: src/common/weeconfig.c:870
#, c-format
msgid "%s unable to assign default color (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:872
+#: src/common/weeconfig.c:909
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr ""
-#: src/common/weeconfig.c:904
+#: src/common/weeconfig.c:941
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
msgstr ""
-#: src/common/weeconfig.c:921
+#: src/common/weeconfig.c:958
#, c-format
msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:939
+#: src/common/weeconfig.c:976
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
msgstr ""
-#: src/common/weeconfig.c:973
+#: src/common/weeconfig.c:1010
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr ""
-#: src/common/weeconfig.c:984
+#: src/common/weeconfig.c:1021
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
"Expected: boolean value: 'off' or 'on'\n"
msgstr ""
-#: src/common/weeconfig.c:993
+#: src/common/weeconfig.c:1030
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
"Expected: integer between %d and %d\n"
msgstr ""
-#: src/common/weeconfig.c:1004
+#: src/common/weeconfig.c:1041
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
"Expected: one of these strings: "
msgstr ""
-#: src/common/weeconfig.c:1020
+#: src/common/weeconfig.c:1057
#, c-format
msgid "%s %s, line %d: invalid color name for option '%s'\n"
msgstr ""
-#: src/common/weeconfig.c:1079 src/common/weeconfig.c:1247
+#: src/common/weeconfig.c:1116 src/common/weeconfig.c:1284
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr ""
-#: src/common/weeconfig.c:1085
+#: src/common/weeconfig.c:1122
#, c-format
msgid "%s: creating default config file...\n"
msgstr ""
-#: src/common/weeconfig.c:1086
+#: src/common/weeconfig.c:1123
msgid "creating default config file\n"
msgstr ""
-#: src/common/weeconfig.c:1089 src/common/weeconfig.c:1256
+#: src/common/weeconfig.c:1126 src/common/weeconfig.c:1293
#, c-format
msgid ""
"#\n"
"# %s configuration file, created by %s v%s on %s#\n"
msgstr ""
-#: src/common/weeconfig.c:1253
+#: src/common/weeconfig.c:1290
msgid "saving config to disk\n"
msgstr ""
diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c
index 18703b4e5..4936443c8 100644
--- a/src/common/weeconfig.c
+++ b/src/common/weeconfig.c
@@ -193,6 +193,12 @@ int cfg_col_nick_sep;
int cfg_col_nick_self;
int cfg_col_nick_private;
int cfg_col_nick_bg;
+int cfg_col_dcc_waiting;
+int cfg_col_dcc_connecting;
+int cfg_col_dcc_active;
+int cfg_col_dcc_done;
+int cfg_col_dcc_failed;
+int cfg_col_dcc_aborted;
t_config_option weechat_options_colors[] =
{ /* title window */
@@ -347,6 +353,32 @@ t_config_option weechat_options_colors[] =
OPTION_TYPE_COLOR, 0, 0, 0,
"default", NULL, &cfg_col_nick_bg, NULL, &config_change_color },
+ /* DCC */
+ { "col_dcc_waiting", N_("color for \"waiting\" dcc status"),
+ N_("color for \"waiting\" dcc status"),
+ OPTION_TYPE_COLOR, 0, 0, 0,
+ "white", NULL, &cfg_col_dcc_waiting, NULL, &config_change_color },
+ { "col_dcc_connecting", N_("color for \"connecting\" dcc status"),
+ N_("color for \"connecting\" dcc status"),
+ OPTION_TYPE_COLOR, 0, 0, 0,
+ "yellow", NULL, &cfg_col_dcc_connecting, NULL, &config_change_color },
+ { "col_dcc_active", N_("color for \"active\" dcc status"),
+ N_("color for \"active\" dcc status"),
+ OPTION_TYPE_COLOR, 0, 0, 0,
+ "lightblue", NULL, &cfg_col_dcc_active, NULL, &config_change_color },
+ { "col_dcc_done", N_("color for \"done\" dcc status"),
+ N_("color for \"done\" dcc status"),
+ OPTION_TYPE_COLOR, 0, 0, 0,
+ "lightgreen", NULL, &cfg_col_dcc_done, NULL, &config_change_color },
+ { "col_dcc_failed", N_("color for \"failed\" dcc status"),
+ N_("color for \"failed\" dcc status"),
+ OPTION_TYPE_COLOR, 0, 0, 0,
+ "lightred", NULL, &cfg_col_dcc_failed, NULL, &config_change_color },
+ { "col_dcc_aborted", N_("color for \"aborted\" dcc status"),
+ N_("color for \"aborted\" dcc status"),
+ OPTION_TYPE_COLOR, 0, 0, 0,
+ "lightred", NULL, &cfg_col_dcc_aborted, NULL, &config_change_color },
+
{ NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
};
@@ -419,6 +451,7 @@ int cfg_dcc_auto_accept_files;
int cfg_dcc_auto_accept_max_size;
int cfg_dcc_auto_accept_chats;
int cfg_dcc_timeout;
+int cfg_dcc_blocksize;
char *cfg_dcc_download_path;
char *cfg_dcc_upload_path;
int cfg_dcc_auto_rename;
@@ -441,6 +474,10 @@ t_config_option weechat_options_dcc[] =
N_("timeout for dcc request (in seconds)"),
OPTION_TYPE_INT, 1, INT_MAX, 300,
NULL, NULL, &cfg_dcc_timeout, NULL, NULL },
+ { "dcc_blocksize", N_("block size for dcc packets"),
+ N_("block size for dcc packets in bytes (default: 1024)"),
+ OPTION_TYPE_INT, 1024, 102400, 1024,
+ NULL, NULL, &cfg_dcc_blocksize, NULL, NULL },
{ "dcc_download_path", N_("path for incoming files with dcc"),
N_("path for writing incoming files with dcc (default: user home)"),
OPTION_TYPE_STRING, 0, 0, 0,
@@ -1263,8 +1300,7 @@ config_write (char *config_name)
if ((i != CONFIG_SECTION_ALIAS) && (i != CONFIG_SECTION_SERVER))
{
fprintf (file, "\n[%s]\n", config_sections[i].section_name);
- if ((i == CONFIG_SECTION_LOG) || (i == CONFIG_SECTION_DCC) ||
- (i == CONFIG_SECTION_PROXY))
+ if ((i == CONFIG_SECTION_LOG) || (i == CONFIG_SECTION_PROXY))
fprintf (file,
"# WARNING!!! Options for section \"%s\" are not developed!\n",
config_sections[i].section_name);
diff --git a/src/common/weeconfig.h b/src/common/weeconfig.h
index 88403fe0f..91ddcdf7a 100644
--- a/src/common/weeconfig.h
+++ b/src/common/weeconfig.h
@@ -127,6 +127,12 @@ extern int cfg_col_nick_sep;
extern int cfg_col_nick_self;
extern int cfg_col_nick_private;
extern int cfg_col_nick_bg;
+extern int cfg_col_dcc_waiting;
+extern int cfg_col_dcc_connecting;
+extern int cfg_col_dcc_active;
+extern int cfg_col_dcc_done;
+extern int cfg_col_dcc_failed;
+extern int cfg_col_dcc_aborted;
extern int cfg_history_max_lines;
extern int cfg_history_max_commands;
@@ -143,6 +149,7 @@ extern int cfg_dcc_auto_accept_files;
extern int cfg_dcc_auto_accept_max_size;
extern int cfg_dcc_auto_accept_chats;
extern int cfg_dcc_timeout;
+extern int cfg_dcc_blocksize;
extern char *cfg_dcc_download_path;
extern char *cfg_dcc_upload_path;
extern int cfg_dcc_auto_rename;
diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c
index 9ee926f71..2f8f2c2f4 100644
--- a/src/gui/curses/gui-display.c
+++ b/src/gui/curses/gui-display.c
@@ -553,8 +553,14 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
{
t_gui_window *ptr_win;
t_gui_line *ptr_line;
+ t_dcc *ptr_dcc;
char format_empty[32];
- int i, lines_used;
+ int i, j, lines_used, num_bars;
+ char *unit_name[] = { N_("bytes"), N_("Kb"), N_("Mb"), N_("Gb") };
+ char *unit_format[] = { "%.0Lf", "%.1Lf", "%.02Lf", "%.02Lf" };
+ long unit_divide[] = { 1, 1024, 1024*1024, 1024*1024,1024 };
+ int num_unit;
+ char format[32];
for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
{
@@ -562,8 +568,7 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
{
if (erase)
{
- if (has_colors ())
- gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
+ gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
snprintf (format_empty, 32, "%%-%ds", ptr_win->win_chat_width);
for (i = 0; i < ptr_win->win_chat_height; i++)
@@ -572,16 +577,65 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
}
}
- if (has_colors ())
- gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
+ gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
if (buffer->dcc)
{
- mvwprintw (ptr_win->win_chat, ptr_win->win_y, ptr_win->win_x,
- "%s", _(" Type Status Filename / progress"));
- for (i = 0; i < ptr_win->win_width; i++)
- mvwprintw (ptr_win->win_chat, 1, i, "%c", '-');
- move (ptr_win->win_y + 3, ptr_win->win_x);
+ i = 0;
+ for (ptr_dcc = dcc_list; ptr_dcc; ptr_dcc = ptr_dcc->next_dcc)
+ {
+ if (i >= ptr_win->win_chat_height - 1)
+ break;
+ if ((ptr_dcc->type == DCC_FILE_RECV)
+ || (ptr_dcc->type == DCC_FILE_SEND))
+ {
+ gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
+ mvwprintw (ptr_win->win_chat, i, 0, " %-16s %s",
+ ptr_dcc->nick, ptr_dcc->filename);
+ gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
+ mvwprintw (ptr_win->win_chat, i + 1, 0, " %s ",
+ (ptr_dcc->type == DCC_FILE_RECV) ?
+ "--->" : "<---");
+ gui_window_set_color (ptr_win->win_chat,
+ COLOR_DCC_WAITING + ptr_dcc->status);
+ wprintw (ptr_win->win_chat, "%-10s",
+ dcc_status_string[ptr_dcc->status]);
+ gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
+ wprintw (ptr_win->win_chat, " [",
+ dcc_status_string[ptr_dcc->status]);
+ if (ptr_dcc->size == 0)
+ num_bars = 10;
+ else
+ num_bars = (int)((((long double)(ptr_dcc->pos)/(long double)(ptr_dcc->size))*100) / 10);
+ for (j = 0; j < num_bars - 1; j++)
+ wprintw (ptr_win->win_chat, "=");
+ if (num_bars > 0)
+ wprintw (ptr_win->win_chat, ">");
+ for (j = 0; j < 10 - num_bars; j++)
+ wprintw (ptr_win->win_chat, " ");
+ if (ptr_dcc->size < 1024*10)
+ num_unit = 0;
+ else if (ptr_dcc->size < 1024*1024)
+ num_unit = 1;
+ else if (ptr_dcc->size < 1024*1024*1024)
+ num_unit = 2;
+ else
+ num_unit = 3;
+ wprintw (ptr_win->win_chat, "] %3lu%% ",
+ (unsigned long)(((long double)(ptr_dcc->pos)/(long double)(ptr_dcc->size))*100),
+ dcc_status_string[ptr_dcc->status]);
+ sprintf (format, "%s %%s / %s %%s",
+ unit_format[num_unit],
+ unit_format[num_unit]);
+ wprintw (ptr_win->win_chat, format,
+ ((long double) ptr_dcc->pos) / ((long double)(unit_divide[num_unit])),
+ unit_name[num_unit],
+ ((long double) ptr_dcc->size) / ((long double)(unit_divide[num_unit])),
+ unit_name[num_unit]);
+ i += 2;
+ }
+ }
+ move (ptr_win->win_y + 1, ptr_win->win_x);
}
else
{
@@ -653,8 +707,7 @@ gui_draw_buffer_nick (t_gui_buffer *buffer, int erase)
{
if (erase)
{
- if (has_colors ())
- gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK);
+ gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK);
snprintf (format_empty, 32, "%%-%ds", ptr_win->win_nick_width);
for (i = 0; i < ptr_win->win_nick_height; i++)
@@ -682,8 +735,7 @@ gui_draw_buffer_nick (t_gui_buffer *buffer, int erase)
ptr_win->win_nick_x);
gui_draw_buffer_chat (buffer, 1);
- if (has_colors ())
- gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK);
+ gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK);
snprintf (format_empty, 32, "%%-%ds", ptr_win->win_nick_width);
for (i = 0; i < ptr_win->win_nick_height; i++)
@@ -908,7 +960,7 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
{
gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS);
if (ptr_win->buffer->dcc)
- wprintw (ptr_win->win_status, _("%d:<DCC> "),
+ wprintw (ptr_win->win_status, "%d:<DCC> ",
ptr_win->buffer->number);
else
wprintw (ptr_win->win_status, _("%d:[not connected] "),
@@ -1577,6 +1629,19 @@ gui_init_colors ()
color_attr[COLOR_WIN_NICK_FIRST + i - 1] =
(color & A_BOLD) ? A_BOLD : 0;
}
+
+ init_pair (COLOR_DCC_WAITING,
+ cfg_col_dcc_waiting & A_CHARTEXT, cfg_col_chat_bg);
+ init_pair (COLOR_DCC_CONNECTING,
+ cfg_col_dcc_connecting & A_CHARTEXT, cfg_col_chat_bg);
+ init_pair (COLOR_DCC_ACTIVE,
+ cfg_col_dcc_active & A_CHARTEXT, cfg_col_chat_bg);
+ init_pair (COLOR_DCC_DONE,
+ cfg_col_dcc_done & A_CHARTEXT, cfg_col_chat_bg);
+ init_pair (COLOR_DCC_FAILED,
+ cfg_col_dcc_failed & A_CHARTEXT, cfg_col_chat_bg);
+ init_pair (COLOR_DCC_ABORTED,
+ cfg_col_dcc_aborted & A_CHARTEXT, cfg_col_chat_bg);
color_attr[COLOR_WIN_TITLE - 1] = cfg_col_title & A_BOLD;
color_attr[COLOR_WIN_CHAT - 1] = cfg_col_chat & A_BOLD;
@@ -1608,6 +1673,12 @@ gui_init_colors ()
color_attr[COLOR_WIN_NICK_SEP - 1] = 0;
color_attr[COLOR_WIN_NICK_SELF - 1] = cfg_col_nick_self & A_BOLD;
color_attr[COLOR_WIN_NICK_PRIVATE - 1] = cfg_col_nick_private & A_BOLD;
+ color_attr[COLOR_DCC_WAITING - 1] = cfg_col_dcc_waiting & A_BOLD;
+ color_attr[COLOR_DCC_CONNECTING - 1] = cfg_col_dcc_connecting & A_BOLD;
+ color_attr[COLOR_DCC_ACTIVE - 1] = cfg_col_dcc_active & A_BOLD;
+ color_attr[COLOR_DCC_DONE - 1] = cfg_col_dcc_done & A_BOLD;
+ color_attr[COLOR_DCC_FAILED - 1] = cfg_col_dcc_failed & A_BOLD;
+ color_attr[COLOR_DCC_ABORTED - 1] = cfg_col_dcc_aborted & A_BOLD;
}
}
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 469980fc8..bed1707cf 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -26,7 +26,7 @@
#define INPUT_BUFFER_BLOCK_SIZE 256
-#define NUM_COLORS 39
+#define NUM_COLORS 45
#define COLOR_WIN_TITLE 1
#define COLOR_WIN_CHAT 2
#define COLOR_WIN_CHAT_TIME 3
@@ -59,6 +59,12 @@
#define COLOR_WIN_NICK_FIRST 30
#define COLOR_WIN_NICK_LAST 39
#define COLOR_WIN_NICK_NUMBER (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1)
+#define COLOR_DCC_WAITING 40
+#define COLOR_DCC_CONNECTING 41
+#define COLOR_DCC_ACTIVE 42
+#define COLOR_DCC_DONE 43
+#define COLOR_DCC_FAILED 44
+#define COLOR_DCC_ABORTED 45
#define SERVER(buffer) ((t_irc_server *)(buffer->server))
#define CHANNEL(buffer) ((t_irc_channel *)(buffer->channel))
diff --git a/src/irc/irc-dcc.c b/src/irc/irc-dcc.c
index 3178149a9..d2276ef7c 100644
--- a/src/irc/irc-dcc.c
+++ b/src/irc/irc-dcc.c
@@ -24,8 +24,19 @@
#include "config.h"
#endif
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/weechat.h"
#include "irc.h"
+#include "../common/weeconfig.h"
+#include "../gui/gui.h"
+
+
+t_dcc *dcc_list = NULL; /* DCC files & chat list */
+char *dcc_status_string[] = /* strings for DCC status */
+{ N_("Waiting"), N_("Connecting"), N_("Active"), N_("Done"), N_("Failed"),
+ N_("Aborted") };
/*
@@ -45,3 +56,52 @@ void
dcc_send ()
{
}
+
+/*
+ * dcc_free: free DCC struct
+ */
+
+void
+dcc_free (t_dcc *ptr_dcc)
+{
+ if (ptr_dcc->nick)
+ free (ptr_dcc->nick);
+ if (ptr_dcc->filename)
+ free (ptr_dcc->filename);
+}
+
+/*
+ * dcc_add: add a DCC file to queue
+ */
+
+t_dcc *
+dcc_add (t_irc_server *server, int type, unsigned long addr, int port, char *nick, char *filename,
+ unsigned int size)
+{
+ t_dcc *new_dcc;
+
+ if ((new_dcc = (t_dcc *) malloc (sizeof (t_dcc))) == NULL)
+ {
+ gui_printf (NULL, _("%s not enough memory for new DCC\n"), WEECHAT_ERROR);
+ return NULL;
+ }
+ new_dcc->server = server;
+ new_dcc->type = type;
+ new_dcc->status = DCC_ACTIVE;
+ new_dcc->addr = addr;
+ new_dcc->port = port;
+ new_dcc->nick = strdup (nick);
+ new_dcc->file = -1;
+ new_dcc->filename = strdup (filename);
+ new_dcc->size = size;
+ new_dcc->pos = 0;
+ new_dcc->next_dcc = dcc_list;
+ dcc_list = new_dcc;
+
+ gui_printf (NULL, "Incoming DCC file: type:%d, nick:%s, address:%d.%d.%d.%d, "
+ "port=%d, name=%s, size=%lu\n",
+ type, nick,
+ addr >> 24, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff,
+ port, filename, size);
+ return new_dcc;
+}
diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c
index 0fb2313d4..f203a63d2 100644
--- a/src/irc/irc-recv.c
+++ b/src/irc/irc-recv.c
@@ -1140,9 +1140,8 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
pos2--;
pos2[1] = '\0';
- wee_log_printf ("Incoming DCC file (NOT DEVELOPED!): "
- "\"%s\", address=\"%s\", port=\"%s\", size=\"%s\"\n",
- pos_file, pos_addr, pos_port, pos_size);
+ dcc_add (server, DCC_FILE_RECV, (unsigned long) atol (pos_addr),
+ atoi (pos_port), host, pos_file, (unsigned int) atoi (pos_size));
return 0;
}
diff --git a/src/irc/irc-send.c b/src/irc/irc-send.c
index 9dfde6d54..d33bb275c 100644
--- a/src/irc/irc-send.c
+++ b/src/irc/irc-send.c
@@ -734,6 +734,7 @@ irc_cmd_send_query (t_irc_server *server, char *arguments)
{
char *pos;
t_irc_channel *ptr_channel;
+ t_gui_buffer *ptr_buffer;
pos = strchr (arguments, ' ');
if (pos)
@@ -761,6 +762,18 @@ irc_cmd_send_query (t_irc_server *server, char *arguments)
}
gui_draw_buffer_title (ptr_channel->buffer, 1);
}
+ else
+ {
+ for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
+ {
+ if (ptr_buffer->channel == ptr_channel)
+ {
+ gui_switch_to_buffer (gui_current_window, ptr_buffer);
+ gui_redraw_buffer (ptr_buffer);
+ break;
+ }
+ }
+ }
/* display text if given */
if (pos)
diff --git a/src/irc/irc.h b/src/irc/irc.h
index d194cfda7..e3f08440a 100644
--- a/src/irc/irc.h
+++ b/src/irc/irc.h
@@ -23,6 +23,8 @@
#include "../gui/gui.h"
+/* prefixes for chat window */
+
#define PREFIX_SERVER "-@-"
#define PREFIX_INFO "-=-"
#define PREFIX_ACTION_ME "-*-"
@@ -34,6 +36,8 @@
#define CHANNEL_PREFIX "#&+!"
+/* channel modes */
+
#define NUM_CHANNEL_MODES 7
#define CHANNEL_MODE_INVITE 0
#define CHANNEL_MODE_KEY 1
@@ -50,6 +54,20 @@
#define DEFAULT_IRC_PORT 6667
+/* DCC types & status */
+
+#define DCC_CHAT_RECV 0 /* receiving DCC chat */
+#define DCC_CHAT_SEND 1 /* sending DCC chat */
+#define DCC_FILE_RECV 2 /* incoming DCC file */
+#define DCC_FILE_SEND 3 /* sending DCC file */
+
+#define DCC_WAITING 0 /* waiting for host answer */
+#define DCC_CONNECTING 1 /* connecting to host */
+#define DCC_ACTIVE 2 /* sending/receiving data */
+#define DCC_DONE 3 /* transfer done */
+#define DCC_FAILED 4 /* DCC failed */
+#define DCC_ABORTED 5 /* DCC aborted by user */
+
/* nick types */
typedef struct t_irc_nick t_irc_nick;
@@ -143,6 +161,8 @@ struct t_irc_command
/* function called when cmd is received */
};
+/* irc messages */
+
typedef struct t_irc_message t_irc_message;
struct t_irc_message
@@ -152,10 +172,31 @@ struct t_irc_message
t_irc_message *next_message; /* link to next message */
};
+/* DCC */
+
+typedef struct t_dcc t_dcc;
+
+struct t_dcc
+{
+ t_irc_server *server; /* irc server */
+ int type; /* DCC type (send or receive) */
+ int status; /* DCC status (waiting, sending, ..) */
+ unsigned long addr; /* IP address */
+ int port; /* port */
+ char *nick; /* remote nick */
+ int file; /* local file (for reading or writing) */
+ char *filename; /* local filename */
+ unsigned long size; /* file size */
+ unsigned long pos; /* number of bytes received/sent */
+ t_dcc *next_dcc; /* link to next dcc file/chat */
+};
+
extern t_irc_command irc_commands[];
extern t_irc_server *irc_servers, *current_irc_server;
extern t_irc_message *recv_msgq, *msgq_last_msg;
extern t_irc_channel *current_channel;
+extern t_dcc *dcc_list;
+extern char *dcc_status_string[6];
extern char *channel_modes;
/* server functions (irc-server.c) */
@@ -201,6 +242,8 @@ extern int nick_get_max_length (t_irc_channel *);
/* DCC functions (irc-dcc.c) */
extern void dcc_send ();
+extern t_dcc *dcc_add (t_irc_server *, int, unsigned long, int, char *, char *,
+ unsigned int);
/* IRC display (irc-diplay.c) */
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 95f06b03f..a39e1eb59 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,12 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-ChangeLog - 2004-08-25
+ChangeLog - 2004-09-01
Version 0.0.8 (under dev!):
+ * DCC window with Alt-D
+ * /query command now reopens private buffer if already opened
* added key for redrawing terminal (Ctrl-L)
* added key for clearing hotlist (Alt-R)
diff --git a/weechat/configure.in b/weechat/configure.in
index ffbef1274..ae93a6352 100644
--- a/weechat/configure.in
+++ b/weechat/configure.in
@@ -19,10 +19,10 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.0.8-pre1, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.0.8-pre2, flashcode@flashtux.org)
AC_CONFIG_SRCDIR([src/common/weechat.c])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.0.8-pre1])
+AM_INIT_AUTOMAKE([weechat], [0.0.8-pre2])
# Checks for programs.
AC_PROG_CC
diff --git a/weechat/po/POTFILES.in b/weechat/po/POTFILES.in
index ff801a86e..1727c1dbb 100644
--- a/weechat/po/POTFILES.in
+++ b/weechat/po/POTFILES.in
@@ -6,6 +6,7 @@
./src/irc/irc-display.c
./src/irc/irc-send.c
./src/irc/irc-recv.c
+./src/irc/irc-dcc.c
./src/plugins/perl/wee-perl.c
./src/plugins/perl/wee-perl.h
./src/plugins/plugins.c
diff --git a/weechat/po/fr.po b/weechat/po/fr.po
index 2f83be93a..9deeedf82 100644
--- a/weechat/po/fr.po
+++ b/weechat/po/fr.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: WeeChat 0.0.8-pre1\n"
+"Project-Id-Version: WeeChat 0.0.8-pre2\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2004-08-08 20:47+0200\n"
+"POT-Creation-Date: 2004-09-01 00:46+0200\n"
"PO-Revision-Date: 2004-08-08 20:47+0200\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
msgid "%s cannot allocate new nick\n"
msgstr "%s ompossible d'allouer un nouveau pseudo\n"
-#: src/irc/irc-server.c:130 src/common/weeconfig.c:1198
+#: src/irc/irc-server.c:130 src/common/weeconfig.c:1235
msgid "Unable to get user's name"
msgstr "Impossible de déterminer le nom d'utilisateur"
@@ -1137,7 +1137,7 @@ msgstr "drapeau de mode inconnu"
msgid "can't change mode for other users"
msgstr "impossible de changer le mode pour les autres utilisateurs"
-#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2897
+#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2896
msgid "unknown"
msgstr "inconnu"
@@ -1147,7 +1147,7 @@ msgid "%s: using local hostname \"%s\"\n"
msgstr "%s: utilisation du nom de machine local \"%s\"\n"
#: src/irc/irc-send.c:210 src/irc/irc-send.c:234 src/irc/irc-send.c:322
-#: src/irc/irc-send.c:568 src/irc/irc-send.c:622 src/irc/irc-send.c:1081
+#: src/irc/irc-send.c:568 src/irc/irc-send.c:622 src/irc/irc-send.c:1094
#, c-format
msgid "%s \"%s\" command can only be executed in a channel window\n"
msgstr ""
@@ -1155,7 +1155,7 @@ msgstr ""
"canal\n"
#: src/irc/irc-send.c:394 src/irc/irc-send.c:465 src/irc/irc-send.c:669
-#: src/irc/irc-send.c:682 src/irc/irc-send.c:976
+#: src/irc/irc-send.c:682 src/irc/irc-send.c:989
#, c-format
msgid "%s \"%s\" command can not be executed on a server window\n"
msgstr ""
@@ -1167,7 +1167,7 @@ msgstr ""
msgid "%s nick not found for \"%s\" command\n"
msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n"
-#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1157
+#: src/irc/irc-send.c:517 src/irc/irc-send.c:758 src/irc/irc-recv.c:1156
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
@@ -1177,7 +1177,7 @@ msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
msgid "%s wrong argument count for \"%s\" command\n"
msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n"
-#: src/irc/irc-send.c:1054
+#: src/irc/irc-send.c:1067
#, c-format
msgid "%s, compiled on %s %s\n"
msgstr "%s, compilé le %s %s\n"
@@ -1192,7 +1192,7 @@ msgid " has joined "
msgstr " a rejoint "
#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:865
-#: src/irc/irc-recv.c:1005 src/irc/irc-recv.c:2397 src/irc/irc-recv.c:2462
+#: src/irc/irc-recv.c:1005 src/irc/irc-recv.c:2396 src/irc/irc-recv.c:2461
#, c-format
msgid "%s channel not found for \"%s\" command\n"
msgstr "%s canal non trouvé pour la commande \"%s\"\n"
@@ -1294,7 +1294,7 @@ msgid "removes voice from"
msgstr "supprime la voix de"
#: src/irc/irc-recv.c:538 src/irc/irc-recv.c:611 src/irc/irc-recv.c:907
-#: src/irc/irc-recv.c:1251
+#: src/irc/irc-recv.c:1250
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr "%s commande \"%s\" reçue sans host\n"
@@ -1339,7 +1339,7 @@ msgstr "%s commande \"%s\" reçue sans host ou canal\n"
msgid " has left "
msgstr " a quitté "
-#: src/irc/irc-recv.c:956 src/irc/irc-recv.c:1183
+#: src/irc/irc-recv.c:956 src/irc/irc-recv.c:1182
#, c-format
msgid "On %s: * %s %s"
msgstr "Sur %s: * %s %s"
@@ -1362,193 +1362,193 @@ msgid "from"
msgstr "de"
#: src/irc/irc-recv.c:1089 src/irc/irc-recv.c:1103 src/irc/irc-recv.c:1118
-#: src/irc/irc-recv.c:1133 src/irc/irc-recv.c:1228 src/irc/irc-recv.c:2683
-#: src/irc/irc-recv.c:2723
+#: src/irc/irc-recv.c:1133 src/irc/irc-recv.c:1227 src/irc/irc-recv.c:2682
+#: src/irc/irc-recv.c:2722
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr "%s impossible d'analyser la commande \"%s\"\n"
-#: src/irc/irc-recv.c:1209
+#: src/irc/irc-recv.c:1208
#, c-format
msgid "Private %s> %s"
msgstr "Privé %s> %s"
-#: src/irc/irc-recv.c:1283
+#: src/irc/irc-recv.c:1282
msgid "has quit"
msgstr "a quitté"
-#: src/irc/irc-recv.c:1403
+#: src/irc/irc-recv.c:1402
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr "%s commande \"%s\" reçue sans canal\n"
-#: src/irc/irc-recv.c:1431
+#: src/irc/irc-recv.c:1430
msgid " has changed topic for "
msgstr " a changé le titre pour "
-#: src/irc/irc-recv.c:1436
+#: src/irc/irc-recv.c:1435
#, c-format
msgid " to: \"%s\"\n"
msgstr " en: \"%s\"\n"
-#: src/irc/irc-recv.c:1442
+#: src/irc/irc-recv.c:1441
msgid " has unset topic for "
msgstr " a retiré le titre pour "
-#: src/irc/irc-recv.c:1533
+#: src/irc/irc-recv.c:1532
#, c-format
msgid " is away: %s\n"
msgstr " est absent: %s\n"
-#: src/irc/irc-recv.c:1607
+#: src/irc/irc-recv.c:1606
msgid "Users online: "
msgstr "Utilisateurs en ligne: "
-#: src/irc/irc-recv.c:1970
+#: src/irc/irc-recv.c:1969
msgid "idle: "
msgstr "inactivité: "
-#: src/irc/irc-recv.c:1978
+#: src/irc/irc-recv.c:1977
msgid "days"
msgstr "jours"
-#: src/irc/irc-recv.c:1978
+#: src/irc/irc-recv.c:1977
msgid "day"
msgstr "jour"
-#: src/irc/irc-recv.c:1988
+#: src/irc/irc-recv.c:1987
msgid "hours"
msgstr "heures"
-#: src/irc/irc-recv.c:1988
+#: src/irc/irc-recv.c:1987
msgid "hour"
msgstr "heure"
-#: src/irc/irc-recv.c:1994
+#: src/irc/irc-recv.c:1993
msgid "minutes"
msgstr "minutes"
-#: src/irc/irc-recv.c:1994
+#: src/irc/irc-recv.c:1993
msgid "minute"
msgstr "minute"
-#: src/irc/irc-recv.c:2000
+#: src/irc/irc-recv.c:1999
msgid "seconds"
msgstr "secondes"
-#: src/irc/irc-recv.c:2000
+#: src/irc/irc-recv.c:1999
msgid "second"
msgstr "seconde"
-#: src/irc/irc-recv.c:2005
+#: src/irc/irc-recv.c:2004
msgid "signon at: "
msgstr "signé le: "
-#: src/irc/irc-recv.c:2093
+#: src/irc/irc-recv.c:2092
msgid "Channels: "
msgstr "Canaux: "
-#: src/irc/irc-recv.c:2344
+#: src/irc/irc-recv.c:2343
msgid "No topic set for "
msgstr "Pas de titre défini pour "
-#: src/irc/irc-recv.c:2386
+#: src/irc/irc-recv.c:2385
msgid "Topic for "
msgstr "Le titre pour "
-#: src/irc/irc-recv.c:2390
+#: src/irc/irc-recv.c:2389
#, c-format
msgid " is: \"%s\"\n"
msgstr " est: \"%s\"\n"
-#: src/irc/irc-recv.c:2406 src/irc/irc-recv.c:2486
+#: src/irc/irc-recv.c:2405 src/irc/irc-recv.c:2485
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr "%s impossible de déterminer le canal pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:2452
+#: src/irc/irc-recv.c:2451
msgid "Topic set by "
msgstr "Titre défini par "
-#: src/irc/irc-recv.c:2470
+#: src/irc/irc-recv.c:2469
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr "%s impossible d'identifier la date/heure pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:2478
+#: src/irc/irc-recv.c:2477
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr ""
"%s impossible de déterminer le nom d'utilisateur pour la commande \"%s\"\n"
-#: src/irc/irc-recv.c:2607
+#: src/irc/irc-recv.c:2606
msgid " on "
msgstr " sur "
-#: src/irc/irc-recv.c:2714
+#: src/irc/irc-recv.c:2713
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr "%s impossible de créer l'utilisateur \"%s\" pour le canal \"%s\"\n"
-#: src/irc/irc-recv.c:2767
+#: src/irc/irc-recv.c:2766
msgid "Nicks "
msgstr "Utilisateurs "
-#: src/irc/irc-recv.c:2787
+#: src/irc/irc-recv.c:2786
msgid "Channel "
msgstr "Canal "
-#: src/irc/irc-recv.c:2798
+#: src/irc/irc-recv.c:2797
msgid "nicks"
msgstr "utilisateurs"
-#: src/irc/irc-recv.c:2798
+#: src/irc/irc-recv.c:2797
msgid "nick"
msgstr "utilisateur"
-#: src/irc/irc-recv.c:2806
+#: src/irc/irc-recv.c:2805
msgid "ops"
msgstr "ops"
-#: src/irc/irc-recv.c:2806
+#: src/irc/irc-recv.c:2805
msgid "op"
msgstr "op"
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2814
msgid "halfops"
msgstr "halfops"
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2814
msgid "halfop"
msgstr "halfop"
-#: src/irc/irc-recv.c:2824
+#: src/irc/irc-recv.c:2823
msgid "voices"
msgstr "voices"
-#: src/irc/irc-recv.c:2824
+#: src/irc/irc-recv.c:2823
msgid "voice"
msgstr "voice"
-#: src/irc/irc-recv.c:2833
+#: src/irc/irc-recv.c:2832
msgid "normal"
msgstr "normal"
-#: src/irc/irc-recv.c:2866
+#: src/irc/irc-recv.c:2865
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
"%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 2nd "
"nom d'utilisateur \"%s\"\n"
-#: src/irc/irc-recv.c:2877
+#: src/irc/irc-recv.c:2876
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
"%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai du 3ème nom "
"d'utilisateur \"%s\"\n"
-#: src/irc/irc-recv.c:2886
+#: src/irc/irc-recv.c:2885
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
@@ -1557,6 +1557,35 @@ msgstr ""
"%s: tous les noms d'utilisateurs déclarés sont déjà en cours d'utilisation, "
"fermeture de la connexion avec le serveur !\n"
+#: src/irc/irc-dcc.c:38
+msgid "Waiting"
+msgstr "Attente"
+
+#: src/irc/irc-dcc.c:38
+msgid "Connecting"
+msgstr "Connexion"
+
+#: src/irc/irc-dcc.c:38
+msgid "Active"
+msgstr "Actif"
+
+#: src/irc/irc-dcc.c:38
+msgid "Done"
+msgstr "Terminé"
+
+#: src/irc/irc-dcc.c:38
+msgid "Failed"
+msgstr "Echoué"
+
+#: src/irc/irc-dcc.c:39
+msgid "Aborted"
+msgstr "Interrompu"
+
+#: src/irc/irc-dcc.c:85
+#, c-format
+msgid "%s not enough memory for new DCC\n"
+msgstr "%s pas assez de mémoire pour un nouveau DCC\n"
+
#: src/plugins/perl/wee-perl.c:83
#, c-format
msgid ""
@@ -1618,16 +1647,32 @@ msgstr ""
"%s impossible d'ajouter la fonction pour le message \"%s\" (mémoire "
"insuffisante)\n"
-#: src/gui/curses/gui-display.c:896
+#: src/gui/curses/gui-display.c:559
+msgid "bytes"
+msgstr "octets"
+
+#: src/gui/curses/gui-display.c:559
+msgid "Kb"
+msgstr "Ko"
+
+#: src/gui/curses/gui-display.c:559
+msgid "Mb"
+msgstr "Mo"
+
+#: src/gui/curses/gui-display.c:559
+msgid "Gb"
+msgstr "Go"
+
+#: src/gui/curses/gui-display.c:966
#, c-format
msgid "%d:[not connected] "
msgstr "%d:[non connecté] "
-#: src/gui/curses/gui-display.c:904
+#: src/gui/curses/gui-display.c:974
msgid "[Act: "
msgstr "[Act: "
-#: src/gui/curses/gui-display.c:939 src/gui/curses/gui-display.c:942
+#: src/gui/curses/gui-display.c:1009 src/gui/curses/gui-display.c:1012
msgid "-MORE-"
msgstr "-PLUS-"
@@ -1635,17 +1680,17 @@ msgstr "-PLUS-"
msgid "server"
msgstr "serveur"
-#: src/gui/gui-common.c:301
+#: src/gui/gui-common.c:302
#, c-format
msgid "%s not enough memory for infobar message\n"
msgstr "%s pas assez de mémoire pour un message de la barre d'infos\n"
-#: src/gui/gui-common.c:436
+#: src/gui/gui-common.c:437
#, c-format
msgid "%s not enough memory for new line!\n"
msgstr "%s pas assez de mémoire pour une nouvelle ligne !\n"
-#: src/gui/gui-common.c:479
+#: src/gui/gui-common.c:480
msgid "not enough memory!\n"
msgstr "pas assez de mémoire !\n"
@@ -2480,203 +2525,226 @@ msgstr ""
"délai (en secondes) pour la notification des messages dans la barre d'infos "
"(0 = désactiver les notifications dans la barre d'infos)"
-#: src/common/weeconfig.c:199 src/common/weeconfig.c:200
+#: src/common/weeconfig.c:205 src/common/weeconfig.c:206
msgid "color for title bar"
msgstr "couleur pour la barre de titre"
-#: src/common/weeconfig.c:203 src/common/weeconfig.c:204
+#: src/common/weeconfig.c:209 src/common/weeconfig.c:210
msgid "background for title bar"
msgstr "couleur de fond pour la barre de titre"
-#: src/common/weeconfig.c:209 src/common/weeconfig.c:210
+#: src/common/weeconfig.c:215 src/common/weeconfig.c:216
msgid "color for chat text"
msgstr "couleur pour le texte de discussion"
-#: src/common/weeconfig.c:213
+#: src/common/weeconfig.c:219
msgid "color for time"
msgstr "couleur pour l'heure"
-#: src/common/weeconfig.c:214
+#: src/common/weeconfig.c:220
msgid "color for time in chat window"
msgstr "couleur pour l'heure dans la fenêtre de discussion"
-#: src/common/weeconfig.c:217
+#: src/common/weeconfig.c:223
msgid "color for time separator"
msgstr "couleur pour le séparateur de l'heure"
-#: src/common/weeconfig.c:218
+#: src/common/weeconfig.c:224
msgid "color for time separator (chat window)"
msgstr "couleur pour la séparation de l'heure (fenêtre de discussion)"
-#: src/common/weeconfig.c:221 src/common/weeconfig.c:222
+#: src/common/weeconfig.c:227 src/common/weeconfig.c:228
msgid "color for 1st and 3rd char of prefix"
msgstr "couleur pour le 1er et le 3ème caractère du préfixe"
-#: src/common/weeconfig.c:225 src/common/weeconfig.c:226
+#: src/common/weeconfig.c:231 src/common/weeconfig.c:232
msgid "color for middle char of prefix"
msgstr "couleur pour le caractère du milieu du préfixe"
-#: src/common/weeconfig.c:229
+#: src/common/weeconfig.c:235
msgid "color for nicks in actions"
msgstr "couleur pour les noms d'utilisateur dans les actions"
-#: src/common/weeconfig.c:230
+#: src/common/weeconfig.c:236
msgid "color for nicks in actions (chat window)"
msgstr ""
"couleur pour les noms d'utilisateurs dans les actions (fenêtre de discussion)"
-#: src/common/weeconfig.c:233
+#: src/common/weeconfig.c:239
msgid "color for hostnames"
msgstr "couleur pour les noms de machines"
-#: src/common/weeconfig.c:234
+#: src/common/weeconfig.c:240
msgid "color for hostnames (chat window)"
msgstr "couleur pour les noms de machines (fenêtre de discussion)"
-#: src/common/weeconfig.c:237
+#: src/common/weeconfig.c:243
msgid "color for channel names in actions"
msgstr "couleur pour les canaux dans les actions"
-#: src/common/weeconfig.c:238
+#: src/common/weeconfig.c:244
msgid "color for channel names in actions (chat window)"
msgstr "couleur pour les canaux dans les actions (fenêtre de discussion)"
-#: src/common/weeconfig.c:241
+#: src/common/weeconfig.c:247
msgid "color for dark separators"
msgstr "couleur pour les séparateurs sombres"
-#: src/common/weeconfig.c:242
+#: src/common/weeconfig.c:248
msgid "color for dark separators (chat window)"
msgstr "couleur pour les séparateurs sombres (fenêtre de discussion)"
-#: src/common/weeconfig.c:245
+#: src/common/weeconfig.c:251
msgid "color for highlighted nick"
msgstr "couleur pour le pseudo surligné"
-#: src/common/weeconfig.c:246
+#: src/common/weeconfig.c:252
msgid "color for highlighted nick (chat window)"
msgstr "couleur pour le pseudo surligné (fenêtre de discussion)"
-#: src/common/weeconfig.c:249
+#: src/common/weeconfig.c:255
msgid "background for chat"
msgstr "couleur de fond pour la discussion"
-#: src/common/weeconfig.c:250
+#: src/common/weeconfig.c:256
msgid "background for chat window"
msgstr "couleur de fond pour la fenêtre de discussion"
-#: src/common/weeconfig.c:255 src/common/weeconfig.c:256
+#: src/common/weeconfig.c:261 src/common/weeconfig.c:262
msgid "color for status bar"
msgstr "couleur pour la barre de statut"
-#: src/common/weeconfig.c:259 src/common/weeconfig.c:260
-#, fuzzy
+#: src/common/weeconfig.c:265 src/common/weeconfig.c:266
msgid "color for status bar delimiters"
-msgstr "couleur pour la barre de statut"
+msgstr "couleur pour les délimiteurs de la barre de statut"
-#: src/common/weeconfig.c:263
+#: src/common/weeconfig.c:269
msgid "color for window with new messages"
msgstr "couleur pour une fenêtre avec de nouvelles infos"
-#: src/common/weeconfig.c:264
+#: src/common/weeconfig.c:270
msgid "color for window with new messages (status bar)"
msgstr "couleur pour une fenêtre avec de nouvelles infos (barre de statut)"
-#: src/common/weeconfig.c:267
+#: src/common/weeconfig.c:273
msgid "color for window with highlight"
msgstr "couleur pour une fenêtre avec un highlight"
-#: src/common/weeconfig.c:268
+#: src/common/weeconfig.c:274
msgid "color for window with highlight (status bar)"
msgstr "couleur pour une fenêtre avec un highlight (barre de statut)"
-#: src/common/weeconfig.c:271
+#: src/common/weeconfig.c:277
msgid "color for window with new data (not messages)"
msgstr "couleur pour une fenêtre avec des nouvelles données (pas des infos)"
-#: src/common/weeconfig.c:272
+#: src/common/weeconfig.c:278
msgid "color for window with new data (not messages) (status bar)"
msgstr ""
"couleur pour une fenêtre avec des nouvelles données (pas des infos) (barre "
"de statut)"
-#: src/common/weeconfig.c:275
+#: src/common/weeconfig.c:281
msgid "color for \"*MORE*\" text"
msgstr "couleur pour le texte \"*MORE*\""
-#: src/common/weeconfig.c:276
+#: src/common/weeconfig.c:282
msgid "color for window with new data (status bar)"
msgstr "couleur pour une fenêtre avec des nouvelles données (barre de statut)"
-#: src/common/weeconfig.c:279 src/common/weeconfig.c:280
+#: src/common/weeconfig.c:285 src/common/weeconfig.c:286
msgid "background for status window"
msgstr "couleur de fond pour la fenêtre de statut"
-#: src/common/weeconfig.c:285 src/common/weeconfig.c:286
+#: src/common/weeconfig.c:291 src/common/weeconfig.c:292
msgid "color for info bar text"
msgstr "couleur pour la barre d'infos"
-#: src/common/weeconfig.c:289 src/common/weeconfig.c:290
+#: src/common/weeconfig.c:295 src/common/weeconfig.c:296
msgid "color for info bar highlight notification"
msgstr "couleur pour la notification dans la barre d'infos"
-#: src/common/weeconfig.c:293 src/common/weeconfig.c:294
+#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
msgid "background for info bar window"
msgstr "couleur de fond pour la fenêtre de barre d'infos"
-#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
+#: src/common/weeconfig.c:305 src/common/weeconfig.c:306
msgid "color for input text"
msgstr "couleur pour le texte saisi"
-#: src/common/weeconfig.c:303 src/common/weeconfig.c:304
+#: src/common/weeconfig.c:309 src/common/weeconfig.c:310
msgid "color for input text (channel name)"
msgstr "couleur pour le texte saisi (nom du canal)"
-#: src/common/weeconfig.c:307 src/common/weeconfig.c:308
+#: src/common/weeconfig.c:313 src/common/weeconfig.c:314
msgid "color for input text (nick name)"
msgstr "couleur pour le texte saisi (pseudo)"
-#: src/common/weeconfig.c:311 src/common/weeconfig.c:312
+#: src/common/weeconfig.c:317 src/common/weeconfig.c:318
msgid "background for input window"
msgstr "couleur de fond pour la fenêtre de saisie"
-#: src/common/weeconfig.c:317 src/common/weeconfig.c:318
+#: src/common/weeconfig.c:323 src/common/weeconfig.c:324
msgid "color for nicknames"
msgstr "couleur pour les pseudos"
-#: src/common/weeconfig.c:321 src/common/weeconfig.c:322
+#: src/common/weeconfig.c:327 src/common/weeconfig.c:328
msgid "color for operator symbol"
msgstr "couleur pour le symbole opérateur"
-#: src/common/weeconfig.c:325 src/common/weeconfig.c:326
+#: src/common/weeconfig.c:331 src/common/weeconfig.c:332
msgid "color for half-operator symbol"
msgstr "couleur pour le symbole demi-opérateur"
-#: src/common/weeconfig.c:329 src/common/weeconfig.c:330
+#: src/common/weeconfig.c:335 src/common/weeconfig.c:336
msgid "color for voice symbol"
msgstr "couleur pour le symbole voix"
-#: src/common/weeconfig.c:333 src/common/weeconfig.c:334
+#: src/common/weeconfig.c:339 src/common/weeconfig.c:340
msgid "color for nick separator"
msgstr "couleur pour le séparateur de pseudo"
-#: src/common/weeconfig.c:337 src/common/weeconfig.c:338
+#: src/common/weeconfig.c:343 src/common/weeconfig.c:344
msgid "color for local nick"
msgstr "couleur pour le pseudo local"
-#: src/common/weeconfig.c:341 src/common/weeconfig.c:342
+#: src/common/weeconfig.c:347 src/common/weeconfig.c:348
msgid "color for other nick in private window"
msgstr "couleur pour l'autre pseudo dans la fenêtre privée"
-#: src/common/weeconfig.c:345 src/common/weeconfig.c:346
+#: src/common/weeconfig.c:351 src/common/weeconfig.c:352
msgid "background for nicknames"
msgstr "couleur de fond pour les pseudos"
-#: src/common/weeconfig.c:359
+#: src/common/weeconfig.c:357 src/common/weeconfig.c:358
+msgid "color for \"waiting\" dcc status"
+msgstr "couleur pour le statut dcc \"attente\""
+
+#: src/common/weeconfig.c:361 src/common/weeconfig.c:362
+msgid "color for \"connecting\" dcc status"
+msgstr "couleur pour le statut dcc \"connexion\""
+
+#: src/common/weeconfig.c:365 src/common/weeconfig.c:366
+msgid "color for \"active\" dcc status"
+msgstr "couleur pour le statut dcc \"actif\""
+
+#: src/common/weeconfig.c:369 src/common/weeconfig.c:370
+msgid "color for \"done\" dcc status"
+msgstr "couleur pour le statut dcc \"terminé\""
+
+#: src/common/weeconfig.c:373 src/common/weeconfig.c:374
+msgid "color for \"failed\" dcc status"
+msgstr "couleur pour le statut dcc \"échoué\""
+
+#: src/common/weeconfig.c:377 src/common/weeconfig.c:378
+msgid "color for \"aborted\" dcc status"
+msgstr "couleur pour le statut dcc \"interrompu\""
+
+#: src/common/weeconfig.c:391
msgid "max lines in history (per window)"
msgstr "nombre maxi de lignes dans l'historique (par fenêtre)"
-#: src/common/weeconfig.c:360
+#: src/common/weeconfig.c:392
msgid ""
"maximum number of lines in history for one server/channel/private window (0 "
"= unlimited)"
@@ -2684,36 +2752,36 @@ msgstr ""
"nombre maximum de lignes dans l'historique pour un serveur/fenêtre/fenêtre "
"privée (0 = sans limite)"
-#: src/common/weeconfig.c:364
+#: src/common/weeconfig.c:396
msgid "max user commands in history"
msgstr "nombre maxi de commandes utilisateur dans l'historique"
-#: src/common/weeconfig.c:365
+#: src/common/weeconfig.c:397
msgid "maximum number of user commands in history (0 = unlimited)"
msgstr ""
"nombre maximum de commandes utilisateur dans l'historique (0 = sans limite)"
-#: src/common/weeconfig.c:382 src/common/weeconfig.c:383
+#: src/common/weeconfig.c:414 src/common/weeconfig.c:415
msgid "automatically log channel chats"
msgstr "enregistrer automatiquement les conversations des canaux"
-#: src/common/weeconfig.c:386 src/common/weeconfig.c:387
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
msgid "automatically log private chats"
msgstr "enregistrer automatiquement les conversations privées"
-#: src/common/weeconfig.c:390
+#: src/common/weeconfig.c:422
msgid "path for log files"
msgstr "chemin pour les conversations sauvegardées"
-#: src/common/weeconfig.c:391
+#: src/common/weeconfig.c:423
msgid "path for WeeChat log files"
msgstr "chemin pour les conversations sauvegardées par WeeChat"
-#: src/common/weeconfig.c:394
+#: src/common/weeconfig.c:426
msgid "name for log files"
msgstr "nom des conversations sauvegardées"
-#: src/common/weeconfig.c:395
+#: src/common/weeconfig.c:427
msgid ""
"name for log files (%S == irc server name, %N == channel name (or nickname "
"if private chat)"
@@ -2721,21 +2789,21 @@ msgstr ""
"nom des conversations saivegardées (%S == nom du serveur irc, %N == nom du "
"canal (ou pseudo si fenêtre privée)"
-#: src/common/weeconfig.c:399
+#: src/common/weeconfig.c:431
msgid "timestamp for log"
msgstr "horodatage pour les conversations sauvegardées"
-#: src/common/weeconfig.c:400
+#: src/common/weeconfig.c:432
msgid "timestamp for log (see man strftime for date/time specifiers)"
msgstr ""
"horodatage pour les conversations sauvegardées (voir man strftime pour le "
"format de date/heure)"
-#: src/common/weeconfig.c:403
+#: src/common/weeconfig.c:435
msgid "start string for log files"
msgstr "chaîne de début pour les conversations sauvegardées"
-#: src/common/weeconfig.c:404
+#: src/common/weeconfig.c:436
msgid ""
"text written when starting new log file (see man strftime for date/time "
"specifiers)"
@@ -2743,186 +2811,194 @@ msgstr ""
"texte écrit en démarrant la sauvegarde d'une discussion (voir man strftime "
"pour le format de date/heure)"
-#: src/common/weeconfig.c:408
+#: src/common/weeconfig.c:440
msgid "end string for log files"
msgstr "chaîne de fin pour les conversations sauvegardées"
-#: src/common/weeconfig.c:409
+#: src/common/weeconfig.c:441
msgid ""
"text written when ending log file (see man strftime for date/time specifiers)"
msgstr ""
"texte écrit à la fin d'une discussion sauvegardées (voir man strftime pour "
"le format de date/heure)"
-#: src/common/weeconfig.c:428
+#: src/common/weeconfig.c:461
msgid "automatically accept dcc files"
msgstr "accepte automatiquement les fichiers dcc"
-#: src/common/weeconfig.c:429
+#: src/common/weeconfig.c:462
msgid "automatically accept incoming dcc files"
msgstr "accepte automatiquement les fichiers dcc entrants"
-#: src/common/weeconfig.c:432
+#: src/common/weeconfig.c:465
msgid "max size when auto accepting file"
msgstr "taille maxi pour accepter un fichier"
-#: src/common/weeconfig.c:433
+#: src/common/weeconfig.c:466
msgid "maximum size for incoming file when automatically accepted"
msgstr ""
"taille maximum pour un fichier entrant lorsqu'il est accepté automatiquement"
-#: src/common/weeconfig.c:436
+#: src/common/weeconfig.c:469
msgid "automatically accept dcc chats"
msgstr "accepte automatiquement les demandes de discussion dcc"
-#: src/common/weeconfig.c:437
+#: src/common/weeconfig.c:470
msgid "automatically accept dcc chats (use carefully!)"
msgstr ""
"accepte automatiquement les demandes de discussion dcc (à utiliser avec "
"précaution !)"
-#: src/common/weeconfig.c:440
+#: src/common/weeconfig.c:473
msgid "timeout for dcc request"
msgstr "délai d'attente pour les requêtes dcc"
-#: src/common/weeconfig.c:441
+#: src/common/weeconfig.c:474
msgid "timeout for dcc request (in seconds)"
msgstr "délai d'attente pour les requêtes dcc (en secondes)"
-#: src/common/weeconfig.c:444
+#: src/common/weeconfig.c:477
+msgid "block size for dcc packets"
+msgstr "taille de bloc pour les paquets dcc"
+
+#: src/common/weeconfig.c:478
+msgid "block size for dcc packets in bytes (default: 1024)"
+msgstr "taille de bloc pour les paquets dcc en octets (défaut: 1024)"
+
+#: src/common/weeconfig.c:481
msgid "path for incoming files with dcc"
msgstr "chemin les fichiers reçus par dcc"
-#: src/common/weeconfig.c:445
+#: src/common/weeconfig.c:482
msgid "path for writing incoming files with dcc (default: user home)"
msgstr ""
"chemin pour écrire les fichiers reçus par dcc (par défaut: répertoire de "
"l'utilisateur)"
-#: src/common/weeconfig.c:448
+#: src/common/weeconfig.c:485
msgid "default path for sending files with dcc"
msgstr "chemin par défaut pour envoyer les fichiers par dcc"
-#: src/common/weeconfig.c:449
+#: src/common/weeconfig.c:486
msgid ""
"path for reading files when sending thru dcc (when no path is specified)"
msgstr ""
"chemin pour lire les fichiers lorsqu'ils sont envoyés par dcc (quand aucun "
"chemin n'est spécifié)"
-#: src/common/weeconfig.c:452
+#: src/common/weeconfig.c:489
msgid "automatically rename dcc files if already exists"
msgstr "renomme automatiquement les fichiers dcc s'ils existent déjà"
-#: src/common/weeconfig.c:453
+#: src/common/weeconfig.c:490
msgid "rename incoming files if already exists (add '.1', '.2', ...)"
msgstr ""
"renommer les fichiers reçus s'ils existent déjà (ajoute '.1', '.2', ...)"
-#: src/common/weeconfig.c:456
+#: src/common/weeconfig.c:493
msgid "automatically resume aborted transfers"
msgstr "continuer automatiquement les transferts non terminés"
-#: src/common/weeconfig.c:457
+#: src/common/weeconfig.c:494
msgid ""
"automatically resume dcc transfer if connection with remote host is loosed"
msgstr ""
"continuer automatiquement les transferts dcc si la connexion avec la machine "
"distante a été perdue"
-#: src/common/weeconfig.c:471
+#: src/common/weeconfig.c:508
msgid "use proxy"
msgstr "utiliser un proxy"
-#: src/common/weeconfig.c:472
+#: src/common/weeconfig.c:509
msgid "use a proxy server to connect to irc server"
msgstr "utiliser un proxy pour se connecter au serveur irc"
-#: src/common/weeconfig.c:475
+#: src/common/weeconfig.c:512
msgid "proxy address"
msgstr "adresse du proxy"
-#: src/common/weeconfig.c:476
+#: src/common/weeconfig.c:513
msgid "proxy server address (IP or hostname)"
msgstr "adresse du serveur proxy (IP ou nom)"
-#: src/common/weeconfig.c:479
+#: src/common/weeconfig.c:516
msgid "port for proxy"
msgstr "port pour le proxy"
-#: src/common/weeconfig.c:480
+#: src/common/weeconfig.c:517
msgid "port for connecting to proxy server"
msgstr "port pour se connecter au serveur proxy"
-#: src/common/weeconfig.c:483
+#: src/common/weeconfig.c:520
msgid "proxy password"
msgstr "mot de passe pour le proxy"
-#: src/common/weeconfig.c:484
+#: src/common/weeconfig.c:521
msgid "password for proxy server"
msgstr "mot de passe pour le serveur proxy"
-#: src/common/weeconfig.c:495
+#: src/common/weeconfig.c:532
msgid "server name"
msgstr "nom du serveur"
-#: src/common/weeconfig.c:496
+#: src/common/weeconfig.c:533
msgid "name associated to IRC server (for display only)"
msgstr "nom associé au serveur IRC (pour affichage seulement)"
-#: src/common/weeconfig.c:499
+#: src/common/weeconfig.c:536
msgid "automatically connect to server"
msgstr "connexion automatique au serveur"
-#: src/common/weeconfig.c:500
+#: src/common/weeconfig.c:537
msgid "automatically connect to server when WeeChat is starting"
msgstr "connexion automatique au serveur quand WeeChat démarre"
-#: src/common/weeconfig.c:503
+#: src/common/weeconfig.c:540
msgid "server address or hostname"
msgstr "adresse ou nom du serveur"
-#: src/common/weeconfig.c:504
+#: src/common/weeconfig.c:541
msgid "IP address or hostname of IRC server"
msgstr "adresse IP ou nom du serveur IRC"
-#: src/common/weeconfig.c:507
+#: src/common/weeconfig.c:544
msgid "port for IRC server"
msgstr "port pour le serveur IRC"
-#: src/common/weeconfig.c:508
+#: src/common/weeconfig.c:545
msgid "port for connecting to server"
msgstr "port pour se connecter au serveur"
-#: src/common/weeconfig.c:511
+#: src/common/weeconfig.c:548
msgid "server password"
msgstr "mot de passe pour le serveur"
-#: src/common/weeconfig.c:512
+#: src/common/weeconfig.c:549
msgid "password for IRC server"
msgstr "mot de passe pour le serveur IRC"
-#: src/common/weeconfig.c:515
+#: src/common/weeconfig.c:552
msgid "nickname for server"
msgstr "pseudo pour le serveur"
-#: src/common/weeconfig.c:516
+#: src/common/weeconfig.c:553
msgid "nickname to use on IRC server"
msgstr "pseudo à utiliser sur le serveur IRC"
-#: src/common/weeconfig.c:519
+#: src/common/weeconfig.c:556
msgid "alternate nickname for server"
msgstr "pseudo alternatif pour le serveur"
-#: src/common/weeconfig.c:520
+#: src/common/weeconfig.c:557
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr "pseudo alternatif pour le serveur IRC (si le pseudo est déjà utilisé)"
-#: src/common/weeconfig.c:523
+#: src/common/weeconfig.c:560
msgid "2nd alternate nickname for server"
msgstr "2nd pseudo alternatif pour le serveur"
-#: src/common/weeconfig.c:524
+#: src/common/weeconfig.c:561
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
@@ -2930,87 +3006,87 @@ msgstr ""
"2nd pseudo alternatif pour le serveur IRC (si le pseudo alternatif est déjà "
"utilisé)"
-#: src/common/weeconfig.c:527
+#: src/common/weeconfig.c:564
msgid "user name for server"
msgstr "nom d'utilisateur pour le serveur"
-#: src/common/weeconfig.c:528
+#: src/common/weeconfig.c:565
msgid "user name to use on IRC server"
msgstr "nom d'utilisateur pour le serveur IRC"
-#: src/common/weeconfig.c:531
+#: src/common/weeconfig.c:568
msgid "real name for server"
msgstr "nom réel pour le serveur"
-#: src/common/weeconfig.c:532
+#: src/common/weeconfig.c:569
msgid "real name to use on IRC server"
msgstr "nom réel pour le serveur IRC"
-#: src/common/weeconfig.c:535 src/common/weeconfig.c:536
+#: src/common/weeconfig.c:572 src/common/weeconfig.c:573
msgid "first command to run when connected to server"
msgstr "commande à exécuter en premier lorsque connecté au serveur"
-#: src/common/weeconfig.c:539
+#: src/common/weeconfig.c:576
msgid "list of channels to join when connected to server"
msgstr "liste des canaux à rejoindre lorsque connecté au serveur"
-#: src/common/weeconfig.c:540
+#: src/common/weeconfig.c:577
msgid "comma separated list of channels to join when connected to server"
msgstr ""
"liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au "
"serveur"
-#: src/common/weeconfig.c:762
+#: src/common/weeconfig.c:799
#, c-format
msgid "%s %s, line %d: new server, but previous was incomplete\n"
msgstr "%s %s, ligne %d: nouveau serveur, mais le précédent était incomplet\n"
-#: src/common/weeconfig.c:771
+#: src/common/weeconfig.c:808
#, c-format
msgid "%s %s, line %d: server '%s' already exists\n"
msgstr "%s %s, ligne %d: le serveur '%s' existe déjà\n"
-#: src/common/weeconfig.c:783
+#: src/common/weeconfig.c:820
#, c-format
msgid "%s %s, line %d: unable to create server\n"
msgstr "%s %s, ligne %d: impossible de créer le serveur\n"
-#: src/common/weeconfig.c:822
+#: src/common/weeconfig.c:859
#, c-format
msgid "%s unable to assign default int with string (\"%s\")\n"
msgstr "%s impossible d'assigner la valeur entière avec la chaîne (\"%s\")\n"
-#: src/common/weeconfig.c:833
+#: src/common/weeconfig.c:870
#, c-format
msgid "%s unable to assign default color (\"%s\")\n"
msgstr "%s impossible d'assigner la couleur par défaut (\"%s\")\n"
-#: src/common/weeconfig.c:872
+#: src/common/weeconfig.c:909
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr "%s fichier de configuration \"%s\" non trouvé.\n"
-#: src/common/weeconfig.c:904
+#: src/common/weeconfig.c:941
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"]\"\n"
-#: src/common/weeconfig.c:921
+#: src/common/weeconfig.c:958
#, c-format
msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
msgstr "%s %s, ligne %d: section inconnue (\"%s\")\n"
-#: src/common/weeconfig.c:939
+#: src/common/weeconfig.c:976
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"=\"\n"
-#: src/common/weeconfig.c:973
+#: src/common/weeconfig.c:1010
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr "%s %s, ligne %d: option \"%s\" invalide\n"
-#: src/common/weeconfig.c:984
+#: src/common/weeconfig.c:1021
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
@@ -3019,7 +3095,7 @@ msgstr ""
"%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
"Attendu: valeur booléenne: 'off' ou 'on'\n"
-#: src/common/weeconfig.c:993
+#: src/common/weeconfig.c:1030
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -3028,7 +3104,7 @@ msgstr ""
"%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
"Attendu: entier compris entre %d et %d\n"
-#: src/common/weeconfig.c:1004
+#: src/common/weeconfig.c:1041
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -3037,26 +3113,26 @@ msgstr ""
"%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
"Attendu: une de ces chaînes: "
-#: src/common/weeconfig.c:1020
+#: src/common/weeconfig.c:1057
#, c-format
msgid "%s %s, line %d: invalid color name for option '%s'\n"
msgstr "%s %s, ligne %d: nom de couleur invalide pour l'option '%s'\n"
-#: src/common/weeconfig.c:1079 src/common/weeconfig.c:1247
+#: src/common/weeconfig.c:1116 src/common/weeconfig.c:1284
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr "%s impossible de créer le fichier \"%s\"\n"
-#: src/common/weeconfig.c:1085
+#: src/common/weeconfig.c:1122
#, c-format
msgid "%s: creating default config file...\n"
msgstr "%s: création du fichier de configuration par défaut...\n"
-#: src/common/weeconfig.c:1086
+#: src/common/weeconfig.c:1123
msgid "creating default config file\n"
msgstr "création du fichier de configuration par défaut\n"
-#: src/common/weeconfig.c:1089 src/common/weeconfig.c:1256
+#: src/common/weeconfig.c:1126 src/common/weeconfig.c:1293
#, c-format
msgid ""
"#\n"
@@ -3065,12 +3141,9 @@ msgstr ""
"#\n"
"# %s: fichier de configuration, créé par %s v%s le %s#\n"
-#: src/common/weeconfig.c:1253
+#: src/common/weeconfig.c:1290
msgid "saving config to disk\n"
msgstr "sauvegarde de la configuration sur disque\n"
#~ msgid "color for active window"
#~ msgstr "couleur pour la fenêtre active"
-
-#~ msgid "color for active window (status bar)"
-#~ msgstr "couleur pour la fenêtre active (barre de statut)"
diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot
index e82060901..4934830d5 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: 2004-08-08 20:47+0200\n"
+"POT-Creation-Date: 2004-09-01 00:46+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
msgid "%s cannot allocate new nick\n"
msgstr ""
-#: src/irc/irc-server.c:130 src/common/weeconfig.c:1198
+#: src/irc/irc-server.c:130 src/common/weeconfig.c:1235
msgid "Unable to get user's name"
msgstr ""
@@ -1046,7 +1046,7 @@ msgstr ""
msgid "can't change mode for other users"
msgstr ""
-#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2897
+#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2896
msgid "unknown"
msgstr ""
@@ -1056,13 +1056,13 @@ msgid "%s: using local hostname \"%s\"\n"
msgstr ""
#: src/irc/irc-send.c:210 src/irc/irc-send.c:234 src/irc/irc-send.c:322
-#: src/irc/irc-send.c:568 src/irc/irc-send.c:622 src/irc/irc-send.c:1081
+#: src/irc/irc-send.c:568 src/irc/irc-send.c:622 src/irc/irc-send.c:1094
#, c-format
msgid "%s \"%s\" command can only be executed in a channel window\n"
msgstr ""
#: src/irc/irc-send.c:394 src/irc/irc-send.c:465 src/irc/irc-send.c:669
-#: src/irc/irc-send.c:682 src/irc/irc-send.c:976
+#: src/irc/irc-send.c:682 src/irc/irc-send.c:989
#, c-format
msgid "%s \"%s\" command can not be executed on a server window\n"
msgstr ""
@@ -1073,7 +1073,7 @@ msgstr ""
msgid "%s nick not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1157
+#: src/irc/irc-send.c:517 src/irc/irc-send.c:758 src/irc/irc-recv.c:1156
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr ""
@@ -1083,7 +1083,7 @@ msgstr ""
msgid "%s wrong argument count for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-send.c:1054
+#: src/irc/irc-send.c:1067
#, c-format
msgid "%s, compiled on %s %s\n"
msgstr ""
@@ -1098,7 +1098,7 @@ msgid " has joined "
msgstr ""
#: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:865
-#: src/irc/irc-recv.c:1005 src/irc/irc-recv.c:2397 src/irc/irc-recv.c:2462
+#: src/irc/irc-recv.c:1005 src/irc/irc-recv.c:2396 src/irc/irc-recv.c:2461
#, c-format
msgid "%s channel not found for \"%s\" command\n"
msgstr ""
@@ -1200,7 +1200,7 @@ msgid "removes voice from"
msgstr ""
#: src/irc/irc-recv.c:538 src/irc/irc-recv.c:611 src/irc/irc-recv.c:907
-#: src/irc/irc-recv.c:1251
+#: src/irc/irc-recv.c:1250
#, c-format
msgid "%s \"%s\" command received without host\n"
msgstr ""
@@ -1245,7 +1245,7 @@ msgstr ""
msgid " has left "
msgstr ""
-#: src/irc/irc-recv.c:956 src/irc/irc-recv.c:1183
+#: src/irc/irc-recv.c:956 src/irc/irc-recv.c:1182
#, c-format
msgid "On %s: * %s %s"
msgstr ""
@@ -1268,194 +1268,223 @@ msgid "from"
msgstr ""
#: src/irc/irc-recv.c:1089 src/irc/irc-recv.c:1103 src/irc/irc-recv.c:1118
-#: src/irc/irc-recv.c:1133 src/irc/irc-recv.c:1228 src/irc/irc-recv.c:2683
-#: src/irc/irc-recv.c:2723
+#: src/irc/irc-recv.c:1133 src/irc/irc-recv.c:1227 src/irc/irc-recv.c:2682
+#: src/irc/irc-recv.c:2722
#, c-format
msgid "%s cannot parse \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:1209
+#: src/irc/irc-recv.c:1208
#, c-format
msgid "Private %s> %s"
msgstr ""
-#: src/irc/irc-recv.c:1283
+#: src/irc/irc-recv.c:1282
msgid "has quit"
msgstr ""
-#: src/irc/irc-recv.c:1403
+#: src/irc/irc-recv.c:1402
#, c-format
msgid "%s \"%s\" command received without channel\n"
msgstr ""
-#: src/irc/irc-recv.c:1431
+#: src/irc/irc-recv.c:1430
msgid " has changed topic for "
msgstr ""
-#: src/irc/irc-recv.c:1436
+#: src/irc/irc-recv.c:1435
#, c-format
msgid " to: \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:1442
+#: src/irc/irc-recv.c:1441
msgid " has unset topic for "
msgstr ""
-#: src/irc/irc-recv.c:1533
+#: src/irc/irc-recv.c:1532
#, c-format
msgid " is away: %s\n"
msgstr ""
-#: src/irc/irc-recv.c:1607
+#: src/irc/irc-recv.c:1606
msgid "Users online: "
msgstr ""
-#: src/irc/irc-recv.c:1970
+#: src/irc/irc-recv.c:1969
msgid "idle: "
msgstr ""
-#: src/irc/irc-recv.c:1978
+#: src/irc/irc-recv.c:1977
msgid "days"
msgstr ""
-#: src/irc/irc-recv.c:1978
+#: src/irc/irc-recv.c:1977
msgid "day"
msgstr ""
-#: src/irc/irc-recv.c:1988
+#: src/irc/irc-recv.c:1987
msgid "hours"
msgstr ""
-#: src/irc/irc-recv.c:1988
+#: src/irc/irc-recv.c:1987
msgid "hour"
msgstr ""
-#: src/irc/irc-recv.c:1994
+#: src/irc/irc-recv.c:1993
msgid "minutes"
msgstr ""
-#: src/irc/irc-recv.c:1994
+#: src/irc/irc-recv.c:1993
msgid "minute"
msgstr ""
-#: src/irc/irc-recv.c:2000
+#: src/irc/irc-recv.c:1999
msgid "seconds"
msgstr ""
-#: src/irc/irc-recv.c:2000
+#: src/irc/irc-recv.c:1999
msgid "second"
msgstr ""
-#: src/irc/irc-recv.c:2005
+#: src/irc/irc-recv.c:2004
msgid "signon at: "
msgstr ""
-#: src/irc/irc-recv.c:2093
+#: src/irc/irc-recv.c:2092
msgid "Channels: "
msgstr ""
-#: src/irc/irc-recv.c:2344
+#: src/irc/irc-recv.c:2343
msgid "No topic set for "
msgstr ""
-#: src/irc/irc-recv.c:2386
+#: src/irc/irc-recv.c:2385
msgid "Topic for "
msgstr ""
-#: src/irc/irc-recv.c:2390
+#: src/irc/irc-recv.c:2389
#, c-format
msgid " is: \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:2406 src/irc/irc-recv.c:2486
+#: src/irc/irc-recv.c:2405 src/irc/irc-recv.c:2485
#, c-format
msgid "%s cannot identify channel for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:2452
+#: src/irc/irc-recv.c:2451
msgid "Topic set by "
msgstr ""
-#: src/irc/irc-recv.c:2470
+#: src/irc/irc-recv.c:2469
#, c-format
msgid "%s cannot identify date/time for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:2478
+#: src/irc/irc-recv.c:2477
#, c-format
msgid "%s cannot identify nickname for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-recv.c:2607
+#: src/irc/irc-recv.c:2606
msgid " on "
msgstr ""
-#: src/irc/irc-recv.c:2714
+#: src/irc/irc-recv.c:2713
#, c-format
msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:2767
+#: src/irc/irc-recv.c:2766
msgid "Nicks "
msgstr ""
-#: src/irc/irc-recv.c:2787
+#: src/irc/irc-recv.c:2786
msgid "Channel "
msgstr ""
-#: src/irc/irc-recv.c:2798
+#: src/irc/irc-recv.c:2797
msgid "nicks"
msgstr ""
-#: src/irc/irc-recv.c:2798
+#: src/irc/irc-recv.c:2797
msgid "nick"
msgstr ""
-#: src/irc/irc-recv.c:2806
+#: src/irc/irc-recv.c:2805
msgid "ops"
msgstr ""
-#: src/irc/irc-recv.c:2806
+#: src/irc/irc-recv.c:2805
msgid "op"
msgstr ""
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2814
msgid "halfops"
msgstr ""
-#: src/irc/irc-recv.c:2815
+#: src/irc/irc-recv.c:2814
msgid "halfop"
msgstr ""
-#: src/irc/irc-recv.c:2824
+#: src/irc/irc-recv.c:2823
msgid "voices"
msgstr ""
-#: src/irc/irc-recv.c:2824
+#: src/irc/irc-recv.c:2823
msgid "voice"
msgstr ""
-#: src/irc/irc-recv.c:2833
+#: src/irc/irc-recv.c:2832
msgid "normal"
msgstr ""
-#: src/irc/irc-recv.c:2866
+#: src/irc/irc-recv.c:2865
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:2877
+#: src/irc/irc-recv.c:2876
#, c-format
msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
msgstr ""
-#: src/irc/irc-recv.c:2886
+#: src/irc/irc-recv.c:2885
#, c-format
msgid ""
"%s: all declared nicknames are already in use, closing connection with "
"server!\n"
msgstr ""
+#: src/irc/irc-dcc.c:38
+msgid "Waiting"
+msgstr ""
+
+#: src/irc/irc-dcc.c:38
+msgid "Connecting"
+msgstr ""
+
+#: src/irc/irc-dcc.c:38
+msgid "Active"
+msgstr ""
+
+#: src/irc/irc-dcc.c:38
+msgid "Done"
+msgstr ""
+
+#: src/irc/irc-dcc.c:38
+msgid "Failed"
+msgstr ""
+
+#: src/irc/irc-dcc.c:39
+msgid "Aborted"
+msgstr ""
+
+#: src/irc/irc-dcc.c:85
+#, c-format
+msgid "%s not enough memory for new DCC\n"
+msgstr ""
+
#: src/plugins/perl/wee-perl.c:83
#, c-format
msgid ""
@@ -1511,16 +1540,32 @@ msgstr ""
msgid "%s unable to add handler for \"%s\" message (not enough memory)\n"
msgstr ""
-#: src/gui/curses/gui-display.c:896
+#: src/gui/curses/gui-display.c:559
+msgid "bytes"
+msgstr ""
+
+#: src/gui/curses/gui-display.c:559
+msgid "Kb"
+msgstr ""
+
+#: src/gui/curses/gui-display.c:559
+msgid "Mb"
+msgstr ""
+
+#: src/gui/curses/gui-display.c:559
+msgid "Gb"
+msgstr ""
+
+#: src/gui/curses/gui-display.c:966
#, c-format
msgid "%d:[not connected] "
msgstr ""
-#: src/gui/curses/gui-display.c:904
+#: src/gui/curses/gui-display.c:974
msgid "[Act: "
msgstr ""
-#: src/gui/curses/gui-display.c:939 src/gui/curses/gui-display.c:942
+#: src/gui/curses/gui-display.c:1009 src/gui/curses/gui-display.c:1012
msgid "-MORE-"
msgstr ""
@@ -1528,17 +1573,17 @@ msgstr ""
msgid "server"
msgstr ""
-#: src/gui/gui-common.c:301
+#: src/gui/gui-common.c:302
#, c-format
msgid "%s not enough memory for infobar message\n"
msgstr ""
-#: src/gui/gui-common.c:436
+#: src/gui/gui-common.c:437
#, c-format
msgid "%s not enough memory for new line!\n"
msgstr ""
-#: src/gui/gui-common.c:479
+#: src/gui/gui-common.c:480
msgid "not enough memory!\n"
msgstr ""
@@ -2309,554 +2354,586 @@ msgid ""
"notifications in infobar)"
msgstr ""
-#: src/common/weeconfig.c:199 src/common/weeconfig.c:200
+#: src/common/weeconfig.c:205 src/common/weeconfig.c:206
msgid "color for title bar"
msgstr ""
-#: src/common/weeconfig.c:203 src/common/weeconfig.c:204
+#: src/common/weeconfig.c:209 src/common/weeconfig.c:210
msgid "background for title bar"
msgstr ""
-#: src/common/weeconfig.c:209 src/common/weeconfig.c:210
+#: src/common/weeconfig.c:215 src/common/weeconfig.c:216
msgid "color for chat text"
msgstr ""
-#: src/common/weeconfig.c:213
+#: src/common/weeconfig.c:219
msgid "color for time"
msgstr ""
-#: src/common/weeconfig.c:214
+#: src/common/weeconfig.c:220
msgid "color for time in chat window"
msgstr ""
-#: src/common/weeconfig.c:217
+#: src/common/weeconfig.c:223
msgid "color for time separator"
msgstr ""
-#: src/common/weeconfig.c:218
+#: src/common/weeconfig.c:224
msgid "color for time separator (chat window)"
msgstr ""
-#: src/common/weeconfig.c:221 src/common/weeconfig.c:222
+#: src/common/weeconfig.c:227 src/common/weeconfig.c:228
msgid "color for 1st and 3rd char of prefix"
msgstr ""
-#: src/common/weeconfig.c:225 src/common/weeconfig.c:226
+#: src/common/weeconfig.c:231 src/common/weeconfig.c:232
msgid "color for middle char of prefix"
msgstr ""
-#: src/common/weeconfig.c:229
+#: src/common/weeconfig.c:235
msgid "color for nicks in actions"
msgstr ""
-#: src/common/weeconfig.c:230
+#: src/common/weeconfig.c:236
msgid "color for nicks in actions (chat window)"
msgstr ""
-#: src/common/weeconfig.c:233
+#: src/common/weeconfig.c:239
msgid "color for hostnames"
msgstr ""
-#: src/common/weeconfig.c:234
+#: src/common/weeconfig.c:240
msgid "color for hostnames (chat window)"
msgstr ""
-#: src/common/weeconfig.c:237
+#: src/common/weeconfig.c:243
msgid "color for channel names in actions"
msgstr ""
-#: src/common/weeconfig.c:238
+#: src/common/weeconfig.c:244
msgid "color for channel names in actions (chat window)"
msgstr ""
-#: src/common/weeconfig.c:241
+#: src/common/weeconfig.c:247
msgid "color for dark separators"
msgstr ""
-#: src/common/weeconfig.c:242
+#: src/common/weeconfig.c:248
msgid "color for dark separators (chat window)"
msgstr ""
-#: src/common/weeconfig.c:245
+#: src/common/weeconfig.c:251
msgid "color for highlighted nick"
msgstr ""
-#: src/common/weeconfig.c:246
+#: src/common/weeconfig.c:252
msgid "color for highlighted nick (chat window)"
msgstr ""
-#: src/common/weeconfig.c:249
+#: src/common/weeconfig.c:255
msgid "background for chat"
msgstr ""
-#: src/common/weeconfig.c:250
+#: src/common/weeconfig.c:256
msgid "background for chat window"
msgstr ""
-#: src/common/weeconfig.c:255 src/common/weeconfig.c:256
+#: src/common/weeconfig.c:261 src/common/weeconfig.c:262
msgid "color for status bar"
msgstr ""
-#: src/common/weeconfig.c:259 src/common/weeconfig.c:260
+#: src/common/weeconfig.c:265 src/common/weeconfig.c:266
msgid "color for status bar delimiters"
msgstr ""
-#: src/common/weeconfig.c:263
+#: src/common/weeconfig.c:269
msgid "color for window with new messages"
msgstr ""
-#: src/common/weeconfig.c:264
+#: src/common/weeconfig.c:270
msgid "color for window with new messages (status bar)"
msgstr ""
-#: src/common/weeconfig.c:267
+#: src/common/weeconfig.c:273
msgid "color for window with highlight"
msgstr ""
-#: src/common/weeconfig.c:268
+#: src/common/weeconfig.c:274
msgid "color for window with highlight (status bar)"
msgstr ""
-#: src/common/weeconfig.c:271
+#: src/common/weeconfig.c:277
msgid "color for window with new data (not messages)"
msgstr ""
-#: src/common/weeconfig.c:272
+#: src/common/weeconfig.c:278
msgid "color for window with new data (not messages) (status bar)"
msgstr ""
-#: src/common/weeconfig.c:275
+#: src/common/weeconfig.c:281
msgid "color for \"*MORE*\" text"
msgstr ""
-#: src/common/weeconfig.c:276
+#: src/common/weeconfig.c:282
msgid "color for window with new data (status bar)"
msgstr ""
-#: src/common/weeconfig.c:279 src/common/weeconfig.c:280
+#: src/common/weeconfig.c:285 src/common/weeconfig.c:286
msgid "background for status window"
msgstr ""
-#: src/common/weeconfig.c:285 src/common/weeconfig.c:286
+#: src/common/weeconfig.c:291 src/common/weeconfig.c:292
msgid "color for info bar text"
msgstr ""
-#: src/common/weeconfig.c:289 src/common/weeconfig.c:290
+#: src/common/weeconfig.c:295 src/common/weeconfig.c:296
msgid "color for info bar highlight notification"
msgstr ""
-#: src/common/weeconfig.c:293 src/common/weeconfig.c:294
+#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
msgid "background for info bar window"
msgstr ""
-#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
+#: src/common/weeconfig.c:305 src/common/weeconfig.c:306
msgid "color for input text"
msgstr ""
-#: src/common/weeconfig.c:303 src/common/weeconfig.c:304
+#: src/common/weeconfig.c:309 src/common/weeconfig.c:310
msgid "color for input text (channel name)"
msgstr ""
-#: src/common/weeconfig.c:307 src/common/weeconfig.c:308
+#: src/common/weeconfig.c:313 src/common/weeconfig.c:314
msgid "color for input text (nick name)"
msgstr ""
-#: src/common/weeconfig.c:311 src/common/weeconfig.c:312
+#: src/common/weeconfig.c:317 src/common/weeconfig.c:318
msgid "background for input window"
msgstr ""
-#: src/common/weeconfig.c:317 src/common/weeconfig.c:318
+#: src/common/weeconfig.c:323 src/common/weeconfig.c:324
msgid "color for nicknames"
msgstr ""
-#: src/common/weeconfig.c:321 src/common/weeconfig.c:322
+#: src/common/weeconfig.c:327 src/common/weeconfig.c:328
msgid "color for operator symbol"
msgstr ""
-#: src/common/weeconfig.c:325 src/common/weeconfig.c:326
+#: src/common/weeconfig.c:331 src/common/weeconfig.c:332
msgid "color for half-operator symbol"
msgstr ""
-#: src/common/weeconfig.c:329 src/common/weeconfig.c:330
+#: src/common/weeconfig.c:335 src/common/weeconfig.c:336
msgid "color for voice symbol"
msgstr ""
-#: src/common/weeconfig.c:333 src/common/weeconfig.c:334
+#: src/common/weeconfig.c:339 src/common/weeconfig.c:340
msgid "color for nick separator"
msgstr ""
-#: src/common/weeconfig.c:337 src/common/weeconfig.c:338
+#: src/common/weeconfig.c:343 src/common/weeconfig.c:344
msgid "color for local nick"
msgstr ""
-#: src/common/weeconfig.c:341 src/common/weeconfig.c:342
+#: src/common/weeconfig.c:347 src/common/weeconfig.c:348
msgid "color for other nick in private window"
msgstr ""
-#: src/common/weeconfig.c:345 src/common/weeconfig.c:346
+#: src/common/weeconfig.c:351 src/common/weeconfig.c:352
msgid "background for nicknames"
msgstr ""
-#: src/common/weeconfig.c:359
+#: src/common/weeconfig.c:357 src/common/weeconfig.c:358
+msgid "color for \"waiting\" dcc status"
+msgstr ""
+
+#: src/common/weeconfig.c:361 src/common/weeconfig.c:362
+msgid "color for \"connecting\" dcc status"
+msgstr ""
+
+#: src/common/weeconfig.c:365 src/common/weeconfig.c:366
+msgid "color for \"active\" dcc status"
+msgstr ""
+
+#: src/common/weeconfig.c:369 src/common/weeconfig.c:370
+msgid "color for \"done\" dcc status"
+msgstr ""
+
+#: src/common/weeconfig.c:373 src/common/weeconfig.c:374
+msgid "color for \"failed\" dcc status"
+msgstr ""
+
+#: src/common/weeconfig.c:377 src/common/weeconfig.c:378
+msgid "color for \"aborted\" dcc status"
+msgstr ""
+
+#: src/common/weeconfig.c:391
msgid "max lines in history (per window)"
msgstr ""
-#: src/common/weeconfig.c:360
+#: src/common/weeconfig.c:392
msgid ""
"maximum number of lines in history for one server/channel/private window (0 "
"= unlimited)"
msgstr ""
-#: src/common/weeconfig.c:364
+#: src/common/weeconfig.c:396
msgid "max user commands in history"
msgstr ""
-#: src/common/weeconfig.c:365
+#: src/common/weeconfig.c:397
msgid "maximum number of user commands in history (0 = unlimited)"
msgstr ""
-#: src/common/weeconfig.c:382 src/common/weeconfig.c:383
+#: src/common/weeconfig.c:414 src/common/weeconfig.c:415
msgid "automatically log channel chats"
msgstr ""
-#: src/common/weeconfig.c:386 src/common/weeconfig.c:387
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
msgid "automatically log private chats"
msgstr ""
-#: src/common/weeconfig.c:390
+#: src/common/weeconfig.c:422
msgid "path for log files"
msgstr ""
-#: src/common/weeconfig.c:391
+#: src/common/weeconfig.c:423
msgid "path for WeeChat log files"
msgstr ""
-#: src/common/weeconfig.c:394
+#: src/common/weeconfig.c:426
msgid "name for log files"
msgstr ""
-#: src/common/weeconfig.c:395
+#: src/common/weeconfig.c:427
msgid ""
"name for log files (%S == irc server name, %N == channel name (or nickname "
"if private chat)"
msgstr ""
-#: src/common/weeconfig.c:399
+#: src/common/weeconfig.c:431
msgid "timestamp for log"
msgstr ""
-#: src/common/weeconfig.c:400
+#: src/common/weeconfig.c:432
msgid "timestamp for log (see man strftime for date/time specifiers)"
msgstr ""
-#: src/common/weeconfig.c:403
+#: src/common/weeconfig.c:435
msgid "start string for log files"
msgstr ""
-#: src/common/weeconfig.c:404
+#: src/common/weeconfig.c:436
msgid ""
"text written when starting new log file (see man strftime for date/time "
"specifiers)"
msgstr ""
-#: src/common/weeconfig.c:408
+#: src/common/weeconfig.c:440
msgid "end string for log files"
msgstr ""
-#: src/common/weeconfig.c:409
+#: src/common/weeconfig.c:441
msgid ""
"text written when ending log file (see man strftime for date/time specifiers)"
msgstr ""
-#: src/common/weeconfig.c:428
+#: src/common/weeconfig.c:461
msgid "automatically accept dcc files"
msgstr ""
-#: src/common/weeconfig.c:429
+#: src/common/weeconfig.c:462
msgid "automatically accept incoming dcc files"
msgstr ""
-#: src/common/weeconfig.c:432
+#: src/common/weeconfig.c:465
msgid "max size when auto accepting file"
msgstr ""
-#: src/common/weeconfig.c:433
+#: src/common/weeconfig.c:466
msgid "maximum size for incoming file when automatically accepted"
msgstr ""
-#: src/common/weeconfig.c:436
+#: src/common/weeconfig.c:469
msgid "automatically accept dcc chats"
msgstr ""
-#: src/common/weeconfig.c:437
+#: src/common/weeconfig.c:470
msgid "automatically accept dcc chats (use carefully!)"
msgstr ""
-#: src/common/weeconfig.c:440
+#: src/common/weeconfig.c:473
msgid "timeout for dcc request"
msgstr ""
-#: src/common/weeconfig.c:441
+#: src/common/weeconfig.c:474
msgid "timeout for dcc request (in seconds)"
msgstr ""
-#: src/common/weeconfig.c:444
+#: src/common/weeconfig.c:477
+msgid "block size for dcc packets"
+msgstr ""
+
+#: src/common/weeconfig.c:478
+msgid "block size for dcc packets in bytes (default: 1024)"
+msgstr ""
+
+#: src/common/weeconfig.c:481
msgid "path for incoming files with dcc"
msgstr ""
-#: src/common/weeconfig.c:445
+#: src/common/weeconfig.c:482
msgid "path for writing incoming files with dcc (default: user home)"
msgstr ""
-#: src/common/weeconfig.c:448
+#: src/common/weeconfig.c:485
msgid "default path for sending files with dcc"
msgstr ""
-#: src/common/weeconfig.c:449
+#: src/common/weeconfig.c:486
msgid ""
"path for reading files when sending thru dcc (when no path is specified)"
msgstr ""
-#: src/common/weeconfig.c:452
+#: src/common/weeconfig.c:489
msgid "automatically rename dcc files if already exists"
msgstr ""
-#: src/common/weeconfig.c:453
+#: src/common/weeconfig.c:490
msgid "rename incoming files if already exists (add '.1', '.2', ...)"
msgstr ""
-#: src/common/weeconfig.c:456
+#: src/common/weeconfig.c:493
msgid "automatically resume aborted transfers"
msgstr ""
-#: src/common/weeconfig.c:457
+#: src/common/weeconfig.c:494
msgid ""
"automatically resume dcc transfer if connection with remote host is loosed"
msgstr ""
-#: src/common/weeconfig.c:471
+#: src/common/weeconfig.c:508
msgid "use proxy"
msgstr ""
-#: src/common/weeconfig.c:472
+#: src/common/weeconfig.c:509
msgid "use a proxy server to connect to irc server"
msgstr ""
-#: src/common/weeconfig.c:475
+#: src/common/weeconfig.c:512
msgid "proxy address"
msgstr ""
-#: src/common/weeconfig.c:476
+#: src/common/weeconfig.c:513
msgid "proxy server address (IP or hostname)"
msgstr ""
-#: src/common/weeconfig.c:479
+#: src/common/weeconfig.c:516
msgid "port for proxy"
msgstr ""
-#: src/common/weeconfig.c:480
+#: src/common/weeconfig.c:517
msgid "port for connecting to proxy server"
msgstr ""
-#: src/common/weeconfig.c:483
+#: src/common/weeconfig.c:520
msgid "proxy password"
msgstr ""
-#: src/common/weeconfig.c:484
+#: src/common/weeconfig.c:521
msgid "password for proxy server"
msgstr ""
-#: src/common/weeconfig.c:495
+#: src/common/weeconfig.c:532
msgid "server name"
msgstr ""
-#: src/common/weeconfig.c:496
+#: src/common/weeconfig.c:533
msgid "name associated to IRC server (for display only)"
msgstr ""
-#: src/common/weeconfig.c:499
+#: src/common/weeconfig.c:536
msgid "automatically connect to server"
msgstr ""
-#: src/common/weeconfig.c:500
+#: src/common/weeconfig.c:537
msgid "automatically connect to server when WeeChat is starting"
msgstr ""
-#: src/common/weeconfig.c:503
+#: src/common/weeconfig.c:540
msgid "server address or hostname"
msgstr ""
-#: src/common/weeconfig.c:504
+#: src/common/weeconfig.c:541
msgid "IP address or hostname of IRC server"
msgstr ""
-#: src/common/weeconfig.c:507
+#: src/common/weeconfig.c:544
msgid "port for IRC server"
msgstr ""
-#: src/common/weeconfig.c:508
+#: src/common/weeconfig.c:545
msgid "port for connecting to server"
msgstr ""
-#: src/common/weeconfig.c:511
+#: src/common/weeconfig.c:548
msgid "server password"
msgstr ""
-#: src/common/weeconfig.c:512
+#: src/common/weeconfig.c:549
msgid "password for IRC server"
msgstr ""
-#: src/common/weeconfig.c:515
+#: src/common/weeconfig.c:552
msgid "nickname for server"
msgstr ""
-#: src/common/weeconfig.c:516
+#: src/common/weeconfig.c:553
msgid "nickname to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:519
+#: src/common/weeconfig.c:556
msgid "alternate nickname for server"
msgstr ""
-#: src/common/weeconfig.c:520
+#: src/common/weeconfig.c:557
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr ""
-#: src/common/weeconfig.c:523
+#: src/common/weeconfig.c:560
msgid "2nd alternate nickname for server"
msgstr ""
-#: src/common/weeconfig.c:524
+#: src/common/weeconfig.c:561
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
msgstr ""
-#: src/common/weeconfig.c:527
+#: src/common/weeconfig.c:564
msgid "user name for server"
msgstr ""
-#: src/common/weeconfig.c:528
+#: src/common/weeconfig.c:565
msgid "user name to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:531
+#: src/common/weeconfig.c:568
msgid "real name for server"
msgstr ""
-#: src/common/weeconfig.c:532
+#: src/common/weeconfig.c:569
msgid "real name to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:535 src/common/weeconfig.c:536
+#: src/common/weeconfig.c:572 src/common/weeconfig.c:573
msgid "first command to run when connected to server"
msgstr ""
-#: src/common/weeconfig.c:539
+#: src/common/weeconfig.c:576
msgid "list of channels to join when connected to server"
msgstr ""
-#: src/common/weeconfig.c:540
+#: src/common/weeconfig.c:577
msgid "comma separated list of channels to join when connected to server"
msgstr ""
-#: src/common/weeconfig.c:762
+#: src/common/weeconfig.c:799
#, c-format
msgid "%s %s, line %d: new server, but previous was incomplete\n"
msgstr ""
-#: src/common/weeconfig.c:771
+#: src/common/weeconfig.c:808
#, c-format
msgid "%s %s, line %d: server '%s' already exists\n"
msgstr ""
-#: src/common/weeconfig.c:783
+#: src/common/weeconfig.c:820
#, c-format
msgid "%s %s, line %d: unable to create server\n"
msgstr ""
-#: src/common/weeconfig.c:822
+#: src/common/weeconfig.c:859
#, c-format
msgid "%s unable to assign default int with string (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:833
+#: src/common/weeconfig.c:870
#, c-format
msgid "%s unable to assign default color (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:872
+#: src/common/weeconfig.c:909
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr ""
-#: src/common/weeconfig.c:904
+#: src/common/weeconfig.c:941
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
msgstr ""
-#: src/common/weeconfig.c:921
+#: src/common/weeconfig.c:958
#, c-format
msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:939
+#: src/common/weeconfig.c:976
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
msgstr ""
-#: src/common/weeconfig.c:973
+#: src/common/weeconfig.c:1010
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr ""
-#: src/common/weeconfig.c:984
+#: src/common/weeconfig.c:1021
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
"Expected: boolean value: 'off' or 'on'\n"
msgstr ""
-#: src/common/weeconfig.c:993
+#: src/common/weeconfig.c:1030
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
"Expected: integer between %d and %d\n"
msgstr ""
-#: src/common/weeconfig.c:1004
+#: src/common/weeconfig.c:1041
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
"Expected: one of these strings: "
msgstr ""
-#: src/common/weeconfig.c:1020
+#: src/common/weeconfig.c:1057
#, c-format
msgid "%s %s, line %d: invalid color name for option '%s'\n"
msgstr ""
-#: src/common/weeconfig.c:1079 src/common/weeconfig.c:1247
+#: src/common/weeconfig.c:1116 src/common/weeconfig.c:1284
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr ""
-#: src/common/weeconfig.c:1085
+#: src/common/weeconfig.c:1122
#, c-format
msgid "%s: creating default config file...\n"
msgstr ""
-#: src/common/weeconfig.c:1086
+#: src/common/weeconfig.c:1123
msgid "creating default config file\n"
msgstr ""
-#: src/common/weeconfig.c:1089 src/common/weeconfig.c:1256
+#: src/common/weeconfig.c:1126 src/common/weeconfig.c:1293
#, c-format
msgid ""
"#\n"
"# %s configuration file, created by %s v%s on %s#\n"
msgstr ""
-#: src/common/weeconfig.c:1253
+#: src/common/weeconfig.c:1290
msgid "saving config to disk\n"
msgstr ""
diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c
index 18703b4e5..4936443c8 100644
--- a/weechat/src/common/weeconfig.c
+++ b/weechat/src/common/weeconfig.c
@@ -193,6 +193,12 @@ int cfg_col_nick_sep;
int cfg_col_nick_self;
int cfg_col_nick_private;
int cfg_col_nick_bg;
+int cfg_col_dcc_waiting;
+int cfg_col_dcc_connecting;
+int cfg_col_dcc_active;
+int cfg_col_dcc_done;
+int cfg_col_dcc_failed;
+int cfg_col_dcc_aborted;
t_config_option weechat_options_colors[] =
{ /* title window */
@@ -347,6 +353,32 @@ t_config_option weechat_options_colors[] =
OPTION_TYPE_COLOR, 0, 0, 0,
"default", NULL, &cfg_col_nick_bg, NULL, &config_change_color },
+ /* DCC */
+ { "col_dcc_waiting", N_("color for \"waiting\" dcc status"),
+ N_("color for \"waiting\" dcc status"),
+ OPTION_TYPE_COLOR, 0, 0, 0,
+ "white", NULL, &cfg_col_dcc_waiting, NULL, &config_change_color },
+ { "col_dcc_connecting", N_("color for \"connecting\" dcc status"),
+ N_("color for \"connecting\" dcc status"),
+ OPTION_TYPE_COLOR, 0, 0, 0,
+ "yellow", NULL, &cfg_col_dcc_connecting, NULL, &config_change_color },
+ { "col_dcc_active", N_("color for \"active\" dcc status"),
+ N_("color for \"active\" dcc status"),
+ OPTION_TYPE_COLOR, 0, 0, 0,
+ "lightblue", NULL, &cfg_col_dcc_active, NULL, &config_change_color },
+ { "col_dcc_done", N_("color for \"done\" dcc status"),
+ N_("color for \"done\" dcc status"),
+ OPTION_TYPE_COLOR, 0, 0, 0,
+ "lightgreen", NULL, &cfg_col_dcc_done, NULL, &config_change_color },
+ { "col_dcc_failed", N_("color for \"failed\" dcc status"),
+ N_("color for \"failed\" dcc status"),
+ OPTION_TYPE_COLOR, 0, 0, 0,
+ "lightred", NULL, &cfg_col_dcc_failed, NULL, &config_change_color },
+ { "col_dcc_aborted", N_("color for \"aborted\" dcc status"),
+ N_("color for \"aborted\" dcc status"),
+ OPTION_TYPE_COLOR, 0, 0, 0,
+ "lightred", NULL, &cfg_col_dcc_aborted, NULL, &config_change_color },
+
{ NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
};
@@ -419,6 +451,7 @@ int cfg_dcc_auto_accept_files;
int cfg_dcc_auto_accept_max_size;
int cfg_dcc_auto_accept_chats;
int cfg_dcc_timeout;
+int cfg_dcc_blocksize;
char *cfg_dcc_download_path;
char *cfg_dcc_upload_path;
int cfg_dcc_auto_rename;
@@ -441,6 +474,10 @@ t_config_option weechat_options_dcc[] =
N_("timeout for dcc request (in seconds)"),
OPTION_TYPE_INT, 1, INT_MAX, 300,
NULL, NULL, &cfg_dcc_timeout, NULL, NULL },
+ { "dcc_blocksize", N_("block size for dcc packets"),
+ N_("block size for dcc packets in bytes (default: 1024)"),
+ OPTION_TYPE_INT, 1024, 102400, 1024,
+ NULL, NULL, &cfg_dcc_blocksize, NULL, NULL },
{ "dcc_download_path", N_("path for incoming files with dcc"),
N_("path for writing incoming files with dcc (default: user home)"),
OPTION_TYPE_STRING, 0, 0, 0,
@@ -1263,8 +1300,7 @@ config_write (char *config_name)
if ((i != CONFIG_SECTION_ALIAS) && (i != CONFIG_SECTION_SERVER))
{
fprintf (file, "\n[%s]\n", config_sections[i].section_name);
- if ((i == CONFIG_SECTION_LOG) || (i == CONFIG_SECTION_DCC) ||
- (i == CONFIG_SECTION_PROXY))
+ if ((i == CONFIG_SECTION_LOG) || (i == CONFIG_SECTION_PROXY))
fprintf (file,
"# WARNING!!! Options for section \"%s\" are not developed!\n",
config_sections[i].section_name);
diff --git a/weechat/src/common/weeconfig.h b/weechat/src/common/weeconfig.h
index 88403fe0f..91ddcdf7a 100644
--- a/weechat/src/common/weeconfig.h
+++ b/weechat/src/common/weeconfig.h
@@ -127,6 +127,12 @@ extern int cfg_col_nick_sep;
extern int cfg_col_nick_self;
extern int cfg_col_nick_private;
extern int cfg_col_nick_bg;
+extern int cfg_col_dcc_waiting;
+extern int cfg_col_dcc_connecting;
+extern int cfg_col_dcc_active;
+extern int cfg_col_dcc_done;
+extern int cfg_col_dcc_failed;
+extern int cfg_col_dcc_aborted;
extern int cfg_history_max_lines;
extern int cfg_history_max_commands;
@@ -143,6 +149,7 @@ extern int cfg_dcc_auto_accept_files;
extern int cfg_dcc_auto_accept_max_size;
extern int cfg_dcc_auto_accept_chats;
extern int cfg_dcc_timeout;
+extern int cfg_dcc_blocksize;
extern char *cfg_dcc_download_path;
extern char *cfg_dcc_upload_path;
extern int cfg_dcc_auto_rename;
diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c
index 9ee926f71..2f8f2c2f4 100644
--- a/weechat/src/gui/curses/gui-display.c
+++ b/weechat/src/gui/curses/gui-display.c
@@ -553,8 +553,14 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
{
t_gui_window *ptr_win;
t_gui_line *ptr_line;
+ t_dcc *ptr_dcc;
char format_empty[32];
- int i, lines_used;
+ int i, j, lines_used, num_bars;
+ char *unit_name[] = { N_("bytes"), N_("Kb"), N_("Mb"), N_("Gb") };
+ char *unit_format[] = { "%.0Lf", "%.1Lf", "%.02Lf", "%.02Lf" };
+ long unit_divide[] = { 1, 1024, 1024*1024, 1024*1024,1024 };
+ int num_unit;
+ char format[32];
for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
{
@@ -562,8 +568,7 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
{
if (erase)
{
- if (has_colors ())
- gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
+ gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
snprintf (format_empty, 32, "%%-%ds", ptr_win->win_chat_width);
for (i = 0; i < ptr_win->win_chat_height; i++)
@@ -572,16 +577,65 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
}
}
- if (has_colors ())
- gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
+ gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
if (buffer->dcc)
{
- mvwprintw (ptr_win->win_chat, ptr_win->win_y, ptr_win->win_x,
- "%s", _(" Type Status Filename / progress"));
- for (i = 0; i < ptr_win->win_width; i++)
- mvwprintw (ptr_win->win_chat, 1, i, "%c", '-');
- move (ptr_win->win_y + 3, ptr_win->win_x);
+ i = 0;
+ for (ptr_dcc = dcc_list; ptr_dcc; ptr_dcc = ptr_dcc->next_dcc)
+ {
+ if (i >= ptr_win->win_chat_height - 1)
+ break;
+ if ((ptr_dcc->type == DCC_FILE_RECV)
+ || (ptr_dcc->type == DCC_FILE_SEND))
+ {
+ gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
+ mvwprintw (ptr_win->win_chat, i, 0, " %-16s %s",
+ ptr_dcc->nick, ptr_dcc->filename);
+ gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
+ mvwprintw (ptr_win->win_chat, i + 1, 0, " %s ",
+ (ptr_dcc->type == DCC_FILE_RECV) ?
+ "--->" : "<---");
+ gui_window_set_color (ptr_win->win_chat,
+ COLOR_DCC_WAITING + ptr_dcc->status);
+ wprintw (ptr_win->win_chat, "%-10s",
+ dcc_status_string[ptr_dcc->status]);
+ gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
+ wprintw (ptr_win->win_chat, " [",
+ dcc_status_string[ptr_dcc->status]);
+ if (ptr_dcc->size == 0)
+ num_bars = 10;
+ else
+ num_bars = (int)((((long double)(ptr_dcc->pos)/(long double)(ptr_dcc->size))*100) / 10);
+ for (j = 0; j < num_bars - 1; j++)
+ wprintw (ptr_win->win_chat, "=");
+ if (num_bars > 0)
+ wprintw (ptr_win->win_chat, ">");
+ for (j = 0; j < 10 - num_bars; j++)
+ wprintw (ptr_win->win_chat, " ");
+ if (ptr_dcc->size < 1024*10)
+ num_unit = 0;
+ else if (ptr_dcc->size < 1024*1024)
+ num_unit = 1;
+ else if (ptr_dcc->size < 1024*1024*1024)
+ num_unit = 2;
+ else
+ num_unit = 3;
+ wprintw (ptr_win->win_chat, "] %3lu%% ",
+ (unsigned long)(((long double)(ptr_dcc->pos)/(long double)(ptr_dcc->size))*100),
+ dcc_status_string[ptr_dcc->status]);
+ sprintf (format, "%s %%s / %s %%s",
+ unit_format[num_unit],
+ unit_format[num_unit]);
+ wprintw (ptr_win->win_chat, format,
+ ((long double) ptr_dcc->pos) / ((long double)(unit_divide[num_unit])),
+ unit_name[num_unit],
+ ((long double) ptr_dcc->size) / ((long double)(unit_divide[num_unit])),
+ unit_name[num_unit]);
+ i += 2;
+ }
+ }
+ move (ptr_win->win_y + 1, ptr_win->win_x);
}
else
{
@@ -653,8 +707,7 @@ gui_draw_buffer_nick (t_gui_buffer *buffer, int erase)
{
if (erase)
{
- if (has_colors ())
- gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK);
+ gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK);
snprintf (format_empty, 32, "%%-%ds", ptr_win->win_nick_width);
for (i = 0; i < ptr_win->win_nick_height; i++)
@@ -682,8 +735,7 @@ gui_draw_buffer_nick (t_gui_buffer *buffer, int erase)
ptr_win->win_nick_x);
gui_draw_buffer_chat (buffer, 1);
- if (has_colors ())
- gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK);
+ gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK);
snprintf (format_empty, 32, "%%-%ds", ptr_win->win_nick_width);
for (i = 0; i < ptr_win->win_nick_height; i++)
@@ -908,7 +960,7 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
{
gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS);
if (ptr_win->buffer->dcc)
- wprintw (ptr_win->win_status, _("%d:<DCC> "),
+ wprintw (ptr_win->win_status, "%d:<DCC> ",
ptr_win->buffer->number);
else
wprintw (ptr_win->win_status, _("%d:[not connected] "),
@@ -1577,6 +1629,19 @@ gui_init_colors ()
color_attr[COLOR_WIN_NICK_FIRST + i - 1] =
(color & A_BOLD) ? A_BOLD : 0;
}
+
+ init_pair (COLOR_DCC_WAITING,
+ cfg_col_dcc_waiting & A_CHARTEXT, cfg_col_chat_bg);
+ init_pair (COLOR_DCC_CONNECTING,
+ cfg_col_dcc_connecting & A_CHARTEXT, cfg_col_chat_bg);
+ init_pair (COLOR_DCC_ACTIVE,
+ cfg_col_dcc_active & A_CHARTEXT, cfg_col_chat_bg);
+ init_pair (COLOR_DCC_DONE,
+ cfg_col_dcc_done & A_CHARTEXT, cfg_col_chat_bg);
+ init_pair (COLOR_DCC_FAILED,
+ cfg_col_dcc_failed & A_CHARTEXT, cfg_col_chat_bg);
+ init_pair (COLOR_DCC_ABORTED,
+ cfg_col_dcc_aborted & A_CHARTEXT, cfg_col_chat_bg);
color_attr[COLOR_WIN_TITLE - 1] = cfg_col_title & A_BOLD;
color_attr[COLOR_WIN_CHAT - 1] = cfg_col_chat & A_BOLD;
@@ -1608,6 +1673,12 @@ gui_init_colors ()
color_attr[COLOR_WIN_NICK_SEP - 1] = 0;
color_attr[COLOR_WIN_NICK_SELF - 1] = cfg_col_nick_self & A_BOLD;
color_attr[COLOR_WIN_NICK_PRIVATE - 1] = cfg_col_nick_private & A_BOLD;
+ color_attr[COLOR_DCC_WAITING - 1] = cfg_col_dcc_waiting & A_BOLD;
+ color_attr[COLOR_DCC_CONNECTING - 1] = cfg_col_dcc_connecting & A_BOLD;
+ color_attr[COLOR_DCC_ACTIVE - 1] = cfg_col_dcc_active & A_BOLD;
+ color_attr[COLOR_DCC_DONE - 1] = cfg_col_dcc_done & A_BOLD;
+ color_attr[COLOR_DCC_FAILED - 1] = cfg_col_dcc_failed & A_BOLD;
+ color_attr[COLOR_DCC_ABORTED - 1] = cfg_col_dcc_aborted & A_BOLD;
}
}
diff --git a/weechat/src/gui/gui.h b/weechat/src/gui/gui.h
index 469980fc8..bed1707cf 100644
--- a/weechat/src/gui/gui.h
+++ b/weechat/src/gui/gui.h
@@ -26,7 +26,7 @@
#define INPUT_BUFFER_BLOCK_SIZE 256
-#define NUM_COLORS 39
+#define NUM_COLORS 45
#define COLOR_WIN_TITLE 1
#define COLOR_WIN_CHAT 2
#define COLOR_WIN_CHAT_TIME 3
@@ -59,6 +59,12 @@
#define COLOR_WIN_NICK_FIRST 30
#define COLOR_WIN_NICK_LAST 39
#define COLOR_WIN_NICK_NUMBER (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1)
+#define COLOR_DCC_WAITING 40
+#define COLOR_DCC_CONNECTING 41
+#define COLOR_DCC_ACTIVE 42
+#define COLOR_DCC_DONE 43
+#define COLOR_DCC_FAILED 44
+#define COLOR_DCC_ABORTED 45
#define SERVER(buffer) ((t_irc_server *)(buffer->server))
#define CHANNEL(buffer) ((t_irc_channel *)(buffer->channel))
diff --git a/weechat/src/irc/irc-dcc.c b/weechat/src/irc/irc-dcc.c
index 3178149a9..d2276ef7c 100644
--- a/weechat/src/irc/irc-dcc.c
+++ b/weechat/src/irc/irc-dcc.c
@@ -24,8 +24,19 @@
#include "config.h"
#endif
+#include <stdlib.h>
+#include <string.h>
+
#include "../common/weechat.h"
#include "irc.h"
+#include "../common/weeconfig.h"
+#include "../gui/gui.h"
+
+
+t_dcc *dcc_list = NULL; /* DCC files & chat list */
+char *dcc_status_string[] = /* strings for DCC status */
+{ N_("Waiting"), N_("Connecting"), N_("Active"), N_("Done"), N_("Failed"),
+ N_("Aborted") };
/*
@@ -45,3 +56,52 @@ void
dcc_send ()
{
}
+
+/*
+ * dcc_free: free DCC struct
+ */
+
+void
+dcc_free (t_dcc *ptr_dcc)
+{
+ if (ptr_dcc->nick)
+ free (ptr_dcc->nick);
+ if (ptr_dcc->filename)
+ free (ptr_dcc->filename);
+}
+
+/*
+ * dcc_add: add a DCC file to queue
+ */
+
+t_dcc *
+dcc_add (t_irc_server *server, int type, unsigned long addr, int port, char *nick, char *filename,
+ unsigned int size)
+{
+ t_dcc *new_dcc;
+
+ if ((new_dcc = (t_dcc *) malloc (sizeof (t_dcc))) == NULL)
+ {
+ gui_printf (NULL, _("%s not enough memory for new DCC\n"), WEECHAT_ERROR);
+ return NULL;
+ }
+ new_dcc->server = server;
+ new_dcc->type = type;
+ new_dcc->status = DCC_ACTIVE;
+ new_dcc->addr = addr;
+ new_dcc->port = port;
+ new_dcc->nick = strdup (nick);
+ new_dcc->file = -1;
+ new_dcc->filename = strdup (filename);
+ new_dcc->size = size;
+ new_dcc->pos = 0;
+ new_dcc->next_dcc = dcc_list;
+ dcc_list = new_dcc;
+
+ gui_printf (NULL, "Incoming DCC file: type:%d, nick:%s, address:%d.%d.%d.%d, "
+ "port=%d, name=%s, size=%lu\n",
+ type, nick,
+ addr >> 24, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff,
+ port, filename, size);
+ return new_dcc;
+}
diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c
index 0fb2313d4..f203a63d2 100644
--- a/weechat/src/irc/irc-recv.c
+++ b/weechat/src/irc/irc-recv.c
@@ -1140,9 +1140,8 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *arguments)
pos2--;
pos2[1] = '\0';
- wee_log_printf ("Incoming DCC file (NOT DEVELOPED!): "
- "\"%s\", address=\"%s\", port=\"%s\", size=\"%s\"\n",
- pos_file, pos_addr, pos_port, pos_size);
+ dcc_add (server, DCC_FILE_RECV, (unsigned long) atol (pos_addr),
+ atoi (pos_port), host, pos_file, (unsigned int) atoi (pos_size));
return 0;
}
diff --git a/weechat/src/irc/irc-send.c b/weechat/src/irc/irc-send.c
index 9dfde6d54..d33bb275c 100644
--- a/weechat/src/irc/irc-send.c
+++ b/weechat/src/irc/irc-send.c
@@ -734,6 +734,7 @@ irc_cmd_send_query (t_irc_server *server, char *arguments)
{
char *pos;
t_irc_channel *ptr_channel;
+ t_gui_buffer *ptr_buffer;
pos = strchr (arguments, ' ');
if (pos)
@@ -761,6 +762,18 @@ irc_cmd_send_query (t_irc_server *server, char *arguments)
}
gui_draw_buffer_title (ptr_channel->buffer, 1);
}
+ else
+ {
+ for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
+ {
+ if (ptr_buffer->channel == ptr_channel)
+ {
+ gui_switch_to_buffer (gui_current_window, ptr_buffer);
+ gui_redraw_buffer (ptr_buffer);
+ break;
+ }
+ }
+ }
/* display text if given */
if (pos)
diff --git a/weechat/src/irc/irc.h b/weechat/src/irc/irc.h
index d194cfda7..e3f08440a 100644
--- a/weechat/src/irc/irc.h
+++ b/weechat/src/irc/irc.h
@@ -23,6 +23,8 @@
#include "../gui/gui.h"
+/* prefixes for chat window */
+
#define PREFIX_SERVER "-@-"
#define PREFIX_INFO "-=-"
#define PREFIX_ACTION_ME "-*-"
@@ -34,6 +36,8 @@
#define CHANNEL_PREFIX "#&+!"
+/* channel modes */
+
#define NUM_CHANNEL_MODES 7
#define CHANNEL_MODE_INVITE 0
#define CHANNEL_MODE_KEY 1
@@ -50,6 +54,20 @@
#define DEFAULT_IRC_PORT 6667
+/* DCC types & status */
+
+#define DCC_CHAT_RECV 0 /* receiving DCC chat */
+#define DCC_CHAT_SEND 1 /* sending DCC chat */
+#define DCC_FILE_RECV 2 /* incoming DCC file */
+#define DCC_FILE_SEND 3 /* sending DCC file */
+
+#define DCC_WAITING 0 /* waiting for host answer */
+#define DCC_CONNECTING 1 /* connecting to host */
+#define DCC_ACTIVE 2 /* sending/receiving data */
+#define DCC_DONE 3 /* transfer done */
+#define DCC_FAILED 4 /* DCC failed */
+#define DCC_ABORTED 5 /* DCC aborted by user */
+
/* nick types */
typedef struct t_irc_nick t_irc_nick;
@@ -143,6 +161,8 @@ struct t_irc_command
/* function called when cmd is received */
};
+/* irc messages */
+
typedef struct t_irc_message t_irc_message;
struct t_irc_message
@@ -152,10 +172,31 @@ struct t_irc_message
t_irc_message *next_message; /* link to next message */
};
+/* DCC */
+
+typedef struct t_dcc t_dcc;
+
+struct t_dcc
+{
+ t_irc_server *server; /* irc server */
+ int type; /* DCC type (send or receive) */
+ int status; /* DCC status (waiting, sending, ..) */
+ unsigned long addr; /* IP address */
+ int port; /* port */
+ char *nick; /* remote nick */
+ int file; /* local file (for reading or writing) */
+ char *filename; /* local filename */
+ unsigned long size; /* file size */
+ unsigned long pos; /* number of bytes received/sent */
+ t_dcc *next_dcc; /* link to next dcc file/chat */
+};
+
extern t_irc_command irc_commands[];
extern t_irc_server *irc_servers, *current_irc_server;
extern t_irc_message *recv_msgq, *msgq_last_msg;
extern t_irc_channel *current_channel;
+extern t_dcc *dcc_list;
+extern char *dcc_status_string[6];
extern char *channel_modes;
/* server functions (irc-server.c) */
@@ -201,6 +242,8 @@ extern int nick_get_max_length (t_irc_channel *);
/* DCC functions (irc-dcc.c) */
extern void dcc_send ();
+extern t_dcc *dcc_add (t_irc_server *, int, unsigned long, int, char *, char *,
+ unsigned int);
/* IRC display (irc-diplay.c) */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 00:50:08 +0000