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-12 14:14:48 +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
390 changed files with 3594 additions and 1237 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-rc2")
+SET(VERSION_PATCH "4-rc3")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(LICENSE "GPL3")
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
@@ -1,14 +1,16 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.4-rc2, 2010-12-20
+v0.3.4-rc3, 2011-01-04


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

-* core: add 256 colors support, new section "palette" in weechat.conf
-  (task #6834)
+* 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)
@@ -40,12 +42,15 @@ Version 0.3.4 (under dev!)
  (bug #30759)
 * api: add priority for hooks (task #10550)
 * api: add new functions: list_search_pos, list_casesearch_pos,
-  hashtable_get_string, hook_info_hashtable, info_get_hashtable, hook_hsignal,
-  hook_hsignal_send, hook_completion_get_string, nicklist_group_get_integer,
+  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
@@ -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-rc2, 2010-12-20
+v0.3.4-rc3, 2011-01-04


 Version 0.3.4 (under dev!)
@@ -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.
@@ -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-rc2, 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-rc2])
+AM_INIT_AUTOMAKE([weechat], [0.3.4-rc3])
 LICENSE="GPL3"

 # Checks for programs
@@ -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,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.
@@ -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
 ........................................

@@ -49,7 +49,7 @@
 ** Werte: ein Farbname (Standardwert: `lightcyan`)

 * *weechat.color.chat_nick_colors*
-** Beschreibung: `text color for nicks (comma separated list of 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"`)

@@ -264,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`)

@@ -289,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`)

@@ -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?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -790,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
@@ -856,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
@@ -880,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]]
@@ -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.
 #
@@ -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.
@@ -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`::

 ........................................
@@ -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?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -3278,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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@@ -6775,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

@@ -792,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):
@@ -856,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
@@ -880,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]]
@@ -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.
@@ -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`::

 ........................................
@@ -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 ?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -3310,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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@@ -6862,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

@@ -811,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
@@ -877,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é
@@ -901,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]]
@@ -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.
 #
@@ -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`) | -
+
 |========================================
@@ -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]`::
@@ -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`::

 ........................................
@@ -49,7 +49,7 @@
 ** valori: un nome colore (valore predefinito: `lightcyan`)

 * *weechat.color.chat_nick_colors*
-** descrizione: `text color for nicks (comma separated list of 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"`)

@@ -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,15 +2461,14 @@ item = weechat.list_search(list, data)
 item = weechat.list_search(list, "my data")
 ----------------------------------------

-// TRANSLATION MISSING
 weechat_list_search_pos
 ^^^^^^^^^^^^^^^^^^^^^^^

-_New in version 0.3.4._
+_Novità nella versione 0.3.4._

-Search an item position in a list.
+Cerca la posizione di un elemento nella lista.

-Prototype:
+Prototipo:

 [source,C]
 ----------------------------------------
@@ -2477,16 +2476,16 @@ int weechat_list_search_pos (struct t_weelist *weelist,
                             const char *data);
 ----------------------------------------

-Arguments:
+Argomenti:

-* 'weelist': list pointer
-* 'data': data to search in list
+* 'weelist': puntatore alla lista
+* 'data': dati da cercare nella lista

-Return value:
+Valore restituito:

-* position of item found, -1 if item was not found
+* posizione dell'elemento trovato, -1 se non trovato

-C example:
+Esempio in C:

 [source,C]
 ----------------------------------------
@@ -2497,10 +2496,10 @@ Script (Python):

 [source,python]
 ----------------------------------------
-# prototype
+# prototipo
 pos_item = weechat.list_search_pos(list, data)

-# example
+# esempio
 pos_item = weechat.list_search_pos(list, "my data")
 ----------------------------------------

@@ -2545,15 +2544,14 @@ item = weechat.list_casesearch(list, data)
 item = weechat.list_casesearch(list, "my data")
 ----------------------------------------

-// TRANSLATION MISSING
 weechat_list_casesearch_pos
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^

-_New in version 0.3.4._
+_Novità nella versione 0.3.4._

-Search an item position in a list, ignoring case.
+Cerca la posizione di un elemento in una lista, ricerca normale.

-Prototype:
+Prototipo:

 [source,C]
 ----------------------------------------
@@ -2561,16 +2559,16 @@ int weechat_list_casesearch_pos (struct t_weelist *weelist,
                                 const char *data);
 ----------------------------------------

-Arguments:
+Argomenti:

-* 'weelist': list pointer
-* 'data': data to search in list
+* 'weelist': puntatore alla lista
+* 'data': dati da cercare nella lista

-Return value:
+Valore restituito:

-* position of item found, -1 if item was not found
+* posizione dell'elemento trovato, -1 se non trovato

-C example:
+Esempio in C:

 [source,C]
 ----------------------------------------
@@ -2581,10 +2579,10 @@ Script (Python):

 [source,python]
 ----------------------------------------
-# prototype
+# prototipo
 pos_item = weechat.list_casesearch_pos(list, data)

-# example
+# esempio
 pos_item = weechat.list_casesearch_pos(list, "my data")
 ----------------------------------------

@@ -3270,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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@@ -6795,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,9 +290,8 @@ Argomenti a riga di comando:
 -a, --no-connect::
    Disabilita la connessione automatica ai server all'avvio di WeeChat

-// TRANSLATION MISSING
 -c, --colors::
-    Display default colors in terminal
+    Mostra i colori prefefiniti nel terminale

 -d, --dir 'path'::
    Imposta una cartella come home per WeeChat (utilizzata per i file di
@@ -300,13 +299,13 @@ Argomenti a riga di comando:
    è ~/.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
@@ -315,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)
@@ -806,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
@@ -873,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
@@ -895,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]]
@@ -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.

@@ -90,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
@@ -97,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-20 12:52+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"
@@ -145,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"
@@ -222,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"
@@ -681,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"

@@ -995,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"

@@ -1677,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ů"

@@ -1692,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"

@@ -1763,10 +1805,9 @@ 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;r/g/b\" where alias is "
-"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b "
-"is redefinition of color (terminal must support it) (everything is optional "
-"in this format)"
+"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
@@ -2442,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\""
@@ -2521,6 +2567,35 @@ msgstr ""
 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..."

@@ -3203,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"
@@ -3653,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 "
@@ -4400,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"

@@ -5986,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"

@@ -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-20 12:52+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,17 +37,16 @@ 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
 msgid "Usage: %s [option...] [plugin:option...]\n"
 msgstr "Aufruf: %s [Option...] [Erweiterung:Option...]\n"

-#, fuzzy
 msgid ""
 "  -a, --no-connect  disable auto-connect to servers at startup\n"
 "  -c, --colors      display default colors in terminal\n"
@@ -66,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
@@ -150,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"
@@ -230,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"
@@ -688,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"

@@ -1013,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"

@@ -1625,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"
@@ -1736,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"

@@ -1751,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"

@@ -1822,15 +1881,19 @@ 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;r/g/b\" where alias is "
-"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b "
-"is redefinition of color (terminal must support it) (everything is optional "
-"in this format)"
+"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)"

-#, fuzzy, c-format
+#, c-format
 msgid "%sError: palette option must be numeric"
-msgstr "%sFehler: Optionen konnten nicht unter %s gesichert werden"
+msgstr "%sFehler: Option Palette muss numerisch sein"

 msgid "Notify level for buffer"
 msgstr "Benachrichtigungsstufe für Buffer"
@@ -2202,9 +2265,8 @@ msgstr "Farbe der Channel-Namens"
 msgid "text color for nicks in chat window"
 msgstr "Farbe für Nicks im Chat-Fenster"

-#, fuzzy
 msgid "text color for nicks (comma separated list of colors)"
-msgstr "Farbe für Nicks im Chat-Fenster"
+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."
@@ -2337,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 ""
@@ -2350,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 = "
@@ -2552,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\":"
@@ -2625,11 +2693,35 @@ msgid "Terminal infos:"
 msgstr "Terminal Informationen:"

 msgid "No color support in terminal."
-msgstr ""
+msgstr "Keine Unterstützung von Farben im Terminal."

-#, fuzzy
 msgid "Default colors:"
-msgstr "Standard rmodifier:"
+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..."
@@ -3079,9 +3171,8 @@ msgstr "Demo-Nachricht, ohne Präfix"
 msgid "%sdemo message with error prefix"
 msgstr "%sDemo-Nachricht mit fehlerhaftem Präfix"

-#, fuzzy
 msgid "colors"
-msgstr "Farbe"
+msgstr "Farben"

 msgid "Available infos:"
 msgstr "verfügbare Informationen:"
@@ -3349,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"
@@ -3596,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"
@@ -3627,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"
@@ -3811,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"
@@ -4198,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"
@@ -4580,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"

@@ -6250,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"

@@ -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-20 12:52+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"
@@ -146,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"
@@ -223,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"
@@ -677,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"

@@ -998,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"

@@ -1691,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"

@@ -1706,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"

@@ -1776,10 +1818,9 @@ 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;r/g/b\" where alias is "
-"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b "
-"is redefinition of color (terminal must support it) (everything is optional "
-"in this format)"
+"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
@@ -2474,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\":"
@@ -2554,6 +2600,35 @@ msgstr ""
 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..."

@@ -3248,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"
@@ -3702,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 "
@@ -4454,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"

@@ -6059,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"

@@ -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-20 12:52+0100\n"
-"PO-Revision-Date: 2010-12-20 12:15+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
@@ -147,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"
@@ -224,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"
@@ -681,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"

@@ -1002,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"

@@ -1706,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"

@@ -1721,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"

@@ -1792,15 +1850,14 @@ 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;r/g/b\" where alias is "
-"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b "
-"is redefinition of color (terminal must support it) (everything is optional "
-"in this format)"
+"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;r/g/b\" "
-"où alias est le nom de la couleur, fg,bg est \"texte,fond\" (par exemple: "
-"\"200,-1\"), r/g/b est la redéfinition de la couleur (le terminal doit le "
-"supporter) (tout est optionnel dans ce format)"
+"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"
@@ -2518,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\":"
@@ -2596,6 +2658,31 @@ 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..."

@@ -3300,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"
@@ -3755,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"
@@ -4521,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"

@@ -6142,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-20 12:52+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"
@@ -147,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"
@@ -226,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"
@@ -728,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"
@@ -974,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 ""

@@ -1480,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"
@@ -1499,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"
@@ -1586,10 +1628,9 @@ msgid "debug level for plugin (\"core\" for WeeChat core)"
 msgstr ""

 msgid ""
-"custom color in palette, format is: \"alias;fg,bg;r/g/b\" where alias is "
-"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b "
-"is redefinition of color (terminal must support it) (everything is optional "
-"in this format)"
+"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
@@ -2265,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"
@@ -2347,6 +2393,35 @@ msgstr ""
 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 ""

@@ -2998,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 ""
@@ -3401,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"
@@ -4142,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"
@@ -5685,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"
@@ -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-20 12:52+0100\n"
-"PO-Revision-Date: 2010-12-10 14:11+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"
@@ -43,7 +43,6 @@ msgstr ""
 msgid "Usage: %s [option...] [plugin:option...]\n"
 msgstr "Utilizzo: %s [opzione...] [plugin:opzione...]\n"

-#, fuzzy
 msgid ""
 "  -a, --no-connect  disable auto-connect to servers at startup\n"
 "  -c, --colors      display default colors in terminal\n"
@@ -63,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"
@@ -145,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"
@@ -222,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"
@@ -676,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"

@@ -992,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"

@@ -1697,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"

@@ -1712,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"

@@ -1782,16 +1824,21 @@ 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;r/g/b\" where alias is "
-"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b "
-"is redefinition of color (terminal must support it) (everything is optional "
-"in this format)"
+"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)"

-#, fuzzy, c-format
+#, c-format
 msgid "%sError: palette option must be numeric"
-msgstr "%sErrore: impossibile salvare le opzioni in %s"
+msgstr "%sErrore: l'opzione per la tavolozza deve essere numerica"

 msgid "Notify level for buffer"
 msgstr "Livello di notifica per il buffer"
@@ -2141,9 +2188,8 @@ 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"

-#, fuzzy
 msgid "text color for nicks (comma separated list of colors)"
-msgstr "colore del testo per i nick nella finestra di chat"
+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"
@@ -2488,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\""
@@ -2562,11 +2613,39 @@ 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 "Default colors:"
-msgstr "Rmodifier predefiniti:"
+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..."
@@ -3002,9 +3081,8 @@ msgstr "messaggio dimostrativo senza prefisso"
 msgid "%sdemo message with error prefix"
 msgstr "%smessaggio dimostrativo con il prefisso di errore"

-#, fuzzy
 msgid "colors"
-msgstr "colore"
+msgstr "colori"

 msgid "Available infos:"
 msgstr "Informazioni disponibili:"
@@ -3268,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"
@@ -3720,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 "
@@ -4485,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"

@@ -6103,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"

@@ -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-20 12:52+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"
@@ -148,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"
@@ -225,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\""
@@ -687,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ę"

@@ -1006,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"

@@ -1698,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"

@@ -1713,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"

@@ -1784,10 +1826,9 @@ 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;r/g/b\" where alias is "
-"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b "
-"is redefinition of color (terminal must support it) (everything is optional "
-"in this format)"
+"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
@@ -2472,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\":"
@@ -2550,6 +2596,35 @@ msgstr ""
 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..."

@@ -3239,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"
@@ -3690,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ą "
@@ -4437,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"

@@ -6020,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"

@@ -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-20 12:52+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"
@@ -146,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"
@@ -223,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"
@@ -685,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"

@@ -903,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 ""

@@ -1335,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 ""

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

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

@@ -1417,10 +1459,9 @@ msgid "debug level for plugin (\"core\" for WeeChat core)"
 msgstr ""

 msgid ""
-"custom color in palette, format is: \"alias;fg,bg;r/g/b\" where alias is "
-"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b "
-"is redefinition of color (terminal must support it) (everything is optional "
-"in this format)"
+"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
@@ -1999,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 ""
@@ -2076,6 +2122,35 @@ msgstr ""
 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 ""

@@ -2687,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 ""
@@ -3043,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"
@@ -3619,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 ""

@@ -5026,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-20 12:52+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"
@@ -150,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"
@@ -229,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"
@@ -735,6 +739,10 @@ msgstr "%s параметр конфигурации \"%s\" не найден\n"
 msgid "Option changed: "
 msgstr "не на канале"

+#, fuzzy
+msgid "Option created: "
+msgstr "не на канале"
+
 #, fuzzy
 msgid "Option changed"
 msgstr "не на канале"
@@ -981,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 ""

@@ -1489,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 "загрузка буфера не удалась"
@@ -1508,6 +1546,10 @@ msgstr "загрузка буфера не удалась"
 msgid "properties that can be read on a buffer"
 msgstr "загрузка буфера не удалась"

+#, fuzzy
+msgid "color pairs"
+msgstr "цвет чата"
+
 #, fuzzy
 msgid "configuration files"
 msgstr "перезагрузить конфигурационный файл сервера"
@@ -1595,10 +1637,9 @@ msgid "debug level for plugin (\"core\" for WeeChat core)"
 msgstr ""

 msgid ""
-"custom color in palette, format is: \"alias;fg,bg;r/g/b\" where alias is "
-"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b "
-"is redefinition of color (terminal must support it) (everything is optional "
-"in this format)"
+"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
@@ -2281,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"
@@ -2363,6 +2409,35 @@ msgstr ""
 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 ""

@@ -3017,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 ""
@@ -3420,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"
@@ -4151,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 "подключиться к серверу(-ам)"
@@ -5700,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 "управление буферами"
@@ -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-20 12:52+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 ""

@@ -111,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 ""
@@ -188,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 ""
@@ -635,6 +639,9 @@ msgstr ""
 msgid "Option changed: "
 msgstr ""

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

@@ -842,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 ""

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

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

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

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

@@ -1356,10 +1396,9 @@ msgid "debug level for plugin (\"core\" for WeeChat core)"
 msgstr ""

 msgid ""
-"custom color in palette, format is: \"alias;fg,bg;r/g/b\" where alias is "
-"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b "
-"is redefinition of color (terminal must support it) (everything is optional "
-"in this format)"
+"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
@@ -1938,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 ""
@@ -2014,6 +2058,29 @@ 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 ""

@@ -2623,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 ""
@@ -2979,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"
@@ -3555,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 ""

@@ -4962,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.
@@ -260,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
 */
@@ -707,13 +747,13 @@ completion_list_add_plugins_commands_cb (void *data,
 }

 /*
- * completion_list_add_color_alias_cb: add color alias in completion
+ * completion_list_map_add_color_alias_cb: add color alias in completion
 */

 void
-completion_list_add_color_alias_cb (void *data,
-                                    struct t_hashtable *hashtable,
-                                    const void *key, const void *value)
+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;
@@ -898,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);
@@ -910,7 +950,7 @@ completion_list_add_config_option_values_cb (void *data,
                                    if (gui_color_hash_palette_alias)
                                    {
                                        hashtable_map (gui_color_hash_palette_alias,
-                                                       &completion_list_add_color_alias_cb,
+                                                       &completion_list_map_add_color_alias_cb,
                                                       completion);
                                    }
                                    gui_completion_list_add (completion, "++1",
@@ -1155,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)
@@ -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.
@@ -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.
@@ -406,6 +406,20 @@ config_change_color (void *data, struct t_config_option *option)
    }
 }

+/*
+ * config_change_nick_colors: called when nick colors are changed
+ */
+
+void
+config_change_nick_colors (void *data, struct t_config_option *option)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) option;
+    
+    gui_color_buffer_display ();
+}
+
 /*
 * config_day_change_timer_cb: timer callback for displaying
 *                             "Day changed to xxx" message
@@ -679,7 +693,7 @@ config_weechat_palette_change_cb (void *data,
    number = (int)strtol (option->name, &error, 10);
    if (error && !error[0])
    {
-        gui_color_palette_change (number, CONFIG_STRING(option));
+        gui_color_palette_add (number, CONFIG_STRING(option));
    }
 }

@@ -728,11 +742,10 @@ config_weechat_palette_create_option_cb (void *data,
                    ptr_option = config_file_new_option (
                        config_file, section,
                        option_name, "string",
-                        _("custom color in palette, format is: \"alias;fg,bg;r/g/b\" "
+                        _("custom color in palette, format is: \"alias;fg,bg\" "
                          "where alias is color name, fg,bg is \"foreground,background\" "
-                          "(example: \"200,-1\"), r/g/b is redefinition of color "
-                          "(terminal must support it) (everything is optional "
-                          "in this format)"),
+                          "(example: \"200,-1\") (everything is optional "
+                          "in this format and order is not important)"),
                        NULL, 0, 0, "", value, 0, NULL, NULL,
                        &config_weechat_palette_change_cb, NULL,
                        NULL, NULL);
@@ -762,9 +775,9 @@ config_weechat_palette_create_option_cb (void *data,

 int
 config_weechat_palette_delete_option_cb (void *data,
-                                       struct t_config_file *config_file,
-                                       struct t_config_section *section,
-                                       struct t_config_option *option)
+                                         struct t_config_file *config_file,
+                                         struct t_config_section *section,
+                                         struct t_config_option *option)
 {
    char *error;
    int number;
@@ -1869,7 +1882,7 @@ config_weechat_init_options ()
        N_("text color for nicks (comma separated list of colors)"),
        NULL, 0, 0, "cyan,magenta,green,brown,lightblue,default,lightcyan,"
        "lightmagenta,lightgreen,blue", NULL, 0,
-        NULL, NULL, NULL, NULL, NULL, NULL);
+        NULL, NULL, &config_change_nick_colors, NULL, NULL, NULL);
    config_color_chat_nick_self = config_file_new_option (
        weechat_config_file, ptr_section,
        "chat_nick_self", "color",
@@ -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.
@@ -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) 2010 Sebastien Helleu <flashcode@flashtux.org>
+ * Copyright (C) 2010-2011 Sebastien Helleu <flashcode@flashtux.org>
 *
 * This file is part of WeeChat, the extensible chat client.
 *
@@ -149,6 +149,8 @@ hashtable_new (int size,
            new_hashtable->callback_keycmp = &hashtable_keycmp_string_cb;
        else
            new_hashtable->callback_keycmp = callback_keycmp;
+        
+        new_hashtable->callback_free_value = NULL;
    }
    return new_hashtable;
 }
@@ -211,19 +213,20 @@ hashtable_alloc_type (enum t_hashtable_type type,
 }

 /*
- * hashtable_free_type: free space used by a key or value
+ * hashtable_free_key: free space used by a key
 */

 void
-hashtable_free_type (enum t_hashtable_type type, void *value)
+hashtable_free_key (struct t_hashtable *hashtable,
+                    struct t_hashtable_item *item)
 {
-    switch (type)
+    switch (hashtable->type_keys)
    {
        case HASHTABLE_INTEGER:
        case HASHTABLE_STRING:
        case HASHTABLE_BUFFER:
        case HASHTABLE_TIME:
-            free (value);
+            free (item->key);
            break;
        case HASHTABLE_POINTER:
            break;
@@ -232,6 +235,38 @@ hashtable_free_type (enum t_hashtable_type type, void *value)
    }
 }

+/*
+ * hashtable_free_value: free space used by a value
+ */
+
+void
+hashtable_free_value (struct t_hashtable *hashtable,
+                      struct t_hashtable_item *item)
+{
+    if (hashtable->callback_free_value)
+    {
+        (void) (hashtable->callback_free_value) (hashtable,
+                                                 item->key,
+                                                 item->value);
+    }
+    else
+    {
+        switch (hashtable->type_values)
+        {
+            case HASHTABLE_INTEGER:
+            case HASHTABLE_STRING:
+            case HASHTABLE_BUFFER:
+            case HASHTABLE_TIME:
+                free (item->value);
+                break;
+            case HASHTABLE_POINTER:
+                break;
+            case HASHTABLE_NUM_TYPES:
+                break;
+        }
+    }
+}
+
 /*
 * hashtable_set_with_size: set value for item in hash table
 *                          argument size is used only for type "buffer"
@@ -267,7 +302,7 @@ hashtable_set_with_size (struct t_hashtable *hashtable,
    /* replace value if item is already in hash table */
    if (ptr_item && (hashtable->callback_keycmp (hashtable, key, ptr_item->key) == 0))
    {
-        hashtable_free_type (hashtable->type_values, ptr_item->value);
+        hashtable_free_value (hashtable, ptr_item);
        hashtable_alloc_type (hashtable->type_values,
                              value, value_size,
                              &ptr_item->value, &ptr_item->value_size);
@@ -732,6 +767,21 @@ hashtable_get_string (struct t_hashtable *hashtable, const char *property)
    return NULL;
 }

+/*
+ * hashtable_set_pointer: set a hashtable property (pointer)
+ */
+
+void
+hashtable_set_pointer (struct t_hashtable *hashtable, const char *property,
+                       void *pointer)
+{
+    if (hashtable && property)
+    {
+        if (string_strcasecmp (property, "callback_free_value") == 0)
+            hashtable->callback_free_value = pointer;
+    }
+}
+
 /*
 * hashtable_add_to_infolist: add hashtable keys and values to infolist
 *                            return 1 if ok, 0 if error
@@ -813,8 +863,8 @@ hashtable_remove_item (struct t_hashtable *hashtable,
        return;
    
    /* free key and value */
-    hashtable_free_type (hashtable->type_keys, item->key);
-    hashtable_free_type (hashtable->type_values, item->value);
+    hashtable_free_value (hashtable, item);
+    hashtable_free_key (hashtable, item);
    
    /* remove item from list */
    if (item->prev_item)
--- 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