summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--TODO3
-rw-r--r--configure.in4
-rw-r--r--po/fr.po354
-rw-r--r--po/weechat.pot352
-rw-r--r--src/common/weechat.c3
-rw-r--r--src/common/weechat.h1
-rw-r--r--src/common/weeconfig.c17
-rw-r--r--src/common/weeconfig.h3
-rw-r--r--src/gui/curses/gui-display.c121
-rw-r--r--src/gui/curses/gui-input.c15
-rw-r--r--src/gui/gtk/gui-display.c29
-rw-r--r--src/gui/gui-common.c4
-rw-r--r--src/gui/gui.h45
-rw-r--r--weechat/ChangeLog4
-rw-r--r--weechat/TODO3
-rw-r--r--weechat/configure.in4
-rw-r--r--weechat/po/fr.po354
-rw-r--r--weechat/po/weechat.pot352
-rw-r--r--weechat/src/common/weechat.c3
-rw-r--r--weechat/src/common/weechat.h1
-rw-r--r--weechat/src/common/weeconfig.c17
-rw-r--r--weechat/src/common/weeconfig.h3
-rw-r--r--weechat/src/gui/curses/gui-display.c121
-rw-r--r--weechat/src/gui/curses/gui-input.c15
-rw-r--r--weechat/src/gui/gtk/gui-display.c29
-rw-r--r--weechat/src/gui/gui-common.c4
-rw-r--r--weechat/src/gui/gui.h45
28 files changed, 1168 insertions, 742 deletions
diff --git a/ChangeLog b/ChangeLog
index c763b3889..ef7fdf504 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,12 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-ChangeLog - 2004-01-17
+ChangeLog - 2004-01-18
Version 0.0.5 (under dev!):
+ * added info bar (optional, "look_infobar" to enable it, "on" by default)
+ * fixed crash with /oper command
* for default config file, nick is now based on un*x username (thanks to Witukind)
* fixed crash when config file cannot be written
* -c (or --config) command line parameter added to see config file options
diff --git a/TODO b/TODO
index 8c95b7a2f..7c7673427 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,7 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-TODO - 2004-01-11
+TODO - 2004-01-18
Legend:
# done
@@ -19,6 +19,7 @@ v0.0.5:
* Interface:
+ internationalization (traduce WeeChat in many languages)
+ + info bar
* Configuration:
+ add missing options for config file
diff --git a/configure.in b/configure.in
index 5f715c264..519dec1ac 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.5-pre1, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.0.5-pre2, flashcode@flashtux.org)
AC_CONFIG_SRCDIR([src/common/weechat.c])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.0.5-pre1])
+AM_INIT_AUTOMAKE([weechat], [0.0.5-pre2])
# Checks for programs.
AC_PROG_CC
diff --git a/po/fr.po b/po/fr.po
index baf64aa9a..c47a5cfab 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: WeeChat 0.0.4\n"
+"Project-Id-Version: WeeChat 0.0.5-pre2\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2004-01-17 11:16+0100\n"
+"POT-Creation-Date: 2004-01-18 19:34+0100\n"
"PO-Revision-Date: 2004-01-01 11:52+0100\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1529,24 +1529,24 @@ msgstr ""
"%s impossible d'ajouter la fonction pour le message \"%s\" (mémoire "
"insuffisante)\n"
-#: src/gui/curses/gui-display.c:861
+#: src/gui/curses/gui-display.c:887
msgid "[not connected] "
msgstr "[non connecté] "
-#: src/gui/curses/gui-display.c:868 src/gui/curses/gui-display.c:871
+#: src/gui/curses/gui-display.c:894 src/gui/curses/gui-display.c:897
msgid "-MORE-"
msgstr "-PLUS-"
-#: src/gui/gtk/gui-display.c:618
+#: src/gui/gtk/gui-display.c:647
msgid "server"
msgstr "serveur"
-#: src/gui/gui-common.c:266
+#: src/gui/gui-common.c:270
#, 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:293
+#: src/gui/gui-common.c:297
msgid "not enough memory!\n"
msgstr "pas assez de mémoire !\n"
@@ -2044,7 +2044,7 @@ msgstr "%s alias ou commande \"%s\" non trouvé\n"
msgid "Alias \"%s\" removed\n"
msgstr "Alias \"%s\" supprimé\n"
-#: src/common/weechat.c:119
+#: src/common/weechat.c:120
msgid ""
"WeeChat configuration options (~/.weechat/weechat.rc):\n"
"\n"
@@ -2052,43 +2052,43 @@ msgstr ""
"Options de configuration de WeeChat (~/.weechat/weechat.rc):\n"
"\n"
-#: src/common/weechat.c:132
+#: src/common/weechat.c:133
msgid " . type boolean (values: 'on' or 'off')\n"
msgstr " . type booléen (valeurs: 'on' ou 'off')\n"
-#: src/common/weechat.c:133 src/common/weechat.c:156 src/common/weechat.c:162
-#: src/common/weechat.c:168
+#: src/common/weechat.c:134 src/common/weechat.c:157 src/common/weechat.c:163
+#: src/common/weechat.c:169
#, c-format
msgid " . default value: '%s'\n"
msgstr " . valeur par défaut: '%s'\n"
-#: src/common/weechat.c:138
+#: src/common/weechat.c:139
#, c-format
msgid " . type integer (values: between %d and %d)\n"
msgstr " . type entier (valeurs: entre %d et %d)\n"
-#: src/common/weechat.c:141
+#: src/common/weechat.c:142
#, c-format
msgid " . default value: %d\n"
msgstr " . valeur par défaut: %d\n"
-#: src/common/weechat.c:145
+#: src/common/weechat.c:146
msgid " . type string (values: "
msgstr " . type chaîne (valeurs: "
-#: src/common/weechat.c:158 src/common/weechat.c:164 src/common/weechat.c:170
+#: src/common/weechat.c:159 src/common/weechat.c:165 src/common/weechat.c:171
msgid "empty"
msgstr "vide"
-#: src/common/weechat.c:161
+#: src/common/weechat.c:162
msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n"
msgstr " . type couleur (couleur Curses ou Gtk, voir la doc WeeChat)\n"
-#: src/common/weechat.c:167
+#: src/common/weechat.c:168
msgid " . type string (any string)\n"
msgstr " . type chaîne (toute chaîne)\n"
-#: src/common/weechat.c:173
+#: src/common/weechat.c:174
#, c-format
msgid ""
" . description: %s\n"
@@ -2097,14 +2097,14 @@ msgstr ""
" . description: %s\n"
"\n"
-#: src/common/weechat.c:179
+#: src/common/weechat.c:180
msgid ""
"Moreover, you can define aliases in [alias] section, by adding lines like:\n"
msgstr ""
"De plus, vous pouvez définir des alias dans la section [alias], en ajoutant "
"des lignes comme :\n"
-#: src/common/weechat.c:181
+#: src/common/weechat.c:182
msgid ""
"where 'j' is alias name, and 'join' associated command.\n"
"\n"
@@ -2112,27 +2112,27 @@ msgstr ""
"où 'j' est le nom de l'alias, et 'join' la commande associée.\n"
"\n"
-#: src/common/weechat.c:205
+#: src/common/weechat.c:206
#, c-format
msgid "%s unknown parameter '%s', ignored\n"
msgstr "%s paramètre inconnu '%s', ignoré\n"
-#: src/common/weechat.c:225
+#: src/common/weechat.c:226
#, c-format
msgid "%s cannot create directory \"%s\"\n"
msgstr "%s impossible de créer le répertoire \"%s\"\n"
-#: src/common/weechat.c:327
+#: src/common/weechat.c:328
#, c-format
msgid "%s unable to create/append to log file (~/.weechat/%s)"
msgstr "%s impossible de créer/ajouter dans le fichier de log (~/.weechat/%s)"
-#: src/common/weechat.c:351
+#: src/common/weechat.c:352
#, c-format
msgid "%sWelcome to "
msgstr "%sBienvenue dans "
-#: src/common/weechat.c:364
+#: src/common/weechat.c:365
msgid "compiled on"
msgstr "compilé le"
@@ -2144,63 +2144,63 @@ msgstr " Erreur:"
msgid " Warning:"
msgstr " Attention:"
-#: src/common/weeconfig.c:78 src/common/weeconfig.c:79
+#: src/common/weeconfig.c:79 src/common/weeconfig.c:80
msgid "set title for terminal window (curses GUI) with name & version"
msgstr ""
"définit le titre de la fenêtre de terminal (GUI curses) avec le nom et la "
"version"
-#: src/common/weeconfig.c:82 src/common/weeconfig.c:83
+#: src/common/weeconfig.c:83 src/common/weeconfig.c:84
msgid "display WeeChat logo at startup"
msgstr "afficher le logo WeeChat au démarrage"
-#: src/common/weeconfig.c:86 src/common/weeconfig.c:87
+#: src/common/weeconfig.c:87 src/common/weeconfig.c:88
msgid "display WeeChat version at startup"
msgstr "afficher la version de WeeChat au démarrage"
-#: src/common/weeconfig.c:90
+#: src/common/weeconfig.c:91
msgid "WeeChat slogan"
msgstr "slogan WeeChat"
-#: src/common/weeconfig.c:91
+#: src/common/weeconfig.c:92
msgid "WeeChat slogan (if empty, slogan is not used)"
msgstr "slogan WeeChat (si vide, le slogan ne sera pas utilisé)"
-#: src/common/weeconfig.c:94 src/common/weeconfig.c:95
+#: src/common/weeconfig.c:95 src/common/weeconfig.c:96
msgid "display nick names with different colors"
msgstr "afficher les utilisateurs avec différentes couleurs"
-#: src/common/weeconfig.c:98 src/common/weeconfig.c:99
+#: src/common/weeconfig.c:99 src/common/weeconfig.c:100
msgid "display actions with different colors"
msgstr "afficher les actions avec différentes couleurs"
-#: src/common/weeconfig.c:102 src/common/weeconfig.c:103
+#: src/common/weeconfig.c:103 src/common/weeconfig.c:104
msgid "remove colors from incoming messages"
msgstr "supprimer les couleurs dans les messages entrants"
-#: src/common/weeconfig.c:106
+#: src/common/weeconfig.c:107
msgid "display nicklist window"
msgstr "afficher la fenêtre des utilisateurs"
-#: src/common/weeconfig.c:107
+#: src/common/weeconfig.c:108
msgid "display nicklist window (for channel windows)"
msgstr "afficher la fenêtre des utilisateurs (pour les fenêtres de canaux)"
-#: src/common/weeconfig.c:110
+#: src/common/weeconfig.c:111
msgid "nicklist position"
msgstr "position de la fenêtre d'utilisateurs"
-#: src/common/weeconfig.c:111
+#: src/common/weeconfig.c:112
msgid "nicklist position (top, left, right (default), bottom)"
msgstr ""
"position de la fenêtre d'utilisateurs (haut (top), gauche (left), droite "
"(right, par défaut), bas (bottom))"
-#: src/common/weeconfig.c:114
+#: src/common/weeconfig.c:115
msgid "min size for nicklist"
msgstr "taille minimum pour la fenêtre d'utilisateurs"
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:116
msgid ""
"min size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no min size))"
@@ -2208,11 +2208,11 @@ msgstr ""
"taille minimum pour la fenêtre d'utilisateurs (largeur ou hauteur, selon "
"look_nicklist_position (0 = pas de taille minimum))"
-#: src/common/weeconfig.c:119
+#: src/common/weeconfig.c:120
msgid "max size for nicklist"
msgstr "taille maximum pour la fenêtre d'utilisateurs"
-#: src/common/weeconfig.c:120
+#: src/common/weeconfig.c:121
msgid ""
"max size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no max size; if min == max and > 0, then size is fixed))"
@@ -2221,205 +2221,217 @@ msgstr ""
"look_nicklist_position (0 = pas de taille maximum; si min == max et > 0, "
"alors la taille est fixe))"
-#: src/common/weeconfig.c:124 src/common/weeconfig.c:125
+#: src/common/weeconfig.c:125 src/common/weeconfig.c:126
msgid "text to display instead of nick when not connected"
msgstr ""
"texte à afficher en lieu et place du nom d'utilisateur lorsque la connexion "
"n'est pas active"
-#: src/common/weeconfig.c:128 src/common/weeconfig.c:129
+#: src/common/weeconfig.c:129 src/common/weeconfig.c:130
msgid "display nick mode ((half)op/voice) before each nick"
msgstr ""
"afficher le mode de l'utilisateur ((half)op/voice) devant chaque utilisateur"
-#: src/common/weeconfig.c:132 src/common/weeconfig.c:133
+#: src/common/weeconfig.c:133 src/common/weeconfig.c:134
msgid "display space if nick mode is not (half)op/voice"
msgstr "afficher un espace si le mode utilisateur n'est pas (half)op/voice"
-#: src/common/weeconfig.c:136 src/common/weeconfig.c:137
+#: src/common/weeconfig.c:137 src/common/weeconfig.c:138
msgid "the string inserted after nick completion"
msgstr "la chaîne affichée après la complétion des utilisateurs"
-#: src/common/weeconfig.c:179 src/common/weeconfig.c:180
+#: src/common/weeconfig.c:141 src/common/weeconfig.c:142
+msgid "enable info bar"
+msgstr "active la barre d'infos"
+
+#: src/common/weeconfig.c:186 src/common/weeconfig.c:187
msgid "color for title bar"
msgstr "couleur pour la barre de titre"
-#: src/common/weeconfig.c:183 src/common/weeconfig.c:184
+#: src/common/weeconfig.c:190 src/common/weeconfig.c:191
msgid "background for title bar"
msgstr "couleur de fond pour la barre de titre"
-#: src/common/weeconfig.c:189 src/common/weeconfig.c:190
+#: src/common/weeconfig.c:196 src/common/weeconfig.c:197
msgid "color for chat text"
msgstr "couleur pour le texte de discussion"
-#: src/common/weeconfig.c:193
+#: src/common/weeconfig.c:200
msgid "color for time"
msgstr "couleur pour l'heure"
-#: src/common/weeconfig.c:194
+#: src/common/weeconfig.c:201
msgid "color for time in chat window"
msgstr "couleur pour l'heure dans la fenêtre de discussion"
-#: src/common/weeconfig.c:197
+#: src/common/weeconfig.c:204
msgid "color for time separator"
msgstr "couleur pour le séparateur de l'heure"
-#: src/common/weeconfig.c:198
+#: src/common/weeconfig.c:205
msgid "color for time separator (chat window)"
msgstr "couleur pour la séparation de l'heure (fenêtre de discussion)"
-#: src/common/weeconfig.c:201 src/common/weeconfig.c:202
+#: src/common/weeconfig.c:208 src/common/weeconfig.c:209
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:205 src/common/weeconfig.c:206
+#: src/common/weeconfig.c:212 src/common/weeconfig.c:213
msgid "color for middle char of prefix"
msgstr "couleur pour le caractère du milieu du préfixe"
-#: src/common/weeconfig.c:209
+#: src/common/weeconfig.c:216
msgid "color for nicks in actions"
msgstr "couleur pour les noms d'utilisateur dans les actions"
-#: src/common/weeconfig.c:210
+#: src/common/weeconfig.c:217
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:213
+#: src/common/weeconfig.c:220
msgid "color for hostnames"
msgstr "couleur pour les noms de machines"
-#: src/common/weeconfig.c:214
+#: src/common/weeconfig.c:221
msgid "color for hostnames (chat window)"
msgstr "couleur pour les noms de machines (fenêtre de discussion)"
-#: src/common/weeconfig.c:217
+#: src/common/weeconfig.c:224
msgid "color for channel names in actions"
msgstr "couleur pour les canaux dans les actions"
-#: src/common/weeconfig.c:218
+#: src/common/weeconfig.c:225
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:221
+#: src/common/weeconfig.c:228
msgid "color for dark separators"
msgstr "couleur pour les séparateurs sombres"
-#: src/common/weeconfig.c:222
+#: src/common/weeconfig.c:229
msgid "color for dark separators (chat window)"
msgstr "couleur pour les séparateurs sombres (fenêtre de discussion)"
-#: src/common/weeconfig.c:225
+#: src/common/weeconfig.c:232
msgid "color for highlighted nick"
msgstr "couleur pour le pseudo surligné"
-#: src/common/weeconfig.c:226
+#: src/common/weeconfig.c:233
msgid "color for highlighted nick (chat window)"
msgstr "couleur pour le pseudo surligné (fenêtre de discussion)"
-#: src/common/weeconfig.c:229
+#: src/common/weeconfig.c:236
msgid "background for chat"
msgstr "couleur de fond pour la discussion"
-#: src/common/weeconfig.c:230
+#: src/common/weeconfig.c:237
msgid "background for chat window"
msgstr "couleur de fond pour la fenêtre de discussion"
-#: src/common/weeconfig.c:235 src/common/weeconfig.c:236
+#: src/common/weeconfig.c:242 src/common/weeconfig.c:243
msgid "color for status bar"
msgstr "couleur pour la barre de statut"
-#: src/common/weeconfig.c:239
+#: src/common/weeconfig.c:246
msgid "color for active window"
msgstr "couleur pour la fenêtre active"
-#: src/common/weeconfig.c:240
+#: src/common/weeconfig.c:247
msgid "color for active window (status bar)"
msgstr "couleur pour la fenêtre active (barre de statut)"
-#: src/common/weeconfig.c:243
+#: src/common/weeconfig.c:250
msgid "color for window with new messages"
msgstr "couleur pour une fenêtre avec de nouvelles infos"
-#: src/common/weeconfig.c:244
+#: src/common/weeconfig.c:251
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:247
+#: src/common/weeconfig.c:254
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:248
+#: src/common/weeconfig.c:255
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:251
+#: src/common/weeconfig.c:258
msgid "color for \"*MORE*\" text"
msgstr "couleur pour le texte \"*MORE*\""
-#: src/common/weeconfig.c:252
+#: src/common/weeconfig.c:259
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:255 src/common/weeconfig.c:256
+#: src/common/weeconfig.c:262 src/common/weeconfig.c:263
msgid "background for status window"
msgstr "couleur de fond pour la fenêtre de statut"
-#: src/common/weeconfig.c:261 src/common/weeconfig.c:262
+#: src/common/weeconfig.c:268 src/common/weeconfig.c:269
+msgid "color for info bar text"
+msgstr "couleur pour la barre d'infos"
+
+#: src/common/weeconfig.c:272 src/common/weeconfig.c:273
+msgid "background for info bar window"
+msgstr "couleur de fond pour la fenêtre de barre d'infos"
+
+#: src/common/weeconfig.c:278 src/common/weeconfig.c:279
msgid "color for input text"
msgstr "couleur pour le texte saisi"
-#: src/common/weeconfig.c:265 src/common/weeconfig.c:266
+#: src/common/weeconfig.c:282 src/common/weeconfig.c:283
msgid "color for input text (channel name)"
msgstr "couleur pour le texte saisi (nom du canal)"
-#: src/common/weeconfig.c:269 src/common/weeconfig.c:270
+#: src/common/weeconfig.c:286 src/common/weeconfig.c:287
msgid "color for input text (nick name)"
msgstr "couleur pour le texte saisi (pseudo)"
-#: src/common/weeconfig.c:273 src/common/weeconfig.c:274
+#: src/common/weeconfig.c:290 src/common/weeconfig.c:291
msgid "background for input window"
msgstr "couleur de fond pour la fenêtre de saisie"
-#: src/common/weeconfig.c:279 src/common/weeconfig.c:280
+#: src/common/weeconfig.c:296 src/common/weeconfig.c:297
msgid "color for nicknames"
msgstr "couleur pour les pseudos"
-#: src/common/weeconfig.c:283 src/common/weeconfig.c:284
+#: src/common/weeconfig.c:300 src/common/weeconfig.c:301
msgid "color for operator symbol"
msgstr "couleur pour le symbole opérateur"
-#: src/common/weeconfig.c:287 src/common/weeconfig.c:288
+#: src/common/weeconfig.c:304 src/common/weeconfig.c:305
msgid "color for half-operator symbol"
msgstr "couleur pour le symbole demi-opérateur"
-#: src/common/weeconfig.c:291 src/common/weeconfig.c:292
+#: src/common/weeconfig.c:308 src/common/weeconfig.c:309
msgid "color for voice symbol"
msgstr "couleur pour le symbole voix"
-#: src/common/weeconfig.c:295 src/common/weeconfig.c:296
+#: src/common/weeconfig.c:312 src/common/weeconfig.c:313
msgid "color for nick separator"
msgstr "couleur pour le séparateur de pseudo"
-#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
+#: src/common/weeconfig.c:316 src/common/weeconfig.c:317
msgid "color for local nick"
msgstr "couleur pour le pseudo local"
-#: src/common/weeconfig.c:303 src/common/weeconfig.c:304
+#: src/common/weeconfig.c:320 src/common/weeconfig.c:321
msgid "color for other nick in private window"
msgstr "couleur pour l'autre pseudo dans la fenêtre privée"
-#: src/common/weeconfig.c:307 src/common/weeconfig.c:308
+#: src/common/weeconfig.c:324 src/common/weeconfig.c:325
msgid "background for nicknames"
msgstr "couleur de fond pour les pseudos"
-#: src/common/weeconfig.c:321
+#: src/common/weeconfig.c:338
msgid "max lines in history (per window)"
msgstr "nombre maxi de lignes dans l'historique (par fenêtre)"
-#: src/common/weeconfig.c:322
+#: src/common/weeconfig.c:339
msgid ""
"maximum number of lines in history for one server/channel/private window (0 "
"= unlimited)"
@@ -2427,36 +2439,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:326
+#: src/common/weeconfig.c:343
msgid "max user commands in history"
msgstr "nombre maxi de commandes utilisateur dans l'historique"
-#: src/common/weeconfig.c:327
+#: src/common/weeconfig.c:344
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:344 src/common/weeconfig.c:345
+#: src/common/weeconfig.c:361 src/common/weeconfig.c:362
msgid "automatically log channel chats"
msgstr "enregistrer automatiquement les conversations des canaux"
-#: src/common/weeconfig.c:348 src/common/weeconfig.c:349
+#: src/common/weeconfig.c:365 src/common/weeconfig.c:366
msgid "automatically log private chats"
msgstr "enregistrer automatiquement les conversations privées"
-#: src/common/weeconfig.c:352
+#: src/common/weeconfig.c:369
msgid "path for log files"
msgstr "chemin pour les conversations sauvegardées"
-#: src/common/weeconfig.c:353
+#: src/common/weeconfig.c:370
msgid "path for WeeChat log files"
msgstr "chemin pour les conversations sauvegardées par WeeChat"
-#: src/common/weeconfig.c:356
+#: src/common/weeconfig.c:373
msgid "name for log files"
msgstr "nom des conversations sauvegardées"
-#: src/common/weeconfig.c:357
+#: src/common/weeconfig.c:374
msgid ""
"name for log files (%S == irc server name, %N == channel name (or nickname "
"if private chat)"
@@ -2464,21 +2476,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:361
+#: src/common/weeconfig.c:378
msgid "timestamp for log"
msgstr "horodatage pour les conversations sauvegardées"
-#: src/common/weeconfig.c:362
+#: src/common/weeconfig.c:379
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:365
+#: src/common/weeconfig.c:382
msgid "start string for log files"
msgstr "chaîne de début pour les conversations sauvegardées"
-#: src/common/weeconfig.c:366
+#: src/common/weeconfig.c:383
msgid ""
"text written when starting new log file (see man strftime for date/time "
"specifiers)"
@@ -2486,186 +2498,186 @@ msgstr ""
"texte écrit en démarrant la sauvegarde d'une discussion (voir man strftime "
"pour le format de date/heure)"
-#: src/common/weeconfig.c:370
+#: src/common/weeconfig.c:387
msgid "end string for log files"
msgstr "chaîne de fin pour les conversations sauvegardées"
-#: src/common/weeconfig.c:371
+#: src/common/weeconfig.c:388
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:390
+#: src/common/weeconfig.c:407
msgid "automatically accept dcc files"
msgstr "accepte automatiquement les fichiers dcc"
-#: src/common/weeconfig.c:391
+#: src/common/weeconfig.c:408
msgid "automatically accept incoming dcc files"
msgstr "accepte automatiquement les fichiers dcc entrants"
-#: src/common/weeconfig.c:394
+#: src/common/weeconfig.c:411
msgid "max size when auto accepting file"
msgstr "taille maxi pour accepter un fichier"
-#: src/common/weeconfig.c:395
+#: src/common/weeconfig.c:412
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:398
+#: src/common/weeconfig.c:415
msgid "automatically accept dcc chats"
msgstr "accepte automatiquement les demandes de discussion dcc"
-#: src/common/weeconfig.c:399
+#: src/common/weeconfig.c:416
msgid "automatically accept dcc chats (use carefully!)"
msgstr ""
"accepte automatiquement les demandes de discussion dcc (à utiliser avec "
"précaution !)"
-#: src/common/weeconfig.c:402
+#: src/common/weeconfig.c:419
msgid "timeout for dcc request"
msgstr "délai d'attente pour les requêtes dcc"
-#: src/common/weeconfig.c:403
+#: src/common/weeconfig.c:420
msgid "timeout for dcc request (in seconds)"
msgstr "délai d'attente pour les requêtes dcc (en secondes)"
-#: src/common/weeconfig.c:406
+#: src/common/weeconfig.c:423
msgid "path for incoming files with dcc"
msgstr "chemin les fichiers reçus par dcc"
-#: src/common/weeconfig.c:407
+#: src/common/weeconfig.c:424
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:410
+#: src/common/weeconfig.c:427
msgid "default path for sending files with dcc"
msgstr "chemin par défaut pour envoyer les fichiers par dcc"
-#: src/common/weeconfig.c:411
+#: src/common/weeconfig.c:428
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:414
+#: src/common/weeconfig.c:431
msgid "automatically rename dcc files if already exists"
msgstr "renomme automatiquement les fichiers dcc s'ils existent déjà"
-#: src/common/weeconfig.c:415
+#: src/common/weeconfig.c:432
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:418
+#: src/common/weeconfig.c:435
msgid "automatically resume aborted transfers"
msgstr "continuer automatiquement les transferts non terminés"
-#: src/common/weeconfig.c:419
+#: src/common/weeconfig.c:436
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:433
+#: src/common/weeconfig.c:450
msgid "use proxy"
msgstr "utiliser un proxy"
-#: src/common/weeconfig.c:434
+#: src/common/weeconfig.c:451
msgid "use a proxy server to connect to irc server"
msgstr "utiliser un proxy pour se connecter au serveur irc"
-#: src/common/weeconfig.c:437
+#: src/common/weeconfig.c:454
msgid "proxy address"
msgstr "adresse du proxy"
-#: src/common/weeconfig.c:438
+#: src/common/weeconfig.c:455
msgid "proxy server address (IP or hostname)"
msgstr "adresse du serveur proxy (IP ou nom)"
-#: src/common/weeconfig.c:441
+#: src/common/weeconfig.c:458
msgid "port for proxy"
msgstr "port pour le proxy"
-#: src/common/weeconfig.c:442
+#: src/common/weeconfig.c:459
msgid "port for connecting to proxy server"
msgstr "port pour se connecter au serveur proxy"
-#: src/common/weeconfig.c:445
+#: src/common/weeconfig.c:462
msgid "proxy password"
msgstr "mot de passe pour le proxy"
-#: src/common/weeconfig.c:446
+#: src/common/weeconfig.c:463
msgid "password for proxy server"
msgstr "mot de passe pour le serveur proxy"
-#: src/common/weeconfig.c:457
+#: src/common/weeconfig.c:474
msgid "server name"
msgstr "nom du serveur"
-#: src/common/weeconfig.c:458
+#: src/common/weeconfig.c:475
msgid "name associated to IRC server (for display only)"
msgstr "nom associé au serveur IRC (pour affichage seulement)"
-#: src/common/weeconfig.c:461
+#: src/common/weeconfig.c:478
msgid "automatically connect to server"
msgstr "connexion automatique au serveur"
-#: src/common/weeconfig.c:462
+#: src/common/weeconfig.c:479
msgid "automatically connect to server when WeeChat is starting"
msgstr "connexion automatique au serveur quand WeeChat démarre"
-#: src/common/weeconfig.c:465
+#: src/common/weeconfig.c:482
msgid "server address or hostname"
msgstr "adresse ou nom du serveur"
-#: src/common/weeconfig.c:466
+#: src/common/weeconfig.c:483
msgid "IP address or hostname of IRC server"
msgstr "adresse IP ou nom du serveur IRC"
-#: src/common/weeconfig.c:469
+#: src/common/weeconfig.c:486
msgid "port for IRC server"
msgstr "port pour le serveur IRC"
-#: src/common/weeconfig.c:470
+#: src/common/weeconfig.c:487
msgid "port for connecting to server"
msgstr "port pour se connecter au serveur"
-#: src/common/weeconfig.c:473
+#: src/common/weeconfig.c:490
msgid "server password"
msgstr "mot de passe pour le serveur"
-#: src/common/weeconfig.c:474
+#: src/common/weeconfig.c:491
msgid "password for IRC server"
msgstr "mot de passe pour le serveur IRC"
-#: src/common/weeconfig.c:477
+#: src/common/weeconfig.c:494
msgid "nickname for server"
msgstr "pseudo pour le serveur"
-#: src/common/weeconfig.c:478
+#: src/common/weeconfig.c:495
msgid "nickname to use on IRC server"
msgstr "pseudo à utiliser sur le serveur IRC"
-#: src/common/weeconfig.c:481
+#: src/common/weeconfig.c:498
msgid "alternate nickname for server"
msgstr "pseudo alternatif pour le serveur"
-#: src/common/weeconfig.c:482
+#: src/common/weeconfig.c:499
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:485
+#: src/common/weeconfig.c:502
msgid "2nd alternate nickname for server"
msgstr "2nd pseudo alternatif pour le serveur"
-#: src/common/weeconfig.c:486
+#: src/common/weeconfig.c:503
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
@@ -2673,87 +2685,87 @@ msgstr ""
"2nd pseudo alternatif pour le serveur IRC (si le pseudo alternatif est déjà "
"utilisé)"
-#: src/common/weeconfig.c:489
+#: src/common/weeconfig.c:506
msgid "user name for server"
msgstr "nom d'utilisateur pour le serveur"
-#: src/common/weeconfig.c:490
+#: src/common/weeconfig.c:507
msgid "user name to use on IRC server"
msgstr "nom d'utilisateur pour le serveur IRC"
-#: src/common/weeconfig.c:493
+#: src/common/weeconfig.c:510
msgid "real name for server"
msgstr "nom réel pour le serveur"
-#: src/common/weeconfig.c:494
+#: src/common/weeconfig.c:511
msgid "real name to use on IRC server"
msgstr "nom réel pour le serveur IRC"
-#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
+#: src/common/weeconfig.c:514 src/common/weeconfig.c:515
msgid "first command to run when connected to server"
msgstr "commande à exécuter en premier lorsque connecté au serveur"
-#: src/common/weeconfig.c:501
+#: src/common/weeconfig.c:518
msgid "list of channels to join when connected to server"
msgstr "liste des canaux à rejoindre lorsque connecté au serveur"
-#: src/common/weeconfig.c:502
+#: src/common/weeconfig.c:519
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:630
+#: src/common/weeconfig.c:647
#, 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:639
+#: src/common/weeconfig.c:656
#, 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:651
+#: src/common/weeconfig.c:668
#, 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:690
+#: src/common/weeconfig.c:707
#, 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:701
+#: src/common/weeconfig.c:718
#, 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:735
+#: src/common/weeconfig.c:752
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr "%s fichier de configuration \"%s\" non trouvé.\n"
-#: src/common/weeconfig.c:767
+#: src/common/weeconfig.c:784
#, 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:784
+#: src/common/weeconfig.c:801
#, 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:802
+#: src/common/weeconfig.c:819
#, 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:836
+#: src/common/weeconfig.c:853
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr "%s %s, ligne %d: option \"%s\" invalide\n"
-#: src/common/weeconfig.c:847
+#: src/common/weeconfig.c:864
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
@@ -2762,7 +2774,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:856
+#: src/common/weeconfig.c:873
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -2771,7 +2783,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:867
+#: src/common/weeconfig.c:884
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -2780,26 +2792,26 @@ msgstr ""
"%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
"Attendu: une de ces chaînes: "
-#: src/common/weeconfig.c:883
+#: src/common/weeconfig.c:900
#, 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:937 src/common/weeconfig.c:1091
+#: src/common/weeconfig.c:954 src/common/weeconfig.c:1116
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr "%s impossible de créer le fichier \"%s\"\n"
-#: src/common/weeconfig.c:943
+#: src/common/weeconfig.c:960
#, 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:944
+#: src/common/weeconfig.c:961
msgid "creating default config file\n"
msgstr "création du fichier de configuration par défaut\n"
-#: src/common/weeconfig.c:947 src/common/weeconfig.c:1100
+#: src/common/weeconfig.c:964 src/common/weeconfig.c:1125
#, c-format
msgid ""
"#\n"
@@ -2808,10 +2820,10 @@ msgstr ""
"#\n"
"# %s: fichier de configuration, créé par %s v%s le %s#\n"
-#: src/common/weeconfig.c:1047
+#: src/common/weeconfig.c:1072
msgid "Unable to get user's name"
msgstr "Impossible de déterminer le nom d'utilisateur"
-#: src/common/weeconfig.c:1097
+#: src/common/weeconfig.c:1122
msgid "saving config to disk\n"
msgstr "sauvegarde de la configuration sur disque\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index c7f838aeb..e2f1a230d 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-01-17 11:16+0100\n"
+"POT-Creation-Date: 2004-01-18 19:34+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1426,24 +1426,24 @@ msgstr ""
msgid "%s unable to add handler for \"%s\" message (not enough memory)\n"
msgstr ""
-#: src/gui/curses/gui-display.c:861
+#: src/gui/curses/gui-display.c:887
msgid "[not connected] "
msgstr ""
-#: src/gui/curses/gui-display.c:868 src/gui/curses/gui-display.c:871
+#: src/gui/curses/gui-display.c:894 src/gui/curses/gui-display.c:897
msgid "-MORE-"
msgstr ""
-#: src/gui/gtk/gui-display.c:618
+#: src/gui/gtk/gui-display.c:647
msgid "server"
msgstr ""
-#: src/gui/gui-common.c:266
+#: src/gui/gui-common.c:270
#, c-format
msgid "%s not enough memory for new line!\n"
msgstr ""
-#: src/gui/gui-common.c:293
+#: src/gui/gui-common.c:297
msgid "not enough memory!\n"
msgstr ""
@@ -1911,87 +1911,87 @@ msgstr ""
msgid "Alias \"%s\" removed\n"
msgstr ""
-#: src/common/weechat.c:119
+#: src/common/weechat.c:120
msgid ""
"WeeChat configuration options (~/.weechat/weechat.rc):\n"
"\n"
msgstr ""
-#: src/common/weechat.c:132
+#: src/common/weechat.c:133
msgid " . type boolean (values: 'on' or 'off')\n"
msgstr ""
-#: src/common/weechat.c:133 src/common/weechat.c:156 src/common/weechat.c:162
-#: src/common/weechat.c:168
+#: src/common/weechat.c:134 src/common/weechat.c:157 src/common/weechat.c:163
+#: src/common/weechat.c:169
#, c-format
msgid " . default value: '%s'\n"
msgstr ""
-#: src/common/weechat.c:138
+#: src/common/weechat.c:139
#, c-format
msgid " . type integer (values: between %d and %d)\n"
msgstr ""
-#: src/common/weechat.c:141
+#: src/common/weechat.c:142
#, c-format
msgid " . default value: %d\n"
msgstr ""
-#: src/common/weechat.c:145
+#: src/common/weechat.c:146
msgid " . type string (values: "
msgstr ""
-#: src/common/weechat.c:158 src/common/weechat.c:164 src/common/weechat.c:170
+#: src/common/weechat.c:159 src/common/weechat.c:165 src/common/weechat.c:171
msgid "empty"
msgstr ""
-#: src/common/weechat.c:161
+#: src/common/weechat.c:162
msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n"
msgstr ""
-#: src/common/weechat.c:167
+#: src/common/weechat.c:168
msgid " . type string (any string)\n"
msgstr ""
-#: src/common/weechat.c:173
+#: src/common/weechat.c:174
#, c-format
msgid ""
" . description: %s\n"
"\n"
msgstr ""
-#: src/common/weechat.c:179
+#: src/common/weechat.c:180
msgid ""
"Moreover, you can define aliases in [alias] section, by adding lines like:\n"
msgstr ""
-#: src/common/weechat.c:181
+#: src/common/weechat.c:182
msgid ""
"where 'j' is alias name, and 'join' associated command.\n"
"\n"
msgstr ""
-#: src/common/weechat.c:205
+#: src/common/weechat.c:206
#, c-format
msgid "%s unknown parameter '%s', ignored\n"
msgstr ""
-#: src/common/weechat.c:225
+#: src/common/weechat.c:226
#, c-format
msgid "%s cannot create directory \"%s\"\n"
msgstr ""
-#: src/common/weechat.c:327
+#: src/common/weechat.c:328
#, c-format
msgid "%s unable to create/append to log file (~/.weechat/%s)"
msgstr ""
-#: src/common/weechat.c:351
+#: src/common/weechat.c:352
#, c-format
msgid "%sWelcome to "
msgstr ""
-#: src/common/weechat.c:364
+#: src/common/weechat.c:365
msgid "compiled on"
msgstr ""
@@ -2003,626 +2003,638 @@ msgstr ""
msgid " Warning:"
msgstr ""
-#: src/common/weeconfig.c:78 src/common/weeconfig.c:79
+#: src/common/weeconfig.c:79 src/common/weeconfig.c:80
msgid "set title for terminal window (curses GUI) with name & version"
msgstr ""
-#: src/common/weeconfig.c:82 src/common/weeconfig.c:83
+#: src/common/weeconfig.c:83 src/common/weeconfig.c:84
msgid "display WeeChat logo at startup"
msgstr ""
-#: src/common/weeconfig.c:86 src/common/weeconfig.c:87
+#: src/common/weeconfig.c:87 src/common/weeconfig.c:88
msgid "display WeeChat version at startup"
msgstr ""
-#: src/common/weeconfig.c:90
+#: src/common/weeconfig.c:91
msgid "WeeChat slogan"
msgstr ""
-#: src/common/weeconfig.c:91
+#: src/common/weeconfig.c:92
msgid "WeeChat slogan (if empty, slogan is not used)"
msgstr ""
-#: src/common/weeconfig.c:94 src/common/weeconfig.c:95
+#: src/common/weeconfig.c:95 src/common/weeconfig.c:96
msgid "display nick names with different colors"
msgstr ""
-#: src/common/weeconfig.c:98 src/common/weeconfig.c:99
+#: src/common/weeconfig.c:99 src/common/weeconfig.c:100
msgid "display actions with different colors"
msgstr ""
-#: src/common/weeconfig.c:102 src/common/weeconfig.c:103
+#: src/common/weeconfig.c:103 src/common/weeconfig.c:104
msgid "remove colors from incoming messages"
msgstr ""
-#: src/common/weeconfig.c:106
+#: src/common/weeconfig.c:107
msgid "display nicklist window"
msgstr ""
-#: src/common/weeconfig.c:107
+#: src/common/weeconfig.c:108
msgid "display nicklist window (for channel windows)"
msgstr ""
-#: src/common/weeconfig.c:110
+#: src/common/weeconfig.c:111
msgid "nicklist position"
msgstr ""
-#: src/common/weeconfig.c:111
+#: src/common/weeconfig.c:112
msgid "nicklist position (top, left, right (default), bottom)"
msgstr ""
-#: src/common/weeconfig.c:114
+#: src/common/weeconfig.c:115
msgid "min size for nicklist"
msgstr ""
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:116
msgid ""
"min size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no min size))"
msgstr ""
-#: src/common/weeconfig.c:119
+#: src/common/weeconfig.c:120
msgid "max size for nicklist"
msgstr ""
-#: src/common/weeconfig.c:120
+#: src/common/weeconfig.c:121
msgid ""
"max size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no max size; if min == max and > 0, then size is fixed))"
msgstr ""
-#: src/common/weeconfig.c:124 src/common/weeconfig.c:125
+#: src/common/weeconfig.c:125 src/common/weeconfig.c:126
msgid "text to display instead of nick when not connected"
msgstr ""
-#: src/common/weeconfig.c:128 src/common/weeconfig.c:129
+#: src/common/weeconfig.c:129 src/common/weeconfig.c:130
msgid "display nick mode ((half)op/voice) before each nick"
msgstr ""
-#: src/common/weeconfig.c:132 src/common/weeconfig.c:133
+#: src/common/weeconfig.c:133 src/common/weeconfig.c:134
msgid "display space if nick mode is not (half)op/voice"
msgstr ""
-#: src/common/weeconfig.c:136 src/common/weeconfig.c:137
+#: src/common/weeconfig.c:137 src/common/weeconfig.c:138
msgid "the string inserted after nick completion"
msgstr ""
-#: src/common/weeconfig.c:179 src/common/weeconfig.c:180
+#: src/common/weeconfig.c:141 src/common/weeconfig.c:142
+msgid "enable info bar"
+msgstr ""
+
+#: src/common/weeconfig.c:186 src/common/weeconfig.c:187
msgid "color for title bar"
msgstr ""
-#: src/common/weeconfig.c:183 src/common/weeconfig.c:184
+#: src/common/weeconfig.c:190 src/common/weeconfig.c:191
msgid "background for title bar"
msgstr ""
-#: src/common/weeconfig.c:189 src/common/weeconfig.c:190
+#: src/common/weeconfig.c:196 src/common/weeconfig.c:197
msgid "color for chat text"
msgstr ""
-#: src/common/weeconfig.c:193
+#: src/common/weeconfig.c:200
msgid "color for time"
msgstr ""
-#: src/common/weeconfig.c:194
+#: src/common/weeconfig.c:201
msgid "color for time in chat window"
msgstr ""
-#: src/common/weeconfig.c:197
+#: src/common/weeconfig.c:204
msgid "color for time separator"
msgstr ""
-#: src/common/weeconfig.c:198
+#: src/common/weeconfig.c:205
msgid "color for time separator (chat window)"
msgstr ""
-#: src/common/weeconfig.c:201 src/common/weeconfig.c:202
+#: src/common/weeconfig.c:208 src/common/weeconfig.c:209
msgid "color for 1st and 3rd char of prefix"
msgstr ""
-#: src/common/weeconfig.c:205 src/common/weeconfig.c:206
+#: src/common/weeconfig.c:212 src/common/weeconfig.c:213
msgid "color for middle char of prefix"
msgstr ""
-#: src/common/weeconfig.c:209
+#: src/common/weeconfig.c:216
msgid "color for nicks in actions"
msgstr ""
-#: src/common/weeconfig.c:210
+#: src/common/weeconfig.c:217
msgid "color for nicks in actions (chat window)"
msgstr ""
-#: src/common/weeconfig.c:213
+#: src/common/weeconfig.c:220
msgid "color for hostnames"
msgstr ""
-#: src/common/weeconfig.c:214
+#: src/common/weeconfig.c:221
msgid "color for hostnames (chat window)"
msgstr ""
-#: src/common/weeconfig.c:217
+#: src/common/weeconfig.c:224
msgid "color for channel names in actions"
msgstr ""
-#: src/common/weeconfig.c:218
+#: src/common/weeconfig.c:225
msgid "color for channel names in actions (chat window)"
msgstr ""
-#: src/common/weeconfig.c:221
+#: src/common/weeconfig.c:228
msgid "color for dark separators"
msgstr ""
-#: src/common/weeconfig.c:222
+#: src/common/weeconfig.c:229
msgid "color for dark separators (chat window)"
msgstr ""
-#: src/common/weeconfig.c:225
+#: src/common/weeconfig.c:232
msgid "color for highlighted nick"
msgstr ""
-#: src/common/weeconfig.c:226
+#: src/common/weeconfig.c:233
msgid "color for highlighted nick (chat window)"
msgstr ""
-#: src/common/weeconfig.c:229
+#: src/common/weeconfig.c:236
msgid "background for chat"
msgstr ""
-#: src/common/weeconfig.c:230
+#: src/common/weeconfig.c:237
msgid "background for chat window"
msgstr ""
-#: src/common/weeconfig.c:235 src/common/weeconfig.c:236
+#: src/common/weeconfig.c:242 src/common/weeconfig.c:243
msgid "color for status bar"
msgstr ""
-#: src/common/weeconfig.c:239
+#: src/common/weeconfig.c:246
msgid "color for active window"
msgstr ""
-#: src/common/weeconfig.c:240
+#: src/common/weeconfig.c:247
msgid "color for active window (status bar)"
msgstr ""
-#: src/common/weeconfig.c:243
+#: src/common/weeconfig.c:250
msgid "color for window with new messages"
msgstr ""
-#: src/common/weeconfig.c:244
+#: src/common/weeconfig.c:251
msgid "color for window with new messages (status bar)"
msgstr ""
-#: src/common/weeconfig.c:247
+#: src/common/weeconfig.c:254
msgid "color for window with new data (not messages)"
msgstr ""
-#: src/common/weeconfig.c:248
+#: src/common/weeconfig.c:255
msgid "color for window with new data (not messages) (status bar)"
msgstr ""
-#: src/common/weeconfig.c:251
+#: src/common/weeconfig.c:258
msgid "color for \"*MORE*\" text"
msgstr ""
-#: src/common/weeconfig.c:252
+#: src/common/weeconfig.c:259
msgid "color for window with new data (status bar)"
msgstr ""
-#: src/common/weeconfig.c:255 src/common/weeconfig.c:256
+#: src/common/weeconfig.c:262 src/common/weeconfig.c:263
msgid "background for status window"
msgstr ""
-#: src/common/weeconfig.c:261 src/common/weeconfig.c:262
+#: src/common/weeconfig.c:268 src/common/weeconfig.c:269
+msgid "color for info bar text"
+msgstr ""
+
+#: src/common/weeconfig.c:272 src/common/weeconfig.c:273
+msgid "background for info bar window"
+msgstr ""
+
+#: src/common/weeconfig.c:278 src/common/weeconfig.c:279
msgid "color for input text"
msgstr ""
-#: src/common/weeconfig.c:265 src/common/weeconfig.c:266
+#: src/common/weeconfig.c:282 src/common/weeconfig.c:283
msgid "color for input text (channel name)"
msgstr ""
-#: src/common/weeconfig.c:269 src/common/weeconfig.c:270
+#: src/common/weeconfig.c:286 src/common/weeconfig.c:287
msgid "color for input text (nick name)"
msgstr ""
-#: src/common/weeconfig.c:273 src/common/weeconfig.c:274
+#: src/common/weeconfig.c:290 src/common/weeconfig.c:291
msgid "background for input window"
msgstr ""
-#: src/common/weeconfig.c:279 src/common/weeconfig.c:280
+#: src/common/weeconfig.c:296 src/common/weeconfig.c:297
msgid "color for nicknames"
msgstr ""
-#: src/common/weeconfig.c:283 src/common/weeconfig.c:284
+#: src/common/weeconfig.c:300 src/common/weeconfig.c:301
msgid "color for operator symbol"
msgstr ""
-#: src/common/weeconfig.c:287 src/common/weeconfig.c:288
+#: src/common/weeconfig.c:304 src/common/weeconfig.c:305
msgid "color for half-operator symbol"
msgstr ""
-#: src/common/weeconfig.c:291 src/common/weeconfig.c:292
+#: src/common/weeconfig.c:308 src/common/weeconfig.c:309
msgid "color for voice symbol"
msgstr ""
-#: src/common/weeconfig.c:295 src/common/weeconfig.c:296
+#: src/common/weeconfig.c:312 src/common/weeconfig.c:313
msgid "color for nick separator"
msgstr ""
-#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
+#: src/common/weeconfig.c:316 src/common/weeconfig.c:317
msgid "color for local nick"
msgstr ""
-#: src/common/weeconfig.c:303 src/common/weeconfig.c:304
+#: src/common/weeconfig.c:320 src/common/weeconfig.c:321
msgid "color for other nick in private window"
msgstr ""
-#: src/common/weeconfig.c:307 src/common/weeconfig.c:308
+#: src/common/weeconfig.c:324 src/common/weeconfig.c:325
msgid "background for nicknames"
msgstr ""
-#: src/common/weeconfig.c:321
+#: src/common/weeconfig.c:338
msgid "max lines in history (per window)"
msgstr ""
-#: src/common/weeconfig.c:322
+#: src/common/weeconfig.c:339
msgid ""
"maximum number of lines in history for one server/channel/private window (0 "
"= unlimited)"
msgstr ""
-#: src/common/weeconfig.c:326
+#: src/common/weeconfig.c:343
msgid "max user commands in history"
msgstr ""
-#: src/common/weeconfig.c:327
+#: src/common/weeconfig.c:344
msgid "maximum number of user commands in history (0 = unlimited)"
msgstr ""
-#: src/common/weeconfig.c:344 src/common/weeconfig.c:345
+#: src/common/weeconfig.c:361 src/common/weeconfig.c:362
msgid "automatically log channel chats"
msgstr ""
-#: src/common/weeconfig.c:348 src/common/weeconfig.c:349
+#: src/common/weeconfig.c:365 src/common/weeconfig.c:366
msgid "automatically log private chats"
msgstr ""
-#: src/common/weeconfig.c:352
+#: src/common/weeconfig.c:369
msgid "path for log files"
msgstr ""
-#: src/common/weeconfig.c:353
+#: src/common/weeconfig.c:370
msgid "path for WeeChat log files"
msgstr ""
-#: src/common/weeconfig.c:356
+#: src/common/weeconfig.c:373
msgid "name for log files"
msgstr ""
-#: src/common/weeconfig.c:357
+#: src/common/weeconfig.c:374
msgid ""
"name for log files (%S == irc server name, %N == channel name (or nickname "
"if private chat)"
msgstr ""
-#: src/common/weeconfig.c:361
+#: src/common/weeconfig.c:378
msgid "timestamp for log"
msgstr ""
-#: src/common/weeconfig.c:362
+#: src/common/weeconfig.c:379
msgid "timestamp for log (see man strftime for date/time specifiers)"
msgstr ""
-#: src/common/weeconfig.c:365
+#: src/common/weeconfig.c:382
msgid "start string for log files"
msgstr ""
-#: src/common/weeconfig.c:366
+#: src/common/weeconfig.c:383
msgid ""
"text written when starting new log file (see man strftime for date/time "
"specifiers)"
msgstr ""
-#: src/common/weeconfig.c:370
+#: src/common/weeconfig.c:387
msgid "end string for log files"
msgstr ""
-#: src/common/weeconfig.c:371
+#: src/common/weeconfig.c:388
msgid ""
"text written when ending log file (see man strftime for date/time specifiers)"
msgstr ""
-#: src/common/weeconfig.c:390
+#: src/common/weeconfig.c:407
msgid "automatically accept dcc files"
msgstr ""
-#: src/common/weeconfig.c:391
+#: src/common/weeconfig.c:408
msgid "automatically accept incoming dcc files"
msgstr ""
-#: src/common/weeconfig.c:394
+#: src/common/weeconfig.c:411
msgid "max size when auto accepting file"
msgstr ""
-#: src/common/weeconfig.c:395
+#: src/common/weeconfig.c:412
msgid "maximum size for incoming file when automatically accepted"
msgstr ""
-#: src/common/weeconfig.c:398
+#: src/common/weeconfig.c:415
msgid "automatically accept dcc chats"
msgstr ""
-#: src/common/weeconfig.c:399
+#: src/common/weeconfig.c:416
msgid "automatically accept dcc chats (use carefully!)"
msgstr ""
-#: src/common/weeconfig.c:402
+#: src/common/weeconfig.c:419
msgid "timeout for dcc request"
msgstr ""
-#: src/common/weeconfig.c:403
+#: src/common/weeconfig.c:420
msgid "timeout for dcc request (in seconds)"
msgstr ""
-#: src/common/weeconfig.c:406
+#: src/common/weeconfig.c:423
msgid "path for incoming files with dcc"
msgstr ""
-#: src/common/weeconfig.c:407
+#: src/common/weeconfig.c:424
msgid "path for writing incoming files with dcc (default: user home)"
msgstr ""
-#: src/common/weeconfig.c:410
+#: src/common/weeconfig.c:427
msgid "default path for sending files with dcc"
msgstr ""
-#: src/common/weeconfig.c:411
+#: src/common/weeconfig.c:428
msgid ""
"path for reading files when sending thru dcc (when no path is specified)"
msgstr ""
-#: src/common/weeconfig.c:414
+#: src/common/weeconfig.c:431
msgid "automatically rename dcc files if already exists"
msgstr ""
-#: src/common/weeconfig.c:415
+#: src/common/weeconfig.c:432
msgid "rename incoming files if already exists (add '.1', '.2', ...)"
msgstr ""
-#: src/common/weeconfig.c:418
+#: src/common/weeconfig.c:435
msgid "automatically resume aborted transfers"
msgstr ""
-#: src/common/weeconfig.c:419
+#: src/common/weeconfig.c:436
msgid ""
"automatically resume dcc transfer if connection with remote host is loosed"
msgstr ""
-#: src/common/weeconfig.c:433
+#: src/common/weeconfig.c:450
msgid "use proxy"
msgstr ""
-#: src/common/weeconfig.c:434
+#: src/common/weeconfig.c:451
msgid "use a proxy server to connect to irc server"
msgstr ""
-#: src/common/weeconfig.c:437
+#: src/common/weeconfig.c:454
msgid "proxy address"
msgstr ""
-#: src/common/weeconfig.c:438
+#: src/common/weeconfig.c:455
msgid "proxy server address (IP or hostname)"
msgstr ""
-#: src/common/weeconfig.c:441
+#: src/common/weeconfig.c:458
msgid "port for proxy"
msgstr ""
-#: src/common/weeconfig.c:442
+#: src/common/weeconfig.c:459
msgid "port for connecting to proxy server"
msgstr ""
-#: src/common/weeconfig.c:445
+#: src/common/weeconfig.c:462
msgid "proxy password"
msgstr ""
-#: src/common/weeconfig.c:446
+#: src/common/weeconfig.c:463
msgid "password for proxy server"
msgstr ""
-#: src/common/weeconfig.c:457
+#: src/common/weeconfig.c:474
msgid "server name"
msgstr ""
-#: src/common/weeconfig.c:458
+#: src/common/weeconfig.c:475
msgid "name associated to IRC server (for display only)"
msgstr ""
-#: src/common/weeconfig.c:461
+#: src/common/weeconfig.c:478
msgid "automatically connect to server"
msgstr ""
-#: src/common/weeconfig.c:462
+#: src/common/weeconfig.c:479
msgid "automatically connect to server when WeeChat is starting"
msgstr ""
-#: src/common/weeconfig.c:465
+#: src/common/weeconfig.c:482
msgid "server address or hostname"
msgstr ""
-#: src/common/weeconfig.c:466
+#: src/common/weeconfig.c:483
msgid "IP address or hostname of IRC server"
msgstr ""
-#: src/common/weeconfig.c:469
+#: src/common/weeconfig.c:486
msgid "port for IRC server"
msgstr ""
-#: src/common/weeconfig.c:470
+#: src/common/weeconfig.c:487
msgid "port for connecting to server"
msgstr ""
-#: src/common/weeconfig.c:473
+#: src/common/weeconfig.c:490
msgid "server password"
msgstr ""
-#: src/common/weeconfig.c:474
+#: src/common/weeconfig.c:491
msgid "password for IRC server"
msgstr ""
-#: src/common/weeconfig.c:477
+#: src/common/weeconfig.c:494
msgid "nickname for server"
msgstr ""
-#: src/common/weeconfig.c:478
+#: src/common/weeconfig.c:495
msgid "nickname to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:481
+#: src/common/weeconfig.c:498
msgid "alternate nickname for server"
msgstr ""
-#: src/common/weeconfig.c:482
+#: src/common/weeconfig.c:499
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr ""
-#: src/common/weeconfig.c:485
+#: src/common/weeconfig.c:502
msgid "2nd alternate nickname for server"
msgstr ""
-#: src/common/weeconfig.c:486
+#: src/common/weeconfig.c:503
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
msgstr ""
-#: src/common/weeconfig.c:489
+#: src/common/weeconfig.c:506
msgid "user name for server"
msgstr ""
-#: src/common/weeconfig.c:490
+#: src/common/weeconfig.c:507
msgid "user name to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:493
+#: src/common/weeconfig.c:510
msgid "real name for server"
msgstr ""
-#: src/common/weeconfig.c:494
+#: src/common/weeconfig.c:511
msgid "real name to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
+#: src/common/weeconfig.c:514 src/common/weeconfig.c:515
msgid "first command to run when connected to server"
msgstr ""
-#: src/common/weeconfig.c:501
+#: src/common/weeconfig.c:518
msgid "list of channels to join when connected to server"
msgstr ""
-#: src/common/weeconfig.c:502
+#: src/common/weeconfig.c:519
msgid "comma separated list of channels to join when connected to server"
msgstr ""
-#: src/common/weeconfig.c:630
+#: src/common/weeconfig.c:647
#, c-format
msgid "%s %s, line %d: new server, but previous was incomplete\n"
msgstr ""
-#: src/common/weeconfig.c:639
+#: src/common/weeconfig.c:656
#, c-format
msgid "%s %s, line %d: server '%s' already exists\n"
msgstr ""
-#: src/common/weeconfig.c:651
+#: src/common/weeconfig.c:668
#, c-format
msgid "%s %s, line %d: unable to create server\n"
msgstr ""
-#: src/common/weeconfig.c:690
+#: src/common/weeconfig.c:707
#, c-format
msgid "%s unable to assign default int with string (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:701
+#: src/common/weeconfig.c:718
#, c-format
msgid "%s unable to assign default color (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:735
+#: src/common/weeconfig.c:752
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr ""
-#: src/common/weeconfig.c:767
+#: src/common/weeconfig.c:784
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
msgstr ""
-#: src/common/weeconfig.c:784
+#: src/common/weeconfig.c:801
#, c-format
msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:802
+#: src/common/weeconfig.c:819
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
msgstr ""
-#: src/common/weeconfig.c:836
+#: src/common/weeconfig.c:853
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr ""
-#: src/common/weeconfig.c:847
+#: src/common/weeconfig.c:864
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
"Expected: boolean value: 'off' or 'on'\n"
msgstr ""
-#: src/common/weeconfig.c:856
+#: src/common/weeconfig.c:873
#, 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:867
+#: src/common/weeconfig.c:884
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
"Expected: one of these strings: "
msgstr ""
-#: src/common/weeconfig.c:883
+#: src/common/weeconfig.c:900
#, c-format
msgid "%s %s, line %d: invalid color name for option '%s'\n"
msgstr ""
-#: src/common/weeconfig.c:937 src/common/weeconfig.c:1091
+#: src/common/weeconfig.c:954 src/common/weeconfig.c:1116
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr ""
-#: src/common/weeconfig.c:943
+#: src/common/weeconfig.c:960
#, c-format
msgid "%s: creating default config file...\n"
msgstr ""
-#: src/common/weeconfig.c:944
+#: src/common/weeconfig.c:961
msgid "creating default config file\n"
msgstr ""
-#: src/common/weeconfig.c:947 src/common/weeconfig.c:1100
+#: src/common/weeconfig.c:964 src/common/weeconfig.c:1125
#, c-format
msgid ""
"#\n"
"# %s configuration file, created by %s v%s on %s#\n"
msgstr ""
-#: src/common/weeconfig.c:1047
+#: src/common/weeconfig.c:1072
msgid "Unable to get user's name"
msgstr ""
-#: src/common/weeconfig.c:1097
+#: src/common/weeconfig.c:1122
msgid "saving config to disk\n"
msgstr ""
diff --git a/src/common/weechat.c b/src/common/weechat.c
index f9b595c17..b03ba027c 100644
--- a/src/common/weechat.c
+++ b/src/common/weechat.c
@@ -58,6 +58,7 @@
#include "../plugins/plugins.h"
+char *var_LANG; /* LANG environment variable */
int quit_weechat; /* = 1 if quit request from user... why ? :'( */
char *weechat_home; /* WeeChat home dir. (example: /home/toto/.weechat) */
FILE *log_file; /* WeeChat log file (~/.weechat/weechat.log) */
@@ -391,6 +392,8 @@ wee_shutdown ()
int
main (int argc, char *argv[])
{
+ var_LANG = getenv ("LANG"); /* get LANG environment variable */
+
#ifdef ENABLE_NLS
setlocale (LC_ALL, ""); /* initialize gettext */
bindtextdomain (PACKAGE, LOCALEDIR);
diff --git a/src/common/weechat.h b/src/common/weechat.h
index 4afc59f74..5ab30e049 100644
--- a/src/common/weechat.h
+++ b/src/common/weechat.h
@@ -94,6 +94,7 @@
/* global variables and functions */
+extern char *var_LANG;
extern int quit_weechat;
extern char *weechat_home;
diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c
index 8932a1417..8dde9f24a 100644
--- a/src/common/weeconfig.c
+++ b/src/common/weeconfig.c
@@ -73,6 +73,7 @@ int cfg_look_nickmode;
int cfg_look_nickmode_empty;
char *cfg_look_no_nickname;
char *cfg_look_completor;
+int cfg_look_infobar;
t_config_option weechat_options_look[] =
{ { "look_set_title", N_("set title for terminal window (curses GUI) with name & version"),
@@ -137,6 +138,10 @@ t_config_option weechat_options_look[] =
N_("the string inserted after nick completion"),
OPTION_TYPE_STRING, 0, 0, 0,
":", NULL, NULL, &cfg_look_completor, NULL },
+ { "look_infobar", N_("enable info bar"),
+ N_("enable info bar"),
+ OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
+ NULL, NULL, &cfg_look_infobar, NULL, NULL },
{ NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
};
@@ -161,6 +166,8 @@ int cfg_col_status_data_msg;
int cfg_col_status_data_other;
int cfg_col_status_more;
int cfg_col_status_bg;
+int cfg_col_infobar;
+int cfg_col_infobar_bg;
int cfg_col_input;
int cfg_col_input_channel;
int cfg_col_input_nick;
@@ -256,6 +263,16 @@ t_config_option weechat_options_colors[] =
N_("background for status window"),
OPTION_TYPE_COLOR, 0, 0, 0,
"blue", NULL, &cfg_col_status_bg, NULL, NULL },
+
+ /* infobar window */
+ { "col_infobar", N_("color for info bar text"),
+ N_("color for info bar text"),
+ OPTION_TYPE_COLOR, 0, 0, 0,
+ "gray", NULL, &cfg_col_infobar, NULL, NULL },
+ { "col_infobar_bg", N_("background for info bar window"),
+ N_("background for info bar window"),
+ OPTION_TYPE_COLOR, 0, 0, 0,
+ "blue", NULL, &cfg_col_infobar_bg, NULL, NULL },
/* input window */
{ "col_input", N_("color for input text"),
diff --git a/src/common/weeconfig.h b/src/common/weeconfig.h
index 085df165a..3078355ae 100644
--- a/src/common/weeconfig.h
+++ b/src/common/weeconfig.h
@@ -88,6 +88,7 @@ extern int cfg_look_nickmode;
extern int cfg_look_nickmode_empty;
extern char *cfg_look_no_nickname;
extern char *cfg_look_completor;
+extern int cfg_look_infobar;
extern int cfg_col_title;
extern int cfg_col_title_bg;
@@ -108,6 +109,8 @@ extern int cfg_col_status_data_msg;
extern int cfg_col_status_data_other;
extern int cfg_col_status_more;
extern int cfg_col_status_bg;
+extern int cfg_col_infobar;
+extern int cfg_col_infobar_bg;
extern int cfg_col_input;
extern int cfg_col_input_channel;
extern int cfg_col_input_nick;
diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c
index ba84f9238..5f0db3624 100644
--- a/src/gui/curses/gui-display.c
+++ b/src/gui/curses/gui-display.c
@@ -192,21 +192,37 @@ gui_calculate_pos_size (t_gui_window *window)
window->win_chat_x = max_length + 2;
window->win_chat_y = 1;
window->win_chat_width = COLS - max_length - 2;
- window->win_chat_height = LINES - 3;
window->win_nick_x = 0;
window->win_nick_y = 1;
window->win_nick_width = max_length + 2;
- window->win_nick_height = LINES - 3;
+ if (cfg_look_infobar)
+ {
+ window->win_chat_height = LINES - 4;
+ window->win_nick_height = LINES - 4;
+ }
+ else
+ {
+ window->win_chat_height = LINES - 3;
+ window->win_nick_height = LINES - 3;
+ }
break;
case CFG_LOOK_NICKLIST_RIGHT:
window->win_chat_x = 0;
window->win_chat_y = 1;
window->win_chat_width = COLS - max_length - 2;
- window->win_chat_height = LINES - 3;
window->win_nick_x = COLS - max_length - 2;
window->win_nick_y = 1;
window->win_nick_width = max_length + 2;
- window->win_nick_height = LINES - 3;
+ if (cfg_look_infobar)
+ {
+ window->win_chat_height = LINES - 4;
+ window->win_nick_height = LINES - 4;
+ }
+ else
+ {
+ window->win_chat_height = LINES - 3;
+ window->win_nick_height = LINES - 3;
+ }
break;
case CFG_LOOK_NICKLIST_TOP:
nick_count (CHANNEL(window), &num_nicks, &num_op, &num_halfop,
@@ -218,7 +234,10 @@ gui_calculate_pos_size (t_gui_window *window)
window->win_chat_x = 0;
window->win_chat_y = 1 + (lines + 1);
window->win_chat_width = COLS;
- window->win_chat_height = LINES - 3 - (lines + 1);
+ if (cfg_look_infobar)
+ window->win_chat_height = LINES - 3 - (lines + 1) - 1;
+ else
+ window->win_chat_height = LINES - 3 - (lines + 1);
window->win_nick_x = 0;
window->win_nick_y = 1;
window->win_nick_width = COLS;
@@ -234,9 +253,15 @@ gui_calculate_pos_size (t_gui_window *window)
window->win_chat_x = 0;
window->win_chat_y = 1;
window->win_chat_width = COLS;
- window->win_chat_height = LINES - 3 - (lines + 1);
+ if (cfg_look_infobar)
+ window->win_chat_height = LINES - 3 - (lines + 1) - 1;
+ else
+ window->win_chat_height = LINES - 3 - (lines + 1);
window->win_nick_x = 0;
- window->win_nick_y = LINES - 2 - (lines + 1);
+ if (cfg_look_infobar)
+ window->win_nick_y = LINES - 2 - (lines + 1) - 1;
+ else
+ window->win_nick_y = LINES - 2 - (lines + 1);
window->win_nick_width = COLS;
window->win_nick_height = lines + 1;
break;
@@ -250,7 +275,10 @@ gui_calculate_pos_size (t_gui_window *window)
window->win_chat_x = 0;
window->win_chat_y = 1;
window->win_chat_width = COLS;
- window->win_chat_height = LINES - 3;
+ if (cfg_look_infobar)
+ window->win_chat_height = LINES - 4;
+ else
+ window->win_chat_height = LINES - 3;
window->win_chat_cursor_x = 0;
window->win_chat_cursor_y = 0;
window->win_nick_x = -1;
@@ -269,7 +297,6 @@ gui_curses_window_clear (WINDOW *window)
{
werase (window);
wmove (window, 0, 0);
- //wrefresh (window);
}
/*
@@ -775,7 +802,6 @@ gui_draw_window_status (t_gui_window *window)
wborder (window->win_status, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ');
wrefresh (window->win_status);
}
- //refresh ();
wmove (window->win_status, 0, 0);
for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
{
@@ -892,6 +918,59 @@ gui_redraw_window_status (t_gui_window *window)
}
/*
+ * gui_draw_window_infobar: draw infobar window
+ */
+
+void
+gui_draw_window_infobar (t_gui_window *window)
+{
+ t_gui_window *ptr_win;
+ char format_more[32];
+ time_t time_seconds;
+ struct tm *local_time;
+ char text[256];
+
+ /* TODO: manage splitted windows! */
+ if (window != gui_current_window)
+ return;
+
+ if (has_colors ())
+ {
+ gui_window_set_color (window->win_infobar, COLOR_WIN_INFOBAR);
+ wborder (window->win_infobar, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ');
+ wrefresh (window->win_infobar);
+ }
+ wmove (window->win_infobar, 0, 0);
+ gui_window_set_color (window->win_infobar, COLOR_WIN_INFOBAR);
+
+ time_seconds = time (NULL);
+ local_time = localtime (&time_seconds);
+ if (strncmp (var_LANG, "fr", 2) == 0)
+ strftime (text, 255, "%A %d %B %G - %H:%M", local_time);
+ else
+ strftime (text, 255, "%B, %A %d %G - %H:%M", local_time);
+ wprintw (window->win_infobar, "%s", text);
+
+ wrefresh (window->win_infobar);
+ refresh ();
+}
+
+/*
+ * gui_redraw_window_infobar: redraw infobar window
+ */
+
+void
+gui_redraw_window_infobar (t_gui_window *window)
+{
+ /* TODO: manage splitted windows! */
+ if (window != gui_current_window)
+ return;
+
+ gui_curses_window_clear (window->win_infobar);
+ gui_draw_window_infobar (window);
+}
+
+/*
* gui_get_input_width: return input width (max # chars displayed)
*/
@@ -931,7 +1010,6 @@ gui_draw_window_input (t_gui_window *window)
wborder (window->win_input, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ');
wrefresh (window->win_input);
}
- //refresh ();
if (window->input_buffer_size == 0)
window->input_buffer[0] = '\0';
@@ -1038,6 +1116,8 @@ gui_redraw_window (t_gui_window *window)
if (window->win_nick)
gui_redraw_window_nick (window);
gui_redraw_window_status (window);
+ if (cfg_look_infobar)
+ gui_redraw_window_infobar (window);
gui_redraw_window_input (window);
}
@@ -1062,11 +1142,13 @@ gui_switch_to_window (t_gui_window *window)
window->win_chat = ptr_win->win_chat;
window->win_nick = ptr_win->win_nick;
window->win_status = ptr_win->win_status;
+ window->win_infobar = ptr_win->win_infobar;
window->win_input = ptr_win->win_input;
ptr_win->win_title = NULL;
ptr_win->win_chat = NULL;
ptr_win->win_nick = NULL;
ptr_win->win_status = NULL;
+ ptr_win->win_infobar = NULL;
ptr_win->win_input = NULL;
ptr_win->is_displayed = 0;
break;
@@ -1091,7 +1173,13 @@ gui_switch_to_window (t_gui_window *window)
window->win_nick_x);
else
window->win_nick = NULL;
- window->win_status = newwin (1, COLS, LINES - 2, 0);
+ if (cfg_look_infobar)
+ {
+ window->win_infobar = newwin (1, COLS, LINES - 2, 0);
+ window->win_status = newwin (1, COLS, LINES - 3, 0);
+ }
+ else
+ window->win_status = newwin (1, COLS, LINES - 2, 0);
window->win_input = newwin (1, COLS, LINES - 1, 0);
}
else
@@ -1232,12 +1320,15 @@ gui_curses_resize_handler ()
delwin (ptr_win->win_nick);
if (ptr_win->win_status)
delwin (ptr_win->win_status);
+ if (ptr_win->win_infobar)
+ delwin (ptr_win->win_infobar);
if (ptr_win->win_input)
delwin (ptr_win->win_input);
ptr_win->win_title = NULL;
ptr_win->win_chat = NULL;
ptr_win->win_nick = NULL;
ptr_win->win_status = NULL;
+ ptr_win->win_infobar = NULL;
ptr_win->win_input = NULL;
gui_switch_to_window (ptr_win);
}
@@ -1255,6 +1346,7 @@ gui_window_init_subwindows (t_gui_window *window)
window->win_chat = NULL;
window->win_nick = NULL;
window->win_status = NULL;
+ window->win_infobar = NULL;
window->win_input = NULL;
}
@@ -1316,6 +1408,8 @@ gui_init_colors ()
cfg_col_status_data_other & A_CHARTEXT, cfg_col_status_bg);
init_pair (COLOR_WIN_STATUS_MORE,
cfg_col_status_more & A_CHARTEXT, cfg_col_status_bg);
+ init_pair (COLOR_WIN_INFOBAR,
+ cfg_col_infobar & A_CHARTEXT, cfg_col_infobar_bg);
init_pair (COLOR_WIN_INPUT,
cfg_col_input & A_CHARTEXT, cfg_col_input_bg);
init_pair (COLOR_WIN_INPUT_CHANNEL,
@@ -1362,6 +1456,7 @@ gui_init_colors ()
color_attr[COLOR_WIN_STATUS_DATA_MSG - 1] = cfg_col_status_data_msg & A_BOLD;
color_attr[COLOR_WIN_STATUS_DATA_OTHER - 1] = cfg_col_status_data_other & A_BOLD;
color_attr[COLOR_WIN_STATUS_MORE - 1] = cfg_col_status_more & A_BOLD;
+ color_attr[COLOR_WIN_INFOBAR - 1] = cfg_col_infobar & A_BOLD;
color_attr[COLOR_WIN_INPUT - 1] = cfg_col_input & A_BOLD;
color_attr[COLOR_WIN_INPUT_CHANNEL - 1] = cfg_col_input_channel & A_BOLD;
color_attr[COLOR_WIN_INPUT_NICK - 1] = cfg_col_input_nick & A_BOLD;
@@ -1426,6 +1521,8 @@ gui_end ()
delwin (ptr_win->win_nick);
if (ptr_win->win_status)
delwin (ptr_win->win_status);
+ if (ptr_win->win_infobar)
+ delwin (ptr_win->win_infobar);
if (ptr_win->win_input)
delwin (ptr_win->win_input);
/* TODO: free input buffer, lines, messages, completion */
diff --git a/src/gui/curses/gui-input.c b/src/gui/curses/gui-input.c
index 9707d998e..53baeb2d4 100644
--- a/src/gui/curses/gui-input.c
+++ b/src/gui/curses/gui-input.c
@@ -57,10 +57,11 @@ gui_read_keyb ()
{
switch (key)
{
- /* resize event: do nothing */
+ /* resize event */
case KEY_RESIZE:
gui_redraw_window (gui_current_window);
break;
+ /* previous window */
case KEY_F(6):
gui_switch_to_previous_window ();
break;
@@ -352,10 +353,22 @@ gui_main_loop ()
fd_set read_fd;
static struct timeval timeout;
t_irc_server *ptr_server;
+ int old_min;
+ time_t new_time;
+ struct tm *local_time;
quit_weechat = 0;
+ old_min = 0;
while (!quit_weechat)
{
+ new_time = time (NULL);
+ local_time = localtime (&new_time);
+ if (local_time->tm_min != old_min)
+ {
+ old_min = local_time->tm_min;
+ gui_redraw_window_infobar (gui_current_window);
+ }
+
timeout.tv_sec = 0;
timeout.tv_usec = 10000;
FD_ZERO (&read_fd);
diff --git a/src/gui/gtk/gui-display.c b/src/gui/gtk/gui-display.c
index b28f9e59f..c39f6ecb5 100644
--- a/src/gui/gtk/gui-display.c
+++ b/src/gui/gtk/gui-display.c
@@ -350,6 +350,35 @@ gui_redraw_window_status (t_gui_window *window)
}
/*
+ * gui_draw_window_infobar: draw infobar window
+ */
+
+void
+gui_draw_window_infobar (t_gui_window *window)
+{
+ /* TODO: manage splitted windows! */
+ if (window != gui_current_window)
+ return;
+
+ /* TODO: draw infobar window! */
+}
+
+/*
+ * gui_redraw_window_infobar: redraw infobar window
+ */
+
+void
+gui_redraw_window_infobar (t_gui_window *window)
+{
+ /* TODO: manage splitted windows! */
+ if (window != gui_current_window)
+ return;
+
+ /* TODO: first delete window content */
+ gui_draw_window_infobar (window);
+}
+
+/*
* gui_draw_window_input: draw input window
*/
diff --git a/src/gui/gui-common.c b/src/gui/gui-common.c
index fd8795342..397e3c3c3 100644
--- a/src/gui/gui-common.c
+++ b/src/gui/gui-common.c
@@ -96,6 +96,10 @@ gui_window_new (void *server, void *channel, int switch_to_window
new_window->line_complete = 1;
new_window->unread_data = 0;
+ /* init infobar */
+ new_window->infobar = NULL;
+ new_window->infobar_length = new_window->win_width + 1;
+
/* init input buffer */
new_window->input_buffer_alloc = INPUT_BUFFER_BLOCK_SIZE;
new_window->input_buffer = (char *) malloc (INPUT_BUFFER_BLOCK_SIZE);
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 2e17c9130..63505a4bd 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -26,7 +26,7 @@
#define INPUT_BUFFER_BLOCK_SIZE 256
-#define NUM_COLORS 36
+#define NUM_COLORS 37
#define COLOR_WIN_TITLE 1
#define COLOR_WIN_CHAT 2
#define COLOR_WIN_CHAT_TIME 3
@@ -43,18 +43,19 @@
#define COLOR_WIN_STATUS_DATA_MSG 14
#define COLOR_WIN_STATUS_DATA_OTHER 15
#define COLOR_WIN_STATUS_MORE 16
-#define COLOR_WIN_INPUT 17
-#define COLOR_WIN_INPUT_CHANNEL 18
-#define COLOR_WIN_INPUT_NICK 19
-#define COLOR_WIN_NICK 20
-#define COLOR_WIN_NICK_OP 21
-#define COLOR_WIN_NICK_HALFOP 22
-#define COLOR_WIN_NICK_VOICE 23
-#define COLOR_WIN_NICK_SEP 24
-#define COLOR_WIN_NICK_SELF 25
-#define COLOR_WIN_NICK_PRIVATE 26
-#define COLOR_WIN_NICK_FIRST 27
-#define COLOR_WIN_NICK_LAST 36
+#define COLOR_WIN_INFOBAR 17
+#define COLOR_WIN_INPUT 18
+#define COLOR_WIN_INPUT_CHANNEL 19
+#define COLOR_WIN_INPUT_NICK 20
+#define COLOR_WIN_NICK 21
+#define COLOR_WIN_NICK_OP 22
+#define COLOR_WIN_NICK_HALFOP 23
+#define COLOR_WIN_NICK_VOICE 24
+#define COLOR_WIN_NICK_SEP 25
+#define COLOR_WIN_NICK_SELF 26
+#define COLOR_WIN_NICK_PRIVATE 27
+#define COLOR_WIN_NICK_FIRST 28
+#define COLOR_WIN_NICK_LAST 37
#define COLOR_WIN_NICK_NUMBER (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1)
#define SERVER(window) ((t_irc_server *)(window->server))
@@ -107,6 +108,17 @@ struct t_gui_color
int color;
};
+typedef struct t_gui_infobar t_gui_infobar;
+
+struct t_gui_infobar
+{
+ char *text; /* infobar text */
+ int time_displayed; /* delay (ms) before erasing this text */
+ /* if 0, text is never erased (except */
+ /* by user action to erase it) */
+ t_gui_infobar *next_infobar; /* next message for infobar */
+};
+
typedef struct t_gui_window t_gui_window;
struct t_gui_window
@@ -138,6 +150,7 @@ struct t_gui_window
void *win_chat; /* chat window (exemple: channel) */
void *win_nick; /* nick window */
void *win_status; /* status window */
+ void *win_infobar; /* info bar window */
void *win_input; /* input window */
/* windows for Curses GUI */
@@ -158,6 +171,10 @@ struct t_gui_window
int line_complete; /* current line complete ? (\n ending) */
int unread_data; /* highlight windows with unread data */
+ /* infobar content */
+ t_gui_infobar *infobar; /* infobar content (stack of messages) */
+ int infobar_length; /* length of infobar (width of win + 1) */
+
/* inupt buffer */
char *input_buffer; /* input buffer */
int input_buffer_alloc; /* input buffer: allocated size in mem */
@@ -211,6 +228,8 @@ extern void gui_draw_window_nick (t_gui_window *);
extern void gui_redraw_window_nick (t_gui_window *);
extern void gui_draw_window_status (t_gui_window *);
extern void gui_redraw_window_status (t_gui_window *);
+extern void gui_draw_window_infobar (t_gui_window *);
+extern void gui_redraw_window_infobar (t_gui_window *);
extern void gui_draw_window_input (t_gui_window *);
extern void gui_redraw_window_input (t_gui_window *);
extern void gui_redraw_window (t_gui_window *);
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index c763b3889..ef7fdf504 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,12 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-ChangeLog - 2004-01-17
+ChangeLog - 2004-01-18
Version 0.0.5 (under dev!):
+ * added info bar (optional, "look_infobar" to enable it, "on" by default)
+ * fixed crash with /oper command
* for default config file, nick is now based on un*x username (thanks to Witukind)
* fixed crash when config file cannot be written
* -c (or --config) command line parameter added to see config file options
diff --git a/weechat/TODO b/weechat/TODO
index 8c95b7a2f..7c7673427 100644
--- a/weechat/TODO
+++ b/weechat/TODO
@@ -1,7 +1,7 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
-TODO - 2004-01-11
+TODO - 2004-01-18
Legend:
# done
@@ -19,6 +19,7 @@ v0.0.5:
* Interface:
+ internationalization (traduce WeeChat in many languages)
+ + info bar
* Configuration:
+ add missing options for config file
diff --git a/weechat/configure.in b/weechat/configure.in
index 5f715c264..519dec1ac 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.5-pre1, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.0.5-pre2, flashcode@flashtux.org)
AC_CONFIG_SRCDIR([src/common/weechat.c])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.0.5-pre1])
+AM_INIT_AUTOMAKE([weechat], [0.0.5-pre2])
# Checks for programs.
AC_PROG_CC
diff --git a/weechat/po/fr.po b/weechat/po/fr.po
index baf64aa9a..c47a5cfab 100644
--- a/weechat/po/fr.po
+++ b/weechat/po/fr.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: WeeChat 0.0.4\n"
+"Project-Id-Version: WeeChat 0.0.5-pre2\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2004-01-17 11:16+0100\n"
+"POT-Creation-Date: 2004-01-18 19:34+0100\n"
"PO-Revision-Date: 2004-01-01 11:52+0100\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1529,24 +1529,24 @@ msgstr ""
"%s impossible d'ajouter la fonction pour le message \"%s\" (mémoire "
"insuffisante)\n"
-#: src/gui/curses/gui-display.c:861
+#: src/gui/curses/gui-display.c:887
msgid "[not connected] "
msgstr "[non connecté] "
-#: src/gui/curses/gui-display.c:868 src/gui/curses/gui-display.c:871
+#: src/gui/curses/gui-display.c:894 src/gui/curses/gui-display.c:897
msgid "-MORE-"
msgstr "-PLUS-"
-#: src/gui/gtk/gui-display.c:618
+#: src/gui/gtk/gui-display.c:647
msgid "server"
msgstr "serveur"
-#: src/gui/gui-common.c:266
+#: src/gui/gui-common.c:270
#, 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:293
+#: src/gui/gui-common.c:297
msgid "not enough memory!\n"
msgstr "pas assez de mémoire !\n"
@@ -2044,7 +2044,7 @@ msgstr "%s alias ou commande \"%s\" non trouvé\n"
msgid "Alias \"%s\" removed\n"
msgstr "Alias \"%s\" supprimé\n"
-#: src/common/weechat.c:119
+#: src/common/weechat.c:120
msgid ""
"WeeChat configuration options (~/.weechat/weechat.rc):\n"
"\n"
@@ -2052,43 +2052,43 @@ msgstr ""
"Options de configuration de WeeChat (~/.weechat/weechat.rc):\n"
"\n"
-#: src/common/weechat.c:132
+#: src/common/weechat.c:133
msgid " . type boolean (values: 'on' or 'off')\n"
msgstr " . type booléen (valeurs: 'on' ou 'off')\n"
-#: src/common/weechat.c:133 src/common/weechat.c:156 src/common/weechat.c:162
-#: src/common/weechat.c:168
+#: src/common/weechat.c:134 src/common/weechat.c:157 src/common/weechat.c:163
+#: src/common/weechat.c:169
#, c-format
msgid " . default value: '%s'\n"
msgstr " . valeur par défaut: '%s'\n"
-#: src/common/weechat.c:138
+#: src/common/weechat.c:139
#, c-format
msgid " . type integer (values: between %d and %d)\n"
msgstr " . type entier (valeurs: entre %d et %d)\n"
-#: src/common/weechat.c:141
+#: src/common/weechat.c:142
#, c-format
msgid " . default value: %d\n"
msgstr " . valeur par défaut: %d\n"
-#: src/common/weechat.c:145
+#: src/common/weechat.c:146
msgid " . type string (values: "
msgstr " . type chaîne (valeurs: "
-#: src/common/weechat.c:158 src/common/weechat.c:164 src/common/weechat.c:170
+#: src/common/weechat.c:159 src/common/weechat.c:165 src/common/weechat.c:171
msgid "empty"
msgstr "vide"
-#: src/common/weechat.c:161
+#: src/common/weechat.c:162
msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n"
msgstr " . type couleur (couleur Curses ou Gtk, voir la doc WeeChat)\n"
-#: src/common/weechat.c:167
+#: src/common/weechat.c:168
msgid " . type string (any string)\n"
msgstr " . type chaîne (toute chaîne)\n"
-#: src/common/weechat.c:173
+#: src/common/weechat.c:174
#, c-format
msgid ""
" . description: %s\n"
@@ -2097,14 +2097,14 @@ msgstr ""
" . description: %s\n"
"\n"
-#: src/common/weechat.c:179
+#: src/common/weechat.c:180
msgid ""
"Moreover, you can define aliases in [alias] section, by adding lines like:\n"
msgstr ""
"De plus, vous pouvez définir des alias dans la section [alias], en ajoutant "
"des lignes comme :\n"
-#: src/common/weechat.c:181
+#: src/common/weechat.c:182
msgid ""
"where 'j' is alias name, and 'join' associated command.\n"
"\n"
@@ -2112,27 +2112,27 @@ msgstr ""
"où 'j' est le nom de l'alias, et 'join' la commande associée.\n"
"\n"
-#: src/common/weechat.c:205
+#: src/common/weechat.c:206
#, c-format
msgid "%s unknown parameter '%s', ignored\n"
msgstr "%s paramètre inconnu '%s', ignoré\n"
-#: src/common/weechat.c:225
+#: src/common/weechat.c:226
#, c-format
msgid "%s cannot create directory \"%s\"\n"
msgstr "%s impossible de créer le répertoire \"%s\"\n"
-#: src/common/weechat.c:327
+#: src/common/weechat.c:328
#, c-format
msgid "%s unable to create/append to log file (~/.weechat/%s)"
msgstr "%s impossible de créer/ajouter dans le fichier de log (~/.weechat/%s)"
-#: src/common/weechat.c:351
+#: src/common/weechat.c:352
#, c-format
msgid "%sWelcome to "
msgstr "%sBienvenue dans "
-#: src/common/weechat.c:364
+#: src/common/weechat.c:365
msgid "compiled on"
msgstr "compilé le"
@@ -2144,63 +2144,63 @@ msgstr " Erreur:"
msgid " Warning:"
msgstr " Attention:"
-#: src/common/weeconfig.c:78 src/common/weeconfig.c:79
+#: src/common/weeconfig.c:79 src/common/weeconfig.c:80
msgid "set title for terminal window (curses GUI) with name & version"
msgstr ""
"définit le titre de la fenêtre de terminal (GUI curses) avec le nom et la "
"version"
-#: src/common/weeconfig.c:82 src/common/weeconfig.c:83
+#: src/common/weeconfig.c:83 src/common/weeconfig.c:84
msgid "display WeeChat logo at startup"
msgstr "afficher le logo WeeChat au démarrage"
-#: src/common/weeconfig.c:86 src/common/weeconfig.c:87
+#: src/common/weeconfig.c:87 src/common/weeconfig.c:88
msgid "display WeeChat version at startup"
msgstr "afficher la version de WeeChat au démarrage"
-#: src/common/weeconfig.c:90
+#: src/common/weeconfig.c:91
msgid "WeeChat slogan"
msgstr "slogan WeeChat"
-#: src/common/weeconfig.c:91
+#: src/common/weeconfig.c:92
msgid "WeeChat slogan (if empty, slogan is not used)"
msgstr "slogan WeeChat (si vide, le slogan ne sera pas utilisé)"
-#: src/common/weeconfig.c:94 src/common/weeconfig.c:95
+#: src/common/weeconfig.c:95 src/common/weeconfig.c:96
msgid "display nick names with different colors"
msgstr "afficher les utilisateurs avec différentes couleurs"
-#: src/common/weeconfig.c:98 src/common/weeconfig.c:99
+#: src/common/weeconfig.c:99 src/common/weeconfig.c:100
msgid "display actions with different colors"
msgstr "afficher les actions avec différentes couleurs"
-#: src/common/weeconfig.c:102 src/common/weeconfig.c:103
+#: src/common/weeconfig.c:103 src/common/weeconfig.c:104
msgid "remove colors from incoming messages"
msgstr "supprimer les couleurs dans les messages entrants"
-#: src/common/weeconfig.c:106
+#: src/common/weeconfig.c:107
msgid "display nicklist window"
msgstr "afficher la fenêtre des utilisateurs"
-#: src/common/weeconfig.c:107
+#: src/common/weeconfig.c:108
msgid "display nicklist window (for channel windows)"
msgstr "afficher la fenêtre des utilisateurs (pour les fenêtres de canaux)"
-#: src/common/weeconfig.c:110
+#: src/common/weeconfig.c:111
msgid "nicklist position"
msgstr "position de la fenêtre d'utilisateurs"
-#: src/common/weeconfig.c:111
+#: src/common/weeconfig.c:112
msgid "nicklist position (top, left, right (default), bottom)"
msgstr ""
"position de la fenêtre d'utilisateurs (haut (top), gauche (left), droite "
"(right, par défaut), bas (bottom))"
-#: src/common/weeconfig.c:114
+#: src/common/weeconfig.c:115
msgid "min size for nicklist"
msgstr "taille minimum pour la fenêtre d'utilisateurs"
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:116
msgid ""
"min size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no min size))"
@@ -2208,11 +2208,11 @@ msgstr ""
"taille minimum pour la fenêtre d'utilisateurs (largeur ou hauteur, selon "
"look_nicklist_position (0 = pas de taille minimum))"
-#: src/common/weeconfig.c:119
+#: src/common/weeconfig.c:120
msgid "max size for nicklist"
msgstr "taille maximum pour la fenêtre d'utilisateurs"
-#: src/common/weeconfig.c:120
+#: src/common/weeconfig.c:121
msgid ""
"max size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no max size; if min == max and > 0, then size is fixed))"
@@ -2221,205 +2221,217 @@ msgstr ""
"look_nicklist_position (0 = pas de taille maximum; si min == max et > 0, "
"alors la taille est fixe))"
-#: src/common/weeconfig.c:124 src/common/weeconfig.c:125
+#: src/common/weeconfig.c:125 src/common/weeconfig.c:126
msgid "text to display instead of nick when not connected"
msgstr ""
"texte à afficher en lieu et place du nom d'utilisateur lorsque la connexion "
"n'est pas active"
-#: src/common/weeconfig.c:128 src/common/weeconfig.c:129
+#: src/common/weeconfig.c:129 src/common/weeconfig.c:130
msgid "display nick mode ((half)op/voice) before each nick"
msgstr ""
"afficher le mode de l'utilisateur ((half)op/voice) devant chaque utilisateur"
-#: src/common/weeconfig.c:132 src/common/weeconfig.c:133
+#: src/common/weeconfig.c:133 src/common/weeconfig.c:134
msgid "display space if nick mode is not (half)op/voice"
msgstr "afficher un espace si le mode utilisateur n'est pas (half)op/voice"
-#: src/common/weeconfig.c:136 src/common/weeconfig.c:137
+#: src/common/weeconfig.c:137 src/common/weeconfig.c:138
msgid "the string inserted after nick completion"
msgstr "la chaîne affichée après la complétion des utilisateurs"
-#: src/common/weeconfig.c:179 src/common/weeconfig.c:180
+#: src/common/weeconfig.c:141 src/common/weeconfig.c:142
+msgid "enable info bar"
+msgstr "active la barre d'infos"
+
+#: src/common/weeconfig.c:186 src/common/weeconfig.c:187
msgid "color for title bar"
msgstr "couleur pour la barre de titre"
-#: src/common/weeconfig.c:183 src/common/weeconfig.c:184
+#: src/common/weeconfig.c:190 src/common/weeconfig.c:191
msgid "background for title bar"
msgstr "couleur de fond pour la barre de titre"
-#: src/common/weeconfig.c:189 src/common/weeconfig.c:190
+#: src/common/weeconfig.c:196 src/common/weeconfig.c:197
msgid "color for chat text"
msgstr "couleur pour le texte de discussion"
-#: src/common/weeconfig.c:193
+#: src/common/weeconfig.c:200
msgid "color for time"
msgstr "couleur pour l'heure"
-#: src/common/weeconfig.c:194
+#: src/common/weeconfig.c:201
msgid "color for time in chat window"
msgstr "couleur pour l'heure dans la fenêtre de discussion"
-#: src/common/weeconfig.c:197
+#: src/common/weeconfig.c:204
msgid "color for time separator"
msgstr "couleur pour le séparateur de l'heure"
-#: src/common/weeconfig.c:198
+#: src/common/weeconfig.c:205
msgid "color for time separator (chat window)"
msgstr "couleur pour la séparation de l'heure (fenêtre de discussion)"
-#: src/common/weeconfig.c:201 src/common/weeconfig.c:202
+#: src/common/weeconfig.c:208 src/common/weeconfig.c:209
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:205 src/common/weeconfig.c:206
+#: src/common/weeconfig.c:212 src/common/weeconfig.c:213
msgid "color for middle char of prefix"
msgstr "couleur pour le caractère du milieu du préfixe"
-#: src/common/weeconfig.c:209
+#: src/common/weeconfig.c:216
msgid "color for nicks in actions"
msgstr "couleur pour les noms d'utilisateur dans les actions"
-#: src/common/weeconfig.c:210
+#: src/common/weeconfig.c:217
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:213
+#: src/common/weeconfig.c:220
msgid "color for hostnames"
msgstr "couleur pour les noms de machines"
-#: src/common/weeconfig.c:214
+#: src/common/weeconfig.c:221
msgid "color for hostnames (chat window)"
msgstr "couleur pour les noms de machines (fenêtre de discussion)"
-#: src/common/weeconfig.c:217
+#: src/common/weeconfig.c:224
msgid "color for channel names in actions"
msgstr "couleur pour les canaux dans les actions"
-#: src/common/weeconfig.c:218
+#: src/common/weeconfig.c:225
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:221
+#: src/common/weeconfig.c:228
msgid "color for dark separators"
msgstr "couleur pour les séparateurs sombres"
-#: src/common/weeconfig.c:222
+#: src/common/weeconfig.c:229
msgid "color for dark separators (chat window)"
msgstr "couleur pour les séparateurs sombres (fenêtre de discussion)"
-#: src/common/weeconfig.c:225
+#: src/common/weeconfig.c:232
msgid "color for highlighted nick"
msgstr "couleur pour le pseudo surligné"
-#: src/common/weeconfig.c:226
+#: src/common/weeconfig.c:233
msgid "color for highlighted nick (chat window)"
msgstr "couleur pour le pseudo surligné (fenêtre de discussion)"
-#: src/common/weeconfig.c:229
+#: src/common/weeconfig.c:236
msgid "background for chat"
msgstr "couleur de fond pour la discussion"
-#: src/common/weeconfig.c:230
+#: src/common/weeconfig.c:237
msgid "background for chat window"
msgstr "couleur de fond pour la fenêtre de discussion"
-#: src/common/weeconfig.c:235 src/common/weeconfig.c:236
+#: src/common/weeconfig.c:242 src/common/weeconfig.c:243
msgid "color for status bar"
msgstr "couleur pour la barre de statut"
-#: src/common/weeconfig.c:239
+#: src/common/weeconfig.c:246
msgid "color for active window"
msgstr "couleur pour la fenêtre active"
-#: src/common/weeconfig.c:240
+#: src/common/weeconfig.c:247
msgid "color for active window (status bar)"
msgstr "couleur pour la fenêtre active (barre de statut)"
-#: src/common/weeconfig.c:243
+#: src/common/weeconfig.c:250
msgid "color for window with new messages"
msgstr "couleur pour une fenêtre avec de nouvelles infos"
-#: src/common/weeconfig.c:244
+#: src/common/weeconfig.c:251
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:247
+#: src/common/weeconfig.c:254
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:248
+#: src/common/weeconfig.c:255
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:251
+#: src/common/weeconfig.c:258
msgid "color for \"*MORE*\" text"
msgstr "couleur pour le texte \"*MORE*\""
-#: src/common/weeconfig.c:252
+#: src/common/weeconfig.c:259
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:255 src/common/weeconfig.c:256
+#: src/common/weeconfig.c:262 src/common/weeconfig.c:263
msgid "background for status window"
msgstr "couleur de fond pour la fenêtre de statut"
-#: src/common/weeconfig.c:261 src/common/weeconfig.c:262
+#: src/common/weeconfig.c:268 src/common/weeconfig.c:269
+msgid "color for info bar text"
+msgstr "couleur pour la barre d'infos"
+
+#: src/common/weeconfig.c:272 src/common/weeconfig.c:273
+msgid "background for info bar window"
+msgstr "couleur de fond pour la fenêtre de barre d'infos"
+
+#: src/common/weeconfig.c:278 src/common/weeconfig.c:279
msgid "color for input text"
msgstr "couleur pour le texte saisi"
-#: src/common/weeconfig.c:265 src/common/weeconfig.c:266
+#: src/common/weeconfig.c:282 src/common/weeconfig.c:283
msgid "color for input text (channel name)"
msgstr "couleur pour le texte saisi (nom du canal)"
-#: src/common/weeconfig.c:269 src/common/weeconfig.c:270
+#: src/common/weeconfig.c:286 src/common/weeconfig.c:287
msgid "color for input text (nick name)"
msgstr "couleur pour le texte saisi (pseudo)"
-#: src/common/weeconfig.c:273 src/common/weeconfig.c:274
+#: src/common/weeconfig.c:290 src/common/weeconfig.c:291
msgid "background for input window"
msgstr "couleur de fond pour la fenêtre de saisie"
-#: src/common/weeconfig.c:279 src/common/weeconfig.c:280
+#: src/common/weeconfig.c:296 src/common/weeconfig.c:297
msgid "color for nicknames"
msgstr "couleur pour les pseudos"
-#: src/common/weeconfig.c:283 src/common/weeconfig.c:284
+#: src/common/weeconfig.c:300 src/common/weeconfig.c:301
msgid "color for operator symbol"
msgstr "couleur pour le symbole opérateur"
-#: src/common/weeconfig.c:287 src/common/weeconfig.c:288
+#: src/common/weeconfig.c:304 src/common/weeconfig.c:305
msgid "color for half-operator symbol"
msgstr "couleur pour le symbole demi-opérateur"
-#: src/common/weeconfig.c:291 src/common/weeconfig.c:292
+#: src/common/weeconfig.c:308 src/common/weeconfig.c:309
msgid "color for voice symbol"
msgstr "couleur pour le symbole voix"
-#: src/common/weeconfig.c:295 src/common/weeconfig.c:296
+#: src/common/weeconfig.c:312 src/common/weeconfig.c:313
msgid "color for nick separator"
msgstr "couleur pour le séparateur de pseudo"
-#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
+#: src/common/weeconfig.c:316 src/common/weeconfig.c:317
msgid "color for local nick"
msgstr "couleur pour le pseudo local"
-#: src/common/weeconfig.c:303 src/common/weeconfig.c:304
+#: src/common/weeconfig.c:320 src/common/weeconfig.c:321
msgid "color for other nick in private window"
msgstr "couleur pour l'autre pseudo dans la fenêtre privée"
-#: src/common/weeconfig.c:307 src/common/weeconfig.c:308
+#: src/common/weeconfig.c:324 src/common/weeconfig.c:325
msgid "background for nicknames"
msgstr "couleur de fond pour les pseudos"
-#: src/common/weeconfig.c:321
+#: src/common/weeconfig.c:338
msgid "max lines in history (per window)"
msgstr "nombre maxi de lignes dans l'historique (par fenêtre)"
-#: src/common/weeconfig.c:322
+#: src/common/weeconfig.c:339
msgid ""
"maximum number of lines in history for one server/channel/private window (0 "
"= unlimited)"
@@ -2427,36 +2439,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:326
+#: src/common/weeconfig.c:343
msgid "max user commands in history"
msgstr "nombre maxi de commandes utilisateur dans l'historique"
-#: src/common/weeconfig.c:327
+#: src/common/weeconfig.c:344
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:344 src/common/weeconfig.c:345
+#: src/common/weeconfig.c:361 src/common/weeconfig.c:362
msgid "automatically log channel chats"
msgstr "enregistrer automatiquement les conversations des canaux"
-#: src/common/weeconfig.c:348 src/common/weeconfig.c:349
+#: src/common/weeconfig.c:365 src/common/weeconfig.c:366
msgid "automatically log private chats"
msgstr "enregistrer automatiquement les conversations privées"
-#: src/common/weeconfig.c:352
+#: src/common/weeconfig.c:369
msgid "path for log files"
msgstr "chemin pour les conversations sauvegardées"
-#: src/common/weeconfig.c:353
+#: src/common/weeconfig.c:370
msgid "path for WeeChat log files"
msgstr "chemin pour les conversations sauvegardées par WeeChat"
-#: src/common/weeconfig.c:356
+#: src/common/weeconfig.c:373
msgid "name for log files"
msgstr "nom des conversations sauvegardées"
-#: src/common/weeconfig.c:357
+#: src/common/weeconfig.c:374
msgid ""
"name for log files (%S == irc server name, %N == channel name (or nickname "
"if private chat)"
@@ -2464,21 +2476,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:361
+#: src/common/weeconfig.c:378
msgid "timestamp for log"
msgstr "horodatage pour les conversations sauvegardées"
-#: src/common/weeconfig.c:362
+#: src/common/weeconfig.c:379
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:365
+#: src/common/weeconfig.c:382
msgid "start string for log files"
msgstr "chaîne de début pour les conversations sauvegardées"
-#: src/common/weeconfig.c:366
+#: src/common/weeconfig.c:383
msgid ""
"text written when starting new log file (see man strftime for date/time "
"specifiers)"
@@ -2486,186 +2498,186 @@ msgstr ""
"texte écrit en démarrant la sauvegarde d'une discussion (voir man strftime "
"pour le format de date/heure)"
-#: src/common/weeconfig.c:370
+#: src/common/weeconfig.c:387
msgid "end string for log files"
msgstr "chaîne de fin pour les conversations sauvegardées"
-#: src/common/weeconfig.c:371
+#: src/common/weeconfig.c:388
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:390
+#: src/common/weeconfig.c:407
msgid "automatically accept dcc files"
msgstr "accepte automatiquement les fichiers dcc"
-#: src/common/weeconfig.c:391
+#: src/common/weeconfig.c:408
msgid "automatically accept incoming dcc files"
msgstr "accepte automatiquement les fichiers dcc entrants"
-#: src/common/weeconfig.c:394
+#: src/common/weeconfig.c:411
msgid "max size when auto accepting file"
msgstr "taille maxi pour accepter un fichier"
-#: src/common/weeconfig.c:395
+#: src/common/weeconfig.c:412
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:398
+#: src/common/weeconfig.c:415
msgid "automatically accept dcc chats"
msgstr "accepte automatiquement les demandes de discussion dcc"
-#: src/common/weeconfig.c:399
+#: src/common/weeconfig.c:416
msgid "automatically accept dcc chats (use carefully!)"
msgstr ""
"accepte automatiquement les demandes de discussion dcc (à utiliser avec "
"précaution !)"
-#: src/common/weeconfig.c:402
+#: src/common/weeconfig.c:419
msgid "timeout for dcc request"
msgstr "délai d'attente pour les requêtes dcc"
-#: src/common/weeconfig.c:403
+#: src/common/weeconfig.c:420
msgid "timeout for dcc request (in seconds)"
msgstr "délai d'attente pour les requêtes dcc (en secondes)"
-#: src/common/weeconfig.c:406
+#: src/common/weeconfig.c:423
msgid "path for incoming files with dcc"
msgstr "chemin les fichiers reçus par dcc"
-#: src/common/weeconfig.c:407
+#: src/common/weeconfig.c:424
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:410
+#: src/common/weeconfig.c:427
msgid "default path for sending files with dcc"
msgstr "chemin par défaut pour envoyer les fichiers par dcc"
-#: src/common/weeconfig.c:411
+#: src/common/weeconfig.c:428
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:414
+#: src/common/weeconfig.c:431
msgid "automatically rename dcc files if already exists"
msgstr "renomme automatiquement les fichiers dcc s'ils existent déjà"
-#: src/common/weeconfig.c:415
+#: src/common/weeconfig.c:432
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:418
+#: src/common/weeconfig.c:435
msgid "automatically resume aborted transfers"
msgstr "continuer automatiquement les transferts non terminés"
-#: src/common/weeconfig.c:419
+#: src/common/weeconfig.c:436
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:433
+#: src/common/weeconfig.c:450
msgid "use proxy"
msgstr "utiliser un proxy"
-#: src/common/weeconfig.c:434
+#: src/common/weeconfig.c:451
msgid "use a proxy server to connect to irc server"
msgstr "utiliser un proxy pour se connecter au serveur irc"
-#: src/common/weeconfig.c:437
+#: src/common/weeconfig.c:454
msgid "proxy address"
msgstr "adresse du proxy"
-#: src/common/weeconfig.c:438
+#: src/common/weeconfig.c:455
msgid "proxy server address (IP or hostname)"
msgstr "adresse du serveur proxy (IP ou nom)"
-#: src/common/weeconfig.c:441
+#: src/common/weeconfig.c:458
msgid "port for proxy"
msgstr "port pour le proxy"
-#: src/common/weeconfig.c:442
+#: src/common/weeconfig.c:459
msgid "port for connecting to proxy server"
msgstr "port pour se connecter au serveur proxy"
-#: src/common/weeconfig.c:445
+#: src/common/weeconfig.c:462
msgid "proxy password"
msgstr "mot de passe pour le proxy"
-#: src/common/weeconfig.c:446
+#: src/common/weeconfig.c:463
msgid "password for proxy server"
msgstr "mot de passe pour le serveur proxy"
-#: src/common/weeconfig.c:457
+#: src/common/weeconfig.c:474
msgid "server name"
msgstr "nom du serveur"
-#: src/common/weeconfig.c:458
+#: src/common/weeconfig.c:475
msgid "name associated to IRC server (for display only)"
msgstr "nom associé au serveur IRC (pour affichage seulement)"
-#: src/common/weeconfig.c:461
+#: src/common/weeconfig.c:478
msgid "automatically connect to server"
msgstr "connexion automatique au serveur"
-#: src/common/weeconfig.c:462
+#: src/common/weeconfig.c:479
msgid "automatically connect to server when WeeChat is starting"
msgstr "connexion automatique au serveur quand WeeChat démarre"
-#: src/common/weeconfig.c:465
+#: src/common/weeconfig.c:482
msgid "server address or hostname"
msgstr "adresse ou nom du serveur"
-#: src/common/weeconfig.c:466
+#: src/common/weeconfig.c:483
msgid "IP address or hostname of IRC server"
msgstr "adresse IP ou nom du serveur IRC"
-#: src/common/weeconfig.c:469
+#: src/common/weeconfig.c:486
msgid "port for IRC server"
msgstr "port pour le serveur IRC"
-#: src/common/weeconfig.c:470
+#: src/common/weeconfig.c:487
msgid "port for connecting to server"
msgstr "port pour se connecter au serveur"
-#: src/common/weeconfig.c:473
+#: src/common/weeconfig.c:490
msgid "server password"
msgstr "mot de passe pour le serveur"
-#: src/common/weeconfig.c:474
+#: src/common/weeconfig.c:491
msgid "password for IRC server"
msgstr "mot de passe pour le serveur IRC"
-#: src/common/weeconfig.c:477
+#: src/common/weeconfig.c:494
msgid "nickname for server"
msgstr "pseudo pour le serveur"
-#: src/common/weeconfig.c:478
+#: src/common/weeconfig.c:495
msgid "nickname to use on IRC server"
msgstr "pseudo à utiliser sur le serveur IRC"
-#: src/common/weeconfig.c:481
+#: src/common/weeconfig.c:498
msgid "alternate nickname for server"
msgstr "pseudo alternatif pour le serveur"
-#: src/common/weeconfig.c:482
+#: src/common/weeconfig.c:499
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:485
+#: src/common/weeconfig.c:502
msgid "2nd alternate nickname for server"
msgstr "2nd pseudo alternatif pour le serveur"
-#: src/common/weeconfig.c:486
+#: src/common/weeconfig.c:503
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
@@ -2673,87 +2685,87 @@ msgstr ""
"2nd pseudo alternatif pour le serveur IRC (si le pseudo alternatif est déjà "
"utilisé)"
-#: src/common/weeconfig.c:489
+#: src/common/weeconfig.c:506
msgid "user name for server"
msgstr "nom d'utilisateur pour le serveur"
-#: src/common/weeconfig.c:490
+#: src/common/weeconfig.c:507
msgid "user name to use on IRC server"
msgstr "nom d'utilisateur pour le serveur IRC"
-#: src/common/weeconfig.c:493
+#: src/common/weeconfig.c:510
msgid "real name for server"
msgstr "nom réel pour le serveur"
-#: src/common/weeconfig.c:494
+#: src/common/weeconfig.c:511
msgid "real name to use on IRC server"
msgstr "nom réel pour le serveur IRC"
-#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
+#: src/common/weeconfig.c:514 src/common/weeconfig.c:515
msgid "first command to run when connected to server"
msgstr "commande à exécuter en premier lorsque connecté au serveur"
-#: src/common/weeconfig.c:501
+#: src/common/weeconfig.c:518
msgid "list of channels to join when connected to server"
msgstr "liste des canaux à rejoindre lorsque connecté au serveur"
-#: src/common/weeconfig.c:502
+#: src/common/weeconfig.c:519
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:630
+#: src/common/weeconfig.c:647
#, 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:639
+#: src/common/weeconfig.c:656
#, 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:651
+#: src/common/weeconfig.c:668
#, 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:690
+#: src/common/weeconfig.c:707
#, 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:701
+#: src/common/weeconfig.c:718
#, 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:735
+#: src/common/weeconfig.c:752
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr "%s fichier de configuration \"%s\" non trouvé.\n"
-#: src/common/weeconfig.c:767
+#: src/common/weeconfig.c:784
#, 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:784
+#: src/common/weeconfig.c:801
#, 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:802
+#: src/common/weeconfig.c:819
#, 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:836
+#: src/common/weeconfig.c:853
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr "%s %s, ligne %d: option \"%s\" invalide\n"
-#: src/common/weeconfig.c:847
+#: src/common/weeconfig.c:864
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
@@ -2762,7 +2774,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:856
+#: src/common/weeconfig.c:873
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -2771,7 +2783,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:867
+#: src/common/weeconfig.c:884
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
@@ -2780,26 +2792,26 @@ msgstr ""
"%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
"Attendu: une de ces chaînes: "
-#: src/common/weeconfig.c:883
+#: src/common/weeconfig.c:900
#, 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:937 src/common/weeconfig.c:1091
+#: src/common/weeconfig.c:954 src/common/weeconfig.c:1116
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr "%s impossible de créer le fichier \"%s\"\n"
-#: src/common/weeconfig.c:943
+#: src/common/weeconfig.c:960
#, 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:944
+#: src/common/weeconfig.c:961
msgid "creating default config file\n"
msgstr "création du fichier de configuration par défaut\n"
-#: src/common/weeconfig.c:947 src/common/weeconfig.c:1100
+#: src/common/weeconfig.c:964 src/common/weeconfig.c:1125
#, c-format
msgid ""
"#\n"
@@ -2808,10 +2820,10 @@ msgstr ""
"#\n"
"# %s: fichier de configuration, créé par %s v%s le %s#\n"
-#: src/common/weeconfig.c:1047
+#: src/common/weeconfig.c:1072
msgid "Unable to get user's name"
msgstr "Impossible de déterminer le nom d'utilisateur"
-#: src/common/weeconfig.c:1097
+#: src/common/weeconfig.c:1122
msgid "saving config to disk\n"
msgstr "sauvegarde de la configuration sur disque\n"
diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot
index c7f838aeb..e2f1a230d 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-01-17 11:16+0100\n"
+"POT-Creation-Date: 2004-01-18 19:34+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1426,24 +1426,24 @@ msgstr ""
msgid "%s unable to add handler for \"%s\" message (not enough memory)\n"
msgstr ""
-#: src/gui/curses/gui-display.c:861
+#: src/gui/curses/gui-display.c:887
msgid "[not connected] "
msgstr ""
-#: src/gui/curses/gui-display.c:868 src/gui/curses/gui-display.c:871
+#: src/gui/curses/gui-display.c:894 src/gui/curses/gui-display.c:897
msgid "-MORE-"
msgstr ""
-#: src/gui/gtk/gui-display.c:618
+#: src/gui/gtk/gui-display.c:647
msgid "server"
msgstr ""
-#: src/gui/gui-common.c:266
+#: src/gui/gui-common.c:270
#, c-format
msgid "%s not enough memory for new line!\n"
msgstr ""
-#: src/gui/gui-common.c:293
+#: src/gui/gui-common.c:297
msgid "not enough memory!\n"
msgstr ""
@@ -1911,87 +1911,87 @@ msgstr ""
msgid "Alias \"%s\" removed\n"
msgstr ""
-#: src/common/weechat.c:119
+#: src/common/weechat.c:120
msgid ""
"WeeChat configuration options (~/.weechat/weechat.rc):\n"
"\n"
msgstr ""
-#: src/common/weechat.c:132
+#: src/common/weechat.c:133
msgid " . type boolean (values: 'on' or 'off')\n"
msgstr ""
-#: src/common/weechat.c:133 src/common/weechat.c:156 src/common/weechat.c:162
-#: src/common/weechat.c:168
+#: src/common/weechat.c:134 src/common/weechat.c:157 src/common/weechat.c:163
+#: src/common/weechat.c:169
#, c-format
msgid " . default value: '%s'\n"
msgstr ""
-#: src/common/weechat.c:138
+#: src/common/weechat.c:139
#, c-format
msgid " . type integer (values: between %d and %d)\n"
msgstr ""
-#: src/common/weechat.c:141
+#: src/common/weechat.c:142
#, c-format
msgid " . default value: %d\n"
msgstr ""
-#: src/common/weechat.c:145
+#: src/common/weechat.c:146
msgid " . type string (values: "
msgstr ""
-#: src/common/weechat.c:158 src/common/weechat.c:164 src/common/weechat.c:170
+#: src/common/weechat.c:159 src/common/weechat.c:165 src/common/weechat.c:171
msgid "empty"
msgstr ""
-#: src/common/weechat.c:161
+#: src/common/weechat.c:162
msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n"
msgstr ""
-#: src/common/weechat.c:167
+#: src/common/weechat.c:168
msgid " . type string (any string)\n"
msgstr ""
-#: src/common/weechat.c:173
+#: src/common/weechat.c:174
#, c-format
msgid ""
" . description: %s\n"
"\n"
msgstr ""
-#: src/common/weechat.c:179
+#: src/common/weechat.c:180
msgid ""
"Moreover, you can define aliases in [alias] section, by adding lines like:\n"
msgstr ""
-#: src/common/weechat.c:181
+#: src/common/weechat.c:182
msgid ""
"where 'j' is alias name, and 'join' associated command.\n"
"\n"
msgstr ""
-#: src/common/weechat.c:205
+#: src/common/weechat.c:206
#, c-format
msgid "%s unknown parameter '%s', ignored\n"
msgstr ""
-#: src/common/weechat.c:225
+#: src/common/weechat.c:226
#, c-format
msgid "%s cannot create directory \"%s\"\n"
msgstr ""
-#: src/common/weechat.c:327
+#: src/common/weechat.c:328
#, c-format
msgid "%s unable to create/append to log file (~/.weechat/%s)"
msgstr ""
-#: src/common/weechat.c:351
+#: src/common/weechat.c:352
#, c-format
msgid "%sWelcome to "
msgstr ""
-#: src/common/weechat.c:364
+#: src/common/weechat.c:365
msgid "compiled on"
msgstr ""
@@ -2003,626 +2003,638 @@ msgstr ""
msgid " Warning:"
msgstr ""
-#: src/common/weeconfig.c:78 src/common/weeconfig.c:79
+#: src/common/weeconfig.c:79 src/common/weeconfig.c:80
msgid "set title for terminal window (curses GUI) with name & version"
msgstr ""
-#: src/common/weeconfig.c:82 src/common/weeconfig.c:83
+#: src/common/weeconfig.c:83 src/common/weeconfig.c:84
msgid "display WeeChat logo at startup"
msgstr ""
-#: src/common/weeconfig.c:86 src/common/weeconfig.c:87
+#: src/common/weeconfig.c:87 src/common/weeconfig.c:88
msgid "display WeeChat version at startup"
msgstr ""
-#: src/common/weeconfig.c:90
+#: src/common/weeconfig.c:91
msgid "WeeChat slogan"
msgstr ""
-#: src/common/weeconfig.c:91
+#: src/common/weeconfig.c:92
msgid "WeeChat slogan (if empty, slogan is not used)"
msgstr ""
-#: src/common/weeconfig.c:94 src/common/weeconfig.c:95
+#: src/common/weeconfig.c:95 src/common/weeconfig.c:96
msgid "display nick names with different colors"
msgstr ""
-#: src/common/weeconfig.c:98 src/common/weeconfig.c:99
+#: src/common/weeconfig.c:99 src/common/weeconfig.c:100
msgid "display actions with different colors"
msgstr ""
-#: src/common/weeconfig.c:102 src/common/weeconfig.c:103
+#: src/common/weeconfig.c:103 src/common/weeconfig.c:104
msgid "remove colors from incoming messages"
msgstr ""
-#: src/common/weeconfig.c:106
+#: src/common/weeconfig.c:107
msgid "display nicklist window"
msgstr ""
-#: src/common/weeconfig.c:107
+#: src/common/weeconfig.c:108
msgid "display nicklist window (for channel windows)"
msgstr ""
-#: src/common/weeconfig.c:110
+#: src/common/weeconfig.c:111
msgid "nicklist position"
msgstr ""
-#: src/common/weeconfig.c:111
+#: src/common/weeconfig.c:112
msgid "nicklist position (top, left, right (default), bottom)"
msgstr ""
-#: src/common/weeconfig.c:114
+#: src/common/weeconfig.c:115
msgid "min size for nicklist"
msgstr ""
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:116
msgid ""
"min size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no min size))"
msgstr ""
-#: src/common/weeconfig.c:119
+#: src/common/weeconfig.c:120
msgid "max size for nicklist"
msgstr ""
-#: src/common/weeconfig.c:120
+#: src/common/weeconfig.c:121
msgid ""
"max size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no max size; if min == max and > 0, then size is fixed))"
msgstr ""
-#: src/common/weeconfig.c:124 src/common/weeconfig.c:125
+#: src/common/weeconfig.c:125 src/common/weeconfig.c:126
msgid "text to display instead of nick when not connected"
msgstr ""
-#: src/common/weeconfig.c:128 src/common/weeconfig.c:129
+#: src/common/weeconfig.c:129 src/common/weeconfig.c:130
msgid "display nick mode ((half)op/voice) before each nick"
msgstr ""
-#: src/common/weeconfig.c:132 src/common/weeconfig.c:133
+#: src/common/weeconfig.c:133 src/common/weeconfig.c:134
msgid "display space if nick mode is not (half)op/voice"
msgstr ""
-#: src/common/weeconfig.c:136 src/common/weeconfig.c:137
+#: src/common/weeconfig.c:137 src/common/weeconfig.c:138
msgid "the string inserted after nick completion"
msgstr ""
-#: src/common/weeconfig.c:179 src/common/weeconfig.c:180
+#: src/common/weeconfig.c:141 src/common/weeconfig.c:142
+msgid "enable info bar"
+msgstr ""
+
+#: src/common/weeconfig.c:186 src/common/weeconfig.c:187
msgid "color for title bar"
msgstr ""
-#: src/common/weeconfig.c:183 src/common/weeconfig.c:184
+#: src/common/weeconfig.c:190 src/common/weeconfig.c:191
msgid "background for title bar"
msgstr ""
-#: src/common/weeconfig.c:189 src/common/weeconfig.c:190
+#: src/common/weeconfig.c:196 src/common/weeconfig.c:197
msgid "color for chat text"
msgstr ""
-#: src/common/weeconfig.c:193
+#: src/common/weeconfig.c:200
msgid "color for time"
msgstr ""
-#: src/common/weeconfig.c:194
+#: src/common/weeconfig.c:201
msgid "color for time in chat window"
msgstr ""
-#: src/common/weeconfig.c:197
+#: src/common/weeconfig.c:204
msgid "color for time separator"
msgstr ""
-#: src/common/weeconfig.c:198
+#: src/common/weeconfig.c:205
msgid "color for time separator (chat window)"
msgstr ""
-#: src/common/weeconfig.c:201 src/common/weeconfig.c:202
+#: src/common/weeconfig.c:208 src/common/weeconfig.c:209
msgid "color for 1st and 3rd char of prefix"
msgstr ""
-#: src/common/weeconfig.c:205 src/common/weeconfig.c:206
+#: src/common/weeconfig.c:212 src/common/weeconfig.c:213
msgid "color for middle char of prefix"
msgstr ""
-#: src/common/weeconfig.c:209
+#: src/common/weeconfig.c:216
msgid "color for nicks in actions"
msgstr ""
-#: src/common/weeconfig.c:210
+#: src/common/weeconfig.c:217
msgid "color for nicks in actions (chat window)"
msgstr ""
-#: src/common/weeconfig.c:213
+#: src/common/weeconfig.c:220
msgid "color for hostnames"
msgstr ""
-#: src/common/weeconfig.c:214
+#: src/common/weeconfig.c:221
msgid "color for hostnames (chat window)"
msgstr ""
-#: src/common/weeconfig.c:217
+#: src/common/weeconfig.c:224
msgid "color for channel names in actions"
msgstr ""
-#: src/common/weeconfig.c:218
+#: src/common/weeconfig.c:225
msgid "color for channel names in actions (chat window)"
msgstr ""
-#: src/common/weeconfig.c:221
+#: src/common/weeconfig.c:228
msgid "color for dark separators"
msgstr ""
-#: src/common/weeconfig.c:222
+#: src/common/weeconfig.c:229
msgid "color for dark separators (chat window)"
msgstr ""
-#: src/common/weeconfig.c:225
+#: src/common/weeconfig.c:232
msgid "color for highlighted nick"
msgstr ""
-#: src/common/weeconfig.c:226
+#: src/common/weeconfig.c:233
msgid "color for highlighted nick (chat window)"
msgstr ""
-#: src/common/weeconfig.c:229
+#: src/common/weeconfig.c:236
msgid "background for chat"
msgstr ""
-#: src/common/weeconfig.c:230
+#: src/common/weeconfig.c:237
msgid "background for chat window"
msgstr ""
-#: src/common/weeconfig.c:235 src/common/weeconfig.c:236
+#: src/common/weeconfig.c:242 src/common/weeconfig.c:243
msgid "color for status bar"
msgstr ""
-#: src/common/weeconfig.c:239
+#: src/common/weeconfig.c:246
msgid "color for active window"
msgstr ""
-#: src/common/weeconfig.c:240
+#: src/common/weeconfig.c:247
msgid "color for active window (status bar)"
msgstr ""
-#: src/common/weeconfig.c:243
+#: src/common/weeconfig.c:250
msgid "color for window with new messages"
msgstr ""
-#: src/common/weeconfig.c:244
+#: src/common/weeconfig.c:251
msgid "color for window with new messages (status bar)"
msgstr ""
-#: src/common/weeconfig.c:247
+#: src/common/weeconfig.c:254
msgid "color for window with new data (not messages)"
msgstr ""
-#: src/common/weeconfig.c:248
+#: src/common/weeconfig.c:255
msgid "color for window with new data (not messages) (status bar)"
msgstr ""
-#: src/common/weeconfig.c:251
+#: src/common/weeconfig.c:258
msgid "color for \"*MORE*\" text"
msgstr ""
-#: src/common/weeconfig.c:252
+#: src/common/weeconfig.c:259
msgid "color for window with new data (status bar)"
msgstr ""
-#: src/common/weeconfig.c:255 src/common/weeconfig.c:256
+#: src/common/weeconfig.c:262 src/common/weeconfig.c:263
msgid "background for status window"
msgstr ""
-#: src/common/weeconfig.c:261 src/common/weeconfig.c:262
+#: src/common/weeconfig.c:268 src/common/weeconfig.c:269
+msgid "color for info bar text"
+msgstr ""
+
+#: src/common/weeconfig.c:272 src/common/weeconfig.c:273
+msgid "background for info bar window"
+msgstr ""
+
+#: src/common/weeconfig.c:278 src/common/weeconfig.c:279
msgid "color for input text"
msgstr ""
-#: src/common/weeconfig.c:265 src/common/weeconfig.c:266
+#: src/common/weeconfig.c:282 src/common/weeconfig.c:283
msgid "color for input text (channel name)"
msgstr ""
-#: src/common/weeconfig.c:269 src/common/weeconfig.c:270
+#: src/common/weeconfig.c:286 src/common/weeconfig.c:287
msgid "color for input text (nick name)"
msgstr ""
-#: src/common/weeconfig.c:273 src/common/weeconfig.c:274
+#: src/common/weeconfig.c:290 src/common/weeconfig.c:291
msgid "background for input window"
msgstr ""
-#: src/common/weeconfig.c:279 src/common/weeconfig.c:280
+#: src/common/weeconfig.c:296 src/common/weeconfig.c:297
msgid "color for nicknames"
msgstr ""
-#: src/common/weeconfig.c:283 src/common/weeconfig.c:284
+#: src/common/weeconfig.c:300 src/common/weeconfig.c:301
msgid "color for operator symbol"
msgstr ""
-#: src/common/weeconfig.c:287 src/common/weeconfig.c:288
+#: src/common/weeconfig.c:304 src/common/weeconfig.c:305
msgid "color for half-operator symbol"
msgstr ""
-#: src/common/weeconfig.c:291 src/common/weeconfig.c:292
+#: src/common/weeconfig.c:308 src/common/weeconfig.c:309
msgid "color for voice symbol"
msgstr ""
-#: src/common/weeconfig.c:295 src/common/weeconfig.c:296
+#: src/common/weeconfig.c:312 src/common/weeconfig.c:313
msgid "color for nick separator"
msgstr ""
-#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
+#: src/common/weeconfig.c:316 src/common/weeconfig.c:317
msgid "color for local nick"
msgstr ""
-#: src/common/weeconfig.c:303 src/common/weeconfig.c:304
+#: src/common/weeconfig.c:320 src/common/weeconfig.c:321
msgid "color for other nick in private window"
msgstr ""
-#: src/common/weeconfig.c:307 src/common/weeconfig.c:308
+#: src/common/weeconfig.c:324 src/common/weeconfig.c:325
msgid "background for nicknames"
msgstr ""
-#: src/common/weeconfig.c:321
+#: src/common/weeconfig.c:338
msgid "max lines in history (per window)"
msgstr ""
-#: src/common/weeconfig.c:322
+#: src/common/weeconfig.c:339
msgid ""
"maximum number of lines in history for one server/channel/private window (0 "
"= unlimited)"
msgstr ""
-#: src/common/weeconfig.c:326
+#: src/common/weeconfig.c:343
msgid "max user commands in history"
msgstr ""
-#: src/common/weeconfig.c:327
+#: src/common/weeconfig.c:344
msgid "maximum number of user commands in history (0 = unlimited)"
msgstr ""
-#: src/common/weeconfig.c:344 src/common/weeconfig.c:345
+#: src/common/weeconfig.c:361 src/common/weeconfig.c:362
msgid "automatically log channel chats"
msgstr ""
-#: src/common/weeconfig.c:348 src/common/weeconfig.c:349
+#: src/common/weeconfig.c:365 src/common/weeconfig.c:366
msgid "automatically log private chats"
msgstr ""
-#: src/common/weeconfig.c:352
+#: src/common/weeconfig.c:369
msgid "path for log files"
msgstr ""
-#: src/common/weeconfig.c:353
+#: src/common/weeconfig.c:370
msgid "path for WeeChat log files"
msgstr ""
-#: src/common/weeconfig.c:356
+#: src/common/weeconfig.c:373
msgid "name for log files"
msgstr ""
-#: src/common/weeconfig.c:357
+#: src/common/weeconfig.c:374
msgid ""
"name for log files (%S == irc server name, %N == channel name (or nickname "
"if private chat)"
msgstr ""
-#: src/common/weeconfig.c:361
+#: src/common/weeconfig.c:378
msgid "timestamp for log"
msgstr ""
-#: src/common/weeconfig.c:362
+#: src/common/weeconfig.c:379
msgid "timestamp for log (see man strftime for date/time specifiers)"
msgstr ""
-#: src/common/weeconfig.c:365
+#: src/common/weeconfig.c:382
msgid "start string for log files"
msgstr ""
-#: src/common/weeconfig.c:366
+#: src/common/weeconfig.c:383
msgid ""
"text written when starting new log file (see man strftime for date/time "
"specifiers)"
msgstr ""
-#: src/common/weeconfig.c:370
+#: src/common/weeconfig.c:387
msgid "end string for log files"
msgstr ""
-#: src/common/weeconfig.c:371
+#: src/common/weeconfig.c:388
msgid ""
"text written when ending log file (see man strftime for date/time specifiers)"
msgstr ""
-#: src/common/weeconfig.c:390
+#: src/common/weeconfig.c:407
msgid "automatically accept dcc files"
msgstr ""
-#: src/common/weeconfig.c:391
+#: src/common/weeconfig.c:408
msgid "automatically accept incoming dcc files"
msgstr ""
-#: src/common/weeconfig.c:394
+#: src/common/weeconfig.c:411
msgid "max size when auto accepting file"
msgstr ""
-#: src/common/weeconfig.c:395
+#: src/common/weeconfig.c:412
msgid "maximum size for incoming file when automatically accepted"
msgstr ""
-#: src/common/weeconfig.c:398
+#: src/common/weeconfig.c:415
msgid "automatically accept dcc chats"
msgstr ""
-#: src/common/weeconfig.c:399
+#: src/common/weeconfig.c:416
msgid "automatically accept dcc chats (use carefully!)"
msgstr ""
-#: src/common/weeconfig.c:402
+#: src/common/weeconfig.c:419
msgid "timeout for dcc request"
msgstr ""
-#: src/common/weeconfig.c:403
+#: src/common/weeconfig.c:420
msgid "timeout for dcc request (in seconds)"
msgstr ""
-#: src/common/weeconfig.c:406
+#: src/common/weeconfig.c:423
msgid "path for incoming files with dcc"
msgstr ""
-#: src/common/weeconfig.c:407
+#: src/common/weeconfig.c:424
msgid "path for writing incoming files with dcc (default: user home)"
msgstr ""
-#: src/common/weeconfig.c:410
+#: src/common/weeconfig.c:427
msgid "default path for sending files with dcc"
msgstr ""
-#: src/common/weeconfig.c:411
+#: src/common/weeconfig.c:428
msgid ""
"path for reading files when sending thru dcc (when no path is specified)"
msgstr ""
-#: src/common/weeconfig.c:414
+#: src/common/weeconfig.c:431
msgid "automatically rename dcc files if already exists"
msgstr ""
-#: src/common/weeconfig.c:415
+#: src/common/weeconfig.c:432
msgid "rename incoming files if already exists (add '.1', '.2', ...)"
msgstr ""
-#: src/common/weeconfig.c:418
+#: src/common/weeconfig.c:435
msgid "automatically resume aborted transfers"
msgstr ""
-#: src/common/weeconfig.c:419
+#: src/common/weeconfig.c:436
msgid ""
"automatically resume dcc transfer if connection with remote host is loosed"
msgstr ""
-#: src/common/weeconfig.c:433
+#: src/common/weeconfig.c:450
msgid "use proxy"
msgstr ""
-#: src/common/weeconfig.c:434
+#: src/common/weeconfig.c:451
msgid "use a proxy server to connect to irc server"
msgstr ""
-#: src/common/weeconfig.c:437
+#: src/common/weeconfig.c:454
msgid "proxy address"
msgstr ""
-#: src/common/weeconfig.c:438
+#: src/common/weeconfig.c:455
msgid "proxy server address (IP or hostname)"
msgstr ""
-#: src/common/weeconfig.c:441
+#: src/common/weeconfig.c:458
msgid "port for proxy"
msgstr ""
-#: src/common/weeconfig.c:442
+#: src/common/weeconfig.c:459
msgid "port for connecting to proxy server"
msgstr ""
-#: src/common/weeconfig.c:445
+#: src/common/weeconfig.c:462
msgid "proxy password"
msgstr ""
-#: src/common/weeconfig.c:446
+#: src/common/weeconfig.c:463
msgid "password for proxy server"
msgstr ""
-#: src/common/weeconfig.c:457
+#: src/common/weeconfig.c:474
msgid "server name"
msgstr ""
-#: src/common/weeconfig.c:458
+#: src/common/weeconfig.c:475
msgid "name associated to IRC server (for display only)"
msgstr ""
-#: src/common/weeconfig.c:461
+#: src/common/weeconfig.c:478
msgid "automatically connect to server"
msgstr ""
-#: src/common/weeconfig.c:462
+#: src/common/weeconfig.c:479
msgid "automatically connect to server when WeeChat is starting"
msgstr ""
-#: src/common/weeconfig.c:465
+#: src/common/weeconfig.c:482
msgid "server address or hostname"
msgstr ""
-#: src/common/weeconfig.c:466
+#: src/common/weeconfig.c:483
msgid "IP address or hostname of IRC server"
msgstr ""
-#: src/common/weeconfig.c:469
+#: src/common/weeconfig.c:486
msgid "port for IRC server"
msgstr ""
-#: src/common/weeconfig.c:470
+#: src/common/weeconfig.c:487
msgid "port for connecting to server"
msgstr ""
-#: src/common/weeconfig.c:473
+#: src/common/weeconfig.c:490
msgid "server password"
msgstr ""
-#: src/common/weeconfig.c:474
+#: src/common/weeconfig.c:491
msgid "password for IRC server"
msgstr ""
-#: src/common/weeconfig.c:477
+#: src/common/weeconfig.c:494
msgid "nickname for server"
msgstr ""
-#: src/common/weeconfig.c:478
+#: src/common/weeconfig.c:495
msgid "nickname to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:481
+#: src/common/weeconfig.c:498
msgid "alternate nickname for server"
msgstr ""
-#: src/common/weeconfig.c:482
+#: src/common/weeconfig.c:499
msgid "alternate nickname to use on IRC server (if nickname is already used)"
msgstr ""
-#: src/common/weeconfig.c:485
+#: src/common/weeconfig.c:502
msgid "2nd alternate nickname for server"
msgstr ""
-#: src/common/weeconfig.c:486
+#: src/common/weeconfig.c:503
msgid ""
"2nd alternate nickname to use on IRC server (if alternate nickname is "
"already used)"
msgstr ""
-#: src/common/weeconfig.c:489
+#: src/common/weeconfig.c:506
msgid "user name for server"
msgstr ""
-#: src/common/weeconfig.c:490
+#: src/common/weeconfig.c:507
msgid "user name to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:493
+#: src/common/weeconfig.c:510
msgid "real name for server"
msgstr ""
-#: src/common/weeconfig.c:494
+#: src/common/weeconfig.c:511
msgid "real name to use on IRC server"
msgstr ""
-#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
+#: src/common/weeconfig.c:514 src/common/weeconfig.c:515
msgid "first command to run when connected to server"
msgstr ""
-#: src/common/weeconfig.c:501
+#: src/common/weeconfig.c:518
msgid "list of channels to join when connected to server"
msgstr ""
-#: src/common/weeconfig.c:502
+#: src/common/weeconfig.c:519
msgid "comma separated list of channels to join when connected to server"
msgstr ""
-#: src/common/weeconfig.c:630
+#: src/common/weeconfig.c:647
#, c-format
msgid "%s %s, line %d: new server, but previous was incomplete\n"
msgstr ""
-#: src/common/weeconfig.c:639
+#: src/common/weeconfig.c:656
#, c-format
msgid "%s %s, line %d: server '%s' already exists\n"
msgstr ""
-#: src/common/weeconfig.c:651
+#: src/common/weeconfig.c:668
#, c-format
msgid "%s %s, line %d: unable to create server\n"
msgstr ""
-#: src/common/weeconfig.c:690
+#: src/common/weeconfig.c:707
#, c-format
msgid "%s unable to assign default int with string (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:701
+#: src/common/weeconfig.c:718
#, c-format
msgid "%s unable to assign default color (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:735
+#: src/common/weeconfig.c:752
#, c-format
msgid "%s config file \"%s\" not found.\n"
msgstr ""
-#: src/common/weeconfig.c:767
+#: src/common/weeconfig.c:784
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
msgstr ""
-#: src/common/weeconfig.c:784
+#: src/common/weeconfig.c:801
#, c-format
msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
msgstr ""
-#: src/common/weeconfig.c:802
+#: src/common/weeconfig.c:819
#, c-format
msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
msgstr ""
-#: src/common/weeconfig.c:836
+#: src/common/weeconfig.c:853
#, c-format
msgid "%s %s, line %d: invalid option \"%s\"\n"
msgstr ""
-#: src/common/weeconfig.c:847
+#: src/common/weeconfig.c:864
#, c-format
msgid ""
"%s %s, line %d: invalid value foroption '%s'\n"
"Expected: boolean value: 'off' or 'on'\n"
msgstr ""
-#: src/common/weeconfig.c:856
+#: src/common/weeconfig.c:873
#, 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:867
+#: src/common/weeconfig.c:884
#, c-format
msgid ""
"%s %s, line %d: invalid value for option '%s'\n"
"Expected: one of these strings: "
msgstr ""
-#: src/common/weeconfig.c:883
+#: src/common/weeconfig.c:900
#, c-format
msgid "%s %s, line %d: invalid color name for option '%s'\n"
msgstr ""
-#: src/common/weeconfig.c:937 src/common/weeconfig.c:1091
+#: src/common/weeconfig.c:954 src/common/weeconfig.c:1116
#, c-format
msgid "%s cannot create file \"%s\"\n"
msgstr ""
-#: src/common/weeconfig.c:943
+#: src/common/weeconfig.c:960
#, c-format
msgid "%s: creating default config file...\n"
msgstr ""
-#: src/common/weeconfig.c:944
+#: src/common/weeconfig.c:961
msgid "creating default config file\n"
msgstr ""
-#: src/common/weeconfig.c:947 src/common/weeconfig.c:1100
+#: src/common/weeconfig.c:964 src/common/weeconfig.c:1125
#, c-format
msgid ""
"#\n"
"# %s configuration file, created by %s v%s on %s#\n"
msgstr ""
-#: src/common/weeconfig.c:1047
+#: src/common/weeconfig.c:1072
msgid "Unable to get user's name"
msgstr ""
-#: src/common/weeconfig.c:1097
+#: src/common/weeconfig.c:1122
msgid "saving config to disk\n"
msgstr ""
diff --git a/weechat/src/common/weechat.c b/weechat/src/common/weechat.c
index f9b595c17..b03ba027c 100644
--- a/weechat/src/common/weechat.c
+++ b/weechat/src/common/weechat.c
@@ -58,6 +58,7 @@
#include "../plugins/plugins.h"
+char *var_LANG; /* LANG environment variable */
int quit_weechat; /* = 1 if quit request from user... why ? :'( */
char *weechat_home; /* WeeChat home dir. (example: /home/toto/.weechat) */
FILE *log_file; /* WeeChat log file (~/.weechat/weechat.log) */
@@ -391,6 +392,8 @@ wee_shutdown ()
int
main (int argc, char *argv[])
{
+ var_LANG = getenv ("LANG"); /* get LANG environment variable */
+
#ifdef ENABLE_NLS
setlocale (LC_ALL, ""); /* initialize gettext */
bindtextdomain (PACKAGE, LOCALEDIR);
diff --git a/weechat/src/common/weechat.h b/weechat/src/common/weechat.h
index 4afc59f74..5ab30e049 100644
--- a/weechat/src/common/weechat.h
+++ b/weechat/src/common/weechat.h
@@ -94,6 +94,7 @@
/* global variables and functions */
+extern char *var_LANG;
extern int quit_weechat;
extern char *weechat_home;
diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c
index 8932a1417..8dde9f24a 100644
--- a/weechat/src/common/weeconfig.c
+++ b/weechat/src/common/weeconfig.c
@@ -73,6 +73,7 @@ int cfg_look_nickmode;
int cfg_look_nickmode_empty;
char *cfg_look_no_nickname;
char *cfg_look_completor;
+int cfg_look_infobar;
t_config_option weechat_options_look[] =
{ { "look_set_title", N_("set title for terminal window (curses GUI) with name & version"),
@@ -137,6 +138,10 @@ t_config_option weechat_options_look[] =
N_("the string inserted after nick completion"),
OPTION_TYPE_STRING, 0, 0, 0,
":", NULL, NULL, &cfg_look_completor, NULL },
+ { "look_infobar", N_("enable info bar"),
+ N_("enable info bar"),
+ OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
+ NULL, NULL, &cfg_look_infobar, NULL, NULL },
{ NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
};
@@ -161,6 +166,8 @@ int cfg_col_status_data_msg;
int cfg_col_status_data_other;
int cfg_col_status_more;
int cfg_col_status_bg;
+int cfg_col_infobar;
+int cfg_col_infobar_bg;
int cfg_col_input;
int cfg_col_input_channel;
int cfg_col_input_nick;
@@ -256,6 +263,16 @@ t_config_option weechat_options_colors[] =
N_("background for status window"),
OPTION_TYPE_COLOR, 0, 0, 0,
"blue", NULL, &cfg_col_status_bg, NULL, NULL },
+
+ /* infobar window */
+ { "col_infobar", N_("color for info bar text"),
+ N_("color for info bar text"),
+ OPTION_TYPE_COLOR, 0, 0, 0,
+ "gray", NULL, &cfg_col_infobar, NULL, NULL },
+ { "col_infobar_bg", N_("background for info bar window"),
+ N_("background for info bar window"),
+ OPTION_TYPE_COLOR, 0, 0, 0,
+ "blue", NULL, &cfg_col_infobar_bg, NULL, NULL },
/* input window */
{ "col_input", N_("color for input text"),
diff --git a/weechat/src/common/weeconfig.h b/weechat/src/common/weeconfig.h
index 085df165a..3078355ae 100644
--- a/weechat/src/common/weeconfig.h
+++ b/weechat/src/common/weeconfig.h
@@ -88,6 +88,7 @@ extern int cfg_look_nickmode;
extern int cfg_look_nickmode_empty;
extern char *cfg_look_no_nickname;
extern char *cfg_look_completor;
+extern int cfg_look_infobar;
extern int cfg_col_title;
extern int cfg_col_title_bg;
@@ -108,6 +109,8 @@ extern int cfg_col_status_data_msg;
extern int cfg_col_status_data_other;
extern int cfg_col_status_more;
extern int cfg_col_status_bg;
+extern int cfg_col_infobar;
+extern int cfg_col_infobar_bg;
extern int cfg_col_input;
extern int cfg_col_input_channel;
extern int cfg_col_input_nick;
diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c
index ba84f9238..5f0db3624 100644
--- a/weechat/src/gui/curses/gui-display.c
+++ b/weechat/src/gui/curses/gui-display.c
@@ -192,21 +192,37 @@ gui_calculate_pos_size (t_gui_window *window)
window->win_chat_x = max_length + 2;
window->win_chat_y = 1;
window->win_chat_width = COLS - max_length - 2;
- window->win_chat_height = LINES - 3;
window->win_nick_x = 0;
window->win_nick_y = 1;
window->win_nick_width = max_length + 2;
- window->win_nick_height = LINES - 3;
+ if (cfg_look_infobar)
+ {
+ window->win_chat_height = LINES - 4;
+ window->win_nick_height = LINES - 4;
+ }
+ else
+ {
+ window->win_chat_height = LINES - 3;
+ window->win_nick_height = LINES - 3;
+ }
break;
case CFG_LOOK_NICKLIST_RIGHT:
window->win_chat_x = 0;
window->win_chat_y = 1;
window->win_chat_width = COLS - max_length - 2;
- window->win_chat_height = LINES - 3;
window->win_nick_x = COLS - max_length - 2;
window->win_nick_y = 1;
window->win_nick_width = max_length + 2;
- window->win_nick_height = LINES - 3;
+ if (cfg_look_infobar)
+ {
+ window->win_chat_height = LINES - 4;
+ window->win_nick_height = LINES - 4;
+ }
+ else
+ {
+ window->win_chat_height = LINES - 3;
+ window->win_nick_height = LINES - 3;
+ }
break;
case CFG_LOOK_NICKLIST_TOP:
nick_count (CHANNEL(window), &num_nicks, &num_op, &num_halfop,
@@ -218,7 +234,10 @@ gui_calculate_pos_size (t_gui_window *window)
window->win_chat_x = 0;
window->win_chat_y = 1 + (lines + 1);
window->win_chat_width = COLS;
- window->win_chat_height = LINES - 3 - (lines + 1);
+ if (cfg_look_infobar)
+ window->win_chat_height = LINES - 3 - (lines + 1) - 1;
+ else
+ window->win_chat_height = LINES - 3 - (lines + 1);
window->win_nick_x = 0;
window->win_nick_y = 1;
window->win_nick_width = COLS;
@@ -234,9 +253,15 @@ gui_calculate_pos_size (t_gui_window *window)
window->win_chat_x = 0;
window->win_chat_y = 1;
window->win_chat_width = COLS;
- window->win_chat_height = LINES - 3 - (lines + 1);
+ if (cfg_look_infobar)
+ window->win_chat_height = LINES - 3 - (lines + 1) - 1;
+ else
+ window->win_chat_height = LINES - 3 - (lines + 1);
window->win_nick_x = 0;
- window->win_nick_y = LINES - 2 - (lines + 1);
+ if (cfg_look_infobar)
+ window->win_nick_y = LINES - 2 - (lines + 1) - 1;
+ else
+ window->win_nick_y = LINES - 2 - (lines + 1);
window->win_nick_width = COLS;
window->win_nick_height = lines + 1;
break;
@@ -250,7 +275,10 @@ gui_calculate_pos_size (t_gui_window *window)
window->win_chat_x = 0;
window->win_chat_y = 1;
window->win_chat_width = COLS;
- window->win_chat_height = LINES - 3;
+ if (cfg_look_infobar)
+ window->win_chat_height = LINES - 4;
+ else
+ window->win_chat_height = LINES - 3;
window->win_chat_cursor_x = 0;
window->win_chat_cursor_y = 0;
window->win_nick_x = -1;
@@ -269,7 +297,6 @@ gui_curses_window_clear (WINDOW *window)
{
werase (window);
wmove (window, 0, 0);
- //wrefresh (window);
}
/*
@@ -775,7 +802,6 @@ gui_draw_window_status (t_gui_window *window)
wborder (window->win_status, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ');
wrefresh (window->win_status);
}
- //refresh ();
wmove (window->win_status, 0, 0);
for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
{
@@ -892,6 +918,59 @@ gui_redraw_window_status (t_gui_window *window)
}
/*
+ * gui_draw_window_infobar: draw infobar window
+ */
+
+void
+gui_draw_window_infobar (t_gui_window *window)
+{
+ t_gui_window *ptr_win;
+ char format_more[32];
+ time_t time_seconds;
+ struct tm *local_time;
+ char text[256];
+
+ /* TODO: manage splitted windows! */
+ if (window != gui_current_window)
+ return;
+
+ if (has_colors ())
+ {
+ gui_window_set_color (window->win_infobar, COLOR_WIN_INFOBAR);
+ wborder (window->win_infobar, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ');
+ wrefresh (window->win_infobar);
+ }
+ wmove (window->win_infobar, 0, 0);
+ gui_window_set_color (window->win_infobar, COLOR_WIN_INFOBAR);
+
+ time_seconds = time (NULL);
+ local_time = localtime (&time_seconds);
+ if (strncmp (var_LANG, "fr", 2) == 0)
+ strftime (text, 255, "%A %d %B %G - %H:%M", local_time);
+ else
+ strftime (text, 255, "%B, %A %d %G - %H:%M", local_time);
+ wprintw (window->win_infobar, "%s", text);
+
+ wrefresh (window->win_infobar);
+ refresh ();
+}
+
+/*
+ * gui_redraw_window_infobar: redraw infobar window
+ */
+
+void
+gui_redraw_window_infobar (t_gui_window *window)
+{
+ /* TODO: manage splitted windows! */
+ if (window != gui_current_window)
+ return;
+
+ gui_curses_window_clear (window->win_infobar);
+ gui_draw_window_infobar (window);
+}
+
+/*
* gui_get_input_width: return input width (max # chars displayed)
*/
@@ -931,7 +1010,6 @@ gui_draw_window_input (t_gui_window *window)
wborder (window->win_input, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ');
wrefresh (window->win_input);
}
- //refresh ();
if (window->input_buffer_size == 0)
window->input_buffer[0] = '\0';
@@ -1038,6 +1116,8 @@ gui_redraw_window (t_gui_window *window)
if (window->win_nick)
gui_redraw_window_nick (window);
gui_redraw_window_status (window);
+ if (cfg_look_infobar)
+ gui_redraw_window_infobar (window);
gui_redraw_window_input (window);
}
@@ -1062,11 +1142,13 @@ gui_switch_to_window (t_gui_window *window)
window->win_chat = ptr_win->win_chat;
window->win_nick = ptr_win->win_nick;
window->win_status = ptr_win->win_status;
+ window->win_infobar = ptr_win->win_infobar;
window->win_input = ptr_win->win_input;
ptr_win->win_title = NULL;
ptr_win->win_chat = NULL;
ptr_win->win_nick = NULL;
ptr_win->win_status = NULL;
+ ptr_win->win_infobar = NULL;
ptr_win->win_input = NULL;
ptr_win->is_displayed = 0;
break;
@@ -1091,7 +1173,13 @@ gui_switch_to_window (t_gui_window *window)
window->win_nick_x);
else
window->win_nick = NULL;
- window->win_status = newwin (1, COLS, LINES - 2, 0);
+ if (cfg_look_infobar)
+ {
+ window->win_infobar = newwin (1, COLS, LINES - 2, 0);
+ window->win_status = newwin (1, COLS, LINES - 3, 0);
+ }
+ else
+ window->win_status = newwin (1, COLS, LINES - 2, 0);
window->win_input = newwin (1, COLS, LINES - 1, 0);
}
else
@@ -1232,12 +1320,15 @@ gui_curses_resize_handler ()
delwin (ptr_win->win_nick);
if (ptr_win->win_status)
delwin (ptr_win->win_status);
+ if (ptr_win->win_infobar)
+ delwin (ptr_win->win_infobar);
if (ptr_win->win_input)
delwin (ptr_win->win_input);
ptr_win->win_title = NULL;
ptr_win->win_chat = NULL;
ptr_win->win_nick = NULL;
ptr_win->win_status = NULL;
+ ptr_win->win_infobar = NULL;
ptr_win->win_input = NULL;
gui_switch_to_window (ptr_win);
}
@@ -1255,6 +1346,7 @@ gui_window_init_subwindows (t_gui_window *window)
window->win_chat = NULL;
window->win_nick = NULL;
window->win_status = NULL;
+ window->win_infobar = NULL;
window->win_input = NULL;
}
@@ -1316,6 +1408,8 @@ gui_init_colors ()
cfg_col_status_data_other & A_CHARTEXT, cfg_col_status_bg);
init_pair (COLOR_WIN_STATUS_MORE,
cfg_col_status_more & A_CHARTEXT, cfg_col_status_bg);
+ init_pair (COLOR_WIN_INFOBAR,
+ cfg_col_infobar & A_CHARTEXT, cfg_col_infobar_bg);
init_pair (COLOR_WIN_INPUT,
cfg_col_input & A_CHARTEXT, cfg_col_input_bg);
init_pair (COLOR_WIN_INPUT_CHANNEL,
@@ -1362,6 +1456,7 @@ gui_init_colors ()
color_attr[COLOR_WIN_STATUS_DATA_MSG - 1] = cfg_col_status_data_msg & A_BOLD;
color_attr[COLOR_WIN_STATUS_DATA_OTHER - 1] = cfg_col_status_data_other & A_BOLD;
color_attr[COLOR_WIN_STATUS_MORE - 1] = cfg_col_status_more & A_BOLD;
+ color_attr[COLOR_WIN_INFOBAR - 1] = cfg_col_infobar & A_BOLD;
color_attr[COLOR_WIN_INPUT - 1] = cfg_col_input & A_BOLD;
color_attr[COLOR_WIN_INPUT_CHANNEL - 1] = cfg_col_input_channel & A_BOLD;
color_attr[COLOR_WIN_INPUT_NICK - 1] = cfg_col_input_nick & A_BOLD;
@@ -1426,6 +1521,8 @@ gui_end ()
delwin (ptr_win->win_nick);
if (ptr_win->win_status)
delwin (ptr_win->win_status);
+ if (ptr_win->win_infobar)
+ delwin (ptr_win->win_infobar);
if (ptr_win->win_input)
delwin (ptr_win->win_input);
/* TODO: free input buffer, lines, messages, completion */
diff --git a/weechat/src/gui/curses/gui-input.c b/weechat/src/gui/curses/gui-input.c
index 9707d998e..53baeb2d4 100644
--- a/weechat/src/gui/curses/gui-input.c
+++ b/weechat/src/gui/curses/gui-input.c
@@ -57,10 +57,11 @@ gui_read_keyb ()
{
switch (key)
{
- /* resize event: do nothing */
+ /* resize event */
case KEY_RESIZE:
gui_redraw_window (gui_current_window);
break;
+ /* previous window */
case KEY_F(6):
gui_switch_to_previous_window ();
break;
@@ -352,10 +353,22 @@ gui_main_loop ()
fd_set read_fd;
static struct timeval timeout;
t_irc_server *ptr_server;
+ int old_min;
+ time_t new_time;
+ struct tm *local_time;
quit_weechat = 0;
+ old_min = 0;
while (!quit_weechat)
{
+ new_time = time (NULL);
+ local_time = localtime (&new_time);
+ if (local_time->tm_min != old_min)
+ {
+ old_min = local_time->tm_min;
+ gui_redraw_window_infobar (gui_current_window);
+ }
+
timeout.tv_sec = 0;
timeout.tv_usec = 10000;
FD_ZERO (&read_fd);
diff --git a/weechat/src/gui/gtk/gui-display.c b/weechat/src/gui/gtk/gui-display.c
index b28f9e59f..c39f6ecb5 100644
--- a/weechat/src/gui/gtk/gui-display.c
+++ b/weechat/src/gui/gtk/gui-display.c
@@ -350,6 +350,35 @@ gui_redraw_window_status (t_gui_window *window)
}
/*
+ * gui_draw_window_infobar: draw infobar window
+ */
+
+void
+gui_draw_window_infobar (t_gui_window *window)
+{
+ /* TODO: manage splitted windows! */
+ if (window != gui_current_window)
+ return;
+
+ /* TODO: draw infobar window! */
+}
+
+/*
+ * gui_redraw_window_infobar: redraw infobar window
+ */
+
+void
+gui_redraw_window_infobar (t_gui_window *window)
+{
+ /* TODO: manage splitted windows! */
+ if (window != gui_current_window)
+ return;
+
+ /* TODO: first delete window content */
+ gui_draw_window_infobar (window);
+}
+
+/*
* gui_draw_window_input: draw input window
*/
diff --git a/weechat/src/gui/gui-common.c b/weechat/src/gui/gui-common.c
index fd8795342..397e3c3c3 100644
--- a/weechat/src/gui/gui-common.c
+++ b/weechat/src/gui/gui-common.c
@@ -96,6 +96,10 @@ gui_window_new (void *server, void *channel, int switch_to_window
new_window->line_complete = 1;
new_window->unread_data = 0;
+ /* init infobar */
+ new_window->infobar = NULL;
+ new_window->infobar_length = new_window->win_width + 1;
+
/* init input buffer */
new_window->input_buffer_alloc = INPUT_BUFFER_BLOCK_SIZE;
new_window->input_buffer = (char *) malloc (INPUT_BUFFER_BLOCK_SIZE);
diff --git a/weechat/src/gui/gui.h b/weechat/src/gui/gui.h
index 2e17c9130..63505a4bd 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 36
+#define NUM_COLORS 37
#define COLOR_WIN_TITLE 1
#define COLOR_WIN_CHAT 2
#define COLOR_WIN_CHAT_TIME 3
@@ -43,18 +43,19 @@
#define COLOR_WIN_STATUS_DATA_MSG 14
#define COLOR_WIN_STATUS_DATA_OTHER 15
#define COLOR_WIN_STATUS_MORE 16
-#define COLOR_WIN_INPUT 17
-#define COLOR_WIN_INPUT_CHANNEL 18
-#define COLOR_WIN_INPUT_NICK 19
-#define COLOR_WIN_NICK 20
-#define COLOR_WIN_NICK_OP 21
-#define COLOR_WIN_NICK_HALFOP 22
-#define COLOR_WIN_NICK_VOICE 23
-#define COLOR_WIN_NICK_SEP 24
-#define COLOR_WIN_NICK_SELF 25
-#define COLOR_WIN_NICK_PRIVATE 26
-#define COLOR_WIN_NICK_FIRST 27
-#define COLOR_WIN_NICK_LAST 36
+#define COLOR_WIN_INFOBAR 17
+#define COLOR_WIN_INPUT 18
+#define COLOR_WIN_INPUT_CHANNEL 19
+#define COLOR_WIN_INPUT_NICK 20
+#define COLOR_WIN_NICK 21
+#define COLOR_WIN_NICK_OP 22
+#define COLOR_WIN_NICK_HALFOP 23
+#define COLOR_WIN_NICK_VOICE 24
+#define COLOR_WIN_NICK_SEP 25
+#define COLOR_WIN_NICK_SELF 26
+#define COLOR_WIN_NICK_PRIVATE 27
+#define COLOR_WIN_NICK_FIRST 28
+#define COLOR_WIN_NICK_LAST 37
#define COLOR_WIN_NICK_NUMBER (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1)
#define SERVER(window) ((t_irc_server *)(window->server))
@@ -107,6 +108,17 @@ struct t_gui_color
int color;
};
+typedef struct t_gui_infobar t_gui_infobar;
+
+struct t_gui_infobar
+{
+ char *text; /* infobar text */
+ int time_displayed; /* delay (ms) before erasing this text */
+ /* if 0, text is never erased (except */
+ /* by user action to erase it) */
+ t_gui_infobar *next_infobar; /* next message for infobar */
+};
+
typedef struct t_gui_window t_gui_window;
struct t_gui_window
@@ -138,6 +150,7 @@ struct t_gui_window
void *win_chat; /* chat window (exemple: channel) */
void *win_nick; /* nick window */
void *win_status; /* status window */
+ void *win_infobar; /* info bar window */
void *win_input; /* input window */
/* windows for Curses GUI */
@@ -158,6 +171,10 @@ struct t_gui_window
int line_complete; /* current line complete ? (\n ending) */
int unread_data; /* highlight windows with unread data */
+ /* infobar content */
+ t_gui_infobar *infobar; /* infobar content (stack of messages) */
+ int infobar_length; /* length of infobar (width of win + 1) */
+
/* inupt buffer */
char *input_buffer; /* input buffer */
int input_buffer_alloc; /* input buffer: allocated size in mem */
@@ -211,6 +228,8 @@ extern void gui_draw_window_nick (t_gui_window *);
extern void gui_redraw_window_nick (t_gui_window *);
extern void gui_draw_window_status (t_gui_window *);
extern void gui_redraw_window_status (t_gui_window *);
+extern void gui_draw_window_infobar (t_gui_window *);
+extern void gui_redraw_window_infobar (t_gui_window *);
extern void gui_draw_window_input (t_gui_window *);
extern void gui_redraw_window_input (t_gui_window *);
extern void gui_redraw_window (t_gui_window *);