Version 0.3.4-rc3

Add note about term option for .screenrc file in user guide
Add doc about 256 colors in user guide and FAQ
2026-06-25 04:16:38 +02:00 · 2011-01-04 15:06:46 +01:00 · 2011-01-04 15:05:30 +01:00 · 2011-01-04 14:48:02 +01:00 · 2011-01-04 14:37:14 +01:00 · 2011-01-03 14:41:14 +01:00
395 changed files with 6358 additions and 2180 deletions
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2007-2008 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2008-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -33,7 +33,7 @@ ENDIF(PREFIX)

 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "3")
-SET(VERSION_PATCH "4-rc1")
+SET(VERSION_PATCH "4-rc3")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(LICENSE "GPL3")
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
@@ -1,12 +1,19 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.4-rc1, 2010-12-10
+v0.3.4-rc3, 2011-01-04


 Version 0.3.4 (under dev!)
 --------------------------

+* core: add 256 colors support, new command /color, new section "palette" in
+  weechat.conf (task #6834)
+* core: add info "weechat_upgrading", signal "upgrade_ended", display duration
+  of upgrade
+* core: replace the 10 nick color options and number of nick colors by a single
+  option "weechat.color.chat_nick_colors" (comma separated list of colors)
+* core: add support of python 2.7 in cmake and configure (debian #606989)
 * core: add color support in option weechat.look.buffer_time_format
 * core: call to hook_config when config option is created
 * core: add new option weechat.look.highlight_regex and function
@@ -34,13 +41,18 @@ Version 0.3.4 (under dev!)
 * core: use similar behaviour for keys bound to local or global history
  (bug #30759)
 * api: add priority for hooks (task #10550)
-* api: add new functions: hashtable_get_string, hook_info_hashtable,
+* api: add new functions: list_search_pos, list_casesearch_pos,
+  hashtable_get_string, hashtable_set_pointer, hook_info_hashtable,
  info_get_hashtable, hook_hsignal, hook_hsignal_send,
  hook_completion_get_string, nicklist_group_get_integer,
  nicklist_group_get_string, nicklist_group_get_pointer, nicklist_group_set,
  nicklist_nick_get_integer, nicklist_nick_get_string, nicklist_nick_get_pointer,
  nicklist_nick_set
 * alias: complete with alias value for second argument of command /alias
+* irc: update nick modes with message 221 (bug #32038)
+* irc: add option "-server" to command /join (task #10837)
+* irc: fix bug with charset decoding on private buffers (decoding was made for
+  local nick instead of remote nick) (bug #31890)
 * irc: add option "-switch" to commands /connect and /reconnect
 * irc: allow command /reconnect on servers that are not currently connected
  (bug #30726)
@@ -191,6 +203,7 @@ Version 0.3.2 (2010-04-18)
 * alias: add custom completion for aliases (task #9479)
 * scripts: allow script commands to reload only one script
 * scripts: fix bug with callbacks when loading a script already loaded
+* perl: fix crash when MULTIPLICITY is disabled
 * perl: fix crash when callbacks are called during script initialization
  (bug #29018)
 * perl: fix crash on /quit or unload of plugin under FreeBSD and Cygwin
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2006-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -1,7 +1,7 @@
 WeeChat News
 ============
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.4-rc1, 2010-12-10
+v0.3.4-rc3, 2011-01-04


 Version 0.3.4 (under dev!)
@@ -9,8 +9,13 @@ Version 0.3.4 (under dev!)

 Important release notes:

-* if you are using `/upgrade` from a previous release, some nick prefixes can
-  be wrong, so it is recommended to do `/allchan names`.
+* if you are using `/upgrade` from a previous release:
+** some nick prefixes can be wrong, so it is recommended to do `/allchan names`
+** nick colors are defined with a new option "weechat.color.chat_nick_colors",
+   therefore old options "weechat.color.chat_nick_color1..10" will be lost when
+   upgrading
+** nick colors in messages displayed will be wrong if you changed some nick colors
+   (old default colors will be used)
 * some IRC options have been renamed, before upgrading to this version, note
  value for old options, and set them again with new name:
 ** options moved from 'network' section to servers (with global value, and server
@@ -27,7 +27,7 @@ NOTE: (1) only Curses interface is available today
 Copyright
 ---------

-Copyright (C) 2003-2010 Sébastien Helleu <flashcode@flashtux.org>
+Copyright (C) 2003-2011 Sébastien Helleu <flashcode@flashtux.org>

 This file is part of WeeChat, the extensible chat client.

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2005-2006 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2007 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -34,7 +34,7 @@ IF(PYTHON_FOUND)
 ENDIF(PYTHON_FOUND)

 FIND_PROGRAM(PYTHON_EXECUTABLE
-  NAMES python python2.6 python2.5 python2.4 python2.3 python2.2
+  NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
  )

@@ -65,7 +65,7 @@ IF(PYTHON_EXECUTABLE)
    )
  
  FIND_LIBRARY(PYTHON_LIBRARY
-    NAMES python python2.6 python2.5 python2.4 python2.3 python2.2
+    NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
    PATHS ${PYTHON_POSSIBLE_LIB_PATH}
    )

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2008 Julien Louis <ptitlouis@sysif.net>
-# Copyright (C) 2008-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2008-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Benoit Papillault <benoit.papillault@free.fr>
 # Copyright (C) 2005-2006 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2005-2009 Emmanuel Bouthenot <kolter@openics.org>
@@ -24,10 +24,10 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.3.4-rc1, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.3.4-rc3, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([src/core/weechat.c])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.3.4-rc1])
+AM_INIT_AUTOMAKE([weechat], [0.3.4-rc3])
 LICENSE="GPL3"

 # Checks for programs
@@ -477,7 +477,7 @@ fi
 PYTHON_VERSION=

 if test "x$enable_python" = "xyes" ; then
-    AC_PATH_PROGS(PYTHON, python python2.5 python2.4 python2.3 python2.2)
+    AC_PATH_PROGS(PYTHON, python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2)
    if test -z $PYTHON ; then
        AC_MSG_WARN([
 *** Python must be installed on your system but python interpreter couldn't be found in path.
@@ -4,8 +4,8 @@ Sat, 21 May 2005 08:00:00 +0200.
 It was downloaded from http://weechat.org/files/src/

 Copyright:
-    Copyright (C) (2003-2010) Sebastien Helleu <flashcode@flashtux.org>
-    Copyright (C) (2005-2010) Emmanuel Bouthenot <kolter@openics.org>
+    Copyright (C) (2003-2011) Sebastien Helleu <flashcode@flashtux.org>
+    Copyright (C) (2005-2011) Emmanuel Bouthenot <kolter@openics.org>
    Copyright (C) (2008-2010) Dmitry Kobylin <fnfal@academ.tsc.ru> (tcl plugin)

 This program is free software; you can redistribute it and/or modify
@@ -19,4 +19,4 @@ License, Version 3 can be found in the file

 Debian packaging (licensed under the GPLv3):
  Copyright(C) 2005-2008, Julien Louis <ptitlouis@sysif.net>
-  Copyright(C) 2008-2010, Emmanuel Bouthenot <kolter@openics.org>
+  Copyright(C) 2008-2011, Emmanuel Bouthenot <kolter@openics.org>
@@ -5,3 +5,5 @@ usr/lib/weechat/plugins/python.so
 usr/lib/weechat/plugins/ruby.so
 usr/lib/weechat/plugins/lua.so
 usr/lib/weechat/plugins/tcl.so
+usr/lib/weechat/plugins/relay.so
+usr/lib/weechat/plugins/rmodifier.so
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -1,6 +1,6 @@
 div.sectionbody {
-  font-family: serif,Georgia,"Times New Roman",Times;
+  font-family: serif,Helvetica,arial;
 }
 h5 {
-    font-size: 1em;
+    font-size: 0.95em;
 }
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -20,7 +20,7 @@
 # user's guide
 ADD_CUSTOM_COMMAND(
  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=3 -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.txt
+  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=4 -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.txt
  DEPENDS
  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.txt
  ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -70,6 +70,8 @@

 | weechat | buffers_plugins_names | Liste der Buffer (inkl. der Erweiterungen)

+| weechat | color_pairs | Farbpaar
+
 | weechat | commands | Befehle (WeeChat und Erweiterungen)

 | weechat | config_files | Konfigurationsdateien
@@ -52,4 +52,6 @@

 | weechat | weechat_site_download | Download-Seite von WeeChat | -

+| weechat | weechat_upgrading | 1 falls WeeChat ein Upgrade durchführt (Befehl  `/upgrade`) | -
+
 |========================================
@@ -55,17 +55,17 @@
 ........................................
  Mit IRC-Server(n) verbinden

-  servername: internal server name to connect (server must have been created by /server add)
-    hostname: hostname (or IP) of a server (this will create a TEMPORARY server)
-        port: port for server (6667 by default)
-      option: set option for server (for boolean option, value can be omitted)
-    nooption: set boolean option to 'off' (for example: -nossl)
-        -all: connect to all servers defined in configuration
-       -open: connect to all opened servers that are not currently connected
-     -nojoin: do not join any channel (even if autojoin is enabled on server)
-     -switch: switch to next server address
+  servername: intern genutzter Servername mit dem verbunden werden soll (Der Server muss zuerst mittels "/server add" angelegt werden)
+    hostname: Hostname oder IP eines Servers (damit erstelt man ausschließlich einen TEMPORÄREN Server)
+        port: Port den der Server nutzen soll (Standardport: 6667)
+      option: legt die Optionen für den Server fest (die Boolean-Optionen können weggelassen werden)
+    nooption: stellt die Boolean Option auf "off" (Beispiel: -nossl)
+        -all: Verbindet mit allen Servern
+       -open: stellt eine Verbindung zu allen geöffneten Servern her zu denen es aktuell keine Verbindung gibt
+     -nojoin: Channel(s) werden nicht betreten (auch falls die Funktion "autojoin" aktiviert sein sollte)
+     -switch: wechselt zur nächsten Server-Adresse
  
-  Examples:
+  Beispiele:
    /connect freenode
    /connect irc.oftc.net/6667
    /connect irc6.oftc.net/6667 -ipv6
@@ -196,17 +196,19 @@
  Nickname: Nickname
 ........................................

-&bull; *`/join`* `[channel1[,channel2[,channel3]] [key1[,key2]]]`::
+&bull; *`/join`* `[-server server] [channel1[,channel2[,channel3]] [key1[,key2]]]`::

 ........................................
  einen Channel betreten

+   server: sendet an diesen Server (interner Name)
  channel: Name des Channels der betreten werden soll
      key: Zugriffsschlüssel für einen Channel (Channels die einen Zugriffsschlüssel benötigen müssen zuerst aufgeführt werden)
  
-  Examples:
+  Beispiele:
    /join #weechat
    /join #geschützterChannel,#weechat Zugriffsschlüssel
+    /join -server freenode #weechat
 ........................................

 &bull; *`/kick`* `[channel] nickname [comment]`::
@@ -454,10 +456,10 @@
 ........................................
  Mit einem oder mehreren Server(n) erneut verbinden

-  servername: server name to reconnect
-        -all: reconnect to all servers
-     -nojoin: do not join any channel (even if autojoin is enabled on server)
-     -switch: switch to next server address
+  Servername: Servername zu welchem neu verbunden werden soll
+        -all: mit allen Servern neu verbinden
+     -nojoin: Channels werden nicht betreten (auch falls autojoin für diesen Server aktiviert ist)
+     -switch: wechselt zur nächsten Server-Adresse
 ........................................

 &bull; *`/rehash`* `[Option]`::
@@ -99,6 +99,29 @@
   /buffer +1
 ........................................

+&bull; *`/color`* `[add pair [alias] [fg,bg]] | [del pair] | switch`::
+
+........................................
+  erstellt benutzerdefinierte Farben und stellt die Farbpalette dar
+
+     add: fügt ein Farbpaar hinzu
+     del: entfernt ein Farbpaar
+  switch: wechselt die Farben von WeeChat/Terminal
+    pair: Wert für Farbpaar (>= 1)
+   alias: Alias für Farbe (zum Beispiel: "orange")
+   fg,bg: Vordergrund- und Hintergrundfarbe (-1 setzt für den Vorder- oder Hintergrund die standard Terminalfarbe)
+  
+  Ohne Angabe von Argumenten öffnet der Befehl einen neuen Buffer, in welchem die Farbpalette dargestellt wird.
+  
+  Beispiele:
+    fügt die Farbe 214 mit dem Alias "orange" hinzu:
+      /color add 214 orange
+    fügt die Farbe 250 mit dem Alias Orange auf Blau hinzu:
+      /color add 250 214,4 orange_blau
+    löscht die Farbe 214:
+      /color del 214
+........................................
+
 &bull; *`/command`* `Erweiterungs-Befehl`::

 ........................................
@@ -404,14 +427,14 @@
              h: Stunden
   Befehl: Befehl der ausgeführt werden soll (ohne das führende '/') oder ein Text der in dem Buffer ausgegeben werden soll
  
-  Hinweis: Der Befehl der zeit verzögert gestartet werden soll wird in dem Buffer ausgeführt in dem der Befehl /wait gestartet wurde. Falls dieser Buffer nicht gefunden werden sollte, z.B.  weil er in der Zwischenzeit geschlossen wurde, wird der Befehl im WeeChat Haupt-Buffer gestartet.
+  Hinweis: Der Befehl der zeit verzögert gestartet werden soll wird in dem Buffer ausgeführt in dem der /wait  Befehl aufgerufen wurde. Falls dieser Buffer nicht gefunden werden sollte, z.B.  weil er in der Zwischenzeit geschlossen wurde, wird der Befehl im WeeChat Core-Buffer ausgeführt.
  
  Beispiele:
-    Betritt einen Channel in 10 Sekunden:
+    Betritt nach 10 Sekunden den Channel #test:
    /wait 10 /join #test
-    Setzt eine Abwesenheit in 15 Minuten:
+    Setzt nach 15 Minuten eine globale Abwesenheit:
    /wait 15m /away -all Bin dann mal eben weg
-    Schickt den Text 'Hallo' nach zwei Minuten ab:
+    Versendet nach zwei Minuten den Text 'Hallo':
    /wait 2m Hallo
 ........................................

@@ -48,55 +48,10 @@
 ** Typ: Farbe
 ** Werte: ein Farbname (Standardwert: `lightcyan`)

-* *weechat.color.chat_nick_color01*
-** Beschreibung: `Textfarbe #1 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `cyan`)
-
-* *weechat.color.chat_nick_color02*
-** Beschreibung: `Textfarbe #2 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `magenta`)
-
-* *weechat.color.chat_nick_color03*
-** Beschreibung: `Textfarbe #3 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `green`)
-
-* *weechat.color.chat_nick_color04*
-** Beschreibung: `Textfarbe #4 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `brown`)
-
-* *weechat.color.chat_nick_color05*
-** Beschreibung: `Textfarbe #5 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `lightblue`)
-
-* *weechat.color.chat_nick_color06*
-** Beschreibung: `Textfarbe #6 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `default`)
-
-* *weechat.color.chat_nick_color07*
-** Beschreibung: `Textfarbe #7 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `lightcyan`)
-
-* *weechat.color.chat_nick_color08*
-** Beschreibung: `Textfarbe #8 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `lightmagenta`)
-
-* *weechat.color.chat_nick_color09*
-** Beschreibung: `Textfarbe #9 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `lightgreen`)
-
-* *weechat.color.chat_nick_color10*
-** Beschreibung: `Textfarbe #10 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `blue`)
+* *weechat.color.chat_nick_colors*
+** Beschreibung: `Textfarbe für Nicks (durch Kommata getrennte Liste von Farben)`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"`)

 * *weechat.color.chat_nick_other*
 ** Beschreibung: `Farbe des anderen Nicknamens in einem privaten Buffer`
@@ -309,7 +264,7 @@
 ** Werte: on, off (Standardwert: `off`)

 * *weechat.completion.partial_completion_count*
-** Beschreibung: `Zeige einen Zähler für jede teilweise, automatische Vervollständigung in der Bar-Item an`
+** Beschreibung: `Zeigt bei einer teilweisen Vervollständigung die Anzahl der jeweiligen Möglichkeiten in der Bar-Item an`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)

@@ -334,7 +289,7 @@
 ** Werte: 0 .. 2147483647 (Standardwert: `4096`)

 * *weechat.history.max_visited_buffers*
-** Beschreibung: `maximale Anzahl an besuchten Buffern, die im Speicher gehalten werden sollen`
+** Beschreibung: `maximale Anzahl an besuchten Buffern welche im Speicher gehalten werden sollen`
 ** Typ: integer
 ** Werte: 0 .. 1000 (Standardwert: `50`)

@@ -353,11 +308,6 @@
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%H:%M:%S"`)

-* *weechat.look.color_nicks_number*
-** Beschreibung: `Anzahl der Farben die für die Nicknamen genutzt werden sollen`
-** Typ: integer
-** Werte: 1 .. 10 (Standardwert: `10`)
-
 * *weechat.look.color_real_white*
 ** Beschreibung: `Falls diese Option aktiviert ist, wird echtes weiß als Farbe genutzt. In der Standardeinstellung ist diese Option allerdings deaktiviert damit es zu keinen Problemen mit Terminals kommt die einen weißen Hintergrund nutzen (falls man keinen weißen Hintergrund nutzen sollte dann ist es ratsam diese Option zu aktivieren, andernfalls wird die voreingestellte Vordergrundfarbe des Terminals genutzt)`
 ** Typ: boolesch
@@ -221,7 +221,7 @@ Hier findet man eine Auflistung von Skripten die sich mit URLs befassen: http://
 Ich möchte die Meldungen von Weechat in einer anderen Sprache ausgeben lassen, ohne WeeChat zu beenden. Ist dies möglich?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-Ja, dazu kannst Du das Python-Skript shell.py verwenden (erhältlich auf der
+Ja, dazu kannst Du das Python-Skript 'shell.py' verwenden (erhältlich auf der
 Internetseite). Nach dem Laden des Skripts führe folgende Befehle aus:

 ----------------------------------------
@@ -234,6 +234,32 @@ Benutzer von ISO-Kodierungen können folgendes eingeben:
 `/shell setenv LANG=en_US`.


+// TRANSLATION MISSING
+[[256_colors]]
+How can I use 256 colors in WeeChat?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+256 colors are supported with WeeChat 0.3.4 or newer.
+
+First check that your 'TERM' environment variable is correct, recommended values
+are:
+
+* under screen: 'screen-256color'
+* outside screen: 'xterm-256color', 'rxvt-256color', 'putty-256color',...
+
+If your 'TERM' variable has wrong value and that WeeChat is already running,
+don't panic! You can change it without restarting, thanks to script 'shell.py':
+
+----------------------------------------
+/shell setenv TERM=screen-256color
+/upgrade
+----------------------------------------
+
+You can use command `/color` for easy setup of colors in WeeChat.
+
+Please read user's guide for more information about colors management.
+
+
 [[key_bindings]]
 Tastaturbelegung
 ----------------
@@ -535,6 +561,28 @@ Es gibt drei Möglichkeiten:
  (Um emails an die "support" Mailing-Liste zu schicken, kannst Du diese abonnieren)


+[[gdb_error_threads]]
+Wenn man WeeChat in gdb startet kann ein Thread-Fehler auftreten. Was beudeutet das?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Falls man WeeChat in gdb ausführt kann folgende Fehlermeldung erscheinen:
+
+----------------------------------------
+gdb /Pfad/zu/weechat-curses
+(gdb) run
+[Thread debugging using libthread_db enabled]
+Cannot find new threads: generic error
+----------------------------------------
+
+Um diesen Fehler zu beheben sollte man gdb wie folgt aufrufen (der Pfad zu
+libpthread und WeeChat muss natürlich an das eigene System angepasst werden):
+
+----------------------------------------
+LD_PRELOAD=/lib/libpthread.so.0 gdb /Pfad/zu/weechat-curses
+(gdb) run
+----------------------------------------
+
+
 [[supported_os]]
 Auf welchen Plattformen läuft WeeChat? Wird es noch auf andere Betriebssystemen portiert?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1,5 +1,5 @@
-WeeChat Quick Start Guide
-=========================
+WeeChat Quickstart Anleitung
+============================
 Sébastien Helleu <flashcode@flashtux.org>


@@ -8,8 +8,8 @@ Start von WeeChat
 -----------------

 Die bevorzugte Terminal-Emulation für X (aber nicht obligatorisch) ist
-rxvt-unicode (es hat eine gute Unterstützung für UTF-8 und keine Probleme
-mit der Standard Tastaturbelegung).
+rxvt-unicode (es besitzt eine gute Unterstützung für UTF-8 und hat keine
+Probleme mit der Standard Tastaturbelegung).

 Starte "weechat-curses" aus Deiner shell.

@@ -24,26 +24,26 @@ ausführen.

 Um Optionen zu setzen benutzt man `/set config.section.option value`.
 (dabei ist 'config' der Konfigurationsname ('weechat' für den Kern von weechat,
-oder ein Plugin-Name), 'section' ein Abschnitt dieser Konfiguration und 'option'
-der Name der Option).
+oder der Name einer Erweiterung), 'section' ein Abschnitt dieser Konfiguration und 'option'
+der Name der betreffenden Option).

-WeeChat benutzt den neu eingestellten Wert sofort (WeeChat muss also *niemals* neu gestartet
+WeeChat benutzt den neu eingestellten Wert umgehend (WeeChat muss also *niemals* neu gestartet
 werden, nach dem die Konfiguration verändert wurde).

 Du kannst die Option `/set` mit teilweise ausgeschriebenen Namen und dem
-Platzhalter "*" am Beginn oder Ende verwenden um alle Optionen anzuzeigen, die
-die Zeichenkette enthalten.
+Platzhalter "*" am Beginn oder Ende verwenden um alle Optionen anzuzeigen die
+diese Zeichenkette enthalten.

 Zum Beispiel:

 `/set`::
-    Anzeige aller Optionen (WeeChat und Plugins)
+    Anzeige aller Optionen (WeeChat und Erweiterungen)

 `/set weechat.*`::
    Anzeige der WeeChat Optionen

 `/set irc.*`::
-    Anzeige der Optionen des IRC-Plugins
+    Anzeige der Optionen des IRC-Erweiterung

 Du kannst mit `/help` Hilfe für Optionen auflisten lassen, z.B.:
 `/help weechat.look.highlight`.
@@ -79,8 +79,8 @@ Du kannst einen IRC-Server mit dem Befehl `/server` hinzufügen, z.B.:

  /server add oftc irc.oftc.net/6667

-Wie immer, wenn Du nicht mehr weiter weißt, kannst Du mit `/help server` Hilfe
-erlangen.
+Wie bei jedem Befehl kannst Du Dir, falls Du nicht mehr weiter kommst, mit
+`/help server` einen Hilfstext anzeigen lassen.


 [[irc_server_options]]
@@ -88,25 +88,26 @@ Setzen eigener IRC-Server Optionen
 ----------------------------------

 WeeChat verwendet Vorgabewerte für alle Server (so genannte "fall backs") falls
-Du keine eigenen Werte für entsprechende Server-Optionen bestimmst.
+Du keine eigenen Werte für entsprechende Server-Optionen bestimmt haben solltest.
 Diese Vorgabeoptionen sind "irc.server_default.*".

 Für jede Server-Option benutzt WeeChat den entsprechend gesetzten Wert - falls
 definiert (nicht "null"). Andernfalls verwendet WeeChat Vorgabewerte
 ("irc.server_default.xxx").

-Als Beispiel erwähnt seien die Vorgabe (default) nicks, die auf dem Un*x Login
-basieren. Diese können nun für oftc-Server mittels folgendem Befehl
+Als Beispiel erwähnt ist die Vorgabe (default) nicks, die auf dem Un*x Login
+basiert. Diese Vorgabe kann nun für den oftc-Server mittels folgendem Befehl
 überschrieben werden:

  /set irc.server.oftc.nicks "mynick1,mynick2,mynick3,mynick4,mynick5"

-Um den User-Namen und wirklichen Namen zu setzen:
+Um einen User- und realen Namen zu setzen:

  /set irc.server.oftc.username "Mein User-Name"
  /set irc.server.oftc.realname "Mein wirklicher Name"

-Aktivieren des automatischen Verbindens mit dem Server beim Start von WeeChat:
+Um beim Start von WeeChat automatisch eine Verbindung zu einem Server
+herzustellen:

  /set irc.server.oftc.autoconnect on

@@ -281,6 +281,10 @@ Befehlszeile:
 -a, --no-connect::
    deaktiviert das automatische Verbinden mit den Servern beim Start von WeeChat

+// TRANSLATION MISSING
+-c, --colors::
+    Display default colors in terminal
+
 -d, --dir 'path'::
    legt den Konfigurationsordner für WeeChat fest (Voreinstellung: ~/.weechat) in
    dem die Erweiterungen, Skripten, Protokolldateien etc.pp. gesichert werden.
@@ -444,101 +448,101 @@ Tastenbefehle für die Befehlszeile
 | Taste| Beschreibung und Befehl

 | Pfeil links +
-  Ctrl + `b` |
+  Ctrl + "b" |
  setzt den Cursor eine Position nach links +
  `/input move_previous_char`

 | Pfeil rechts +
-  Ctrl + `f` |
+  Ctrl + "f" |
  setzt den Cursor eine Position nach rechts +
  `/input move_next_char`

 | Ctrl + Pfeil links +
-  Alt + `b` |
+  Alt + "b" |
  springt zum Anfang des vorherigen Wortes in der Befehlszeile +
  `/input move_previous_word`

 | Ctrl + Pfeil rechts +
-  Alt + `f` |
+  Alt + "f" |
  sprint zum Anfang des nächsten Wortes in der Befehlszeile +
  `/input move_next_word`

 | Home +
-  Ctrl + `a` |
+  Ctrl + "a" |
  sprint zum Anfang der Befehlszeile +
  `/input move_beginning_of_line`

 | End +
-  Ctrl + `e` |
+  Ctrl + "e" |
  springt ans Ende der Befehlszeile +
  `/input move_end_of_line`

-| Ctrl + `c` dann `b` |
+| Ctrl + "c" dann "b" |
  Fügt Steuerzeichen für fett geschrieben Text ein +
  `/input insert \x02`

-| Ctrl + `c` dann `c` |
+| Ctrl + "c" dann "c" |
  Fügt Steuerzeichen für Textfarbe ein +
  `/input insert \x03`

-| Ctrl + `c` dann `i` |
+| Ctrl + "c" dann "i" |
  Fügt Steuerzeichen für kursiven Text ein +
  `/input insert \x1D`

-| Ctrl + `c` dann `o` |
+| Ctrl + "c" dann "o" |
  Fügt Steuerzeichen für Standardfarbe ein +
  `/input insert \x0F`

-| Ctrl + `c` dann `r` |
+| Ctrl + "c" dann "r" |
  Fügt Steuerzeichen für Hintergrundfarbe ein +
  `/input insert \x12`

-| Ctrl + `c` dann `u` |
+| Ctrl + "c" dann "u" |
  Fügt Steuerzeichen für unterstrichenen Text ein +
  `/input insert \x15`

 | Delete +
-  Ctrl + `d` |
+  Ctrl + "d" |
  entfernt nächstes Zeichen in der Befehlszeile +
  `/input delete_next_char`

 | Backspace +
-  Ctrl + `h` |
+  Ctrl + "h" |
  entfernt vorheriges Zeichen in der Befehlszeile +
  `/input delete_previous_char`

-| Ctrl + `k` |
+| Ctrl + "k" |
  entfernt alle Zeichen vom Cursor bis zum Ende der Zeile (Zeichenkette wird in Zwischenablage
  kopiert) +
  `/input delete_end_of_line`

-| Ctrl + `r` |
+| Ctrl + "r" |
  Sucht in der Protokolldatei nach einem Text (zweimaliges Drücken: sucht nach exaktem Text),
  mittels Pfeiltaste hoch/runter kann zum nächsten/vorherigen Treffer gesprungen werden +
  `/input search_text`

-| Ctrl + `t` |
+| Ctrl + "t" |
  Zeichen austauschen +
  `/input transpose_chars`

-| Ctrl + `u` |
+| Ctrl + "u" |
  entfernt alle Zeichen vom Cursor bis zum Anfang der Zeile (Zeichenkette wird in Zwischenablage
  kopiert) +
  `/input delete_beginning_of_line`

-| Ctrl + `w` |
+| Ctrl + "w" |
  entfernt das Wort links vom Cursor (entferntes Wort wird in Zwischenablage kopiert) +
  `/input delete_previous_word`

-| Ctrl + `y` |
+| Ctrl + "y" |
  fügt Zeichenkette aus Zwischenablage ein +
  `/input clipboard_paste`

-| Ctrl + `_` |
+| Ctrl + "_" |
  Rückgängig machen in Befehlszeile +
  `/input undo`

-| Alt + `_` |
+| Alt + "_" |
  Wiederherstellen in der Befehlszeile +
  `/input redo`

@@ -555,8 +559,8 @@ Tastenbefehle für die Befehlszeile
  schreibt das Zeichen in die Befehlszeile

 | Enter +
-  Ctrl + `j` +
-  Ctrl + `m` |
+  Ctrl + "j" +
+  Ctrl + "m" |
  führt einen Befehl aus oder sendet den Text  (im Such-Modus: stoppt Suche) +
  `/input return`

@@ -576,16 +580,16 @@ Tastenbefehle für die Befehlszeile
  ruft nächsten Befehl/Nachricht aus dem globalen Befehlsspeicher auf (für alle Buffer) +
  `/input history_global_next`

-| Alt + `d` |
+| Alt + "d" |
  löscht das Wort rechts vom Cursor (Zeichenkette wird in Zwischenablage kopiert) +
  `/input delete_next_word`

-| Alt + `k` |
+| Alt + "k" |
  zeigt den Tastencode (inklusive des eingebundenen Befehls) einer Tastenkombination an und fügt ihn in
  die Befehlszeile ein +
  `/input grab_key_command`

-| Alt + `r` |
+| Alt + "r" |
  löscht komplette Eingabezeile +
  `/input delete_line`
 |========================================
@@ -598,15 +602,15 @@ Tastenbefehle für Buffer / Fenster
 |========================================
 | Keys | Description and command

-| Ctrl + `l` |
+| Ctrl + "l" (L) |
  zeichnet das Fenster neu +
  `/window refresh`

-| Ctrl + `s` dann Ctrl + `u` |
+| Ctrl + "s" dann Ctrl + "u" |
  Setzt die ungelesen Markierung für alle Buffer +
  `/input set_unread`

-| Ctrl + `x` |
+| Ctrl + "x" |
  sind mehrere Buffer zu einem Buffer zusammen gefügt wechselt man diese durch +
  `/input switch_active_buffer`

@@ -636,14 +640,14 @@ Tastenbefehle für Buffer / Fenster

 | Alt + Pfeil links +
  Alt + Pfeil hoch +
-  Ctrl + `p` +
+  Ctrl + "p" +
  F5 |
  zum vorherigen Buffer springen +
  `/buffer -1`

 | Alt + Pfeil rechts +
  Alt + Pfeil runter +
-  Ctrl + `n` +
+  Ctrl + "n" +
  F6 |
  zum nächsten Buffer springen +
  `/buffer +1`
@@ -680,20 +684,20 @@ Tastenbefehle für Buffer / Fenster
  springt zum Ende der Nickliste +
  `/bar scroll nicklist * ye`

-| Alt + `a` |
+| Alt + "a" |
  wechselt zum nächsten Buffer mit Aktivität (nach Priorität: highlight, Nachricht,
  ...) +
  `/input jump_smart`

-| Alt + `j` dann Alt + `l` |
+| Alt + "j" dann Alt + "l" (L) |
  wechselt zum letzten Buffer +
  `/input jump_last_buffer`

-| Alt + `j` dann Alt + `r` |
+| Alt + "j" dann Alt + "r" |
  wechselt zum IRC raw Buffer +
  `/server raw`

-| Alt + `j` dann Alt + `s` |
+| Alt + "j" dann Alt + "s" |
  wechselt zum IRC Server Buffer +
  `/server jump`

@@ -701,38 +705,38 @@ Tastenbefehle für Buffer / Fenster
  wechselt zum Buffer mit der Nummer (0 = 10) +
  `/buffer *N`

-| Alt + `j` dann Ziffern (01-99) |
+| Alt + "j" dann Ziffern (01-99) |
  wechselt zum Buffer mit der Nummer +
  `/buffer NN`

-| Alt + `n` |
+| Alt + "n" |
  springe zur nächsten Highlight Nachricht +
  `/window scroll_next_highlight`

-| Alt + `p` |
+| Alt + "p" |
  springe zur vorherigen Highlight Nachricht +
  `/window scroll_previous_highlight`

-| Alt + `u` |
+| Alt + "u" |
  springe zur ersten ungelesenen Zeile im Buffer +
  `/input scroll_unread`

-| Alt + `w` dann Alt + Pfeiltaste |
+| Alt + "w" dann Alt + Pfeiltaste |
  wechselt zum Fenster durch Richtungsanweisung +
  `/window up` +
  `/window down` +
  `/window left` +
  `/window right`

-| Alt + `z` |
+| Alt + "z" |
  Zoom für aktuelles Fenster (nochmals Alt + Z: stellt die vorherigen Einstellungen wieder her) +
  `/window zoom`

-| Alt + `<` |
+| Alt + "<" |
  wechselt zum vorherigen Buffer der letzten aufgerufenen Buffer +
  `/input jump_previously_visited_buffer`

-| Alt + `>` |
+| Alt + ">" |
  wechselt zum nächsten Buffer der letzten aufgerufenen Buffer +
  `/input jump_next_visited_buffer`
 |========================================
@@ -745,11 +749,11 @@ andere Tastenbefehle
 |========================================
 |Tasten| Beschreibung und Befehl

-| Alt + `h` |
+| Alt + "h" |
  löscht Hotliste (Aktivitätsanzeige für die Buffer) +
  `/input hotlist_clear` +

-| Alt + `=` |
+| Alt + "=" |
  schaltet Filterfunktion an/aus +
  `/filter toggle` +
 |========================================
@@ -786,9 +790,10 @@ Dazu muss ein zweites "/" vorangestellt werden. Um den Befehl'/set' als Text zu
 //set
 ----------------------------------------

+// TRANSLATION MISSING
 [[command_line_colors]]
-Farben
-^^^^^^
+Color codes
+^^^^^^^^^^^

 Für einige Erweiterungen wie z.B. die IRC Erweiterung können Farbcodes und Attribute für den Text
 gesetzt werden. Dazu muss die Tastenkombination "Ctrl-C" gefolgt von einem der folgenden Zeichen
@@ -852,12 +857,68 @@ WeeChat Optionen (weechat.conf)

 include::autogen/user/weechat_options.txt[]

-[[curses_colors]]
-Farben für Curses GUI
-^^^^^^^^^^^^^^^^^^^^^
+[[weechat_commands]]
+WeeChat Befehle
+~~~~~~~~~~~~~~~

-[width="50%",cols="^3m,8"]
+include::autogen/user/weechat_commands.txt[]
+
+// TRANSLATION MISSING
+[[colors]]
+Colors
+~~~~~~
+
+WeeChat can use up to 256 color pairs to display text in bars and chat area
+(your terminal must support 256 colors to use them in WeeChat).
+
+According to value of 'TERM' environment variable, you may have following limits
+for colors in WeeChat:
+
+[width="40%",cols="5,>2,>2",options="header"]
 |========================================
+| $TERM                                 | Colors | Pairs ^(1)^
+| "rxvt-unicode", "xterm",...           |     88 |         256
+| "rxvt-256color", "xterm-256color",... |    256 |       32767
+| "screen"                              |      8 |          64
+| "screen-256color"                     |    256 |       32767
+|========================================
+
+[NOTE]
+^(1)^ Even if your terminal supports more than 256 pairs, only 256 pairs can be
+used in WeeChat, because of a ncurses limitation.
+
+You can run `weechat-curses --colors` or use command `/color` in WeeChat to
+display limits for your environment.
+
+Some recommended values for 'TERM' if you want 256 colors:
+
+* under screen: 'screen-256color'
+* outside screen: 'xterm-256color', 'rxvt-256color', 'putty-256color',...
+
+If you are using screen, you can add this line to your '~/.screenrc':
+
+----------------------------------------
+term screen-256color
+----------------------------------------
+
+If your 'TERM' variable has wrong value and that WeeChat is already running,
+don't panic! You can change it without restarting, thanks to script 'shell.py':
+
+----------------------------------------
+/shell setenv TERM=screen-256color
+/upgrade
+----------------------------------------
+
+// TRANSLATION MISSING
+[[colors_basic]]
+Basic colors
+^^^^^^^^^^^^
+
+Basic colors in WeeChat are:
+
+[width="50%",cols="^3m,8",options="header"]
+|========================================
+| Name         | Color
 | default      | Standard Terminalfarbe (transparent für Hintergrund)
 | black        | schwarz
 | darkgray     | dunkelgrau
@@ -876,11 +937,58 @@ Farben für Curses GUI
 | white        | weiß
 |========================================

-[[weechat_commands]]
-WeeChat Befehle
-~~~~~~~~~~~~~~~
+// TRANSLATION MISSING
+[[colors_palette]]
+Palette
+^^^^^^^

-include::autogen/user/weechat_commands.txt[]
+According to your terminal, 64 or 256 pairs are defined by WeeChat, a
+combination of foreground with background colors:
+
+* for 64 pairs: 8 foreground colors * 8 background colors (dark colors)
+* for 256 pairs: 16 foreground colors * 16 background colors (8 dark colors and
+  8 light colors)
+
+Use command `/color` to see default colors (on buffer you can press 'alt+c' to
+switch between WeeChat and terminal colors).
+
+You can override some color pairs (a pair is foreground + background) with
+command `/color`, which creates option in section 'palette' of file
+'weechat.conf'.
+
+For each color defined, you can specify:
+
+* foreground and background, using format "fg,bg": color for text and
+  background, by default it is color pair number on default background (-1)
+* alias: you can give a name to your color, for easy use in color options
+
+For example, to define pairs 225 to 240 with colors like blue, cyan, green,
+yellow, orange, red, pink, purple:
+
+----------------------------------------
+/color add 225 18,-1
+/color add 226 20,-1
+/color add 227 27,-1
+/color add 228 39,-1
+/color add 229 51,-1
+/color add 230 49,-1
+/color add 231 47,-1
+/color add 232 82,-1
+/color add 233 154,-1
+/color add 234 226,-1
+/color add 235 214,-1
+/color add 236 202,-1
+/color add 237 196,-1
+/color add 238 199,-1
+/color add 239 201,-1
+/color add 240 176,-1
+----------------------------------------
+
+See `/help color` for other examples.
+
+[IMPORTANT]
+Colors defined are overriding default WeeChat color pairs, so you should
+redefine pair only if you're not using this color in WeeChat.


 [[plugins]]
@@ -1544,14 +1652,59 @@ mit lokalen Buffervariablen zu füllen. Um zu sehen welche lokalen Variabel es g
 /buffer localvar
 ----------------------------------------

-Möchten Sie zum Beispiel ein Verzeichnis für jeden IRC Server in dem eine Datei
-für jeden Channel erstellt wird nutzen Sie:
+Zum Beispiel für den Buffer "irc.freenode.#weechat". WeeChat sucht in dieser
+Reihenfolge nach einer Maske:
+
+----------------------------------------
+logger.mask.irc.freenode.#weechat
+logger.mask.irc.freenode
+logger.mask.irc
+logger.file.mask
+----------------------------------------
+
+Dies bedeutet dass man eine Maske speziell für einen IRC Server 
+("logger.mask.irc.freenode") anlegen kann oder aber global für
+die Erweiterung ("logger.mask.irc").
+
+[[logger_files_by_date]]
+Protokolldatei nach Datum
+++++++++++++++++++++++++
+
+Um Protokolldateien mit einer Datumsrelevanz zu erstellen müssen
+Datumsspezifikationen in der Maske genutzt werden (siehe
+`man strftime` for formats). Zum Beispiel:
+
+----------------------------------------
+/set logger.file.mask "%Y/%m/$plugin.$name.weechatlog"
+----------------------------------------
+
+Erstellt eine Struktur in folgender Form:
+
+........................................
+~/.weechat/
+    |--- logs/
+        |--- 2010/
+            |--- 11/
+            |       irc.server.freenode.weechatlog
+            |       irc.freenode.#weechat.weechatlog
+        |--- 2010/
+            |--- 12/
+            |       irc.server.freenode.weechatlog
+            |       irc.freenode.#weechat.weechatlog
+........................................
+
+[[logger_irc_files_by_server_channel]]
+Protokolldateien nach Server und Channel
++++++++++++++++++++++++++++++++++++++++
+
+Soll für jeden IRC Server ein Verzeichnis erstellt werden mit jeweils
+einer Protokolldatei für jeden Channel:

 ----------------------------------------
 /set logger.mask.irc "irc/$server/$channel.weechatlog"
 ----------------------------------------

-In einer Baumstruktur sieht es dann wie folgt aus:
+Erstellt eine Struktur in folgender Form:

 ........................................
 ~/.weechat/
@@ -1571,7 +1724,7 @@ In einer Baumstruktur sieht es dann wie folgt aus:
 Relay Erweiterung
 ~~~~~~~~~~~~~~~~~

-Die Relay-Erweiterung wird genutzt um Daten, mittels unterschiedlichen Protokollen,
+Die Relay-Erweiterung wird genutzt um Daten, mittels unterschiedlicher Protokolle,
 über ein Netzwerk zu übermitteln.

 Zur Zeit wird ausschließlich das "IRC" Protokoll unterstützt (IRC Proxy).
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2008-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -85,6 +85,7 @@ my @ignore_options = ("aspell\\.dict\\..*",
                      "logger\\.mask\\..*",
                      "relay\\.port\\..*",
                      "rmodifier\\.modifier\\..*",
+                      "weechat\\.palette\\..*",
                      "weechat\\.proxy\\..*",
                      "weechat\\.bar\\..*",
                      "weechat\\.debug\\..*",
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -20,7 +20,7 @@
 # user's guide
 ADD_CUSTOM_COMMAND(
  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=3 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.txt
+  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.txt
  DEPENDS
  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.txt
  ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -70,6 +70,8 @@

 | weechat | buffers_plugins_names | names of buffers (including plugins names)

+| weechat | color_pairs | color pairs
+
 | weechat | commands | commands (weechat and plugins)

 | weechat | config_files | configuration files
@@ -52,4 +52,6 @@

 | weechat | weechat_site_download | WeeChat site, download page | -

+| weechat | weechat_upgrading | 1 if WeeChat is upgrading (command `/upgrade`) | -
+
 |========================================
@@ -196,17 +196,19 @@
  nickname: nickname
 ........................................

-&bull; *`/join`* `[channel1[,channel2[,channel3]] [key1[,key2]]]`::
+&bull; *`/join`* `[-server server] [channel1[,channel2[,channel3]] [key1[,key2]]]`::

 ........................................
  join a channel

+   server: send to this server (internal name)
  channel: channel name to join
      key: key to join the channel (channels with a key must be the first in list)
  
  Examples:
    /join #weechat
    /join #protectedchan,#weechat key
+    /join -server freenode #weechat
 ........................................

 &bull; *`/kick`* `[channel] nickname [comment]`::
@@ -99,6 +99,29 @@
      /buffer +1
 ........................................

+&bull; *`/color`* `[add pair [alias] [fg,bg]] | [del pair] | switch`::
+
+........................................
+  define custom colors and display palette of colors
+
+     add: add a color pair
+     del: delete a color pair
+  switch: switch WeeChat/terminal colors
+    pair: pair number (>= 1)
+   alias: alias name for color (for example: "orange")
+   fg,bg: foreground and background pair number (-1 for default terminal foreground or background)
+  
+  Without argument, this command displays colors in a new buffer.
+  
+  Examples:
+    add color 214 with alias "orange":
+      /color add 214 orange
+    add color 250 with orange on blue:
+      /color add 250 214,4 orange_blue
+    delete color 214:
+      /color del 214
+........................................
+
 &bull; *`/command`* `plugin command`::

 ........................................
@@ -48,55 +48,10 @@
 ** type: color
 ** values: a color name (default value: `lightcyan`)

-* *weechat.color.chat_nick_color01*
-** description: `text color #1 for nick`
-** type: color
-** values: a color name (default value: `cyan`)
-
-* *weechat.color.chat_nick_color02*
-** description: `text color #2 for nick`
-** type: color
-** values: a color name (default value: `magenta`)
-
-* *weechat.color.chat_nick_color03*
-** description: `text color #3 for nick`
-** type: color
-** values: a color name (default value: `green`)
-
-* *weechat.color.chat_nick_color04*
-** description: `text color #4 for nick`
-** type: color
-** values: a color name (default value: `brown`)
-
-* *weechat.color.chat_nick_color05*
-** description: `text color #5 for nick`
-** type: color
-** values: a color name (default value: `lightblue`)
-
-* *weechat.color.chat_nick_color06*
-** description: `text color #6 for nick`
-** type: color
-** values: a color name (default value: `default`)
-
-* *weechat.color.chat_nick_color07*
-** description: `text color #7 for nick`
-** type: color
-** values: a color name (default value: `lightcyan`)
-
-* *weechat.color.chat_nick_color08*
-** description: `text color #8 for nick`
-** type: color
-** values: a color name (default value: `lightmagenta`)
-
-* *weechat.color.chat_nick_color09*
-** description: `text color #9 for nick`
-** type: color
-** values: a color name (default value: `lightgreen`)
-
-* *weechat.color.chat_nick_color10*
-** description: `text color #10 for nick`
-** type: color
-** values: a color name (default value: `blue`)
+* *weechat.color.chat_nick_colors*
+** description: `text color for nicks (comma separated list of colors)`
+** type: string
+** values: any string (default value: `"cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"`)

 * *weechat.color.chat_nick_other*
 ** description: `text color for other nick in private buffer`
@@ -353,11 +308,6 @@
 ** type: string
 ** values: any string (default value: `"%H:%M:%S"`)

-* *weechat.look.color_nicks_number*
-** description: `number of colors to use for nicks colors`
-** type: integer
-** values: 1 .. 10 (default value: `10`)
-
 * *weechat.look.color_real_white*
 ** description: `if set, uses real white color, disabled by default for terms with white background (if you never use white background, you should turn on this option to see real white instead of default term foreground color)`
 ** type: boolean
@@ -209,7 +209,7 @@ List of scripts about URLs: http://www.weechat.org/scripts/stable/tag/url
 I want to change the language used by WeeChat for messages, but without exiting WeeChat, is it possible?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-Yes, you have to use a python script, shell.py (available on WeeChat website)
+Yes, you have to use a python script, 'shell.py' (available on WeeChat website)
 and issue these commands when script is loaded:

 ----------------------------------------
@@ -221,6 +221,31 @@ To have english messages with UTF-8 encoding for terminal, for ISO users, you
 can issue: `/shell setenv LANG=en_US`.


+[[256_colors]]
+How can I use 256 colors in WeeChat?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+256 colors are supported with WeeChat 0.3.4 or newer.
+
+First check that your 'TERM' environment variable is correct, recommended values
+are:
+
+* under screen: 'screen-256color'
+* outside screen: 'xterm-256color', 'rxvt-256color', 'putty-256color',...
+
+If your 'TERM' variable has wrong value and that WeeChat is already running,
+don't panic! You can change it without restarting, thanks to script 'shell.py':
+
+----------------------------------------
+/shell setenv TERM=screen-256color
+/upgrade
+----------------------------------------
+
+You can use command `/color` for easy setup of colors in WeeChat.
+
+Please read user's guide for more information about colors management.
+
+
 [[key_bindings]]
 Key bindings
 ------------
@@ -504,6 +529,28 @@ There are 3 ways:
  (you can subscribe and send to "support" mailing list)


+[[gdb_error_threads]]
+When I run WeeChat under gdb, there is error about threads, what can I do?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When you run WeeChat under gdb, you may have this error:
+
+----------------------------------------
+gdb /path/to/weechat-curses
+(gdb) run
+[Thread debugging using libthread_db enabled]
+Cannot find new threads: generic error
+----------------------------------------
+
+To fix that, you can run gdb with this command (replace path to libpthread and
+WeeChat with paths on your system):
+
+----------------------------------------
+LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat-curses
+(gdb) run
+----------------------------------------
+
+
 [[supported_os]]
 What is the list of supported platforms for WeeChat? Will it be ported to other operating systems?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2474,6 +2474,48 @@ item = weechat.list_search(list, data)
 item = weechat.list_search(list, "my data")
 ----------------------------------------

+weechat_list_search_pos
+^^^^^^^^^^^^^^^^^^^^^^^
+
+_New in version 0.3.4._
+
+Search an item position in a list.
+
+Prototype:
+
+[source,C]
+----------------------------------------
+int weechat_list_search_pos (struct t_weelist *weelist,
+                             const char *data);
+----------------------------------------
+
+Arguments:
+
+* 'weelist': list pointer
+* 'data': data to search in list
+
+Return value:
+
+* position of item found, -1 if item was not found
+
+C example:
+
+[source,C]
+----------------------------------------
+int pos_item = weechat_list_search_pos (list, "my data");
+----------------------------------------
+
+Script (Python):
+
+[source,python]
+----------------------------------------
+# prototype
+pos_item = weechat.list_search_pos(list, data)
+
+# example
+pos_item = weechat.list_search_pos(list, "my data")
+----------------------------------------
+
 weechat_list_casesearch
 ^^^^^^^^^^^^^^^^^^^^^^^

@@ -2514,6 +2556,48 @@ item = weechat.list_casesearch(list, data)
 item = weechat.list_casesearch(list, "my data")
 ----------------------------------------

+weechat_list_casesearch_pos
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+_New in version 0.3.4._
+
+Search an item position in a list, ignoring case.
+
+Prototype:
+
+[source,C]
+----------------------------------------
+int weechat_list_casesearch_pos (struct t_weelist *weelist,
+                                 const char *data);
+----------------------------------------
+
+Arguments:
+
+* 'weelist': list pointer
+* 'data': data to search in list
+
+Return value:
+
+* position of item found, -1 if item was not found
+
+C example:
+
+[source,C]
+----------------------------------------
+int pos_item = weechat_list_casesearch_pos (list, "my data");
+----------------------------------------
+
+Script (Python):
+
+[source,python]
+----------------------------------------
+# prototype
+pos_item = weechat.list_casesearch_pos(list, data)
+
+# example
+pos_item = weechat.list_casesearch_pos(list, "my data")
+----------------------------------------
+
 weechat_list_get
 ^^^^^^^^^^^^^^^^

@@ -3194,6 +3278,43 @@ weechat_printf (NULL, "list of keys: %s",
 [NOTE]
 This function is not available in scripting API.

+weechat_hashtable_set_pointer
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+_New in version 0.3.4._
+
+Set pointer value of a hashtable property.
+
+Prototype:
+
+[source,C]
+----------------------------------------
+void weechat_hashtable_set_pointer (struct t_hashtable *hashtable,
+                                    const char *property, void *pointer);
+----------------------------------------
+
+Arguments:
+
+* 'hashtable': hashtable pointer
+* 'property' and 'value': property name, with its value:
+** 'callback_free_value': set callback function used to free values in hashtable
+
+C example:
+
+[source,C]
+----------------------------------------
+void
+my_free_value_cb (struct t_hashtable *hashtable, const void *key, void *value)
+{
+    /* ... */
+}
+
+weechat_hashtable_set_pointer (hashtable, "callback_free_value", &my_free_value_cb);
+----------------------------------------
+
+[NOTE]
+This function is not available in scripting API.
+
 weechat_hashtable_add_to_infolist
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@@ -6691,6 +6812,9 @@ Arguments:
 | weechat | upgrade | - |
  command `/upgrade` issued by user

+| weechat | upgrade_ended | - |
+  end of upgrade process (command `/upgrade`)
+
 | weechat | weechat_highlight | string: message with prefix |
  highlight happened

@@ -283,6 +283,9 @@ Command line arguments:
 -a, --no-connect::
    Disable auto-connect to servers when WeeChat is starting

+-c, --colors::
+    Display default colors in terminal
+
 -d, --dir 'path'::
    Set path as home for WeeChat (used for configuration files, logs, user
    plugins and scripts), default value is '~/.weechat' (note: directory is
@@ -445,101 +448,101 @@ Keys for command line
 | Keys | Description and command

 | Left arrow +
-  Ctrl + `b` |
+  Ctrl + "b" |
  Go to previous char in command line +
  `/input move_previous_char`

 | Right arrow +
-  Ctrl + `f` |
+  Ctrl + "f" |
  Go to next char in command line +
  `/input move_next_char`

 | Ctrl + left arrow +
-  Alt + `b` |
+  Alt + "b" |
  Go to previous word in command line +
  `/input move_previous_word`

 | Ctrl + right arrow +
-  Alt + `f` |
+  Alt + "f" |
  Go to next word in command line +
  `/input move_next_word`

 | Home +
-  Ctrl + `a` |
+  Ctrl + "a" |
  Go to the beginning of command line +
  `/input move_beginning_of_line`

 | End +
-  Ctrl + `e` |
+  Ctrl + "e" |
  Go to the end of command line +
  `/input move_end_of_line`

-| Ctrl + `c` then `b` |
+| Ctrl + "c" then "b" |
  Insert code for bold text +
  `/input insert \x02`

-| Ctrl + `c` then `c` |
+| Ctrl + "c" then "c" |
  Insert code for colored text +
  `/input insert \x03`

-| Ctrl + `c` then `i` |
+| Ctrl + "c" then "i" |
  Insert code for italic text +
  `/input insert \x1D`

-| Ctrl + `c` then `o` |
+| Ctrl + "c" then "o" |
  Insert code for color reset +
  `/input insert \x0F`

-| Ctrl + `c` then `r` |
+| Ctrl + "c" then "r" |
  Insert code for reverse color +
  `/input insert \x12`

-| Ctrl + `c` then `u` |
+| Ctrl + "c" then "u" |
  Insert code for underlined text +
  `/input insert \x15`

 | Delete +
-  Ctrl + `d` |
+  Ctrl + "d" |
  Delete next char in command line +
  `/input delete_next_char`

 | Backspace +
-  Ctrl + `h` |
+  Ctrl + "h" |
  Delete previous char in command line +
  `/input delete_previous_char`

-| Ctrl + `k` |
+| Ctrl + "k" |
  Delete from cursor until end of command line (deleted string is copied to
  clipboard) +
  `/input delete_end_of_line`

-| Ctrl + `r` |
+| Ctrl + "r" |
  Search for text in buffer history (two times: search exact text),
  next/previous occurrences can be found with up and down arrows +
  `/input search_text`

-| Ctrl + `t` |
+| Ctrl + "t" |
  Transpose chars +
  `/input transpose_chars`

-| Ctrl + `u` |
+| Ctrl + "u" |
  Delete from cursor until beginning of command line (deleted string is copied
  to clipboard) +
  `/input delete_beginning_of_line`

-| Ctrl + `w` |
+| Ctrl + "w" |
  Delete previous word of command line (deleted string is copied to clipboard) +
  `/input delete_previous_word`

-| Ctrl + `y` |
+| Ctrl + "y" |
  Paste clipboard content +
  `/input clipboard_paste`

-| Ctrl + `_` |
+| Ctrl + "_" |
  Undo last action on command line +
  `/input undo`

-| Alt + `_` |
+| Alt + "_" |
  Redo last action on command line +
  `/input redo`

@@ -556,8 +559,8 @@ Keys for command line
  Insert char at cursor position in command line

 | Enter +
-  Ctrl + `j` +
-  Ctrl + `m` |
+  Ctrl + "j" +
+  Ctrl + "m" |
  Execute command or send message (in search mode: stop search) +
  `/input return`

@@ -577,16 +580,16 @@ Keys for command line
  Call next command/message in global history (common for all buffers) +
  `/input history_global_next`

-| Alt + `d` |
+| Alt + "d" |
  Delete next word in command line (deleted string is copied to clipboard) +
  `/input delete_next_word`

-| Alt + `k` |
+| Alt + "k" |
  Grab a key and insert its code (and command bound if key exists) in command
  line +
  `/input grab_key_command`

-| Alt + `r` |
+| Alt + "r" |
  Delete entire command line +
  `/input delete_line`
 |========================================
@@ -599,15 +602,15 @@ Keys for buffers / windows
 |========================================
 | Keys | Description and command

-| Ctrl + `l` |
+| Ctrl + "l" (L) |
  Redraw whole window +
  `/window refresh`

-| Ctrl + `s` then Ctrl + `u` |
+| Ctrl + "s" then Ctrl + "u" |
  Set unread marker on all buffers +
  `/input set_unread`

-| Ctrl + `x` |
+| Ctrl + "x" |
  Switch current buffer if buffers are attached with same number +
  `/input switch_active_buffer`

@@ -637,14 +640,14 @@ Keys for buffers / windows

 | Alt + left arrow +
  Alt + up arrow +
-  Ctrl + `p` +
+  Ctrl + "p" +
  F5 |
  Switch to previous buffer +
  `/buffer -1`

 | Alt + right arrow +
  Alt + down arrow +
-  Ctrl + `n` +
+  Ctrl + "n" +
  F6 |
  Switch to next buffer +
  `/buffer +1`
@@ -681,20 +684,20 @@ Keys for buffers / windows
  Go to the end of nicklist +
  `/bar scroll nicklist * ye`

-| Alt + `a` |
+| Alt + "a" |
  Switch to next buffer with activity (with priority: highlight, message,
  other) +
  `/input jump_smart`

-| Alt + `j` then Alt + `l` |
+| Alt + "j" then Alt + "l" (L) |
  Switch to last buffer +
  `/input jump_last_buffer`

-| Alt + `j` then Alt + `r` |
+| Alt + "j" then Alt + "r" |
  Switch to IRC raw buffer +
  `/server raw`

-| Alt + `j` then Alt + `s` |
+| Alt + "j" then Alt + "s" |
  Switch to IRC server buffer +
  `/server jump`

@@ -702,39 +705,39 @@ Keys for buffers / windows
  Switch to buffer by number (0 = 10) +
  `/buffer *N`

-| Alt + `j` then number (01-99) |
+| Alt + "j" then number (01-99) |
  Switch to buffer by number +
  `/buffer NN`

-| Alt + `n` |
+| Alt + "n" |
  Scroll to next highlight +
  `/window scroll_next_highlight`

-| Alt + `p` |
+| Alt + "p" |
  Scroll to previous highlight +
  `/window scroll_previous_highlight`

-| Alt + `u` |
+| Alt + "u" |
  Scroll to first unread line in buffer +
  `/input scroll_unread`

-| Alt + `w` then Alt + arrow |
+| Alt + "w" then Alt + arrow |
  Switch to window with direction +
  `/window up` +
  `/window down` +
  `/window left` +
  `/window right`

-| Alt + `z` |
+| Alt + "z" |
  Zoom on current window (Alt + Z again: restore initial windows state, before
  zoom) +
  `/window zoom`

-| Alt + `<` |
+| Alt + "<" |
  Switch to previous buffer in list of visited buffers +
  `/input jump_previously_visited_buffer`

-| Alt + `>` |
+| Alt + ">" |
  Switch to next buffer in list of visited buffers +
  `/input jump_next_visited_buffer`
 |========================================
@@ -747,11 +750,11 @@ Other keys
 |========================================
 | Keys | Description and command

-| Alt + `h` |
+| Alt + "h" |
  Clear hotlist (activity notification on other buffers) +
  `/input hotlist_clear` +

-| Alt + `=` |
+| Alt + "=" |
  Toggle filters on/off +
  `/filter toggle` +
 |========================================
@@ -789,8 +792,8 @@ For example, to send text '/set' on current buffer:
 ----------------------------------------

 [[command_line_colors]]
-Colors
-^^^^^^
+Color codes
+^^^^^^^^^^^

 For some plugins like IRC, you can use color codes and attributes, as
 follow (press Ctrl-C then following letter, with optional value):
@@ -853,12 +856,66 @@ WeeChat options (weechat.conf)

 include::autogen/user/weechat_options.txt[]

-[[curses_colors]]
-Colors for Curses GUI
-^^^^^^^^^^^^^^^^^^^^^
+[[weechat_commands]]
+WeeChat commands
+~~~~~~~~~~~~~~~~

-[width="50%",cols="^3m,8"]
+include::autogen/user/weechat_commands.txt[]
+
+[[colors]]
+Colors
+~~~~~~
+
+WeeChat can use up to 256 color pairs to display text in bars and chat area
+(your terminal must support 256 colors to use them in WeeChat).
+
+According to value of 'TERM' environment variable, you may have following limits
+for colors in WeeChat:
+
+[width="40%",cols="5,>2,>2",options="header"]
 |========================================
+| $TERM                                 | Colors | Pairs ^(1)^
+| "rxvt-unicode", "xterm",...           |     88 |         256
+| "rxvt-256color", "xterm-256color",... |    256 |       32767
+| "screen"                              |      8 |          64
+| "screen-256color"                     |    256 |       32767
+|========================================
+
+[NOTE]
+^(1)^ Even if your terminal supports more than 256 pairs, only 256 pairs can be
+used in WeeChat, because of a ncurses limitation.
+
+You can run `weechat-curses --colors` or use command `/color` in WeeChat to
+display limits for your environment.
+
+Some recommended values for 'TERM' if you want 256 colors:
+
+* under screen: 'screen-256color'
+* outside screen: 'xterm-256color', 'rxvt-256color', 'putty-256color',...
+
+If you are using screen, you can add this line to your '~/.screenrc':
+
+----------------------------------------
+term screen-256color
+----------------------------------------
+
+If your 'TERM' variable has wrong value and that WeeChat is already running,
+don't panic! You can change it without restarting, thanks to script 'shell.py':
+
+----------------------------------------
+/shell setenv TERM=screen-256color
+/upgrade
+----------------------------------------
+
+[[colors_basic]]
+Basic colors
+^^^^^^^^^^^^
+
+Basic colors in WeeChat are:
+
+[width="50%",cols="^3m,8",options="header"]
+|========================================
+| Name         | Color
 | default      | default terminal color (transparent for background)
 | black        | black
 | darkgray     | dark gray
@@ -877,11 +934,57 @@ Colors for Curses GUI
 | white        | white
 |========================================

-[[weechat_commands]]
-WeeChat commands
-~~~~~~~~~~~~~~~~
+[[colors_palette]]
+Palette
+^^^^^^^

-include::autogen/user/weechat_commands.txt[]
+According to your terminal, 64 or 256 pairs are defined by WeeChat, a
+combination of foreground with background colors:
+
+* for 64 pairs: 8 foreground colors * 8 background colors (dark colors)
+* for 256 pairs: 16 foreground colors * 16 background colors (8 dark colors and
+  8 light colors)
+
+Use command `/color` to see default colors (on buffer you can press 'alt+c' to
+switch between WeeChat and terminal colors).
+
+You can override some color pairs (a pair is foreground + background) with
+command `/color`, which creates option in section 'palette' of file
+'weechat.conf'.
+
+For each color defined, you can specify:
+
+* foreground and background, using format "fg,bg": color for text and
+  background, by default it is color pair number on default background (-1)
+* alias: you can give a name to your color, for easy use in color options
+
+For example, to define pairs 225 to 240 with colors like blue, cyan, green,
+yellow, orange, red, pink, purple:
+
+----------------------------------------
+/color add 225 18,-1
+/color add 226 20,-1
+/color add 227 27,-1
+/color add 228 39,-1
+/color add 229 51,-1
+/color add 230 49,-1
+/color add 231 47,-1
+/color add 232 82,-1
+/color add 233 154,-1
+/color add 234 226,-1
+/color add 235 214,-1
+/color add 236 202,-1
+/color add 237 196,-1
+/color add 238 199,-1
+/color add 239 201,-1
+/color add 240 176,-1
+----------------------------------------
+
+See `/help color` for other examples.
+
+[IMPORTANT]
+Colors defined are overriding default WeeChat color pairs, so you should
+redefine pair only if you're not using this color in WeeChat.


 [[plugins]]
@@ -1529,8 +1632,50 @@ variables to build filename. To see local variables for current buffer:
 /buffer localvar
 ----------------------------------------

-For example if you want one directory by IRC server and one file by channel
-inside:
+For example, on buffer "irc.freenode.#weechat", WeeChat will search a mask with
+option name, in this order:
+
+----------------------------------------
+logger.mask.irc.freenode.#weechat
+logger.mask.irc.freenode
+logger.mask.irc
+logger.file.mask
+----------------------------------------
+
+That means you can have masks specific for some IRC servers
+("logger.mask.irc.freenode") or for a plugin ("logger.mask.irc").
+
+[[logger_files_by_date]]
+Log files by date
+++++++++++++++++
+
+To have log files by date, you can use date/time specifiers in mask (see
+`man strftime` for formats), for example:
+
+----------------------------------------
+/set logger.file.mask "%Y/%m/$plugin.$name.weechatlog"
+----------------------------------------
+
+You'll have following files:
+
+........................................
+~/.weechat/
+    |--- logs/
+        |--- 2010/
+            |--- 11/
+            |       irc.server.freenode.weechatlog
+            |       irc.freenode.#weechat.weechatlog
+        |--- 2010/
+            |--- 12/
+            |       irc.server.freenode.weechatlog
+            |       irc.freenode.#weechat.weechatlog
+........................................
+
+[[logger_irc_files_by_server_channel]]
+IRC log files by server and channel
+++++++++++++++++++++++++++++++++++
+
+If you want one directory by IRC server and one file by channel inside:

 ----------------------------------------
 /set logger.mask.irc "irc/$server/$channel.weechatlog"
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -20,7 +20,7 @@
 # user's guide
 ADD_CUSTOM_COMMAND(
  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=3 -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.txt
+  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=4 -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.txt
  DEPENDS
  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.txt
  ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -70,6 +70,8 @@

 | weechat | buffers_plugins_names | noms des tampons (incluant les noms d'extensions)

+| weechat | color_pairs | paires de couleur
+
 | weechat | commands | commandes (weechat et extensions)

 | weechat | config_files | fichiers de configuration
@@ -52,4 +52,6 @@

 | weechat | weechat_site_download | site WeeChat, page de téléchargement | -

+| weechat | weechat_upgrading | 1 si WeeChat est en cours de mise à jour (commande `/upgrade`) | -
+
 |========================================
@@ -196,17 +196,19 @@
  pseudo: pseudo
 ........................................

-&bull; *`/join`* `[canal1[,canal2[,canal3]] [clé1[,clé2]]]`::
+&bull; *`/join`* `[-server serveur] [canal1[,canal2[,canal3]] [clé1[,clé2]]]`::

 ........................................
  joindre un canal

-  canal: nom du canal à rejoindre
-    clé: clé pour rejoindre le canal (les canaux avec une clé doivent être les premiers dans la liste)
+  serveur: envoyer à ce serveur (nom interne)
+    canal: nom du canal à rejoindre
+      clé: clé pour rejoindre le canal (les canaux avec une clé doivent être les premiers dans la liste)
  
  Exemples:
    /join #weechat
    /join #protectedchan,#weechat key
+    /join -server freenode #weechat
 ........................................

 &bull; *`/kick`* `[canal] pseudo [commentaire]`::
@@ -99,6 +99,29 @@
      /buffer +1
 ........................................

+&bull; *`/color`* `[add paire [alias] [fg,bg]] | [del paire] | switch`::
+
+........................................
+  définir des couleurs personnalisées et afficher la palette des couleurs
+
+     add: ajouter une paire de couleur
+     del: supprimer une paire de couleur
+  switch: basculer entre les couleurs WeeChat et du terminal
+   paire: numéro de paire (>= 1)
+   alias: nom d'alias pour la couleur (par exemple: "orange")
+   fg,bg: numéro de paire pour le texte et le fond (-1 pour la couleur par défaut du terminal pour le texte ou le fond)
+  
+  Sans paramètre, cette commande affiche les couleurs dans un nouveau tampon.
+  
+  Exemples:
+    ajouter la couleur 214 avec l'alias "orange":
+      /color add 214 orange
+    ajouter la couleur 250 avec orange sur bleu:
+      /color add 250 214,4 orange_bleu
+    supprimer la couleur 214:
+      /color del 214
+........................................
+
 &bull; *`/command`* `extension commande`::

 ........................................
@@ -48,55 +48,10 @@
 ** type: couleur
 ** valeurs: un nom de couleur (valeur par défaut: `lightcyan`)

-* *weechat.color.chat_nick_color01*
-** description: `couleur du texte n°1 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `cyan`)
-
-* *weechat.color.chat_nick_color02*
-** description: `couleur du texte n°2 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `magenta`)
-
-* *weechat.color.chat_nick_color03*
-** description: `couleur du texte n°3 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `green`)
-
-* *weechat.color.chat_nick_color04*
-** description: `couleur du texte n°4 le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `brown`)
-
-* *weechat.color.chat_nick_color05*
-** description: `couleur du texte n°5 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `lightblue`)
-
-* *weechat.color.chat_nick_color06*
-** description: `couleur du texte n°6 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `default`)
-
-* *weechat.color.chat_nick_color07*
-** description: `couleur du texte n°7 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `lightcyan`)
-
-* *weechat.color.chat_nick_color08*
-** description: `couleur du texte n°8 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `lightmagenta`)
-
-* *weechat.color.chat_nick_color09*
-** description: `couleur du texte n°9 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `lightgreen`)
-
-* *weechat.color.chat_nick_color10*
-** description: `couleur du texte n°10 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `blue`)
+* *weechat.color.chat_nick_colors*
+** description: `couleur du texte pour les pseudos (liste de couleurs séparées par une virgule)`
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: `"cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"`)

 * *weechat.color.chat_nick_other*
 ** description: `couleur du texte pour l'autre pseudo dans le tampon privée`
@@ -353,11 +308,6 @@
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `"%H:%M:%S"`)

-* *weechat.look.color_nicks_number*
-** description: `nombre de couleurs à utiliser pour les couleurs des pseudos`
-** type: entier
-** valeurs: 1 .. 10 (valeur par défaut: `10`)
-
 * *weechat.look.color_real_white*
 ** description: `si activé, utilise la vraie couleur blanche, désactivé par défaut pour les terminaux avec un fond blanc (si vous n'utilisez jamais de fond blanc, vous devriez activer cette option pour voir du vrai blanc au lieu de la couleur d'avant plan par défaut du terminal)`
 ** type: booléen
@@ -218,7 +218,7 @@ http://www.weechat.org/scripts/stable/tag/url
 Je souhaite changer la langue des messages affichés par WeeChat, mais sans quitter WeeChat, est-ce possible ?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-Oui, il faut utiliser le script python shell.py (disponible sur le site de
+Oui, il faut utiliser le script python 'shell.py' (disponible sur le site de
 WeeChat) et taper ces commandes une fois le script chargé :

 ----------------------------------------
@@ -230,6 +230,34 @@ Pour avoir des messages anglais avec encodage UTF-8 pour le terminal, pour les
 utilisateurs en ISO, vous pouvez taper : `/shell setenv LANG=fr_FR`.


+[[256_colors]]
+Comment puis-je utiliser 256 couleurs sous WeeChat ?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Les 256 couleurs sont supportées avec WeeChat 0.3.4 ou plus récent.
+
+Premièrement vérifiez que votre variable d'environnement 'TERM' est correcte,
+les valeurs recommandées sont :
+
+* sous screen : 'screen-256color'
+* en dehors de screen : 'xterm-256color', 'rxvt-256color', 'putty-256color', ...
+
+Si votre variable 'TERM' a une valeur erronée et que WeeChat est déjà lancé,
+ne paniquez pas ! Vous pouvez la changer sans redémarrer, grâce au script
+'shell.py' :
+
+----------------------------------------
+/shell setenv TERM=screen-256color
+/upgrade
+----------------------------------------
+
+Vous pouvez utiliser la commande `/color` pour une configuration facile des
+couleurs dans WeeChat.
+
+Merci de lire le guide utilisateur pour plus d'information sur la gestion des
+couleurs.
+
+
 [[key_bindings]]
 Raccourcis clavier
 ------------------
@@ -521,6 +549,28 @@ Il y a 3 possibilités :
  (vous pouvez souscrire et envoyer à la liste de diffusion nommée "support")


+[[gdb_error_threads]]
+Quand je lance WeeChat sous gdb, il y a une erreur à propos des threads, que puis-je faire ?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Quand vous lancez WeeChat sous gdb, vous pouvez avoir cette erreur :
+
+----------------------------------------
+gdb /path/to/weechat-curses
+(gdb) run
+[Thread debugging using libthread_db enabled]
+Cannot find new threads: generic error
+----------------------------------------
+
+Pour corriger ça, vous pouvez lancer gdb avec cette commande (remplacez le
+chemin vers libpthread et WeeChat avec les chemins sur votre système) :
+
+----------------------------------------
+LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat-curses
+(gdb) run
+----------------------------------------
+
+
 [[supported_os]]
 Quelle est la liste des plate-formes supportées par WeeChat ? Sera-t-il porté sur d'autres systèmes d'exploitation ?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2501,6 +2501,48 @@ item = weechat.list_search(list, data)
 item = weechat.list_search(list, "ma donnée")
 ----------------------------------------

+weechat_list_search_pos
+^^^^^^^^^^^^^^^^^^^^^^^
+
+_Nouveau dans la version 0.3.4._
+
+Recherche la position d'un élément dans une liste.
+
+Prototype :
+
+[source,C]
+----------------------------------------
+int weechat_list_search_pos (struct t_weelist *weelist,
+                             const char *data);
+----------------------------------------
+
+Paramètres :
+
+* 'weelist' : pointeur vers la liste
+* 'data' : donnée à chercher dans la liste
+
+Valeur de retour :
+
+* position de l'élément trouvé, -1 si aucun élément n'a été trouvé
+
+Exemple en C :
+
+[source,C]
+----------------------------------------
+int pos_item = weechat_list_search_pos (list, "ma donnée");
+----------------------------------------
+
+Script (Python) :
+
+[source,python]
+----------------------------------------
+# prototype
+pos_item = weechat.list_search_pos(list, data)
+
+# exemple
+pos_item = weechat.list_search_pos(list, "ma donnée")
+----------------------------------------
+
 weechat_list_casesearch
 ^^^^^^^^^^^^^^^^^^^^^^^

@@ -2541,6 +2583,48 @@ item = weechat.list_casesearch(list, data)
 item = weechat.list_casesearch(list, "ma donnée")
 ----------------------------------------

+weechat_list_casesearch_pos
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+_Nouveau dans la version 0.3.4._
+
+Recherche la position d'un élément dans la liste, sans tenir compte de la casse.
+
+Prototype :
+
+[source,C]
+----------------------------------------
+int weechat_list_casesearch_pos (struct t_weelist *weelist,
+                                 const char *data);
+----------------------------------------
+
+Paramètres :
+
+* 'weelist' : pointeur vers la liste
+* 'data' : données à chercher dans la liste
+
+Valeur de retour :
+
+* position l'élément trouvé, -1 si aucun élément n'a été trouvé
+
+Exemple en C :
+
+[source,C]
+----------------------------------------
+int pos_item = weechat_list_casesearch_pos (list, "ma donnée");
+----------------------------------------
+
+Script (Python) :
+
+[source,python]
+----------------------------------------
+# prototype
+pos_item = weechat.list_casesearch_pos(list, data)
+
+# exemple
+pos_item = weechat.list_casesearch_pos(list, "ma donnée")
+----------------------------------------
+
 weechat_list_get
 ^^^^^^^^^^^^^^^^

@@ -3226,6 +3310,44 @@ weechat_printf (NULL, "liste des clés: %s",
 [NOTE]
 Cette fonction n'est pas disponible dans l'API script.

+weechat_hashtable_set_pointer
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+_Nouveau dans la version 0.3.4._
+
+Affecte un pointeur à une propriété d'une hashtable.
+
+Prototype :
+
+[source,C]
+----------------------------------------
+void weechat_hashtable_set_pointer (struct t_hashtable *hashtable,
+                                    const char *property, void *pointer);
+----------------------------------------
+
+Paramètres :
+
+* 'hashtable' : pointeur vers la hashtable
+* 'property' et 'value' : nom de la propriété, avec sa valeur :
+** 'callback_free_value' : définit la fonction "callback" pour libérer les
+   valeurs de la hashtable
+
+Exemple en C :
+
+[source,C]
+----------------------------------------
+void
+my_free_value_cb (struct t_hashtable *hashtable, const void *key, void *value)
+{
+    /* ... */
+}
+
+weechat_hashtable_set_pointer (hashtable, "callback_free_value", &my_free_value_cb);
+----------------------------------------
+
+[NOTE]
+Cette fonction n'est pas disponible dans l'API script.
+
 weechat_hashtable_add_to_infolist
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@@ -6778,6 +6900,9 @@ Paramètres :
 | weechat | upgrade | - |
  la commande `/upgrade` a été exécutée par l'utilisateur

+| weechat | upgrade_ended | - |
+  fin du processus de mise à jour (commande `/upgrade`)
+
 | weechat | weechat_highlight | chaîne : message avec le préfixe |
  un highlight est survenu

@@ -289,6 +289,9 @@ Paramètres de ligne de commande :
 -a, --no-connect::
    Supprimer la connexion automatique aux serveurs lors du démarrage

+-c, --colors::
+    Afficher les couleurs par défaut du terminal
+
 -d, --dir 'path'::
    Définir le répertoire comme étant la base de WeeChat
    (utilisé pour les fichiers de configuration, logs, extensions
@@ -456,103 +459,103 @@ Touches pour la ligne de commande
 | Touches | Description et commande

 | Flèche gauche +
-  Ctrl + `b` |
+  Ctrl + "b" |
  Aller au caractère précédent sur la ligne de commande +
  `/input move_previous_char`

 | Flèche droite +
-  Ctrl + `f` |
+  Ctrl + "f" |
  Aller au caractère suivant sur la ligne de commande +
  `/input move_next_char`

 | Ctrl + flèche gauche +
-  Alt + `b` |
+  Alt + "b" |
  Aller au mot précédent sur la ligne de commande +
  `/input move_previous_word`

 | Ctrl + flèche droite +
-  Alt + `f` |
+  Alt + "f" |
  Aller au mot suivant sur la ligne de commande +
  `/input move_next_word`

 | Home +
-  Ctrl + `a` |
+  Ctrl + "a" |
  Aller au début de la ligne de commande +
  `/input move_beginning_of_line`

 | End +
-  Ctrl + `e` |
+  Ctrl + "e" |
  Aller à la fin de la ligne de commande +
  `/input move_end_of_line`

-| Ctrl + `c` puis `b` |
+| Ctrl + "c" puis "b" |
  Insérer le code pour mettre le texte en gras +
  `/input insert \x02`

-| Ctrl + `c` puis `c` |
+| Ctrl + "c" puis "c" |
  Insérer le code pour écrire en couleur +
  `/input insert \x03`

-| Ctrl + `c` puis `i` |
+| Ctrl + "c" puis "i" |
  Insérer le code pour mettre le texte en italique +
  `/input insert \x1D`

-| Ctrl + `c` puis `o` |
+| Ctrl + "c" puis "o" |
  Insérer le code pour réinitaliser la couleur +
  `/input insert \x0F`

-| Ctrl + `c` puis `r` |
+| Ctrl + "c" puis "r" |
  Insérer le code pour écrire en couleur inversée +
  `/input insert \x12`

-| Ctrl + `c` puis `u` |
+| Ctrl + "c" puis "u" |
  Insérer le code pour écrire en souligné +
  `/input insert \x15`

 | Delete +
-  Ctrl + `d` |
+  Ctrl + "d" |
  Effacer le caractère suivant sur la ligne de commande +
  `/input delete_next_char`

 | Backspace +
-  Ctrl + `h` |
+  Ctrl + "h" |
  Effacer le caractère précédent sur la ligne de commande +
  `/input delete_previous_char`

-| Ctrl + `k` |
+| Ctrl + "k" |
  Effacer du curseur jusqu'à la fin de la ligne de commande (la chaîne
  supprimée est copiée dans le presse-papiers) +
  `/input delete_end_of_line`

-| Ctrl + `r` |
+| Ctrl + "r" |
  Chercher du texte dans l'historique du tampon (deux appuis successifs pour
  rechercher du texte exact), les occurrences suivantes/précédentes peuvent être
  trouvées avec les flèches haut et bas +
  `/input search_text`

-| Ctrl + `t` |
+| Ctrl + "t" |
  Inverser deux caractères +
  `/input transpose_chars`

-| Ctrl + `u` |
+| Ctrl + "u" |
  Effacer du curseur jusqu'au début de la ligne de commande (la chaîne
  supprimée est copiée dans le presse-papiers) +
  `/input delete_beginning_of_line`

-| Ctrl + `w` |
+| Ctrl + "w" |
  Effacer le mot précédent sur la ligne de commande (la chaîne supprimée est
  copiée dans le presse-papiers) +
  `/input delete_previous_word`

-| Ctrl + `y` |
+| Ctrl + "y" |
  Coller le contenu du presse-papiers +
  `/input clipboard_paste`

-| Ctrl + `_` |
+| Ctrl + "_" |
  Défaire la dernière action sur la ligne de commande +
  `/input undo`

-| Alt + `_` |
+| Alt + "_" |
  Refaire la dernière action sur la ligne de commande +
  `/input redo`

@@ -570,8 +573,8 @@ Touches pour la ligne de commande
  Insérer le caractère à la position du curseur sur la ligne de commande

 | Enter +
-  Ctrl + `j` +
-  Ctrl + `m` |
+  Ctrl + "j" +
+  Ctrl + "m" |
  Exécuter la commande ou envoyer le message (en mode recherche : arrêter la
  recherche) +
  `/input return`
@@ -594,17 +597,17 @@ Touches pour la ligne de commande
  tampons) +
  `/input history_global_next`

-| Alt + `d` |
+| Alt + "d" |
  Effacer le mot suivant (la chaîne supprimée est copiée dans le
  presse-papiers) +
  `/input delete_next_word`

-| Alt + `k` |
+| Alt + "k" |
  Capturer une touche et insérer son code (et la commande associée si la
  commande existe) sur la ligne de commande +
  `/input grab_key_command`

-| Alt + `r` |
+| Alt + "r" |
  Effacer entièrement la ligne de commande +
  `/input delete_line`
 |========================================
@@ -617,15 +620,15 @@ Touches pour les tampons / fenêtres
 |========================================
 | Touches | Description et commande

-| Ctrl + `l` |
+| Ctrl + "l" (L) |
  Réafficher toute la fenêtre +
  `/window refresh`

-| Ctrl + `s` puis Ctrl + `u` |
+| Ctrl + "s" puis Ctrl + "u" |
  Positionner le marqueur de données non lues sur tous les tampons +
  `/input set_unread`

-| Ctrl + `x` |
+| Ctrl + "x" |
  Changer de tampon courant si plusieurs tampons sont attachés avec le même
  numéro +
  `/input switch_active_buffer`
@@ -656,14 +659,14 @@ Touches pour les tampons / fenêtres

 | Alt + flèche gauche +
  Alt + flèche haut +
-  Ctrl + `p` +
+  Ctrl + "p" +
  F5 |
  Aller au tampon précédent +
  `/buffer -1`

 | Alt + flèche droite +
  Alt + flèche bas +
-  Ctrl + `n` +
+  Ctrl + "n" +
  F6 |
  Aller au tampon suivant +
  `/buffer +1`
@@ -700,20 +703,20 @@ Touches pour les tampons / fenêtres
  Aller à la fin de la liste des pseudos +
  `/bar scroll nicklist * ye`

-| Alt + `a` |
+| Alt + "a" |
  Sauter au prochain tampon avec activité (avec priorité : highlight, message,
  autre) +
  `/input jump_smart`

-| Alt + `j` puis Alt + `l` |
+| Alt + "j" puis Alt + "l" (L) |
  Sauter au dernier tampon +
  `/input jump_last_buffer`

-| Alt + `j` puis Alt + `r` |
+| Alt + "j" puis Alt + "r" |
  Sauter au tampon IRC de données brutes +
  `/server raw`

-| Alt + `j` puis Alt + `s` |
+| Alt + "j" puis Alt + "s" |
  Sauter au tampon IRC du serveur +
  `/server jump`

@@ -721,39 +724,39 @@ Touches pour les tampons / fenêtres
  Sauter au tampon qui porte ce numéro (0 = 10) +
  `/buffer *N`

-| Alt + `j` puis nombre (01-99) |
+| Alt + "j" puis nombre (01-99) |
  Sauter au tampon qui porte ce numéro +
  `/buffer NN`

-| Alt + `n` |
+| Alt + "n" |
  Se positionner sur le highlight suivant +
  `/window scroll_next_highlight`

-| Alt + `p` |
+| Alt + "p" |
  Se positionner sur le highlight précédent +
  `/window scroll_previous_highlight`

-| Alt + `u` |
+| Alt + "u" |
  Se positionner sur la première ligne non lue du tampon +
  `/input scroll_unread`

-| Alt + `w` puis Alt + flèche |
+| Alt + "w" puis Alt + flèche |
  Sauter à une fenêtre avec une direction +
  `/window up` +
  `/window down` +
  `/window left` +
  `/window right`

-| Alt + `z` |
+| Alt + "z" |
  Zoom sur la fenêtre courante (Alt + Z de nouveau : restaurer l'état initial
  des fenêtres, avant le zoom) +
  `/window zoom`

-| Alt + `<` |
+| Alt + "<" |
  Sauter au tampon précédent dans la liste des tampons visités +
  `/input jump_previously_visited_buffer`

-| Alt + `>` |
+| Alt + ">" |
  Sauter au tampon suivant dans la liste des tampons visités +
  `/input jump_next_visited_buffer`
 |========================================
@@ -766,11 +769,11 @@ Autres touches
 |========================================
 | Touches | Description et commande

-| Alt + `h` |
+| Alt + "h" |
  Vider la hotlist (notification d'activité sur les autres tampons) +
  `/input hotlist_clear`

-| Alt + `=` |
+| Alt + "=" |
  Active/désactive les filtres +
  `/filter toggle`
 |========================================
@@ -808,8 +811,8 @@ doublant. Par exemple pour envoyer le texte '/set' sur le tampon courant :
 ----------------------------------------

 [[command_line_colors]]
-Couleurs
-^^^^^^^^
+Codes couleurs
+^^^^^^^^^^^^^^

 Pour certaines extensions comme IRC, il est possible d'utiliser des codes
 couleur et attributs comme suit (appuyer sur Ctrl-C puis sur la lettre qui
@@ -874,12 +877,68 @@ Options WeeChat (weechat.conf)

 include::autogen/user/weechat_options.txt[]

-[[curses_colors]]
-Couleurs pour l'interface Curses
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+[[weechat_commands]]
+Commandes WeeChat
+~~~~~~~~~~~~~~~~~

-[width="50%",cols="^3m,8"]
+include::autogen/user/weechat_commands.txt[]
+
+[[colors]]
+Couleurs
+~~~~~~~~
+
+WeeChat peut utiliser jusqu'à 256 paires de couleur pour afficher le texte dans
+les barres et la zone de discussion (votre terminal doit supporter 256 couleurs
+pour pouvoir les utiliser dans WeeChat).
+
+Selon la valeur de la variable d'environnement 'TERM', vous pouvez avoir les
+limites suivantes pour les couleurs dans WeeChat :
+
+[width="40%",cols="5,>2,>2",options="header"]
 |========================================
+| $TERM                                  | Couleurs | Paires ^(1)^
+| "rxvt-unicode", "xterm", ...           |       88 |          256
+| "rxvt-256color", "xterm-256color", ... |      256 |        32767
+| "screen"                               |        8 |           64
+| "screen-256color"                      |      256 |        32767
+|========================================
+
+[NOTE]
+^(1)^ Même si votre terminal supporte plus de 256 paires, seules 256 paires
+peuvent être utilisées dans WeeChat, en raison d'une limitation de ncurses.
+
+Vous pouvez lancer `weechat-curses --colors` ou utiliser la commande `/color`
+dans WeeChat pour afficher les limites de votre environnement.
+
+Quelques valeurs recommandées pour 'TERM' si vous voulez 256 couleurs :
+
+* sous screen : 'screen-256color'
+* en dehors de screen : 'xterm-256color', 'rxvt-256color', 'putty-256color', ...
+
+Si vous utilisez screen, vous pouvez ajouter cette ligne dans votre '~/.screenrc':
+
+----------------------------------------
+term screen-256color
+----------------------------------------
+
+Si votre variable 'TERM' a une valeur erronée et que WeeChat est déjà lancé,
+ne paniquez pas ! Vous pouvez la changer sans redémarrer, grâce au script
+'shell.py' :
+
+----------------------------------------
+/shell setenv TERM=screen-256color
+/upgrade
+----------------------------------------
+
+[[colors_basic]]
+Couleurs de base
+^^^^^^^^^^^^^^^^
+
+Les couleurs de base dans WeeChat sont :
+
+[width="50%",cols="^3m,8",options="header"]
+|========================================
+| Nom          | Couleur
 | default      | couleur par défaut du terminal (transparent pour le fond)
 | black        | noir
 | darkgray     | gris foncé
@@ -898,11 +957,62 @@ Couleurs pour l'interface Curses
 | white        | white
 |========================================

-[[weechat_commands]]
-Commandes WeeChat
-~~~~~~~~~~~~~~~~~
+[[colors_palette]]
+Palette
+^^^^^^^

-include::autogen/user/weechat_commands.txt[]
+Selon votre terminal, 64 ou 256 paires sont définies par WeeChat, une
+combinaison des couleurs d'avant-plan avec le fond :
+
+* pour 64 paires : 8 couleurs d'avant-plan * 8 couleurs de fond (couleurs
+  sombres)
+* pour 256 paires : 16 couleurs d'avant-plan * 16 couleurs de fond (8 couleurs
+  sombres et 8 couleurs claires)
+
+Utilisez la commande `/color` pour voir les couleurs par défaut (sur le tampon
+vous pouvez appuyer sur 'alt+c' pour basculer entre les couleurs WeeChat et
+celles du terminal).
+
+Vous pouvez écraser des paires de couleur (une paire est un avant-plan + un
+fond) avec la commande `/color`, qui créé une option dans la section 'palette'
+du fichier 'weechat.conf'.
+
+Pour chaque couleur définie, vous pouvez spécifier :
+
+* avant-plan et fond, en utilisant le format "fg,bg" : couleur pour le texte et
+  le fond, par défaut c'est la couleur du numéro de paire sur le fond par
+  défaut (-1)
+* alias : vous pouvez donner un nom à la couleur, pour l'utiliser facilement
+  dans les options de couleurs
+
+Par exemple, pour définir les paires de 225 à 240 avec des couleurs comme le
+bleu, cyan, vert, jaune, orange, rouge, rose, pourpre :
+
+----------------------------------------
+/color add 225 18,-1
+/color add 226 20,-1
+/color add 227 27,-1
+/color add 228 39,-1
+/color add 229 51,-1
+/color add 230 49,-1
+/color add 231 47,-1
+/color add 232 82,-1
+/color add 233 154,-1
+/color add 234 226,-1
+/color add 235 214,-1
+/color add 236 202,-1
+/color add 237 196,-1
+/color add 238 199,-1
+/color add 239 201,-1
+/color add 240 176,-1
+----------------------------------------
+
+Voir `/help color` pour d'autres exemples.
+
+[IMPORTANT]
+Les couleurs définies écrasent les paires de couleur WeeChat par défaut, donc
+vous ne devriez redéfinir une paire seulement si vous n'utilisez pas cette
+couleur dans WeeChat.


 [[plugins]]
@@ -1574,8 +1684,51 @@ Pour voir les variables du tampon courant :
 /buffer localvar
 ----------------------------------------

-Par exemple, si vous voulez un répertoire par serveur IRC et un fichier
-par canal dedans :
+Par exemple, sur le tampon "irc.freenode.#weechat", WeeChat cherchera un masque
+avec le nom de l'option, dans cet ordre :
+
+----------------------------------------
+logger.mask.irc.freenode.#weechat
+logger.mask.irc.freenode
+logger.mask.irc
+logger.file.mask
+----------------------------------------
+
+Cela signifie que vous pouvez avoir un masque spécifique pour certaines
+serveurs IRC ("logger.mask.irc.freenode") ou pour une extension
+("logger.mask.irc").
+
+[[logger_files_by_date]]
+Fichiers de log par date
++++++++++++++++++++++++
+
+Pour avoir des fichiers de log par date, vous pouvez utiliser des marqueurs
+dans le masque (voir `man strftime` pour le format), par exemple :
+
+----------------------------------------
+/set logger.file.mask "%Y/%m/$plugin.$name.weechatlog"
+----------------------------------------
+
+Vous obtiendrez les fichiers suivants :
+
+........................................
+~/.weechat/
+    |--- logs/
+        |--- 2010/
+            |--- 11/
+            |       irc.server.freenode.weechatlog
+            |       irc.freenode.#weechat.weechatlog
+        |--- 2010/
+            |--- 12/
+            |       irc.server.freenode.weechatlog
+            |       irc.freenode.#weechat.weechatlog
+........................................
+
+[[logger_irc_files_by_server_channel]]
+Fichiers de log IRC par serveur et canal
++++++++++++++++++++++++++++++++++++++++
+
+Si vous voulez un répertoire par serveur IRC et un fichier par canal dedans :

 ----------------------------------------
 /set logger.mask.irc "irc/$server/$channel.weechatlog"
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -20,7 +20,7 @@
 # user's guide
 ADD_CUSTOM_COMMAND(
  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.it.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=3 -a toc-title='Indice' -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.it.txt
+  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=4 -a toc-title='Indice' -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.it.txt
  DEPENDS
  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.it.txt
  ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -70,6 +70,8 @@

 | weechat | buffers_plugins_names | nomi dei buffer (inclusi i nomi plugin)

+| weechat | color_pairs | color pairs
+
 | weechat | commands | comandi (weechat e plugin)

 | weechat | config_files | file di configurazione
@@ -52,4 +52,6 @@

 | weechat | weechat_site_download | sito di WeeChat, pagina di download | -

+| weechat | weechat_upgrading | 1 if WeeChat is upgrading (command `/upgrade`) | -
+
 |========================================
@@ -50,27 +50,27 @@
      nick: utente o host da bannare
 ........................................

-&bull; *`/connect`* `[servername [servername ...] | hostname[/port] [-option[=value]] [-nooption] | -all | -open] [-nojoin] [-switch]`::
+&bull; *`/connect`* `[nome_server [nome_server ...] | nome_host[/porta] [-opzione[=valore]] [-nooption] | -all | -open] [-nojoin] [-switch]`::

 ........................................
  connette ad uno o più server IRC

-  servername: internal server name to connect (server must have been created by /server add)
-    hostname: hostname (or IP) of a server (this will create a TEMPORARY server)
-        port: port for server (6667 by default)
-      option: set option for server (for boolean option, value can be omitted)
-    nooption: set boolean option to 'off' (for example: -nossl)
-        -all: connect to all servers defined in configuration
-       -open: connect to all opened servers that are not currently connected
-     -nojoin: do not join any channel (even if autojoin is enabled on server)
-     -switch: switch to next server address
+  nome_server: nome interno del server a cui connettersi (il server deve essere stato creato con /server add)
+    nome_host: nome host (oppure IP) del server
+        porta: porta per il server (6667 è la predefinita)
+      opzione: imposta opzione per il server (per le opzioni bool, il valore può essere omesso)
+     nooption: imposta il valore bool dell'opzione su off (per esempio: -nossl)
+         -all: connette a tutti i server definiti nella configurazione
+       -open: connette a tutti i server aperti ai quali non si è attualmente connessi
+      -nojoin: non entrare in nessun canale (anche se l'ingresso automatico è attivo sul server)
+      -switch: passa al server successivo
  
-  Examples:
+  Esempi:
    /connect freenode
    /connect irc.oftc.net/6667
    /connect irc6.oftc.net/6667 -ipv6
    /connect irc6.oftc.net/6697 -ipv6 -ssl
-    /connect my.server.org/6697 -ssl -password=test
+    /connect mio.server.org/6697 -ssl -password=test
    /connect -switch
 ........................................

@@ -196,17 +196,19 @@
  nick: nick
 ........................................

-&bull; *`/join`* `[canale1[,canale2[,canale3]] [chiave1[,chiave2]]]`::
+&bull; *`/join`* `[-server server] [channel1[,channel2[,channel3]] [key1[,key2]]]`::

 ........................................
  entra in un canale

-  canale: nome del canale in cui entrare
-  chiave: chiave per entrare nel canale (i canali con una chiave devono essere primi nella lista)
+   server: send to this server (internal name)
+  channel: channel name to join
+      key: key to join the channel (channels with a key must be the first in list)
  
-  Esempi:
+  Examples:
    /join #weechat
-    /join #canaleprotetto,#weechat chiave
+    /join #protectedchan,#weechat key
+    /join -server freenode #weechat
 ........................................

 &bull; *`/kick`* `[canale] nick [commento]`::
@@ -449,15 +451,15 @@
    dati: dati raw da inviare
 ........................................

-&bull; *`/reconnect`* `[servername [servername ...] | -all] [-nojoin] [-switch]`::
+&bull; *`/reconnect`* `[nome_server [nome_server ...] | -all [-nojoin] [switch]`::

 ........................................
  riconnette a uno (o più) server

-  servername: server name to reconnect
-        -all: reconnect to all servers
-     -nojoin: do not join any channel (even if autojoin is enabled on server)
-     -switch: switch to next server address
+  nome_server: nome del server a cui riconnettersi
+         -all: riconnetti a tutti i server
+       nojoin: non entrare in nessun canale (anche se l'ingresso automatico è abilitato sul server)
+      -switch: passa al server successivo
 ........................................

 &bull; *`/rehash`* `[opzione]`::
@@ -3,21 +3,21 @@
 ........................................
  controllo relay

-           list: list relay clients (only active relays)
-       listfull: list relay clients (verbose, all relays)
-      listrelay: list relays (name and port)
-            add: add relay for a protocol + name
-            del: remove relay for a protocol + name
-  protocol.name: protocol and name to relay
-                 currently, only protocol "irc" is supported
-                 for example: irc.freenode
-           port: port used for relay
-            raw: open buffer with raw Relay data
+             list: elenca i client relay (solo quelli attivi)
+         listfull: elenca i client relay (dettagliato, tutti i relay)
+        listrelay: elenca i relay (nome e porta)
+              add: aggiungi relay per un protocollo + nome
+              del: rimuovi relay per un protocollo + nome
+  protocollo.nome: protocollo e nome con cui effettuare il relay
+                   al momento, è supportato solo il protocollo "irc"
+                   ad esempio: irc.freenode
+            porta: porta utilizzata per il relay
+              raw: apre il buffer con dati Relay
  
-  Without argument, this command opens buffer with list of relay clients.
+  Senza argomento, il comando apre i buffer con l'elenco dei client relay.
  
-  Example:
-    irc proxy, for server "freenode":
-      /relay add irc.freenode 8000
+  Esempio:
+    proxy irc, per il server "freenode":
+      /relay add irc.freenode.net 8000
 ........................................

@@ -99,6 +99,29 @@
      /buffer +1
 ........................................

+&bull; *`/color`* `[add pair [alias] [fg,bg]] | [del pair] | switch`::
+
+........................................
+  define custom colors and display palette of colors
+
+     add: add a color pair
+     del: delete a color pair
+  switch: switch WeeChat/terminal colors
+    pair: pair number (>= 1)
+   alias: alias name for color (for example: "orange")
+   fg,bg: foreground and background pair number (-1 for default terminal foreground or background)
+  
+  Without argument, this command displays colors in a new buffer.
+  
+  Examples:
+    add color 214 with alias "orange":
+      /color add 214 orange
+    add color 250 with orange on blue:
+      /color add 250 214,4 orange_blue
+    delete color 214:
+      /color del 214
+........................................
+
 &bull; *`/command`* `plugin comando`::

 ........................................
@@ -48,55 +48,10 @@
 ** tipo: colore
 ** valori: un nome colore (valore predefinito: `lightcyan`)

-* *weechat.color.chat_nick_color01*
-** descrizione: `colore del testo #1 per il nick`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `cyan`)
-
-* *weechat.color.chat_nick_color02*
-** descrizione: `colore del testo #2 per il nick`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `magenta`)
-
-* *weechat.color.chat_nick_color03*
-** descrizione: `colore del testo #3 per il nick`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `green`)
-
-* *weechat.color.chat_nick_color04*
-** descrizione: `colore del testo #4 per il nick`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `brown`)
-
-* *weechat.color.chat_nick_color05*
-** descrizione: `colore del testo #5 per il nick`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `lightblue`)
-
-* *weechat.color.chat_nick_color06*
-** descrizione: `colore del testo #6 per il nick`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `default`)
-
-* *weechat.color.chat_nick_color07*
-** descrizione: `colore del testo #7 per il nick<`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `lightcyan`)
-
-* *weechat.color.chat_nick_color08*
-** descrizione: `colore del testo #8 per il nick<`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `lightmagenta`)
-
-* *weechat.color.chat_nick_color09*
-** descrizione: `colore del testo #9 per il nick<`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `lightgreen`)
-
-* *weechat.color.chat_nick_color10*
-** descrizione: `colore del testo #10 per il nick<`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `blue`)
+* *weechat.color.chat_nick_colors*
+** descrizione: `colore del testo per i nick (elenco separato da virgole di colori)`
+** tipo: stringa
+** valori: qualsiasi stringa (valore predefinito: `"cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"`)

 * *weechat.color.chat_nick_other*
 ** descrizione: `colore del testo per gli altri nick nel buffer privato`
@@ -349,15 +304,10 @@
 ** valori: none, highlight, message, all (valore predefinito: `all`)

 * *weechat.look.buffer_time_format*
-** descrizione: `time format for each line displayed in buffers (see man strftime for date/time specifiers), colors are allowed with format "${color}", for example french time: "${lightblue}%H${white}%M${lightred}%S"`
+** descrizione: `formato dell'ora per ogni riga visualizzata nei buffer (consultare man strftime per gli specificatori data/ora), i colori sono consentiti nel formato "${colore}", nell'orario italiano ad esempio: "${lightblue}%H${white}%M{lightred}%S"`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"%H:%M:%S"`)

-* *weechat.look.color_nicks_number*
-** descrizione: `numero di colori da utilizzare per i colori dei nick`
-** tipo: intero
-** valori: 1 .. 10 (valore predefinito: `10`)
-
 * *weechat.look.color_real_white*
 ** descrizione: `se impostato, utilizza il colore bianco reale, disabilitato sui terminali con lo sfondo bianco (se non utilizzato, l'opzione dovrebbe essere attivata per visualizzare il bianco reale invece del colore di primo piano predefinito del terminale)`
 ** tipo: bool
@@ -389,7 +339,7 @@
 ** valori: qualsiasi stringa (valore predefinito: `""`)

 * *weechat.look.highlight_regex*
-** descrizione: `regular expression used to check if a message has highlight or not, at least one match in string must be surrounded by word chars (alphanumeric, "-", "_" or "|"), regular expression is case sensitive, example: "FlashCode|flashy"`
+** descrizione: `l'espressione regolare usata per verificare se un messaggio contiene un evento oppure no, almeno una corrispondenza nella stringa deve essere circondata da caratteri :(alfanumerici, "-", "_" or "|"), l'espressione regolare è esatta, esempio "FlashCode|flashy"`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `""`)

@@ -214,7 +214,7 @@ Elenco di script a proposito di URL: http://www.weechat.org/scripts/stable/tag/u
 Voglio cambiare la lingua utilizzata da WeeChat per i messaggi, ma senza uscire da WeeChat, è possibile?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-Sì. è necessario uno script python, shell.py (disponibile sul sito di WeeChat)
+Sì. è necessario uno script python, 'shell.py' (disponibile sul sito di WeeChat)
 e digitare questi comandi quando viene caricato lo script:

 ----------------------------------------
@@ -226,6 +226,32 @@ Per avere i messaggi in inglese con la codifica UTF-8 per il terminale, per gli
 utenti ISO, digitare: `/shell setenv LANG=en_US`.


+// TRANSLATION MISSING
+[[256_colors]]
+How can I use 256 colors in WeeChat?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+256 colors are supported with WeeChat 0.3.4 or newer.
+
+First check that your 'TERM' environment variable is correct, recommended values
+are:
+
+* under screen: 'screen-256color'
+* outside screen: 'xterm-256color', 'rxvt-256color', 'putty-256color',...
+
+If your 'TERM' variable has wrong value and that WeeChat is already running,
+don't panic! You can change it without restarting, thanks to script 'shell.py':
+
+----------------------------------------
+/shell setenv TERM=screen-256color
+/upgrade
+----------------------------------------
+
+You can use command `/color` for easy setup of colors in WeeChat.
+
+Please read user's guide for more information about colors management.
+
+
 [[key_bindings]]
 Associazioni dei tasti
 ----------------------
@@ -517,6 +543,29 @@ Esistono 3 modi:
  (è possibile iscriversi ed inviare alla mailing list "support")


+// TRANSLATION MISSING
+[[gdb_error_threads]]
+When I run WeeChat under gdb, there is an error about threads, what can I do?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When you run WeeChat under gdb, you may have this error:
+
+----------------------------------------
+gdb /path/to/weechat-curses
+(gdb) run
+[Thread debugging using libthread_db enabled]
+Cannot find new threads: generic error
+----------------------------------------
+
+To fix that, you can run gdb with this command (replace path to libpthread and
+WeeChat with paths on your system):
+
+----------------------------------------
+LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat-curses
+(gdb) run
+----------------------------------------
+
+
 [[supported_os]]
 Qual è la lista delle piattaforme supportate da WeeChat? Verrà effettuato il port su altri sistemi operativi?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2461,6 +2461,48 @@ item = weechat.list_search(list, data)
 item = weechat.list_search(list, "my data")
 ----------------------------------------

+weechat_list_search_pos
+^^^^^^^^^^^^^^^^^^^^^^^
+
+_Novità nella versione 0.3.4._
+
+Cerca la posizione di un elemento nella lista.
+
+Prototipo:
+
+[source,C]
+----------------------------------------
+int weechat_list_search_pos (struct t_weelist *weelist,
+                             const char *data);
+----------------------------------------
+
+Argomenti:
+
+* 'weelist': puntatore alla lista
+* 'data': dati da cercare nella lista
+
+Valore restituito:
+
+* posizione dell'elemento trovato, -1 se non trovato
+
+Esempio in C:
+
+[source,C]
+----------------------------------------
+int pos_item = weechat_list_search_pos (list, "my data");
+----------------------------------------
+
+Script (Python):
+
+[source,python]
+----------------------------------------
+# prototipo
+pos_item = weechat.list_search_pos(list, data)
+
+# esempio
+pos_item = weechat.list_search_pos(list, "my data")
+----------------------------------------
+
 weechat_list_casesearch
 ^^^^^^^^^^^^^^^^^^^^^^^

@@ -2502,6 +2544,48 @@ item = weechat.list_casesearch(list, data)
 item = weechat.list_casesearch(list, "my data")
 ----------------------------------------

+weechat_list_casesearch_pos
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+_Novità nella versione 0.3.4._
+
+Cerca la posizione di un elemento in una lista, ricerca normale.
+
+Prototipo:
+
+[source,C]
+----------------------------------------
+int weechat_list_casesearch_pos (struct t_weelist *weelist,
+                                 const char *data);
+----------------------------------------
+
+Argomenti:
+
+* 'weelist': puntatore alla lista
+* 'data': dati da cercare nella lista
+
+Valore restituito:
+
+* posizione dell'elemento trovato, -1 se non trovato
+
+Esempio in C:
+
+[source,C]
+----------------------------------------
+int pos_item = weechat_list_casesearch_pos (list, "my data");
+----------------------------------------
+
+Script (Python):
+
+[source,python]
+----------------------------------------
+# prototipo
+pos_item = weechat.list_casesearch_pos(list, data)
+
+# esempio
+pos_item = weechat.list_casesearch_pos(list, "my data")
+----------------------------------------
+
 weechat_list_get
 ^^^^^^^^^^^^^^^^

@@ -3184,6 +3268,45 @@ weechat_printf (NULL, "list of keys: %s",
 [NOTE]
 Questa funzione non è disponibile nelle API per lo scripting.

+weechat_hashtable_set_pointer
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+_Novità nella versione 0.3.4._
+
+// TRANSLATION MISSING
+Set pointer value of a hashtable property.
+
+Prototipo:
+
+[source,C]
+----------------------------------------
+void weechat_hashtable_set_pointer (struct t_hashtable *hashtable,
+                                    const char *property, void *pointer);
+----------------------------------------
+
+Argomenti:
+
+* 'hashtable': puntatore alla tabella hash
+* 'property' e 'value': nome della proprietà, con il proprio valore:
+// TRANSLATION MISSING
+** 'callback_free_value': set callback function used to free values in hashtable
+
+Esempio in C:
+
+[source,C]
+----------------------------------------
+void
+my_free_value_cb (struct t_hashtable *hashtable, const void *key, void *value)
+{
+    /* ... */
+}
+
+weechat_hashtable_set_pointer (hashtable, "callback_free_value", &my_free_value_cb);
+----------------------------------------
+
+[NOTE]
+Questa funzione non è disponibile nelle API per lo scripting.
+
 weechat_hashtable_add_to_infolist
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@@ -6217,9 +6340,8 @@ Valore restituito:

 * puntatore al nuovo hook, NULL in caso di errore

-// TRANSLATION MISSING
-When command has ended, or if timeout is reached, WeeChat will automatically
-unhook (and kill process if it is still running).
+Quando il comando ha terminato, o se viene raggiunto il timeout, WeeChat
+effettua automaticamente l'unhook (e termina il processo se ancora in esecuzione).

 [NOTE]
 La dimensione del buffer per l'invio dei dati alla callback è di 64KB (ci sono
@@ -6710,6 +6832,10 @@ Argomenti:
 | weechat | upgrade | - |
  comando `/upgrade` digitato dall'utente

+// TRANSLATION MISSING
+| weechat | upgrade_ended | - |
+  end of upgrade process (command `/upgrade`)
+
 | weechat | weechat_highlight | string: messaggio con prefisso |
  evento accaduto

@@ -290,19 +290,22 @@ Argomenti a riga di comando:
 -a, --no-connect::
    Disabilita la connessione automatica ai server all'avvio di WeeChat

+-c, --colors::
+    Mostra i colori prefefiniti nel terminale
+
 -d, --dir 'path'::
    Imposta una cartella come home per WeeChat (utilizzata per i file di
    configurazione, log, plugin e script dell'utente), il valore predefinito
    è ~/.weechat

 -h, --help::
-    Visualizza l'aiuto
+    Mostra l'aiuto

 -k, --keys::
-    Visualizza i tasti predefiniti di WeeChat
+    Mostra i tasti predefiniti di WeeChat

 -l, --license::
-    Visualizza la licenza di WeeChat
+    Mostra la licenza di WeeChat

 -p, --no-plugin::
    Disabilita il caricamento automatico dei plugin
@@ -311,7 +314,7 @@ Argomenti a riga di comando:
    Disabilita il caricamento automatico dei script

 -v, --version::
-    Visualizza la versione di WeeChat
+    Mostra la versione di WeeChat

 plugin:option::
    Opzione per il plugin (consultare la documentazione per ogni plugin)
@@ -454,102 +457,102 @@ Tasti per la riga di comando
 | Tasti | Descrizione e comando

 | Freccia sinistra +
-  Ctrl + `b` |
+  Ctrl + "b" |
  Passa al carattere precedente nella riga di comando +
  `/input move_previous_char`

 | Freccia destra +
-  Ctrl + `f` |
+  Ctrl + "f" |
  Passa al carattere successivo nella riga di comando +
  `/input move_next_char`

 | Ctrl + freccia sinistra +
-  Alt + `b` |
+  Alt + "b" |
  Passa alla parola precedente nella riga di comando +
  `/input move_previous_word`

 | Ctrl + freccia destra +
-  Alt + `f` |
+  Alt + "f" |
  Passa alla parola successiva nella riga di comando +
  `/input move_next_word`

 | Home +
-  Ctrl + `a` |
+  Ctrl + "a" |
  Si sposta all'inizio della riga di comando +
  `/input move_beginning_of_line`

 | Fine +
-  Ctrl + `e` |
+  Ctrl + "e" |
  Si sposta alla fine della riga di comando +
  `/input move_end_of_line`

-| Ctrl + `c` poi `b` |
+| Ctrl + "c" poi "b" |
  Inserisce il codice per il testo in grassetto +
  `/input insert \x02`

-| Ctrl + `c` poi `c` |
+| Ctrl + "c" poi "c" |
  Inserisce il codice per il testo colorato +
  `/input insert \x03`

-| Ctrl + `c` poi `i` |
+| Ctrl + "c" poi "i" |
  Inserisce il codice per il testo in corsivo +
  `/input insert \x1D`

-| Ctrl + `c` poi `o` |
+| Ctrl + "c" poi "o" |
  Inserisce il codice per il reset dei colori +
  `/input insert \x0F`

-| Ctrl + `c` then `r` |
+| Ctrl + "c" then "r" |
  Inserisce il codice per l'inversione dei colori +
  `/input insert \x12`

-| Ctrl + `c` poi `u` |
+| Ctrl + "c" poi "u" |
  Inserisce il codice per il testo sottolineato +
  `/input insert \x15`

 | Canc +
-  Ctrl + `d` |
+  Ctrl + "d" |
  Elimina il carattere successivo nella riga di comando +
  `/input delete_next_char`

 | Backspace +
-  Ctrl + `h` |
+  Ctrl + "h" |
  Elimina il carattere precedente nella riga di comando +
  `/input delete_previous_char`

-| Ctrl + `k` |
+| Ctrl + "k" |
  Elimina dal cursore fino alla fine della riga di comando (la stringa eliminata
  viene copiata negli appunti) +
  `/input delete_end_of_line`

-| Ctrl + `r` |
+| Ctrl + "r" |
  Cerca il testo nella cronologia del buffer (due volte: cerca testo esatto),
  ricorrenze successive/precedenti possono essere trovate con le frecce su/giù +
  `/input search_text`

-| Ctrl + `t` |
+| Ctrl + "t" |
  Inverti caratteri +
  `/input transpose_chars`

-| Ctrl + `u` |
+| Ctrl + "u" |
  Elimina dal cursore fino all'inizio della riga di comando (la stringa eliminata
  viene copiata negli appunti) +
  `/input delete_beginning_of_line`

-| Ctrl + `w` |
+| Ctrl + "w" |
  Elimina la parola precedente nella riga di comando (la stringa eliminata viene
  copiata negli appunti) +
  `/input delete_previous_word`

-| Ctrl + `y` |
+| Ctrl + "y" |
  Incolla il contenuto degli appunti +
  `/input clipboard_paste`

-| Ctrl + `_` |
+| Ctrl + "_" |
  Annulla l'ultima azione sulla riga di comando +
  `/input undo`

-| Alt + `_` |
+| Alt + "_" |
  Ripete l'ultima azione sulla riga di comando +
  `/input redo`

@@ -566,8 +569,8 @@ Tasti per la riga di comando
  Inserisce carattere alla posizione del cursore nella riga di comando

 | Invio +
-  Ctrl + `j` +
-  Ctrl + `m` |
+  Ctrl + "j" +
+  Ctrl + "m" |
  Esegue comando o invia messaggio (in modalità ricerca: ferma ricerca) +
  `/input return`

@@ -589,17 +592,17 @@ Tasti per la riga di comando
  per tutti i buffer) +
  `/input history_global_next`

-| Alt + `d` |
+| Alt + "d" |
  Elimina la parola successiva nella riga di comando (la stringa eliminata viene
  copiata negli appunti) +
  `/input delete_next_word`

-| Alt + `k` |
+| Alt + "k" |
  Cattura un tasto ed inserisce il suo codice (e il comando associato se il tasto
  esiste) nella riga di comando +
  `/input grab_key_command`

-| Alt + `r` |
+| Alt + "r" |
  Elimina l'intera riga di comando +
  `/input delete_line`
 |========================================
@@ -612,15 +615,15 @@ Tasti per buffer / finestre
 |========================================
 | Tasti | Descrizione e comando

-| Ctrl + `l` |
+| Ctrl + "l" (L) |
  Ridisegna l'intera finestra +
  `/window refresh`

-| Ctrl + `s` poi Ctrl + `u` |
+| Ctrl + "s" poi Ctrl + "u" |
  Imposta l'evidenziatore dei messaggi non letti su tutti i buffer +
  `/input set_unread`

-| Ctrl + `x` |
+| Ctrl + "x" |
  Passa al buffer attivo se i buffer sono collegati con lo stesso numero +
  `/input switch_active_buffer`

@@ -650,14 +653,14 @@ Tasti per buffer / finestre

 | Alt + freccia sinistra +
  Alt + freccia su +
-  Ctrl + `p` +
+  Ctrl + "p" +
  F5 |
  Passa al buffer precedente +
  `/buffer -1`

 | Alt + freccia destra +
  Alt + freccia giù +
-  Ctrl + `n` +
+  Ctrl + "n" +
  F6 |
  Passa al buffer successivo +
  `/buffer +1`
@@ -694,20 +697,20 @@ Tasti per buffer / finestre
  Sposta alla fine della lista nick +
  `/bar scroll nicklist * ye`

-| Alt + `a` |
+| Alt + "a" |
  Passa al buffer successivo con attività (con priorità: evento, messaggio,
  altro) +
  `/input jump_smart`

-| Alt + `j` poi Alt + `l` |
+| Alt + "j" poi Alt + "l" (L) |
  Passa all'ultimo buffer +
  `/input jump_last_buffer`

-| Alt + `j` poi Alt + `r` |
+| Alt + "j" poi Alt + "r" |
  Passa al buffer raw IRC +
  `/server raw`

-| Alt + `j` poi Alt + `s` |
+| Alt + "j" poi Alt + "s" |
  Passa al buffer server IRC +
  `/server jump`

@@ -715,39 +718,39 @@ Tasti per buffer / finestre
  Passa al buffer numero (0 = 10) +
  `/buffer *N`

-| Alt + `j` poi numero (01-99) |
+| Alt + "j" poi numero (01-99) |
  Passa al buffer numero +
  `/buffer NN`

-| Alt + `n` |
+| Alt + "n" |
  Scorre fino all'evento successivo +
  `/window scroll_next_highlight`

-| Alt + `p` |
+| Alt + "p" |
  Scorre fino all'evento precedente +
  `/window scroll_previous_highlight`

-| Alt + `u` |
+| Alt + "u" |
  Scorre fino alla prima riga non letta nel buffer +
  `/input scroll_unread`

-| Alt + `w` poi Alt + freccia |
+| Alt + "w" poi Alt + freccia |
  Passa alla finestra con direzione +
  `/window up` (in alto) +
  `/window down` (in basso) +
  `/window left` (a sinistra) +
  `/window right` (a destra)

-| Alt + `z` |
+| Alt + "z" |
  Ingrandimento sulla finestra attiva (Alt + Z di nuovo: ripristina lo stato iniziale
  della finestra, prima dell'ingrandimento) +
  `/window zoom`

-| Alt + `<` |
+| Alt + "<" |
  Passa al buffer precedente nella lista dei buffer visitati +
  `/input jump_previously_visited_buffer`

-| Alt + `>` |
+| Alt + ">" |
  Passa al buffer successivo nella lista dei buffer visitati +
  `/input jump_next_visited_buffer`
 |========================================
@@ -760,11 +763,11 @@ Altri tasti
 |========================================
 | Tasti | Descrizione e comando

-| Alt + `h` |
+| Alt + "h" |
  Pulisce hotlist (notifica di attività su altri buffer) +
  `/input hotlist_clear` +

-| Alt + `=` |
+| Alt + "=" |
  Attiva/disattiva filtri +
  `/filter toggle` +
 |========================================
@@ -802,9 +805,10 @@ poi un altro. Ad esempio, per inviare il testo '/set' sul buffer attivo:
 //set
 ----------------------------------------

+// TRANSLATION MISSING
 [[command_line_colors]]
-Colori
-^^^^^^
+Color codes
+^^^^^^^^^^^

 Per alcuni plugin come IRC, è possibile usare codici colori ed attributi,
 come segue (digitare Ctrl-C poi la lettera che segue, con il valore
@@ -869,12 +873,68 @@ Opzioni di WeeChat (weechat.conf)

 include::autogen/user/weechat_options.txt[]

-[[curses_colors]]
-I colori per l'interfaccia Curses
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+[[weechat_commands]]
+Comandi di WeeChat
+~~~~~~~~~~~~~~~~~~

-[width="50%",cols="^3m,8"]
+include::autogen/user/weechat_commands.txt[]
+
+// TRANSLATION MISSING
+[[colors]]
+Colors
+~~~~~~
+
+WeeChat can use up to 256 color pairs to display text in bars and chat area
+(your terminal must support 256 colors to use them in WeeChat).
+
+According to value of 'TERM' environment variable, you may have following limits
+for colors in WeeChat:
+
+[width="40%",cols="5,>2,>2",options="header"]
 |========================================
+| $TERM                                 | Colors | Pairs ^(1)^
+| "rxvt-unicode", "xterm",...           |     88 |         256
+| "rxvt-256color", "xterm-256color",... |    256 |       32767
+| "screen"                              |      8 |          64
+| "screen-256color"                     |    256 |       32767
+|========================================
+
+[NOTE]
+^(1)^ Even if your terminal supports more than 256 pairs, only 256 pairs can be
+used in WeeChat, because of a ncurses limitation.
+
+You can run `weechat-curses --colors` or use command `/color` in WeeChat to
+display limits for your environment.
+
+Some recommended values for 'TERM' if you want 256 colors:
+
+* under screen: 'screen-256color'
+* outside screen: 'xterm-256color', 'rxvt-256color', 'putty-256color',...
+
+If you are using screen, you can add this line to your '~/.screenrc':
+
+----------------------------------------
+term screen-256color
+----------------------------------------
+
+If your 'TERM' variable has wrong value and that WeeChat is already running,
+don't panic! You can change it without restarting, thanks to script 'shell.py':
+
+----------------------------------------
+/shell setenv TERM=screen-256color
+/upgrade
+----------------------------------------
+
+// TRANSLATION MISSING
+[[colors_basic]]
+Basic colors
+^^^^^^^^^^^^
+
+Basic colors in WeeChat are:
+
+[width="50%",cols="^3m,8",options="header"]
+|========================================
+| Name         | Color
 | default      | colore predefinito del terminale (trasparente per lo sfondo)
 | black        | nero
 | darkgray     | grigio scuro
@@ -891,13 +951,60 @@ I colori per l'interfaccia Curses
 | cyan         | azzurro scuro
 | lightcyan    | azzurro chiaro
 | white        | bianco
-|=======================================
+|========================================

-[[weechat_commands]]
-Comandi di WeeChat
-~~~~~~~~~~~~~~~~~~
+// TRANSLATION MISSING
+[[colors_palette]]
+Palette
+^^^^^^^

-include::autogen/user/weechat_commands.txt[]
+According to your terminal, 64 or 256 pairs are defined by WeeChat, a
+combination of foreground with background colors:
+
+* for 64 pairs: 8 foreground colors * 8 background colors (dark colors)
+* for 256 pairs: 16 foreground colors * 16 background colors (8 dark colors and
+  8 light colors)
+
+Use command `/color` to see default colors (on buffer you can press 'alt+c' to
+switch between WeeChat and terminal colors).
+
+You can override some color pairs (a pair is foreground + background) with
+command `/color`, which creates option in section 'palette' of file
+'weechat.conf'.
+
+For each color defined, you can specify:
+
+* foreground and background, using format "fg,bg": color for text and
+  background, by default it is color pair number on default background (-1)
+* alias: you can give a name to your color, for easy use in color options
+
+For example, to define pairs 225 to 240 with colors like blue, cyan, green,
+yellow, orange, red, pink, purple:
+
+----------------------------------------
+/color add 225 18,-1
+/color add 226 20,-1
+/color add 227 27,-1
+/color add 228 39,-1
+/color add 229 51,-1
+/color add 230 49,-1
+/color add 231 47,-1
+/color add 232 82,-1
+/color add 233 154,-1
+/color add 234 226,-1
+/color add 235 214,-1
+/color add 236 202,-1
+/color add 237 196,-1
+/color add 238 199,-1
+/color add 239 201,-1
+/color add 240 176,-1
+----------------------------------------
+
+See `/help color` for other examples.
+
+[IMPORTANT]
+Colors defined are overriding default WeeChat color pairs, so you should
+redefine pair only if you're not using this color in WeeChat.


 [[plugins]]
@@ -949,8 +1056,7 @@ I plugin predefiniti sono:
 | fifo      | pipe FIFO utilizzata per inviare comandi da remoto su WeeChat
 | irc       | protocollo chat per IRC
 | logger    | Registra i buffer su file
-// TRANSLATION MISSING
-| relay     | Relay data via network (IRC proxy)
+| relay     | Relay dei dati via rete (proxy IRC)
 | rmodifier | Cambia le stringhe del modificatore con espressioni regolari
 | perl      | API per lo scripting in Perl
 | python    | API per lo scripting in Python
@@ -1566,8 +1672,51 @@ variabili locali per il buffer corrente:
 /buffer localvar
 ----------------------------------------

-Per esempio, se si vuole una cartella per server IRC e un file per canale al
-suo interno:
+Ad esempio, sul buffer "irc.freenode.#weechat", WeeChat cercherà un mask con il
+nome dell'opzione, in quest'ordine:
+
+----------------------------------------
+logger.mask.irc.freenode.#weechat
+logger.mask.irc.freenode
+logger.mask.irc
+logger.file.mask
+----------------------------------------
+
+Ciò vuol dire che si hanno dei mask specifici per alcuni server
+IRC ("logger.mask.irc.freenode") o per un plugin ("logger.mask.irc").
+
+[[logger_files_by_date]]
+File di log per data
++++++++++++++++++++
+
+Per avere file di log per data, è possibile usare specificatori data/ora
+nei mask (consultare `man stfrtime` per i formati), ad esempio:
+
+----------------------------------------
+/set logger.file.mask "%Y/%m/$plugin.$name.weechatlog"
+----------------------------------------
+
+Si avranno i seguenti file:
+
+........................................
+~/.weechat/
+    |--- logs/
+        |--- 2010/
+            |--- 11/
+            |       irc.server.freenode.weechatlog
+            |       irc.freenode.#weechat.weechatlog
+        |--- 2010/
+            |--- 12/
+            |       irc.server.freenode.weechatlog
+            |       irc.freenode.#weechat.weechatlog
+........................................
+
+[[logger_irc_files_by_server_channel]]
+File di log IRC per server e canale
+++++++++++++++++++++++++++++++++++
+
+Se si desidera avere una cartella per il server IRC ed una per il canale
+al suo interno:

 ----------------------------------------
 /set logger.mask.irc "irc/$server/$channel.weechatlog"
@@ -1582,21 +1731,21 @@ Si avranno i seguenti file:
            |--- freenode/
            |       freenode.weechatlog
            |       #weechat.weechatlog
-            |       #miocanale.weechatlog
+            |       #mychan.weechatlog
            |--- oftc/
            |       oftc.weechatlog
-            |       #canale1.weechatlog
-            |       #canale2.weechatlog
+            |       #chan1.weechatlog
+            |       #chan2.weechatlog
 ........................................

-// TRANSLATION MISSING
 [[relay_plugin]]
-Relay plugin
+Plugin Relay
 ~~~~~~~~~~~~

-The Relay plugin is used to relay data via network, using different protocols.
+Il plugin Relay viene utilizzato per inoltrare i dati via rete, facendo uso di
+protocolli differenti.

-Currently, only "irc" protocol is supported (IRC proxy).
+Al momento, è supportato solo il protocollo "irc" (proxy IRC).

 [[relay_options]]
 Opzioni (relay.conf)
@@ -1610,25 +1759,24 @@ Comandi

 include::autogen/user/relay_commands.txt[]

-// TRANSLATION MISSING
 [[relay_irc_proxy]]
-IRC proxy
+Proxy IRC
 ^^^^^^^^^

-The Relay plugin can act as an IRC proxy: you can define one port by IRC server
-and use a password for clients.
+Il plugin Relay può funzionare come un proxy IRC: è possibile definire una porta
+per il server IRC ed utilizzare una password per i client.

-For example:
+Ad esempio:

 ----------------------------------------
-/set relay.network.password "mypass"
+/set relay.network.password "miapass"
 /relay add irc.freenode 8000
 ----------------------------------------

-Now you can connect on port 8000 with any IRC client (WeeChat, xchat,
-irssi, ..), using server password "mypass".
+Ora è possibile connettersi sulla porta 8000 con qualsiasi client IRC
+(WeeChat, xchat, irssi, ..) utilizzando la password del server "miapass".

-You can limit number of allowed clients:
+È possibile inoltre limitare il numero di client consentiti:

 ----------------------------------------
 /set relay.network.max_clients 1
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -210,7 +210,7 @@ Lista skryptów do obsługi adresów URL: http://www.weechat.org/scripts/stable/
 Chcę zmienić język komunikatów wyświetlanych przez WeeChat, ale bez jego zamykania, czy jest to możliwe?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-Tak, musisz użyć pythonowego skryptu shell.py (dostępny na stronie programu),
+Tak, musisz użyć pythonowego skryptu 'shell.py' (dostępny na stronie programu),
 oraz użyć tych komend po załadowaniu skryptu:

 ----------------------------------------
@@ -222,6 +222,32 @@ Aby otrzymać polskie komunikaty dla kodowania UTF-8 w terminalu, osóby
 używające ISO, moga wykonać: `/shell setenv LANG=pl_PL`.


+// TRANSLATION MISSING
+[[256_colors]]
+How can I use 256 colors in WeeChat?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+256 colors are supported with WeeChat 0.3.4 or newer.
+
+First check that your 'TERM' environment variable is correct, recommended values
+are:
+
+* under screen: 'screen-256color'
+* outside screen: 'xterm-256color', 'rxvt-256color', 'putty-256color',...
+
+If your 'TERM' variable has wrong value and that WeeChat is already running,
+don't panic! You can change it without restarting, thanks to script 'shell.py':
+
+----------------------------------------
+/shell setenv TERM=screen-256color
+/upgrade
+----------------------------------------
+
+You can use command `/color` for easy setup of colors in WeeChat.
+
+Please read user's guide for more information about colors management.
+
+
 [[key_bindings]]
 Przypisania klawiszy
 --------------------
@@ -509,6 +535,29 @@ Są 3 możliwości:
  (możesz się zapisać na listę mailingową "support" i na niej pisać)


+// TRANSLATION MISSING
+[[gdb_error_threads]]
+When I run WeeChat under gdb, there is an error about threads, what can I do?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When you run WeeChat under gdb, you may have this error:
+
+----------------------------------------
+gdb /path/to/weechat-curses
+(gdb) run
+[Thread debugging using libthread_db enabled]
+Cannot find new threads: generic error
+----------------------------------------
+
+To fix that, you can run gdb with this command (replace path to libpthread and
+WeeChat with paths on your system):
+
+----------------------------------------
+LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat-curses
+(gdb) run
+----------------------------------------
+
+
 [[supported_os]]
 Jaka jest lista platform wspieranych przez WeeChat? Czy będzie przeportowany na inne systemy operacyjne?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,4 +1,4 @@
-.TH WEECHAT 1 "August 2010" "Sebastien Helleu"
+.TH WEECHAT 1 "January 2011" "Sebastien Helleu"

 .SH NAME
 weechat-curses \- Wee Enhanced Environment for Chat (Curses version)
@@ -13,7 +13,6 @@ weechat-curses \- Wee Enhanced Environment for Chat (Curses version)
 Fast, light and extensible chat client for many operating systems.
 .br
 Everything can be done with a keyboard. It is customizable and extensible with scripts.
-Many GUIs are or will be available (Curses, Gtk and Qt).
 .br
 It is compliant with IRC RFCs 1459, 2810, 2811, 2812, and 2813.

@@ -23,6 +22,10 @@ It is compliant with IRC RFCs 1459, 2810, 2811, 2812, and 2813.
 .br
 disable auto-connect to servers at startup
 .TP
+.B \-c, \-\-colors
+.br
+display default colors in terminal
+.TP
 .B \-d, \-\-dir <dir>
 .br
 set WeeChat home dir
@@ -86,6 +89,12 @@ configuration file for IRC plugin
 .B $HOME/.weechat/logger.conf
 configuration file for logger plugin
 .TP
+.B $HOME/.weechat/relay.conf
+configuration file for relay plugin
+.TP
+.B $HOME/.weechat/rmodifier.conf
+configuration file for rmodifier plugin
+.TP
 .B $HOME/.weechat/xfer.conf
 configuration file for xfer plugin
 .TP
@@ -93,7 +102,7 @@ configuration file for xfer plugin
 WeeChat log file

 .SH LICENSE
-Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 .br
 WeeChat is distributed under the GNU General Public License, version 3.
 Please read the COPYING file for more information.
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2005-2010 Jiri Golembiovsky <golemj@gmail.com>
+# Copyright (C) 2005-2011 Jiri Golembiovsky <golemj@gmail.com>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-09 22:59+0100\n"
+"POT-Creation-Date: 2011-01-01 18:04+0100\n"
 "PO-Revision-Date: 2010-11-06 11:55+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -31,9 +31,9 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

 #. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Copyright (C) 2003-2010, compiled on %s %s\n"
+"WeeChat %s Copyright %s, compiled on %s %s\n"
 "Developed by Sebastien Helleu <flashcode@flashtux.org> - %s"
 msgstr ""
 "%s Copyright (C) 2003-2010, zkompilováno %s %s\n"
@@ -43,8 +43,10 @@ msgstr ""
 msgid "Usage: %s [option...] [plugin:option...]\n"
 msgstr "Použití: %s [volba...] [plugin:volba...]\n"

+#, fuzzy
 msgid ""
 "  -a, --no-connect  disable auto-connect to servers at startup\n"
+"  -c, --colors      display default colors in terminal\n"
 "  -d, --dir <path>  set WeeChat home directory (default: ~/.weechat)\n"
 "  -h, --help        this help\n"
 "  -k, --keys        display WeeChat default keys\n"
@@ -143,10 +145,6 @@ msgstr "  %s (plugin: %s)"
 msgid "No bar item defined"
 msgstr "Žádné položky pole nejsou definovány"

-#, c-format
-msgid "%sError: missing arguments for \"%s\" command"
-msgstr "%sChyba: chybí argumenty pro příkaz \"%s\""
-
 #, c-format
 msgid "%sNot enough memory"
 msgstr "%sNedostatek paměti"
@@ -220,6 +218,14 @@ msgstr "Lokální proměnné pro buffer \"%s\":"
 msgid "No local variable defined for buffer \"%s\""
 msgstr "Není definovaná žádná lokální proměnná pro buffer \"%s\""

+#, c-format
+msgid "%sInvalid pair number \"%s\" (must be between %d and %d)"
+msgstr ""
+
+#, c-format
+msgid "%sColor \"%s\" is not defined in palette"
+msgstr ""
+
 #, c-format
 msgid "%sPlugin \"%s\" not found"
 msgstr "%sPlugin \"%s\" nenalezen"
@@ -679,6 +685,10 @@ msgstr "%sChyba: volba nastavení \"%s\" nenalezena"
 msgid "Option changed: "
 msgstr "Volba změněna: "

+#, fuzzy
+msgid "Option created: "
+msgstr "Volba změněna: "
+
 msgid "Option changed"
 msgstr "Volba změněna"

@@ -993,6 +1003,32 @@ msgstr ""
 "  skočit na další buffer:\n"
 "    /buffer +1"

+msgid "define custom colors and display palette of colors"
+msgstr ""
+
+msgid "[add pair [alias] [fg,bg]] | [del pair] | switch"
+msgstr ""
+
+msgid ""
+"   add: add a color pair\n"
+"   del: delete a color pair\n"
+"switch: switch WeeChat/terminal colors\n"
+"  pair: pair number (>= 1)\n"
+" alias: alias name for color (for example: \"orange\")\n"
+" fg,bg: foreground and background pair number (-1 for default terminal "
+"foreground or background)\n"
+"\n"
+"Without argument, this command displays colors in a new buffer.\n"
+"\n"
+"Examples:\n"
+"  add color 214 with alias \"orange\":\n"
+"    /color add 214 orange\n"
+"  add color 250 with orange on blue:\n"
+"    /color add 250 214,4 orange_blue\n"
+"  delete color 214:\n"
+"    /color del 214"
+msgstr ""
+
 msgid "launch explicit WeeChat or plugin command"
 msgstr "pustit uvedený WeeChat nebo plugin příkaz"

@@ -1675,6 +1711,10 @@ msgstr ""
 "  posunout na začátek aktuálního dne:\n"
 "    /window scroll -d"

+#, c-format
+msgid "%sError: missing arguments for \"%s\" command"
+msgstr "%sChyba: chybí argumenty pro příkaz \"%s\""
+
 msgid "names of buffers"
 msgstr "jména bufferů"

@@ -1690,6 +1730,10 @@ msgstr "vlastnosti, které mohou být nastaveny bufferu"
 msgid "properties that can be read on a buffer"
 msgstr "vlastnosti, které mohou být čteny o bufferu"

+#, fuzzy
+msgid "color pairs"
+msgstr "barva"
+
 msgid "configuration files"
 msgstr "konfigurační soubory"

@@ -1760,6 +1804,16 @@ msgstr "\t\tZměnil se den na %s"
 msgid "debug level for plugin (\"core\" for WeeChat core)"
 msgstr "úroveň ladění pro plugin (\"core\" pro jádro WeeChat)"

+msgid ""
+"custom color in palette, format is: \"alias;fg,bg\" where alias is color "
+"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything "
+"is optional in this format and order is not important)"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%sError: palette option must be numeric"
+msgstr "%sChyba: selhalo uložení voleb do %s"
+
 msgid "Notify level for buffer"
 msgstr "Úroveň upozornění pro buffer"

@@ -1801,9 +1855,6 @@ msgstr ""
 "časová známka použita v logovacích souborech (použijte manuálovou stránku "
 "strftime pro spcifikátory data/času)"

-msgid "number of colors to use for nicks colors"
-msgstr "počet barev použitých pro barvy přezdívek"
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -2092,42 +2143,16 @@ msgstr "barva textu pro jméno kanálu"
 msgid "text color for nicks in chat window"
 msgstr "barva textu přezdívky v okně rozhovoru"

+#, fuzzy
+msgid "text color for nicks (comma separated list of colors)"
+msgstr "barva textu přezdívky v okně rozhovoru"
+
 msgid "text color for local nick in chat window"
 msgstr "barva textu pro lokální přezdívku v okně rozhovoru"

 msgid "text color for other nick in private buffer"
 msgstr "barva textu pro jiné přezdívky v soukromém bufferu"

-msgid "text color #1 for nick"
-msgstr "barva textu 1. přezdívky"
-
-msgid "text color #2 for nick"
-msgstr "barva textu 2. přezdívky"
-
-msgid "text color #3 for nick"
-msgstr "barva textu 3. přezdívky"
-
-msgid "text color #4 for nick"
-msgstr "barva textu 4. přezdívky"
-
-msgid "text color #5 for nick"
-msgstr "barva textu 5. přezdívky"
-
-msgid "text color #6 for nick"
-msgstr "barva textu 6. přezdívky"
-
-msgid "text color #7 for nick"
-msgstr "barva textu 7. přezdívky"
-
-msgid "text color #8 for nick"
-msgstr "barva textu 8. přezdívky"
-
-msgid "text color #9 for nick"
-msgstr "barva textu 9. přezdívky"
-
-msgid "text color #10 for nick"
-msgstr "barva textu 10. přezdívky"
-
 msgid "text color for hostnames"
 msgstr "barva textu jména hosta"

@@ -2458,6 +2483,11 @@ msgstr "bajt"
 msgid "debug: removing file: %s"
 msgstr "ladění: odstraňuji soubor: %s"

+#. TRANSLATORS: "%s" is translation of "second" or "seconds"
+#, c-format
+msgid "Upgrade done (%.02f %s)"
+msgstr ""
+
 #, c-format
 msgid "%sError upgrading WeeChat with file \"%s\":"
 msgstr "%sChyba aktualizace WeeChat se souborem \"%s\""
@@ -2527,6 +2557,45 @@ msgstr ""
 "čtení - špatný podpis (formát aktualizačního souboru se mohl změnit od "
 "poslední verze)"

+msgid "Terminal infos:"
+msgstr "Informace o terminálu:"
+
+msgid "No color support in terminal."
+msgstr ""
+
+#, fuzzy
+msgid "Default colors:"
+msgstr "Výchozí klávesové zkratky obnoveny"
+
+msgid ""
+"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] "
+"Toggle colors"
+msgstr ""
+
+#, fuzzy
+msgid "Terminal colors:"
+msgstr "Informace o terminálu:"
+
+#, fuzzy
+msgid "WeeChat colors:"
+msgstr "datum kompilace WeeChat"
+
+#, fuzzy
+msgid "fixed color"
+msgstr "barva textu"
+
+#, fuzzy
+msgid "WeeChat basic colors:"
+msgstr "adresář WeeChat"
+
+#, fuzzy
+msgid "Nick colors:"
+msgstr "barva"
+
+#, fuzzy
+msgid "Palette colors:"
+msgstr "Výchozí klávesové zkratky obnoveny"
+
 msgid "Terminal lost, exiting WeeChat..."
 msgstr "Terminál ztracen, ukončuji WeeChat..."

@@ -2537,9 +2606,6 @@ msgstr "Obdržen signál %s, ukončuji WeeChat.."
 msgid "Signal SIGHUP received, reloading configuration files"
 msgstr "Obdržen signál SIGHUP, znovunačítám konfigurační soubory"

-msgid "Terminal infos:"
-msgstr "Informace o terminálu:"
-
 #, c-format
 msgid "  TERM='%s', size: %dx%d"
 msgstr "  TERM='%s', velikost: %dx%d"
@@ -2949,10 +3015,9 @@ msgstr "demo zpráva bez prefixu"
 msgid "%sdemo message with error prefix"
 msgstr "%sdemo zpráva s chybovým prefixem"

-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr ""
-"barvy: %s buffer %s přezdívka1 %s přezdívka2 %s přezdívka3 %s přezdívka4"
+#, fuzzy
+msgid "colors"
+msgstr "barva"

 msgid "Available infos:"
 msgstr "Dostupné informace:"
@@ -3213,6 +3278,10 @@ msgstr "%s%s: nekorektní číslo ignorování"
 msgid "%s%s: unknown option for \"%s\" command"
 msgstr "%s%s: neznámá volba pro příkaz \"%s\""

+#, c-format
+msgid "%s%s: command \"%s\" must be executed on connected irc server"
+msgstr "%s%s: příkaz \"%s\" nemůže být spuštěn v připojeném irc serveru"
+
 #, c-format
 msgid "%s%s: mask must begin with nick"
 msgstr "%s%s: maska musí začínat přezdívkou"
@@ -3663,17 +3732,21 @@ msgstr "přezdívka: přezdívka"
 msgid "join a channel"
 msgstr "připojit se ke kanálu"

-msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
+#, fuzzy
+msgid "[-server server] [channel1[,channel2[,channel3]] [key1[,key2]]]"
 msgstr "[kanál1[,kanál2[,kanál3]] [klíč1[,klíč2]]]"

+#, fuzzy
 msgid ""
+" server: send to this server (internal name)\n"
 "channel: channel name to join\n"
 "    key: key to join the channel (channels with a key must be the first in "
 "list)\n"
 "\n"
 "Examples:\n"
 "  /join #weechat\n"
-"  /join #protectedchan,#weechat key"
+"  /join #protectedchan,#weechat key\n"
+"  /join -server freenode #weechat"
 msgstr ""
 "kanál: jméno kanálu pro připojení\n"
 " klíč: klíč pro připojení ke kanálu (kanál s klíčem musí být v seznamu "
@@ -4410,10 +4483,6 @@ msgid "%s%s: command \"%s\" must be executed on irc buffer (server or channel)"
 msgstr ""
 "%s%s: příkaz \"%s\" nemůže být spuštěn v irc bufferu (server nebo kanál)"

-#, c-format
-msgid "%s%s: command \"%s\" must be executed on connected irc server"
-msgstr "%s%s: příkaz \"%s\" nemůže být spuštěn v připojeném irc serveru"
-
 msgid "current IRC server"
 msgstr "aktuální IRC server"

@@ -5996,6 +6065,9 @@ msgstr "stránka WeeChat"
 msgid "WeeChat site, download page"
 msgstr "stránka WeeChat, stránka pro stažení"

+msgid "1 if WeeChat is upgrading (command `/upgrade`)"
+msgstr ""
+
 msgid "terminal charset"
 msgstr "znaková sada terminálu"

@@ -7148,6 +7220,43 @@ msgstr ""
 msgid "Pointer"
 msgstr "Ukazatel"

+#~ msgid "number of colors to use for nicks colors"
+#~ msgstr "počet barev použitých pro barvy přezdívek"
+
+#~ msgid "text color #1 for nick"
+#~ msgstr "barva textu 1. přezdívky"
+
+#~ msgid "text color #2 for nick"
+#~ msgstr "barva textu 2. přezdívky"
+
+#~ msgid "text color #3 for nick"
+#~ msgstr "barva textu 3. přezdívky"
+
+#~ msgid "text color #4 for nick"
+#~ msgstr "barva textu 4. přezdívky"
+
+#~ msgid "text color #5 for nick"
+#~ msgstr "barva textu 5. přezdívky"
+
+#~ msgid "text color #6 for nick"
+#~ msgstr "barva textu 6. přezdívky"
+
+#~ msgid "text color #7 for nick"
+#~ msgstr "barva textu 7. přezdívky"
+
+#~ msgid "text color #8 for nick"
+#~ msgstr "barva textu 8. přezdívky"
+
+#~ msgid "text color #9 for nick"
+#~ msgstr "barva textu 9. přezdívky"
+
+#~ msgid "text color #10 for nick"
+#~ msgstr "barva textu 10. přezdívky"
+
+#~ msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
+#~ msgstr ""
+#~ "barvy: %s buffer %s přezdívka1 %s přezdívka2 %s přezdívka3 %s přezdívka4"
+
 #~ msgid "[-server server] receiver[,receiver] text"
 #~ msgstr "[-server server] příjemce[,příjemce] text"

@@ -1,7 +1,7 @@
 #
 # Copyright (C) 2005 Rudolf Polzer <weechat-te@durchnull.de>
 # Copyright (C) 2006-2007 Thomas Schuetz <i18n@internet-villa.de>
-# Copyright (C) 2009-2010 Nils G <weechatter@arcor.de>
+# Copyright (C) 2009-2011 Nils G <weechatter@arcor.de>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-09 22:59+0100\n"
-"PO-Revision-Date: 2010-12-07 23:21+0100\n"
+"POT-Creation-Date: 2011-01-02 19:28+0100\n"
+"PO-Revision-Date: 2011-01-01 22:28+0100\n"
 "Last-Translator: Nils G.\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: \n"
@@ -37,10 +37,10 @@ msgstr ""
 #. TRANSLATORS: "%s %s" after "compiled on" is date and time
 #, c-format
 msgid ""
-"%s Copyright (C) 2003-2010, compiled on %s %s\n"
+"WeeChat %s Copyright %s, compiled on %s %s\n"
 "Developed by Sebastien Helleu <flashcode@flashtux.org> - %s"
 msgstr ""
-"%s Copyright (C) 2003-2010, kompiliert am %s %s\n"
+"WeeChat %s Copyright %s, kompiliert am %s %s\n"
 "Entwickelt von Sebastien Helleu <flashcode@flashtux.org> - %s"

 #, c-format
@@ -49,6 +49,7 @@ msgstr "Aufruf: %s [Option...] [Erweiterung:Option...]\n"

 msgid ""
 "  -a, --no-connect  disable auto-connect to servers at startup\n"
+"  -c, --colors      display default colors in terminal\n"
 "  -d, --dir <path>  set WeeChat home directory (default: ~/.weechat)\n"
 "  -h, --help        this help\n"
 "  -k, --keys        display WeeChat default keys\n"
@@ -64,25 +65,27 @@ msgid ""
 "                    (look at plugins documentation for more information\n"
 "                    about possible options)\n"
 msgstr ""
-"  -a, --no-connect        deaktiviert das automatische Verbinden mit den "
-"Servern, beim Start von WeeChat\n"
-"  -d, --dir <Pfad>        legt den Konfigurationsordner für WeeChat fest "
+"  -a, --no-connect  deaktiviert das automatische Verbinden mit den Servern, "
+"beim Start von WeeChat\n"
+"  -c, --colors      zeigt die Standardfarben des Terminals an\n"
+"  -d, --dir <Pfad>  legt den Konfigurationsordner für WeeChat fest "
 "(Voreinstellung: ~/.weechat)\n"
-"  -h, --help              zeigt diese Hilfe an\n"
-"  -k, --keys              zeigt die Standard-Tastaturbelegung an\n"
-"  -l, --license           zeigt die Lizenz von WeeChat an\n"
-"  -p, --no-plugin         unterbindet das Laden der Erweiterungen, beim "
+"  -h, --help        zeigt diese Hilfe an\n"
+"  -k, --keys        zeigt die Standard-Tastaturbelegung an\n"
+"  -l, --license     zeigt die Lizenz von WeeChat an\n"
+"  -p, --no-plugin   unterbindet das Laden der Erweiterungen, beim "
 "Programmstart\n"
-"  -s, --no-script         Skripten werden beim Programmstart nicht geladen\n"
-"  -v, --version           zeigt die Version von WeeChat an\n"
-"  plugin:option           Option für Erweiterung\n"
-"                Beispiel: Die IRC-Erweiterung kann sich mit einem Server\n"
-"                          folgender URL verbinden:\n"
-"                          irc[6][s]://[nickname[:password]@]irc.beispiel.org"
-"[/port][//#channel1][,#channel2[...]]\n"
-"                          (siehe Dokumentation zu den IRC-Erweiterungen um "
+"  -s, --no-script   Skripten werden beim Programmstart nicht geladen\n"
+"  -v, --version     zeigt die Version von WeeChat an\n"
+"  plugin:option     Option für Erweiterung\n"
+"                    Beispiel: Die IRC-Erweiterung kann sich mit einem "
+"Server\n"
+"                    folgender URL verbinden:\n"
+"                    irc[6][s]://[nickname[:password]@]irc.beispiel.org[/port]"
+"[//#channel1][,#channel2[...]]\n"
+"                    (siehe Dokumentation zu den IRC-Erweiterungen um "
 "zusätzliche Informationen\n"
-"                          zu den mögliche Optionen zu erhalten.)\n"
+"                    zu den mögliche Optionen zu erhalten.)\n"

 #. TRANSLATORS: "%s" is "weechat"
 #, c-format
@@ -148,11 +151,7 @@ msgid "  %s (plugin: %s)"
 msgstr "  %s (Erweiterung: %s)"

 msgid "No bar item defined"
-msgstr "Es wurden keine Bar-Items festgelegt"
-
-#, c-format
-msgid "%sError: missing arguments for \"%s\" command"
-msgstr "%sFehler: fehlende Argumente für den Befehl \"%s\""
+msgstr "Es wurde kein Bar-Item festgelegt"

 #, c-format
 msgid "%sNot enough memory"
@@ -228,6 +227,14 @@ msgstr "Lokale Variablen für Buffer \"%s\":"
 msgid "No local variable defined for buffer \"%s\""
 msgstr "Keine lokale Variable definiert für Buffer \"%s\""

+#, c-format
+msgid "%sInvalid pair number \"%s\" (must be between %d and %d)"
+msgstr "%sungültiger Wert für Farbpaar \"%s\" (muss zwischen %d und %d liegen)"
+
+#, c-format
+msgid "%sColor \"%s\" is not defined in palette"
+msgstr "%sFarbe \"%s\" ist in der Farbpalette nicht definiert"
+
 #, c-format
 msgid "%sPlugin \"%s\" not found"
 msgstr "%sErweiterung \"%s\" wurde nicht gefunden"
@@ -686,6 +693,9 @@ msgstr "%sFehler: Konfigurationsoption \"%s\" nicht gefunden"
 msgid "Option changed: "
 msgstr "Option geändert: "

+msgid "Option created: "
+msgstr "Option erstellt: "
+
 msgid "Option changed"
 msgstr "Option geändert"

@@ -1011,6 +1021,50 @@ msgstr ""
 "  wechselt zum nächsten Buffer:\n"
 " /buffer +1"

+msgid "define custom colors and display palette of colors"
+msgstr "erstellt benutzerdefinierte Farben und stellt die Farbpalette dar"
+
+msgid "[add pair [alias] [fg,bg]] | [del pair] | switch"
+msgstr "[add pair [alias] [fg,bg]] | [del pair] | switch"
+
+msgid ""
+"   add: add a color pair\n"
+"   del: delete a color pair\n"
+"switch: switch WeeChat/terminal colors\n"
+"  pair: pair number (>= 1)\n"
+" alias: alias name for color (for example: \"orange\")\n"
+" fg,bg: foreground and background pair number (-1 for default terminal "
+"foreground or background)\n"
+"\n"
+"Without argument, this command displays colors in a new buffer.\n"
+"\n"
+"Examples:\n"
+"  add color 214 with alias \"orange\":\n"
+"    /color add 214 orange\n"
+"  add color 250 with orange on blue:\n"
+"    /color add 250 214,4 orange_blue\n"
+"  delete color 214:\n"
+"    /color del 214"
+msgstr ""
+"   add: fügt ein Farbpaar hinzu\n"
+"   del: entfernt ein Farbpaar\n"
+"switch: wechselt die Farben von WeeChat/Terminal\n"
+"  pair: Wert für Farbpaar (>= 1)\n"
+" alias: Alias für Farbe (zum Beispiel: \"orange\")\n"
+" fg,bg: Vordergrund- und Hintergrundfarbe (-1 setzt für den Vorder- oder "
+"Hintergrund die standard Terminalfarbe)\n"
+"\n"
+"Ohne Angabe von Argumenten öffnet der Befehl einen neuen Buffer, in welchem "
+"die Farbpalette dargestellt wird.\n"
+"\n"
+"Beispiele:\n"
+"  fügt die Farbe 214 mit dem Alias \"orange\" hinzu:\n"
+"    /color add 214 orange\n"
+"  fügt die Farbe 250 mit dem Alias Orange auf Blau hinzu:\n"
+"    /color add 250 214,4 orange_blau\n"
+"  löscht die Farbe 214:\n"
+"    /color del 214"
+
 msgid "launch explicit WeeChat or plugin command"
 msgstr "führe explizit einen WeeChat Befehl oder eine Erweiterung aus"

@@ -1623,16 +1677,16 @@ msgstr ""
 "Text der in dem Buffer ausgegeben werden soll\n"
 "\n"
 "Hinweis: Der Befehl der zeit verzögert gestartet werden soll wird in dem "
-"Buffer ausgeführt in dem der Befehl /wait gestartet wurde. Falls dieser "
+"Buffer ausgeführt in dem der /wait  Befehl aufgerufen wurde. Falls dieser "
 "Buffer nicht gefunden werden sollte, z.B.  weil er in der Zwischenzeit "
-"geschlossen wurde, wird der Befehl im WeeChat Haupt-Buffer gestartet.\n"
+"geschlossen wurde, wird der Befehl im WeeChat Core-Buffer ausgeführt.\n"
 "\n"
 "Beispiele:\n"
-"  Betritt einen Channel in 10 Sekunden:\n"
+"  Betritt nach 10 Sekunden den Channel #test:\n"
 "  /wait 10 /join #test\n"
-"  Setzt eine Abwesenheit in 15 Minuten:\n"
+"  Setzt nach 15 Minuten eine globale Abwesenheit:\n"
 "  /wait 15m /away -all Bin dann mal eben weg\n"
-"  Schickt den Text 'Hallo' nach zwei Minuten ab:\n"
+"  Versendet nach zwei Minuten den Text 'Hallo':\n"
 "  /wait 2m Hallo"

 msgid "manage windows"
@@ -1734,6 +1788,10 @@ msgstr ""
 "  Scrollt zum Beginn des aktuellen Tages:\n"
 "    /window scroll -d"

+#, c-format
+msgid "%sError: missing arguments for \"%s\" command"
+msgstr "%sFehler: fehlende Argumente für den Befehl \"%s\""
+
 msgid "names of buffers"
 msgstr "Auflistung der vorhandenen Buffer"

@@ -1749,6 +1807,9 @@ msgstr "Eigenschaften die für den Buffer gesetzt werden können"
 msgid "properties that can be read on a buffer"
 msgstr "Eigenschaften die für den Buffer gelesen werden können"

+msgid "color pairs"
+msgstr "Farbpaar"
+
 msgid "configuration files"
 msgstr "Konfigurationsdateien"

@@ -1819,6 +1880,21 @@ msgstr "\t\tEin neuer Tag bricht an. Heute ist %s"
 msgid "debug level for plugin (\"core\" for WeeChat core)"
 msgstr "Debug-Level für Erweiterung (\"core\" für den WeeChat Core)"

+msgid ""
+"custom color in palette, format is: \"alias;fg,bg\" where alias is color "
+"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything "
+"is optional in this format and order is not important)"
+msgstr ""
+"Benutzerdefinierte Farbe in der Palette, Format:  \"alias;fg,bg\" wobei "
+"alias durch einen Farbnamen ersetzt werden kann, fg,bg steht für "
+"\"Vordergrund,Hintergrund\"-Farbe  (Beispiel: \"200,-1\")  (alle Einträge in "
+"diesem Format sind optional und die Reihenfolge der Einträge ist frei "
+"wählbar)"
+
+#, c-format
+msgid "%sError: palette option must be numeric"
+msgstr "%sFehler: Option Palette muss numerisch sein"
+
 msgid "Notify level for buffer"
 msgstr "Benachrichtigungsstufe für Buffer"

@@ -1871,9 +1947,6 @@ msgstr ""
 "\"${Farbe}\" ist es möglich eine Farbauswahl zu treffen, zum Beispiel eine "
 "französische Uhr: \"${lightblue}%H${white}%M${lightred}%S\""

-msgid "number of colors to use for nicks colors"
-msgstr "Anzahl der Farben die für die Nicknamen genutzt werden sollen"
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -2192,42 +2265,15 @@ msgstr "Farbe der Channel-Namens"
 msgid "text color for nicks in chat window"
 msgstr "Farbe für Nicks im Chat-Fenster"

+msgid "text color for nicks (comma separated list of colors)"
+msgstr "Textfarbe für Nicks (durch Kommata getrennte Liste von Farben)"
+
 msgid "text color for local nick in chat window"
 msgstr "Textfarbe für den eigenen Nicknamen, im lokalen Chat-Fenster."

 msgid "text color for other nick in private buffer"
 msgstr "Farbe des anderen Nicknamens in einem privaten Buffer"

-msgid "text color #1 for nick"
-msgstr "Textfarbe #1 für Nick"
-
-msgid "text color #2 for nick"
-msgstr "Textfarbe #2 für Nick"
-
-msgid "text color #3 for nick"
-msgstr "Textfarbe #3 für Nick"
-
-msgid "text color #4 for nick"
-msgstr "Textfarbe #4 für Nick"
-
-msgid "text color #5 for nick"
-msgstr "Textfarbe #5 für Nick"
-
-msgid "text color #6 for nick"
-msgstr "Textfarbe #6 für Nick"
-
-msgid "text color #7 for nick"
-msgstr "Textfarbe #7 für Nick"
-
-msgid "text color #8 for nick"
-msgstr "Textfarbe #8 für Nick"
-
-msgid "text color #9 for nick"
-msgstr "Textfarbe #9 für Nick"
-
-msgid "text color #10 for nick"
-msgstr "Textfarbe #10 für Nick"
-
 msgid "text color for hostnames"
 msgstr "Textfarbe für Host-Namen"

@@ -2353,8 +2399,8 @@ msgstr ""

 msgid "display count for each partial completion in bar item"
 msgstr ""
-"Zeige einen Zähler für jede teilweise, automatische Vervollständigung in der "
-"Bar-Item an"
+"Zeigt bei einer teilweisen Vervollständigung die Anzahl der jeweiligen "
+"Möglichkeiten in der Bar-Item an"

 msgid "maximum number of lines in history per buffer (0 = unlimited)"
 msgstr ""
@@ -2366,7 +2412,8 @@ msgstr "maximale Anzahl an Befehlen im Verlauf (0: kein Begrenzung)"

 msgid "maximum number of visited buffers to keep in memory"
 msgstr ""
-"maximale Anzahl an besuchten Buffern, die im Speicher gehalten werden sollen"
+"maximale Anzahl an besuchten Buffern welche im Speicher gehalten werden "
+"sollen"

 msgid ""
 "maximum number of commands to display by default in history listing (0 = "
@@ -2568,6 +2615,11 @@ msgstr "Byte"
 msgid "debug: removing file: %s"
 msgstr "debug: lösche Datei: %s"

+#. TRANSLATORS: "%s" is translation of "second" or "seconds"
+#, c-format
+msgid "Upgrade done (%.02f %s)"
+msgstr "Upgrade durchgeführt (%.02f %s)"
+
 #, c-format
 msgid "%sError upgrading WeeChat with file \"%s\":"
 msgstr "%sFehler bei der Aktualisierung von WeeChat, mit der Datei \"%s\":"
@@ -2637,6 +2689,40 @@ msgstr ""
 "lese - falsche Signatur (das Dateiformat wurde vermutlich seit der letzten "
 "Version verändern)"

+msgid "Terminal infos:"
+msgstr "Terminal Informationen:"
+
+msgid "No color support in terminal."
+msgstr "Keine Unterstützung von Farben im Terminal."
+
+msgid "Default colors:"
+msgstr "Standardfarben:"
+
+msgid ""
+"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] "
+"Toggle colors"
+msgstr ""
+"WeeChat Farben | Aktionen: [R] aktualisieren [Q] Buffer schließen | Befehle: "
+"[alt-c] wechselt Farben"
+
+msgid "Terminal colors:"
+msgstr "Terminal-Farben:"
+
+msgid "WeeChat colors:"
+msgstr "WeeChat Farben:"
+
+msgid "fixed color"
+msgstr "vorgegebene Farbe"
+
+msgid "WeeChat basic colors:"
+msgstr "WeeChat Basisfarben:"
+
+msgid "Nick colors:"
+msgstr "Farben für Nicks:"
+
+msgid "Palette colors:"
+msgstr "Farbpalette:"
+
 msgid "Terminal lost, exiting WeeChat..."
 msgstr "Terminal verloren, beende WeeChat..."

@@ -2647,9 +2733,6 @@ msgstr "Signal %s empfangen, beende WeeChat..."
 msgid "Signal SIGHUP received, reloading configuration files"
 msgstr "Signal SIGHUP empfangen, lese Konfigurationsdateien neu"

-msgid "Terminal infos:"
-msgstr "Terminal Informationen:"
-
 #, c-format
 msgid "  TERM='%s', size: %dx%d"
 msgstr "  TERM='%s', Größe: %dx%d"
@@ -3088,9 +3171,8 @@ msgstr "Demo-Nachricht, ohne Präfix"
 msgid "%sdemo message with error prefix"
 msgstr "%sDemo-Nachricht mit fehlerhaftem Präfix"

-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr "Farben: %s Buffer %s Nick1 %s Nick2 %s Nick3 %s Nick4"
+msgid "colors"
+msgstr "Farben"

 msgid "Available infos:"
 msgstr "verfügbare Informationen:"
@@ -3358,6 +3440,12 @@ msgstr "%s%s: Falsche Nummer für /ignore-Regel"
 msgid "%s%s: unknown option for \"%s\" command"
 msgstr "%s%s: Unbekannte Option für den Befehl \"%s\""

+#, c-format
+msgid "%s%s: command \"%s\" must be executed on connected irc server"
+msgstr ""
+"%s%s: Der Befehl \"%s\" kann nur bei einem verbundenen IRC-Server ausgeführt "
+"werden"
+
 #, c-format
 msgid "%s%s: mask must begin with nick"
 msgstr "%s%s: Die Maske muss mit einem Nick beginnen"
@@ -3605,15 +3693,13 @@ msgstr ""
 msgid "connect to IRC server(s)"
 msgstr "Mit IRC-Server(n) verbinden"

-#, fuzzy
 msgid ""
 "[servername [servername ...] | hostname[/port] [-option[=value]] [-nooption] "
 "| -all | -open] [-nojoin] [-switch]"
 msgstr ""
-"[-all [-nojoin] | -open [-nojoin] | servername [servername ...] [-nojoin] | "
-"hostname[/port] [-option[=value]] [-nooption]]"
+"[servername [servername ...] | hostname[/port] [-option[=value]] [-nooption] "
+"| -all | -open] [-nojoin] [-switch]"

-#, fuzzy
 msgid ""
 "servername: internal server name to connect (server must have been created "
 "by /server add)\n"
@@ -3636,25 +3722,28 @@ msgid ""
 "  /connect my.server.org/6697 -ssl -password=test\n"
 "  /connect -switch"
 msgstr ""
-"      -all: Verbindet mit allen Servern\n"
-"     -open: stellt eine Verbindung zu allen geöffneten Servern her, zu denen "
-"es aktuell keine Verbindung gibt\n"
-"servername: intern genutzter Servername, mit dem verbunden werden soll (Der "
+"servername: intern genutzter Servername mit dem verbunden werden soll (Der "
 "Server muss zuerst mittels \"/server add\" angelegt werden)\n"
-"   -nojoin: betrete (/join) keinen Channel (auch wenn die Funktion \"autojoin"
-"\" aktiviert sein sollte)\n"
-"  hostname: Hostname, oder IP, eines Servers\n"
+"  hostname: Hostname oder IP eines Servers (damit erstelt man ausschließlich "
+"einen TEMPORÄREN Server)\n"
 "      port: Port den der Server nutzen soll (Standardport: 6667)\n"
 "    option: legt die Optionen für den Server fest (die Boolean-Optionen "
 "können weggelassen werden)\n"
 "  nooption: stellt die Boolean Option auf \"off\" (Beispiel: -nossl)\n"
+"      -all: Verbindet mit allen Servern\n"
+"     -open: stellt eine Verbindung zu allen geöffneten Servern her zu denen "
+"es aktuell keine Verbindung gibt\n"
+"   -nojoin: Channel(s) werden nicht betreten (auch falls die Funktion "
+"\"autojoin\" aktiviert sein sollte)\n"
+"   -switch: wechselt zur nächsten Server-Adresse\n"
 "\n"
 "Beispiele:\n"
 "  /connect freenode\n"
 "  /connect irc.oftc.net/6667\n"
 "  /connect irc6.oftc.net/6667 -ipv6\n"
 "  /connect irc6.oftc.net/6697 -ipv6 -ssl\n"
-"  /connect my.server.org/6697 -ssl -password=test"
+"  /connect my.server.org/6697 -ssl -password=test\n"
+"  /connect -switch"

 msgid "send a CTCP message (Client-To-Client Protocol)"
 msgstr "CTCP-Nachricht verschicken"
@@ -3820,25 +3909,29 @@ msgstr "Nickname: Nickname"
 msgid "join a channel"
 msgstr "einen Channel betreten"

-msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
-msgstr "[channel1[,channel2[,channel3]] [key1[,key2]]]"
+msgid "[-server server] [channel1[,channel2[,channel3]] [key1[,key2]]]"
+msgstr "[-server server] [channel1[,channel2[,channel3]] [key1[,key2]]]"

 msgid ""
+" server: send to this server (internal name)\n"
 "channel: channel name to join\n"
 "    key: key to join the channel (channels with a key must be the first in "
 "list)\n"
 "\n"
 "Examples:\n"
 "  /join #weechat\n"
-"  /join #protectedchan,#weechat key"
+"  /join #protectedchan,#weechat key\n"
+"  /join -server freenode #weechat"
 msgstr ""
+" server: sendet an diesen Server (interner Name)\n"
 "channel: Name des Channels der betreten werden soll\n"
 "    key: Zugriffsschlüssel für einen Channel (Channels die einen "
 "Zugriffsschlüssel benötigen müssen zuerst aufgeführt werden)\n"
 "\n"
-"Examples:\n"
+"Beispiele:\n"
 "  /join #weechat\n"
-"  /join #geschützterChannel,#weechat Zugriffsschlüssel"
+"  /join #geschützterChannel,#weechat Zugriffsschlüssel\n"
+"  /join -server freenode #weechat"

 msgid "forcibly remove a user from a channel"
 msgstr "Einen User aus einem Channel herauskicken"
@@ -4207,21 +4300,20 @@ msgstr ""
 msgid "reconnect to server(s)"
 msgstr "Mit einem oder mehreren Server(n) erneut verbinden"

-#, fuzzy
 msgid "[servername [servername ...] | -all] [-nojoin] [-switch]"
-msgstr "[-all [-nojoin] | Servername [Servername ...] [-nojoin]]"
+msgstr "[servername [servername ...] | -all] [-nojoin] [-switch]"

-#, fuzzy
 msgid ""
 "servername: server name to reconnect\n"
 "      -all: reconnect to all servers\n"
 "   -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
 "   -switch: switch to next server address"
 msgstr ""
+"Servername: Servername zu welchem neu verbunden werden soll\n"
 "      -all: mit allen Servern neu verbinden\n"
-"Servername: Servername mit welchem verbunden werden soll\n"
-"   -nojoin: Channels werden nicht betreten (selbst wenn autojoin für diesen "
-"Server aktiv ist)"
+"   -nojoin: Channels werden nicht betreten (auch falls autojoin für diesen "
+"Server aktiviert ist)\n"
+"   -switch: wechselt zur nächsten Server-Adresse"

 msgid "tell the server to reload its config file"
 msgstr "Den Server dazu bringen seine Konfigurationsdatei neu zu laden"
@@ -4589,12 +4681,6 @@ msgstr ""
 "%s%s: Der Befehl \"%s\" kann nur im IRC-Buffer ausgeführt werden (Server "
 "oder Channel)"

-#, c-format
-msgid "%s%s: command \"%s\" must be executed on connected irc server"
-msgstr ""
-"%s%s: Der Befehl \"%s\" kann nur bei einem verbundenen IRC-Server ausgeführt "
-"werden"
-
 msgid "current IRC server"
 msgstr "aktueller IRC-Server"

@@ -6259,6 +6345,9 @@ msgstr "WeeChat Seite"
 msgid "WeeChat site, download page"
 msgstr "Download-Seite von WeeChat"

+msgid "1 if WeeChat is upgrading (command `/upgrade`)"
+msgstr "1 falls WeeChat ein Upgrade durchführt (Befehl  `/upgrade`)"
+
 msgid "terminal charset"
 msgstr "Terminal Zeichensatz"

@@ -7461,6 +7550,42 @@ msgstr "Hashtable (Ausgabe)"
 msgid "Pointer"
 msgstr "Pointer"

+#~ msgid "number of colors to use for nicks colors"
+#~ msgstr "Anzahl der Farben die für die Nicknamen genutzt werden sollen"
+
+#~ msgid "text color #1 for nick"
+#~ msgstr "Textfarbe #1 für Nick"
+
+#~ msgid "text color #2 for nick"
+#~ msgstr "Textfarbe #2 für Nick"
+
+#~ msgid "text color #3 for nick"
+#~ msgstr "Textfarbe #3 für Nick"
+
+#~ msgid "text color #4 for nick"
+#~ msgstr "Textfarbe #4 für Nick"
+
+#~ msgid "text color #5 for nick"
+#~ msgstr "Textfarbe #5 für Nick"
+
+#~ msgid "text color #6 for nick"
+#~ msgstr "Textfarbe #6 für Nick"
+
+#~ msgid "text color #7 for nick"
+#~ msgstr "Textfarbe #7 für Nick"
+
+#~ msgid "text color #8 for nick"
+#~ msgstr "Textfarbe #8 für Nick"
+
+#~ msgid "text color #9 for nick"
+#~ msgstr "Textfarbe #9 für Nick"
+
+#~ msgid "text color #10 for nick"
+#~ msgstr "Textfarbe #10 für Nick"
+
+#~ msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
+#~ msgstr "Farben: %s Buffer %s Nick1 %s Nick2 %s Nick3 %s Nick4"
+
 #~ msgid ""
 #~ "  server: send to this server (internal name)\n"
 #~ "nickname: user to send notice to\n"
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-09 22:59+0100\n"
+"POT-Creation-Date: 2011-01-01 18:04+0100\n"
 "PO-Revision-Date: 2010-11-06 11:56+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -32,9 +32,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

 #. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Copyright (C) 2003-2010, compiled on %s %s\n"
+"WeeChat %s Copyright %s, compiled on %s %s\n"
 "Developed by Sebastien Helleu <flashcode@flashtux.org> - %s"
 msgstr ""
 "%s Copyright (C) 2003-2010, compilado en %s %s\n"
@@ -44,8 +44,10 @@ msgstr ""
 msgid "Usage: %s [option...] [plugin:option...]\n"
 msgstr "Uso: %s [opción...] [plugin:opción...]\n"

+#, fuzzy
 msgid ""
 "  -a, --no-connect  disable auto-connect to servers at startup\n"
+"  -c, --colors      display default colors in terminal\n"
 "  -d, --dir <path>  set WeeChat home directory (default: ~/.weechat)\n"
 "  -h, --help        this help\n"
 "  -k, --keys        display WeeChat default keys\n"
@@ -144,10 +146,6 @@ msgstr "  %s (plugin: %s)"
 msgid "No bar item defined"
 msgstr "Ningún elemento definido"

-#, c-format
-msgid "%sError: missing arguments for \"%s\" command"
-msgstr "%sError: faltan argumentos para el comando \"%s\""
-
 #, c-format
 msgid "%sNot enough memory"
 msgstr "%sNo hay suficiente memoria"
@@ -221,6 +219,14 @@ msgstr "Variables locales para el buffer \"%s\":"
 msgid "No local variable defined for buffer \"%s\""
 msgstr "Ninguna variable local definida para el buffer \"%s\""

+#, c-format
+msgid "%sInvalid pair number \"%s\" (must be between %d and %d)"
+msgstr ""
+
+#, c-format
+msgid "%sColor \"%s\" is not defined in palette"
+msgstr ""
+
 #, c-format
 msgid "%sPlugin \"%s\" not found"
 msgstr "%sPlugin \"%s\" no encontrado"
@@ -675,6 +681,10 @@ msgstr "%sError: opción de configuración \"%s\" no encontrada"
 msgid "Option changed: "
 msgstr "Opción cambiada: "

+#, fuzzy
+msgid "Option created: "
+msgstr "Opción cambiada: "
+
 msgid "Option changed"
 msgstr "Opción cambiada"

@@ -996,6 +1006,32 @@ msgstr ""
 "  ir al buffer siguiente:\n"
 "    /buffer +1"

+msgid "define custom colors and display palette of colors"
+msgstr ""
+
+msgid "[add pair [alias] [fg,bg]] | [del pair] | switch"
+msgstr ""
+
+msgid ""
+"   add: add a color pair\n"
+"   del: delete a color pair\n"
+"switch: switch WeeChat/terminal colors\n"
+"  pair: pair number (>= 1)\n"
+" alias: alias name for color (for example: \"orange\")\n"
+" fg,bg: foreground and background pair number (-1 for default terminal "
+"foreground or background)\n"
+"\n"
+"Without argument, this command displays colors in a new buffer.\n"
+"\n"
+"Examples:\n"
+"  add color 214 with alias \"orange\":\n"
+"    /color add 214 orange\n"
+"  add color 250 with orange on blue:\n"
+"    /color add 250 214,4 orange_blue\n"
+"  delete color 214:\n"
+"    /color del 214"
+msgstr ""
+
 msgid "launch explicit WeeChat or plugin command"
 msgstr "lanza explícitamente un comando de WeeChat o plugin"

@@ -1689,6 +1725,10 @@ msgstr ""
 "  desplazar al principio del día actual:\n"
 "    /window scroll -d"

+#, c-format
+msgid "%sError: missing arguments for \"%s\" command"
+msgstr "%sError: faltan argumentos para el comando \"%s\""
+
 msgid "names of buffers"
 msgstr "nombres de los buffers"

@@ -1704,6 +1744,10 @@ msgstr "propiedades del buffer que pueden configurarse"
 msgid "properties that can be read on a buffer"
 msgstr "propiedades del buffer que pueden leerse"

+#, fuzzy
+msgid "color pairs"
+msgstr "color"
+
 msgid "configuration files"
 msgstr "archivos de configuración"

@@ -1773,6 +1817,16 @@ msgstr "\t\tNuevo día, %s"
 msgid "debug level for plugin (\"core\" for WeeChat core)"
 msgstr "nivel de depurado para el plugin (\"core\" para el núcleo de WeeChat)"

+msgid ""
+"custom color in palette, format is: \"alias;fg,bg\" where alias is color "
+"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything "
+"is optional in this format and order is not important)"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%sError: palette option must be numeric"
+msgstr "%sError: no se pudo guardar las opciones en %s"
+
 msgid "Notify level for buffer"
 msgstr "Nivel de notificación para el buffer"

@@ -1816,9 +1870,6 @@ msgstr ""
 "formato de hora en el registro (ver el manual de strftime para los "
 "especificadores de fecha/hora)"

-msgid "number of colors to use for nicks colors"
-msgstr "número de colores para usar en los colores de nombres de usuario"
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -2116,42 +2167,16 @@ msgstr "color para los nombres de los canales"
 msgid "text color for nicks in chat window"
 msgstr "color para los apodos en la ventana de conversación"

+#, fuzzy
+msgid "text color for nicks (comma separated list of colors)"
+msgstr "color para los apodos en la ventana de conversación"
+
 msgid "text color for local nick in chat window"
 msgstr "color para el apodo propio en la ventana de conversación"

 msgid "text color for other nick in private buffer"
 msgstr "color para el otro apodo en una conversación privada"

-msgid "text color #1 for nick"
-msgstr "color para el apodo #1"
-
-msgid "text color #2 for nick"
-msgstr "color para el apodo #2"
-
-msgid "text color #3 for nick"
-msgstr "color para el apodo #3"
-
-msgid "text color #4 for nick"
-msgstr "color para el apodo #4"
-
-msgid "text color #5 for nick"
-msgstr "color para el apodo #5"
-
-msgid "text color #6 for nick"
-msgstr "color para el apodo #6"
-
-msgid "text color #7 for nick"
-msgstr "color para el apodo #7"
-
-msgid "text color #8 for nick"
-msgstr "color para el apodo #8"
-
-msgid "text color #9 for nick"
-msgstr "color para el apodo #9"
-
-msgid "text color #10 for nick"
-msgstr "color para el apodo #10"
-
 msgid "text color for hostnames"
 msgstr "color para los hostnames"

@@ -2490,6 +2515,11 @@ msgstr "byte"
 msgid "debug: removing file: %s"
 msgstr "depurado: removiendo el archivo: %s"

+#. TRANSLATORS: "%s" is translation of "second" or "seconds"
+#, c-format
+msgid "Upgrade done (%.02f %s)"
+msgstr ""
+
 #, c-format
 msgid "%sError upgrading WeeChat with file \"%s\":"
 msgstr "%sError al actualizar WeeChat con el archivo \"%s\":"
@@ -2560,6 +2590,45 @@ msgstr ""
 "lectura - firma incorrecta (el formato del archivo de actualización puede "
 "haber cambiado desde la última versión)"

+msgid "Terminal infos:"
+msgstr "Información de la terminal:"
+
+msgid "No color support in terminal."
+msgstr ""
+
+#, fuzzy
+msgid "Default colors:"
+msgstr "Atajos predefinidos restaurados"
+
+msgid ""
+"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] "
+"Toggle colors"
+msgstr ""
+
+#, fuzzy
+msgid "Terminal colors:"
+msgstr "Información de la terminal:"
+
+#, fuzzy
+msgid "WeeChat colors:"
+msgstr "fecha de compilación de WeeChat"
+
+#, fuzzy
+msgid "fixed color"
+msgstr "color del texto"
+
+#, fuzzy
+msgid "WeeChat basic colors:"
+msgstr "directorio de WeeChat"
+
+#, fuzzy
+msgid "Nick colors:"
+msgstr "color"
+
+#, fuzzy
+msgid "Palette colors:"
+msgstr "Atajos predefinidos restaurados"
+
 msgid "Terminal lost, exiting WeeChat..."
 msgstr "Se perdió la terminal, cerrando WeeChat..."

@@ -2570,9 +2639,6 @@ msgstr "Señal %s recibida, cerrando WeeChat..."
 msgid "Signal SIGHUP received, reloading configuration files"
 msgstr "Señal SIGHUP recibida, recargando archivos de configuración"

-msgid "Terminal infos:"
-msgstr "Información de la terminal:"
-
 #, c-format
 msgid "  TERM='%s', size: %dx%d"
 msgstr "  TERM='%s', tamaño: %dx%d"
@@ -2993,9 +3059,9 @@ msgstr "mensaje de demostración sin un prefijo"
 msgid "%sdemo message with error prefix"
 msgstr "%smensaje de demostración con prefijo de error"

-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr "colores: %s buffer %s apodo1 %s apodo2 %s apodo3 %s apodo4"
+#, fuzzy
+msgid "colors"
+msgstr "color"

 msgid "Available infos:"
 msgstr "Infos disponibles:"
@@ -3257,6 +3323,10 @@ msgstr "%s%s: número de ignorado incorrecto"
 msgid "%s%s: unknown option for \"%s\" command"
 msgstr "%s%s: opción desconocida para el comando \"%s\""

+#, c-format
+msgid "%s%s: command \"%s\" must be executed on connected irc server"
+msgstr "%s%s: el comando \"%s\"debe ser ejecutado en un servidor irc conectado"
+
 #, c-format
 msgid "%s%s: mask must begin with nick"
 msgstr "%s%s: la máscara debe empezar con el apodo"
@@ -3711,17 +3781,21 @@ msgstr "apodo: apodo"
 msgid "join a channel"
 msgstr "unirse a un canal"

-msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
+#, fuzzy
+msgid "[-server server] [channel1[,channel2[,channel3]] [key1[,key2]]]"
 msgstr "[canal1[,canal2[,canal3]] [clave1[,clave2]]]"

+#, fuzzy
 msgid ""
+" server: send to this server (internal name)\n"
 "channel: channel name to join\n"
 "    key: key to join the channel (channels with a key must be the first in "
 "list)\n"
 "\n"
 "Examples:\n"
 "  /join #weechat\n"
-"  /join #protectedchan,#weechat key"
+"  /join #protectedchan,#weechat key\n"
+"  /join -server freenode #weechat"
 msgstr ""
 "canal: nombre del canal a unirse\n"
 "clave: clave para unirse al canal (canales con clave deben ser los primeros "
@@ -4463,10 +4537,6 @@ msgstr ""
 "%s%s: el comando \"%s\" debe ser ejecutado en un buffer irc (canal o "
 "servidor)"

-#, c-format
-msgid "%s%s: command \"%s\" must be executed on connected irc server"
-msgstr "%s%s: el comando \"%s\"debe ser ejecutado en un servidor irc conectado"
-
 msgid "current IRC server"
 msgstr "servidor IRC actual"

@@ -6068,6 +6138,9 @@ msgstr "sitio web de WeeChat"
 msgid "WeeChat site, download page"
 msgstr "sitio web de WeeChat, página de descarga"

+msgid "1 if WeeChat is upgrading (command `/upgrade`)"
+msgstr ""
+
 msgid "terminal charset"
 msgstr "set de caracteres de la terminal"

@@ -7237,6 +7310,42 @@ msgstr ""
 msgid "Pointer"
 msgstr "Puntero"

+#~ msgid "number of colors to use for nicks colors"
+#~ msgstr "número de colores para usar en los colores de nombres de usuario"
+
+#~ msgid "text color #1 for nick"
+#~ msgstr "color para el apodo #1"
+
+#~ msgid "text color #2 for nick"
+#~ msgstr "color para el apodo #2"
+
+#~ msgid "text color #3 for nick"
+#~ msgstr "color para el apodo #3"
+
+#~ msgid "text color #4 for nick"
+#~ msgstr "color para el apodo #4"
+
+#~ msgid "text color #5 for nick"
+#~ msgstr "color para el apodo #5"
+
+#~ msgid "text color #6 for nick"
+#~ msgstr "color para el apodo #6"
+
+#~ msgid "text color #7 for nick"
+#~ msgstr "color para el apodo #7"
+
+#~ msgid "text color #8 for nick"
+#~ msgstr "color para el apodo #8"
+
+#~ msgid "text color #9 for nick"
+#~ msgstr "color para el apodo #9"
+
+#~ msgid "text color #10 for nick"
+#~ msgstr "color para el apodo #10"
+
+#~ msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
+#~ msgstr "colores: %s buffer %s apodo1 %s apodo2 %s apodo3 %s apodo4"
+
 #~ msgid "[-server server] receiver[,receiver] text"
 #~ msgstr "[-server servidor] destino[,destino] texto"

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005-2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-09 22:59+0100\n"
-"PO-Revision-Date: 2010-12-09 20:22+0100\n"
+"POT-Creation-Date: 2011-01-01 18:04+0100\n"
+"PO-Revision-Date: 2011-01-01 15:54+0100\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -34,10 +34,10 @@ msgstr ""
 #. TRANSLATORS: "%s %s" after "compiled on" is date and time
 #, c-format
 msgid ""
-"%s Copyright (C) 2003-2010, compiled on %s %s\n"
+"WeeChat %s Copyright %s, compiled on %s %s\n"
 "Developed by Sebastien Helleu <flashcode@flashtux.org> - %s"
 msgstr ""
-"%s Copyright (C) 2003-2010, compilé le %s %s\n"
+"WeeChat %s Copyright %s, compilé le %s %s\n"
 "Développé par Sebastien Helleu <flashcode@flashtux.org> - %s"

 #, c-format
@@ -46,6 +46,7 @@ msgstr "Utilisation: %s [option...] [extension:option...]\n"

 msgid ""
 "  -a, --no-connect  disable auto-connect to servers at startup\n"
+"  -c, --colors      display default colors in terminal\n"
 "  -d, --dir <path>  set WeeChat home directory (default: ~/.weechat)\n"
 "  -h, --help        this help\n"
 "  -k, --keys        display WeeChat default keys\n"
@@ -62,6 +63,7 @@ msgid ""
 "                    about possible options)\n"
 msgstr ""
 "  -a, --no-connect  désactiver l'auto-connexion aux serveurs au démarrage\n"
+"  -c, --colors      afficher les couleurs par défaut du terminal\n"
 "  -d, --dir <rep>   définir le répertoire de base pour WeeChat (défaut: ~/."
 "weechat)\n"
 "  -h, --help        cette aide\n"
@@ -145,10 +147,6 @@ msgstr "  %s (extension: %s)"
 msgid "No bar item defined"
 msgstr "Pas d'objet de barre défini"

-#, c-format
-msgid "%sError: missing arguments for \"%s\" command"
-msgstr "%sErreur: paramètres manquants pour la commande \"%s\""
-
 #, c-format
 msgid "%sNot enough memory"
 msgstr "%sPas assez de mémoire"
@@ -222,6 +220,14 @@ msgstr "Variables locales pour le tampon \"%s\":"
 msgid "No local variable defined for buffer \"%s\""
 msgstr "Pas de variable locale définie pour le tampon \"%s\""

+#, c-format
+msgid "%sInvalid pair number \"%s\" (must be between %d and %d)"
+msgstr "%sNuméro de paire invalide \"%s\" (doit être entre %d et %d)"
+
+#, c-format
+msgid "%sColor \"%s\" is not defined in palette"
+msgstr "%sLa couleur \"%s\" n'est pas définie dans la palette"
+
 #, c-format
 msgid "%sPlugin \"%s\" not found"
 msgstr "%sExtension \"%s\" non trouvée"
@@ -679,6 +685,9 @@ msgstr "%sErreur: option de configuration \"%s\" non trouvée"
 msgid "Option changed: "
 msgstr "Option modifiée: "

+msgid "Option created: "
+msgstr "Option créée: "
+
 msgid "Option changed"
 msgstr "Option modifiée"

@@ -1000,6 +1009,50 @@ msgstr ""
 "  aller au tampon suivant:\n"
 "    /buffer +1"

+msgid "define custom colors and display palette of colors"
+msgstr ""
+"définir des couleurs personnalisées et afficher la palette des couleurs"
+
+msgid "[add pair [alias] [fg,bg]] | [del pair] | switch"
+msgstr "[add paire [alias] [fg,bg]] | [del paire] | switch"
+
+msgid ""
+"   add: add a color pair\n"
+"   del: delete a color pair\n"
+"switch: switch WeeChat/terminal colors\n"
+"  pair: pair number (>= 1)\n"
+" alias: alias name for color (for example: \"orange\")\n"
+" fg,bg: foreground and background pair number (-1 for default terminal "
+"foreground or background)\n"
+"\n"
+"Without argument, this command displays colors in a new buffer.\n"
+"\n"
+"Examples:\n"
+"  add color 214 with alias \"orange\":\n"
+"    /color add 214 orange\n"
+"  add color 250 with orange on blue:\n"
+"    /color add 250 214,4 orange_blue\n"
+"  delete color 214:\n"
+"    /color del 214"
+msgstr ""
+"   add: ajouter une paire de couleur\n"
+"   del: supprimer une paire de couleur\n"
+"switch: basculer entre les couleurs WeeChat et du terminal\n"
+" paire: numéro de paire (>= 1)\n"
+" alias: nom d'alias pour la couleur (par exemple: \"orange\")\n"
+" fg,bg: numéro de paire pour le texte et le fond (-1 pour la couleur par "
+"défaut du terminal pour le texte ou le fond)\n"
+"\n"
+"Sans paramètre, cette commande affiche les couleurs dans un nouveau tampon.\n"
+"\n"
+"Exemples:\n"
+"  ajouter la couleur 214 avec l'alias \"orange\":\n"
+"    /color add 214 orange\n"
+"  ajouter la couleur 250 avec orange sur bleu:\n"
+"    /color add 250 214,4 orange_bleu\n"
+"  supprimer la couleur 214:\n"
+"    /color del 214"
+
 msgid "launch explicit WeeChat or plugin command"
 msgstr "lancer explicitement une commande WeeChat ou d'une extension"

@@ -1704,6 +1757,10 @@ msgstr ""
 "  défilement jusqu'au début du jour courant:\n"
 "    /window scroll -d"

+#, c-format
+msgid "%sError: missing arguments for \"%s\" command"
+msgstr "%sErreur: paramètres manquants pour la commande \"%s\""
+
 msgid "names of buffers"
 msgstr "noms des tampons"

@@ -1719,6 +1776,9 @@ msgstr "propriétés qui peuvent être changées sur un tampon"
 msgid "properties that can be read on a buffer"
 msgstr "propriétés qui peuvent être lues sur un tampon"

+msgid "color pairs"
+msgstr "paires de couleur"
+
 msgid "configuration files"
 msgstr "fichiers de configuration"

@@ -1789,6 +1849,20 @@ msgstr "\t\tJour changé: %s"
 msgid "debug level for plugin (\"core\" for WeeChat core)"
 msgstr "niveau de debug pour l'extension (\"core\" pour le coeur de WeeChat)"

+msgid ""
+"custom color in palette, format is: \"alias;fg,bg\" where alias is color "
+"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything "
+"is optional in this format and order is not important)"
+msgstr ""
+"couleur personnalisée dans la palette, le format est: \"alias;fg,bg\" où "
+"alias est le nom de la couleur, fg,bg est \"texte,fond\" (par exemple: "
+"\"200,-1\") (tout est optionnel dans ce format et l'ordre n'est pas "
+"important)"
+
+#, c-format
+msgid "%sError: palette option must be numeric"
+msgstr "%sErreur: l'option de palette doit être numérique"
+
 msgid "Notify level for buffer"
 msgstr "Niveau de notification pour le tampon"

@@ -1836,9 +1910,6 @@ msgstr ""
 "format \"${couleur}\", par exemple l'heure française: \"${lightblue}%H"
 "${white}%M${lightred}%S\""

-msgid "number of colors to use for nicks colors"
-msgstr "nombre de couleurs à utiliser pour les couleurs des pseudos"
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -2144,42 +2215,17 @@ msgstr "couleur du texte pour le nom des canaux"
 msgid "text color for nicks in chat window"
 msgstr "couleur du texte pour l'heure dans la fenêtre de discussion"

+msgid "text color for nicks (comma separated list of colors)"
+msgstr ""
+"couleur du texte pour les pseudos (liste de couleurs séparées par une "
+"virgule)"
+
 msgid "text color for local nick in chat window"
 msgstr "couleur du texte pour le pseudo local dans la fenêtre de discussion"

 msgid "text color for other nick in private buffer"
 msgstr "couleur du texte pour l'autre pseudo dans le tampon privée"

-msgid "text color #1 for nick"
-msgstr "couleur du texte n°1 pour le pseudo"
-
-msgid "text color #2 for nick"
-msgstr "couleur du texte n°2 pour le pseudo"
-
-msgid "text color #3 for nick"
-msgstr "couleur du texte n°3 pour le pseudo"
-
-msgid "text color #4 for nick"
-msgstr "couleur du texte n°4 le pseudo"
-
-msgid "text color #5 for nick"
-msgstr "couleur du texte n°5 pour le pseudo"
-
-msgid "text color #6 for nick"
-msgstr "couleur du texte n°6 pour le pseudo"
-
-msgid "text color #7 for nick"
-msgstr "couleur du texte n°7 pour le pseudo"
-
-msgid "text color #8 for nick"
-msgstr "couleur du texte n°8 pour le pseudo"
-
-msgid "text color #9 for nick"
-msgstr "couleur du texte n°9 pour le pseudo"
-
-msgid "text color #10 for nick"
-msgstr "couleur du texte n°10 pour le pseudo"
-
 msgid "text color for hostnames"
 msgstr "couleur du texte pour les noms d'hôtes"

@@ -2529,6 +2575,11 @@ msgstr "octet"
 msgid "debug: removing file: %s"
 msgstr "debug: suppression du fichier: %s"

+#. TRANSLATORS: "%s" is translation of "second" or "seconds"
+#, c-format
+msgid "Upgrade done (%.02f %s)"
+msgstr "Mise à jour terminée (%.02f %s)"
+
 #, c-format
 msgid "%sError upgrading WeeChat with file \"%s\":"
 msgstr "%sErreur de mise à jour de WeeChat avec le fichier \"%s\":"
@@ -2598,6 +2649,40 @@ msgstr ""
 "lecture - mauvaise signature (le format de fichier upgrade a peut-être "
 "changé depuis la dernière version)"

+msgid "Terminal infos:"
+msgstr "Infos sur le terminal:"
+
+msgid "No color support in terminal."
+msgstr "Pas de support pour la couleur dans le terminal."
+
+msgid "Default colors:"
+msgstr "Couleurs par défaut:"
+
+msgid ""
+"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] "
+"Toggle colors"
+msgstr ""
+"Couleurs WeeChat | Actions: [R] Rafraîchir [Q] Fermer le tampon | Touches: "
+"[alt-c] Basculer les couleurs"
+
+msgid "Terminal colors:"
+msgstr "Couleurs du terminal:"
+
+msgid "WeeChat colors:"
+msgstr "Couleurs WeeChat:"
+
+msgid "fixed color"
+msgstr "couleur fixe"
+
+msgid "WeeChat basic colors:"
+msgstr "Couleurs de base WeeChat:"
+
+msgid "Nick colors:"
+msgstr "Couleurs des pseudos:"
+
+msgid "Palette colors:"
+msgstr "Couleurs de la palette:"
+
 msgid "Terminal lost, exiting WeeChat..."
 msgstr "Terminal perdu, sortie de WeeChat..."

@@ -2608,9 +2693,6 @@ msgstr "Signal %s reçu, sortie de WeeChat..."
 msgid "Signal SIGHUP received, reloading configuration files"
 msgstr "Signal SIGHUP reçu, rechargement des fichiers de configuration"

-msgid "Terminal infos:"
-msgstr "Infos sur le terminal:"
-
 #, c-format
 msgid "  TERM='%s', size: %dx%d"
 msgstr "  TERM='%s', taille: %dx%d"
@@ -3041,9 +3123,8 @@ msgstr "message de démonstration sans préfixe"
 msgid "%sdemo message with error prefix"
 msgstr "%smessage de démonstration avec préfixe d'erreur"

-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr "couleurs: %s tampon %s pseudo1 %s pseudo2 %s pseudo3 %s pseudo4"
+msgid "colors"
+msgstr "couleurs"

 msgid "Available infos:"
 msgstr "Infos disponibles:"
@@ -3306,6 +3387,11 @@ msgstr "%s%s: numéro d'ignore incorrect"
 msgid "%s%s: unknown option for \"%s\" command"
 msgstr "%s%s: option inconnue pour la commande \"%s\""

+#, c-format
+msgid "%s%s: command \"%s\" must be executed on connected irc server"
+msgstr ""
+"%s%s: la commande \"%s\" doit être exécutée sur un serveur irc connecté"
+
 #, c-format
 msgid "%s%s: mask must begin with nick"
 msgstr "%s%s: le masque doit commencer par un pseudo"
@@ -3761,25 +3847,29 @@ msgstr "pseudo: pseudo"
 msgid "join a channel"
 msgstr "joindre un canal"

-msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
-msgstr "[canal1[,canal2[,canal3]] [clé1[,clé2]]]"
+msgid "[-server server] [channel1[,channel2[,channel3]] [key1[,key2]]]"
+msgstr "[-server serveur] [canal1[,canal2[,canal3]] [clé1[,clé2]]]"

 msgid ""
+" server: send to this server (internal name)\n"
 "channel: channel name to join\n"
 "    key: key to join the channel (channels with a key must be the first in "
 "list)\n"
 "\n"
 "Examples:\n"
 "  /join #weechat\n"
-"  /join #protectedchan,#weechat key"
+"  /join #protectedchan,#weechat key\n"
+"  /join -server freenode #weechat"
 msgstr ""
-"canal: nom du canal à rejoindre\n"
-"  clé: clé pour rejoindre le canal (les canaux avec une clé doivent être les "
-"premiers dans la liste)\n"
+"serveur: envoyer à ce serveur (nom interne)\n"
+"  canal: nom du canal à rejoindre\n"
+"    clé: clé pour rejoindre le canal (les canaux avec une clé doivent être "
+"les premiers dans la liste)\n"
 "\n"
 "Exemples:\n"
 "  /join #weechat\n"
-"  /join #protectedchan,#weechat key"
+"  /join #protectedchan,#weechat key\n"
+"  /join -server freenode #weechat"

 msgid "forcibly remove a user from a channel"
 msgstr "retirer par la force un utilisateur d'un canal"
@@ -4527,11 +4617,6 @@ msgstr ""
 "%s%s: la commande \"%s\" doit être exécutée sur un tampon irc (serveur ou "
 "canal)"

-#, c-format
-msgid "%s%s: command \"%s\" must be executed on connected irc server"
-msgstr ""
-"%s%s: la commande \"%s\" doit être exécutée sur un serveur irc connecté"
-
 msgid "current IRC server"
 msgstr "serveur IRC courant"

@@ -6148,6 +6233,9 @@ msgstr "site WeeChat"
 msgid "WeeChat site, download page"
 msgstr "site WeeChat, page de téléchargement"

+msgid "1 if WeeChat is upgrading (command `/upgrade`)"
+msgstr "1 si WeeChat est en cours de mise à jour (commande `/upgrade`)"
+
 msgid "terminal charset"
 msgstr "charset du terminal"

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-09 22:59+0100\n"
+"POT-Creation-Date: 2011-01-01 18:04+0100\n"
 "PO-Revision-Date: 2010-11-05 17:17+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -31,9 +31,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"

 #. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Copyright (C) 2003-2010, compiled on %s %s\n"
+"WeeChat %s Copyright %s, compiled on %s %s\n"
 "Developed by Sebastien Helleu <flashcode@flashtux.org> - %s"
 msgstr ""
 "%s Copyright (C) 2003-2010, fordítva: %s %s\n"
@@ -46,6 +46,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -a, --no-connect  disable auto-connect to servers at startup\n"
+"  -c, --colors      display default colors in terminal\n"
 "  -d, --dir <path>  set WeeChat home directory (default: ~/.weechat)\n"
 "  -h, --help        this help\n"
 "  -k, --keys        display WeeChat default keys\n"
@@ -146,10 +147,6 @@ msgstr "  (nem található bővítőmodul)\n"
 msgid "No bar item defined"
 msgstr "Nincs aliasz definiálva.\n"

-#, fuzzy, c-format
-msgid "%sError: missing arguments for \"%s\" command"
-msgstr "%s hiányzó argumentum a \"%s\" parancsnak\n"
-
 #, fuzzy, c-format
 msgid "%sNot enough memory"
 msgstr "Nincs elég memória az új sorhoz\n"
@@ -225,6 +222,14 @@ msgstr "a pufferek időbélyege"
 msgid "No local variable defined for buffer \"%s\""
 msgstr ""

+#, c-format
+msgid "%sInvalid pair number \"%s\" (must be between %d and %d)"
+msgstr ""
+
+#, c-format
+msgid "%sColor \"%s\" is not defined in palette"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%sPlugin \"%s\" not found"
 msgstr "%s cím \"%s\" nem található\n"
@@ -727,6 +732,10 @@ msgstr "%s a \"%s\" opció nem található\n"
 msgid "Option changed: "
 msgstr "nincs a szobában"

+#, fuzzy
+msgid "Option created: "
+msgstr "nincs a szobában"
+
 #, fuzzy
 msgid "Option changed"
 msgstr "nincs a szobában"
@@ -973,6 +982,32 @@ msgstr ""
 "    ugrás 20 sorral feljebb: /buffer scroll -20\n"
 "   ugrás a #weechat szobára: /buffer #weechat"

+msgid "define custom colors and display palette of colors"
+msgstr ""
+
+msgid "[add pair [alias] [fg,bg]] | [del pair] | switch"
+msgstr ""
+
+msgid ""
+"   add: add a color pair\n"
+"   del: delete a color pair\n"
+"switch: switch WeeChat/terminal colors\n"
+"  pair: pair number (>= 1)\n"
+" alias: alias name for color (for example: \"orange\")\n"
+" fg,bg: foreground and background pair number (-1 for default terminal "
+"foreground or background)\n"
+"\n"
+"Without argument, this command displays colors in a new buffer.\n"
+"\n"
+"Examples:\n"
+"  add color 214 with alias \"orange\":\n"
+"    /color add 214 orange\n"
+"  add color 250 with orange on blue:\n"
+"    /color add 250 214,4 orange_blue\n"
+"  delete color 214:\n"
+"    /color del 214"
+msgstr ""
+
 msgid "launch explicit WeeChat or plugin command"
 msgstr ""

@@ -1479,6 +1514,10 @@ msgstr ""
 "hogy az új ablak hány százaléka lesz a szülőablaknak. Például 25 esetén a "
 "szülőablak negyedét kapjuk."

+#, fuzzy, c-format
+msgid "%sError: missing arguments for \"%s\" command"
+msgstr "%s hiányzó argumentum a \"%s\" parancsnak\n"
+
 #, fuzzy
 msgid "names of buffers"
 msgstr "puffer betöltése sikertelen"
@@ -1498,6 +1537,10 @@ msgstr "puffer betöltése sikertelen"
 msgid "properties that can be read on a buffer"
 msgstr "puffer betöltése sikertelen"

+#, fuzzy
+msgid "color pairs"
+msgstr "üzenetek színe"
+
 #, fuzzy
 msgid "configuration files"
 msgstr "szerver konfigurációs fájljának újraolvastatása"
@@ -1584,6 +1627,16 @@ msgstr "A mai dátum: %s\n"
 msgid "debug level for plugin (\"core\" for WeeChat core)"
 msgstr ""

+msgid ""
+"custom color in palette, format is: \"alias;fg,bg\" where alias is color "
+"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything "
+"is optional in this format and order is not important)"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%sError: palette option must be numeric"
+msgstr "%s nem sikerült a modul opciókat elmenteni\n"
+
 #, fuzzy
 msgid "Notify level for buffer"
 msgstr "szobanév nem található a pufferhez"
@@ -1619,9 +1672,6 @@ msgid ""
 "french time: \"${lightblue}%H${white}%M${lightred}%S\""
 msgstr "új nap kezdetével megjelenő időbélyeg"

-msgid "number of colors to use for nicks colors"
-msgstr "nevek színezéséhez használt színek száma"
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -1898,6 +1948,10 @@ msgstr "szobanevek színe az eseményekben"
 msgid "text color for nicks in chat window"
 msgstr "idő színe a beszédablakban"

+#, fuzzy
+msgid "text color for nicks (comma separated list of colors)"
+msgstr "idő színe a beszédablakban"
+
 #, fuzzy
 msgid "text color for local nick in chat window"
 msgstr "a név előtt megjelenítendő szöveg a beszédablakban"
@@ -1906,46 +1960,6 @@ msgstr "a név előtt megjelenítendő szöveg a beszédablakban"
 msgid "text color for other nick in private buffer"
 msgstr "másik fél nevének színe privát beszélgetésben"

-#, fuzzy
-msgid "text color #1 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #2 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #3 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #4 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #5 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #6 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #7 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #8 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #9 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #10 for nick"
-msgstr "név színe"
-
 #, fuzzy
 msgid "text color for hostnames"
 msgstr "gépnevek színe"
@@ -2292,6 +2306,11 @@ msgstr "byte"
 msgid "debug: removing file: %s"
 msgstr "       IRC(%s)\n"

+#. TRANSLATORS: "%s" is translation of "second" or "seconds"
+#, c-format
+msgid "Upgrade done (%.02f %s)"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%sError upgrading WeeChat with file \"%s\":"
 msgstr "WeeChat frissítése...\n"
@@ -2364,6 +2383,45 @@ msgid ""
 "version)"
 msgstr ""

+msgid "Terminal infos:"
+msgstr ""
+
+msgid "No color support in terminal."
+msgstr ""
+
+#, fuzzy
+msgid "Default colors:"
+msgstr "Alapértelmezett billentyűparancsok visszaállítva\n"
+
+msgid ""
+"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] "
+"Toggle colors"
+msgstr ""
+
+#, fuzzy
+msgid "Terminal colors:"
+msgstr "pufferek kezelése"
+
+#, fuzzy
+msgid "WeeChat colors:"
+msgstr "Konfigurációs fájl elmentve\n"
+
+#, fuzzy
+msgid "fixed color"
+msgstr "üzenetek színe"
+
+#, fuzzy
+msgid "WeeChat basic colors:"
+msgstr "WeeChat Hiba:"
+
+#, fuzzy
+msgid "Nick colors:"
+msgstr "üzenetek színe"
+
+#, fuzzy
+msgid "Palette colors:"
+msgstr "Alapértelmezett billentyűparancsok visszaállítva\n"
+
 msgid "Terminal lost, exiting WeeChat..."
 msgstr ""

@@ -2375,9 +2433,6 @@ msgstr ""
 msgid "Signal SIGHUP received, reloading configuration files"
 msgstr "%s nem sikerült a konfigurációs fájlt elmenteni\n"

-msgid "Terminal infos:"
-msgstr ""
-
 #, c-format
 msgid "  TERM='%s', size: %dx%d"
 msgstr ""
@@ -2760,9 +2815,9 @@ msgstr ""
 msgid "%sdemo message with error prefix"
 msgstr ""

-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr ""
+#, fuzzy
+msgid "colors"
+msgstr "üzenetek színe"

 msgid "Available infos:"
 msgstr ""
@@ -3018,6 +3073,10 @@ msgstr "%s helytelen pufferszám\n"
 msgid "%s%s: unknown option for \"%s\" command"
 msgstr "%s ismeretlen opció a \"%s\" parancsnak\n"

+#, fuzzy, c-format
+msgid "%s%s: command \"%s\" must be executed on connected irc server"
+msgstr "%s \"%s\" parancs nem futtatható a szerverablakban\n"
+
 #, c-format
 msgid "%s%s: mask must begin with nick"
 msgstr ""
@@ -3421,17 +3480,19 @@ msgid "join a channel"
 msgstr "belépés egy szobába"

 #, fuzzy
-msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
+msgid "[-server server] [channel1[,channel2[,channel3]] [key1[,key2]]]"
 msgstr "szoba[,szoba] [kulcs[,kulcs]]"

 msgid ""
+" server: send to this server (internal name)\n"
 "channel: channel name to join\n"
 "    key: key to join the channel (channels with a key must be the first in "
 "list)\n"
 "\n"
 "Examples:\n"
 "  /join #weechat\n"
-"  /join #protectedchan,#weechat key"
+"  /join #protectedchan,#weechat key\n"
+"  /join -server freenode #weechat"
 msgstr ""

 msgid "forcibly remove a user from a channel"
@@ -4162,10 +4223,6 @@ msgstr "%s rossz argumentum a \"%s\" parancsnak\n"
 msgid "%s%s: command \"%s\" must be executed on irc buffer (server or channel)"
 msgstr "%s \"%s\" parancs nem futtatható a szerverablakban\n"

-#, fuzzy, c-format
-msgid "%s%s: command \"%s\" must be executed on connected irc server"
-msgstr "%s \"%s\" parancs nem futtatható a szerverablakban\n"
-
 #, fuzzy
 msgid "current IRC server"
 msgstr "csatlakozás a szerver(ek)hez"
@@ -5705,6 +5762,9 @@ msgstr "WeeChat szlogen"
 msgid "WeeChat site, download page"
 msgstr ""

+msgid "1 if WeeChat is upgrading (command `/upgrade`)"
+msgstr ""
+
 #, fuzzy
 msgid "terminal charset"
 msgstr "pufferek kezelése"
@@ -6869,6 +6929,49 @@ msgstr ""
 msgid "Pointer"
 msgstr "perc"

+#~ msgid "number of colors to use for nicks colors"
+#~ msgstr "nevek színezéséhez használt színek száma"
+
+#, fuzzy
+#~ msgid "text color #1 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #2 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #3 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #4 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #5 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #6 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #7 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #8 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #9 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #10 for nick"
+#~ msgstr "név színe"
+
 #, fuzzy
 #~ msgid "[-server server] receiver[,receiver] text"
 #~ msgstr "fogadó [,fogadó] szöveg"
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-09 22:59+0100\n"
-"PO-Revision-Date: 2010-12-04 11:57+0100\n"
+"POT-Creation-Date: 2011-01-01 18:04+0100\n"
+"PO-Revision-Date: 2010-12-22 11:02+0100\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Italian\n"
@@ -31,9 +31,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"

 #. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Copyright (C) 2003-2010, compiled on %s %s\n"
+"WeeChat %s Copyright %s, compiled on %s %s\n"
 "Developed by Sebastien Helleu <flashcode@flashtux.org> - %s"
 msgstr ""
 "%s Copyright (C) 2003-2010, compilato il %s %s\n"
@@ -45,6 +45,7 @@ msgstr "Utilizzo: %s [opzione...] [plugin:opzione...]\n"

 msgid ""
 "  -a, --no-connect  disable auto-connect to servers at startup\n"
+"  -c, --colors      display default colors in terminal\n"
 "  -d, --dir <path>  set WeeChat home directory (default: ~/.weechat)\n"
 "  -h, --help        this help\n"
 "  -k, --keys        display WeeChat default keys\n"
@@ -61,14 +62,15 @@ msgid ""
 "                    about possible options)\n"
 msgstr ""
 "  -a, --no-connect      disabilta la connessione automatica all'avvio\n"
+"  -c, --colors\t\t mostra i colori predefiniti nel terminale\n"
 "  -d, --dir <percorso>  imposta la cartella principale di WeeChat "
 "(predefinita: ~/.weechat)\n"
 "  -h, --help            mostra questo aiuto\n"
-"  -k, --keys            visualizza i tasti principali di WeeChat\n"
-"  -l,  --license        visualizza la licenza di WeeChat\n"
+"  -k, --keys            mostra i tasti principali di WeeChat\n"
+"  -l,  --license        mostra la licenza di WeeChat\n"
 "  -p, --no-plugin       non carica i plugin all'avvio\n"
 "  -s, --no-script       non carica gli script all'avvio\n"
-"  -v. --version         visualizza la versione di WeeChat\n"
+"  -v. --version         mostra la versione di WeeChat\n"
 "  plugin:opzione        opzione per il plugin\n"
 "                        per esempio, il plugin irc può connettersi\n"
 "                        al server con un url del tipo:\n"
@@ -143,10 +145,6 @@ msgstr "  %s (plugin: %s)"
 msgid "No bar item defined"
 msgstr "Nessun elemento barra definito"

-#, c-format
-msgid "%sError: missing arguments for \"%s\" command"
-msgstr "%sErrore: argomento mancante per il comando \"%s\""
-
 #, c-format
 msgid "%sNot enough memory"
 msgstr "%sSpazio non sufficiente"
@@ -220,6 +218,14 @@ msgstr "Variabili locali per il buffer \"%s\":"
 msgid "No local variable defined for buffer \"%s\""
 msgstr "Nessuna variabile locale definita per il buffer \"%s\""

+#, c-format
+msgid "%sInvalid pair number \"%s\" (must be between %d and %d)"
+msgstr ""
+
+#, c-format
+msgid "%sColor \"%s\" is not defined in palette"
+msgstr ""
+
 #, c-format
 msgid "%sPlugin \"%s\" not found"
 msgstr "%sPlugin \"%s\" non trovato"
@@ -674,6 +680,10 @@ msgstr "%sErrore: opzione di configurazione \"%s\" non trovata"
 msgid "Option changed: "
 msgstr "Opzione modificata: "

+#, fuzzy
+msgid "Option created: "
+msgstr "Opzione modificata: "
+
 msgid "Option changed"
 msgstr "Opzione modificata"

@@ -990,6 +1000,32 @@ msgstr ""
 "  salta al buffer successivo:\n"
 "    /buffer +1"

+msgid "define custom colors and display palette of colors"
+msgstr ""
+
+msgid "[add pair [alias] [fg,bg]] | [del pair] | switch"
+msgstr ""
+
+msgid ""
+"   add: add a color pair\n"
+"   del: delete a color pair\n"
+"switch: switch WeeChat/terminal colors\n"
+"  pair: pair number (>= 1)\n"
+" alias: alias name for color (for example: \"orange\")\n"
+" fg,bg: foreground and background pair number (-1 for default terminal "
+"foreground or background)\n"
+"\n"
+"Without argument, this command displays colors in a new buffer.\n"
+"\n"
+"Examples:\n"
+"  add color 214 with alias \"orange\":\n"
+"    /color add 214 orange\n"
+"  add color 250 with orange on blue:\n"
+"    /color add 250 214,4 orange_blue\n"
+"  delete color 214:\n"
+"    /color del 214"
+msgstr ""
+
 msgid "launch explicit WeeChat or plugin command"
 msgstr "esegui comando o plugin di WeeChat esplicito"

@@ -1695,6 +1731,10 @@ msgstr ""
 "  scorre all'inizio del giorno attuale:\n"
 "     /window scroll -d"

+#, c-format
+msgid "%sError: missing arguments for \"%s\" command"
+msgstr "%sErrore: argomento mancante per il comando \"%s\""
+
 msgid "names of buffers"
 msgstr "nomi dei buffer"

@@ -1710,6 +1750,10 @@ msgstr "proprietà che possono essere impostate su un buffer"
 msgid "properties that can be read on a buffer"
 msgstr "proprietà che possono essere lette su un buffer"

+#, fuzzy
+msgid "color pairs"
+msgstr "colori"
+
 msgid "configuration files"
 msgstr "file di configurazione"

@@ -1780,6 +1824,22 @@ msgstr "\t\tOggi è %s"
 msgid "debug level for plugin (\"core\" for WeeChat core)"
 msgstr "livello di debug per il plugin (\"core\" per il core di WeeChat)"

+#, fuzzy
+msgid ""
+"custom color in palette, format is: \"alias;fg,bg\" where alias is color "
+"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything "
+"is optional in this format and order is not important)"
+msgstr ""
+"colore personalizzato nella tavolozza, il formato è \"alias;fg,bg;r/g/b\" "
+"dove l'alias è il nome del colore, fg,bg sono \"colore di primo piano,colore "
+"di sfondo (esempio: \"200,-1\"), r/g/b la nuova definizone del colore (il "
+"terminale deve supportarla) (tutto è opzionale in questo formato e non "
+"importa l'ordine)"
+
+#, c-format
+msgid "%sError: palette option must be numeric"
+msgstr "%sErrore: l'opzione per la tavolozza deve essere numerica"
+
 msgid "Notify level for buffer"
 msgstr "Livello di notifica per il buffer"

@@ -1816,17 +1876,15 @@ msgstr ""
 "message=messaggi+eventi, highlight=solo eventi, none=non viene mai "
 "visualizzato nella hotlist"

-#, fuzzy
 msgid ""
 "time format for each line displayed in buffers (see man strftime for date/"
 "time specifiers), colors are allowed with format \"${color}\", for example "
 "french time: \"${lightblue}%H${white}%M${lightred}%S\""
 msgstr ""
 "formato dell'ora per ogni riga visualizzata nei buffer (consultare man "
-"strftime per gli specificatori data/ora)"
-
-msgid "number of colors to use for nicks colors"
-msgstr "numero di colori da utilizzare per i colori dei nick"
+"strftime per gli specificatori data/ora), i colori sono consentiti nel "
+"formato \"${colore}\", nell'orario italiano ad esempio: \"${lightblue}%H"
+"${white}%M{lightred}%S\""

 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
@@ -1868,7 +1926,6 @@ msgstr ""
 "le parole potrebbero cominciare o terminare con \"*\" per un riscontro "
 "parziale)"

-#, fuzzy
 msgid ""
 "regular expression used to check if a message has highlight or not, at least "
 "one match in string must be surrounded by word chars (alphanumeric, \"-\", "
@@ -2131,42 +2188,15 @@ msgstr "colore del testo per i nomi dei canali"
 msgid "text color for nicks in chat window"
 msgstr "colore del testo per i nick nella finestra di chat"

+msgid "text color for nicks (comma separated list of colors)"
+msgstr "colore del testo per i nick (elenco separato da virgole di colori)"
+
 msgid "text color for local nick in chat window"
 msgstr "colore del testo per il nick locale nella finestra di chat"

 msgid "text color for other nick in private buffer"
 msgstr "colore del testo per gli altri nick nel buffer privato"

-msgid "text color #1 for nick"
-msgstr "colore del testo #1 per il nick"
-
-msgid "text color #2 for nick"
-msgstr "colore del testo #2 per il nick"
-
-msgid "text color #3 for nick"
-msgstr "colore del testo #3 per il nick"
-
-msgid "text color #4 for nick"
-msgstr "colore del testo #4 per il nick"
-
-msgid "text color #5 for nick"
-msgstr "colore del testo #5 per il nick"
-
-msgid "text color #6 for nick"
-msgstr "colore del testo #6 per il nick"
-
-msgid "text color #7 for nick"
-msgstr "colore del testo #7 per il nick<"
-
-msgid "text color #8 for nick"
-msgstr "colore del testo #8 per il nick<"
-
-msgid "text color #9 for nick"
-msgstr "colore del testo #9 per il nick<"
-
-msgid "text color #10 for nick"
-msgstr "colore del testo #10 per il nick<"
-
 msgid "text color for hostnames"
 msgstr "colore del testo per i nomi host"

@@ -2504,6 +2534,11 @@ msgstr "byte"
 msgid "debug: removing file: %s"
 msgstr "debug: rimozione del file: %s"

+#. TRANSLATORS: "%s" is translation of "second" or "seconds"
+#, c-format
+msgid "Upgrade done (%.02f %s)"
+msgstr ""
+
 #, c-format
 msgid "%sError upgrading WeeChat with file \"%s\":"
 msgstr "%sErrore durante l'aggiornamento di WeeChat con il file \"%s\""
@@ -2574,6 +2609,44 @@ msgstr ""
 "lettura - firma errata (l'aggiornamento del formato del file potrebbe essere "
 "cambiato dall'ultima versione)"

+msgid "Terminal infos:"
+msgstr "Informazioni sul terminale:"
+
+msgid "No color support in terminal."
+msgstr "Nessun supporto al colore nel terminale."
+
+msgid "Default colors:"
+msgstr "Colori predefiniti:"
+
+msgid ""
+"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] "
+"Toggle colors"
+msgstr ""
+
+#, fuzzy
+msgid "Terminal colors:"
+msgstr "Informazioni sul terminale:"
+
+#, fuzzy
+msgid "WeeChat colors:"
+msgstr "data di compilazione di WeeChat"
+
+#, fuzzy
+msgid "fixed color"
+msgstr "colore del testo"
+
+#, fuzzy
+msgid "WeeChat basic colors:"
+msgstr "cartella WeeChat"
+
+#, fuzzy
+msgid "Nick colors:"
+msgstr "colori"
+
+#, fuzzy
+msgid "Palette colors:"
+msgstr "Colori predefiniti:"
+
 msgid "Terminal lost, exiting WeeChat..."
 msgstr "Terminale perduto, chiusura di WeeChat..."

@@ -2584,9 +2657,6 @@ msgstr "Ricevuto segnale %s, chiusura di WeeChat..."
 msgid "Signal SIGHUP received, reloading configuration files"
 msgstr "Ricevuto segnale SIGHUP, caricamento dei file di configurazione"

-msgid "Terminal infos:"
-msgstr "Informazioni sul terminale:"
-
 #, c-format
 msgid "  TERM='%s', size: %dx%d"
 msgstr "  TERM='%s', dimensione %dx%d"
@@ -3011,9 +3081,8 @@ msgstr "messaggio dimostrativo senza prefisso"
 msgid "%sdemo message with error prefix"
 msgstr "%smessaggio dimostrativo con il prefisso di errore"

-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr "colori: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
+msgid "colors"
+msgstr "colori"

 msgid "Available infos:"
 msgstr "Informazioni disponibili:"
@@ -3277,6 +3346,10 @@ msgstr "%s%s: numero di ignore errato"
 msgid "%s%s: unknown option for \"%s\" command"
 msgstr "%s%s: opzione sconosciuta per il comando \"%s\""

+#, c-format
+msgid "%s%s: command \"%s\" must be executed on connected irc server"
+msgstr "%s%s: il comando \"%s\" deve essere eseguito su un server IRC connesso"
+
 #, c-format
 msgid "%s%s: mask must begin with nick"
 msgstr "%s%s: la mask deve iniziare col nick"
@@ -3516,15 +3589,13 @@ msgstr ""
 msgid "connect to IRC server(s)"
 msgstr "connette ad uno o più server IRC"

-#, fuzzy
 msgid ""
 "[servername [servername ...] | hostname[/port] [-option[=value]] [-nooption] "
 "| -all | -open] [-nojoin] [-switch]"
 msgstr ""
-"[-all [-nojoin] | -open [-nojoin] | nome_server [nome_server ...] [-nojoin] "
-"| nome_host[/porta] [-opzione[=valore]] [-nooption]"
+"[nome_server [nome_server ...] | nome_host[/porta] [-opzione[=valore]] [-"
+"nooption] | -all | -open] [-nojoin] [-switch]"

-#, fuzzy
 msgid ""
 "servername: internal server name to connect (server must have been created "
 "by /server add)\n"
@@ -3547,26 +3618,28 @@ msgid ""
 "  /connect my.server.org/6697 -ssl -password=test\n"
 "  /connect -switch"
 msgstr ""
-"       -all: connette a tutti i server definiti nella configurazione\n"
-"     -open: connette a tutti i server aperti ai quali non si è attualmente "
-"connessi\n"
 "nome_server: nome interno del server a cui connettersi (il server deve "
 "essere stato creato con /server add)\n"
-"    -nojoin: non entrare in nessun canale (anche se l'ingresso automatico è "
-"attivo sul server)\n"
 "  nome_host: nome host (oppure IP) del server\n"
 "      porta: porta per il server (6667 è la predefinita)\n"
 "    opzione: imposta opzione per il server (per le opzioni bool, il valore "
 "può essere omesso)\n"
 "   nooption: imposta il valore bool dell'opzione su off (per esempio: -"
 "nossl)\n"
+"       -all: connette a tutti i server definiti nella configurazione\n"
+"     -open: connette a tutti i server aperti ai quali non si è attualmente "
+"connessi\n"
+"    -nojoin: non entrare in nessun canale (anche se l'ingresso automatico è "
+"attivo sul server)\n"
+"    -switch: passa al server successivo\n"
 "\n"
 "Esempi:\n"
 "  /connect freenode\n"
 "  /connect irc.oftc.net/6667\n"
 "  /connect irc6.oftc.net/6667 -ipv6\n"
 "  /connect irc6.oftc.net/6697 -ipv6 -ssl\n"
-"  /connect mio.server.org/6697 -ssl -password=test"
+"  /connect mio.server.org/6697 -ssl -password=test\n"
+"  /connect -switch"

 msgid "send a CTCP message (Client-To-Client Protocol)"
 msgstr "invia un messaggio CTCP (Protocollo Client-A-Client)"
@@ -3729,17 +3802,21 @@ msgstr "nick: nick"
 msgid "join a channel"
 msgstr "entra in un canale"

-msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
+#, fuzzy
+msgid "[-server server] [channel1[,channel2[,channel3]] [key1[,key2]]]"
 msgstr "[canale1[,canale2[,canale3]] [chiave1[,chiave2]]]"

+#, fuzzy
 msgid ""
+" server: send to this server (internal name)\n"
 "channel: channel name to join\n"
 "    key: key to join the channel (channels with a key must be the first in "
 "list)\n"
 "\n"
 "Examples:\n"
 "  /join #weechat\n"
-"  /join #protectedchan,#weechat key"
+"  /join #protectedchan,#weechat key\n"
+"  /join -server freenode #weechat"
 msgstr ""
 "canale: nome del canale in cui entrare\n"
 "chiave: chiave per entrare nel canale (i canali con una chiave devono essere "
@@ -4113,21 +4190,20 @@ msgstr ""
 msgid "reconnect to server(s)"
 msgstr "riconnette a uno (o più) server"

-#, fuzzy
 msgid "[servername [servername ...] | -all] [-nojoin] [-switch]"
-msgstr "[-all [-nojoin] | nome_server [nome_server ...] [-nojoin]]"
+msgstr "[nome_server [nome_server ...] | -all [-nojoin] [switch]"

-#, fuzzy
 msgid ""
 "servername: server name to reconnect\n"
 "      -all: reconnect to all servers\n"
 "   -nojoin: do not join any channel (even if autojoin is enabled on server)\n"
 "   -switch: switch to next server address"
 msgstr ""
-"       -all: riconnetti a tutti i server\n"
 "nome_server: nome del server a cui riconnettersi\n"
+"       -all: riconnetti a tutti i server\n"
 "     nojoin: non entrare in nessun canale (anche se l'ingresso automatico è "
-"abilitato sul server)"
+"abilitato sul server)\n"
+"    -switch: passa al server successivo"

 msgid "tell the server to reload its config file"
 msgstr "chiede al server di ricaricare il proprio file di configurazione"
@@ -4495,10 +4571,6 @@ msgstr ""
 "%s%s: il comando \"%s\" deve essere eseguito su un buffer IRC (server o "
 "canale)"

-#, c-format
-msgid "%s%s: command \"%s\" must be executed on connected irc server"
-msgstr "%s%s: il comando \"%s\" deve essere eseguito su un server IRC connesso"
-
 msgid "current IRC server"
 msgstr "server IRC corrente"

@@ -6113,6 +6185,9 @@ msgstr "sito di WeeChat"
 msgid "WeeChat site, download page"
 msgstr "sito di WeeChat, pagina di download"

+msgid "1 if WeeChat is upgrading (command `/upgrade`)"
+msgstr ""
+
 msgid "terminal charset"
 msgstr "set caratteri terminale"

@@ -6417,7 +6492,6 @@ msgid "[list | listfull | add protocol.name port | del protocol.name | raw]"
 msgstr ""
 "[list | listfull | add protocollo.nome porta | del protocollo.nome | raw]"

-#, fuzzy
 msgid ""
 "         list: list relay clients (only active relays)\n"
 "     listfull: list relay clients (verbose, all relays)\n"
@@ -6436,17 +6510,22 @@ msgid ""
 "  irc proxy, for server \"freenode\":\n"
 "    /relay add irc.freenode 8000"
 msgstr ""
-"         list: elenca i client relay (solo quelli attivi)\n"
-"     listfull: elenca i client relay (dettagliato, tutti i relay)\n"
-"    listrelay: elenca i relay (nome e porta)\n"
-"          add: aggiungi relay per un protocollo + nome\n"
-"          del: rimuovi relay per un protocollo + nome\n"
+"           list: elenca i client relay (solo quelli attivi)\n"
+"       listfull: elenca i client relay (dettagliato, tutti i relay)\n"
+"      listrelay: elenca i relay (nome e porta)\n"
+"            add: aggiungi relay per un protocollo + nome\n"
+"            del: rimuovi relay per un protocollo + nome\n"
 "protocollo.nome: protocollo e nome con cui effettuare il relay\n"
-"               per esempio: irc.freenode\n"
-"        porta: porta utilizzata per il relay\n"
-"\t   raw: apre il buffer con dati Relay\n"
+"                 al momento, è supportato solo il protocollo \"irc\"\n"
+"                 ad esempio: irc.freenode\n"
+"          porta: porta utilizzata per il relay\n"
+"            raw: apre il buffer con dati Relay\n"
 "\n"
-"Senza argomento, il comando apre i buffer con l'elenco dei client relay."
+"Senza argomento, il comando apre i buffer con l'elenco dei client relay.\n"
+"\n"
+"Esempio:\n"
+"  proxy irc, per il server \"freenode\":\n"
+"    /relay add irc.freenode.net 8000"

 msgid "all possible protocol.name for relay plugin"
 msgstr "protocollo.nome possibile per il plugin relay"
@@ -7287,6 +7366,42 @@ msgstr "Tabella hash (output)"
 msgid "Pointer"
 msgstr "Puntatore"

+#~ msgid "number of colors to use for nicks colors"
+#~ msgstr "numero di colori da utilizzare per i colori dei nick"
+
+#~ msgid "text color #1 for nick"
+#~ msgstr "colore del testo #1 per il nick"
+
+#~ msgid "text color #2 for nick"
+#~ msgstr "colore del testo #2 per il nick"
+
+#~ msgid "text color #3 for nick"
+#~ msgstr "colore del testo #3 per il nick"
+
+#~ msgid "text color #4 for nick"
+#~ msgstr "colore del testo #4 per il nick"
+
+#~ msgid "text color #5 for nick"
+#~ msgstr "colore del testo #5 per il nick"
+
+#~ msgid "text color #6 for nick"
+#~ msgstr "colore del testo #6 per il nick"
+
+#~ msgid "text color #7 for nick"
+#~ msgstr "colore del testo #7 per il nick<"
+
+#~ msgid "text color #8 for nick"
+#~ msgstr "colore del testo #8 per il nick<"
+
+#~ msgid "text color #9 for nick"
+#~ msgstr "colore del testo #9 per il nick<"
+
+#~ msgid "text color #10 for nick"
+#~ msgstr "colore del testo #10 per il nick<"
+
+#~ msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
+#~ msgstr "colori: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
+
 #~ msgid ""
 #~ "  server: send to this server (internal name)\n"
 #~ "nickname: user to send notice to\n"
@@ -7314,10 +7429,10 @@ msgstr "Puntatore"
 #~ "nick"

 #~ msgid "path for writing incoming files"
-#~ msgstr "percorso per il salvataggio dei file locali"
+#~ msgstr "percorso per il salvataggio dei file in arrivo"

 #~ msgid ""
 #~ "path for reading files when sending (when no path is specified by user)"
 #~ msgstr ""
-#~ "percorso per la lettura dei file all'invio (se non specificato "
+#~ "percorso per la lettura dei file in fase di invio (se non specificato "
 #~ "dall'utente)"
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-09 22:59+0100\n"
+"POT-Creation-Date: 2011-01-01 18:04+0100\n"
 "PO-Revision-Date: 2010-11-06 11:56+0100\n"
 "Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -33,9 +33,9 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"

 #. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Copyright (C) 2003-2010, compiled on %s %s\n"
+"WeeChat %s Copyright %s, compiled on %s %s\n"
 "Developed by Sebastien Helleu <flashcode@flashtux.org> - %s"
 msgstr ""
 "%s Copyright (C) 2003-2010, skompilowano na %s %s\n"
@@ -45,8 +45,10 @@ msgstr ""
 msgid "Usage: %s [option...] [plugin:option...]\n"
 msgstr "Użycie: %s [argumenty...] [wtyczka:opcje...]\n"

+#, fuzzy
 msgid ""
 "  -a, --no-connect  disable auto-connect to servers at startup\n"
+"  -c, --colors      display default colors in terminal\n"
 "  -d, --dir <path>  set WeeChat home directory (default: ~/.weechat)\n"
 "  -h, --help        this help\n"
 "  -k, --keys        display WeeChat default keys\n"
@@ -146,10 +148,6 @@ msgstr "  %s (wtyczka: %s)"
 msgid "No bar item defined"
 msgstr "Nie zdefiniowano elementów paska"

-#, c-format
-msgid "%sError: missing arguments for \"%s\" command"
-msgstr "%sBłąd: brak argumentów dla komendy \"%s\""
-
 #, c-format
 msgid "%sNot enough memory"
 msgstr "%sZa mało pamięci"
@@ -223,6 +221,14 @@ msgstr "Lokalne zmienne bufora \"%s\":"
 msgid "No local variable defined for buffer \"%s\""
 msgstr "Żadne lokalne zmienne nie zostały zdefiniowane dla bufora \"%s\""

+#, c-format
+msgid "%sInvalid pair number \"%s\" (must be between %d and %d)"
+msgstr ""
+
+#, c-format
+msgid "%sColor \"%s\" is not defined in palette"
+msgstr ""
+
 #, c-format
 msgid "%sPlugin \"%s\" not found"
 msgstr "%sNie odnaleziono wtyczki \"%s\""
@@ -685,6 +691,10 @@ msgstr "%sBłąd: nie znaleziono opcji konfiguracyjnej \"%s\" "
 msgid "Option changed: "
 msgstr "Opcja zmieniona:"

+#, fuzzy
+msgid "Option created: "
+msgstr "Opcja zmieniona:"
+
 msgid "Option changed"
 msgstr "Zmieniono opcję"

@@ -1004,6 +1014,32 @@ msgstr ""
 "  przechodzi do następnego buforu:\n"
 "    /buffer +1"

+msgid "define custom colors and display palette of colors"
+msgstr ""
+
+msgid "[add pair [alias] [fg,bg]] | [del pair] | switch"
+msgstr ""
+
+msgid ""
+"   add: add a color pair\n"
+"   del: delete a color pair\n"
+"switch: switch WeeChat/terminal colors\n"
+"  pair: pair number (>= 1)\n"
+" alias: alias name for color (for example: \"orange\")\n"
+" fg,bg: foreground and background pair number (-1 for default terminal "
+"foreground or background)\n"
+"\n"
+"Without argument, this command displays colors in a new buffer.\n"
+"\n"
+"Examples:\n"
+"  add color 214 with alias \"orange\":\n"
+"    /color add 214 orange\n"
+"  add color 250 with orange on blue:\n"
+"    /color add 250 214,4 orange_blue\n"
+"  delete color 214:\n"
+"    /color del 214"
+msgstr ""
+
 msgid "launch explicit WeeChat or plugin command"
 msgstr "wywołaj wyraźnie komendę WeeChat lub pluginu"

@@ -1696,6 +1732,10 @@ msgstr ""
 "  przewiń do początku obecnego dnia:\n"
 "    /window scroll -d"

+#, c-format
+msgid "%sError: missing arguments for \"%s\" command"
+msgstr "%sBłąd: brak argumentów dla komendy \"%s\""
+
 msgid "names of buffers"
 msgstr "nazwy buforów"

@@ -1711,6 +1751,10 @@ msgstr "właściwości, jakie mogą być ustawione w buforze"
 msgid "properties that can be read on a buffer"
 msgstr "właściwości, jakie moga być przeczytane w buforze"

+#, fuzzy
+msgid "color pairs"
+msgstr "kolor"
+
 msgid "configuration files"
 msgstr "pliki konfiguracyjne"

@@ -1781,6 +1825,16 @@ msgstr "\t\tDzień zmienił się na %s"
 msgid "debug level for plugin (\"core\" for WeeChat core)"
 msgstr "poziom debugowania dla wtyczki (\"core\" dla rdzenia WeeChat)"

+msgid ""
+"custom color in palette, format is: \"alias;fg,bg\" where alias is color "
+"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything "
+"is optional in this format and order is not important)"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%sError: palette option must be numeric"
+msgstr "%sBłąd: nie udało się zapisać ustawień do %s"
+
 msgid "Notify level for buffer"
 msgstr "Poziom powiadomień dla buforu"

@@ -1825,9 +1879,6 @@ msgstr ""
 "format czasu użyty w plikach z logami (zobacz man strftime dla "
 "specyfikatorów daty/czasu)"

-msgid "number of colors to use for nicks colors"
-msgstr "liczba kolorów do użycia dla kolorowania nicków"
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -2121,42 +2172,16 @@ msgstr "kolor nazw kanałów"
 msgid "text color for nicks in chat window"
 msgstr "kolor nicków w oknie rozmowy"

+#, fuzzy
+msgid "text color for nicks (comma separated list of colors)"
+msgstr "kolor nicków w oknie rozmowy"
+
 msgid "text color for local nick in chat window"
 msgstr "kolor lokalnego nicka w oknie rozmowy"

 msgid "text color for other nick in private buffer"
 msgstr "kolor innego nicka w prywatnym buforze"

-msgid "text color #1 for nick"
-msgstr "kolor #1 nicka"
-
-msgid "text color #2 for nick"
-msgstr "kolor #2 nicka"
-
-msgid "text color #3 for nick"
-msgstr "kolor #3 nicka"
-
-msgid "text color #4 for nick"
-msgstr "kolor #4 nicka"
-
-msgid "text color #5 for nick"
-msgstr "kolor #5 nicka"
-
-msgid "text color #6 for nick"
-msgstr "kolor #6 nicka"
-
-msgid "text color #7 for nick"
-msgstr "kolor #7 nicka"
-
-msgid "text color #8 for nick"
-msgstr "kolor #8 nicka"
-
-msgid "text color #9 for nick"
-msgstr "kolor #9 nicka"
-
-msgid "text color #10 for nick"
-msgstr "kolor #10 nicka"
-
 msgid "text color for hostnames"
 msgstr "kolor nazw hostów"

@@ -2488,6 +2513,11 @@ msgstr "bajt"
 msgid "debug: removing file: %s"
 msgstr "debug: usuwam plik: %s"

+#. TRANSLATORS: "%s" is translation of "second" or "seconds"
+#, c-format
+msgid "Upgrade done (%.02f %s)"
+msgstr ""
+
 #, c-format
 msgid "%sError upgrading WeeChat with file \"%s\":"
 msgstr "%sBłąd przy uaktualnianiu WeeChat z użyciem pliku \"%s\":"
@@ -2556,6 +2586,45 @@ msgid ""
 msgstr ""
 "odczyt - zła sygnatura (format pliku mógł ulec zmianie od poprzedniej wersji)"

+msgid "Terminal infos:"
+msgstr "Informacje terminala:"
+
+msgid "No color support in terminal."
+msgstr ""
+
+#, fuzzy
+msgid "Default colors:"
+msgstr "Przywrócono domyślne przypisania klawiszy"
+
+msgid ""
+"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] "
+"Toggle colors"
+msgstr ""
+
+#, fuzzy
+msgid "Terminal colors:"
+msgstr "Informacje terminala:"
+
+#, fuzzy
+msgid "WeeChat colors:"
+msgstr "data kompilacji WeeChat"
+
+#, fuzzy
+msgid "fixed color"
+msgstr "kolor tekstu"
+
+#, fuzzy
+msgid "WeeChat basic colors:"
+msgstr "katalog Weechat"
+
+#, fuzzy
+msgid "Nick colors:"
+msgstr "kolor"
+
+#, fuzzy
+msgid "Palette colors:"
+msgstr "Przywrócono domyślne przypisania klawiszy"
+
 msgid "Terminal lost, exiting WeeChat..."
 msgstr "Utracono terminal, wychodzę z WeeChat..."

@@ -2566,9 +2635,6 @@ msgstr "Otrzymano sygnał %s, wychodzę z WeeChat..."
 msgid "Signal SIGHUP received, reloading configuration files"
 msgstr "Otrzymano sygnał SIGHUP, przeładowuję pliki konfiguracyjne"

-msgid "Terminal infos:"
-msgstr "Informacje terminala:"
-
 #, c-format
 msgid "  TERM='%s', size: %dx%d"
 msgstr "  TERM='%s', rozmiar: %dx%d"
@@ -2984,9 +3050,9 @@ msgstr "testowa wiadomość bez przedrostka"
 msgid "%sdemo message with error prefix"
 msgstr "%stestowa wiadomość z przedrostkiem"

-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr "kolory: %s bufor %s nick1 %s nick2 %s nick3 %s nick4"
+#, fuzzy
+msgid "colors"
+msgstr "kolor"

 msgid "Available infos:"
 msgstr "Dostępne informacje:"
@@ -3248,6 +3314,10 @@ msgstr "%s%s: zły numer z listy ignorowanych"
 msgid "%s%s: unknown option for \"%s\" command"
 msgstr "%s%s: nieznana opcja dla komendy \"%s\""

+#, c-format
+msgid "%s%s: command \"%s\" must be executed on connected irc server"
+msgstr "%s%s: komenda \"%s\" musi zostać wykonana na połączonym serwerze irc"
+
 #, c-format
 msgid "%s%s: mask must begin with nick"
 msgstr "%s%s: maska musi zaczynać się od nicka"
@@ -3699,17 +3769,21 @@ msgstr "nick: nazwa użytkownika"
 msgid "join a channel"
 msgstr "wchodzi na kanał"

-msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
+#, fuzzy
+msgid "[-server server] [channel1[,channel2[,channel3]] [key1[,key2]]]"
 msgstr "[kanał1[,kanał2[,kanał3]] [klucz[,klucz2]]]"

+#, fuzzy
 msgid ""
+" server: send to this server (internal name)\n"
 "channel: channel name to join\n"
 "    key: key to join the channel (channels with a key must be the first in "
 "list)\n"
 "\n"
 "Examples:\n"
 "  /join #weechat\n"
-"  /join #protectedchan,#weechat key"
+"  /join #protectedchan,#weechat key\n"
+"  /join -server freenode #weechat"
 msgstr ""
 "kanał: nazwa kanału do wejścia\n"
 "    klucz: hasło wymagane do wejścia na kanał (kanały wymagające hasła muszą "
@@ -4446,10 +4520,6 @@ msgid "%s%s: command \"%s\" must be executed on irc buffer (server or channel)"
 msgstr ""
 "%s%s: komenda \"%s\" musi zostać wykonana w buforze irc (serwer lub kanał)"

-#, c-format
-msgid "%s%s: command \"%s\" must be executed on connected irc server"
-msgstr "%s%s: komenda \"%s\" musi zostać wykonana na połączonym serwerze irc"
-
 msgid "current IRC server"
 msgstr "obecny serwer IRC"

@@ -6029,6 +6099,9 @@ msgstr "Strona WeeChat"
 msgid "WeeChat site, download page"
 msgstr "Strona pobrań WeeChat"

+msgid "1 if WeeChat is upgrading (command `/upgrade`)"
+msgstr ""
+
 msgid "terminal charset"
 msgstr "kodowanie terminala"

@@ -7167,6 +7240,42 @@ msgstr ""
 msgid "Pointer"
 msgstr "Wskaźnik"

+#~ msgid "number of colors to use for nicks colors"
+#~ msgstr "liczba kolorów do użycia dla kolorowania nicków"
+
+#~ msgid "text color #1 for nick"
+#~ msgstr "kolor #1 nicka"
+
+#~ msgid "text color #2 for nick"
+#~ msgstr "kolor #2 nicka"
+
+#~ msgid "text color #3 for nick"
+#~ msgstr "kolor #3 nicka"
+
+#~ msgid "text color #4 for nick"
+#~ msgstr "kolor #4 nicka"
+
+#~ msgid "text color #5 for nick"
+#~ msgstr "kolor #5 nicka"
+
+#~ msgid "text color #6 for nick"
+#~ msgstr "kolor #6 nicka"
+
+#~ msgid "text color #7 for nick"
+#~ msgstr "kolor #7 nicka"
+
+#~ msgid "text color #8 for nick"
+#~ msgstr "kolor #8 nicka"
+
+#~ msgid "text color #9 for nick"
+#~ msgstr "kolor #9 nicka"
+
+#~ msgid "text color #10 for nick"
+#~ msgstr "kolor #10 nicka"
+
+#~ msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
+#~ msgstr "kolory: %s bufor %s nick1 %s nick2 %s nick3 %s nick4"
+
 #~ msgid "[-server server] receiver[,receiver] text"
 #~ msgstr "[-server serwer] odbiorca[,odbiorca] tekst"

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-09 22:59+0100\n"
+"POT-Creation-Date: 2011-01-01 18:04+0100\n"
 "PO-Revision-Date: 2010-11-13 09:26+0100\n"
 "Last-Translator: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -31,9 +31,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"

 #. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Copyright (C) 2003-2010, compiled on %s %s\n"
+"WeeChat %s Copyright %s, compiled on %s %s\n"
 "Developed by Sebastien Helleu <flashcode@flashtux.org> - %s"
 msgstr ""
 "%s Copyright (C) 2003-2010, compilado por %s %s\n"
@@ -43,8 +43,10 @@ msgstr ""
 msgid "Usage: %s [option...] [plugin:option...]\n"
 msgstr "Uso: %s [opção...] [plugin:opção...]\n"

+#, fuzzy
 msgid ""
 "  -a, --no-connect  disable auto-connect to servers at startup\n"
+"  -c, --colors      display default colors in terminal\n"
 "  -d, --dir <path>  set WeeChat home directory (default: ~/.weechat)\n"
 "  -h, --help        this help\n"
 "  -k, --keys        display WeeChat default keys\n"
@@ -144,10 +146,6 @@ msgstr "  %s (plugin: %s)"
 msgid "No bar item defined"
 msgstr "Nenhum item da barra definido"

-#, c-format
-msgid "%sError: missing arguments for \"%s\" command"
-msgstr "%sErro: faltando argumentos para o comando \"%s\""
-
 #, c-format
 msgid "%sNot enough memory"
 msgstr "%sMemória insuficiente"
@@ -221,6 +219,14 @@ msgstr "Variáveis locais para o buffer \"%s\":"
 msgid "No local variable defined for buffer \"%s\""
 msgstr "Nenhuma variável local definida para o buffer \"%s\""

+#, c-format
+msgid "%sInvalid pair number \"%s\" (must be between %d and %d)"
+msgstr ""
+
+#, c-format
+msgid "%sColor \"%s\" is not defined in palette"
+msgstr ""
+
 #, c-format
 msgid "%sPlugin \"%s\" not found"
 msgstr "%sPlugin \"%s\" não encontrado"
@@ -683,6 +689,10 @@ msgstr "%sErro: opção de configuração \"%s\" não encontrada"
 msgid "Option changed: "
 msgstr "Opção mudada: "

+#, fuzzy
+msgid "Option created: "
+msgstr "Opção mudada: "
+
 msgid "Option changed"
 msgstr "Opção mudada"

@@ -901,6 +911,32 @@ msgid ""
 "    /buffer +1"
 msgstr ""

+msgid "define custom colors and display palette of colors"
+msgstr ""
+
+msgid "[add pair [alias] [fg,bg]] | [del pair] | switch"
+msgstr ""
+
+msgid ""
+"   add: add a color pair\n"
+"   del: delete a color pair\n"
+"switch: switch WeeChat/terminal colors\n"
+"  pair: pair number (>= 1)\n"
+" alias: alias name for color (for example: \"orange\")\n"
+" fg,bg: foreground and background pair number (-1 for default terminal "
+"foreground or background)\n"
+"\n"
+"Without argument, this command displays colors in a new buffer.\n"
+"\n"
+"Examples:\n"
+"  add color 214 with alias \"orange\":\n"
+"    /color add 214 orange\n"
+"  add color 250 with orange on blue:\n"
+"    /color add 250 214,4 orange_blue\n"
+"  delete color 214:\n"
+"    /color del 214"
+msgstr ""
+
 msgid "launch explicit WeeChat or plugin command"
 msgstr ""

@@ -1333,6 +1369,10 @@ msgid ""
 "    /window scroll -d"
 msgstr ""

+#, c-format
+msgid "%sError: missing arguments for \"%s\" command"
+msgstr "%sErro: faltando argumentos para o comando \"%s\""
+
 msgid "names of buffers"
 msgstr ""

@@ -1348,6 +1388,10 @@ msgstr ""
 msgid "properties that can be read on a buffer"
 msgstr ""

+#, fuzzy
+msgid "color pairs"
+msgstr "cor"
+
 msgid "configuration files"
 msgstr ""

@@ -1414,6 +1458,16 @@ msgstr ""
 msgid "debug level for plugin (\"core\" for WeeChat core)"
 msgstr ""

+msgid ""
+"custom color in palette, format is: \"alias;fg,bg\" where alias is color "
+"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything "
+"is optional in this format and order is not important)"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%sError: palette option must be numeric"
+msgstr "%sErro: falhou ao salvar as opções para %s"
+
 msgid "Notify level for buffer"
 msgstr ""

@@ -1447,9 +1501,6 @@ msgid ""
 "french time: \"${lightblue}%H${white}%M${lightred}%S\""
 msgstr ""

-msgid "number of colors to use for nicks colors"
-msgstr ""
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -1686,42 +1737,15 @@ msgstr ""
 msgid "text color for nicks in chat window"
 msgstr ""

+msgid "text color for nicks (comma separated list of colors)"
+msgstr ""
+
 msgid "text color for local nick in chat window"
 msgstr ""

 msgid "text color for other nick in private buffer"
 msgstr ""

-msgid "text color #1 for nick"
-msgstr ""
-
-msgid "text color #2 for nick"
-msgstr ""
-
-msgid "text color #3 for nick"
-msgstr ""
-
-msgid "text color #4 for nick"
-msgstr ""
-
-msgid "text color #5 for nick"
-msgstr ""
-
-msgid "text color #6 for nick"
-msgstr ""
-
-msgid "text color #7 for nick"
-msgstr ""
-
-msgid "text color #8 for nick"
-msgstr ""
-
-msgid "text color #9 for nick"
-msgstr ""
-
-msgid "text color #10 for nick"
-msgstr ""
-
 msgid "text color for hostnames"
 msgstr ""

@@ -2016,6 +2040,11 @@ msgstr ""
 msgid "debug: removing file: %s"
 msgstr ""

+#. TRANSLATORS: "%s" is translation of "second" or "seconds"
+#, c-format
+msgid "Upgrade done (%.02f %s)"
+msgstr ""
+
 #, c-format
 msgid "%sError upgrading WeeChat with file \"%s\":"
 msgstr ""
@@ -2083,6 +2112,45 @@ msgid ""
 "version)"
 msgstr ""

+msgid "Terminal infos:"
+msgstr ""
+
+msgid "No color support in terminal."
+msgstr ""
+
+#, fuzzy
+msgid "Default colors:"
+msgstr "comando padrão:"
+
+msgid ""
+"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] "
+"Toggle colors"
+msgstr ""
+
+#, fuzzy
+msgid "Terminal colors:"
+msgstr "comando padrão:"
+
+#, fuzzy
+msgid "WeeChat colors:"
+msgstr "comando padrão:"
+
+#, fuzzy
+msgid "fixed color"
+msgstr "cor"
+
+#, fuzzy
+msgid "WeeChat basic colors:"
+msgstr "comando padrão:"
+
+#, fuzzy
+msgid "Nick colors:"
+msgstr "cor"
+
+#, fuzzy
+msgid "Palette colors:"
+msgstr "comando padrão:"
+
 msgid "Terminal lost, exiting WeeChat..."
 msgstr ""

@@ -2093,9 +2161,6 @@ msgstr ""
 msgid "Signal SIGHUP received, reloading configuration files"
 msgstr ""

-msgid "Terminal infos:"
-msgstr ""
-
 #, c-format
 msgid "  TERM='%s', size: %dx%d"
 msgstr ""
@@ -2448,9 +2513,9 @@ msgstr ""
 msgid "%sdemo message with error prefix"
 msgstr ""

-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr ""
+#, fuzzy
+msgid "colors"
+msgstr "cor"

 msgid "Available infos:"
 msgstr ""
@@ -2697,6 +2762,10 @@ msgstr ""
 msgid "%s%s: unknown option for \"%s\" command"
 msgstr ""

+#, c-format
+msgid "%s%s: command \"%s\" must be executed on connected irc server"
+msgstr ""
+
 #, c-format
 msgid "%s%s: mask must begin with nick"
 msgstr ""
@@ -3053,17 +3122,19 @@ msgstr ""
 msgid "join a channel"
 msgstr ""

-msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
+msgid "[-server server] [channel1[,channel2[,channel3]] [key1[,key2]]]"
 msgstr ""

 msgid ""
+" server: send to this server (internal name)\n"
 "channel: channel name to join\n"
 "    key: key to join the channel (channels with a key must be the first in "
 "list)\n"
 "\n"
 "Examples:\n"
 "  /join #weechat\n"
-"  /join #protectedchan,#weechat key"
+"  /join #protectedchan,#weechat key\n"
+"  /join -server freenode #weechat"
 msgstr ""

 msgid "forcibly remove a user from a channel"
@@ -3629,10 +3700,6 @@ msgstr ""
 msgid "%s%s: command \"%s\" must be executed on irc buffer (server or channel)"
 msgstr ""

-#, c-format
-msgid "%s%s: command \"%s\" must be executed on connected irc server"
-msgstr ""
-
 msgid "current IRC server"
 msgstr ""

@@ -5036,6 +5103,9 @@ msgstr ""
 msgid "WeeChat site, download page"
 msgstr ""

+msgid "1 if WeeChat is upgrading (command `/upgrade`)"
+msgstr ""
+
 msgid "terminal charset"
 msgstr ""

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-09 22:59+0100\n"
+"POT-Creation-Date: 2011-01-01 18:04+0100\n"
 "PO-Revision-Date: 2010-11-05 17:17+0100\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -33,9 +33,9 @@ msgstr ""
 "X-Poedit-Bookmarks: -1,-1,608,-1,-1,-1,-1,-1,-1,-1\n"

 #. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Copyright (C) 2003-2010, compiled on %s %s\n"
+"WeeChat %s Copyright %s, compiled on %s %s\n"
 "Developed by Sebastien Helleu <flashcode@flashtux.org> - %s"
 msgstr ""
 "%s Copyright (C) 2003-2010, собран %s %s\n"
@@ -48,6 +48,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "  -a, --no-connect  disable auto-connect to servers at startup\n"
+"  -c, --colors      display default colors in terminal\n"
 "  -d, --dir <path>  set WeeChat home directory (default: ~/.weechat)\n"
 "  -h, --help        this help\n"
 "  -k, --keys        display WeeChat default keys\n"
@@ -149,10 +150,6 @@ msgstr "  (нет pluginа)\n"
 msgid "No bar item defined"
 msgstr "Сокращения не заданы.\n"

-#, fuzzy, c-format
-msgid "%sError: missing arguments for \"%s\" command"
-msgstr "%s нет аргументов для \"%s\" команды\n"
-
 #, fuzzy, c-format
 msgid "%sNot enough memory"
 msgstr "Недостаточно памяти для новой строчки\n"
@@ -228,6 +225,14 @@ msgstr "время в буферах"
 msgid "No local variable defined for buffer \"%s\""
 msgstr ""

+#, c-format
+msgid "%sInvalid pair number \"%s\" (must be between %d and %d)"
+msgstr ""
+
+#, c-format
+msgid "%sColor \"%s\" is not defined in palette"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%sPlugin \"%s\" not found"
 msgstr "%s адрес \"%s\" не найден\n"
@@ -734,6 +739,10 @@ msgstr "%s параметр конфигурации \"%s\" не найден\n"
 msgid "Option changed: "
 msgstr "не на канале"

+#, fuzzy
+msgid "Option created: "
+msgstr "не на канале"
+
 #, fuzzy
 msgid "Option changed"
 msgstr "не на канале"
@@ -980,6 +989,32 @@ msgstr ""
 " отмотать 20 сообщений: /buffer scroll -20\n"
 "    перейти к #weechat: /buffer #weechat"

+msgid "define custom colors and display palette of colors"
+msgstr ""
+
+msgid "[add pair [alias] [fg,bg]] | [del pair] | switch"
+msgstr ""
+
+msgid ""
+"   add: add a color pair\n"
+"   del: delete a color pair\n"
+"switch: switch WeeChat/terminal colors\n"
+"  pair: pair number (>= 1)\n"
+" alias: alias name for color (for example: \"orange\")\n"
+" fg,bg: foreground and background pair number (-1 for default terminal "
+"foreground or background)\n"
+"\n"
+"Without argument, this command displays colors in a new buffer.\n"
+"\n"
+"Examples:\n"
+"  add color 214 with alias \"orange\":\n"
+"    /color add 214 orange\n"
+"  add color 250 with orange on blue:\n"
+"    /color add 250 214,4 orange_blue\n"
+"  delete color 214:\n"
+"    /color del 214"
+msgstr ""
+
 msgid "launch explicit WeeChat or plugin command"
 msgstr ""

@@ -1488,6 +1523,10 @@ msgstr ""
 "Для splith и splitv <прцт> - процент размера создаваемого окна относительно "
 "текущего. Например, 25 означает создать окно в 4 раза меньше текущего"

+#, fuzzy, c-format
+msgid "%sError: missing arguments for \"%s\" command"
+msgstr "%s нет аргументов для \"%s\" команды\n"
+
 #, fuzzy
 msgid "names of buffers"
 msgstr "загрузка буфера не удалась"
@@ -1507,6 +1546,10 @@ msgstr "загрузка буфера не удалась"
 msgid "properties that can be read on a buffer"
 msgstr "загрузка буфера не удалась"

+#, fuzzy
+msgid "color pairs"
+msgstr "цвет чата"
+
 #, fuzzy
 msgid "configuration files"
 msgstr "перезагрузить конфигурационный файл сервера"
@@ -1593,6 +1636,16 @@ msgstr "Дата сменилась на %s\n"
 msgid "debug level for plugin (\"core\" for WeeChat core)"
 msgstr ""

+msgid ""
+"custom color in palette, format is: \"alias;fg,bg\" where alias is color "
+"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything "
+"is optional in this format and order is not important)"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%sError: palette option must be numeric"
+msgstr "%s не могу сохранить конфигурационный файл pluginов\n"
+
 #, fuzzy
 msgid "Notify level for buffer"
 msgstr "не найдено имя канала для буфера"
@@ -1628,9 +1681,6 @@ msgid ""
 "french time: \"${lightblue}%H${white}%M${lightred}%S\""
 msgstr "отображение маркера даты при смене дня"

-msgid "number of colors to use for nicks colors"
-msgstr "количество цветов для раскрашивания ников"
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -1916,6 +1966,10 @@ msgstr "цвет имён при действиях"
 msgid "text color for nicks in chat window"
 msgstr "цвет времени в окне чата"

+#, fuzzy
+msgid "text color for nicks (comma separated list of colors)"
+msgstr "цвет времени в окне чата"
+
 #, fuzzy
 msgid "text color for local nick in chat window"
 msgstr "текст, который отображать до ника в окне чата"
@@ -1924,46 +1978,6 @@ msgstr "текст, который отображать до ника в окн
 msgid "text color for other nick in private buffer"
 msgstr "цвет ника собеседника в окне привата"

-#, fuzzy
-msgid "text color #1 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #2 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #3 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #4 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #5 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #6 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #7 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #8 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #9 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #10 for nick"
-msgstr "цвет ника"
-
 #, fuzzy
 msgid "text color for hostnames"
 msgstr "цвет hostname"
@@ -2308,6 +2322,11 @@ msgstr "байтов"
 msgid "debug: removing file: %s"
 msgstr "       IRC(%s)\n"

+#. TRANSLATORS: "%s" is translation of "second" or "seconds"
+#, c-format
+msgid "Upgrade done (%.02f %s)"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%sError upgrading WeeChat with file \"%s\":"
 msgstr "Обновляю WeeChat...\n"
@@ -2380,6 +2399,45 @@ msgid ""
 "version)"
 msgstr ""

+msgid "Terminal infos:"
+msgstr ""
+
+msgid "No color support in terminal."
+msgstr ""
+
+#, fuzzy
+msgid "Default colors:"
+msgstr "Комбинации клавиш по умолчанию восстановлены\n"
+
+msgid ""
+"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] "
+"Toggle colors"
+msgstr ""
+
+#, fuzzy
+msgid "Terminal colors:"
+msgstr "управление буферами"
+
+#, fuzzy
+msgid "WeeChat colors:"
+msgstr "Конфигурационный файл сохранён\n"
+
+#, fuzzy
+msgid "fixed color"
+msgstr "цвет чата"
+
+#, fuzzy
+msgid "WeeChat basic colors:"
+msgstr "Ошибка WeeChat:"
+
+#, fuzzy
+msgid "Nick colors:"
+msgstr "цвет чата"
+
+#, fuzzy
+msgid "Palette colors:"
+msgstr "Комбинации клавиш по умолчанию восстановлены\n"
+
 msgid "Terminal lost, exiting WeeChat..."
 msgstr ""

@@ -2391,9 +2449,6 @@ msgstr ""
 msgid "Signal SIGHUP received, reloading configuration files"
 msgstr "%s не могу сохранить конфигурационный файл\n"

-msgid "Terminal infos:"
-msgstr ""
-
 #, c-format
 msgid "  TERM='%s', size: %dx%d"
 msgstr ""
@@ -2779,9 +2834,9 @@ msgstr ""
 msgid "%sdemo message with error prefix"
 msgstr ""

-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr ""
+#, fuzzy
+msgid "colors"
+msgstr "цвет чата"

 msgid "Available infos:"
 msgstr ""
@@ -3037,6 +3092,10 @@ msgstr "%s неправильный номер буфера\n"
 msgid "%s%s: unknown option for \"%s\" command"
 msgstr "%s неизвестный параметр для команды \"%s\"\n"

+#, fuzzy, c-format
+msgid "%s%s: command \"%s\" must be executed on connected irc server"
+msgstr "%s \"%s\" команда может быть выполнена только в буфере сервера\n"
+
 #, c-format
 msgid "%s%s: mask must begin with nick"
 msgstr ""
@@ -3440,17 +3499,19 @@ msgid "join a channel"
 msgstr "зайти на канал"

 #, fuzzy
-msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
+msgid "[-server server] [channel1[,channel2[,channel3]] [key1[,key2]]]"
 msgstr "канал[,канал] [ключ[,ключ]]"

 msgid ""
+" server: send to this server (internal name)\n"
 "channel: channel name to join\n"
 "    key: key to join the channel (channels with a key must be the first in "
 "list)\n"
 "\n"
 "Examples:\n"
 "  /join #weechat\n"
-"  /join #protectedchan,#weechat key"
+"  /join #protectedchan,#weechat key\n"
+"  /join -server freenode #weechat"
 msgstr ""

 msgid "forcibly remove a user from a channel"
@@ -4171,10 +4232,6 @@ msgstr "%s некорректные аргументы команды \"%s\"\n"
 msgid "%s%s: command \"%s\" must be executed on irc buffer (server or channel)"
 msgstr "%s \"%s\" команда может быть выполнена только в буфере сервера\n"

-#, fuzzy, c-format
-msgid "%s%s: command \"%s\" must be executed on connected irc server"
-msgstr "%s \"%s\" команда может быть выполнена только в буфере сервера\n"
-
 #, fuzzy
 msgid "current IRC server"
 msgstr "подключиться к серверу(-ам)"
@@ -5720,6 +5777,9 @@ msgstr "слоган WeeChat"
 msgid "WeeChat site, download page"
 msgstr ""

+msgid "1 if WeeChat is upgrading (command `/upgrade`)"
+msgstr ""
+
 #, fuzzy
 msgid "terminal charset"
 msgstr "управление буферами"
@@ -6878,6 +6938,49 @@ msgstr ""
 msgid "Pointer"
 msgstr "минута"

+#~ msgid "number of colors to use for nicks colors"
+#~ msgstr "количество цветов для раскрашивания ников"
+
+#, fuzzy
+#~ msgid "text color #1 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #2 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #3 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #4 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #5 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #6 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #7 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #8 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #9 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #10 for nick"
+#~ msgstr "цвет ника"
+
 #, fuzzy
 #~ msgid "[-server server] receiver[,receiver] text"
 #~ msgstr "адресат[,адресат] текст"
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-09 22:59+0100\n"
+"POT-Creation-Date: 2011-01-01 18:04+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"
@@ -20,7 +20,7 @@ msgstr ""
 #. TRANSLATORS: "%s %s" after "compiled on" is date and time
 #, c-format
 msgid ""
-"%s Copyright (C) 2003-2010, compiled on %s %s\n"
+"WeeChat %s Copyright %s, compiled on %s %s\n"
 "Developed by Sebastien Helleu <flashcode@flashtux.org> - %s"
 msgstr ""

@@ -30,6 +30,7 @@ msgstr ""

 msgid ""
 "  -a, --no-connect  disable auto-connect to servers at startup\n"
+"  -c, --colors      display default colors in terminal\n"
 "  -d, --dir <path>  set WeeChat home directory (default: ~/.weechat)\n"
 "  -h, --help        this help\n"
 "  -k, --keys        display WeeChat default keys\n"
@@ -110,10 +111,6 @@ msgstr ""
 msgid "No bar item defined"
 msgstr ""

-#, c-format
-msgid "%sError: missing arguments for \"%s\" command"
-msgstr ""
-
 #, c-format
 msgid "%sNot enough memory"
 msgstr ""
@@ -187,6 +184,14 @@ msgstr ""
 msgid "No local variable defined for buffer \"%s\""
 msgstr ""

+#, c-format
+msgid "%sInvalid pair number \"%s\" (must be between %d and %d)"
+msgstr ""
+
+#, c-format
+msgid "%sColor \"%s\" is not defined in palette"
+msgstr ""
+
 #, c-format
 msgid "%sPlugin \"%s\" not found"
 msgstr ""
@@ -634,6 +639,9 @@ msgstr ""
 msgid "Option changed: "
 msgstr ""

+msgid "Option created: "
+msgstr ""
+
 msgid "Option changed"
 msgstr ""

@@ -841,6 +849,32 @@ msgid ""
 "    /buffer +1"
 msgstr ""

+msgid "define custom colors and display palette of colors"
+msgstr ""
+
+msgid "[add pair [alias] [fg,bg]] | [del pair] | switch"
+msgstr ""
+
+msgid ""
+"   add: add a color pair\n"
+"   del: delete a color pair\n"
+"switch: switch WeeChat/terminal colors\n"
+"  pair: pair number (>= 1)\n"
+" alias: alias name for color (for example: \"orange\")\n"
+" fg,bg: foreground and background pair number (-1 for default terminal "
+"foreground or background)\n"
+"\n"
+"Without argument, this command displays colors in a new buffer.\n"
+"\n"
+"Examples:\n"
+"  add color 214 with alias \"orange\":\n"
+"    /color add 214 orange\n"
+"  add color 250 with orange on blue:\n"
+"    /color add 250 214,4 orange_blue\n"
+"  delete color 214:\n"
+"    /color del 214"
+msgstr ""
+
 msgid "launch explicit WeeChat or plugin command"
 msgstr ""

@@ -1273,6 +1307,10 @@ msgid ""
 "    /window scroll -d"
 msgstr ""

+#, c-format
+msgid "%sError: missing arguments for \"%s\" command"
+msgstr ""
+
 msgid "names of buffers"
 msgstr ""

@@ -1288,6 +1326,9 @@ msgstr ""
 msgid "properties that can be read on a buffer"
 msgstr ""

+msgid "color pairs"
+msgstr ""
+
 msgid "configuration files"
 msgstr ""

@@ -1354,6 +1395,16 @@ msgstr ""
 msgid "debug level for plugin (\"core\" for WeeChat core)"
 msgstr ""

+msgid ""
+"custom color in palette, format is: \"alias;fg,bg\" where alias is color "
+"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything "
+"is optional in this format and order is not important)"
+msgstr ""
+
+#, c-format
+msgid "%sError: palette option must be numeric"
+msgstr ""
+
 msgid "Notify level for buffer"
 msgstr ""

@@ -1387,9 +1438,6 @@ msgid ""
 "french time: \"${lightblue}%H${white}%M${lightred}%S\""
 msgstr ""

-msgid "number of colors to use for nicks colors"
-msgstr ""
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -1626,42 +1674,15 @@ msgstr ""
 msgid "text color for nicks in chat window"
 msgstr ""

+msgid "text color for nicks (comma separated list of colors)"
+msgstr ""
+
 msgid "text color for local nick in chat window"
 msgstr ""

 msgid "text color for other nick in private buffer"
 msgstr ""

-msgid "text color #1 for nick"
-msgstr ""
-
-msgid "text color #2 for nick"
-msgstr ""
-
-msgid "text color #3 for nick"
-msgstr ""
-
-msgid "text color #4 for nick"
-msgstr ""
-
-msgid "text color #5 for nick"
-msgstr ""
-
-msgid "text color #6 for nick"
-msgstr ""
-
-msgid "text color #7 for nick"
-msgstr ""
-
-msgid "text color #8 for nick"
-msgstr ""
-
-msgid "text color #9 for nick"
-msgstr ""
-
-msgid "text color #10 for nick"
-msgstr ""
-
 msgid "text color for hostnames"
 msgstr ""

@@ -1956,6 +1977,11 @@ msgstr ""
 msgid "debug: removing file: %s"
 msgstr ""

+#. TRANSLATORS: "%s" is translation of "second" or "seconds"
+#, c-format
+msgid "Upgrade done (%.02f %s)"
+msgstr ""
+
 #, c-format
 msgid "%sError upgrading WeeChat with file \"%s\":"
 msgstr ""
@@ -2023,6 +2049,38 @@ msgid ""
 "version)"
 msgstr ""

+msgid "Terminal infos:"
+msgstr ""
+
+msgid "No color support in terminal."
+msgstr ""
+
+msgid "Default colors:"
+msgstr ""
+
+msgid ""
+"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] "
+"Toggle colors"
+msgstr ""
+
+msgid "Terminal colors:"
+msgstr ""
+
+msgid "WeeChat colors:"
+msgstr ""
+
+msgid "fixed color"
+msgstr ""
+
+msgid "WeeChat basic colors:"
+msgstr ""
+
+msgid "Nick colors:"
+msgstr ""
+
+msgid "Palette colors:"
+msgstr ""
+
 msgid "Terminal lost, exiting WeeChat..."
 msgstr ""

@@ -2033,9 +2091,6 @@ msgstr ""
 msgid "Signal SIGHUP received, reloading configuration files"
 msgstr ""

-msgid "Terminal infos:"
-msgstr ""
-
 #, c-format
 msgid "  TERM='%s', size: %dx%d"
 msgstr ""
@@ -2387,8 +2442,7 @@ msgstr ""
 msgid "%sdemo message with error prefix"
 msgstr ""

-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
+msgid "colors"
 msgstr ""

 msgid "Available infos:"
@@ -2636,6 +2690,10 @@ msgstr ""
 msgid "%s%s: unknown option for \"%s\" command"
 msgstr ""

+#, c-format
+msgid "%s%s: command \"%s\" must be executed on connected irc server"
+msgstr ""
+
 #, c-format
 msgid "%s%s: mask must begin with nick"
 msgstr ""
@@ -2992,17 +3050,19 @@ msgstr ""
 msgid "join a channel"
 msgstr ""

-msgid "[channel1[,channel2[,channel3]] [key1[,key2]]]"
+msgid "[-server server] [channel1[,channel2[,channel3]] [key1[,key2]]]"
 msgstr ""

 msgid ""
+" server: send to this server (internal name)\n"
 "channel: channel name to join\n"
 "    key: key to join the channel (channels with a key must be the first in "
 "list)\n"
 "\n"
 "Examples:\n"
 "  /join #weechat\n"
-"  /join #protectedchan,#weechat key"
+"  /join #protectedchan,#weechat key\n"
+"  /join -server freenode #weechat"
 msgstr ""

 msgid "forcibly remove a user from a channel"
@@ -3568,10 +3628,6 @@ msgstr ""
 msgid "%s%s: command \"%s\" must be executed on irc buffer (server or channel)"
 msgstr ""

-#, c-format
-msgid "%s%s: command \"%s\" must be executed on connected irc server"
-msgstr ""
-
 msgid "current IRC server"
 msgstr ""

@@ -4975,6 +5031,9 @@ msgstr ""
 msgid "WeeChat site, download page"
 msgstr ""

+msgid "1 if WeeChat is upgrading (command `/upgrade`)"
+msgstr ""
+
 msgid "terminal charset"
 msgstr ""

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2007-2008 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2008-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2008 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+ * Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 *
 * This file is part of WeeChat, the extensible chat client.
 *
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+ * Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 *
 * This file is part of WeeChat, the extensible chat client.
 *
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+ * Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 * Copyright (C) 2005-2006 Emmanuel Bouthenot <kolter@openics.org>
 *
 * This file is part of WeeChat, the extensible chat client.
@@ -150,9 +150,7 @@ command_bar_list (int full)
 * command_bar: manage bars
 */

-int
-command_bar (void *data, struct t_gui_buffer *buffer,
-             int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(bar)
 {
    int type, position;
    char *error, *str_type, *pos_condition;
@@ -204,15 +202,7 @@ command_bar (void *data, struct t_gui_buffer *buffer,
    /* add a new bar */
    if (string_strcasecmp (argv[1], "add") == 0)
    {
-        if (argc < 8)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "bar");
-            return WEECHAT_RC_ERROR;
-        }
+        COMMAND_MIN_ARGS(8, "bar add");
        pos_condition = strchr (argv[3], ',');
        if (pos_condition)
        {
@@ -300,15 +290,7 @@ command_bar (void *data, struct t_gui_buffer *buffer,
    /* delete a bar */
    if (string_strcasecmp (argv[1], "del") == 0)
    {
-        if (argc < 3)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "bar");
-            return WEECHAT_RC_ERROR;
-        }
+        COMMAND_MIN_ARGS(3, "bar del");
        if (string_strcasecmp (argv[2], "-all") == 0)
        {
            gui_bar_free_all ();
@@ -337,15 +319,7 @@ command_bar (void *data, struct t_gui_buffer *buffer,
    /* set a bar property */
    if (string_strcasecmp (argv[1], "set") == 0)
    {
-        if (argc < 5)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "bar");
-            return WEECHAT_RC_ERROR;
-        }
+        COMMAND_MIN_ARGS(5, "bar set");
        ptr_bar = gui_bar_search (argv[2]);
        if (!ptr_bar)
        {
@@ -371,15 +345,7 @@ command_bar (void *data, struct t_gui_buffer *buffer,
    /* hide a bar */
    if (string_strcasecmp (argv[1], "hide") == 0)
    {
-        if (argc < 3)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "bar");
-            return WEECHAT_RC_ERROR;
-        }
+        COMMAND_MIN_ARGS(3, "bar hide");
        ptr_bar = gui_bar_search (argv[2]);
        if (!ptr_bar)
        {
@@ -398,15 +364,7 @@ command_bar (void *data, struct t_gui_buffer *buffer,
    /* show a bar */
    if (string_strcasecmp (argv[1], "show") == 0)
    {
-        if (argc < 3)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "bar");
-            return WEECHAT_RC_ERROR;
-        }
+        COMMAND_MIN_ARGS(3, "bar show");
        ptr_bar = gui_bar_search (argv[2]);
        if (!ptr_bar)
        {
@@ -425,15 +383,7 @@ command_bar (void *data, struct t_gui_buffer *buffer,
    /* toggle a bar visible/hidden */
    if (string_strcasecmp (argv[1], "toggle") == 0)
    {
-        if (argc < 3)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "bar");
-            return WEECHAT_RC_ERROR;
-        }
+        COMMAND_MIN_ARGS(3, "bar toggle");
        ptr_bar = gui_bar_search (argv[2]);
        if (!ptr_bar)
        {
@@ -452,15 +402,7 @@ command_bar (void *data, struct t_gui_buffer *buffer,
    /* scroll in a bar */
    if (string_strcasecmp (argv[1], "scroll") == 0)
    {
-        if (argc < 5)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "bar");
-            return WEECHAT_RC_ERROR;
-        }
+        COMMAND_MIN_ARGS(5, "bar scroll");
        ptr_bar = gui_bar_search (argv[2]);
        if (ptr_bar)
        {
@@ -530,9 +472,7 @@ command_buffer_display_localvar (void *data,
 * command_buffer: manage buffers
 */

-int
-command_buffer (void *data, struct t_gui_buffer *buffer,
-                int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(buffer)
 {
    struct t_gui_buffer *ptr_buffer;
    long number, number1, number2;
@@ -621,16 +561,7 @@ command_buffer (void *data, struct t_gui_buffer *buffer,
    /* move buffer to another number in the list */
    if (string_strcasecmp (argv[1], "move") == 0)
    {
-        if (argc < 3)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "buffer");
-            return WEECHAT_RC_ERROR;
-        }
-        
+        COMMAND_MIN_ARGS(3, "buffer move");
        error = NULL;
        number = strtol (((argv[2][0] == '+') || (argv[2][0] == '-')) ?
                         argv[2] + 1 : argv[2],
@@ -661,16 +592,7 @@ command_buffer (void *data, struct t_gui_buffer *buffer,
    /* merge buffer with another number in the list */
    if (string_strcasecmp (argv[1], "merge") == 0)
    {
-        if (argc < 3)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "buffer");
-            return WEECHAT_RC_ERROR;
-        }
-        
+        COMMAND_MIN_ARGS(3, "buffer merge");
        error = NULL;
        number = strtol (argv[2], &error, 10);
        if (error && !error[0])
@@ -718,7 +640,7 @@ command_buffer (void *data, struct t_gui_buffer *buffer,
    {
        if (argc < 3)
        {
-            if (!buffer->plugin)
+            if (buffer == gui_buffer_search_main ())
            {
                gui_chat_printf (NULL,
                                 _("%sError: WeeChat main buffer can't be "
@@ -797,20 +719,11 @@ command_buffer (void *data, struct t_gui_buffer *buffer,
        
        return WEECHAT_RC_OK;
    }
-
-    /* display buffer notify */
+    
+    /* set notify level */
    if (string_strcasecmp (argv[1], "notify") == 0)
    {
-        if (argc < 3)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "buffer");
-            return WEECHAT_RC_ERROR;
-        }
-        /* set notify level for current buffer */
+        COMMAND_MIN_ARGS(3, "buffer notify");
        config_weechat_notify_set (gui_current_window->buffer,
                                   argv_eol[2]);
        return WEECHAT_RC_OK;
@@ -839,15 +752,7 @@ command_buffer (void *data, struct t_gui_buffer *buffer,
    /* set a property on buffer */
    if (string_strcasecmp (argv[1], "set") == 0)
    {
-        if (argc < 4)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "buffer");
-            return WEECHAT_RC_ERROR;
-        }
+        COMMAND_MIN_ARGS(4, "buffer set");
        value = string_remove_quotes (argv_eol[3], "'\"");
        gui_buffer_set (buffer, argv[2], (value) ? value : argv_eol[3]);
        if (value)
@@ -859,15 +764,7 @@ command_buffer (void *data, struct t_gui_buffer *buffer,
    /* get a buffer property */
    if (string_strcasecmp (argv[1], "get") == 0)
    {
-        if (argc < 3)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "buffer");
-            return WEECHAT_RC_ERROR;
-        }
+        COMMAND_MIN_ARGS(3, "buffer get");
        if (gui_buffer_property_in_list (gui_buffer_properties_get_integer,
                                         argv[2]))
        {
@@ -985,13 +882,160 @@ command_buffer (void *data, struct t_gui_buffer *buffer,
    return WEECHAT_RC_OK;
 }

+/*
+ * command_color: define custom colors and display palette of colors
+ */
+
+COMMAND_CALLBACK(color)
+{
+    char *str_alias, *str_pair, *str_rgb, *pos, *error;
+    char str_color[1024], str_command[1024];
+    long number;
+    int i;
+    struct t_gui_color_palette *color_palette;
+    
+    /* make C compiler happy */
+    (void) data;
+    (void) argv_eol;
+    
+    if (argc == 1)
+    {
+        gui_color_buffer_open ();
+        return WEECHAT_RC_OK;
+    }
+    
+    /* add a color pair */
+    if (string_strcasecmp (argv[1], "add") == 0)
+    {
+        COMMAND_MIN_ARGS(3, "color add");
+        
+        /* check pair number */
+        error = NULL;
+        number = strtol (argv[2], &error, 10);
+        if (error && !error[0])
+        {
+            if ((number < 1) || (number > gui_color_get_last_pair ()))
+                number = -1;
+        }
+        else
+        {
+            number = -1;
+        }
+        if (number < 0)
+        {
+            gui_chat_printf (NULL,
+                             _("%sInvalid pair number \"%s\" (must be between "
+                               "%d and %d)"),
+                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
+                             argv[2], 1, gui_color_get_last_pair ());
+            return WEECHAT_RC_ERROR;
+        }
+        
+        /* check other arguments */
+        str_alias = NULL;
+        str_pair = NULL;
+        str_rgb = NULL;
+        for (i = 3; i < argc; i++)
+        {
+            pos = strchr (argv[i], ',');
+            if (pos)
+                str_pair = argv[i];
+            else
+            {
+                pos = strchr (argv[i], '/');
+                if (pos)
+                    str_rgb = argv[i];
+                else
+                    str_alias = argv[i];
+            }
+        }
+        str_color[0] = '\0';
+        if (str_alias)
+        {
+            strcat (str_color, ";");
+            strcat (str_color, str_alias);
+        }
+        if (str_pair)
+        {
+            strcat (str_color, ";");
+            strcat (str_color, str_pair);
+        }
+        if (str_rgb)
+        {
+            strcat (str_color, ";");
+            strcat (str_color, str_rgb);
+        }
+        
+        /* add color pair */
+        snprintf (str_command, sizeof (str_command),
+                  "/set weechat.palette.%d \"%s\"",
+                  (int)number,
+                  (str_color[0]) ? str_color + 1 : "");
+        input_exec_command (buffer, 1, NULL, str_command);
+        return WEECHAT_RC_OK;
+    }
+    
+    /* delete a color pair */
+    if (string_strcasecmp (argv[1], "del") == 0)
+    {
+        COMMAND_MIN_ARGS(3, "color del");
+        
+        /* check pair number */
+        error = NULL;
+        number = strtol (argv[2], &error, 10);
+        if (error && !error[0])
+        {
+            if ((number < 1) || (number > gui_color_get_last_pair ()))
+                number = -1;
+        }
+        else
+        {
+            number = -1;
+        }
+        if (number < 0)
+        {
+            gui_chat_printf (NULL,
+                             _("%sInvalid pair number \"%s\" (must be between "
+                               "%d and %d)"),
+                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
+                             argv[2], 1, gui_color_get_last_pair ());
+            return WEECHAT_RC_ERROR;
+        }
+        
+        /* search color pair */
+        color_palette = gui_color_palette_get ((int)number);
+        if (!color_palette)
+        {
+            gui_chat_printf (NULL,
+                             _("%sColor \"%s\" is not defined in palette"),
+                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
+                             argv[2]);
+            return WEECHAT_RC_ERROR;
+        }
+        
+        /* delete color pair */
+        snprintf (str_command, sizeof (str_command),
+                  "/unset weechat.palette.%d",
+                  (int)number);
+        input_exec_command (buffer, 1, NULL, str_command);
+        return WEECHAT_RC_OK;
+    }
+    
+    /* switch WeeChat/terminal colors */
+    if (string_strcasecmp (argv[1], "switch") == 0)
+    {
+        gui_color_switch_colors ();
+        return WEECHAT_RC_OK;
+    }
+    
+    return WEECHAT_RC_OK;
+}
+
 /*
 * command_command: launch explicit WeeChat or plugin command
 */

-int
-command_command (void *data, struct t_gui_buffer *buffer,
-                 int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(command)
 {
    int length;
    char *command;
@@ -1038,9 +1082,7 @@ command_command (void *data, struct t_gui_buffer *buffer,
 * command_debug: control debug for core/plugins
 */

-int
-command_debug (void *data, struct t_gui_buffer *buffer,
-               int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(debug)
 {
    struct t_config_option *ptr_option;
    struct t_weechat_plugin *ptr_plugin;
@@ -1097,15 +1139,7 @@ command_debug (void *data, struct t_gui_buffer *buffer,
    }
    else if (string_strcasecmp (argv[1], "set") == 0)
    {
-        if (argc < 4)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "debug set");
-            return WEECHAT_RC_ERROR;
-        }
+        COMMAND_MIN_ARGS(4, "debug set");
        if (strcmp (argv[3], "0") == 0)
        {
            /* disable debug for a plugin */
@@ -1167,9 +1201,7 @@ command_filter_display (struct t_gui_filter *filter)
 * command_filter: manage message filters
 */

-int
-command_filter (void *data, struct t_gui_buffer *buffer,
-                int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(filter)
 {
    struct t_gui_filter *ptr_filter;
    
@@ -1321,15 +1353,7 @@ command_filter (void *data, struct t_gui_buffer *buffer,
    /* add filter */
    if (string_strcasecmp (argv[1], "add") == 0)
    {
-        if (argc < 6)
-        {
-            gui_chat_printf_date_tags (NULL, 0, GUI_FILTER_TAG_NO_FILTER,
-                                       _("%sError: missing arguments for \"%s\" "
-                                         "command"),
-                                       gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                                       "filter add");
-            return WEECHAT_RC_ERROR;
-        }
+        COMMAND_MIN_ARGS(6, "filter add");
        if (gui_filter_search_by_name (argv[2]))
        {
            gui_chat_printf_date_tags (NULL, 0, GUI_FILTER_TAG_NO_FILTER,
@@ -1370,17 +1394,7 @@ command_filter (void *data, struct t_gui_buffer *buffer,
    /* rename a filter */
    if (string_strcasecmp (argv[1], "rename") == 0)
    {
-        if (argc < 4)
-        {
-            gui_chat_printf_date_tags (NULL, 0, GUI_FILTER_TAG_NO_FILTER,
-                                       _("%sError: missing arguments for \"%s\" "
-                                         "command"),
-                                       gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                                       "filter rename");
-            return WEECHAT_RC_ERROR;
-        }
-        
-        /* rename filter */
+        COMMAND_MIN_ARGS(4, "filter rename");
        ptr_filter = gui_filter_search_by_name (argv[2]);
        if (ptr_filter)
        {
@@ -1415,15 +1429,7 @@ command_filter (void *data, struct t_gui_buffer *buffer,
    /* delete filter */
    if (string_strcasecmp (argv[1], "del") == 0)
    {
-        if (argc < 3)
-        {
-            gui_chat_printf_date_tags (NULL, 0, GUI_FILTER_TAG_NO_FILTER,
-                                       _("%sError: missing arguments for \"%s\" "
-                                         "command"),
-                                       gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                                       "filter del");
-            return WEECHAT_RC_ERROR;
-        }
+        COMMAND_MIN_ARGS(3, "filter del");
        if (string_strcasecmp (argv[2], "-all") == 0)
        {
            if (gui_filters)
@@ -1473,9 +1479,7 @@ command_filter (void *data, struct t_gui_buffer *buffer,
 * command_help: display help about commands
 */

-int
-command_help (void *data, struct t_gui_buffer *buffer,
-              int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(help)
 {
    struct t_hook *ptr_hook;
    struct t_config_option *ptr_option;
@@ -1840,9 +1844,7 @@ command_help (void *data, struct t_gui_buffer *buffer,
 * command_history: display current buffer history
 */

-int
-command_history (void *data, struct t_gui_buffer *buffer,
-                 int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(history)
 {
    struct t_gui_history *ptr_history;
    int n, n_total, n_user, displayed;
@@ -1897,9 +1899,7 @@ command_history (void *data, struct t_gui_buffer *buffer,
 * command_input: input actions (used by key bindings)
 */

-int
-command_input (void *data, struct t_gui_buffer *buffer,
-               int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(input)
 {
    /* make C compiler happy */
    (void) data;
@@ -2143,9 +2143,7 @@ command_key_display_listdiff ()
 * command_key: bind/unbind keys
 */

-int
-command_key (void *data, struct t_gui_buffer *buffer,
-             int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(key)
 {
    char *internal_code;
    struct t_gui_key *ptr_key, *ptr_default_key, *ptr_new_key;
@@ -2207,15 +2205,7 @@ command_key (void *data, struct t_gui_buffer *buffer,
            return WEECHAT_RC_OK;
        }
        
-        if (argc < 4)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "key");
-            return WEECHAT_RC_ERROR;
-        }
+        COMMAND_MIN_ARGS(4, "key bind");
        
        /* bind new key */
        gui_keyboard_verbose = 1;
@@ -2447,9 +2437,7 @@ command_layout_display_tree (struct t_gui_layout_window *layout_window,
 * command_layout: save/apply buffers/windows layout
 */

-int
-command_layout (void *data, struct t_gui_buffer *buffer,
-                int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(layout)
 {
    struct t_gui_layout_buffer *ptr_layout_buffer;
    int flag_buffers, flag_windows;
@@ -2559,9 +2547,7 @@ command_layout (void *data, struct t_gui_buffer *buffer,
 * command_mute: execute a command mute
 */

-int
-command_mute (void *data, struct t_gui_buffer *buffer,
-              int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(mute)
 {
    int length, mute_mode;
    char *command, *ptr_command;
@@ -2926,9 +2912,7 @@ command_plugin_list (const char *name, int full)
 * command_plugin: list/load/unload WeeChat plugins
 */

-int
-command_plugin (void *data, struct t_gui_buffer *buffer,
-                int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(plugin)
 {
    /* make C compiler happy */
    (void) data;
@@ -3029,9 +3013,7 @@ command_proxy_list ()
 * command_proxy: manage proxies
 */

-int
-command_proxy (void *data, struct t_gui_buffer *buffer,
-               int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(proxy)
 {
    int type;
    char *error;
@@ -3052,15 +3034,7 @@ command_proxy (void *data, struct t_gui_buffer *buffer,
    /* add a new proxy */
    if (string_strcasecmp (argv[1], "add") == 0)
    {
-        if (argc < 6)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "proxy");
-            return WEECHAT_RC_ERROR;
-        }
+        COMMAND_MIN_ARGS(6, "proxy add");
        type = proxy_search_type (argv[3]);
        if (type < 0)
        {
@@ -3107,15 +3081,7 @@ command_proxy (void *data, struct t_gui_buffer *buffer,
    /* delete a proxy */
    if (string_strcasecmp (argv[1], "del") == 0)
    {
-        if (argc < 3)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "proxy");
-            return WEECHAT_RC_ERROR;
-        }
+        COMMAND_MIN_ARGS(3, "proxy del");
        if (string_strcasecmp (argv[2], "-all") == 0)
        {
            proxy_free_all ();
@@ -3142,15 +3108,7 @@ command_proxy (void *data, struct t_gui_buffer *buffer,
    /* set a proxy property */
    if (string_strcasecmp (argv[1], "set") == 0)
    {
-        if (argc < 5)
-        {
-            gui_chat_printf (NULL,
-                             _("%sError: missing arguments for \"%s\" "
-                               "command"),
-                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                             "proxy");
-            return WEECHAT_RC_ERROR;
-        }
+        COMMAND_MIN_ARGS(5, "proxy set");
        ptr_proxy = proxy_search (argv[2]);
        if (!ptr_proxy)
        {
@@ -3185,9 +3143,7 @@ command_proxy (void *data, struct t_gui_buffer *buffer,
 * command_quit: quit WeeChat
 */

-int
-command_quit (void *data, struct t_gui_buffer *buffer,
-              int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(quit)
 {
    int confirm_ok;
    char *pos_args;
@@ -3266,9 +3222,7 @@ command_reload_file (struct t_config_file *config_file)
 * command_reload: reload WeeChat and plugins options from disk
 */

-int
-command_reload (void *data, struct t_gui_buffer *buffer,
-                int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(reload)
 {
    struct t_config_file *ptr_config_file;
    int i;
@@ -3333,9 +3287,7 @@ command_save_file (struct t_config_file *config_file)
 * command_save: save configuration files to disk
 */

-int
-command_save (void *data, struct t_gui_buffer *buffer,
-              int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(save)
 {
    struct t_config_file *ptr_config_file;
    int i;
@@ -3548,13 +3500,11 @@ command_set_display_option_list (const char *message, const char *search)
 * command_set: set config options
 */

-int
-command_set (void *data, struct t_gui_buffer *buffer,
-             int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(set)
 {
    char *value;
    int number_found, rc;
-    struct t_config_option *ptr_option;
+    struct t_config_option *ptr_option, *ptr_option_before;
    
    /* make C compiler happy */
    (void) data;
@@ -3572,20 +3522,25 @@ command_set (void *data, struct t_gui_buffer *buffer,
        if (number_found == 0)
        {
            if (argc == 2)
+            {
                gui_chat_printf (NULL,
                                 _("%sOption \"%s\" not found (tip: you can use "
                                   "\"*\" at beginning and/or end of option to "
                                   "see a sublist)"),
                                 gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
                                 argv[1]);
+            }
            else
+            {
                gui_chat_printf (NULL,
                                 _("No configuration option found"));
+            }
        }
        else
        {
            gui_chat_printf (NULL, "");
            if (argc == 2)
+            {
                gui_chat_printf (NULL,
                                 NG_("%s%d%s configuration option found "
                                     "matching with \"%s\"",
@@ -3596,7 +3551,9 @@ command_set (void *data, struct t_gui_buffer *buffer,
                                 number_found,
                                 GUI_COLOR(GUI_COLOR_CHAT),
                                 argv[1]);
+            }
            else
+            {
                gui_chat_printf (NULL,
                                 NG_("%s%d%s configuration option found",
                                     "%s%d%s configuration options found",
@@ -3604,12 +3561,15 @@ command_set (void *data, struct t_gui_buffer *buffer,
                                 GUI_COLOR(GUI_COLOR_CHAT_BUFFER),
                                 number_found,
                                 GUI_COLOR(GUI_COLOR_CHAT));
+            }
        }
        return WEECHAT_RC_OK;
    }
    
    /* set option value */
-    value =(string_strcasecmp (argv_eol[2], WEECHAT_CONFIG_OPTION_NULL) == 0) ?
+    config_file_search_with_string (argv[1], NULL, NULL, &ptr_option_before,
+                                    NULL);
+    value = (string_strcasecmp (argv_eol[2], WEECHAT_CONFIG_OPTION_NULL) == 0) ?
        NULL : string_remove_quotes (argv_eol[2], "'\"");
    rc = config_file_option_set_with_string (argv[1], value);
    if (value)
@@ -3633,8 +3593,12 @@ command_set (void *data, struct t_gui_buffer *buffer,
            config_file_search_with_string (argv[1], NULL, NULL,
                                            &ptr_option, NULL);
            if (ptr_option)
+            {
                command_set_display_option (ptr_option,
-                                            _("Option changed: "));
+                                            (ptr_option_before) ?
+                                            _("Option changed: ") :
+                                            _("Option created: "));
+            }
            else
                gui_chat_printf (NULL, _("Option changed"));
            break;
@@ -3647,9 +3611,7 @@ command_set (void *data, struct t_gui_buffer *buffer,
 * command_unset: unset/reset config options
 */

-int
-command_unset (void *data, struct t_gui_buffer *buffer,
-               int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(unset)
 {
    struct t_config_file *ptr_config;
    struct t_config_section *ptr_section;
@@ -3733,9 +3695,7 @@ command_unset (void *data, struct t_gui_buffer *buffer,
 * command_upgrade: upgrade WeeChat
 */

-int
-command_upgrade (void *data, struct t_gui_buffer *buffer,
-                 int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(upgrade)
 {
    char *ptr_binary;
    char *exec_args[7] = { NULL, "-a", "--dir", NULL, "--upgrade", NULL };
@@ -3853,9 +3813,7 @@ command_upgrade (void *data, struct t_gui_buffer *buffer,
 * command_uptime: display WeeChat uptime
 */

-int
-command_uptime (void *data, struct t_gui_buffer *buffer,
-                int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(uptime)
 {
    time_t running_time;
    int day, hour, min, sec;
@@ -3865,7 +3823,7 @@ command_uptime (void *data, struct t_gui_buffer *buffer,
    (void) data;
    (void) argv_eol;
    
-    running_time = time (NULL) - weechat_start_time;
+    running_time = time (NULL) - weechat_first_start_time;
    day = running_time / (60 * 60 * 24);
    hour = (running_time % (60 * 60 * 24)) / (60 * 60);
    min = ((running_time % (60 * 60 * 24)) % (60 * 60)) / 60;
@@ -3880,7 +3838,7 @@ command_uptime (void *data, struct t_gui_buffer *buffer,
                  hour,
                  min,
                  sec,
-                  ctime (&weechat_start_time));
+                  ctime (&weechat_first_start_time));
        string[strlen (string) - 1] = '\0';
        input_data (buffer, string);
    }
@@ -3894,7 +3852,7 @@ command_uptime (void *data, struct t_gui_buffer *buffer,
                  hour,
                  min,
                  sec,
-                  util_get_time_string (&weechat_start_time));
+                  util_get_time_string (&weechat_first_start_time));
        input_data (buffer, string);
    }
    else
@@ -3918,7 +3876,7 @@ command_uptime (void *data, struct t_gui_buffer *buffer,
                         sec,
                         GUI_COLOR(GUI_COLOR_CHAT),
                         GUI_COLOR(GUI_COLOR_CHAT_BUFFER),
-                         util_get_time_string (&weechat_start_time));
+                         util_get_time_string (&weechat_first_start_time));
    }
    
    return WEECHAT_RC_OK;
@@ -3953,7 +3911,7 @@ command_version_display (struct t_gui_buffer *buffer,
                          weechat_upgrade_count,
                          /* TRANSLATORS: text is: "upgraded xx times" */
                          NG_("time", "times", weechat_upgrade_count),
-                          util_get_time_string (&weechat_start_time));
+                          util_get_time_string (&weechat_first_start_time));
                input_data (buffer, string);
            }
        }
@@ -3972,7 +3930,7 @@ command_version_display (struct t_gui_buffer *buffer,
                          "Upgraded %d %s, first start: %s",
                          weechat_upgrade_count,
                          (weechat_upgrade_count > 1) ? "times" : "time",
-                          ctime (&weechat_start_time));
+                          ctime (&weechat_first_start_time));
                string[strlen (string) - 1] = '\0';
                input_data (buffer, string);
            }
@@ -3996,7 +3954,7 @@ command_version_display (struct t_gui_buffer *buffer,
                             weechat_upgrade_count,
                             /* TRANSLATORS: text is: "upgraded xx times" */
                             NG_("time", "times", weechat_upgrade_count),
-                             util_get_time_string (&weechat_start_time));
+                             util_get_time_string (&weechat_first_start_time));
        }
    }
 }
@@ -4005,9 +3963,7 @@ command_version_display (struct t_gui_buffer *buffer,
 * command_version: display WeeChat version
 */

-int
-command_version (void *data, struct t_gui_buffer *buffer,
-                 int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(version)
 {
    int send_to_buffer_as_input, translated_string;
    
@@ -4080,9 +4036,7 @@ command_wait_timer_cb (void *data, int remaining_calls)
 * command_wait: schedule a command execution in future
 */

-int
-command_wait (void *data, struct t_gui_buffer *buffer,
-              int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(wait)
 {
    char *pos, *str_number, *error;
    long number, factor, delay;
@@ -4159,9 +4113,7 @@ command_wait (void *data, struct t_gui_buffer *buffer,
 * command_window: manage windows
 */

-int
-command_window (void *data, struct t_gui_buffer *buffer,
-                int argc, char **argv, char **argv_eol)
+COMMAND_CALLBACK(window)
 {
    struct t_gui_window *ptr_win;
    int i;
@@ -4570,6 +4522,29 @@ command_init ()
                  " || %(irc_privates)"
                  " || %(buffers_numbers)",
                  &command_buffer, NULL);
+    hook_command (NULL, "color",
+                  N_("define custom colors and display palette of colors"),
+                  N_("[add pair [alias] [fg,bg]] | [del pair] | switch"),
+                  N_("   add: add a color pair\n"
+                     "   del: delete a color pair\n"
+                     "switch: switch WeeChat/terminal colors\n"
+                     "  pair: pair number (>= 1)\n"
+                     " alias: alias name for color (for example: \"orange\")\n"
+                     " fg,bg: foreground and background pair number (-1 for "
+                      "default terminal foreground or background)\n\n"
+                     "Without argument, this command displays colors in a new "
+                     "buffer.\n\n"
+                     "Examples:\n"
+                     "  add color 214 with alias \"orange\":\n"
+                     "    /color add 214 orange\n"
+                     "  add color 250 with orange on blue:\n"
+                     "    /color add 250 214,4 orange_blue\n"
+                     "  delete color 214:\n"
+                     "    /color del 214"),
+                  "add %(color_pairs)"
+                  " || del %(color_pairs)"
+                  " || switch",
+                  &command_color, NULL);
    hook_command (NULL, "command",
                  N_("launch explicit WeeChat or plugin command"),
                  N_("plugin command"),
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+ * Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 * Copyright (C) 2005-2006 Emmanuel Bouthenot <kolter@openics.org>
 *
 * This file is part of WeeChat, the extensible chat client.
@@ -21,6 +21,11 @@
 #ifndef __WEECHAT_COMMAND_H
 #define __WEECHAT_COMMAND_H 1

+#define COMMAND_CALLBACK(__command)                                     \
+    int                                                                 \
+    command_##__command (void *data, struct t_gui_buffer *buffer,       \
+                         int argc, char **argv, char **argv_eol)
+
 /*
 * This macro is used to create an "empty" command in WeeChat core:
 * command does nothing, but plugins or scripts can catch it when it
@@ -40,6 +45,18 @@
        return WEECHAT_RC_OK;                                           \
    }

+#define COMMAND_MIN_ARGS(__min, __command)                              \
+    if (argc < __min)                                                   \
+    {                                                                   \
+        gui_chat_printf_date_tags (                                     \
+            NULL, 0,                                                    \
+            GUI_FILTER_TAG_NO_FILTER,                                   \
+            _("%sError: missing arguments for \"%s\" command"),         \
+            gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],                     \
+            __command);                                                 \
+        return WEECHAT_RC_ERROR;                                        \
+    }
+
 struct t_gui_buffer;

 extern int command_reload (void *data, struct t_gui_buffer *buffer,
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+ * Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 * Copyright (C) 2006 Emmanuel Bouthenot <kolter@openics.org>
 *
 * This file is part of WeeChat, the extensible chat client.
@@ -37,6 +37,7 @@

 #include "weechat.h"
 #include "wee-config.h"
+#include "wee-hashtable.h"
 #include "wee-hook.h"
 #include "wee-list.h"
 #include "wee-proxy.h"
@@ -259,6 +260,46 @@ completion_list_add_buffer_properties_get_cb (void *data,
    return WEECHAT_RC_OK;
 }

+/*
+ * completion_list_map_add_color_cb: add color pairs in completion
+ */
+
+void
+completion_list_map_add_color_cb (void *data,
+                                  struct t_hashtable *hashtable,
+                                  const void *key, const void *value)
+{
+    /* make C compiler happy */
+    (void) hashtable;
+    (void) value;
+    
+    gui_completion_list_add ((struct t_gui_completion *)data,
+                             (char *)key,
+                             0, WEECHAT_LIST_POS_SORT);
+}
+
+/*
+ * completion_list_add_color_pairs_cb: add color pairs (in section "palette")
+ */
+
+int
+completion_list_add_color_pairs_cb (void *data,
+                                    const char *completion_item,
+                                    struct t_gui_buffer *buffer,
+                                    struct t_gui_completion *completion)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) completion_item;
+    (void) buffer;
+    
+    hashtable_map (gui_color_hash_palette_color,
+                   &completion_list_map_add_color_cb,
+                   completion);
+    
+    return WEECHAT_RC_OK;
+}
+
 /*
 * completion_list_add_config_files_cb: add config files to completion list
 */
@@ -705,6 +746,24 @@ completion_list_add_plugins_commands_cb (void *data,
    return WEECHAT_RC_OK;
 }

+/*
+ * completion_list_map_add_color_alias_cb: add color alias in completion
+ */
+
+void
+completion_list_map_add_color_alias_cb (void *data,
+                                        struct t_hashtable *hashtable,
+                                        const void *key, const void *value)
+{
+    /* make C compiler happy */
+    (void) hashtable;
+    (void) value;
+    
+    gui_completion_list_add ((struct t_gui_completion *)data,
+                             (char *)key,
+                             0, WEECHAT_LIST_POS_SORT);
+}
+
 /*
 * completion_list_add_config_option_values_cb: add option value to completion
 *                                              list
@@ -879,7 +938,7 @@ completion_list_add_config_option_values_cb (void *data,
                                    }
                                    break;
                                case CONFIG_OPTION_TYPE_COLOR:
-                                    num_colors = gui_color_get_number ();
+                                    num_colors = gui_color_get_weechat_colors_number ();
                                    for (i = 0; i < num_colors; i++)
                                    {
                                        color_name = gui_color_get_name (i);
@@ -888,6 +947,12 @@ completion_list_add_config_option_values_cb (void *data,
                                                                     color_name,
                                                                     0, WEECHAT_LIST_POS_SORT);
                                    }
+                                    if (gui_color_hash_palette_alias)
+                                    {
+                                        hashtable_map (gui_color_hash_palette_alias,
+                                                       &completion_list_map_add_color_alias_cb,
+                                                       completion);
+                                    }
                                    gui_completion_list_add (completion, "++1",
                                                             0, WEECHAT_LIST_POS_END);
                                    gui_completion_list_add (completion, "--1",
@@ -1130,6 +1195,9 @@ completion_init ()
    hook_completion (NULL, "buffer_properties_get",
                     N_("properties that can be read on a buffer"),
                     &completion_list_add_buffer_properties_get_cb, NULL);
+    hook_completion (NULL, "color_pairs",
+                     N_("color pairs"),
+                     &completion_list_add_color_pairs_cb, NULL);
    hook_completion (NULL, "config_files", /* formerly "%c" */
                     N_("configuration files"),
                     &completion_list_add_config_files_cb, NULL);
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+ * Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 *
 * This file is part of WeeChat, the extensible chat client.
 *
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+ * Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 * Copyright (C) 2005-2006 Emmanuel Bouthenot <kolter@openics.org>
 *
 * This file is part of WeeChat, the extensible chat client.
@@ -636,7 +636,7 @@ config_file_new_option (struct t_config_file *config_file,
                break;
            case CONFIG_OPTION_TYPE_COLOR:
                new_option->min = min;
-                new_option->max = gui_color_get_number () - 1;
+                new_option->max = gui_color_get_weechat_colors_number () - 1;
                if (default_value)
                {
                    new_option->default_value = malloc (sizeof (int));
@@ -1251,7 +1251,7 @@ config_file_option_set (struct t_config_option *option, const char *value,
                    old_value = CONFIG_COLOR(option);
                if (option->value)
                {
-                    num_colors = gui_color_get_number ();
+                    num_colors = gui_color_get_weechat_colors_number ();
                    value_int = -1;
                    new_value_ok = 0;
                    if (strncmp (value, "++", 2) == 0)
@@ -1260,12 +1260,9 @@ config_file_option_set (struct t_config_option *option, const char *value,
                        number = strtol (value + 2, &error, 10);
                        if (error && !error[0])
                        {
-                            number = number % (num_colors + 1);
-                            value_int = (old_value + number) %
-                                (num_colors + 1);
-                            if (value_int > num_colors - 1)
-                                value_int -= num_colors;
-                            if (value_int <= num_colors - 1)
+                            if (gui_color_assign_by_diff (&value_int,
+                                                          gui_color_get_name (old_value),
+                                                          number))
                                new_value_ok = 1;
                        }
                    }
@@ -1275,19 +1272,15 @@ config_file_option_set (struct t_config_option *option, const char *value,
                        number = strtol (value + 2, &error, 10);
                        if (error && !error[0])
                        {
-                            number = number % (num_colors + 1);
-                            value_int = (old_value + num_colors - number) %
-                                num_colors;
-                            if (value_int < 0)
-                                value_int += num_colors;
-                            if (value_int >= 0)
+                            if (gui_color_assign_by_diff (&value_int,
+                                                          gui_color_get_name (old_value),
+                                                          -1 * number))
                                new_value_ok = 1;
                        }
                    }
                    else
                    {
-                        gui_color_assign (&value_int, value);
-                        if ((value_int >= 0) && (value_int <= num_colors - 1))
+                        if (gui_color_assign (&value_int, value))
                            new_value_ok = 1;
                    }
                    if (new_value_ok)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+ * Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
 * Copyright (C) 2005-2006 Emmanuel Bouthenot <kolter@openics.org>
 *
 * This file is part of WeeChat, the extensible chat client.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sebastien Helleu	09e4bfa8a6	Version 0.3.4-rc3	2011-01-04 15:06:46 +01:00
Sebastien Helleu	a477debb46	Add note about term option for .screenrc file in user guide	2011-01-04 15:05:30 +01:00
Sebastien Helleu	be48a1e763	Add doc about 256 colors in user guide and FAQ	2011-01-04 14:48:02 +01:00
Sebastien Helleu	fb60335176	Fix number of colors displayed in buffer opened by /color (can be different between WeeChat and terminal colors)	2011-01-04 14:37:14 +01:00
Sebastien Helleu	a341d809b2	Fix crash when changing or removing color palette options	2011-01-03 14:41:14 +01:00
Sebastien Helleu	b38dfac5ee	Update nick modes with IRC message 221 (bug #32038 )	2011-01-03 13:02:22 +01:00
Sebastien Helleu	7785292428	Fix crash with malformed IRC message "324" received	2011-01-02 21:43:32 +01:00
Sebastien Helleu	c466b5e1b1	Fix completion of IRC commands /notice, /query and /quote (add -server with servers) (bug #32027 )	2011-01-02 19:59:38 +01:00
Sebastien Helleu	f37d13466e	Update german translations	2011-01-02 19:35:13 +01:00
Sebastien Helleu	ce1aac77e0	Free color palette structures when exiting WeeChat	2011-01-02 16:34:47 +01:00
Sebastien Helleu	44e16c0511	Add function "hashtable_set_pointer" in plugin API	2011-01-02 16:32:54 +01:00
Sebastien Helleu	fcfe854441	Fix memory leak in flush of irc message queue	2011-01-02 15:28:20 +01:00
Sebastien Helleu	10bf2a8665	Test if variables are not NULL before free in function hook_print_exec	2011-01-02 13:09:02 +01:00
Sebastien Helleu	2d82a4a4fc	Add config files relay.conf and rmodifier.conf in man page	2011-01-02 12:23:59 +01:00
Sebastien Helleu	fc5efe5c35	Add plugins relay and rmodifier in debian package "weechat-plugins"	2011-01-02 10:48:44 +01:00
Sebastien Helleu	d24f6e9e17	Update copyright dates	2011-01-01 18:06:29 +01:00
Sebastien Helleu	b0a2274496	Update command /color in user guide	2011-01-01 16:33:29 +01:00
Sebastien Helleu	0721bb1d4c	Add new command /color	2011-01-01 14:39:12 +01:00
Sebastien Helleu	7445c12667	Add option "-server" to command /join (task #10837 )	2010-12-27 11:12:14 +01:00
Sebastien Helleu	baee047a28	Add question about gdb and threads error in FAQ	2010-12-26 15:03:58 +01:00
Sebastien Helleu	391ca47674	Add info "weechat_upgrading", signal "upgrade_ended", display duration of upgrade	2010-12-26 12:16:47 +01:00
Sebastien Helleu	b770f9c8c5	Update german and italian translations	2010-12-24 12:02:31 +01:00
Sebastien Helleu	894da1c9ed	Allow more flexible format for palette options Order of alias, pair and rgb is free and semicolon is not required any more before or after pair.	2010-12-21 09:24:31 +01:00
Sebastien Helleu	4d98ddb13c	Version 0.3.4-rc2	2010-12-20 18:31:23 +01:00
Sebastien Helleu	a9f25d125b	Do not allow empty string for color (regression with 256 colors feature)	2010-12-20 18:24:29 +01:00
Sebastien Helleu	8893a59063	Build list of color aliases at startup (fix crash when setting "++1" on option if no palette option is defined)	2010-12-20 18:22:22 +01:00
Sebastien Helleu	f7a3a2d995	Fix parsing of palette options	2010-12-20 16:27:09 +01:00
Sebastien Helleu	2ee9f7b0fc	Replace the 10 nick color options and number of nick colors by a single option "weechat.color.chat_nick_colors" (comma separated list of colors)	2010-12-20 15:08:30 +01:00
Sebastien Helleu	1340ce6b41	Update german quickstart guide	2010-12-20 13:34:47 +01:00
Sebastien Helleu	e17e5a9614	Fix removal of color pair number in a string (function gui_color_decode)	2010-12-20 11:42:26 +01:00
Sebastien Helleu	cd7a02bec5	Add 256 colors support Changes: - new section "palette" in weechat.conf - new API functions: list_search_pos and list_casesearch_pos	2010-12-20 10:13:37 +01:00
Sebastien Helleu	e80d6b93a5	Add command line option "-c" (or "--colors") to display default colors in terminal	2010-12-17 12:27:51 +01:00
Sebastien Helleu	4043ca3d38	Allow use of color pair number in color options and in API function "weechat_color"	2010-12-17 09:54:46 +01:00
Sebastien Helleu	f2c9961a21	Fix crash in perl plugin when MULTIPLICITY is disabled	2010-12-16 14:27:16 +01:00
Sebastien Helleu	29f1461c42	Update list of fonts in asciidoc.css	2010-12-16 11:39:55 +01:00
Sebastien Helleu	987044405b	Fix bug with charset decoding on IRC private buffers (decoding was made for local nick instead of remote nick) (bug #31890 )	2010-12-15 17:57:43 +01:00
Sebastien Helleu	62dc84f4e9	Add support of python 2.7 in cmake and configure (debian #606989 )	2010-12-13 22:20:57 +01:00
Sebastien Helleu	4a74325e61	Use case insensitive comparison for string in redirected messages	2010-12-13 21:41:53 +01:00
Sebastien Helleu	25d9d6e0fe	Update german user guide	2010-12-12 13:27:38 +01:00
Sebastien Helleu	bea89de51c	Update italian translations and doc	2010-12-12 09:57:28 +01:00
Sebastien Helleu	4669eac372	Add date format for logger masks in user guide	2010-12-11 22:03:21 +01:00
Sebastien Helleu	cabf0c4bc1	Change font used in doc for default keybindings	2010-12-10 16:13:27 +01:00