diff --git a/BUGS b/BUGS
index 37e316020..f3c990244 100644
--- a/BUGS
+++ b/BUGS
@@ -1,13 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-WeeChat known bugs, 2005-09-24
+WeeChat known bugs, 2005-11-04
 
-- color display problems when term has white background
 - ./configure does not check that Ruby libraries are installed
 - ./configure does not check that Gtk 2.0 libraries are installed
 - when quitting WeeChat term title is not restored (if look_set_title is ON)
 - command name for /server can not contain spaces
 - when many WeeChat are launched, log file is not properly written (cleared by
   each WeeChat at startup)
-- display problems with old Konsole versions (Kde terminal) (???)
+- WeeChat may crash if too much nicks in nicklist when position is top or bottom
diff --git a/ChangeLog b/ChangeLog
index 3af6b5236..94019d019 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,13 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2005-10-30
+ChangeLog - 2005-11-04
 
 
 Version 0.1.6 (under dev!):
+   * new color management system, IRC colors are now correctly
+     displayed and can be removed by new options irc_colors_receive
+     and irc_colors_send
    * added setting for having one server buffer for all servers
      (look_one_server_buffer)
    * added setting for ignoring some chars when completing nicks
@@ -18,7 +21,8 @@ Version 0.1.6 (under dev!):
      library, and perl/python are plugin scripts
    * log options (for server/channel/private) can now be set while
      WeeChat is running
-   * added some missing IRC commands, channel modes +e and +f
+   * added channel modes +e and +f
+   * added some missing IRC commands, fixed command 367
    * added colors for input buffer and current channel of status bar
    * added online help for config options (with /set full_option_name)
    * enhanced "smart" hotlist, with names (new options:
diff --git a/doc/weechat-curses.1 b/doc/weechat-curses.1
index 240066e47..e415802fe 100644
--- a/doc/weechat-curses.1
+++ b/doc/weechat-curses.1
@@ -1,4 +1,4 @@
-.TH WEECHAT 1 "September 2005" "FlashCode"
+.TH WEECHAT 1 "November 2005" "FlashCode"
 
 .SH NAME
 weechat-curses \- Wee Enhanced Environment for Chat (Curses version)
@@ -19,6 +19,10 @@ It is compliant with RFCs 1459, 2810, 2811, 2812, and 2813.
 
 .SH OPTIONS
 .TP
+.B \-a, \-\-no\-connect
+.br
+disable auto-connect to servers at startup
+.TP
 .B \-c, \-\-config
 .br
 display config file help (list of options)
@@ -43,6 +47,10 @@ display default keys
 .br
 display program license
 .TP
+.B \-p, \-\-no\-plugin
+.br
+don't load any plugin at startup
+.TP
 .B \-v, \-\-version
 .br
 display WeeChat version
diff --git a/doc/weechat_doc_en.texi b/doc/weechat_doc_en.texi
index 349f2c5e7..4c5721f1f 100644
--- a/doc/weechat_doc_en.texi
+++ b/doc/weechat_doc_en.texi
@@ -35,7 +35,7 @@
 
 @title WeeChat - User guide
 @subtitle Fast, light and extensible IRC client
-@subtitle Documentation for WeeChat v0.1.6-cvs - October, 30 2005
+@subtitle Documentation for WeeChat v0.1.6-cvs - November, 4 2005
 
 @author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
 
@@ -298,9 +298,6 @@ Type: integer (values: between 1 and 10), default value: 10@*
 @item look_color_actions
 Display actions with different colors@*
 Type: boolean (values: 'on' or 'off'), default value: 'on'@*
-@item look_remove_colors_from_msgs
-Remove colors from incoming messages@*
-Type: boolean (values: 'on' or 'off'), default value: 'on'@*
 @item look_nicklist
 Display nicklist window (for channel windows)@*
 Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@@ -453,7 +450,7 @@ Color for input text (nick name)@*
 Type: color (Curses or Gtk color), default value: 'lightcyan'@*
 @item col_input_delimiters
 Color for input text (delimiters)@*
-Type: color (Curses or Gtk color), default value: 'white'@*
+Type: color (Curses or Gtk color), default value: 'cyan'@*
 @item col_input_bg
 Background for input window@*
 Type: color (Curses or Gtk color), default value: 'default'@*
@@ -604,6 +601,12 @@ Type: boolean (values: 'on' or 'off'), default value: 'off'@*
 @item irc_highlight
 Comma separated list of words to highlight (case insensitive comparison, words may begin or end with "*" for partial match)@*
 Type: string (any string), default value: ''@*
+@item irc_colors_receive
+Keep colors from incoming messages@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
+@item irc_colors_send
+Allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %U=underline, %R=reverse)@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
 @item dcc_auto_accept_files
 Automatically accept incoming dcc files@*
 Type: boolean (values: 'on' or 'off'), default value: 'off'@*
@@ -1577,7 +1580,7 @@ them the plugin can't load):@*
 @item functions for init and end of plugin:
 @itemize @minus
 @item weechat_plugin_init: function called when plugin is loaded,
-must return PLUGIN_RC_OK (0) if successful, PLUGIN_RC_KO (-1) if error
+must return PLUGIN_RC_OK if successful, PLUGIN_RC_KO if error
 @item weechat_plugin_end: function called when plugin is unloaded
 @end itemize
 @end itemize
@@ -1831,15 +1834,17 @@ void *handler_pointer)}@*
 @*
 @emph{Notes:}@*
 @*
-Function called when message is received has to return one of these values:@*
+Function called when message is received has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{PLUGIN_RC_KO or -1}: function failed
-@item @option{PLUGIN_RC_OK or 0}: function successfully completed
-@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT or 1}: message will not be sent to
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
+@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT}: message will not be sent to
 WeeChat
-@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS or 2}: message will not be sent to
+@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS}: message will not be sent to
 other plugins
-@item @option{PLUGIN_RC_OK_IGNORE_ALL or 3}: message will not be sent to
+@item @option{PLUGIN_RC_OK_IGNORE_ALL}: message will not be sent to
 WeeChat neither other plugins
 @end itemize
 @*
@@ -1888,10 +1893,12 @@ file: %s", (arguments) ? arguments : "none");}@*
 @*
 @emph{Notes:}@*
 @*
-Function called when command is executed has to return one of these values:@*
+Function called when command is executed has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{PLUGIN_RC_KO or -1}: function failed
-@item @option{PLUGIN_RC_OK or 0}: function successfully completed
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
 @end itemize
 @*
 
@@ -2217,12 +2224,11 @@ void weechat_plugin_end (t_weechat_plugin *plugin)
 Three plugins are provided with WeeChat to use script languages: Perl,
 Python and Ruby.
 
-@subsection Perl scripts
+@subsection Load/unload scripts
 
-@subsubsection Load/unload Perl scripts
-
-Perl scripts are loaded and unloaded with @command{/perl} command.
-(type @kbd{/help perl} within WeeChat to get help about command).@*
+Perl scripts are loaded and unloaded with @command{/perl},
+@command{/python} and @command{/ruby} commands.
+(type @kbd{/help} within WeeChat to get help about commands).@*
 
 @emph{Examples:}@*
 @itemize @bullet
@@ -2232,23 +2238,32 @@ Load a Perl script: @kbd{/perl load /tmp/sample.pl}@*
 Unload all Perl scripts: @kbd{/perl unload}@*
 @item
 List all Perl scripts: @kbd{/perl}@*
+@item
+Load a Python script: @kbd{/python load /tmp/sample.py}@*
+@item
+Unload all Python scripts: @kbd{/python unload}@*
+@item
+List all Python scripts: @kbd{/python}@*
 @end itemize
 
-@subsubsection WeeChat / Perl API
+@subsection WeeChat / Scripts API
 
 @itemize @bullet
 @item
-@command{weechat::register ( name, version, shutdown_function, description );}@*
+Perl: @command{weechat::register ( name, version, shutdown_function,
+description );}@*
+Python: @command{weechat.register ( name, version, shutdown_function,
+description )}@*
 @*
-This is first function to call in Perl script.@*
-All Perl scripts for WeeChat should call this function.@*
+This is first function to call in script.@*
+All scripts for WeeChat should call this function.@*
 
 @emph{Arguments:}
 @itemize @minus
 @item @option{name}: unique name to identify script (each script must have
 unique name)
 @item @option{version}: script's version
-@item @option{shutdown_function}: Perl function called when script is
+@item @option{shutdown_function}: function called when script is
 unloaded (optional parameter, empty string means nothing is called at the end)
 @item @option{description}: short description of script.
 @end itemize
@@ -2257,13 +2272,20 @@ unloaded (optional parameter, empty string means nothing is called at the end)
 @*
 1 if script was registered, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat::register ("sample", "1.0", "sample_end", "Sample script!");}@*
+@code{weechat::register ("sample", "1.0", "sample_end", "Sample
+script!");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.register ("sample", "1.0", "sample_end", "Sample
+script!")}@*
 @*
 
 @item
-@command{weechat::print ( message, [channel, [server]] );}@*
+Perl: @command{weechat::print ( message, [channel, [server]] );}@*
+Python: @command{weechat.prnt ( message, [channel, [server]] )}@*
 @*
 Print message in a channel.@*
 
@@ -2278,15 +2300,22 @@ Print message in a channel.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
 @code{weechat::print ("message");}@*
 @code{weechat::print ("message", "#weechat");}@*
 @code{weechat::print ("message", "#weechat", "freenode");}@*
 @*
+@emph{Python examples:}@*
+@*
+@code{weechat.prnt ("message")}@*
+@code{weechat.prnt ("message", "#weechat")}@*
+@code{weechat.prnt ("message", "#weechat", "freenode")}@*
+@*
 
 @item
-@command{weechat::print_infobar ( delay, message );}@*
+Perl: @command{weechat::print_infobar ( delay, message );}@*
+Python: @command{weechat.print_infobar ( delay, message )}@*
 @*
 Print message in infobar.@*
 
@@ -2301,15 +2330,20 @@ Print message in infobar.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
 @code{weechat::print_infobar (5, "message");}@*
 @*
+@emph{Python example:}@*
+@*
+@code{weechat.print_infobar (5, "message")}@*
+@*
 
 @item
-@command{weechat::add_message_handler ( name, function );}@*
+Perl: @command{weechat::add_message_handler ( name, function );}@*
+Python: @command{weechat.add_message_handler ( name, function )}@*
 @*
-Attach a Perl function to an IRC message.@*
+Attach a script function to an IRC message.@*
 Function will be called each time IRC message will be received.@*
 
 @emph{Arguments:}
@@ -2318,14 +2352,14 @@ Function will be called each time IRC message will be received.@*
 To know list of IRC messages, please refer to RFC 1459 and/or 2812:@*
 RFC 1459: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
 RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{function}: Perl function called when message is received
+@item @option{function}: function called when message is received
 @end itemize
 @*
 @emph{Return value:}@*
 @*
-1 if Perl function was attached, 0 if error occured.@*
+1 if function was attached, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
 @code{weechat::add_message_handler ("privmsg", my_function);}@*
 @code{sub my_function}@*
@@ -2337,31 +2371,48 @@ RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
 @code{@ @ @ @ return 0;}@*
 @code{@} }@*
 @*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.add_message_handler ("privmsg", my_function)}@*
+@code{def my_function(server, args):}@*
+@code{@ @ @ @ weechat.prnt("server="+server)}@*
+@code{@ @ @ @ null, channel, message = string.split(args, ":", 2)}@*
+@code{@ @ @ @ hostmask, null, channel = string.split(string.strip(channel), " ", 2)}@*
+@code{@ @ @ @ weechat.prnt("host="+hostmask+", channel="+channel+", message="+message)}@*
+@code{@ @ @ @ return 0}@*
+@*
 @emph{Notes:}@*
 @*
-Function called when message is received has to return one of these values:@*
+Function called when message is received has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@item @option{1}: message will not be sent to WeeChat
-@item @option{2}: message will not be sent to other plugins
-@item @option{3}: message will not be sent to WeeChat neither other plugins
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
+@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT}: message will not be sent
+to WeeChat
+@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS}: message will not be sent
+to other plugins
+@item @option{PLUGIN_RC_OK_IGNORE_ALL}: message will not be sent to
+WeeChat neither other plugins
 @end itemize
 @*
 
 @item
-@command{weechat::add_command_handler ( name, function );}@*
+Perl: @command{weechat::add_command_handler ( name, function );}@*
+Python: @command{weechat.add_command_handler ( name, function )}@*
 @*
-Create new WeeChat command, linked with Perl function.@*
+Create new WeeChat command, linked with script function.@*
 Function will be called when user will launch command with @kbd{/name}.@*
 
 @emph{Arguments:}
 @itemize @minus
 @item @option{name}: name of new command@*
 This name may be existing command, so that the command is overrided by
-Perl function. Be careful when overriding WeeChat commands, they'll not be
-available until your Perl script will be unloaded.
-@item @option{function}: Perl function linked with command
+script function. Be careful when overriding WeeChat commands, they'll not be
+available until your script will be unloaded.
+@item @option{function}: function linked with command
 @item @option{description}: command description (displayed by /help
 command)
 @item @option{arguments}: short description of command arguments
@@ -2372,9 +2423,9 @@ arguments (displayed by /help command)
 @*
 @emph{Return value:}@*
 @*
-1 if Perl function was attached, 0 if error occured.@*
+1 if function was attached, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
 @code{weechat::add_command_handler ("command", my_command);}@*
 @code{sub my_command}@*
@@ -2383,37 +2434,52 @@ arguments (displayed by /help command)
 @code{@ @ @ @ return 0;}@*
 @code{@} }@*
 @*
+@emph{Python example:}@*
+@*
+@code{weechat.add_command_handler ("command", my_command)}@*
+@code{def my_command(server, args):}@*
+@code{@ @ @ @ weechat.prnt("server:"+server+" arguments:"+args)}@*
+@code{@ @ @ @ return 0}@*
+@*
 @emph{Notes:}@*
 @*
-Function called when command is executed has to return one of these values:@*
+Function called when command is executed has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
 @end itemize
 @*
 
 @item
-@command{weechat::remove_handler ( name, function );}@*
+Perl: @command{weechat::remove_handler ( name, function );}@*
+Python: @command{weechat.remove_handler ( name, function )}@*
 @*
 Remove a message or command handler.@*
 
 @emph{Arguments:}
 @itemize @minus
 @item @option{name}: name of IRC message or command handler
-@item @option{function}: Perl function
+@item @option{function}: function
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
 @code{weechat::remove_handler ("command", my_command);}@*
 @*
+@emph{Python example:}@*
+@*
+@code{weechat.remove_handler ("command", my_command)}@*
+@*
 
 @item
-@command{weechat::command ( command, [channel, [server]] );}@*
+Perl: @command{weechat::command ( command, [channel, [server]] );}@*
+Python: @command{weechat.command ( command, [channel, [server]] )}@*
 @*
 Execute a command or send a message to a channel.@*
 
@@ -2428,15 +2494,22 @@ Execute a command or send a message to a channel.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
 @code{weechat::command ("hello world!");}@*
 @code{weechat::command ("/kick toto please leave this chan", "#weechat");}@*
 @code{weechat::command ("/nick newnick", "", "freenode");}@*
 @*
+@emph{Python examples:}@*
+@*
+@code{weechat.command ("hello world!")}@*
+@code{weechat.command ("/kick toto please leave this chan", "#weechat")}@*
+@code{weechat.command ("/nick newnick", "", "freenode")}@*
+@*
 
 @item
-@command{weechat::get_info ( name, [server, [channel] ] );}@*
+Perl: @command{weechat::get_info ( name, [server, [channel] ] );}@*
+Python: @command{weechat.get_info ( name, [server, [channel] ] )}@*
 @*
 Get various info about WeeChat, server or user.@*
 
@@ -2462,391 +2535,20 @@ Get various info about WeeChat, server or user.@*
 @*
 Asked info, empty if error occured or info was not found.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
 @code{$version = weechat::get_info("version");}@*
 @code{$nick = weechat::get_info("nick", "freenode");}@*
 @*
-
-@item
-@command{weechat::get_dcc_info ( );}@*
-@*
-Get DCC list.@*
-
-Returned array has following fields:
-@itemize @minus
-@item server: IRC server
-@item channel: IRC channel
-@item type: DCC type:
-@itemize @minus
-@item 0: chat (received)
-@item 1: chat (sent)
-@item 2: file (receiving)
-@item 3: file (sending)
-@end itemize
-@item status: DCC status:
-@itemize @minus
-@item 0: waiting
-@item 1: connecting
-@item 2: active
-@item 3: done
-@item 4: failed
-@item 5: aborted
-@end itemize
-@item start_time: date/time of DCC creation
-@item start_transfer: date/time of transfer start
-@item addr: remote address
-@item port: port used for DCC
-@item nick: remote nick
-@item filename: filename
-@item local_filename: local filename
-@item size: file size
-@item pos: current position in file
-@item start_resume: restart position after interruption
-@item bytes_per_sec: bytes sent/received per second
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-DCC list, 0 if error occured.@*
-@*
-
-@item
-@command{weechat::get_config ( option );}@*
-@*
-Get WeeChat config option value.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Value of option, empty if error occured or option was not found.@*
-@*
-@emph{Examples:}@*
-@*
-@code{$value1 = weechat::get_config ("look_nicklist");}@*
-@code{$value2 = weechat::get_config ("freenode.server_autojoin");}@*
-@*
-
-@item
-@command{weechat::set_config ( option, value );}@*
-@*
-Get WeeChat config option value.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@item @option{value}: new value for option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Examples:}@*
-@*
-@code{weechat::set_config ("look_nicklist", "off");}@*
-@code{weechat::set_config ("freenode.server_autojoin"", "#weechat");}@*
-@*
-
-@item
-@command{weechat::get_plugin_config ( option );}@*
-@*
-Return value of a plugin option.@*
-Option is read from file ~/.weechat/plugins.rc and is like:@*
-@code{plugin.script.option=value}@*
-Note: plugin and script names are automatically added.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Value of option, empty if error occured or option was not found.@*
-@*
-@emph{Example:}@*
-@*
-@code{$value = weechat::get_plugin_config ("my_var");}@*
-@*
-
-@item
-@command{weechat::set_plugin_config ( option, value );}@*
-@*
-Update value of a plugin option.@*
-Option is written in file ~/.weechat/plugins.rc and is like:@*
-@code{plugin.script.option=value}@*
-Note: plugin and script names are automatically added.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@item @option{value}: new value for option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat::set_plugin_config ("my_var", "value");}@*
-@*
-
-@end itemize
-
-@subsection Python scripts
-
-@subsubsection Load/unload Python scripts
-
-Python scripts are loaded and unloaded with @command{/python} command.
-(type @kbd{/help python} within WeeChat to get help about command).@*
-
-@emph{Examples:}@*
-@itemize @bullet
-@item
-Load a Python script: @kbd{/python load /tmp/sample.py}@*
-@item
-Unload all Python scripts: @kbd{/python unload}@*
-@item
-List all Python scripts: @kbd{/python}@*
-@end itemize
-
-@subsubsection WeeChat / Python API
-
-@itemize @bullet
-@item
-@command{weechat.register ( name, version, shutdown_function, description )}@*
-@*
-This is first function to call in Python script.@*
-All Python scripts for WeeChat should call this function.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{name}: unique name to identify script (each script must have
-unique name)
-@item @option{version}: script's version
-@item @option{shutdown_function}: Python function called when script is
-unloaded (optional parameter, empty string means nothing is called at the end)
-@item @option{description}: short description of script.
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if script was registered, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat.register ("sample", "1.0", "sample_end", "Sample script!")}@*
-@*
-
-@item
-@command{weechat.prnt ( message, [channel, [server]] )}@*
-@*
-Print message in a channel.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{message}: message to display
-@item @option{channel}: name of channel
-@item @option{server}: internal name of server
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Examples:}@*
-@*
-@code{weechat.prnt ("message")}@*
-@code{weechat.prnt ("message", "#weechat")}@*
-@code{weechat.prnt ("message", "#weechat", "freenode")}@*
-@*
-
-@item
-@command{weechat.print_infobar ( delay, message )}@*
-@*
-Print message in infobar.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{delay}: after this delay (in seconds), message will be erased
-(if 0, message will not be erased).
-@item @option{message}: message to display
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat.print_infobar (5, "message")}@*
-@*
-
-@item
-@command{weechat.add_message_handler ( name, function )}@*
-@*
-Attach a Python function to an IRC message.@*
-Function will be called each time IRC message will be received.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{name}: name of IRC message@*
-To know list of IRC messages, please refer to RFC 1459 and/or 2812:@*
-RFC 1459: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
-RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{function}: Python function called when message is received
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if Python function was attached, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat.add_message_handler ("privmsg", my_function)}@*
-@code{def my_function(server, args):}@*
-@code{@ @ @ @ weechat.prnt("server="+server)}@*
-@code{@ @ @ @ null, channel, message = string.split(args, ":", 2)}@*
-@code{@ @ @ @ hostmask, null, channel = string.split(string.strip(channel), " ", 2)}@*
-@code{@ @ @ @ weechat.prnt("host="+hostmask+", channel="+channel+", message="+message)}@*
-@code{@ @ @ @ return 0}@*
-@*
-@emph{Notes:}@*
-@*
-Function called when message is received has to return one of these values:@*
-@itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@item @option{1}: message will not be sent to WeeChat
-@item @option{2}: message will not be sent to other plugins
-@item @option{3}: message will not be sent to WeeChat neither other plugins
-@end itemize
-@*
-
-@item
-@command{weechat.add_command_handler ( name, function )}@*
-@*
-Create new WeeChat command, linked with Python function.@*
-Function will be called when user will launch command with @kbd{/name}.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{name}: name of new command@*
-This name may be existing command, so that the command is overrided by
-Python function. Be careful when overriding WeeChat commands, they'll not be
-available until your Python script will be unloaded.
-@item @option{function}: Python function linked with command
-@item @option{description}: command description (displayed by /help
-command)
-@item @option{arguments}: short description of command arguments
-(displayed by /help command)
-@item @option{arguments_description}: long description of command
-arguments (displayed by /help command)
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if Python function was attached, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat.add_command_handler ("command", my_command)}@*
-@code{def my_command(server, args):}@*
-@code{@ @ @ @ weechat.prnt("server:"+server+" arguments:"+args)}@*
-@code{@ @ @ @ return 0}@*
-@*
-@emph{Notes:}@*
-@*
-Function called when command is executed has to return one of these values:@*
-@itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@end itemize
-@*
-
-@item
-@command{weechat.remove_handler ( name, function );}@*
-@*
-Remove a message or command handler.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{name}: name of IRC message or command handler
-@item @option{function}: Python function
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat.remove_handler ("command", my_command);}@*
-@*
-
-@item
-@command{weechat.command ( command, [channel, [server]] )}@*
-@*
-Execute a command or send a message to a channel.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{command}: command to execute (or message to send in a channel)
-@item @option{channel}: name of channel
-@item @option{server}: internal name of server
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Examples:}@*
-@*
-@code{weechat.command ("hello world!")}@*
-@code{weechat.command ("/kick toto please leave this chan", "#weechat")}@*
-@code{weechat.command ("/nick newnick", "", "freenode")}@*
-@*
-
-
-@item
-@command{weechat.get_info ( name, [server] )}@*
-@*
-Get various info about WeeChat, server or user.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{name}: name of info to retrieve:
-@itemize @minus
-@item @option{version}: get WeeChat version
-@item @option{nick}: get nickname
-@item @option{channel}: get channel name
-@item @option{server}: get server name
-@item @option{away}: get ``away'' flag
-@item @option{weechat_dir}: get WeeChat home dir
-@item @option{weechat_libdir}: get WeeChat system lib dir
-@item @option{weechat_sharedir}: get WeeChat system share dir
-@end itemize
-@item @option{server}: internal name of server
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Asked info, empty if error occured or info was not found.@*
-@*
-@emph{Examples:}@*
+@emph{Python examples:}@*
 @*
 @code{$version = weechat.get_info("version")}@*
 @code{$nick = weechat.get_info("nick", "freenode")}@*
 @*
 
 @item
-@command{weechat.get_dcc_info ( );}@*
+Perl: @command{weechat::get_dcc_info ( );}@*
+Python: @command{weechat.get_dcc_info ( );}@*
 @*
 Get DCC list.@*
 
@@ -2889,7 +2591,8 @@ DCC list, 0 if error occured.@*
 @*
 
 @item
-@command{weechat.get_config ( option );}@*
+Perl: @command{weechat::get_config ( option );}@*
+Python: @command{weechat.get_config ( option )}@*
 @*
 Get WeeChat config option value.@*
 
@@ -2902,14 +2605,20 @@ Get WeeChat config option value.@*
 @*
 Value of option, empty if error occured or option was not found.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
-@code{$value1 = weechat.get_config ("look_nicklist");}@*
-@code{$value2 = weechat.get_config ("freenode.server_autojoin");}@*
+@code{$value1 = weechat::get_config ("look_nicklist");}@*
+@code{$value2 = weechat::get_config ("freenode.server_autojoin");}@*
+@*
+@emph{Python examples:}@*
+@*
+@code{$value1 = weechat.get_config ("look_nicklist")}@*
+@code{$value2 = weechat.get_config ("freenode.server_autojoin")}@*
 @*
 
 @item
-@command{weechat.set_config ( option, value );}@*
+Perl: @command{weechat::set_config ( option, value );}@*
+Python: @command{weechat.set_config ( option, value )}@*
 @*
 Get WeeChat config option value.@*
 
@@ -2923,14 +2632,21 @@ Get WeeChat config option value.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
-@code{weechat.set_config ("look_nicklist", "off");}@*
-@code{weechat.set_config ("freenode.server_autojoin"", "#weechat");}@*
+@code{weechat::set_config ("look_nicklist", "off");}@*
+@code{weechat::set_config ("freenode.server_autojoin"",
+"#weechat");}@*
+@*
+@emph{Python examples:}@*
+@*
+@code{weechat.set_config ("look_nicklist", "off")}@*
+@code{weechat.set_config ("freenode.server_autojoin"", "#weechat")}@*
 @*
 
 @item
-@command{weechat.get_plugin_config ( option );}@*
+Perl: @command{weechat::get_plugin_config ( option );}@*
+Python: @command{weechat.get_plugin_config ( option )}@*
 @*
 Return value of a plugin option.@*
 Option is read from file ~/.weechat/plugins.rc and is like:@*
@@ -2946,13 +2662,18 @@ Note: plugin and script names are automatically added.@*
 @*
 Value of option, empty if error occured or option was not found.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
-@code{$value = weechat.get_plugin_config ("my_var");}@*
+@code{$value = weechat::get_plugin_config ("my_var");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{$value = weechat.get_plugin_config ("my_var")}@*
 @*
 
 @item
-@command{weechat.set_plugin_config ( option, value );}@*
+Perl: @command{weechat::set_plugin_config ( option, value );}@*
+Python: @command{weechat.set_plugin_config ( option, value )}@*
 @*
 Update value of a plugin option.@*
 Option is written in file ~/.weechat/plugins.rc and is like:@*
@@ -2969,17 +2690,17 @@ Note: plugin and script names are automatically added.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat.set_plugin_config ("my_var", "value");}@*
+@code{weechat::set_plugin_config ("my_var", "value");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.set_plugin_config ("my_var", "value")}@*
 @*
 
 @end itemize
 
-@subsection Ruby scripts
-
-Not developed!
-
 
 @c **************************** Authors / Support *****************************
 
diff --git a/doc/weechat_doc_es.texi b/doc/weechat_doc_es.texi
index d36bcd412..a4330e16d 100644
--- a/doc/weechat_doc_es.texi
+++ b/doc/weechat_doc_es.texi
@@ -36,7 +36,7 @@
 
 @title WeeChat - Gui@'on de usuario.
 @subtitle Cliente IRC r@'apido, peque@~no y extensible
-@subtitle Documentaci@'on para WeeChat v0.1.6-cvs - 30 de octubre de 2005
+@subtitle Documentaci@'on para WeeChat v0.1.6-cvs - 4 de noviembre de 2005
 
 @author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
 
@@ -298,9 +298,6 @@ Typo: entero (valores: entre 1 y 10), valor por defecto: 10@*
 @item look_color_actions
 Mostrar acciones con colores diferentes@*
 Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'on'@*
-@item look_remove_colors_from_msgs
-Quitar colores en los mensajes entrantes@*
-Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'on'@*
 @item look_nicklist
 Mostrar ventana de usuarios (para las ventanas de canal)@*
 Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'on'@*
@@ -453,7 +450,7 @@ Color para el texto de entrada (alias)@*
 Typo: color (color Curses @'o Gtk), valor por defecto: 'lightcyan'@*
 @item col_input_delimiters
 Color for input text (delimiters)@*
-Typo: color (color Curses @'o Gtk), valor por defecto: 'white'@*
+Typo: color (color Curses @'o Gtk), valor por defecto: 'cyan'@*
 @item col_input_bg
 Color de fondo para la ventana de entrada@*
 Typo: color (color Curses @'o Gtk), valor por defecto: 'default'@*
@@ -604,6 +601,12 @@ Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'off'@*
 @item irc_highlight
 Comma separated list of words to highlight (case insensitive comparison, words may begin or end with "*" for partial match)@*
 Typo: cadena (cualquier cadena), valor por defecto: ''@*
+@item irc_colors_receive
+Keep colors from incoming messages@*
+Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'on'@*
+@item irc_colors_send
+Allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %U=underline, %R=reverse)@*
+Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'on'@*
 @item dcc_auto_accept_files
 Aceptar autom@'aticamente los ficheros dcc entrantes@*
 Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'off'@*
@@ -1834,15 +1837,17 @@ void *handler_pointer)}@*
 @*
 @emph{Notes:}@*
 @*
-Function called when message is received has to return one of these values:@*
+Function called when message is received has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{PLUGIN_RC_KO or -1}: function failed
-@item @option{PLUGIN_RC_OK or 0}: function successfully completed
-@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT or 1}: message will not be sent to
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
+@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT}: message will not be sent to
 WeeChat
-@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS or 2}: message will not be sent to
+@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS}: message will not be sent to
 other plugins
-@item @option{PLUGIN_RC_OK_IGNORE_ALL or 3}: message will not be sent to
+@item @option{PLUGIN_RC_OK_IGNORE_ALL}: message will not be sent to
 WeeChat neither other plugins
 @end itemize
 @*
@@ -1891,10 +1896,12 @@ file: %s", (arguments) ? arguments : "none");}@*
 @*
 @emph{Notes:}@*
 @*
-Function called when message is received has to return one of these values:@*
+Function called when message is received has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{PLUGIN_RC_KO or -1}: function failed
-@item @option{PLUGIN_RC_OK or 0}: function successfully completed
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
 @end itemize
 @*
 
@@ -2214,151 +2221,195 @@ void weechat_plugin_end (t_weechat_plugin *plugin)
 Three plugins are provided with WeeChat to load scripts: Perl,
 Python and Ruby.
 
-@subsection Perl scripts
+@subsection Load/unload scripts
 
-@subsubsection Cargar/descargar programas Perl
+Perl scripts are loaded and unloaded with @command{/perl},
+@command{/python} and @command{/ruby} commands.
+(type @kbd{/help} within WeeChat to get help about commands).@*
 
-Los programas Perl se cargan y descargan con el comando @command{/perl}
-(escribiendo @kbd{/help perl} en WeeChat para obtener la ayuda acerca del comando).@*
-
-@emph{Ejemplos:}@*
+@emph{Examples:}@*
 @itemize @bullet
 @item
-Cargar un programa Perl: @kbd{/perl load /tmp/ejemplo.pl}@*
-@item Descargar todos los programas Perl: @kbd{/perl unload}@*
+Load a Perl script: @kbd{/perl load /tmp/sample.pl}@*
 @item
-Listar los programas Perl cargados: @kbd{/perl}@*
+Unload all Perl scripts: @kbd{/perl unload}@*
+@item
+List all Perl scripts: @kbd{/perl}@*
+@item
+Load a Python script: @kbd{/python load /tmp/sample.py}@*
+@item
+Unload all Python scripts: @kbd{/python unload}@*
+@item
+List all Python scripts: @kbd{/python}@*
 @end itemize
 
-@subsubsection Interfaz WeeChat / Perl
+@subsection WeeChat / Scripts API
 
 @itemize @bullet
 @item
-@command{weechat::register ( nombre, versi@'on, funci@'on_final, descripci@'on );}@*
+Perl: @command{weechat::register ( name, version, shutdown_function,
+description );}@*
+Python: @command{weechat.register ( name, version, shutdown_function,
+description )}@*
 @*
-Es la primera funci@'on a la que llamar en el programa Perl.@*
-Todos los programas en Perl para WeeChat deben llamar esta funci@'on.@*
+This is first function to call in script.@*
+All scripts for WeeChat should call this function.@*
 
-@emph{Par@'ametros:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{nombre}: nombre @'unico para identificar el programa (cada programa debe
-tener un nombre distinto)
-@item @option{versi@'on}: versi@'on del programa
-@item @option{funci@'on_final}: funci@'on Perl llamada cuando el programa finaliza
-(par@'ametro facultativo, una cadena llena significa que no hay ninguna funci@'on que llamar)
-@item @option{descripci@'on}: descripci@'on breve del programa
+@item @option{name}: unique name to identify script (each script must have
+unique name)
+@item @option{version}: script's version
+@item @option{shutdown_function}: function called when script is
+unloaded (optional parameter, empty string means nothing is called at the end)
+@item @option{description}: short description of script.
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 1 if script was registered, 0 if error occured.@*
 @*
-@emph{Ejemplo:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat::register ("ejemplo", "1.0", "fin_ejemplo", "programa de ejemplo...");}@*
+@code{weechat::register ("sample", "1.0", "sample_end", "Sample
+script!");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.register ("sample", "1.0", "sample_end", "Sample
+script!")}@*
 @*
 
 @item
-@command{weechat::print ( mensaje, [canal, [servidor]] );}@*
+Perl: @command{weechat::print ( message, [channel, [server]] );}@*
+Python: @command{weechat.prnt ( message, [channel, [server]] )}@*
 @*
-Escribe un mensaje en un canal.@*
+Print message in a channel.@*
 
-@emph{Par@'ametros:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{mensaje}: mensaje a escribir
-@item @option{canal}: nombre del canal
-@item @option{servidor}: (opcional) nombre interno del servidor
+@item @option{message}: message to display
+@item @option{channel}: name of channel
+@item @option{server}: internal name of server
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Ejemplos:}@*
+@emph{Perl examples:}@*
 @*
-@code{weechat::print ("mensaje");}@*
-@code{weechat::print ("mensaje", "#weechat");}@*
-@code{weechat::print ("mensaje", "#weechat", "freenode");}@*
+@code{weechat::print ("message");}@*
+@code{weechat::print ("message", "#weechat");}@*
+@code{weechat::print ("message", "#weechat", "freenode");}@*
+@*
+@emph{Python examples:}@*
+@*
+@code{weechat.prnt ("message")}@*
+@code{weechat.prnt ("message", "#weechat")}@*
+@code{weechat.prnt ("message", "#weechat", "freenode")}@*
 @*
 
 @item
-@command{weechat::print_infobar ( retraso, mensaje );}@*
+Perl: @command{weechat::print_infobar ( delay, message );}@*
+Python: @command{weechat.print_infobar ( delay, message )}@*
 @*
-Escribir un mensaje en la barra de informaciones.@*
+Print message in infobar.@*
 
-@emph{Par@'ametros:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{plazo}: periodo en segundo durante el cual se mostrar@'a el mensaje
-(si es 0, el mensaje no se borrar@'a).
-@item @option{message}: mensaje que se escribir@'a en la barra de informaciones.
+@item @option{delay}: after this delay (in seconds), message will be erased
+(if 0, message will not be erased).
+@item @option{message}: message to display
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Ejemplo:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat::print_infobar (5, "mensaje");}@*
+@code{weechat::print_infobar (5, "message");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.print_infobar (5, "message")}@*
 @*
 
 @item
-@command{weechat::add_message_handler ( nombre, funci@'on );}@*
+Perl: @command{weechat::add_message_handler ( name, function );}@*
+Python: @command{weechat.add_message_handler ( name, function )}@*
 @*
-Adjunta una funci@'on Perl a un mensaje IRC.@*
-Se llamar@'a a la funci@'on cada vez que el mensaje IRC se reciba.@*
+Attach a script function to an IRC message.@*
+Function will be called each time IRC message will be received.@*
 
-@emph{Par@'ametros:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{nombre}: nombre del mensaje IRC que producir@'a la llamada a la funci@'on.@*
-Para saber qu@'e tipo de mensajes IRC existen puede leer las 
-RFC 1459 y/o 2812:@*
+@item @option{name}: name of IRC message@*
+To know list of IRC messages, please refer to RFC 1459 and/or 2812:@*
 RFC 1459: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
 RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{funci@'on}: funci@'on en Perl llamada cuando se reciba el mensaje.
+@item @option{function}: function called when message is received
 @end itemize
 @*
 @emph{Return value:}@*
 @*
-1 if Perl function was attached, 0 if error occured.@*
+1 if function was attached, 0 if error occured.@*
 @*
-@emph{Ejemplo:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat::add_message_handler ("privmsg", mi_funcion);}@*
-@code{sub mi_funcion}@*
+@code{weechat::add_message_handler ("privmsg", my_function);}@*
+@code{sub my_function}@*
 @code{@{ }@*
-@code{@ @ @ @ weechat::print ("serveur=$_[0]\n");}@*
-@code{@ @ @ @ ($null, $canal, $mensaje) = split ":",$_[1],3;}@*
-@code{@ @ @ @ ($mascara, $null, $canal) = split " ", $canal;}@*
-@code{@ @ @ @ weechat::print ("masc=$mascara, canal=$canal, msj=$mensaje\n");}@*
+@code{@ @ @ @ weechat::print ("server=$_[0]\n");}@*
+@code{@ @ @ @ ($null, $channel, $message) = split ":",$_[1],3;}@*
+@code{@ @ @ @ ($hostmask, $null, $channel) = split " ", $channel;}@*
+@code{@ @ @ @ weechat::print ("host=$hostmask, chan=$channel, msg=$message\n");}@*
 @code{@ @ @ @ return 0;}@*
 @code{@} }@*
 @*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.add_message_handler ("privmsg", my_function)}@*
+@code{def my_function(server, args):}@*
+@code{@ @ @ @ weechat.prnt("server="+server)}@*
+@code{@ @ @ @ null, channel, message = string.split(args, ":", 2)}@*
+@code{@ @ @ @ hostmask, null, channel = string.split(string.strip(channel), " ", 2)}@*
+@code{@ @ @ @ weechat.prnt("host="+hostmask+", channel="+channel+", message="+message)}@*
+@code{@ @ @ @ return 0}@*
+@*
 @emph{Notes:}@*
 @*
-Function called when message is received has to return one of these values:@*
+Function called when message is received has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@item @option{1}: message will not be sent to WeeChat
-@item @option{2}: message will not be sent to other plugins
-@item @option{3}: message will not be sent to WeeChat neither other plugins
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
+@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT}: message will not be sent
+to WeeChat
+@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS}: message will not be sent
+to other plugins
+@item @option{PLUGIN_RC_OK_IGNORE_ALL}: message will not be sent to
+WeeChat neither other plugins
 @end itemize
 @*
 
 @item
-@command{weechat::add_command_handler ( nombre, funci@'on );}@*
+Perl: @command{weechat::add_command_handler ( name, function );}@*
+Python: @command{weechat.add_command_handler ( name, function )}@*
 @*
-A@~nadir un nuevo comando WeeChat, con un enlace a una funci@'on en Perl.@*
-Se llamar@'a a la funci@'on cuando el usuario lance el comando con @kbd{/nombre}.@*
+Create new WeeChat command, linked with script function.@*
+Function will be called when user will launch command with @kbd{/name}.@*
 
-@emph{Par@'ametros:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{nombre}: nombre del nuevo comando@*
-Puede ser un comando que ya existe, y en este caso el nuevo comando sustituir@'a
-el antiguo. Ten cuidado cuando sustituyas a un comando de WeeChat, no podr@'a acceder 
-al antiguo comando si el script Perl est@'a cargado.
-@item @option{funcion}: funci@'on Perl assiciada al comando.
+@item @option{name}: name of new command@*
+This name may be existing command, so that the command is overrided by
+script function. Be careful when overriding WeeChat commands, they'll not be
+available until your script will be unloaded.
+@item @option{function}: function linked with command
 @item @option{description}: command description (displayed by /help
 command)
 @item @option{arguments}: short description of command arguments
@@ -2369,48 +2420,63 @@ arguments (displayed by /help command)
 @*
 @emph{Return value:}@*
 @*
-1 if Perl function was attached, 0 if error occured.@*
+1 if function was attached, 0 if error occured.@*
 @*
-@emph{Ejemplo:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat::add_command_handler ("comando", mi_comando);}@*
-@code{sub mi_comando}@*
+@code{weechat::add_command_handler ("command", my_command);}@*
+@code{sub my_command}@*
 @code{@{ }@*
-@code{@ @ @ @ weechat::print("Servidor: $_[0], Par@'ametros: $_[1]\n");}@*
+@code{@ @ @ @ weechat::print("Server: $_[0], arguments: $_[1]\n");}@*
 @code{@ @ @ @ return 0;}@*
 @code{@} }@*
 @*
+@emph{Python example:}@*
+@*
+@code{weechat.add_command_handler ("command", my_command)}@*
+@code{def my_command(server, args):}@*
+@code{@ @ @ @ weechat.prnt("server:"+server+" arguments:"+args)}@*
+@code{@ @ @ @ return 0}@*
+@*
 @emph{Notes:}@*
 @*
-Function called when command is executed has to return one of these values:@*
+Function called when command is executed has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
 @end itemize
 @*
 
 @item
-@command{weechat::remove_handler ( name, function );}@*
+Perl: @command{weechat::remove_handler ( name, function );}@*
+Python: @command{weechat.remove_handler ( name, function )}@*
 @*
 Remove a message or command handler.@*
 
 @emph{Arguments:}
 @itemize @minus
 @item @option{name}: name of IRC message or command handler
-@item @option{function}: Perl function
+@item @option{function}: function
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
 @code{weechat::remove_handler ("command", my_command);}@*
 @*
+@emph{Python example:}@*
+@*
+@code{weechat.remove_handler ("command", my_command)}@*
+@*
 
 @item
-@command{weechat::command ( command, [channel, [server]] );}@*
+Perl: @command{weechat::command ( command, [channel, [server]] );}@*
+Python: @command{weechat.command ( command, [channel, [server]] )}@*
 @*
 Execute a command or send a message to a channel.@*
 
@@ -2425,384 +2491,13 @@ Execute a command or send a message to a channel.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
 @code{weechat::command ("hello world!");}@*
 @code{weechat::command ("/kick toto please leave this chan", "#weechat");}@*
 @code{weechat::command ("/nick newnick", "", "freenode");}@*
 @*
-
-@item
-@command{weechat::get_info ( nombre, [servidor, [canal] ] );}@*
-@*
-Obtener informaciones distintas sobre WeeChat, el servidor o el usuario.@*
-
-@emph{Par@'ametros:}
-@itemize @minus
-@item @option{nombre}: nombre de la informaci@'on que se quiere obtener:
-@itemize @minus
-@item @option{version}: obtener la versi@'on de WeeChat
-@item @option{nick}: obtener el seud@'onimo
-@item @option{channel}: obtener el nombre del canal
-@item @option{server}: obtener el nombre del servidor
-@item @option{away}: get ``away'' flag
-@item @option{weechat_dir}: get WeeChat home dir
-@item @option{weechat_libdir}: get WeeChat system lib dir
-@item @option{weechat_sharedir}: get WeeChat system share dir
-@end itemize
-@item @option{servidor}: nombre interno del servidor
-@item @option{canal}: nombre del canal
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Asked info, empty if error occured or info was not found.@*
-@*
-@emph{Ejemplos:}@*
-@*
-@code{$version = weechat::get_info("version");}@*
-@code{$nick = weechat::get_info("nick", "freenode");}@*
-@*
-
-@item
-@command{weechat::get_dcc_info ( );}@*
-@*
-Get DCC list.@*
-
-Returned array has following fields:
-@itemize @minus
-@item server: IRC server
-@item channel: IRC channel
-@item type: DCC type:
-@itemize @minus
-@item 0: chat (received)
-@item 1: chat (sent)
-@item 2: file (receiving)
-@item 3: file (sending)
-@end itemize
-@item status: DCC status:
-@itemize @minus
-@item 0: waiting
-@item 1: connecting
-@item 2: active
-@item 3: done
-@item 4: failed
-@item 5: aborted
-@end itemize
-@item start_time: date/time of DCC creation
-@item start_transfer: date/time of transfer start
-@item addr: remote address
-@item port: port used for DCC
-@item nick: remote nick
-@item filename: filename
-@item local_filename: local filename
-@item size: file size
-@item pos: current position in file
-@item start_resume: restart position after interruption
-@item bytes_per_sec: bytes sent/received per second
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-DCC list, 0 if error occured.@*
-@*
-
-@item
-@command{weechat::get_config ( option );}@*
-@*
-Get WeeChat config option value.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Value of option, empty if error occured or option was not found.@*
-@*
-@emph{Examples:}@*
-@*
-@code{$value1 = weechat::get_config ("look_nicklist");}@*
-@code{$value2 = weechat::get_config ("freenode.server_autojoin");}@*
-@*
-
-@item
-@command{weechat::set_config ( option, value );}@*
-@*
-Get WeeChat config option value.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@item @option{value}: new value for option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Examples:}@*
-@*
-@code{weechat::set_config ("look_nicklist", "off");}@*
-@code{weechat::set_config ("freenode.server_autojoin"", "#weechat");}@*
-@*
-
-@item
-@command{weechat::get_plugin_config ( option );}@*
-@*
-Return value of a plugin option.@*
-Option is read from file ~/.weechat/plugins.rc and is like:@*
-@code{plugin.script.option=value}@*
-Note: plugin and script names are automatically added.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Value of option, empty if error occured or option was not found.@*
-@*
-@emph{Example:}@*
-@*
-@code{$value = weechat::get_plugin_config ("my_var");}@*
-@*
-
-@item
-@command{weechat::set_plugin_config ( option, value );}@*
-@*
-Update value of a plugin option.@*
-Option is written in file ~/.weechat/plugins.rc and is like:@*
-@code{plugin.script.option=value}@*
-Note: plugin and script names are automatically added.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@item @option{value}: new value for option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat::set_plugin_config ("my_var", "value");}@*
-@*
-
-@end itemize
-
-@subsection Python scripts
-
-@subsubsection Cargar/descargar programas Python
-
-Los programas Python se cargan y descargan con el comando @command{/python}
-(escribiendo @kbd{/help python} en WeeChat para obtener la ayuda acerca del comando).@*
-
-@emph{Ejemplos:}@*
-@itemize @bullet
-@item
-Cargar un programa Python: @kbd{/python load /tmp/ejemplo.py}@*
-@item Descargar todos los programas Python: @kbd{/python unload}@*
-@item
-Listar los programas Python cargados: @kbd{/python}@*
-@end itemize
-
-@subsubsection Interfaz WeeChat / Python
-
-@itemize @bullet
-@item
-@command{weechat.register ( nombre, versi@'on, funci@'on_final, descripci@'on )}@*
-@*
-Es la primera funci@'on a la que llamar en el programa Python.@*
-Todos los programas en Python para WeeChat deben llamar esta funci@'on.@*
-
-@emph{Par@'ametros:}
-@itemize @minus
-@item @option{nombre}: nombre @'unico para identificar el programa (cada programa debe
-tener un nombre distinto)
-@item @option{versi@'on}: versi@'on del programa
-@item @option{funci@'on_final}: funci@'on Python llamada cuando el programa finaliza
-(par@'ametro facultativo, una cadena llena significa que no hay ninguna funci@'on que llamar)
-@item @option{descripci@'on}: descripci@'on breve del programa
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if script was registered, 0 if error occured.@*
-@*
-@emph{Ejemplo:}@*
-@*
-@code{weechat.register ("ejemplo", "1.0", "fin_ejemplo", "programa de ejemplo...")}@*
-@*
-
-@item
-@command{weechat.prnt ( mensaje, [canal, [servidor]] )}@*
-@*
-Escribe un mensaje en un canal.@*
-
-@emph{Par@'ametros:}
-@itemize @minus
-@item @option{mensaje}: mensaje a escribir
-@item @option{canal}: nombre del canal
-@item @option{servidor}: (opcional) nombre interno del servidor
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Ejemplos:}@*
-@*
-@code{weechat.prnt ("mensaje")}@*
-@code{weechat.prnt ("mensaje", "#weechat")}@*
-@code{weechat.prnt ("mensaje", "#weechat", "freenode")}@*
-@*
-
-@item
-@command{weechat.print_infobar ( retraso, mensaje )}@*
-@*
-Escribir un mensaje en la barra de informaciones.@*
-
-@emph{Par@'ametros:}
-@itemize @minus
-@item @option{retraso}: periodo en segundo durante el cual se mostrar@'a el mensaje
-(si es 0, el mensaje no se borrar@'a).
-@item @option{mensaje}: mensaje que se escribir@'a en la barra de informaciones.
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Ejemplo:}@*
-@*
-@code{weechat.print_infobar (5, "mensaje")}@*
-@*
-
-@item
-@command{weechat.add_message_handler ( nombre, funci@'on )}@*
-@*
-Adjunta una funci@'on Python a un mensaje IRC.@*
-Se llamar@'a a la funci@'on cada vez que el mensaje IRC se reciba.@*
-
-@emph{Par@'ametros:}
-@itemize @minus
-@item @option{nombre}: nombre del mensaje IRC que producir@'a la llamada a la funci@'on.@*
-Para saber qu@'e tipo de mensajes IRC existen puede leer las 
-RFC 1459 y/o 2812:@*
-RFC 1459: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
-RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{funci@'on}: funci@'on en Python llamada cuando se reciba el mensaje.
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if Python function was attached, 0 if error occured.@*
-@*
-@emph{Ejemplo:}@*
-@*
-@code{weechat.add_message_handler ("privmsg", mi_funcion)}@*
-@code{def mi_funcion(servidor, args):}@*
-@code{@ @ @ @ weechat.prnt("servidor="+servidor)}@*
-@code{@ @ @ @ null, canal, mensaje = string.split(args, ":", 2)}@*
-@code{@ @ @ @ mascara, null, canal = string.split(string.strip(canal), " ", 2)}@*
-@code{@ @ @ @ weechat.prnt("masc="+mascara+", canal="+canal+", msj="+mensaje)}@*
-@code{@ @ @ @ return 0}@*
-@*
-@emph{Notes:}@*
-@*
-Function called when message is received has to return one of these values:@*
-@itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@item @option{1}: message will not be sent to WeeChat
-@item @option{2}: message will not be sent to other plugins
-@item @option{3}: message will not be sent to WeeChat neither other plugins
-@end itemize
-@*
-
-@item
-@command{weechat.add_command_handler ( nombre, funci@'on )}@*
-@*
-A@~nadir un nuevo comando WeeChat, con un enlace a una funci@'on en Python.@*
-Se llamar@'a a la funci@'on cuando el usuario lance el comando con @kbd{/nombre}.@*
-
-@emph{Par@'ametros:}
-@itemize @minus
-@item @option{nombre}: nombre del nuevo comando@*
-Puede ser un comando que ya existe, y en este caso el nuevo comando sustituir@'a
-el antiguo. Ten cuidado cuando sustituyas a un comando de WeeChat, no podr@'a acceder 
-al antiguo comando si el script Python est@'a cargado.
-@item @option{funcion}: funci@'on Python assiciada al comando.
-@item @option{description}: command description (displayed by /help
-command)
-@item @option{arguments}: short description of command arguments
-(displayed by /help command)
-@item @option{arguments_description}: long description of command
-arguments (displayed by /help command)
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if Python function was attached, 0 if error occured.@*
-@*
-@emph{Ejemplo:}@*
-@*
-@code{weechat.add_command_handler ("comando", mi_comando)}@*
-@code{def mi_comando(servidor, args):}@*
-@code{@ @ @ @ weechat.prnt("Servidor:"+servidor+" Par@'ametros:"+args)}@*
-@code{@ @ @ @ return 0}@*
-@*
-@emph{Notes:}@*
-@*
-Function called when command is executed has to return one of these values:@*
-@itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@end itemize
-@*
-
-@item
-@command{weechat.remove_handler ( name, function );}@*
-@*
-Remove a message or command handler.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{name}: name of IRC message or command handler
-@item @option{function}: Python function
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat.remove_handler ("command", my_command);}@*
-@*
-
-@item
-@command{weechat.command ( command, [channel, [server]] )}@*
-@*
-Execute a command or send a message to a channel.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{command}: command to execute (or message to send in a channel)
-@item @option{channel}: name of channel
-@item @option{server}: internal name of server
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Examples:}@*
+@emph{Python examples:}@*
 @*
 @code{weechat.command ("hello world!")}@*
 @code{weechat.command ("/kick toto please leave this chan", "#weechat")}@*
@@ -2810,38 +2505,47 @@ Execute a command or send a message to a channel.@*
 @*
 
 @item
-@command{weechat.get_info ( nombre, [servidor] )}@*
+Perl: @command{weechat::get_info ( name, [server, [channel] ] );}@*
+Python: @command{weechat.get_info ( name, [server, [channel] ] )}@*
 @*
-Obtener informaciones distintas sobre WeeChat, el servidor o el usuario.@*
+Get various info about WeeChat, server or user.@*
 
-@emph{Par@'ametros:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{nombre}: nombre de la informaci@'on que se quiere obtener:
+@item @option{name}: name of info to retrieve:
 @itemize @minus
-@item @option{version}: obtener la versi@'on de WeeChat
-@item @option{nick}: obtener el seud@'onimo
-@item @option{channel}: obtener el nombre del canal
-@item @option{server}: obtener el nombre del servidor
+@item @option{version}: get WeeChat version
+@item @option{nick}: get nickname
+@item @option{channel}: get channel name
+@item @option{server}: get server name
 @item @option{away}: get ``away'' flag
 @item @option{weechat_dir}: get WeeChat home dir
 @item @option{weechat_libdir}: get WeeChat system lib dir
 @item @option{weechat_sharedir}: get WeeChat system share dir
+
 @end itemize
-@item @option{servidor}: nombre interno del servidor
+@item @option{server}: internal name of server
+@item @option{channel}: channel name
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 Asked info, empty if error occured or info was not found.@*
 @*
-@emph{Ejemplos:}@*
+@emph{Perl examples:}@*
+@*
+@code{$version = weechat::get_info("version");}@*
+@code{$nick = weechat::get_info("nick", "freenode");}@*
+@*
+@emph{Python examples:}@*
 @*
 @code{$version = weechat.get_info("version")}@*
 @code{$nick = weechat.get_info("nick", "freenode")}@*
 @*
 
 @item
-@command{weechat.get_dcc_info ( );}@*
+Perl: @command{weechat::get_dcc_info ( );}@*
+Python: @command{weechat.get_dcc_info ( );}@*
 @*
 Get DCC list.@*
 
@@ -2884,7 +2588,8 @@ DCC list, 0 if error occured.@*
 @*
 
 @item
-@command{weechat.get_config ( option );}@*
+Perl: @command{weechat::get_config ( option );}@*
+Python: @command{weechat.get_config ( option )}@*
 @*
 Get WeeChat config option value.@*
 
@@ -2897,14 +2602,20 @@ Get WeeChat config option value.@*
 @*
 Value of option, empty if error occured or option was not found.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
-@code{$value1 = weechat.get_config ("look_nicklist");}@*
-@code{$value2 = weechat.get_config ("freenode.server_autojoin");}@*
+@code{$value1 = weechat::get_config ("look_nicklist");}@*
+@code{$value2 = weechat::get_config ("freenode.server_autojoin");}@*
+@*
+@emph{Python examples:}@*
+@*
+@code{$value1 = weechat.get_config ("look_nicklist")}@*
+@code{$value2 = weechat.get_config ("freenode.server_autojoin")}@*
 @*
 
 @item
-@command{weechat.set_config ( option, value );}@*
+Perl: @command{weechat::set_config ( option, value );}@*
+Python: @command{weechat.set_config ( option, value )}@*
 @*
 Get WeeChat config option value.@*
 
@@ -2918,14 +2629,21 @@ Get WeeChat config option value.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
-@code{weechat.set_config ("look_nicklist", "off");}@*
-@code{weechat.set_config ("freenode.server_autojoin"", "#weechat");}@*
+@code{weechat::set_config ("look_nicklist", "off");}@*
+@code{weechat::set_config ("freenode.server_autojoin"",
+"#weechat");}@*
+@*
+@emph{Python examples:}@*
+@*
+@code{weechat.set_config ("look_nicklist", "off")}@*
+@code{weechat.set_config ("freenode.server_autojoin"", "#weechat")}@*
 @*
 
 @item
-@command{weechat.get_plugin_config ( option );}@*
+Perl: @command{weechat::get_plugin_config ( option );}@*
+Python: @command{weechat.get_plugin_config ( option )}@*
 @*
 Return value of a plugin option.@*
 Option is read from file ~/.weechat/plugins.rc and is like:@*
@@ -2941,13 +2659,18 @@ Note: plugin and script names are automatically added.@*
 @*
 Value of option, empty if error occured or option was not found.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
-@code{$value = weechat.get_plugin_config ("my_var");}@*
+@code{$value = weechat::get_plugin_config ("my_var");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{$value = weechat.get_plugin_config ("my_var")}@*
 @*
 
 @item
-@command{weechat.set_plugin_config ( option, value );}@*
+Perl: @command{weechat::set_plugin_config ( option, value );}@*
+Python: @command{weechat.set_plugin_config ( option, value )}@*
 @*
 Update value of a plugin option.@*
 Option is written in file ~/.weechat/plugins.rc and is like:@*
@@ -2964,17 +2687,17 @@ Note: plugin and script names are automatically added.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat.set_plugin_config ("my_var", "value");}@*
+@code{weechat::set_plugin_config ("my_var", "value");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.set_plugin_config ("my_var", "value")}@*
 @*
 
 @end itemize
 
-@subsection Ruby scripts
-
-@exclamdown{}No desarrollado!
-
 
 @c **************************** Autores / Soporte *****************************
 
diff --git a/doc/weechat_doc_fr.texi b/doc/weechat_doc_fr.texi
index a4e99d3d8..ab562e2fe 100644
--- a/doc/weechat_doc_fr.texi
+++ b/doc/weechat_doc_fr.texi
@@ -36,7 +36,7 @@
 
 @title WeeChat - Guide utilisateur
 @subtitle Client IRC rapide, l@'eger et extensible
-@subtitle Documentation pour WeeChat v0.1.6-cvs - 30 octobre 2005
+@subtitle Documentation pour WeeChat v0.1.6-cvs - 4 novembre 2005
 
 @author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
 
@@ -299,9 +299,6 @@ Type: entier (valeurs: entre 1 et 10), valeur par d@'efaut: 10@*
 @item look_color_actions
 Afficher les actions avec diff@'erentes couleurs@*
 Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
-@item look_remove_colors_from_msgs
-Supprimer les couleurs dans les messages entrants@*
-Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
 @item look_nicklist
 Afficher la fen@^etre des utilisateurs (pour les fen@^etres de canaux)@*
 Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
@@ -454,7 +451,7 @@ Couleur pour le texte saisi (pseudo)@*
 Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightcyan'@*
 @item col_input_delimiters
 Couleur pour le texte saisi (d@'elimiteurs)@*
-Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'white'@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'cyan'@*
 @item col_input_bg
 Couleur de fond pour la fen@^etre de saisie@*
 Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'default'@*
@@ -605,6 +602,12 @@ Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'off'@*
 @item irc_highlight
 Liste des mots pour la notification (s@'epar@'es par des virgules, le comparaison ne tient pas compte de la casse, les mots peuvent commencer ou se terminer par "*" pour une comparaison partielle)@*
 Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: ''@*
+@item irc_colors_receive
+Garder les couleurs dans les messages re@,{c}us@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
+@item irc_colors_send
+Autorise l'utilisateur @`a envoyer des couleurs avec des codes sp@'eciaux (%B=gras, %Cxx,yy=couleur, %U=soulign@'e, %R=invers@'e)@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
 @item dcc_auto_accept_files
 Accepte automatiquement les fichiers dcc entrants@*
 Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'off'@*
@@ -1850,15 +1853,16 @@ void *handler_pointer)}@*
 @emph{Notes :}@*
 @*
 La fonction appel@'ee lorsque le message est re@,cu doit renvoyer une
-des valeurs suivantes :@*
+des valeurs suivantes (pr@'efix@'ee par ``weechat::'' pour Perl ou
+``weechat.'' pour Python) :@*
 @itemize @minus
-@item @option{PLUGIN_RC_KO ou -1}: la fonction a @'echou@'e
-@item @option{PLUGIN_RC_OK ou 0}: la fonction a r@'eussi
-@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT ou 1}: le message ne sera pas transmis
+@item @option{PLUGIN_RC_KO}: la fonction a @'echou@'e
+@item @option{PLUGIN_RC_OK}: la fonction a r@'eussi
+@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT}: le message ne sera pas transmis
 @`a WeeChat
-@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS ou 2}: le message ne sera pas transmis
+@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS}: le message ne sera pas transmis
 @`a d'autres extensions
-@item @option{PLUGIN_RC_OK_IGNORE_ALL ou 3}: le message ne sera transmis ni @`a
+@item @option{PLUGIN_RC_OK_IGNORE_ALL}: le message ne sera transmis ni @`a
 WeeChat ni @`a d'autres extensions
 @end itemize
 @*
@@ -1911,10 +1915,11 @@ fichier: %s", (arguments) ? arguments : "aucun");}@*
 @emph{Notes :}@*
 @*
 La fonction appel@'ee lorsque la commande est ex@'ecut@'ee doit
-renvoyer une des valeurs suivantes :@*
+renvoyer une des valeurs suivantes (pr@'efix@'ee par ``weechat::''
+pour Perl ou ``weechat.'' pour Python) :@*
 @itemize @minus
-@item @option{PLUGIN_RC_KO ou -1}: la fonction a @'echou@'e
-@item @option{PLUGIN_RC_OK ou 0}: la fonction a r@'eussi
+@item @option{PLUGIN_RC_KO}: la fonction a @'echou@'e
+@item @option{PLUGIN_RC_OK}: la fonction a r@'eussi
 @end itemize
 @*
 
@@ -2249,37 +2254,47 @@ void weechat_plugin_end (t_weechat_plugin *plugin)
 Trois extensions sont fournies en standard avec WeeChat pour utiliser
 des langages de script: Perl, Python et Ruby.
 
-@subsection Scripts Perl
+@subsection Charger/d@'echarger des scripts
 
-@subsubsection Charger/d@'echarger des scripts Perl
-
-Les scripts Perl sont charg@'es et d@'echarg@'es avec la commande @command{/perl}
-(tapez @kbd{/help perl} dans WeeChat pour obtenir de l'aide sur la commande).@*
+Les scripts sont charg@'es et d@'echarg@'es avec les commandes
+@command{/perl}, @command{/python} et @command{/ruby}.
+(tapez @kbd{/help} dans WeeChat pour obtenir de l'aide sur les
+commandes).@*
 
 @emph{Exemples :}@*
 @itemize @bullet
 @item
 Charger un script Perl : @kbd{/perl load /tmp/essai.pl}@*
-@item D@'echarger tous les scripts Perl : @kbd{/perl unload}@*
+@item
+D@'echarger tous les scripts Perl : @kbd{/perl unload}@*
 @item
 Lister les scripts Perl charg@'es : @kbd{/perl}@*
+@item
+Charger un script Python : @kbd{/python load /tmp/essai.py}@*
+@item
+D@'echarger tous les scripts Python : @kbd{/python unload}@*
+@item
+Lister les scripts Python charg@'es : @kbd{/python}@*
 @end itemize
 
-@subsubsection Interface WeeChat / Perl
+@subsection Interface WeeChat / Scripts
 
 @itemize @bullet
 @item
-@command{weechat::register ( nom, version, fonction_de_fin, description );}@*
+Perl: @command{weechat::register ( nom, version, fonction_de_fin,
+description );}@*
+Python: @command{weechat.register ( nom, version, fonction_de_fin,
+description )}@*
 @*
-C'est la premi@`ere fonction @`a appeler dans le script Perl.@*
-Tout script Perl pour WeeChat doit appeler cette fonction.@*
+C'est la premi@`ere fonction @`a appeler dans le script.@*
+Tout script pour WeeChat doit appeler cette fonction.@*
 
 @emph{Param@`etres :}
 @itemize @minus
 @item @option{nom}: nom unique pour identifier le script (chaque script doit
 avoir un nom diff@'erent)
 @item @option{version}: version du script
-@item @option{fonction_de_fin}: fonction Perl appel@'ee quand le script est
+@item @option{fonction_de_fin}: fonction appel@'ee quand le script est
 d@'echarg@'e (param@`etre facultatif, une cha@^ine vide signifiant qu'il n'y a pas
 de fonction @`a appeler)
 @item @option{description}: description br@`eve du script.
@@ -2289,13 +2304,18 @@ de fonction @`a appeler)
 @*
 1 si le script a @'et@'e enregistr@'e, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemple :}@*
+@emph{Exemple en Perl :}@*
 @*
 @code{weechat::register ("essai", "1.0", "fin_essai", "Script d'essai !");}@*
 @*
+@emph{Exemple en Python :}@*
+@*
+@code{weechat.register ("essai", "1.0", "fin_essai", "Script d'essai !")}@*
+@*
 
 @item
-@command{weechat::print ( message, [canal, [serveur]] );}@*
+Perl: @command{weechat::print ( message, [canal, [serveur]] );}@*
+Python: @command{weechat.prnt ( message, [canal, [serveur]] )}@*
 @*
 Affiche un message dans un canal.@*
 
@@ -2310,15 +2330,22 @@ Affiche un message dans un canal.@*
 @*
 1 si succ@`es, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemples :}@*
+@emph{Exemples en Perl :}@*
 @*
 @code{weechat::print ("message");}@*
 @code{weechat::print ("message", "#weechat");}@*
 @code{weechat::print ("message", "#weechat", "freenode");}@*
 @*
+@emph{Exemples en Python :}@*
+@*
+@code{weechat.prnt ("message")}@*
+@code{weechat.prnt ("message", "#weechat")}@*
+@code{weechat.prnt ("message", "#weechat", "freenode")}@*
+@*
 
 @item
-@command{weechat::print_infobar ( d@'elai, message );}@*
+Perl: @command{weechat::print_infobar ( d@'elai, message );}@*
+Python: @command{weechat.print_infobar ( d@'elai, message )}@*
 @*
 Affiche un message dans la barre d'infos.@*
 
@@ -2333,16 +2360,22 @@ Affiche un message dans la barre d'infos.@*
 @*
 1 si succ@`es, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemple :}@*
+@emph{Exemple en Perl :}@*
 @*
 @code{weechat::print_infobar (5, "message");}@*
 @*
+@emph{Exemple en Python :}@*
+@*
+@code{weechat.print_infobar (5, "message")}@*
+@*
 
 @item
-@command{weechat::add_message_handler ( nom, fonction );}@*
+Perl: @command{weechat::add_message_handler ( nom, fonction );}@*
+Python: @command{weechat.add_message_handler ( nom, fonction )}@*
 @*
-Attache une fonction Perl @`a un message IRC particulier.@*
-La fonction sera appel@'ee @`a chaque fois que le message IRC sera re@,{c}u.@*
+Attache une fonction @`a un message IRC particulier.@*
+La fonction sera appel@'ee @`a chaque fois que le message IRC sera
+re@,{c}u.@*
 
 @emph{Param@`etres :}
 @itemize @minus
@@ -2351,14 +2384,14 @@ Pour conna@^itre la liste des messages IRC disponibles, merci de consulter les
 RFC 1459 et/ou 2812 :@*
 RFC 1459 : @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
 RFC 2812 : @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{fonction}: fonction Perl appel@'ee lorsque le message est re@,{c}u
+@item @option{fonction}: fonction appel@'ee lorsque le message est re@,{c}u
 @end itemize
 @*
 @emph{Valeur renvoy@'ee :}@*
 @*
-1 si la fonction Perl a @'et@'e attach@'ee, 0 si une erreur s'est produite.@*
+1 si la fonction a @'et@'e attach@'ee, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemple :}@*
+@emph{Exemple en Perl :}@*
 @*
 @code{weechat::add_message_handler ("privmsg", ma_fonction);}@*
 @code{sub ma_fonction}@*
@@ -2367,391 +2400,10 @@ RFC 2812 : @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
 @code{@ @ @ @ ($null, $canal, $message) = split ":",$_[1],3;}@*
 @code{@ @ @ @ ($masque, $null, $canal) = split " ", $canal;}@*
 @code{@ @ @ @ weechat::print ("masque=$masque, canal=$canal, msg=$message\n");}@*
-@code{@ @ @ @ return 0;}@*
+@code{@ @ @ @ return weechat::PLUGIN_RC_OK;}@*
 @code{@} }@*
 @*
-@emph{Notes :}@*
-@*
-La fonction appel@'ee lorsque le message est re@,cu doit renvoyer une
-des valeurs suivantes :@*
-@itemize @minus
-@item @option{-1}: la fonction a @'echou@'e
-@item @option{0}: la fonction a r@'eussi
-@item @option{1}: le message ne sera pas transmis @`a WeeChat
-@item @option{2}: le message ne sera pas transmis @`a d'autres extensions
-@item @option{3}: le message ne sera transmis ni @`a WeeChat ni @`a
-d'autres extensions
-@end itemize
-@*
-
-@item
-@command{weechat::add_command_handler ( nom, fonction, [description,
-arguments, arguments_description] );}@*
-@*
-Cr@'e@'e une nouvelle commande WeeChat, associ@'ee @`a une fonction Perl.@*
-La fonction sera appel@'ee lorsque l'utilisateur lancera la commande par @kbd{/nom}.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{nom}: nom de la nouvelle commande@*
-Il peut s'agir d'une commande existante, auquel cas celle-ci est @'ecras@'ee par
-la fonction Perl. Soyez prudent en @'ecrasant les commandes WeeChat, car elles
-ne seront plus accessibles tant que le script Perl sera charg@'e.
-@item @option{fonction}: fonction Perl associ@'ee @`a la commande
-@item @option{description}: description de la commande (affich@'ee par
-/help commande)
-@item @option{arguments}: br@`eve description des param@`etres de la
-commande (affich@'ee par /help commande)
-@item @option{arguments_description}: longue description des
-param@`etres de la commande (affich@'ee par /help commande)
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si la fonction Perl a @'et@'e attach@'ee, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemple :}@*
-@*
-@code{weechat::add_command_handler ("commande", ma_commande);}@*
-@code{sub ma_commande}@*
-@code{@{ }@*
-@code{@ @ @ @ weechat::print("Serveur: $_[0], param@`etres: $_[1]\n");}@*
-@code{@ @ @ @ return 0;}@*
-@code{@} }@*
-@*
-@emph{Notes :}@*
-@*
-La fonction appel@'ee lorsque la commande est ex@'ecut@'ee doit renvoyer une
-des valeurs suivantes :@*
-@itemize @minus
-@item @option{-1}: la fonction a @'echou@'e
-@item @option{0}: la fonction a r@'eussi
-@end itemize
-@*
-
-@item
-@command{weechat::remove_handler ( nom, fonction );}@*
-@*
-Supprime un gestionnaire de message ou de commande.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{nom}: nom du message IRC ou de la commande
-@item @option{fonction}: fonction Perl associ@'ee
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si succ@`es, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemple :}@*
-@*
-@code{weechat::remove_handler ("commande", ma_commande);}@*
-@*
-
-@item
-@command{weechat::command ( commande, [canal, [serveur]] );}@*
-@*
-Ex@'ecute une commande ou envoie un message @'a un canal.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{commande}: commande @'a ex@'ecuter (ou message @'a envoyer au canal)
-@item @option{canal}: nom du canal
-@item @option{serveur}: nom interne du serveur
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si succ@`es, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemples :}@*
-@*
-@code{weechat::command ("bonjour tout le monde !");}@*
-@code{weechat::command ("/kick toto merci de quitter ce canal", "#weechat");}@*
-@code{weechat::command ("/nick newnick", "", "freenode");}@*
-@*
-
-@item
-@command{weechat::get_info ( nom, [serveur, [canal] ] );}@*
-@*
-Obtenir des informations vari@'ees sur WeeChat, le serveur ou l'utilisateur.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{nom}: nom de l'info @`a obtenir :
-@itemize @minus
-@item @option{version}: obtenir la version de WeeChat
-@item @option{nick}: obtenir le pseudo
-@item @option{channel}: obtenir le nom du canal
-@item @option{server}: obtenir le nom du serveur
-@item @option{away}: obtenir le drapeau ``away''
-@item @option{weechat_dir}: obtenir le r@'epertoire maison de WeeChat
-@item @option{weechat_libdir}: obtenir le r@'epertoire ``lib''
-syst@`eme de WeeChat
-@item @option{weechat_sharedir}: obtenir le r@'epertoire ``share''
-syst@`eme de partage WeeChat
-@end itemize
-@item @option{serveur}: nom interne du serveur
-@item @option{canal}: nom du canal
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-L'information demand@'e, blanc si une erreur s'est produite ou que
-l'information n'a pas @'et@'e trouv@'ee.@*
-@*
-@emph{Exemples :}@*
-@*
-@code{$version = get_info("version");}@*
-@code{$nick = get_info("nick", "freenode");}@*
-@*
-
-@item
-@command{weechat::get_dcc_info ( );}@*
-@*
-Obtenir la liste des DCC.@*
-
-Le tableau renvoy@'e contient les champs suivants :
-@itemize @minus
-@item server: le serveur IRC
-@item channel: le canal IRC
-@item type: le type de DCC :
-@itemize @minus
-@item 0: discussion (re@,cue)
-@item 1: discussion (envoy@'ee)
-@item 2: fichier en r@'eception
-@item 3: fichier en @'emission
-@end itemize
-@item status: statut du DCC :
-@itemize @minus
-@item 0: en attente
-@item 1: en cours de connexion
-@item 2: actif
-@item 3: termin@'e
-@item 4: @'echou@'e
-@item 5: interrompu par l'utilisateur
-@end itemize
-@item start_time: la date et heure de cr@'eation du DCC
-@item start_transfer: la date et heure de d@'emarrage du transfert
-@item addr: adresse de l'utilisateur distant
-@item port: port utilis@'e pour le DCC
-@item nick: pseudo de l'utilisateur distant
-@item filename: nom de fichier
-@item local_filename: nom de fichier local
-@item size: taille du fichier
-@item pos: position actuelle dans le fichier
-@item start_resume: position de d@'emarrage apr@`es une interruption
-@item bytes_per_sec: nombre d'octets transmis par seconde depuis le d@'ebut
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-La liste des DCC, 0 si une erreur s'est produite.@*
-@*
-
-@item
-@command{weechat::get_config ( option );}@*
-@*
-Obtenir la valeur d'une option de configuration WeeChat.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{option}: nom de l'option
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-La valeur de l'option, blanc si une erreur s'est produite ou que
-l'option n'a pas @'et@'e trouv@'ee.@*
-@*
-@emph{Exemples :}@*
-@*
-@code{$value1 = weechat::get_config ("look_nicklist");}@*
-@code{$value2 = weechat::get_config ("freenode.server_autojoin");}@*
-@*
-
-@item
-@command{weechat::set_config ( option, valeur );}@*
-@*
-Modifier une otion de configuration WeeChat.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{option}: nom de l'option
-@item @option{valeur}: la nouvelle valeur pour l'option
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si succ@`es, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemples :}@*
-@*
-@code{weechat::set_config ("look_nicklist", "off");}@*
-@code{weechat::set_config ("freenode.server_autojoin, "#weechat");}@*
-@*
-
-@item
-@command{weechat::get_plugin_config ( option );}@*
-@*
-Renvoie la valeur d'une option de l'extension.@*
-L'option est lue depuis le fichier ~/.weechat/plugins.rc et est
-sous cette forme :@*
-@code{extension.script.option=valeur}@*
-NB: le nom de l'extension et du script sont ajout@'es automatiquement.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{option}: nom de l'option
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-La valeur de l'option, blanc si une erreur s'est produite ou que
-l'option n'a pas @'et@'e trouv@'ee.@*
-@*
-@emph{Exemple :}@*
-@*
-@code{$value = weechat::get_plugin_config ("ma_variable");}@*
-@*
-
-@item
-@command{weechat::set_plugin_config ( option, valeur );}@*
-@*
-Modifie la valeur d'une option de l'extension.@*
-L'option est @'ecrite dans le fichier ~/.weechat/plugins.rc et est
-sous cette forme :@*
-@code{extension.script.option=valeur}@*
-NB: le nom de l'extension et du script sont ajout@'es automatiquement.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{option}: nom de l'option
-@item @option{valeur}: la nouvelle valeur pour l'option
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si succ@`es, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemple :}@*
-@*
-@code{weechat::set_plugin_config ("ma_variable", "valeur");}@*
-@*
-
-@end itemize
-
-@subsection Scripts Python
-
-@subsubsection Charger/d@'echarger des scripts Python
-
-Les scripts Python sont charg@'es et d@'echarg@'es avec la commande @command{/python}
-(tapez @kbd{/help python} dans WeeChat pour obtenir de l'aide sur la commande).@*
-
-@emph{Exemples :}@*
-@itemize @bullet
-@item
-Charger un script Python : @kbd{/python load /tmp/essai.py}@*
-@item D@'echarger tous les scripts Python : @kbd{/python unload}@*
-@item
-Lister les scripts Python charg@'es : @kbd{/python}@*
-@end itemize
-
-@subsubsection Interface WeeChat / Python
-
-@itemize @bullet
-@item
-@command{weechat.register ( nom, version, fonction_de_fin, description )}@*
-@*
-C'est la premi@`ere fonction @`a appeler dans le script Python.@*
-Tout script Python pour WeeChat doit appeler cette fonction.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{nom}: nom unique pour identifier le script (chaque script doit
-avoir un nom diff@'erent)
-@item @option{version}: version du script
-@item @option{fonction_de_fin}: fonction Python appel@'ee quand le script est
-d@'echarg@'e (param@`etre facultatif, une cha@^ine vide signifiant qu'il n'y a pas
-de fonction @`a appeler)
-@item @option{description}: description br@`eve du script.
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si le script a @'et@'e enregistr@'e, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemple :}@*
-@*
-@code{weechat.register ("essai", "1.0", "fin_essai", "Script d'essai !")}@*
-@*
-
-@item
-@command{weechat.prnt ( message, [canal, [serveur]] )}@*
-@*
-Affiche un message dans un canal.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{message}: message @`a afficher
-@item @option{canal}: nom du canal
-@item @option{serveur}: nom interne du serveur
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si succ@`es, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemples :}@*
-@*
-@code{weechat.prnt ("message")}@*
-@code{weechat.prnt ("message", "#weechat")}@*
-@code{weechat.prnt ("message", "#weechat", "freenode")}@*
-@*
-
-@item
-@command{weechat.print_infobar ( d@'elai, message )}@*
-@*
-Affiche un message dans la barre d'infos.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{d@'elai}: d@'elai (en secondes) pendant lequel le message est affich@'e
-(si 0, le message ne sera pas effac@'e).
-@item @option{message}: message @`a afficher
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si succ@`es, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemple :}@*
-@*
-@code{weechat.print_infobar (5, "message")}@*
-@*
-
-@item
-@command{weechat.add_message_handler ( nom, fonction )}@*
-@*
-Attache une fonction Python @`a un message IRC particulier.@*
-La fonction sera appel@'ee @`a chaque fois que le message IRC sera re@,{c}u.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{nom}: nom du message IRC pour lequel la fonction est appel@'ee@*
-Pour conna@^itre la liste des messages IRC disponibles, merci de consulter les
-RFC 1459 et/ou 2812 :@*
-RFC 1459 : @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
-RFC 2812 : @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{fonction}: fonction Python appel@'ee lorsque le message est re@,{c}u
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si la fonction Python a @'et@'e attach@'ee, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemple :}@*
+@emph{Exemple en Python :}@*
 @*
 @code{weechat.add_message_handler ("privmsg", ma_fonction)}@*
 @code{def ma_fonction(serveur, args):}@*
@@ -2759,35 +2411,43 @@ RFC 2812 : @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
 @code{@ @ @ @ null, canal, message = string.split(args, ":", 2)}@*
 @code{@ @ @ @ masque, null, canal = string.split(string.strip(canal), " ", 2)}@*
 @code{@ @ @ @ weechat.prnt("masque="+masque+", canal="+canal+", message="+message)}@*
-@code{@ @ @ @ return 0}@*
+@code{@ @ @ @ return weechat.PLUGIN_RC_OK}@*
 @*
 @emph{Notes :}@*
 @*
 La fonction appel@'ee lorsque le message est re@,cu doit renvoyer une
-des valeurs suivantes :@*
+des valeurs suivantes (pr@'efix@'ee par ``weechat::'' pour Perl ou
+``weechat.'' pour Python) :@*
 @itemize @minus
-@item @option{-1}: la fonction a @'echou@'e
-@item @option{0}: la fonction a r@'eussi
-@item @option{1}: le message ne sera pas transmis @`a WeeChat
-@item @option{2}: le message ne sera pas transmis @`a d'autres extensions
-@item @option{3}: le message ne sera transmis ni @`a WeeChat ni @`a
-d'autres extensions
+@item @option{PLUGIN_RC_KO}: la fonction a @'echou@'e
+@item @option{PLUGIN_RC_OK}: la fonction a r@'eussi
+@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT}: le message ne sera pas
+transmis @`a WeeChat
+@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS}: le message ne sera pas
+transmis @`a d'autres extensions
+@item @option{PLUGIN_RC_OK_IGNORE_ALL}: le message ne sera transmis ni
+@`a WeeChat ni @`a d'autres extensions
 @end itemize
 @*
 
 @item
-@command{weechat.add_command_handler ( nom, fonction )}@*
+Perl: @command{weechat::add_command_handler ( nom, fonction,
+[description, arguments, arguments_description] );}@*
+Python: @command{weechat.add_command_handler ( nom, fonction,
+[description, arguments, arguments_description] )}@*
 @*
-Cr@'e@'e une nouvelle commande WeeChat, associ@'ee @`a une fonction Python.@*
-La fonction sera appel@'ee lorsque l'utilisateur lancera la commande par @kbd{/nom}.@*
+Cr@'e@'e une nouvelle commande WeeChat, associ@'ee @`a une fonction.@*
+La fonction sera appel@'ee lorsque l'utilisateur lancera la commande
+par @kbd{/nom}.@*
 
 @emph{Param@`etres :}
 @itemize @minus
 @item @option{nom}: nom de la nouvelle commande@*
-Il peut s'agir d'une commande existante, auquel cas celle-ci est @'ecras@'ee par
-la fonction Python. Soyez prudent en @'ecrasant les commandes WeeChat, car elles
-ne seront plus accessibles tant que le script Python sera charg@'e.
-@item @option{fonction}: fonction Python associ@'ee @`a la commande
+Il peut s'agir d'une commande existante, auquel cas celle-ci est
+@'ecras@'ee par la fonction du script. Soyez prudent en @'ecrasant les
+commandes WeeChat, car elles ne seront plus accessibles tant que le
+script sera charg@'e.
+@item @option{fonction}: fonction associ@'ee @`a la commande
 @item @option{description}: description de la commande (affich@'ee par
 /help commande)
 @item @option{arguments}: br@`eve description des param@`etres de la
@@ -2798,53 +2458,70 @@ param@`etres de la commande (affich@'ee par /help commande)
 @*
 @emph{Valeur renvoy@'ee :}@*
 @*
-1 si la fonction Python a @'et@'e attach@'ee, 0 si une erreur s'est produite.@*
+1 si la fonction a @'et@'e attach@'ee, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemple :}@*
+@emph{Exemple en Perl :}@*
+@*
+@code{weechat::add_command_handler ("commande", ma_commande);}@*
+@code{sub ma_commande}@*
+@code{@{ }@*
+@code{@ @ @ @ weechat::print("Serveur: $_[0], param@`etres: $_[1]\n");}@*
+@code{@ @ @ @ return weechat::PLUGIN_RC_OK;}@*
+@code{@} }@*
+@*
+@emph{Exemple en Python :}@*
 @*
 @code{weechat.add_command_handler ("commande", ma_commande)}@*
 @code{def ma_commande(serveur, args):}@*
 @code{@ @ @ @ weechat.prnt("serveur:"+serveur+" param@`etres:"+args)}@*
-@code{@ @ @ @ return 0}@*
+@code{@ @ @ @ return weechat.PLUGIN_RC_OK}@*
 @*
 @emph{Notes :}@*
 @*
-La fonction appel@'ee lorsque la commande est ex@'ecut@'ee doit renvoyer une
-des valeurs suivantes :@*
+La fonction appel@'ee lorsque la commande est ex@'ecut@'ee doit
+renvoyer une des valeurs suivantes (pr@'efix@'ee par ``weechat::''
+pour Perl ou ``weechat.'' pour Python) :@*
 @itemize @minus
-@item @option{-1}: la fonction a @'echou@'e
-@item @option{0}: la fonction a r@'eussi
+@item @option{PLUGIN_RC_KO}: la fonction a @'echou@'e
+@item @option{PLUGIN_RC_OK}: la fonction a r@'eussi
 @end itemize
 @*
 
 @item
-@command{weechat.remove_handler ( nom, fonction );}@*
+Perl: @command{weechat::remove_handler ( nom, fonction );}@*
+Python: @command{weechat.remove_handler ( nom, fonction )}@*
 @*
 Supprime un gestionnaire de message ou de commande.@*
 
 @emph{Param@`etres :}
 @itemize @minus
 @item @option{nom}: nom du message IRC ou de la commande
-@item @option{fonction}: fonction Python associ@'ee
+@item @option{fonction}: fonction associ@'ee
 @end itemize
 @*
 @emph{Valeur renvoy@'ee :}@*
 @*
 1 si succ@`es, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemple :}@*
+@emph{Exemple en Perl :}@*
 @*
-@code{weechat.remove_handler ("commande", ma_commande);}@*
+@code{weechat::remove_handler ("commande", ma_commande);}@*
+@*
+@emph{Exemple en Python :}@*
+@*
+@code{weechat.remove_handler ("commande", ma_commande)}@*
 @*
 
 @item
-@command{weechat.command ( commande, [canal, [serveur]] )}@*
+Perl: @command{weechat::command ( commande, [canal, [serveur]] );}@*
+Python: @command{weechat.command ( commande, [canal, [serveur]] )}@*
 @*
 Ex@'ecute une commande ou envoie un message @'a un canal.@*
 
 @emph{Param@`etres :}
 @itemize @minus
-@item @option{commande}: commande @'a ex@'ecuter (ou message @'a envoyer au canal)
+@item @option{commande}: commande @'a ex@'ecuter (ou message @'a
+envoyer au canal)
 @item @option{canal}: nom du canal
 @item @option{serveur}: nom interne du serveur
 @end itemize
@@ -2853,7 +2530,13 @@ Ex@'ecute une commande ou envoie un message @'a un canal.@*
 @*
 1 si succ@`es, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemples :}@*
+@emph{Exemples en Perl :}@*
+@*
+@code{weechat::command ("bonjour tout le monde !");}@*
+@code{weechat::command ("/kick toto merci de quitter ce canal", "#weechat");}@*
+@code{weechat::command ("/nick newnick", "", "freenode");}@*
+@*
+@emph{Exemples en Python :}@*
 @*
 @code{weechat.command ("bonjour tout le monde !")}@*
 @code{weechat.command ("/kick toto merci de quitter ce canal", "#weechat")}@*
@@ -2861,9 +2544,11 @@ Ex@'ecute une commande ou envoie un message @'a un canal.@*
 @*
 
 @item
-@command{weechat.get_info ( nom, [serveur] )}@*
+Perl: @command{weechat::get_info ( nom, [serveur, [canal] ] );}@*
+Python: @command{weechat.get_info ( nom, [serveur, [canal] ] )}@*
 @*
-Obtenir des informations vari@'ees sur WeeChat, le serveur ou l'utilisateur.@*
+Obtenir des informations vari@'ees sur WeeChat, le serveur ou
+l'utilisateur.@*
 
 @emph{Param@`etres :}
 @itemize @minus
@@ -2881,6 +2566,7 @@ syst@`eme de WeeChat
 syst@`eme de partage WeeChat
 @end itemize
 @item @option{serveur}: nom interne du serveur
+@item @option{canal}: nom du canal
 @end itemize
 @*
 @emph{Valeur renvoy@'ee :}@*
@@ -2888,14 +2574,20 @@ syst@`eme de partage WeeChat
 L'information demand@'e, blanc si une erreur s'est produite ou que
 l'information n'a pas @'et@'e trouv@'ee.@*
 @*
-@emph{Exemples :}@*
+@emph{Exemples en Perl :}@*
+@*
+@code{$version = get_info("version");}@*
+@code{$nick = get_info("nick", "freenode");}@*
+@*
+@emph{Exemples en Python :}@*
 @*
 @code{$version = weechat.get_info ("version")}@*
 @code{$nick = weechat.get_info ("nick", "freenode")}@*
 @*
 
 @item
-@command{weechat.get_dcc_info ( );}@*
+Perl: @command{weechat::get_dcc_info ( );}@*
+Python: @command{weechat.get_dcc_info ( )}@*
 @*
 Obtenir la liste des DCC.@*
 
@@ -2938,13 +2630,14 @@ La liste des DCC, 0 si une erreur s'est produite.@*
 @*
 
 @item
-@command{weechat.get_config ( nom );}@*
+Perl: @command{weechat::get_config ( option );}@*
+Python: @command{weechat.get_config ( option )}@*
 @*
 Obtenir la valeur d'une option de configuration WeeChat.@*
 
 @emph{Param@`etres :}
 @itemize @minus
-@item @option{nom}: nom de l'option
+@item @option{option}: nom de l'option
 @end itemize
 @*
 @emph{Valeur renvoy@'ee :}@*
@@ -2952,20 +2645,26 @@ Obtenir la valeur d'une option de configuration WeeChat.@*
 La valeur de l'option, blanc si une erreur s'est produite ou que
 l'option n'a pas @'et@'e trouv@'ee.@*
 @*
-@emph{Exemples :}@*
+@emph{Exemples en Perl :}@*
 @*
-@code{$value1 = weechat.get_config ("look_nicklist");}@*
-@code{$value2 = weechat.get_config ("freenode.server_autojoin");}@*
+@code{$value1 = weechat::get_config ("look_nicklist");}@*
+@code{$value2 = weechat::get_config ("freenode.server_autojoin");}@*
+@*
+@emph{Exemples en Python :}@*
+@*
+@code{$value1 = weechat.get_config ("look_nicklist")}@*
+@code{$value2 = weechat.get_config ("freenode.server_autojoin")}@*
 @*
 
 @item
-@command{weechat.set_config ( nom, valeur );}@*
+Perl: @command{weechat::set_config ( option, valeur );}@*
+Python: @command{weechat.set_config ( option, valeur )}@*
 @*
 Modifier une otion de configuration WeeChat.@*
 
 @emph{Param@`etres :}
 @itemize @minus
-@item @option{nom}: nom de l'option
+@item @option{option}: nom de l'option
 @item @option{valeur}: la nouvelle valeur pour l'option
 @end itemize
 @*
@@ -2973,14 +2672,20 @@ Modifier une otion de configuration WeeChat.@*
 @*
 1 si succ@`es, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemples :}@*
+@emph{Exemples en Perl :}@*
 @*
-@code{weechat.set_config ("look_nicklist", "off");}@*
-@code{weechat.set_config ("freenode.server_autojoin, "#weechat");}@*
+@code{weechat::set_config ("look_nicklist", "off");}@*
+@code{weechat::set_config ("freenode.server_autojoin, "#weechat");}@*
+@*
+@emph{Exemples en Python :}@*
+@*
+@code{weechat.set_config ("look_nicklist", "off")}@*
+@code{weechat.set_config ("freenode.server_autojoin, "#weechat")}@*
 @*
 
 @item
-@command{weechat.get_plugin_config ( option );}@*
+Perl: @command{weechat::get_plugin_config ( option );}@*
+Python: @command{weechat.get_plugin_config ( option )}@*
 @*
 Renvoie la valeur d'une option de l'extension.@*
 L'option est lue depuis le fichier ~/.weechat/plugins.rc et est
@@ -2998,13 +2703,18 @@ NB: le nom de l'extension et du script sont ajout@'es automatiquement.@*
 La valeur de l'option, blanc si une erreur s'est produite ou que
 l'option n'a pas @'et@'e trouv@'ee.@*
 @*
-@emph{Exemple :}@*
+@emph{Exemple en Perl :}@*
 @*
-@code{$value = weechat.get_plugin_config ("ma_variable");}@*
+@code{$value = weechat::get_plugin_config ("ma_variable");}@*
+@*
+@emph{Exemple en Python :}@*
+@*
+@code{$value = weechat.get_plugin_config ("ma_variable")}@*
 @*
 
 @item
-@command{weechat.set_plugin_config ( option, valeur );}@*
+Perl: @command{weechat::set_plugin_config ( option, valeur );}@*
+Python: @command{weechat.set_plugin_config ( option, valeur )}@*
 @*
 Modifie la valeur d'une option de l'extension.@*
 L'option est @'ecrite dans le fichier ~/.weechat/plugins.rc et est
@@ -3022,17 +2732,17 @@ NB: le nom de l'extension et du script sont ajout@'es automatiquement.@*
 @*
 1 si succ@`es, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemple :}@*
+@emph{Exemple en Perl :}@*
 @*
-@code{weechat.set_plugin_config ("ma_variable", "valeur");}@*
+@code{weechat::set_plugin_config ("ma_variable", "valeur");}@*
+@*
+@emph{Exemple en Python :}@*
+@*
+@code{weechat.set_plugin_config ("ma_variable", "valeur")}@*
 @*
 
 @end itemize
 
-@subsection Scripts Ruby
-
-Non d@'evelopp@'e !
-
 
 @c **************************** Auteurs / Support *****************************
 
diff --git a/doc/weechat_doc_pt.texi b/doc/weechat_doc_pt.texi
index c25c22760..b9384e8b6 100644
--- a/doc/weechat_doc_pt.texi
+++ b/doc/weechat_doc_pt.texi
@@ -36,7 +36,7 @@
 
 @title WeeChat - Guia do Utilizador
 @subtitle Cliente de IRC rapido, leve e extencivel
-@subtitle Documenta@,{c}@~ao do WeeChat v0.1.6-cvs - 30 de outubro de 2005
+@subtitle Documenta@,{c}@~ao do WeeChat v0.1.6-cvs - 4 de novembro de 2005
 
 @author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
 
@@ -296,9 +296,6 @@ Type: integer (values: between 1 and 10), default value: 10@*
 @item look_color_actions
 Display actions with different colors@*
 Type: boolean (values: 'on' or 'off'), default value: 'on'@*
-@item look_remove_colors_from_msgs
-Remove colors from incoming messages@*
-Type: boolean (values: 'on' or 'off'), default value: 'on'@*
 @item look_nicklist
 Display nicklist window (for channel windows)@*
 Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@@ -451,7 +448,7 @@ Color for input text (nick name)@*
 Type: color (Curses or Gtk color), default value: 'lightcyan'@*
 @item col_input_delimiters
 Color for input text (delimiters)@*
-Type: color (Curses or Gtk color), default value: 'white'@*
+Type: color (Curses or Gtk color), default value: 'cyan'@*
 @item col_input_bg
 Background for input window@*
 Type: color (Curses or Gtk color), default value: 'default'@*
@@ -602,6 +599,12 @@ Type: boolean (values: 'on' or 'off'), default value: 'off'@*
 @item irc_highlight
 Comma separated list of words to highlight (case insensitive comparison, words may begin or end with "*" for partial match)@*
 Type: string (any string), default value: ''@*
+@item irc_colors_receive
+Keep colors from incoming messages@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
+@item irc_colors_send
+Allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %U=underline, %R=reverse)@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
 @item dcc_auto_accept_files
 Automatically accept incoming dcc files@*
 Type: boolean (values: 'on' or 'off'), default value: 'off'@*
@@ -1829,15 +1832,17 @@ void *handler_pointer)}@*
 @*
 @emph{Notes:}@*
 @*
-Function called when message is received has to return one of these values:@*
+Function called when message is received has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{PLUGIN_RC_KO or -1}: function failed
-@item @option{PLUGIN_RC_OK or 0}: function successfully completed
-@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT or 1}: message will not be sent to
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
+@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT}: message will not be sent to
 WeeChat
-@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS or 2}: message will not be sent to
+@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS}: message will not be sent to
 other plugins
-@item @option{PLUGIN_RC_OK_IGNORE_ALL or 3}: message will not be sent to
+@item @option{PLUGIN_RC_OK_IGNORE_ALL}: message will not be sent to
 WeeChat neither other plugins
 @end itemize
 @*
@@ -1886,10 +1891,12 @@ file: %s", (arguments) ? arguments : "none");}@*
 @*
 @emph{Notes:}@*
 @*
-Function called when message is received has to return one of these values:@*
+Function called when message is received has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{PLUGIN_RC_KO or -1}: function failed
-@item @option{PLUGIN_RC_OK or 0}: function successfully completed
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
 @end itemize
 @*
 
@@ -2209,204 +2216,74 @@ void weechat_plugin_end (t_weechat_plugin *plugin)
 Three plugins are provided with WeeChat to load scripts: Perl,
 Python and Ruby.
 
-@subsection Perl scripts
+@subsection Load/unload scripts
 
-@subsubsection Carregar/Descarregar Scripts Perl
+Perl scripts are loaded and unloaded with @command{/perl},
+@command{/python} and @command{/ruby} commands.
+(type @kbd{/help} within WeeChat to get help about commands).@*
 
-Os Scripts Perl s@~ao carregados e descarregados com o comando @command{/perl}.
-(escreve @kbd{/help perl} dentro do WeeChat para obteres ajuda acerca do comando).@*
-
-@emph{Exemplos:}@*
+@emph{Examples:}@*
 @itemize @bullet
 @item
-Carregar um Script Perl: @kbd{/perl load /tmp/sample.pl}@*
+Load a Perl script: @kbd{/perl load /tmp/sample.pl}@*
 @item
-Descarregar todos os Scripts Perl: @kbd{/perl unload}@*
+Unload all Perl scripts: @kbd{/perl unload}@*
 @item
-Listar todos os Scripts Perl: @kbd{/perl}@*
+List all Perl scripts: @kbd{/perl}@*
+@item
+Load a Python script: @kbd{/python load /tmp/sample.py}@*
+@item
+Unload all Python scripts: @kbd{/python unload}@*
+@item
+List all Python scripts: @kbd{/python}@*
 @end itemize
 
-@subsubsection Interface WeeChat / Perl
+@subsection WeeChat / Scripts API
 
 @itemize @bullet
 @item
-@command{weechat::register ( nome, vers@~ao, fun@,{c}@~ao_de_shutdown, descri@,{c}@~ao );}@*
+Perl: @command{weechat::register ( name, version, shutdown_function,
+description );}@*
+Python: @command{weechat.register ( name, version, shutdown_function,
+description )}@*
 @*
-Esta @'e a primeira fun@,{c}@~ao a invocar num Script Perl.@*
-Todos os Scripts Perl para o Weechat devem invocar esta fun@,{c}@~ao.@*
+This is first function to call in script.@*
+All scripts for WeeChat should call this function.@*
 
-@emph{Argumentos:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{nome}: nome @'unico que indentifique o script (cada Script Perl deve ter um @'unico nome)
-@item @option{vers@~ao}: vers@~ao do script
-@item @option{fun@,{c}@~ao_de_shutdown}: fun@,{c}@~ao Perl invocada quando o script é descarregado (par@^ametro opcional, se deixado em branco significa que nada deve ser chamado)
-@item @option{descri@,{c}@~ao}: breve descri@,{c}@~ao do script.
+@item @option{name}: unique name to identify script (each script must have
+unique name)
+@item @option{version}: script's version
+@item @option{shutdown_function}: function called when script is
+unloaded (optional parameter, empty string means nothing is called at the end)
+@item @option{description}: short description of script.
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 1 if script was registered, 0 if error occured.@*
 @*
-@emph{Exemplo:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat::register ("sample", "1.0", "sample_end", "Sample script!");}@*
+@code{weechat::register ("sample", "1.0", "sample_end", "Sample
+script!");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.register ("sample", "1.0", "sample_end", "Sample
+script!")}@*
 @*
 
 @item
-@command{weechat::print ( mensagem, [canal, [servidor]] );}@*
+Perl: @command{weechat::print ( message, [channel, [server]] );}@*
+Python: @command{weechat.prnt ( message, [channel, [server]] )}@*
 @*
-Imprimne uma mensagem na canal.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{mensagem}: mensagem a mostrar
-@item @option{canal}: nome da canal
-@item @option{servidor}: nome interno da servidor
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Exemplos:}@*
-@*
-@code{weechat::print ("mensagem");}@*
-@code{weechat::print ("mensagem", "#weechat");}@*
-@code{weechat::print ("mensagem", "#weechat", "freenode");}@*
-@*
-
-@item
-@command{weechat::print_infobar ( atrasa, mensagem );}@*
-@*
-Imprimne uma mensagem na barra do info.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{atrasa}: depois que isto atrasa (nos segundos), a mensagem estar@'a apagada
-(se 0, mensagem n@~ao forem apagados).
-@item @option{mensagem}: mensagem a mostrar
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Exemplo:}@*
-@*
-@code{weechat::print_infobar (5, "mensagem");}@*
-@*
-
-@item
-@command{weechat::add_message_handler ( nome, fun@,{c}@~ao );}@*
-@*
-Anexa uma fun@,{c}@~ao Perl a uma mensagem de IRC.@*
-A fun@,{c}@~ao ser@'a invocada de cada vez que a mensagem IRC for recebida.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{nome}: nome da mensagem IRC@*
-Para conheceres uma lista de mensagens de IRC, por favor lê o RFC 1459 e/ou o 2812:@*
-RFC 1459: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
-RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{fun@,{c}@~ao}: fun@,{c}@~ao Perl invocada quando a mensagem é recebida
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if Perl function was attached, 0 if error occured.@*
-@*
-@emph{Exemplo:}@*
-@*
-@code{weechat::add_message_handler ("privmsg", my_function);}@*
-@code{sub my_function}@*
-@code{@{ }@*
-@code{@ @ @ @ ($null, $channel, $message) = split ":",@@_[0],3;}@*
-@code{@ @ @ @ ($hostmask, $null, $channel) = split " ", $channel;}@*
-@code{@ @ @ @ weechat::print ("host=$hostmask, chan=$channel, msg=$message\n");}@*
-@code{@ @ @ @ return 0;}@*
-@code{@} }@*
-@*
-@emph{Notes:}@*
-@*
-Function called when message is received has to return one of these values:@*
-@itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@item @option{1}: message will not be sent to WeeChat
-@item @option{2}: message will not be sent to other plugins
-@item @option{3}: message will not be sent to WeeChat neither other plugins
-@end itemize
-@*
-
-@item
-@command{weechat::add_command_handler ( nome, fun@,{c}@~ao );}@*
-@*
-Cria um novo comando do Weechat, ligado a uma fun@,{c}@~ao Perl.@*
-A fun@,{c}@~ao ser@'a chamada quando o utilizador a invocar utilizando @command{/nome}@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{nome}: nome do novo comando@*
-Este nome pode pertencer a um comando já existente, o qual ser@'a sobreposto pela fun@,{c}@~ao Perl. Tem cuidado quando fizeres isto: os comandos originais não estar@~ao acessiveis antes de teres descarregado o Script Perl.
-@item @option{fun@,{c}@~ao}: fun@,{c}@~ao Perl ligada ao comando
-@item @option{description}: command description (displayed by /help
-command)
-@item @option{arguments}: short description of command arguments
-(displayed by /help command)
-@item @option{arguments_description}: long description of command
-arguments (displayed by /help command)
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if Perl function was attached, 0 if error occured.@*
-@*
-@emph{Exemplo:}@*
-@*
-@code{weechat::add_command_handler ("command", my_command);}@*
-@code{sub my_command}@*
-@code{@{ }@*
-@code{@ @ @ @ weechat::print("Argumentos: ".@@_[0]);}@*
-@code{@ @ @ @ return 0;}@*
-@code{@} }@*
-@*
-@emph{Notes:}@*
-@*
-Function called when command is executed has to return one of these values:@*
-@itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@end itemize
-@*
-
-@item
-@command{weechat::remove_handler ( name, function );}@*
-@*
-Remove a message or command handler.@*
+Print message in a channel.@*
 
 @emph{Arguments:}
 @itemize @minus
-@item @option{name}: name of IRC message or command handler
-@item @option{function}: Perl function
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat::remove_handler ("command", my_command);}@*
-@*
-
-@item
-@command{weechat::command ( command, [channel, [server]] );}@*
-@*
-Execute a command or send a message to a channel.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{command}: command to execute (or message to send in a channel)
+@item @option{message}: message to display
 @item @option{channel}: name of channel
 @item @option{server}: internal name of server
 @end itemize
@@ -2415,315 +2292,119 @@ Execute a command or send a message to a channel.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
-@code{weechat::command ("hello world!");}@*
-@code{weechat::command ("/kick toto please leave this chan", "#weechat");}@*
-@code{weechat::command ("/nick newnick", "", "freenode");}@*
+@code{weechat::print ("message");}@*
+@code{weechat::print ("message", "#weechat");}@*
+@code{weechat::print ("message", "#weechat", "freenode");}@*
+@*
+@emph{Python examples:}@*
+@*
+@code{weechat.prnt ("message")}@*
+@code{weechat.prnt ("message", "#weechat")}@*
+@code{weechat.prnt ("message", "#weechat", "freenode")}@*
 @*
 
 @item
-@command{weechat::get_info ( nome, [servidor, [canal] ] );}@*
+Perl: @command{weechat::print_infobar ( delay, message );}@*
+Python: @command{weechat.print_infobar ( delay, message )}@*
 @*
-Comece o v@'ario info sobre WeeChat, servidor ou usu@'ario.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{nome}: nome do info a recuperar:
-@itemize @minus
-@item @option{version}: comece a vers@~ao de WeeChat
-@item @option{nick}: comece o nickname
-@item @option{channel}: comece o nome da canal
-@item @option{server}: comece o nome do servidor
-@item @option{away}: get ``away'' flag
-@item @option{weechat_dir}: get WeeChat home dir
-@item @option{weechat_libdir}: get WeeChat system lib dir
-@item @option{weechat_sharedir}: get WeeChat system share dir
-@end itemize
-@item @option{servidor}: nome interno da servidor
-@item @option{canal}: nome da canal
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Asked info, empty if error occured or info was not found.@*
-@*
-@emph{Exemplos:}@*
-@*
-@code{$version = get_info("version");}@*
-@code{$nick = get_info("nick", "freenode");}@*
-@*
-
-@item
-@command{weechat::get_dcc_info ( );}@*
-@*
-Get DCC list.@*
-
-Returned array has following fields:
-@itemize @minus
-@item server: IRC server
-@item channel: IRC channel
-@item type: DCC type:
-@itemize @minus
-@item 0: chat (received)
-@item 1: chat (sent)
-@item 2: file (receiving)
-@item 3: file (sending)
-@end itemize
-@item status: DCC status:
-@itemize @minus
-@item 0: waiting
-@item 1: connecting
-@item 2: active
-@item 3: done
-@item 4: failed
-@item 5: aborted
-@end itemize
-@item start_time: date/time of DCC creation
-@item start_transfer: date/time of transfer start
-@item addr: remote address
-@item port: port used for DCC
-@item nick: remote nick
-@item filename: filename
-@item local_filename: local filename
-@item size: file size
-@item pos: current position in file
-@item start_resume: restart position after interruption
-@item bytes_per_sec: bytes sent/received per second
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-DCC list, 0 if error occured.@*
-@*
-
-@item
-@command{weechat::get_config ( option );}@*
-@*
-Get WeeChat config option value.@*
+Print message in infobar.@*
 
 @emph{Arguments:}
 @itemize @minus
-@item @option{option}: name of option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Value of option, empty if error occured or option was not found.@*
-@*
-@emph{Examples:}@*
-@*
-@code{$value1 = weechat::get_config ("look_nicklist");}@*
-@code{$value2 = weechat::get_config ("freenode.server_autojoin");}@*
-@*
-
-@item
-@command{weechat::set_config ( option, value );}@*
-@*
-Get WeeChat config option value.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@item @option{value}: new value for option
+@item @option{delay}: after this delay (in seconds), message will be erased
+(if 0, message will not be erased).
+@item @option{message}: message to display
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat::set_config ("look_nicklist", "off");}@*
-@code{weechat::set_config ("freenode.server_autojoin"", "#weechat");}@*
+@code{weechat::print_infobar (5, "message");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.print_infobar (5, "message")}@*
 @*
 
 @item
-@command{weechat::get_plugin_config ( option );}@*
+Perl: @command{weechat::add_message_handler ( name, function );}@*
+Python: @command{weechat.add_message_handler ( name, function )}@*
 @*
-Return value of a plugin option.@*
-Option is read from file ~/.weechat/plugins.rc and is like:@*
-@code{plugin.script.option=value}@*
-Note: plugin and script names are automatically added.@*
+Attach a script function to an IRC message.@*
+Function will be called each time IRC message will be received.@*
 
 @emph{Arguments:}
 @itemize @minus
-@item @option{option}: name of option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Value of option, empty if error occured or option was not found.@*
-@*
-@emph{Example:}@*
-@*
-@code{$value = weechat::get_plugin_config ("my_var");}@*
-@*
-
-@item
-@command{weechat::set_plugin_config ( option, value );}@*
-@*
-Update value of a plugin option.@*
-Option is written in file ~/.weechat/plugins.rc and is like:@*
-@code{plugin.script.option=value}@*
-Note: plugin and script names are automatically added.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@item @option{value}: new value for option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat::set_plugin_config ("my_var", "value");}@*
-@*
-
-@end itemize
-
-@subsection Python scripts
-
-@subsubsection Carregar/Descarregar Scripts Python
-
-Os Scripts Python s@~ao carregados e descarregados com o comando @command{/python}.
-(escreve @kbd{/help python} dentro do WeeChat para obteres ajuda acerca do comando).@*
-
-@emph{Exemplos:}@*
-@itemize @bullet
-@item
-Carregar um Script Python: @kbd{/python load /tmp/sample.py}@*
-@item
-Descarregar todos os Scripts Python: @kbd{/python unload}@*
-@item
-Listar todos os Scripts Python: @kbd{/python}@*
-@end itemize
-
-@subsubsection Interface WeeChat / Python
-
-@itemize @bullet
-@item
-@command{weechat.register ( nome, vers@~ao, fun@,{c}@~ao_de_shutdown, descri@,{c}@~ao );}@*
-@*
-Esta @'e a primeira fun@,{c}@~ao a invocar num Script Python.@*
-Todos os Scripts Python para o Weechat devem invocar esta fun@,{c}@~ao.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{nome}: nome @'unico que indentifique o script (cada Script Python deve ter um @'unico nome)
-@item @option{vers@~ao}: vers@~ao do script
-@item @option{fun@,{c}@~ao_de_shutdown}: fun@,{c}@~ao Python invocada quando o script é descarregado (par@^ametro opcional, se deixado em branco significa que nada deve ser chamado)
-@item @option{descri@,{c}@~ao}: breve descri@,{c}@~ao do script.
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if script was registered, 0 if error occured.@*
-@*
-@emph{Exemplo:}@*
-@*
-@code{weechat.register ("sample", "1.0", "sample_end", "Sample script!")}@*
-@*
-
-@item
-@command{weechat.prnt ( mensagem, [canal, [servidor]] )}@*
-@*
-Imprimne uma mensagem na canal.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{mensagem}: mensagem a mostrar
-@item @option{canal}: nome da canal
-@item @option{servidor}: nome interno da servidor
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Exemplos:}@*
-@*
-@code{weechat.prnt ("mensagem")}@*
-@code{weechat.prnt ("mensagem", "#weechat")}@*
-@code{weechat.prnt ("mensagem", "#weechat", "freenode")}@*
-@*
-
-@item
-@command{weechat.print_infobar ( atrasa, mensagem )}@*
-@*
-Imprimne uma mensagem na barra do info.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{atrasa}: depois que isto atrasa (nos segundos), a mensagem estar@'a apagada
-(se 0, mensagem n@~ao forem apagados).
-@item @option{mensagem}: mensagem a mostrar
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Exemplo:}@*
-@*
-@code{weechat.print_infobar (5, "mensagem")}@*
-@*
-
-@item
-@command{weechat.add_message_handler ( nome, fun@,{c}@~ao )}@*
-@*
-Anexa uma fun@,{c}@~ao Python a uma mensagem de IRC.@*
-A fun@,{c}@~ao ser@'a invocada de cada vez que a mensagem IRC for recebida.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{nome}: nome da mensagem IRC@*
-Para conheceres uma lista de mensagens de IRC, por favor lê o RFC 1459 e/ou o 2812:@*
+@item @option{name}: name of IRC message@*
+To know list of IRC messages, please refer to RFC 1459 and/or 2812:@*
 RFC 1459: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
 RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{fun@,{c}@~ao}: fun@,{c}@~ao Python invocada quando a mensagem é recebida
+@item @option{function}: function called when message is received
 @end itemize
 @*
 @emph{Return value:}@*
 @*
-1 if Python function was attached, 0 if error occured.@*
+1 if function was attached, 0 if error occured.@*
 @*
-@emph{Exemplo:}@*
+@emph{Perl example:}@*
+@*
+@code{weechat::add_message_handler ("privmsg", my_function);}@*
+@code{sub my_function}@*
+@code{@{ }@*
+@code{@ @ @ @ weechat::print ("server=$_[0]\n");}@*
+@code{@ @ @ @ ($null, $channel, $message) = split ":",$_[1],3;}@*
+@code{@ @ @ @ ($hostmask, $null, $channel) = split " ", $channel;}@*
+@code{@ @ @ @ weechat::print ("host=$hostmask, chan=$channel, msg=$message\n");}@*
+@code{@ @ @ @ return 0;}@*
+@code{@} }@*
+@*
+@*
+@emph{Python example:}@*
 @*
 @code{weechat.add_message_handler ("privmsg", my_function)}@*
 @code{def my_function(server, args):}@*
 @code{@ @ @ @ weechat.prnt("server="+server)}@*
 @code{@ @ @ @ null, channel, message = string.split(args, ":", 2)}@*
 @code{@ @ @ @ hostmask, null, channel = string.split(string.strip(channel), " ", 2)}@*
-@code{@ @ @ @ weechat.prnt("host="+hostmask+", chan="+channel+", msg="+message)}@*
+@code{@ @ @ @ weechat.prnt("host="+hostmask+", channel="+channel+", message="+message)}@*
 @code{@ @ @ @ return 0}@*
 @*
 @emph{Notes:}@*
 @*
-Function called when message is received has to return one of these values:@*
+Function called when message is received has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@item @option{1}: message will not be sent to WeeChat
-@item @option{2}: message will not be sent to other plugins
-@item @option{3}: message will not be sent to WeeChat neither other plugins
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
+@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT}: message will not be sent
+to WeeChat
+@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS}: message will not be sent
+to other plugins
+@item @option{PLUGIN_RC_OK_IGNORE_ALL}: message will not be sent to
+WeeChat neither other plugins
 @end itemize
 @*
 
 @item
-@command{weechat.add_command_handler ( nome, fun@,{c}@~ao )}@*
+Perl: @command{weechat::add_command_handler ( name, function );}@*
+Python: @command{weechat.add_command_handler ( name, function )}@*
 @*
-Cria um novo comando do Weechat, ligado a uma fun@,{c}@~ao Python.@*
-A fun@,{c}@~ao ser@'a chamada quando o utilizador a invocar utilizando @command{/nome}@*
+Create new WeeChat command, linked with script function.@*
+Function will be called when user will launch command with @kbd{/name}.@*
 
-@emph{Argumentos:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{nome}: nome do novo comando@*
-Este nome pode pertencer a um comando já existente, o qual ser@'a sobreposto pela fun@,{c}@~ao Python. Tem cuidado quando fizeres isto: os comandos originais não estar@~ao acessiveis antes de teres descarregado o Script Python.
-@item @option{fun@,{c}@~ao}: fun@,{c}@~ao Python ligada ao comando
+@item @option{name}: name of new command@*
+This name may be existing command, so that the command is overrided by
+script function. Be careful when overriding WeeChat commands, they'll not be
+available until your script will be unloaded.
+@item @option{function}: function linked with command
 @item @option{description}: command description (displayed by /help
 command)
 @item @option{arguments}: short description of command arguments
@@ -2734,45 +2415,63 @@ arguments (displayed by /help command)
 @*
 @emph{Return value:}@*
 @*
-1 if Python function was attached, 0 if error occured.@*
+1 if function was attached, 0 if error occured.@*
 @*
-@emph{Exemplo:}@*
+@emph{Perl example:}@*
+@*
+@code{weechat::add_command_handler ("command", my_command);}@*
+@code{sub my_command}@*
+@code{@{ }@*
+@code{@ @ @ @ weechat::print("Server: $_[0], arguments: $_[1]\n");}@*
+@code{@ @ @ @ return 0;}@*
+@code{@} }@*
+@*
+@emph{Python example:}@*
 @*
 @code{weechat.add_command_handler ("command", my_command)}@*
 @code{def my_command(server, args):}@*
-@code{@ @ @ @ weechat.prnt("Servidor:"+server+" Argumentos:"+args)}@*
+@code{@ @ @ @ weechat.prnt("server:"+server+" arguments:"+args)}@*
+@code{@ @ @ @ return 0}@*
 @*
 @emph{Notes:}@*
 @*
-Function called when command is executed has to return one of these values:@*
+Function called when command is executed has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
 @end itemize
 @*
 
 @item
-@command{weechat.remove_handler ( name, function );}@*
+Perl: @command{weechat::remove_handler ( name, function );}@*
+Python: @command{weechat.remove_handler ( name, function )}@*
 @*
 Remove a message or command handler.@*
 
 @emph{Arguments:}
 @itemize @minus
 @item @option{name}: name of IRC message or command handler
-@item @option{function}: Python function
+@item @option{function}: function
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat.remove_handler ("command", my_command);}@*
+@code{weechat::remove_handler ("command", my_command);}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.remove_handler ("command", my_command)}@*
 @*
 
 @item
-@command{weechat.command ( command, [channel, [server]] )}@*
+Perl: @command{weechat::command ( command, [channel, [server]] );}@*
+Python: @command{weechat.command ( command, [channel, [server]] )}@*
 @*
 Execute a command or send a message to a channel.@*
 
@@ -2787,7 +2486,13 @@ Execute a command or send a message to a channel.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
+@*
+@code{weechat::command ("hello world!");}@*
+@code{weechat::command ("/kick toto please leave this chan", "#weechat");}@*
+@code{weechat::command ("/nick newnick", "", "freenode");}@*
+@*
+@emph{Python examples:}@*
 @*
 @code{weechat.command ("hello world!")}@*
 @code{weechat.command ("/kick toto please leave this chan", "#weechat")}@*
@@ -2795,38 +2500,47 @@ Execute a command or send a message to a channel.@*
 @*
 
 @item
-@command{weechat.get_info ( nome, [servidor] )}@*
+Perl: @command{weechat::get_info ( name, [server, [channel] ] );}@*
+Python: @command{weechat.get_info ( name, [server, [channel] ] )}@*
 @*
-Comece o v@'ario info sobre WeeChat, servidor ou usu@'ario.@*
+Get various info about WeeChat, server or user.@*
 
-@emph{Argumentos:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{nome}: nome do info a recuperar:
+@item @option{name}: name of info to retrieve:
 @itemize @minus
-@item @option{version}: comece a vers@~ao de WeeChat
-@item @option{nick}: comece o nickname
-@item @option{channel}: comece o nome da canal
-@item @option{server}: comece o nome do servidor
+@item @option{version}: get WeeChat version
+@item @option{nick}: get nickname
+@item @option{channel}: get channel name
+@item @option{server}: get server name
 @item @option{away}: get ``away'' flag
 @item @option{weechat_dir}: get WeeChat home dir
 @item @option{weechat_libdir}: get WeeChat system lib dir
 @item @option{weechat_sharedir}: get WeeChat system share dir
+
 @end itemize
-@item @option{servidor}: nome interno da servidor
+@item @option{server}: internal name of server
+@item @option{channel}: channel name
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 Asked info, empty if error occured or info was not found.@*
 @*
-@emph{Exemplos:}@*
+@emph{Perl examples:}@*
+@*
+@code{$version = weechat::get_info("version");}@*
+@code{$nick = weechat::get_info("nick", "freenode");}@*
+@*
+@emph{Python examples:}@*
 @*
 @code{$version = weechat.get_info("version")}@*
 @code{$nick = weechat.get_info("nick", "freenode")}@*
 @*
 
 @item
-@command{weechat::get_dcc_info ( );}@*
+Perl: @command{weechat::get_dcc_info ( );}@*
+Python: @command{weechat.get_dcc_info ( );}@*
 @*
 Get DCC list.@*
 
@@ -2869,7 +2583,8 @@ DCC list, 0 if error occured.@*
 @*
 
 @item
-@command{weechat.get_config ( option );}@*
+Perl: @command{weechat::get_config ( option );}@*
+Python: @command{weechat.get_config ( option )}@*
 @*
 Get WeeChat config option value.@*
 
@@ -2882,14 +2597,20 @@ Get WeeChat config option value.@*
 @*
 Value of option, empty if error occured or option was not found.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
-@code{$value1 = weechat.get_config ("look_nicklist");}@*
-@code{$value2 = weechat.get_config ("freenode.server_autojoin");}@*
+@code{$value1 = weechat::get_config ("look_nicklist");}@*
+@code{$value2 = weechat::get_config ("freenode.server_autojoin");}@*
+@*
+@emph{Python examples:}@*
+@*
+@code{$value1 = weechat.get_config ("look_nicklist")}@*
+@code{$value2 = weechat.get_config ("freenode.server_autojoin")}@*
 @*
 
 @item
-@command{weechat.set_config ( option, value );}@*
+Perl: @command{weechat::set_config ( option, value );}@*
+Python: @command{weechat.set_config ( option, value )}@*
 @*
 Get WeeChat config option value.@*
 
@@ -2903,14 +2624,21 @@ Get WeeChat config option value.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
-@code{weechat.set_config ("look_nicklist", "off");}@*
-@code{weechat.set_config ("freenode.server_autojoin"", "#weechat");}@*
+@code{weechat::set_config ("look_nicklist", "off");}@*
+@code{weechat::set_config ("freenode.server_autojoin"",
+"#weechat");}@*
+@*
+@emph{Python examples:}@*
+@*
+@code{weechat.set_config ("look_nicklist", "off")}@*
+@code{weechat.set_config ("freenode.server_autojoin"", "#weechat")}@*
 @*
 
 @item
-@command{weechat.get_plugin_config ( option );}@*
+Perl: @command{weechat::get_plugin_config ( option );}@*
+Python: @command{weechat.get_plugin_config ( option )}@*
 @*
 Return value of a plugin option.@*
 Option is read from file ~/.weechat/plugins.rc and is like:@*
@@ -2926,13 +2654,18 @@ Note: plugin and script names are automatically added.@*
 @*
 Value of option, empty if error occured or option was not found.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
-@code{$value = weechat.get_plugin_config ("my_var");}@*
+@code{$value = weechat::get_plugin_config ("my_var");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{$value = weechat.get_plugin_config ("my_var")}@*
 @*
 
 @item
-@command{weechat.set_plugin_config ( option, value );}@*
+Perl: @command{weechat::set_plugin_config ( option, value );}@*
+Python: @command{weechat.set_plugin_config ( option, value )}@*
 @*
 Update value of a plugin option.@*
 Option is written in file ~/.weechat/plugins.rc and is like:@*
@@ -2949,17 +2682,17 @@ Note: plugin and script names are automatically added.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat.set_plugin_config ("my_var", "value");}@*
+@code{weechat::set_plugin_config ("my_var", "value");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.set_plugin_config ("my_var", "value")}@*
 @*
 
 @end itemize
 
-@subsection Ruby scripts
-
-N@~AO DESENVOLVIDO!
-
 
 @c **************************** Autores/Suporte *****************************
 
diff --git a/po/cs.po b/po/cs.po
index a112c9dbd..cc1558a81 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.6-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-10-30 10:52+0100\n"
+"POT-Creation-Date: 2005-11-04 12:35+0100\n"
 "PO-Revision-Date: 2005-10-30 10:53+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -20,87 +20,87 @@ msgstr ""
 msgid "%s cannot allocate new nick\n"
 msgstr "%s nemůžu přidělit novou přezdívku\n"
 
-#: src/irc/irc-server.c:180 src/common/weeconfig.c:1968
+#: src/irc/irc-server.c:181 src/common/weeconfig.c:1974
 msgid "Unable to get user's name"
 msgstr "Nemůžu získat jméno uživatele"
 
-#: src/irc/irc-server.c:248
+#: src/irc/irc-server.c:249
 #, c-format
 msgid "%s cannot allocate new server\n"
 msgstr "%s nemůžu přidělit nový server\n"
 
-#: src/irc/irc-server.c:466
+#: src/irc/irc-server.c:467
 #, c-format
 msgid "%s error sending data to IRC server\n"
 msgstr "%s chyba při zasílání dat na IRC server\n"
 
-#: src/irc/irc-server.c:489 src/irc/irc-server.c:502 src/irc/irc-server.c:549
-#: src/irc/irc-server.c:562
+#: src/irc/irc-server.c:490 src/irc/irc-server.c:503 src/irc/irc-server.c:550
+#: src/irc/irc-server.c:563
 #, c-format
 msgid "%s not enough memory for received IRC message\n"
 msgstr "%s nedostatek paměti pro získání IRC zprávy\n"
 
-#: src/irc/irc-server.c:674
-#, c-format
-msgid "%s Command '%s' failed!\n"
-msgstr "%s Příkaz '%s' selhal!\n"
+#: src/irc/irc-server.c:675
+#, fuzzy, c-format
+msgid "%s Command \"%s\" failed!\n"
+msgstr "%s příkaz \"%s\" selhal\n"
 
-#: src/irc/irc-server.c:680
+#: src/irc/irc-server.c:681
 #, c-format
 msgid "%s No command to execute!\n"
 msgstr "%s Žádný příkaz pro provedení!\n"
 
-#: src/irc/irc-server.c:686
-#, c-format
-msgid "%s Unknown command: cmd=%s, host=%s, args=%s\n"
+#: src/irc/irc-server.c:687
+#, fuzzy, c-format
+msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
 msgstr "%s Neznámý příkaz: příkaz=%s, host=%s, parametry=%s\n"
 
-#: src/irc/irc-server.c:737
+#: src/irc/irc-server.c:738
 #, c-format
 msgid "%s cannot read data from socket, disconnecting from server...\n"
 msgstr "%s nemůžu pře�íst data ze soketu, odpojuji se od serveru...\n"
 
-#: src/irc/irc-server.c:820
+#: src/irc/irc-server.c:821
 #, c-format
 msgid "%s: Reconnecting to server in %d seconds\n"
 msgstr "%s: Navazuji nové spojení se serverem za %d sekund\n"
 
-#: src/irc/irc-server.c:854
+#: src/irc/irc-server.c:855
 #, c-format
 msgid "%s gnutls handshake failed\n"
 msgstr "%s handshake s gnutls selhal\n"
 
-#: src/irc/irc-server.c:871
+#: src/irc/irc-server.c:872
 #, c-format
 msgid "%s proxy address \"%s\" not found\n"
 msgstr "%s adresa proxy \"%s\" nenalezena\n"
 
-#: src/irc/irc-server.c:875
+#: src/irc/irc-server.c:876
 #, c-format
 msgid "%s address \"%s\" not found\n"
 msgstr "%s adresa \"%s\" nenalezena\n"
 
-#: src/irc/irc-server.c:885
+#: src/irc/irc-server.c:886
 #, c-format
 msgid "%s proxy IP address not found\n"
 msgstr "%s IP adresa proxy nenalezena\n"
 
-#: src/irc/irc-server.c:888
+#: src/irc/irc-server.c:889
 #, c-format
 msgid "%s IP address not found\n"
 msgstr "%s IP adresa nenalezena\n"
 
-#: src/irc/irc-server.c:897
+#: src/irc/irc-server.c:898
 #, c-format
 msgid "%s proxy connection refused\n"
 msgstr "%s proxy odmítla spojení\n"
 
-#: src/irc/irc-server.c:900
+#: src/irc/irc-server.c:901
 #, c-format
 msgid "%s connection refused\n"
 msgstr "%s spojení odmítnuto\n"
 
-#: src/irc/irc-server.c:908
+#: src/irc/irc-server.c:909
 #, c-format
 msgid ""
 "%s proxy fails to establish connection to server (check username/password if "
@@ -109,7 +109,7 @@ msgstr ""
 "%s selhalo zjednání spojení s proxy serverem (zkontrolujte uživatelské jméno "
 "a heslo pokud jsou vyžadovány)\n"
 
-#: src/irc/irc-server.c:1387
+#: src/irc/irc-server.c:1388
 #, c-format
 msgid ""
 "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -117,57 +117,57 @@ msgstr ""
 "%s nemohu se připojit pomocí SSL, protže WeeChat nebyl sestaven s podporou "
 "GNUtls\n"
 
-#: src/irc/irc-server.c:1396
+#: src/irc/irc-server.c:1397
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr "%s: připojuji se k serveru %s:%d%s%s přes %s proxy %s:%d%s...\n"
 
-#: src/irc/irc-server.c:1402
+#: src/irc/irc-server.c:1403
 #, c-format
 msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr "Připojuji se k serveru %s:%d%s%s přes %s proxy %s:%d%s...\n"
 
-#: src/irc/irc-server.c:1412
+#: src/irc/irc-server.c:1413
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s...\n"
 msgstr "%s: připojuji se k serveru %s:%d%s%s...\n"
 
-#: src/irc/irc-server.c:1416
+#: src/irc/irc-server.c:1417
 #, c-format
 msgid "Connecting to server %s:%d%s%s...\n"
 msgstr "Připojuji se k serveru %s:%d%s%s...\n"
 
-#: src/irc/irc-server.c:1434
+#: src/irc/irc-server.c:1435
 #, c-format
 msgid "%s gnutls init error\n"
 msgstr "%s chyba inicializace gnutls\n"
 
-#: src/irc/irc-server.c:1449
+#: src/irc/irc-server.c:1450
 #, c-format
 msgid "%s cannot create pipe\n"
 msgstr "%s nemohu vytvořit rouru\n"
 
-#: src/irc/irc-server.c:1464
+#: src/irc/irc-server.c:1465
 #, c-format
 msgid "%s cannot create socket\n"
 msgstr "%s nemohu vytvořit soket\n"
 
-#: src/irc/irc-server.c:1475
+#: src/irc/irc-server.c:1476
 #, c-format
 msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
 msgstr "%s nemohu nastavit nastavení sketu \"SO_REUSEADDR\"\n"
 
-#: src/irc/irc-server.c:1486
+#: src/irc/irc-server.c:1487
 #, c-format
 msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
 msgstr "%s nemohu nastavit nastavení soketu \"SO_KEEPALIVE\"\n"
 
-#: src/irc/irc-server.c:1517
+#: src/irc/irc-server.c:1518
 #, c-format
 msgid "%s: Reconnecting to server...\n"
 msgstr "%s: Připojuji se znovu k serveru...\n"
 
-#: src/irc/irc-server.c:1567 src/irc/irc-server.c:1576
+#: src/irc/irc-server.c:1568 src/irc/irc-server.c:1577
 msgid "Disconnected from server!\n"
 msgstr "Odpojen od serveru!\n"
 
@@ -962,7 +962,7 @@ msgstr ""
 #: src/irc/irc-commands.c:380 src/irc/irc-commands.c:381
 #: src/irc/irc-commands.c:382 src/irc/irc-commands.c:383
 #: src/irc/irc-commands.c:384 src/irc/irc-commands.c:385
-#: src/irc/irc-commands.c:490
+#: src/irc/irc-commands.c:491
 msgid "a server message"
 msgstr "zpráva serveru"
 
@@ -1143,244 +1143,249 @@ msgid "you are now an IRC operator"
 msgstr "nyní jsi IRC operátor"
 
 #: src/irc/irc-commands.c:387
+msgid "rehashing"
+msgstr ""
+
+#: src/irc/irc-commands.c:388
 msgid "server local time"
 msgstr "lokální �as serveru"
 
-#: src/irc/irc-commands.c:388
+#: src/irc/irc-commands.c:389
 msgid "no such nick/channel"
 msgstr "neexistující přezdívka/kanál"
 
-#: src/irc/irc-commands.c:390
+#: src/irc/irc-commands.c:391
 msgid "no such server"
 msgstr "neexistující server"
 
-#: src/irc/irc-commands.c:392
+#: src/irc/irc-commands.c:393
 msgid "no such channel"
 msgstr "neexistující kanál"
 
-#: src/irc/irc-commands.c:394
+#: src/irc/irc-commands.c:395
 msgid "cannot send to channel"
 msgstr "nemohu poslat na kanál"
 
-#: src/irc/irc-commands.c:396
+#: src/irc/irc-commands.c:397
 msgid "too many channels"
 msgstr "příliš mnoho kanálů"
 
-#: src/irc/irc-commands.c:398 src/irc/irc-commands.c:400
+#: src/irc/irc-commands.c:399 src/irc/irc-commands.c:401
 msgid "was no such nick"
 msgstr "byl neznámá přezdívka"
 
-#: src/irc/irc-commands.c:402
+#: src/irc/irc-commands.c:403
 msgid "no origin"
 msgstr "žádný původ"
 
-#: src/irc/irc-commands.c:404
+#: src/irc/irc-commands.c:405
 msgid "no services"
 msgstr "žádné služby"
 
-#: src/irc/irc-commands.c:406
+#: src/irc/irc-commands.c:407
 msgid "no recipient"
 msgstr "žádný příjemce"
 
-#: src/irc/irc-commands.c:408
+#: src/irc/irc-commands.c:409
 msgid "no text to send"
 msgstr "není text k poslání"
 
-#: src/irc/irc-commands.c:410
+#: src/irc/irc-commands.c:411
 msgid "no toplevel"
 msgstr "žádný nejvyšší level"
 
-#: src/irc/irc-commands.c:412
+#: src/irc/irc-commands.c:413
 msgid "wilcard in toplevel domain"
 msgstr "žna�ka pro výběr souboru v nejvyšší doméně"
 
-#: src/irc/irc-commands.c:414
+#: src/irc/irc-commands.c:415
 msgid "unknown command"
 msgstr "neznámý přkaz"
 
-#: src/irc/irc-commands.c:416
+#: src/irc/irc-commands.c:417
 msgid "MOTD is missing"
 msgstr "MOTD chybí"
 
-#: src/irc/irc-commands.c:418
+#: src/irc/irc-commands.c:419
 msgid "no administrative info"
 msgstr "žádné administrativní informace"
 
-#: src/irc/irc-commands.c:420
+#: src/irc/irc-commands.c:421
 msgid "file error"
 msgstr "chyba souboru"
 
-#: src/irc/irc-commands.c:422
+#: src/irc/irc-commands.c:423
 msgid "no nickname given"
 msgstr "žádná přezdívka nebyla dána"
 
-#: src/irc/irc-commands.c:424
+#: src/irc/irc-commands.c:425
 msgid "erroneous nickname"
 msgstr "chybová přezdívka"
 
-#: src/irc/irc-commands.c:426
+#: src/irc/irc-commands.c:427
 msgid "nickname already in use"
 msgstr "přezdívka je zrovna používaná"
 
-#: src/irc/irc-commands.c:428
+#: src/irc/irc-commands.c:429
 msgid "nickname collision"
 msgstr "kolize přezdívek"
 
-#: src/irc/irc-commands.c:430
+#: src/irc/irc-commands.c:431
 msgid "not authorized to change nickname"
 msgstr "chybí autorizace pro změnu přezdívky"
 
-#: src/irc/irc-commands.c:432
+#: src/irc/irc-commands.c:433
 msgid "user not in channel"
 msgstr "uživatel není na kanále"
 
-#: src/irc/irc-commands.c:434
+#: src/irc/irc-commands.c:435
 msgid "not on channel"
 msgstr "není na kanále"
 
-#: src/irc/irc-commands.c:436
+#: src/irc/irc-commands.c:437
 msgid "user already on channel"
 msgstr "uživatel již je na kanále"
 
-#: src/irc/irc-commands.c:438
+#: src/irc/irc-commands.c:439
 msgid "user not logged in"
 msgstr "uživatel není přihlášen"
 
-#: src/irc/irc-commands.c:440
+#: src/irc/irc-commands.c:441
 msgid "summon has been disabled"
 msgstr "svolávání bylo zakázáno"
 
-#: src/irc/irc-commands.c:442
+#: src/irc/irc-commands.c:443
 msgid "users has been disabled"
 msgstr "uživatel byl zablokován"
 
-#: src/irc/irc-commands.c:444
+#: src/irc/irc-commands.c:445
 msgid "you are not registered"
 msgstr "nejsi registrován"
 
-#: src/irc/irc-commands.c:446
+#: src/irc/irc-commands.c:447
 msgid "not enough parameters"
 msgstr "nedostatek parametrů"
 
-#: src/irc/irc-commands.c:448
+#: src/irc/irc-commands.c:449
 msgid "you may not register"
 msgstr "nemůžeš se registrovat"
 
-#: src/irc/irc-commands.c:450
+#: src/irc/irc-commands.c:451
 msgid "your host isn't among the privileged"
 msgstr "tvůj host není mezi privilegovanými"
 
-#: src/irc/irc-commands.c:452
+#: src/irc/irc-commands.c:453
 msgid "password incorrect"
 msgstr "nezprávné heslo"
 
-#: src/irc/irc-commands.c:454
+#: src/irc/irc-commands.c:455
 msgid "you are banned from this server"
 msgstr "dle tohoto serveru jsi zakázaný"
 
-#: src/irc/irc-commands.c:456
+#: src/irc/irc-commands.c:457
 msgid "channel key already set"
 msgstr "klí� kanálu je již nastaven"
 
-#: src/irc/irc-commands.c:458
+#: src/irc/irc-commands.c:459
 msgid "forwarding to another channel"
 msgstr "předávám na dalsí kanál"
 
-#: src/irc/irc-commands.c:460
+#: src/irc/irc-commands.c:461
 msgid "channel is already full"
 msgstr "kanál je již plný"
 
-#: src/irc/irc-commands.c:462
+#: src/irc/irc-commands.c:463
 msgid "unknown mode char to me"
 msgstr "neznámý znak módu"
 
-#: src/irc/irc-commands.c:464
+#: src/irc/irc-commands.c:465
 msgid "cannot join channel (invite only)"
 msgstr "nemohu se přidat na kanál (pouze na pozvání)"
 
-#: src/irc/irc-commands.c:466
+#: src/irc/irc-commands.c:467
 msgid "cannot join channel (banned from channel)"
 msgstr "nemohu se přidat na kanál (zakázaný dle kanálu)"
 
-#: src/irc/irc-commands.c:468
+#: src/irc/irc-commands.c:469
 msgid "cannot join channel (bad channel key)"
 msgstr "nemohu se přidat na kanál (špatný klí� kanálu)"
 
-#: src/irc/irc-commands.c:470
+#: src/irc/irc-commands.c:471
 msgid "bad channel mask"
 msgstr "špatná maska kanálu"
 
-#: src/irc/irc-commands.c:472
+#: src/irc/irc-commands.c:473
 msgid "channel doesn't support modes"
 msgstr "kanál nepodporuje módy"
 
-#: src/irc/irc-commands.c:474
+#: src/irc/irc-commands.c:475
 msgid "you're not an IRC operator"
 msgstr "nejsi IRC operátor"
 
-#: src/irc/irc-commands.c:476
+#: src/irc/irc-commands.c:477
 msgid "you're not channel operator"
 msgstr "nejsi operátor kanálu"
 
-#: src/irc/irc-commands.c:478
+#: src/irc/irc-commands.c:479
 msgid "you can't kill a server!"
 msgstr "nemůžeš zabít server!"
 
-#: src/irc/irc-commands.c:480
+#: src/irc/irc-commands.c:481
 msgid "your connection is restricted!"
 msgstr "tvé připojení je omezené"
 
-#: src/irc/irc-commands.c:482
+#: src/irc/irc-commands.c:483
 msgid "user is immune from kick/deop"
 msgstr "uživatel je imunní na kick/deop"
 
-#: src/irc/irc-commands.c:484
+#: src/irc/irc-commands.c:485
 msgid "no O-lines for your host"
 msgstr "žádné O-řádky pro tvůj host"
 
-#: src/irc/irc-commands.c:486
+#: src/irc/irc-commands.c:487
 msgid "unknown mode flag"
 msgstr "neznámá zna�ka módu"
 
-#: src/irc/irc-commands.c:488
+#: src/irc/irc-commands.c:489
 msgid "can't change mode for other users"
 msgstr "nemůžu změnit mód přo ostatní uživatele"
 
-#: src/irc/irc-commands.c:491
+#: src/irc/irc-commands.c:492
 msgid "whois (secure connection)"
 msgstr "whois (zabezpe�ená �ást)"
 
-#: src/irc/irc-display.c:170 src/common/command.c:873
-msgid "Server: "
-msgstr "Server: "
+#: src/irc/irc-display.c:180
+#, c-format
+msgid "%sServer: %s%s %s[%s%s%s]\n"
+msgstr ""
 
-#: src/irc/irc-display.c:175
+#: src/irc/irc-display.c:187
 msgid "connected"
 msgstr "připojen"
 
-#: src/irc/irc-display.c:175 src/common/command.c:899
+#: src/irc/irc-display.c:187
 msgid "not connected"
 msgstr "nepřipojen"
 
-#: src/irc/irc-display.c:179 src/irc/irc-display.c:184
-#: src/irc/irc-display.c:196 src/irc/irc-display.c:199
+#: src/irc/irc-display.c:191 src/irc/irc-display.c:195
+#: src/irc/irc-display.c:203 src/irc/irc-display.c:205
 msgid "yes"
 msgstr "ano"
 
-#: src/irc/irc-display.c:179 src/irc/irc-display.c:184
-#: src/irc/irc-display.c:196 src/irc/irc-display.c:199
+#: src/irc/irc-display.c:191 src/irc/irc-display.c:195
+#: src/irc/irc-display.c:203 src/irc/irc-display.c:205
 msgid "no"
 msgstr "ne"
 
-#: src/irc/irc-display.c:181
+#: src/irc/irc-display.c:193
 msgid " (temporary server, will not be saved)"
 msgstr " (do�asný server, nebude uložen)"
 
-#: src/irc/irc-display.c:203
+#: src/irc/irc-display.c:208
 msgid "(hidden)"
 msgstr "(skrytý)"
 
-#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4718
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4674
 msgid "unknown"
 msgstr "neznámý"
 
@@ -1389,516 +1394,513 @@ msgstr "neznámý"
 msgid "%s: using local hostname \"%s\"\n"
 msgstr "%s: používám lokální jméno hosta \"%s\"\n"
 
-#: src/irc/irc-send.c:167 src/common/command.c:749
+#: src/irc/irc-send.c:166 src/common/command.c:760
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr "%s nemohu najít přezdívku pro poslání zprávy\n"
 
-#: src/irc/irc-send.c:329 src/irc/irc-send.c:357 src/irc/irc-send.c:544
-#: src/irc/irc-send.c:577 src/irc/irc-send.c:610 src/irc/irc-send.c:658
-#: src/irc/irc-send.c:694 src/irc/irc-send.c:761 src/irc/irc-send.c:818
-#: src/irc/irc-send.c:1160 src/irc/irc-send.c:1258 src/irc/irc-send.c:1737
-#: src/irc/irc-send.c:1851
+#: src/irc/irc-send.c:328 src/irc/irc-send.c:356 src/irc/irc-send.c:547
+#: src/irc/irc-send.c:580 src/irc/irc-send.c:613 src/irc/irc-send.c:661
+#: src/irc/irc-send.c:697 src/irc/irc-send.c:764 src/irc/irc-send.c:821
+#: src/irc/irc-send.c:1154 src/irc/irc-send.c:1254 src/irc/irc-send.c:1730
+#: src/irc/irc-send.c:1844
 #, c-format
 msgid "%s \"%s\" command can only be executed in a channel window\n"
 msgstr "%s \"%s\" příkaz může být spuštěn pouze v okně kanálu\n"
 
-#: src/irc/irc-send.c:456 src/irc/irc-send.c:468 src/irc/irc-send.c:486
-#: src/irc/irc-send.c:1138 src/irc/irc-send.c:1231 src/irc/irc-send.c:1763
-#: src/common/command.c:1233 src/common/command.c:1647
-#: src/common/command.c:1781
+#: src/irc/irc-send.c:459 src/irc/irc-send.c:471 src/irc/irc-send.c:489
+#: src/irc/irc-send.c:1132 src/irc/irc-send.c:1227 src/irc/irc-send.c:1756
+#: src/common/command.c:1253 src/common/command.c:1695
+#: src/common/command.c:1831
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s špatný po�et parametrů pro příkaz \"%s\"\n"
 
-#: src/irc/irc-send.c:509 src/irc/irc-send.c:746 src/irc/irc-send.c:803
+#: src/irc/irc-send.c:512 src/irc/irc-send.c:749 src/irc/irc-send.c:806
 #, c-format
 msgid "%s wrong arguments for \"%s\" command\n"
 msgstr "%s špatné parametry pro příkaz \"%s\"\n"
 
-#: src/irc/irc-send.c:946 src/irc/irc-send.c:1013 src/irc/irc-send.c:1306
-#: src/irc/irc-send.c:1320 src/irc/irc-send.c:1664
+#: src/irc/irc-send.c:949 src/irc/irc-send.c:1016 src/irc/irc-send.c:1302
+#: src/irc/irc-send.c:1316 src/irc/irc-send.c:1657
 #, c-format
 msgid "%s \"%s\" command can not be executed on a server window\n"
 msgstr "%s \"%s\" příkaz nemůže být spuštěn v okně serveru\n"
 
-#: src/irc/irc-send.c:1031 src/irc/irc-send.c:1056 src/irc/irc-recv.c:499
+#: src/irc/irc-send.c:1032 src/irc/irc-send.c:1055 src/irc/irc-recv.c:500
 #, c-format
 msgid "%s nick \"%s\" not found for \"%s\" command\n"
 msgstr "%s přezdívka \"%s\" nebyla nalezena pro příkaz \"%s\"\n"
 
-#: src/irc/irc-send.c:1108 src/irc/irc-send.c:1416 src/irc/irc-recv.c:1238
-#: src/irc/irc-recv.c:2054 src/irc/irc-recv.c:2142
+#: src/irc/irc-send.c:1105 src/irc/irc-send.c:1412 src/irc/irc-recv.c:1230
+#: src/irc/irc-recv.c:2042 src/irc/irc-recv.c:2132
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr "%s nemohu vytvořít nové soukromé okno\"%s\"\n"
 
-#: src/irc/irc-send.c:1816
+#: src/irc/irc-send.c:1809
 #, c-format
 msgid "%s, compiled on %s %s\n"
 msgstr "%s, kompilováno na %s %s\n"
 
-#: src/irc/irc-recv.c:355
-msgid "You have been invited to "
+#: src/irc/irc-recv.c:362
+#, fuzzy, c-format
+msgid "You have been invited to %s%s%s by %s%s\n"
 msgstr "Byl jsi pozván na "
 
-#: src/irc/irc-recv.c:358 src/irc/irc-recv.c:3994
-msgid "by"
-msgstr "od"
-
-#: src/irc/irc-recv.c:369 src/irc/irc-recv.c:463 src/irc/irc-recv.c:1012
-#: src/irc/irc-recv.c:1397 src/irc/irc-recv.c:1656 src/irc/irc-recv.c:3559
-#: src/irc/irc-recv.c:3581 src/irc/irc-recv.c:3642 src/irc/irc-recv.c:3714
+#: src/irc/irc-recv.c:376 src/irc/irc-recv.c:469 src/irc/irc-recv.c:1008
+#: src/irc/irc-recv.c:1386 src/irc/irc-recv.c:1645 src/irc/irc-recv.c:3520
+#: src/irc/irc-recv.c:3541 src/irc/irc-recv.c:3601 src/irc/irc-recv.c:3672
 #, c-format
 msgid "%s channel \"%s\" not found for \"%s\" command\n"
 msgstr "%s kanál \"%s\" nebyl nalezen příkazem \"%s\"\n"
 
-#: src/irc/irc-recv.c:397
+#: src/irc/irc-recv.c:404
 #, c-format
 msgid "%s cannot create new channel \"%s\"\n"
 msgstr "%s nemohu vytvořit nový kanál \"%s\"\n"
 
-#: src/irc/irc-recv.c:416
-msgid " has joined "
-msgstr " se připojil "
+#: src/irc/irc-recv.c:415
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:474
-msgid " has kicked "
-msgstr " byl vykopnut "
+#: src/irc/irc-recv.c:477
+#, fuzzy, c-format
+msgid "%s%s%s has kicked %s%s%s from %s%s"
+msgstr " změnil téma pro "
 
-#: src/irc/irc-recv.c:478 src/common/command.c:1468
-msgid " from "
-msgstr " z "
+#: src/irc/irc-recv.c:562
+#, c-format
+msgid "%s%s%s has killed %s%s%s from server"
+msgstr ""
 
-#: src/irc/irc-recv.c:564
-msgid " has killed "
-msgstr " byl zabit "
-
-#: src/irc/irc-recv.c:570
-msgid " from server"
-msgstr " ze serveru"
-
-#: src/irc/irc-recv.c:580
-msgid " from server\n"
-msgstr " ze serveru\n"
-
-#: src/irc/irc-recv.c:588
+#: src/irc/irc-recv.c:584
 #, c-format
 msgid "%s host \"%s\" not found for \"%s\" command\n"
 msgstr "%s host \"%s\" nenalezen pro příkaz \"%s\"\n"
 
-#: src/irc/irc-recv.c:629
+#: src/irc/irc-recv.c:625
 msgid "sets ban on"
 msgstr "tě zakázal"
 
-#: src/irc/irc-recv.c:630
+#: src/irc/irc-recv.c:626
 msgid "removes ban on"
 msgstr "odebral zakázaní"
 
-#: src/irc/irc-recv.c:654
+#: src/irc/irc-recv.c:650
 msgid "sets exception on"
 msgstr "nastavena vyjímka na"
 
-#: src/irc/irc-recv.c:655
+#: src/irc/irc-recv.c:651
 msgid "removes exception on"
 msgstr "odstraněna vyjímka z"
 
-#: src/irc/irc-recv.c:679
+#: src/irc/irc-recv.c:675
 msgid "sets mode +f"
 msgstr "nastavil mód +f"
 
-#: src/irc/irc-recv.c:680
+#: src/irc/irc-recv.c:676
 msgid "removes mode +f"
 msgstr "odstranil mód +f"
 
-#: src/irc/irc-recv.c:704
+#: src/irc/irc-recv.c:700
 msgid "gives half channel operator status to"
 msgstr "dal polovi�ní status operátora na"
 
-#: src/irc/irc-recv.c:705
+#: src/irc/irc-recv.c:701
 msgid "removes half channel operator status from"
 msgstr "odebral polovi�ní status operátora z"
 
-#: src/irc/irc-recv.c:732
+#: src/irc/irc-recv.c:728
 msgid "sets invite-only channel flag"
 msgstr "nastavil zan�ku kanálu: pouze na pování"
 
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:729
 msgid "removes invite-only channel flag"
 msgstr "odebral zna�ku kanálu: pouze na pozvání"
 
-#: src/irc/irc-recv.c:750
+#: src/irc/irc-recv.c:746
 msgid "sets channel key to"
 msgstr "nastavil klí� kanálu na"
 
-#: src/irc/irc-recv.c:751
+#: src/irc/irc-recv.c:747
 msgid "removes channel key"
 msgstr "odebral klí� kanálu"
 
-#: src/irc/irc-recv.c:782
+#: src/irc/irc-recv.c:778
 msgid "sets the user limit to"
 msgstr "nastavil limit uživatelů na"
 
-#: src/irc/irc-recv.c:783
+#: src/irc/irc-recv.c:779
 msgid "removes user limit"
 msgstr "odebral limit uživatelů"
 
-#: src/irc/irc-recv.c:805
+#: src/irc/irc-recv.c:801
 msgid "sets moderated channel flag"
 msgstr "nastavil zna�ku moderovaného kanálu"
 
-#: src/irc/irc-recv.c:806
+#: src/irc/irc-recv.c:802
 msgid "removes moderated channel flag"
 msgstr "odebral zna�ku moderovaného kanálu"
 
-#: src/irc/irc-recv.c:816
+#: src/irc/irc-recv.c:812
 msgid "sets messages from channel only flag"
 msgstr "nastavil zna�ku kanálu: zprávy pouze z kanálu"
 
-#: src/irc/irc-recv.c:817
+#: src/irc/irc-recv.c:813
 msgid "removes messages from channel only flag"
 msgstr "odebral zna�ku kanálu: zprávy pouze z kanálu"
 
-#: src/irc/irc-recv.c:834
+#: src/irc/irc-recv.c:830
 msgid "gives channel operator status to"
 msgstr "dal status operátora na"
 
-#: src/irc/irc-recv.c:835
+#: src/irc/irc-recv.c:831
 msgid "removes channel operator status from"
 msgstr "odebral status operátora z"
 
-#: src/irc/irc-recv.c:862
+#: src/irc/irc-recv.c:858
 msgid "sets private channel flag"
 msgstr "nastavil zna�ku soukromého kanálu"
 
-#: src/irc/irc-recv.c:863
+#: src/irc/irc-recv.c:859
 msgid "removes private channel flag"
 msgstr "odebral zna�ku soukromého kanálu"
 
-#: src/irc/irc-recv.c:880
+#: src/irc/irc-recv.c:876
 msgid "sets quiet on"
 msgstr "nastavil ticho na"
 
-#: src/irc/irc-recv.c:881
+#: src/irc/irc-recv.c:877
 msgid "removes quiet on"
 msgstr "odebral ticho z"
 
-#: src/irc/irc-recv.c:898
+#: src/irc/irc-recv.c:894
 msgid "sets secret channel flag"
 msgstr "nastavil zna�ku tajného kanálu"
 
-#: src/irc/irc-recv.c:899
+#: src/irc/irc-recv.c:895
 msgid "removes secret channel flag"
 msgstr "odebral zna�ku tajného kanálu"
 
-#: src/irc/irc-recv.c:909
+#: src/irc/irc-recv.c:905
 msgid "sets topic protection"
 msgstr "nastavil protekci tématu"
 
-#: src/irc/irc-recv.c:910
+#: src/irc/irc-recv.c:906
 msgid "removes topic protection"
 msgstr "odebral protekci tématu"
 
-#: src/irc/irc-recv.c:927
+#: src/irc/irc-recv.c:923
 msgid "gives voice to"
 msgstr "dal voice na"
 
-#: src/irc/irc-recv.c:928
+#: src/irc/irc-recv.c:924
 msgid "removes voice from"
 msgstr "odebral voice z"
 
-#: src/irc/irc-recv.c:971 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1475
-#: src/irc/irc-recv.c:2209
+#: src/irc/irc-recv.c:967 src/irc/irc-recv.c:1053 src/irc/irc-recv.c:1464
+#: src/irc/irc-recv.c:2201
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr "%s \"%s\" příkaz obdržen bez hosta\n"
 
-#: src/irc/irc-recv.c:981
+#: src/irc/irc-recv.c:977
 #, c-format
 msgid "%s \"%s\" command received without channel or nickname\n"
 msgstr "%s \"%s\" příkaz obdržen bez kanálu nebo přezdívky\n"
 
-#: src/irc/irc-recv.c:1029
-msgid "mode changed by"
-msgstr "mód změnil"
+#: src/irc/irc-recv.c:1019
+#, c-format
+msgid "%s[%s%s%s/%s%s%s]%s mode changed by %s%s\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:1091
-msgid "You are "
-msgstr "Jsi "
-
-#: src/irc/irc-recv.c:1098
-msgid " is "
-msgstr " je "
-
-#: src/irc/irc-recv.c:1102
-msgid "now known as "
+#: src/irc/irc-recv.c:1088
+#, fuzzy, c-format
+msgid "You are now known as %s%s\n"
 msgstr "nyní známý jako "
 
-#: src/irc/irc-recv.c:1169
+#: src/irc/irc-recv.c:1092
+#, fuzzy, c-format
+msgid "%s%s%s is now known as %s%s\n"
+msgstr "nyní známý jako "
+
+#: src/irc/irc-recv.c:1159
 #, c-format
 msgid "%s nickname not found for \"%s\" command\n"
 msgstr "%s přezdívka nenalezena pro příkaz \"%s\"\n"
 
-#: src/irc/irc-recv.c:1185 src/irc/irc-recv.c:1217
-msgid "reply from"
-msgstr "odpověd od"
-
-#: src/irc/irc-recv.c:1220
+#: src/irc/irc-recv.c:1173
 #, c-format
-msgid ": %ld.%ld seconds\n"
-msgstr ": %ld %ld sekund\n"
+msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:1259 src/irc/irc-recv.c:2163 src/irc/irc-dcc.c:1136
+#: src/irc/irc-recv.c:1207
+#, c-format
+msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:1252 src/irc/irc-recv.c:2154 src/irc/irc-dcc.c:1153
 #, c-format
 msgid "Private %s> %s"
 msgstr "Soukromý %s> %s"
 
-#: src/irc/irc-recv.c:1322
+#: src/irc/irc-recv.c:1317
 #, c-format
 msgid "%s \"%s\" command received without host or channel\n"
 msgstr "%s \"%s\" příkaz obdržen bez hosta nebo kanálu\n"
 
-#: src/irc/irc-recv.c:1371
-msgid " has left "
-msgstr " opustil "
+#: src/irc/irc-recv.c:1357
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has left %s%s"
+msgstr ""
 
-#: src/irc/irc-recv.c:1523 src/irc/irc-recv.c:2078
+#: src/irc/irc-recv.c:1513 src/irc/irc-recv.c:2067
 #, c-format
 msgid "On %s: * %s %s"
 msgstr "Na %s: * %s %s"
 
-#: src/irc/irc-recv.c:1547
-#, c-format
-msgid "Received a CTCP SOUND \"%s\" from "
+#: src/irc/irc-recv.c:1538
+#, fuzzy, c-format
+msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
 msgstr "Obdržen CTCP ZVUK \"%s\" od "
 
-#: src/irc/irc-recv.c:1580 src/irc/irc-recv.c:1611 src/irc/irc-recv.c:1715
-#: src/irc/irc-recv.c:1755 src/irc/irc-recv.c:2118
-msgid "received from"
-msgstr "obdrženo od"
+#: src/irc/irc-recv.c:1568 src/irc/irc-recv.c:1739
+#, fuzzy, c-format
+msgid "CTCP %sPING%s received from %s%s\n"
+msgstr " obdržen od "
 
-#: src/irc/irc-recv.c:1607 src/irc/irc-recv.c:2114
-msgid "Unknown CTCP "
-msgstr "Neznámé CTCP "
+#: src/irc/irc-recv.c:1597 src/irc/irc-recv.c:2104
+#, fuzzy, c-format
+msgid "Unknown CTCP %s%s%s received from %s%s"
+msgstr "%s neznámý DCC CHAT typ obdržen od "
 
-#: src/irc/irc-recv.c:1639
+#: src/irc/irc-recv.c:1629
 #, c-format
 msgid "On %s: %s> %s"
 msgstr "Na: %s: %s> %s"
 
-#: src/irc/irc-recv.c:1771 src/irc/irc-recv.c:1792 src/irc/irc-recv.c:1808
-#: src/irc/irc-recv.c:1824 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1871
-#: src/irc/irc-recv.c:1887 src/irc/irc-recv.c:1912 src/irc/irc-recv.c:1933
-#: src/irc/irc-recv.c:1949 src/irc/irc-recv.c:1974 src/irc/irc-recv.c:1995
-#: src/irc/irc-recv.c:2010 src/irc/irc-recv.c:2185 src/irc/irc-recv.c:2529
-#: src/irc/irc-recv.c:3918 src/irc/irc-recv.c:3933 src/irc/irc-recv.c:3948
-#: src/irc/irc-recv.c:3963 src/irc/irc-recv.c:3976 src/irc/irc-recv.c:4031
-#: src/irc/irc-recv.c:4045 src/irc/irc-recv.c:4285 src/irc/irc-recv.c:4343
-#: src/irc/irc-recv.c:4502 src/irc/irc-recv.c:4517 src/irc/irc-recv.c:4532
-#: src/irc/irc-recv.c:4547 src/irc/irc-recv.c:4560 src/irc/irc-recv.c:4614
-#: src/irc/irc-recv.c:4628
+#: src/irc/irc-recv.c:1700
+#, fuzzy, c-format
+msgid "CTCP %sVERSION%s received from %s%s"
+msgstr " obdržen od "
+
+#: src/irc/irc-recv.c:1757 src/irc/irc-recv.c:1778 src/irc/irc-recv.c:1794
+#: src/irc/irc-recv.c:1810 src/irc/irc-recv.c:1836 src/irc/irc-recv.c:1857
+#: src/irc/irc-recv.c:1873 src/irc/irc-recv.c:1898 src/irc/irc-recv.c:1919
+#: src/irc/irc-recv.c:1935 src/irc/irc-recv.c:1960 src/irc/irc-recv.c:1981
+#: src/irc/irc-recv.c:1996 src/irc/irc-recv.c:2177 src/irc/irc-recv.c:2516
+#: src/irc/irc-recv.c:3879 src/irc/irc-recv.c:3894 src/irc/irc-recv.c:3909
+#: src/irc/irc-recv.c:3924 src/irc/irc-recv.c:3937 src/irc/irc-recv.c:4002
+#: src/irc/irc-recv.c:4016 src/irc/irc-recv.c:4250 src/irc/irc-recv.c:4308
+#: src/irc/irc-recv.c:4446 src/irc/irc-recv.c:4461 src/irc/irc-recv.c:4567
+#: src/irc/irc-recv.c:4581
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr "%s nemohu rozpársovat příkaz \"%s\"\n"
 
-#: src/irc/irc-recv.c:2023
+#: src/irc/irc-recv.c:2009
 #, c-format
 msgid "%s unknown DCC CHAT type received from "
 msgstr "%s neznámý DCC CHAT typ obdržen od "
 
-#: src/irc/irc-recv.c:2240
-msgid "has quit"
-msgstr "ukon�il"
+#: src/irc/irc-recv.c:2224
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has quit %s(%s%s%s)\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:2354
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr "%s \"%s\" příkaz obdržen bez kanálu\n"
 
-#: src/irc/irc-recv.c:2397
-msgid " has changed topic for "
+#: src/irc/irc-recv.c:2382
+#, fuzzy, c-format
+msgid "%s%s%s has changed topic for %s%s%s to: \"%s\"\n"
 msgstr " změnil téma pro "
 
-#: src/irc/irc-recv.c:2402
-#, c-format
-msgid " to: \"%s\"\n"
-msgstr " pro: \"%s\"\n"
-
-#: src/irc/irc-recv.c:2408
-msgid " has unset topic for "
+#: src/irc/irc-recv.c:2392
+#, fuzzy, c-format
+msgid "%s%s%s has unset topic for %s%s\n"
 msgstr " zrušil téma pro "
 
-#: src/irc/irc-recv.c:2517
-msgid "User mode"
-msgstr "Uživatelský mód"
-
-#: src/irc/irc-recv.c:2572
+#: src/irc/irc-recv.c:2502
 #, c-format
-msgid " is away: %s\n"
+msgid "User mode %s[%s%s%s/%s%s%s]\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:2557
+#, fuzzy, c-format
+msgid "%s%s%s is away: %s\n"
 msgstr " je pry�: %s\n"
 
-#: src/irc/irc-recv.c:2654
+#: src/irc/irc-recv.c:2642
 msgid "Users online: "
 msgstr "Uživatelů online: "
 
-#: src/irc/irc-recv.c:3144
-msgid "idle: "
-msgstr "ne�inný: "
+#: src/irc/irc-recv.c:2999
+#, c-format
+msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3120
+#, c-format
+msgid "%s[%s%s%s]%s idle: "
+msgstr ""
+
+#: src/irc/irc-recv.c:3132
 msgid "days"
 msgstr "dní"
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3132
 msgid "day"
 msgstr "den"
 
-#: src/irc/irc-recv.c:3162
+#: src/irc/irc-recv.c:3136
+#, c-format
+msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
+msgstr ""
+
+#: src/irc/irc-recv.c:3140
 msgid "hours"
 msgstr "hodin"
 
-#: src/irc/irc-recv.c:3162
+#: src/irc/irc-recv.c:3140
 msgid "hour"
 msgstr "hodina"
 
-#: src/irc/irc-recv.c:3168
+#: src/irc/irc-recv.c:3144
 msgid "minutes"
 msgstr "minut"
 
-#: src/irc/irc-recv.c:3168
+#: src/irc/irc-recv.c:3144
 msgid "minute"
 msgstr "minuta"
 
-#: src/irc/irc-recv.c:3174
+#: src/irc/irc-recv.c:3148
 msgid "seconds"
 msgstr "sekund"
 
-#: src/irc/irc-recv.c:3174
+#: src/irc/irc-recv.c:3148
 msgid "second"
 msgstr "sekunda"
 
-#: src/irc/irc-recv.c:3179
-msgid "signon at: "
-msgstr "připojen: "
-
-#: src/irc/irc-recv.c:3275
-msgid "Channels: "
-msgstr "Kanály: "
-
-#: src/irc/irc-recv.c:3572
-msgid "No topic set for "
+#: src/irc/irc-recv.c:3532
+#, fuzzy, c-format
+msgid "No topic set for %s%s\n"
 msgstr "Není nastaveno téma pro "
 
-#: src/irc/irc-recv.c:3629
-msgid "Topic for "
-msgstr "Téma pro "
-
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3588
 #, c-format
-msgid " is: \"%s\"\n"
-msgstr " je: \"%s\"\n"
+msgid "Topic for %s%s%s is: \"%s\"\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:3652 src/irc/irc-recv.c:3741 src/irc/irc-recv.c:3794
+#: src/irc/irc-recv.c:3611 src/irc/irc-recv.c:3699 src/irc/irc-recv.c:3754
 #, c-format
 msgid "%s cannot identify channel for \"%s\" command\n"
 msgstr "%s nemohu identifikovat kanál pro příkaz \"%s\"\n"
 
-#: src/irc/irc-recv.c:3702
-msgid "Topic set by "
+#: src/irc/irc-recv.c:3661
+#, fuzzy, c-format
+msgid "Topic set by %s%s%s, %s"
 msgstr "Téma nasteveno "
 
-#: src/irc/irc-recv.c:3723
+#: src/irc/irc-recv.c:3681
 #, c-format
 msgid "%s cannot identify date/time for \"%s\" command\n"
 msgstr "%s nemohu identofikovat datum/�as pro příkaz \"%s\"\n"
 
-#: src/irc/irc-recv.c:3732 src/irc/irc-recv.c:3803
+#: src/irc/irc-recv.c:3690 src/irc/irc-recv.c:3763
 #, c-format
 msgid "%s cannot identify nickname for \"%s\" command\n"
 msgstr "%s nemohu identifikovat přezdívku pro příkaz \"%s\"\n"
 
-#: src/irc/irc-recv.c:3782
-msgid "has invited"
-msgstr "pozval"
+#: src/irc/irc-recv.c:3739
+#, fuzzy, c-format
+msgid "%s%s%s has invited %s%s%s on %s%s\n"
+msgstr " změnil téma pro "
 
-#: src/irc/irc-recv.c:3785 src/irc/irc-recv.c:4206 src/common/command.c:1461
-msgid "on"
-msgstr "na"
-
-#: src/irc/irc-recv.c:3840
-msgid "Channel reop"
+#: src/irc/irc-recv.c:3799
+#, fuzzy, c-format
+msgid "Channel reop %s%s%s: %s%s\n"
 msgstr "reop kanálu"
 
-#: src/irc/irc-recv.c:3992
-msgid "exception"
-msgstr "vyjímka"
-
-#: src/irc/irc-recv.c:4331
+#: src/irc/irc-recv.c:4296
 #, c-format
 msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
 msgstr "%s nemohu vztvořit přezdívku \"%s\" pro kanál \"%s\"\n"
 
-#: src/irc/irc-recv.c:4390
-msgid "Nicks "
-msgstr "Přezdívky "
+#: src/irc/irc-recv.c:4354
+#, c-format
+msgid "Nicks %s%s%s: %s["
+msgstr ""
 
-#: src/irc/irc-recv.c:4410
-msgid "Channel "
-msgstr "Kanál "
+#: src/irc/irc-recv.c:4375
+#, c-format
+msgid ""
+"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:4421
+#: src/irc/irc-recv.c:4383
 msgid "nicks"
 msgstr "přezdívky"
 
-#: src/irc/irc-recv.c:4421
+#: src/irc/irc-recv.c:4383
 msgid "nick"
 msgstr "přezdívka"
 
-#: src/irc/irc-recv.c:4429
+#: src/irc/irc-recv.c:4388
 msgid "ops"
 msgstr "ops"
 
-#: src/irc/irc-recv.c:4429
+#: src/irc/irc-recv.c:4388
 msgid "op"
 msgstr "op"
 
-#: src/irc/irc-recv.c:4438
+#: src/irc/irc-recv.c:4392
 msgid "halfops"
 msgstr "�áste�ní-ops"
 
-#: src/irc/irc-recv.c:4438
+#: src/irc/irc-recv.c:4392
 msgid "halfop"
 msgstr "�áste�ný-op"
 
-#: src/irc/irc-recv.c:4447
+#: src/irc/irc-recv.c:4396
 msgid "voices"
 msgstr "voices"
 
-#: src/irc/irc-recv.c:4447
+#: src/irc/irc-recv.c:4396
 msgid "voice"
 msgstr "voice"
 
-#: src/irc/irc-recv.c:4456
+#: src/irc/irc-recv.c:4400
 msgid "normal"
 msgstr "normální"
 
-#: src/irc/irc-recv.c:4577
-msgid "banned by"
-msgstr "zakázán"
+#: src/irc/irc-recv.c:4501
+#, c-format
+msgid "%s[%s%s%s] %s%s%s banned by "
+msgstr ""
 
-#: src/irc/irc-recv.c:4672
+#: src/irc/irc-recv.c:4536
+#, c-format
+msgid "%s[%s%s%s] %s%s%s banned\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:4628
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
 msgstr ""
 "%s: přezdívka \"%s\" je již používaná, zkouším druhou přezdívku \"%s\"\n"
 
-#: src/irc/irc-recv.c:4684
+#: src/irc/irc-recv.c:4640
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
 msgstr ""
 "%s: přezdívka \"%s\" je již používaná, zkouším třetí přezdívku \"%s\"\n"
 
-#: src/irc/irc-recv.c:4696
+#: src/irc/irc-recv.c:4652
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
@@ -1907,7 +1909,7 @@ msgstr ""
 "%s: všechny deklarované přezdívky jsou již používány, zavírám spojení se "
 "serverem!\n"
 
-#: src/irc/irc-recv.c:4706
+#: src/irc/irc-recv.c:4662
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
 msgstr ""
@@ -1937,35 +1939,39 @@ msgstr "Selhal"
 msgid "Aborted"
 msgstr "Zrušeno"
 
-#: src/irc/irc-dcc.c:367 src/irc/irc-dcc.c:568 src/irc/irc-dcc.c:731
-msgid "DCC: file "
+#: src/irc/irc-dcc.c:368
+#, fuzzy, c-format
+msgid "DCC: file %s%s%s"
 msgstr "DCC: soubor "
 
-#: src/irc/irc-dcc.c:374 src/irc/irc-dcc.c:693 src/irc/irc-dcc.c:736
-msgid " (local filename: "
+#: src/irc/irc-dcc.c:374
+#, fuzzy, c-format
+msgid " (local filename: %s%s%s)"
 msgstr " (lokální jmého souboru: "
 
-#: src/irc/irc-dcc.c:382
+#: src/irc/irc-dcc.c:379
 msgid " sent to "
 msgstr " poslán "
 
-#: src/irc/irc-dcc.c:384
+#: src/irc/irc-dcc.c:381
 msgid " received from "
 msgstr " obdržen od "
 
-#: src/irc/irc-dcc.c:390
-msgid ": ok!\n"
-msgstr ": ok!\n"
+#: src/irc/irc-dcc.c:386
+msgid "OK"
+msgstr ""
 
-#: src/irc/irc-dcc.c:390
-msgid ": FAILED\n"
+#: src/irc/irc-dcc.c:386
+#, fuzzy
+msgid "FAILED"
 msgstr ": SELHAL\n"
 
-#: src/irc/irc-dcc.c:402
-msgid "DCC chat closed with "
+#: src/irc/irc-dcc.c:399
+#, fuzzy, c-format
+msgid "DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"
 msgstr "DCC rozhovor zavřen s "
 
-#: src/irc/irc-dcc.c:459
+#: src/irc/irc-dcc.c:457
 #, c-format
 msgid ""
 "%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1974,20 +1980,17 @@ msgstr ""
 "%s nemohu přiřadit DCC rozhovor k soukromému bufferu (možná má "
 "soukromýbuffer již DCC CHAT?)\n"
 
-#: src/irc/irc-dcc.c:470
-msgid "Connected to "
-msgstr "Připojen k "
+#: src/irc/irc-dcc.c:468
+#, fuzzy, c-format
+msgid "Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"
+msgstr "DCC rozhovor zavřen s "
 
-#: src/irc/irc-dcc.c:479
-msgid "via DCC chat\n"
-msgstr "přes DCC rozhovor\n"
+#: src/irc/irc-dcc.c:568
+#, fuzzy, c-format
+msgid "DCC: file %s%s%s resumed at position %u\n"
+msgstr "bude obnoven na pozici %u\n"
 
-#: src/irc/irc-dcc.c:573
-#, c-format
-msgid "resumed at position %u\n"
-msgstr "obnoveno na pozici %u\n"
-
-#: src/irc/irc-dcc.c:579 src/irc/irc-dcc.c:604
+#: src/irc/irc-dcc.c:577 src/irc/irc-dcc.c:602
 #, c-format
 msgid ""
 "%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
@@ -1996,76 +1999,79 @@ msgstr ""
 "%s nemohu obnovit soubor \"%s\" (port: %d, po�áte�ní pozice: %u): DCC "
 "nenalezeno nebo ukon�eno\n"
 
-#: src/irc/irc-dcc.c:623
+#: src/irc/irc-dcc.c:621
 #, c-format
 msgid "%s not enough memory for new DCC\n"
 msgstr "%s nedostatek paměti pro nové DCC\n"
 
-#: src/irc/irc-dcc.c:642
+#: src/irc/irc-dcc.c:640
 msgid "DCC chat"
 msgstr "DCC rozhovor"
 
-#: src/irc/irc-dcc.c:672
-msgid "Incoming DCC file from "
-msgstr "Příchozí DCC soubor od "
+#: src/irc/irc-dcc.c:671
+#, c-format
+msgid ""
+"Incoming DCC file from %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s bytes\n"
+msgstr ""
 
-#: src/irc/irc-dcc.c:683 src/irc/irc-dcc.c:697
-msgid " bytes\n"
-msgstr " bajtů\n"
+#: src/irc/irc-dcc.c:694
+#, c-format
+msgid ""
+"Sending DCC file to %s%s%s: %s%s%s (local filename: %s%s%s), %s%lu%s bytes\n"
+msgstr ""
 
-#: src/irc/irc-dcc.c:689
-msgid "Sending DCC file to "
-msgstr "Posílám DCC soubor k "
-
-#: src/irc/irc-dcc.c:703
-msgid "Incoming DCC chat request from "
+#: src/irc/irc-dcc.c:714
+#, fuzzy, c-format
+msgid "Incoming DCC chat request from %s%s%s (%s%d.%d.%d.%d%s)\n"
 msgstr "Příchozí požadavek DCC rozhovoru od "
 
-#: src/irc/irc-dcc.c:715
-msgid "Sending DCC chat request to "
+#: src/irc/irc-dcc.c:731
+#, fuzzy, c-format
+msgid "Sending DCC chat request to %s%s\n"
 msgstr "Posílám požadavek DCC rozhovoru na "
 
-#: src/irc/irc-dcc.c:742
+#: src/irc/irc-dcc.c:749
 #, c-format
-msgid "will be resumed at position %u\n"
-msgstr "bude obnoven na pozici %u\n"
+msgid ""
+"DCC: file %s%s%s (local filename: %s%s%s) will be resumed at position %u\n"
+msgstr ""
 
-#: src/irc/irc-dcc.c:810
+#: src/irc/irc-dcc.c:824
 #, c-format
 msgid "%s not enough memory for DCC SEND\n"
 msgstr "%s nedostatek pameti pro DCC SEND\n"
 
-#: src/irc/irc-dcc.c:832
+#: src/irc/irc-dcc.c:846
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr "%s nemohu přistupovat k souboru \"%s\"\n"
 
-#: src/irc/irc-dcc.c:854
+#: src/irc/irc-dcc.c:868
 #, c-format
 msgid "%s could not find address for '%s'. Falling back to local IP.\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:874
+#: src/irc/irc-dcc.c:888
 #, c-format
 msgid "%s cannot create socket for DCC\n"
 msgstr "%s nemohu vytvořit soket pro DCC\n"
 
-#: src/irc/irc-dcc.c:932
+#: src/irc/irc-dcc.c:946
 #, c-format
 msgid "%s cannot find available port for DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:976
+#: src/irc/irc-dcc.c:990
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr "%s neomhu poslat DCC\n"
 
-#: src/irc/irc-dcc.c:1057
+#: src/irc/irc-dcc.c:1071
 #, c-format
 msgid "%s error sending data to \"%s\" via DCC CHAT\n"
 msgstr "%s chyba posílání dat k \"%s\" přes DCC CHAT\n"
 
-#: src/irc/irc-dcc.c:1330
+#: src/irc/irc-dcc.c:1350
 #, c-format
 msgid ""
 "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -2074,7 +2080,7 @@ msgstr ""
 "%s DCC selhalo, protože velikost bloku je příliž velká. Zkontrolujte hodnotu "
 "\"dcc_blocksize\" nastavní, maximum je %d.\n"
 
-#: src/irc/irc-dcc.c:1405
+#: src/irc/irc-dcc.c:1425
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr "Ruším aktivní DCC: \"%s\" od %s\n"
@@ -2205,13 +2211,13 @@ msgstr "Plugin \"%s\" odebrán.\n"
 msgid "%s plugin \"%s\" not found\n"
 msgstr "%s plugin \"%s\" nenalezen\n"
 
-#: src/plugins/plugins-config.c:215 src/common/weeconfig.c:1653
+#: src/plugins/plugins-config.c:215 src/common/weeconfig.c:1659
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
 msgstr "%s %s, řádek %d: nevalidní syntax, chybí \"=\"\n"
 
-#: src/plugins/plugins-config.c:265 src/common/weeconfig.c:1826
-#: src/common/weeconfig.c:2024
+#: src/plugins/plugins-config.c:265 src/common/weeconfig.c:1832
+#: src/common/weeconfig.c:2030
 #, c-format
 msgid "%s cannot create file \"%s\"\n"
 msgstr "%s nemohu vytvořit soubor \"%s\"\n"
@@ -2241,64 +2247,64 @@ msgstr "Změnil se den na %s\n"
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s zpoždění je veliké, odpojuji se od serveru...\n"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "bytes"
 msgstr "bajtů"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Kb"
 msgstr "Kb"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Mb"
 msgstr "Mb"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Gb"
 msgstr "Gb"
 
-#: src/gui/curses/gui-display.c:1265
+#: src/gui/curses/gui-display.c:1836
 msgid "<servers>"
 msgstr "<serverů>"
 
-#: src/gui/curses/gui-display.c:1277
+#: src/gui/curses/gui-display.c:1848
 msgid "(away)"
 msgstr "(pry�)"
 
-#: src/gui/curses/gui-display.c:1411
+#: src/gui/curses/gui-display.c:1982
 msgid "[not connected] "
 msgstr "[nepřipojen] "
 
-#: src/gui/curses/gui-display.c:1421
+#: src/gui/curses/gui-display.c:1992
 msgid "Act: "
 msgstr "Aktivní: "
 
-#: src/gui/curses/gui-display.c:1509
+#: src/gui/curses/gui-display.c:2080
 #, c-format
 msgid "Lag: %.1f"
 msgstr "Zpoždění: %.1f"
 
-#: src/gui/curses/gui-display.c:1525
+#: src/gui/curses/gui-display.c:2096
 msgid "-MORE-"
 msgstr "-V�CE-"
 
-#: src/gui/curses/gui-display.c:1715
+#: src/gui/curses/gui-display.c:2274
 msgid "  [A] Accept"
 msgstr "  [A] Akceptovat"
 
-#: src/gui/curses/gui-display.c:1716 src/gui/curses/gui-display.c:1720
+#: src/gui/curses/gui-display.c:2275 src/gui/curses/gui-display.c:2279
 msgid "  [C] Cancel"
 msgstr "  [C] Storno"
 
-#: src/gui/curses/gui-display.c:1725
+#: src/gui/curses/gui-display.c:2284
 msgid "  [R] Remove"
 msgstr "  [R] Odebrat"
 
-#: src/gui/curses/gui-display.c:1729
+#: src/gui/curses/gui-display.c:2288
 msgid "  [P] Purge old DCC"
 msgstr "  [P] Pro�istit staré DCC"
 
-#: src/gui/curses/gui-display.c:1730
+#: src/gui/curses/gui-display.c:2289
 msgid "  [Q] Close DCC view"
 msgstr "  [Q] Zavřít DCC pohled"
 
@@ -2306,17 +2312,13 @@ msgstr "  [Q] Zavřít DCC pohled"
 msgid "server"
 msgstr "server"
 
-#: src/gui/gui-common.c:392
-msgid "Not enough memory for infobar message\n"
-msgstr "Nedostatek paměti pro infobar zprávu\n"
-
-#: src/gui/gui-common.c:582
+#: src/gui/gui-common.c:508
 msgid "Not enough memory for new line\n"
 msgstr "Nedostatek paměti pro nový řádek\n"
 
-#: src/gui/gui-common.c:625
-msgid "Not enough memory for new message\n"
-msgstr "Nedostatek paměti pro novou zprávu\n"
+#: src/gui/gui-common.c:844
+msgid "Not enough memory for infobar message\n"
+msgstr "Nedostatek paměti pro infobar zprávu\n"
 
 #: src/gui/gui-keyboard.c:45
 msgid "terminate line"
@@ -2466,7 +2468,7 @@ msgstr "obnov obrazovku"
 msgid "grab a key"
 msgstr "zachytit klávesu"
 
-#: src/gui/gui-keyboard.c:428 src/common/command.c:1662
+#: src/gui/gui-keyboard.c:428 src/common/command.c:1710
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr "%s nemohu napojit kalávesu \"%s\"\n"
@@ -2813,8 +2815,8 @@ msgid "%s alias cannot run another alias!\n"
 msgstr "%s alias nemůže pouštět jiný ailas!\n"
 
 #: src/common/command.c:306
-#, c-format
-msgid "%s target command \"%s\" does not exist!\n"
+#, fuzzy, c-format
+msgid "%s target command \"/%s\" does not exist!\n"
 msgstr "%s cílový příkaz \"%s\" neexistuje!\n"
 
 #: src/common/command.c:535
@@ -2862,247 +2864,269 @@ msgstr "%s příkaz \"%s\" potřebuje připojení na server!\n"
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr "%s neznámý příkaz \"%s\" (zadejte /help pro nápovědu)\n"
 
-#: src/common/command.c:773
+#: src/common/command.c:789
 #, c-format
 msgid "%s unable to call handler for message (not enough memory)\n"
 msgstr "%s nemohu zavolat handler pro zprávu (neodstatek paměti)\n"
 
-#: src/common/command.c:781
+#: src/common/command.c:797
 msgid "This window is not a channel!\n"
 msgstr "Tohe není okno kanálu!\n"
 
-#: src/common/command.c:809 src/common/command.c:833 src/common/command.c:943
+#: src/common/command.c:825 src/common/command.c:856 src/common/command.c:963
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr "%s chybí argumenty pro příkaz \"%s\"\n"
 
-#: src/common/command.c:818
+#: src/common/command.c:832
+#, fuzzy, c-format
+msgid "%s alias can not start with \"/\"\n"
+msgstr "%s alias nemůže pouštět jiný ailas!\n"
+
+#: src/common/command.c:841
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr "Alias \"%s\" => \"%s\" vytvořen\n"
 
-#: src/common/command.c:824
+#: src/common/command.c:847
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr "Selhalo vytvoření aliasu \"%s\" => \"%s\" (nedostatek paměti)\n"
 
-#: src/common/command.c:844
+#: src/common/command.c:867
 msgid "List of aliases:\n"
 msgstr "Seznam pro aliasy:\n"
 
-#: src/common/command.c:856
+#: src/common/command.c:881
 msgid "No alias defined.\n"
 msgstr "Žádné aliasy nejsou definovány.\n"
 
-#: src/common/command.c:879
-msgid "Channel: "
-msgstr "Kanál: "
+#: src/common/command.c:898
+#, fuzzy, c-format
+msgid "%sServer: %s%s\n"
+msgstr "Server: "
 
-#: src/common/command.c:882 src/common/command.c:892
-msgid " (server: "
-msgstr " (server: "
+#: src/common/command.c:903
+#, c-format
+msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
+msgstr ""
 
-#: src/common/command.c:889
-msgid "Private with: "
-msgstr "Soukromý s: "
+#: src/common/command.c:912
+#, c-format
+msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
+msgstr ""
 
-#: src/common/command.c:923
+#: src/common/command.c:920
+#, fuzzy
+msgid "not connected\n"
+msgstr "nepřipojen"
+
+#: src/common/command.c:942
 msgid "Opened buffers:\n"
 msgstr "Otevřené buffery:\n"
 
-#: src/common/command.c:966
+#: src/common/command.c:986
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr "%s nekorektní �íslo bufferu\n"
 
-#: src/common/command.c:982
+#: src/common/command.c:1002
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr "%s nemohu zavřít jediný buffer\n"
 
-#: src/common/command.c:992
+#: src/common/command.c:1012
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr "%s nemohu zavřít buffer serveru dokud jsou otevřeny kanály\n"
 
-#: src/common/command.c:1043
+#: src/common/command.c:1063
 msgid "Notify levels:  "
 msgstr "Level upozornění:  "
 
-#: src/common/command.c:1071 src/common/command.c:1093
+#: src/common/command.c:1091 src/common/command.c:1113
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr "%s nekorektní level upozornění (musí být mezi %d a %d)\n"
 
-#: src/common/command.c:1080
+#: src/common/command.c:1100
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr "%s nekorektní buffer pro upozornění (musí být kanál nebo soukromý)\n"
 
-#: src/common/command.c:1160
+#: src/common/command.c:1180
 #, c-format
 msgid "unknown parameter \"%s\" for \"%s\" command\n"
 msgstr "neznámý parametr \"%s\" pro příkaz \"%s\"\n"
 
-#: src/common/command.c:1190
+#: src/common/command.c:1210
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s již vytvořený server \"%s\"!\n"
 
-#: src/common/command.c:1198
+#: src/common/command.c:1218
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr "%s zrovna připojuji k serveru \"%s\"!\n"
 
-#: src/common/command.c:1216 src/common/command.c:1291
+#: src/common/command.c:1236 src/common/command.c:1311
 #, c-format
 msgid "%s server not found\n"
 msgstr "%s server nenalezen\n"
 
-#: src/common/command.c:1246 src/common/command.c:1774
-#: src/common/command.c:2595 src/common/command.c:2619
+#: src/common/command.c:1266 src/common/command.c:1824
+#: src/common/command.c:2671 src/common/command.c:2695
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s neznámá volba pro příkaz \"%s\"\n"
 
-#: src/common/command.c:1275
+#: src/common/command.c:1295
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr "%s nepřipojen k serveru \"%s\"!\n"
 
-#: src/common/command.c:1283
+#: src/common/command.c:1303
 msgid "Auto-reconnection is cancelled\n"
 msgstr "Automatické znovupřipojené je zrušeno\n"
 
-#: src/common/command.c:1314 src/common/weechat.c:350
+#: src/common/command.c:1334 src/common/weechat.c:364
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "%s vnitřní příkazy:\n"
 
-#: src/common/command.c:1323 src/common/weechat.c:370
+#: src/common/command.c:1344 src/common/weechat.c:384
 #, c-format
 msgid "IRC commands:\n"
 msgstr "IRC příkazy:\n"
 
-#: src/common/command.c:1336
+#: src/common/command.c:1358
 msgid "Plugin commands:\n"
 msgstr "Příkazy pluginu:\n"
 
-#: src/common/command.c:1444
+#: src/common/command.c:1474
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr "Není dostupná žádná nápověda, \"%s\" je neznámý příkaz\n"
 
-#: src/common/command.c:1466
+#: src/common/command.c:1495
+msgid "on"
+msgstr "na"
+
+#: src/common/command.c:1503
 msgid " ignoring "
 msgstr " ignoruji "
 
-#: src/common/command.c:1490
+#: src/common/command.c:1507
+msgid " from "
+msgstr " z "
+
+#: src/common/command.c:1530
 msgid "List of ignore:\n"
 msgstr "Seznam ignorování:\n"
 
-#: src/common/command.c:1505
+#: src/common/command.c:1547
 msgid "No ignore defined.\n"
 msgstr "Žádné ignorování není definováno.\n"
 
-#: src/common/command.c:1531
+#: src/common/command.c:1573
 msgid "New ignore:"
 msgstr "Nové ignorování:"
 
-#: src/common/command.c:1550
-msgid "New key binding:\n"
+#: src/common/command.c:1593
+#, fuzzy, c-format
+msgid "New key binding:  %s"
 msgstr "Nová klávesová zkratka:\n"
 
-#: src/common/command.c:1583
+#: src/common/command.c:1627
 msgid "Key bindings:\n"
 msgstr "Klávesové zkratky:\n"
 
-#: src/common/command.c:1595
+#: src/common/command.c:1641
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr "Klávesa \"%s\" odpojena\n"
 
-#: src/common/command.c:1600
+#: src/common/command.c:1647
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s nemohu odpojit klávesu \"%s\"\n"
 
-#: src/common/command.c:1608 src/common/weechat.c:401
+#: src/common/command.c:1655 src/common/weechat.c:415
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Vnitřní klávesové funkce:\n"
 
-#: src/common/command.c:1627
+#: src/common/command.c:1675
 msgid "Default key bindings restored\n"
 msgstr "Výchozí klávesové zkratky obnoveny\n"
 
-#: src/common/command.c:1633
+#: src/common/command.c:1681
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 "%s \"-yes\" argument je požadován pro reset kaláves (bezpe�nostní opatření)\n"
 
-#: src/common/command.c:1689
+#: src/common/command.c:1737
 msgid "Plugins loaded:\n"
 msgstr "Na�tené pluginy:\n"
 
-#: src/common/command.c:1703
+#: src/common/command.c:1753
 msgid "     message handlers:\n"
 msgstr "     obsluhova�e zpráv:\n"
 
-#: src/common/command.c:1712
+#: src/common/command.c:1762
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr "       IRC(%s)\n"
 
-#: src/common/command.c:1719
+#: src/common/command.c:1769
 msgid "       (no message handler)\n"
 msgstr "       (není obsluhova� zprávy)\n"
 
-#: src/common/command.c:1724
+#: src/common/command.c:1774
 msgid "     command handlers:\n"
 msgstr "     obsluhova�e příkazu:\n"
 
-#: src/common/command.c:1745
+#: src/common/command.c:1795
 msgid "       (no command handler)\n"
 msgstr "       (není obsluhova� příkazu)\n"
 
-#: src/common/command.c:1751
+#: src/common/command.c:1801
 msgid "  (no plugin)\n"
 msgstr "  (není plugin)\n"
 
-#: src/common/command.c:1787
+#: src/common/command.c:1837
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
 msgstr ""
 "Příkaz \"plugin\" není dostupný, WeeChat byl přeložen bez podpory pluginů.\n"
 
-#: src/common/command.c:1834
+#: src/common/command.c:1884
 msgid "No server.\n"
 msgstr "žádný server.\n"
 
-#: src/common/command.c:1845
+#: src/common/command.c:1895
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "Server '%s' nenalezen.\n"
 
-#: src/common/command.c:1857
+#: src/common/command.c:1907
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr "%s chybí jméno serveru pro příkaz \"%s\"\n"
 
-#: src/common/command.c:1865
+#: src/common/command.c:1915
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr "%s příliž mnoho argumentů pro příkaz \"%s\", ignoruji argumety\n"
 
-#: src/common/command.c:1884
+#: src/common/command.c:1934
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr "%s server \"%s\" nenalezen pro příkaz \"%s\"\n"
 
-#: src/common/command.c:1892
+#: src/common/command.c:1942
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -3111,172 +3135,172 @@ msgstr ""
 "%s nemůžete odebrat server \"%s\", protože jste k němu připojent. Skuste "
 "nejprve /dissconnect %s.\n"
 
-#: src/common/command.c:1908 src/common/command.c:2054
-msgid "Server"
-msgstr "Server"
-
-#: src/common/command.c:1911
-msgid "has been deleted\n"
+#: src/common/command.c:1960
+#, fuzzy, c-format
+msgid "Server %s%s%s has been deleted\n"
 msgstr "byl odebrán\n"
 
-#: src/common/command.c:1926
+#: src/common/command.c:1977
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s chybí parametry pro příkaz \"%s\"\n"
 
-#: src/common/command.c:1936
+#: src/common/command.c:1987
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr "%s server \"%s\" již existuje, nemohu jej vytvořít!\n"
 
-#: src/common/command.c:1965 src/common/command.c:1993
-#: src/common/command.c:2006 src/common/command.c:2032
+#: src/common/command.c:2016 src/common/command.c:2044
+#: src/common/command.c:2057 src/common/command.c:2083
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr "%s chybí heslo pro parametr \"%s\"\n"
 
-#: src/common/command.c:1978
+#: src/common/command.c:2029
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr "%s chybí přezdívka/přezdívky pro parametr \"%s\"\n"
 
-#: src/common/command.c:2019
+#: src/common/command.c:2070
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s chybí příkaz pro parametr \"%s\"\n"
 
-#: src/common/command.c:2057
-msgid "created\n"
-msgstr "vytvořeno\n"
+#: src/common/command.c:2105
+#, fuzzy, c-format
+msgid "Server %s%s%s created\n"
+msgstr "Server '%s' nenalezen.\n"
 
-#: src/common/command.c:2063
+#: src/common/command.c:2114
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s nemohu vytvořit server\n"
 
-#: src/common/command.c:2118
+#: src/common/command.c:2173
 msgid "(unknown)"
 msgstr "(neznámý)"
 
-#: src/common/command.c:2141
-msgid "(password hidden) "
+#: src/common/command.c:2196
+#, fuzzy, c-format
+msgid "%s(password hidden) "
 msgstr "(heslo schováno) "
 
-#: src/common/command.c:2205
+#: src/common/command.c:2263
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s server \"%s\" nenalezen\n"
 
-#: src/common/command.c:2236 src/common/command.c:2282
+#: src/common/command.c:2296 src/common/command.c:2344
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s volba nastavení \"%s\" nenalezena\n"
 
-#: src/common/command.c:2241 src/common/command.c:2274
+#: src/common/command.c:2301 src/common/command.c:2336
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s nekorektní hodnota pro volbu \"%s\"\n"
 
-#: src/common/command.c:2257
+#: src/common/command.c:2317
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr "%s volba \"%s\" nemůže být změněna dokud WeeChat běží\n"
 
-#: src/common/command.c:2362
+#: src/common/command.c:2427
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr "Nebyla nalezena žádná volba nastavení s \"%s\"\n"
 
-#: src/common/command.c:2365
+#: src/common/command.c:2430
 msgid "No config option found\n"
 msgstr "Nebyla nalezena žádná volba nastavení\n"
 
-#: src/common/command.c:2372
-msgid "Detail:\n"
+#: src/common/command.c:2437
+#, fuzzy, c-format
+msgid "%sDetail:\n"
 msgstr "Detail:\n"
 
-#: src/common/command.c:2376 src/common/weechat.c:287
+#: src/common/command.c:2443 src/common/weechat.c:301
 #, c-format
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr "  . typ boolean (hodnota: 'on' nebo 'off')\n"
 
-#: src/common/command.c:2377 src/common/command.c:2400
-#: src/common/command.c:2406 src/common/command.c:2412
-#: src/common/weechat.c:288 src/common/weechat.c:311 src/common/weechat.c:317
-#: src/common/weechat.c:323
+#: src/common/command.c:2444 src/common/command.c:2467
+#: src/common/command.c:2473 src/common/command.c:2479
+#: src/common/weechat.c:302 src/common/weechat.c:325 src/common/weechat.c:331
+#: src/common/weechat.c:337
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . výchozí hodnota: '%s'\n"
 
-#: src/common/command.c:2382 src/common/weechat.c:293
+#: src/common/command.c:2449 src/common/weechat.c:307
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . typ celo�íselný (hodnoty: mezi %d a %d)\n"
 
-#: src/common/command.c:2385 src/common/weechat.c:296
+#: src/common/command.c:2452 src/common/weechat.c:310
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . výchozí hodnota: %d\n"
 
-#: src/common/command.c:2389 src/common/weechat.c:300
+#: src/common/command.c:2456 src/common/weechat.c:314
 #, c-format
 msgid "  . type string (values: "
 msgstr "  . typ řetězec (hodnoty: "
 
-#: src/common/command.c:2402 src/common/command.c:2408
-#: src/common/command.c:2414 src/common/weechat.c:313 src/common/weechat.c:319
-#: src/common/weechat.c:325
+#: src/common/command.c:2469 src/common/command.c:2475
+#: src/common/command.c:2481 src/common/weechat.c:327 src/common/weechat.c:333
+#: src/common/weechat.c:339
 msgid "empty"
 msgstr "prázdný"
 
-#: src/common/command.c:2405 src/common/weechat.c:316
+#: src/common/command.c:2472 src/common/weechat.c:330
 #, c-format
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr "  . typ barva (Curses nebo Gtk barva, viz WeeChat dokumentace)\n"
 
-#: src/common/command.c:2411 src/common/weechat.c:322
+#: src/common/command.c:2478 src/common/weechat.c:336
 #, c-format
 msgid "  . type string (any string)\n"
 msgstr "  . typ řetězec (jakýkoliv řetězec)\n"
 
-#: src/common/command.c:2417 src/common/weechat.c:328
+#: src/common/command.c:2484 src/common/weechat.c:342
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . popis: %s\n"
 
-#: src/common/command.c:2424
+#: src/common/command.c:2495
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr "volba/volby nastavení nalezeny s \"%s\"\n"
 
-#: src/common/command.c:2427
+#: src/common/command.c:2498
 msgid "config option(s) found\n"
 msgstr "volba/volby nastavení nalezeny\n"
 
-#: src/common/command.c:2448
+#: src/common/command.c:2519
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s alias nebo příkaz \"%s\" nenalezen\n"
 
-#: src/common/command.c:2458
+#: src/common/command.c:2529
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "Alias \"%s\" odebrán\n"
 
-#: src/common/command.c:2511
+#: src/common/command.c:2585
 msgid "ignore were removed.\n"
 msgstr "ignorování bylo odebráno.\n"
 
-#: src/common/command.c:2513
+#: src/common/command.c:2587
 msgid "ignore was removed.\n"
 msgstr "ignorování bylo odebrán\n"
 
-#: src/common/command.c:2518
+#: src/common/command.c:2592
 #, c-format
 msgid "%s no ignore found\n"
 msgstr "%s žádné ignorování nenaleyeno\n"
 
-#: src/common/command.c:2543
+#: src/common/command.c:2617
 msgid "Opened windows:\n"
 msgstr "Otevřené okna:\n"
 
@@ -3323,23 +3347,23 @@ msgstr "FIFO roura zavřena\n"
 msgid "%s cannot add a buffer to hotlist\n"
 msgstr "%s nemohu přidat buffer do hotlistu\n"
 
-#: src/common/log.c:118
+#: src/common/log.c:96
 msgid "Not enough memory to write log file for a buffer\n"
 msgstr "Nedostatek paměti pro zapsání log sourobru bufferu\n"
 
-#: src/common/log.c:146
+#: src/common/log.c:124
 msgid "Unable to write log file for a buffer\n"
 msgstr "Nemůžu zapsat log soubor bufferu\n"
 
-#: src/common/log.c:150
+#: src/common/log.c:128
 msgid "****  Beginning of log  "
 msgstr "****  Beginning of log  "
 
-#: src/common/log.c:164
+#: src/common/log.c:142
 msgid "****  End of log  "
 msgstr "****  End of log  "
 
-#: src/common/weechat.c:274
+#: src/common/weechat.c:288
 #, c-format
 msgid ""
 "WeeChat configuration options (~/.weechat/weechat.rc):\n"
@@ -3348,7 +3372,7 @@ msgstr ""
 "WeeChat kofnigura�ní nastavení (~/.weechat/weechat.rc):\n"
 "\n"
 
-#: src/common/weechat.c:335
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "Moreover, you can define aliases in [alias] section, by adding lines like:\n"
@@ -3356,7 +3380,7 @@ msgstr ""
 "Mimoto můžete definovat aliasy v sekci [alias], přidáním řádku jako je "
 "tento:\n"
 
-#: src/common/weechat.c:337
+#: src/common/weechat.c:351
 #, c-format
 msgid ""
 "where 'j' is alias name, and 'join' associated command.\n"
@@ -3365,62 +3389,62 @@ msgstr ""
 "kde 'j' je jméno aliasu, a 'join' přidružený příkaz.\n"
 "\n"
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:437
 #, c-format
 msgid "%s default keys:\n"
 msgstr "%s výchozí klávesy:\n"
 
-#: src/common/weechat.c:503
+#: src/common/weechat.c:525
 #, c-format
 msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
 msgstr "%s nevalidní syntaxe pro IRC server ('%s'), ignorován\n"
 
-#: src/common/weechat.c:516
+#: src/common/weechat.c:538
 #, c-format
 msgid "%s unable to create server ('%s'), ignored\n"
 msgstr "%s nemohu vytvořit server ('%s'), ignorován\n"
 
-#: src/common/weechat.c:525
+#: src/common/weechat.c:547
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr "%s neznámý parametr '%s', ignorován\n"
 
-#: src/common/weechat.c:545
+#: src/common/weechat.c:567
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr "%s nemohu vytvořit adresář \"%s\"\n"
 
-#: src/common/weechat.c:571
+#: src/common/weechat.c:593
 #, c-format
 msgid "%s unable to get HOME directory\n"
 msgstr "%s nemohu získat HOME adresář\n"
 
-#: src/common/weechat.c:580
+#: src/common/weechat.c:602
 #, c-format
 msgid "%s not enough memory for home directory\n"
 msgstr "%s nedostatek paměti pro domácí adresář\n"
 
-#: src/common/weechat.c:590
+#: src/common/weechat.c:612
 #, c-format
 msgid "%s unable to create ~/.weechat directory\n"
 msgstr "%s nemohu vytvořit adresář ~/.weechat\n"
 
-#: src/common/weechat.c:603
+#: src/common/weechat.c:625
 #, c-format
 msgid "%s unable to create ~/.weechat/logs directory\n"
 msgstr "%s nemohu vytvořit adresář ~/.weechat/logs\n"
 
-#: src/common/weechat.c:646
+#: src/common/weechat.c:668
 #, c-format
 msgid "%s unable to create/append to log file (~/.weechat/%s)"
 msgstr "%s nemohu vytvořit/přidat do log souboru (~/.weechat/%s)"
 
-#: src/common/weechat.c:669
-#, c-format
-msgid "%sWelcome to "
+#: src/common/weechat.c:696
+#, fuzzy, c-format
+msgid "%sWelcome to %s%s%s, %s\n"
 msgstr "%sVítejte do "
 
-#: src/common/weechat.c:682 src/common/weechat.c:691
+#: src/common/weechat.c:710 src/common/weechat.c:720
 msgid "compiled on"
 msgstr "kompilováno"
 
@@ -3432,34 +3456,34 @@ msgstr "WeeChat chyba:"
 msgid "WeeChat Warning:"
 msgstr "WeeChat Upozornění:"
 
-#: src/common/weeconfig.c:103 src/common/weeconfig.c:104
+#: src/common/weeconfig.c:102 src/common/weeconfig.c:103
 msgid "set title for window (terminal for Curses GUI) with name & version"
 msgstr "nastaví titulek okna (terminálu pro Cruses GUI) s jménem a verzí"
 
-#: src/common/weeconfig.c:107 src/common/weeconfig.c:108
+#: src/common/weeconfig.c:106 src/common/weeconfig.c:107
 msgid "display WeeChat logo at startup"
 msgstr "zobrazí WeeChat logo při spuštění"
 
-#: src/common/weeconfig.c:111 src/common/weeconfig.c:112
+#: src/common/weeconfig.c:110 src/common/weeconfig.c:111
 msgid "display WeeChat version at startup"
 msgstr "zobrazí verzi WeeChat při spuštění"
 
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:114
 msgid "WeeChat slogan"
 msgstr "WeeChat slogan"
 
-#: src/common/weeconfig.c:116
+#: src/common/weeconfig.c:115
 msgid "WeeChat slogan (if empty, slogan is not used)"
 msgstr "WeeChat slogan (pokud je prázdné, není slogan použit)"
 
-#: src/common/weeconfig.c:119
+#: src/common/weeconfig.c:118
 msgid ""
 "ISO charset for decoding messages from server (used only if locale is UTF-8)"
 msgstr ""
 "Znaková sada ISO pro dekódování zpráv ze serveru (použito pouze pokud je "
 "lokalizace UTF-8)"
 
-#: src/common/weeconfig.c:120
+#: src/common/weeconfig.c:119
 msgid ""
 "ISO charset for decoding messages from server (used only if locale is UTF-8) "
 "(if empty, messages are not converted if locale is UTF-8"
@@ -3468,7 +3492,7 @@ msgstr ""
 "lokalizace UTF-8) (pokud je prázdná, pak zprávy nejsou konvertovány v "
 "případě lokalizace UTF-8"
 
-#: src/common/weeconfig.c:124
+#: src/common/weeconfig.c:123
 msgid ""
 "UTF charset for decoding messages from server (used only if locale is not "
 "UTF-8)"
@@ -3476,7 +3500,7 @@ msgstr ""
 "Znaková sada UTF pro dekódování zpráv ze serveru (použito pouze pokud není "
 "lokalizace UTF-8)"
 
-#: src/common/weeconfig.c:125
+#: src/common/weeconfig.c:124
 msgid ""
 "UTF charset for decoding messages from server (used only if locale is not "
 "UTF-8) (if empty, messages are not converted if locale is not UTF-8"
@@ -3485,11 +3509,11 @@ msgstr ""
 "lokalizace UTF-8) (pokud je prázndá, pak zprávy nejsou konvertovány v "
 "případě, žě lokalizace není UTF-8"
 
-#: src/common/weeconfig.c:129
+#: src/common/weeconfig.c:128
 msgid "charset for encoding messages sent to server"
 msgstr "znaková sada pro kódování zpráv posílaných na server"
 
-#: src/common/weeconfig.c:130
+#: src/common/weeconfig.c:129
 msgid ""
 "charset for encoding messages sent to server, examples: UFT-8, ISO-8859-1 "
 "(if empty, messages are not converted)"
@@ -3497,13 +3521,13 @@ msgstr ""
 "znaková sada pro kódování zpráv posílaných na server, příklady: UTF-8, ISO-"
 "8859-1 (pokud je prázdná, zprávy nejsou konvertovány)"
 
-#: src/common/weeconfig.c:133
+#: src/common/weeconfig.c:132
 msgid "forces internal WeeChat charset (should be empty in most cases)"
 msgstr ""
 "přebije vnitřní znakovou sadu WeeChat (ve většině případů by mělo být "
 "prázdné)"
 
-#: src/common/weeconfig.c:134
+#: src/common/weeconfig.c:133
 msgid ""
 "forces internal WeeChat charset (should be empty in most cases, that means "
 "detected charset is used)"
@@ -3511,51 +3535,47 @@ msgstr ""
 "přebije vnitřní znakovou sadu WeeChat (ve většině případů by mělo být "
 "přázdné, to znamená použití detekované znakové sady)"
 
-#: src/common/weeconfig.c:137 src/common/weeconfig.c:138
+#: src/common/weeconfig.c:136 src/common/weeconfig.c:137
 msgid "use same buffer for all servers"
 msgstr ""
 
-#: src/common/weeconfig.c:141 src/common/weeconfig.c:142
+#: src/common/weeconfig.c:140 src/common/weeconfig.c:141
 msgid "timestamp for buffers"
 msgstr "�asová známka pro buffer"
 
-#: src/common/weeconfig.c:145 src/common/weeconfig.c:146
+#: src/common/weeconfig.c:144 src/common/weeconfig.c:145
 msgid "display nick names with different colors"
 msgstr "zobrazit přezdívky různými barvami"
 
-#: src/common/weeconfig.c:149 src/common/weeconfig.c:150
+#: src/common/weeconfig.c:148 src/common/weeconfig.c:149
 msgid "number of colors to use for nicks colors"
 msgstr "po�et barev použitých pro barvy přezdívek"
 
-#: src/common/weeconfig.c:153 src/common/weeconfig.c:154
+#: src/common/weeconfig.c:152 src/common/weeconfig.c:153
 msgid "display actions with different colors"
 msgstr "zobrazit akce různými barvami"
 
-#: src/common/weeconfig.c:157 src/common/weeconfig.c:158
-msgid "remove colors from incoming messages"
-msgstr "odstranit barvy z příchozích zpráv"
-
-#: src/common/weeconfig.c:161
+#: src/common/weeconfig.c:156
 msgid "display nicklist window"
 msgstr "zobrazit okno se seznamem přezdívek"
 
-#: src/common/weeconfig.c:162
+#: src/common/weeconfig.c:157
 msgid "display nicklist window (for channel windows)"
 msgstr "zobrazit okno se seznamem přezdívek (pouze pro okno kanálu)"
 
-#: src/common/weeconfig.c:165
+#: src/common/weeconfig.c:160
 msgid "nicklist position"
 msgstr "pozice seznamu přezdívek"
 
-#: src/common/weeconfig.c:166
+#: src/common/weeconfig.c:161
 msgid "nicklist position (top, left, right (default), bottom)"
 msgstr "pozice seznamu přezdívek (top, left, right (výchozí), bottom)"
 
-#: src/common/weeconfig.c:169
+#: src/common/weeconfig.c:164
 msgid "min size for nicklist"
 msgstr "minimální velikost pro seznam přezdívek"
 
-#: src/common/weeconfig.c:170
+#: src/common/weeconfig.c:165
 msgid ""
 "min size for nicklist (width or height, depending on look_nicklist_position "
 "(0 = no min size))"
@@ -3563,11 +3583,11 @@ msgstr ""
 "minimální velikost pro seznam přezdívek (šířka nebo výšhak, závisí na "
 "look_nicklist_position (0 = není minimální velikost))"
 
-#: src/common/weeconfig.c:174
+#: src/common/weeconfig.c:169
 msgid "max size for nicklist"
 msgstr "maximální velikost pro seznam přezdívek"
 
-#: src/common/weeconfig.c:175
+#: src/common/weeconfig.c:170
 msgid ""
 "max size for nicklist (width or height, depending on look_nicklist_position "
 "(0 = no max size; if min == max and > 0, then size is fixed))"
@@ -3576,43 +3596,43 @@ msgstr ""
 "look_nicklist_position (0 = není maximální velikost; jestliže min == max a > "
 "0 pak je velikost fixní ))"
 
-#: src/common/weeconfig.c:179 src/common/weeconfig.c:180
+#: src/common/weeconfig.c:174 src/common/weeconfig.c:175
 msgid "text to display instead of nick when not connected"
 msgstr "text pro zobrazení místo přezdívky pokud není připojeno"
 
-#: src/common/weeconfig.c:183 src/common/weeconfig.c:184
+#: src/common/weeconfig.c:178 src/common/weeconfig.c:179
 msgid "display nick mode ((half)op/voice) before each nick"
 msgstr "zobrazit mód přezdívky ((�áste�ný)op/voice) před každou přezdívkou"
 
-#: src/common/weeconfig.c:187 src/common/weeconfig.c:188
+#: src/common/weeconfig.c:182 src/common/weeconfig.c:183
 msgid "display space if nick mode is not (half)op/voice"
 msgstr "zobrazit mezeru pokud mód přezdívkz není (�áste�ný)op/voice"
 
-#: src/common/weeconfig.c:191 src/common/weeconfig.c:192
+#: src/common/weeconfig.c:186 src/common/weeconfig.c:187
 msgid "the string inserted after nick completion"
 msgstr "řetězec vložený za doplňování přezdívky"
 
-#: src/common/weeconfig.c:195 src/common/weeconfig.c:196
+#: src/common/weeconfig.c:190 src/common/weeconfig.c:191
 msgid "chars ignored for nick completion"
 msgstr ""
 
-#: src/common/weeconfig.c:199 src/common/weeconfig.c:200
+#: src/common/weeconfig.c:194 src/common/weeconfig.c:195
 msgid "enable info bar"
 msgstr "povolit info bar"
 
-#: src/common/weeconfig.c:203 src/common/weeconfig.c:204
+#: src/common/weeconfig.c:198 src/common/weeconfig.c:199
 msgid "timestamp for time in infobar"
 msgstr "�asová zna�ka pro �as v infobaru"
 
-#: src/common/weeconfig.c:207 src/common/weeconfig.c:208
+#: src/common/weeconfig.c:202 src/common/weeconfig.c:203
 msgid "display seconds in infobar time"
 msgstr "zobrazit sekundy v �ase v infobaru"
 
-#: src/common/weeconfig.c:211
+#: src/common/weeconfig.c:206
 msgid "delay (in seconds) for highlight messages in infobar"
 msgstr "podržet (v sekundách) zvýrazněnou zprávu v infobaru"
 
-#: src/common/weeconfig.c:212
+#: src/common/weeconfig.c:207
 msgid ""
 "delay (in seconds) for highlight messages in infobar (0 = disable highlight "
 "notifications in infobar)"
@@ -3620,22 +3640,22 @@ msgstr ""
 "podržet (v sekundách) zvýrazněnou zprávu v infobaru (0 = zakázat zvýrazněnou "
 "notifikaci v infobaru)"
 
-#: src/common/weeconfig.c:216
+#: src/common/weeconfig.c:211
 msgid "max number of names in hotlist"
 msgstr "maximální po�et jmen v hotlistu"
 
-#: src/common/weeconfig.c:217
+#: src/common/weeconfig.c:212
 msgid ""
 "max number of names in hotlist (0 = no name displayed, only buffer numbers)"
 msgstr ""
 "maximální po�et jmen v hotlistu (0 = žádné jméno není zobrazeno, pouze �ísla "
 "bufferů)"
 
-#: src/common/weeconfig.c:220
+#: src/common/weeconfig.c:215
 msgid "level for displaying names in hotlist"
 msgstr "úroveň pro zobrazování jmen v hotlistu"
 
-#: src/common/weeconfig.c:221
+#: src/common/weeconfig.c:216
 msgid ""
 "level for displaying names in hotlist (combination of: 1=join/part, "
 "2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
@@ -3643,316 +3663,316 @@ msgstr ""
 "úroveň pro zobrazování jmen v hotlistu (kombinace: 1=připojení/odpojení "
 "2=zpráva, 4=soukromé, 8=zvýraznění, příklad: 12=soukromé+zvýraznění)"
 
-#: src/common/weeconfig.c:225
+#: src/common/weeconfig.c:220
 msgid "max length of names in hotlist"
 msgstr "maximální délka jmen v hotlistu"
 
-#: src/common/weeconfig.c:226
+#: src/common/weeconfig.c:221
 msgid "max length of names in hotlist (0 = no limit)"
 msgstr "maximální délka jmen v hotlistu (0 = bez limitu)"
 
-#: src/common/weeconfig.c:229 src/common/weeconfig.c:230
+#: src/common/weeconfig.c:224 src/common/weeconfig.c:225
 msgid "display special message when day changes"
 msgstr "zobrazit speiální zprávy při změně dne"
 
-#: src/common/weeconfig.c:233 src/common/weeconfig.c:234
+#: src/common/weeconfig.c:228 src/common/weeconfig.c:229
 msgid "timestamp for date displayed when day changed"
 msgstr "�asová známka pro zobrazení dne při změně dne"
 
-#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
+#: src/common/weeconfig.c:294 src/common/weeconfig.c:295
 msgid "color for title bar"
 msgstr "barva pro title bar"
 
-#: src/common/weeconfig.c:303 src/common/weeconfig.c:304
+#: src/common/weeconfig.c:298 src/common/weeconfig.c:299
 msgid "background for title bar"
 msgstr "pozadí pro title bar"
 
-#: src/common/weeconfig.c:309 src/common/weeconfig.c:310
+#: src/common/weeconfig.c:304 src/common/weeconfig.c:305
 msgid "color for chat text"
 msgstr "barva pro text rozhovoru"
 
-#: src/common/weeconfig.c:313
+#: src/common/weeconfig.c:308
 msgid "color for time"
 msgstr "barva �asu"
 
-#: src/common/weeconfig.c:314
+#: src/common/weeconfig.c:309
 msgid "color for time in chat window"
 msgstr "barva �asu v okně rozhovoru"
 
-#: src/common/weeconfig.c:317
+#: src/common/weeconfig.c:312
 msgid "color for time separator"
 msgstr "barva pro děli� �asu"
 
-#: src/common/weeconfig.c:318
+#: src/common/weeconfig.c:313
 msgid "color for time separator (chat window)"
 msgstr "barva pro děli� �asu (okno rozhovoru)"
 
-#: src/common/weeconfig.c:321 src/common/weeconfig.c:322
+#: src/common/weeconfig.c:316 src/common/weeconfig.c:317
 msgid "color for 1st and 3rd char of prefix"
 msgstr "barva pro první a třetí znak prefixu"
 
-#: src/common/weeconfig.c:325 src/common/weeconfig.c:326
+#: src/common/weeconfig.c:320 src/common/weeconfig.c:321
 msgid "color for middle char of prefix"
 msgstr "barva pro vnitřní znak prefixu"
 
-#: src/common/weeconfig.c:329 src/common/weeconfig.c:330
+#: src/common/weeconfig.c:324 src/common/weeconfig.c:325
 msgid "color for server name"
 msgstr ""
 
-#: src/common/weeconfig.c:333 src/common/weeconfig.c:334
+#: src/common/weeconfig.c:328 src/common/weeconfig.c:329
 msgid "color for join arrow (prefix)"
 msgstr "barva pro Å¡ipku pri 'join' (prefix)"
 
-#: src/common/weeconfig.c:337 src/common/weeconfig.c:338
+#: src/common/weeconfig.c:332 src/common/weeconfig.c:333
 msgid "color for part/quit arrow (prefix)"
 msgstr "barva pro šipku při 'quit'/'part' (prefix)"
 
-#: src/common/weeconfig.c:341
+#: src/common/weeconfig.c:336
 msgid "color for nicks in actions"
 msgstr "barva pro přezdívky v akcích"
 
-#: src/common/weeconfig.c:342
+#: src/common/weeconfig.c:337
 msgid "color for nicks in actions (chat window)"
 msgstr "barva přezdívek v akcích (okno rozhovoru)"
 
-#: src/common/weeconfig.c:345
+#: src/common/weeconfig.c:340
 msgid "color for hostnames"
 msgstr "barva jména hosta"
 
-#: src/common/weeconfig.c:346
+#: src/common/weeconfig.c:341
 msgid "color for hostnames (chat window)"
 msgstr "barva jména hosta (okno rozhovoru)"
 
-#: src/common/weeconfig.c:349
+#: src/common/weeconfig.c:344
 msgid "color for channel names in actions"
 msgstr "barva kanálu v akcích"
 
-#: src/common/weeconfig.c:350
+#: src/common/weeconfig.c:345
 msgid "color for channel names in actions (chat window)"
 msgstr "barva kanálu v akcích (okno rozhovoru)"
 
-#: src/common/weeconfig.c:353
+#: src/common/weeconfig.c:348
 msgid "color for dark separators"
 msgstr "barva pro tmavý děli�"
 
-#: src/common/weeconfig.c:354
+#: src/common/weeconfig.c:349
 msgid "color for dark separators (chat window)"
 msgstr "barva pro tmavý děli� (okno rozhovoru)"
 
-#: src/common/weeconfig.c:357
+#: src/common/weeconfig.c:352
 msgid "color for highlighted nick"
 msgstr "barva pro zvýraznění přezdívky"
 
-#: src/common/weeconfig.c:358
+#: src/common/weeconfig.c:353
 msgid "color for highlighted nick (chat window)"
 msgstr "barva pro zvýraznění přezdívky (okno rozhovoru)"
 
-#: src/common/weeconfig.c:361
+#: src/common/weeconfig.c:356
 msgid "background for chat"
 msgstr "pozadí rozhovoru"
 
-#: src/common/weeconfig.c:362
+#: src/common/weeconfig.c:357
 msgid "background for chat window"
 msgstr "pozadí okna rozhovoru"
 
-#: src/common/weeconfig.c:367 src/common/weeconfig.c:368
+#: src/common/weeconfig.c:362 src/common/weeconfig.c:363
 msgid "color for status bar"
 msgstr "barva status baru"
 
-#: src/common/weeconfig.c:371 src/common/weeconfig.c:372
+#: src/common/weeconfig.c:366 src/common/weeconfig.c:367
 msgid "color for status bar delimiters"
 msgstr "barva děli�ů status barů"
 
-#: src/common/weeconfig.c:375 src/common/weeconfig.c:376
+#: src/common/weeconfig.c:370 src/common/weeconfig.c:371
 msgid "color for current channel in status bar"
 msgstr "barva pro aktuální kanál v stavovém řádku"
 
-#: src/common/weeconfig.c:379
+#: src/common/weeconfig.c:374
 msgid "color for window with new messages"
 msgstr "barva okna s novými zprávami"
 
-#: src/common/weeconfig.c:380
+#: src/common/weeconfig.c:375
 msgid "color for window with new messages (status bar)"
 msgstr "barva okna s novými zprávami (status bar)"
 
-#: src/common/weeconfig.c:383
+#: src/common/weeconfig.c:378
 msgid "color for window with private message"
 msgstr "barva okna se soukroumou zprávou"
 
-#: src/common/weeconfig.c:384
+#: src/common/weeconfig.c:379
 msgid "color for window with private message (status bar)"
 msgstr "barva okna se soukromou zprávou (status bar)"
 
-#: src/common/weeconfig.c:387
+#: src/common/weeconfig.c:382
 msgid "color for window with highlight"
 msgstr "barva okna se zvýrazněním"
 
-#: src/common/weeconfig.c:388
+#: src/common/weeconfig.c:383
 msgid "color for window with highlight (status bar)"
 msgstr "barva okna se zvýrazněním (stavový řádek)"
 
-#: src/common/weeconfig.c:391
+#: src/common/weeconfig.c:386
 msgid "color for window with new data (not messages)"
 msgstr "barva okna s novými daty (ne zprávami)"
 
-#: src/common/weeconfig.c:392
+#: src/common/weeconfig.c:387
 msgid "color for window with new data (not messages) (status bar)"
 msgstr "barva okna s novými daty (ne zprávami) (status bar)"
 
-#: src/common/weeconfig.c:395
+#: src/common/weeconfig.c:390
 msgid "color for \"-MORE-\" text"
 msgstr "barva pro text \"-V�CE-\""
 
-#: src/common/weeconfig.c:396
+#: src/common/weeconfig.c:391
 msgid "color for window with new data (status bar)"
 msgstr "barva okna s novými daty (status bar)"
 
-#: src/common/weeconfig.c:399 src/common/weeconfig.c:400
+#: src/common/weeconfig.c:394 src/common/weeconfig.c:395
 msgid "background for status window"
 msgstr "pozadí stavového okna"
 
-#: src/common/weeconfig.c:405 src/common/weeconfig.c:406
+#: src/common/weeconfig.c:400 src/common/weeconfig.c:401
 msgid "color for info bar text"
 msgstr "barva textu v info baru"
 
-#: src/common/weeconfig.c:409 src/common/weeconfig.c:410
+#: src/common/weeconfig.c:404 src/common/weeconfig.c:405
 msgid "color for infobar delimiters"
 msgstr "barva děli�ů v infobaru"
 
-#: src/common/weeconfig.c:413 src/common/weeconfig.c:414
+#: src/common/weeconfig.c:408 src/common/weeconfig.c:409
 msgid "color for info bar highlight notification"
 msgstr "barva upozornění zvýraznění v info baru"
 
-#: src/common/weeconfig.c:417 src/common/weeconfig.c:418
+#: src/common/weeconfig.c:412 src/common/weeconfig.c:413
 msgid "background for info bar window"
 msgstr "pozadí pro okno info baru"
 
-#: src/common/weeconfig.c:423 src/common/weeconfig.c:424
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
 msgid "color for input text"
 msgstr "barva pro vstupní text"
 
-#: src/common/weeconfig.c:427 src/common/weeconfig.c:428
+#: src/common/weeconfig.c:422 src/common/weeconfig.c:423
 msgid "color for input text (channel name)"
 msgstr "barva vstupního textu (jména kanálů)"
 
-#: src/common/weeconfig.c:431 src/common/weeconfig.c:432
+#: src/common/weeconfig.c:426 src/common/weeconfig.c:427
 msgid "color for input text (nick name)"
 msgstr "barva vstupního textu (přezdívky)"
 
-#: src/common/weeconfig.c:435 src/common/weeconfig.c:436
+#: src/common/weeconfig.c:430 src/common/weeconfig.c:431
 msgid "color for input text (delimiters)"
 msgstr "barva pro vstupní text (děli�e)"
 
-#: src/common/weeconfig.c:439 src/common/weeconfig.c:440
+#: src/common/weeconfig.c:434 src/common/weeconfig.c:435
 msgid "background for input window"
 msgstr "pozadí vstupního okna"
 
-#: src/common/weeconfig.c:445 src/common/weeconfig.c:446
+#: src/common/weeconfig.c:440 src/common/weeconfig.c:441
 msgid "color for nicknames"
 msgstr "barva přezdívek"
 
-#: src/common/weeconfig.c:449 src/common/weeconfig.c:450
+#: src/common/weeconfig.c:444 src/common/weeconfig.c:445
 msgid "color for away nicknames"
 msgstr "barva přezdívek, které jsou pry�"
 
-#: src/common/weeconfig.c:453
+#: src/common/weeconfig.c:448
 msgid "color for chan owner symbol"
 msgstr "barva symbolu majitele kanálu"
 
-#: src/common/weeconfig.c:454
+#: src/common/weeconfig.c:449
 msgid "color for chan owner symbol (specific to unrealircd)"
 msgstr "barva symbolu majitele kanálu (specifický pro unrealircd)"
 
-#: src/common/weeconfig.c:457
+#: src/common/weeconfig.c:452
 msgid "color for chan admin symbol"
 msgstr "barva symbolu administrátora kanálu"
 
-#: src/common/weeconfig.c:458
+#: src/common/weeconfig.c:453
 msgid "color for chan admin symbol (specific to unrealircd)"
 msgstr "barva symbolu administrátora kanálu (specifický pro unrealircd)"
 
-#: src/common/weeconfig.c:461 src/common/weeconfig.c:462
+#: src/common/weeconfig.c:456 src/common/weeconfig.c:457
 msgid "color for operator symbol"
 msgstr "barva symbolu operátora"
 
-#: src/common/weeconfig.c:465 src/common/weeconfig.c:466
+#: src/common/weeconfig.c:460 src/common/weeconfig.c:461
 msgid "color for half-operator symbol"
 msgstr "barva symbolu �áste�ného perátora"
 
-#: src/common/weeconfig.c:469 src/common/weeconfig.c:470
+#: src/common/weeconfig.c:464 src/common/weeconfig.c:465
 msgid "color for voice symbol"
 msgstr "barva symbolu voice"
 
-#: src/common/weeconfig.c:473 src/common/weeconfig.c:474
+#: src/common/weeconfig.c:468 src/common/weeconfig.c:469
 msgid "color for '+' when scrolling nicks"
 msgstr "barva pro '+' při procházení přezdívek"
 
-#: src/common/weeconfig.c:477 src/common/weeconfig.c:478
+#: src/common/weeconfig.c:472 src/common/weeconfig.c:473
 msgid "color for nick separator"
 msgstr "barva děli�e přezdívek"
 
-#: src/common/weeconfig.c:481 src/common/weeconfig.c:482
+#: src/common/weeconfig.c:476 src/common/weeconfig.c:477
 msgid "color for local nick"
 msgstr "barva lokální přezdívky"
 
-#: src/common/weeconfig.c:485 src/common/weeconfig.c:486
-#: src/common/weeconfig.c:489 src/common/weeconfig.c:490
-#: src/common/weeconfig.c:493 src/common/weeconfig.c:494
-#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
-#: src/common/weeconfig.c:501 src/common/weeconfig.c:502
-#: src/common/weeconfig.c:505 src/common/weeconfig.c:506
-#: src/common/weeconfig.c:509 src/common/weeconfig.c:510
-#: src/common/weeconfig.c:513 src/common/weeconfig.c:514
-#: src/common/weeconfig.c:517 src/common/weeconfig.c:518
-#: src/common/weeconfig.c:521 src/common/weeconfig.c:522
+#: src/common/weeconfig.c:480 src/common/weeconfig.c:481
+#: src/common/weeconfig.c:484 src/common/weeconfig.c:485
+#: src/common/weeconfig.c:488 src/common/weeconfig.c:489
+#: src/common/weeconfig.c:492 src/common/weeconfig.c:493
+#: src/common/weeconfig.c:496 src/common/weeconfig.c:497
+#: src/common/weeconfig.c:500 src/common/weeconfig.c:501
+#: src/common/weeconfig.c:504 src/common/weeconfig.c:505
+#: src/common/weeconfig.c:508 src/common/weeconfig.c:509
+#: src/common/weeconfig.c:512 src/common/weeconfig.c:513
+#: src/common/weeconfig.c:516 src/common/weeconfig.c:517
 msgid "color for nick"
 msgstr "barva přezdívky"
 
-#: src/common/weeconfig.c:525 src/common/weeconfig.c:526
+#: src/common/weeconfig.c:520 src/common/weeconfig.c:521
 msgid "color for other nick in private window"
 msgstr "barva jiné přezdívky v soukromém okně"
 
-#: src/common/weeconfig.c:529 src/common/weeconfig.c:530
+#: src/common/weeconfig.c:524 src/common/weeconfig.c:525
 msgid "background for nicknames"
 msgstr "pozadí přezdívek"
 
-#: src/common/weeconfig.c:535
+#: src/common/weeconfig.c:530
 msgid "color for selected DCC"
 msgstr "barva vybraného DCC"
 
-#: src/common/weeconfig.c:536
+#: src/common/weeconfig.c:531
 msgid "color for selected DCC (chat window)"
 msgstr "barva vybraného DCC (okno rozhovoru)"
 
-#: src/common/weeconfig.c:539 src/common/weeconfig.c:540
+#: src/common/weeconfig.c:534 src/common/weeconfig.c:535
 msgid "color for \"waiting\" dcc status"
 msgstr "barva pro \"waiting\" status dcc"
 
-#: src/common/weeconfig.c:543 src/common/weeconfig.c:544
+#: src/common/weeconfig.c:538 src/common/weeconfig.c:539
 msgid "color for \"connecting\" dcc status"
 msgstr "barva pro \"connecting\" status dcc"
 
-#: src/common/weeconfig.c:547 src/common/weeconfig.c:548
+#: src/common/weeconfig.c:542 src/common/weeconfig.c:543
 msgid "color for \"active\" dcc status"
 msgstr "barva pro \"active\" status dcc"
 
-#: src/common/weeconfig.c:551 src/common/weeconfig.c:552
+#: src/common/weeconfig.c:546 src/common/weeconfig.c:547
 msgid "color for \"done\" dcc status"
 msgstr "barva pro \"done\" status dcc"
 
-#: src/common/weeconfig.c:555 src/common/weeconfig.c:556
+#: src/common/weeconfig.c:550 src/common/weeconfig.c:551
 msgid "color for \"failed\" dcc status"
 msgstr "barva pro \"failed\" status dcc"
 
-#: src/common/weeconfig.c:559 src/common/weeconfig.c:560
+#: src/common/weeconfig.c:554 src/common/weeconfig.c:555
 msgid "color for \"aborted\" dcc status"
 msgstr "barva pro \"aborted\" status dcc"
 
-#: src/common/weeconfig.c:573
+#: src/common/weeconfig.c:568
 msgid "max lines in history (per window)"
 msgstr "maximální po�et řádků v historii (pro okno)"
 
-#: src/common/weeconfig.c:574
+#: src/common/weeconfig.c:569
 msgid ""
 "maximum number of lines in history for one server/channel/private window (0 "
 "= unlimited)"
@@ -3960,123 +3980,123 @@ msgstr ""
 "maximální po�et řádků v historii pro jeden server/kanál/soukromé okno (0 = "
 "nekone�eně)"
 
-#: src/common/weeconfig.c:578
+#: src/common/weeconfig.c:573
 msgid "max user commands in history"
 msgstr "maximální po�et uživatelských příkazů v historii"
 
-#: src/common/weeconfig.c:579
+#: src/common/weeconfig.c:574
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr "maximální po�et uživatelských příkazů v historii (0 = nekone�ně)"
 
-#: src/common/weeconfig.c:596 src/common/weeconfig.c:597
+#: src/common/weeconfig.c:591 src/common/weeconfig.c:592
 msgid "automatically log server messages"
 msgstr "automati logovat zprávy server"
 
-#: src/common/weeconfig.c:600 src/common/weeconfig.c:601
+#: src/common/weeconfig.c:595 src/common/weeconfig.c:596
 msgid "automatically log channel chats"
 msgstr "automaticky logovat rozhovory kanálu"
 
-#: src/common/weeconfig.c:604 src/common/weeconfig.c:605
+#: src/common/weeconfig.c:599 src/common/weeconfig.c:600
 msgid "automatically log private chats"
 msgstr "automaticky logovat soukromé rozhovory"
 
-#: src/common/weeconfig.c:608 src/common/weeconfig.c:609
+#: src/common/weeconfig.c:603 src/common/weeconfig.c:604
 msgid "log messages from plugins (scripts)"
 msgstr "logovat zprávy y pluginů (skriptů)"
 
-#: src/common/weeconfig.c:612
+#: src/common/weeconfig.c:607
 msgid "path for log files"
 msgstr "cesta pro soubory logů"
 
-#: src/common/weeconfig.c:613
+#: src/common/weeconfig.c:608
 msgid "path for WeeChat log files"
 msgstr "cesta pro soubory WeeChat logů"
 
-#: src/common/weeconfig.c:616
+#: src/common/weeconfig.c:611
 msgid "timestamp for log"
 msgstr "�asová zna�ka pro log"
 
-#: src/common/weeconfig.c:617
+#: src/common/weeconfig.c:612
 msgid "timestamp for log (see man strftime for date/time specifiers)"
 msgstr "�asová zna�ka pro log (viz man strftime pro specifikaci datumu/�asu"
 
-#: src/common/weeconfig.c:620 src/common/weeconfig.c:621
+#: src/common/weeconfig.c:615 src/common/weeconfig.c:616
 msgid "hide password displayed by nickserv"
 msgstr "schovat heslo zobrazené nickservem"
 
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:639
 msgid "display message to all channels when away"
 msgstr "zobrazit zprávu na všechny kanály, jestliže jsem pry�"
 
-#: src/common/weeconfig.c:643
+#: src/common/weeconfig.c:640
 msgid "display message to all channels when (un)marking as away"
 msgstr "zobrazit zprávu na všechny kanály, když měním stav z/na pry�"
 
-#: src/common/weeconfig.c:646 src/common/weeconfig.c:647
+#: src/common/weeconfig.c:643 src/common/weeconfig.c:644
 msgid "default message when away"
 msgstr "výchozí zprávy, když jsem pry�"
 
-#: src/common/weeconfig.c:650 src/common/weeconfig.c:651
+#: src/common/weeconfig.c:647 src/common/weeconfig.c:648
 msgid "default part message (leaving channel)"
 msgstr "výchozí zpráva při opouštění kanálu"
 
-#: src/common/weeconfig.c:654
+#: src/common/weeconfig.c:651
 msgid "default quit message"
 msgstr "výchzí zpráva při ukno�ení"
 
-#: src/common/weeconfig.c:655
+#: src/common/weeconfig.c:652
 msgid ""
 "default quit message ('%v' will be replaced by WeeChat version in string)"
 msgstr ""
 "výchozí zpráva při ukno�není ('%v' bude nahrazeno verzí WeeChat v řetězci)"
 
-#: src/common/weeconfig.c:658 src/common/weeconfig.c:659
+#: src/common/weeconfig.c:655 src/common/weeconfig.c:656
 msgid "display notices as private messages"
 msgstr "zobrazit upozornění jako soukromé zprávy"
 
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:659
 msgid "interval between two checks for away"
 msgstr "interval mezi dvěmi kontrolami pro nepřítomnost"
 
-#: src/common/weeconfig.c:663
+#: src/common/weeconfig.c:660
 msgid "interval between two checks for away (in minutes, 0 = never check)"
 msgstr ""
 "interval mezi dvěmi knotrolami pro nepřítomnost (v minutách, 0 = nikdy "
 "nekontrolovat)"
 
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:663
 msgid "interval between two checks for lag"
 msgstr "interval mezi dvěmi kontrolami lagu"
 
-#: src/common/weeconfig.c:667
+#: src/common/weeconfig.c:664
 msgid "interval between two checks for lag (in seconds)"
 msgstr "interval mezi dvěmi knotrolami lagu (v sekundách)"
 
-#: src/common/weeconfig.c:670
+#: src/common/weeconfig.c:667
 msgid "minimum lag to show"
 msgstr "minimální lag, který zobrazit"
 
-#: src/common/weeconfig.c:671
+#: src/common/weeconfig.c:668
 msgid "minimum lag to show (in seconds)"
 msgstr "minimální lag, který zobrazit (v sekundách)"
 
-#: src/common/weeconfig.c:674
+#: src/common/weeconfig.c:671
 msgid "disconnect after important lag"
 msgstr "odpojit po závažném lagu"
 
-#: src/common/weeconfig.c:675
+#: src/common/weeconfig.c:672
 msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
 msgstr "odpojit po závažném lagu (v minutách, 0 = nikny neodpojit)"
 
-#: src/common/weeconfig.c:678 src/common/weeconfig.c:679
+#: src/common/weeconfig.c:675 src/common/weeconfig.c:676
 msgid "create a FIFO pipe for remote control"
 msgstr "vytvořit FIFO pro vzdálené ovládání"
 
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:679
 msgid "list of words to highlight"
 msgstr "seznam slov pro zvýraznění"
 
-#: src/common/weeconfig.c:683
+#: src/common/weeconfig.c:680
 #, fuzzy
 msgid ""
 "comma separated list of words to highlight (case insensitive comparison, "
@@ -4084,165 +4104,180 @@ msgid ""
 msgstr ""
 "�árkou oddělený seznam slov pro zvýraznění (neporovnává se velikost písmen)"
 
-#: src/common/weeconfig.c:705
+#: src/common/weeconfig.c:684 src/common/weeconfig.c:685
+#, fuzzy
+msgid "keep colors from incoming messages"
+msgstr "odstranit barvy z příchozích zpráv"
+
+#: src/common/weeconfig.c:688
+msgid "allow user to send colors"
+msgstr ""
+
+#: src/common/weeconfig.c:689
+msgid ""
+"allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %"
+"U=underline, %R=reverse)"
+msgstr ""
+
+#: src/common/weeconfig.c:711
 msgid "automatically accept dcc files"
 msgstr "automaticky akceptovat dcc soubory"
 
-#: src/common/weeconfig.c:706
+#: src/common/weeconfig.c:712
 msgid "automatically accept incoming dcc files"
 msgstr "automaticky akceptovat příchozí dcc soubory"
 
-#: src/common/weeconfig.c:709
+#: src/common/weeconfig.c:715
 msgid "automatically accept dcc chats"
 msgstr "automaticky akceptovat dcc rozhovor"
 
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:716
 msgid "automatically accept dcc chats (use carefully!)"
 msgstr "automaticky akceptovat dcc rozhovor (používejte opatrně!)"
 
-#: src/common/weeconfig.c:713
+#: src/common/weeconfig.c:719
 msgid "timeout for dcc request"
 msgstr "�asový limit pro dcc požadavek"
 
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:720
 msgid "timeout for dcc request (in seconds)"
 msgstr "�asový limit pro dcc požadavek (v sekundách)"
 
-#: src/common/weeconfig.c:717
+#: src/common/weeconfig.c:723
 msgid "block size for dcc packets"
 msgstr "velikost bloku pro dcc pakety"
 
-#: src/common/weeconfig.c:718
+#: src/common/weeconfig.c:724
 msgid "block size for dcc packets in bytes (default: 65536)"
 msgstr "velikost bloku pro dcc pakety v bajtech (výchozí: 65536)"
 
-#: src/common/weeconfig.c:721
+#: src/common/weeconfig.c:727
 msgid "allowed ports for outgoing dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:728
 msgid ""
 "restricts outgoing dcc to use only ports in the given range (useful for NAT) "
 "(syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, empty value "
 "means any port)"
 msgstr ""
 
-#: src/common/weeconfig.c:727
+#: src/common/weeconfig.c:733
 msgid "IP address for outgoing dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:728
+#: src/common/weeconfig.c:734
 msgid ""
 "IP or DNS address used for outgoing dcc (if empty, local interface IP is "
 "used)"
 msgstr ""
 
-#: src/common/weeconfig.c:732
+#: src/common/weeconfig.c:738
 msgid "path for incoming files with dcc"
 msgstr "cesta pro příchozí dcc soubory"
 
-#: src/common/weeconfig.c:733
+#: src/common/weeconfig.c:739
 msgid "path for writing incoming files with dcc (default: user home)"
 msgstr "cesta pro zápis příchozích dcc souborů (výchozí: uživatelův domov)"
 
-#: src/common/weeconfig.c:736
+#: src/common/weeconfig.c:742
 msgid "default path for sending files with dcc"
 msgstr "výchozí cesta pro odesílaní souborů pomocí dcc"
 
-#: src/common/weeconfig.c:737
+#: src/common/weeconfig.c:743
 msgid ""
 "path for reading files when sending thru dcc (when no path is specified)"
 msgstr ""
 "cesta pro �tení souborů při odesílání přes dcc (když není specifikována "
 "cesta)"
 
-#: src/common/weeconfig.c:740 src/common/weeconfig.c:741
+#: src/common/weeconfig.c:746 src/common/weeconfig.c:747
 msgid "convert spaces to underscores when sending files"
 msgstr "konvertovat mezery na podtržítka při odesílání souborů"
 
-#: src/common/weeconfig.c:744
+#: src/common/weeconfig.c:750
 msgid "automatically rename dcc files if already exists"
 msgstr "automaticky přejmenovat dcc soubory, jestliže již existují"
 
-#: src/common/weeconfig.c:745
+#: src/common/weeconfig.c:751
 msgid "rename incoming files if already exists (add '.1', '.2', ...)"
 msgstr ""
 "přejmenovat příchozí soubory, jestliže již existují (přídat '.1', '.2', ...)"
 
-#: src/common/weeconfig.c:748
+#: src/common/weeconfig.c:754
 msgid "automatically resume aborted transfers"
 msgstr "automaticky obnovit zrušený přenos"
 
-#: src/common/weeconfig.c:749
+#: src/common/weeconfig.c:755
 msgid ""
 "automatically resume dcc transfer if connection with remote host is loosed"
 msgstr "automaticky obnovit dcc přenos pokud bylo ztraceno spojení s hostem"
 
-#: src/common/weeconfig.c:768
+#: src/common/weeconfig.c:774
 msgid "use proxy"
 msgstr "použít proxy"
 
-#: src/common/weeconfig.c:769
+#: src/common/weeconfig.c:775
 msgid "use a proxy server to connect to irc server"
 msgstr "použít proxy server pro připojení na irc server"
 
-#: src/common/weeconfig.c:772
+#: src/common/weeconfig.c:778
 msgid "proxy type"
 msgstr "typ proxy"
 
-#: src/common/weeconfig.c:773
+#: src/common/weeconfig.c:779
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "typ proxy (http (výchozí), socks4, socks5)"
 
-#: src/common/weeconfig.c:776
+#: src/common/weeconfig.c:782
 msgid "use ipv6 proxy"
 msgstr "použít ipv6 proxy"
 
-#: src/common/weeconfig.c:777
+#: src/common/weeconfig.c:783
 msgid "connect to proxy in ipv6"
 msgstr "připojit na proxy v ipv6"
 
-#: src/common/weeconfig.c:780
+#: src/common/weeconfig.c:786
 msgid "proxy address"
 msgstr "proxy adresa"
 
-#: src/common/weeconfig.c:781
+#: src/common/weeconfig.c:787
 msgid "proxy server address (IP or hostname)"
 msgstr "adresa proxy serveru (IP nebo jméno hosta)"
 
-#: src/common/weeconfig.c:784
+#: src/common/weeconfig.c:790
 msgid "port for proxy"
 msgstr "port proxy"
 
-#: src/common/weeconfig.c:785
+#: src/common/weeconfig.c:791
 msgid "port for connecting to proxy server"
 msgstr "port pro připojení na proxy server"
 
-#: src/common/weeconfig.c:788
+#: src/common/weeconfig.c:794
 msgid "proxy username"
 msgstr "uživatelské jeméno proxy"
 
-#: src/common/weeconfig.c:789
+#: src/common/weeconfig.c:795
 msgid "username for proxy server"
 msgstr "uživatelské jméno pro proxy server"
 
-#: src/common/weeconfig.c:792
+#: src/common/weeconfig.c:798
 msgid "proxy password"
 msgstr "heslo proxy"
 
-#: src/common/weeconfig.c:793
+#: src/common/weeconfig.c:799
 msgid "password for proxy server"
 msgstr "heslo pro proxy server"
 
-#: src/common/weeconfig.c:806 src/common/weeconfig.c:807
+#: src/common/weeconfig.c:812 src/common/weeconfig.c:813
 msgid "path for searching plugins"
 msgstr "cesta pro hledání pluginů"
 
-#: src/common/weeconfig.c:810
+#: src/common/weeconfig.c:816
 msgid "list of plugins to load automatically"
 msgstr "seznam pluginů pro automatické na�tení"
 
-#: src/common/weeconfig.c:811
+#: src/common/weeconfig.c:817
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found (names may be partial, for example \"perl\" is ok "
@@ -4252,11 +4287,11 @@ msgstr ""
 "znamená všechny nalezené pluginy (jména mohou být �áste�ná, například \"perl"
 "\" je OK pro \"libperl.so\")"
 
-#: src/common/weeconfig.c:816
+#: src/common/weeconfig.c:822
 msgid "standard plugins extension in filename"
 msgstr "standardní přípona pluginů v jménu souboru"
 
-#: src/common/weeconfig.c:817
+#: src/common/weeconfig.c:823
 msgid ""
 "standard plugins extension in filename, used for autoload (if empty, then "
 "all files are loaded when autoload is \"*\")"
@@ -4264,93 +4299,93 @@ msgstr ""
 "standardní přípona pluginů v jménu soubor, použita při autona�ítání (pokud "
 "prázdná jsou na�teny všechny souboru pokud je autoload \"*\")"
 
-#: src/common/weeconfig.c:834
+#: src/common/weeconfig.c:840
 msgid "server name"
 msgstr "jméno serveru"
 
-#: src/common/weeconfig.c:835
+#: src/common/weeconfig.c:841
 msgid "name associated to IRC server (for display only)"
 msgstr "jméno asociované k IRC serveru (pouze pro zobrazení)"
 
-#: src/common/weeconfig.c:838
+#: src/common/weeconfig.c:844
 msgid "automatically connect to server"
 msgstr "automaticky připojit k serveru"
 
-#: src/common/weeconfig.c:839
+#: src/common/weeconfig.c:845
 msgid "automatically connect to server when WeeChat is starting"
 msgstr "automaticky připojit k serveru, když je WeeChat spouštěn"
 
-#: src/common/weeconfig.c:842
+#: src/common/weeconfig.c:848
 msgid "automatically reconnect to server"
 msgstr "automaticky znovupřipojit server"
 
-#: src/common/weeconfig.c:843
+#: src/common/weeconfig.c:849
 msgid "automatically reconnect to server when disconnected"
 msgstr "automaticky znovu připojit server, když je odpojen"
 
-#: src/common/weeconfig.c:846
+#: src/common/weeconfig.c:852
 msgid "delay before trying again to reconnect"
 msgstr "doba před novým zkušením znovupřipojení"
 
-#: src/common/weeconfig.c:847
+#: src/common/weeconfig.c:853
 msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr "doba (v sekundách) před novým zkušením znovupřipojení na server"
 
-#: src/common/weeconfig.c:850
+#: src/common/weeconfig.c:856
 msgid "server address or hostname"
 msgstr "adresa serveru nebo jméno hosta"
 
-#: src/common/weeconfig.c:851
+#: src/common/weeconfig.c:857
 msgid "IP address or hostname of IRC server"
 msgstr "IP adresa nebo jeméno hosta IRC serveru"
 
-#: src/common/weeconfig.c:854
+#: src/common/weeconfig.c:860
 msgid "port for IRC server"
 msgstr "port IRC serveru"
 
-#: src/common/weeconfig.c:855
+#: src/common/weeconfig.c:861
 msgid "port for connecting to server"
 msgstr "port pro připojení na server"
 
-#: src/common/weeconfig.c:858 src/common/weeconfig.c:859
+#: src/common/weeconfig.c:864 src/common/weeconfig.c:865
 msgid "use IPv6 protocol for server communication"
 msgstr "použít protokol IPv6 pro komunikaci se serverem"
 
-#: src/common/weeconfig.c:862 src/common/weeconfig.c:863
+#: src/common/weeconfig.c:868 src/common/weeconfig.c:869
 msgid "use SSL for server communication"
 msgstr "použít SSL pro komunikaci se serverem"
 
-#: src/common/weeconfig.c:866
+#: src/common/weeconfig.c:872
 msgid "server password"
 msgstr "heslo serveru"
 
-#: src/common/weeconfig.c:867
+#: src/common/weeconfig.c:873
 msgid "password for IRC server"
 msgstr "heslo pro IRC server"
 
-#: src/common/weeconfig.c:870
+#: src/common/weeconfig.c:876
 msgid "nickname for server"
 msgstr "přezdívka pro server"
 
-#: src/common/weeconfig.c:871
+#: src/common/weeconfig.c:877
 msgid "nickname to use on IRC server"
 msgstr "přezdívka použitá na IRC serveru"
 
-#: src/common/weeconfig.c:874
+#: src/common/weeconfig.c:880
 msgid "alternate nickname for server"
 msgstr "alternativní přezdívka pro server"
 
-#: src/common/weeconfig.c:875
+#: src/common/weeconfig.c:881
 msgid "alternate nickname to use on IRC server (if nickname is already used)"
 msgstr ""
 "alternativní přezdívka použitá na IRC serveru (pokud přezdívka je již "
 "použita)"
 
-#: src/common/weeconfig.c:878
+#: src/common/weeconfig.c:884
 msgid "2nd alternate nickname for server"
 msgstr "druhá alternativní přezdívka pro server"
 
-#: src/common/weeconfig.c:879
+#: src/common/weeconfig.c:885
 msgid ""
 "2nd alternate nickname to use on IRC server (if alternate nickname is "
 "already used)"
@@ -4358,31 +4393,31 @@ msgstr ""
 "druhá alternativní přezdívka použitá na IRC serveru (pokud alternativní "
 "přezdívka je již použita)"
 
-#: src/common/weeconfig.c:882
+#: src/common/weeconfig.c:888
 msgid "user name for server"
 msgstr "uživatelské jméno pro server"
 
-#: src/common/weeconfig.c:883
+#: src/common/weeconfig.c:889
 msgid "user name to use on IRC server"
 msgstr "uživatelské jméno použité na IRC serveru"
 
-#: src/common/weeconfig.c:886
+#: src/common/weeconfig.c:892
 msgid "real name for server"
 msgstr "skute�né jméno pro server"
 
-#: src/common/weeconfig.c:887
+#: src/common/weeconfig.c:893
 msgid "real name to use on IRC server"
 msgstr "skute�né jméno použité na IRC serveru"
 
-#: src/common/weeconfig.c:890 src/common/weeconfig.c:891
+#: src/common/weeconfig.c:896 src/common/weeconfig.c:897
 msgid "first command to run when connected to server"
 msgstr "první příkaz, který zpustit po připojení na server"
 
-#: src/common/weeconfig.c:894
+#: src/common/weeconfig.c:900
 msgid "delay (in seconds) after command was executed"
 msgstr "po�kání (v sekundách) po spušt�ní příkazu"
 
-#: src/common/weeconfig.c:895
+#: src/common/weeconfig.c:901
 msgid ""
 "delay (in seconds) after command was executed (example: give some time for "
 "authentication)"
@@ -4390,11 +4425,11 @@ msgstr ""
 "po�kání (v sekundách) po spuštění příkazu (například: dád nějaký �as pro "
 "autorizaci)"
 
-#: src/common/weeconfig.c:898
+#: src/common/weeconfig.c:904
 msgid "list of channels to join when connected to server"
 msgstr "seznam kanálů na které přistoupit po připojení na server"
 
-#: src/common/weeconfig.c:899
+#: src/common/weeconfig.c:905
 msgid ""
 "comma separated list of channels to join when connected to server (example: "
 "\"#chan1,#chan2,#chan3 key1,key2\")"
@@ -4402,15 +4437,15 @@ msgstr ""
 "�árkou rozdělený seznam kanálů na které přistoupit po připojení na server "
 "(příklad: \"#kanál1,#kanál2,#kanál3 klí�1,klí�2\")"
 
-#: src/common/weeconfig.c:902 src/common/weeconfig.c:903
+#: src/common/weeconfig.c:908 src/common/weeconfig.c:909
 msgid "automatically rejoin channels when kicked"
 msgstr "automaticky znovu přijít na kanál po vykopnutí"
 
-#: src/common/weeconfig.c:906
+#: src/common/weeconfig.c:912
 msgid "notify levels for channels of this server"
 msgstr "level upozornění pro kanály na tomto serveru"
 
-#: src/common/weeconfig.c:907
+#: src/common/weeconfig.c:913
 msgid ""
 "comma separated list of notify levels for channels of this server (format: "
 "#channel:1,..)"
@@ -4418,62 +4453,62 @@ msgstr ""
 "�árkou oddělený seznam levelů upozornění pro kanály na tomto serveru "
 "(formát: #kanál:1,..)"
 
-#: src/common/weeconfig.c:1463
+#: src/common/weeconfig.c:1469
 #, c-format
 msgid "%s %s, line %d: new server, but previous was incomplete\n"
 msgstr "%s %s, řádek %d: nový server, ale předchozí byl nekompletní\n"
 
-#: src/common/weeconfig.c:1472
+#: src/common/weeconfig.c:1478
 #, c-format
 msgid "%s %s, line %d: server '%s' already exists\n"
 msgstr "%s %s, řádek %d: server '%s' již existuje\n"
 
-#: src/common/weeconfig.c:1487
+#: src/common/weeconfig.c:1493
 #, c-format
 msgid "%s %s, line %d: unable to create server\n"
 msgstr "%s %s, řádek %d: nemohu vytvořit server\n"
 
-#: src/common/weeconfig.c:1527
+#: src/common/weeconfig.c:1533
 #, c-format
 msgid "%s unable to assign default int with string (\"%s\")\n"
 msgstr "%s nemohu přiřadit výchozí �íslo s řetězcem (\"%s\")\n"
 
-#: src/common/weeconfig.c:1538
+#: src/common/weeconfig.c:1544
 #, c-format
 msgid "%s unable to assign default color (\"%s\")\n"
 msgstr "%s nemohu přiřadit výchozí barvu (\"%s\")\n"
 
-#: src/common/weeconfig.c:1578
+#: src/common/weeconfig.c:1584
 #, c-format
 msgid "%s config file \"%s\" not found.\n"
 msgstr "%s konfigura�ní soubor \"%s\" nenalezen\n"
 
-#: src/common/weeconfig.c:1610
+#: src/common/weeconfig.c:1616
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
 msgstr "%s %s, řádek %d: nevalidní syntaxe, chybí \"]\"\n"
 
-#: src/common/weeconfig.c:1627
+#: src/common/weeconfig.c:1633
 #, c-format
 msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
 msgstr "%s %s, řádek %d: neznámý identifikátor sekce (\"%s\")\n"
 
-#: src/common/weeconfig.c:1645
+#: src/common/weeconfig.c:1651
 #, c-format
 msgid "%s %s, line %d: invalid section for option, line is ignored\n"
 msgstr "%s %s, řádek %d: nevalidní sekce pro volbu, řádek je ignorován\n"
 
-#: src/common/weeconfig.c:1690 src/common/weeconfig.c:1716
+#: src/common/weeconfig.c:1696 src/common/weeconfig.c:1722
 #, c-format
 msgid "%s %s, line %d: invalid option \"%s\"\n"
 msgstr "%s %s, řádek %d: nevalidní volba \"%s\"\n"
 
-#: src/common/weeconfig.c:1696
+#: src/common/weeconfig.c:1702
 #, c-format
 msgid "%s %s, line %d: invalid ignore options \"%s\"\n"
 msgstr "%s %s, řádek %d: nevalidní volba \"%s\" pro ignorování\n"
 
-#: src/common/weeconfig.c:1727
+#: src/common/weeconfig.c:1733
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value foroption '%s'\n"
@@ -4482,7 +4517,7 @@ msgstr ""
 "%s %s, řádek %d: nevalidní hodnota pro volbu '%s'\n"
 "O�ekáváno: hodnota boolean: 'off' nebo 'on'\n"
 
-#: src/common/weeconfig.c:1736
+#: src/common/weeconfig.c:1742
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4491,7 +4526,7 @@ msgstr ""
 "%s %s, řádek %d: nevalidní hodnota pro volbu '%s'\n"
 "O�ekáváno: celé �íslo mezi %d a %d\n"
 
-#: src/common/weeconfig.c:1747
+#: src/common/weeconfig.c:1753
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4500,21 +4535,21 @@ msgstr ""
 "%s %s, řádek %d: nevalidní hodnota pro volbu '%s'\n"
 "O�ekáváno: jeden z těchto řetězců: "
 
-#: src/common/weeconfig.c:1763
+#: src/common/weeconfig.c:1769
 #, c-format
 msgid "%s %s, line %d: invalid color name for option '%s'\n"
 msgstr "%s %s, řádek %d: nevalidní jméno barvy pro hodnotu '%s'\n"
 
-#: src/common/weeconfig.c:1832
+#: src/common/weeconfig.c:1838
 #, c-format
 msgid "%s: creating default config file...\n"
 msgstr "%s: vytvářím výchozí konfigura�ní soubor...\n"
 
-#: src/common/weeconfig.c:1833
+#: src/common/weeconfig.c:1839
 msgid "Creating default config file\n"
 msgstr "Vytvářím výchozí konfigura�ní soubor\n"
 
-#: src/common/weeconfig.c:1836 src/common/weeconfig.c:2033
+#: src/common/weeconfig.c:1842 src/common/weeconfig.c:2039
 #, c-format
 msgid ""
 "#\n"
@@ -4523,7 +4558,7 @@ msgstr ""
 "#\n"
 "# %s konfigura�ní soubor, vytvořil %s v%s %s"
 
-#: src/common/weeconfig.c:1840 src/common/weeconfig.c:2037
+#: src/common/weeconfig.c:1846 src/common/weeconfig.c:2043
 #, c-format
 msgid ""
 "# WARNING! Be careful when editing this file, WeeChat writes this file when "
@@ -4531,9 +4566,132 @@ msgid ""
 "#\n"
 msgstr ""
 
-#: src/common/weeconfig.c:2030
+#: src/common/weeconfig.c:2036
 msgid "Saving config to disk\n"
 msgstr "Ukládám konfiguraci na disk\n"
 
+#~ msgid "%s Command '%s' failed!\n"
+#~ msgstr "%s Příkaz '%s' selhal!\n"
+
+#~ msgid "by"
+#~ msgstr "od"
+
+#~ msgid " has joined "
+#~ msgstr " se připojil "
+
+#~ msgid " has kicked "
+#~ msgstr " byl vykopnut "
+
+#~ msgid " has killed "
+#~ msgstr " byl zabit "
+
+#~ msgid " from server"
+#~ msgstr " ze serveru"
+
+#~ msgid " from server\n"
+#~ msgstr " ze serveru\n"
+
+#~ msgid "mode changed by"
+#~ msgstr "mód změnil"
+
+#~ msgid "You are "
+#~ msgstr "Jsi "
+
+#~ msgid " is "
+#~ msgstr " je "
+
+#~ msgid "reply from"
+#~ msgstr "odpověd od"
+
+#~ msgid ": %ld.%ld seconds\n"
+#~ msgstr ": %ld %ld sekund\n"
+
+#~ msgid " has left "
+#~ msgstr " opustil "
+
+#~ msgid "received from"
+#~ msgstr "obdrženo od"
+
+#~ msgid "Unknown CTCP "
+#~ msgstr "Neznámé CTCP "
+
+#~ msgid "has quit"
+#~ msgstr "ukon�il"
+
+#~ msgid " to: \"%s\"\n"
+#~ msgstr " pro: \"%s\"\n"
+
+#~ msgid "User mode"
+#~ msgstr "Uživatelský mód"
+
+#~ msgid "idle: "
+#~ msgstr "ne�inný: "
+
+#~ msgid "signon at: "
+#~ msgstr "připojen: "
+
+#~ msgid "Channels: "
+#~ msgstr "Kanály: "
+
+#~ msgid "Topic for "
+#~ msgstr "Téma pro "
+
+#~ msgid " is: \"%s\"\n"
+#~ msgstr " je: \"%s\"\n"
+
+#~ msgid "has invited"
+#~ msgstr "pozval"
+
+#~ msgid "exception"
+#~ msgstr "vyjímka"
+
+#~ msgid "Nicks "
+#~ msgstr "Přezdívky "
+
+#~ msgid "Channel "
+#~ msgstr "Kanál "
+
+#~ msgid "banned by"
+#~ msgstr "zakázán"
+
+#~ msgid ": ok!\n"
+#~ msgstr ": ok!\n"
+
+#~ msgid "Connected to "
+#~ msgstr "Připojen k "
+
+#~ msgid "via DCC chat\n"
+#~ msgstr "přes DCC rozhovor\n"
+
+#~ msgid "resumed at position %u\n"
+#~ msgstr "obnoveno na pozici %u\n"
+
+#~ msgid "Incoming DCC file from "
+#~ msgstr "Příchozí DCC soubor od "
+
+#~ msgid " bytes\n"
+#~ msgstr " bajtů\n"
+
+#~ msgid "Sending DCC file to "
+#~ msgstr "Posílám DCC soubor k "
+
+#~ msgid "Not enough memory for new message\n"
+#~ msgstr "Nedostatek paměti pro novou zprávu\n"
+
+#~ msgid "Channel: "
+#~ msgstr "Kanál: "
+
+#~ msgid " (server: "
+#~ msgstr " (server: "
+
+#~ msgid "Private with: "
+#~ msgstr "Soukromý s: "
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "created\n"
+#~ msgstr "vytvořeno\n"
+
 #~ msgid "-servers-"
 #~ msgstr "-serverů-"
diff --git a/po/es.po b/po/es.po
index 94fd0bb76..7b1b92b7c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.6-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-10-30 10:52+0100\n"
+"POT-Creation-Date: 2005-11-04 12:35+0100\n"
 "PO-Revision-Date: 2005-10-30 10:53+0100\n"
 "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -20,88 +20,88 @@ msgstr ""
 msgid "%s cannot allocate new nick\n"
 msgstr "%s no ha sido posible crear un nuevo nick\n"
 
-#: src/irc/irc-server.c:180 src/common/weeconfig.c:1968
+#: src/irc/irc-server.c:181 src/common/weeconfig.c:1974
 msgid "Unable to get user's name"
 msgstr "No ha sido posible obtener el nombre de usuario"
 
-#: src/irc/irc-server.c:248
+#: src/irc/irc-server.c:249
 #, c-format
 msgid "%s cannot allocate new server\n"
 msgstr "%s no ha sido posible crear un nuevo servidor\n"
 
-#: src/irc/irc-server.c:466
+#: src/irc/irc-server.c:467
 #, c-format
 msgid "%s error sending data to IRC server\n"
 msgstr "%s error enviando datos al servidor IRC\n"
 
-#: src/irc/irc-server.c:489 src/irc/irc-server.c:502 src/irc/irc-server.c:549
-#: src/irc/irc-server.c:562
+#: src/irc/irc-server.c:490 src/irc/irc-server.c:503 src/irc/irc-server.c:550
+#: src/irc/irc-server.c:563
 #, c-format
 msgid "%s not enough memory for received IRC message\n"
 msgstr "%s memoria insuficiente para un mensaje IRC recibido\n"
 
-#: src/irc/irc-server.c:674
-#, c-format
-msgid "%s Command '%s' failed!\n"
-msgstr "%s ¡Ha fallado el comando '%s' !\n"
+#: src/irc/irc-server.c:675
+#, fuzzy, c-format
+msgid "%s Command \"%s\" failed!\n"
+msgstr "%s el comando \"%s\" ha fallado\n"
 
-#: src/irc/irc-server.c:680
+#: src/irc/irc-server.c:681
 #, c-format
 msgid "%s No command to execute!\n"
 msgstr "%s ¡Ningún comando para ejecutar!\n"
 
-#: src/irc/irc-server.c:686
-#, c-format
-msgid "%s Unknown command: cmd=%s, host=%s, args=%s\n"
+#: src/irc/irc-server.c:687
+#, fuzzy, c-format
+msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
 msgstr "%s Comando desconocido: cmd=%s, host=%s, params=%s\n"
 
-#: src/irc/irc-server.c:737
+#: src/irc/irc-server.c:738
 #, c-format
 msgid "%s cannot read data from socket, disconnecting from server...\n"
 msgstr ""
 "%s no ha sido posible leer datos del socket, desconectando del servidor...\n"
 
-#: src/irc/irc-server.c:820
+#: src/irc/irc-server.c:821
 #, c-format
 msgid "%s: Reconnecting to server in %d seconds\n"
 msgstr "%s: Reconexión al servidor en %d segundos\n"
 
-#: src/irc/irc-server.c:854
+#: src/irc/irc-server.c:855
 #, c-format
 msgid "%s gnutls handshake failed\n"
 msgstr "%s el apretón de manos gnutls ha fallado\n"
 
-#: src/irc/irc-server.c:871
+#: src/irc/irc-server.c:872
 #, c-format
 msgid "%s proxy address \"%s\" not found\n"
 msgstr "%s dirección proxy \"%s\" no encontrada\n"
 
-#: src/irc/irc-server.c:875
+#: src/irc/irc-server.c:876
 #, c-format
 msgid "%s address \"%s\" not found\n"
 msgstr "%s dirección \"%s\" no encontrada\n"
 
-#: src/irc/irc-server.c:885
+#: src/irc/irc-server.c:886
 #, c-format
 msgid "%s proxy IP address not found\n"
 msgstr "%s dirección proxy IP no encontrada\n"
 
-#: src/irc/irc-server.c:888
+#: src/irc/irc-server.c:889
 #, c-format
 msgid "%s IP address not found\n"
 msgstr "%s Dirección IP no encontrada\n"
 
-#: src/irc/irc-server.c:897
+#: src/irc/irc-server.c:898
 #, c-format
 msgid "%s proxy connection refused\n"
 msgstr "%s conexión proxy rechazada\n"
 
-#: src/irc/irc-server.c:900
+#: src/irc/irc-server.c:901
 #, c-format
 msgid "%s connection refused\n"
 msgstr "%s conexión rechazada\n"
 
-#: src/irc/irc-server.c:908
+#: src/irc/irc-server.c:909
 #, c-format
 msgid ""
 "%s proxy fails to establish connection to server (check username/password if "
@@ -110,7 +110,7 @@ msgstr ""
 "%s el proxy ha fallado al establecer la conexión al servidor (comprueba el "
 "nombre de usuario o la contraseña si es necesario)\n"
 
-#: src/irc/irc-server.c:1387
+#: src/irc/irc-server.c:1388
 #, c-format
 msgid ""
 "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -118,57 +118,57 @@ msgstr ""
 "%s No ha sido posible conectar con SSL debido a que Weechat no fue compilado "
 "con soporte GNUtls\n"
 
-#: src/irc/irc-server.c:1396
+#: src/irc/irc-server.c:1397
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr "%s: conectando al servidor %s:%d%s%s vía %s proxy %s: %d%s...\n"
 
-#: src/irc/irc-server.c:1402
+#: src/irc/irc-server.c:1403
 #, c-format
 msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr "Conectando al servidor %s:%d%s%s vía %s proxy %s:%d%s...\n"
 
-#: src/irc/irc-server.c:1412
+#: src/irc/irc-server.c:1413
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s...\n"
 msgstr "%s: conectando al servidor %s:%d%s%s...\n"
 
-#: src/irc/irc-server.c:1416
+#: src/irc/irc-server.c:1417
 #, c-format
 msgid "Connecting to server %s:%d%s%s...\n"
 msgstr "Conectando al servidor %s:%d%s%s...\n"
 
-#: src/irc/irc-server.c:1434
+#: src/irc/irc-server.c:1435
 #, c-format
 msgid "%s gnutls init error\n"
 msgstr "%s error de inicialización de gnutls\n"
 
-#: src/irc/irc-server.c:1449
+#: src/irc/irc-server.c:1450
 #, c-format
 msgid "%s cannot create pipe\n"
 msgstr "%s no ha sido posible crear la interconexión\n"
 
-#: src/irc/irc-server.c:1464
+#: src/irc/irc-server.c:1465
 #, c-format
 msgid "%s cannot create socket\n"
 msgstr "%s no ha sido posible crear el socket\n"
 
-#: src/irc/irc-server.c:1475
+#: src/irc/irc-server.c:1476
 #, c-format
 msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
 msgstr "%s no ha sido posible configurar la opción socket \"SO_REUSEADDR\"\n"
 
-#: src/irc/irc-server.c:1486
+#: src/irc/irc-server.c:1487
 #, c-format
 msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
 msgstr "%s no ha sido posible configurar la opción socket \"SO_KEEPALIVE\"\n"
 
-#: src/irc/irc-server.c:1517
+#: src/irc/irc-server.c:1518
 #, c-format
 msgid "%s: Reconnecting to server...\n"
 msgstr "%s: Reconectando al servidor...\n"
 
-#: src/irc/irc-server.c:1567 src/irc/irc-server.c:1576
+#: src/irc/irc-server.c:1568 src/irc/irc-server.c:1577
 msgid "Disconnected from server!\n"
 msgstr "¡Desconectado del servidor!\n"
 
@@ -968,7 +968,7 @@ msgstr ""
 #: src/irc/irc-commands.c:380 src/irc/irc-commands.c:381
 #: src/irc/irc-commands.c:382 src/irc/irc-commands.c:383
 #: src/irc/irc-commands.c:384 src/irc/irc-commands.c:385
-#: src/irc/irc-commands.c:490
+#: src/irc/irc-commands.c:491
 msgid "a server message"
 msgstr "un mensaje de servidor"
 
@@ -1149,244 +1149,249 @@ msgid "you are now an IRC operator"
 msgstr ""
 
 #: src/irc/irc-commands.c:387
+msgid "rehashing"
+msgstr ""
+
+#: src/irc/irc-commands.c:388
 msgid "server local time"
 msgstr "hora local del servidor"
 
-#: src/irc/irc-commands.c:388
+#: src/irc/irc-commands.c:389
 msgid "no such nick/channel"
 msgstr "no existe ese usuario/canal"
 
-#: src/irc/irc-commands.c:390
+#: src/irc/irc-commands.c:391
 msgid "no such server"
 msgstr "no existe ese servidor"
 
-#: src/irc/irc-commands.c:392
+#: src/irc/irc-commands.c:393
 msgid "no such channel"
 msgstr "no existe ese canal"
 
-#: src/irc/irc-commands.c:394
+#: src/irc/irc-commands.c:395
 msgid "cannot send to channel"
 msgstr "no ha sido posible enviar al canal"
 
-#: src/irc/irc-commands.c:396
+#: src/irc/irc-commands.c:397
 msgid "too many channels"
 msgstr "demasiados canales"
 
-#: src/irc/irc-commands.c:398 src/irc/irc-commands.c:400
+#: src/irc/irc-commands.c:399 src/irc/irc-commands.c:401
 msgid "was no such nick"
 msgstr "no estaba ese usuario"
 
-#: src/irc/irc-commands.c:402
+#: src/irc/irc-commands.c:403
 msgid "no origin"
 msgstr "sin origen"
 
-#: src/irc/irc-commands.c:404
+#: src/irc/irc-commands.c:405
 msgid "no services"
 msgstr "sin servicios"
 
-#: src/irc/irc-commands.c:406
+#: src/irc/irc-commands.c:407
 msgid "no recipient"
 msgstr "sin destinatario"
 
-#: src/irc/irc-commands.c:408
+#: src/irc/irc-commands.c:409
 msgid "no text to send"
 msgstr "sin texto a enviar"
 
-#: src/irc/irc-commands.c:410
+#: src/irc/irc-commands.c:411
 msgid "no toplevel"
 msgstr "sin nivel superior"
 
-#: src/irc/irc-commands.c:412
+#: src/irc/irc-commands.c:413
 msgid "wilcard in toplevel domain"
 msgstr "carácter comodín en el dominio del nivel superior"
 
-#: src/irc/irc-commands.c:414
+#: src/irc/irc-commands.c:415
 msgid "unknown command"
 msgstr "comando desconocido"
 
-#: src/irc/irc-commands.c:416
+#: src/irc/irc-commands.c:417
 msgid "MOTD is missing"
 msgstr "MOTD falta"
 
-#: src/irc/irc-commands.c:418
+#: src/irc/irc-commands.c:419
 msgid "no administrative info"
 msgstr "sin información administrativa"
 
-#: src/irc/irc-commands.c:420
+#: src/irc/irc-commands.c:421
 msgid "file error"
 msgstr "error de fichero"
 
-#: src/irc/irc-commands.c:422
+#: src/irc/irc-commands.c:423
 msgid "no nickname given"
 msgstr "no se ha dado un nombre de usuario"
 
-#: src/irc/irc-commands.c:424
+#: src/irc/irc-commands.c:425
 msgid "erroneous nickname"
 msgstr "nombre de usuario erróneo"
 
-#: src/irc/irc-commands.c:426
+#: src/irc/irc-commands.c:427
 msgid "nickname already in use"
 msgstr "nombre de usuario ya en uso"
 
-#: src/irc/irc-commands.c:428
+#: src/irc/irc-commands.c:429
 msgid "nickname collision"
 msgstr "colisión en el nombre de usuario"
 
-#: src/irc/irc-commands.c:430
+#: src/irc/irc-commands.c:431
 msgid "not authorized to change nickname"
 msgstr "no autorizado a cambiar el nombre de usuario"
 
-#: src/irc/irc-commands.c:432
+#: src/irc/irc-commands.c:433
 msgid "user not in channel"
 msgstr "usuario no presente en el canal"
 
-#: src/irc/irc-commands.c:434
+#: src/irc/irc-commands.c:435
 msgid "not on channel"
 msgstr "no presente en el canal"
 
-#: src/irc/irc-commands.c:436
+#: src/irc/irc-commands.c:437
 msgid "user already on channel"
 msgstr "usuario ya en el canal"
 
-#: src/irc/irc-commands.c:438
+#: src/irc/irc-commands.c:439
 msgid "user not logged in"
 msgstr "usuario no registrado"
 
-#: src/irc/irc-commands.c:440
+#: src/irc/irc-commands.c:441
 msgid "summon has been disabled"
 msgstr "la petición de ayuda ha sido desactivada"
 
-#: src/irc/irc-commands.c:442
+#: src/irc/irc-commands.c:443
 msgid "users has been disabled"
 msgstr "los usuarios han sido desactivados"
 
-#: src/irc/irc-commands.c:444
+#: src/irc/irc-commands.c:445
 msgid "you are not registered"
 msgstr "usted no está registrado"
 
-#: src/irc/irc-commands.c:446
+#: src/irc/irc-commands.c:447
 msgid "not enough parameters"
 msgstr "no hay parámetros suficientes"
 
-#: src/irc/irc-commands.c:448
+#: src/irc/irc-commands.c:449
 msgid "you may not register"
 msgstr "usted no puede registrarse"
 
-#: src/irc/irc-commands.c:450
+#: src/irc/irc-commands.c:451
 msgid "your host isn't among the privileged"
 msgstr "su nombre de máquina no está entre los privilegiados"
 
-#: src/irc/irc-commands.c:452
+#: src/irc/irc-commands.c:453
 msgid "password incorrect"
 msgstr "contraseña incorrecta"
 
-#: src/irc/irc-commands.c:454
+#: src/irc/irc-commands.c:455
 msgid "you are banned from this server"
 msgstr "usted está baneado de este servidor"
 
-#: src/irc/irc-commands.c:456
+#: src/irc/irc-commands.c:457
 msgid "channel key already set"
 msgstr "clave de canal ya definida"
 
-#: src/irc/irc-commands.c:458
+#: src/irc/irc-commands.c:459
 msgid "forwarding to another channel"
 msgstr ""
 
-#: src/irc/irc-commands.c:460
+#: src/irc/irc-commands.c:461
 msgid "channel is already full"
 msgstr "el canal ya está lleno"
 
-#: src/irc/irc-commands.c:462
+#: src/irc/irc-commands.c:463
 msgid "unknown mode char to me"
 msgstr "carácter de modo desconocido para mí"
 
-#: src/irc/irc-commands.c:464
+#: src/irc/irc-commands.c:465
 msgid "cannot join channel (invite only)"
 msgstr "no es posible unirse al canal (sólo invitados)"
 
-#: src/irc/irc-commands.c:466
+#: src/irc/irc-commands.c:467
 msgid "cannot join channel (banned from channel)"
 msgstr "no es posible unirse al canal (baneado del canal)"
 
-#: src/irc/irc-commands.c:468
+#: src/irc/irc-commands.c:469
 msgid "cannot join channel (bad channel key)"
 msgstr "no es posible unirse al canal (clave de canal incorrecta)"
 
-#: src/irc/irc-commands.c:470
+#: src/irc/irc-commands.c:471
 msgid "bad channel mask"
 msgstr "máscara de canal incorrecta"
 
-#: src/irc/irc-commands.c:472
+#: src/irc/irc-commands.c:473
 msgid "channel doesn't support modes"
 msgstr "el canal no soporta los modos"
 
-#: src/irc/irc-commands.c:474
+#: src/irc/irc-commands.c:475
 msgid "you're not an IRC operator"
 msgstr "usted no es un operador IRC"
 
-#: src/irc/irc-commands.c:476
+#: src/irc/irc-commands.c:477
 msgid "you're not channel operator"
 msgstr "usted no es operador del canal"
 
-#: src/irc/irc-commands.c:478
+#: src/irc/irc-commands.c:479
 msgid "you can't kill a server!"
 msgstr "!usted no puede matar a un servidor!"
 
-#: src/irc/irc-commands.c:480
+#: src/irc/irc-commands.c:481
 msgid "your connection is restricted!"
 msgstr ""
 
-#: src/irc/irc-commands.c:482
+#: src/irc/irc-commands.c:483
 msgid "user is immune from kick/deop"
 msgstr "el usuario es inmune a kick/deop"
 
-#: src/irc/irc-commands.c:484
+#: src/irc/irc-commands.c:485
 msgid "no O-lines for your host"
 msgstr "no hay O-lines para su máquina"
 
-#: src/irc/irc-commands.c:486
+#: src/irc/irc-commands.c:487
 msgid "unknown mode flag"
 msgstr "indicador de modo desconocido"
 
-#: src/irc/irc-commands.c:488
+#: src/irc/irc-commands.c:489
 msgid "can't change mode for other users"
 msgstr "no es posible cambiar el modo para el resto de usuarios"
 
-#: src/irc/irc-commands.c:491
+#: src/irc/irc-commands.c:492
 msgid "whois (secure connection)"
 msgstr "whois (conexión segura)"
 
-#: src/irc/irc-display.c:170 src/common/command.c:873
-msgid "Server: "
-msgstr "Servidor: "
+#: src/irc/irc-display.c:180
+#, c-format
+msgid "%sServer: %s%s %s[%s%s%s]\n"
+msgstr ""
 
-#: src/irc/irc-display.c:175
+#: src/irc/irc-display.c:187
 msgid "connected"
 msgstr "conectado"
 
-#: src/irc/irc-display.c:175 src/common/command.c:899
+#: src/irc/irc-display.c:187
 msgid "not connected"
 msgstr "no conectado"
 
-#: src/irc/irc-display.c:179 src/irc/irc-display.c:184
-#: src/irc/irc-display.c:196 src/irc/irc-display.c:199
+#: src/irc/irc-display.c:191 src/irc/irc-display.c:195
+#: src/irc/irc-display.c:203 src/irc/irc-display.c:205
 msgid "yes"
 msgstr "sí"
 
-#: src/irc/irc-display.c:179 src/irc/irc-display.c:184
-#: src/irc/irc-display.c:196 src/irc/irc-display.c:199
+#: src/irc/irc-display.c:191 src/irc/irc-display.c:195
+#: src/irc/irc-display.c:203 src/irc/irc-display.c:205
 msgid "no"
 msgstr "no"
 
-#: src/irc/irc-display.c:181
+#: src/irc/irc-display.c:193
 msgid " (temporary server, will not be saved)"
 msgstr " (servidor temporal, no será guardado)"
 
-#: src/irc/irc-display.c:203
+#: src/irc/irc-display.c:208
 msgid "(hidden)"
 msgstr "(oculto)"
 
-#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4718
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4674
 msgid "unknown"
 msgstr "desconocido"
 
@@ -1395,521 +1400,518 @@ msgstr "desconocido"
 msgid "%s: using local hostname \"%s\"\n"
 msgstr "%s: utilización del nombre de máquina local \"%s\"\n"
 
-#: src/irc/irc-send.c:167 src/common/command.c:749
+#: src/irc/irc-send.c:166 src/common/command.c:760
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr "%s no ha sido posible encontrar el usuario al que enviar el mensaje\n"
 
-#: src/irc/irc-send.c:329 src/irc/irc-send.c:357 src/irc/irc-send.c:544
-#: src/irc/irc-send.c:577 src/irc/irc-send.c:610 src/irc/irc-send.c:658
-#: src/irc/irc-send.c:694 src/irc/irc-send.c:761 src/irc/irc-send.c:818
-#: src/irc/irc-send.c:1160 src/irc/irc-send.c:1258 src/irc/irc-send.c:1737
-#: src/irc/irc-send.c:1851
+#: src/irc/irc-send.c:328 src/irc/irc-send.c:356 src/irc/irc-send.c:547
+#: src/irc/irc-send.c:580 src/irc/irc-send.c:613 src/irc/irc-send.c:661
+#: src/irc/irc-send.c:697 src/irc/irc-send.c:764 src/irc/irc-send.c:821
+#: src/irc/irc-send.c:1154 src/irc/irc-send.c:1254 src/irc/irc-send.c:1730
+#: src/irc/irc-send.c:1844
 #, c-format
 msgid "%s \"%s\" command can only be executed in a channel window\n"
 msgstr ""
 "%s el comando \"%s\" sólo puede ser ejecutado en una ventana de canal\n"
 
-#: src/irc/irc-send.c:456 src/irc/irc-send.c:468 src/irc/irc-send.c:486
-#: src/irc/irc-send.c:1138 src/irc/irc-send.c:1231 src/irc/irc-send.c:1763
-#: src/common/command.c:1233 src/common/command.c:1647
-#: src/common/command.c:1781
+#: src/irc/irc-send.c:459 src/irc/irc-send.c:471 src/irc/irc-send.c:489
+#: src/irc/irc-send.c:1132 src/irc/irc-send.c:1227 src/irc/irc-send.c:1756
+#: src/common/command.c:1253 src/common/command.c:1695
+#: src/common/command.c:1831
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s número de argumentos incorrecto para el comando \"%s\"\n"
 
-#: src/irc/irc-send.c:509 src/irc/irc-send.c:746 src/irc/irc-send.c:803
+#: src/irc/irc-send.c:512 src/irc/irc-send.c:749 src/irc/irc-send.c:806
 #, c-format
 msgid "%s wrong arguments for \"%s\" command\n"
 msgstr "%s argumentos incorrecto para el comando \"%s\"\n"
 
-#: src/irc/irc-send.c:946 src/irc/irc-send.c:1013 src/irc/irc-send.c:1306
-#: src/irc/irc-send.c:1320 src/irc/irc-send.c:1664
+#: src/irc/irc-send.c:949 src/irc/irc-send.c:1016 src/irc/irc-send.c:1302
+#: src/irc/irc-send.c:1316 src/irc/irc-send.c:1657
 #, c-format
 msgid "%s \"%s\" command can not be executed on a server window\n"
 msgstr ""
 "%s el comando \"%s\" no puede ser ejecutado en una ventana de servidor\n"
 
-#: src/irc/irc-send.c:1031 src/irc/irc-send.c:1056 src/irc/irc-recv.c:499
+#: src/irc/irc-send.c:1032 src/irc/irc-send.c:1055 src/irc/irc-recv.c:500
 #, c-format
 msgid "%s nick \"%s\" not found for \"%s\" command\n"
 msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n"
 
-#: src/irc/irc-send.c:1108 src/irc/irc-send.c:1416 src/irc/irc-recv.c:1238
-#: src/irc/irc-recv.c:2054 src/irc/irc-recv.c:2142
+#: src/irc/irc-send.c:1105 src/irc/irc-send.c:1412 src/irc/irc-recv.c:1230
+#: src/irc/irc-recv.c:2042 src/irc/irc-recv.c:2132
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
 
-#: src/irc/irc-send.c:1816
+#: src/irc/irc-send.c:1809
 #, c-format
 msgid "%s, compiled on %s %s\n"
 msgstr "%s, compilado en %s %s\n"
 
-#: src/irc/irc-recv.c:355
-msgid "You have been invited to "
+#: src/irc/irc-recv.c:362
+#, fuzzy, c-format
+msgid "You have been invited to %s%s%s by %s%s\n"
 msgstr "Has sido invitado a "
 
-#: src/irc/irc-recv.c:358 src/irc/irc-recv.c:3994
-msgid "by"
-msgstr "por"
-
-#: src/irc/irc-recv.c:369 src/irc/irc-recv.c:463 src/irc/irc-recv.c:1012
-#: src/irc/irc-recv.c:1397 src/irc/irc-recv.c:1656 src/irc/irc-recv.c:3559
-#: src/irc/irc-recv.c:3581 src/irc/irc-recv.c:3642 src/irc/irc-recv.c:3714
+#: src/irc/irc-recv.c:376 src/irc/irc-recv.c:469 src/irc/irc-recv.c:1008
+#: src/irc/irc-recv.c:1386 src/irc/irc-recv.c:1645 src/irc/irc-recv.c:3520
+#: src/irc/irc-recv.c:3541 src/irc/irc-recv.c:3601 src/irc/irc-recv.c:3672
 #, c-format
 msgid "%s channel \"%s\" not found for \"%s\" command\n"
 msgstr "%s canal \"%s\" no encontrado para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:397
+#: src/irc/irc-recv.c:404
 #, c-format
 msgid "%s cannot create new channel \"%s\"\n"
 msgstr "%s no es posible crear un nuevo canal \"%s\"\n"
 
-#: src/irc/irc-recv.c:416
-msgid " has joined "
-msgstr " se ha unido "
+#: src/irc/irc-recv.c:415
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:474
-msgid " has kicked "
-msgstr " se ha expulsado "
+#: src/irc/irc-recv.c:477
+#, fuzzy, c-format
+msgid "%s%s%s has kicked %s%s%s from %s%s"
+msgstr "ha cambiado el tema por "
 
-#: src/irc/irc-recv.c:478 src/common/command.c:1468
-msgid " from "
-msgstr " de "
+#: src/irc/irc-recv.c:562
+#, c-format
+msgid "%s%s%s has killed %s%s%s from server"
+msgstr ""
 
-#: src/irc/irc-recv.c:564
-msgid " has killed "
-msgstr "ha matado"
-
-#: src/irc/irc-recv.c:570
-msgid " from server"
-msgstr "del servidor"
-
-#: src/irc/irc-recv.c:580
-msgid " from server\n"
-msgstr "del servidor\n"
-
-#: src/irc/irc-recv.c:588
+#: src/irc/irc-recv.c:584
 #, c-format
 msgid "%s host \"%s\" not found for \"%s\" command\n"
 msgstr "%s anfitrión \"%s\" no encontrado para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:629
+#: src/irc/irc-recv.c:625
 msgid "sets ban on"
 msgstr "establecer baneo en"
 
-#: src/irc/irc-recv.c:630
+#: src/irc/irc-recv.c:626
 msgid "removes ban on"
 msgstr "quitar baneo en"
 
-#: src/irc/irc-recv.c:654
+#: src/irc/irc-recv.c:650
 msgid "sets exception on"
 msgstr ""
 
-#: src/irc/irc-recv.c:655
+#: src/irc/irc-recv.c:651
 msgid "removes exception on"
 msgstr ""
 
-#: src/irc/irc-recv.c:679
+#: src/irc/irc-recv.c:675
 msgid "sets mode +f"
 msgstr ""
 
-#: src/irc/irc-recv.c:680
+#: src/irc/irc-recv.c:676
 msgid "removes mode +f"
 msgstr ""
 
-#: src/irc/irc-recv.c:704
+#: src/irc/irc-recv.c:700
 msgid "gives half channel operator status to"
 msgstr "dar estado de media operador de canal a"
 
-#: src/irc/irc-recv.c:705
+#: src/irc/irc-recv.c:701
 msgid "removes half channel operator status from"
 msgstr "eliminar el estado de media operador de canal a"
 
-#: src/irc/irc-recv.c:732
+#: src/irc/irc-recv.c:728
 msgid "sets invite-only channel flag"
 msgstr "define el canal sólo en modo invitado"
 
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:729
 msgid "removes invite-only channel flag"
 msgstr "elimina el modo sólo invitado para el canal"
 
-#: src/irc/irc-recv.c:750
+#: src/irc/irc-recv.c:746
 msgid "sets channel key to"
 msgstr "definir clave de canal en"
 
-#: src/irc/irc-recv.c:751
+#: src/irc/irc-recv.c:747
 msgid "removes channel key"
 msgstr "elimina la clave de canal"
 
-#: src/irc/irc-recv.c:782
+#: src/irc/irc-recv.c:778
 msgid "sets the user limit to"
 msgstr "define el límite de usuarios en"
 
-#: src/irc/irc-recv.c:783
+#: src/irc/irc-recv.c:779
 msgid "removes user limit"
 msgstr "elimina el límite de usuarios"
 
-#: src/irc/irc-recv.c:805
+#: src/irc/irc-recv.c:801
 msgid "sets moderated channel flag"
 msgstr "establece la moderación en el canal"
 
-#: src/irc/irc-recv.c:806
+#: src/irc/irc-recv.c:802
 msgid "removes moderated channel flag"
 msgstr "elimina la moderación en el canal"
 
-#: src/irc/irc-recv.c:816
+#: src/irc/irc-recv.c:812
 msgid "sets messages from channel only flag"
 msgstr "establece el modo sólo mensajes de usuarios del canal"
 
-#: src/irc/irc-recv.c:817
+#: src/irc/irc-recv.c:813
 msgid "removes messages from channel only flag"
 msgstr "autoriza a todos los usuarios a escribir en el canal"
 
-#: src/irc/irc-recv.c:834
+#: src/irc/irc-recv.c:830
 msgid "gives channel operator status to"
 msgstr "dar estado de operador de canal a"
 
-#: src/irc/irc-recv.c:835
+#: src/irc/irc-recv.c:831
 msgid "removes channel operator status from"
 msgstr "eliminar el estado de operador de canal a"
 
-#: src/irc/irc-recv.c:862
+#: src/irc/irc-recv.c:858
 msgid "sets private channel flag"
 msgstr "establece el canal como privado"
 
-#: src/irc/irc-recv.c:863
+#: src/irc/irc-recv.c:859
 msgid "removes private channel flag"
 msgstr "elimina el modo privado para el canal"
 
-#: src/irc/irc-recv.c:880
+#: src/irc/irc-recv.c:876
 msgid "sets quiet on"
 msgstr ""
 
-#: src/irc/irc-recv.c:881
+#: src/irc/irc-recv.c:877
 msgid "removes quiet on"
 msgstr ""
 
-#: src/irc/irc-recv.c:898
+#: src/irc/irc-recv.c:894
 msgid "sets secret channel flag"
 msgstr "establece el canal como secreto"
 
-#: src/irc/irc-recv.c:899
+#: src/irc/irc-recv.c:895
 msgid "removes secret channel flag"
 msgstr "elimina el modo secreto para el canal"
 
-#: src/irc/irc-recv.c:909
+#: src/irc/irc-recv.c:905
 msgid "sets topic protection"
 msgstr "activa la protección de tema"
 
-#: src/irc/irc-recv.c:910
+#: src/irc/irc-recv.c:906
 msgid "removes topic protection"
 msgstr "elimina la protección de tema"
 
-#: src/irc/irc-recv.c:927
+#: src/irc/irc-recv.c:923
 msgid "gives voice to"
 msgstr "da voz a"
 
-#: src/irc/irc-recv.c:928
+#: src/irc/irc-recv.c:924
 msgid "removes voice from"
 msgstr "quita la voz a"
 
-#: src/irc/irc-recv.c:971 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1475
-#: src/irc/irc-recv.c:2209
+#: src/irc/irc-recv.c:967 src/irc/irc-recv.c:1053 src/irc/irc-recv.c:1464
+#: src/irc/irc-recv.c:2201
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr "%s comando \"%s\" recibido sin host \n"
 
-#: src/irc/irc-recv.c:981
+#: src/irc/irc-recv.c:977
 #, c-format
 msgid "%s \"%s\" command received without channel or nickname\n"
 msgstr "%s comando \"%s\" recibido sin canal ó usuario\n"
 
-#: src/irc/irc-recv.c:1029
-msgid "mode changed by"
-msgstr "modo cambiado por"
+#: src/irc/irc-recv.c:1019
+#, c-format
+msgid "%s[%s%s%s/%s%s%s]%s mode changed by %s%s\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:1091
-msgid "You are "
-msgstr "Usted es "
-
-#: src/irc/irc-recv.c:1098
-msgid " is "
-msgstr "es "
-
-#: src/irc/irc-recv.c:1102
-msgid "now known as "
+#: src/irc/irc-recv.c:1088
+#, fuzzy, c-format
+msgid "You are now known as %s%s\n"
 msgstr "ahora conocido como"
 
-#: src/irc/irc-recv.c:1169
+#: src/irc/irc-recv.c:1092
+#, fuzzy, c-format
+msgid "%s%s%s is now known as %s%s\n"
+msgstr "ahora conocido como"
+
+#: src/irc/irc-recv.c:1159
 #, c-format
 msgid "%s nickname not found for \"%s\" command\n"
 msgstr "%s nombre de usuario no encontrado para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:1185 src/irc/irc-recv.c:1217
-msgid "reply from"
-msgstr "respuesta de"
-
-#: src/irc/irc-recv.c:1220
+#: src/irc/irc-recv.c:1173
 #, c-format
-msgid ": %ld.%ld seconds\n"
-msgstr ": %ld.%ld segundos\n"
+msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:1259 src/irc/irc-recv.c:2163 src/irc/irc-dcc.c:1136
+#: src/irc/irc-recv.c:1207
+#, c-format
+msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:1252 src/irc/irc-recv.c:2154 src/irc/irc-dcc.c:1153
 #, c-format
 msgid "Private %s> %s"
 msgstr "Privado %s> %s"
 
-#: src/irc/irc-recv.c:1322
+#: src/irc/irc-recv.c:1317
 #, c-format
 msgid "%s \"%s\" command received without host or channel\n"
 msgstr "%s comando \"%s\" recibido sin host o canal\n"
 
-#: src/irc/irc-recv.c:1371
-msgid " has left "
-msgstr " ha salido "
+#: src/irc/irc-recv.c:1357
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has left %s%s"
+msgstr ""
 
-#: src/irc/irc-recv.c:1523 src/irc/irc-recv.c:2078
+#: src/irc/irc-recv.c:1513 src/irc/irc-recv.c:2067
 #, c-format
 msgid "On %s: * %s %s"
 msgstr "En %s: * %s %s"
 
-#: src/irc/irc-recv.c:1547
-#, c-format
-msgid "Received a CTCP SOUND \"%s\" from "
+#: src/irc/irc-recv.c:1538
+#, fuzzy, c-format
+msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
 msgstr "Recibido un sonido CTCP \\\"%s\\\" de "
 
-#: src/irc/irc-recv.c:1580 src/irc/irc-recv.c:1611 src/irc/irc-recv.c:1715
-#: src/irc/irc-recv.c:1755 src/irc/irc-recv.c:2118
-msgid "received from"
-msgstr "recibido de"
+#: src/irc/irc-recv.c:1568 src/irc/irc-recv.c:1739
+#, fuzzy, c-format
+msgid "CTCP %sPING%s received from %s%s\n"
+msgstr " recibido de "
 
-#: src/irc/irc-recv.c:1607 src/irc/irc-recv.c:2114
-msgid "Unknown CTCP "
-msgstr ""
+#: src/irc/irc-recv.c:1597 src/irc/irc-recv.c:2104
+#, fuzzy, c-format
+msgid "Unknown CTCP %s%s%s received from %s%s"
+msgstr "%s tipo DCC CHAT desconocido recibido de "
 
-#: src/irc/irc-recv.c:1639
+#: src/irc/irc-recv.c:1629
 #, c-format
 msgid "On %s: %s> %s"
 msgstr "En %s: %s> %s"
 
-#: src/irc/irc-recv.c:1771 src/irc/irc-recv.c:1792 src/irc/irc-recv.c:1808
-#: src/irc/irc-recv.c:1824 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1871
-#: src/irc/irc-recv.c:1887 src/irc/irc-recv.c:1912 src/irc/irc-recv.c:1933
-#: src/irc/irc-recv.c:1949 src/irc/irc-recv.c:1974 src/irc/irc-recv.c:1995
-#: src/irc/irc-recv.c:2010 src/irc/irc-recv.c:2185 src/irc/irc-recv.c:2529
-#: src/irc/irc-recv.c:3918 src/irc/irc-recv.c:3933 src/irc/irc-recv.c:3948
-#: src/irc/irc-recv.c:3963 src/irc/irc-recv.c:3976 src/irc/irc-recv.c:4031
-#: src/irc/irc-recv.c:4045 src/irc/irc-recv.c:4285 src/irc/irc-recv.c:4343
-#: src/irc/irc-recv.c:4502 src/irc/irc-recv.c:4517 src/irc/irc-recv.c:4532
-#: src/irc/irc-recv.c:4547 src/irc/irc-recv.c:4560 src/irc/irc-recv.c:4614
-#: src/irc/irc-recv.c:4628
+#: src/irc/irc-recv.c:1700
+#, fuzzy, c-format
+msgid "CTCP %sVERSION%s received from %s%s"
+msgstr " recibido de "
+
+#: src/irc/irc-recv.c:1757 src/irc/irc-recv.c:1778 src/irc/irc-recv.c:1794
+#: src/irc/irc-recv.c:1810 src/irc/irc-recv.c:1836 src/irc/irc-recv.c:1857
+#: src/irc/irc-recv.c:1873 src/irc/irc-recv.c:1898 src/irc/irc-recv.c:1919
+#: src/irc/irc-recv.c:1935 src/irc/irc-recv.c:1960 src/irc/irc-recv.c:1981
+#: src/irc/irc-recv.c:1996 src/irc/irc-recv.c:2177 src/irc/irc-recv.c:2516
+#: src/irc/irc-recv.c:3879 src/irc/irc-recv.c:3894 src/irc/irc-recv.c:3909
+#: src/irc/irc-recv.c:3924 src/irc/irc-recv.c:3937 src/irc/irc-recv.c:4002
+#: src/irc/irc-recv.c:4016 src/irc/irc-recv.c:4250 src/irc/irc-recv.c:4308
+#: src/irc/irc-recv.c:4446 src/irc/irc-recv.c:4461 src/irc/irc-recv.c:4567
+#: src/irc/irc-recv.c:4581
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr "%s no es posible analizar el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:2023
+#: src/irc/irc-recv.c:2009
 #, c-format
 msgid "%s unknown DCC CHAT type received from "
 msgstr "%s tipo DCC CHAT desconocido recibido de "
 
-#: src/irc/irc-recv.c:2240
-msgid "has quit"
-msgstr "ha salido"
+#: src/irc/irc-recv.c:2224
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has quit %s(%s%s%s)\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:2354
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr "%s comando \"%s\" recibido sin canal\n"
 
-#: src/irc/irc-recv.c:2397
-msgid " has changed topic for "
+#: src/irc/irc-recv.c:2382
+#, fuzzy, c-format
+msgid "%s%s%s has changed topic for %s%s%s to: \"%s\"\n"
 msgstr "ha cambiado el tema por "
 
-#: src/irc/irc-recv.c:2402
-#, c-format
-msgid " to: \"%s\"\n"
-msgstr " a: \"%s\"\n"
-
-#: src/irc/irc-recv.c:2408
-msgid " has unset topic for "
+#: src/irc/irc-recv.c:2392
+#, fuzzy, c-format
+msgid "%s%s%s has unset topic for %s%s\n"
 msgstr " ha quitado el tema por "
 
-#: src/irc/irc-recv.c:2517
-msgid "User mode"
+#: src/irc/irc-recv.c:2502
+#, c-format
+msgid "User mode %s[%s%s%s/%s%s%s]\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2572
-#, c-format
-msgid " is away: %s\n"
+#: src/irc/irc-recv.c:2557
+#, fuzzy, c-format
+msgid "%s%s%s is away: %s\n"
 msgstr " está ausente: %s\n"
 
-#: src/irc/irc-recv.c:2654
+#: src/irc/irc-recv.c:2642
 msgid "Users online: "
 msgstr "Usuarios conectados: "
 
-#: src/irc/irc-recv.c:3144
-msgid "idle: "
-msgstr "sin actividad: "
+#: src/irc/irc-recv.c:2999
+#, c-format
+msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3120
+#, c-format
+msgid "%s[%s%s%s]%s idle: "
+msgstr ""
+
+#: src/irc/irc-recv.c:3132
 msgid "days"
 msgstr "días"
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3132
 msgid "day"
 msgstr "día"
 
-#: src/irc/irc-recv.c:3162
+#: src/irc/irc-recv.c:3136
+#, c-format
+msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
+msgstr ""
+
+#: src/irc/irc-recv.c:3140
 msgid "hours"
 msgstr "horas"
 
-#: src/irc/irc-recv.c:3162
+#: src/irc/irc-recv.c:3140
 msgid "hour"
 msgstr "hora"
 
-#: src/irc/irc-recv.c:3168
+#: src/irc/irc-recv.c:3144
 msgid "minutes"
 msgstr "minutos"
 
-#: src/irc/irc-recv.c:3168
+#: src/irc/irc-recv.c:3144
 msgid "minute"
 msgstr "minuto"
 
-#: src/irc/irc-recv.c:3174
+#: src/irc/irc-recv.c:3148
 msgid "seconds"
 msgstr "segundos"
 
-#: src/irc/irc-recv.c:3174
+#: src/irc/irc-recv.c:3148
 msgid "second"
 msgstr "segundo"
 
-#: src/irc/irc-recv.c:3179
-msgid "signon at: "
-msgstr "firmado el: "
-
-#: src/irc/irc-recv.c:3275
-msgid "Channels: "
-msgstr "Canales: "
-
-#: src/irc/irc-recv.c:3572
-msgid "No topic set for "
+#: src/irc/irc-recv.c:3532
+#, fuzzy, c-format
+msgid "No topic set for %s%s\n"
 msgstr "No hay tema definido para "
 
-#: src/irc/irc-recv.c:3629
-msgid "Topic for "
-msgstr "El tema para "
-
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3588
 #, c-format
-msgid " is: \"%s\"\n"
-msgstr " es: \"%s\"\n"
+msgid "Topic for %s%s%s is: \"%s\"\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:3652 src/irc/irc-recv.c:3741 src/irc/irc-recv.c:3794
+#: src/irc/irc-recv.c:3611 src/irc/irc-recv.c:3699 src/irc/irc-recv.c:3754
 #, c-format
 msgid "%s cannot identify channel for \"%s\" command\n"
 msgstr "%s no es posible identificar el canal para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:3702
-msgid "Topic set by "
+#: src/irc/irc-recv.c:3661
+#, fuzzy, c-format
+msgid "Topic set by %s%s%s, %s"
 msgstr "Tema definido por "
 
-#: src/irc/irc-recv.c:3723
+#: src/irc/irc-recv.c:3681
 #, c-format
 msgid "%s cannot identify date/time for \"%s\" command\n"
 msgstr "%s no es posible identificar la fecha/hora para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:3732 src/irc/irc-recv.c:3803
+#: src/irc/irc-recv.c:3690 src/irc/irc-recv.c:3763
 #, c-format
 msgid "%s cannot identify nickname for \"%s\" command\n"
 msgstr ""
 "%s no es posible determinar el nombre de usuario para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:3782
-msgid "has invited"
-msgstr "ha invitado"
+#: src/irc/irc-recv.c:3739
+#, fuzzy, c-format
+msgid "%s%s%s has invited %s%s%s on %s%s\n"
+msgstr "ha cambiado el tema por "
 
-#: src/irc/irc-recv.c:3785 src/irc/irc-recv.c:4206 src/common/command.c:1461
-msgid "on"
-msgstr "en"
-
-#: src/irc/irc-recv.c:3840
-msgid "Channel reop"
+#: src/irc/irc-recv.c:3799
+#, c-format
+msgid "Channel reop %s%s%s: %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3992
-msgid "exception"
-msgstr ""
-
-#: src/irc/irc-recv.c:4331
+#: src/irc/irc-recv.c:4296
 #, c-format
 msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
 msgstr "%s no es posible crear el usuario \"%s\" para el canal \"%s\"\n"
 
-#: src/irc/irc-recv.c:4390
-msgid "Nicks "
-msgstr "Usuarios "
+#: src/irc/irc-recv.c:4354
+#, c-format
+msgid "Nicks %s%s%s: %s["
+msgstr ""
 
-#: src/irc/irc-recv.c:4410
-msgid "Channel "
-msgstr "Canal "
+#: src/irc/irc-recv.c:4375
+#, c-format
+msgid ""
+"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:4421
+#: src/irc/irc-recv.c:4383
 msgid "nicks"
 msgstr "usuarios"
 
-#: src/irc/irc-recv.c:4421
+#: src/irc/irc-recv.c:4383
 msgid "nick"
 msgstr "usuario"
 
-#: src/irc/irc-recv.c:4429
+#: src/irc/irc-recv.c:4388
 msgid "ops"
 msgstr "operadores"
 
-#: src/irc/irc-recv.c:4429
+#: src/irc/irc-recv.c:4388
 msgid "op"
 msgstr "operador"
 
-#: src/irc/irc-recv.c:4438
+#: src/irc/irc-recv.c:4392
 msgid "halfops"
 msgstr "semi-operadores"
 
-#: src/irc/irc-recv.c:4438
+#: src/irc/irc-recv.c:4392
 msgid "halfop"
 msgstr "semi-operador"
 
-#: src/irc/irc-recv.c:4447
+#: src/irc/irc-recv.c:4396
 msgid "voices"
 msgstr "voces"
 
-#: src/irc/irc-recv.c:4447
+#: src/irc/irc-recv.c:4396
 msgid "voice"
 msgstr "voz"
 
-#: src/irc/irc-recv.c:4456
+#: src/irc/irc-recv.c:4400
 msgid "normal"
 msgstr "normal"
 
-#: src/irc/irc-recv.c:4577
-msgid "banned by"
-msgstr "baneado por"
+#: src/irc/irc-recv.c:4501
+#, c-format
+msgid "%s[%s%s%s] %s%s%s banned by "
+msgstr ""
 
-#: src/irc/irc-recv.c:4672
+#: src/irc/irc-recv.c:4536
+#, c-format
+msgid "%s[%s%s%s] %s%s%s banned\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:4628
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
 msgstr ""
 "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 2º nombre de "
 "usuario \"%s\"\n"
 
-#: src/irc/irc-recv.c:4684
+#: src/irc/irc-recv.c:4640
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
 msgstr ""
 "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 3º nombre de "
 "usuario \"%s\"\n"
 
-#: src/irc/irc-recv.c:4696
+#: src/irc/irc-recv.c:4652
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
@@ -1918,7 +1920,7 @@ msgstr ""
 "%s: ¡todos los nombres de usuario declarados ya están en uso, cerrando la "
 "conexión con el servidor!\n"
 
-#: src/irc/irc-recv.c:4706
+#: src/irc/irc-recv.c:4662
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
 msgstr ""
@@ -1949,35 +1951,38 @@ msgstr "Fall
 msgid "Aborted"
 msgstr "Abortado"
 
-#: src/irc/irc-dcc.c:367 src/irc/irc-dcc.c:568 src/irc/irc-dcc.c:731
-msgid "DCC: file "
+#: src/irc/irc-dcc.c:368
+#, fuzzy, c-format
+msgid "DCC: file %s%s%s"
 msgstr "DCC: fichero "
 
-#: src/irc/irc-dcc.c:374 src/irc/irc-dcc.c:693 src/irc/irc-dcc.c:736
-msgid " (local filename: "
+#: src/irc/irc-dcc.c:374
+#, fuzzy, c-format
+msgid " (local filename: %s%s%s)"
 msgstr " (nombre de fichero local: "
 
-#: src/irc/irc-dcc.c:382
+#: src/irc/irc-dcc.c:379
 msgid " sent to "
 msgstr " enviado a "
 
-#: src/irc/irc-dcc.c:384
+#: src/irc/irc-dcc.c:381
 msgid " received from "
 msgstr " recibido de "
 
-#: src/irc/irc-dcc.c:390
-msgid ": ok!\n"
-msgstr ": ok!\n"
-
-#: src/irc/irc-dcc.c:390
-msgid ": FAILED\n"
+#: src/irc/irc-dcc.c:386
+msgid "OK"
 msgstr ""
 
-#: src/irc/irc-dcc.c:402
-msgid "DCC chat closed with "
+#: src/irc/irc-dcc.c:386
+msgid "FAILED"
+msgstr ""
+
+#: src/irc/irc-dcc.c:399
+#, fuzzy, c-format
+msgid "DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"
 msgstr "DCC chat cerrada con "
 
-#: src/irc/irc-dcc.c:459
+#: src/irc/irc-dcc.c:457
 #, c-format
 msgid ""
 "%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1986,96 +1991,96 @@ msgstr ""
 "%s no se puede asociar la conversación DCC con el búfer privado (quizá el "
 "búfer privado ya tiene DCC CHAT)\n"
 
-#: src/irc/irc-dcc.c:470
-msgid "Connected to "
-msgstr "Conectado al "
+#: src/irc/irc-dcc.c:468
+#, fuzzy, c-format
+msgid "Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"
+msgstr "DCC chat cerrada con "
 
-#: src/irc/irc-dcc.c:479
-msgid "via DCC chat\n"
-msgstr "con charla DCC\n"
-
-#: src/irc/irc-dcc.c:573
+#: src/irc/irc-dcc.c:568
 #, c-format
-msgid "resumed at position %u\n"
+msgid "DCC: file %s%s%s resumed at position %u\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:579 src/irc/irc-dcc.c:604
+#: src/irc/irc-dcc.c:577 src/irc/irc-dcc.c:602
 #, c-format
 msgid ""
 "%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
 "ended\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:623
+#: src/irc/irc-dcc.c:621
 #, c-format
 msgid "%s not enough memory for new DCC\n"
 msgstr "%s no hay memoria suficiente para un nuevo DCC\n"
 
-#: src/irc/irc-dcc.c:642
+#: src/irc/irc-dcc.c:640
 msgid "DCC chat"
 msgstr "Charla DCC"
 
-#: src/irc/irc-dcc.c:672
-msgid "Incoming DCC file from "
-msgstr "Recibir fichero DCC de "
-
-#: src/irc/irc-dcc.c:683 src/irc/irc-dcc.c:697
-msgid " bytes\n"
-msgstr " bytes\n"
-
-#: src/irc/irc-dcc.c:689
-msgid "Sending DCC file to "
-msgstr "Enviar fichero DCC a "
-
-#: src/irc/irc-dcc.c:703
-msgid "Incoming DCC chat request from "
-msgstr "Recibir DCC chat de "
-
-#: src/irc/irc-dcc.c:715
-msgid "Sending DCC chat request to "
-msgstr "Enviar DCC chat a "
-
-#: src/irc/irc-dcc.c:742
+#: src/irc/irc-dcc.c:671
 #, c-format
-msgid "will be resumed at position %u\n"
+msgid ""
+"Incoming DCC file from %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s bytes\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:810
+#: src/irc/irc-dcc.c:694
+#, c-format
+msgid ""
+"Sending DCC file to %s%s%s: %s%s%s (local filename: %s%s%s), %s%lu%s bytes\n"
+msgstr ""
+
+#: src/irc/irc-dcc.c:714
+#, fuzzy, c-format
+msgid "Incoming DCC chat request from %s%s%s (%s%d.%d.%d.%d%s)\n"
+msgstr "Recibir DCC chat de "
+
+#: src/irc/irc-dcc.c:731
+#, fuzzy, c-format
+msgid "Sending DCC chat request to %s%s\n"
+msgstr "Enviar DCC chat a "
+
+#: src/irc/irc-dcc.c:749
+#, c-format
+msgid ""
+"DCC: file %s%s%s (local filename: %s%s%s) will be resumed at position %u\n"
+msgstr ""
+
+#: src/irc/irc-dcc.c:824
 #, c-format
 msgid "%s not enough memory for DCC SEND\n"
 msgstr "%s no hay memoria suficiente para el DCC SEND\n"
 
-#: src/irc/irc-dcc.c:832
+#: src/irc/irc-dcc.c:846
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr "%s no es posible acceder al fichero \"%s\"\n"
 
-#: src/irc/irc-dcc.c:854
+#: src/irc/irc-dcc.c:868
 #, c-format
 msgid "%s could not find address for '%s'. Falling back to local IP.\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:874
+#: src/irc/irc-dcc.c:888
 #, c-format
 msgid "%s cannot create socket for DCC\n"
 msgstr "%s no es posible crear socket para el DCC\n"
 
-#: src/irc/irc-dcc.c:932
+#: src/irc/irc-dcc.c:946
 #, c-format
 msgid "%s cannot find available port for DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:976
+#: src/irc/irc-dcc.c:990
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr "%s no es posible enviar el DCC\n"
 
-#: src/irc/irc-dcc.c:1057
+#: src/irc/irc-dcc.c:1071
 #, c-format
 msgid "%s error sending data to \"%s\" via DCC CHAT\n"
 msgstr "%s error enviando datos al \"%s\" con DCC CHAT\n"
 
-#: src/irc/irc-dcc.c:1330
+#: src/irc/irc-dcc.c:1350
 #, c-format
 msgid ""
 "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -2084,7 +2089,7 @@ msgstr ""
 "%s El DCC ha fallado porque el tamaño de bloque es demasiado grande. "
 "Compruebe el valor de la opción \"dcc_blocksize\", el máximo es %d.\n"
 
-#: src/irc/irc-dcc.c:1405
+#: src/irc/irc-dcc.c:1425
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr "Abandonar el DCC activo: \"%s\" de %s\n"
@@ -2202,13 +2207,13 @@ msgstr ""
 msgid "%s plugin \"%s\" not found\n"
 msgstr ""
 
-#: src/plugins/plugins-config.c:215 src/common/weeconfig.c:1653
+#: src/plugins/plugins-config.c:215 src/common/weeconfig.c:1659
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
 msgstr "%s %s, línea %d: sintaxis inválida, falta \"=\"\n"
 
-#: src/plugins/plugins-config.c:265 src/common/weeconfig.c:1826
-#: src/common/weeconfig.c:2024
+#: src/plugins/plugins-config.c:265 src/common/weeconfig.c:1832
+#: src/common/weeconfig.c:2030
 #, c-format
 msgid "%s cannot create file \"%s\"\n"
 msgstr "%s no es posible crear el fichero \"%s\"\n"
@@ -2238,64 +2243,64 @@ msgstr ""
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s el lag (retraso) es alto, desconectando del servidor...\n"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "bytes"
 msgstr "bytes"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Kb"
 msgstr "KB"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Mb"
 msgstr "MB"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Gb"
 msgstr "GB"
 
-#: src/gui/curses/gui-display.c:1265
+#: src/gui/curses/gui-display.c:1836
 msgid "<servers>"
 msgstr "<servidores>"
 
-#: src/gui/curses/gui-display.c:1277
+#: src/gui/curses/gui-display.c:1848
 msgid "(away)"
 msgstr "(ausente)"
 
-#: src/gui/curses/gui-display.c:1411
+#: src/gui/curses/gui-display.c:1982
 msgid "[not connected] "
 msgstr "[no conectado] "
 
-#: src/gui/curses/gui-display.c:1421
+#: src/gui/curses/gui-display.c:1992
 msgid "Act: "
 msgstr "Act: "
 
-#: src/gui/curses/gui-display.c:1509
+#: src/gui/curses/gui-display.c:2080
 #, c-format
 msgid "Lag: %.1f"
 msgstr "Lag: %.1f"
 
-#: src/gui/curses/gui-display.c:1525
+#: src/gui/curses/gui-display.c:2096
 msgid "-MORE-"
 msgstr "-MÁS-"
 
-#: src/gui/curses/gui-display.c:1715
+#: src/gui/curses/gui-display.c:2274
 msgid "  [A] Accept"
 msgstr "  [A] Aceptar"
 
-#: src/gui/curses/gui-display.c:1716 src/gui/curses/gui-display.c:1720
+#: src/gui/curses/gui-display.c:2275 src/gui/curses/gui-display.c:2279
 msgid "  [C] Cancel"
 msgstr "  [C] Cancelar"
 
-#: src/gui/curses/gui-display.c:1725
+#: src/gui/curses/gui-display.c:2284
 msgid "  [R] Remove"
 msgstr "  [R] Eliminar"
 
-#: src/gui/curses/gui-display.c:1729
+#: src/gui/curses/gui-display.c:2288
 msgid "  [P] Purge old DCC"
 msgstr "  [P] Purgar los viejos DCC"
 
-#: src/gui/curses/gui-display.c:1730
+#: src/gui/curses/gui-display.c:2289
 msgid "  [Q] Close DCC view"
 msgstr "  [Q] Cerrar la vista DCC"
 
@@ -2303,16 +2308,12 @@ msgstr "  [Q] Cerrar la vista DCC"
 msgid "server"
 msgstr "servidor"
 
-#: src/gui/gui-common.c:392
-msgid "Not enough memory for infobar message\n"
-msgstr "No hay suficiente memoria para el mensaje de la barra de información\n"
-
-#: src/gui/gui-common.c:582
+#: src/gui/gui-common.c:508
 msgid "Not enough memory for new line\n"
 msgstr "No hay suficiente memoria para una nueva línea\n"
 
-#: src/gui/gui-common.c:625
-msgid "Not enough memory for new message\n"
+#: src/gui/gui-common.c:844
+msgid "Not enough memory for infobar message\n"
 msgstr "No hay suficiente memoria para el mensaje de la barra de información\n"
 
 #: src/gui/gui-keyboard.c:45
@@ -2463,7 +2464,7 @@ msgstr "recargar la pantalla"
 msgid "grab a key"
 msgstr ""
 
-#: src/gui/gui-keyboard.c:428 src/common/command.c:1662
+#: src/gui/gui-keyboard.c:428 src/common/command.c:1710
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr "%s No ha sido posible atar la clave \"%s\"\n"
@@ -2791,8 +2792,8 @@ msgid "%s alias cannot run another alias!\n"
 msgstr "%s ¡el alias no puede ejecutar otro alias!\n"
 
 #: src/common/command.c:306
-#, c-format
-msgid "%s target command \"%s\" does not exist!\n"
+#, fuzzy, c-format
+msgid "%s target command \"/%s\" does not exist!\n"
 msgstr "%s ¡el comando objetivo \"%s\" no existe!\n"
 
 #: src/common/command.c:535
@@ -2842,253 +2843,275 @@ msgstr "%s 
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr "%s comando \"%s\" desconocido (escriba /help para la ayuda)\n"
 
-#: src/common/command.c:773
+#: src/common/command.c:789
 #, c-format
 msgid "%s unable to call handler for message (not enough memory)\n"
 msgstr ""
 "%s No ha sido posible llamar al manejador para el mensaje (no hay suficiente "
 "memoria)\n"
 
-#: src/common/command.c:781
+#: src/common/command.c:797
 msgid "This window is not a channel!\n"
 msgstr "¡Esta ventana no es un canal!\n"
 
-#: src/common/command.c:809 src/common/command.c:833 src/common/command.c:943
+#: src/common/command.c:825 src/common/command.c:856 src/common/command.c:963
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr "%s faltan argumentos para el comando \"%s\"\n"
 
-#: src/common/command.c:818
+#: src/common/command.c:832
+#, fuzzy, c-format
+msgid "%s alias can not start with \"/\"\n"
+msgstr "%s ¡el alias no puede ejecutar otro alias!\n"
+
+#: src/common/command.c:841
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr "Alias \"%s\" => \"%s\" creado\n"
 
-#: src/common/command.c:824
+#: src/common/command.c:847
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr ""
 "No ha sido posible crear el alias \"%s\" => \"%s\" (no hay suficiente "
 "memoria)\n"
 
-#: src/common/command.c:844
+#: src/common/command.c:867
 msgid "List of aliases:\n"
 msgstr "Lista de alias:\n"
 
-#: src/common/command.c:856
+#: src/common/command.c:881
 msgid "No alias defined.\n"
 msgstr "Ningún alias definido.\n"
 
-#: src/common/command.c:879
-msgid "Channel: "
-msgstr "Canal: "
+#: src/common/command.c:898
+#, fuzzy, c-format
+msgid "%sServer: %s%s\n"
+msgstr "Servidor: "
 
-#: src/common/command.c:882 src/common/command.c:892
-msgid " (server: "
-msgstr " (servidor: "
+#: src/common/command.c:903
+#, c-format
+msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
+msgstr ""
 
-#: src/common/command.c:889
-msgid "Private with: "
-msgstr "Privado con: "
+#: src/common/command.c:912
+#, c-format
+msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
+msgstr ""
 
-#: src/common/command.c:923
+#: src/common/command.c:920
+#, fuzzy
+msgid "not connected\n"
+msgstr "no conectado"
+
+#: src/common/command.c:942
 msgid "Opened buffers:\n"
 msgstr "Búfers abiertos:\n"
 
-#: src/common/command.c:966
+#: src/common/command.c:986
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr "%s número de búfer incorrecto\n"
 
-#: src/common/command.c:982
+#: src/common/command.c:1002
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr "%s no es posible cerrar el único búfer\n"
 
-#: src/common/command.c:992
+#: src/common/command.c:1012
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr ""
 "%s no se puede cerrar el búfer de servidor mientras haya canales abiertos\n"
 
-#: src/common/command.c:1043
+#: src/common/command.c:1063
 msgid "Notify levels:  "
 msgstr "Niveles de notificación:  "
 
-#: src/common/command.c:1071 src/common/command.c:1093
+#: src/common/command.c:1091 src/common/command.c:1113
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr "%s nivel de notificación incorrecto (debe estar entre %d y %d)\n"
 
-#: src/common/command.c:1080
+#: src/common/command.c:1100
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr "%s búfer incorrecto para notificar (debe ser canal o privado)\n"
 
-#: src/common/command.c:1160
+#: src/common/command.c:1180
 #, c-format
 msgid "unknown parameter \"%s\" for \"%s\" command\n"
 msgstr "parámetro desconocido \"%s\" para el comando \"%s\"\n"
 
-#: src/common/command.c:1190
+#: src/common/command.c:1210
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s ya conectado al servidor \"%s\"!\n"
 
-#: src/common/command.c:1198
+#: src/common/command.c:1218
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr "%s actualmente conectando al servidor \"%s\"!\n"
 
-#: src/common/command.c:1216 src/common/command.c:1291
+#: src/common/command.c:1236 src/common/command.c:1311
 #, c-format
 msgid "%s server not found\n"
 msgstr "%s servidor no encontrado\n"
 
-#: src/common/command.c:1246 src/common/command.c:1774
-#: src/common/command.c:2595 src/common/command.c:2619
+#: src/common/command.c:1266 src/common/command.c:1824
+#: src/common/command.c:2671 src/common/command.c:2695
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s opción desconocida para el comando \"%s\"\n"
 
-#: src/common/command.c:1275
+#: src/common/command.c:1295
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr "%s ¡no conectado al servidor \"%s\"!\n"
 
-#: src/common/command.c:1283
+#: src/common/command.c:1303
 msgid "Auto-reconnection is cancelled\n"
 msgstr "La reconexión automática está anulada\n"
 
-#: src/common/command.c:1314 src/common/weechat.c:350
+#: src/common/command.c:1334 src/common/weechat.c:364
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "Comandos internos %s :\n"
 
-#: src/common/command.c:1323 src/common/weechat.c:370
+#: src/common/command.c:1344 src/common/weechat.c:384
 #, c-format
 msgid "IRC commands:\n"
 msgstr "Comandos IRC :\n"
 
-#: src/common/command.c:1336
+#: src/common/command.c:1358
 msgid "Plugin commands:\n"
 msgstr ""
 
-#: src/common/command.c:1444
+#: src/common/command.c:1474
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr "No hay ayuda disponible, el comando \"%s\" es desconocido\n"
 
-#: src/common/command.c:1466
+#: src/common/command.c:1495
+msgid "on"
+msgstr "en"
+
+#: src/common/command.c:1503
 msgid " ignoring "
 msgstr ""
 
-#: src/common/command.c:1490
+#: src/common/command.c:1507
+msgid " from "
+msgstr " de "
+
+#: src/common/command.c:1530
 msgid "List of ignore:\n"
 msgstr ""
 
-#: src/common/command.c:1505
+#: src/common/command.c:1547
 msgid "No ignore defined.\n"
 msgstr ""
 
-#: src/common/command.c:1531
+#: src/common/command.c:1573
 msgid "New ignore:"
 msgstr ""
 
-#: src/common/command.c:1550
-msgid "New key binding:\n"
+#: src/common/command.c:1593
+#, fuzzy, c-format
+msgid "New key binding:  %s"
 msgstr "Nuevo anclaje de clave:\n"
 
-#: src/common/command.c:1583
+#: src/common/command.c:1627
 msgid "Key bindings:\n"
 msgstr "Anclajes de clave:\n"
 
-#: src/common/command.c:1595
+#: src/common/command.c:1641
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr "Clave \"%s\" desatada\n"
 
-#: src/common/command.c:1600
+#: src/common/command.c:1647
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s No ha sido posible desatar la clave \"%s\"\n"
 
-#: src/common/command.c:1608 src/common/weechat.c:401
+#: src/common/command.c:1655 src/common/weechat.c:415
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Funciones de clave internas:\n"
 
-#: src/common/command.c:1627
+#: src/common/command.c:1675
 msgid "Default key bindings restored\n"
 msgstr "Anclajes de clave por defecto restaurados\n"
 
-#: src/common/command.c:1633
+#: src/common/command.c:1681
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 "%s \"-yes\" se requiere argumento para resetear las claves (por razones de "
 "seguridad)\n"
 
-#: src/common/command.c:1689
+#: src/common/command.c:1737
 msgid "Plugins loaded:\n"
 msgstr ""
 
-#: src/common/command.c:1703
+#: src/common/command.c:1753
 msgid "     message handlers:\n"
 msgstr ""
 
-#: src/common/command.c:1712
+#: src/common/command.c:1762
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr ""
 
-#: src/common/command.c:1719
+#: src/common/command.c:1769
 msgid "       (no message handler)\n"
 msgstr ""
 
-#: src/common/command.c:1724
+#: src/common/command.c:1774
 msgid "     command handlers:\n"
 msgstr ""
 
-#: src/common/command.c:1745
+#: src/common/command.c:1795
 msgid "       (no command handler)\n"
 msgstr ""
 
-#: src/common/command.c:1751
+#: src/common/command.c:1801
 msgid "  (no plugin)\n"
 msgstr ""
 
-#: src/common/command.c:1787
+#: src/common/command.c:1837
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
 msgstr ""
 
-#: src/common/command.c:1834
+#: src/common/command.c:1884
 msgid "No server.\n"
 msgstr "Ningún servidor.\n"
 
-#: src/common/command.c:1845
+#: src/common/command.c:1895
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "Servidor '%s' no encontrado.\n"
 
-#: src/common/command.c:1857
+#: src/common/command.c:1907
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr "%s falta el nombre de servidor para el comando \"%s\"\n"
 
-#: src/common/command.c:1865
+#: src/common/command.c:1915
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr ""
 "%s demasiados argumentos para el comando \"%s\", ignorando parámetros\n"
 
-#: src/common/command.c:1884
+#: src/common/command.c:1934
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr "%s servidor \"%s\" no encontrado para el comando \"%s\"\n"
 
-#: src/common/command.c:1892
+#: src/common/command.c:1942
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -3097,174 +3120,174 @@ msgstr ""
 "%s usted no puede eliminar el servidor \"%s\" ya que está usted conectado a "
 "él. Pruebe /disconnect %s antes.\n"
 
-#: src/common/command.c:1908 src/common/command.c:2054
-msgid "Server"
-msgstr "Servidor"
-
-#: src/common/command.c:1911
-msgid "has been deleted\n"
+#: src/common/command.c:1960
+#, fuzzy, c-format
+msgid "Server %s%s%s has been deleted\n"
 msgstr "ha sido eliminado\n"
 
-#: src/common/command.c:1926
+#: src/common/command.c:1977
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s faltan parámetros para el comando \"%s\"\n"
 
-#: src/common/command.c:1936
+#: src/common/command.c:1987
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr "%s el servidor \"%s\" ya existe, ¡no se puede crear!\n"
 
-#: src/common/command.c:1965 src/common/command.c:1993
-#: src/common/command.c:2006 src/common/command.c:2032
+#: src/common/command.c:2016 src/common/command.c:2044
+#: src/common/command.c:2057 src/common/command.c:2083
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr "%s falta contraseña para el comando \"%s\"\n"
 
-#: src/common/command.c:1978
+#: src/common/command.c:2029
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr "%s falta(n) usuario(s) para el parámetro \"%s\"\n"
 
-#: src/common/command.c:2019
+#: src/common/command.c:2070
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s falta comando para el parámetro \"%s\"\n"
 
-#: src/common/command.c:2057
-msgid "created\n"
-msgstr "creado\n"
+#: src/common/command.c:2105
+#, fuzzy, c-format
+msgid "Server %s%s%s created\n"
+msgstr "Servidor '%s' no encontrado.\n"
 
-#: src/common/command.c:2063
+#: src/common/command.c:2114
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s no es posible crear el servidor\n"
 
-#: src/common/command.c:2118
+#: src/common/command.c:2173
 msgid "(unknown)"
 msgstr "(desconocido)"
 
-#: src/common/command.c:2141
-msgid "(password hidden) "
+#: src/common/command.c:2196
+#, fuzzy, c-format
+msgid "%s(password hidden) "
 msgstr "(contraseña oculta) "
 
-#: src/common/command.c:2205
+#: src/common/command.c:2263
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s servidor \"%s\" no encontrado\n"
 
-#: src/common/command.c:2236 src/common/command.c:2282
+#: src/common/command.c:2296 src/common/command.c:2344
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s opción de configuración \"%s\" no encontrada\n"
 
-#: src/common/command.c:2241 src/common/command.c:2274
+#: src/common/command.c:2301 src/common/command.c:2336
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s valor incorrecto para la opción \"%s\"\n"
 
-#: src/common/command.c:2257
+#: src/common/command.c:2317
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr ""
 "%s la opción \"%s\" no puede ser modificada mientras WeeChat esté en "
 "ejecución\n"
 
-#: src/common/command.c:2362
+#: src/common/command.c:2427
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr "Ninguna opción de configuración encontrada con \"%s\"\n"
 
-#: src/common/command.c:2365
+#: src/common/command.c:2430
 msgid "No config option found\n"
 msgstr "Ninguna opción de configuración encontrada\n"
 
-#: src/common/command.c:2372
-msgid "Detail:\n"
+#: src/common/command.c:2437
+#, c-format
+msgid "%sDetail:\n"
 msgstr ""
 
-#: src/common/command.c:2376 src/common/weechat.c:287
+#: src/common/command.c:2443 src/common/weechat.c:301
 #, c-format
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr "  . tipo booleano (valores: 'on' u 'off')\n"
 
-#: src/common/command.c:2377 src/common/command.c:2400
-#: src/common/command.c:2406 src/common/command.c:2412
-#: src/common/weechat.c:288 src/common/weechat.c:311 src/common/weechat.c:317
-#: src/common/weechat.c:323
+#: src/common/command.c:2444 src/common/command.c:2467
+#: src/common/command.c:2473 src/common/command.c:2479
+#: src/common/weechat.c:302 src/common/weechat.c:325 src/common/weechat.c:331
+#: src/common/weechat.c:337
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . valor por defecto: '%s'\n"
 
-#: src/common/command.c:2382 src/common/weechat.c:293
+#: src/common/command.c:2449 src/common/weechat.c:307
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . tipo entero (valores: entre %d y %d)\n"
 
-#: src/common/command.c:2385 src/common/weechat.c:296
+#: src/common/command.c:2452 src/common/weechat.c:310
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . valor por defecto: %d\n"
 
-#: src/common/command.c:2389 src/common/weechat.c:300
+#: src/common/command.c:2456 src/common/weechat.c:314
 #, c-format
 msgid "  . type string (values: "
 msgstr "  . tipo cadena (valores: "
 
-#: src/common/command.c:2402 src/common/command.c:2408
-#: src/common/command.c:2414 src/common/weechat.c:313 src/common/weechat.c:319
-#: src/common/weechat.c:325
+#: src/common/command.c:2469 src/common/command.c:2475
+#: src/common/command.c:2481 src/common/weechat.c:327 src/common/weechat.c:333
+#: src/common/weechat.c:339
 msgid "empty"
 msgstr "vacío"
 
-#: src/common/command.c:2405 src/common/weechat.c:316
+#: src/common/command.c:2472 src/common/weechat.c:330
 #, c-format
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr "  . tipo color (color Curses ó Gtk, ver la documentación de WeeChat)\n"
 
-#: src/common/command.c:2411 src/common/weechat.c:322
+#: src/common/command.c:2478 src/common/weechat.c:336
 #, c-format
 msgid "  . type string (any string)\n"
 msgstr "  . tipo cadena (cualquier cadena)\n"
 
-#: src/common/command.c:2417 src/common/weechat.c:328
+#: src/common/command.c:2484 src/common/weechat.c:342
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . descripción: %s\n"
 
-#: src/common/command.c:2424
+#: src/common/command.c:2495
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr "opción/opciones de configuración encontrada(s) con \"%s\"\n"
 
-#: src/common/command.c:2427
+#: src/common/command.c:2498
 msgid "config option(s) found\n"
 msgstr "opción/opciones de configuración encontrada(s)\n"
 
-#: src/common/command.c:2448
+#: src/common/command.c:2519
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s alias o comando \"%s\" no encontrado\n"
 
-#: src/common/command.c:2458
+#: src/common/command.c:2529
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "Alias \"%s\" eliminado\n"
 
-#: src/common/command.c:2511
+#: src/common/command.c:2585
 msgid "ignore were removed.\n"
 msgstr ""
 
-#: src/common/command.c:2513
+#: src/common/command.c:2587
 msgid "ignore was removed.\n"
 msgstr ""
 
-#: src/common/command.c:2518
+#: src/common/command.c:2592
 #, c-format
 msgid "%s no ignore found\n"
 msgstr ""
 
-#: src/common/command.c:2543
+#: src/common/command.c:2617
 msgid "Opened windows:\n"
 msgstr "Ventanas abiertas:\n"
 
@@ -3312,24 +3335,24 @@ msgstr "La tuber
 msgid "%s cannot add a buffer to hotlist\n"
 msgstr "%s no es posible añadir un búfer a la lista caliente (hotlist)\n"
 
-#: src/common/log.c:118
+#: src/common/log.c:96
 msgid "Not enough memory to write log file for a buffer\n"
 msgstr ""
 "No hay suficiente memoria para escribir un fichero de log para un búfer\n"
 
-#: src/common/log.c:146
+#: src/common/log.c:124
 msgid "Unable to write log file for a buffer\n"
 msgstr "No es posible escribir un fichero de log para un búfer\n"
 
-#: src/common/log.c:150
+#: src/common/log.c:128
 msgid "****  Beginning of log  "
 msgstr "****  Comienzo del log (registro)  "
 
-#: src/common/log.c:164
+#: src/common/log.c:142
 msgid "****  End of log  "
 msgstr "****  Fin del log  "
 
-#: src/common/weechat.c:274
+#: src/common/weechat.c:288
 #, c-format
 msgid ""
 "WeeChat configuration options (~/.weechat/weechat.rc):\n"
@@ -3338,7 +3361,7 @@ msgstr ""
 "Opciones de configuración de WeeChat (~/.weechat/weechat.rc):\n"
 "\n"
 
-#: src/common/weechat.c:335
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "Moreover, you can define aliases in [alias] section, by adding lines like:\n"
@@ -3346,7 +3369,7 @@ msgstr ""
 "Además, usted puede definir alias en la sección [alias], añadiendo líneas "
 "como:\n"
 
-#: src/common/weechat.c:337
+#: src/common/weechat.c:351
 #, c-format
 msgid ""
 "where 'j' is alias name, and 'join' associated command.\n"
@@ -3355,62 +3378,62 @@ msgstr ""
 "donde 'j' es el nombre del alias, y 'join' el comando asociado.\n"
 "\n"
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:437
 #, c-format
 msgid "%s default keys:\n"
 msgstr "%s claves por defecto:\n"
 
-#: src/common/weechat.c:503
+#: src/common/weechat.c:525
 #, c-format
 msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
 msgstr "%s sintaxis inválida para el servidor IRC ('%s'), ignorado\n"
 
-#: src/common/weechat.c:516
+#: src/common/weechat.c:538
 #, c-format
 msgid "%s unable to create server ('%s'), ignored\n"
 msgstr "%s no es posible crear el servidor ('%s'), ignorado\n"
 
-#: src/common/weechat.c:525
+#: src/common/weechat.c:547
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr "%s parámetro desconocido '%s', ignorado\n"
 
-#: src/common/weechat.c:545
+#: src/common/weechat.c:567
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr "%s no es posible crear el directorio \"%s\"\n"
 
-#: src/common/weechat.c:571
+#: src/common/weechat.c:593
 #, c-format
 msgid "%s unable to get HOME directory\n"
 msgstr "%s no ha sido posible leer el directorio HOME\n"
 
-#: src/common/weechat.c:580
+#: src/common/weechat.c:602
 #, c-format
 msgid "%s not enough memory for home directory\n"
 msgstr "%s no hay suficiente memoria para el directorio home\n"
 
-#: src/common/weechat.c:590
+#: src/common/weechat.c:612
 #, c-format
 msgid "%s unable to create ~/.weechat directory\n"
 msgstr "%s no es posible crear el directorio ~/.weechat\n"
 
-#: src/common/weechat.c:603
+#: src/common/weechat.c:625
 #, c-format
 msgid "%s unable to create ~/.weechat/logs directory\n"
 msgstr "%s no es posible crear el directorio ~/.weechat/logs\n"
 
-#: src/common/weechat.c:646
+#: src/common/weechat.c:668
 #, c-format
 msgid "%s unable to create/append to log file (~/.weechat/%s)"
 msgstr "%s no es posible crear/añadir en el fichero de log (~/.weechat/%s)"
 
-#: src/common/weechat.c:669
-#, c-format
-msgid "%sWelcome to "
+#: src/common/weechat.c:696
+#, fuzzy, c-format
+msgid "%sWelcome to %s%s%s, %s\n"
 msgstr "%sBienvenido a "
 
-#: src/common/weechat.c:682 src/common/weechat.c:691
+#: src/common/weechat.c:710 src/common/weechat.c:720
 msgid "compiled on"
 msgstr "compilado en"
 
@@ -3422,118 +3445,114 @@ msgstr "Error WeeChat:"
 msgid "WeeChat Warning:"
 msgstr "Advertencia WeeChat:"
 
-#: src/common/weeconfig.c:103 src/common/weeconfig.c:104
+#: src/common/weeconfig.c:102 src/common/weeconfig.c:103
 msgid "set title for window (terminal for Curses GUI) with name & version"
 msgstr ""
 "define el título de la ventana (el terminal para la interfaz Curses) con el "
 "nombre y la versión"
 
-#: src/common/weeconfig.c:107 src/common/weeconfig.c:108
+#: src/common/weeconfig.c:106 src/common/weeconfig.c:107
 msgid "display WeeChat logo at startup"
 msgstr "mostrar el logotipo de WeeChat en el arranque"
 
-#: src/common/weeconfig.c:111 src/common/weeconfig.c:112
+#: src/common/weeconfig.c:110 src/common/weeconfig.c:111
 msgid "display WeeChat version at startup"
 msgstr "mostrar la versión de Weechat en el arranque"
 
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:114
 msgid "WeeChat slogan"
 msgstr "eslógan de WeeChat"
 
-#: src/common/weeconfig.c:116
+#: src/common/weeconfig.c:115
 msgid "WeeChat slogan (if empty, slogan is not used)"
 msgstr "eslógan de WeeChat (si está vacío, el eslógan no será utilizado)"
 
-#: src/common/weeconfig.c:119
+#: src/common/weeconfig.c:118
 msgid ""
 "ISO charset for decoding messages from server (used only if locale is UTF-8)"
 msgstr ""
 
-#: src/common/weeconfig.c:120
+#: src/common/weeconfig.c:119
 msgid ""
 "ISO charset for decoding messages from server (used only if locale is UTF-8) "
 "(if empty, messages are not converted if locale is UTF-8"
 msgstr ""
 
-#: src/common/weeconfig.c:124
+#: src/common/weeconfig.c:123
 msgid ""
 "UTF charset for decoding messages from server (used only if locale is not "
 "UTF-8)"
 msgstr ""
 
-#: src/common/weeconfig.c:125
+#: src/common/weeconfig.c:124
 msgid ""
 "UTF charset for decoding messages from server (used only if locale is not "
 "UTF-8) (if empty, messages are not converted if locale is not UTF-8"
 msgstr ""
 
-#: src/common/weeconfig.c:129
+#: src/common/weeconfig.c:128
 msgid "charset for encoding messages sent to server"
 msgstr "juego de caracteres para codificar los mensajes enviados al servidor"
 
-#: src/common/weeconfig.c:130
+#: src/common/weeconfig.c:129
 msgid ""
 "charset for encoding messages sent to server, examples: UFT-8, ISO-8859-1 "
 "(if empty, messages are not converted)"
 msgstr ""
 
-#: src/common/weeconfig.c:133
+#: src/common/weeconfig.c:132
 msgid "forces internal WeeChat charset (should be empty in most cases)"
 msgstr ""
 
-#: src/common/weeconfig.c:134
+#: src/common/weeconfig.c:133
 msgid ""
 "forces internal WeeChat charset (should be empty in most cases, that means "
 "detected charset is used)"
 msgstr ""
 
-#: src/common/weeconfig.c:137 src/common/weeconfig.c:138
+#: src/common/weeconfig.c:136 src/common/weeconfig.c:137
 msgid "use same buffer for all servers"
 msgstr ""
 
-#: src/common/weeconfig.c:141 src/common/weeconfig.c:142
+#: src/common/weeconfig.c:140 src/common/weeconfig.c:141
 msgid "timestamp for buffers"
 msgstr "fecha y hora para las búfers"
 
-#: src/common/weeconfig.c:145 src/common/weeconfig.c:146
+#: src/common/weeconfig.c:144 src/common/weeconfig.c:145
 msgid "display nick names with different colors"
 msgstr "mostrar nombres de usuario con colores diferentes"
 
-#: src/common/weeconfig.c:149 src/common/weeconfig.c:150
+#: src/common/weeconfig.c:148 src/common/weeconfig.c:149
 msgid "number of colors to use for nicks colors"
 msgstr ""
 
-#: src/common/weeconfig.c:153 src/common/weeconfig.c:154
+#: src/common/weeconfig.c:152 src/common/weeconfig.c:153
 msgid "display actions with different colors"
 msgstr "mostrar acciones con colores diferentes"
 
-#: src/common/weeconfig.c:157 src/common/weeconfig.c:158
-msgid "remove colors from incoming messages"
-msgstr "quitar colores en los mensajes entrantes"
-
-#: src/common/weeconfig.c:161
+#: src/common/weeconfig.c:156
 msgid "display nicklist window"
 msgstr "mostrar ventana de usuarios"
 
-#: src/common/weeconfig.c:162
+#: src/common/weeconfig.c:157
 msgid "display nicklist window (for channel windows)"
 msgstr "mostrar ventana de usuarios (para las ventanas de canal)"
 
-#: src/common/weeconfig.c:165
+#: src/common/weeconfig.c:160
 msgid "nicklist position"
 msgstr "posición de la ventana de usuarios"
 
-#: src/common/weeconfig.c:166
+#: src/common/weeconfig.c:161
 msgid "nicklist position (top, left, right (default), bottom)"
 msgstr ""
 "posición de la ventana de usuarios (arriba (top), izquierda (left), derecha "
 "(right, por defecto), abajo (bottom))"
 
-#: src/common/weeconfig.c:169
+#: src/common/weeconfig.c:164
 msgid "min size for nicklist"
 msgstr "tamaño mínimo para la ventana de usuarios"
 
-#: src/common/weeconfig.c:170
+#: src/common/weeconfig.c:165
 msgid ""
 "min size for nicklist (width or height, depending on look_nicklist_position "
 "(0 = no min size))"
@@ -3541,11 +3560,11 @@ msgstr ""
 "tamaño mínimo para la ventana de usuarios (ancho o alto, dependiendo de "
 "look_nicklist_position (0 = sin tamaño mínimo))"
 
-#: src/common/weeconfig.c:174
+#: src/common/weeconfig.c:169
 msgid "max size for nicklist"
 msgstr "tamaño máximo para la ventana de usuarios"
 
-#: src/common/weeconfig.c:175
+#: src/common/weeconfig.c:170
 msgid ""
 "max size for nicklist (width or height, depending on look_nicklist_position "
 "(0 = no max size; if min == max and > 0, then size is fixed))"
@@ -3554,45 +3573,45 @@ msgstr ""
 "look_nicklist_position (0 = sin tamaño máximo, si min == max y > 0, entonces "
 "se fija el tamaño))"
 
-#: src/common/weeconfig.c:179 src/common/weeconfig.c:180
+#: src/common/weeconfig.c:174 src/common/weeconfig.c:175
 msgid "text to display instead of nick when not connected"
 msgstr "texto a mostrar en lugar del nick cuando no se está conectado"
 
-#: src/common/weeconfig.c:183 src/common/weeconfig.c:184
+#: src/common/weeconfig.c:178 src/common/weeconfig.c:179
 msgid "display nick mode ((half)op/voice) before each nick"
 msgstr "mostrar modo del usuario ((half)op/voice) antes de cada usuario"
 
-#: src/common/weeconfig.c:187 src/common/weeconfig.c:188
+#: src/common/weeconfig.c:182 src/common/weeconfig.c:183
 msgid "display space if nick mode is not (half)op/voice"
 msgstr "mostrar un espacio si el modo de usuario no es (half)op/voice"
 
-#: src/common/weeconfig.c:191 src/common/weeconfig.c:192
+#: src/common/weeconfig.c:186 src/common/weeconfig.c:187
 msgid "the string inserted after nick completion"
 msgstr "la cadena mostrada tras la finalización de los nombres de usuario"
 
-#: src/common/weeconfig.c:195 src/common/weeconfig.c:196
+#: src/common/weeconfig.c:190 src/common/weeconfig.c:191
 msgid "chars ignored for nick completion"
 msgstr ""
 
-#: src/common/weeconfig.c:199 src/common/weeconfig.c:200
+#: src/common/weeconfig.c:194 src/common/weeconfig.c:195
 msgid "enable info bar"
 msgstr "activa la barra de información"
 
-#: src/common/weeconfig.c:203 src/common/weeconfig.c:204
+#: src/common/weeconfig.c:198 src/common/weeconfig.c:199
 msgid "timestamp for time in infobar"
 msgstr "fecha y hora para las conversaciones guardadas"
 
-#: src/common/weeconfig.c:207 src/common/weeconfig.c:208
+#: src/common/weeconfig.c:202 src/common/weeconfig.c:203
 msgid "display seconds in infobar time"
 msgstr "mostrar segundos en la hora de la barra de herramientas"
 
-#: src/common/weeconfig.c:211
+#: src/common/weeconfig.c:206
 msgid "delay (in seconds) for highlight messages in infobar"
 msgstr ""
 "retraso (en segundos) para la notificación de mensajes en la barra de "
 "información"
 
-#: src/common/weeconfig.c:212
+#: src/common/weeconfig.c:207
 msgid ""
 "delay (in seconds) for highlight messages in infobar (0 = disable highlight "
 "notifications in infobar)"
@@ -3600,340 +3619,340 @@ msgstr ""
 "retraso (en segundos) para la notificación de mensajes en la barra de "
 "información (0 = desactivar las notificaciones en la barra de información)"
 
-#: src/common/weeconfig.c:216
+#: src/common/weeconfig.c:211
 msgid "max number of names in hotlist"
 msgstr ""
 
-#: src/common/weeconfig.c:217
+#: src/common/weeconfig.c:212
 msgid ""
 "max number of names in hotlist (0 = no name displayed, only buffer numbers)"
 msgstr ""
 
-#: src/common/weeconfig.c:220
+#: src/common/weeconfig.c:215
 msgid "level for displaying names in hotlist"
 msgstr ""
 
-#: src/common/weeconfig.c:221
+#: src/common/weeconfig.c:216
 msgid ""
 "level for displaying names in hotlist (combination of: 1=join/part, "
 "2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
 msgstr ""
 
-#: src/common/weeconfig.c:225
+#: src/common/weeconfig.c:220
 msgid "max length of names in hotlist"
 msgstr ""
 
-#: src/common/weeconfig.c:226
+#: src/common/weeconfig.c:221
 msgid "max length of names in hotlist (0 = no limit)"
 msgstr ""
 
-#: src/common/weeconfig.c:229 src/common/weeconfig.c:230
+#: src/common/weeconfig.c:224 src/common/weeconfig.c:225
 msgid "display special message when day changes"
 msgstr ""
 
-#: src/common/weeconfig.c:233 src/common/weeconfig.c:234
+#: src/common/weeconfig.c:228 src/common/weeconfig.c:229
 msgid "timestamp for date displayed when day changed"
 msgstr ""
 
-#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
+#: src/common/weeconfig.c:294 src/common/weeconfig.c:295
 msgid "color for title bar"
 msgstr "color para la barra de título"
 
-#: src/common/weeconfig.c:303 src/common/weeconfig.c:304
+#: src/common/weeconfig.c:298 src/common/weeconfig.c:299
 msgid "background for title bar"
 msgstr "color de fondo para la barra de título"
 
-#: src/common/weeconfig.c:309 src/common/weeconfig.c:310
+#: src/common/weeconfig.c:304 src/common/weeconfig.c:305
 msgid "color for chat text"
 msgstr "color para el texto de conversación"
 
-#: src/common/weeconfig.c:313
+#: src/common/weeconfig.c:308
 msgid "color for time"
 msgstr "color para la hora"
 
-#: src/common/weeconfig.c:314
+#: src/common/weeconfig.c:309
 msgid "color for time in chat window"
 msgstr "color para la hora en la ventana de conversación"
 
-#: src/common/weeconfig.c:317
+#: src/common/weeconfig.c:312
 msgid "color for time separator"
 msgstr "color para el separador de la hora"
 
-#: src/common/weeconfig.c:318
+#: src/common/weeconfig.c:313
 msgid "color for time separator (chat window)"
 msgstr "color para el separador de la hora (ventana de conversación)"
 
-#: src/common/weeconfig.c:321 src/common/weeconfig.c:322
+#: src/common/weeconfig.c:316 src/common/weeconfig.c:317
 msgid "color for 1st and 3rd char of prefix"
 msgstr "color para el primer o tercer carácter de prefijo"
 
-#: src/common/weeconfig.c:325 src/common/weeconfig.c:326
+#: src/common/weeconfig.c:320 src/common/weeconfig.c:321
 msgid "color for middle char of prefix"
 msgstr "color para el carácter de en medio del prefijo"
 
-#: src/common/weeconfig.c:329 src/common/weeconfig.c:330
+#: src/common/weeconfig.c:324 src/common/weeconfig.c:325
 msgid "color for server name"
 msgstr ""
 
-#: src/common/weeconfig.c:333 src/common/weeconfig.c:334
+#: src/common/weeconfig.c:328 src/common/weeconfig.c:329
 msgid "color for join arrow (prefix)"
 msgstr ""
 
-#: src/common/weeconfig.c:337 src/common/weeconfig.c:338
+#: src/common/weeconfig.c:332 src/common/weeconfig.c:333
 msgid "color for part/quit arrow (prefix)"
 msgstr ""
 
-#: src/common/weeconfig.c:341
+#: src/common/weeconfig.c:336
 msgid "color for nicks in actions"
 msgstr "color para los nombres de usuario en las acciones"
 
-#: src/common/weeconfig.c:342
+#: src/common/weeconfig.c:337
 msgid "color for nicks in actions (chat window)"
 msgstr ""
 "color para los nombres de usuario en las acciones (ventana de conversación)"
 
-#: src/common/weeconfig.c:345
+#: src/common/weeconfig.c:340
 msgid "color for hostnames"
 msgstr "color para los nombres de máquina"
 
-#: src/common/weeconfig.c:346
+#: src/common/weeconfig.c:341
 msgid "color for hostnames (chat window)"
 msgstr "color para los nombres de máquina (ventana de conversación)"
 
-#: src/common/weeconfig.c:349
+#: src/common/weeconfig.c:344
 msgid "color for channel names in actions"
 msgstr "color para los nombres de canal en las acciones"
 
-#: src/common/weeconfig.c:350
+#: src/common/weeconfig.c:345
 msgid "color for channel names in actions (chat window)"
 msgstr ""
 "color para los nombres de canal en las acciones (ventana de conversación)"
 
-#: src/common/weeconfig.c:353
+#: src/common/weeconfig.c:348
 msgid "color for dark separators"
 msgstr "color para los separadores oscuros"
 
-#: src/common/weeconfig.c:354
+#: src/common/weeconfig.c:349
 msgid "color for dark separators (chat window)"
 msgstr "color para los separadores oscuros (ventana de conversación)"
 
-#: src/common/weeconfig.c:357
+#: src/common/weeconfig.c:352
 msgid "color for highlighted nick"
 msgstr "color para el alias subrayado"
 
-#: src/common/weeconfig.c:358
+#: src/common/weeconfig.c:353
 msgid "color for highlighted nick (chat window)"
 msgstr "color para el alias subrayado (ventana de conversación)"
 
-#: src/common/weeconfig.c:361
+#: src/common/weeconfig.c:356
 msgid "background for chat"
 msgstr "color de fondo para la conversación"
 
-#: src/common/weeconfig.c:362
+#: src/common/weeconfig.c:357
 msgid "background for chat window"
 msgstr "color de fondo para la ventana de conversación"
 
-#: src/common/weeconfig.c:367 src/common/weeconfig.c:368
+#: src/common/weeconfig.c:362 src/common/weeconfig.c:363
 msgid "color for status bar"
 msgstr "color para la barra de estado"
 
-#: src/common/weeconfig.c:371 src/common/weeconfig.c:372
+#: src/common/weeconfig.c:366 src/common/weeconfig.c:367
 msgid "color for status bar delimiters"
 msgstr "color para los delimitadores de la barra de estado"
 
-#: src/common/weeconfig.c:375 src/common/weeconfig.c:376
+#: src/common/weeconfig.c:370 src/common/weeconfig.c:371
 msgid "color for current channel in status bar"
 msgstr ""
 
-#: src/common/weeconfig.c:379
+#: src/common/weeconfig.c:374
 msgid "color for window with new messages"
 msgstr "color para una ventana con mensajes nuevos"
 
-#: src/common/weeconfig.c:380
+#: src/common/weeconfig.c:375
 msgid "color for window with new messages (status bar)"
 msgstr "color para una ventana con mensajes nuevos (barra de estado)"
 
-#: src/common/weeconfig.c:383
+#: src/common/weeconfig.c:378
 msgid "color for window with private message"
 msgstr ""
 
-#: src/common/weeconfig.c:384
+#: src/common/weeconfig.c:379
 msgid "color for window with private message (status bar)"
 msgstr ""
 
-#: src/common/weeconfig.c:387
+#: src/common/weeconfig.c:382
 msgid "color for window with highlight"
 msgstr "color para una ventana con resaltado"
 
-#: src/common/weeconfig.c:388
+#: src/common/weeconfig.c:383
 msgid "color for window with highlight (status bar)"
 msgstr "color para una ventana con resaltado (barra de estado)"
 
-#: src/common/weeconfig.c:391
+#: src/common/weeconfig.c:386
 msgid "color for window with new data (not messages)"
 msgstr "color para una ventana con nuevos datos (no mensajes)"
 
-#: src/common/weeconfig.c:392
+#: src/common/weeconfig.c:387
 msgid "color for window with new data (not messages) (status bar)"
 msgstr ""
 "color para una ventana con nuevos datos (no mensajes) (barra de estado)"
 
-#: src/common/weeconfig.c:395
+#: src/common/weeconfig.c:390
 msgid "color for \"-MORE-\" text"
 msgstr "color para el texto \"-MÁS-\""
 
-#: src/common/weeconfig.c:396
+#: src/common/weeconfig.c:391
 msgid "color for window with new data (status bar)"
 msgstr "color para una ventana con nuevos datos (barra de estado)"
 
-#: src/common/weeconfig.c:399 src/common/weeconfig.c:400
+#: src/common/weeconfig.c:394 src/common/weeconfig.c:395
 msgid "background for status window"
 msgstr "color de fondo para la ventana de estado"
 
-#: src/common/weeconfig.c:405 src/common/weeconfig.c:406
+#: src/common/weeconfig.c:400 src/common/weeconfig.c:401
 msgid "color for info bar text"
 msgstr "color para el texto de la barra de información"
 
-#: src/common/weeconfig.c:409 src/common/weeconfig.c:410
+#: src/common/weeconfig.c:404 src/common/weeconfig.c:405
 msgid "color for infobar delimiters"
 msgstr "color para los delimitadores de la barra de información"
 
-#: src/common/weeconfig.c:413 src/common/weeconfig.c:414
+#: src/common/weeconfig.c:408 src/common/weeconfig.c:409
 msgid "color for info bar highlight notification"
 msgstr "color para la notificación en la barra de información"
 
-#: src/common/weeconfig.c:417 src/common/weeconfig.c:418
+#: src/common/weeconfig.c:412 src/common/weeconfig.c:413
 msgid "background for info bar window"
 msgstr "color de fondo para la ventana de la barra de información"
 
-#: src/common/weeconfig.c:423 src/common/weeconfig.c:424
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
 msgid "color for input text"
 msgstr "color para el texto de entrada"
 
-#: src/common/weeconfig.c:427 src/common/weeconfig.c:428
+#: src/common/weeconfig.c:422 src/common/weeconfig.c:423
 msgid "color for input text (channel name)"
 msgstr "color para el texto de entrada (nombre de canal)"
 
-#: src/common/weeconfig.c:431 src/common/weeconfig.c:432
+#: src/common/weeconfig.c:426 src/common/weeconfig.c:427
 msgid "color for input text (nick name)"
 msgstr "color para el texto de entrada (alias)"
 
-#: src/common/weeconfig.c:435 src/common/weeconfig.c:436
+#: src/common/weeconfig.c:430 src/common/weeconfig.c:431
 msgid "color for input text (delimiters)"
 msgstr ""
 
-#: src/common/weeconfig.c:439 src/common/weeconfig.c:440
+#: src/common/weeconfig.c:434 src/common/weeconfig.c:435
 msgid "background for input window"
 msgstr "color de fondo para la ventana de entrada"
 
-#: src/common/weeconfig.c:445 src/common/weeconfig.c:446
+#: src/common/weeconfig.c:440 src/common/weeconfig.c:441
 msgid "color for nicknames"
 msgstr "color para los nombres de usuario"
 
-#: src/common/weeconfig.c:449 src/common/weeconfig.c:450
+#: src/common/weeconfig.c:444 src/common/weeconfig.c:445
 msgid "color for away nicknames"
 msgstr "color para los usuarios ausentes"
 
-#: src/common/weeconfig.c:453
+#: src/common/weeconfig.c:448
 msgid "color for chan owner symbol"
 msgstr "color para el símbolo de propietario de canal"
 
-#: src/common/weeconfig.c:454
+#: src/common/weeconfig.c:449
 msgid "color for chan owner symbol (specific to unrealircd)"
 msgstr ""
 "color para el símbolo de propietario de canal (especificado en unrealircd)"
 
-#: src/common/weeconfig.c:457
+#: src/common/weeconfig.c:452
 msgid "color for chan admin symbol"
 msgstr "color para el símbolo de administrador de canal"
 
-#: src/common/weeconfig.c:458
+#: src/common/weeconfig.c:453
 msgid "color for chan admin symbol (specific to unrealircd)"
 msgstr ""
 "color para el símbolo de administrador de canal (especificado en unrealircd)"
 
-#: src/common/weeconfig.c:461 src/common/weeconfig.c:462
+#: src/common/weeconfig.c:456 src/common/weeconfig.c:457
 msgid "color for operator symbol"
 msgstr "color para el símbolo de operador"
 
-#: src/common/weeconfig.c:465 src/common/weeconfig.c:466
+#: src/common/weeconfig.c:460 src/common/weeconfig.c:461
 msgid "color for half-operator symbol"
 msgstr "color para el símbolo de semi-operador"
 
-#: src/common/weeconfig.c:469 src/common/weeconfig.c:470
+#: src/common/weeconfig.c:464 src/common/weeconfig.c:465
 msgid "color for voice symbol"
 msgstr "color para el símbolo de voz"
 
-#: src/common/weeconfig.c:473 src/common/weeconfig.c:474
+#: src/common/weeconfig.c:468 src/common/weeconfig.c:469
 msgid "color for '+' when scrolling nicks"
 msgstr "color para '+' al desplazar nicks"
 
-#: src/common/weeconfig.c:477 src/common/weeconfig.c:478
+#: src/common/weeconfig.c:472 src/common/weeconfig.c:473
 msgid "color for nick separator"
 msgstr "color para el separador de alias"
 
-#: src/common/weeconfig.c:481 src/common/weeconfig.c:482
+#: src/common/weeconfig.c:476 src/common/weeconfig.c:477
 msgid "color for local nick"
 msgstr "color para el alias local"
 
-#: src/common/weeconfig.c:485 src/common/weeconfig.c:486
-#: src/common/weeconfig.c:489 src/common/weeconfig.c:490
-#: src/common/weeconfig.c:493 src/common/weeconfig.c:494
-#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
-#: src/common/weeconfig.c:501 src/common/weeconfig.c:502
-#: src/common/weeconfig.c:505 src/common/weeconfig.c:506
-#: src/common/weeconfig.c:509 src/common/weeconfig.c:510
-#: src/common/weeconfig.c:513 src/common/weeconfig.c:514
-#: src/common/weeconfig.c:517 src/common/weeconfig.c:518
-#: src/common/weeconfig.c:521 src/common/weeconfig.c:522
+#: src/common/weeconfig.c:480 src/common/weeconfig.c:481
+#: src/common/weeconfig.c:484 src/common/weeconfig.c:485
+#: src/common/weeconfig.c:488 src/common/weeconfig.c:489
+#: src/common/weeconfig.c:492 src/common/weeconfig.c:493
+#: src/common/weeconfig.c:496 src/common/weeconfig.c:497
+#: src/common/weeconfig.c:500 src/common/weeconfig.c:501
+#: src/common/weeconfig.c:504 src/common/weeconfig.c:505
+#: src/common/weeconfig.c:508 src/common/weeconfig.c:509
+#: src/common/weeconfig.c:512 src/common/weeconfig.c:513
+#: src/common/weeconfig.c:516 src/common/weeconfig.c:517
 msgid "color for nick"
 msgstr ""
 
-#: src/common/weeconfig.c:525 src/common/weeconfig.c:526
+#: src/common/weeconfig.c:520 src/common/weeconfig.c:521
 msgid "color for other nick in private window"
 msgstr "color para el otro alias en la ventana privada"
 
-#: src/common/weeconfig.c:529 src/common/weeconfig.c:530
+#: src/common/weeconfig.c:524 src/common/weeconfig.c:525
 msgid "background for nicknames"
 msgstr "color de fondo para los nombres de usuario"
 
-#: src/common/weeconfig.c:535
+#: src/common/weeconfig.c:530
 msgid "color for selected DCC"
 msgstr "color para el DCC seleccionado"
 
-#: src/common/weeconfig.c:536
+#: src/common/weeconfig.c:531
 msgid "color for selected DCC (chat window)"
 msgstr "color para el DCC seleccionado (ventana de conversación)"
 
-#: src/common/weeconfig.c:539 src/common/weeconfig.c:540
+#: src/common/weeconfig.c:534 src/common/weeconfig.c:535
 msgid "color for \"waiting\" dcc status"
 msgstr "color para el estado dcc \"esperando\""
 
-#: src/common/weeconfig.c:543 src/common/weeconfig.c:544
+#: src/common/weeconfig.c:538 src/common/weeconfig.c:539
 msgid "color for \"connecting\" dcc status"
 msgstr "color para el estado dcc \"conectando\""
 
-#: src/common/weeconfig.c:547 src/common/weeconfig.c:548
+#: src/common/weeconfig.c:542 src/common/weeconfig.c:543
 msgid "color for \"active\" dcc status"
 msgstr "color para el estado dcc \"activo\""
 
-#: src/common/weeconfig.c:551 src/common/weeconfig.c:552
+#: src/common/weeconfig.c:546 src/common/weeconfig.c:547
 msgid "color for \"done\" dcc status"
 msgstr "color para el estado dcc \"terminado\""
 
-#: src/common/weeconfig.c:555 src/common/weeconfig.c:556
+#: src/common/weeconfig.c:550 src/common/weeconfig.c:551
 msgid "color for \"failed\" dcc status"
 msgstr "color para el estado dcc \"fallo\""
 
-#: src/common/weeconfig.c:559 src/common/weeconfig.c:560
+#: src/common/weeconfig.c:554 src/common/weeconfig.c:555
 msgid "color for \"aborted\" dcc status"
 msgstr "color para el estado dcc \"abortado\""
 
-#: src/common/weeconfig.c:573
+#: src/common/weeconfig.c:568
 msgid "max lines in history (per window)"
 msgstr "número máximo de líneas en el histórico (por ventana)"
 
-#: src/common/weeconfig.c:574
+#: src/common/weeconfig.c:569
 msgid ""
 "maximum number of lines in history for one server/channel/private window (0 "
 "= unlimited)"
@@ -3941,401 +3960,416 @@ msgstr ""
 "número máximo de líneas en el histórico para un servidor/canal/privado (0 = "
 "ilimitado)"
 
-#: src/common/weeconfig.c:578
+#: src/common/weeconfig.c:573
 msgid "max user commands in history"
 msgstr "número máximo de comandos de usuario en el histórico"
 
-#: src/common/weeconfig.c:579
+#: src/common/weeconfig.c:574
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr "número máximo de comandos de usuario en el histórico (0 = ilimitado)"
 
-#: src/common/weeconfig.c:596 src/common/weeconfig.c:597
+#: src/common/weeconfig.c:591 src/common/weeconfig.c:592
 msgid "automatically log server messages"
 msgstr "registrar automáticamente los mensajes de servidor"
 
-#: src/common/weeconfig.c:600 src/common/weeconfig.c:601
+#: src/common/weeconfig.c:595 src/common/weeconfig.c:596
 msgid "automatically log channel chats"
 msgstr "registrar automáticamente las conversaciones de canal"
 
-#: src/common/weeconfig.c:604 src/common/weeconfig.c:605
+#: src/common/weeconfig.c:599 src/common/weeconfig.c:600
 msgid "automatically log private chats"
 msgstr "registrar automáticamente las conversaciones privadas"
 
-#: src/common/weeconfig.c:608 src/common/weeconfig.c:609
+#: src/common/weeconfig.c:603 src/common/weeconfig.c:604
 msgid "log messages from plugins (scripts)"
 msgstr "registrar mensajes de plugins (scripts)"
 
-#: src/common/weeconfig.c:612
+#: src/common/weeconfig.c:607
 msgid "path for log files"
 msgstr "ruta para los archivos de registro (logs)"
 
-#: src/common/weeconfig.c:613
+#: src/common/weeconfig.c:608
 msgid "path for WeeChat log files"
 msgstr "ruta para los archivos de registro (logs) de WeeChat"
 
-#: src/common/weeconfig.c:616
+#: src/common/weeconfig.c:611
 msgid "timestamp for log"
 msgstr "fecha y hora para las conversaciones registradas"
 
-#: src/common/weeconfig.c:617
+#: src/common/weeconfig.c:612
 msgid "timestamp for log (see man strftime for date/time specifiers)"
 msgstr ""
 "fecha y hora para los registros (ver man strftime para el formato de fecha/"
 "hora)"
 
-#: src/common/weeconfig.c:620 src/common/weeconfig.c:621
+#: src/common/weeconfig.c:615 src/common/weeconfig.c:616
 msgid "hide password displayed by nickserv"
 msgstr "ocultar contraseña mostrada por nickserv"
 
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:639
 msgid "display message to all channels when away"
 msgstr "mostrar mensaje en todos los canales cuando se está ausente"
 
-#: src/common/weeconfig.c:643
+#: src/common/weeconfig.c:640
 msgid "display message to all channels when (un)marking as away"
 msgstr ""
 "mostrar mensaje en todos los canales cuando se vuelva del estado ausente"
 
-#: src/common/weeconfig.c:646 src/common/weeconfig.c:647
+#: src/common/weeconfig.c:643 src/common/weeconfig.c:644
 msgid "default message when away"
 msgstr "mensaje por defecto para el estado ausente"
 
-#: src/common/weeconfig.c:650 src/common/weeconfig.c:651
+#: src/common/weeconfig.c:647 src/common/weeconfig.c:648
 msgid "default part message (leaving channel)"
 msgstr "mensaje por defecto de salida (saliendo de un canal)"
 
-#: src/common/weeconfig.c:654
+#: src/common/weeconfig.c:651
 msgid "default quit message"
 msgstr "mensaje de fin por defecto"
 
-#: src/common/weeconfig.c:655
+#: src/common/weeconfig.c:652
 msgid ""
 "default quit message ('%v' will be replaced by WeeChat version in string)"
 msgstr ""
 "mensaje de fin por defecto ('%v' será reemplazado por la versión de WeeChat "
 "en la cadena)"
 
-#: src/common/weeconfig.c:658 src/common/weeconfig.c:659
+#: src/common/weeconfig.c:655 src/common/weeconfig.c:656
 msgid "display notices as private messages"
 msgstr ""
 
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:659
 msgid "interval between two checks for away"
 msgstr "intervalo entre dos comprobaciones de ausencia"
 
-#: src/common/weeconfig.c:663
+#: src/common/weeconfig.c:660
 msgid "interval between two checks for away (in minutes, 0 = never check)"
 msgstr ""
 "intervalo entre dos comprobaciones de ausencia (en minutos, 0 = no comprobar)"
 
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:663
 msgid "interval between two checks for lag"
 msgstr "intervalo entre dos medidas de lag (retraso)"
 
-#: src/common/weeconfig.c:667
+#: src/common/weeconfig.c:664
 msgid "interval between two checks for lag (in seconds)"
 msgstr "intervalo entre dos medidas de lag (en segundos)"
 
-#: src/common/weeconfig.c:670
+#: src/common/weeconfig.c:667
 msgid "minimum lag to show"
 msgstr "lag (retraso) mínimo a mostrar"
 
-#: src/common/weeconfig.c:671
+#: src/common/weeconfig.c:668
 msgid "minimum lag to show (in seconds)"
 msgstr "lag mínimo a mostrar (en segundos)"
 
-#: src/common/weeconfig.c:674
+#: src/common/weeconfig.c:671
 msgid "disconnect after important lag"
 msgstr "desconexión tras un lag importante"
 
-#: src/common/weeconfig.c:675
+#: src/common/weeconfig.c:672
 msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
 msgstr ""
 "desconexión tras un lag importante (en minutos, 0 = no desconectar nunca)"
 
-#: src/common/weeconfig.c:678 src/common/weeconfig.c:679
+#: src/common/weeconfig.c:675 src/common/weeconfig.c:676
 msgid "create a FIFO pipe for remote control"
 msgstr "crea una tubería FIFO para control remoto"
 
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:679
 msgid "list of words to highlight"
 msgstr ""
 
-#: src/common/weeconfig.c:683
+#: src/common/weeconfig.c:680
 msgid ""
 "comma separated list of words to highlight (case insensitive comparison, "
 "words may begin or end with \"*\" for partial match)"
 msgstr ""
 
-#: src/common/weeconfig.c:705
+#: src/common/weeconfig.c:684 src/common/weeconfig.c:685
+#, fuzzy
+msgid "keep colors from incoming messages"
+msgstr "quitar colores en los mensajes entrantes"
+
+#: src/common/weeconfig.c:688
+msgid "allow user to send colors"
+msgstr ""
+
+#: src/common/weeconfig.c:689
+msgid ""
+"allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %"
+"U=underline, %R=reverse)"
+msgstr ""
+
+#: src/common/weeconfig.c:711
 msgid "automatically accept dcc files"
 msgstr "aceptar automáticamente los ficheros dcc"
 
-#: src/common/weeconfig.c:706
+#: src/common/weeconfig.c:712
 msgid "automatically accept incoming dcc files"
 msgstr "aceptar automáticamente los ficheros dcc entrantes"
 
-#: src/common/weeconfig.c:709
+#: src/common/weeconfig.c:715
 msgid "automatically accept dcc chats"
 msgstr "aceptar automáticamente las peticiones de conversación dcc"
 
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:716
 msgid "automatically accept dcc chats (use carefully!)"
 msgstr ""
 "aceptar automáticamente las peticiones de conversación dcc (¡utilizar con "
 "precaución!)"
 
-#: src/common/weeconfig.c:713
+#: src/common/weeconfig.c:719
 msgid "timeout for dcc request"
 msgstr "tiempo de espera (timeout) para la petición dcc"
 
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:720
 msgid "timeout for dcc request (in seconds)"
 msgstr "tiempo de espera para la petición dcc (en segundos)"
 
-#: src/common/weeconfig.c:717
+#: src/common/weeconfig.c:723
 msgid "block size for dcc packets"
 msgstr "tamaño de bloque para los paquetes dcc"
 
-#: src/common/weeconfig.c:718
+#: src/common/weeconfig.c:724
 msgid "block size for dcc packets in bytes (default: 65536)"
 msgstr "tamaño de bloque para los paquetes dcc en bytes (por defecto: 65536)"
 
-#: src/common/weeconfig.c:721
+#: src/common/weeconfig.c:727
 msgid "allowed ports for outgoing dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:728
 msgid ""
 "restricts outgoing dcc to use only ports in the given range (useful for NAT) "
 "(syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, empty value "
 "means any port)"
 msgstr ""
 
-#: src/common/weeconfig.c:727
+#: src/common/weeconfig.c:733
 msgid "IP address for outgoing dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:728
+#: src/common/weeconfig.c:734
 msgid ""
 "IP or DNS address used for outgoing dcc (if empty, local interface IP is "
 "used)"
 msgstr ""
 
-#: src/common/weeconfig.c:732
+#: src/common/weeconfig.c:738
 msgid "path for incoming files with dcc"
 msgstr "ruta para los ficheros recibidos con dcc"
 
-#: src/common/weeconfig.c:733
+#: src/common/weeconfig.c:739
 msgid "path for writing incoming files with dcc (default: user home)"
 msgstr ""
 "ruta para los ficheros recibidos con dcc (por defecto: directorio home del "
 "usuario)"
 
-#: src/common/weeconfig.c:736
+#: src/common/weeconfig.c:742
 msgid "default path for sending files with dcc"
 msgstr "ruta por defecto para enviar ficheros con dcc"
 
-#: src/common/weeconfig.c:737
+#: src/common/weeconfig.c:743
 msgid ""
 "path for reading files when sending thru dcc (when no path is specified)"
 msgstr ""
 "ruta para la lectura de ficheros cuando se envían a través de dcc (cuando no "
 "se especifica una ruta)"
 
-#: src/common/weeconfig.c:740 src/common/weeconfig.c:741
+#: src/common/weeconfig.c:746 src/common/weeconfig.c:747
 msgid "convert spaces to underscores when sending files"
 msgstr "convertir los espacios a subrayados cuando se envían los ficheros"
 
-#: src/common/weeconfig.c:744
+#: src/common/weeconfig.c:750
 msgid "automatically rename dcc files if already exists"
 msgstr "renombrar automáticamente los ficheros dcc si ya existen"
 
-#: src/common/weeconfig.c:745
+#: src/common/weeconfig.c:751
 msgid "rename incoming files if already exists (add '.1', '.2', ...)"
 msgstr ""
 "renombrar los ficheros recibidos si ya existen (añadir '.1', '.2', ...)"
 
-#: src/common/weeconfig.c:748
+#: src/common/weeconfig.c:754
 msgid "automatically resume aborted transfers"
 msgstr "continuar automáticamente las transferencias canceladas"
 
-#: src/common/weeconfig.c:749
+#: src/common/weeconfig.c:755
 msgid ""
 "automatically resume dcc transfer if connection with remote host is loosed"
 msgstr ""
 "continuar automáticamente la transferencia dcc si se ha perdido la conexión "
 "con la máquina remota"
 
-#: src/common/weeconfig.c:768
+#: src/common/weeconfig.c:774
 msgid "use proxy"
 msgstr "utilizar un proxy"
 
-#: src/common/weeconfig.c:769
+#: src/common/weeconfig.c:775
 msgid "use a proxy server to connect to irc server"
 msgstr "utilizar un proxy para conectarse al servidor irc"
 
-#: src/common/weeconfig.c:772
+#: src/common/weeconfig.c:778
 msgid "proxy type"
 msgstr "tipo de proxy"
 
-#: src/common/weeconfig.c:773
+#: src/common/weeconfig.c:779
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "tipo de proxy(http (por defecto), socks4, socks5)"
 
-#: src/common/weeconfig.c:776
+#: src/common/weeconfig.c:782
 msgid "use ipv6 proxy"
 msgstr "usar proxy ipv6"
 
-#: src/common/weeconfig.c:777
+#: src/common/weeconfig.c:783
 msgid "connect to proxy in ipv6"
 msgstr "conectar al proxy en ipv6"
 
-#: src/common/weeconfig.c:780
+#: src/common/weeconfig.c:786
 msgid "proxy address"
 msgstr "dirección del proxy"
 
-#: src/common/weeconfig.c:781
+#: src/common/weeconfig.c:787
 msgid "proxy server address (IP or hostname)"
 msgstr "dirección del servidor proxy (IP o nombre de máquina)"
 
-#: src/common/weeconfig.c:784
+#: src/common/weeconfig.c:790
 msgid "port for proxy"
 msgstr "puerto para el proxy"
 
-#: src/common/weeconfig.c:785
+#: src/common/weeconfig.c:791
 msgid "port for connecting to proxy server"
 msgstr "puerto para conectarse al servidor proxy"
 
-#: src/common/weeconfig.c:788
+#: src/common/weeconfig.c:794
 msgid "proxy username"
 msgstr "nombre de usuario del proxy"
 
-#: src/common/weeconfig.c:789
+#: src/common/weeconfig.c:795
 msgid "username for proxy server"
 msgstr "nombre de usuario para el servidor proxy"
 
-#: src/common/weeconfig.c:792
+#: src/common/weeconfig.c:798
 msgid "proxy password"
 msgstr "contraseña para el proxy"
 
-#: src/common/weeconfig.c:793
+#: src/common/weeconfig.c:799
 msgid "password for proxy server"
 msgstr "contraseña para el servidor proxy"
 
-#: src/common/weeconfig.c:806 src/common/weeconfig.c:807
+#: src/common/weeconfig.c:812 src/common/weeconfig.c:813
 msgid "path for searching plugins"
 msgstr ""
 
-#: src/common/weeconfig.c:810
+#: src/common/weeconfig.c:816
 msgid "list of plugins to load automatically"
 msgstr ""
 
-#: src/common/weeconfig.c:811
+#: src/common/weeconfig.c:817
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found (names may be partial, for example \"perl\" is ok "
 "for \"libperl.so\")"
 msgstr ""
 
-#: src/common/weeconfig.c:816
+#: src/common/weeconfig.c:822
 msgid "standard plugins extension in filename"
 msgstr ""
 
-#: src/common/weeconfig.c:817
+#: src/common/weeconfig.c:823
 msgid ""
 "standard plugins extension in filename, used for autoload (if empty, then "
 "all files are loaded when autoload is \"*\")"
 msgstr ""
 
-#: src/common/weeconfig.c:834
+#: src/common/weeconfig.c:840
 msgid "server name"
 msgstr "nombre de servidor"
 
-#: src/common/weeconfig.c:835
+#: src/common/weeconfig.c:841
 msgid "name associated to IRC server (for display only)"
 msgstr "nombre asociado al servidor IRC (para mostrar solamente)"
 
-#: src/common/weeconfig.c:838
+#: src/common/weeconfig.c:844
 msgid "automatically connect to server"
 msgstr "conexión automática al servidor"
 
-#: src/common/weeconfig.c:839
+#: src/common/weeconfig.c:845
 msgid "automatically connect to server when WeeChat is starting"
 msgstr "conexión automática al servidor cuando WeeChat esté arrancando"
 
-#: src/common/weeconfig.c:842
+#: src/common/weeconfig.c:848
 msgid "automatically reconnect to server"
 msgstr "reconexión automática al servidor"
 
-#: src/common/weeconfig.c:843
+#: src/common/weeconfig.c:849
 msgid "automatically reconnect to server when disconnected"
 msgstr "reconexión automática al servidor tras una desconexión"
 
-#: src/common/weeconfig.c:846
+#: src/common/weeconfig.c:852
 msgid "delay before trying again to reconnect"
 msgstr "esperar antes de intentar de nuevo una reconexión"
 
-#: src/common/weeconfig.c:847
+#: src/common/weeconfig.c:853
 msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr ""
 "espera (en segundos) antes de intentar de nuevo una reconexión al servidor"
 
-#: src/common/weeconfig.c:850
+#: src/common/weeconfig.c:856
 msgid "server address or hostname"
 msgstr "dirección o nombre de máquina del servidor"
 
-#: src/common/weeconfig.c:851
+#: src/common/weeconfig.c:857
 msgid "IP address or hostname of IRC server"
 msgstr "dirección IP o nombre de máquina del servidor IRC"
 
-#: src/common/weeconfig.c:854
+#: src/common/weeconfig.c:860
 msgid "port for IRC server"
 msgstr "puerto para el servidor IRC"
 
-#: src/common/weeconfig.c:855
+#: src/common/weeconfig.c:861
 msgid "port for connecting to server"
 msgstr "puerto para conectarse al servidor"
 
-#: src/common/weeconfig.c:858 src/common/weeconfig.c:859
+#: src/common/weeconfig.c:864 src/common/weeconfig.c:865
 msgid "use IPv6 protocol for server communication"
 msgstr "usar el protocolo IPv6 para la comunicación del servidor"
 
-#: src/common/weeconfig.c:862 src/common/weeconfig.c:863
+#: src/common/weeconfig.c:868 src/common/weeconfig.c:869
 msgid "use SSL for server communication"
 msgstr "usar SSL para la comunicación del servidor"
 
-#: src/common/weeconfig.c:866
+#: src/common/weeconfig.c:872
 msgid "server password"
 msgstr "contraseña para el servidor"
 
-#: src/common/weeconfig.c:867
+#: src/common/weeconfig.c:873
 msgid "password for IRC server"
 msgstr "contraseña para el servidor IRC"
 
-#: src/common/weeconfig.c:870
+#: src/common/weeconfig.c:876
 msgid "nickname for server"
 msgstr "nombre de usuario para el servidor"
 
-#: src/common/weeconfig.c:871
+#: src/common/weeconfig.c:877
 msgid "nickname to use on IRC server"
 msgstr "nombre de usuario a utilizar en el servidor IRC"
 
-#: src/common/weeconfig.c:874
+#: src/common/weeconfig.c:880
 msgid "alternate nickname for server"
 msgstr "nombre de usuario alternativo para el servidor"
 
-#: src/common/weeconfig.c:875
+#: src/common/weeconfig.c:881
 msgid "alternate nickname to use on IRC server (if nickname is already used)"
 msgstr ""
 "nombre de usuario alternativo para el servidor IRC (si el nombre de usuario "
 "ya está en uso)"
 
-#: src/common/weeconfig.c:878
+#: src/common/weeconfig.c:884
 msgid "2nd alternate nickname for server"
 msgstr "segundo nombre de usuario alternativo para el servidor"
 
-#: src/common/weeconfig.c:879
+#: src/common/weeconfig.c:885
 msgid ""
 "2nd alternate nickname to use on IRC server (if alternate nickname is "
 "already used)"
@@ -4343,31 +4377,31 @@ msgstr ""
 "segundo nombre de usuario alternativo a utilizar en el servidor IRC (si el "
 "nombre de usuario alternativo ya está en uso)"
 
-#: src/common/weeconfig.c:882
+#: src/common/weeconfig.c:888
 msgid "user name for server"
 msgstr "nombre de usuario para el servidor"
 
-#: src/common/weeconfig.c:883
+#: src/common/weeconfig.c:889
 msgid "user name to use on IRC server"
 msgstr "nombre de usuario para el servidor IRC"
 
-#: src/common/weeconfig.c:886
+#: src/common/weeconfig.c:892
 msgid "real name for server"
 msgstr "nombre real para el servidor"
 
-#: src/common/weeconfig.c:887
+#: src/common/weeconfig.c:893
 msgid "real name to use on IRC server"
 msgstr "nombre real para el servidor IRC"
 
-#: src/common/weeconfig.c:890 src/common/weeconfig.c:891
+#: src/common/weeconfig.c:896 src/common/weeconfig.c:897
 msgid "first command to run when connected to server"
 msgstr "primer comando a ejecutar cuando se conecte a un servidor"
 
-#: src/common/weeconfig.c:894
+#: src/common/weeconfig.c:900
 msgid "delay (in seconds) after command was executed"
 msgstr "espera (en segundos) después de que el comando sea ejecutado"
 
-#: src/common/weeconfig.c:895
+#: src/common/weeconfig.c:901
 msgid ""
 "delay (in seconds) after command was executed (example: give some time for "
 "authentication)"
@@ -4375,11 +4409,11 @@ msgstr ""
 "espera (en segundos) después de que el comando sea ejecutado (ejemplo: dar "
 "algo de tiempo para la autenticación)"
 
-#: src/common/weeconfig.c:898
+#: src/common/weeconfig.c:904
 msgid "list of channels to join when connected to server"
 msgstr "lista de canales a unirse cuando se conecte a un servidor"
 
-#: src/common/weeconfig.c:899
+#: src/common/weeconfig.c:905
 msgid ""
 "comma separated list of channels to join when connected to server (example: "
 "\"#chan1,#chan2,#chan3 key1,key2\")"
@@ -4387,15 +4421,15 @@ msgstr ""
 "lista de canales (separados por comas) a unirse cuando se conecte a un "
 "servidor (ejemplo: \"#chan1,#chan2,#chan3 key1,key2\")"
 
-#: src/common/weeconfig.c:902 src/common/weeconfig.c:903
+#: src/common/weeconfig.c:908 src/common/weeconfig.c:909
 msgid "automatically rejoin channels when kicked"
 msgstr "unirse de nuevo automáticamente a los canales cuando sea expulsado"
 
-#: src/common/weeconfig.c:906
+#: src/common/weeconfig.c:912
 msgid "notify levels for channels of this server"
 msgstr "niveles de notificación para canales de este servidor"
 
-#: src/common/weeconfig.c:907
+#: src/common/weeconfig.c:913
 msgid ""
 "comma separated list of notify levels for channels of this server (format: "
 "#channel:1,..)"
@@ -4403,62 +4437,62 @@ msgstr ""
 "lista separada por comas de niveles de notificación para canales de este "
 "servidor (formato: #canal:1,...)"
 
-#: src/common/weeconfig.c:1463
+#: src/common/weeconfig.c:1469
 #, c-format
 msgid "%s %s, line %d: new server, but previous was incomplete\n"
 msgstr "%s %s, línea %d: nuevo servidor, pero el anterior estaba incompleto\n"
 
-#: src/common/weeconfig.c:1472
+#: src/common/weeconfig.c:1478
 #, c-format
 msgid "%s %s, line %d: server '%s' already exists\n"
 msgstr "%s %s, línea %d: el servidor '%s' ya existe\n"
 
-#: src/common/weeconfig.c:1487
+#: src/common/weeconfig.c:1493
 #, c-format
 msgid "%s %s, line %d: unable to create server\n"
 msgstr "%s %s, línea %d: no es posible crear el servidor\n"
 
-#: src/common/weeconfig.c:1527
+#: src/common/weeconfig.c:1533
 #, c-format
 msgid "%s unable to assign default int with string (\"%s\")\n"
 msgstr "%s no es posible asignar el valor entero con la cadena (\"%s\")\n"
 
-#: src/common/weeconfig.c:1538
+#: src/common/weeconfig.c:1544
 #, c-format
 msgid "%s unable to assign default color (\"%s\")\n"
 msgstr "%s no es posible asignar el color por defecto (\"%s\")\n"
 
-#: src/common/weeconfig.c:1578
+#: src/common/weeconfig.c:1584
 #, c-format
 msgid "%s config file \"%s\" not found.\n"
 msgstr "%s fichero de configuración \"%s\" no encontrado.\n"
 
-#: src/common/weeconfig.c:1610
+#: src/common/weeconfig.c:1616
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
 msgstr "%s %s, línea %d: sintaxis inválida, falta \"]\"\n"
 
-#: src/common/weeconfig.c:1627
+#: src/common/weeconfig.c:1633
 #, c-format
 msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
 msgstr "%s %s, línea %d: identificador de sección desconocido (\"%s\")\n"
 
-#: src/common/weeconfig.c:1645
+#: src/common/weeconfig.c:1651
 #, c-format
 msgid "%s %s, line %d: invalid section for option, line is ignored\n"
 msgstr "%s %s, línea %d: sección inválida para la opción, línea ignorada\n"
 
-#: src/common/weeconfig.c:1690 src/common/weeconfig.c:1716
+#: src/common/weeconfig.c:1696 src/common/weeconfig.c:1722
 #, c-format
 msgid "%s %s, line %d: invalid option \"%s\"\n"
 msgstr "%s %s, línea %d: opción \"%s\" inválida\n"
 
-#: src/common/weeconfig.c:1696
+#: src/common/weeconfig.c:1702
 #, c-format
 msgid "%s %s, line %d: invalid ignore options \"%s\"\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1727
+#: src/common/weeconfig.c:1733
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value foroption '%s'\n"
@@ -4467,7 +4501,7 @@ msgstr ""
 "%s %s, línea %d: valor inválido para la opción '%s'\n"
 "Esperado: valor booleano: 'off' u 'on'\n"
 
-#: src/common/weeconfig.c:1736
+#: src/common/weeconfig.c:1742
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4476,7 +4510,7 @@ msgstr ""
 "%s %s, línea %d: valor inválido para la opción %s'\n"
 "Esperado: entero comprendido entre %d y %d\n"
 
-#: src/common/weeconfig.c:1747
+#: src/common/weeconfig.c:1753
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4485,21 +4519,21 @@ msgstr ""
 "%s %s, línea %d: valor inválido para la opción '%s'\n"
 "Esperado: una de estas cadenas: "
 
-#: src/common/weeconfig.c:1763
+#: src/common/weeconfig.c:1769
 #, c-format
 msgid "%s %s, line %d: invalid color name for option '%s'\n"
 msgstr "%s %s, línea %d: nombre de color inválido para la opción '%s'\n"
 
-#: src/common/weeconfig.c:1832
+#: src/common/weeconfig.c:1838
 #, c-format
 msgid "%s: creating default config file...\n"
 msgstr "%s: creando fichero de configuración por defecto...\n"
 
-#: src/common/weeconfig.c:1833
+#: src/common/weeconfig.c:1839
 msgid "Creating default config file\n"
 msgstr "Creando fichero de configuración por defecto\n"
 
-#: src/common/weeconfig.c:1836 src/common/weeconfig.c:2033
+#: src/common/weeconfig.c:1842 src/common/weeconfig.c:2039
 #, c-format
 msgid ""
 "#\n"
@@ -4508,7 +4542,7 @@ msgstr ""
 "#\n"
 "# %s: fichero de configuración, creado por %s v%s el %s"
 
-#: src/common/weeconfig.c:1840 src/common/weeconfig.c:2037
+#: src/common/weeconfig.c:1846 src/common/weeconfig.c:2043
 #, c-format
 msgid ""
 "# WARNING! Be careful when editing this file, WeeChat writes this file when "
@@ -4516,6 +4550,118 @@ msgid ""
 "#\n"
 msgstr ""
 
-#: src/common/weeconfig.c:2030
+#: src/common/weeconfig.c:2036
 msgid "Saving config to disk\n"
 msgstr "Guardar configuración a disco\n"
+
+#~ msgid "%s Command '%s' failed!\n"
+#~ msgstr "%s ¡Ha fallado el comando '%s' !\n"
+
+#~ msgid "by"
+#~ msgstr "por"
+
+#~ msgid " has joined "
+#~ msgstr " se ha unido "
+
+#~ msgid " has kicked "
+#~ msgstr " se ha expulsado "
+
+#~ msgid " has killed "
+#~ msgstr "ha matado"
+
+#~ msgid " from server"
+#~ msgstr "del servidor"
+
+#~ msgid " from server\n"
+#~ msgstr "del servidor\n"
+
+#~ msgid "mode changed by"
+#~ msgstr "modo cambiado por"
+
+#~ msgid "You are "
+#~ msgstr "Usted es "
+
+#~ msgid " is "
+#~ msgstr "es "
+
+#~ msgid "reply from"
+#~ msgstr "respuesta de"
+
+#~ msgid ": %ld.%ld seconds\n"
+#~ msgstr ": %ld.%ld segundos\n"
+
+#~ msgid " has left "
+#~ msgstr " ha salido "
+
+#~ msgid "received from"
+#~ msgstr "recibido de"
+
+#~ msgid "has quit"
+#~ msgstr "ha salido"
+
+#~ msgid " to: \"%s\"\n"
+#~ msgstr " a: \"%s\"\n"
+
+#~ msgid "idle: "
+#~ msgstr "sin actividad: "
+
+#~ msgid "signon at: "
+#~ msgstr "firmado el: "
+
+#~ msgid "Channels: "
+#~ msgstr "Canales: "
+
+#~ msgid "Topic for "
+#~ msgstr "El tema para "
+
+#~ msgid " is: \"%s\"\n"
+#~ msgstr " es: \"%s\"\n"
+
+#~ msgid "has invited"
+#~ msgstr "ha invitado"
+
+#~ msgid "Nicks "
+#~ msgstr "Usuarios "
+
+#~ msgid "Channel "
+#~ msgstr "Canal "
+
+#~ msgid "banned by"
+#~ msgstr "baneado por"
+
+#~ msgid ": ok!\n"
+#~ msgstr ": ok!\n"
+
+#~ msgid "Connected to "
+#~ msgstr "Conectado al "
+
+#~ msgid "via DCC chat\n"
+#~ msgstr "con charla DCC\n"
+
+#~ msgid "Incoming DCC file from "
+#~ msgstr "Recibir fichero DCC de "
+
+#~ msgid " bytes\n"
+#~ msgstr " bytes\n"
+
+#~ msgid "Sending DCC file to "
+#~ msgstr "Enviar fichero DCC a "
+
+#~ msgid "Not enough memory for new message\n"
+#~ msgstr ""
+#~ "No hay suficiente memoria para el mensaje de la barra de información\n"
+
+#~ msgid "Channel: "
+#~ msgstr "Canal: "
+
+#~ msgid " (server: "
+#~ msgstr " (servidor: "
+
+#~ msgid "Private with: "
+#~ msgstr "Privado con: "
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid "created\n"
+#~ msgstr "creado\n"
diff --git a/po/fr.po b/po/fr.po
index 491663de8..2c4013b29 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.6-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-10-30 10:52+0100\n"
-"PO-Revision-Date: 2005-10-30 10:53+0100\n"
+"POT-Creation-Date: 2005-11-04 12:35+0100\n"
+"PO-Revision-Date: 2005-11-04 12:35+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,88 +20,88 @@ msgstr ""
 msgid "%s cannot allocate new nick\n"
 msgstr "%s impossible d'allouer un nouveau pseudo\n"
 
-#: src/irc/irc-server.c:180 src/common/weeconfig.c:1968
+#: src/irc/irc-server.c:181 src/common/weeconfig.c:1974
 msgid "Unable to get user's name"
 msgstr "Impossible de déterminer le nom d'utilisateur"
 
-#: src/irc/irc-server.c:248
+#: src/irc/irc-server.c:249
 #, c-format
 msgid "%s cannot allocate new server\n"
 msgstr "%s impossible d'allouer un nouveau serveur\n"
 
-#: src/irc/irc-server.c:466
+#: src/irc/irc-server.c:467
 #, c-format
 msgid "%s error sending data to IRC server\n"
 msgstr "%s erreur d'envoi de données au serveur IRC\n"
 
-#: src/irc/irc-server.c:489 src/irc/irc-server.c:502 src/irc/irc-server.c:549
-#: src/irc/irc-server.c:562
+#: src/irc/irc-server.c:490 src/irc/irc-server.c:503 src/irc/irc-server.c:550
+#: src/irc/irc-server.c:563
 #, c-format
 msgid "%s not enough memory for received IRC message\n"
 msgstr "%s mémoire insuffisante pour un message IRC reçu\n"
 
-#: src/irc/irc-server.c:674
+#: src/irc/irc-server.c:675
 #, c-format
-msgid "%s Command '%s' failed!\n"
-msgstr "%s La commande '%s' a échoué !\n"
+msgid "%s Command \"%s\" failed!\n"
+msgstr "%s La commande \"%s\" a échoué !\n"
 
-#: src/irc/irc-server.c:680
+#: src/irc/irc-server.c:681
 #, c-format
 msgid "%s No command to execute!\n"
 msgstr "%s Pas de commande à exécuter !\n"
 
-#: src/irc/irc-server.c:686
+#: src/irc/irc-server.c:687
 #, c-format
-msgid "%s Unknown command: cmd=%s, host=%s, args=%s\n"
-msgstr "%s Commande inconnue: cmd=%s, hote=%s, params=%s\n"
+msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
+msgstr "%s Commande inconnue: cmd=\"%s\", hote=\"%s\", params=\"%s\"\n"
 
-#: src/irc/irc-server.c:737
+#: src/irc/irc-server.c:738
 #, c-format
 msgid "%s cannot read data from socket, disconnecting from server...\n"
 msgstr ""
 "%s impossible de lire des données sur la socket, déconnexion du serveur...\n"
 
-#: src/irc/irc-server.c:820
+#: src/irc/irc-server.c:821
 #, c-format
 msgid "%s: Reconnecting to server in %d seconds\n"
 msgstr "%s: Reconnexion au serveur dans %d secondes\n"
 
-#: src/irc/irc-server.c:854
+#: src/irc/irc-server.c:855
 #, c-format
 msgid "%s gnutls handshake failed\n"
 msgstr "%s le handshake gnutls a échoué\n"
 
-#: src/irc/irc-server.c:871
+#: src/irc/irc-server.c:872
 #, c-format
 msgid "%s proxy address \"%s\" not found\n"
 msgstr "%s adresse du proxy \"%s\" introuvable\n"
 
-#: src/irc/irc-server.c:875
+#: src/irc/irc-server.c:876
 #, c-format
 msgid "%s address \"%s\" not found\n"
 msgstr "%s adresse \"%s\" introuvable\n"
 
-#: src/irc/irc-server.c:885
+#: src/irc/irc-server.c:886
 #, c-format
 msgid "%s proxy IP address not found\n"
 msgstr "%s adresse IP du proxy introuvable\n"
 
-#: src/irc/irc-server.c:888
+#: src/irc/irc-server.c:889
 #, c-format
 msgid "%s IP address not found\n"
 msgstr "%s adresse IP introuvable\n"
 
-#: src/irc/irc-server.c:897
+#: src/irc/irc-server.c:898
 #, c-format
 msgid "%s proxy connection refused\n"
 msgstr "%s connexion au proxy refusée\n"
 
-#: src/irc/irc-server.c:900
+#: src/irc/irc-server.c:901
 #, c-format
 msgid "%s connection refused\n"
 msgstr "%s connexion refusée\n"
 
-#: src/irc/irc-server.c:908
+#: src/irc/irc-server.c:909
 #, c-format
 msgid ""
 "%s proxy fails to establish connection to server (check username/password if "
@@ -110,7 +110,7 @@ msgstr ""
 "%s le proxy n'a pas pu se connecter au serveur (vérifiez l'utilisateur/mot "
 "de passe si utilisés)\n"
 
-#: src/irc/irc-server.c:1387
+#: src/irc/irc-server.c:1388
 #, c-format
 msgid ""
 "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -118,57 +118,57 @@ msgstr ""
 "%s impossible de se connecter en SSL car WeeChat n'a pas été construit avec "
 "le support GNUtls\n"
 
-#: src/irc/irc-server.c:1396
+#: src/irc/irc-server.c:1397
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr "%s: connexion au serveur %s:%d%s%s via le proxy %s %s:%d%s...\n"
 
-#: src/irc/irc-server.c:1402
+#: src/irc/irc-server.c:1403
 #, c-format
 msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr "Connexion au serveur %s:%d%s%s via le proxy %s %s:%d%s...\n"
 
-#: src/irc/irc-server.c:1412
+#: src/irc/irc-server.c:1413
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s...\n"
 msgstr "%s: connexion au serveur %s:%d%s%s...\n"
 
-#: src/irc/irc-server.c:1416
+#: src/irc/irc-server.c:1417
 #, c-format
 msgid "Connecting to server %s:%d%s%s...\n"
 msgstr "Connexion au serveur %s:%d%s%s...\n"
 
-#: src/irc/irc-server.c:1434
+#: src/irc/irc-server.c:1435
 #, c-format
 msgid "%s gnutls init error\n"
 msgstr "%s erreur d'initialisation gnutls\n"
 
-#: src/irc/irc-server.c:1449
+#: src/irc/irc-server.c:1450
 #, c-format
 msgid "%s cannot create pipe\n"
 msgstr "%s impossible de créer le pipe\n"
 
-#: src/irc/irc-server.c:1464
+#: src/irc/irc-server.c:1465
 #, c-format
 msgid "%s cannot create socket\n"
 msgstr "%s impossible de créer la socket\n"
 
-#: src/irc/irc-server.c:1475
+#: src/irc/irc-server.c:1476
 #, c-format
 msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
 msgstr "%s impossible de paramétrer l'option socket \"SO_REUSEADDR\"\n"
 
-#: src/irc/irc-server.c:1486
+#: src/irc/irc-server.c:1487
 #, c-format
 msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
 msgstr "%s impossible de paramétrer l'option socket \"SO_KEEPALIVE\"\n"
 
-#: src/irc/irc-server.c:1517
+#: src/irc/irc-server.c:1518
 #, c-format
 msgid "%s: Reconnecting to server...\n"
 msgstr "%s: Reconnexion au serveur...\n"
 
-#: src/irc/irc-server.c:1567 src/irc/irc-server.c:1576
+#: src/irc/irc-server.c:1568 src/irc/irc-server.c:1577
 msgid "Disconnected from server!\n"
 msgstr "Déconnecté du serveur !\n"
 
@@ -970,7 +970,7 @@ msgstr ""
 #: src/irc/irc-commands.c:380 src/irc/irc-commands.c:381
 #: src/irc/irc-commands.c:382 src/irc/irc-commands.c:383
 #: src/irc/irc-commands.c:384 src/irc/irc-commands.c:385
-#: src/irc/irc-commands.c:490
+#: src/irc/irc-commands.c:491
 msgid "a server message"
 msgstr "un message du serveur"
 
@@ -1151,244 +1151,249 @@ msgid "you are now an IRC operator"
 msgstr "vous êtes maintenant un opérateur IRC"
 
 #: src/irc/irc-commands.c:387
+msgid "rehashing"
+msgstr "rechargement"
+
+#: src/irc/irc-commands.c:388
 msgid "server local time"
 msgstr "heure locale du serveur"
 
-#: src/irc/irc-commands.c:388
+#: src/irc/irc-commands.c:389
 msgid "no such nick/channel"
 msgstr "pas de tel utilisateur/canal"
 
-#: src/irc/irc-commands.c:390
+#: src/irc/irc-commands.c:391
 msgid "no such server"
 msgstr "pas de tel serveur"
 
-#: src/irc/irc-commands.c:392
+#: src/irc/irc-commands.c:393
 msgid "no such channel"
 msgstr "pas de tel canal"
 
-#: src/irc/irc-commands.c:394
+#: src/irc/irc-commands.c:395
 msgid "cannot send to channel"
 msgstr "impossible d'envoyer au canal"
 
-#: src/irc/irc-commands.c:396
+#: src/irc/irc-commands.c:397
 msgid "too many channels"
 msgstr "trop de canaux"
 
-#: src/irc/irc-commands.c:398 src/irc/irc-commands.c:400
+#: src/irc/irc-commands.c:399 src/irc/irc-commands.c:401
 msgid "was no such nick"
 msgstr "n'y avait pas de tel utilisateur"
 
-#: src/irc/irc-commands.c:402
+#: src/irc/irc-commands.c:403
 msgid "no origin"
 msgstr "pas d'origine"
 
-#: src/irc/irc-commands.c:404
+#: src/irc/irc-commands.c:405
 msgid "no services"
 msgstr "pas de service"
 
-#: src/irc/irc-commands.c:406
+#: src/irc/irc-commands.c:407
 msgid "no recipient"
 msgstr "pas de destinataire"
 
-#: src/irc/irc-commands.c:408
+#: src/irc/irc-commands.c:409
 msgid "no text to send"
 msgstr "pas de texte à envoyer"
 
-#: src/irc/irc-commands.c:410
+#: src/irc/irc-commands.c:411
 msgid "no toplevel"
 msgstr "pas de niveau supérieur"
 
-#: src/irc/irc-commands.c:412
+#: src/irc/irc-commands.c:413
 msgid "wilcard in toplevel domain"
 msgstr "caractère joker dans le domaine de niveau supérieur"
 
-#: src/irc/irc-commands.c:414
+#: src/irc/irc-commands.c:415
 msgid "unknown command"
 msgstr "commande inconnue"
 
-#: src/irc/irc-commands.c:416
+#: src/irc/irc-commands.c:417
 msgid "MOTD is missing"
 msgstr "MOTD est manquant"
 
-#: src/irc/irc-commands.c:418
+#: src/irc/irc-commands.c:419
 msgid "no administrative info"
 msgstr "pas d'information administrative"
 
-#: src/irc/irc-commands.c:420
+#: src/irc/irc-commands.c:421
 msgid "file error"
 msgstr "erreur de fichier"
 
-#: src/irc/irc-commands.c:422
+#: src/irc/irc-commands.c:423
 msgid "no nickname given"
 msgstr "pas d'utilisateur donné"
 
-#: src/irc/irc-commands.c:424
+#: src/irc/irc-commands.c:425
 msgid "erroneous nickname"
 msgstr "nom d'utilisateur erroné"
 
-#: src/irc/irc-commands.c:426
+#: src/irc/irc-commands.c:427
 msgid "nickname already in use"
 msgstr "nom d'utilisateur déjà en cours d'utilisation"
 
-#: src/irc/irc-commands.c:428
+#: src/irc/irc-commands.c:429
 msgid "nickname collision"
 msgstr "collision sur le nom d'utilisateur"
 
-#: src/irc/irc-commands.c:430
+#: src/irc/irc-commands.c:431
 msgid "not authorized to change nickname"
 msgstr "non autorisé à changer de pseudo"
 
-#: src/irc/irc-commands.c:432
+#: src/irc/irc-commands.c:433
 msgid "user not in channel"
 msgstr "utilisateur non présent dans le canal"
 
-#: src/irc/irc-commands.c:434
+#: src/irc/irc-commands.c:435
 msgid "not on channel"
 msgstr "non présent sur le canal"
 
-#: src/irc/irc-commands.c:436
+#: src/irc/irc-commands.c:437
 msgid "user already on channel"
 msgstr "utilisateur déjà sur le canal"
 
-#: src/irc/irc-commands.c:438
+#: src/irc/irc-commands.c:439
 msgid "user not logged in"
 msgstr "utilisateur non enregistré"
 
-#: src/irc/irc-commands.c:440
+#: src/irc/irc-commands.c:441
 msgid "summon has been disabled"
 msgstr "summon a été désactivé"
 
-#: src/irc/irc-commands.c:442
+#: src/irc/irc-commands.c:443
 msgid "users has been disabled"
 msgstr "users a été désactivé"
 
-#: src/irc/irc-commands.c:444
+#: src/irc/irc-commands.c:445
 msgid "you are not registered"
 msgstr "vous n'êtes pas enregistré"
 
-#: src/irc/irc-commands.c:446
+#: src/irc/irc-commands.c:447
 msgid "not enough parameters"
 msgstr "pas assez de paramètres"
 
-#: src/irc/irc-commands.c:448
+#: src/irc/irc-commands.c:449
 msgid "you may not register"
 msgstr "vous ne pouvez pas vous enregistrer"
 
-#: src/irc/irc-commands.c:450
+#: src/irc/irc-commands.c:451
 msgid "your host isn't among the privileged"
 msgstr "votre nom de machine n'est pas parmi les privilégiés"
 
-#: src/irc/irc-commands.c:452
+#: src/irc/irc-commands.c:453
 msgid "password incorrect"
 msgstr "mot de passe incorrect"
 
-#: src/irc/irc-commands.c:454
+#: src/irc/irc-commands.c:455
 msgid "you are banned from this server"
 msgstr "vous êtes banni de ce serveur"
 
-#: src/irc/irc-commands.c:456
+#: src/irc/irc-commands.c:457
 msgid "channel key already set"
 msgstr "clé du canal déjà définie"
 
-#: src/irc/irc-commands.c:458
+#: src/irc/irc-commands.c:459
 msgid "forwarding to another channel"
 msgstr "redirection vers un autre canal"
 
-#: src/irc/irc-commands.c:460
+#: src/irc/irc-commands.c:461
 msgid "channel is already full"
 msgstr "le canal est déjà plein"
 
-#: src/irc/irc-commands.c:462
+#: src/irc/irc-commands.c:463
 msgid "unknown mode char to me"
 msgstr "caractère de mode inconnu pour moi"
 
-#: src/irc/irc-commands.c:464
+#: src/irc/irc-commands.c:465
 msgid "cannot join channel (invite only)"
 msgstr "impossible de rejoindre le canal (invités seulement)"
 
-#: src/irc/irc-commands.c:466
+#: src/irc/irc-commands.c:467
 msgid "cannot join channel (banned from channel)"
 msgstr "impossible de rejoindre le canal (banni du canal)"
 
-#: src/irc/irc-commands.c:468
+#: src/irc/irc-commands.c:469
 msgid "cannot join channel (bad channel key)"
 msgstr "impossible de rejoindre le canal (mauvaise clé pour le canal)"
 
-#: src/irc/irc-commands.c:470
+#: src/irc/irc-commands.c:471
 msgid "bad channel mask"
 msgstr "mauvais masque de canal"
 
-#: src/irc/irc-commands.c:472
+#: src/irc/irc-commands.c:473
 msgid "channel doesn't support modes"
 msgstr "le canal ne supporte pas les modes"
 
-#: src/irc/irc-commands.c:474
+#: src/irc/irc-commands.c:475
 msgid "you're not an IRC operator"
 msgstr "vous n'êtres pas opérateur IRC"
 
-#: src/irc/irc-commands.c:476
+#: src/irc/irc-commands.c:477
 msgid "you're not channel operator"
 msgstr "vous n'êtes pas opérateur du canal"
 
-#: src/irc/irc-commands.c:478
+#: src/irc/irc-commands.c:479
 msgid "you can't kill a server!"
 msgstr "vous ne pouvez pas supprimer un serveur !"
 
-#: src/irc/irc-commands.c:480
+#: src/irc/irc-commands.c:481
 msgid "your connection is restricted!"
 msgstr "votre connexion est restreinte !"
 
-#: src/irc/irc-commands.c:482
+#: src/irc/irc-commands.c:483
 msgid "user is immune from kick/deop"
 msgstr "l'utilisateur est protégé des kick/deop"
 
-#: src/irc/irc-commands.c:484
+#: src/irc/irc-commands.c:485
 msgid "no O-lines for your host"
 msgstr "pas de O-lines pour votre nom de machine"
 
-#: src/irc/irc-commands.c:486
+#: src/irc/irc-commands.c:487
 msgid "unknown mode flag"
 msgstr "drapeau de mode inconnu"
 
-#: src/irc/irc-commands.c:488
+#: src/irc/irc-commands.c:489
 msgid "can't change mode for other users"
 msgstr "impossible de changer le mode pour les autres utilisateurs"
 
-#: src/irc/irc-commands.c:491
+#: src/irc/irc-commands.c:492
 msgid "whois (secure connection)"
 msgstr "qui est (connexion sécurisée)"
 
-#: src/irc/irc-display.c:170 src/common/command.c:873
-msgid "Server: "
-msgstr "Serveur: "
+#: src/irc/irc-display.c:180
+#, c-format
+msgid "%sServer: %s%s %s[%s%s%s]\n"
+msgstr "%sServeur: %s%s %s[%s%s%s]\n"
 
-#: src/irc/irc-display.c:175
+#: src/irc/irc-display.c:187
 msgid "connected"
 msgstr "connecté"
 
-#: src/irc/irc-display.c:175 src/common/command.c:899
+#: src/irc/irc-display.c:187
 msgid "not connected"
 msgstr "non connecté"
 
-#: src/irc/irc-display.c:179 src/irc/irc-display.c:184
-#: src/irc/irc-display.c:196 src/irc/irc-display.c:199
+#: src/irc/irc-display.c:191 src/irc/irc-display.c:195
+#: src/irc/irc-display.c:203 src/irc/irc-display.c:205
 msgid "yes"
 msgstr "oui"
 
-#: src/irc/irc-display.c:179 src/irc/irc-display.c:184
-#: src/irc/irc-display.c:196 src/irc/irc-display.c:199
+#: src/irc/irc-display.c:191 src/irc/irc-display.c:195
+#: src/irc/irc-display.c:203 src/irc/irc-display.c:205
 msgid "no"
 msgstr "non"
 
-#: src/irc/irc-display.c:181
+#: src/irc/irc-display.c:193
 msgid " (temporary server, will not be saved)"
 msgstr " (serveur temporaire, ne sera pas sauvé)"
 
-#: src/irc/irc-display.c:203
+#: src/irc/irc-display.c:208
 msgid "(hidden)"
 msgstr "(caché)"
 
-#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4718
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4674
 msgid "unknown"
 msgstr "inconnu"
 
@@ -1397,522 +1402,520 @@ msgstr "inconnu"
 msgid "%s: using local hostname \"%s\"\n"
 msgstr "%s: utilisation du nom de machine local \"%s\"\n"
 
-#: src/irc/irc-send.c:167 src/common/command.c:749
+#: src/irc/irc-send.c:166 src/common/command.c:760
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr "%s impossible de trouver le pseudo pour envoyer le message\n"
 
-#: src/irc/irc-send.c:329 src/irc/irc-send.c:357 src/irc/irc-send.c:544
-#: src/irc/irc-send.c:577 src/irc/irc-send.c:610 src/irc/irc-send.c:658
-#: src/irc/irc-send.c:694 src/irc/irc-send.c:761 src/irc/irc-send.c:818
-#: src/irc/irc-send.c:1160 src/irc/irc-send.c:1258 src/irc/irc-send.c:1737
-#: src/irc/irc-send.c:1851
+#: src/irc/irc-send.c:328 src/irc/irc-send.c:356 src/irc/irc-send.c:547
+#: src/irc/irc-send.c:580 src/irc/irc-send.c:613 src/irc/irc-send.c:661
+#: src/irc/irc-send.c:697 src/irc/irc-send.c:764 src/irc/irc-send.c:821
+#: src/irc/irc-send.c:1154 src/irc/irc-send.c:1254 src/irc/irc-send.c:1730
+#: src/irc/irc-send.c:1844
 #, c-format
 msgid "%s \"%s\" command can only be executed in a channel window\n"
 msgstr ""
 "%s la commande \"%s\" peut seulement être exécutée dans une fenêtre de "
 "canal\n"
 
-#: src/irc/irc-send.c:456 src/irc/irc-send.c:468 src/irc/irc-send.c:486
-#: src/irc/irc-send.c:1138 src/irc/irc-send.c:1231 src/irc/irc-send.c:1763
-#: src/common/command.c:1233 src/common/command.c:1647
-#: src/common/command.c:1781
+#: src/irc/irc-send.c:459 src/irc/irc-send.c:471 src/irc/irc-send.c:489
+#: src/irc/irc-send.c:1132 src/irc/irc-send.c:1227 src/irc/irc-send.c:1756
+#: src/common/command.c:1253 src/common/command.c:1695
+#: src/common/command.c:1831
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n"
 
-#: src/irc/irc-send.c:509 src/irc/irc-send.c:746 src/irc/irc-send.c:803
+#: src/irc/irc-send.c:512 src/irc/irc-send.c:749 src/irc/irc-send.c:806
 #, c-format
 msgid "%s wrong arguments for \"%s\" command\n"
 msgstr "%s paramètres invalides pour la commande \"%s\"\n"
 
-#: src/irc/irc-send.c:946 src/irc/irc-send.c:1013 src/irc/irc-send.c:1306
-#: src/irc/irc-send.c:1320 src/irc/irc-send.c:1664
+#: src/irc/irc-send.c:949 src/irc/irc-send.c:1016 src/irc/irc-send.c:1302
+#: src/irc/irc-send.c:1316 src/irc/irc-send.c:1657
 #, c-format
 msgid "%s \"%s\" command can not be executed on a server window\n"
 msgstr ""
 "%s la commande \"%s\" ne peut pas être exécutée dans une fenêtre serveur\n"
 
-#: src/irc/irc-send.c:1031 src/irc/irc-send.c:1056 src/irc/irc-recv.c:499
+#: src/irc/irc-send.c:1032 src/irc/irc-send.c:1055 src/irc/irc-recv.c:500
 #, c-format
 msgid "%s nick \"%s\" not found for \"%s\" command\n"
 msgstr "%s pseudo \"%s\" non trouvé pour la commande \"%s\"\n"
 
-#: src/irc/irc-send.c:1108 src/irc/irc-send.c:1416 src/irc/irc-recv.c:1238
-#: src/irc/irc-recv.c:2054 src/irc/irc-recv.c:2142
+#: src/irc/irc-send.c:1105 src/irc/irc-send.c:1412 src/irc/irc-recv.c:1230
+#: src/irc/irc-recv.c:2042 src/irc/irc-recv.c:2132
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
 
-#: src/irc/irc-send.c:1816
+#: src/irc/irc-send.c:1809
 #, c-format
 msgid "%s, compiled on %s %s\n"
 msgstr "%s, compilé le %s %s\n"
 
-#: src/irc/irc-recv.c:355
-msgid "You have been invited to "
-msgstr "Vous avez été invité sur "
+#: src/irc/irc-recv.c:362
+#, c-format
+msgid "You have been invited to %s%s%s by %s%s\n"
+msgstr "Vous avez été invité sur %s%s%s par %s%s\n"
 
-#: src/irc/irc-recv.c:358 src/irc/irc-recv.c:3994
-msgid "by"
-msgstr "par"
-
-#: src/irc/irc-recv.c:369 src/irc/irc-recv.c:463 src/irc/irc-recv.c:1012
-#: src/irc/irc-recv.c:1397 src/irc/irc-recv.c:1656 src/irc/irc-recv.c:3559
-#: src/irc/irc-recv.c:3581 src/irc/irc-recv.c:3642 src/irc/irc-recv.c:3714
+#: src/irc/irc-recv.c:376 src/irc/irc-recv.c:469 src/irc/irc-recv.c:1008
+#: src/irc/irc-recv.c:1386 src/irc/irc-recv.c:1645 src/irc/irc-recv.c:3520
+#: src/irc/irc-recv.c:3541 src/irc/irc-recv.c:3601 src/irc/irc-recv.c:3672
 #, c-format
 msgid "%s channel \"%s\" not found for \"%s\" command\n"
 msgstr "%s canal \"%s\" non trouvé pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:397
+#: src/irc/irc-recv.c:404
 #, c-format
 msgid "%s cannot create new channel \"%s\"\n"
 msgstr "%s impossible de créer le nouveau canal \"%s\"\n"
 
-#: src/irc/irc-recv.c:416
-msgid " has joined "
-msgstr " a rejoint "
+#: src/irc/irc-recv.c:415
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
+msgstr "%s%s %s(%s%s%s)%s a rejoint %s%s\n"
 
-#: src/irc/irc-recv.c:474
-msgid " has kicked "
-msgstr " a poussé dehors "
+#: src/irc/irc-recv.c:477
+#, c-format
+msgid "%s%s%s has kicked %s%s%s from %s%s"
+msgstr "%s%s%s a poussé dehors %s%s%s de %s%s"
 
-#: src/irc/irc-recv.c:478 src/common/command.c:1468
-msgid " from "
-msgstr " de "
+#: src/irc/irc-recv.c:562
+#, c-format
+msgid "%s%s%s has killed %s%s%s from server"
+msgstr "%s%s%s a tué %s%s%s du serveur"
 
-#: src/irc/irc-recv.c:564
-msgid " has killed "
-msgstr " a tué "
-
-#: src/irc/irc-recv.c:570
-msgid " from server"
-msgstr " du serveur"
-
-#: src/irc/irc-recv.c:580
-msgid " from server\n"
-msgstr " du serveur\n"
-
-#: src/irc/irc-recv.c:588
+#: src/irc/irc-recv.c:584
 #, c-format
 msgid "%s host \"%s\" not found for \"%s\" command\n"
 msgstr "%s la machine \"%s\" n'existe pas pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:629
+#: src/irc/irc-recv.c:625
 msgid "sets ban on"
 msgstr "instaure un bannissement sur"
 
-#: src/irc/irc-recv.c:630
+#: src/irc/irc-recv.c:626
 msgid "removes ban on"
 msgstr "supprime le banissement sur"
 
-#: src/irc/irc-recv.c:654
+#: src/irc/irc-recv.c:650
 msgid "sets exception on"
 msgstr "définit une exception sur"
 
-#: src/irc/irc-recv.c:655
+#: src/irc/irc-recv.c:651
 msgid "removes exception on"
 msgstr "supprime l'exception sur"
 
-#: src/irc/irc-recv.c:679
+#: src/irc/irc-recv.c:675
 msgid "sets mode +f"
 msgstr "définit le mode +f"
 
-#: src/irc/irc-recv.c:680
+#: src/irc/irc-recv.c:676
 msgid "removes mode +f"
 msgstr "supprime le mode +f"
 
-#: src/irc/irc-recv.c:704
+#: src/irc/irc-recv.c:700
 msgid "gives half channel operator status to"
 msgstr "donne le droit demi-opérateur à"
 
-#: src/irc/irc-recv.c:705
+#: src/irc/irc-recv.c:701
 msgid "removes half channel operator status from"
 msgstr "supprime le droit demi-opérateur à"
 
-#: src/irc/irc-recv.c:732
+#: src/irc/irc-recv.c:728
 msgid "sets invite-only channel flag"
 msgstr "définit le canal en mode invité seulement"
 
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:729
 msgid "removes invite-only channel flag"
 msgstr "supprime le mode invité seulement pour le canal"
 
-#: src/irc/irc-recv.c:750
+#: src/irc/irc-recv.c:746
 msgid "sets channel key to"
 msgstr "définit la clé du canal à"
 
-#: src/irc/irc-recv.c:751
+#: src/irc/irc-recv.c:747
 msgid "removes channel key"
 msgstr "supprime la clé du canal"
 
-#: src/irc/irc-recv.c:782
+#: src/irc/irc-recv.c:778
 msgid "sets the user limit to"
 msgstr "définit la limite d'utilisateurs à"
 
-#: src/irc/irc-recv.c:783
+#: src/irc/irc-recv.c:779
 msgid "removes user limit"
 msgstr "supprime la limite d'utilisateurs"
 
-#: src/irc/irc-recv.c:805
+#: src/irc/irc-recv.c:801
 msgid "sets moderated channel flag"
 msgstr "instaure la modération sur le canal"
 
-#: src/irc/irc-recv.c:806
+#: src/irc/irc-recv.c:802
 msgid "removes moderated channel flag"
 msgstr "supprime la modération sur le canal"
 
-#: src/irc/irc-recv.c:816
+#: src/irc/irc-recv.c:812
 msgid "sets messages from channel only flag"
 msgstr "interdit aux utilisateurs en dehors du canal d'y écrire"
 
-#: src/irc/irc-recv.c:817
+#: src/irc/irc-recv.c:813
 msgid "removes messages from channel only flag"
 msgstr "autorise tout utilisateur à écrire sur le canal"
 
-#: src/irc/irc-recv.c:834
+#: src/irc/irc-recv.c:830
 msgid "gives channel operator status to"
 msgstr "donne le droit opérateur à"
 
-#: src/irc/irc-recv.c:835
+#: src/irc/irc-recv.c:831
 msgid "removes channel operator status from"
 msgstr "supprime le droit opérateur à"
 
-#: src/irc/irc-recv.c:862
+#: src/irc/irc-recv.c:858
 msgid "sets private channel flag"
 msgstr "définit le canal comme privé"
 
-#: src/irc/irc-recv.c:863
+#: src/irc/irc-recv.c:859
 msgid "removes private channel flag"
 msgstr "supprime le mode privé pour le canal"
 
-#: src/irc/irc-recv.c:880
+#: src/irc/irc-recv.c:876
 msgid "sets quiet on"
 msgstr "définit le mode muet sur"
 
-#: src/irc/irc-recv.c:881
+#: src/irc/irc-recv.c:877
 msgid "removes quiet on"
 msgstr "supprime le mode muet sur"
 
-#: src/irc/irc-recv.c:898
+#: src/irc/irc-recv.c:894
 msgid "sets secret channel flag"
 msgstr "définit le canal comme secret"
 
-#: src/irc/irc-recv.c:899
+#: src/irc/irc-recv.c:895
 msgid "removes secret channel flag"
 msgstr "supprime le mode secret pour le canal"
 
-#: src/irc/irc-recv.c:909
+#: src/irc/irc-recv.c:905
 msgid "sets topic protection"
 msgstr "active la protection du titre"
 
-#: src/irc/irc-recv.c:910
+#: src/irc/irc-recv.c:906
 msgid "removes topic protection"
 msgstr "supprime la protection du titre"
 
-#: src/irc/irc-recv.c:927
+#: src/irc/irc-recv.c:923
 msgid "gives voice to"
 msgstr "donne la voix à"
 
-#: src/irc/irc-recv.c:928
+#: src/irc/irc-recv.c:924
 msgid "removes voice from"
 msgstr "supprime la voix de"
 
-#: src/irc/irc-recv.c:971 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1475
-#: src/irc/irc-recv.c:2209
+#: src/irc/irc-recv.c:967 src/irc/irc-recv.c:1053 src/irc/irc-recv.c:1464
+#: src/irc/irc-recv.c:2201
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr "%s commande \"%s\" reçue sans host\n"
 
-#: src/irc/irc-recv.c:981
+#: src/irc/irc-recv.c:977
 #, c-format
 msgid "%s \"%s\" command received without channel or nickname\n"
 msgstr "%s commande \"%s\" reçue sans canal ou utilisateur\n"
 
-#: src/irc/irc-recv.c:1029
-msgid "mode changed by"
-msgstr "mode changé par"
+#: src/irc/irc-recv.c:1019
+#, c-format
+msgid "%s[%s%s%s/%s%s%s]%s mode changed by %s%s\n"
+msgstr "%s[%s%s%s/%s%s%s]%s mode changé par %s%s\n"
 
-#: src/irc/irc-recv.c:1091
-msgid "You are "
-msgstr "Vous êtes "
+#: src/irc/irc-recv.c:1088
+#, c-format
+msgid "You are now known as %s%s\n"
+msgstr "Vous êtes maintenant connu sous le nom %s%s\n"
 
-#: src/irc/irc-recv.c:1098
-msgid " is "
-msgstr " est "
+#: src/irc/irc-recv.c:1092
+#, c-format
+msgid "%s%s%s is now known as %s%s\n"
+msgstr "%s%s%s est maintenant connu sous le nom %s%s\n"
 
-#: src/irc/irc-recv.c:1102
-msgid "now known as "
-msgstr "maintenant connu sous le nom "
-
-#: src/irc/irc-recv.c:1169
+#: src/irc/irc-recv.c:1159
 #, c-format
 msgid "%s nickname not found for \"%s\" command\n"
 msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:1185 src/irc/irc-recv.c:1217
-msgid "reply from"
-msgstr "réponse de"
-
-#: src/irc/irc-recv.c:1220
+#: src/irc/irc-recv.c:1173
 #, c-format
-msgid ": %ld.%ld seconds\n"
-msgstr ": %ld.%ld secondes\n"
+msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
+msgstr "CTCP %sVERSION%s réponse de %s%s%s: %s\n"
 
-#: src/irc/irc-recv.c:1259 src/irc/irc-recv.c:2163 src/irc/irc-dcc.c:1136
+#: src/irc/irc-recv.c:1207
+#, c-format
+msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
+msgstr "CTCP %sPING%s réponse de %s%s%s: %ld.%ld secondes\n"
+
+#: src/irc/irc-recv.c:1252 src/irc/irc-recv.c:2154 src/irc/irc-dcc.c:1153
 #, c-format
 msgid "Private %s> %s"
 msgstr "Privé %s> %s"
 
-#: src/irc/irc-recv.c:1322
+#: src/irc/irc-recv.c:1317
 #, c-format
 msgid "%s \"%s\" command received without host or channel\n"
 msgstr "%s commande \"%s\" reçue sans host ou canal\n"
 
-#: src/irc/irc-recv.c:1371
-msgid " has left "
-msgstr " a quitté "
+#: src/irc/irc-recv.c:1357
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has left %s%s"
+msgstr "%s%s %s(%s%s%s)%s a quitté %s%s"
 
-#: src/irc/irc-recv.c:1523 src/irc/irc-recv.c:2078
+#: src/irc/irc-recv.c:1513 src/irc/irc-recv.c:2067
 #, c-format
 msgid "On %s: * %s %s"
 msgstr "Sur %s: * %s %s"
 
-#: src/irc/irc-recv.c:1547
+#: src/irc/irc-recv.c:1538
 #, c-format
-msgid "Received a CTCP SOUND \"%s\" from "
-msgstr "CTCP SOUND \"%s\" reçu de "
+msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
+msgstr "CTCP %sSOUND%s \"%s\" reçu de %s%s\n"
 
-#: src/irc/irc-recv.c:1580 src/irc/irc-recv.c:1611 src/irc/irc-recv.c:1715
-#: src/irc/irc-recv.c:1755 src/irc/irc-recv.c:2118
-msgid "received from"
-msgstr "reçu de"
+#: src/irc/irc-recv.c:1568 src/irc/irc-recv.c:1739
+#, c-format
+msgid "CTCP %sPING%s received from %s%s\n"
+msgstr "CTCP %sPING%s reçu de %s%s\n"
 
-#: src/irc/irc-recv.c:1607 src/irc/irc-recv.c:2114
-msgid "Unknown CTCP "
-msgstr "CTCP inconnu "
+#: src/irc/irc-recv.c:1597 src/irc/irc-recv.c:2104
+#, c-format
+msgid "Unknown CTCP %s%s%s received from %s%s"
+msgstr "CTCP inconnu %s%s%s reçu de %s%s"
 
-#: src/irc/irc-recv.c:1639
+#: src/irc/irc-recv.c:1629
 #, c-format
 msgid "On %s: %s> %s"
 msgstr "Sur %s: %s> %s"
 
-#: src/irc/irc-recv.c:1771 src/irc/irc-recv.c:1792 src/irc/irc-recv.c:1808
-#: src/irc/irc-recv.c:1824 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1871
-#: src/irc/irc-recv.c:1887 src/irc/irc-recv.c:1912 src/irc/irc-recv.c:1933
-#: src/irc/irc-recv.c:1949 src/irc/irc-recv.c:1974 src/irc/irc-recv.c:1995
-#: src/irc/irc-recv.c:2010 src/irc/irc-recv.c:2185 src/irc/irc-recv.c:2529
-#: src/irc/irc-recv.c:3918 src/irc/irc-recv.c:3933 src/irc/irc-recv.c:3948
-#: src/irc/irc-recv.c:3963 src/irc/irc-recv.c:3976 src/irc/irc-recv.c:4031
-#: src/irc/irc-recv.c:4045 src/irc/irc-recv.c:4285 src/irc/irc-recv.c:4343
-#: src/irc/irc-recv.c:4502 src/irc/irc-recv.c:4517 src/irc/irc-recv.c:4532
-#: src/irc/irc-recv.c:4547 src/irc/irc-recv.c:4560 src/irc/irc-recv.c:4614
-#: src/irc/irc-recv.c:4628
+#: src/irc/irc-recv.c:1700
+#, c-format
+msgid "CTCP %sVERSION%s received from %s%s"
+msgstr "CTCP %sVERSION%s reçu de %s%s"
+
+#: src/irc/irc-recv.c:1757 src/irc/irc-recv.c:1778 src/irc/irc-recv.c:1794
+#: src/irc/irc-recv.c:1810 src/irc/irc-recv.c:1836 src/irc/irc-recv.c:1857
+#: src/irc/irc-recv.c:1873 src/irc/irc-recv.c:1898 src/irc/irc-recv.c:1919
+#: src/irc/irc-recv.c:1935 src/irc/irc-recv.c:1960 src/irc/irc-recv.c:1981
+#: src/irc/irc-recv.c:1996 src/irc/irc-recv.c:2177 src/irc/irc-recv.c:2516
+#: src/irc/irc-recv.c:3879 src/irc/irc-recv.c:3894 src/irc/irc-recv.c:3909
+#: src/irc/irc-recv.c:3924 src/irc/irc-recv.c:3937 src/irc/irc-recv.c:4002
+#: src/irc/irc-recv.c:4016 src/irc/irc-recv.c:4250 src/irc/irc-recv.c:4308
+#: src/irc/irc-recv.c:4446 src/irc/irc-recv.c:4461 src/irc/irc-recv.c:4567
+#: src/irc/irc-recv.c:4581
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr "%s impossible d'analyser la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:2023
+#: src/irc/irc-recv.c:2009
 #, c-format
 msgid "%s unknown DCC CHAT type received from "
 msgstr "%s type de DCC CHAT inconnu reçu de "
 
-#: src/irc/irc-recv.c:2240
-msgid "has quit"
-msgstr "a quitté"
+#: src/irc/irc-recv.c:2224
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has quit %s(%s%s%s)\n"
+msgstr "%s%s %s(%s%s%s)%s a quitté %s(%s%s%s)\n"
 
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:2354
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr "%s commande \"%s\" reçue sans canal\n"
 
-#: src/irc/irc-recv.c:2397
-msgid " has changed topic for "
-msgstr " a changé le titre pour "
-
-#: src/irc/irc-recv.c:2402
+#: src/irc/irc-recv.c:2382
 #, c-format
-msgid " to: \"%s\"\n"
-msgstr " en: \"%s\"\n"
+msgid "%s%s%s has changed topic for %s%s%s to: \"%s\"\n"
+msgstr "%s%s%s a changé le titre pour %s%s%s en: \"%s\"\n"
 
-#: src/irc/irc-recv.c:2408
-msgid " has unset topic for "
-msgstr " a retiré le titre pour "
-
-#: src/irc/irc-recv.c:2517
-msgid "User mode"
-msgstr "Mode utilisateur"
-
-#: src/irc/irc-recv.c:2572
+#: src/irc/irc-recv.c:2392
 #, c-format
-msgid " is away: %s\n"
-msgstr " est absent: %s\n"
+msgid "%s%s%s has unset topic for %s%s\n"
+msgstr "%s%s%s a retiré le titre pour %s%s\n"
 
-#: src/irc/irc-recv.c:2654
+#: src/irc/irc-recv.c:2502
+#, c-format
+msgid "User mode %s[%s%s%s/%s%s%s]\n"
+msgstr "Mode utilisateur %s[%s%s%s/%s%s%s]\n"
+
+#: src/irc/irc-recv.c:2557
+#, c-format
+msgid "%s%s%s is away: %s\n"
+msgstr "%s%s%s est absent: %s\n"
+
+#: src/irc/irc-recv.c:2642
 msgid "Users online: "
 msgstr "Utilisateurs en ligne: "
 
-#: src/irc/irc-recv.c:3144
-msgid "idle: "
-msgstr "inactivité: "
+#: src/irc/irc-recv.c:2999
+#, c-format
+msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
+msgstr "%s%s %s(%s%s@%s%s)%s était %s\n"
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3120
+#, c-format
+msgid "%s[%s%s%s]%s idle: "
+msgstr "%s[%s%s%s]%s inactivité: "
+
+#: src/irc/irc-recv.c:3132
 msgid "days"
 msgstr "jours"
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3132
 msgid "day"
 msgstr "jour"
 
-#: src/irc/irc-recv.c:3162
+#: src/irc/irc-recv.c:3136
+#, c-format
+msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
+msgstr "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signé le: %s%s"
+
+#: src/irc/irc-recv.c:3140
 msgid "hours"
 msgstr "heures"
 
-#: src/irc/irc-recv.c:3162
+#: src/irc/irc-recv.c:3140
 msgid "hour"
 msgstr "heure"
 
-#: src/irc/irc-recv.c:3168
+#: src/irc/irc-recv.c:3144
 msgid "minutes"
 msgstr "minutes"
 
-#: src/irc/irc-recv.c:3168
+#: src/irc/irc-recv.c:3144
 msgid "minute"
 msgstr "minute"
 
-#: src/irc/irc-recv.c:3174
+#: src/irc/irc-recv.c:3148
 msgid "seconds"
 msgstr "secondes"
 
-#: src/irc/irc-recv.c:3174
+#: src/irc/irc-recv.c:3148
 msgid "second"
 msgstr "seconde"
 
-#: src/irc/irc-recv.c:3179
-msgid "signon at: "
-msgstr "signé le: "
-
-#: src/irc/irc-recv.c:3275
-msgid "Channels: "
-msgstr "Canaux: "
-
-#: src/irc/irc-recv.c:3572
-msgid "No topic set for "
-msgstr "Pas de titre défini pour "
-
-#: src/irc/irc-recv.c:3629
-msgid "Topic for "
-msgstr "Le titre pour "
-
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3532
 #, c-format
-msgid " is: \"%s\"\n"
-msgstr " est: \"%s\"\n"
+msgid "No topic set for %s%s\n"
+msgstr "Pas de titre défini pour %s%s\n"
 
-#: src/irc/irc-recv.c:3652 src/irc/irc-recv.c:3741 src/irc/irc-recv.c:3794
+#: src/irc/irc-recv.c:3588
+#, c-format
+msgid "Topic for %s%s%s is: \"%s\"\n"
+msgstr "Le titre pour %s%s%s est: \"%s\"\n"
+
+#: src/irc/irc-recv.c:3611 src/irc/irc-recv.c:3699 src/irc/irc-recv.c:3754
 #, c-format
 msgid "%s cannot identify channel for \"%s\" command\n"
 msgstr "%s impossible de déterminer le canal pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:3702
-msgid "Topic set by "
-msgstr "Titre défini par "
+#: src/irc/irc-recv.c:3661
+#, c-format
+msgid "Topic set by %s%s%s, %s"
+msgstr "Titre défini par %s%s%s, %s"
 
-#: src/irc/irc-recv.c:3723
+#: src/irc/irc-recv.c:3681
 #, c-format
 msgid "%s cannot identify date/time for \"%s\" command\n"
 msgstr "%s impossible d'identifier la date/heure pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:3732 src/irc/irc-recv.c:3803
+#: src/irc/irc-recv.c:3690 src/irc/irc-recv.c:3763
 #, c-format
 msgid "%s cannot identify nickname for \"%s\" command\n"
 msgstr ""
 "%s impossible de déterminer le nom d'utilisateur pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:3782
-msgid "has invited"
-msgstr "a invité"
+#: src/irc/irc-recv.c:3739
+#, c-format
+msgid "%s%s%s has invited %s%s%s on %s%s\n"
+msgstr "%s%s%s a invité %s%s%s sur %s%s\n"
 
-#: src/irc/irc-recv.c:3785 src/irc/irc-recv.c:4206 src/common/command.c:1461
-msgid "on"
-msgstr "sur"
+#: src/irc/irc-recv.c:3799
+#, c-format
+msgid "Channel reop %s%s%s: %s%s\n"
+msgstr "Reop canal %s%s%s: %s%s\n"
 
-#: src/irc/irc-recv.c:3840
-msgid "Channel reop"
-msgstr "Canal reop"
-
-#: src/irc/irc-recv.c:3992
-msgid "exception"
-msgstr "exception"
-
-#: src/irc/irc-recv.c:4331
+#: src/irc/irc-recv.c:4296
 #, c-format
 msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
 msgstr "%s impossible de créer l'utilisateur \"%s\" pour le canal \"%s\"\n"
 
-#: src/irc/irc-recv.c:4390
-msgid "Nicks "
-msgstr "Utilisateurs "
+#: src/irc/irc-recv.c:4354
+#, c-format
+msgid "Nicks %s%s%s: %s["
+msgstr "Utilisateurs %s%s%s: %s["
 
-#: src/irc/irc-recv.c:4410
-msgid "Channel "
-msgstr "Canal "
+#: src/irc/irc-recv.c:4375
+#, c-format
+msgid ""
+"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
+msgstr ""
+"Canal %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
 
-#: src/irc/irc-recv.c:4421
+#: src/irc/irc-recv.c:4383
 msgid "nicks"
 msgstr "utilisateurs"
 
-#: src/irc/irc-recv.c:4421
+#: src/irc/irc-recv.c:4383
 msgid "nick"
 msgstr "utilisateur"
 
-#: src/irc/irc-recv.c:4429
+#: src/irc/irc-recv.c:4388
 msgid "ops"
 msgstr "ops"
 
-#: src/irc/irc-recv.c:4429
+#: src/irc/irc-recv.c:4388
 msgid "op"
 msgstr "op"
 
-#: src/irc/irc-recv.c:4438
+#: src/irc/irc-recv.c:4392
 msgid "halfops"
 msgstr "halfops"
 
-#: src/irc/irc-recv.c:4438
+#: src/irc/irc-recv.c:4392
 msgid "halfop"
 msgstr "halfop"
 
-#: src/irc/irc-recv.c:4447
+#: src/irc/irc-recv.c:4396
 msgid "voices"
 msgstr "voices"
 
-#: src/irc/irc-recv.c:4447
+#: src/irc/irc-recv.c:4396
 msgid "voice"
 msgstr "voice"
 
-#: src/irc/irc-recv.c:4456
+#: src/irc/irc-recv.c:4400
 msgid "normal"
 msgstr "normal"
 
-#: src/irc/irc-recv.c:4577
-msgid "banned by"
-msgstr "banni par"
+#: src/irc/irc-recv.c:4501
+#, c-format
+msgid "%s[%s%s%s] %s%s%s banned by "
+msgstr "%s[%s%s%s] %s%s%s banni par "
 
-#: src/irc/irc-recv.c:4672
+#: src/irc/irc-recv.c:4536
+#, c-format
+msgid "%s[%s%s%s] %s%s%s banned\n"
+msgstr "%s[%s%s%s] %s%s%s banni\n"
+
+#: src/irc/irc-recv.c:4628
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
 msgstr ""
 "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 2nd "
 "nom d'utilisateur \"%s\"\n"
 
-#: src/irc/irc-recv.c:4684
+#: src/irc/irc-recv.c:4640
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
 msgstr ""
 "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 3ème "
 "nom d'utilisateur \"%s\"\n"
 
-#: src/irc/irc-recv.c:4696
+#: src/irc/irc-recv.c:4652
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
@@ -1921,7 +1924,7 @@ msgstr ""
 "%s: tous les noms d'utilisateurs déclarés sont déjà en cours d'utilisation, "
 "fermeture de la connexion avec le serveur !\n"
 
-#: src/irc/irc-recv.c:4706
+#: src/irc/irc-recv.c:4662
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
 msgstr ""
@@ -1952,35 +1955,38 @@ msgstr "Echou
 msgid "Aborted"
 msgstr "Interrompu"
 
-#: src/irc/irc-dcc.c:367 src/irc/irc-dcc.c:568 src/irc/irc-dcc.c:731
-msgid "DCC: file "
-msgstr "DCC: fichier "
+#: src/irc/irc-dcc.c:368
+#, c-format
+msgid "DCC: file %s%s%s"
+msgstr "DCC: fichier %s%s%s"
 
-#: src/irc/irc-dcc.c:374 src/irc/irc-dcc.c:693 src/irc/irc-dcc.c:736
-msgid " (local filename: "
-msgstr " (nom local: "
+#: src/irc/irc-dcc.c:374
+#, c-format
+msgid " (local filename: %s%s%s)"
+msgstr " (nom local: %s%s%s)"
 
-#: src/irc/irc-dcc.c:382
+#: src/irc/irc-dcc.c:379
 msgid " sent to "
 msgstr " envoyé à "
 
-#: src/irc/irc-dcc.c:384
+#: src/irc/irc-dcc.c:381
 msgid " received from "
 msgstr " reçu de "
 
-#: src/irc/irc-dcc.c:390
-msgid ": ok!\n"
-msgstr ": ok!\n"
+#: src/irc/irc-dcc.c:386
+msgid "OK"
+msgstr "OK"
 
-#: src/irc/irc-dcc.c:390
-msgid ": FAILED\n"
-msgstr ": ECHOUE\n"
+#: src/irc/irc-dcc.c:386
+msgid "FAILED"
+msgstr "ECHOUE"
 
-#: src/irc/irc-dcc.c:402
-msgid "DCC chat closed with "
-msgstr "Discussion DCC fermée avec "
+#: src/irc/irc-dcc.c:399
+#, c-format
+msgid "DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"
+msgstr "Discussion DCC fermée avec %s%s %s(%s%d.%d.%d.%d%s)\n"
 
-#: src/irc/irc-dcc.c:459
+#: src/irc/irc-dcc.c:457
 #, c-format
 msgid ""
 "%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1989,20 +1995,17 @@ msgstr ""
 "%s impossible d'associer la discussion DCC avec un tampon privé (le tampon "
 "privé a peut-être déjà un DCC CHAT ?)\n"
 
-#: src/irc/irc-dcc.c:470
-msgid "Connected to "
-msgstr "Connecté à "
-
-#: src/irc/irc-dcc.c:479
-msgid "via DCC chat\n"
-msgstr "via une discussion DCC\n"
-
-#: src/irc/irc-dcc.c:573
+#: src/irc/irc-dcc.c:468
 #, c-format
-msgid "resumed at position %u\n"
-msgstr "recommencé en position %u\n"
+msgid "Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"
+msgstr "Connecté à %s%s %s(%s%d.%d.%d.%d%s)%s via une discussion DCC\n"
 
-#: src/irc/irc-dcc.c:579 src/irc/irc-dcc.c:604
+#: src/irc/irc-dcc.c:568
+#, c-format
+msgid "DCC: file %s%s%s resumed at position %u\n"
+msgstr "DCC: fichier %s%s%s recommencé en position %u\n"
+
+#: src/irc/irc-dcc.c:577 src/irc/irc-dcc.c:602
 #, c-format
 msgid ""
 "%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
@@ -2011,78 +2014,84 @@ msgstr ""
 "%s impossible de continuer le fichier \"%s\" (port: %d, position de départ: %"
 "u): DCC non trouvé ou terminé\n"
 
-#: src/irc/irc-dcc.c:623
+#: src/irc/irc-dcc.c:621
 #, c-format
 msgid "%s not enough memory for new DCC\n"
 msgstr "%s pas assez de mémoire pour un nouveau DCC\n"
 
-#: src/irc/irc-dcc.c:642
+#: src/irc/irc-dcc.c:640
 msgid "DCC chat"
 msgstr "Discussion DCC"
 
-#: src/irc/irc-dcc.c:672
-msgid "Incoming DCC file from "
-msgstr "Réception fichier DCC de "
-
-#: src/irc/irc-dcc.c:683 src/irc/irc-dcc.c:697
-msgid " bytes\n"
-msgstr " octets\n"
-
-#: src/irc/irc-dcc.c:689
-msgid "Sending DCC file to "
-msgstr "Envoi fichier DCC à "
-
-#: src/irc/irc-dcc.c:703
-msgid "Incoming DCC chat request from "
-msgstr "Demande de discussion DCC reçue de "
-
-#: src/irc/irc-dcc.c:715
-msgid "Sending DCC chat request to "
-msgstr "Envoi d'une demande discussion DCC à "
-
-#: src/irc/irc-dcc.c:742
+#: src/irc/irc-dcc.c:671
 #, c-format
-msgid "will be resumed at position %u\n"
-msgstr "sera redémarré à la position %u\n"
+msgid ""
+"Incoming DCC file from %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s bytes\n"
+msgstr ""
+"Réception fichier de %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s octets\n"
 
-#: src/irc/irc-dcc.c:810
+#: src/irc/irc-dcc.c:694
+#, c-format
+msgid ""
+"Sending DCC file to %s%s%s: %s%s%s (local filename: %s%s%s), %s%lu%s bytes\n"
+msgstr ""
+"Envoi fichier DCC à %s%s%s: %s%s%s (nom local: %s%s%s), %s%lu%s octets\n"
+
+#: src/irc/irc-dcc.c:714
+#, c-format
+msgid "Incoming DCC chat request from %s%s%s (%s%d.%d.%d.%d%s)\n"
+msgstr "Demande de discussion DCC reçue de %s%s%s (%s%d.%d.%d.%d%s)\n"
+
+#: src/irc/irc-dcc.c:731
+#, c-format
+msgid "Sending DCC chat request to %s%s\n"
+msgstr "Envoi d'une demande discussion DCC à %s%s\n"
+
+#: src/irc/irc-dcc.c:749
+#, c-format
+msgid ""
+"DCC: file %s%s%s (local filename: %s%s%s) will be resumed at position %u\n"
+msgstr ""
+"DCC: fichier %s%s%s (nom local: %s%s%s) sera recommencé en position %u\n"
+
+#: src/irc/irc-dcc.c:824
 #, c-format
 msgid "%s not enough memory for DCC SEND\n"
 msgstr "%s pas assez de mémoire pour le DCC SEND\n"
 
-#: src/irc/irc-dcc.c:832
+#: src/irc/irc-dcc.c:846
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr "%s impossible d'accéder au fichier \"%s\"\n"
 
-#: src/irc/irc-dcc.c:854
+#: src/irc/irc-dcc.c:868
 #, c-format
 msgid "%s could not find address for '%s'. Falling back to local IP.\n"
 msgstr ""
 "%s impossible de trouver l'adresse pour '%s'. Utilisation de l'adresse IP "
 "locale.\n"
 
-#: src/irc/irc-dcc.c:874
+#: src/irc/irc-dcc.c:888
 #, c-format
 msgid "%s cannot create socket for DCC\n"
 msgstr "%s impossible de créer la socket pour le DCC\n"
 
-#: src/irc/irc-dcc.c:932
+#: src/irc/irc-dcc.c:946
 #, c-format
 msgid "%s cannot find available port for DCC\n"
 msgstr "%s impossible de trouver un port disponible pour le DCC\n"
 
-#: src/irc/irc-dcc.c:976
+#: src/irc/irc-dcc.c:990
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr "%s impossible d'envoyer le DCC\n"
 
-#: src/irc/irc-dcc.c:1057
+#: src/irc/irc-dcc.c:1071
 #, c-format
 msgid "%s error sending data to \"%s\" via DCC CHAT\n"
 msgstr "%s erreur d'envoi de données à \"%s\" via DCC CHAT\n"
 
-#: src/irc/irc-dcc.c:1330
+#: src/irc/irc-dcc.c:1350
 #, c-format
 msgid ""
 "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -2091,7 +2100,7 @@ msgstr ""
 "%s le DCC a échoué car la taille de bloc est trop grande. Vérifiez la valeur "
 "de l'option \"dcc_blocksize\", le maximum est %d.\n"
 
-#: src/irc/irc-dcc.c:1405
+#: src/irc/irc-dcc.c:1425
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr "Abandon du DCC actif: \"%s\" de %s\n"
@@ -2227,13 +2236,13 @@ msgstr "Extension \"%s\" d
 msgid "%s plugin \"%s\" not found\n"
 msgstr "%s extension \"%s\" non trouvée\n"
 
-#: src/plugins/plugins-config.c:215 src/common/weeconfig.c:1653
+#: src/plugins/plugins-config.c:215 src/common/weeconfig.c:1659
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
 msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"=\"\n"
 
-#: src/plugins/plugins-config.c:265 src/common/weeconfig.c:1826
-#: src/common/weeconfig.c:2024
+#: src/plugins/plugins-config.c:265 src/common/weeconfig.c:1832
+#: src/common/weeconfig.c:2030
 #, c-format
 msgid "%s cannot create file \"%s\"\n"
 msgstr "%s impossible de créer le fichier \"%s\"\n"
@@ -2268,64 +2277,64 @@ msgstr "Jour chang
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s le lag est élevé, déconnexion du serveur...\n"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "bytes"
 msgstr "octets"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Kb"
 msgstr "Ko"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Mb"
 msgstr "Mo"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Gb"
 msgstr "Go"
 
-#: src/gui/curses/gui-display.c:1265
+#: src/gui/curses/gui-display.c:1836
 msgid "<servers>"
 msgstr "<serveurs>"
 
-#: src/gui/curses/gui-display.c:1277
+#: src/gui/curses/gui-display.c:1848
 msgid "(away)"
 msgstr "(absent)"
 
-#: src/gui/curses/gui-display.c:1411
+#: src/gui/curses/gui-display.c:1982
 msgid "[not connected] "
 msgstr "[non connecté] "
 
-#: src/gui/curses/gui-display.c:1421
+#: src/gui/curses/gui-display.c:1992
 msgid "Act: "
 msgstr "Act: "
 
-#: src/gui/curses/gui-display.c:1509
+#: src/gui/curses/gui-display.c:2080
 #, c-format
 msgid "Lag: %.1f"
 msgstr "Lag: %.1f"
 
-#: src/gui/curses/gui-display.c:1525
+#: src/gui/curses/gui-display.c:2096
 msgid "-MORE-"
 msgstr "-PLUS-"
 
-#: src/gui/curses/gui-display.c:1715
+#: src/gui/curses/gui-display.c:2274
 msgid "  [A] Accept"
 msgstr "  [A] Accepter"
 
-#: src/gui/curses/gui-display.c:1716 src/gui/curses/gui-display.c:1720
+#: src/gui/curses/gui-display.c:2275 src/gui/curses/gui-display.c:2279
 msgid "  [C] Cancel"
 msgstr "  [C] Annuler"
 
-#: src/gui/curses/gui-display.c:1725
+#: src/gui/curses/gui-display.c:2284
 msgid "  [R] Remove"
 msgstr "  [R] Retirer"
 
-#: src/gui/curses/gui-display.c:1729
+#: src/gui/curses/gui-display.c:2288
 msgid "  [P] Purge old DCC"
 msgstr "  [P] Purger anciens DCC"
 
-#: src/gui/curses/gui-display.c:1730
+#: src/gui/curses/gui-display.c:2289
 msgid "  [Q] Close DCC view"
 msgstr "  [Q] Fermer la vue DCC"
 
@@ -2333,16 +2342,12 @@ msgstr "  [Q] Fermer la vue DCC"
 msgid "server"
 msgstr "serveur"
 
-#: src/gui/gui-common.c:392
-msgid "Not enough memory for infobar message\n"
-msgstr "Pas assez de mémoire pour un message de la barre d'infos\n"
-
-#: src/gui/gui-common.c:582
+#: src/gui/gui-common.c:508
 msgid "Not enough memory for new line\n"
 msgstr "Pas assez de mémoire pour une nouvelle ligne !\n"
 
-#: src/gui/gui-common.c:625
-msgid "Not enough memory for new message\n"
+#: src/gui/gui-common.c:844
+msgid "Not enough memory for infobar message\n"
 msgstr "Pas assez de mémoire pour un message de la barre d'infos\n"
 
 #: src/gui/gui-keyboard.c:45
@@ -2493,7 +2498,7 @@ msgstr "rafraichir l'
 msgid "grab a key"
 msgstr "capturer une touche"
 
-#: src/gui/gui-keyboard.c:428 src/common/command.c:1662
+#: src/gui/gui-keyboard.c:428 src/common/command.c:1710
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr "%s impossible de créer la touche \"%s\"\n"
@@ -2844,8 +2849,8 @@ msgstr "%s l'alias ne peut pas lancer un autre alias !\n"
 
 #: src/common/command.c:306
 #, c-format
-msgid "%s target command \"%s\" does not exist!\n"
-msgstr "%s la commande cible \"%s\" n'existe pas !\n"
+msgid "%s target command \"/%s\" does not exist!\n"
+msgstr "%s la commande cible \"/%s\" n'existe pas !\n"
 
 #: src/common/command.c:535
 #, c-format
@@ -2894,221 +2899,242 @@ msgstr "%s la commande \"%s\" n
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr "%s commande \"%s\" inconnue (tapez /help pour l'aide)\n"
 
-#: src/common/command.c:773
+#: src/common/command.c:789
 #, c-format
 msgid "%s unable to call handler for message (not enough memory)\n"
 msgstr ""
 "%s impossible d'appeler la fonction pour le message (mémoire insuffisante)\n"
 
-#: src/common/command.c:781
+#: src/common/command.c:797
 msgid "This window is not a channel!\n"
 msgstr "Cette fenêtre n'est pas un canal !\n"
 
-#: src/common/command.c:809 src/common/command.c:833 src/common/command.c:943
+#: src/common/command.c:825 src/common/command.c:856 src/common/command.c:963
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr "%s paramètres manquants pour la commande \"%s\"\n"
 
-#: src/common/command.c:818
+#: src/common/command.c:832
+#, c-format
+msgid "%s alias can not start with \"/\"\n"
+msgstr "%s l'alias ne peut pas commencer par \"/\"\n"
+
+#: src/common/command.c:841
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr "Alias \"%s\" => \"%s\" créé\n"
 
-#: src/common/command.c:824
+#: src/common/command.c:847
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr "Impossible de créer l'alias \"%s\" => \"%s\" (pas assez de mémoire)\n"
 
-#: src/common/command.c:844
+#: src/common/command.c:867
 msgid "List of aliases:\n"
 msgstr "Liste des alias:\n"
 
-#: src/common/command.c:856
+#: src/common/command.c:881
 msgid "No alias defined.\n"
 msgstr "Aucun alias défini.\n"
 
-#: src/common/command.c:879
-msgid "Channel: "
-msgstr "Canal: "
+#: src/common/command.c:898
+#, c-format
+msgid "%sServer: %s%s\n"
+msgstr "%sServeur: %s%s\n"
 
-#: src/common/command.c:882 src/common/command.c:892
-msgid " (server: "
-msgstr " (serveur: "
+#: src/common/command.c:903
+#, c-format
+msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
+msgstr "%sCanal: %s%s %s(serveur: %s%s%s)\n"
 
-#: src/common/command.c:889
-msgid "Private with: "
-msgstr "Privé avec: "
+#: src/common/command.c:912
+#, c-format
+msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
+msgstr "%sPrivé avec: %s%s %s(serveur: %s%s%s)\n"
 
-#: src/common/command.c:923
+#: src/common/command.c:920
+msgid "not connected\n"
+msgstr "non connecté\n"
+
+#: src/common/command.c:942
 msgid "Opened buffers:\n"
 msgstr "Tampons ouverts:\n"
 
-#: src/common/command.c:966
+#: src/common/command.c:986
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr "%s numéro de buffer incorrect\n"
 
-#: src/common/command.c:982
+#: src/common/command.c:1002
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr "%s impossible de fermer le tampon unique\n"
 
-#: src/common/command.c:992
+#: src/common/command.c:1012
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr ""
 "%s impossible de fermer le tampon du serveur tant que des canaux sont "
 "ouverts\n"
 
-#: src/common/command.c:1043
+#: src/common/command.c:1063
 msgid "Notify levels:  "
 msgstr "Niveaux de notification:  "
 
-#: src/common/command.c:1071 src/common/command.c:1093
+#: src/common/command.c:1091 src/common/command.c:1113
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr "%s niveau de notification incorrect (doit être entre %d et %d)\n"
 
-#: src/common/command.c:1080
+#: src/common/command.c:1100
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr ""
 "%s tampon incorrect pour la notification (doit être un canal ou un privé)\n"
 
-#: src/common/command.c:1160
+#: src/common/command.c:1180
 #, c-format
 msgid "unknown parameter \"%s\" for \"%s\" command\n"
 msgstr "paramètre inconnu \"%s\" pour la commande \"%s\"\n"
 
-#: src/common/command.c:1190
+#: src/common/command.c:1210
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s déjà connecté au serveur \"%s\" !\n"
 
-#: src/common/command.c:1198
+#: src/common/command.c:1218
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr "%s une connexion vers le serveur \"%s\" est en cours !\n"
 
-#: src/common/command.c:1216 src/common/command.c:1291
+#: src/common/command.c:1236 src/common/command.c:1311
 #, c-format
 msgid "%s server not found\n"
 msgstr "%s serveur non trouvé\n"
 
-#: src/common/command.c:1246 src/common/command.c:1774
-#: src/common/command.c:2595 src/common/command.c:2619
+#: src/common/command.c:1266 src/common/command.c:1824
+#: src/common/command.c:2671 src/common/command.c:2695
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s option inconnue pour la commande \"%s\"\n"
 
-#: src/common/command.c:1275
+#: src/common/command.c:1295
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr "%s non connecté au serveur \"%s\" !\n"
 
-#: src/common/command.c:1283
+#: src/common/command.c:1303
 msgid "Auto-reconnection is cancelled\n"
 msgstr "La reconnexion automatique est annulée\n"
 
-#: src/common/command.c:1314 src/common/weechat.c:350
+#: src/common/command.c:1334 src/common/weechat.c:364
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "Commandes internes %s :\n"
 
-#: src/common/command.c:1323 src/common/weechat.c:370
+#: src/common/command.c:1344 src/common/weechat.c:384
 #, c-format
 msgid "IRC commands:\n"
 msgstr "Commandes IRC :\n"
 
-#: src/common/command.c:1336
+#: src/common/command.c:1358
 msgid "Plugin commands:\n"
 msgstr "Commandes d'extension :\n"
 
-#: src/common/command.c:1444
+#: src/common/command.c:1474
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr "Pas d'aide disponible, la commande \"%s\" est inconnue\n"
 
-#: src/common/command.c:1466
+#: src/common/command.c:1495
+msgid "on"
+msgstr "sur"
+
+#: src/common/command.c:1503
 msgid " ignoring "
 msgstr " ignore "
 
-#: src/common/command.c:1490
+#: src/common/command.c:1507
+msgid " from "
+msgstr " de "
+
+#: src/common/command.c:1530
 msgid "List of ignore:\n"
 msgstr "Liste des ignore:\n"
 
-#: src/common/command.c:1505
+#: src/common/command.c:1547
 msgid "No ignore defined.\n"
 msgstr "Aucun ignore défini.\n"
 
-#: src/common/command.c:1531
+#: src/common/command.c:1573
 msgid "New ignore:"
 msgstr "Nouveau ignore:"
 
-#: src/common/command.c:1550
-msgid "New key binding:\n"
-msgstr "Nouvelle touche:\n"
+#: src/common/command.c:1593
+#, c-format
+msgid "New key binding:  %s"
+msgstr "Nouvelle touche:  %s"
 
-#: src/common/command.c:1583
+#: src/common/command.c:1627
 msgid "Key bindings:\n"
 msgstr "Associations de touches:\n"
 
-#: src/common/command.c:1595
+#: src/common/command.c:1641
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr "Touche \"%s\" supprimée\n"
 
-#: src/common/command.c:1600
+#: src/common/command.c:1647
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s impossible de supprimer la touche \"%s\"\n"
 
-#: src/common/command.c:1608 src/common/weechat.c:401
+#: src/common/command.c:1655 src/common/weechat.c:415
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Fonctions internes pour les touches:\n"
 
-#: src/common/command.c:1627
+#: src/common/command.c:1675
 msgid "Default key bindings restored\n"
 msgstr "Touches par défaut restaurées\n"
 
-#: src/common/command.c:1633
+#: src/common/command.c:1681
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 "%s le paramètre \"-yes\" est requis pour la réinitialisation des touches "
 "(raison de sécurité)\n"
 
-#: src/common/command.c:1689
+#: src/common/command.c:1737
 msgid "Plugins loaded:\n"
 msgstr "Extensions chargées :\n"
 
-#: src/common/command.c:1703
+#: src/common/command.c:1753
 msgid "     message handlers:\n"
 msgstr "     fonctions de message :\n"
 
-#: src/common/command.c:1712
+#: src/common/command.c:1762
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr "       IRC(%s)\n"
 
-#: src/common/command.c:1719
+#: src/common/command.c:1769
 msgid "       (no message handler)\n"
 msgstr "       (aucunne fonction de message)\n"
 
-#: src/common/command.c:1724
+#: src/common/command.c:1774
 msgid "     command handlers:\n"
 msgstr "     commandes :\n"
 
-#: src/common/command.c:1745
+#: src/common/command.c:1795
 msgid "       (no command handler)\n"
 msgstr "       (aucune commande)\n"
 
-#: src/common/command.c:1751
+#: src/common/command.c:1801
 msgid "  (no plugin)\n"
 msgstr "  (aucune extension)\n"
 
-#: src/common/command.c:1787
+#: src/common/command.c:1837
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
@@ -3116,31 +3142,31 @@ msgstr ""
 "La commande \"plugin\" n'est pas disponible, WeeChat a été compilé sans le "
 "support des extensions.\n"
 
-#: src/common/command.c:1834
+#: src/common/command.c:1884
 msgid "No server.\n"
 msgstr "Pas de serveur.\n"
 
-#: src/common/command.c:1845
+#: src/common/command.c:1895
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "Serveur '%s' non trouvé.\n"
 
-#: src/common/command.c:1857
+#: src/common/command.c:1907
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr "%s il manque le nom du serveur pour la commande \"%s\"\n"
 
-#: src/common/command.c:1865
+#: src/common/command.c:1915
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr "%s trop de paramètres pour la commande \"%s\", paramètres ignorés\n"
 
-#: src/common/command.c:1884
+#: src/common/command.c:1934
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr "%s le serveur \"%s\" n'existe pas pour la commande \"%s\"\n"
 
-#: src/common/command.c:1892
+#: src/common/command.c:1942
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -3149,172 +3175,172 @@ msgstr ""
 "%s vous ne pouvez pas supprimer le server \"%s\" car vous êtes connecté "
 "dessus. Essayez /disconnect %s avant.\n"
 
-#: src/common/command.c:1908 src/common/command.c:2054
-msgid "Server"
-msgstr "Serveur"
+#: src/common/command.c:1960
+#, c-format
+msgid "Server %s%s%s has been deleted\n"
+msgstr "Le serveur %s%s%s a été supprimé\n"
 
-#: src/common/command.c:1911
-msgid "has been deleted\n"
-msgstr "a été supprimé\n"
-
-#: src/common/command.c:1926
+#: src/common/command.c:1977
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s paramètres manquants pour la commande \"%s\"\n"
 
-#: src/common/command.c:1936
+#: src/common/command.c:1987
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr "%s le serveur \"%s\" existe déjà, impossible de le créer !\n"
 
-#: src/common/command.c:1965 src/common/command.c:1993
-#: src/common/command.c:2006 src/common/command.c:2032
+#: src/common/command.c:2016 src/common/command.c:2044
+#: src/common/command.c:2057 src/common/command.c:2083
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr "%s mot de passe manquant pour le paramètre \"%s\"\n"
 
-#: src/common/command.c:1978
+#: src/common/command.c:2029
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr "%s pseudo(s) manquant(s) pour le paramètre \"%s\"\n"
 
-#: src/common/command.c:2019
+#: src/common/command.c:2070
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s commande manquante pour le paramètre \"%s\"\n"
 
-#: src/common/command.c:2057
-msgid "created\n"
-msgstr "créé\n"
+#: src/common/command.c:2105
+#, c-format
+msgid "Server %s%s%s created\n"
+msgstr "Serveur %s%s%s créé\n"
 
-#: src/common/command.c:2063
+#: src/common/command.c:2114
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s impossible de créer le serveur\n"
 
-#: src/common/command.c:2118
+#: src/common/command.c:2173
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: src/common/command.c:2141
-msgid "(password hidden) "
-msgstr "(mot de passe caché) "
+#: src/common/command.c:2196
+#, c-format
+msgid "%s(password hidden) "
+msgstr "%s(mot de passe caché) "
 
-#: src/common/command.c:2205
+#: src/common/command.c:2263
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s serveur \"%s\" non trouvé\n"
 
-#: src/common/command.c:2236 src/common/command.c:2282
+#: src/common/command.c:2296 src/common/command.c:2344
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s option de configuration \"%s\" non trouvée\n"
 
-#: src/common/command.c:2241 src/common/command.c:2274
+#: src/common/command.c:2301 src/common/command.c:2336
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s valeur incorrecte pour l'option \"%s\"\n"
 
-#: src/common/command.c:2257
+#: src/common/command.c:2317
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr "%s l'option \"%s\" ne peut pas être changée lorsque WeeChat tourne\n"
 
-#: src/common/command.c:2362
+#: src/common/command.c:2427
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr "Aucune option de configuration trouvée avec \"%s\"\n"
 
-#: src/common/command.c:2365
+#: src/common/command.c:2430
 msgid "No config option found\n"
 msgstr "Aucune option de configuration trouvée\n"
 
-#: src/common/command.c:2372
-msgid "Detail:\n"
-msgstr "Détail :\n"
+#: src/common/command.c:2437
+#, c-format
+msgid "%sDetail:\n"
+msgstr "%sDétail :\n"
 
-#: src/common/command.c:2376 src/common/weechat.c:287
+#: src/common/command.c:2443 src/common/weechat.c:301
 #, c-format
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr "  . type booléen (valeurs: 'on' ou 'off')\n"
 
-#: src/common/command.c:2377 src/common/command.c:2400
-#: src/common/command.c:2406 src/common/command.c:2412
-#: src/common/weechat.c:288 src/common/weechat.c:311 src/common/weechat.c:317
-#: src/common/weechat.c:323
+#: src/common/command.c:2444 src/common/command.c:2467
+#: src/common/command.c:2473 src/common/command.c:2479
+#: src/common/weechat.c:302 src/common/weechat.c:325 src/common/weechat.c:331
+#: src/common/weechat.c:337
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . valeur par défaut: '%s'\n"
 
-#: src/common/command.c:2382 src/common/weechat.c:293
+#: src/common/command.c:2449 src/common/weechat.c:307
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . type entier (valeurs: entre %d et %d)\n"
 
-#: src/common/command.c:2385 src/common/weechat.c:296
+#: src/common/command.c:2452 src/common/weechat.c:310
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . valeur par défaut: %d\n"
 
-#: src/common/command.c:2389 src/common/weechat.c:300
+#: src/common/command.c:2456 src/common/weechat.c:314
 #, c-format
 msgid "  . type string (values: "
 msgstr "  . type chaîne (valeurs: "
 
-#: src/common/command.c:2402 src/common/command.c:2408
-#: src/common/command.c:2414 src/common/weechat.c:313 src/common/weechat.c:319
-#: src/common/weechat.c:325
+#: src/common/command.c:2469 src/common/command.c:2475
+#: src/common/command.c:2481 src/common/weechat.c:327 src/common/weechat.c:333
+#: src/common/weechat.c:339
 msgid "empty"
 msgstr "vide"
 
-#: src/common/command.c:2405 src/common/weechat.c:316
+#: src/common/command.c:2472 src/common/weechat.c:330
 #, c-format
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr "  . type couleur (couleur Curses ou Gtk, voir la doc WeeChat)\n"
 
-#: src/common/command.c:2411 src/common/weechat.c:322
+#: src/common/command.c:2478 src/common/weechat.c:336
 #, c-format
 msgid "  . type string (any string)\n"
 msgstr "  . type chaîne (toute chaîne)\n"
 
-#: src/common/command.c:2417 src/common/weechat.c:328
+#: src/common/command.c:2484 src/common/weechat.c:342
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . description: %s\n"
 
-#: src/common/command.c:2424
+#: src/common/command.c:2495
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr "option(s) de configuration trouvée(s) avec \"%s\"\n"
 
-#: src/common/command.c:2427
+#: src/common/command.c:2498
 msgid "config option(s) found\n"
 msgstr "option(s) de configuration trouvée(s)\n"
 
-#: src/common/command.c:2448
+#: src/common/command.c:2519
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s alias ou commande \"%s\" non trouvé\n"
 
-#: src/common/command.c:2458
+#: src/common/command.c:2529
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "Alias \"%s\" supprimé\n"
 
-#: src/common/command.c:2511
+#: src/common/command.c:2585
 msgid "ignore were removed.\n"
 msgstr "ignore ont été supprimés.\n"
 
-#: src/common/command.c:2513
+#: src/common/command.c:2587
 msgid "ignore was removed.\n"
 msgstr "ignore a été supprimé.\n"
 
-#: src/common/command.c:2518
+#: src/common/command.c:2592
 #, c-format
 msgid "%s no ignore found\n"
 msgstr "%s aucun ignore trouvé\n"
 
-#: src/common/command.c:2543
+#: src/common/command.c:2617
 msgid "Opened windows:\n"
 msgstr "Fenêtres ouvertes:\n"
 
@@ -3361,23 +3387,23 @@ msgstr "Le tube FIFO est ferm
 msgid "%s cannot add a buffer to hotlist\n"
 msgstr "%s impossible d'ajouter le tampon à la liste des tampons actifs\n"
 
-#: src/common/log.c:118
+#: src/common/log.c:96
 msgid "Not enough memory to write log file for a buffer\n"
 msgstr "Pas assez de mémoire pour écrire un fichier log de tampon\n"
 
-#: src/common/log.c:146
+#: src/common/log.c:124
 msgid "Unable to write log file for a buffer\n"
 msgstr "Impossible d'écrire le fichier log pour un tampon\n"
 
-#: src/common/log.c:150
+#: src/common/log.c:128
 msgid "****  Beginning of log  "
 msgstr "****  Début du log  "
 
-#: src/common/log.c:164
+#: src/common/log.c:142
 msgid "****  End of log  "
 msgstr "****  Fin du log  "
 
-#: src/common/weechat.c:274
+#: src/common/weechat.c:288
 #, c-format
 msgid ""
 "WeeChat configuration options (~/.weechat/weechat.rc):\n"
@@ -3386,7 +3412,7 @@ msgstr ""
 "Options de configuration de WeeChat (~/.weechat/weechat.rc):\n"
 "\n"
 
-#: src/common/weechat.c:335
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "Moreover, you can define aliases in [alias] section, by adding lines like:\n"
@@ -3394,7 +3420,7 @@ msgstr ""
 "De plus, vous pouvez définir des alias dans la section [alias], en ajoutant "
 "des lignes comme :\n"
 
-#: src/common/weechat.c:337
+#: src/common/weechat.c:351
 #, c-format
 msgid ""
 "where 'j' is alias name, and 'join' associated command.\n"
@@ -3403,62 +3429,62 @@ msgstr ""
 "où 'j' est le nom de l'alias, et 'join' la commande associée.\n"
 "\n"
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:437
 #, c-format
 msgid "%s default keys:\n"
 msgstr "Touches par défaut %s:\n"
 
-#: src/common/weechat.c:503
+#: src/common/weechat.c:525
 #, c-format
 msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
 msgstr "%s syntaxe invalide pour le serveur IRC ('%s'), ignoré\n"
 
-#: src/common/weechat.c:516
+#: src/common/weechat.c:538
 #, c-format
 msgid "%s unable to create server ('%s'), ignored\n"
 msgstr "%s impossible de créer le serveur ('%s'), ignoré\n"
 
-#: src/common/weechat.c:525
+#: src/common/weechat.c:547
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr "%s paramètre inconnu '%s', ignoré\n"
 
-#: src/common/weechat.c:545
+#: src/common/weechat.c:567
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr "%s impossible de créer le répertoire \"%s\"\n"
 
-#: src/common/weechat.c:571
+#: src/common/weechat.c:593
 #, c-format
 msgid "%s unable to get HOME directory\n"
 msgstr "%s impossible de lire le répertoire personnel\n"
 
-#: src/common/weechat.c:580
+#: src/common/weechat.c:602
 #, c-format
 msgid "%s not enough memory for home directory\n"
 msgstr "%s pas assez de mémoire pour le répertoire personnel\n"
 
-#: src/common/weechat.c:590
+#: src/common/weechat.c:612
 #, c-format
 msgid "%s unable to create ~/.weechat directory\n"
 msgstr "%s impossible de créer le répertoire ~/.weechat\n"
 
-#: src/common/weechat.c:603
+#: src/common/weechat.c:625
 #, c-format
 msgid "%s unable to create ~/.weechat/logs directory\n"
 msgstr "%s impossible de créer le répertoire ~/.weechat/logs\n"
 
-#: src/common/weechat.c:646
+#: src/common/weechat.c:668
 #, c-format
 msgid "%s unable to create/append to log file (~/.weechat/%s)"
 msgstr "%s impossible de créer/ajouter dans le fichier de log (~/.weechat/%s)"
 
-#: src/common/weechat.c:669
+#: src/common/weechat.c:696
 #, c-format
-msgid "%sWelcome to "
-msgstr "%sBienvenue dans "
+msgid "%sWelcome to %s%s%s, %s\n"
+msgstr "%sBienvenue dans %s%s%s, %s\n"
 
-#: src/common/weechat.c:682 src/common/weechat.c:691
+#: src/common/weechat.c:710 src/common/weechat.c:720
 msgid "compiled on"
 msgstr "compilé le"
 
@@ -3470,36 +3496,36 @@ msgstr "Erreur WeeChat:"
 msgid "WeeChat Warning:"
 msgstr "Avertissement WeeChat:"
 
-#: src/common/weeconfig.c:103 src/common/weeconfig.c:104
+#: src/common/weeconfig.c:102 src/common/weeconfig.c:103
 msgid "set title for window (terminal for Curses GUI) with name & version"
 msgstr ""
 "définit le titre de la fenêtre (terminal pour l'interface Curses) avec le "
 "nom et la version"
 
-#: src/common/weeconfig.c:107 src/common/weeconfig.c:108
+#: src/common/weeconfig.c:106 src/common/weeconfig.c:107
 msgid "display WeeChat logo at startup"
 msgstr "afficher le logo WeeChat au démarrage"
 
-#: src/common/weeconfig.c:111 src/common/weeconfig.c:112
+#: src/common/weeconfig.c:110 src/common/weeconfig.c:111
 msgid "display WeeChat version at startup"
 msgstr "afficher la version de WeeChat au démarrage"
 
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:114
 msgid "WeeChat slogan"
 msgstr "slogan WeeChat"
 
-#: src/common/weeconfig.c:116
+#: src/common/weeconfig.c:115
 msgid "WeeChat slogan (if empty, slogan is not used)"
 msgstr "slogan WeeChat (si vide, le slogan ne sera pas utilisé)"
 
-#: src/common/weeconfig.c:119
+#: src/common/weeconfig.c:118
 msgid ""
 "ISO charset for decoding messages from server (used only if locale is UTF-8)"
 msgstr ""
 "jeu de caractères ISO pour décoder les messages du serveur (utilisé "
 "seulement si la locale est UTF-8)"
 
-#: src/common/weeconfig.c:120
+#: src/common/weeconfig.c:119
 msgid ""
 "ISO charset for decoding messages from server (used only if locale is UTF-8) "
 "(if empty, messages are not converted if locale is UTF-8"
@@ -3508,7 +3534,7 @@ msgstr ""
 "seulement si la locale est UTF-8) (si non renseigné, les messages ne sont "
 "pas concertis si la locale est UTF-8)"
 
-#: src/common/weeconfig.c:124
+#: src/common/weeconfig.c:123
 msgid ""
 "UTF charset for decoding messages from server (used only if locale is not "
 "UTF-8)"
@@ -3516,7 +3542,7 @@ msgstr ""
 "jeu de caractères UTF pour décoder les messages du serveur (utilisé "
 "seulement si la locale n'est pas UTF-8)"
 
-#: src/common/weeconfig.c:125
+#: src/common/weeconfig.c:124
 msgid ""
 "UTF charset for decoding messages from server (used only if locale is not "
 "UTF-8) (if empty, messages are not converted if locale is not UTF-8"
@@ -3525,11 +3551,11 @@ msgstr ""
 "seulement si la locale n'est pas UTF-8) (si non renseigné, les messages ne "
 "sont pas convertis si la locale n'est pas UTF-8)"
 
-#: src/common/weeconfig.c:129
+#: src/common/weeconfig.c:128
 msgid "charset for encoding messages sent to server"
 msgstr "jeu de caractères pour encoder les messages envoyés au serveur"
 
-#: src/common/weeconfig.c:130
+#: src/common/weeconfig.c:129
 msgid ""
 "charset for encoding messages sent to server, examples: UFT-8, ISO-8859-1 "
 "(if empty, messages are not converted)"
@@ -3537,13 +3563,13 @@ msgstr ""
 "jeu de caractères pour encoder les messages envoyés au serveur, exemples: "
 "UFT-8, ISO-8859-1 (si non renseigné, les messages ne sont pas convertis)"
 
-#: src/common/weeconfig.c:133
+#: src/common/weeconfig.c:132
 msgid "forces internal WeeChat charset (should be empty in most cases)"
 msgstr ""
 "force le jeu de caractères interne à WeeChat (doit être vide dans la plupart "
 "des cas)"
 
-#: src/common/weeconfig.c:134
+#: src/common/weeconfig.c:133
 msgid ""
 "forces internal WeeChat charset (should be empty in most cases, that means "
 "detected charset is used)"
@@ -3551,53 +3577,49 @@ msgstr ""
 "force le jeu de caractères interne à WeeChat (doit être vide dans la plupart "
 "des cas, ce qui signifie que le jeu de caractères détecté est utilisé)"
 
-#: src/common/weeconfig.c:137 src/common/weeconfig.c:138
+#: src/common/weeconfig.c:136 src/common/weeconfig.c:137
 msgid "use same buffer for all servers"
 msgstr "utiliser le même tampon pour tous les serveurs"
 
-#: src/common/weeconfig.c:141 src/common/weeconfig.c:142
+#: src/common/weeconfig.c:140 src/common/weeconfig.c:141
 msgid "timestamp for buffers"
 msgstr "format de date/heure pour les tampons"
 
-#: src/common/weeconfig.c:145 src/common/weeconfig.c:146
+#: src/common/weeconfig.c:144 src/common/weeconfig.c:145
 msgid "display nick names with different colors"
 msgstr "afficher les utilisateurs avec différentes couleurs"
 
-#: src/common/weeconfig.c:149 src/common/weeconfig.c:150
+#: src/common/weeconfig.c:148 src/common/weeconfig.c:149
 msgid "number of colors to use for nicks colors"
 msgstr "nombre de couleurs à utiliser pour les couleurs des pseudos"
 
-#: src/common/weeconfig.c:153 src/common/weeconfig.c:154
+#: src/common/weeconfig.c:152 src/common/weeconfig.c:153
 msgid "display actions with different colors"
 msgstr "afficher les actions avec différentes couleurs"
 
-#: src/common/weeconfig.c:157 src/common/weeconfig.c:158
-msgid "remove colors from incoming messages"
-msgstr "supprimer les couleurs dans les messages entrants"
-
-#: src/common/weeconfig.c:161
+#: src/common/weeconfig.c:156
 msgid "display nicklist window"
 msgstr "afficher la fenêtre des utilisateurs"
 
-#: src/common/weeconfig.c:162
+#: src/common/weeconfig.c:157
 msgid "display nicklist window (for channel windows)"
 msgstr "afficher la fenêtre des utilisateurs (pour les fenêtres de canaux)"
 
-#: src/common/weeconfig.c:165
+#: src/common/weeconfig.c:160
 msgid "nicklist position"
 msgstr "position de la fenêtre d'utilisateurs"
 
-#: src/common/weeconfig.c:166
+#: src/common/weeconfig.c:161
 msgid "nicklist position (top, left, right (default), bottom)"
 msgstr ""
 "position de la fenêtre d'utilisateurs (haut (top), gauche (left), droite "
 "(right, par défaut), bas (bottom))"
 
-#: src/common/weeconfig.c:169
+#: src/common/weeconfig.c:164
 msgid "min size for nicklist"
 msgstr "taille minimum pour la fenêtre d'utilisateurs"
 
-#: src/common/weeconfig.c:170
+#: src/common/weeconfig.c:165
 msgid ""
 "min size for nicklist (width or height, depending on look_nicklist_position "
 "(0 = no min size))"
@@ -3605,11 +3627,11 @@ msgstr ""
 "taille minimum pour la fenêtre d'utilisateurs (largeur ou hauteur, selon "
 "look_nicklist_position (0 = pas de taille minimum))"
 
-#: src/common/weeconfig.c:174
+#: src/common/weeconfig.c:169
 msgid "max size for nicklist"
 msgstr "taille maximum pour la fenêtre d'utilisateurs"
 
-#: src/common/weeconfig.c:175
+#: src/common/weeconfig.c:170
 msgid ""
 "max size for nicklist (width or height, depending on look_nicklist_position "
 "(0 = no max size; if min == max and > 0, then size is fixed))"
@@ -3618,47 +3640,47 @@ msgstr ""
 "look_nicklist_position (0 = pas de taille maximum; si min == max et > 0, "
 "alors la taille est fixe))"
 
-#: src/common/weeconfig.c:179 src/common/weeconfig.c:180
+#: src/common/weeconfig.c:174 src/common/weeconfig.c:175
 msgid "text to display instead of nick when not connected"
 msgstr ""
 "texte à afficher en lieu et place du nom d'utilisateur lorsque la connexion "
 "n'est pas active"
 
-#: src/common/weeconfig.c:183 src/common/weeconfig.c:184
+#: src/common/weeconfig.c:178 src/common/weeconfig.c:179
 msgid "display nick mode ((half)op/voice) before each nick"
 msgstr ""
 "afficher le mode de l'utilisateur ((half)op/voice) devant chaque utilisateur"
 
-#: src/common/weeconfig.c:187 src/common/weeconfig.c:188
+#: src/common/weeconfig.c:182 src/common/weeconfig.c:183
 msgid "display space if nick mode is not (half)op/voice"
 msgstr "afficher un espace si le mode utilisateur n'est pas (half)op/voice"
 
-#: src/common/weeconfig.c:191 src/common/weeconfig.c:192
+#: src/common/weeconfig.c:186 src/common/weeconfig.c:187
 msgid "the string inserted after nick completion"
 msgstr "la chaîne affichée après la complétion des pseudos"
 
-#: src/common/weeconfig.c:195 src/common/weeconfig.c:196
+#: src/common/weeconfig.c:190 src/common/weeconfig.c:191
 msgid "chars ignored for nick completion"
 msgstr "caractères à ignorer pour la complétion des pseudos"
 
-#: src/common/weeconfig.c:199 src/common/weeconfig.c:200
+#: src/common/weeconfig.c:194 src/common/weeconfig.c:195
 msgid "enable info bar"
 msgstr "active la barre d'infos"
 
-#: src/common/weeconfig.c:203 src/common/weeconfig.c:204
+#: src/common/weeconfig.c:198 src/common/weeconfig.c:199
 msgid "timestamp for time in infobar"
 msgstr "format de date/heure dans la barre d'info"
 
-#: src/common/weeconfig.c:207 src/common/weeconfig.c:208
+#: src/common/weeconfig.c:202 src/common/weeconfig.c:203
 msgid "display seconds in infobar time"
 msgstr "afficher les secondes pour l'heure dans la barre d'infos"
 
-#: src/common/weeconfig.c:211
+#: src/common/weeconfig.c:206
 msgid "delay (in seconds) for highlight messages in infobar"
 msgstr ""
 "délai (en seconds) pour la notification des messages dans la barre d'infos"
 
-#: src/common/weeconfig.c:212
+#: src/common/weeconfig.c:207
 msgid ""
 "delay (in seconds) for highlight messages in infobar (0 = disable highlight "
 "notifications in infobar)"
@@ -3666,22 +3688,22 @@ msgstr ""
 "délai (en secondes) pour la notification des messages dans la barre d'infos "
 "(0 = désactiver les notifications dans la barre d'infos)"
 
-#: src/common/weeconfig.c:216
+#: src/common/weeconfig.c:211
 msgid "max number of names in hotlist"
 msgstr "nombre maximum de noms dans la liste d'activité"
 
-#: src/common/weeconfig.c:217
+#: src/common/weeconfig.c:212
 msgid ""
 "max number of names in hotlist (0 = no name displayed, only buffer numbers)"
 msgstr ""
 "nombre maximum de noms dans la liste d'activité (0 = pas de nom affiché, "
 "seulement les numéros de tampons)"
 
-#: src/common/weeconfig.c:220
+#: src/common/weeconfig.c:215
 msgid "level for displaying names in hotlist"
 msgstr "niveau pour l'affichage des noms dans la liste d'activité"
 
-#: src/common/weeconfig.c:221
+#: src/common/weeconfig.c:216
 msgid ""
 "level for displaying names in hotlist (combination of: 1=join/part, "
 "2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
@@ -3690,321 +3712,321 @@ msgstr ""
 "1=join/part, 2=message, 4=privé, 8=highlight, par exemple: 12=privé"
 "+highlight)"
 
-#: src/common/weeconfig.c:225
+#: src/common/weeconfig.c:220
 msgid "max length of names in hotlist"
 msgstr "longueur maximum des noms dans la liste d'activité"
 
-#: src/common/weeconfig.c:226
+#: src/common/weeconfig.c:221
 msgid "max length of names in hotlist (0 = no limit)"
 msgstr "nombre maximum des noms dans la liste d'activité (0 = pas de limite)"
 
-#: src/common/weeconfig.c:229 src/common/weeconfig.c:230
+#: src/common/weeconfig.c:224 src/common/weeconfig.c:225
 msgid "display special message when day changes"
 msgstr "affiche un message quand le jour change"
 
-#: src/common/weeconfig.c:233 src/common/weeconfig.c:234
+#: src/common/weeconfig.c:228 src/common/weeconfig.c:229
 msgid "timestamp for date displayed when day changed"
 msgstr "format de date pour la date affichée quand le jour a changé"
 
-#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
+#: src/common/weeconfig.c:294 src/common/weeconfig.c:295
 msgid "color for title bar"
 msgstr "couleur pour la barre de titre"
 
-#: src/common/weeconfig.c:303 src/common/weeconfig.c:304
+#: src/common/weeconfig.c:298 src/common/weeconfig.c:299
 msgid "background for title bar"
 msgstr "couleur de fond pour la barre de titre"
 
-#: src/common/weeconfig.c:309 src/common/weeconfig.c:310
+#: src/common/weeconfig.c:304 src/common/weeconfig.c:305
 msgid "color for chat text"
 msgstr "couleur pour le texte de discussion"
 
-#: src/common/weeconfig.c:313
+#: src/common/weeconfig.c:308
 msgid "color for time"
 msgstr "couleur pour l'heure"
 
-#: src/common/weeconfig.c:314
+#: src/common/weeconfig.c:309
 msgid "color for time in chat window"
 msgstr "couleur pour l'heure dans la fenêtre de discussion"
 
-#: src/common/weeconfig.c:317
+#: src/common/weeconfig.c:312
 msgid "color for time separator"
 msgstr "couleur pour le séparateur de l'heure"
 
-#: src/common/weeconfig.c:318
+#: src/common/weeconfig.c:313
 msgid "color for time separator (chat window)"
 msgstr "couleur pour la séparation de l'heure (fenêtre de discussion)"
 
-#: src/common/weeconfig.c:321 src/common/weeconfig.c:322
+#: src/common/weeconfig.c:316 src/common/weeconfig.c:317
 msgid "color for 1st and 3rd char of prefix"
 msgstr "couleur pour le 1er et le 3ème caractère du préfixe"
 
-#: src/common/weeconfig.c:325 src/common/weeconfig.c:326
+#: src/common/weeconfig.c:320 src/common/weeconfig.c:321
 msgid "color for middle char of prefix"
 msgstr "couleur pour le caractère du milieu du préfixe"
 
-#: src/common/weeconfig.c:329 src/common/weeconfig.c:330
+#: src/common/weeconfig.c:324 src/common/weeconfig.c:325
 msgid "color for server name"
 msgstr "couleur pour le nom du serveur"
 
-#: src/common/weeconfig.c:333 src/common/weeconfig.c:334
+#: src/common/weeconfig.c:328 src/common/weeconfig.c:329
 msgid "color for join arrow (prefix)"
 msgstr "couleur pour la flèche du join (préfixe)"
 
-#: src/common/weeconfig.c:337 src/common/weeconfig.c:338
+#: src/common/weeconfig.c:332 src/common/weeconfig.c:333
 msgid "color for part/quit arrow (prefix)"
 msgstr "couleur pour la flèche du part/quit (préfixe)"
 
-#: src/common/weeconfig.c:341
+#: src/common/weeconfig.c:336
 msgid "color for nicks in actions"
 msgstr "couleur pour les noms d'utilisateur dans les actions"
 
-#: src/common/weeconfig.c:342
+#: src/common/weeconfig.c:337
 msgid "color for nicks in actions (chat window)"
 msgstr ""
 "couleur pour les noms d'utilisateurs dans les actions (fenêtre de discussion)"
 
-#: src/common/weeconfig.c:345
+#: src/common/weeconfig.c:340
 msgid "color for hostnames"
 msgstr "couleur pour les noms de machines"
 
-#: src/common/weeconfig.c:346
+#: src/common/weeconfig.c:341
 msgid "color for hostnames (chat window)"
 msgstr "couleur pour les noms de machines (fenêtre de discussion)"
 
-#: src/common/weeconfig.c:349
+#: src/common/weeconfig.c:344
 msgid "color for channel names in actions"
 msgstr "couleur pour les canaux dans les actions"
 
-#: src/common/weeconfig.c:350
+#: src/common/weeconfig.c:345
 msgid "color for channel names in actions (chat window)"
 msgstr "couleur pour les canaux dans les actions (fenêtre de discussion)"
 
-#: src/common/weeconfig.c:353
+#: src/common/weeconfig.c:348
 msgid "color for dark separators"
 msgstr "couleur pour les séparateurs sombres"
 
-#: src/common/weeconfig.c:354
+#: src/common/weeconfig.c:349
 msgid "color for dark separators (chat window)"
 msgstr "couleur pour les séparateurs sombres (fenêtre de discussion)"
 
-#: src/common/weeconfig.c:357
+#: src/common/weeconfig.c:352
 msgid "color for highlighted nick"
 msgstr "couleur pour le pseudo surligné"
 
-#: src/common/weeconfig.c:358
+#: src/common/weeconfig.c:353
 msgid "color for highlighted nick (chat window)"
 msgstr "couleur pour le pseudo surligné (fenêtre de discussion)"
 
-#: src/common/weeconfig.c:361
+#: src/common/weeconfig.c:356
 msgid "background for chat"
 msgstr "couleur de fond pour la discussion"
 
-#: src/common/weeconfig.c:362
+#: src/common/weeconfig.c:357
 msgid "background for chat window"
 msgstr "couleur de fond pour la fenêtre de discussion"
 
-#: src/common/weeconfig.c:367 src/common/weeconfig.c:368
+#: src/common/weeconfig.c:362 src/common/weeconfig.c:363
 msgid "color for status bar"
 msgstr "couleur pour la barre de statut"
 
-#: src/common/weeconfig.c:371 src/common/weeconfig.c:372
+#: src/common/weeconfig.c:366 src/common/weeconfig.c:367
 msgid "color for status bar delimiters"
 msgstr "couleur pour les délimiteurs de la barre de statut"
 
-#: src/common/weeconfig.c:375 src/common/weeconfig.c:376
+#: src/common/weeconfig.c:370 src/common/weeconfig.c:371
 msgid "color for current channel in status bar"
 msgstr "couleur pour le canal courant dans la barre de statut"
 
-#: src/common/weeconfig.c:379
+#: src/common/weeconfig.c:374
 msgid "color for window with new messages"
 msgstr "couleur pour une fenêtre avec de nouvelles infos"
 
-#: src/common/weeconfig.c:380
+#: src/common/weeconfig.c:375
 msgid "color for window with new messages (status bar)"
 msgstr "couleur pour une fenêtre avec de nouvelles infos (barre de statut)"
 
-#: src/common/weeconfig.c:383
+#: src/common/weeconfig.c:378
 msgid "color for window with private message"
 msgstr "couleur pour une fenêtre avec un message privé"
 
-#: src/common/weeconfig.c:384
+#: src/common/weeconfig.c:379
 msgid "color for window with private message (status bar)"
 msgstr "couleur pour une fenêtre avec un message privé (barre de statut)"
 
-#: src/common/weeconfig.c:387
+#: src/common/weeconfig.c:382
 msgid "color for window with highlight"
 msgstr "couleur pour une fenêtre avec un highlight"
 
-#: src/common/weeconfig.c:388
+#: src/common/weeconfig.c:383
 msgid "color for window with highlight (status bar)"
 msgstr "couleur pour une fenêtre avec un highlight (barre de statut)"
 
-#: src/common/weeconfig.c:391
+#: src/common/weeconfig.c:386
 msgid "color for window with new data (not messages)"
 msgstr "couleur pour une fenêtre avec des nouvelles données (pas des infos)"
 
-#: src/common/weeconfig.c:392
+#: src/common/weeconfig.c:387
 msgid "color for window with new data (not messages) (status bar)"
 msgstr ""
 "couleur pour une fenêtre avec des nouvelles données (pas des infos) (barre "
 "de statut)"
 
-#: src/common/weeconfig.c:395
+#: src/common/weeconfig.c:390
 msgid "color for \"-MORE-\" text"
 msgstr "couleur pour le texte \"-PLUS-\""
 
-#: src/common/weeconfig.c:396
+#: src/common/weeconfig.c:391
 msgid "color for window with new data (status bar)"
 msgstr "couleur pour une fenêtre avec des nouvelles données (barre de statut)"
 
-#: src/common/weeconfig.c:399 src/common/weeconfig.c:400
+#: src/common/weeconfig.c:394 src/common/weeconfig.c:395
 msgid "background for status window"
 msgstr "couleur de fond pour la fenêtre de statut"
 
-#: src/common/weeconfig.c:405 src/common/weeconfig.c:406
+#: src/common/weeconfig.c:400 src/common/weeconfig.c:401
 msgid "color for info bar text"
 msgstr "couleur pour la barre d'infos"
 
-#: src/common/weeconfig.c:409 src/common/weeconfig.c:410
+#: src/common/weeconfig.c:404 src/common/weeconfig.c:405
 msgid "color for infobar delimiters"
 msgstr "couleur pour les délimiteurs de la barre d'infos"
 
-#: src/common/weeconfig.c:413 src/common/weeconfig.c:414
+#: src/common/weeconfig.c:408 src/common/weeconfig.c:409
 msgid "color for info bar highlight notification"
 msgstr "couleur pour la notification dans la barre d'infos"
 
-#: src/common/weeconfig.c:417 src/common/weeconfig.c:418
+#: src/common/weeconfig.c:412 src/common/weeconfig.c:413
 msgid "background for info bar window"
 msgstr "couleur de fond pour la fenêtre de barre d'infos"
 
-#: src/common/weeconfig.c:423 src/common/weeconfig.c:424
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
 msgid "color for input text"
 msgstr "couleur pour le texte saisi"
 
-#: src/common/weeconfig.c:427 src/common/weeconfig.c:428
+#: src/common/weeconfig.c:422 src/common/weeconfig.c:423
 msgid "color for input text (channel name)"
 msgstr "couleur pour le texte saisi (nom du canal)"
 
-#: src/common/weeconfig.c:431 src/common/weeconfig.c:432
+#: src/common/weeconfig.c:426 src/common/weeconfig.c:427
 msgid "color for input text (nick name)"
 msgstr "couleur pour le texte saisi (pseudo)"
 
-#: src/common/weeconfig.c:435 src/common/weeconfig.c:436
+#: src/common/weeconfig.c:430 src/common/weeconfig.c:431
 msgid "color for input text (delimiters)"
 msgstr "couleur pour le texte saisi (délimiteurs)"
 
-#: src/common/weeconfig.c:439 src/common/weeconfig.c:440
+#: src/common/weeconfig.c:434 src/common/weeconfig.c:435
 msgid "background for input window"
 msgstr "couleur de fond pour la fenêtre de saisie"
 
-#: src/common/weeconfig.c:445 src/common/weeconfig.c:446
+#: src/common/weeconfig.c:440 src/common/weeconfig.c:441
 msgid "color for nicknames"
 msgstr "couleur pour les pseudos"
 
-#: src/common/weeconfig.c:449 src/common/weeconfig.c:450
+#: src/common/weeconfig.c:444 src/common/weeconfig.c:445
 msgid "color for away nicknames"
 msgstr "couleur pour les pseudos absents"
 
-#: src/common/weeconfig.c:453
+#: src/common/weeconfig.c:448
 msgid "color for chan owner symbol"
 msgstr "couleur pour le symbole du propriétaire du canal"
 
-#: src/common/weeconfig.c:454
+#: src/common/weeconfig.c:449
 msgid "color for chan owner symbol (specific to unrealircd)"
 msgstr ""
 "couleur pour le symbole du propriétaire du canal (spécifique à unrealircd)"
 
-#: src/common/weeconfig.c:457
+#: src/common/weeconfig.c:452
 msgid "color for chan admin symbol"
 msgstr "couleur pour le symbole administrateur du canal"
 
-#: src/common/weeconfig.c:458
+#: src/common/weeconfig.c:453
 msgid "color for chan admin symbol (specific to unrealircd)"
 msgstr ""
 "couleur pour le symbole administrateur du canal (spécifique à unrealircd)"
 
-#: src/common/weeconfig.c:461 src/common/weeconfig.c:462
+#: src/common/weeconfig.c:456 src/common/weeconfig.c:457
 msgid "color for operator symbol"
 msgstr "couleur pour le symbole opérateur"
 
-#: src/common/weeconfig.c:465 src/common/weeconfig.c:466
+#: src/common/weeconfig.c:460 src/common/weeconfig.c:461
 msgid "color for half-operator symbol"
 msgstr "couleur pour le symbole demi-opérateur"
 
-#: src/common/weeconfig.c:469 src/common/weeconfig.c:470
+#: src/common/weeconfig.c:464 src/common/weeconfig.c:465
 msgid "color for voice symbol"
 msgstr "couleur pour le symbole voix"
 
-#: src/common/weeconfig.c:473 src/common/weeconfig.c:474
+#: src/common/weeconfig.c:468 src/common/weeconfig.c:469
 msgid "color for '+' when scrolling nicks"
 msgstr "couleur pour les '+' lors du scroll sur les pseudos"
 
-#: src/common/weeconfig.c:477 src/common/weeconfig.c:478
+#: src/common/weeconfig.c:472 src/common/weeconfig.c:473
 msgid "color for nick separator"
 msgstr "couleur pour le séparateur de pseudo"
 
-#: src/common/weeconfig.c:481 src/common/weeconfig.c:482
+#: src/common/weeconfig.c:476 src/common/weeconfig.c:477
 msgid "color for local nick"
 msgstr "couleur pour le pseudo local"
 
-#: src/common/weeconfig.c:485 src/common/weeconfig.c:486
-#: src/common/weeconfig.c:489 src/common/weeconfig.c:490
-#: src/common/weeconfig.c:493 src/common/weeconfig.c:494
-#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
-#: src/common/weeconfig.c:501 src/common/weeconfig.c:502
-#: src/common/weeconfig.c:505 src/common/weeconfig.c:506
-#: src/common/weeconfig.c:509 src/common/weeconfig.c:510
-#: src/common/weeconfig.c:513 src/common/weeconfig.c:514
-#: src/common/weeconfig.c:517 src/common/weeconfig.c:518
-#: src/common/weeconfig.c:521 src/common/weeconfig.c:522
+#: src/common/weeconfig.c:480 src/common/weeconfig.c:481
+#: src/common/weeconfig.c:484 src/common/weeconfig.c:485
+#: src/common/weeconfig.c:488 src/common/weeconfig.c:489
+#: src/common/weeconfig.c:492 src/common/weeconfig.c:493
+#: src/common/weeconfig.c:496 src/common/weeconfig.c:497
+#: src/common/weeconfig.c:500 src/common/weeconfig.c:501
+#: src/common/weeconfig.c:504 src/common/weeconfig.c:505
+#: src/common/weeconfig.c:508 src/common/weeconfig.c:509
+#: src/common/weeconfig.c:512 src/common/weeconfig.c:513
+#: src/common/weeconfig.c:516 src/common/weeconfig.c:517
 msgid "color for nick"
 msgstr "couleur pour le pseudo"
 
-#: src/common/weeconfig.c:525 src/common/weeconfig.c:526
+#: src/common/weeconfig.c:520 src/common/weeconfig.c:521
 msgid "color for other nick in private window"
 msgstr "couleur pour l'autre pseudo dans la fenêtre privée"
 
-#: src/common/weeconfig.c:529 src/common/weeconfig.c:530
+#: src/common/weeconfig.c:524 src/common/weeconfig.c:525
 msgid "background for nicknames"
 msgstr "couleur de fond pour les pseudos"
 
-#: src/common/weeconfig.c:535
+#: src/common/weeconfig.c:530
 msgid "color for selected DCC"
 msgstr "couleur pour le DCC sélectionné"
 
-#: src/common/weeconfig.c:536
+#: src/common/weeconfig.c:531
 msgid "color for selected DCC (chat window)"
 msgstr "couleur pour le DCC sélectionné (fenêtre de discussion)"
 
-#: src/common/weeconfig.c:539 src/common/weeconfig.c:540
+#: src/common/weeconfig.c:534 src/common/weeconfig.c:535
 msgid "color for \"waiting\" dcc status"
 msgstr "couleur pour le statut dcc \"attente\""
 
-#: src/common/weeconfig.c:543 src/common/weeconfig.c:544
+#: src/common/weeconfig.c:538 src/common/weeconfig.c:539
 msgid "color for \"connecting\" dcc status"
 msgstr "couleur pour le statut dcc \"connexion\""
 
-#: src/common/weeconfig.c:547 src/common/weeconfig.c:548
+#: src/common/weeconfig.c:542 src/common/weeconfig.c:543
 msgid "color for \"active\" dcc status"
 msgstr "couleur pour le statut dcc \"actif\""
 
-#: src/common/weeconfig.c:551 src/common/weeconfig.c:552
+#: src/common/weeconfig.c:546 src/common/weeconfig.c:547
 msgid "color for \"done\" dcc status"
 msgstr "couleur pour le statut dcc \"terminé\""
 
-#: src/common/weeconfig.c:555 src/common/weeconfig.c:556
+#: src/common/weeconfig.c:550 src/common/weeconfig.c:551
 msgid "color for \"failed\" dcc status"
 msgstr "couleur pour le statut dcc \"échoué\""
 
-#: src/common/weeconfig.c:559 src/common/weeconfig.c:560
+#: src/common/weeconfig.c:554 src/common/weeconfig.c:555
 msgid "color for \"aborted\" dcc status"
 msgstr "couleur pour le statut dcc \"interrompu\""
 
-#: src/common/weeconfig.c:573
+#: src/common/weeconfig.c:568
 msgid "max lines in history (per window)"
 msgstr "nombre maxi de lignes dans l'historique (par fenêtre)"
 
-#: src/common/weeconfig.c:574
+#: src/common/weeconfig.c:569
 msgid ""
 "maximum number of lines in history for one server/channel/private window (0 "
 "= unlimited)"
@@ -4012,128 +4034,128 @@ msgstr ""
 "nombre maximum de lignes dans l'historique pour un serveur/fenêtre/fenêtre "
 "privée (0 = sans limite)"
 
-#: src/common/weeconfig.c:578
+#: src/common/weeconfig.c:573
 msgid "max user commands in history"
 msgstr "nombre maxi de commandes utilisateur dans l'historique"
 
-#: src/common/weeconfig.c:579
+#: src/common/weeconfig.c:574
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr ""
 "nombre maximum de commandes utilisateur dans l'historique (0 = sans limite)"
 
-#: src/common/weeconfig.c:596 src/common/weeconfig.c:597
+#: src/common/weeconfig.c:591 src/common/weeconfig.c:592
 msgid "automatically log server messages"
 msgstr "enregistrer automatiquement les messages du serveur"
 
-#: src/common/weeconfig.c:600 src/common/weeconfig.c:601
+#: src/common/weeconfig.c:595 src/common/weeconfig.c:596
 msgid "automatically log channel chats"
 msgstr "enregistrer automatiquement les conversations des canaux"
 
-#: src/common/weeconfig.c:604 src/common/weeconfig.c:605
+#: src/common/weeconfig.c:599 src/common/weeconfig.c:600
 msgid "automatically log private chats"
 msgstr "enregistrer automatiquement les conversations privées"
 
-#: src/common/weeconfig.c:608 src/common/weeconfig.c:609
+#: src/common/weeconfig.c:603 src/common/weeconfig.c:604
 msgid "log messages from plugins (scripts)"
 msgstr "enregistrer les messages des plugins (scripts)"
 
-#: src/common/weeconfig.c:612
+#: src/common/weeconfig.c:607
 msgid "path for log files"
 msgstr "chemin pour les conversations sauvegardées"
 
-#: src/common/weeconfig.c:613
+#: src/common/weeconfig.c:608
 msgid "path for WeeChat log files"
 msgstr "chemin pour les conversations sauvegardées par WeeChat"
 
-#: src/common/weeconfig.c:616
+#: src/common/weeconfig.c:611
 msgid "timestamp for log"
 msgstr "format de date/heure pour les conversations sauvegardées"
 
-#: src/common/weeconfig.c:617
+#: src/common/weeconfig.c:612
 msgid "timestamp for log (see man strftime for date/time specifiers)"
 msgstr ""
 "format de date/heure pour les conversations sauvegardées (voir man strftime "
 "pour le format de date/heure)"
 
-#: src/common/weeconfig.c:620 src/common/weeconfig.c:621
+#: src/common/weeconfig.c:615 src/common/weeconfig.c:616
 msgid "hide password displayed by nickserv"
 msgstr "masquer le mot de passe affiché par nickserv"
 
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:639
 msgid "display message to all channels when away"
 msgstr "affiche un message sur tous les canaux pour l'absence"
 
-#: src/common/weeconfig.c:643
+#: src/common/weeconfig.c:640
 msgid "display message to all channels when (un)marking as away"
 msgstr "affiche un message sur tous les canaux pour l'absence/le retour"
 
-#: src/common/weeconfig.c:646 src/common/weeconfig.c:647
+#: src/common/weeconfig.c:643 src/common/weeconfig.c:644
 msgid "default message when away"
 msgstr "message par défaut pour l'absence"
 
-#: src/common/weeconfig.c:650 src/common/weeconfig.c:651
+#: src/common/weeconfig.c:647 src/common/weeconfig.c:648
 msgid "default part message (leaving channel)"
 msgstr "message par défaut pour le part (quitte un canal)"
 
-#: src/common/weeconfig.c:654
+#: src/common/weeconfig.c:651
 msgid "default quit message"
 msgstr "message de fin par défaut"
 
-#: src/common/weeconfig.c:655
+#: src/common/weeconfig.c:652
 msgid ""
 "default quit message ('%v' will be replaced by WeeChat version in string)"
 msgstr ""
 "message de fin par défaut ('%v' sera remplacé par la version de WeeChat dans "
 "la chaîne)"
 
-#: src/common/weeconfig.c:658 src/common/weeconfig.c:659
+#: src/common/weeconfig.c:655 src/common/weeconfig.c:656
 msgid "display notices as private messages"
 msgstr "afficher les notices comme des messages privés"
 
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:659
 msgid "interval between two checks for away"
 msgstr "intervalle entre deux vérifications des absences"
 
-#: src/common/weeconfig.c:663
+#: src/common/weeconfig.c:660
 msgid "interval between two checks for away (in minutes, 0 = never check)"
 msgstr ""
 "intervalle entre deux vérifications des absences (en minutes, 0 = ne jemais "
 "vérifier)"
 
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:663
 msgid "interval between two checks for lag"
 msgstr "intervalle entre deux mesures de lag"
 
-#: src/common/weeconfig.c:667
+#: src/common/weeconfig.c:664
 msgid "interval between two checks for lag (in seconds)"
 msgstr "intervalle entre deux mesures de lag (en secondes)"
 
-#: src/common/weeconfig.c:670
+#: src/common/weeconfig.c:667
 msgid "minimum lag to show"
 msgstr "lag minimum à afficher"
 
-#: src/common/weeconfig.c:671
+#: src/common/weeconfig.c:668
 msgid "minimum lag to show (in seconds)"
 msgstr "lag minimum à afficher (en secondes)"
 
-#: src/common/weeconfig.c:674
+#: src/common/weeconfig.c:671
 msgid "disconnect after important lag"
 msgstr "déconnexion après un lag important"
 
-#: src/common/weeconfig.c:675
+#: src/common/weeconfig.c:672
 msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
 msgstr ""
 "déconnexion après un lag important (en minutes, 0 = ne jamais se déconnecter)"
 
-#: src/common/weeconfig.c:678 src/common/weeconfig.c:679
+#: src/common/weeconfig.c:675 src/common/weeconfig.c:676
 msgid "create a FIFO pipe for remote control"
 msgstr "créer un tube FIFO pour le contrôle à distance"
 
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:679
 msgid "list of words to highlight"
 msgstr "liste de mots pour la notification"
 
-#: src/common/weeconfig.c:683
+#: src/common/weeconfig.c:680
 msgid ""
 "comma separated list of words to highlight (case insensitive comparison, "
 "words may begin or end with \"*\" for partial match)"
@@ -4142,45 +4164,61 @@ msgstr ""
 "comparaison ne tient pas compte de la casse, les mots peuvent commencer ou "
 "se terminer par \"*\" pour une comparaison partielle)"
 
-#: src/common/weeconfig.c:705
+#: src/common/weeconfig.c:684 src/common/weeconfig.c:685
+msgid "keep colors from incoming messages"
+msgstr "garder les couleurs dans les messages reçus"
+
+#: src/common/weeconfig.c:688
+msgid "allow user to send colors"
+msgstr "autorise l'utilisateur à envoyer des couleurs"
+
+#: src/common/weeconfig.c:689
+msgid ""
+"allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %"
+"U=underline, %R=reverse)"
+msgstr ""
+"autorise l'utilisateur à envoyer des couleurs avec des codes spéciaux (%"
+"B=gras, %Cxx,yy=couleur, %U=souligné, %R=inversé)"
+
+#: src/common/weeconfig.c:711
 msgid "automatically accept dcc files"
 msgstr "accepte automatiquement les fichiers dcc"
 
-#: src/common/weeconfig.c:706
+#: src/common/weeconfig.c:712
 msgid "automatically accept incoming dcc files"
 msgstr "accepte automatiquement les fichiers dcc entrants"
 
-#: src/common/weeconfig.c:709
+#: src/common/weeconfig.c:715
 msgid "automatically accept dcc chats"
 msgstr "accepte automatiquement les demandes de discussion dcc"
 
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:716
 msgid "automatically accept dcc chats (use carefully!)"
 msgstr ""
 "accepte automatiquement les demandes de discussion dcc (à utiliser avec "
 "précaution !)"
 
-#: src/common/weeconfig.c:713
+#: src/common/weeconfig.c:719
 msgid "timeout for dcc request"
 msgstr "délai d'attente pour les requêtes dcc"
 
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:720
 msgid "timeout for dcc request (in seconds)"
 msgstr "délai d'attente pour les requêtes dcc (en secondes)"
 
-#: src/common/weeconfig.c:717
+#: src/common/weeconfig.c:723
 msgid "block size for dcc packets"
 msgstr "taille de bloc pour les paquets dcc"
 
-#: src/common/weeconfig.c:718
+#: src/common/weeconfig.c:724
 msgid "block size for dcc packets in bytes (default: 65536)"
 msgstr "taille de bloc pour les paquets dcc en octets (défaut: 65536)"
 
-#: src/common/weeconfig.c:721
+#: src/common/weeconfig.c:727
 msgid "allowed ports for outgoing dcc"
 msgstr "ports autorisés pour le dcc sortant"
 
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:728
 msgid ""
 "restricts outgoing dcc to use only ports in the given range (useful for NAT) "
 "(syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, empty value "
@@ -4190,11 +4228,11 @@ msgstr ""
 "pour le NAT) (syntaxe: un port simple, par exemple 5000, une plage de ports, "
 "par exemple 5000-5015, si non renseigné tout port peut être utilisé)"
 
-#: src/common/weeconfig.c:727
+#: src/common/weeconfig.c:733
 msgid "IP address for outgoing dcc"
 msgstr "adresse IP pour le dcc sortant"
 
-#: src/common/weeconfig.c:728
+#: src/common/weeconfig.c:734
 msgid ""
 "IP or DNS address used for outgoing dcc (if empty, local interface IP is "
 "used)"
@@ -4202,116 +4240,116 @@ msgstr ""
 "adresse IP ou DNS utilisée pour le dcc sortant (si non renseigné, "
 "l'interface IP locale est utilisée)"
 
-#: src/common/weeconfig.c:732
+#: src/common/weeconfig.c:738
 msgid "path for incoming files with dcc"
 msgstr "chemin les fichiers reçus par dcc"
 
-#: src/common/weeconfig.c:733
+#: src/common/weeconfig.c:739
 msgid "path for writing incoming files with dcc (default: user home)"
 msgstr ""
 "chemin pour écrire les fichiers reçus par dcc (par défaut: répertoire de "
 "l'utilisateur)"
 
-#: src/common/weeconfig.c:736
+#: src/common/weeconfig.c:742
 msgid "default path for sending files with dcc"
 msgstr "chemin par défaut pour envoyer les fichiers par dcc"
 
-#: src/common/weeconfig.c:737
+#: src/common/weeconfig.c:743
 msgid ""
 "path for reading files when sending thru dcc (when no path is specified)"
 msgstr ""
 "chemin pour lire les fichiers lorsqu'ils sont envoyés par dcc (quand aucun "
 "chemin n'est spécifié)"
 
-#: src/common/weeconfig.c:740 src/common/weeconfig.c:741
+#: src/common/weeconfig.c:746 src/common/weeconfig.c:747
 msgid "convert spaces to underscores when sending files"
 msgstr "convertir les espaces en underscores lors d'envoi de fichiers"
 
-#: src/common/weeconfig.c:744
+#: src/common/weeconfig.c:750
 msgid "automatically rename dcc files if already exists"
 msgstr "renomme automatiquement les fichiers dcc s'ils existent déjà"
 
-#: src/common/weeconfig.c:745
+#: src/common/weeconfig.c:751
 msgid "rename incoming files if already exists (add '.1', '.2', ...)"
 msgstr ""
 "renommer les fichiers reçus s'ils existent déjà (ajoute '.1', '.2', ...)"
 
-#: src/common/weeconfig.c:748
+#: src/common/weeconfig.c:754
 msgid "automatically resume aborted transfers"
 msgstr "continuer automatiquement les transferts non terminés"
 
-#: src/common/weeconfig.c:749
+#: src/common/weeconfig.c:755
 msgid ""
 "automatically resume dcc transfer if connection with remote host is loosed"
 msgstr ""
 "continuer automatiquement les transferts dcc si la connexion avec la machine "
 "distante a été perdue"
 
-#: src/common/weeconfig.c:768
+#: src/common/weeconfig.c:774
 msgid "use proxy"
 msgstr "utiliser un proxy"
 
-#: src/common/weeconfig.c:769
+#: src/common/weeconfig.c:775
 msgid "use a proxy server to connect to irc server"
 msgstr "utiliser un proxy pour se connecter au serveur irc"
 
-#: src/common/weeconfig.c:772
+#: src/common/weeconfig.c:778
 msgid "proxy type"
 msgstr "type de proxy"
 
-#: src/common/weeconfig.c:773
+#: src/common/weeconfig.c:779
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "type de proxy (http (défaut), socks4, socks5)"
 
-#: src/common/weeconfig.c:776
+#: src/common/weeconfig.c:782
 msgid "use ipv6 proxy"
 msgstr "utiliser un proxy ipv6"
 
-#: src/common/weeconfig.c:777
+#: src/common/weeconfig.c:783
 msgid "connect to proxy in ipv6"
 msgstr "se connecter au proxy en ipv6"
 
-#: src/common/weeconfig.c:780
+#: src/common/weeconfig.c:786
 msgid "proxy address"
 msgstr "adresse du proxy"
 
-#: src/common/weeconfig.c:781
+#: src/common/weeconfig.c:787
 msgid "proxy server address (IP or hostname)"
 msgstr "adresse du serveur proxy (IP ou nom)"
 
-#: src/common/weeconfig.c:784
+#: src/common/weeconfig.c:790
 msgid "port for proxy"
 msgstr "port pour le proxy"
 
-#: src/common/weeconfig.c:785
+#: src/common/weeconfig.c:791
 msgid "port for connecting to proxy server"
 msgstr "port pour se connecter au serveur proxy"
 
-#: src/common/weeconfig.c:788
+#: src/common/weeconfig.c:794
 msgid "proxy username"
 msgstr "nom d'utilisateur proxy"
 
-#: src/common/weeconfig.c:789
+#: src/common/weeconfig.c:795
 msgid "username for proxy server"
 msgstr "nom d'utilisateur pour le serveur proxy"
 
-#: src/common/weeconfig.c:792
+#: src/common/weeconfig.c:798
 msgid "proxy password"
 msgstr "mot de passe pour le proxy"
 
-#: src/common/weeconfig.c:793
+#: src/common/weeconfig.c:799
 msgid "password for proxy server"
 msgstr "mot de passe pour le serveur proxy"
 
-#: src/common/weeconfig.c:806 src/common/weeconfig.c:807
+#: src/common/weeconfig.c:812 src/common/weeconfig.c:813
 msgid "path for searching plugins"
 msgstr "chemin de recherche des extensions"
 
-#: src/common/weeconfig.c:810
+#: src/common/weeconfig.c:816
 msgid "list of plugins to load automatically"
 msgstr "list des extensions à charger automatiquement"
 
-#: src/common/weeconfig.c:811
+#: src/common/weeconfig.c:817
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found (names may be partial, for example \"perl\" is ok "
@@ -4321,11 +4359,11 @@ msgstr ""
 "toutes (séparées par des virgules, les noms peuvent être partiels, par "
 "exemple \"perl\" est ok pour \"libperl.so\")"
 
-#: src/common/weeconfig.c:816
+#: src/common/weeconfig.c:822
 msgid "standard plugins extension in filename"
 msgstr "extension standard des extensions dans le nom de fichier"
 
-#: src/common/weeconfig.c:817
+#: src/common/weeconfig.c:823
 msgid ""
 "standard plugins extension in filename, used for autoload (if empty, then "
 "all files are loaded when autoload is \"*\")"
@@ -4334,91 +4372,91 @@ msgstr ""
 "automatique (si vide, alors tous les fichiers sont chargés si autoload vaut "
 "\"*\")"
 
-#: src/common/weeconfig.c:834
+#: src/common/weeconfig.c:840
 msgid "server name"
 msgstr "nom du serveur"
 
-#: src/common/weeconfig.c:835
+#: src/common/weeconfig.c:841
 msgid "name associated to IRC server (for display only)"
 msgstr "nom associé au serveur IRC (pour affichage seulement)"
 
-#: src/common/weeconfig.c:838
+#: src/common/weeconfig.c:844
 msgid "automatically connect to server"
 msgstr "connexion automatique au serveur"
 
-#: src/common/weeconfig.c:839
+#: src/common/weeconfig.c:845
 msgid "automatically connect to server when WeeChat is starting"
 msgstr "connexion automatique au serveur quand WeeChat démarre"
 
-#: src/common/weeconfig.c:842
+#: src/common/weeconfig.c:848
 msgid "automatically reconnect to server"
 msgstr "reconnexion automatique au serveur"
 
-#: src/common/weeconfig.c:843
+#: src/common/weeconfig.c:849
 msgid "automatically reconnect to server when disconnected"
 msgstr "reconnexion automatique au serveur après une déconnexion"
 
-#: src/common/weeconfig.c:846
+#: src/common/weeconfig.c:852
 msgid "delay before trying again to reconnect"
 msgstr "délai avant de tenter une reconnexion"
 
-#: src/common/weeconfig.c:847
+#: src/common/weeconfig.c:853
 msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr "délai (en secondes) avant de tenter une reconnexion au serveur"
 
-#: src/common/weeconfig.c:850
+#: src/common/weeconfig.c:856
 msgid "server address or hostname"
 msgstr "adresse ou nom du serveur"
 
-#: src/common/weeconfig.c:851
+#: src/common/weeconfig.c:857
 msgid "IP address or hostname of IRC server"
 msgstr "adresse IP ou nom du serveur IRC"
 
-#: src/common/weeconfig.c:854
+#: src/common/weeconfig.c:860
 msgid "port for IRC server"
 msgstr "port pour le serveur IRC"
 
-#: src/common/weeconfig.c:855
+#: src/common/weeconfig.c:861
 msgid "port for connecting to server"
 msgstr "port pour se connecter au serveur"
 
-#: src/common/weeconfig.c:858 src/common/weeconfig.c:859
+#: src/common/weeconfig.c:864 src/common/weeconfig.c:865
 msgid "use IPv6 protocol for server communication"
 msgstr "utiliser le protocole IPv6 pour la communication avec le serveur"
 
-#: src/common/weeconfig.c:862 src/common/weeconfig.c:863
+#: src/common/weeconfig.c:868 src/common/weeconfig.c:869
 msgid "use SSL for server communication"
 msgstr "utiliser SSL pour la communication avec le serveur"
 
-#: src/common/weeconfig.c:866
+#: src/common/weeconfig.c:872
 msgid "server password"
 msgstr "mot de passe pour le serveur"
 
-#: src/common/weeconfig.c:867
+#: src/common/weeconfig.c:873
 msgid "password for IRC server"
 msgstr "mot de passe pour le serveur IRC"
 
-#: src/common/weeconfig.c:870
+#: src/common/weeconfig.c:876
 msgid "nickname for server"
 msgstr "pseudo pour le serveur"
 
-#: src/common/weeconfig.c:871
+#: src/common/weeconfig.c:877
 msgid "nickname to use on IRC server"
 msgstr "pseudo à utiliser sur le serveur IRC"
 
-#: src/common/weeconfig.c:874
+#: src/common/weeconfig.c:880
 msgid "alternate nickname for server"
 msgstr "pseudo alternatif pour le serveur"
 
-#: src/common/weeconfig.c:875
+#: src/common/weeconfig.c:881
 msgid "alternate nickname to use on IRC server (if nickname is already used)"
 msgstr "pseudo alternatif pour le serveur IRC (si le pseudo est déjà utilisé)"
 
-#: src/common/weeconfig.c:878
+#: src/common/weeconfig.c:884
 msgid "2nd alternate nickname for server"
 msgstr "2nd pseudo alternatif pour le serveur"
 
-#: src/common/weeconfig.c:879
+#: src/common/weeconfig.c:885
 msgid ""
 "2nd alternate nickname to use on IRC server (if alternate nickname is "
 "already used)"
@@ -4426,31 +4464,31 @@ msgstr ""
 "2nd pseudo alternatif pour le serveur IRC (si le pseudo alternatif est déjà "
 "utilisé)"
 
-#: src/common/weeconfig.c:882
+#: src/common/weeconfig.c:888
 msgid "user name for server"
 msgstr "nom d'utilisateur pour le serveur"
 
-#: src/common/weeconfig.c:883
+#: src/common/weeconfig.c:889
 msgid "user name to use on IRC server"
 msgstr "nom d'utilisateur pour le serveur IRC"
 
-#: src/common/weeconfig.c:886
+#: src/common/weeconfig.c:892
 msgid "real name for server"
 msgstr "nom réel pour le serveur"
 
-#: src/common/weeconfig.c:887
+#: src/common/weeconfig.c:893
 msgid "real name to use on IRC server"
 msgstr "nom réel pour le serveur IRC"
 
-#: src/common/weeconfig.c:890 src/common/weeconfig.c:891
+#: src/common/weeconfig.c:896 src/common/weeconfig.c:897
 msgid "first command to run when connected to server"
 msgstr "commande à exécuter en premier lorsque connecté au serveur"
 
-#: src/common/weeconfig.c:894
+#: src/common/weeconfig.c:900
 msgid "delay (in seconds) after command was executed"
 msgstr "délai (en secondes) après exécution de la commande"
 
-#: src/common/weeconfig.c:895
+#: src/common/weeconfig.c:901
 msgid ""
 "delay (in seconds) after command was executed (example: give some time for "
 "authentication)"
@@ -4458,11 +4496,11 @@ msgstr ""
 "délai (en secondes) après exécution de la commande (exemple: donner du temps "
 "pour l'authentification)"
 
-#: src/common/weeconfig.c:898
+#: src/common/weeconfig.c:904
 msgid "list of channels to join when connected to server"
 msgstr "liste des canaux à rejoindre lorsque connecté au serveur"
 
-#: src/common/weeconfig.c:899
+#: src/common/weeconfig.c:905
 msgid ""
 "comma separated list of channels to join when connected to server (example: "
 "\"#chan1,#chan2,#chan3 key1,key2\")"
@@ -4470,15 +4508,15 @@ msgstr ""
 "liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au "
 "serveur (exemple: \"#chan1,#chan2,#chan3 key1,key2\")"
 
-#: src/common/weeconfig.c:902 src/common/weeconfig.c:903
+#: src/common/weeconfig.c:908 src/common/weeconfig.c:909
 msgid "automatically rejoin channels when kicked"
 msgstr "rejoindre automatiquement les canaux quand mis dehors"
 
-#: src/common/weeconfig.c:906
+#: src/common/weeconfig.c:912
 msgid "notify levels for channels of this server"
 msgstr "niveaux de notification pour les canaux de ce serveur"
 
-#: src/common/weeconfig.c:907
+#: src/common/weeconfig.c:913
 msgid ""
 "comma separated list of notify levels for channels of this server (format: "
 "#channel:1,..)"
@@ -4486,64 +4524,64 @@ msgstr ""
 "liste des niveaux de notifications (séparés par des virgules) pour les "
 "canaux de ce serveur (format: #canal:1,..)"
 
-#: src/common/weeconfig.c:1463
+#: src/common/weeconfig.c:1469
 #, c-format
 msgid "%s %s, line %d: new server, but previous was incomplete\n"
 msgstr "%s %s, ligne %d: nouveau serveur, mais le précédent était incomplet\n"
 
-#: src/common/weeconfig.c:1472
+#: src/common/weeconfig.c:1478
 #, c-format
 msgid "%s %s, line %d: server '%s' already exists\n"
 msgstr "%s %s, ligne %d: le serveur '%s' existe déjà\n"
 
-#: src/common/weeconfig.c:1487
+#: src/common/weeconfig.c:1493
 #, c-format
 msgid "%s %s, line %d: unable to create server\n"
 msgstr "%s %s, ligne %d: impossible de créer le serveur\n"
 
-#: src/common/weeconfig.c:1527
+#: src/common/weeconfig.c:1533
 #, c-format
 msgid "%s unable to assign default int with string (\"%s\")\n"
 msgstr ""
 "%s impossible d'assigner la valeur entière par défaut avec la chaîne (\"%s"
 "\")\n"
 
-#: src/common/weeconfig.c:1538
+#: src/common/weeconfig.c:1544
 #, c-format
 msgid "%s unable to assign default color (\"%s\")\n"
 msgstr "%s impossible d'assigner la couleur par défaut (\"%s\")\n"
 
-#: src/common/weeconfig.c:1578
+#: src/common/weeconfig.c:1584
 #, c-format
 msgid "%s config file \"%s\" not found.\n"
 msgstr "%s fichier de configuration \"%s\" non trouvé.\n"
 
-#: src/common/weeconfig.c:1610
+#: src/common/weeconfig.c:1616
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
 msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"]\"\n"
 
-#: src/common/weeconfig.c:1627
+#: src/common/weeconfig.c:1633
 #, c-format
 msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
 msgstr "%s %s, ligne %d: section inconnue (\"%s\")\n"
 
-#: src/common/weeconfig.c:1645
+#: src/common/weeconfig.c:1651
 #, c-format
 msgid "%s %s, line %d: invalid section for option, line is ignored\n"
 msgstr "%s %s, ligne %d: section invalide pour l'option, ligne ignorée\n"
 
-#: src/common/weeconfig.c:1690 src/common/weeconfig.c:1716
+#: src/common/weeconfig.c:1696 src/common/weeconfig.c:1722
 #, c-format
 msgid "%s %s, line %d: invalid option \"%s\"\n"
 msgstr "%s %s, ligne %d: option \"%s\" invalide\n"
 
-#: src/common/weeconfig.c:1696
+#: src/common/weeconfig.c:1702
 #, c-format
 msgid "%s %s, line %d: invalid ignore options \"%s\"\n"
 msgstr "%s %s, ligne %d: options \"%s\" invalides pour le ignore\n"
 
-#: src/common/weeconfig.c:1727
+#: src/common/weeconfig.c:1733
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value foroption '%s'\n"
@@ -4552,7 +4590,7 @@ msgstr ""
 "%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
 "Attendu: valeur booléenne: 'off' ou 'on'\n"
 
-#: src/common/weeconfig.c:1736
+#: src/common/weeconfig.c:1742
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4561,7 +4599,7 @@ msgstr ""
 "%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
 "Attendu: entier compris entre %d et %d\n"
 
-#: src/common/weeconfig.c:1747
+#: src/common/weeconfig.c:1753
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4570,21 +4608,21 @@ msgstr ""
 "%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
 "Attendu: une de ces chaînes: "
 
-#: src/common/weeconfig.c:1763
+#: src/common/weeconfig.c:1769
 #, c-format
 msgid "%s %s, line %d: invalid color name for option '%s'\n"
 msgstr "%s %s, ligne %d: nom de couleur invalide pour l'option '%s'\n"
 
-#: src/common/weeconfig.c:1832
+#: src/common/weeconfig.c:1838
 #, c-format
 msgid "%s: creating default config file...\n"
 msgstr "%s: création du fichier de configuration par défaut...\n"
 
-#: src/common/weeconfig.c:1833
+#: src/common/weeconfig.c:1839
 msgid "Creating default config file\n"
 msgstr "Création du fichier de configuration par défaut\n"
 
-#: src/common/weeconfig.c:1836 src/common/weeconfig.c:2033
+#: src/common/weeconfig.c:1842 src/common/weeconfig.c:2039
 #, c-format
 msgid ""
 "#\n"
@@ -4593,7 +4631,7 @@ msgstr ""
 "#\n"
 "# %s: fichier de configuration, créé par %s v%s le %s"
 
-#: src/common/weeconfig.c:1840 src/common/weeconfig.c:2037
+#: src/common/weeconfig.c:1846 src/common/weeconfig.c:2043
 #, c-format
 msgid ""
 "# WARNING! Be careful when editing this file, WeeChat writes this file when "
@@ -4604,9 +4642,132 @@ msgstr ""
 "quittant.\n"
 "#\n"
 
-#: src/common/weeconfig.c:2030
+#: src/common/weeconfig.c:2036
 msgid "Saving config to disk\n"
 msgstr "Sauvegarde de la configuration sur disque\n"
 
+#~ msgid "%s Command '%s' failed!\n"
+#~ msgstr "%s La commande '%s' a échoué !\n"
+
+#~ msgid "by"
+#~ msgstr "par"
+
+#~ msgid " has joined "
+#~ msgstr " a rejoint "
+
+#~ msgid " has kicked "
+#~ msgstr " a poussé dehors "
+
+#~ msgid " has killed "
+#~ msgstr " a tué "
+
+#~ msgid " from server"
+#~ msgstr " du serveur"
+
+#~ msgid " from server\n"
+#~ msgstr " du serveur\n"
+
+#~ msgid "mode changed by"
+#~ msgstr "mode changé par"
+
+#~ msgid "You are "
+#~ msgstr "Vous êtes "
+
+#~ msgid " is "
+#~ msgstr " est "
+
+#~ msgid "reply from"
+#~ msgstr "réponse de"
+
+#~ msgid ": %ld.%ld seconds\n"
+#~ msgstr ": %ld.%ld secondes\n"
+
+#~ msgid " has left "
+#~ msgstr " a quitté "
+
+#~ msgid "received from"
+#~ msgstr "reçu de"
+
+#~ msgid "Unknown CTCP "
+#~ msgstr "CTCP inconnu "
+
+#~ msgid "has quit"
+#~ msgstr "a quitté"
+
+#~ msgid " to: \"%s\"\n"
+#~ msgstr " en: \"%s\"\n"
+
+#~ msgid "User mode"
+#~ msgstr "Mode utilisateur"
+
+#~ msgid "idle: "
+#~ msgstr "inactivité: "
+
+#~ msgid "signon at: "
+#~ msgstr "signé le: "
+
+#~ msgid "Channels: "
+#~ msgstr "Canaux: "
+
+#~ msgid "Topic for "
+#~ msgstr "Le titre pour "
+
+#~ msgid " is: \"%s\"\n"
+#~ msgstr " est: \"%s\"\n"
+
+#~ msgid "has invited"
+#~ msgstr "a invité"
+
+#~ msgid "exception"
+#~ msgstr "exception"
+
+#~ msgid "Nicks "
+#~ msgstr "Utilisateurs "
+
+#~ msgid "Channel "
+#~ msgstr "Canal "
+
+#~ msgid "banned by"
+#~ msgstr "banni par"
+
+#~ msgid ": ok!\n"
+#~ msgstr ": ok!\n"
+
+#~ msgid "Connected to "
+#~ msgstr "Connecté à "
+
+#~ msgid "via DCC chat\n"
+#~ msgstr "via une discussion DCC\n"
+
+#~ msgid "resumed at position %u\n"
+#~ msgstr "recommencé en position %u\n"
+
+#~ msgid "Incoming DCC file from "
+#~ msgstr "Réception fichier DCC de "
+
+#~ msgid " bytes\n"
+#~ msgstr " octets\n"
+
+#~ msgid "Sending DCC file to "
+#~ msgstr "Envoi fichier DCC à "
+
+#~ msgid "Not enough memory for new message\n"
+#~ msgstr "Pas assez de mémoire pour un message de la barre d'infos\n"
+
+#~ msgid "Channel: "
+#~ msgstr "Canal: "
+
+#~ msgid " (server: "
+#~ msgstr " (serveur: "
+
+#~ msgid "Private with: "
+#~ msgstr "Privé avec: "
+
+#~ msgid "Server"
+#~ msgstr "Serveur"
+
+#~ msgid "created\n"
+#~ msgstr "créé\n"
+
 #~ msgid "-servers-"
 #~ msgstr "-serveurs-"
diff --git a/po/weechat.pot b/po/weechat.pot
index be2009428..ff2f6ec1b 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-10-30 10:52+0100\n"
+"POT-Creation-Date: 2005-11-04 12:35+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,150 +20,150 @@ msgstr ""
 msgid "%s cannot allocate new nick\n"
 msgstr ""
 
-#: src/irc/irc-server.c:180 src/common/weeconfig.c:1968
+#: src/irc/irc-server.c:181 src/common/weeconfig.c:1974
 msgid "Unable to get user's name"
 msgstr ""
 
-#: src/irc/irc-server.c:248
+#: src/irc/irc-server.c:249
 #, c-format
 msgid "%s cannot allocate new server\n"
 msgstr ""
 
-#: src/irc/irc-server.c:466
+#: src/irc/irc-server.c:467
 #, c-format
 msgid "%s error sending data to IRC server\n"
 msgstr ""
 
-#: src/irc/irc-server.c:489 src/irc/irc-server.c:502 src/irc/irc-server.c:549
-#: src/irc/irc-server.c:562
+#: src/irc/irc-server.c:490 src/irc/irc-server.c:503 src/irc/irc-server.c:550
+#: src/irc/irc-server.c:563
 #, c-format
 msgid "%s not enough memory for received IRC message\n"
 msgstr ""
 
-#: src/irc/irc-server.c:674
+#: src/irc/irc-server.c:675
 #, c-format
-msgid "%s Command '%s' failed!\n"
+msgid "%s Command \"%s\" failed!\n"
 msgstr ""
 
-#: src/irc/irc-server.c:680
+#: src/irc/irc-server.c:681
 #, c-format
 msgid "%s No command to execute!\n"
 msgstr ""
 
-#: src/irc/irc-server.c:686
+#: src/irc/irc-server.c:687
 #, c-format
-msgid "%s Unknown command: cmd=%s, host=%s, args=%s\n"
+msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-server.c:737
+#: src/irc/irc-server.c:738
 #, c-format
 msgid "%s cannot read data from socket, disconnecting from server...\n"
 msgstr ""
 
-#: src/irc/irc-server.c:820
+#: src/irc/irc-server.c:821
 #, c-format
 msgid "%s: Reconnecting to server in %d seconds\n"
 msgstr ""
 
-#: src/irc/irc-server.c:854
+#: src/irc/irc-server.c:855
 #, c-format
 msgid "%s gnutls handshake failed\n"
 msgstr ""
 
-#: src/irc/irc-server.c:871
+#: src/irc/irc-server.c:872
 #, c-format
 msgid "%s proxy address \"%s\" not found\n"
 msgstr ""
 
-#: src/irc/irc-server.c:875
+#: src/irc/irc-server.c:876
 #, c-format
 msgid "%s address \"%s\" not found\n"
 msgstr ""
 
-#: src/irc/irc-server.c:885
+#: src/irc/irc-server.c:886
 #, c-format
 msgid "%s proxy IP address not found\n"
 msgstr ""
 
-#: src/irc/irc-server.c:888
+#: src/irc/irc-server.c:889
 #, c-format
 msgid "%s IP address not found\n"
 msgstr ""
 
-#: src/irc/irc-server.c:897
+#: src/irc/irc-server.c:898
 #, c-format
 msgid "%s proxy connection refused\n"
 msgstr ""
 
-#: src/irc/irc-server.c:900
+#: src/irc/irc-server.c:901
 #, c-format
 msgid "%s connection refused\n"
 msgstr ""
 
-#: src/irc/irc-server.c:908
+#: src/irc/irc-server.c:909
 #, c-format
 msgid ""
 "%s proxy fails to establish connection to server (check username/password if "
 "used)\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1387
+#: src/irc/irc-server.c:1388
 #, c-format
 msgid ""
 "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1396
+#: src/irc/irc-server.c:1397
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1402
+#: src/irc/irc-server.c:1403
 #, c-format
 msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1412
+#: src/irc/irc-server.c:1413
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s...\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1416
+#: src/irc/irc-server.c:1417
 #, c-format
 msgid "Connecting to server %s:%d%s%s...\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1434
+#: src/irc/irc-server.c:1435
 #, c-format
 msgid "%s gnutls init error\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1449
+#: src/irc/irc-server.c:1450
 #, c-format
 msgid "%s cannot create pipe\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1464
+#: src/irc/irc-server.c:1465
 #, c-format
 msgid "%s cannot create socket\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1475
+#: src/irc/irc-server.c:1476
 #, c-format
 msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1486
+#: src/irc/irc-server.c:1487
 #, c-format
 msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1517
+#: src/irc/irc-server.c:1518
 #, c-format
 msgid "%s: Reconnecting to server...\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1567 src/irc/irc-server.c:1576
+#: src/irc/irc-server.c:1568 src/irc/irc-server.c:1577
 msgid "Disconnected from server!\n"
 msgstr ""
 
@@ -861,7 +861,7 @@ msgstr ""
 #: src/irc/irc-commands.c:380 src/irc/irc-commands.c:381
 #: src/irc/irc-commands.c:382 src/irc/irc-commands.c:383
 #: src/irc/irc-commands.c:384 src/irc/irc-commands.c:385
-#: src/irc/irc-commands.c:490
+#: src/irc/irc-commands.c:491
 msgid "a server message"
 msgstr ""
 
@@ -1038,244 +1038,249 @@ msgid "you are now an IRC operator"
 msgstr ""
 
 #: src/irc/irc-commands.c:387
-msgid "server local time"
+msgid "rehashing"
 msgstr ""
 
 #: src/irc/irc-commands.c:388
+msgid "server local time"
+msgstr ""
+
+#: src/irc/irc-commands.c:389
 msgid "no such nick/channel"
 msgstr ""
 
-#: src/irc/irc-commands.c:390
+#: src/irc/irc-commands.c:391
 msgid "no such server"
 msgstr ""
 
-#: src/irc/irc-commands.c:392
+#: src/irc/irc-commands.c:393
 msgid "no such channel"
 msgstr ""
 
-#: src/irc/irc-commands.c:394
+#: src/irc/irc-commands.c:395
 msgid "cannot send to channel"
 msgstr ""
 
-#: src/irc/irc-commands.c:396
+#: src/irc/irc-commands.c:397
 msgid "too many channels"
 msgstr ""
 
-#: src/irc/irc-commands.c:398 src/irc/irc-commands.c:400
+#: src/irc/irc-commands.c:399 src/irc/irc-commands.c:401
 msgid "was no such nick"
 msgstr ""
 
-#: src/irc/irc-commands.c:402
+#: src/irc/irc-commands.c:403
 msgid "no origin"
 msgstr ""
 
-#: src/irc/irc-commands.c:404
+#: src/irc/irc-commands.c:405
 msgid "no services"
 msgstr ""
 
-#: src/irc/irc-commands.c:406
+#: src/irc/irc-commands.c:407
 msgid "no recipient"
 msgstr ""
 
-#: src/irc/irc-commands.c:408
+#: src/irc/irc-commands.c:409
 msgid "no text to send"
 msgstr ""
 
-#: src/irc/irc-commands.c:410
+#: src/irc/irc-commands.c:411
 msgid "no toplevel"
 msgstr ""
 
-#: src/irc/irc-commands.c:412
+#: src/irc/irc-commands.c:413
 msgid "wilcard in toplevel domain"
 msgstr ""
 
-#: src/irc/irc-commands.c:414
+#: src/irc/irc-commands.c:415
 msgid "unknown command"
 msgstr ""
 
-#: src/irc/irc-commands.c:416
+#: src/irc/irc-commands.c:417
 msgid "MOTD is missing"
 msgstr ""
 
-#: src/irc/irc-commands.c:418
+#: src/irc/irc-commands.c:419
 msgid "no administrative info"
 msgstr ""
 
-#: src/irc/irc-commands.c:420
+#: src/irc/irc-commands.c:421
 msgid "file error"
 msgstr ""
 
-#: src/irc/irc-commands.c:422
+#: src/irc/irc-commands.c:423
 msgid "no nickname given"
 msgstr ""
 
-#: src/irc/irc-commands.c:424
+#: src/irc/irc-commands.c:425
 msgid "erroneous nickname"
 msgstr ""
 
-#: src/irc/irc-commands.c:426
+#: src/irc/irc-commands.c:427
 msgid "nickname already in use"
 msgstr ""
 
-#: src/irc/irc-commands.c:428
+#: src/irc/irc-commands.c:429
 msgid "nickname collision"
 msgstr ""
 
-#: src/irc/irc-commands.c:430
+#: src/irc/irc-commands.c:431
 msgid "not authorized to change nickname"
 msgstr ""
 
-#: src/irc/irc-commands.c:432
+#: src/irc/irc-commands.c:433
 msgid "user not in channel"
 msgstr ""
 
-#: src/irc/irc-commands.c:434
+#: src/irc/irc-commands.c:435
 msgid "not on channel"
 msgstr ""
 
-#: src/irc/irc-commands.c:436
+#: src/irc/irc-commands.c:437
 msgid "user already on channel"
 msgstr ""
 
-#: src/irc/irc-commands.c:438
+#: src/irc/irc-commands.c:439
 msgid "user not logged in"
 msgstr ""
 
-#: src/irc/irc-commands.c:440
+#: src/irc/irc-commands.c:441
 msgid "summon has been disabled"
 msgstr ""
 
-#: src/irc/irc-commands.c:442
+#: src/irc/irc-commands.c:443
 msgid "users has been disabled"
 msgstr ""
 
-#: src/irc/irc-commands.c:444
+#: src/irc/irc-commands.c:445
 msgid "you are not registered"
 msgstr ""
 
-#: src/irc/irc-commands.c:446
+#: src/irc/irc-commands.c:447
 msgid "not enough parameters"
 msgstr ""
 
-#: src/irc/irc-commands.c:448
+#: src/irc/irc-commands.c:449
 msgid "you may not register"
 msgstr ""
 
-#: src/irc/irc-commands.c:450
+#: src/irc/irc-commands.c:451
 msgid "your host isn't among the privileged"
 msgstr ""
 
-#: src/irc/irc-commands.c:452
+#: src/irc/irc-commands.c:453
 msgid "password incorrect"
 msgstr ""
 
-#: src/irc/irc-commands.c:454
+#: src/irc/irc-commands.c:455
 msgid "you are banned from this server"
 msgstr ""
 
-#: src/irc/irc-commands.c:456
+#: src/irc/irc-commands.c:457
 msgid "channel key already set"
 msgstr ""
 
-#: src/irc/irc-commands.c:458
+#: src/irc/irc-commands.c:459
 msgid "forwarding to another channel"
 msgstr ""
 
-#: src/irc/irc-commands.c:460
+#: src/irc/irc-commands.c:461
 msgid "channel is already full"
 msgstr ""
 
-#: src/irc/irc-commands.c:462
+#: src/irc/irc-commands.c:463
 msgid "unknown mode char to me"
 msgstr ""
 
-#: src/irc/irc-commands.c:464
+#: src/irc/irc-commands.c:465
 msgid "cannot join channel (invite only)"
 msgstr ""
 
-#: src/irc/irc-commands.c:466
+#: src/irc/irc-commands.c:467
 msgid "cannot join channel (banned from channel)"
 msgstr ""
 
-#: src/irc/irc-commands.c:468
+#: src/irc/irc-commands.c:469
 msgid "cannot join channel (bad channel key)"
 msgstr ""
 
-#: src/irc/irc-commands.c:470
+#: src/irc/irc-commands.c:471
 msgid "bad channel mask"
 msgstr ""
 
-#: src/irc/irc-commands.c:472
+#: src/irc/irc-commands.c:473
 msgid "channel doesn't support modes"
 msgstr ""
 
-#: src/irc/irc-commands.c:474
+#: src/irc/irc-commands.c:475
 msgid "you're not an IRC operator"
 msgstr ""
 
-#: src/irc/irc-commands.c:476
+#: src/irc/irc-commands.c:477
 msgid "you're not channel operator"
 msgstr ""
 
-#: src/irc/irc-commands.c:478
+#: src/irc/irc-commands.c:479
 msgid "you can't kill a server!"
 msgstr ""
 
-#: src/irc/irc-commands.c:480
+#: src/irc/irc-commands.c:481
 msgid "your connection is restricted!"
 msgstr ""
 
-#: src/irc/irc-commands.c:482
+#: src/irc/irc-commands.c:483
 msgid "user is immune from kick/deop"
 msgstr ""
 
-#: src/irc/irc-commands.c:484
+#: src/irc/irc-commands.c:485
 msgid "no O-lines for your host"
 msgstr ""
 
-#: src/irc/irc-commands.c:486
+#: src/irc/irc-commands.c:487
 msgid "unknown mode flag"
 msgstr ""
 
-#: src/irc/irc-commands.c:488
+#: src/irc/irc-commands.c:489
 msgid "can't change mode for other users"
 msgstr ""
 
-#: src/irc/irc-commands.c:491
+#: src/irc/irc-commands.c:492
 msgid "whois (secure connection)"
 msgstr ""
 
-#: src/irc/irc-display.c:170 src/common/command.c:873
-msgid "Server: "
+#: src/irc/irc-display.c:180
+#, c-format
+msgid "%sServer: %s%s %s[%s%s%s]\n"
 msgstr ""
 
-#: src/irc/irc-display.c:175
+#: src/irc/irc-display.c:187
 msgid "connected"
 msgstr ""
 
-#: src/irc/irc-display.c:175 src/common/command.c:899
+#: src/irc/irc-display.c:187
 msgid "not connected"
 msgstr ""
 
-#: src/irc/irc-display.c:179 src/irc/irc-display.c:184
-#: src/irc/irc-display.c:196 src/irc/irc-display.c:199
+#: src/irc/irc-display.c:191 src/irc/irc-display.c:195
+#: src/irc/irc-display.c:203 src/irc/irc-display.c:205
 msgid "yes"
 msgstr ""
 
-#: src/irc/irc-display.c:179 src/irc/irc-display.c:184
-#: src/irc/irc-display.c:196 src/irc/irc-display.c:199
+#: src/irc/irc-display.c:191 src/irc/irc-display.c:195
+#: src/irc/irc-display.c:203 src/irc/irc-display.c:205
 msgid "no"
 msgstr ""
 
-#: src/irc/irc-display.c:181
+#: src/irc/irc-display.c:193
 msgid " (temporary server, will not be saved)"
 msgstr ""
 
-#: src/irc/irc-display.c:203
+#: src/irc/irc-display.c:208
 msgid "(hidden)"
 msgstr ""
 
-#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4718
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4674
 msgid "unknown"
 msgstr ""
 
@@ -1284,521 +1289,518 @@ msgstr ""
 msgid "%s: using local hostname \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-send.c:167 src/common/command.c:749
+#: src/irc/irc-send.c:166 src/common/command.c:760
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr ""
 
-#: src/irc/irc-send.c:329 src/irc/irc-send.c:357 src/irc/irc-send.c:544
-#: src/irc/irc-send.c:577 src/irc/irc-send.c:610 src/irc/irc-send.c:658
-#: src/irc/irc-send.c:694 src/irc/irc-send.c:761 src/irc/irc-send.c:818
-#: src/irc/irc-send.c:1160 src/irc/irc-send.c:1258 src/irc/irc-send.c:1737
-#: src/irc/irc-send.c:1851
+#: src/irc/irc-send.c:328 src/irc/irc-send.c:356 src/irc/irc-send.c:547
+#: src/irc/irc-send.c:580 src/irc/irc-send.c:613 src/irc/irc-send.c:661
+#: src/irc/irc-send.c:697 src/irc/irc-send.c:764 src/irc/irc-send.c:821
+#: src/irc/irc-send.c:1154 src/irc/irc-send.c:1254 src/irc/irc-send.c:1730
+#: src/irc/irc-send.c:1844
 #, c-format
 msgid "%s \"%s\" command can only be executed in a channel window\n"
 msgstr ""
 
-#: src/irc/irc-send.c:456 src/irc/irc-send.c:468 src/irc/irc-send.c:486
-#: src/irc/irc-send.c:1138 src/irc/irc-send.c:1231 src/irc/irc-send.c:1763
-#: src/common/command.c:1233 src/common/command.c:1647
-#: src/common/command.c:1781
+#: src/irc/irc-send.c:459 src/irc/irc-send.c:471 src/irc/irc-send.c:489
+#: src/irc/irc-send.c:1132 src/irc/irc-send.c:1227 src/irc/irc-send.c:1756
+#: src/common/command.c:1253 src/common/command.c:1695
+#: src/common/command.c:1831
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-send.c:509 src/irc/irc-send.c:746 src/irc/irc-send.c:803
+#: src/irc/irc-send.c:512 src/irc/irc-send.c:749 src/irc/irc-send.c:806
 #, c-format
 msgid "%s wrong arguments for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-send.c:946 src/irc/irc-send.c:1013 src/irc/irc-send.c:1306
-#: src/irc/irc-send.c:1320 src/irc/irc-send.c:1664
+#: src/irc/irc-send.c:949 src/irc/irc-send.c:1016 src/irc/irc-send.c:1302
+#: src/irc/irc-send.c:1316 src/irc/irc-send.c:1657
 #, c-format
 msgid "%s \"%s\" command can not be executed on a server window\n"
 msgstr ""
 
-#: src/irc/irc-send.c:1031 src/irc/irc-send.c:1056 src/irc/irc-recv.c:499
+#: src/irc/irc-send.c:1032 src/irc/irc-send.c:1055 src/irc/irc-recv.c:500
 #, c-format
 msgid "%s nick \"%s\" not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-send.c:1108 src/irc/irc-send.c:1416 src/irc/irc-recv.c:1238
-#: src/irc/irc-recv.c:2054 src/irc/irc-recv.c:2142
+#: src/irc/irc-send.c:1105 src/irc/irc-send.c:1412 src/irc/irc-recv.c:1230
+#: src/irc/irc-recv.c:2042 src/irc/irc-recv.c:2132
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-send.c:1816
+#: src/irc/irc-send.c:1809
 #, c-format
 msgid "%s, compiled on %s %s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:355
-msgid "You have been invited to "
+#: src/irc/irc-recv.c:362
+#, c-format
+msgid "You have been invited to %s%s%s by %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:358 src/irc/irc-recv.c:3994
-msgid "by"
-msgstr ""
-
-#: src/irc/irc-recv.c:369 src/irc/irc-recv.c:463 src/irc/irc-recv.c:1012
-#: src/irc/irc-recv.c:1397 src/irc/irc-recv.c:1656 src/irc/irc-recv.c:3559
-#: src/irc/irc-recv.c:3581 src/irc/irc-recv.c:3642 src/irc/irc-recv.c:3714
+#: src/irc/irc-recv.c:376 src/irc/irc-recv.c:469 src/irc/irc-recv.c:1008
+#: src/irc/irc-recv.c:1386 src/irc/irc-recv.c:1645 src/irc/irc-recv.c:3520
+#: src/irc/irc-recv.c:3541 src/irc/irc-recv.c:3601 src/irc/irc-recv.c:3672
 #, c-format
 msgid "%s channel \"%s\" not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:397
+#: src/irc/irc-recv.c:404
 #, c-format
 msgid "%s cannot create new channel \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:416
-msgid " has joined "
+#: src/irc/irc-recv.c:415
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:474
-msgid " has kicked "
+#: src/irc/irc-recv.c:477
+#, c-format
+msgid "%s%s%s has kicked %s%s%s from %s%s"
 msgstr ""
 
-#: src/irc/irc-recv.c:478 src/common/command.c:1468
-msgid " from "
+#: src/irc/irc-recv.c:562
+#, c-format
+msgid "%s%s%s has killed %s%s%s from server"
 msgstr ""
 
-#: src/irc/irc-recv.c:564
-msgid " has killed "
-msgstr ""
-
-#: src/irc/irc-recv.c:570
-msgid " from server"
-msgstr ""
-
-#: src/irc/irc-recv.c:580
-msgid " from server\n"
-msgstr ""
-
-#: src/irc/irc-recv.c:588
+#: src/irc/irc-recv.c:584
 #, c-format
 msgid "%s host \"%s\" not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:629
+#: src/irc/irc-recv.c:625
 msgid "sets ban on"
 msgstr ""
 
-#: src/irc/irc-recv.c:630
+#: src/irc/irc-recv.c:626
 msgid "removes ban on"
 msgstr ""
 
-#: src/irc/irc-recv.c:654
+#: src/irc/irc-recv.c:650
 msgid "sets exception on"
 msgstr ""
 
-#: src/irc/irc-recv.c:655
+#: src/irc/irc-recv.c:651
 msgid "removes exception on"
 msgstr ""
 
-#: src/irc/irc-recv.c:679
+#: src/irc/irc-recv.c:675
 msgid "sets mode +f"
 msgstr ""
 
-#: src/irc/irc-recv.c:680
+#: src/irc/irc-recv.c:676
 msgid "removes mode +f"
 msgstr ""
 
-#: src/irc/irc-recv.c:704
+#: src/irc/irc-recv.c:700
 msgid "gives half channel operator status to"
 msgstr ""
 
-#: src/irc/irc-recv.c:705
+#: src/irc/irc-recv.c:701
 msgid "removes half channel operator status from"
 msgstr ""
 
-#: src/irc/irc-recv.c:732
+#: src/irc/irc-recv.c:728
 msgid "sets invite-only channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:729
 msgid "removes invite-only channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:750
+#: src/irc/irc-recv.c:746
 msgid "sets channel key to"
 msgstr ""
 
-#: src/irc/irc-recv.c:751
+#: src/irc/irc-recv.c:747
 msgid "removes channel key"
 msgstr ""
 
-#: src/irc/irc-recv.c:782
+#: src/irc/irc-recv.c:778
 msgid "sets the user limit to"
 msgstr ""
 
-#: src/irc/irc-recv.c:783
+#: src/irc/irc-recv.c:779
 msgid "removes user limit"
 msgstr ""
 
-#: src/irc/irc-recv.c:805
+#: src/irc/irc-recv.c:801
 msgid "sets moderated channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:806
+#: src/irc/irc-recv.c:802
 msgid "removes moderated channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:816
+#: src/irc/irc-recv.c:812
 msgid "sets messages from channel only flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:817
+#: src/irc/irc-recv.c:813
 msgid "removes messages from channel only flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:834
+#: src/irc/irc-recv.c:830
 msgid "gives channel operator status to"
 msgstr ""
 
-#: src/irc/irc-recv.c:835
+#: src/irc/irc-recv.c:831
 msgid "removes channel operator status from"
 msgstr ""
 
-#: src/irc/irc-recv.c:862
+#: src/irc/irc-recv.c:858
 msgid "sets private channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:863
+#: src/irc/irc-recv.c:859
 msgid "removes private channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:880
+#: src/irc/irc-recv.c:876
 msgid "sets quiet on"
 msgstr ""
 
-#: src/irc/irc-recv.c:881
+#: src/irc/irc-recv.c:877
 msgid "removes quiet on"
 msgstr ""
 
-#: src/irc/irc-recv.c:898
+#: src/irc/irc-recv.c:894
 msgid "sets secret channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:899
+#: src/irc/irc-recv.c:895
 msgid "removes secret channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:909
+#: src/irc/irc-recv.c:905
 msgid "sets topic protection"
 msgstr ""
 
-#: src/irc/irc-recv.c:910
+#: src/irc/irc-recv.c:906
 msgid "removes topic protection"
 msgstr ""
 
-#: src/irc/irc-recv.c:927
+#: src/irc/irc-recv.c:923
 msgid "gives voice to"
 msgstr ""
 
-#: src/irc/irc-recv.c:928
+#: src/irc/irc-recv.c:924
 msgid "removes voice from"
 msgstr ""
 
-#: src/irc/irc-recv.c:971 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1475
-#: src/irc/irc-recv.c:2209
+#: src/irc/irc-recv.c:967 src/irc/irc-recv.c:1053 src/irc/irc-recv.c:1464
+#: src/irc/irc-recv.c:2201
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:981
+#: src/irc/irc-recv.c:977
 #, c-format
 msgid "%s \"%s\" command received without channel or nickname\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1029
-msgid "mode changed by"
+#: src/irc/irc-recv.c:1019
+#, c-format
+msgid "%s[%s%s%s/%s%s%s]%s mode changed by %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1091
-msgid "You are "
+#: src/irc/irc-recv.c:1088
+#, c-format
+msgid "You are now known as %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1098
-msgid " is "
+#: src/irc/irc-recv.c:1092
+#, c-format
+msgid "%s%s%s is now known as %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1102
-msgid "now known as "
-msgstr ""
-
-#: src/irc/irc-recv.c:1169
+#: src/irc/irc-recv.c:1159
 #, c-format
 msgid "%s nickname not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1185 src/irc/irc-recv.c:1217
-msgid "reply from"
-msgstr ""
-
-#: src/irc/irc-recv.c:1220
+#: src/irc/irc-recv.c:1173
 #, c-format
-msgid ": %ld.%ld seconds\n"
+msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1259 src/irc/irc-recv.c:2163 src/irc/irc-dcc.c:1136
+#: src/irc/irc-recv.c:1207
+#, c-format
+msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:1252 src/irc/irc-recv.c:2154 src/irc/irc-dcc.c:1153
 #, c-format
 msgid "Private %s> %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1322
+#: src/irc/irc-recv.c:1317
 #, c-format
 msgid "%s \"%s\" command received without host or channel\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1371
-msgid " has left "
+#: src/irc/irc-recv.c:1357
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has left %s%s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1523 src/irc/irc-recv.c:2078
+#: src/irc/irc-recv.c:1513 src/irc/irc-recv.c:2067
 #, c-format
 msgid "On %s: * %s %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1547
+#: src/irc/irc-recv.c:1538
 #, c-format
-msgid "Received a CTCP SOUND \"%s\" from "
+msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1580 src/irc/irc-recv.c:1611 src/irc/irc-recv.c:1715
-#: src/irc/irc-recv.c:1755 src/irc/irc-recv.c:2118
-msgid "received from"
+#: src/irc/irc-recv.c:1568 src/irc/irc-recv.c:1739
+#, c-format
+msgid "CTCP %sPING%s received from %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1607 src/irc/irc-recv.c:2114
-msgid "Unknown CTCP "
+#: src/irc/irc-recv.c:1597 src/irc/irc-recv.c:2104
+#, c-format
+msgid "Unknown CTCP %s%s%s received from %s%s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1639
+#: src/irc/irc-recv.c:1629
 #, c-format
 msgid "On %s: %s> %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1771 src/irc/irc-recv.c:1792 src/irc/irc-recv.c:1808
-#: src/irc/irc-recv.c:1824 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1871
-#: src/irc/irc-recv.c:1887 src/irc/irc-recv.c:1912 src/irc/irc-recv.c:1933
-#: src/irc/irc-recv.c:1949 src/irc/irc-recv.c:1974 src/irc/irc-recv.c:1995
-#: src/irc/irc-recv.c:2010 src/irc/irc-recv.c:2185 src/irc/irc-recv.c:2529
-#: src/irc/irc-recv.c:3918 src/irc/irc-recv.c:3933 src/irc/irc-recv.c:3948
-#: src/irc/irc-recv.c:3963 src/irc/irc-recv.c:3976 src/irc/irc-recv.c:4031
-#: src/irc/irc-recv.c:4045 src/irc/irc-recv.c:4285 src/irc/irc-recv.c:4343
-#: src/irc/irc-recv.c:4502 src/irc/irc-recv.c:4517 src/irc/irc-recv.c:4532
-#: src/irc/irc-recv.c:4547 src/irc/irc-recv.c:4560 src/irc/irc-recv.c:4614
-#: src/irc/irc-recv.c:4628
+#: src/irc/irc-recv.c:1700
+#, c-format
+msgid "CTCP %sVERSION%s received from %s%s"
+msgstr ""
+
+#: src/irc/irc-recv.c:1757 src/irc/irc-recv.c:1778 src/irc/irc-recv.c:1794
+#: src/irc/irc-recv.c:1810 src/irc/irc-recv.c:1836 src/irc/irc-recv.c:1857
+#: src/irc/irc-recv.c:1873 src/irc/irc-recv.c:1898 src/irc/irc-recv.c:1919
+#: src/irc/irc-recv.c:1935 src/irc/irc-recv.c:1960 src/irc/irc-recv.c:1981
+#: src/irc/irc-recv.c:1996 src/irc/irc-recv.c:2177 src/irc/irc-recv.c:2516
+#: src/irc/irc-recv.c:3879 src/irc/irc-recv.c:3894 src/irc/irc-recv.c:3909
+#: src/irc/irc-recv.c:3924 src/irc/irc-recv.c:3937 src/irc/irc-recv.c:4002
+#: src/irc/irc-recv.c:4016 src/irc/irc-recv.c:4250 src/irc/irc-recv.c:4308
+#: src/irc/irc-recv.c:4446 src/irc/irc-recv.c:4461 src/irc/irc-recv.c:4567
+#: src/irc/irc-recv.c:4581
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2023
+#: src/irc/irc-recv.c:2009
 #, c-format
 msgid "%s unknown DCC CHAT type received from "
 msgstr ""
 
-#: src/irc/irc-recv.c:2240
-msgid "has quit"
+#: src/irc/irc-recv.c:2224
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has quit %s(%s%s%s)\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:2354
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2397
-msgid " has changed topic for "
-msgstr ""
-
-#: src/irc/irc-recv.c:2402
+#: src/irc/irc-recv.c:2382
 #, c-format
-msgid " to: \"%s\"\n"
+msgid "%s%s%s has changed topic for %s%s%s to: \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2408
-msgid " has unset topic for "
-msgstr ""
-
-#: src/irc/irc-recv.c:2517
-msgid "User mode"
-msgstr ""
-
-#: src/irc/irc-recv.c:2572
+#: src/irc/irc-recv.c:2392
 #, c-format
-msgid " is away: %s\n"
+msgid "%s%s%s has unset topic for %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2654
+#: src/irc/irc-recv.c:2502
+#, c-format
+msgid "User mode %s[%s%s%s/%s%s%s]\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:2557
+#, c-format
+msgid "%s%s%s is away: %s\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:2642
 msgid "Users online: "
 msgstr ""
 
-#: src/irc/irc-recv.c:3144
-msgid "idle: "
+#: src/irc/irc-recv.c:2999
+#, c-format
+msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3120
+#, c-format
+msgid "%s[%s%s%s]%s idle: "
+msgstr ""
+
+#: src/irc/irc-recv.c:3132
 msgid "days"
 msgstr ""
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3132
 msgid "day"
 msgstr ""
 
-#: src/irc/irc-recv.c:3162
+#: src/irc/irc-recv.c:3136
+#, c-format
+msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
+msgstr ""
+
+#: src/irc/irc-recv.c:3140
 msgid "hours"
 msgstr ""
 
-#: src/irc/irc-recv.c:3162
+#: src/irc/irc-recv.c:3140
 msgid "hour"
 msgstr ""
 
-#: src/irc/irc-recv.c:3168
+#: src/irc/irc-recv.c:3144
 msgid "minutes"
 msgstr ""
 
-#: src/irc/irc-recv.c:3168
+#: src/irc/irc-recv.c:3144
 msgid "minute"
 msgstr ""
 
-#: src/irc/irc-recv.c:3174
+#: src/irc/irc-recv.c:3148
 msgid "seconds"
 msgstr ""
 
-#: src/irc/irc-recv.c:3174
+#: src/irc/irc-recv.c:3148
 msgid "second"
 msgstr ""
 
-#: src/irc/irc-recv.c:3179
-msgid "signon at: "
-msgstr ""
-
-#: src/irc/irc-recv.c:3275
-msgid "Channels: "
-msgstr ""
-
-#: src/irc/irc-recv.c:3572
-msgid "No topic set for "
-msgstr ""
-
-#: src/irc/irc-recv.c:3629
-msgid "Topic for "
-msgstr ""
-
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3532
 #, c-format
-msgid " is: \"%s\"\n"
+msgid "No topic set for %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3652 src/irc/irc-recv.c:3741 src/irc/irc-recv.c:3794
+#: src/irc/irc-recv.c:3588
+#, c-format
+msgid "Topic for %s%s%s is: \"%s\"\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:3611 src/irc/irc-recv.c:3699 src/irc/irc-recv.c:3754
 #, c-format
 msgid "%s cannot identify channel for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3702
-msgid "Topic set by "
+#: src/irc/irc-recv.c:3661
+#, c-format
+msgid "Topic set by %s%s%s, %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:3723
+#: src/irc/irc-recv.c:3681
 #, c-format
 msgid "%s cannot identify date/time for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3732 src/irc/irc-recv.c:3803
+#: src/irc/irc-recv.c:3690 src/irc/irc-recv.c:3763
 #, c-format
 msgid "%s cannot identify nickname for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3782
-msgid "has invited"
+#: src/irc/irc-recv.c:3739
+#, c-format
+msgid "%s%s%s has invited %s%s%s on %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3785 src/irc/irc-recv.c:4206 src/common/command.c:1461
-msgid "on"
+#: src/irc/irc-recv.c:3799
+#, c-format
+msgid "Channel reop %s%s%s: %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3840
-msgid "Channel reop"
-msgstr ""
-
-#: src/irc/irc-recv.c:3992
-msgid "exception"
-msgstr ""
-
-#: src/irc/irc-recv.c:4331
+#: src/irc/irc-recv.c:4296
 #, c-format
 msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:4390
-msgid "Nicks "
+#: src/irc/irc-recv.c:4354
+#, c-format
+msgid "Nicks %s%s%s: %s["
 msgstr ""
 
-#: src/irc/irc-recv.c:4410
-msgid "Channel "
+#: src/irc/irc-recv.c:4375
+#, c-format
+msgid ""
+"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:4421
+#: src/irc/irc-recv.c:4383
 msgid "nicks"
 msgstr ""
 
-#: src/irc/irc-recv.c:4421
+#: src/irc/irc-recv.c:4383
 msgid "nick"
 msgstr ""
 
-#: src/irc/irc-recv.c:4429
+#: src/irc/irc-recv.c:4388
 msgid "ops"
 msgstr ""
 
-#: src/irc/irc-recv.c:4429
+#: src/irc/irc-recv.c:4388
 msgid "op"
 msgstr ""
 
-#: src/irc/irc-recv.c:4438
+#: src/irc/irc-recv.c:4392
 msgid "halfops"
 msgstr ""
 
-#: src/irc/irc-recv.c:4438
+#: src/irc/irc-recv.c:4392
 msgid "halfop"
 msgstr ""
 
-#: src/irc/irc-recv.c:4447
+#: src/irc/irc-recv.c:4396
 msgid "voices"
 msgstr ""
 
-#: src/irc/irc-recv.c:4447
+#: src/irc/irc-recv.c:4396
 msgid "voice"
 msgstr ""
 
-#: src/irc/irc-recv.c:4456
+#: src/irc/irc-recv.c:4400
 msgid "normal"
 msgstr ""
 
-#: src/irc/irc-recv.c:4577
-msgid "banned by"
+#: src/irc/irc-recv.c:4501
+#, c-format
+msgid "%s[%s%s%s] %s%s%s banned by "
 msgstr ""
 
-#: src/irc/irc-recv.c:4672
+#: src/irc/irc-recv.c:4536
+#, c-format
+msgid "%s[%s%s%s] %s%s%s banned\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:4628
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:4684
+#: src/irc/irc-recv.c:4640
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:4696
+#: src/irc/irc-recv.c:4652
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
 "server!\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:4706
+#: src/irc/irc-recv.c:4662
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
 msgstr ""
@@ -1827,138 +1829,141 @@ msgstr ""
 msgid "Aborted"
 msgstr ""
 
-#: src/irc/irc-dcc.c:367 src/irc/irc-dcc.c:568 src/irc/irc-dcc.c:731
-msgid "DCC: file "
+#: src/irc/irc-dcc.c:368
+#, c-format
+msgid "DCC: file %s%s%s"
 msgstr ""
 
-#: src/irc/irc-dcc.c:374 src/irc/irc-dcc.c:693 src/irc/irc-dcc.c:736
-msgid " (local filename: "
+#: src/irc/irc-dcc.c:374
+#, c-format
+msgid " (local filename: %s%s%s)"
 msgstr ""
 
-#: src/irc/irc-dcc.c:382
+#: src/irc/irc-dcc.c:379
 msgid " sent to "
 msgstr ""
 
-#: src/irc/irc-dcc.c:384
+#: src/irc/irc-dcc.c:381
 msgid " received from "
 msgstr ""
 
-#: src/irc/irc-dcc.c:390
-msgid ": ok!\n"
+#: src/irc/irc-dcc.c:386
+msgid "OK"
 msgstr ""
 
-#: src/irc/irc-dcc.c:390
-msgid ": FAILED\n"
+#: src/irc/irc-dcc.c:386
+msgid "FAILED"
 msgstr ""
 
-#: src/irc/irc-dcc.c:402
-msgid "DCC chat closed with "
+#: src/irc/irc-dcc.c:399
+#, c-format
+msgid "DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:459
+#: src/irc/irc-dcc.c:457
 #, c-format
 msgid ""
 "%s can't associate DCC chat with private buffer (maybe private buffer has "
 "already DCC CHAT?)\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:470
-msgid "Connected to "
-msgstr ""
-
-#: src/irc/irc-dcc.c:479
-msgid "via DCC chat\n"
-msgstr ""
-
-#: src/irc/irc-dcc.c:573
+#: src/irc/irc-dcc.c:468
 #, c-format
-msgid "resumed at position %u\n"
+msgid "Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:579 src/irc/irc-dcc.c:604
+#: src/irc/irc-dcc.c:568
+#, c-format
+msgid "DCC: file %s%s%s resumed at position %u\n"
+msgstr ""
+
+#: src/irc/irc-dcc.c:577 src/irc/irc-dcc.c:602
 #, c-format
 msgid ""
 "%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
 "ended\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:623
+#: src/irc/irc-dcc.c:621
 #, c-format
 msgid "%s not enough memory for new DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:642
+#: src/irc/irc-dcc.c:640
 msgid "DCC chat"
 msgstr ""
 
-#: src/irc/irc-dcc.c:672
-msgid "Incoming DCC file from "
-msgstr ""
-
-#: src/irc/irc-dcc.c:683 src/irc/irc-dcc.c:697
-msgid " bytes\n"
-msgstr ""
-
-#: src/irc/irc-dcc.c:689
-msgid "Sending DCC file to "
-msgstr ""
-
-#: src/irc/irc-dcc.c:703
-msgid "Incoming DCC chat request from "
-msgstr ""
-
-#: src/irc/irc-dcc.c:715
-msgid "Sending DCC chat request to "
-msgstr ""
-
-#: src/irc/irc-dcc.c:742
+#: src/irc/irc-dcc.c:671
 #, c-format
-msgid "will be resumed at position %u\n"
+msgid ""
+"Incoming DCC file from %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s bytes\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:810
+#: src/irc/irc-dcc.c:694
+#, c-format
+msgid ""
+"Sending DCC file to %s%s%s: %s%s%s (local filename: %s%s%s), %s%lu%s bytes\n"
+msgstr ""
+
+#: src/irc/irc-dcc.c:714
+#, c-format
+msgid "Incoming DCC chat request from %s%s%s (%s%d.%d.%d.%d%s)\n"
+msgstr ""
+
+#: src/irc/irc-dcc.c:731
+#, c-format
+msgid "Sending DCC chat request to %s%s\n"
+msgstr ""
+
+#: src/irc/irc-dcc.c:749
+#, c-format
+msgid ""
+"DCC: file %s%s%s (local filename: %s%s%s) will be resumed at position %u\n"
+msgstr ""
+
+#: src/irc/irc-dcc.c:824
 #, c-format
 msgid "%s not enough memory for DCC SEND\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:832
+#: src/irc/irc-dcc.c:846
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:854
+#: src/irc/irc-dcc.c:868
 #, c-format
 msgid "%s could not find address for '%s'. Falling back to local IP.\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:874
+#: src/irc/irc-dcc.c:888
 #, c-format
 msgid "%s cannot create socket for DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:932
+#: src/irc/irc-dcc.c:946
 #, c-format
 msgid "%s cannot find available port for DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:976
+#: src/irc/irc-dcc.c:990
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1057
+#: src/irc/irc-dcc.c:1071
 #, c-format
 msgid "%s error sending data to \"%s\" via DCC CHAT\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1330
+#: src/irc/irc-dcc.c:1350
 #, c-format
 msgid ""
 "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
 "option, max is %d.\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1405
+#: src/irc/irc-dcc.c:1425
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr ""
@@ -2076,13 +2081,13 @@ msgstr ""
 msgid "%s plugin \"%s\" not found\n"
 msgstr ""
 
-#: src/plugins/plugins-config.c:215 src/common/weeconfig.c:1653
+#: src/plugins/plugins-config.c:215 src/common/weeconfig.c:1659
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
 msgstr ""
 
-#: src/plugins/plugins-config.c:265 src/common/weeconfig.c:1826
-#: src/common/weeconfig.c:2024
+#: src/plugins/plugins-config.c:265 src/common/weeconfig.c:1832
+#: src/common/weeconfig.c:2030
 #, c-format
 msgid "%s cannot create file \"%s\"\n"
 msgstr ""
@@ -2112,64 +2117,64 @@ msgstr ""
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "bytes"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Kb"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Mb"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Gb"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1265
+#: src/gui/curses/gui-display.c:1836
 msgid "<servers>"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1277
+#: src/gui/curses/gui-display.c:1848
 msgid "(away)"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1411
+#: src/gui/curses/gui-display.c:1982
 msgid "[not connected] "
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1421
+#: src/gui/curses/gui-display.c:1992
 msgid "Act: "
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1509
+#: src/gui/curses/gui-display.c:2080
 #, c-format
 msgid "Lag: %.1f"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1525
+#: src/gui/curses/gui-display.c:2096
 msgid "-MORE-"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1715
+#: src/gui/curses/gui-display.c:2274
 msgid "  [A] Accept"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1716 src/gui/curses/gui-display.c:1720
+#: src/gui/curses/gui-display.c:2275 src/gui/curses/gui-display.c:2279
 msgid "  [C] Cancel"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1725
+#: src/gui/curses/gui-display.c:2284
 msgid "  [R] Remove"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1729
+#: src/gui/curses/gui-display.c:2288
 msgid "  [P] Purge old DCC"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1730
+#: src/gui/curses/gui-display.c:2289
 msgid "  [Q] Close DCC view"
 msgstr ""
 
@@ -2177,16 +2182,12 @@ msgstr ""
 msgid "server"
 msgstr ""
 
-#: src/gui/gui-common.c:392
-msgid "Not enough memory for infobar message\n"
-msgstr ""
-
-#: src/gui/gui-common.c:582
+#: src/gui/gui-common.c:508
 msgid "Not enough memory for new line\n"
 msgstr ""
 
-#: src/gui/gui-common.c:625
-msgid "Not enough memory for new message\n"
+#: src/gui/gui-common.c:844
+msgid "Not enough memory for infobar message\n"
 msgstr ""
 
 #: src/gui/gui-keyboard.c:45
@@ -2337,7 +2338,7 @@ msgstr ""
 msgid "grab a key"
 msgstr ""
 
-#: src/gui/gui-keyboard.c:428 src/common/command.c:1662
+#: src/gui/gui-keyboard.c:428 src/common/command.c:1710
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr ""
@@ -2617,7 +2618,7 @@ msgstr ""
 
 #: src/common/command.c:306
 #, c-format
-msgid "%s target command \"%s\" does not exist!\n"
+msgid "%s target command \"/%s\" does not exist!\n"
 msgstr ""
 
 #: src/common/command.c:535
@@ -2659,417 +2660,438 @@ msgstr ""
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr ""
 
-#: src/common/command.c:773
+#: src/common/command.c:789
 #, c-format
 msgid "%s unable to call handler for message (not enough memory)\n"
 msgstr ""
 
-#: src/common/command.c:781
+#: src/common/command.c:797
 msgid "This window is not a channel!\n"
 msgstr ""
 
-#: src/common/command.c:809 src/common/command.c:833 src/common/command.c:943
+#: src/common/command.c:825 src/common/command.c:856 src/common/command.c:963
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:818
+#: src/common/command.c:832
+#, c-format
+msgid "%s alias can not start with \"/\"\n"
+msgstr ""
+
+#: src/common/command.c:841
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr ""
 
-#: src/common/command.c:824
+#: src/common/command.c:847
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr ""
 
-#: src/common/command.c:844
+#: src/common/command.c:867
 msgid "List of aliases:\n"
 msgstr ""
 
-#: src/common/command.c:856
+#: src/common/command.c:881
 msgid "No alias defined.\n"
 msgstr ""
 
-#: src/common/command.c:879
-msgid "Channel: "
+#: src/common/command.c:898
+#, c-format
+msgid "%sServer: %s%s\n"
 msgstr ""
 
-#: src/common/command.c:882 src/common/command.c:892
-msgid " (server: "
+#: src/common/command.c:903
+#, c-format
+msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
 msgstr ""
 
-#: src/common/command.c:889
-msgid "Private with: "
+#: src/common/command.c:912
+#, c-format
+msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
 msgstr ""
 
-#: src/common/command.c:923
+#: src/common/command.c:920
+msgid "not connected\n"
+msgstr ""
+
+#: src/common/command.c:942
 msgid "Opened buffers:\n"
 msgstr ""
 
-#: src/common/command.c:966
+#: src/common/command.c:986
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr ""
 
-#: src/common/command.c:982
+#: src/common/command.c:1002
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr ""
 
-#: src/common/command.c:992
+#: src/common/command.c:1012
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr ""
 
-#: src/common/command.c:1043
+#: src/common/command.c:1063
 msgid "Notify levels:  "
 msgstr ""
 
-#: src/common/command.c:1071 src/common/command.c:1093
+#: src/common/command.c:1091 src/common/command.c:1113
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr ""
 
-#: src/common/command.c:1080
+#: src/common/command.c:1100
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr ""
 
-#: src/common/command.c:1160
+#: src/common/command.c:1180
 #, c-format
 msgid "unknown parameter \"%s\" for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1190
+#: src/common/command.c:1210
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr ""
 
-#: src/common/command.c:1198
+#: src/common/command.c:1218
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr ""
 
-#: src/common/command.c:1216 src/common/command.c:1291
+#: src/common/command.c:1236 src/common/command.c:1311
 #, c-format
 msgid "%s server not found\n"
 msgstr ""
 
-#: src/common/command.c:1246 src/common/command.c:1774
-#: src/common/command.c:2595 src/common/command.c:2619
+#: src/common/command.c:1266 src/common/command.c:1824
+#: src/common/command.c:2671 src/common/command.c:2695
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1275
+#: src/common/command.c:1295
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr ""
 
-#: src/common/command.c:1283
+#: src/common/command.c:1303
 msgid "Auto-reconnection is cancelled\n"
 msgstr ""
 
-#: src/common/command.c:1314 src/common/weechat.c:350
+#: src/common/command.c:1334 src/common/weechat.c:364
 #, c-format
 msgid "%s internal commands:\n"
 msgstr ""
 
-#: src/common/command.c:1323 src/common/weechat.c:370
+#: src/common/command.c:1344 src/common/weechat.c:384
 #, c-format
 msgid "IRC commands:\n"
 msgstr ""
 
-#: src/common/command.c:1336
+#: src/common/command.c:1358
 msgid "Plugin commands:\n"
 msgstr ""
 
-#: src/common/command.c:1444
+#: src/common/command.c:1474
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr ""
 
-#: src/common/command.c:1466
+#: src/common/command.c:1495
+msgid "on"
+msgstr ""
+
+#: src/common/command.c:1503
 msgid " ignoring "
 msgstr ""
 
-#: src/common/command.c:1490
+#: src/common/command.c:1507
+msgid " from "
+msgstr ""
+
+#: src/common/command.c:1530
 msgid "List of ignore:\n"
 msgstr ""
 
-#: src/common/command.c:1505
+#: src/common/command.c:1547
 msgid "No ignore defined.\n"
 msgstr ""
 
-#: src/common/command.c:1531
+#: src/common/command.c:1573
 msgid "New ignore:"
 msgstr ""
 
-#: src/common/command.c:1550
-msgid "New key binding:\n"
+#: src/common/command.c:1593
+#, c-format
+msgid "New key binding:  %s"
 msgstr ""
 
-#: src/common/command.c:1583
+#: src/common/command.c:1627
 msgid "Key bindings:\n"
 msgstr ""
 
-#: src/common/command.c:1595
+#: src/common/command.c:1641
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr ""
 
-#: src/common/command.c:1600
+#: src/common/command.c:1647
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:1608 src/common/weechat.c:401
+#: src/common/command.c:1655 src/common/weechat.c:415
 #, c-format
 msgid "Internal key functions:\n"
 msgstr ""
 
-#: src/common/command.c:1627
+#: src/common/command.c:1675
 msgid "Default key bindings restored\n"
 msgstr ""
 
-#: src/common/command.c:1633
+#: src/common/command.c:1681
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 
-#: src/common/command.c:1689
+#: src/common/command.c:1737
 msgid "Plugins loaded:\n"
 msgstr ""
 
-#: src/common/command.c:1703
+#: src/common/command.c:1753
 msgid "     message handlers:\n"
 msgstr ""
 
-#: src/common/command.c:1712
+#: src/common/command.c:1762
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr ""
 
-#: src/common/command.c:1719
+#: src/common/command.c:1769
 msgid "       (no message handler)\n"
 msgstr ""
 
-#: src/common/command.c:1724
+#: src/common/command.c:1774
 msgid "     command handlers:\n"
 msgstr ""
 
-#: src/common/command.c:1745
+#: src/common/command.c:1795
 msgid "       (no command handler)\n"
 msgstr ""
 
-#: src/common/command.c:1751
+#: src/common/command.c:1801
 msgid "  (no plugin)\n"
 msgstr ""
 
-#: src/common/command.c:1787
+#: src/common/command.c:1837
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
 msgstr ""
 
-#: src/common/command.c:1834
+#: src/common/command.c:1884
 msgid "No server.\n"
 msgstr ""
 
-#: src/common/command.c:1845
+#: src/common/command.c:1895
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr ""
 
-#: src/common/command.c:1857
+#: src/common/command.c:1907
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1865
+#: src/common/command.c:1915
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr ""
 
-#: src/common/command.c:1884
+#: src/common/command.c:1934
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1892
+#: src/common/command.c:1942
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
 "disconnect %s before.\n"
 msgstr ""
 
-#: src/common/command.c:1908 src/common/command.c:2054
-msgid "Server"
+#: src/common/command.c:1960
+#, c-format
+msgid "Server %s%s%s has been deleted\n"
 msgstr ""
 
-#: src/common/command.c:1911
-msgid "has been deleted\n"
-msgstr ""
-
-#: src/common/command.c:1926
+#: src/common/command.c:1977
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1936
+#: src/common/command.c:1987
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr ""
 
-#: src/common/command.c:1965 src/common/command.c:1993
-#: src/common/command.c:2006 src/common/command.c:2032
+#: src/common/command.c:2016 src/common/command.c:2044
+#: src/common/command.c:2057 src/common/command.c:2083
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:1978
+#: src/common/command.c:2029
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:2019
+#: src/common/command.c:2070
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:2057
-msgid "created\n"
+#: src/common/command.c:2105
+#, c-format
+msgid "Server %s%s%s created\n"
 msgstr ""
 
-#: src/common/command.c:2063
+#: src/common/command.c:2114
 #, c-format
 msgid "%s unable to create server\n"
 msgstr ""
 
-#: src/common/command.c:2118
+#: src/common/command.c:2173
 msgid "(unknown)"
 msgstr ""
 
-#: src/common/command.c:2141
-msgid "(password hidden) "
+#: src/common/command.c:2196
+#, c-format
+msgid "%s(password hidden) "
 msgstr ""
 
-#: src/common/command.c:2205
+#: src/common/command.c:2263
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr ""
 
-#: src/common/command.c:2236 src/common/command.c:2282
+#: src/common/command.c:2296 src/common/command.c:2344
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr ""
 
-#: src/common/command.c:2241 src/common/command.c:2274
+#: src/common/command.c:2301 src/common/command.c:2336
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:2257
+#: src/common/command.c:2317
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr ""
 
-#: src/common/command.c:2362
+#: src/common/command.c:2427
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:2365
+#: src/common/command.c:2430
 msgid "No config option found\n"
 msgstr ""
 
-#: src/common/command.c:2372
-msgid "Detail:\n"
+#: src/common/command.c:2437
+#, c-format
+msgid "%sDetail:\n"
 msgstr ""
 
-#: src/common/command.c:2376 src/common/weechat.c:287
+#: src/common/command.c:2443 src/common/weechat.c:301
 #, c-format
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr ""
 
-#: src/common/command.c:2377 src/common/command.c:2400
-#: src/common/command.c:2406 src/common/command.c:2412
-#: src/common/weechat.c:288 src/common/weechat.c:311 src/common/weechat.c:317
-#: src/common/weechat.c:323
+#: src/common/command.c:2444 src/common/command.c:2467
+#: src/common/command.c:2473 src/common/command.c:2479
+#: src/common/weechat.c:302 src/common/weechat.c:325 src/common/weechat.c:331
+#: src/common/weechat.c:337
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr ""
 
-#: src/common/command.c:2382 src/common/weechat.c:293
+#: src/common/command.c:2449 src/common/weechat.c:307
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr ""
 
-#: src/common/command.c:2385 src/common/weechat.c:296
+#: src/common/command.c:2452 src/common/weechat.c:310
 #, c-format
 msgid "  . default value: %d\n"
 msgstr ""
 
-#: src/common/command.c:2389 src/common/weechat.c:300
+#: src/common/command.c:2456 src/common/weechat.c:314
 #, c-format
 msgid "  . type string (values: "
 msgstr ""
 
-#: src/common/command.c:2402 src/common/command.c:2408
-#: src/common/command.c:2414 src/common/weechat.c:313 src/common/weechat.c:319
-#: src/common/weechat.c:325
+#: src/common/command.c:2469 src/common/command.c:2475
+#: src/common/command.c:2481 src/common/weechat.c:327 src/common/weechat.c:333
+#: src/common/weechat.c:339
 msgid "empty"
 msgstr ""
 
-#: src/common/command.c:2405 src/common/weechat.c:316
+#: src/common/command.c:2472 src/common/weechat.c:330
 #, c-format
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr ""
 
-#: src/common/command.c:2411 src/common/weechat.c:322
+#: src/common/command.c:2478 src/common/weechat.c:336
 #, c-format
 msgid "  . type string (any string)\n"
 msgstr ""
 
-#: src/common/command.c:2417 src/common/weechat.c:328
+#: src/common/command.c:2484 src/common/weechat.c:342
 #, c-format
 msgid "  . description: %s\n"
 msgstr ""
 
-#: src/common/command.c:2424
+#: src/common/command.c:2495
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:2427
+#: src/common/command.c:2498
 msgid "config option(s) found\n"
 msgstr ""
 
-#: src/common/command.c:2448
+#: src/common/command.c:2519
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr ""
 
-#: src/common/command.c:2458
+#: src/common/command.c:2529
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr ""
 
-#: src/common/command.c:2511
+#: src/common/command.c:2585
 msgid "ignore were removed.\n"
 msgstr ""
 
-#: src/common/command.c:2513
+#: src/common/command.c:2587
 msgid "ignore was removed.\n"
 msgstr ""
 
-#: src/common/command.c:2518
+#: src/common/command.c:2592
 #, c-format
 msgid "%s no ignore found\n"
 msgstr ""
 
-#: src/common/command.c:2543
+#: src/common/command.c:2617
 msgid "Opened windows:\n"
 msgstr ""
 
@@ -3116,98 +3138,98 @@ msgstr ""
 msgid "%s cannot add a buffer to hotlist\n"
 msgstr ""
 
-#: src/common/log.c:118
+#: src/common/log.c:96
 msgid "Not enough memory to write log file for a buffer\n"
 msgstr ""
 
-#: src/common/log.c:146
+#: src/common/log.c:124
 msgid "Unable to write log file for a buffer\n"
 msgstr ""
 
-#: src/common/log.c:150
+#: src/common/log.c:128
 msgid "****  Beginning of log  "
 msgstr ""
 
-#: src/common/log.c:164
+#: src/common/log.c:142
 msgid "****  End of log  "
 msgstr ""
 
-#: src/common/weechat.c:274
+#: src/common/weechat.c:288
 #, c-format
 msgid ""
 "WeeChat configuration options (~/.weechat/weechat.rc):\n"
 "\n"
 msgstr ""
 
-#: src/common/weechat.c:335
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "Moreover, you can define aliases in [alias] section, by adding lines like:\n"
 msgstr ""
 
-#: src/common/weechat.c:337
+#: src/common/weechat.c:351
 #, c-format
 msgid ""
 "where 'j' is alias name, and 'join' associated command.\n"
 "\n"
 msgstr ""
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:437
 #, c-format
 msgid "%s default keys:\n"
 msgstr ""
 
-#: src/common/weechat.c:503
+#: src/common/weechat.c:525
 #, c-format
 msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
 msgstr ""
 
-#: src/common/weechat.c:516
+#: src/common/weechat.c:538
 #, c-format
 msgid "%s unable to create server ('%s'), ignored\n"
 msgstr ""
 
-#: src/common/weechat.c:525
+#: src/common/weechat.c:547
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr ""
 
-#: src/common/weechat.c:545
+#: src/common/weechat.c:567
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr ""
 
-#: src/common/weechat.c:571
+#: src/common/weechat.c:593
 #, c-format
 msgid "%s unable to get HOME directory\n"
 msgstr ""
 
-#: src/common/weechat.c:580
+#: src/common/weechat.c:602
 #, c-format
 msgid "%s not enough memory for home directory\n"
 msgstr ""
 
-#: src/common/weechat.c:590
+#: src/common/weechat.c:612
 #, c-format
 msgid "%s unable to create ~/.weechat directory\n"
 msgstr ""
 
-#: src/common/weechat.c:603
+#: src/common/weechat.c:625
 #, c-format
 msgid "%s unable to create ~/.weechat/logs directory\n"
 msgstr ""
 
-#: src/common/weechat.c:646
+#: src/common/weechat.c:668
 #, c-format
 msgid "%s unable to create/append to log file (~/.weechat/%s)"
 msgstr ""
 
-#: src/common/weechat.c:669
+#: src/common/weechat.c:696
 #, c-format
-msgid "%sWelcome to "
+msgid "%sWelcome to %s%s%s, %s\n"
 msgstr ""
 
-#: src/common/weechat.c:682 src/common/weechat.c:691
+#: src/common/weechat.c:710 src/common/weechat.c:720
 msgid "compiled on"
 msgstr ""
 
@@ -3219,1038 +3241,1048 @@ msgstr ""
 msgid "WeeChat Warning:"
 msgstr ""
 
-#: src/common/weeconfig.c:103 src/common/weeconfig.c:104
+#: src/common/weeconfig.c:102 src/common/weeconfig.c:103
 msgid "set title for window (terminal for Curses GUI) with name & version"
 msgstr ""
 
-#: src/common/weeconfig.c:107 src/common/weeconfig.c:108
+#: src/common/weeconfig.c:106 src/common/weeconfig.c:107
 msgid "display WeeChat logo at startup"
 msgstr ""
 
-#: src/common/weeconfig.c:111 src/common/weeconfig.c:112
+#: src/common/weeconfig.c:110 src/common/weeconfig.c:111
 msgid "display WeeChat version at startup"
 msgstr ""
 
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:114
 msgid "WeeChat slogan"
 msgstr ""
 
-#: src/common/weeconfig.c:116
+#: src/common/weeconfig.c:115
 msgid "WeeChat slogan (if empty, slogan is not used)"
 msgstr ""
 
-#: src/common/weeconfig.c:119
+#: src/common/weeconfig.c:118
 msgid ""
 "ISO charset for decoding messages from server (used only if locale is UTF-8)"
 msgstr ""
 
-#: src/common/weeconfig.c:120
+#: src/common/weeconfig.c:119
 msgid ""
 "ISO charset for decoding messages from server (used only if locale is UTF-8) "
 "(if empty, messages are not converted if locale is UTF-8"
 msgstr ""
 
-#: src/common/weeconfig.c:124
+#: src/common/weeconfig.c:123
 msgid ""
 "UTF charset for decoding messages from server (used only if locale is not "
 "UTF-8)"
 msgstr ""
 
-#: src/common/weeconfig.c:125
+#: src/common/weeconfig.c:124
 msgid ""
 "UTF charset for decoding messages from server (used only if locale is not "
 "UTF-8) (if empty, messages are not converted if locale is not UTF-8"
 msgstr ""
 
-#: src/common/weeconfig.c:129
+#: src/common/weeconfig.c:128
 msgid "charset for encoding messages sent to server"
 msgstr ""
 
-#: src/common/weeconfig.c:130
+#: src/common/weeconfig.c:129
 msgid ""
 "charset for encoding messages sent to server, examples: UFT-8, ISO-8859-1 "
 "(if empty, messages are not converted)"
 msgstr ""
 
-#: src/common/weeconfig.c:133
+#: src/common/weeconfig.c:132
 msgid "forces internal WeeChat charset (should be empty in most cases)"
 msgstr ""
 
-#: src/common/weeconfig.c:134
+#: src/common/weeconfig.c:133
 msgid ""
 "forces internal WeeChat charset (should be empty in most cases, that means "
 "detected charset is used)"
 msgstr ""
 
-#: src/common/weeconfig.c:137 src/common/weeconfig.c:138
+#: src/common/weeconfig.c:136 src/common/weeconfig.c:137
 msgid "use same buffer for all servers"
 msgstr ""
 
-#: src/common/weeconfig.c:141 src/common/weeconfig.c:142
+#: src/common/weeconfig.c:140 src/common/weeconfig.c:141
 msgid "timestamp for buffers"
 msgstr ""
 
-#: src/common/weeconfig.c:145 src/common/weeconfig.c:146
+#: src/common/weeconfig.c:144 src/common/weeconfig.c:145
 msgid "display nick names with different colors"
 msgstr ""
 
-#: src/common/weeconfig.c:149 src/common/weeconfig.c:150
+#: src/common/weeconfig.c:148 src/common/weeconfig.c:149
 msgid "number of colors to use for nicks colors"
 msgstr ""
 
-#: src/common/weeconfig.c:153 src/common/weeconfig.c:154
+#: src/common/weeconfig.c:152 src/common/weeconfig.c:153
 msgid "display actions with different colors"
 msgstr ""
 
-#: src/common/weeconfig.c:157 src/common/weeconfig.c:158
-msgid "remove colors from incoming messages"
-msgstr ""
-
-#: src/common/weeconfig.c:161
+#: src/common/weeconfig.c:156
 msgid "display nicklist window"
 msgstr ""
 
-#: src/common/weeconfig.c:162
+#: src/common/weeconfig.c:157
 msgid "display nicklist window (for channel windows)"
 msgstr ""
 
-#: src/common/weeconfig.c:165
+#: src/common/weeconfig.c:160
 msgid "nicklist position"
 msgstr ""
 
-#: src/common/weeconfig.c:166
+#: src/common/weeconfig.c:161
 msgid "nicklist position (top, left, right (default), bottom)"
 msgstr ""
 
-#: src/common/weeconfig.c:169
+#: src/common/weeconfig.c:164
 msgid "min size for nicklist"
 msgstr ""
 
-#: src/common/weeconfig.c:170
+#: src/common/weeconfig.c:165
 msgid ""
 "min size for nicklist (width or height, depending on look_nicklist_position "
 "(0 = no min size))"
 msgstr ""
 
-#: src/common/weeconfig.c:174
+#: src/common/weeconfig.c:169
 msgid "max size for nicklist"
 msgstr ""
 
-#: src/common/weeconfig.c:175
+#: src/common/weeconfig.c:170
 msgid ""
 "max size for nicklist (width or height, depending on look_nicklist_position "
 "(0 = no max size; if min == max and > 0, then size is fixed))"
 msgstr ""
 
-#: src/common/weeconfig.c:179 src/common/weeconfig.c:180
+#: src/common/weeconfig.c:174 src/common/weeconfig.c:175
 msgid "text to display instead of nick when not connected"
 msgstr ""
 
-#: src/common/weeconfig.c:183 src/common/weeconfig.c:184
+#: src/common/weeconfig.c:178 src/common/weeconfig.c:179
 msgid "display nick mode ((half)op/voice) before each nick"
 msgstr ""
 
-#: src/common/weeconfig.c:187 src/common/weeconfig.c:188
+#: src/common/weeconfig.c:182 src/common/weeconfig.c:183
 msgid "display space if nick mode is not (half)op/voice"
 msgstr ""
 
-#: src/common/weeconfig.c:191 src/common/weeconfig.c:192
+#: src/common/weeconfig.c:186 src/common/weeconfig.c:187
 msgid "the string inserted after nick completion"
 msgstr ""
 
-#: src/common/weeconfig.c:195 src/common/weeconfig.c:196
+#: src/common/weeconfig.c:190 src/common/weeconfig.c:191
 msgid "chars ignored for nick completion"
 msgstr ""
 
-#: src/common/weeconfig.c:199 src/common/weeconfig.c:200
+#: src/common/weeconfig.c:194 src/common/weeconfig.c:195
 msgid "enable info bar"
 msgstr ""
 
-#: src/common/weeconfig.c:203 src/common/weeconfig.c:204
+#: src/common/weeconfig.c:198 src/common/weeconfig.c:199
 msgid "timestamp for time in infobar"
 msgstr ""
 
-#: src/common/weeconfig.c:207 src/common/weeconfig.c:208
+#: src/common/weeconfig.c:202 src/common/weeconfig.c:203
 msgid "display seconds in infobar time"
 msgstr ""
 
-#: src/common/weeconfig.c:211
+#: src/common/weeconfig.c:206
 msgid "delay (in seconds) for highlight messages in infobar"
 msgstr ""
 
-#: src/common/weeconfig.c:212
+#: src/common/weeconfig.c:207
 msgid ""
 "delay (in seconds) for highlight messages in infobar (0 = disable highlight "
 "notifications in infobar)"
 msgstr ""
 
-#: src/common/weeconfig.c:216
+#: src/common/weeconfig.c:211
 msgid "max number of names in hotlist"
 msgstr ""
 
-#: src/common/weeconfig.c:217
+#: src/common/weeconfig.c:212
 msgid ""
 "max number of names in hotlist (0 = no name displayed, only buffer numbers)"
 msgstr ""
 
-#: src/common/weeconfig.c:220
+#: src/common/weeconfig.c:215
 msgid "level for displaying names in hotlist"
 msgstr ""
 
-#: src/common/weeconfig.c:221
+#: src/common/weeconfig.c:216
 msgid ""
 "level for displaying names in hotlist (combination of: 1=join/part, "
 "2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
 msgstr ""
 
-#: src/common/weeconfig.c:225
+#: src/common/weeconfig.c:220
 msgid "max length of names in hotlist"
 msgstr ""
 
-#: src/common/weeconfig.c:226
+#: src/common/weeconfig.c:221
 msgid "max length of names in hotlist (0 = no limit)"
 msgstr ""
 
-#: src/common/weeconfig.c:229 src/common/weeconfig.c:230
+#: src/common/weeconfig.c:224 src/common/weeconfig.c:225
 msgid "display special message when day changes"
 msgstr ""
 
-#: src/common/weeconfig.c:233 src/common/weeconfig.c:234
+#: src/common/weeconfig.c:228 src/common/weeconfig.c:229
 msgid "timestamp for date displayed when day changed"
 msgstr ""
 
-#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
+#: src/common/weeconfig.c:294 src/common/weeconfig.c:295
 msgid "color for title bar"
 msgstr ""
 
-#: src/common/weeconfig.c:303 src/common/weeconfig.c:304
+#: src/common/weeconfig.c:298 src/common/weeconfig.c:299
 msgid "background for title bar"
 msgstr ""
 
-#: src/common/weeconfig.c:309 src/common/weeconfig.c:310
+#: src/common/weeconfig.c:304 src/common/weeconfig.c:305
 msgid "color for chat text"
 msgstr ""
 
-#: src/common/weeconfig.c:313
+#: src/common/weeconfig.c:308
 msgid "color for time"
 msgstr ""
 
-#: src/common/weeconfig.c:314
+#: src/common/weeconfig.c:309
 msgid "color for time in chat window"
 msgstr ""
 
-#: src/common/weeconfig.c:317
+#: src/common/weeconfig.c:312
 msgid "color for time separator"
 msgstr ""
 
-#: src/common/weeconfig.c:318
+#: src/common/weeconfig.c:313
 msgid "color for time separator (chat window)"
 msgstr ""
 
-#: src/common/weeconfig.c:321 src/common/weeconfig.c:322
+#: src/common/weeconfig.c:316 src/common/weeconfig.c:317
 msgid "color for 1st and 3rd char of prefix"
 msgstr ""
 
-#: src/common/weeconfig.c:325 src/common/weeconfig.c:326
+#: src/common/weeconfig.c:320 src/common/weeconfig.c:321
 msgid "color for middle char of prefix"
 msgstr ""
 
-#: src/common/weeconfig.c:329 src/common/weeconfig.c:330
+#: src/common/weeconfig.c:324 src/common/weeconfig.c:325
 msgid "color for server name"
 msgstr ""
 
-#: src/common/weeconfig.c:333 src/common/weeconfig.c:334
+#: src/common/weeconfig.c:328 src/common/weeconfig.c:329
 msgid "color for join arrow (prefix)"
 msgstr ""
 
-#: src/common/weeconfig.c:337 src/common/weeconfig.c:338
+#: src/common/weeconfig.c:332 src/common/weeconfig.c:333
 msgid "color for part/quit arrow (prefix)"
 msgstr ""
 
-#: src/common/weeconfig.c:341
+#: src/common/weeconfig.c:336
 msgid "color for nicks in actions"
 msgstr ""
 
-#: src/common/weeconfig.c:342
+#: src/common/weeconfig.c:337
 msgid "color for nicks in actions (chat window)"
 msgstr ""
 
-#: src/common/weeconfig.c:345
+#: src/common/weeconfig.c:340
 msgid "color for hostnames"
 msgstr ""
 
-#: src/common/weeconfig.c:346
+#: src/common/weeconfig.c:341
 msgid "color for hostnames (chat window)"
 msgstr ""
 
-#: src/common/weeconfig.c:349
+#: src/common/weeconfig.c:344
 msgid "color for channel names in actions"
 msgstr ""
 
-#: src/common/weeconfig.c:350
+#: src/common/weeconfig.c:345
 msgid "color for channel names in actions (chat window)"
 msgstr ""
 
-#: src/common/weeconfig.c:353
+#: src/common/weeconfig.c:348
 msgid "color for dark separators"
 msgstr ""
 
-#: src/common/weeconfig.c:354
+#: src/common/weeconfig.c:349
 msgid "color for dark separators (chat window)"
 msgstr ""
 
-#: src/common/weeconfig.c:357
+#: src/common/weeconfig.c:352
 msgid "color for highlighted nick"
 msgstr ""
 
-#: src/common/weeconfig.c:358
+#: src/common/weeconfig.c:353
 msgid "color for highlighted nick (chat window)"
 msgstr ""
 
-#: src/common/weeconfig.c:361
+#: src/common/weeconfig.c:356
 msgid "background for chat"
 msgstr ""
 
-#: src/common/weeconfig.c:362
+#: src/common/weeconfig.c:357
 msgid "background for chat window"
 msgstr ""
 
-#: src/common/weeconfig.c:367 src/common/weeconfig.c:368
+#: src/common/weeconfig.c:362 src/common/weeconfig.c:363
 msgid "color for status bar"
 msgstr ""
 
-#: src/common/weeconfig.c:371 src/common/weeconfig.c:372
+#: src/common/weeconfig.c:366 src/common/weeconfig.c:367
 msgid "color for status bar delimiters"
 msgstr ""
 
-#: src/common/weeconfig.c:375 src/common/weeconfig.c:376
+#: src/common/weeconfig.c:370 src/common/weeconfig.c:371
 msgid "color for current channel in status bar"
 msgstr ""
 
-#: src/common/weeconfig.c:379
+#: src/common/weeconfig.c:374
 msgid "color for window with new messages"
 msgstr ""
 
-#: src/common/weeconfig.c:380
+#: src/common/weeconfig.c:375
 msgid "color for window with new messages (status bar)"
 msgstr ""
 
-#: src/common/weeconfig.c:383
+#: src/common/weeconfig.c:378
 msgid "color for window with private message"
 msgstr ""
 
-#: src/common/weeconfig.c:384
+#: src/common/weeconfig.c:379
 msgid "color for window with private message (status bar)"
 msgstr ""
 
-#: src/common/weeconfig.c:387
+#: src/common/weeconfig.c:382
 msgid "color for window with highlight"
 msgstr ""
 
-#: src/common/weeconfig.c:388
+#: src/common/weeconfig.c:383
 msgid "color for window with highlight (status bar)"
 msgstr ""
 
-#: src/common/weeconfig.c:391
+#: src/common/weeconfig.c:386
 msgid "color for window with new data (not messages)"
 msgstr ""
 
-#: src/common/weeconfig.c:392
+#: src/common/weeconfig.c:387
 msgid "color for window with new data (not messages) (status bar)"
 msgstr ""
 
-#: src/common/weeconfig.c:395
+#: src/common/weeconfig.c:390
 msgid "color for \"-MORE-\" text"
 msgstr ""
 
-#: src/common/weeconfig.c:396
+#: src/common/weeconfig.c:391
 msgid "color for window with new data (status bar)"
 msgstr ""
 
-#: src/common/weeconfig.c:399 src/common/weeconfig.c:400
+#: src/common/weeconfig.c:394 src/common/weeconfig.c:395
 msgid "background for status window"
 msgstr ""
 
-#: src/common/weeconfig.c:405 src/common/weeconfig.c:406
+#: src/common/weeconfig.c:400 src/common/weeconfig.c:401
 msgid "color for info bar text"
 msgstr ""
 
-#: src/common/weeconfig.c:409 src/common/weeconfig.c:410
+#: src/common/weeconfig.c:404 src/common/weeconfig.c:405
 msgid "color for infobar delimiters"
 msgstr ""
 
-#: src/common/weeconfig.c:413 src/common/weeconfig.c:414
+#: src/common/weeconfig.c:408 src/common/weeconfig.c:409
 msgid "color for info bar highlight notification"
 msgstr ""
 
-#: src/common/weeconfig.c:417 src/common/weeconfig.c:418
+#: src/common/weeconfig.c:412 src/common/weeconfig.c:413
 msgid "background for info bar window"
 msgstr ""
 
-#: src/common/weeconfig.c:423 src/common/weeconfig.c:424
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
 msgid "color for input text"
 msgstr ""
 
-#: src/common/weeconfig.c:427 src/common/weeconfig.c:428
+#: src/common/weeconfig.c:422 src/common/weeconfig.c:423
 msgid "color for input text (channel name)"
 msgstr ""
 
-#: src/common/weeconfig.c:431 src/common/weeconfig.c:432
+#: src/common/weeconfig.c:426 src/common/weeconfig.c:427
 msgid "color for input text (nick name)"
 msgstr ""
 
-#: src/common/weeconfig.c:435 src/common/weeconfig.c:436
+#: src/common/weeconfig.c:430 src/common/weeconfig.c:431
 msgid "color for input text (delimiters)"
 msgstr ""
 
-#: src/common/weeconfig.c:439 src/common/weeconfig.c:440
+#: src/common/weeconfig.c:434 src/common/weeconfig.c:435
 msgid "background for input window"
 msgstr ""
 
-#: src/common/weeconfig.c:445 src/common/weeconfig.c:446
+#: src/common/weeconfig.c:440 src/common/weeconfig.c:441
 msgid "color for nicknames"
 msgstr ""
 
-#: src/common/weeconfig.c:449 src/common/weeconfig.c:450
+#: src/common/weeconfig.c:444 src/common/weeconfig.c:445
 msgid "color for away nicknames"
 msgstr ""
 
-#: src/common/weeconfig.c:453
+#: src/common/weeconfig.c:448
 msgid "color for chan owner symbol"
 msgstr ""
 
-#: src/common/weeconfig.c:454
+#: src/common/weeconfig.c:449
 msgid "color for chan owner symbol (specific to unrealircd)"
 msgstr ""
 
-#: src/common/weeconfig.c:457
+#: src/common/weeconfig.c:452
 msgid "color for chan admin symbol"
 msgstr ""
 
-#: src/common/weeconfig.c:458
+#: src/common/weeconfig.c:453
 msgid "color for chan admin symbol (specific to unrealircd)"
 msgstr ""
 
-#: src/common/weeconfig.c:461 src/common/weeconfig.c:462
+#: src/common/weeconfig.c:456 src/common/weeconfig.c:457
 msgid "color for operator symbol"
 msgstr ""
 
-#: src/common/weeconfig.c:465 src/common/weeconfig.c:466
+#: src/common/weeconfig.c:460 src/common/weeconfig.c:461
 msgid "color for half-operator symbol"
 msgstr ""
 
-#: src/common/weeconfig.c:469 src/common/weeconfig.c:470
+#: src/common/weeconfig.c:464 src/common/weeconfig.c:465
 msgid "color for voice symbol"
 msgstr ""
 
-#: src/common/weeconfig.c:473 src/common/weeconfig.c:474
+#: src/common/weeconfig.c:468 src/common/weeconfig.c:469
 msgid "color for '+' when scrolling nicks"
 msgstr ""
 
-#: src/common/weeconfig.c:477 src/common/weeconfig.c:478
+#: src/common/weeconfig.c:472 src/common/weeconfig.c:473
 msgid "color for nick separator"
 msgstr ""
 
-#: src/common/weeconfig.c:481 src/common/weeconfig.c:482
+#: src/common/weeconfig.c:476 src/common/weeconfig.c:477
 msgid "color for local nick"
 msgstr ""
 
-#: src/common/weeconfig.c:485 src/common/weeconfig.c:486
-#: src/common/weeconfig.c:489 src/common/weeconfig.c:490
-#: src/common/weeconfig.c:493 src/common/weeconfig.c:494
-#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
-#: src/common/weeconfig.c:501 src/common/weeconfig.c:502
-#: src/common/weeconfig.c:505 src/common/weeconfig.c:506
-#: src/common/weeconfig.c:509 src/common/weeconfig.c:510
-#: src/common/weeconfig.c:513 src/common/weeconfig.c:514
-#: src/common/weeconfig.c:517 src/common/weeconfig.c:518
-#: src/common/weeconfig.c:521 src/common/weeconfig.c:522
+#: src/common/weeconfig.c:480 src/common/weeconfig.c:481
+#: src/common/weeconfig.c:484 src/common/weeconfig.c:485
+#: src/common/weeconfig.c:488 src/common/weeconfig.c:489
+#: src/common/weeconfig.c:492 src/common/weeconfig.c:493
+#: src/common/weeconfig.c:496 src/common/weeconfig.c:497
+#: src/common/weeconfig.c:500 src/common/weeconfig.c:501
+#: src/common/weeconfig.c:504 src/common/weeconfig.c:505
+#: src/common/weeconfig.c:508 src/common/weeconfig.c:509
+#: src/common/weeconfig.c:512 src/common/weeconfig.c:513
+#: src/common/weeconfig.c:516 src/common/weeconfig.c:517
 msgid "color for nick"
 msgstr ""
 
-#: src/common/weeconfig.c:525 src/common/weeconfig.c:526
+#: src/common/weeconfig.c:520 src/common/weeconfig.c:521
 msgid "color for other nick in private window"
 msgstr ""
 
-#: src/common/weeconfig.c:529 src/common/weeconfig.c:530
+#: src/common/weeconfig.c:524 src/common/weeconfig.c:525
 msgid "background for nicknames"
 msgstr ""
 
-#: src/common/weeconfig.c:535
+#: src/common/weeconfig.c:530
 msgid "color for selected DCC"
 msgstr ""
 
-#: src/common/weeconfig.c:536
+#: src/common/weeconfig.c:531
 msgid "color for selected DCC (chat window)"
 msgstr ""
 
-#: src/common/weeconfig.c:539 src/common/weeconfig.c:540
+#: src/common/weeconfig.c:534 src/common/weeconfig.c:535
 msgid "color for \"waiting\" dcc status"
 msgstr ""
 
-#: src/common/weeconfig.c:543 src/common/weeconfig.c:544
+#: src/common/weeconfig.c:538 src/common/weeconfig.c:539
 msgid "color for \"connecting\" dcc status"
 msgstr ""
 
-#: src/common/weeconfig.c:547 src/common/weeconfig.c:548
+#: src/common/weeconfig.c:542 src/common/weeconfig.c:543
 msgid "color for \"active\" dcc status"
 msgstr ""
 
-#: src/common/weeconfig.c:551 src/common/weeconfig.c:552
+#: src/common/weeconfig.c:546 src/common/weeconfig.c:547
 msgid "color for \"done\" dcc status"
 msgstr ""
 
-#: src/common/weeconfig.c:555 src/common/weeconfig.c:556
+#: src/common/weeconfig.c:550 src/common/weeconfig.c:551
 msgid "color for \"failed\" dcc status"
 msgstr ""
 
-#: src/common/weeconfig.c:559 src/common/weeconfig.c:560
+#: src/common/weeconfig.c:554 src/common/weeconfig.c:555
 msgid "color for \"aborted\" dcc status"
 msgstr ""
 
-#: src/common/weeconfig.c:573
+#: src/common/weeconfig.c:568
 msgid "max lines in history (per window)"
 msgstr ""
 
-#: src/common/weeconfig.c:574
+#: src/common/weeconfig.c:569
 msgid ""
 "maximum number of lines in history for one server/channel/private window (0 "
 "= unlimited)"
 msgstr ""
 
-#: src/common/weeconfig.c:578
+#: src/common/weeconfig.c:573
 msgid "max user commands in history"
 msgstr ""
 
-#: src/common/weeconfig.c:579
+#: src/common/weeconfig.c:574
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr ""
 
-#: src/common/weeconfig.c:596 src/common/weeconfig.c:597
+#: src/common/weeconfig.c:591 src/common/weeconfig.c:592
 msgid "automatically log server messages"
 msgstr ""
 
-#: src/common/weeconfig.c:600 src/common/weeconfig.c:601
+#: src/common/weeconfig.c:595 src/common/weeconfig.c:596
 msgid "automatically log channel chats"
 msgstr ""
 
-#: src/common/weeconfig.c:604 src/common/weeconfig.c:605
+#: src/common/weeconfig.c:599 src/common/weeconfig.c:600
 msgid "automatically log private chats"
 msgstr ""
 
-#: src/common/weeconfig.c:608 src/common/weeconfig.c:609
+#: src/common/weeconfig.c:603 src/common/weeconfig.c:604
 msgid "log messages from plugins (scripts)"
 msgstr ""
 
-#: src/common/weeconfig.c:612
+#: src/common/weeconfig.c:607
 msgid "path for log files"
 msgstr ""
 
-#: src/common/weeconfig.c:613
+#: src/common/weeconfig.c:608
 msgid "path for WeeChat log files"
 msgstr ""
 
-#: src/common/weeconfig.c:616
+#: src/common/weeconfig.c:611
 msgid "timestamp for log"
 msgstr ""
 
-#: src/common/weeconfig.c:617
+#: src/common/weeconfig.c:612
 msgid "timestamp for log (see man strftime for date/time specifiers)"
 msgstr ""
 
-#: src/common/weeconfig.c:620 src/common/weeconfig.c:621
+#: src/common/weeconfig.c:615 src/common/weeconfig.c:616
 msgid "hide password displayed by nickserv"
 msgstr ""
 
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:639
 msgid "display message to all channels when away"
 msgstr ""
 
-#: src/common/weeconfig.c:643
+#: src/common/weeconfig.c:640
 msgid "display message to all channels when (un)marking as away"
 msgstr ""
 
-#: src/common/weeconfig.c:646 src/common/weeconfig.c:647
+#: src/common/weeconfig.c:643 src/common/weeconfig.c:644
 msgid "default message when away"
 msgstr ""
 
-#: src/common/weeconfig.c:650 src/common/weeconfig.c:651
+#: src/common/weeconfig.c:647 src/common/weeconfig.c:648
 msgid "default part message (leaving channel)"
 msgstr ""
 
-#: src/common/weeconfig.c:654
+#: src/common/weeconfig.c:651
 msgid "default quit message"
 msgstr ""
 
-#: src/common/weeconfig.c:655
+#: src/common/weeconfig.c:652
 msgid ""
 "default quit message ('%v' will be replaced by WeeChat version in string)"
 msgstr ""
 
-#: src/common/weeconfig.c:658 src/common/weeconfig.c:659
+#: src/common/weeconfig.c:655 src/common/weeconfig.c:656
 msgid "display notices as private messages"
 msgstr ""
 
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:659
 msgid "interval between two checks for away"
 msgstr ""
 
-#: src/common/weeconfig.c:663
+#: src/common/weeconfig.c:660
 msgid "interval between two checks for away (in minutes, 0 = never check)"
 msgstr ""
 
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:663
 msgid "interval between two checks for lag"
 msgstr ""
 
-#: src/common/weeconfig.c:667
+#: src/common/weeconfig.c:664
 msgid "interval between two checks for lag (in seconds)"
 msgstr ""
 
-#: src/common/weeconfig.c:670
+#: src/common/weeconfig.c:667
 msgid "minimum lag to show"
 msgstr ""
 
-#: src/common/weeconfig.c:671
+#: src/common/weeconfig.c:668
 msgid "minimum lag to show (in seconds)"
 msgstr ""
 
-#: src/common/weeconfig.c:674
+#: src/common/weeconfig.c:671
 msgid "disconnect after important lag"
 msgstr ""
 
-#: src/common/weeconfig.c:675
+#: src/common/weeconfig.c:672
 msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
 msgstr ""
 
-#: src/common/weeconfig.c:678 src/common/weeconfig.c:679
+#: src/common/weeconfig.c:675 src/common/weeconfig.c:676
 msgid "create a FIFO pipe for remote control"
 msgstr ""
 
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:679
 msgid "list of words to highlight"
 msgstr ""
 
-#: src/common/weeconfig.c:683
+#: src/common/weeconfig.c:680
 msgid ""
 "comma separated list of words to highlight (case insensitive comparison, "
 "words may begin or end with \"*\" for partial match)"
 msgstr ""
 
-#: src/common/weeconfig.c:705
+#: src/common/weeconfig.c:684 src/common/weeconfig.c:685
+msgid "keep colors from incoming messages"
+msgstr ""
+
+#: src/common/weeconfig.c:688
+msgid "allow user to send colors"
+msgstr ""
+
+#: src/common/weeconfig.c:689
+msgid ""
+"allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %"
+"U=underline, %R=reverse)"
+msgstr ""
+
+#: src/common/weeconfig.c:711
 msgid "automatically accept dcc files"
 msgstr ""
 
-#: src/common/weeconfig.c:706
+#: src/common/weeconfig.c:712
 msgid "automatically accept incoming dcc files"
 msgstr ""
 
-#: src/common/weeconfig.c:709
+#: src/common/weeconfig.c:715
 msgid "automatically accept dcc chats"
 msgstr ""
 
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:716
 msgid "automatically accept dcc chats (use carefully!)"
 msgstr ""
 
-#: src/common/weeconfig.c:713
+#: src/common/weeconfig.c:719
 msgid "timeout for dcc request"
 msgstr ""
 
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:720
 msgid "timeout for dcc request (in seconds)"
 msgstr ""
 
-#: src/common/weeconfig.c:717
+#: src/common/weeconfig.c:723
 msgid "block size for dcc packets"
 msgstr ""
 
-#: src/common/weeconfig.c:718
+#: src/common/weeconfig.c:724
 msgid "block size for dcc packets in bytes (default: 65536)"
 msgstr ""
 
-#: src/common/weeconfig.c:721
+#: src/common/weeconfig.c:727
 msgid "allowed ports for outgoing dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:728
 msgid ""
 "restricts outgoing dcc to use only ports in the given range (useful for NAT) "
 "(syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, empty value "
 "means any port)"
 msgstr ""
 
-#: src/common/weeconfig.c:727
+#: src/common/weeconfig.c:733
 msgid "IP address for outgoing dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:728
+#: src/common/weeconfig.c:734
 msgid ""
 "IP or DNS address used for outgoing dcc (if empty, local interface IP is "
 "used)"
 msgstr ""
 
-#: src/common/weeconfig.c:732
+#: src/common/weeconfig.c:738
 msgid "path for incoming files with dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:733
+#: src/common/weeconfig.c:739
 msgid "path for writing incoming files with dcc (default: user home)"
 msgstr ""
 
-#: src/common/weeconfig.c:736
+#: src/common/weeconfig.c:742
 msgid "default path for sending files with dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:737
+#: src/common/weeconfig.c:743
 msgid ""
 "path for reading files when sending thru dcc (when no path is specified)"
 msgstr ""
 
-#: src/common/weeconfig.c:740 src/common/weeconfig.c:741
+#: src/common/weeconfig.c:746 src/common/weeconfig.c:747
 msgid "convert spaces to underscores when sending files"
 msgstr ""
 
-#: src/common/weeconfig.c:744
+#: src/common/weeconfig.c:750
 msgid "automatically rename dcc files if already exists"
 msgstr ""
 
-#: src/common/weeconfig.c:745
+#: src/common/weeconfig.c:751
 msgid "rename incoming files if already exists (add '.1', '.2', ...)"
 msgstr ""
 
-#: src/common/weeconfig.c:748
+#: src/common/weeconfig.c:754
 msgid "automatically resume aborted transfers"
 msgstr ""
 
-#: src/common/weeconfig.c:749
+#: src/common/weeconfig.c:755
 msgid ""
 "automatically resume dcc transfer if connection with remote host is loosed"
 msgstr ""
 
-#: src/common/weeconfig.c:768
+#: src/common/weeconfig.c:774
 msgid "use proxy"
 msgstr ""
 
-#: src/common/weeconfig.c:769
+#: src/common/weeconfig.c:775
 msgid "use a proxy server to connect to irc server"
 msgstr ""
 
-#: src/common/weeconfig.c:772
+#: src/common/weeconfig.c:778
 msgid "proxy type"
 msgstr ""
 
-#: src/common/weeconfig.c:773
+#: src/common/weeconfig.c:779
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr ""
 
-#: src/common/weeconfig.c:776
+#: src/common/weeconfig.c:782
 msgid "use ipv6 proxy"
 msgstr ""
 
-#: src/common/weeconfig.c:777
+#: src/common/weeconfig.c:783
 msgid "connect to proxy in ipv6"
 msgstr ""
 
-#: src/common/weeconfig.c:780
+#: src/common/weeconfig.c:786
 msgid "proxy address"
 msgstr ""
 
-#: src/common/weeconfig.c:781
+#: src/common/weeconfig.c:787
 msgid "proxy server address (IP or hostname)"
 msgstr ""
 
-#: src/common/weeconfig.c:784
+#: src/common/weeconfig.c:790
 msgid "port for proxy"
 msgstr ""
 
-#: src/common/weeconfig.c:785
+#: src/common/weeconfig.c:791
 msgid "port for connecting to proxy server"
 msgstr ""
 
-#: src/common/weeconfig.c:788
+#: src/common/weeconfig.c:794
 msgid "proxy username"
 msgstr ""
 
-#: src/common/weeconfig.c:789
+#: src/common/weeconfig.c:795
 msgid "username for proxy server"
 msgstr ""
 
-#: src/common/weeconfig.c:792
+#: src/common/weeconfig.c:798
 msgid "proxy password"
 msgstr ""
 
-#: src/common/weeconfig.c:793
+#: src/common/weeconfig.c:799
 msgid "password for proxy server"
 msgstr ""
 
-#: src/common/weeconfig.c:806 src/common/weeconfig.c:807
+#: src/common/weeconfig.c:812 src/common/weeconfig.c:813
 msgid "path for searching plugins"
 msgstr ""
 
-#: src/common/weeconfig.c:810
+#: src/common/weeconfig.c:816
 msgid "list of plugins to load automatically"
 msgstr ""
 
-#: src/common/weeconfig.c:811
+#: src/common/weeconfig.c:817
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found (names may be partial, for example \"perl\" is ok "
 "for \"libperl.so\")"
 msgstr ""
 
-#: src/common/weeconfig.c:816
+#: src/common/weeconfig.c:822
 msgid "standard plugins extension in filename"
 msgstr ""
 
-#: src/common/weeconfig.c:817
+#: src/common/weeconfig.c:823
 msgid ""
 "standard plugins extension in filename, used for autoload (if empty, then "
 "all files are loaded when autoload is \"*\")"
 msgstr ""
 
-#: src/common/weeconfig.c:834
+#: src/common/weeconfig.c:840
 msgid "server name"
 msgstr ""
 
-#: src/common/weeconfig.c:835
+#: src/common/weeconfig.c:841
 msgid "name associated to IRC server (for display only)"
 msgstr ""
 
-#: src/common/weeconfig.c:838
+#: src/common/weeconfig.c:844
 msgid "automatically connect to server"
 msgstr ""
 
-#: src/common/weeconfig.c:839
+#: src/common/weeconfig.c:845
 msgid "automatically connect to server when WeeChat is starting"
 msgstr ""
 
-#: src/common/weeconfig.c:842
+#: src/common/weeconfig.c:848
 msgid "automatically reconnect to server"
 msgstr ""
 
-#: src/common/weeconfig.c:843
+#: src/common/weeconfig.c:849
 msgid "automatically reconnect to server when disconnected"
 msgstr ""
 
-#: src/common/weeconfig.c:846
+#: src/common/weeconfig.c:852
 msgid "delay before trying again to reconnect"
 msgstr ""
 
-#: src/common/weeconfig.c:847
+#: src/common/weeconfig.c:853
 msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr ""
 
-#: src/common/weeconfig.c:850
+#: src/common/weeconfig.c:856
 msgid "server address or hostname"
 msgstr ""
 
-#: src/common/weeconfig.c:851
+#: src/common/weeconfig.c:857
 msgid "IP address or hostname of IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:854
+#: src/common/weeconfig.c:860
 msgid "port for IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:855
+#: src/common/weeconfig.c:861
 msgid "port for connecting to server"
 msgstr ""
 
-#: src/common/weeconfig.c:858 src/common/weeconfig.c:859
+#: src/common/weeconfig.c:864 src/common/weeconfig.c:865
 msgid "use IPv6 protocol for server communication"
 msgstr ""
 
-#: src/common/weeconfig.c:862 src/common/weeconfig.c:863
+#: src/common/weeconfig.c:868 src/common/weeconfig.c:869
 msgid "use SSL for server communication"
 msgstr ""
 
-#: src/common/weeconfig.c:866
+#: src/common/weeconfig.c:872
 msgid "server password"
 msgstr ""
 
-#: src/common/weeconfig.c:867
+#: src/common/weeconfig.c:873
 msgid "password for IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:870
+#: src/common/weeconfig.c:876
 msgid "nickname for server"
 msgstr ""
 
-#: src/common/weeconfig.c:871
+#: src/common/weeconfig.c:877
 msgid "nickname to use on IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:874
+#: src/common/weeconfig.c:880
 msgid "alternate nickname for server"
 msgstr ""
 
-#: src/common/weeconfig.c:875
+#: src/common/weeconfig.c:881
 msgid "alternate nickname to use on IRC server (if nickname is already used)"
 msgstr ""
 
-#: src/common/weeconfig.c:878
+#: src/common/weeconfig.c:884
 msgid "2nd alternate nickname for server"
 msgstr ""
 
-#: src/common/weeconfig.c:879
+#: src/common/weeconfig.c:885
 msgid ""
 "2nd alternate nickname to use on IRC server (if alternate nickname is "
 "already used)"
 msgstr ""
 
-#: src/common/weeconfig.c:882
+#: src/common/weeconfig.c:888
 msgid "user name for server"
 msgstr ""
 
-#: src/common/weeconfig.c:883
+#: src/common/weeconfig.c:889
 msgid "user name to use on IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:886
+#: src/common/weeconfig.c:892
 msgid "real name for server"
 msgstr ""
 
-#: src/common/weeconfig.c:887
+#: src/common/weeconfig.c:893
 msgid "real name to use on IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:890 src/common/weeconfig.c:891
+#: src/common/weeconfig.c:896 src/common/weeconfig.c:897
 msgid "first command to run when connected to server"
 msgstr ""
 
-#: src/common/weeconfig.c:894
+#: src/common/weeconfig.c:900
 msgid "delay (in seconds) after command was executed"
 msgstr ""
 
-#: src/common/weeconfig.c:895
+#: src/common/weeconfig.c:901
 msgid ""
 "delay (in seconds) after command was executed (example: give some time for "
 "authentication)"
 msgstr ""
 
-#: src/common/weeconfig.c:898
+#: src/common/weeconfig.c:904
 msgid "list of channels to join when connected to server"
 msgstr ""
 
-#: src/common/weeconfig.c:899
+#: src/common/weeconfig.c:905
 msgid ""
 "comma separated list of channels to join when connected to server (example: "
 "\"#chan1,#chan2,#chan3 key1,key2\")"
 msgstr ""
 
-#: src/common/weeconfig.c:902 src/common/weeconfig.c:903
+#: src/common/weeconfig.c:908 src/common/weeconfig.c:909
 msgid "automatically rejoin channels when kicked"
 msgstr ""
 
-#: src/common/weeconfig.c:906
+#: src/common/weeconfig.c:912
 msgid "notify levels for channels of this server"
 msgstr ""
 
-#: src/common/weeconfig.c:907
+#: src/common/weeconfig.c:913
 msgid ""
 "comma separated list of notify levels for channels of this server (format: "
 "#channel:1,..)"
 msgstr ""
 
-#: src/common/weeconfig.c:1463
+#: src/common/weeconfig.c:1469
 #, c-format
 msgid "%s %s, line %d: new server, but previous was incomplete\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1472
+#: src/common/weeconfig.c:1478
 #, c-format
 msgid "%s %s, line %d: server '%s' already exists\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1487
+#: src/common/weeconfig.c:1493
 #, c-format
 msgid "%s %s, line %d: unable to create server\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1527
+#: src/common/weeconfig.c:1533
 #, c-format
 msgid "%s unable to assign default int with string (\"%s\")\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1538
+#: src/common/weeconfig.c:1544
 #, c-format
 msgid "%s unable to assign default color (\"%s\")\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1578
+#: src/common/weeconfig.c:1584
 #, c-format
 msgid "%s config file \"%s\" not found.\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1610
+#: src/common/weeconfig.c:1616
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1627
+#: src/common/weeconfig.c:1633
 #, c-format
 msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1645
+#: src/common/weeconfig.c:1651
 #, c-format
 msgid "%s %s, line %d: invalid section for option, line is ignored\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1690 src/common/weeconfig.c:1716
+#: src/common/weeconfig.c:1696 src/common/weeconfig.c:1722
 #, c-format
 msgid "%s %s, line %d: invalid option \"%s\"\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1696
+#: src/common/weeconfig.c:1702
 #, c-format
 msgid "%s %s, line %d: invalid ignore options \"%s\"\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1727
+#: src/common/weeconfig.c:1733
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value foroption '%s'\n"
 "Expected: boolean value: 'off' or 'on'\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1736
+#: src/common/weeconfig.c:1742
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
 "Expected: integer between %d and %d\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1747
+#: src/common/weeconfig.c:1753
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
 "Expected: one of these strings: "
 msgstr ""
 
-#: src/common/weeconfig.c:1763
+#: src/common/weeconfig.c:1769
 #, c-format
 msgid "%s %s, line %d: invalid color name for option '%s'\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1832
+#: src/common/weeconfig.c:1838
 #, c-format
 msgid "%s: creating default config file...\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1833
+#: src/common/weeconfig.c:1839
 msgid "Creating default config file\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1836 src/common/weeconfig.c:2033
+#: src/common/weeconfig.c:1842 src/common/weeconfig.c:2039
 #, c-format
 msgid ""
 "#\n"
 "# %s configuration file, created by %s v%s on %s"
 msgstr ""
 
-#: src/common/weeconfig.c:1840 src/common/weeconfig.c:2037
+#: src/common/weeconfig.c:1846 src/common/weeconfig.c:2043
 #, c-format
 msgid ""
 "# WARNING! Be careful when editing this file, WeeChat writes this file when "
@@ -4258,6 +4290,6 @@ msgid ""
 "#\n"
 msgstr ""
 
-#: src/common/weeconfig.c:2030
+#: src/common/weeconfig.c:2036
 msgid "Saving config to disk\n"
 msgstr ""
diff --git a/src/common/command.c b/src/common/command.c
index 9cbc5cc3a..e3aea11cb 100644
--- a/src/common/command.c
+++ b/src/common/command.c
@@ -303,7 +303,7 @@ alias_new (char *alias_name, char *alias_command)
     if (!weelist_search (index_commands, alias_command))
     {
         irc_display_prefix (NULL, NULL, PREFIX_ERROR);
-        gui_printf (NULL, _("%s target command \"%s\" does not exist!\n"),
+        gui_printf (NULL, _("%s target command \"/%s\" does not exist!\n"),
                     WEECHAT_ERROR, alias_command);
         return NULL;
     }
@@ -689,7 +689,7 @@ user_command (t_irc_server *server, t_gui_buffer *buffer, char *command)
 {
     t_irc_nick *ptr_nick;
     int plugin_args_length;
-    char *plugin_args;
+    char *command_with_colors, *command_with_colors2, *plugin_args;
     
     if ((!command) || (!command[0]) || (command[0] == '\r') || (command[0] == '\n'))
         return;
@@ -709,28 +709,37 @@ user_command (t_irc_server *server, t_gui_buffer *buffer, char *command)
         
         if (server && (!BUFFER_IS_SERVER(buffer)))
         {
+            command_with_colors = (cfg_irc_colors_send) ?
+                (char *)gui_color_encode ((unsigned char *)command) : NULL;
+            
             if (CHANNEL(buffer)->dcc_chat)
                 dcc_chat_sendf ((t_irc_dcc *)(CHANNEL(buffer)->dcc_chat),
-                                "%s\r\n", command);
+                                "%s\r\n",
+                                (command_with_colors) ? command_with_colors : command);
             else
                 server_sendf (server, "PRIVMSG %s :%s\r\n",
-                              CHANNEL(buffer)->name, command);
+                              CHANNEL(buffer)->name,
+                              (command_with_colors) ?
+                              command_with_colors : command);
+            
+            command_with_colors2 = (command_with_colors) ?
+                (char *)gui_color_decode ((unsigned char *)command_with_colors, 1) : NULL;
             
             if (CHANNEL(buffer)->type == CHAT_PRIVATE)
             {
-                gui_printf_type_color (CHANNEL(buffer)->buffer,
-                                       MSG_TYPE_NICK,
-                                       COLOR_WIN_CHAT_DARK, "<");
-                gui_printf_type_color (CHANNEL(buffer)->buffer,
-                                       MSG_TYPE_NICK,
-                                       COLOR_WIN_NICK_SELF,
-                                       "%s", server->nick);
-                gui_printf_type_color (CHANNEL(buffer)->buffer,
-                                       MSG_TYPE_NICK,
-                                       COLOR_WIN_CHAT_DARK, "> ");
-                gui_printf_type_color (CHANNEL(buffer)->buffer,
-                                       MSG_TYPE_MSG,
-                                       COLOR_WIN_CHAT, "%s\n", command);
+                gui_printf_type (CHANNEL(buffer)->buffer,
+                                 MSG_TYPE_NICK,
+                                 "%s<%s%s%s> ",
+                                 GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                 GUI_COLOR(COLOR_WIN_NICK_SELF),
+                                 server->nick,
+                                 GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                gui_printf_type (CHANNEL(buffer)->buffer,
+                                 MSG_TYPE_MSG,
+                                 "%s%s\n",
+                                 GUI_COLOR(COLOR_WIN_CHAT),
+                                 (command_with_colors2) ?
+                                 command_with_colors2 : command);
             }
             else
             {
@@ -739,8 +748,10 @@ user_command (t_irc_server *server, t_gui_buffer *buffer, char *command)
                 {
                     irc_display_nick (CHANNEL(buffer)->buffer, ptr_nick, NULL,
                                       MSG_TYPE_NICK, 1, 1, 0);
-                    gui_printf_color (CHANNEL(buffer)->buffer,
-                                      COLOR_WIN_CHAT, "%s\n", command);
+                    gui_printf (CHANNEL(buffer)->buffer,
+                                "%s\n",
+                                (command_with_colors2) ?
+                                command_with_colors2 : command);
                 }
                 else
                 {
@@ -751,6 +762,11 @@ user_command (t_irc_server *server, t_gui_buffer *buffer, char *command)
                 }
             }
             
+            if (command_with_colors)
+                free (command_with_colors);
+            if (command_with_colors2)
+                free (command_with_colors2);
+            
             /* sending a copy of the message as PRIVMSG to plugins because irc server doesn't */                               
             plugin_args_length = strlen ("localhost PRIVMSG  :") +
                 strlen (CHANNEL(buffer)->name) + strlen(command) + 16;
@@ -810,6 +826,13 @@ weechat_cmd_alias (char *arguments)
                             WEECHAT_ERROR, "alias");
                 return -1;
             }
+            if (arguments[0] == '/')
+            {
+                irc_display_prefix (NULL, NULL, PREFIX_ERROR);
+                gui_printf (NULL, _("%s alias can not start with \"/\"\n"),
+                            WEECHAT_ERROR, "alias");
+                return -1;
+            }
             if (!alias_new (arguments, pos))
                 return -1;
             if (weelist_add (&index_commands, &last_index_command, arguments))
@@ -845,8 +868,10 @@ weechat_cmd_alias (char *arguments)
             for (ptr_alias = weechat_alias; ptr_alias;
                  ptr_alias = ptr_alias->next_alias)
             {
-                gui_printf (NULL, "  %s => %s\n",
+                gui_printf (NULL, "  %s %s=>%s %s\n",
                             ptr_alias->alias_name,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
                             ptr_alias->alias_command + 1);
             }
         }
@@ -867,38 +892,32 @@ void
 weechat_cmd_buffer_display_info (t_gui_buffer *buffer)
 {
     if (buffer->dcc)
-        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "DCC\n");
+        gui_printf (NULL, "%sDCC\n",
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL));
     else if (BUFFER_IS_SERVER (buffer))
-    {
-        gui_printf (NULL, _("Server: "));
-        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
-                          "%s\n", SERVER(buffer)->name);
-    }
+        gui_printf (NULL, _("%sServer: %s%s\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    SERVER(buffer)->name);
     else if (BUFFER_IS_CHANNEL (buffer))
-    {
-        gui_printf (NULL, _("Channel: "));
-        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
-                          "%s", CHANNEL(buffer)->name);
-        gui_printf (NULL, _(" (server: "));
-        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
-                          "%s", SERVER(buffer)->name);
-        gui_printf (NULL, ")\n");
-    }
+        gui_printf (NULL, _("%sChannel: %s%s %s(server: %s%s%s)\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    CHANNEL(buffer)->name,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    SERVER(buffer)->name,
+                    GUI_COLOR(COLOR_WIN_CHAT));
     else if (BUFFER_IS_PRIVATE (buffer))
-    {
-        gui_printf (NULL, _("Private with: "));
-        gui_printf_color (NULL, COLOR_WIN_CHAT_NICK,
-                          "%s", CHANNEL(buffer)->name);
-        gui_printf (NULL, _(" (server: "));
-        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
-                          "%s", SERVER(buffer)->name);
-        gui_printf (NULL, ")\n");
-    }
+        gui_printf (NULL, _("%sPrivate with: %s%s %s(server: %s%s%s)\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    CHANNEL(buffer)->name,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    SERVER(buffer)->name);
     else
-    {
-        gui_printf (NULL, _("not connected"));
-        gui_printf (NULL, "\n");
-    }
+        gui_printf (NULL, _("not connected\n"));
 }
 
 /*
@@ -924,10 +943,11 @@ weechat_cmd_buffer (int argc, char **argv)
         
         for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
         {
-            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "[");
-            gui_printf (NULL, "%d", ptr_buffer->number);
-            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "] ");
-            
+            gui_printf (NULL, "%s[%s%d%s] ",
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        ptr_buffer->number,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK));
             weechat_cmd_buffer_display_info (ptr_buffer);
         }
     }
@@ -1314,9 +1334,10 @@ weechat_cmd_help (int argc, char **argv)
             gui_printf (NULL, _("%s internal commands:\n"), PACKAGE_NAME);
             for (i = 0; weechat_commands[i].command_name; i++)
             {
-                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "   %s",
-                                  weechat_commands[i].command_name);
-                gui_printf (NULL, " - %s\n",
+                gui_printf (NULL, "   %s%s %s- %s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                            weechat_commands[i].command_name,
+                            GUI_COLOR(COLOR_WIN_CHAT),
                             _(weechat_commands[i].command_description));
             }
             gui_printf (NULL, "\n");
@@ -1325,9 +1346,10 @@ weechat_cmd_help (int argc, char **argv)
             {
                 if (irc_commands[i].cmd_function_args || irc_commands[i].cmd_function_1arg)
                 {
-                    gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "   %s",
-                                      irc_commands[i].command_name);
-                    gui_printf (NULL, " - %s\n",
+                    gui_printf (NULL, "   %s%s %s- %s\n",
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                irc_commands[i].command_name,
+                                GUI_COLOR(COLOR_WIN_CHAT),
                                 _(irc_commands[i].command_description));
                 }
             }
@@ -1342,11 +1364,13 @@ weechat_cmd_help (int argc, char **argv)
                 {
                     if (ptr_handler->type == HANDLER_COMMAND)
                     {
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "   %s",
-                                          ptr_handler->command);
+                        gui_printf (NULL, "   %s%s",
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    ptr_handler->command);
                         if (ptr_handler->description
                             && ptr_handler->description[0])
-                            gui_printf (NULL, " - %s",
+                            gui_printf (NULL, " %s- %s",
+                                        GUI_COLOR(COLOR_WIN_CHAT),
                                         ptr_handler->description);
                         gui_printf (NULL, "\n");
                     }
@@ -1361,11 +1385,13 @@ weechat_cmd_help (int argc, char **argv)
                 {
                     gui_printf (NULL, "\n");
                     gui_printf (NULL, "[w]");
-                    gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "  /%s",
-                                      weechat_commands[i].command_name);
+                    gui_printf (NULL, "  %s/%s",
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                weechat_commands[i].command_name);
                     if (weechat_commands[i].arguments &&
                         weechat_commands[i].arguments[0])
-                        gui_printf (NULL, "  %s\n",
+                        gui_printf (NULL, "  %s%s\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT),
                                     _(weechat_commands[i].arguments));
                     else
                         gui_printf (NULL, "\n");
@@ -1387,11 +1413,13 @@ weechat_cmd_help (int argc, char **argv)
                 {
                     gui_printf (NULL, "\n");
                     gui_printf (NULL, "[i]");
-                    gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "  /%s",
-                                      irc_commands[i].command_name);
+                    gui_printf (NULL, "  %s/%s",
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                irc_commands[i].command_name);
                     if (irc_commands[i].arguments &&
                         irc_commands[i].arguments[0])
-                        gui_printf (NULL, "  %s\n",
+                        gui_printf (NULL, "  %s%s\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT),
                                     _(irc_commands[i].arguments));
                     else
                         gui_printf (NULL, "\n");
@@ -1418,11 +1446,13 @@ weechat_cmd_help (int argc, char **argv)
                     {
                         gui_printf (NULL, "\n");
                         gui_printf (NULL, "[p]");
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "  /%s",
-                                          ptr_handler->command);
+                        gui_printf (NULL, "  %s/%s",
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    ptr_handler->command);
                         if (ptr_handler->arguments &&
                             ptr_handler->arguments[0])
-                            gui_printf (NULL, "  %s\n",
+                            gui_printf (NULL, "  %s%s\n",
+                                        GUI_COLOR(COLOR_WIN_CHAT),
                                         ptr_handler->arguments);
                         else
                             gui_printf (NULL, "\n");
@@ -1456,17 +1486,27 @@ void
 weechat_cmd_ignore_display (char *text, t_irc_ignore *ptr_ignore)
 {
     if (text)
-        gui_printf (NULL, "%s ", text);
+        gui_printf (NULL, "%s%s ",
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    text);
     
-    gui_printf (NULL, _("on"));
-    gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, " %s", ptr_ignore->server_name);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "/");
-    gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s", ptr_ignore->channel_name);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, ":");
-    gui_printf (NULL, _(" ignoring "));
-    gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s", ptr_ignore->type);
-    gui_printf (NULL, _(" from "));
-    gui_printf_color (NULL, COLOR_WIN_CHAT_HOST, "%s\n", ptr_ignore->mask);
+    gui_printf (NULL, "%s%s %s%s%s/%s%s%s:%s%s%s%s%s%s%s%s\n",
+                GUI_COLOR(COLOR_WIN_CHAT),
+                _("on"),
+                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                ptr_ignore->server_name,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                ptr_ignore->channel_name,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT),
+                _(" ignoring "),
+                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                ptr_ignore->type,
+                GUI_COLOR(COLOR_WIN_CHAT),
+                _(" from "),
+                GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                ptr_ignore->mask);
 }
 
 /*
@@ -1493,9 +1533,11 @@ weechat_cmd_ignore (int argc, char **argv)
                      ptr_ignore = ptr_ignore->next_ignore)
                 {
                     i++;
-                    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "[");
-                    gui_printf (NULL, "%d", i);
-                    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "] ");
+                    gui_printf (NULL, "%s[%s%d%s] ",
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                i,
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK));
                     weechat_cmd_ignore_display (NULL, ptr_ignore);
                 }
             }
@@ -1547,13 +1589,15 @@ weechat_cmd_key_display (t_gui_key *key, int new_key)
     expanded_name = gui_key_get_expanded_name (key->key);
     if (new_key)
     {
-        gui_printf (NULL, _("New key binding:\n"));
-        gui_printf (NULL, "  %s", (expanded_name) ? expanded_name : key->key);
+        irc_display_prefix (NULL, NULL, PREFIX_INFO);
+        gui_printf (NULL, _("New key binding:  %s"),
+                    (expanded_name) ? expanded_name : key->key);
     }
     else
         gui_printf (NULL, "  %20s", (expanded_name) ? expanded_name : key->key);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " => ");
-    gui_printf (NULL, "%s\n",
+    gui_printf (NULL, "%s => %s%s\n",
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT),
                 (key->function) ?
                 gui_key_function_search_by_ptr (key->function) : key->command);
     if (expanded_name)
@@ -1592,7 +1636,10 @@ weechat_cmd_key (char *arguments)
         while (arguments[0] == ' ')
             arguments++;
         if (gui_key_unbind (arguments))
+        {
+            irc_display_prefix (NULL, NULL, PREFIX_INFO);
             gui_printf (NULL, _("Key \"%s\" unbinded\n"), arguments);
+        }
         else
         {
             irc_display_prefix (NULL, NULL, PREFIX_ERROR);
@@ -1624,6 +1671,7 @@ weechat_cmd_key (char *arguments)
         {
             gui_key_free_all ();
             gui_key_init ();
+            irc_display_prefix (NULL, NULL, PREFIX_INFO);
             gui_printf (NULL, _("Default key bindings restored\n"));
         }
         else
@@ -1692,8 +1740,10 @@ weechat_cmd_plugin (int argc, char **argv)
             {
                 /* plugin info */
                 irc_display_prefix (NULL, NULL, PREFIX_PLUGIN);
-                gui_printf (NULL, "  %s v%s - %s (%s)\n",
+                gui_printf (NULL, "  %s%s%s v%s - %s (%s)\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
                             ptr_plugin->name,
+                            GUI_COLOR(COLOR_WIN_CHAT),
                             ptr_plugin->version,
                             ptr_plugin->description,
                             ptr_plugin->filename);
@@ -1904,13 +1954,14 @@ weechat_cmd_server (int argc, char **argv)
                 }
             }
             
-            irc_display_prefix (NULL, NULL, PREFIX_INFO);
-            gui_printf_color (NULL, COLOR_WIN_CHAT, _("Server"));
-            gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
-                              " %s ", server_found->name);
-            gui_printf_color (NULL, COLOR_WIN_CHAT, _("has been deleted\n"));
-            
             server_free (server_found);
+            
+            irc_display_prefix (NULL, NULL, PREFIX_INFO);
+            gui_printf (NULL, _("Server %s%s%s has been deleted\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_SERVER),
+                        server_found->name,
+                        GUI_COLOR(COLOR_WIN_CHAT));
+            
             gui_redraw_buffer (gui_current_window->buffer);
             
             return 0;
@@ -2051,10 +2102,10 @@ weechat_cmd_server (int argc, char **argv)
         if (new_server)
         {
             irc_display_prefix (NULL, NULL, PREFIX_INFO);
-            gui_printf_color (NULL, COLOR_WIN_CHAT, _("Server"));
-            gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
-                              " %s ", server.name);
-            gui_printf_color (NULL, COLOR_WIN_CHAT, _("created\n"));
+            gui_printf (NULL, _("Server %s%s%s created\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_SERVER),
+                        server.name,
+                        GUI_COLOR(COLOR_WIN_CHAT));
         }
         else
         {
@@ -2086,11 +2137,11 @@ weechat_cmd_set_display_option (t_config_option *option, char *prefix, void *val
 {
     char *color_name, *pos_nickserv, *pos_pwd, *value2;
     
-    gui_printf (NULL, "  %s%s%s",
+    gui_printf (NULL, "  %s%s%s%s = ",
                 (prefix) ? prefix : "",
                 (prefix) ? "." : "",
-                option->option_name);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " = ");
+                option->option_name,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK));
     if (!value)
     {
         if (option->option_type == OPTION_TYPE_STRING)
@@ -2101,21 +2152,25 @@ weechat_cmd_set_display_option (t_config_option *option, char *prefix, void *val
     switch (option->option_type)
     {
         case OPTION_TYPE_BOOLEAN:
-            gui_printf_color (NULL, COLOR_WIN_CHAT_HOST,
-                              "%s\n", (*((int *)value)) ? "ON" : "OFF");
+            gui_printf (NULL, "%s%s\n",
+                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                        (*((int *)value)) ? "ON" : "OFF");
             break;
         case OPTION_TYPE_INT:
-            gui_printf_color (NULL, COLOR_WIN_CHAT_HOST,
-                              "%d\n", *((int *)value));
+            gui_printf (NULL, "%s%d\n",
+                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                        *((int *)value));
             break;
         case OPTION_TYPE_INT_WITH_STRING:
-            gui_printf_color (NULL, COLOR_WIN_CHAT_HOST,
-                              "%s\n", option->array_values[*((int *)value)]);
+            gui_printf (NULL, "%s%s\n",
+                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                        option->array_values[*((int *)value)]);
             break;
         case OPTION_TYPE_COLOR:
-            color_name = gui_get_color_by_value (*((int *)value));
-            gui_printf_color (NULL, COLOR_WIN_CHAT_HOST,
-                              "%s\n", (color_name) ? color_name : _("(unknown)"));
+            color_name = gui_get_color_name (*((int *)value));
+            gui_printf (NULL, "%s%s\n",
+                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                        (color_name) ? color_name : _("(unknown)"));
             break;
         case OPTION_TYPE_STRING:
             if (*((char **)value))
@@ -2138,9 +2193,12 @@ weechat_cmd_set_display_option (t_config_option *option, char *prefix, void *val
                         pos_pwd[0] = '*';
                         pos_pwd++;
                     }
-                    gui_printf (NULL, _("(password hidden) "));
+                    gui_printf (NULL, _("%s(password hidden) "),
+                                GUI_COLOR(COLOR_WIN_CHAT));
                 }
-                gui_printf_color (NULL, COLOR_WIN_CHAT_HOST, "%s", value2);
+                gui_printf (NULL, "%s%s",
+                            GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                            value2);
                 free (value2);
             }
             gui_printf (NULL, "\n");
@@ -2210,12 +2268,14 @@ weechat_cmd_set (char *arguments)
                 switch (config_set_server_value (ptr_server, pos + 1, value))
                 {
                     case 0:
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "\n[");
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s",
-                                          config_sections[CONFIG_SECTION_SERVER].section_name);
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_NICK, " %s",
-                                          ptr_server->name);
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "]\n");
+                        gui_printf (NULL, "\n");
+                        gui_printf (NULL, "%s[%s%s %s%s]\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    config_sections[CONFIG_SECTION_SERVER].section_name,
+                                    GUI_COLOR(COLOR_WIN_CHAT_SERVER),
+                                    ptr_server->name,
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK));
                         for (i = 0; weechat_options[CONFIG_SECTION_SERVER][i].option_name; i++)
                         {
                             if (strcmp (weechat_options[CONFIG_SECTION_SERVER][i].option_name, pos + 1) == 0)
@@ -2262,10 +2322,12 @@ weechat_cmd_set (char *arguments)
                     if (config_option_set_value (ptr_option, value) == 0)
                     {
                         (void) (ptr_option->handler_change());
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "\n[");
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
-                                          "%s", config_get_section (ptr_option));
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "]\n");
+                        gui_printf (NULL, "\n");
+                        gui_printf (NULL, "%s[%s%s%s]\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    config_get_section (ptr_option),
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK));
                         weechat_cmd_set_display_option (ptr_option, NULL, NULL);
                     }
                     else
@@ -2304,11 +2366,12 @@ weechat_cmd_set (char *arguments)
                     {
                         if (!section_displayed)
                         {
-                            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "\n[");
-                            gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
-                                              "%s",
-                                              config_sections[i].section_name);
-                            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "]\n");
+                            gui_printf (NULL, "\n");
+                            gui_printf (NULL, "%s[%s%s%s]\n",
+                                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                        config_sections[i].section_name,
+                                        GUI_COLOR(COLOR_WIN_CHAT_DARK));
                             section_displayed = 1;
                         }
                         weechat_cmd_set_display_option (&weechat_options[i][j], NULL, NULL);
@@ -2334,12 +2397,14 @@ weechat_cmd_set (char *arguments)
                 {
                     if (!section_displayed)
                     {
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "\n[");
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s",
-                                          config_sections[CONFIG_SECTION_SERVER].section_name);
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_NICK, " %s",
-                                          ptr_server->name);
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "]\n");
+                        gui_printf (NULL, "\n");
+                        gui_printf (NULL, "%s[%s%s %s%s%s]\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    config_sections[CONFIG_SECTION_SERVER].section_name,
+                                    GUI_COLOR(COLOR_WIN_CHAT_SERVER),
+                                    ptr_server->name,
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK));
                         section_displayed = 1;
                     }
                     ptr_option_value = config_get_server_option_ptr (ptr_server,
@@ -2369,7 +2434,9 @@ weechat_cmd_set (char *arguments)
             if ((number_found == 1) && (last_section >= 0) && (last_option >= 0))
             {
                 gui_printf (NULL, "\n");
-                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, _("Detail:\n"));
+                gui_printf (NULL, _("%sDetail:\n"),
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL));
+                gui_printf (NULL, GUI_COLOR(COLOR_WIN_CHAT_CHANNEL));
                 switch (weechat_options[last_section][last_option].option_type)
                 {
                     case OPTION_TYPE_BOOLEAN:
@@ -2419,7 +2486,11 @@ weechat_cmd_set (char *arguments)
             }
             else
             {
-                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "\n%d ", number_found);
+                gui_printf (NULL, "\n");
+                gui_printf (NULL, "%s%d %s",
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                            number_found,
+                            GUI_COLOR(COLOR_WIN_CHAT));
                 if (option)
                     gui_printf (NULL, _("config option(s) found with \"%s\"\n"),
                                 option);
@@ -2506,7 +2577,10 @@ weechat_cmd_unignore (int argc, char **argv)
     if (ret)
     {
         irc_display_prefix (NULL, NULL, PREFIX_INFO);
-        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%d ", ret);
+        gui_printf (NULL, "%s%d%s ",
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    ret,
+                    GUI_COLOR(COLOR_WIN_CHAT));
         if (ret > 1)
             gui_printf (NULL, _("ignore were removed.\n"));
         else
@@ -2545,17 +2619,19 @@ weechat_cmd_window (int argc, char **argv)
         i = 1;
         for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
         {
-            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "[");
-            gui_printf (NULL, "%d", i);
-            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "] (");
-            gui_printf (NULL, "%d", ptr_win->win_x);
-            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, ":");
-            gui_printf (NULL, "%d", ptr_win->win_y);
-            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, ";");
-            gui_printf (NULL, "%d", ptr_win->win_width);
-            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "x");
-            gui_printf (NULL, "%d", ptr_win->win_height);
-            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, ") ");
+            gui_printf (NULL, "%s[%s%d%s] (%s%d:%d%s;%s%dx%d%s) ",
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        i,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        ptr_win->win_x,
+                        ptr_win->win_y,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        ptr_win->win_width,
+                        ptr_win->win_height,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK));
             
             weechat_cmd_buffer_display_info (ptr_win->buffer);
             
diff --git a/src/common/completion.c b/src/common/completion.c
index 2dc6bc879..30dba84d0 100644
--- a/src/common/completion.c
+++ b/src/common/completion.c
@@ -425,7 +425,7 @@ completion_build_list (t_completion *completion, void *channel)
                             weelist_add (&completion->completion_list,
                                          &completion->last_completion,
                                          (option_value) ?
-                                             gui_get_color_by_value (*((int *)(option_value))) :
+                                             gui_get_color_name (*((int *)(option_value))) :
                                              option->default_string);
                             break;
                         case OPTION_TYPE_STRING:
diff --git a/src/common/log.c b/src/common/log.c
index 06f62f7cd..1c18553ec 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -72,28 +72,6 @@ log_write (t_gui_buffer *buffer, char *message)
     }
 }
 
-/*
- * log_write_line: writes a WeeChat line to log file
- */
-
-void
-log_write_line (t_gui_buffer *buffer, t_gui_line *line)
-{
-    t_gui_message *ptr_msg;
-    
-    if (buffer->log_file)
-    {    
-        log_write_date (buffer);
-        for (ptr_msg = line->messages; ptr_msg; ptr_msg = ptr_msg->next_message)
-        {
-            if (ptr_msg->type != MSG_TYPE_TIME)
-                fprintf (buffer->log_file, "%s", ptr_msg->message);
-        }
-        fprintf (buffer->log_file, "\n");
-        fflush (buffer->log_file);
-    }
-}
-
 /*
  * log_start: starts a log
  */
diff --git a/src/common/weechat.c b/src/common/weechat.c
index 58a2e348e..245776975 100644
--- a/src/common/weechat.c
+++ b/src/common/weechat.c
@@ -169,6 +169,7 @@ void
 wee_log_printf (char *message, ...)
 {
     static char buffer[4096];
+    char *ptr_buffer;
     va_list argptr;
     static time_t seconds;
     struct tm *date_tmp;
@@ -180,6 +181,17 @@ wee_log_printf (char *message, ...)
     vsnprintf (buffer, sizeof (buffer) - 1, message, argptr);
     va_end (argptr);
     
+    /* keep only valid chars */
+    ptr_buffer = buffer;
+    while (ptr_buffer[0])
+    {
+        if ((ptr_buffer[0] != '\n')
+            && (ptr_buffer[0] != '\r')
+            && ((unsigned char)(ptr_buffer[0]) < 32))
+            ptr_buffer[0] = '.';
+        ptr_buffer++;
+    }
+    
     seconds = time (NULL);
     date_tmp = localtime (&seconds);
     if (date_tmp)
@@ -667,35 +679,42 @@ weechat_welcome_message ()
 {
     if (cfg_look_startup_logo)
     {
-        gui_printf_color (NULL, COLOR_WIN_CHAT_PREFIX1,
-            "   ___       __         ______________        _____ \n"
-            "   __ |     / /___________  ____/__  /_______ __  /_\n"
-            "   __ | /| / /_  _ \\  _ \\  /    __  __ \\  __ `/  __/\n"
-            "   __ |/ |/ / /  __/  __/ /___  _  / / / /_/ // /_  \n"
-            "   ____/|__/  \\___/\\___/\\____/  /_/ /_/\\__,_/ \\__/  \n");
+        gui_printf (NULL,
+                    "%s   ___       __         ______________        _____ \n"
+                    "%s   __ |     / /___________  ____/__  /_______ __  /_\n"
+                    "%s   __ | /| / /_  _ \\  _ \\  /    __  __ \\  __ `/  __/\n"
+                    "%s   __ |/ |/ / /  __/  __/ /___  _  / / / /_/ // /_  \n"
+                    "%s   ____/|__/  \\___/\\___/\\____/  /_/ /_/\\__,_/ \\__/  \n",
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK));
     }
     if (cfg_look_weechat_slogan && cfg_look_weechat_slogan[0])
     {
-        gui_printf_color (NULL, COLOR_WIN_CHAT, _("%sWelcome to "),
-                          (cfg_look_startup_logo) ? "      " : "");
-        gui_printf_color (NULL, COLOR_WIN_CHAT_PREFIX2, PACKAGE_NAME);
-        gui_printf_color (NULL, COLOR_WIN_CHAT,
-                          ", %s\n", cfg_look_weechat_slogan);
+        gui_printf (NULL, _("%sWelcome to %s%s%s, %s\n"),
+                    (cfg_look_startup_logo) ? "      " : "",
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    PACKAGE_NAME,
+                    GUI_NO_COLOR,
+                    cfg_look_weechat_slogan);
     }
     if (cfg_look_startup_version)
     {
-        gui_printf_color (NULL, COLOR_WIN_CHAT_PREFIX2,
-                          "%s" PACKAGE_STRING,
-                          (cfg_look_startup_logo) ? "    " : "");
-        gui_printf_color (NULL, COLOR_WIN_CHAT,
-                          ", %s %s %s\n",
-                          _("compiled on"), __DATE__, __TIME__);
+        gui_printf (NULL, "%s%s%s%s, %s %s %s\n",
+                    (cfg_look_startup_logo) ? "    " : "",
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    PACKAGE_STRING,
+                    GUI_NO_COLOR,
+                    _("compiled on"), __DATE__, __TIME__);
     }
     if (cfg_look_startup_logo ||
         (cfg_look_weechat_slogan && cfg_look_weechat_slogan[0]) ||
         cfg_look_startup_version)
-        gui_printf_color (NULL, COLOR_WIN_CHAT_PREFIX1,
-            "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n");
+        gui_printf (NULL,
+                    "%s-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n",
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK));
     
     wee_log_printf ("%s (%s %s %s)\n",
                     PACKAGE_STRING, _("compiled on"), __DATE__, __TIME__);
diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c
index eaacbc5e8..89c2a0935 100644
--- a/src/common/weeconfig.c
+++ b/src/common/weeconfig.c
@@ -77,7 +77,6 @@ char *cfg_look_buffer_timestamp;
 int cfg_look_color_nicks;
 int cfg_look_color_nicks_number;
 int cfg_look_color_actions;
-int cfg_look_remove_colors_from_msgs;
 int cfg_look_nicklist;
 int cfg_look_nicklist_position;
 char *cfg_look_nicklist_position_values[] =
@@ -154,10 +153,6 @@ t_config_option weechat_options_look[] =
     N_("display actions with different colors"),
     OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
     NULL, NULL, &cfg_look_color_actions, NULL, config_change_noop },
-  { "look_remove_colors_from_msgs", N_("remove colors from incoming messages"),
-    N_("remove colors from incoming messages"),
-    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
-    NULL, NULL, &cfg_look_remove_colors_from_msgs, NULL, config_change_noop },
   { "look_nicklist", N_("display nicklist window"),
     N_("display nicklist window (for channel windows)"),
     OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
@@ -435,7 +430,7 @@ t_config_option weechat_options_colors[] =
   { "col_input_delimiters", N_("color for input text (delimiters)"),
     N_("color for input text (delimiters)"),
     OPTION_TYPE_COLOR, 0, 0, 0,
-    "white", NULL, &cfg_col_input_delimiters, NULL, &config_change_color },
+    "cyan", NULL, &cfg_col_input_delimiters, NULL, &config_change_color },
   { "col_input_bg", N_("background for input window"),
     N_("background for input window"),
     OPTION_TYPE_COLOR, 0, 0, 0,
@@ -637,6 +632,8 @@ int cfg_irc_lag_min_show;
 int cfg_irc_lag_disconnect;
 int cfg_irc_fifo_pipe;
 char *cfg_irc_highlight;
+int cfg_irc_colors_receive;
+int cfg_irc_colors_send;
 
 t_config_option weechat_options_irc[] =
 { { "irc_display_away", N_("display message to all channels when away"),
@@ -684,6 +681,15 @@ t_config_option weechat_options_irc[] =
        "words may begin or end with \"*\" for partial match)"),
     OPTION_TYPE_STRING, 0, 0, 0,
     "", NULL, NULL, &cfg_irc_highlight, &config_change_noop },
+  { "irc_colors_receive", N_("keep colors from incoming messages"),
+    N_("keep colors from incoming messages"),
+    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
+    NULL, NULL, &cfg_irc_colors_receive, NULL, config_change_noop },
+  { "irc_colors_send", N_("allow user to send colors"),
+    N_("allow user to send colors with special codes (%B=bold, %Cxx,yy=color, "
+       "%U=underline, %R=reverse)"),
+    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
+    NULL, NULL, &cfg_irc_colors_send, NULL, config_change_noop },
   { NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
 };
 
@@ -1043,7 +1049,7 @@ config_change_color ()
 {
     t_gui_window *ptr_win;
     
-    gui_init_colors ();
+    gui_rebuild_weechat_colors ();
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
         gui_redraw_buffer (ptr_win->buffer);
 }
@@ -2072,7 +2078,7 @@ config_write (char *config_name)
                         fprintf (file, "%s=%s\n",
                                  weechat_options[i][j].option_name,
                                  (weechat_options[i][j].ptr_int) ?
-                                 gui_get_color_by_value (*weechat_options[i][j].ptr_int) :
+                                 gui_get_color_name (*weechat_options[i][j].ptr_int) :
                                  weechat_options[i][j].default_string);
                         break;
                     case OPTION_TYPE_STRING:
diff --git a/src/common/weeconfig.h b/src/common/weeconfig.h
index f383a6011..929bfbe8e 100644
--- a/src/common/weeconfig.h
+++ b/src/common/weeconfig.h
@@ -92,7 +92,6 @@ extern char *cfg_look_buffer_timestamp;
 extern int cfg_look_color_nicks;
 extern int cfg_look_color_nicks_number;
 extern int cfg_look_color_actions;
-extern int cfg_look_remove_colors_from_msgs;
 extern int cfg_look_nicklist;
 extern int cfg_look_nicklist_position;
 extern int cfg_look_nicklist_min_size;
@@ -189,6 +188,8 @@ extern int cfg_irc_lag_min_show;
 extern int cfg_irc_lag_disconnect;
 extern int cfg_irc_fifo_pipe;
 extern char *cfg_irc_highlight;
+extern int cfg_irc_colors_receive;
+extern int cfg_irc_colors_send;
 
 extern int cfg_dcc_auto_accept_files;
 extern int cfg_dcc_auto_accept_chats;
diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c
index 8c2897a90..bc9708367 100644
--- a/src/gui/curses/gui-display.c
+++ b/src/gui/curses/gui-display.c
@@ -47,30 +47,49 @@
 #include "../../irc/irc.h"
 
 
-t_gui_color gui_colors[] =
-{ { "default",      -1 | A_NORMAL },
-  { "black",        COLOR_BLACK | A_NORMAL },
-  { "red",          COLOR_RED | A_NORMAL },
-  { "lightred",     COLOR_RED | A_BOLD },
-  { "green",        COLOR_GREEN | A_NORMAL },
-  { "lightgreen",   COLOR_GREEN | A_BOLD },
-  { "brown",        COLOR_YELLOW | A_NORMAL },
-  { "yellow",       COLOR_YELLOW | A_BOLD },
-  { "blue",         COLOR_BLUE | A_NORMAL },
-  { "lightblue",    COLOR_BLUE | A_BOLD },
-  { "magenta",      COLOR_MAGENTA | A_NORMAL },
-  { "lightmagenta", COLOR_MAGENTA | A_BOLD },
-  { "cyan",         COLOR_CYAN | A_NORMAL },
-  { "lightcyan",    COLOR_CYAN | A_BOLD },
-  { "white",        COLOR_WHITE | A_BOLD },
-  { NULL, 0 }
+t_gui_color gui_weechat_colors[] =
+{ { -1,                    0, 0,        "default"      },
+  { WEECHAT_COLOR_BLACK,   0, 0,        "black"        },
+  { WEECHAT_COLOR_RED,     0, 0,        "red"          },
+  { WEECHAT_COLOR_RED,     0, A_BOLD,   "lightred"     },
+  { WEECHAT_COLOR_GREEN,   0, 0,        "green"        },
+  { WEECHAT_COLOR_GREEN,   0, A_BOLD,   "lightgreen"   },
+  { WEECHAT_COLOR_YELLOW,  0, 0,        "brown"        },
+  { WEECHAT_COLOR_YELLOW,  0, A_BOLD,   "yellow"       },
+  { WEECHAT_COLOR_BLUE,    0, 0,        "blue"         },
+  { WEECHAT_COLOR_BLUE,    0, A_BOLD,   "lightblue"    },
+  { WEECHAT_COLOR_MAGENTA, 0, 0,        "magenta"      },
+  { WEECHAT_COLOR_MAGENTA, 0, A_BOLD,   "lightmagenta" },
+  { WEECHAT_COLOR_CYAN,    0, 0,        "cyan"         },
+  { WEECHAT_COLOR_CYAN,    0, A_BOLD,   "lightcyan"    },
+  { WEECHAT_COLOR_WHITE,   0, A_BOLD,   "white"        },
+  { 0,                     0, 0,        NULL           }
 };
 
-int color_attr[NUM_COLORS];
+int gui_irc_colors[16][2] =
+{ { /*  0 */ WEECHAT_COLOR_WHITE,   A_BOLD },
+  { /*  1 */ WEECHAT_COLOR_BLACK,   0      },
+  { /*  2 */ WEECHAT_COLOR_BLUE,    0      },
+  { /*  3 */ WEECHAT_COLOR_GREEN,   0      },
+  { /*  4 */ WEECHAT_COLOR_RED,     A_BOLD },
+  { /*  5 */ WEECHAT_COLOR_RED,     0      },
+  { /*  6 */ WEECHAT_COLOR_MAGENTA, 0      },
+  { /*  7 */ WEECHAT_COLOR_YELLOW,  0      },
+  { /*  8 */ WEECHAT_COLOR_YELLOW,  A_BOLD },
+  { /*  9 */ WEECHAT_COLOR_GREEN,   A_BOLD },
+  { /* 10 */ WEECHAT_COLOR_CYAN,    0      },
+  { /* 11 */ WEECHAT_COLOR_CYAN,    A_BOLD },
+  { /* 12 */ WEECHAT_COLOR_BLUE,    A_BOLD },
+  { /* 13 */ WEECHAT_COLOR_MAGENTA, A_BOLD },
+  { /* 14 */ WEECHAT_COLOR_WHITE,   0      },
+  { /* 15 */ WEECHAT_COLOR_WHITE,   A_BOLD }
+};
+
+t_gui_color *gui_color[NUM_COLORS];
 
 
 /*
- * gui_assign_color: assign a color (read from config)
+ * gui_assign_color: assign a WeeChat color (read from config)
  */
 
 int
@@ -80,11 +99,11 @@ gui_assign_color (int *color, char *color_name)
     
     /* look for curses colors in table */
     i = 0;
-    while (gui_colors[i].name)
+    while (gui_weechat_colors[i].string)
     {
-        if (ascii_strcasecmp (gui_colors[i].name, color_name) == 0)
+        if (ascii_strcasecmp (gui_weechat_colors[i].string, color_name) == 0)
         {
-            *color = gui_colors[i].color;
+            *color = i;
             return 1;
         }
         i++;
@@ -95,79 +114,434 @@ gui_assign_color (int *color, char *color_name)
 }
 
 /*
- * gui_get_color_by_name: get color by name
- */
-
-int
-gui_get_color_by_name (char *color_name)
-{
-    int i;
-    
-    /* look for curses colors in table */
-    i = 0;
-    while (gui_colors[i].name)
-    {
-        if (ascii_strcasecmp (gui_colors[i].name, color_name) == 0)
-            return gui_colors[i].color;
-        i++;
-    }
-    
-    /* color not found */
-    return -1;
-}
-
-/*
- * gui_get_color_by_value: get color name by value
+ * gui_get_color_name: get color name
  */
 
 char *
-gui_get_color_by_value (int color_value)
+gui_get_color_name (int num_color)
 {
-    int i;
-    
-    /* look for curses colors in table */
-    i = 0;
-    while (gui_colors[i].name)
-    {
-        if (gui_colors[i].color == color_value)
-            return gui_colors[i].name;
-        i++;
-    }
-    
-    /* color not found */
-    return NULL;
+    return gui_weechat_colors[num_color].string;
 }
 
 /*
- * gui_window_set_color: set color for window
+ * gui_color_decode: parses a message (coming from IRC server),
+ *                   and according:
+ *                     - remove any color/style in message
+ *                   or:
+ *                     - change colors by codes to be compatible with
+ *                       other IRC clients 
+ *                   After use, string returned has to be free()
+ */
+
+unsigned char *
+gui_color_decode (unsigned char *string, int keep_colors)
+{
+    unsigned char *out;
+    int out_length, out_pos;
+    char str_fg[3], str_bg[3];
+    int fg, bg, attr;
+    
+    out_length = (strlen ((char *)string) * 2) + 1;
+    out = (unsigned char *)malloc (out_length);
+    if (!out)
+        return NULL;
+    
+    out_pos = 0;
+    while (string[0] && (out_pos < out_length - 1))
+    {
+        switch (string[0])
+        {
+            case GUI_ATTR_BOLD_CHAR:
+            case GUI_ATTR_RESET_CHAR:
+            case GUI_ATTR_FIXED_CHAR:
+            case GUI_ATTR_REVERSE_CHAR:
+            case GUI_ATTR_REVERSE2_CHAR:
+            case GUI_ATTR_ITALIC_CHAR:
+            case GUI_ATTR_UNDERLINE_CHAR:
+                if (keep_colors)
+                    out[out_pos++] = string[0];
+                string++;
+                break;
+            case GUI_ATTR_COLOR_CHAR:
+                string++;
+                str_fg[0] = '\0';
+                str_bg[0] = '\0';
+                if (isdigit (string[0]))
+                {
+                    str_fg[0] = string[0];
+                    str_fg[1] = '\0';
+                    string++;
+                    if (isdigit (string[0]))
+                    {
+                        str_fg[1] = string[0];
+                        str_fg[2] = '\0';
+                        string++;
+                    }
+                }
+                if (string[0] == ',')
+                {
+                    string++;
+                    if (isdigit (string[0]))
+                    {
+                        str_bg[0] = string[0];
+                        str_bg[1] = '\0';
+                        string++;
+                        if (isdigit (string[0]))
+                        {
+                            str_bg[1] = string[0];
+                            str_bg[2] = '\0';
+                            string++;
+                        }
+                    }
+                }
+                if (keep_colors)
+                {
+                    if (!str_fg[0] && !str_bg[0])
+                        out[out_pos++] = GUI_ATTR_COLOR_CHAR;
+                    else
+                    {
+                        attr = 0;
+                        if (str_fg[0])
+                        {
+                            sscanf (str_fg, "%d", &fg);
+                            fg %= 16;
+                            attr |= gui_irc_colors[fg][1];
+                        }
+                        if (str_bg[0])
+                        {
+                            sscanf (str_bg, "%d", &bg);
+                            bg %= 16;
+                            attr |= gui_irc_colors[bg][1];
+                        }
+                        if (attr & A_BOLD)
+                        {
+                            out[out_pos++] = GUI_ATTR_WEECHAT_SET_CHAR;
+                            out[out_pos++] = GUI_ATTR_BOLD_CHAR;
+                        }
+                        else
+                        {
+                            out[out_pos++] = GUI_ATTR_WEECHAT_REMOVE_CHAR;
+                            out[out_pos++] = GUI_ATTR_BOLD_CHAR;
+                        }
+                        out[out_pos++] = GUI_ATTR_COLOR_CHAR;
+                        if (str_fg[0])
+                        {
+                            out[out_pos++] = (gui_irc_colors[fg][0] / 10) + '0';
+                            out[out_pos++] = (gui_irc_colors[fg][0] % 10) + '0';
+                        }
+                        if (str_bg[0])
+                        {
+                            out[out_pos++] = ',';
+                            out[out_pos++] = (gui_irc_colors[bg][0] / 10) + '0';
+                            out[out_pos++] = (gui_irc_colors[bg][0] % 10) + '0';
+                        }
+                    }
+                }
+                break;
+            case GUI_ATTR_WEECHAT_SET_CHAR:
+            case GUI_ATTR_WEECHAT_REMOVE_CHAR:
+                string++;
+                if (string[0])
+                {
+                    if (keep_colors)
+                    {
+                        out[out_pos++] = *(string - 1);
+                        out[out_pos++] = string[0];
+                    }
+                    string++;
+                }
+                break;
+            default:
+                out[out_pos++] = string[0];
+                string++;
+        }
+    }
+    out[out_pos] = '\0';
+    return out;
+}
+
+/*
+ * gui_color_encode: parses a message (entered by user), and
+ *                   encode special chars (%B, %C, ..) in IRC colors
+ *                   After use, string returned has to be free()
+ */
+
+unsigned char *
+gui_color_encode (unsigned char *string)
+{
+    unsigned char *out;
+    int out_length, out_pos;
+    
+    out_length = strlen ((char *)string) + 1;
+    out = (unsigned char *)malloc (out_length);
+    if (!out)
+        return NULL;
+    
+    out_pos = 0;
+    while (string[0] && (out_pos < out_length - 1))
+    {
+        switch (string[0])
+        {
+            case '%':
+                string++;
+                switch (string[0])
+                {
+                    case 'B': /* bold */
+                        out[out_pos++] = GUI_ATTR_BOLD_CHAR;
+                        string++;
+                        break;
+                    case 'C': /* color */
+                        out[out_pos++] = GUI_ATTR_COLOR_CHAR;
+                        string++;
+                        if (isdigit (string[0]))
+                        {
+                            out[out_pos++] = string[0];
+                            string++;
+                            if (isdigit (string[0]))
+                            {
+                                out[out_pos++] = string[0];
+                                string++;
+                            }
+                        }
+                        if (string[0] == ',')
+                        {
+                            out[out_pos++] = ',';
+                            string++;
+                            if (isdigit (string[0]))
+                            {
+                                out[out_pos++] = string[0];
+                                string++;
+                                if (isdigit (string[0]))
+                                {
+                                out[out_pos++] = string[0];
+                                string++;
+                                }
+                            }
+                        }
+                        break;
+                    case 'R': /* reverse */
+                        out[out_pos++] = GUI_ATTR_REVERSE_CHAR;
+                        string++;
+                        break;
+                    case 'U': /* underline */
+                        out[out_pos++] = GUI_ATTR_UNDERLINE_CHAR;
+                        string++;
+                        break;
+                    default:
+                        out[out_pos++] = '%';
+                        out[out_pos++] = string[0];
+                        string++;
+                }
+                break;
+            default:
+                out[out_pos++] = string[0];
+                string++;
+        }
+    }
+    out[out_pos] = '\0';
+    return out;
+}
+
+/*
+ * gui_color_build: build a WeeChat color with foreground,
+ *                  background and attributes (attributes are
+ *                  given with foreground color, with a OR)
+ */
+
+t_gui_color *
+gui_color_build (int number, int foreground, int background)
+{
+    t_gui_color *new_color;
+    
+    new_color = (t_gui_color *)malloc (sizeof (t_gui_color));
+    if (!new_color)
+        return NULL;
+    
+    new_color->foreground = gui_weechat_colors[foreground].foreground;
+    new_color->background = gui_weechat_colors[background].foreground;
+    new_color->attributes = gui_weechat_colors[foreground].attributes;
+    new_color->string = (char *)malloc (4);
+    if (new_color->string)
+        snprintf (new_color->string, 4,
+                  "%s%02d",
+                  GUI_ATTR_WEECHAT_COLOR_STR, number);
+    
+    return new_color;
+}
+
+/*
+ * gui_color_get_pair: get color pair with a WeeChat color number
+ */
+
+int
+gui_color_get_pair (int num_color)
+{
+    int fg, bg;
+    
+    fg = gui_color[num_color]->foreground;
+    bg = gui_color[num_color]->background;
+    
+    if (((fg == -1) || (fg == 99))
+        && ((bg == -1) || (bg == 99)))
+        return 63;
+    if ((fg == -1) || (fg == 99))
+        fg = WEECHAT_COLOR_WHITE;
+    if ((bg == -1) || (bg == 99))
+        bg = 0;
+    
+    return (bg * 8) + fg;
+}
+
+/*
+ * gui_window_set_weechat_color: set WeeChat color for window
  */
 
 void
-gui_window_set_color (WINDOW *window, int num_color)
+gui_window_set_weechat_color (WINDOW *window, int num_color)
 {
     if (has_colors ())
     {
-        if (color_attr[num_color - 1] & A_BOLD)
-            wattron (window, COLOR_PAIR (num_color) | A_BOLD);
+        wattroff (window, A_BOLD | A_UNDERLINE | A_REVERSE);
+        wattron (window, COLOR_PAIR(gui_color_get_pair (num_color)) |
+                 gui_color[num_color]->attributes);
+    }
+}
+
+/*
+ * gui_window_chat_set_style: set style (bold, underline, ..)
+ *                            for a chat window
+ */
+
+void
+gui_window_chat_set_style (t_gui_window *window, int style)
+{
+    if (has_colors ())
+    {
+        wattron (window->win_chat, style);
+    }
+}
+
+/*
+ * gui_window_chat_remove_style: remove style (bold, underline, ..)
+ *                               for a chat window
+ */
+
+void
+gui_window_chat_remove_style (t_gui_window *window, int style)
+{
+    if (has_colors ())
+    {
+        wattroff (window->win_chat, style);
+    }
+}
+
+/*
+ * gui_window_chat_toggle_style: toggle a style (bold, underline, ..)
+ *                               for a chat window
+ */
+
+void
+gui_window_chat_toggle_style (t_gui_window *window, int style)
+{
+    window->current_style_attr ^= style;
+    if (window->current_style_attr & style)
+        gui_window_chat_set_style (window, style);
+    else
+        gui_window_chat_remove_style (window, style);
+}
+
+/*
+ * gui_window_chat_reset_style: reset style (color and attr)
+ *                              for a chat window
+ */
+
+void
+gui_window_chat_reset_style (t_gui_window *window)
+{
+    window->current_style_fg = -1;
+    window->current_style_bg = -1;
+    window->current_style_attr = 0;
+    window->current_color_attr = 0;
+    
+    gui_window_set_weechat_color (window->win_chat, COLOR_WIN_CHAT);
+    gui_window_chat_remove_style (window,
+                                  A_BOLD | A_UNDERLINE | A_REVERSE);
+}
+
+/*
+ * gui_window_chat_set_color_style: set style for color
+ */
+
+void
+gui_window_chat_set_color_style (t_gui_window *window, int style)
+{
+    window->current_color_attr |= style;
+    wattron (window->win_chat, style);
+}
+
+/*
+ * gui_window_chat_remove_color_style: remove style for color
+ */
+
+void
+gui_window_chat_remove_color_style (t_gui_window *window, int style)
+{
+    window->current_color_attr &= !style;
+    wattroff (window->win_chat, style);
+}
+
+/*
+ * gui_window_chat_reset_color_style: reset style for color
+ */
+
+void
+gui_window_chat_reset_color_style (t_gui_window *window)
+{
+    wattroff (window->win_chat, window->current_color_attr);
+    window->current_color_attr = 0;
+}
+
+/*
+ * gui_window_chat_set_color: set color for a chat window
+ */
+
+void
+gui_window_chat_set_color (t_gui_window *window, int fg, int bg)
+{
+    if (has_colors ())
+    {
+        if (((fg == -1) || (fg == 99))
+            && ((bg == -1) || (bg == 99)))
+            wattron (window->win_chat, COLOR_PAIR(63));
         else
         {
-            wattroff (window, A_BOLD);
-            wattron (window, COLOR_PAIR (num_color));
+            if ((fg == -1) || (fg == 99))
+                fg = WEECHAT_COLOR_WHITE;
+            if ((bg == -1) || (bg == 99))
+                bg = 0;
+            wattron (window->win_chat, COLOR_PAIR((bg * 8) + fg));
         }
     }
 }
 
 /*
- * gui_buffer_has_nicklist: returns 1 if buffer has nicklist
+ * gui_window_chat_set_weechat_color: set a WeeChat color for a chat window
  */
 
-int
-gui_buffer_has_nicklist (t_gui_buffer *buffer)
+void
+gui_window_chat_set_weechat_color (t_gui_window *window, int weechat_color)
 {
-    return (((CHANNEL(buffer)) && (CHANNEL(buffer)->type == CHAT_CHANNEL)) ? 1 : 0);
+    if (has_colors ())
+    {
+        gui_window_chat_reset_style (window);
+        gui_window_chat_set_style (window,
+                                   gui_color[weechat_color]->attributes);
+        gui_window_chat_set_color (window,
+                                   gui_color[weechat_color]->foreground,
+                                   gui_color[weechat_color]->background);
+    }
 }
 
-
 /*
  * gui_calculate_pos_size: calculate position and size for a buffer & subwindows
  */
@@ -300,11 +674,12 @@ gui_calculate_pos_size (t_gui_window *window)
  */
 
 void
-gui_curses_window_clear (WINDOW *window)
+gui_curses_window_clear (WINDOW *window, int num_color)
 {
     if (!gui_ok)
         return;
     
+    wbkgdset(window, ' ' | COLOR_PAIR (gui_color_get_pair (num_color)));
     werase (window);
     wmove (window, 0, 0);
 }
@@ -325,7 +700,7 @@ gui_draw_window_separator (t_gui_window *window)
                                         1,
                                         window->win_y,
                                         window->win_x - 1);
-        gui_window_set_color (window->win_separator, COLOR_WIN_TITLE);
+        gui_window_set_weechat_color (window->win_separator, COLOR_WIN_TITLE);
         wborder (window->win_separator, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ');
         wnoutrefresh (window->win_separator);
         refresh ();
@@ -350,9 +725,9 @@ gui_draw_buffer_title (t_gui_buffer *buffer, int erase)
         if (ptr_win->buffer == buffer)
         {
             if (erase)
-              gui_curses_window_clear (ptr_win->win_title);
+                gui_curses_window_clear (ptr_win->win_title, COLOR_WIN_TITLE);
             
-            gui_window_set_color (ptr_win->win_title, COLOR_WIN_TITLE);
+            gui_window_set_weechat_color (ptr_win->win_title, COLOR_WIN_TITLE);
             snprintf (format, 32, "%%-%ds", ptr_win->win_width);
             if (CHANNEL(buffer))
             {
@@ -395,15 +770,14 @@ void
 gui_display_new_line (t_gui_window *window, int num_lines, int count,
                       int *lines_displayed, int simulate)
 {
-    char format_empty[32];
-    
     if ((count == 0) || (*lines_displayed >= num_lines - count))
     {
         if ((!simulate) && (window->win_chat_cursor_x <= window->win_chat_width - 1))
         {
-            snprintf (format_empty, 32, "%%-%ds",
-                      window->win_chat_width - window->win_chat_cursor_x);
-            wprintw (window->win_chat, format_empty, " ");
+            wmove (window->win_chat,
+                   window->win_chat_cursor_y,
+                   window->win_chat_cursor_x);
+            wclrtoeol (window->win_chat);
         }
         window->win_chat_cursor_y++;
     }
@@ -412,20 +786,203 @@ gui_display_new_line (t_gui_window *window, int num_lines, int count,
 }
 
 /*
- * gui_message_get_next_char: returns next char of message at offset
+ * gui_word_get_next_char: returns next char of a word
+ *                         special chars like colors, bold, .. are skipped
+ */
+
+char *
+gui_word_get_next_char (t_gui_window *window, unsigned char *string, int apply_style)
+{
+    char str_fg[3], str_bg[3];
+    int fg, bg, weechat_color;
+    
+    while (string[0])
+    {
+        switch (string[0])
+        {
+            case GUI_ATTR_BOLD_CHAR:
+                string++;
+                if (apply_style)
+                    gui_window_chat_toggle_style (window, A_BOLD);
+                break;
+            case GUI_ATTR_COLOR_CHAR:
+                string++;
+                str_fg[0] = '\0';
+                str_bg[0] = '\0';
+                fg = 99;
+                bg = 99;
+                if (isdigit (string[0]))
+                {
+                    str_fg[0] = string[0];
+                    str_fg[1] = '\0';
+                    string++;
+                    if (isdigit (string[0]))
+                    {
+                        str_fg[1] = string[0];
+                        str_fg[2] = '\0';
+                        string++;
+                    }
+                }
+                if (string[0] == ',')
+                {
+                    string++;
+                    if (isdigit (string[0]))
+                    {
+                        str_bg[0] = string[0];
+                        str_bg[1] = '\0';
+                        string++;
+                        if (isdigit (string[0]))
+                        {
+                            str_bg[1] = string[0];
+                            str_bg[2] = '\0';
+                            string++;
+                        }
+                    }
+                }
+                if (apply_style)
+                {
+                    if (str_fg[0] || str_bg[0])
+                    {
+                        if (str_fg[0])
+                            sscanf (str_fg, "%d", &fg);
+                        else
+                            fg = window->current_style_fg;
+                        if (str_bg[0])
+                            sscanf (str_bg, "%d", &bg);
+                        else
+                            bg = window->current_style_bg;
+                    }
+                    if (!str_fg[0] && !str_bg[0])
+                        gui_window_chat_reset_color_style (window);
+                    window->current_style_fg = fg;
+                    window->current_style_bg = bg;
+                    gui_window_chat_set_color (window, fg, bg);
+                }
+                break;
+            case GUI_ATTR_RESET_CHAR:
+                string++;
+                if (apply_style)
+                    gui_window_chat_reset_style (window);
+                break;
+            case GUI_ATTR_FIXED_CHAR:
+                string++;
+                break;
+            case GUI_ATTR_REVERSE_CHAR:
+            case GUI_ATTR_REVERSE2_CHAR:
+                string++;
+                if (apply_style)
+                    gui_window_chat_toggle_style (window, A_REVERSE);
+                break;
+            case GUI_ATTR_WEECHAT_COLOR_CHAR:
+                string++;
+                if (isdigit (string[0]) && isdigit (string[1]))
+                {
+                    str_fg[0] = string[0];
+                    str_fg[1] = string[1];
+                    str_fg[2] = '\0';
+                    string += 2;
+                    if (apply_style)
+                    {
+                        sscanf (str_fg, "%d", &weechat_color);
+                        gui_window_chat_set_weechat_color (window, weechat_color);
+                    }
+                }
+                break;
+            case GUI_ATTR_WEECHAT_SET_CHAR:
+                string++;
+                switch (string[0])
+                {
+                    case GUI_ATTR_BOLD_CHAR:
+                        string++;
+                        if (apply_style)
+                            gui_window_chat_set_color_style (window, A_BOLD);
+                        break;
+                    case GUI_ATTR_REVERSE_CHAR:
+                    case GUI_ATTR_REVERSE2_CHAR:
+                        string++;
+                        if (apply_style)
+                            gui_window_chat_set_color_style (window, A_REVERSE);
+                        break;
+                    case GUI_ATTR_UNDERLINE_CHAR:
+                        string++;
+                        if (apply_style)
+                            gui_window_chat_set_color_style (window, A_UNDERLINE);
+                        break;
+                }
+                break;
+            case GUI_ATTR_WEECHAT_REMOVE_CHAR:
+                string++;
+                switch (string[0])
+                {
+                    case GUI_ATTR_BOLD_CHAR:
+                        string++;
+                        if (apply_style)
+                            gui_window_chat_remove_color_style (window, A_BOLD);
+                        break;
+                    case GUI_ATTR_REVERSE_CHAR:
+                    case GUI_ATTR_REVERSE2_CHAR:
+                        string++;
+                        if (apply_style)
+                            gui_window_chat_remove_color_style (window, A_REVERSE);
+                        break;
+                    case GUI_ATTR_UNDERLINE_CHAR:
+                        string++;
+                        if (apply_style)
+                            gui_window_chat_remove_color_style (window, A_UNDERLINE);
+                        break;
+                }
+                break;
+            case GUI_ATTR_ITALIC_CHAR:
+                string++;
+                break;
+            case GUI_ATTR_UNDERLINE_CHAR:
+                string++;
+                if (apply_style)
+                    gui_window_chat_toggle_style (window, A_UNDERLINE);
+                break;
+            default:
+                if (string[0] < 32)
+                    string++;
+                else
+                    return utf8_next_char ((char *)string);
+        }
+            
+    }
+    
+    /* nothing found except color/attrib codes, so return NULL */
+    return NULL;
+}
+
+/*
+ * gui_display_word_raw: display word on chat buffer, letter by letter
+ *                       special chars like color, bold, .. are interpreted
  */
 
 void
-gui_message_get_next_char (t_gui_message **message, int *offset)
+gui_display_word_raw (t_gui_window *window, char *string)
 {
-    if (!(*message))
-        return;
+    char *prev_char, *next_char, saved_char;
     
-    (*offset) += utf8_char_size ((*message)->message + (*offset));
-    if (!((*message)->message[*offset]))
+    wmove (window->win_chat,
+           window->win_chat_cursor_y,
+           window->win_chat_cursor_x);
+    
+    while (string && string[0])
     {
-        *message = (*message)->next_message;
-        *offset = 0;
+        next_char = gui_word_get_next_char (window, (unsigned char *)string, 1);
+        if (!next_char)
+            return;
+        
+        prev_char = utf8_prev_char (string, next_char);
+        if (prev_char)
+        {
+            saved_char = next_char[0];
+            next_char[0] = '\0';
+            wprintw (window->win_chat, "%s", prev_char);
+            next_char[0] = saved_char;
+        }
+        
+        string = next_char;
     }
 }
 
@@ -434,35 +991,34 @@ gui_message_get_next_char (t_gui_message **message, int *offset)
  */
 
 void
-gui_display_word (t_gui_window *window, t_gui_line *line,
-                  t_gui_message *message, int offset,
-                  t_gui_message *end_msg, int end_offset,
+gui_display_word (t_gui_window *window,
+                  t_gui_line *line,
+                  char *data,
+                  char *end_offset,
                   int num_lines, int count, int *lines_displayed, int simulate)
 {
-    char format_align[32];
-    char saved_char_end, saved_char;
-    int pos_saved_char, end_of_word, chars_to_display, num_displayed;
+    char *end_line, saved_char_end, saved_char;
+    int pos_saved_char, chars_to_display, num_displayed;
     
-    if (!message || !end_msg ||
+    if (!data ||
         ((!simulate) && (window->win_chat_cursor_y > window->win_chat_height - 1)))
         return;
     
-    snprintf (format_align, 32, "%%-%ds", line->length_align);
-    
-    saved_char_end = '\0';
-    if (end_msg)
+    end_line = data + strlen (data);
+        
+    if (end_offset[0])
     {
-        saved_char_end = end_msg->message[end_offset + 1];
-        end_msg->message[end_offset + 1] = '\0';
+        saved_char_end = end_offset[1];
+        end_offset[1] = '\0';
+    }
+    else
+    {
+        end_offset = NULL;
+        saved_char_end = '\0';
     }
     
-    end_of_word = 0;
-    while (!end_of_word)
+    while (data && data[0])
     {
-        /* set text color if beginning of message */
-        if (!simulate)
-            gui_window_set_color (window->win_chat, message->color);
-        
         /* insert spaces for align text under time/nick */
         if ((line->length_align > 0) &&
             (window->win_chat_cursor_x == 0) &&
@@ -471,77 +1027,55 @@ gui_display_word (t_gui_window *window, t_gui_line *line,
             (line->length_align < (window->win_chat_width - 5)))
         {
             if (!simulate)
-                mvwprintw (window->win_chat,
-                           window->win_chat_cursor_y, 
-                           window->win_chat_cursor_x,
-                           format_align, " ");
+            {
+                wmove (window->win_chat,
+                       window->win_chat_cursor_y,
+                       window->win_chat_cursor_x);
+                wclrtoeol (window->win_chat);
+            }
             window->win_chat_cursor_x += line->length_align;
         }
         
-        chars_to_display = utf8_strlen (message->message + offset);
+        chars_to_display = gui_word_strlen (window, data);
 
         /* too long for current line */
         if (window->win_chat_cursor_x + chars_to_display > window->win_chat_width)
         {
             num_displayed = window->win_chat_width - window->win_chat_cursor_x;
-            pos_saved_char = utf8_real_pos (message->message + offset, num_displayed);
-            saved_char = message->message[offset + pos_saved_char];
-            message->message[offset + pos_saved_char] = '\0';
+            pos_saved_char = gui_word_real_pos (window, data, num_displayed);
+            saved_char = data[pos_saved_char];
+            data[pos_saved_char] = '\0';
             if ((!simulate) &&
                 ((count == 0) || (*lines_displayed >= num_lines - count)))
-                mvwprintw (window->win_chat,
-                           window->win_chat_cursor_y, 
-                           window->win_chat_cursor_x,
-                           "%s", message->message + offset);
-            message->message[offset + pos_saved_char] = saved_char;
-            offset += pos_saved_char;
+                gui_display_word_raw (window, data);
+            data[pos_saved_char] = saved_char;
+            data += pos_saved_char;
         }
         else
         {
             num_displayed = chars_to_display;
             if ((!simulate) &&
                 ((count == 0) || (*lines_displayed >= num_lines - count)))
-                mvwprintw (window->win_chat,
-                           window->win_chat_cursor_y, 
-                           window->win_chat_cursor_x,
-                           "%s", message->message + offset);
-            if (message == end_msg)
-            {
-                if (end_msg)
-                    end_msg->message[end_offset + 1] = saved_char_end;
-                if (saved_char_end == '\0')
-                {
-                    message = message->next_message;
-                    offset = 0;
-                }
-                else
-                    offset = end_offset + 1;
-            }
-            else
-            {
-                message = message->next_message;
-                offset = 0;
-            }
+                gui_display_word_raw (window, data);
+            data += strlen (data);
         }
         
         window->win_chat_cursor_x += num_displayed;
         
         /* display new line? */
-        if (!message ||
+        if ((data >= end_line) ||
             ((window->win_chat_cursor_y <= window->win_chat_height - 1) &&
             (window->win_chat_cursor_x > (window->win_chat_width - 1))))
             gui_display_new_line (window, num_lines, count,
                                   lines_displayed, simulate);
         
-        /* end of word? */
-        if (!message || (message->prev_message == end_msg) ||
-            ((message == end_msg) && (offset > end_offset)) ||
+        if ((data >= end_line) ||
             (window->win_chat_cursor_y >= window->win_chat_height))
-            end_of_word = 1;
+            data = NULL;
     }
-        
-    if (end_msg)
-        end_msg->message[end_offset + 1] = saved_char_end;
+    
+    if (end_offset)
+        end_offset[1] = saved_char_end;
 }
 
 /*
@@ -549,39 +1083,57 @@ gui_display_word (t_gui_window *window, t_gui_line *line,
  */
 
 void
-gui_get_word_info (t_gui_message *message, int offset,
-                   t_gui_message **word_start_msg, int *word_start_offset,
-                   t_gui_message **word_end_msg, int *word_end_offset,
+gui_get_word_info (t_gui_window *window,
+                   char *data,
+                   int *word_start_offset, int *word_end_offset,
                    int *word_length_with_spaces, int *word_length)
 {
-    *word_start_msg = NULL;
+    char *start_data, *prev_char, *next_char;
+    int leading_spaces, char_size;
+    
     *word_start_offset = 0;
-    *word_end_msg = NULL;
     *word_end_offset = 0;
     *word_length_with_spaces = 0;
     *word_length = 0;
     
-    /* leading spaces */
-    while (message && (message->message[offset] == ' '))
-    {
-        (*word_length_with_spaces)++;
-        gui_message_get_next_char (&message, &offset);
-    }
+    start_data = data;
     
-    /* not only spaces? */
-    if (message)
+    leading_spaces = 1;
+    while (data && data[0])
     {
-        *word_start_msg = message;
-        *word_start_offset = offset;
-        
-        /* find end of word */
-        while (message && (message->message[offset]) && (message->message[offset] != ' '))
+        next_char = gui_word_get_next_char (window, (unsigned char *)data, 0);
+        if (next_char)
         {
-            *word_end_msg = message;
-            *word_end_offset = offset + utf8_char_size (message->message + offset) - 1;
-            (*word_length_with_spaces) += utf8_char_size (message->message + offset);
-            (*word_length) += utf8_char_size (message->message + offset);
-            gui_message_get_next_char (&message, &offset);
+            prev_char = utf8_prev_char (data, next_char);
+            if (prev_char)
+            {
+                if (prev_char[0] != ' ')
+                {
+                    if (leading_spaces)
+                        *word_start_offset = prev_char - start_data;
+                    leading_spaces = 0;
+                    char_size = next_char - prev_char;
+                    *word_end_offset = next_char - start_data - 1;
+                    (*word_length_with_spaces) += char_size;
+                    (*word_length) += char_size;
+                }
+                else
+                {
+                    if (leading_spaces)
+                        (*word_length_with_spaces)++;
+                    else
+                    {
+                        *word_end_offset = prev_char - start_data - 1;
+                        return;
+                    }
+                }
+                data = next_char;
+            }
+        }
+        else
+        {
+            *word_end_offset = data + strlen (data) - start_data - 1;
+            return;
         }
     }
 }
@@ -598,11 +1150,12 @@ gui_get_word_info (t_gui_message *message, int offset,
 int
 gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulate)
 {
-    int num_lines, x, y, offset, lines_displayed;
-    t_gui_message *ptr_message, *word_start_msg, *word_end_msg;
+    int num_lines, x, y, lines_displayed;
     int word_start_offset, word_end_offset;
     int word_length_with_spaces, word_length;
     int skip_spaces;
+    char *ptr_data, *ptr_end_offset, *next_char, *prev_char;
+    char *ptr_style, saved_char;
     
     if (simulate)
     {
@@ -623,17 +1176,22 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
         window->win_chat_cursor_y = y;
     }
     
-    ptr_message = line->messages;
-    offset = 0;
+    /* reset color & style for a new line */
+    gui_window_chat_reset_style (window);
+    
     lines_displayed = 0;
-    while (ptr_message)
+    ptr_data = line->data;
+    while (ptr_data && ptr_data[0])
     {
         skip_spaces = 0;
-        gui_get_word_info (ptr_message, offset,
-                           &word_start_msg, &word_start_offset,
-                           &word_end_msg, &word_end_offset,
+        gui_get_word_info (window,
+                           ptr_data,
+                           &word_start_offset,
+                           &word_end_offset,
                            &word_length_with_spaces, &word_length);
         
+        ptr_end_offset = ptr_data + word_end_offset;
+        
         if (word_length > 0)
         {
             /* spaces + word too long for current line */
@@ -642,8 +1200,20 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
             {
                 gui_display_new_line (window, num_lines, count,
                                       &lines_displayed, simulate);
-                ptr_message = word_start_msg;
-                offset = word_start_offset;
+                /* apply styles before jumping to start of word */
+                if (!simulate && (word_start_offset > 0))
+                {
+                    saved_char = ptr_data[word_start_offset];
+                    ptr_data[word_start_offset] = '\0';
+                    ptr_style = ptr_data;
+                    while ((ptr_style = gui_word_get_next_char (window, (unsigned char *)ptr_style, 1)) != NULL)
+                    {
+                        /* loop until no style/char available */
+                    }
+                    ptr_data[word_start_offset] = saved_char;
+                }
+                /* jump to start of word */
+                ptr_data += word_start_offset;
             }
             
             /* word is exactly width => we'll skip next leading spaces for next line */
@@ -651,25 +1221,34 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
                 skip_spaces = 1;
             
             /* display word */
-            gui_display_word (window, line,
-                              ptr_message, offset,
-                              word_end_msg, word_end_offset,
+            gui_display_word (window, line, ptr_data,
+                              ptr_end_offset,
                               num_lines, count, &lines_displayed, simulate);
             
             if (window->win_chat_cursor_y >= window->win_chat_height)
-                ptr_message = NULL;
+                ptr_data = NULL;
             else
             {
                 /* move pointer after end of word */
-                ptr_message = word_end_msg;
-                offset = word_end_offset;
-                gui_message_get_next_char (&ptr_message, &offset);
+                ptr_data = ptr_end_offset + 1;
+                if (*(ptr_data - 1) == '\0')
+                    ptr_data = NULL;
                 
                 /* skip leading spaces? */
                 if (skip_spaces)
                 {
-                    while (ptr_message && (ptr_message->message[offset] == ' '))
-                        gui_message_get_next_char (&ptr_message, &offset);
+                    while (ptr_data && (ptr_data[0] == ' '))
+                    {
+                        next_char = gui_word_get_next_char (window,
+                                                            (unsigned char *)ptr_data, 0);
+                        if (!next_char)
+                            break;
+                        prev_char = utf8_prev_char (ptr_data, next_char);
+                        if (prev_char && (prev_char[0] == ' '))
+                            ptr_data = next_char;
+                        else
+                            break;
+                    }
                 }
             }
         }
@@ -677,7 +1256,7 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
         {
             gui_display_new_line (window, num_lines, count,
                                   &lines_displayed, simulate);
-            ptr_message = NULL;
+            ptr_data = NULL;
         }
     }
     
@@ -817,7 +1396,7 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
         {
             if (erase)
             {
-                gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
+                gui_window_set_weechat_color (ptr_win->win_chat, COLOR_WIN_CHAT);
                 
                 snprintf (format_empty, 32, "%%-%ds", ptr_win->win_chat_width);
                 for (i = 0; i < ptr_win->win_chat_height; i++)
@@ -826,7 +1405,7 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
                 }
             }
             
-            gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
+            gui_window_set_weechat_color (ptr_win->win_chat, COLOR_WIN_CHAT);
             
             if (buffer->dcc)
             {
@@ -839,9 +1418,9 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
                         break;
                     
                     /* nickname and filename */
-                    gui_window_set_color (ptr_win->win_chat,
-                                          (ptr_dcc == dcc_selected) ?
-                                          COLOR_DCC_SELECTED : COLOR_WIN_CHAT);
+                    gui_window_set_weechat_color (ptr_win->win_chat,
+                                                  (ptr_dcc == dcc_selected) ?
+                                                  COLOR_DCC_SELECTED : COLOR_WIN_CHAT);
                     mvwprintw (ptr_win->win_chat, i, 0, "%s %-16s ",
                                (ptr_dcc == dcc_selected) ? "***" : "   ",
                                ptr_dcc->nick);
@@ -861,14 +1440,14 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
                     }
                     
                     /* status */
-                    gui_window_set_color (ptr_win->win_chat,
-                                          (ptr_dcc == dcc_selected) ?
-                                          COLOR_DCC_SELECTED : COLOR_WIN_CHAT);
+                    gui_window_set_weechat_color (ptr_win->win_chat,
+                                                  (ptr_dcc == dcc_selected) ?
+                                                  COLOR_DCC_SELECTED : COLOR_WIN_CHAT);
                     mvwprintw (ptr_win->win_chat, i + 1, 0, "%s %s ",
                                (ptr_dcc == dcc_selected) ? "***" : "   ",
                                (DCC_IS_RECV(ptr_dcc->type)) ? "-->>" : "<<--");
-                    gui_window_set_color (ptr_win->win_chat,
-                                          COLOR_DCC_WAITING + ptr_dcc->status);
+                    gui_window_set_weechat_color (ptr_win->win_chat,
+                                                  COLOR_DCC_WAITING + ptr_dcc->status);
                     buf = weechat_convert_encoding ((local_utf8) ?
                                                     cfg_look_charset_decode_iso : cfg_look_charset_decode_utf,
                                                     (cfg_look_charset_internal && cfg_look_charset_internal[0]) ?
@@ -878,9 +1457,9 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
                     free (buf);
                     
                     /* other infos */
-                    gui_window_set_color (ptr_win->win_chat,
-                                          (ptr_dcc == dcc_selected) ?
-                                          COLOR_DCC_SELECTED : COLOR_WIN_CHAT);
+                    gui_window_set_weechat_color (ptr_win->win_chat,
+                                                  (ptr_dcc == dcc_selected) ?
+                                                  COLOR_DCC_SELECTED : COLOR_WIN_CHAT);
                     if (DCC_IS_FILE(ptr_dcc->type))
                     {
                         wprintw (ptr_win->win_chat, "  [");
@@ -1021,7 +1600,7 @@ gui_draw_buffer_nick (t_gui_buffer *buffer, int erase)
     char format[32], format_empty[32];
     t_irc_nick *ptr_nick;
     
-    if (!gui_ok)
+    if (!gui_ok || !BUFFER_HAS_NICKLIST(buffer))
         return;
     
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
@@ -1030,7 +1609,7 @@ gui_draw_buffer_nick (t_gui_buffer *buffer, int erase)
         {
             if (erase)
             {
-                gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK);
+                gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK);
                 
                 snprintf (format_empty, 32, "%%-%ds", ptr_win->win_nick_width);
                 for (i = 0; i < ptr_win->win_nick_height; i++)
@@ -1039,177 +1618,174 @@ gui_draw_buffer_nick (t_gui_buffer *buffer, int erase)
                 }
             }
             
-            if (gui_buffer_has_nicklist (buffer))
+            max_length = nick_get_max_length (CHANNEL(buffer));
+            if ((buffer->num_displayed > 0) &&
+                ((max_length + 2) != ptr_win->win_nick_width))
             {
-                max_length = nick_get_max_length (CHANNEL(buffer));
-                if ((buffer->num_displayed > 0) &&
-                    ((max_length + 2) != ptr_win->win_nick_width))
-                {
-                    gui_calculate_pos_size (ptr_win);
-                    delwin (ptr_win->win_chat);
-                    delwin (ptr_win->win_nick);
-                    ptr_win->win_chat = newwin (ptr_win->win_chat_height,
-                                                ptr_win->win_chat_width,
-                                                ptr_win->win_chat_y,
-                                                ptr_win->win_chat_x);
-                    ptr_win->win_nick = newwin (ptr_win->win_nick_height,
-                                                ptr_win->win_nick_width,
-                                                ptr_win->win_nick_y,
-                                                ptr_win->win_nick_x);
-                    gui_draw_buffer_chat (buffer, 1);
-                    
-                    gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK);
-                    
-                    snprintf (format_empty, 32, "%%-%ds", ptr_win->win_nick_width);
-                    for (i = 0; i < ptr_win->win_nick_height; i++)
-                    {
-                        mvwprintw (ptr_win->win_nick, i, 0, format_empty, " ");
-                    }
-                }
-                snprintf (format, 32, "%%.%ds",
-                          ((cfg_look_nicklist_min_size > 0)
-                           && (max_length < cfg_look_nicklist_min_size)) ?
-                          cfg_look_nicklist_min_size :
-                          (((cfg_look_nicklist_max_size > 0)
-                           && (max_length > cfg_look_nicklist_max_size)) ?
-                          cfg_look_nicklist_max_size : max_length));
+                gui_calculate_pos_size (ptr_win);
+                delwin (ptr_win->win_chat);
+                delwin (ptr_win->win_nick);
+                ptr_win->win_chat = newwin (ptr_win->win_chat_height,
+                                            ptr_win->win_chat_width,
+                                            ptr_win->win_chat_y,
+                                            ptr_win->win_chat_x);
+                ptr_win->win_nick = newwin (ptr_win->win_nick_height,
+                                            ptr_win->win_nick_width,
+                                            ptr_win->win_nick_y,
+                                            ptr_win->win_nick_x);
+                gui_draw_buffer_chat (buffer, 1);
                 
-                if (has_colors ())
+                gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK);
+                
+                snprintf (format_empty, 32, "%%-%ds", ptr_win->win_nick_width);
+                for (i = 0; i < ptr_win->win_nick_height; i++)
+                {
+                    mvwprintw (ptr_win->win_nick, i, 0, format_empty, " ");
+                }
+            }
+            snprintf (format, 32, "%%.%ds",
+                      ((cfg_look_nicklist_min_size > 0)
+                       && (max_length < cfg_look_nicklist_min_size)) ?
+                      cfg_look_nicklist_min_size :
+                      (((cfg_look_nicklist_max_size > 0)
+                        && (max_length > cfg_look_nicklist_max_size)) ?
+                       cfg_look_nicklist_max_size : max_length));
+            
+            if (has_colors ())
+            {
+                gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK_SEP);
+                switch (cfg_look_nicklist_position)
+                {
+                    case CFG_LOOK_NICKLIST_LEFT:
+                        mvwvline (ptr_win->win_nick,
+                                  0, ptr_win->win_nick_width - 1, ACS_VLINE,
+                                  ptr_win->win_chat_height);
+                        break;
+                    case CFG_LOOK_NICKLIST_RIGHT:
+                        mvwvline (ptr_win->win_nick,
+                                  0, 0, ACS_VLINE,
+                                  ptr_win->win_chat_height);
+                        break;
+                    case CFG_LOOK_NICKLIST_TOP:
+                        mvwhline (ptr_win->win_nick,
+                                  ptr_win->win_nick_height - 1, 0, ACS_HLINE,
+                                  ptr_win->win_chat_width);
+                        break;
+                    case CFG_LOOK_NICKLIST_BOTTOM:
+                        mvwhline (ptr_win->win_nick,
+                                  0, 0, ACS_HLINE,
+                                  ptr_win->win_chat_width);
+                        break;
+                }
+            }
+            
+            gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK);
+            x = 0;
+            y = (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM) ? 1 : 0;
+            column = 0;
+            
+            if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ||
+                (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM))
+                nicks_displayed = (ptr_win->win_width / (max_length + 2)) * (ptr_win->win_height - 1);
+            else
+                nicks_displayed = ptr_win->win_nick_height;
+            
+            ptr_nick = CHANNEL(buffer)->nicks;
+            for (i = 0; i < ptr_win->win_nick_start; i++)
+            {
+                if (!ptr_nick)
+                    break;
+                ptr_nick = ptr_nick->next_nick;
+            }
+            if (ptr_nick)
+            {
+                for (i = 0; i < nicks_displayed; i++)
                 {
-                    gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK_SEP);
                     switch (cfg_look_nicklist_position)
                     {
                         case CFG_LOOK_NICKLIST_LEFT:
-                            mvwvline (ptr_win->win_nick,
-                                      0, ptr_win->win_nick_width - 1, ACS_VLINE,
-                                      ptr_win->win_chat_height);
+                            x = 0;
                             break;
                         case CFG_LOOK_NICKLIST_RIGHT:
-                            mvwvline (ptr_win->win_nick,
-                                      0, 0, ACS_VLINE,
-                                      ptr_win->win_chat_height);
+                            x = 1;
                             break;
                         case CFG_LOOK_NICKLIST_TOP:
-                            mvwhline (ptr_win->win_nick,
-                                      ptr_win->win_nick_height - 1, 0, ACS_HLINE,
-                                      ptr_win->win_chat_width);
-                            break;
                         case CFG_LOOK_NICKLIST_BOTTOM:
-                            mvwhline (ptr_win->win_nick,
-                                      0, 0, ACS_HLINE,
-                                      ptr_win->win_chat_width);
+                            x = column;
                             break;
                     }
-                }
-                
-                gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK);
-                x = 0;
-                y = (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM) ? 1 : 0;
-                column = 0;
-                
-                if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ||
-                    (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM))
-                    nicks_displayed = (ptr_win->win_width / (max_length + 2)) * (ptr_win->win_height - 1);
-                else
-                    nicks_displayed = ptr_win->win_nick_height;
-                
-                ptr_nick = CHANNEL(buffer)->nicks;
-                for (i = 0; i < ptr_win->win_nick_start; i++)
-                {
-                    if (!ptr_nick)
-                        break;
-                    ptr_nick = ptr_nick->next_nick;
-                }
-                if (ptr_nick)
-                {
-                    for (i = 0; i < nicks_displayed; i++)
+                    if ( ((i == 0) && (ptr_win->win_nick_start > 0))
+                         || ((i == nicks_displayed - 1) && (ptr_nick->next_nick)) )
                     {
-                        switch (cfg_look_nicklist_position)
+                        gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK_MORE);
+                        j = (max_length + 1) >= 4 ? 4 : max_length + 1;
+                        for (x = 1; x <= j; x++)
+                            mvwprintw (ptr_win->win_nick, y, x, "+");
+                    }
+                    else
+                    {
+                        if (ptr_nick->is_chanowner)
                         {
-                            case CFG_LOOK_NICKLIST_LEFT:
-                                x = 0;
-                                break;
-                            case CFG_LOOK_NICKLIST_RIGHT:
-                                x = 1;
-                                break;
-                            case CFG_LOOK_NICKLIST_TOP:
-                            case CFG_LOOK_NICKLIST_BOTTOM:
-                                x = column;
-                                break;
+                            gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK_CHANOWNER);
+                            mvwprintw (ptr_win->win_nick, y, x, "~");
+                            x++;
                         }
-                        if ( ((i == 0) && (ptr_win->win_nick_start > 0))
-                            || ((i == nicks_displayed - 1) && (ptr_nick->next_nick)) )
+                        else if (ptr_nick->is_chanadmin)
                         {
-                            gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK_MORE);
-                            j = (max_length + 1) >= 4 ? 4 : max_length + 1;
-                            for (x = 1; x <= j; x++)
-                                mvwprintw (ptr_win->win_nick, y, x, "+");
+                            gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK_CHANADMIN);
+                            mvwprintw (ptr_win->win_nick, y, x, "&");
+                            x++;
+                        }
+                        else if (ptr_nick->is_op)
+                        {
+                            gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK_OP);
+                            mvwprintw (ptr_win->win_nick, y, x, "@");
+                            x++;
+                        }
+                        else if (ptr_nick->is_halfop)
+                        {
+                            gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK_HALFOP);
+                            mvwprintw (ptr_win->win_nick, y, x, "%%");
+                            x++;
+                        }
+                        else if (ptr_nick->has_voice)
+                        {
+                            gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK_VOICE);
+                            mvwprintw (ptr_win->win_nick, y, x, "+");
+                            x++;
                         }
                         else
                         {
-                            if (ptr_nick->is_chanowner)
-                            {
-                                gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK_CHANOWNER);
-                                mvwprintw (ptr_win->win_nick, y, x, "~");
-                                x++;
-                            }
-                            else if (ptr_nick->is_chanadmin)
-                            {
-                                gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK_CHANADMIN);
-                                mvwprintw (ptr_win->win_nick, y, x, "&");
-                                x++;
-                            }
-                            else if (ptr_nick->is_op)
-                            {
-                                gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK_OP);
-                                mvwprintw (ptr_win->win_nick, y, x, "@");
-                                x++;
-                            }
-                            else if (ptr_nick->is_halfop)
-                            {
-                                gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK_HALFOP);
-                                mvwprintw (ptr_win->win_nick, y, x, "%%");
-                                x++;
-                            }
-                            else if (ptr_nick->has_voice)
-                            {
-                                gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK_VOICE);
-                                mvwprintw (ptr_win->win_nick, y, x, "+");
-                                x++;
-                            }
-                            else
-                            {
-                                gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK);
-                                mvwprintw (ptr_win->win_nick, y, x, " ");
-                                x++;
-                            }
-                            gui_window_set_color (ptr_win->win_nick,
-                                                  ((cfg_irc_away_check > 0) && (ptr_nick->is_away)) ?
-                                                  COLOR_WIN_NICK_AWAY : COLOR_WIN_NICK);
-                            mvwprintw (ptr_win->win_nick, y, x, format, ptr_nick->nick);
-                            
-                            ptr_nick = ptr_nick->next_nick;
-                            
-                            if (!ptr_nick)
-                                break;
+                            gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK);
+                            mvwprintw (ptr_win->win_nick, y, x, " ");
+                            x++;
                         }
-                        y++;
-                        if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ||
-                            (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM))
+                        gui_window_set_weechat_color (ptr_win->win_nick,
+                                                      ((cfg_irc_away_check > 0) && (ptr_nick->is_away)) ?
+                                                      COLOR_WIN_NICK_AWAY : COLOR_WIN_NICK);
+                        mvwprintw (ptr_win->win_nick, y, x, format, ptr_nick->nick);
+                        
+                        ptr_nick = ptr_nick->next_nick;
+                        
+                        if (!ptr_nick)
+                            break;
+                    }
+                    y++;
+                    if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ||
+                        (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM))
+                    {
+                        if (y - ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM) ? 1 : 0) >= ptr_win->win_nick_height - 1)
                         {
-                            if (y - ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM) ? 1 : 0) >= ptr_win->win_nick_height - 1)
-                            {
-                                column += max_length + 2;
-                                y = (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ?
-                                    0 : 1;
-                            }
+                            column += max_length + 2;
+                            y = (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ?
+                                0 : 1;
                         }
                     }
                 }
             }
-            wnoutrefresh (ptr_win->win_nick);
-            refresh ();
         }
+        wnoutrefresh (ptr_win->win_nick);
+        refresh ();
     }
 }
 
@@ -1234,64 +1810,59 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
     
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
     {
-        if (has_colors ())
-            wbkgdset(ptr_win->win_status, ' ' | COLOR_PAIR (COLOR_WIN_STATUS));
-        
         if (erase)
-            gui_curses_window_clear (ptr_win->win_status);
+            gui_curses_window_clear (ptr_win->win_status, COLOR_WIN_STATUS);
         
-        gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS);
-        /* wborder (ptr_win->win_status, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '); */
-        wmove (ptr_win->win_status, 0, 0);
+        gui_window_set_weechat_color (ptr_win->win_status, COLOR_WIN_STATUS);
         
         /* display number of buffers */
-        gui_window_set_color (ptr_win->win_status,
-                              COLOR_WIN_STATUS_DELIMITERS);
-        wprintw (ptr_win->win_status, "[");
-        gui_window_set_color (ptr_win->win_status,
-                              COLOR_WIN_STATUS);
+        gui_window_set_weechat_color (ptr_win->win_status,
+                                      COLOR_WIN_STATUS_DELIMITERS);
+        mvwprintw (ptr_win->win_status, 0, 0, "[");
+        gui_window_set_weechat_color (ptr_win->win_status,
+                                      COLOR_WIN_STATUS);
         wprintw (ptr_win->win_status, "%d",
                  (last_gui_buffer) ? last_gui_buffer->number : 0);
-        gui_window_set_color (ptr_win->win_status,
-                              COLOR_WIN_STATUS_DELIMITERS);
+        gui_window_set_weechat_color (ptr_win->win_status,
+                                      COLOR_WIN_STATUS_DELIMITERS);
         wprintw (ptr_win->win_status, "] ");
         
         /* display "<servers>" or current server */
         if (ptr_win->buffer->all_servers)
         {
             wprintw (ptr_win->win_status, "[");
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS);
             wprintw (ptr_win->win_status, _("<servers>"));
-            gui_window_set_color (ptr_win->win_status,
-                              COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, "] ");
         }
         else if (SERVER(ptr_win->buffer) && SERVER(ptr_win->buffer)->name)
         {
             wprintw (ptr_win->win_status, "[");
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS);
             wprintw (ptr_win->win_status, "%s", SERVER(ptr_win->buffer)->name);
             if (SERVER(ptr_win->buffer)->is_away)
                 wprintw (ptr_win->win_status, _("(away)"));
-            gui_window_set_color (ptr_win->win_status,
-                              COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, "] ");
         }
         
         /* infos about current buffer */
         if (SERVER(ptr_win->buffer) && !CHANNEL(ptr_win->buffer))
         {
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS);
             wprintw (ptr_win->win_status, "%d",
                      ptr_win->buffer->number);
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, ":");
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS_CHANNEL);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_CHANNEL);
             if (SERVER(ptr_win->buffer)->is_connected)
                 wprintw (ptr_win->win_status, "[%s] ",
                          SERVER(ptr_win->buffer)->name);
@@ -1303,35 +1874,35 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
                 server_get_number_buffer (SERVER(ptr_win->buffer),
                                           &server_pos,
                                           &server_total);
-                gui_window_set_color (ptr_win->win_status,
-                                      COLOR_WIN_STATUS_DELIMITERS);
+                gui_window_set_weechat_color (ptr_win->win_status,
+                                              COLOR_WIN_STATUS_DELIMITERS);
                 wprintw (ptr_win->win_status, "(");
-                gui_window_set_color (ptr_win->win_status,
-                                      COLOR_WIN_STATUS);
+                gui_window_set_weechat_color (ptr_win->win_status,
+                                              COLOR_WIN_STATUS);
                 wprintw (ptr_win->win_status, "%d", server_pos);
-                gui_window_set_color (ptr_win->win_status,
-                                      COLOR_WIN_STATUS_DELIMITERS);
+                gui_window_set_weechat_color (ptr_win->win_status,
+                                              COLOR_WIN_STATUS_DELIMITERS);
                 wprintw (ptr_win->win_status, "/");
-                gui_window_set_color (ptr_win->win_status,
-                                      COLOR_WIN_STATUS);
+                gui_window_set_weechat_color (ptr_win->win_status,
+                                              COLOR_WIN_STATUS);
                 wprintw (ptr_win->win_status, "%d", server_total);
-                gui_window_set_color (ptr_win->win_status,
-                                      COLOR_WIN_STATUS_DELIMITERS);
+                gui_window_set_weechat_color (ptr_win->win_status,
+                                              COLOR_WIN_STATUS_DELIMITERS);
                 wprintw (ptr_win->win_status, ") ");
 
             }
         }
         if (SERVER(ptr_win->buffer) && CHANNEL(ptr_win->buffer))
         {
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS);
             wprintw (ptr_win->win_status, "%d",
                      ptr_win->buffer->number);
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, ":");
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS_CHANNEL);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_CHANNEL);
             if ((!CHANNEL(ptr_win->buffer)->nicks)
                 && (CHANNEL(ptr_win->buffer)->type != CHAT_PRIVATE))
                 wprintw (ptr_win->win_status, "(%s)",
@@ -1344,11 +1915,11 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
                 /* display channel modes */
                 if (CHANNEL(ptr_win->buffer)->type == CHAT_CHANNEL)
                 {
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS_DELIMITERS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS_DELIMITERS);
                     wprintw (ptr_win->win_status, "(");
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS);
                     i = 0;
                     first_mode = 1;
                     while (CHANNEL(ptr_win->buffer)->modes[i])
@@ -1371,40 +1942,40 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
                     if (CHANNEL(ptr_win->buffer)->modes[CHANNEL_MODE_LIMIT] != ' ')
                         wprintw (ptr_win->win_status, ",%d",
                                  CHANNEL(ptr_win->buffer)->limit);
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS_DELIMITERS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS_DELIMITERS);
                     wprintw (ptr_win->win_status, ")");
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS);
                 }
                 
                 /* display DCC if private is DCC CHAT */
                 if ((CHANNEL(ptr_win->buffer)->type == CHAT_PRIVATE)
                     && (CHANNEL(ptr_win->buffer)->dcc_chat))
                 {
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS_DELIMITERS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS_DELIMITERS);
                     wprintw (ptr_win->win_status, "(");
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS_CHANNEL);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS_CHANNEL);
                     wprintw (ptr_win->win_status, "DCC");
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS_DELIMITERS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS_DELIMITERS);
                     wprintw (ptr_win->win_status, ")");
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS);
                 }
             }
             wprintw (ptr_win->win_status, " ");
         }
         if (!SERVER(ptr_win->buffer))
         {
-            gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (ptr_win->win_status, COLOR_WIN_STATUS);
             wprintw (ptr_win->win_status, "%d",
                      ptr_win->buffer->number);
-            gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status, COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, ":");
-            gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS_CHANNEL);
+            gui_window_set_weechat_color (ptr_win->win_status, COLOR_WIN_STATUS_CHANNEL);
             if (ptr_win->buffer->dcc)
                 wprintw (ptr_win->win_status, "<DCC> ");
             else
@@ -1414,10 +1985,10 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
         /* display list of other active windows (if any) with numbers */
         if (hotlist)
         {
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, "[");
-            gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (ptr_win->win_status, COLOR_WIN_STATUS);
             wprintw (ptr_win->win_status, _("Act: "));
             
             names_count = 0;
@@ -1427,23 +1998,23 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
                 switch (ptr_hotlist->priority)
                 {
                     case HOTLIST_LOW:
-                        gui_window_set_color (ptr_win->win_status,
-                                              COLOR_WIN_STATUS_DATA_OTHER);
+                        gui_window_set_weechat_color (ptr_win->win_status,
+                                                      COLOR_WIN_STATUS_DATA_OTHER);
                         display_name = ((cfg_look_hotlist_names_level & 1) != 0);
                         break;
                     case HOTLIST_MSG:
-                        gui_window_set_color (ptr_win->win_status,
-                                              COLOR_WIN_STATUS_DATA_MSG);
+                        gui_window_set_weechat_color (ptr_win->win_status,
+                                                      COLOR_WIN_STATUS_DATA_MSG);
                         display_name = ((cfg_look_hotlist_names_level & 2) != 0);
                         break;
                     case HOTLIST_PRIVATE:
-                        gui_window_set_color (ptr_win->win_status,
-                                              COLOR_WIN_STATUS_DATA_PRIVATE);
+                        gui_window_set_weechat_color (ptr_win->win_status,
+                                                      COLOR_WIN_STATUS_DATA_PRIVATE);
                         display_name = ((cfg_look_hotlist_names_level & 4) != 0);
                         break;
                     case HOTLIST_HIGHLIGHT:
-                        gui_window_set_color (ptr_win->win_status,
-                                              COLOR_WIN_STATUS_DATA_HIGHLIGHT);
+                        gui_window_set_weechat_color (ptr_win->win_status,
+                                                      COLOR_WIN_STATUS_DATA_HIGHLIGHT);
                         display_name = ((cfg_look_hotlist_names_level & 8) != 0);
                         break;
                     default:
@@ -1454,11 +2025,11 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
                 {
                     wprintw (ptr_win->win_status, "%d",
                              ptr_hotlist->buffer->number);
-                    gui_window_set_color (ptr_win->win_status,
-                                              COLOR_WIN_STATUS_DELIMITERS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS_DELIMITERS);
                     wprintw (ptr_win->win_status, ":");
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS);
                     wprintw (ptr_win->win_status, "DCC");
                 }
                 else
@@ -1471,12 +2042,12 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
                     {
                         names_count++;
                         
-                        gui_window_set_color (ptr_win->win_status,
-                                              COLOR_WIN_STATUS_DELIMITERS);
+                        gui_window_set_weechat_color (ptr_win->win_status,
+                                                      COLOR_WIN_STATUS_DELIMITERS);
                         wprintw (ptr_win->win_status, ":");
                         
-                        gui_window_set_color (ptr_win->win_status,
-                                              COLOR_WIN_STATUS);
+                        gui_window_set_weechat_color (ptr_win->win_status,
+                                                      COLOR_WIN_STATUS);
                         if (cfg_look_hotlist_names_length == 0)
                             snprintf (format, sizeof (format) - 1, "%%s");
                         else
@@ -1492,8 +2063,8 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
                 if (ptr_hotlist->next_hotlist)
                     wprintw (ptr_win->win_status, ",");
             }
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, "] ");
         }
         
@@ -1502,20 +2073,20 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
         {
             if (SERVER(ptr_win->buffer)->lag / 1000 >= cfg_irc_lag_min_show)
             {
-                gui_window_set_color (ptr_win->win_status,
-                                      COLOR_WIN_STATUS_DELIMITERS);
+                gui_window_set_weechat_color (ptr_win->win_status,
+                                              COLOR_WIN_STATUS_DELIMITERS);
                 wprintw (ptr_win->win_status, "[");
-                gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS);
+                gui_window_set_weechat_color (ptr_win->win_status, COLOR_WIN_STATUS);
                 wprintw (ptr_win->win_status, _("Lag: %.1f"),
                          ((float)(SERVER(ptr_win->buffer)->lag)) / 1000);
-                gui_window_set_color (ptr_win->win_status,
-                                      COLOR_WIN_STATUS_DELIMITERS);
+                gui_window_set_weechat_color (ptr_win->win_status,
+                                              COLOR_WIN_STATUS_DELIMITERS);
                 wprintw (ptr_win->win_status, "]");
             }
         }
         
         /* display "-MORE-" (if last line is not displayed) & nicks count */
-        if (gui_buffer_has_nicklist (ptr_win->buffer))
+        if (BUFFER_HAS_NICKLIST(ptr_win->buffer))
         {
             snprintf (str_nicks, sizeof (str_nicks) - 1, "%d", CHANNEL(ptr_win->buffer)->nicks_count);
             x = ptr_win->win_width - strlen (str_nicks) - 4;
@@ -1526,7 +2097,7 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
         x -= strlen (more) - 1;
         if (x < 0)
             x = 0;
-        gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS_MORE);
+        gui_window_set_weechat_color (ptr_win->win_status, COLOR_WIN_STATUS_MORE);
         if (ptr_win->start_line)
             mvwprintw (ptr_win->win_status, 0, x, "%s", more);
         else
@@ -1534,15 +2105,15 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
             snprintf (format, sizeof (format) - 1, "%%-%ds", (int)(strlen (more)));
             mvwprintw (ptr_win->win_status, 0, x, format, " ");
         }
-        if (gui_buffer_has_nicklist (ptr_win->buffer))
+        if (BUFFER_HAS_NICKLIST(ptr_win->buffer))
         {
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, " [");
-            gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (ptr_win->win_status, COLOR_WIN_STATUS);
             wprintw (ptr_win->win_status, "%s", str_nicks);
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, "]");
         }
         free (more);
@@ -1575,7 +2146,7 @@ gui_draw_buffer_infobar_time (t_gui_buffer *buffer)
         local_time = localtime (&time_seconds);
         if (local_time)
         {
-            gui_window_set_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
+            gui_window_set_weechat_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
             mvwprintw (ptr_win->win_infobar,
                        0, 1,
                        "%02d:%02d",
@@ -1609,24 +2180,19 @@ gui_draw_buffer_infobar (t_gui_buffer *buffer, int erase)
     
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
     {
-        if (has_colors ())
-            wbkgdset(ptr_win->win_infobar, ' ' | COLOR_PAIR (COLOR_WIN_INFOBAR));
-        
         if (erase)
-            gui_curses_window_clear (ptr_win->win_infobar);
-
-        gui_window_set_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
-        /* wborder (ptr_win->win_infobar, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '); */
-        wmove (ptr_win->win_infobar, 0, 0);
+            gui_curses_window_clear (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
+        
+        gui_window_set_weechat_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
         
         time_seconds = time (NULL);
         local_time = localtime (&time_seconds);
         if (local_time)
         {
             strftime (text_time, 1024, cfg_look_infobar_timestamp, local_time);
-            gui_window_set_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR_DELIMITERS);
             wprintw (ptr_win->win_infobar, "[");
-            gui_window_set_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
+            gui_window_set_weechat_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
             wprintw (ptr_win->win_infobar,
                      "%02d:%02d",
                      local_time->tm_hour, local_time->tm_min);
@@ -1634,17 +2200,17 @@ gui_draw_buffer_infobar (t_gui_buffer *buffer, int erase)
                 wprintw (ptr_win->win_infobar,
                          ":%02d",
                          local_time->tm_sec);
-            gui_window_set_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR_DELIMITERS);
             wprintw (ptr_win->win_infobar, "]");
-            gui_window_set_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
+            gui_window_set_weechat_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
             wprintw (ptr_win->win_infobar,
                      " %s", text_time);
         }
         if (gui_infobar)
         {
-            gui_window_set_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR_DELIMITERS);
             wprintw (ptr_win->win_infobar, " | ");
-            gui_window_set_color (ptr_win->win_infobar, gui_infobar->color);
+            gui_window_set_weechat_color (ptr_win->win_infobar, gui_infobar->color);
             wprintw (ptr_win->win_infobar, "%s", gui_infobar->text);
         }
         
@@ -1662,13 +2228,13 @@ gui_get_input_width (t_gui_window *window)
 {
     if (CHANNEL(window->buffer))
         return (window->win_width - strlen (CHANNEL(window->buffer)->name) -
-                strlen (SERVER(window->buffer)->nick) - 3);
+                strlen (SERVER(window->buffer)->nick) - 4);
     else
     {
         if (SERVER(window->buffer) && (SERVER(window->buffer)->is_connected))
-            return (window->win_width - strlen (SERVER(window->buffer)->nick) - 2);
+            return (window->win_width - strlen (SERVER(window->buffer)->nick) - 3);
         else
-            return (window->win_width - strlen (cfg_look_no_nickname) - 2);
+            return (window->win_width - strlen (cfg_look_no_nickname) - 3);
     }
 }
 
@@ -1693,14 +2259,7 @@ gui_draw_buffer_input (t_gui_buffer *buffer, int erase)
         if (ptr_win->buffer == buffer)
         {
             if (erase)
-                gui_curses_window_clear (ptr_win->win_input);
-    
-            if (has_colors ())
-            {
-                gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT);
-                wborder (ptr_win->win_input, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ');
-                wnoutrefresh (ptr_win->win_input);
-            }
+                gui_curses_window_clear (ptr_win->win_input, COLOR_WIN_INPUT);
             
             if (buffer->dcc)
             {
@@ -1764,13 +2323,15 @@ gui_draw_buffer_input (t_gui_buffer *buffer, int erase)
                 }
                 if (CHANNEL(buffer))
                 {
-                    gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_CHANNEL);
-                    mvwprintw (ptr_win->win_input, 0, 0, "%s ", CHANNEL(buffer)->name);
-                    gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_NICK);
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT_DELIMITERS);
+                    mvwprintw (ptr_win->win_input, 0, 0, "[");
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT_CHANNEL);
+                    wprintw (ptr_win->win_input, "%s ", CHANNEL(buffer)->name);
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT_NICK);
                     wprintw (ptr_win->win_input, "%s", SERVER(buffer)->nick);
-                    gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_DELIMITERS);
-                    wprintw (ptr_win->win_input, "> ");
-                    gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT);
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT_DELIMITERS);
+                    wprintw (ptr_win->win_input, "] ");
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT);
                     snprintf (format, 32, "%%-%ds", input_width);
                     if (ptr_win == gui_current_window)
                         wprintw (ptr_win->win_input, format,
@@ -1781,7 +2342,7 @@ gui_draw_buffer_input (t_gui_buffer *buffer, int erase)
                                  "");
                     wclrtoeol (ptr_win->win_input);
                     ptr_win->win_input_x = utf8_strlen (CHANNEL(buffer)->name) +
-                        utf8_strlen (SERVER(buffer)->nick) + 3 +
+                        utf8_strlen (SERVER(buffer)->nick) + 4 +
                         (buffer->input_buffer_pos - buffer->input_buffer_1st_display);
                     if (ptr_win == gui_current_window)
                         move (ptr_win->win_y + ptr_win->win_height - 1,
@@ -1789,15 +2350,17 @@ gui_draw_buffer_input (t_gui_buffer *buffer, int erase)
                 }
                 else
                 {
-                    gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_NICK);
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT_DELIMITERS);
+                    mvwprintw (ptr_win->win_input, 0, 0, "[");
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT_NICK);
                     if (SERVER(buffer) && (SERVER(buffer)->is_connected))
                         ptr_nickname = SERVER(buffer)->nick;
                     else
                         ptr_nickname = cfg_look_no_nickname;
-                    mvwprintw (ptr_win->win_input, 0, 0, "%s", ptr_nickname);
-                    gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_DELIMITERS);
-                    wprintw (ptr_win->win_input, "> ");
-                    gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT);
+                    wprintw (ptr_win->win_input, "%s", ptr_nickname);
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT_DELIMITERS);
+                    wprintw (ptr_win->win_input, "] ");
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT);
                     snprintf (format, 32, "%%-%ds", input_width);
                     if (ptr_win == gui_current_window)
                         wprintw (ptr_win->win_input, format,
@@ -1807,7 +2370,7 @@ gui_draw_buffer_input (t_gui_buffer *buffer, int erase)
                         wprintw (ptr_win->win_input, format,
                                  "");
                     wclrtoeol (ptr_win->win_input);
-                    ptr_win->win_input_x = utf8_strlen (ptr_nickname) + 2 +
+                    ptr_win->win_input_x = utf8_strlen (ptr_nickname) + 3 +
                         (buffer->input_buffer_pos - buffer->input_buffer_1st_display);
                     if (ptr_win == gui_current_window)
                         move (ptr_win->win_y + ptr_win->win_height - 1,
@@ -1932,11 +2495,17 @@ gui_switch_to_buffer (t_gui_window *window, t_gui_buffer *buffer)
     /* create status/infobar windows */
     if (cfg_look_infobar)
     {
-        window->win_infobar = newwin (1, window->win_width, window->win_y + window->win_height - 2, window->win_x);
-        window->win_status = newwin (1, window->win_width, window->win_y + window->win_height - 3, window->win_x);
+        window->win_infobar = newwin (1, window->win_width,
+                                      window->win_y + window->win_height - 2,
+                                      window->win_x);
+        window->win_status = newwin (1, window->win_width,
+                                     window->win_y + window->win_height - 3,
+                                     window->win_x);
     }
     else
-        window->win_status = newwin (1, window->win_width, window->win_y + window->win_height - 2, window->win_x);
+        window->win_status = newwin (1, window->win_width,
+                                     window->win_y + window->win_height - 2,
+                                     window->win_x);
     
     window->start_line = NULL;
     window->start_line_pos = 0;
@@ -2035,7 +2604,7 @@ gui_window_nick_beginning (t_gui_window *window)
     if (!gui_ok)
         return;
     
-    if (gui_buffer_has_nicklist (window->buffer))
+    if (BUFFER_HAS_NICKLIST(window->buffer))
     {
         if (window->win_nick_start > 0)
         {
@@ -2057,7 +2626,7 @@ gui_window_nick_end (t_gui_window *window)
     if (!gui_ok)
         return;
     
-    if (gui_buffer_has_nicklist (window->buffer))
+    if (BUFFER_HAS_NICKLIST(window->buffer))
     {
         new_start =
             CHANNEL(window->buffer)->nicks_count - window->win_nick_height;
@@ -2084,7 +2653,7 @@ gui_window_nick_page_up (t_gui_window *window)
     if (!gui_ok)
         return;
     
-    if (gui_buffer_has_nicklist (window->buffer))
+    if (BUFFER_HAS_NICKLIST(window->buffer))
     {
         if (window->win_nick_start > 0)
         {
@@ -2106,7 +2675,7 @@ gui_window_nick_page_down (t_gui_window *window)
     if (!gui_ok)
         return;
     
-    if (gui_buffer_has_nicklist (window->buffer))
+    if (BUFFER_HAS_NICKLIST(window->buffer))
     {
         if ((CHANNEL(window->buffer)->nicks_count > window->win_nick_height)
             && (window->win_nick_start + window->win_nick_height - 1
@@ -2421,6 +2990,7 @@ gui_refresh_screen ()
     }
     
     gui_current_window = old_current_window;
+    gui_switch_to_buffer (gui_current_window, gui_current_window->buffer);
     gui_redraw_buffer (gui_current_window->buffer);
 }
 
@@ -2436,6 +3006,93 @@ gui_pre_init (int *argc, char **argv[])
     (void) argv;
 }
 
+/*
+ * gui_init_weechat_colors: init WeeChat colors
+ */
+
+void
+gui_init_weechat_colors ()
+{
+    int i;
+    
+    /* init WeeChat colors */
+    gui_color[COLOR_WIN_TITLE] = gui_color_build (COLOR_WIN_TITLE, cfg_col_title, cfg_col_title_bg);
+    gui_color[COLOR_WIN_CHAT] = gui_color_build (COLOR_WIN_CHAT, cfg_col_chat, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_TIME] = gui_color_build (COLOR_WIN_CHAT_TIME, cfg_col_chat_time, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_TIME_SEP] = gui_color_build (COLOR_WIN_CHAT_TIME_SEP, cfg_col_chat_time_sep, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_PREFIX1] = gui_color_build (COLOR_WIN_CHAT_PREFIX1, cfg_col_chat_prefix1, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_PREFIX2] = gui_color_build (COLOR_WIN_CHAT_PREFIX2, cfg_col_chat_prefix2, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_SERVER] = gui_color_build (COLOR_WIN_CHAT_SERVER, cfg_col_chat_server, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_JOIN] = gui_color_build (COLOR_WIN_CHAT_JOIN, cfg_col_chat_join, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_PART] = gui_color_build (COLOR_WIN_CHAT_PART, cfg_col_chat_part, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_NICK] = gui_color_build (COLOR_WIN_CHAT_NICK, cfg_col_chat_nick, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_HOST] = gui_color_build (COLOR_WIN_CHAT_HOST, cfg_col_chat_host, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_CHANNEL] = gui_color_build (COLOR_WIN_CHAT_CHANNEL, cfg_col_chat_channel, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_DARK] = gui_color_build (COLOR_WIN_CHAT_DARK, cfg_col_chat_dark, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_HIGHLIGHT] = gui_color_build (COLOR_WIN_CHAT_HIGHLIGHT, cfg_col_chat_highlight, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_STATUS] = gui_color_build (COLOR_WIN_STATUS, cfg_col_status, cfg_col_status_bg);
+    gui_color[COLOR_WIN_STATUS_DELIMITERS] = gui_color_build (COLOR_WIN_STATUS_DELIMITERS, cfg_col_status_delimiters, cfg_col_status_bg);
+    gui_color[COLOR_WIN_STATUS_CHANNEL] = gui_color_build (COLOR_WIN_STATUS_CHANNEL, cfg_col_status_channel, cfg_col_status_bg);
+    gui_color[COLOR_WIN_STATUS_DATA_MSG] = gui_color_build (COLOR_WIN_STATUS_DATA_MSG, cfg_col_status_data_msg, cfg_col_status_bg);
+    gui_color[COLOR_WIN_STATUS_DATA_PRIVATE] = gui_color_build (COLOR_WIN_STATUS_DATA_PRIVATE, cfg_col_status_data_private, cfg_col_status_bg);
+    gui_color[COLOR_WIN_STATUS_DATA_HIGHLIGHT] = gui_color_build (COLOR_WIN_STATUS_DATA_HIGHLIGHT, cfg_col_status_data_highlight, cfg_col_status_bg);
+    gui_color[COLOR_WIN_STATUS_DATA_OTHER] = gui_color_build (COLOR_WIN_STATUS_DATA_OTHER, cfg_col_status_data_other, cfg_col_status_bg);
+    gui_color[COLOR_WIN_STATUS_MORE] = gui_color_build (COLOR_WIN_STATUS_MORE, cfg_col_status_more, cfg_col_status_bg);
+    gui_color[COLOR_WIN_INFOBAR] = gui_color_build (COLOR_WIN_INFOBAR, cfg_col_infobar, cfg_col_infobar_bg);
+    gui_color[COLOR_WIN_INFOBAR_DELIMITERS] = gui_color_build (COLOR_WIN_INFOBAR_DELIMITERS, cfg_col_infobar_delimiters, cfg_col_infobar_bg);
+    gui_color[COLOR_WIN_INFOBAR_HIGHLIGHT] = gui_color_build (COLOR_WIN_INFOBAR_HIGHLIGHT, cfg_col_infobar_highlight, cfg_col_infobar_bg);
+    gui_color[COLOR_WIN_INPUT] = gui_color_build (COLOR_WIN_INPUT, cfg_col_input, cfg_col_input_bg);
+    gui_color[COLOR_WIN_INPUT_CHANNEL] = gui_color_build (COLOR_WIN_INPUT_CHANNEL, cfg_col_input_channel, cfg_col_input_bg);
+    gui_color[COLOR_WIN_INPUT_NICK] = gui_color_build (COLOR_WIN_INPUT_NICK, cfg_col_input_nick, cfg_col_input_bg);
+    gui_color[COLOR_WIN_INPUT_DELIMITERS] = gui_color_build (COLOR_WIN_INPUT_DELIMITERS, cfg_col_input_delimiters, cfg_col_input_bg);
+    gui_color[COLOR_WIN_NICK] = gui_color_build (COLOR_WIN_NICK, cfg_col_nick, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_AWAY] = gui_color_build (COLOR_WIN_NICK_AWAY, cfg_col_nick_away, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_CHANOWNER] = gui_color_build (COLOR_WIN_NICK_CHANOWNER, cfg_col_nick_chanowner, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_CHANADMIN] = gui_color_build (COLOR_WIN_NICK_CHANADMIN, cfg_col_nick_chanadmin, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_OP] = gui_color_build (COLOR_WIN_NICK_OP, cfg_col_nick_op, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_HALFOP] = gui_color_build (COLOR_WIN_NICK_HALFOP, cfg_col_nick_halfop, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_VOICE] = gui_color_build (COLOR_WIN_NICK_VOICE, cfg_col_nick_voice, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_MORE] = gui_color_build (COLOR_WIN_NICK_MORE, cfg_col_nick_more, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_SEP] = gui_color_build (COLOR_WIN_NICK_SEP, cfg_col_nick_sep, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_SELF] = gui_color_build (COLOR_WIN_NICK_SELF, cfg_col_nick_self, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_PRIVATE] = gui_color_build (COLOR_WIN_NICK_PRIVATE, cfg_col_nick_private, cfg_col_nick_bg);
+
+    for (i = 0; i < COLOR_WIN_NICK_NUMBER; i++)
+    {
+        gui_color[COLOR_WIN_NICK_1 + i] = gui_color_build (COLOR_WIN_NICK_1 + i, cfg_col_nick_colors[i], cfg_col_chat_bg);
+    }
+        
+    gui_color[COLOR_DCC_SELECTED] = gui_color_build (COLOR_DCC_SELECTED, cfg_col_dcc_selected, cfg_col_chat_bg);
+    gui_color[COLOR_DCC_WAITING] = gui_color_build (COLOR_DCC_WAITING, cfg_col_dcc_waiting, cfg_col_chat_bg);
+    gui_color[COLOR_DCC_CONNECTING] = gui_color_build (COLOR_DCC_CONNECTING, cfg_col_dcc_connecting, cfg_col_chat_bg);
+    gui_color[COLOR_DCC_ACTIVE] = gui_color_build (COLOR_DCC_ACTIVE, cfg_col_dcc_active, cfg_col_chat_bg);
+    gui_color[COLOR_DCC_DONE] = gui_color_build (COLOR_DCC_DONE, cfg_col_dcc_done, cfg_col_chat_bg);
+    gui_color[COLOR_DCC_FAILED] = gui_color_build (COLOR_DCC_FAILED, cfg_col_dcc_failed, cfg_col_chat_bg);
+    gui_color[COLOR_DCC_ABORTED] = gui_color_build (COLOR_DCC_ABORTED, cfg_col_dcc_aborted, cfg_col_chat_bg);
+}
+
+/*
+ * gui_rebuild_weechat_colors: rebuild WeeChat colors
+ */
+
+void
+gui_rebuild_weechat_colors ()
+{
+    int i;
+    
+    for (i = 0; i < NUM_COLORS; i++)
+    {
+        if (gui_color[i])
+        {
+            if (gui_color[i]->string)
+                free (gui_color[i]->string);
+            free (gui_color[i]);
+            gui_color[i] = NULL;
+        }
+    }
+    gui_init_weechat_colors ();
+}
+
 /*
  * gui_init_colors: init GUI colors
  */
@@ -2444,162 +3101,23 @@ void
 gui_init_colors ()
 {
     int i;
+    char shift_colors[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
     
     if (has_colors ())
     {
         start_color ();
         use_default_colors ();
         
-        init_pair (COLOR_WIN_TITLE,
-            cfg_col_title, cfg_col_title_bg);
-        init_pair (COLOR_WIN_CHAT,
-            cfg_col_chat, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_TIME,
-            cfg_col_chat_time, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_TIME_SEP,
-            cfg_col_chat_time_sep, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_PREFIX1,
-            cfg_col_chat_prefix1, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_PREFIX2,
-            cfg_col_chat_prefix2, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_SERVER,
-            cfg_col_chat_server, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_JOIN,
-            cfg_col_chat_join, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_PART,
-            cfg_col_chat_part, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_NICK,
-            cfg_col_chat_nick, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_HOST,
-            cfg_col_chat_host, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_CHANNEL,
-            cfg_col_chat_channel, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_DARK,
-            cfg_col_chat_dark, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_HIGHLIGHT,
-            cfg_col_chat_highlight, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_STATUS,
-            cfg_col_status, cfg_col_status_bg);
-        init_pair (COLOR_WIN_STATUS_DELIMITERS,
-            cfg_col_status_delimiters, cfg_col_status_bg);
-        init_pair (COLOR_WIN_STATUS_CHANNEL,
-            cfg_col_status_channel, cfg_col_status_bg);
-        init_pair (COLOR_WIN_STATUS_DATA_MSG,
-            cfg_col_status_data_msg, cfg_col_status_bg);
-        init_pair (COLOR_WIN_STATUS_DATA_PRIVATE,
-            cfg_col_status_data_private, cfg_col_status_bg);
-        init_pair (COLOR_WIN_STATUS_DATA_HIGHLIGHT,
-            cfg_col_status_data_highlight, cfg_col_status_bg);
-        init_pair (COLOR_WIN_STATUS_DATA_OTHER,
-            cfg_col_status_data_other, cfg_col_status_bg);
-        init_pair (COLOR_WIN_STATUS_MORE,
-            cfg_col_status_more, cfg_col_status_bg);
-        init_pair (COLOR_WIN_INFOBAR,
-            cfg_col_infobar, cfg_col_infobar_bg);
-        init_pair (COLOR_WIN_INFOBAR_DELIMITERS,
-            cfg_col_infobar_delimiters, cfg_col_infobar_bg);
-        init_pair (COLOR_WIN_INFOBAR_HIGHLIGHT,
-            cfg_col_infobar_highlight, cfg_col_infobar_bg);
-        init_pair (COLOR_WIN_INPUT,
-            cfg_col_input, cfg_col_input_bg);
-        init_pair (COLOR_WIN_INPUT_CHANNEL,
-            cfg_col_input_channel, cfg_col_input_bg);
-        init_pair (COLOR_WIN_INPUT_NICK,
-            cfg_col_input_nick, cfg_col_input_bg);
-        init_pair (COLOR_WIN_INPUT_DELIMITERS,
-            cfg_col_input_delimiters, cfg_col_input_bg);
-        init_pair (COLOR_WIN_NICK,
-            cfg_col_nick, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_AWAY,
-            cfg_col_nick_away, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_CHANOWNER,
-            cfg_col_nick_chanowner, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_CHANADMIN,
-            cfg_col_nick_chanadmin, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_OP,
-            cfg_col_nick_op, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_HALFOP,
-            cfg_col_nick_halfop, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_VOICE,
-            cfg_col_nick_voice, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_MORE,
-            cfg_col_nick_more, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_SEP,
-            cfg_col_nick_sep, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_SELF,
-            cfg_col_nick_self, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_PRIVATE,
-            cfg_col_nick_private, cfg_col_nick_bg);
+        for (i = 1; i < COLOR_PAIRS; i++)
+            init_pair (i, shift_colors[i % 8], (i < 8) ? -1 : shift_colors[i / 8]);
         
-        for (i = 0; i < COLOR_WIN_NICK_NUMBER; i++)
-        {
-            init_pair (COLOR_WIN_NICK_FIRST + i, cfg_col_nick_colors[i], cfg_col_chat_bg);
-            color_attr[COLOR_WIN_NICK_FIRST + i - 1] = (cfg_col_nick_colors[i] >= 0) ? cfg_col_nick_colors[i] & A_BOLD : 0;
-        }
+        /* disable white on white, replaced by black on white */
+        init_pair (63, -1, -1);
         
-        init_pair (COLOR_DCC_SELECTED,
-            cfg_col_dcc_selected, cfg_col_chat_bg);
-        init_pair (COLOR_DCC_WAITING,
-            cfg_col_dcc_waiting, cfg_col_chat_bg);
-        init_pair (COLOR_DCC_CONNECTING,
-            cfg_col_dcc_connecting, cfg_col_chat_bg);
-        init_pair (COLOR_DCC_ACTIVE,
-            cfg_col_dcc_active, cfg_col_chat_bg);
-        init_pair (COLOR_DCC_DONE,
-            cfg_col_dcc_done, cfg_col_chat_bg);
-        init_pair (COLOR_DCC_FAILED,
-            cfg_col_dcc_failed, cfg_col_chat_bg);
-        init_pair (COLOR_DCC_ABORTED,
-            cfg_col_dcc_aborted, cfg_col_chat_bg);
-            
-        color_attr[COLOR_WIN_TITLE - 1] = (cfg_col_title >= 0) ? cfg_col_title & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT - 1] = (cfg_col_chat >= 0) ? cfg_col_chat & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_TIME - 1] = (cfg_col_chat_time >= 0) ? cfg_col_chat_time & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_TIME_SEP - 1] = (cfg_col_chat_time_sep >= 0) ? cfg_col_chat_time_sep & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_DARK - 1] = (cfg_col_chat_dark >= 0) ? cfg_col_chat_dark & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_PREFIX1 - 1] = (cfg_col_chat_prefix1 >= 0) ? cfg_col_chat_prefix1 & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_PREFIX2 - 1] = (cfg_col_chat_prefix2 >= 0) ? cfg_col_chat_prefix2 & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_SERVER - 1] = (cfg_col_chat_server >= 0) ? cfg_col_chat_server & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_JOIN - 1] = (cfg_col_chat_join >= 0) ? cfg_col_chat_join & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_PART - 1] = (cfg_col_chat_part >= 0) ? cfg_col_chat_part & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_NICK - 1] = (cfg_col_chat_nick >= 0) ? cfg_col_chat_nick & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_HOST - 1] = (cfg_col_chat_host >= 0) ? cfg_col_chat_host & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_CHANNEL - 1] = (cfg_col_chat_channel >= 0) ? cfg_col_chat_channel & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_DARK - 1] = (cfg_col_chat_dark >= 0) ? cfg_col_chat_dark & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_HIGHLIGHT - 1] = (cfg_col_chat_highlight >= 0) ? cfg_col_chat_highlight & A_BOLD : 0;
-        color_attr[COLOR_WIN_STATUS - 1] = (cfg_col_status >= 0) ? cfg_col_status & A_BOLD : 0;
-        color_attr[COLOR_WIN_STATUS_DELIMITERS - 1] = (cfg_col_status_delimiters >= 0) ? cfg_col_status_delimiters & A_BOLD : 0;
-        color_attr[COLOR_WIN_STATUS_CHANNEL - 1] = (cfg_col_status_channel >= 0) ? cfg_col_status_channel & A_BOLD : 0;
-        color_attr[COLOR_WIN_STATUS_DATA_MSG - 1] = (cfg_col_status_data_msg >= 0) ? cfg_col_status_data_msg & A_BOLD : 0;
-        color_attr[COLOR_WIN_STATUS_DATA_PRIVATE - 1] = (cfg_col_status_data_private >= 0) ? cfg_col_status_data_private & A_BOLD : 0;
-        color_attr[COLOR_WIN_STATUS_DATA_HIGHLIGHT - 1] = (cfg_col_status_data_highlight >= 0) ? cfg_col_status_data_highlight & A_BOLD : 0;
-        color_attr[COLOR_WIN_STATUS_DATA_OTHER - 1] = (cfg_col_status_data_other >= 0) ? cfg_col_status_data_other & A_BOLD : 0;
-        color_attr[COLOR_WIN_STATUS_MORE - 1] = (cfg_col_status_more >= 0) ? cfg_col_status_more & A_BOLD : 0;
-        color_attr[COLOR_WIN_INFOBAR - 1] = (cfg_col_infobar >= 0) ? cfg_col_infobar & A_BOLD : 0;
-        color_attr[COLOR_WIN_INFOBAR_DELIMITERS - 1] = (cfg_col_infobar_delimiters >= 0) ? cfg_col_infobar_delimiters & A_BOLD : 0;
-        color_attr[COLOR_WIN_INFOBAR_HIGHLIGHT - 1] = (cfg_col_infobar_highlight >= 0) ? cfg_col_infobar_highlight & A_BOLD : 0;
-        color_attr[COLOR_WIN_INPUT - 1] = (cfg_col_input >= 0) ? cfg_col_input & A_BOLD : 0;
-        color_attr[COLOR_WIN_INPUT_CHANNEL - 1] = (cfg_col_input_channel >= 0) ? cfg_col_input_channel & A_BOLD : 0;
-        color_attr[COLOR_WIN_INPUT_NICK - 1] = (cfg_col_input_nick >= 0) ? cfg_col_input_nick & A_BOLD : 0;
-        color_attr[COLOR_WIN_INPUT_DELIMITERS - 1] = (cfg_col_input_delimiters >= 0) ? cfg_col_input_delimiters & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK - 1] = (cfg_col_nick >= 0) ? cfg_col_nick & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_AWAY - 1] = (cfg_col_nick_away >= 0) ? cfg_col_nick_away & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_CHANOWNER - 1] = (cfg_col_nick_chanowner >= 0) ? cfg_col_nick_chanowner & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_CHANADMIN - 1] = (cfg_col_nick_chanadmin >= 0) ? cfg_col_nick_chanadmin & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_OP - 1] = (cfg_col_nick_op >= 0) ? cfg_col_nick_op & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_HALFOP - 1] = (cfg_col_nick_halfop >= 0) ? cfg_col_nick_halfop & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_VOICE - 1] = (cfg_col_nick_voice >= 0) ? cfg_col_nick_voice & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_MORE - 1] = (cfg_col_nick_more >= 0) ? cfg_col_nick_more & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_SEP - 1] = 0;
-        color_attr[COLOR_WIN_NICK_SELF - 1] = (cfg_col_nick_self >= 0) ? cfg_col_nick_self & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_PRIVATE - 1] = (cfg_col_nick_private >= 0) ? cfg_col_nick_private & A_BOLD : 0;
-        color_attr[COLOR_DCC_SELECTED - 1] = (cfg_col_dcc_selected >= 0) ? cfg_col_dcc_selected & A_BOLD : 0;
-        color_attr[COLOR_DCC_WAITING - 1] = (cfg_col_dcc_waiting >= 0) ? cfg_col_dcc_waiting & A_BOLD : 0;
-        color_attr[COLOR_DCC_CONNECTING - 1] = (cfg_col_dcc_connecting >= 0) ? cfg_col_dcc_connecting & A_BOLD : 0;
-        color_attr[COLOR_DCC_ACTIVE - 1] = (cfg_col_dcc_active >= 0) ? cfg_col_dcc_active & A_BOLD : 0;
-        color_attr[COLOR_DCC_DONE - 1] = (cfg_col_dcc_done >= 0) ? cfg_col_dcc_done & A_BOLD : 0;
-        color_attr[COLOR_DCC_FAILED - 1] = (cfg_col_dcc_failed >= 0) ? cfg_col_dcc_failed & A_BOLD : 0;
-        color_attr[COLOR_DCC_ABORTED - 1] = (cfg_col_dcc_aborted >= 0) ? cfg_col_dcc_aborted & A_BOLD : 0;
+        /* white on default bg is default (-1) */
+        init_pair (WEECHAT_COLOR_WHITE, -1, -1);
+        
+        gui_init_weechat_colors ();
     }
 }
 
@@ -2705,243 +3223,3 @@ gui_end ()
     refresh ();
     endwin ();
 }
-
-/*
- * gui_add_message: add a message to a buffer
- */
-
-void
-gui_add_message (t_gui_buffer *buffer, int type, int color, char *message)
-{
-    char *pos;
-    int length;
-    char *ptr_string;
-    
-    /* create new line if previous was ending by '\n' (or if 1st line) */
-    if (buffer->line_complete)
-    {
-        buffer->line_complete = 0;
-        if (!gui_new_line (buffer))
-            return;
-    }
-    if (!gui_new_message (buffer))
-        return;
-    
-    buffer->last_line->last_message->type = type;
-    buffer->last_line->last_message->color = color;
-    pos = strchr (message, '\n');
-    if (pos)
-    {
-        pos[0] = '\0';
-        buffer->line_complete = 1;
-    }
-    buffer->last_line->last_message->message = strdup (message);
-    ptr_string = buffer->last_line->last_message->message;
-    while (ptr_string[0])
-    {
-        if ((ptr_string[0] > 0) && (ptr_string[0] < 32))
-            ptr_string[0] = 32;
-        ptr_string++;
-    }
-    length = utf8_strlen (message);
-    buffer->last_line->length += length;
-    if (type & MSG_TYPE_MSG)
-        buffer->last_line->line_with_message = 1;
-    if (type & MSG_TYPE_HIGHLIGHT)
-        buffer->last_line->line_with_highlight = 1;
-    if ((type & MSG_TYPE_TIME) || (type & MSG_TYPE_NICK) || (type & MSG_TYPE_PREFIX))
-        buffer->last_line->length_align += length;
-    if (type & MSG_TYPE_NOLOG)
-        buffer->last_line->log_write = 0;
-    if (pos)
-    {
-        pos[0] = '\n';
-        if (buffer->num_displayed > 0)
-            gui_draw_buffer_chat (buffer, 0);
-        if (gui_add_hotlist && (buffer->num_displayed == 0))
-        {
-            if (3 - buffer->last_line->line_with_message -
-                buffer->last_line->line_with_highlight <=
-                buffer->notify_level)
-            {
-                if (buffer->last_line->line_with_highlight)
-                    hotlist_add (HOTLIST_HIGHLIGHT, buffer);
-                else if (BUFFER_IS_PRIVATE(buffer) && (buffer->last_line->line_with_message))
-                    hotlist_add (HOTLIST_PRIVATE, buffer);
-                else if (buffer->last_line->line_with_message)
-                    hotlist_add (HOTLIST_MSG, buffer);
-                else
-                    hotlist_add (HOTLIST_LOW, buffer);
-                gui_draw_buffer_status (gui_current_window->buffer, 1);
-            }
-        }
-    }
-    if (buffer->line_complete && buffer->log_file && buffer->last_line->log_write)
-        log_write_line (buffer, buffer->last_line);
-}
-
-/*
- * gui_printf_internal: display a message in a buffer
- *                      This function should NEVER be called directly.
- *                      You should use macros defined in gui.h
- */
-
-void
-gui_printf_internal (t_gui_buffer *buffer, int display_time, int type, int color, char *message, ...)
-{
-    static char buf[8192];
-    char text_time[1024];
-    char text_time_char[2];
-    time_t time_seconds;
-    struct tm *local_time;
-    int time_first_digit, time_last_digit;
-    char *pos, *buf2, *buf3;
-    int i, j;
-    va_list argptr;
-    static time_t seconds;
-    struct tm *date_tmp;
-    
-    if (gui_init_ok)
-    {
-        if (color == -1)
-            color = COLOR_WIN_CHAT;
-    
-        if (buffer == NULL)
-        {
-            type |= MSG_TYPE_NOLOG;
-            if (SERVER(gui_current_window->buffer))
-                buffer = SERVER(gui_current_window->buffer)->buffer;
-            else
-                buffer = gui_current_window->buffer;
-            
-            if (!buffer || buffer->dcc)
-                buffer = gui_buffers;
-        }
-    
-        if (buffer == NULL)
-        {
-            wee_log_printf ("WARNING: gui_printf_internal without buffer! This is a bug, "
-                            "please send to developers - thanks\n");
-            return;
-        }
-        
-        if (buffer->dcc)
-            buffer = gui_buffers;
-        
-        if (buffer->dcc)
-            return;
-    }
-    
-    va_start (argptr, message);
-    vsnprintf (buf, sizeof (buf) - 1, message, argptr);
-    va_end (argptr);
-    
-    if (!buf[0])
-        return;
-    
-    if (cfg_look_remove_colors_from_msgs)
-    {
-        buf2 = (char *) malloc (strlen (buf) + 2);
-        i = 0;
-        j = 0;
-        while (buf[i])
-        {
-            if (buf[i] == 0x02)
-                i++;
-            else
-            {
-                if (buf[i] == 0x03)
-                {
-                    if ((buf[i+1] >= '0') && (buf[i+1] <= '9')
-                    && (buf[i+2] >= '0') && (buf[i+2] <= '9'))
-                        i += 3;
-                    else
-                        i++;
-                }
-                else
-                    buf2[j++] = buf[i++];
-            }
-        }
-        buf2[j] = '\0';
-    }
-    else
-        buf2 = strdup (buf);
-    
-    if (!local_utf8 || !utf8_is_valid (buf2))
-        buf3 = weechat_convert_encoding ((local_utf8) ?
-                                         cfg_look_charset_decode_iso : cfg_look_charset_decode_utf,
-                                         (cfg_look_charset_internal && cfg_look_charset_internal[0]) ?
-                                         cfg_look_charset_internal : local_charset,
-                                         buf2);
-    else
-        buf3 = strdup (buf2);
-    
-    if (gui_init_ok)
-    {
-        seconds = time (NULL);
-        date_tmp = localtime (&seconds);
-        
-        pos = buf3 - 1;
-        while (pos)
-        {
-            if (display_time
-                && cfg_look_buffer_timestamp && cfg_look_buffer_timestamp[0]
-                && ((!buffer->last_line) || (buffer->line_complete)))
-            {
-                time_seconds = time (NULL);
-                local_time = localtime (&time_seconds);
-                strftime (text_time, sizeof (text_time), cfg_look_buffer_timestamp, local_time);
-                
-                time_first_digit = -1;
-                time_last_digit = -1;
-                i = 0;
-                while (text_time[i])
-                {
-                    if (isdigit (text_time[i]))
-                    {
-                        if (time_first_digit == -1)
-                            time_first_digit = i;
-                        time_last_digit = i;
-                    }
-                    i++;
-                }
-                
-                text_time_char[1] = '\0';
-                i = 0;
-                while (text_time[i])
-                {
-                    text_time_char[0] = text_time[i];
-                    if (time_first_digit < 0)
-                        gui_add_message (buffer, MSG_TYPE_TIME, COLOR_WIN_CHAT_TIME,
-                                         text_time_char);
-                    else
-                    {
-                        if ((i < time_first_digit) || (i > time_last_digit))
-                            gui_add_message (buffer, MSG_TYPE_TIME, COLOR_WIN_CHAT_DARK,
-                                             text_time_char);
-                        else
-                        {
-                            if (isdigit (text_time[i]))
-                                gui_add_message (buffer, MSG_TYPE_TIME, COLOR_WIN_CHAT_TIME,
-                                                 text_time_char);
-                            else
-                                gui_add_message (buffer, MSG_TYPE_TIME, COLOR_WIN_CHAT_TIME_SEP,
-                                                 text_time_char);
-                        }
-                    }
-                    i++;
-                }
-                gui_add_message (buffer, MSG_TYPE_TIME, COLOR_WIN_CHAT_DARK, " ");
-            }
-            gui_add_message (buffer, type, color, pos + 1);
-            pos = strchr (pos + 1, '\n');
-            if (pos && !pos[1])
-                pos = NULL;
-        }
-    }
-    else
-        printf ("%s", buf3);
-    
-    free (buf2);
-    free (buf3);
-}
diff --git a/src/gui/gui-common.c b/src/gui/gui-common.c
index 96066a30b..2f4c6163f 100644
--- a/src/gui/gui-common.c
+++ b/src/gui/gui-common.c
@@ -31,6 +31,7 @@
 #include <string.h>
 #include <signal.h>
 #include <time.h>
+#include <ctype.h>
 
 #include "../common/weechat.h"
 #include "gui.h"
@@ -302,19 +303,12 @@ gui_buffer_clear (t_gui_buffer *buffer)
 {
     t_gui_window *ptr_win;
     t_gui_line *ptr_line;
-    t_gui_message *ptr_message;
     
     while (buffer->lines)
     {
         ptr_line = buffer->lines->next_line;
-        while (buffer->lines->messages)
-        {
-            ptr_message = buffer->lines->messages->next_message;
-            if (buffer->lines->messages->message)
-                free (buffer->lines->messages->message);
-            free (buffer->lines->messages);
-            buffer->lines->messages = ptr_message;
-        }
+        if (buffer->lines->data)
+            free (buffer->lines->data);
         free (buffer->lines);
         buffer->lines = ptr_line;
     }
@@ -351,47 +345,6 @@ gui_buffer_clear_all ()
         gui_buffer_clear (ptr_buffer);
 }
 
-/* 
- * gui_infobar_printf: display message in infobar
- */
-
-void
-gui_infobar_printf (int time_displayed, int color, char *message, ...)
-{
-    static char buffer[1024];
-    va_list argptr;
-    t_gui_infobar *ptr_infobar;
-    char *pos, *buf2;
-    
-    va_start (argptr, message);
-    vsnprintf (buffer, sizeof (buffer) - 1, message, argptr);
-    va_end (argptr);
-    
-    buf2 = weechat_convert_encoding ((local_utf8) ?
-                                     cfg_look_charset_decode_iso : cfg_look_charset_decode_utf,
-                                     (cfg_look_charset_internal && cfg_look_charset_internal[0]) ?
-                                     cfg_look_charset_internal : local_charset,
-                                     buffer);
-    
-    ptr_infobar = (t_gui_infobar *)malloc (sizeof (t_gui_infobar));
-    if (ptr_infobar)
-    {
-        ptr_infobar->color = color;
-        ptr_infobar->text = strdup (buf2);
-        pos = strchr (ptr_infobar->text, '\n');
-        if (pos)
-            pos[0] = '\0';
-        ptr_infobar->remaining_time = (time_displayed <= 0) ? -1 : time_displayed;
-        ptr_infobar->next_infobar = gui_infobar;
-        gui_infobar = ptr_infobar;
-        gui_draw_buffer_infobar (gui_current_window->buffer, 1);
-    }
-    else
-        wee_log_printf (_("Not enough memory for infobar message\n"));
-    
-    free (buf2);
-}
-
 /*
  * gui_window_free: delete a window
  */
@@ -415,25 +368,6 @@ gui_window_free (t_gui_window *window)
     free (window);
 }
 
-/*
- * gui_infobar_remove: remove last displayed message in infobar
- */
-
-void
-gui_infobar_remove ()
-{
-    t_gui_infobar *new_infobar;
-    
-    if (gui_infobar)
-    {
-        new_infobar = gui_infobar->next_infobar;
-        if (gui_infobar->text)
-            free (gui_infobar->text);
-        free (gui_infobar);
-        gui_infobar = new_infobar;
-    }
-}
-
 /*
  * gui_line_free: delete a line from a buffer
  */
@@ -442,8 +376,7 @@ void
 gui_line_free (t_gui_line *line)
 {
     t_gui_window *ptr_win;
-    t_gui_message *ptr_message;
-
+    
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
     {
         if (ptr_win->start_line == line)
@@ -452,14 +385,8 @@ gui_line_free (t_gui_line *line)
             ptr_win->start_line_pos = 0;
         }
     }
-    while (line->messages)
-    {
-        ptr_message = line->messages->next_message;
-        if (line->messages->message)
-            free (line->messages->message);
-        free (line->messages);
-        line->messages = ptr_message;
-    }
+    if (line->data)
+        free (line->data);
     free (line);
 }
 
@@ -566,8 +493,7 @@ gui_new_line (t_gui_buffer *buffer)
         new_line->log_write = 1;
         new_line->line_with_message = 0;
         new_line->line_with_highlight = 0;
-        new_line->messages = NULL;
-        new_line->last_message = NULL;
+        new_line->data = NULL;
         if (!buffer->lines)
             buffer->lines = new_line;
         else
@@ -602,30 +528,345 @@ gui_new_line (t_gui_buffer *buffer)
 }
 
 /*
- * gui_new_message: create a new message for last line of a buffer
+ * gui_word_strlen: returns length of a word
+ *                  special chars like color, bold, .. are ignored
  */
 
-t_gui_message *
-gui_new_message (t_gui_buffer *buffer)
+int
+gui_word_strlen (t_gui_window *window, char *string)
 {
-    t_gui_message *new_message;
+    int length;
     
-    if ((new_message = (t_gui_message *) malloc (sizeof (struct t_gui_message))))
+    length = 0;
+    while (string && string[0])
     {
-        if (!buffer->last_line->messages)
-            buffer->last_line->messages = new_message;
-        else
-            buffer->last_line->last_message->next_message = new_message;
-        new_message->prev_message = buffer->last_line->last_message;
-        new_message->next_message = NULL;
-        buffer->last_line->last_message = new_message;
+        string = gui_word_get_next_char (window, (unsigned char *)string, 0);
+        if (string)
+            length++;
+    }
+    return length;
+}
+
+/*
+ * gui_word_real_pos: get real position in string (ignoring color/bold/.. chars)
+ */
+
+int
+gui_word_real_pos (t_gui_window *window, char *string, int pos)
+{
+    char *saved_pos;
+    int real_pos;
+    
+    if (pos <= 0)
+        return 0;
+    
+    real_pos = 0;
+    while (string && string[0] && (pos > 0))
+    {
+        saved_pos = string;
+        string = gui_word_get_next_char (window, (unsigned char *)string, 0);
+        pos--;
+        if (string)
+            real_pos += (string - saved_pos);
+    }
+    return real_pos;
+}
+
+/*
+ * gui_add_to_line: add a message to last line of buffer
+ */
+
+void
+gui_add_to_line (t_gui_buffer *buffer, int type, char *message)
+{
+    char *pos;
+    int length;
+    
+    /* create new line if previous was ending by '\n' (or if 1st line) */
+    if (buffer->line_complete)
+    {
+        buffer->line_complete = 0;
+        if (!gui_new_line (buffer))
+            return;
+    }
+    
+    pos = strchr (message, '\n');
+    if (pos)
+    {
+        pos[0] = '\0';
+        buffer->line_complete = 1;
+    }
+    if (buffer->last_line->data)
+    {
+        buffer->last_line->data = (char *) realloc (buffer->last_line->data,
+                                                    strlen (buffer->last_line->data) +
+                                                    strlen (message) + 1);
+        strcat (buffer->last_line->data, message);
     }
     else
+        buffer->last_line->data = strdup (message);
+    
+    length = gui_word_strlen (NULL, message);
+    buffer->last_line->length += length;
+    if (type & MSG_TYPE_MSG)
+        buffer->last_line->line_with_message = 1;
+    if (type & MSG_TYPE_HIGHLIGHT)
+        buffer->last_line->line_with_highlight = 1;
+    if ((type & MSG_TYPE_TIME) || (type & MSG_TYPE_NICK) || (type & MSG_TYPE_PREFIX))
+        buffer->last_line->length_align += length;
+    if (type & MSG_TYPE_NOLOG)
+        buffer->last_line->log_write = 0;
+    if (pos)
     {
-        wee_log_printf (_("Not enough memory for new message\n"));
-        return NULL;
+        pos[0] = '\n';
+        if (buffer->num_displayed > 0)
+            gui_draw_buffer_chat (buffer, 0);
+        if (gui_add_hotlist && (buffer->num_displayed == 0))
+        {
+            if (3 - buffer->last_line->line_with_message -
+                buffer->last_line->line_with_highlight <=
+                buffer->notify_level)
+            {
+                if (buffer->last_line->line_with_highlight)
+                    hotlist_add (HOTLIST_HIGHLIGHT, buffer);
+                else if (BUFFER_IS_PRIVATE(buffer) && (buffer->last_line->line_with_message))
+                    hotlist_add (HOTLIST_PRIVATE, buffer);
+                else if (buffer->last_line->line_with_message)
+                    hotlist_add (HOTLIST_MSG, buffer);
+                else
+                    hotlist_add (HOTLIST_LOW, buffer);
+                gui_draw_buffer_status (gui_current_window->buffer, 1);
+            }
+        }
+    }
+    if (buffer->line_complete && buffer->log_file && buffer->last_line->log_write)
+    {
+        log_write (buffer, buffer->last_line->data);
+        log_write (buffer, "\n");
+    }
+}
+
+/*
+ * gui_printf_internal: display a message in a buffer
+ *                      This function should NEVER be called directly.
+ *                      You should use macros defined in gui.h
+ */
+
+void
+gui_printf_internal (t_gui_buffer *buffer, int display_time, int type, char *message, ...)
+{
+    static char buf[8192];
+    char text_time[1024];
+    char text_time_char[2];
+    time_t time_seconds;
+    struct tm *local_time;
+    int time_first_digit, time_last_digit;
+    char *pos, *buf2;
+    int i;
+    va_list argptr;
+    static time_t seconds;
+    struct tm *date_tmp;
+    
+    if (gui_init_ok)
+    {
+        if (buffer == NULL)
+        {
+            type |= MSG_TYPE_NOLOG;
+            if (SERVER(gui_current_window->buffer))
+                buffer = SERVER(gui_current_window->buffer)->buffer;
+            else
+                buffer = gui_current_window->buffer;
+            
+            if (!buffer || buffer->dcc)
+                buffer = gui_buffers;
+        }
+    
+        if (buffer == NULL)
+        {
+            wee_log_printf ("WARNING: gui_printf_internal without buffer! This is a bug, "
+                            "please send to developers - thanks\n");
+            return;
+        }
+        
+        if (buffer->dcc)
+            buffer = gui_buffers;
+        
+        if (buffer->dcc)
+            return;
+    }
+    
+    va_start (argptr, message);
+    vsnprintf (buf, sizeof (buf) - 1, message, argptr);
+    va_end (argptr);
+    
+    if (!buf[0])
+        return;
+    
+    if (!local_utf8 || !utf8_is_valid (buf))
+        buf2 = weechat_convert_encoding ((local_utf8) ?
+                                         cfg_look_charset_decode_iso : cfg_look_charset_decode_utf,
+                                         (cfg_look_charset_internal && cfg_look_charset_internal[0]) ?
+                                         cfg_look_charset_internal : local_charset,
+                                         buf);
+    else
+        buf2 = strdup (buf);
+    
+    if (gui_init_ok)
+    {
+        seconds = time (NULL);
+        date_tmp = localtime (&seconds);
+        
+        pos = buf2 - 1;
+        while (pos)
+        {
+            if (display_time
+                && cfg_look_buffer_timestamp && cfg_look_buffer_timestamp[0]
+                && ((!buffer->last_line) || (buffer->line_complete)))
+            {
+                time_seconds = time (NULL);
+                local_time = localtime (&time_seconds);
+                strftime (text_time, sizeof (text_time), cfg_look_buffer_timestamp, local_time);
+                
+                time_first_digit = -1;
+                time_last_digit = -1;
+                i = 0;
+                while (text_time[i])
+                {
+                    if (isdigit (text_time[i]))
+                    {
+                        if (time_first_digit == -1)
+                            time_first_digit = i;
+                        time_last_digit = i;
+                    }
+                    i++;
+                }
+                
+                text_time_char[1] = '\0';
+                i = 0;
+                while (text_time[i])
+                {
+                    text_time_char[0] = text_time[i];
+                    if (time_first_digit < 0)
+                    {
+                        gui_add_to_line (buffer, MSG_TYPE_TIME,
+                                         GUI_COLOR(COLOR_WIN_CHAT_TIME));
+                        gui_add_to_line (buffer, MSG_TYPE_TIME, text_time_char);
+                    }
+                    else
+                    {
+                        if ((i < time_first_digit) || (i > time_last_digit))
+                        {
+                            gui_add_to_line (buffer, MSG_TYPE_TIME,
+                                             GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                            gui_add_to_line (buffer, MSG_TYPE_TIME, text_time_char);
+                        }
+                        else
+                        {
+                            if (isdigit (text_time[i]))
+                            {
+                                gui_add_to_line (buffer, MSG_TYPE_TIME,
+                                                 GUI_COLOR(COLOR_WIN_CHAT_TIME));
+                                gui_add_to_line (buffer, MSG_TYPE_TIME, text_time_char);
+                            }
+                            else
+                            {
+                                gui_add_to_line (buffer, MSG_TYPE_TIME,
+                                                 GUI_COLOR(COLOR_WIN_CHAT_TIME_SEP));
+                                gui_add_to_line (buffer, MSG_TYPE_TIME, text_time_char);
+                            }
+                        }
+                    }
+                    i++;
+                }
+                gui_add_to_line (buffer, MSG_TYPE_TIME, GUI_COLOR(COLOR_WIN_CHAT));
+                gui_add_to_line (buffer, MSG_TYPE_TIME, " ");
+            }
+            gui_add_to_line (buffer, type, pos + 1);
+            pos = strchr (pos + 1, '\n');
+            if (pos && !pos[1])
+                pos = NULL;
+        }
+    }
+    else
+        printf ("%s", buf2);
+    
+    free (buf2);
+}
+
+/* 
+ * gui_infobar_printf: display message in infobar
+ */
+
+void
+gui_infobar_printf (int time_displayed, int color, char *message, ...)
+{
+    static char buffer[1024];
+    va_list argptr;
+    t_gui_infobar *ptr_infobar;
+    char *pos, *buf2, *buf3;
+    
+    va_start (argptr, message);
+    vsnprintf (buffer, sizeof (buffer) - 1, message, argptr);
+    va_end (argptr);
+    
+    buf2 = (char *)gui_color_decode ((unsigned char *)buffer, 0);
+    
+    if (buf2)
+    {
+        if (!local_utf8 || !utf8_is_valid (buf2))
+            buf3 = weechat_convert_encoding ((local_utf8) ?
+                                             cfg_look_charset_decode_iso : cfg_look_charset_decode_utf,
+                                             (cfg_look_charset_internal && cfg_look_charset_internal[0]) ?
+                                             cfg_look_charset_internal : local_charset,
+                                             buf2);
+        else
+            buf3 = strdup (buf2);
+    }
+    else
+        buf3 = NULL;
+    
+    if (buf3)
+    {
+        ptr_infobar = (t_gui_infobar *)malloc (sizeof (t_gui_infobar));
+        if (ptr_infobar)
+        {
+            ptr_infobar->color = color;
+            ptr_infobar->text = strdup (buf3);
+            pos = strchr (ptr_infobar->text, '\n');
+            if (pos)
+                pos[0] = '\0';
+            ptr_infobar->remaining_time = (time_displayed <= 0) ? -1 : time_displayed;
+            ptr_infobar->next_infobar = gui_infobar;
+            gui_infobar = ptr_infobar;
+            gui_draw_buffer_infobar (gui_current_window->buffer, 1);
+        }
+        else
+            wee_log_printf (_("Not enough memory for infobar message\n"));
+    }
+    
+    if (buf2)
+        free (buf2);
+    if (buf3)
+        free (buf3);
+}
+
+/*
+ * gui_infobar_remove: remove last displayed message in infobar
+ */
+
+void
+gui_infobar_remove ()
+{
+    t_gui_infobar *new_infobar;
+    
+    if (gui_infobar)
+    {
+        new_infobar = gui_infobar->next_infobar;
+        if (gui_infobar->text)
+            free (gui_infobar->text);
+        free (gui_infobar);
+        gui_infobar = new_infobar;
     }
-    return new_message;
 }
 
 /*
@@ -1219,9 +1460,7 @@ void
 gui_buffer_print_log (t_gui_buffer *buffer)
 {
     t_gui_line *ptr_line;
-    t_gui_message *ptr_message;
     int num;
-    char buf[4096];
     
     wee_log_printf ("[buffer (addr:0x%X)]\n", buffer);
     wee_log_printf ("  num_displayed. . . . : %d\n",   buffer->num_displayed);
@@ -1266,16 +1505,10 @@ gui_buffer_print_log (t_gui_buffer *buffer)
     
     while (ptr_line)
     {
-        buf[0] = '\0';
-        for (ptr_message = ptr_line->messages; ptr_message;
-            ptr_message = ptr_message->next_message)
-        {
-            if (strlen (buf) + strlen (ptr_message->message) + 1 >= sizeof (buf))
-                break;
-            strcat (buf, ptr_message->message);
-        }
         num--;
-        wee_log_printf ("       line N-%05d: %s\n", num, buf);
+        wee_log_printf ("       line N-%05d: %s\n",
+                        num,
+                        (ptr_line->data) ? ptr_line->data : "(empty)");
         
         ptr_line = ptr_line->next_line;
     }
diff --git a/src/gui/gui.h b/src/gui/gui.h
index fdc5f4493..09f13dbca 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -26,57 +26,114 @@
 
 #define INPUT_BUFFER_BLOCK_SIZE 256
 
-#define NUM_COLORS                      57
-#define COLOR_WIN_TITLE                 1
-#define COLOR_WIN_CHAT                  2
-#define COLOR_WIN_CHAT_TIME             3
-#define COLOR_WIN_CHAT_TIME_SEP         4
-#define COLOR_WIN_CHAT_PREFIX1          5
-#define COLOR_WIN_CHAT_PREFIX2          6
-#define COLOR_WIN_CHAT_SERVER           7
-#define COLOR_WIN_CHAT_JOIN             8
-#define COLOR_WIN_CHAT_PART             9
-#define COLOR_WIN_CHAT_NICK             10
-#define COLOR_WIN_CHAT_HOST             11
-#define COLOR_WIN_CHAT_CHANNEL          12
-#define COLOR_WIN_CHAT_DARK             13
-#define COLOR_WIN_CHAT_HIGHLIGHT        14
-#define COLOR_WIN_STATUS                15
-#define COLOR_WIN_STATUS_DELIMITERS     16
-#define COLOR_WIN_STATUS_CHANNEL        17
-#define COLOR_WIN_STATUS_DATA_MSG       18
-#define COLOR_WIN_STATUS_DATA_PRIVATE   19
-#define COLOR_WIN_STATUS_DATA_HIGHLIGHT 20
-#define COLOR_WIN_STATUS_DATA_OTHER     21
-#define COLOR_WIN_STATUS_MORE           22
-#define COLOR_WIN_INFOBAR               23
-#define COLOR_WIN_INFOBAR_DELIMITERS    24
-#define COLOR_WIN_INFOBAR_HIGHLIGHT     25
-#define COLOR_WIN_INPUT                 26
-#define COLOR_WIN_INPUT_CHANNEL         27
-#define COLOR_WIN_INPUT_NICK            28
-#define COLOR_WIN_INPUT_DELIMITERS      29
-#define COLOR_WIN_NICK                  30
-#define COLOR_WIN_NICK_AWAY             31
-#define COLOR_WIN_NICK_CHANOWNER        32
-#define COLOR_WIN_NICK_CHANADMIN        33
-#define COLOR_WIN_NICK_OP               34
-#define COLOR_WIN_NICK_HALFOP           35
-#define COLOR_WIN_NICK_VOICE            36
-#define COLOR_WIN_NICK_MORE             37
-#define COLOR_WIN_NICK_SEP              38
-#define COLOR_WIN_NICK_SELF             39
-#define COLOR_WIN_NICK_PRIVATE          40
-#define COLOR_WIN_NICK_FIRST            41
-#define COLOR_WIN_NICK_LAST             50
-#define COLOR_WIN_NICK_NUMBER           (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1)
-#define COLOR_DCC_SELECTED              51
-#define COLOR_DCC_WAITING               52
-#define COLOR_DCC_CONNECTING            53
-#define COLOR_DCC_ACTIVE                54
-#define COLOR_DCC_DONE                  55
-#define COLOR_DCC_FAILED                56
-#define COLOR_DCC_ABORTED               57
+/* shift ncurses colors for compatibility with colors
+   in IRC messages (same as other IRC clients) */
+
+#define WEECHAT_COLOR_BLACK   COLOR_BLACK
+#define WEECHAT_COLOR_RED     COLOR_BLUE
+#define WEECHAT_COLOR_GREEN   COLOR_GREEN
+#define WEECHAT_COLOR_YELLOW  COLOR_CYAN
+#define WEECHAT_COLOR_BLUE    COLOR_RED
+#define WEECHAT_COLOR_MAGENTA COLOR_MAGENTA
+#define WEECHAT_COLOR_CYAN    COLOR_YELLOW
+#define WEECHAT_COLOR_WHITE   COLOR_WHITE
+
+#define COLOR_WIN_NICK_NUMBER 10
+
+typedef enum t_weechat_color t_weechat_color;
+
+enum t_weechat_color
+{
+    COLOR_WIN_TITLE = 0,
+    COLOR_WIN_CHAT,
+    COLOR_WIN_CHAT_TIME,
+    COLOR_WIN_CHAT_TIME_SEP,
+    COLOR_WIN_CHAT_PREFIX1,
+    COLOR_WIN_CHAT_PREFIX2,
+    COLOR_WIN_CHAT_SERVER,
+    COLOR_WIN_CHAT_JOIN,
+    COLOR_WIN_CHAT_PART,
+    COLOR_WIN_CHAT_NICK,
+    COLOR_WIN_CHAT_HOST,
+    COLOR_WIN_CHAT_CHANNEL,
+    COLOR_WIN_CHAT_DARK,
+    COLOR_WIN_CHAT_HIGHLIGHT,
+    COLOR_WIN_STATUS,
+    COLOR_WIN_STATUS_DELIMITERS,
+    COLOR_WIN_STATUS_CHANNEL,
+    COLOR_WIN_STATUS_DATA_MSG,
+    COLOR_WIN_STATUS_DATA_PRIVATE,
+    COLOR_WIN_STATUS_DATA_HIGHLIGHT,
+    COLOR_WIN_STATUS_DATA_OTHER,
+    COLOR_WIN_STATUS_MORE,
+    COLOR_WIN_INFOBAR,
+    COLOR_WIN_INFOBAR_DELIMITERS,
+    COLOR_WIN_INFOBAR_HIGHLIGHT,
+    COLOR_WIN_INPUT,
+    COLOR_WIN_INPUT_CHANNEL,
+    COLOR_WIN_INPUT_NICK,
+    COLOR_WIN_INPUT_DELIMITERS,
+    COLOR_WIN_NICK,
+    COLOR_WIN_NICK_AWAY,
+    COLOR_WIN_NICK_CHANOWNER,
+    COLOR_WIN_NICK_CHANADMIN,
+    COLOR_WIN_NICK_OP,
+    COLOR_WIN_NICK_HALFOP,
+    COLOR_WIN_NICK_VOICE,
+    COLOR_WIN_NICK_MORE,
+    COLOR_WIN_NICK_SEP,
+    COLOR_WIN_NICK_SELF,
+    COLOR_WIN_NICK_PRIVATE,
+    COLOR_WIN_NICK_1,
+    COLOR_WIN_NICK_2,
+    COLOR_WIN_NICK_3,
+    COLOR_WIN_NICK_4,
+    COLOR_WIN_NICK_5,
+    COLOR_WIN_NICK_6,
+    COLOR_WIN_NICK_7,
+    COLOR_WIN_NICK_8,
+    COLOR_WIN_NICK_9,
+    COLOR_WIN_NICK_10,
+    COLOR_DCC_SELECTED,
+    COLOR_DCC_WAITING,
+    COLOR_DCC_CONNECTING,
+    COLOR_DCC_ACTIVE,
+    COLOR_DCC_DONE,
+    COLOR_DCC_FAILED,
+    COLOR_DCC_ABORTED,
+    NUM_COLORS
+};
+
+/* attributes in IRC messages for color & style (bold, ..) */
+
+#define GUI_ATTR_BOLD_CHAR        '\x02'
+#define GUI_ATTR_BOLD_STR         "\x02"
+#define GUI_ATTR_COLOR_CHAR       '\x03'
+#define GUI_ATTR_COLOR_STR        "\x03"
+#define GUI_ATTR_RESET_CHAR       '\x0F'
+#define GUI_ATTR_RESET_STR        "\x0F"
+#define GUI_ATTR_FIXED_CHAR       '\x11'
+#define GUI_ATTR_FIXED_STR        "\x11"
+#define GUI_ATTR_REVERSE_CHAR     '\x12'
+#define GUI_ATTR_REVERSE_STR      "\x12"
+#define GUI_ATTR_REVERSE2_CHAR    '\x16'
+#define GUI_ATTR_REVERSE2_STR     "\x16"
+#define GUI_ATTR_ITALIC_CHAR      '\x1D'
+#define GUI_ATTR_ITALIC_STR       "\x1D"
+#define GUI_ATTR_UNDERLINE_CHAR   '\x1F'
+#define GUI_ATTR_UNDERLINE_STR    "\x1F"
+
+/* WeeChat internal attributes (should never be in IRC messages) */
+
+#define GUI_ATTR_WEECHAT_COLOR_CHAR  '\x19'
+#define GUI_ATTR_WEECHAT_COLOR_STR   "\x19"
+#define GUI_ATTR_WEECHAT_SET_CHAR    '\x1A'
+#define GUI_ATTR_WEECHAT_SET_STR     "\x1A"
+#define GUI_ATTR_WEECHAT_REMOVE_CHAR '\x1B'
+#define GUI_ATTR_WEECHAT_REMOVE_STR  "\x1B"
+
+#define GUI_COLOR(color) ((gui_color[color]) ? gui_color[color]->string : "")
+#define GUI_NO_COLOR     GUI_ATTR_RESET_STR
 
 #define SERVER(buffer)  ((t_irc_server *)(buffer->server))
 #define CHANNEL(buffer) ((t_irc_channel *)(buffer->channel))
@@ -85,6 +142,8 @@
 #define BUFFER_IS_CHANNEL(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHAT_CHANNEL))
 #define BUFFER_IS_PRIVATE(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHAT_PRIVATE))
 
+#define BUFFER_HAS_NICKLIST(buffer) (BUFFER_IS_CHANNEL(buffer))
+
 #define MSG_TYPE_TIME      1
 #define MSG_TYPE_PREFIX    2
 #define MSG_TYPE_NICK      4
@@ -94,22 +153,16 @@
 #define MSG_TYPE_NOLOG     64
 
 #define gui_printf(buffer, fmt, argz...) \
-    gui_printf_internal(buffer, 1, MSG_TYPE_INFO, -1, fmt, ##argz)
-
-#define gui_printf_color(buffer, color, fmt, argz...) \
-    gui_printf_internal(buffer, 1, MSG_TYPE_INFO, color, fmt, ##argz)
+    gui_printf_internal(buffer, 1, MSG_TYPE_INFO, fmt, ##argz)
 
 #define gui_printf_type(buffer, type, fmt, argz...) \
-    gui_printf_internal(buffer, 1, type, -1, fmt, ##argz)
-
-#define gui_printf_type_color(buffer, type, color, fmt, argz...) \
-    gui_printf_internal(buffer, 1, type, color, fmt, ##argz)
+    gui_printf_internal(buffer, 1, type, fmt, ##argz)
 
 #define gui_printf_nolog(buffer, fmt, argz...) \
-    gui_printf_internal(buffer, 1, MSG_TYPE_INFO | MSG_TYPE_NOLOG, -1, fmt, ##argz)
+    gui_printf_internal(buffer, 1, MSG_TYPE_INFO | MSG_TYPE_NOLOG, fmt, ##argz)
 
 #define gui_printf_nolog_notime(buffer, fmt, argz...) \
-    gui_printf_internal(buffer, 0, MSG_TYPE_NOLOG, -1, fmt, ##argz)
+    gui_printf_internal(buffer, 0, MSG_TYPE_NOLOG, fmt, ##argz)
 
 #define NOTIFY_LEVEL_MIN        0
 #define NOTIFY_LEVEL_MAX        3
@@ -118,38 +171,14 @@
 #define KEY_SHOW_MODE_DISPLAY   1
 #define KEY_SHOW_MODE_BIND      2
 
-typedef struct t_gui_message t_gui_message;
-
-struct t_gui_message
-{
-    int type;                       /* type of message (time, nick, other)  */
-    int color;                      /* color of message                     */
-    char *message;                  /* message content                      */
-    t_gui_message *prev_message;    /* link to previous message for line    */
-    t_gui_message *next_message;    /* link to next message for line        */
-};
-
-typedef struct t_gui_line t_gui_line;
-
-struct t_gui_line
-{
-    int length;                     /* length of the line (in char)         */
-    int length_align;               /* alignment length (time or time/nick) */
-    int log_write;                  /* = 1 if line will be written to log   */
-    int line_with_message;          /* line contains a message from a user? */
-    int line_with_highlight;        /* line contains highlight              */
-    t_gui_message *messages;        /* messages for the line                */
-    t_gui_message *last_message;    /* last message of the line             */
-    t_gui_line *prev_line;          /* link to previous line                */
-    t_gui_line *next_line;          /* link to next line                    */
-};
-
 typedef struct t_gui_color t_gui_color;
 
 struct t_gui_color
 {
-    char *name;
-    int color;
+    int foreground;                 /* foreground color                     */
+    int background;                 /* background color                     */
+    int attributes;                 /* attributes (bold, ..)                */
+    char *string;                   /* WeeChat color: "\x19??", ?? is #color*/
 };
 
 typedef struct t_gui_infobar t_gui_infobar;
@@ -164,6 +193,20 @@ struct t_gui_infobar
     t_gui_infobar *next_infobar;    /* next message for infobar             */
 };
 
+typedef struct t_gui_line t_gui_line;
+
+struct t_gui_line
+{
+    int length;                     /* length of the line (in char)         */
+    int length_align;               /* alignment length (time or time/nick) */
+    int log_write;                  /* = 1 if line will be written to log   */
+    int line_with_message;          /* line contains a message from a user? */
+    int line_with_highlight;        /* line contains highlight              */
+    char *data;                     /* line content                         */
+    t_gui_line *prev_line;          /* link to previous line                */
+    t_gui_line *next_line;          /* link to next line                    */
+};
+
 typedef struct t_gui_buffer t_gui_buffer;
 
 struct t_gui_buffer
@@ -260,6 +303,11 @@ struct t_gui_window
     /* windows for Qt GUI */
     /* TODO: declare Qt window */
     
+    int current_style_fg;;          /* current color used for foreground    */
+    int current_style_bg;;          /* current color used for background    */
+    int current_style_attr;         /* current attributes (bold, ..)        */
+    int current_color_attr;         /* attr sum of last color(s) displayed  */
+    
     /* DCC */
     void *dcc_first;                /* first dcc displayed                  */
     void *dcc_selected;             /* selected dcc                         */
@@ -316,6 +364,8 @@ extern int gui_key_grab;
 extern int gui_key_grab_count;
 extern char *gui_input_clipboard;
 
+extern t_gui_color *gui_color[NUM_COLORS];
+
 /* GUI independent functions: windows & buffers */
 
 extern t_gui_window *gui_window_new (int, int, int, int);
@@ -327,7 +377,9 @@ extern void gui_window_free (t_gui_window *);
 extern void gui_infobar_remove ();
 extern void gui_buffer_free (t_gui_buffer *, int);
 extern t_gui_line *gui_new_line (t_gui_buffer *);
-extern t_gui_message *gui_new_message (t_gui_buffer *);
+extern int gui_word_strlen (t_gui_window *, char *);
+extern int gui_word_real_pos (t_gui_window *, char *, int);
+extern void gui_printf_internal (t_gui_buffer *, int, int, char *, ...);
 extern void gui_optimize_input_buffer_size (t_gui_buffer *);
 extern void gui_exec_action_dcc (t_gui_window *, char *);
 extern int gui_insert_string_input (t_gui_window *, char *, int);
@@ -403,11 +455,13 @@ extern void gui_key_free_all ();
 /* GUI dependant functions: display */
 
 extern int gui_assign_color (int *, char *);
-extern int gui_get_color_by_name (char *);
-extern char *gui_get_color_by_value (int);
+extern char *gui_get_color_name (int);
+extern unsigned char *gui_color_decode (unsigned char *, int);
+extern unsigned char *gui_color_encode (unsigned char *);
 extern int gui_buffer_has_nicklist (t_gui_buffer *);
 extern void gui_calculate_pos_size (t_gui_window *);
 extern void gui_draw_buffer_title (t_gui_buffer *, int);
+extern char *gui_word_get_next_char (t_gui_window *, unsigned char *, int);
 extern void gui_draw_buffer_chat (t_gui_buffer *, int);
 extern void gui_draw_buffer_nick (t_gui_buffer *, int);
 extern void gui_draw_buffer_status (t_gui_buffer *, int);
@@ -434,11 +488,10 @@ extern void gui_window_merge_auto (t_gui_window *);
 extern void gui_window_merge_all (t_gui_window *);
 extern void gui_refresh_screen ();
 extern void gui_pre_init (int *, char **[]);
-extern void gui_init_colors ();
+extern void gui_rebuild_weechat_colors ();
 extern void gui_set_window_title ();
 extern void gui_init ();
 extern void gui_end ();
-extern void gui_printf_internal (t_gui_buffer *, int, int, int, char *, ...);
 extern void gui_input_default_key_bindings ();
 extern void gui_main_loop ();
 
diff --git a/src/irc/irc-commands.c b/src/irc/irc-commands.c
index 2ddd68485..f994d2262 100644
--- a/src/irc/irc-commands.c
+++ b/src/irc/irc-commands.c
@@ -384,6 +384,7 @@ t_irc_command irc_commands[] =
   { "375", N_("a server message"),            "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
   { "376", N_("a server message"),            "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
   { "381", N_("you are now an IRC operator"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "382", N_("rehashing"),                   "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
   { "391", N_("server local time"),           "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
   { "401", N_("no such nick/channel"),
     "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
diff --git a/src/irc/irc-dcc.c b/src/irc/irc-dcc.c
index 739fe93c1..103791aa2 100644
--- a/src/irc/irc-dcc.c
+++ b/src/irc/irc-dcc.c
@@ -364,30 +364,26 @@ dcc_close (t_irc_dcc *ptr_dcc, int status)
         {
             irc_display_prefix (ptr_dcc->server, ptr_dcc->server->buffer,
                                 PREFIX_INFO);
-            gui_printf (ptr_dcc->server->buffer, _("DCC: file "));
-            gui_printf_color (ptr_dcc->server->buffer,
-                              COLOR_WIN_CHAT_CHANNEL,
-                              "%s",
-                              ptr_dcc->filename);
+            gui_printf (ptr_dcc->server->buffer,
+                        _("DCC: file %s%s%s"),
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        ptr_dcc->filename,
+                        GUI_COLOR(COLOR_WIN_CHAT));
             if (ptr_dcc->local_filename)
-            {
-                gui_printf (ptr_dcc->server->buffer, _(" (local filename: "));
-                gui_printf_color (ptr_dcc->server->buffer,
-                                  COLOR_WIN_CHAT_CHANNEL,
-                                  "%s",
-                                  ptr_dcc->local_filename);
-                gui_printf (ptr_dcc->server->buffer, ")");
-            }
+                gui_printf (ptr_dcc->server->buffer,
+                            _(" (local filename: %s%s%s)"),
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                            ptr_dcc->local_filename,
+                            GUI_COLOR(COLOR_WIN_CHAT));
             if (ptr_dcc->type == DCC_FILE_SEND)
                 gui_printf (ptr_dcc->server->buffer, _(" sent to "));
             else
                 gui_printf (ptr_dcc->server->buffer, _(" received from "));
-            gui_printf_color (ptr_dcc->server->buffer,
-                              COLOR_WIN_CHAT_NICK,
-                              "%s",
-                              ptr_dcc->nick);
-            gui_printf (ptr_dcc->server->buffer,
-                        (status == DCC_DONE) ? _(": ok!\n") : _(": FAILED\n"));
+            gui_printf (ptr_dcc->server->buffer, "%s%s%s: %s\n",
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        ptr_dcc->nick,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        (status == DCC_DONE) ? _("OK") : _("FAILED"));
         }
     }
     if (status == DCC_ABORTED)
@@ -399,15 +395,17 @@ dcc_close (t_irc_dcc *ptr_dcc, int status)
             else
                 ptr_buffer = ptr_dcc->server->buffer;
             irc_display_prefix (ptr_dcc->server, ptr_buffer, PREFIX_INFO);
-            gui_printf (ptr_buffer, _("DCC chat closed with "));
-            gui_printf_color (ptr_buffer, COLOR_WIN_CHAT_NICK,
-                              "%s", ptr_dcc->nick);
-            gui_printf_color (ptr_buffer, COLOR_WIN_CHAT_DARK, " (");
-            gui_printf_color (ptr_buffer, COLOR_WIN_CHAT_HOST,
-                              "%d.%d.%d.%d",
-                              ptr_dcc->addr >> 24, (ptr_dcc->addr >> 16) & 0xff,
-                              (ptr_dcc->addr >> 8) & 0xff, ptr_dcc->addr & 0xff);
-            gui_printf_color (ptr_buffer, COLOR_WIN_CHAT_DARK, ")\n");
+            gui_printf (ptr_buffer,
+                        _("DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        ptr_dcc->nick,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                        ptr_dcc->addr >> 24,
+                        (ptr_dcc->addr >> 16) & 0xff,
+                        (ptr_dcc->addr >> 8) & 0xff,
+                        ptr_dcc->addr & 0xff,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK));
         }
     }
     
@@ -467,16 +465,17 @@ dcc_channel_for_chat (t_irc_dcc *ptr_dcc)
     irc_display_prefix (ptr_dcc->server, ptr_dcc->channel->buffer,
                         PREFIX_INFO);
     gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_MSG,
-                     _("Connected to "));
-    gui_printf_color (ptr_dcc->channel->buffer, COLOR_WIN_CHAT_NICK,
-                      "%s", ptr_dcc->nick);
-    gui_printf_color (ptr_dcc->channel->buffer, COLOR_WIN_CHAT_DARK, " (");
-    gui_printf_color (ptr_dcc->channel->buffer, COLOR_WIN_CHAT_HOST,
-                      "%d.%d.%d.%d",
-                      ptr_dcc->addr >> 24, (ptr_dcc->addr >> 16) & 0xff,
-                      (ptr_dcc->addr >> 8) & 0xff, ptr_dcc->addr & 0xff);
-    gui_printf_color (ptr_dcc->channel->buffer, COLOR_WIN_CHAT_DARK, ") ");
-    gui_printf (ptr_dcc->channel->buffer, _("via DCC chat\n"));
+                     _("Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"),
+                     GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                     ptr_dcc->nick,
+                     GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                     GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                     ptr_dcc->addr >> 24,
+                     (ptr_dcc->addr >> 16) & 0xff,
+                     (ptr_dcc->addr >> 8) & 0xff,
+                     ptr_dcc->addr & 0xff,
+                     GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                     GUI_COLOR(COLOR_WIN_CHAT));
 }
 
 /*
@@ -565,12 +564,11 @@ dcc_accept_resume (t_irc_server *server, char *filename, int port,
         
         irc_display_prefix (ptr_dcc->server, ptr_dcc->server->buffer,
                             PREFIX_INFO);
-        gui_printf (ptr_dcc->server->buffer, _("DCC: file "));
-        gui_printf_color (ptr_dcc->server->buffer,
-                          COLOR_WIN_CHAT_CHANNEL,
-                          "%s ",
-                          ptr_dcc->filename);
-        gui_printf (ptr_dcc->server->buffer, _("resumed at position %u\n"),
+        gui_printf (ptr_dcc->server->buffer,
+                    _("DCC: file %s%s%s resumed at position %u\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    ptr_dcc->filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
                     ptr_dcc->start_resume);
         dcc_redraw (HOTLIST_MSG);
     }
@@ -669,51 +667,70 @@ dcc_add (t_irc_server *server, int type, unsigned long addr, int port, char *nic
     if (type == DCC_FILE_RECV)
     {
         irc_display_prefix (server, server->buffer, PREFIX_INFO);
-        gui_printf (server->buffer, _("Incoming DCC file from "));
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, " (");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_HOST,
-                          "%d.%d.%d.%d",
-                          addr >> 24, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, ")");
-        gui_printf (server->buffer, ": ");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", filename);
-        gui_printf (server->buffer, ", ");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%lu", size);
-        gui_printf (server->buffer, _(" bytes\n"));
+        gui_printf (server->buffer,
+                    _("Incoming DCC file from %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s bytes\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    nick,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                    addr >> 24,
+                    (addr >> 16) & 0xff,
+                    (addr >> 8) & 0xff,
+                    addr & 0xff,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    size,
+                    GUI_COLOR(COLOR_WIN_CHAT));
         dcc_redraw (HOTLIST_MSG);
     }
     if (type == DCC_FILE_SEND)
     {
         irc_display_prefix (server, server->buffer, PREFIX_INFO);
-        gui_printf (server->buffer, _("Sending DCC file to "));
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);
-        gui_printf (server->buffer, ": ");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", filename);
-        gui_printf (server->buffer, _(" (local filename: "));
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", local_filename);
-        gui_printf (server->buffer, "), ");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%lu", size);
-        gui_printf (server->buffer, _(" bytes\n"));
+        gui_printf (server->buffer,
+                    _("Sending DCC file to %s%s%s: %s%s%s "
+                      "(local filename: %s%s%s), %s%lu%s bytes\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    nick,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    local_filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    size,
+                    GUI_COLOR(COLOR_WIN_CHAT));
         dcc_redraw (HOTLIST_MSG);
     }
     if (type == DCC_CHAT_RECV)
     {
         irc_display_prefix (server, server->buffer, PREFIX_INFO);
-        gui_printf (server->buffer, _("Incoming DCC chat request from "));
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, " (");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_HOST,
-                          "%d.%d.%d.%d",
-                          addr >> 24, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, ")\n");
+        gui_printf (server->buffer,
+                    _("Incoming DCC chat request from %s%s%s "
+                      "(%s%d.%d.%d.%d%s)\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    nick,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                    addr >> 24,
+                    (addr >> 16) & 0xff,
+                    (addr >> 8) & 0xff,
+                    addr & 0xff,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK));
         dcc_redraw (HOTLIST_MSG);
     }
     if (type == DCC_CHAT_SEND)
     {
         irc_display_prefix (server, server->buffer, PREFIX_INFO);
-        gui_printf (server->buffer, _("Sending DCC chat request to "));
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s\n", nick);
+        gui_printf (server->buffer,
+                    _("Sending DCC chat request to %s%s\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    nick);
         dcc_redraw (HOTLIST_MSG);
     }
     
@@ -728,18 +745,15 @@ dcc_add (t_irc_server *server, int type, unsigned long addr, int port, char *nic
     {
         irc_display_prefix (new_dcc->server, new_dcc->server->buffer,
                             PREFIX_INFO);
-        gui_printf (new_dcc->server->buffer, _("DCC: file "));
-        gui_printf_color (new_dcc->server->buffer,
-                          COLOR_WIN_CHAT_CHANNEL,
-                          "%s",
-                          new_dcc->filename);
-        gui_printf (new_dcc->server->buffer, _(" (local filename: "));
-        gui_printf_color (new_dcc->server->buffer,
-                          COLOR_WIN_CHAT_CHANNEL,
-                          "%s",
-                          new_dcc->local_filename);
-        gui_printf (new_dcc->server->buffer, ") ");
-        gui_printf (new_dcc->server->buffer, _("will be resumed at position %u\n"),
+        gui_printf (new_dcc->server->buffer,
+                    _("DCC: file %s%s%s (local filename: %s%s%s) "
+                      "will be resumed at position %u\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    new_dcc->filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    new_dcc->local_filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
                     new_dcc->start_resume);
         dcc_redraw (HOTLIST_MSG);
     }
@@ -1070,6 +1084,7 @@ dcc_chat_recv (t_irc_dcc *ptr_dcc)
 {
     static char buffer[4096 + 2];
     char *buf2, *pos, *ptr_buf, *next_ptr_buf;
+    char *ptr_buf_color;
     int num_read;
 
     num_read = recv (ptr_dcc->sock, buffer, sizeof (buffer) - 2, 0);
@@ -1120,40 +1135,45 @@ dcc_chat_recv (t_irc_dcc *ptr_dcc)
             
             if (ptr_buf)
             {
-                gui_printf_type_color (ptr_dcc->channel->buffer,
-                                       MSG_TYPE_NICK,
-                                       COLOR_WIN_CHAT_DARK, "<");
+                ptr_buf_color = (char *)gui_color_decode ((unsigned char *)ptr_buf,
+                                                          cfg_irc_colors_receive);
+                gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_NICK,
+                                 "%s<", GUI_COLOR(COLOR_WIN_CHAT_DARK));
                 if (irc_is_highlight (ptr_buf, ptr_dcc->server->nick))
                 {
-                    gui_printf_type_color (ptr_dcc->channel->buffer,
-                                           MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
-                                           COLOR_WIN_CHAT_HIGHLIGHT,
-                                           "%s", ptr_dcc->nick);
+                    gui_printf_type (ptr_dcc->channel->buffer,
+                                     MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
+                                     "%s%s",
+                                     GUI_COLOR(COLOR_WIN_CHAT_HIGHLIGHT),
+                                     ptr_dcc->nick);
                     if ( (cfg_look_infobar_delay_highlight > 0)
                         && (ptr_dcc->channel->buffer != gui_current_window->buffer) )
                         gui_infobar_printf (cfg_look_infobar_delay_highlight,
                                             COLOR_WIN_INFOBAR_HIGHLIGHT,
                                             _("Private %s> %s"),
-                                            ptr_dcc->nick, ptr_buf);
+                                            ptr_dcc->nick,
+                                            (ptr_buf_color) ? ptr_buf_color : ptr_buf);
                 }
                 else
-                    gui_printf_type_color (ptr_dcc->channel->buffer,
-                                           MSG_TYPE_NICK,
-                                           COLOR_WIN_NICK_PRIVATE,
-                                           "%s", ptr_dcc->nick);
-                gui_printf_type_color (ptr_dcc->channel->buffer,
-                                       MSG_TYPE_NICK,
-                                       COLOR_WIN_CHAT_DARK, "> ");
-                gui_printf_type_color (ptr_dcc->channel->buffer,
-                                       MSG_TYPE_MSG,
-                                       COLOR_WIN_CHAT, "%s\n", ptr_buf);
+                    gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_NICK,
+                                     "%s%s",
+                                     GUI_COLOR(COLOR_WIN_NICK_PRIVATE),
+                                     ptr_dcc->nick);
+                gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_NICK,
+                                 "%s> ", GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_MSG,
+                                 "%s%s\n",
+                                 GUI_COLOR(COLOR_WIN_CHAT),
+                                 (ptr_buf_color) ? ptr_buf_color : ptr_buf);
+                if (ptr_buf_color)
+                    free (ptr_buf_color);
             }
             
             ptr_buf = next_ptr_buf;
         }
         
         if (buf2)
-            free (buf2);
+free (buf2);
     }
     else
     {
diff --git a/src/irc/irc-display.c b/src/irc/irc-display.c
index 10d2a103a..e6aa330cd 100644
--- a/src/irc/irc-display.c
+++ b/src/irc/irc-display.c
@@ -52,25 +52,34 @@ irc_display_prefix (t_irc_server *server, t_gui_buffer *buffer, char *prefix)
     
     if (prefix[0] == prefix[2])
     {
-        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_PREFIX1, "%c", prefix[0]);
-        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_PREFIX2, "%c", prefix[1]);
-        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_PREFIX1, "%c ", prefix[2]);
+        gui_printf_type (buffer, type, "%s%c%s%c%s%c ",
+                         GUI_COLOR(COLOR_WIN_CHAT_PREFIX1),
+                         prefix[0],
+                         GUI_COLOR(COLOR_WIN_CHAT_PREFIX2),
+                         prefix[1],
+                         GUI_COLOR(COLOR_WIN_CHAT_PREFIX1),
+                         prefix[2]);
     }
     else
     {
         if (strcmp (prefix, PREFIX_JOIN) == 0)
-            gui_printf_color (buffer, COLOR_WIN_CHAT_JOIN, "%s ", prefix);
+            gui_printf_type (buffer, type, "%s%s ",
+                             GUI_COLOR(COLOR_WIN_CHAT_JOIN), prefix);
         else if (strcmp (prefix, PREFIX_PART) == 0)
-            gui_printf_color (buffer, COLOR_WIN_CHAT_PART, "%s ", prefix);
+            gui_printf_type (buffer, type, "%s%s ",
+                             GUI_COLOR(COLOR_WIN_CHAT_PART), prefix);
         else
-            gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%s ", prefix);
+            gui_printf_type (buffer, type, "%s%s ",
+                             GUI_COLOR(COLOR_WIN_CHAT_PREFIX1), prefix);
     }
     if (server && (server->buffer == buffer) && buffer->all_servers)
     {
-        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_DARK, "[");
-        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_SERVER, "%s", server->name);
-        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_DARK, "] ");
+        gui_printf_type (buffer, type, "%s[%s%s%s] ",
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                         GUI_COLOR(COLOR_WIN_CHAT_SERVER), server->name,
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK));
     }
+    gui_printf_type (buffer, type, GUI_NO_COLOR);
 }
 
 /*
@@ -80,58 +89,51 @@ irc_display_prefix (t_irc_server *server, t_gui_buffer *buffer, char *prefix)
 
 void
 irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, char *nickname,
-                  int message_type, int display_around, int color_nick, int no_nickmode)
+                  int type, int display_around, int color_nick, int no_nickmode)
 {
     if (display_around)
-        gui_printf_type_color (buffer,
-                               message_type, COLOR_WIN_CHAT_DARK,
-                               (nick) ? "<" : ">");
+        gui_printf_type (buffer, type, "%s%s",
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                         (nick) ? "<" : ">");
     if (nick && cfg_look_nickmode)
     {
         if (nick->is_chanowner)
-            gui_printf_type_color (buffer,
-                                   message_type,
-                                   COLOR_WIN_NICK_OP, "~");
+            gui_printf_type (buffer, type, "%s~",
+                             GUI_COLOR(COLOR_WIN_NICK_OP));
         else if (nick->is_chanadmin)
-            gui_printf_type_color (buffer,
-                                   message_type,
-                                   COLOR_WIN_NICK_OP, "&");
+            gui_printf_type (buffer, type, "%s&",
+                             GUI_COLOR(COLOR_WIN_NICK_OP));
         else if (nick->is_op)
-            gui_printf_type_color (buffer,
-                                   message_type,
-                                   COLOR_WIN_NICK_OP, "@");
+            gui_printf_type (buffer, type, "%s@",
+                             GUI_COLOR(COLOR_WIN_NICK_OP));
         else if (nick->is_halfop)
-            gui_printf_type_color (buffer,
-                                   message_type,
-                                   COLOR_WIN_NICK_HALFOP, "%%");
+            gui_printf_type (buffer, type, "%s%%",
+                             GUI_COLOR(COLOR_WIN_NICK_HALFOP));
         else if (nick->has_voice)
-            gui_printf_type_color (buffer,
-                                   message_type,
-                                   COLOR_WIN_NICK_VOICE, "+");
+            gui_printf_type (buffer, type, "%s+",
+                             GUI_COLOR(COLOR_WIN_NICK_VOICE));
         else
             if (cfg_look_nickmode_empty && !no_nickmode)
-                gui_printf_type_color (buffer,
-                                       message_type,
-                                       COLOR_WIN_CHAT, " ");
+                gui_printf_type (buffer, type, "%s ",
+                                 GUI_COLOR(COLOR_WIN_CHAT));
     }
     if (color_nick < 0)
-        gui_printf_type_color (buffer,
-                               message_type,
-                               COLOR_WIN_CHAT_HIGHLIGHT,
-                               "%s", (nick) ? nick->nick : nickname);
+        gui_printf_type (buffer, type, "%s%s",
+                         GUI_COLOR(COLOR_WIN_CHAT_HIGHLIGHT),
+                         (nick) ? nick->nick : nickname);
     else
-        gui_printf_type_color (buffer,
-                               message_type,
-                               (nick && color_nick) ?
+        gui_printf_type (buffer, type, "%s%s",
+                         GUI_COLOR((nick && color_nick) ?
                                    ((cfg_look_color_nicks) ?
-                                   nick->color : COLOR_WIN_CHAT) :
-                                   COLOR_WIN_CHAT,
-                               "%s", (nick) ? nick->nick : nickname);
+                                    nick->color : COLOR_WIN_CHAT) :
+                                   COLOR_WIN_CHAT),
+                         (nick) ? nick->nick : nickname);
     
     if (display_around)
-        gui_printf_type_color (buffer,
-                               message_type, COLOR_WIN_CHAT_DARK,
-                               (nick) ? "> " : "< ");
+        gui_printf_type (buffer, type, "%s%s",
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                         (nick) ? "> " : "< ");
+    gui_printf_type (buffer, type, GUI_NO_COLOR);
 }
 
 /*
@@ -144,19 +146,27 @@ irc_display_mode (t_irc_server *server, t_gui_buffer *buffer,
                   char *symbol, char *nick_host, char *message, char *param)
 {
     irc_display_prefix (server, buffer, PREFIX_INFO);
-    gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
-    gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", channel_name);
-    gui_printf_color (buffer, COLOR_WIN_CHAT, "/");
-    gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%c%s", set_flag, symbol);
-    gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
-    gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, "%s", nick_host);
+    gui_printf (buffer, "%s[%s%s%s/%s%c%s%s] %s%s",
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                channel_name,
+                GUI_COLOR(COLOR_WIN_CHAT),
+                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                set_flag,
+                symbol,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                nick_host);
     if (param)
-    {
-        gui_printf_color (buffer, COLOR_WIN_CHAT, " %s ", message);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, "%s\n", param);
-    }
+        gui_printf (buffer, " %s%s %s%s\n",
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    message,
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    param);
     else
-        gui_printf_color (buffer, COLOR_WIN_CHAT, " %s\n", message);
+        gui_printf (buffer, " %s\n",
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    message);
 }
 
 /*
@@ -167,65 +177,56 @@ void
 irc_display_server (t_irc_server *server)
 {
     gui_printf (NULL, "\n");
-    gui_printf_color (NULL, COLOR_WIN_CHAT, _("Server: "));
-    gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s", server->name);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " [");
-    gui_printf_color (NULL, COLOR_WIN_CHAT, "%s",
-                      (server->is_connected) ?
-                          _("connected") : _("not connected"));
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "]\n");
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_autoconnect        : %s%s\n",
-                      (server->autoconnect) ? _("yes") : _("no"),
-                      (server->command_line) ?
-                          _(" (temporary server, will not be saved)") : "");
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_autoreconnect . . .: %s\n",
-                      (server->autoreconnect) ? _("yes") : _("no"));
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_autoreconnect_delay: %d seconds\n",
-                      server->autoreconnect_delay);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_address . . . . . .: %s\n",
-                      server->address);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_port  . . . . . . .: %d\n",
-                      server->port);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_ipv6  . . . . . . .: %s\n",
-                      (server->ipv6) ? _("yes") : _("no"));
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_ssl . . . . . . . .: %s\n",
-                      (server->ssl) ? _("yes") : _("no"));
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_password  . . . . .: %s\n",
-                      (server->password && server->password[0]) ?
-                      _("(hidden)") : "");
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_nick1/2/3 . . . . .: %s", server->nick1);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " / ");
-    gui_printf_color (NULL, COLOR_WIN_CHAT, "%s", server->nick2);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " / ");
-    gui_printf_color (NULL, COLOR_WIN_CHAT, "%s\n", server->nick3);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_username  . . . . .: %s\n",
-                      server->username);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_realname  . . . . .: %s\n",
-                      server->realname);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_command . . . . . .: %s\n",
-                      (server->command && server->command[0]) ?
-                      server->command : "");
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_command_delay . . .: %d seconds\n",
-                      server->command_delay);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_autojoin  . . . . .: %s\n",
-                      (server->autojoin && server->autojoin[0]) ?
-                      server->autojoin : "");
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_notify_levels . . .: %s\n",
-                      (server->notify_levels && server->notify_levels[0]) ?
-                      server->notify_levels : "");
+    gui_printf (NULL, _("%sServer: %s%s %s[%s%s%s]\n"),
+                GUI_COLOR(COLOR_WIN_CHAT),
+                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                server->name,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT),
+                (server->is_connected) ?
+                _("connected") : _("not connected"),
+                GUI_COLOR(COLOR_WIN_CHAT_DARK));
+    
+    gui_printf (NULL, "  server_autoconnect . . . .: %s%s\n",
+                (server->autoconnect) ? _("yes") : _("no"),
+                (server->command_line) ?
+                _(" (temporary server, will not be saved)") : "");
+    gui_printf (NULL, "  server_autoreconnect . . .: %s\n",
+                (server->autoreconnect) ? _("yes") : _("no"));
+    gui_printf (NULL, "  server_autoreconnect_delay: %d seconds\n",
+                server->autoreconnect_delay);
+    gui_printf (NULL, "  server_address . . . . . .: %s\n",
+                server->address);
+    gui_printf (NULL, "  server_port  . . . . . . .: %d\n",
+                server->port);
+    gui_printf (NULL, "  server_ipv6  . . . . . . .: %s\n",
+                (server->ipv6) ? _("yes") : _("no"));
+    gui_printf (NULL, "  server_ssl . . . . . . . .: %s\n",
+                (server->ssl) ? _("yes") : _("no"));
+    gui_printf (NULL, "  server_password  . . . . .: %s\n",
+                (server->password && server->password[0]) ?
+                _("(hidden)") : "");
+    gui_printf (NULL, "  server_nick1/2/3 . . . . .: %s %s/ %s%s %s/ %s%s\n",
+                server->nick1,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT),
+                server->nick2,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT),
+                server->nick3);
+    gui_printf (NULL, "  server_username  . . . . .: %s\n",
+                server->username);
+    gui_printf (NULL, "  server_realname  . . . . .: %s\n",
+               server->realname);
+    gui_printf (NULL, "  server_command . . . . . .: %s\n",
+                (server->command && server->command[0]) ?
+                server->command : "");
+    gui_printf (NULL, "  server_command_delay . . .: %d seconds\n",
+                server->command_delay);
+    gui_printf (NULL, "  server_autojoin  . . . . .: %s\n",
+                (server->autojoin && server->autojoin[0]) ?
+                server->autojoin : "");
+    gui_printf (NULL, "  server_notify_levels . . .: %s\n",
+                (server->notify_levels && server->notify_levels[0]) ?
+                server->notify_levels : "");
 }
diff --git a/src/irc/irc-nick.c b/src/irc/irc-nick.c
index 615606e6e..a91fcd7af 100644
--- a/src/irc/irc-nick.c
+++ b/src/irc/irc-nick.c
@@ -49,7 +49,7 @@ nick_find_color (t_irc_nick *nick)
     }
     color = (color % cfg_look_color_nicks_number);
     
-    return COLOR_WIN_NICK_FIRST + color;
+    return COLOR_WIN_NICK_1 + color;
 }
 
 /*
diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c
index cf59fe2b7..24c9bd2d0 100644
--- a/src/irc/irc-recv.c
+++ b/src/irc/irc-recv.c
@@ -203,7 +203,7 @@ irc_recv_command (t_irc_server *server, char *entire_line,
                   char *host, char *command, char *arguments)
 {
     int i, cmd_found, return_code;
-    char *pos, *nick;
+    char *pos, *nick, *args_after_color;
     
     if (command == NULL)
         return -2;
@@ -247,7 +247,13 @@ irc_recv_command (t_irc_server *server, char *entire_line,
         nick = (host) ? strdup (host) : NULL;
         if (pos)
             pos[0] = '!';
-        return_code = (int) (irc_commands[i].recv_function) (server, host, nick, arguments);
+        args_after_color = (char *)gui_color_decode ((unsigned char *)arguments,
+                                                     cfg_irc_colors_receive);
+        return_code = (int) (irc_commands[i].recv_function) (server, host, nick,
+                                                             (args_after_color) ?
+                                                             args_after_color : arguments);
+        if (args_after_color)
+            free (args_after_color);
         if (nick)
             free (nick);
         return return_code;
@@ -302,9 +308,10 @@ irc_cmd_recv_error (t_irc_server *server, char *host, char *nick, char *argument
                 pos++;
             if (first)
                 irc_display_prefix (server, ptr_buffer, PREFIX_ERROR);
-            gui_printf_color (ptr_buffer,
-                              COLOR_WIN_CHAT,
-                              "%s%s\n", (first) ? "" : ": ", pos);
+            gui_printf (ptr_buffer, "%s%s%s\n",
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        (first) ? "" : ": ",
+                        pos);
             pos = NULL;
         }
         else
@@ -317,10 +324,10 @@ irc_cmd_recv_error (t_irc_server *server, char *host, char *nick, char *argument
                     ptr_buffer = ptr_channel->buffer;
                 irc_display_prefix (server, ptr_buffer, PREFIX_ERROR);
             }
-            gui_printf_color (ptr_buffer,
-                              COLOR_WIN_CHAT_CHANNEL,
-                              "%s%s",
-                              (first) ? "" : " ", pos);
+            gui_printf (ptr_buffer, "%s%s%s",
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        (first) ? "" : " ",
+                        pos);
             first = 0;
             pos = pos2 + 1;
         }
@@ -352,12 +359,12 @@ irc_cmd_recv_invite (t_irc_server *server, char *host, char *nick, char *argumen
         if (!command_ignored)
         {
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf (server->buffer, _("You have been invited to "));
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL,
-                              "%s ", pos_channel);
-            gui_printf (server->buffer, _("by"));
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK,
-                              " %s\n", nick);
+            gui_printf (server->buffer, _("You have been invited to %s%s%s by %s%s\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        pos_channel,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        nick);
             hotlist_add (HOTLIST_HIGHLIGHT, server->buffer);
             gui_draw_buffer_status (gui_current_window->buffer, 1);
         }
@@ -404,18 +411,17 @@ irc_cmd_recv_join (t_irc_server *server, char *host, char *nick, char *arguments
     {
         pos = strchr (host, '!');
         irc_display_prefix (server, ptr_channel->buffer, PREFIX_JOIN);
-        gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
-                          "%s ", nick);
-        gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
-                          "(");
-        gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_HOST,
-                          "%s", (pos) ? pos + 1 : "");
-        gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
-                          ")");
-        gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                          _(" has joined "));
-        gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
-                          "%s\n", arguments);
+        gui_printf (ptr_channel->buffer,
+                    _("%s%s %s(%s%s%s)%s has joined %s%s\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    nick,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                    (pos) ? pos + 1 : "",
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    arguments);
     }
     (void) nick_new (ptr_channel, nick, 0, 0, 0, 0, 0);
     gui_draw_buffer_nick (ptr_channel->buffer, 1);
@@ -468,28 +474,23 @@ irc_cmd_recv_kick (t_irc_server *server, char *host, char *nick, char *arguments
         if (!command_ignored)
         {
             irc_display_prefix (server, ptr_channel->buffer, PREFIX_PART);
-            gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
-                              "%s", nick);
-            gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                              _(" has kicked "));
-            gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
-                              "%s", pos_nick);
-            gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                              _(" from "));
+            gui_printf (ptr_channel->buffer, _("%s%s%s has kicked %s%s%s from %s%s"),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        nick,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        pos_nick,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        arguments);
             if (pos_comment)
-            {
-                gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
-                                  "%s ", arguments);
-                gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
-                                  "(");
-                gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                                  "%s", pos_comment);
-                gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
-                                  ")\n");
-            }
+                gui_printf (ptr_channel->buffer, " %s(%s%s%s)\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_comment,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK));
             else
-                gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
-                                  "%s\n", arguments);
+                gui_printf (ptr_channel->buffer, "\n");
         }
     }
     else
@@ -558,26 +559,21 @@ irc_cmd_recv_kill (t_irc_server *server, char *host, char *nick, char *arguments
                 && !ignore_check (host, "kill", ptr_channel->name, server->name))
             {
                 irc_display_prefix (server, ptr_channel->buffer, PREFIX_PART);
-                gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
-                                  "%s", nick);
-                gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                                  _(" has killed "));
-                gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
-                                  "%s", arguments);
+                gui_printf (ptr_channel->buffer, _("%s%s%s has killed %s%s%s from server"),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            nick,
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            arguments,
+                            GUI_COLOR(COLOR_WIN_CHAT));
                 if (pos_comment)
-                {
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                                      _(" from server"));
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
-                                      " (");
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                                      "%s", pos_comment);
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
-                                      ")\n");
-                }
+                    gui_printf (ptr_channel->buffer, " %s(%s%s%s)\n",
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                pos_comment,
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK));
                 else
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                                      _(" from server\n"));
+                    gui_printf (ptr_channel->buffer, "\n");
             }
         }
     }
@@ -1020,14 +1016,17 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *nick, char *arguments
         if (!command_ignored)
         {
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "[");
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, "/");
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK,
-                              "%s", (pos[0] == ':') ? pos + 1 : pos);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "] ");
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("mode changed by"));
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s\n", nick);
+            gui_printf (server->buffer, _("%s[%s%s%s/%s%s%s]%s mode changed by %s%s\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        arguments,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        (pos[0] == ':') ? pos + 1 : pos,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        nick);
         }
     }
     return 0;
@@ -1086,27 +1085,18 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *nick, char *arguments
             {
                 irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
                 if (nick_is_me)
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      _("You are "));
+                    gui_printf (ptr_channel->buffer, _("You are now known as %s%s\n"),
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                arguments);
                 else
-                {
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_NICK,
-                                      "%s", nick);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, _(" is "));
-                }
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT,
-                                  _("now known as "));
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT_NICK,
-                                  "%s\n",
-                                  arguments);
+                    gui_printf (ptr_channel->buffer, _("%s%s%s is now known as %s%s\n"),
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                nick,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                arguments);
             }
-            if (gui_buffer_has_nicklist (ptr_channel->buffer))
-                gui_draw_buffer_nick (ptr_channel->buffer, 1);
+            gui_draw_buffer_nick (ptr_channel->buffer, 1);
             gui_add_hotlist = 1;
         }
     }
@@ -1180,11 +1170,13 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *nick, char *argumen
             if (pos2)
                 pos2[0] = '\0';
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, "CTCP ");
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "VERSION ");
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("reply from"));
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s", nick);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": %s\n", pos);
+            gui_printf (server->buffer, _("CTCP %sVERSION%s reply from %s%s%s: %s\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        nick,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        pos);
         }
         else
         {
@@ -1212,14 +1204,14 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *nick, char *argumen
                         difftime = ((sec2 * 1000000) + usec2) - ((sec1 * 1000000) + usec1);
                         
                         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                        gui_printf_color (server->buffer, COLOR_WIN_CHAT, "CTCP ");
-                        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "PING ");
-                        gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("reply from"));
-                        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s", nick);
-                        gui_printf_color (server->buffer, COLOR_WIN_CHAT,
-                                          _(": %ld.%ld seconds\n"),
-                                          difftime / 1000000,
-                                          (difftime % 1000000) / 1000);
+                        gui_printf (server->buffer, _("CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                    nick,
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    difftime / 1000000,
+                                    (difftime % 1000000) / 1000);
                     }
                 }
             }
@@ -1243,15 +1235,16 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *nick, char *argumen
                     if (!ptr_channel->topic)
                         ptr_channel->topic = strdup ((host2) ? host2 : "");
                     
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_NICK,
-                                           COLOR_WIN_CHAT_DARK, "<");
+                    gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                                     "%s<",
+                                     GUI_COLOR(COLOR_WIN_CHAT_DARK));
                     if (irc_is_highlight (pos, server->nick))
                     {
-                        gui_printf_type_color (ptr_channel->buffer,
-                                               MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
-                                               COLOR_WIN_CHAT_HIGHLIGHT,
-                                               "%s", nick);
+                        gui_printf_type (ptr_channel->buffer,
+                                         MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
+                                         "%s%s",
+                                         GUI_COLOR(COLOR_WIN_CHAT_HIGHLIGHT),
+                                         nick);
                         if ( (cfg_look_infobar_delay_highlight > 0)
                              && (ptr_channel->buffer != gui_current_window->buffer) )
                             gui_infobar_printf (cfg_look_infobar_delay_highlight,
@@ -1260,35 +1253,37 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *nick, char *argumen
                                                 nick, pos);
                     }
                     else
-                        gui_printf_type_color (ptr_channel->buffer,
-                                               MSG_TYPE_NICK,
-                                               COLOR_WIN_NICK_PRIVATE,
-                                               "%s", nick);
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_NICK,
-                                           COLOR_WIN_CHAT_DARK, "> ");
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_MSG,
-                                           COLOR_WIN_CHAT, "%s\n", pos);
+                        gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                                         "%s%s",
+                                         GUI_COLOR(COLOR_WIN_NICK_PRIVATE),
+                                         nick);
+                    gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                                     "%s> ",
+                                     GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                    gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG,
+                                     "%s%s\n",
+                                     GUI_COLOR(COLOR_WIN_CHAT),
+                                     pos);
                 }
                 else
                 {
                     irc_display_prefix (server, server->buffer, PREFIX_SERVER);
                     if (host)
                     {
-                        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);
+                        gui_printf (server->buffer, "%s%s",
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK), nick);
                         if (host2)
-                        {
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT_DARK, " (");
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT_HOST, "%s", host2);
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT_DARK, ")");
-                        }
-                        gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": ");
+                            gui_printf (server->buffer, " %s(%s%s%s)",
+                                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                                        host2,
+                                        GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                        gui_printf (server->buffer, "%s: ",
+                                    GUI_COLOR(COLOR_WIN_CHAT));
                     }
-                    gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", pos);
+                    gui_printf (server->buffer, "%s%s\n",
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                pos);
                     if ((nick) && (ascii_strcasecmp (nick, "nickserv") != 0) &&
                         (ascii_strcasecmp (nick, "chanserv") != 0) &&
                         (ascii_strcasecmp (nick, "memoserv") != 0))
@@ -1359,33 +1354,27 @@ irc_cmd_recv_part (t_irc_server *server, char *host, char *nick, char *arguments
                 {
                     pos = strchr (host, '!');
                     irc_display_prefix (server, ptr_channel->buffer, PREFIX_PART);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_NICK, "%s ", nick);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_DARK, "(");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_HOST, "%s", (pos) ? pos + 1 : "");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_DARK, ")");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, _(" has left "));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL,
-                                      "%s", ptr_channel->name);
+                    gui_printf (ptr_channel->buffer, _("%s%s %s(%s%s%s)%s has left %s%s"),
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                nick,
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                                (pos) ? pos + 1 : "",
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                ptr_channel->name);
                     if (pos_args && pos_args[0])
-                    {
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT_DARK, " (");
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT, "%s", pos_args);
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT_DARK, ")");
-                    }
-                    gui_printf (ptr_channel->buffer, "\n");
+                        gui_printf (ptr_channel->buffer, " %s(%s%s%s)\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    pos_args,
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                    else
+                        gui_printf (ptr_channel->buffer, "\n");
                 }
                 
-                if (gui_buffer_has_nicklist (ptr_channel->buffer))
-                    gui_draw_buffer_nick (ptr_channel->buffer, 1);
+                gui_draw_buffer_nick (ptr_channel->buffer, 1);
                 gui_draw_buffer_status (ptr_channel->buffer, 1);
             }
         }
@@ -1511,10 +1500,11 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                         irc_display_prefix (server, ptr_channel->buffer, PREFIX_ACTION_ME);
                         if (irc_is_highlight (pos, server->nick))
                         {
-                            gui_printf_type_color (ptr_channel->buffer,
-                                                   MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
-                                                   COLOR_WIN_CHAT_HIGHLIGHT,
-                                                   "%s", nick);
+                            gui_printf_type (ptr_channel->buffer,
+                                             MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
+                                             "%s%s",
+                                             GUI_COLOR(COLOR_WIN_CHAT_HIGHLIGHT),
+                                             nick);
                             if ( (cfg_look_infobar)
                                  && (cfg_look_infobar_delay_highlight > 0)
                                  && (ptr_channel->buffer != gui_current_window->buffer) )
@@ -1525,11 +1515,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                                                     nick, pos);
                         }
                         else
-                            gui_printf_type_color (ptr_channel->buffer,
-                                                   MSG_TYPE_MSG,
-                                                   COLOR_WIN_CHAT_NICK, "%s", nick);
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT, " %s\n", pos);
+                            gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG,
+                                             "%s%s",
+                                             GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                             nick);
+                        gui_printf (ptr_channel->buffer, " %s%s\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT), pos);
                     }
                     return 0;
                 }
@@ -1544,11 +1535,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                     {
                         irc_display_prefix (server, ptr_channel->buffer, PREFIX_SERVER);
                         gui_printf (ptr_channel->buffer,
-                                    _("Received a CTCP SOUND \"%s\" from "),
-                                    pos);
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT_NICK,
-                                          "%s\n", nick);
+                                    _("Received a CTCP %sSOUND%s \"%s\" from %s%s\n"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    pos,
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                    nick);
                     }
                     return 0;
                 }
@@ -1572,14 +1564,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                         server_sendf (server, "NOTICE %s :\01PING\01\r\n",
                                       nick);
                     irc_display_prefix (server, ptr_channel->buffer, PREFIX_SERVER);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, "CTCP ");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL, "PING ");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, _("received from"));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_NICK, " %s\n", nick);
+                    gui_printf (ptr_channel->buffer,
+                                _("CTCP %sPING%s received from %s%s\n"),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                nick);
                     return 0;
                 }
                 
@@ -1603,17 +1593,17 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                     if (!command_ignored)
                     {
                         irc_display_prefix (server, ptr_channel->buffer, PREFIX_SERVER);
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT, _("Unknown CTCP "));
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT_CHANNEL, "%s ", pos);
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT, _("received from"));
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT_NICK, " %s", nick);
+                        gui_printf (ptr_channel->buffer,
+                                    _("Unknown CTCP %s%s%s received from %s%s"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    pos,
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                    nick);
                         if (pos2)
-                            gui_printf_color (ptr_channel->buffer,
-                                              COLOR_WIN_CHAT, ": %s\n", pos2);
+                            gui_printf (ptr_channel->buffer, "%s: %s\n",
+                                        GUI_COLOR(COLOR_WIN_CHAT),
+                                        pos2);
                         else
                             gui_printf (ptr_channel->buffer, "\n");
                     }
@@ -1644,9 +1634,8 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                         irc_display_nick (ptr_channel->buffer, ptr_nick,
                                           (ptr_nick) ? NULL : nick,
                                           MSG_TYPE_NICK, 1, 1, 0);
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_MSG,
-                                           COLOR_WIN_CHAT, "%s\n", pos);
+                    gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG,
+                                     "%s\n", pos);
                 }
             }
             else
@@ -1689,7 +1678,7 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                     }
                     
                     buf = (struct utsname *) malloc (sizeof (struct utsname));
-                    if (buf && (uname (buf) == 0))
+                    if (buf && (uname (buf) >= 0))
                     {
                         server_sendf (server,
                                       "NOTICE %s :%sVERSION %s v%s"
@@ -1707,17 +1696,16 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                                       nick, "\01", PACKAGE_NAME, PACKAGE_VERSION, __DATE__,
                                       "\01\r\n");
                     irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT, "CTCP ");
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL, "VERSION ");
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT, _("received from"));
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_NICK, " %s", nick);
+                    gui_printf (server->buffer,
+                                _("CTCP %sVERSION%s received from %s%s"),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                nick);
                     if (pos2)
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT, ": %s\n", pos2);
+                        gui_printf (server->buffer, "%s: %s\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    pos2);
                     else
                         gui_printf (server->buffer, "\n");
                 }
@@ -1747,14 +1735,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                         server_sendf (server, "NOTICE %s :\01PING\01\r\n",
                                       nick);
                     irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT, "CTCP ");
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL, "PING ");
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT, _("received from"));
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_NICK, " %s\n", nick);
+                    gui_printf (server->buffer,
+                                _("CTCP %sPING%s received from %s%s\n"),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                nick);
                 }
                 return 0;
             }
@@ -2022,9 +2008,11 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                         gui_printf_nolog (server->buffer,
                                           _("%s unknown DCC CHAT type received from "),
                                           WEECHAT_ERROR);
-                        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK,
-                                          "%s", nick);
-                        gui_printf (server->buffer, ": \"%s\"\n", pos_file);
+                        gui_printf (server->buffer, "%s%s%s: \"%s\"\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                    nick,
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    pos_file);
                         return -1;
                     }
                     
@@ -2066,10 +2054,11 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                     irc_display_prefix (server, ptr_channel->buffer, PREFIX_ACTION_ME);
                     if (irc_is_highlight (pos, server->nick))
                     {
-                        gui_printf_type_color (ptr_channel->buffer,
-                                               MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
-                                               COLOR_WIN_CHAT_HIGHLIGHT,
-                                               "%s", nick);
+                        gui_printf_type (ptr_channel->buffer,
+                                         MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
+                                         "%s%s",
+                                         GUI_COLOR(COLOR_WIN_CHAT_HIGHLIGHT),
+                                         nick);
                         if ( (cfg_look_infobar)
                              && (cfg_look_infobar_delay_highlight > 0)
                              && (ptr_channel->buffer != gui_current_window->buffer) )
@@ -2080,11 +2069,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                                                 nick, pos);
                     }
                     else
-                        gui_printf_type_color (ptr_channel->buffer,
-                                               MSG_TYPE_MSG,
-                                               COLOR_WIN_CHAT_NICK, "%s", nick);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, " %s\n", pos);
+                        gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG,
+                                         "%s%s",
+                                         GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                         nick);
+                    gui_printf (ptr_channel->buffer, " %s%s\n",
+                                GUI_COLOR(COLOR_WIN_CHAT), pos);
                 }
             }
             else
@@ -2110,17 +2100,17 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                                 pos2 = NULL;
                         }
                         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT, _("Unknown CTCP "));
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_CHANNEL, "%s ", pos);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT, _("received from"));
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_NICK, " %s", nick);
+                        gui_printf (server->buffer,
+                                    _("Unknown CTCP %s%s%s received from %s%s"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    pos,
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                    nick);
                         if (pos2)
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT, ": %s\n", pos2);
+                            gui_printf (server->buffer, "%s: %s\n",
+                                        GUI_COLOR(COLOR_WIN_CHAT),
+                                        pos2);
                         else
                             gui_printf (server->buffer, "\n");
                     }
@@ -2147,15 +2137,16 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                         if (!ptr_channel->topic)
                             ptr_channel->topic = strdup (host2);
                         
-                        gui_printf_type_color (ptr_channel->buffer,
-                                               MSG_TYPE_NICK,
-                                               COLOR_WIN_CHAT_DARK, "<");
+                        gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                                         "%s<",
+                                         GUI_COLOR(COLOR_WIN_CHAT_DARK));
                         if (irc_is_highlight (pos, server->nick))
                         {
-                            gui_printf_type_color (ptr_channel->buffer,
-                                                   MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
-                                                   COLOR_WIN_CHAT_HIGHLIGHT,
-                                                   "%s", nick);
+                            gui_printf_type (ptr_channel->buffer,
+                                             MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
+                                             "%s%s",
+                                             GUI_COLOR(COLOR_WIN_CHAT_HIGHLIGHT),
+                                             nick);
                             if ( (cfg_look_infobar_delay_highlight > 0)
                                  && (ptr_channel->buffer != gui_current_window->buffer) )
                                 gui_infobar_printf (cfg_look_infobar_delay_highlight,
@@ -2164,16 +2155,17 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                                                     nick, pos);
                         }
                         else
-                            gui_printf_type_color (ptr_channel->buffer,
-                                                   MSG_TYPE_NICK,
-                                                   COLOR_WIN_NICK_PRIVATE,
-                                                   "%s", nick);
-                        gui_printf_type_color (ptr_channel->buffer,
-                                               MSG_TYPE_NICK,
-                                               COLOR_WIN_CHAT_DARK, "> ");
-                        gui_printf_type_color (ptr_channel->buffer,
-                                               MSG_TYPE_MSG,
-                                               COLOR_WIN_CHAT, "%s\n", pos);
+                            gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                                             "%s%s",
+                                             GUI_COLOR(COLOR_WIN_NICK_PRIVATE),
+                                             nick);
+                        gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                                         "%s> ",
+                                         GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                        gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG,
+                                         "%s%s\n",
+                                         GUI_COLOR(COLOR_WIN_CHAT),
+                                         pos);
                     }
                 }
             }
@@ -2228,26 +2220,21 @@ irc_cmd_recv_quit (t_irc_server *server, char *host, char *nick, char *arguments
             {
                 pos = strchr (host, '!');
                 irc_display_prefix (server, ptr_channel->buffer, PREFIX_QUIT);
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s ", nick);
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT_DARK, "(");
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT_HOST, "%s", (pos) ? pos + 1 : "");
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT_DARK, ") ");
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT, _("has quit"));
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT_DARK, " (");
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT, "%s",
-                                  arguments);
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT_DARK, ")\n");
+                gui_printf (ptr_channel->buffer,
+                            _("%s%s %s(%s%s%s)%s has quit %s(%s%s%s)\n"),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            nick,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                            (pos) ? pos + 1 : "",
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            arguments,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK));
             }
-            if (gui_buffer_has_nicklist (ptr_channel->buffer))
-                gui_draw_buffer_nick (ptr_channel->buffer, 1);
+            gui_draw_buffer_nick (ptr_channel->buffer, 1);
             gui_draw_buffer_status (ptr_channel->buffer, 1);
         }
     }
@@ -2281,7 +2268,8 @@ irc_cmd_recv_server_msg (t_irc_server *server, char *host, char *nick, char *arg
     if (!command_ignored)
     {
         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", arguments);
+        gui_printf (server->buffer, "%s%s\n",
+                    GUI_COLOR(COLOR_WIN_CHAT), arguments);
     }
     return 0;
 }
@@ -2324,18 +2312,19 @@ irc_cmd_recv_server_reply (t_irc_server *server, char *host, char *nick, char *a
             {
                 if (pos[0] == ':')
                     pos++;
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT,
-                                  "%s%s\n", (first) ? "" : ": ", pos);
+                gui_printf (server->buffer, "%s%s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            (first) ? "" : ": ",
+                            pos);
                 pos = NULL;
             }
             else
             {
                 pos2[0] = '\0';
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_CHANNEL,
-                                  "%s%s\n",
-                                  (first) ? "" : " ", pos);
+                gui_printf (server->buffer, "%s%s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                            (first) ? "" : " ",
+                            pos);
                 first = 0;
                 pos = pos2 + 1;
             }
@@ -2388,28 +2377,24 @@ irc_cmd_recv_topic (t_irc_server *server, char *host, char *nick, char *argument
     if (!command_ignored)
     {
         irc_display_prefix (server, buffer, PREFIX_INFO);
-        gui_printf_color (buffer,
-                          COLOR_WIN_CHAT_NICK, "%s",
-                          nick);
         if (pos)
-        {
-            gui_printf_color (buffer,
-                              COLOR_WIN_CHAT, _(" has changed topic for "));
-            gui_printf_color (buffer,
-                              COLOR_WIN_CHAT_CHANNEL, "%s",
-                              arguments);
-            gui_printf_color (buffer,
-                              COLOR_WIN_CHAT, _(" to: \"%s\"\n"),
-                              pos);
-        }
+            gui_printf (buffer,
+                        _("%s%s%s has changed topic for %s%s%s to: \"%s\"\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        nick,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        arguments,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        pos);
         else
-        {
-            gui_printf_color (buffer,
-                              COLOR_WIN_CHAT, _(" has unset topic for "));
-            gui_printf_color (buffer,
-                              COLOR_WIN_CHAT_CHANNEL, "%s\n",
-                              arguments);
-        }
+            gui_printf (buffer,
+                        _("%s%s%s has unset topic for %s%s\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        nick,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        arguments);
     }
     
     if (ptr_channel)
@@ -2514,12 +2499,14 @@ irc_cmd_recv_221 (t_irc_server *server, char *host, char *nick, char *arguments)
         if (!command_ignored)
         {
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("User mode"));
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, " [");
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, "/");
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, pos_mode);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "]\n");
+            gui_printf (server->buffer, _("User mode %s[%s%s%s/%s%s%s]\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        arguments,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        pos_mode,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK));
         }
     }
     else
@@ -2566,10 +2553,12 @@ irc_cmd_recv_301 (t_irc_server *server, char *host, char *nick, char *arguments)
             if (!command_ignored)
             {
                 irc_display_prefix (server, gui_current_window->buffer, PREFIX_INFO);
-                gui_printf_color (gui_current_window->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                gui_printf_color (gui_current_window->buffer,
-                                  COLOR_WIN_CHAT, _(" is away: %s\n"), pos_message);
+                gui_printf (gui_current_window->buffer,
+                            _("%s%s%s is away: %s\n"),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_nick,
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_message);
             }
         }
     }
@@ -2616,12 +2605,12 @@ irc_cmd_recv_302 (t_irc_server *server, char *host, char *nick, char *arguments)
                     }
                     
                     irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_NICK, "%s", arguments);
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT, "=");
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_HOST, "%s\n", pos_host);
+                    gui_printf (server->buffer, "%s%s%s=%s%s\n",
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                arguments,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                                pos_host);
                 }
                 else
                     ptr_next = NULL;
@@ -2650,8 +2639,7 @@ irc_cmd_recv_303 (t_irc_server *server, char *host, char *nick, char *arguments)
     if (!command_ignored)
     {
         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-        gui_printf_color (server->buffer,
-                          COLOR_WIN_CHAT, _("Users online: "));
+        gui_printf (server->buffer, _("Users online: "));
         
         arguments = strchr (arguments, ' ');
         if (arguments)
@@ -2670,8 +2658,9 @@ irc_cmd_recv_303 (t_irc_server *server, char *host, char *nick, char *arguments)
                     while (ptr_next[0] == ' ')
                         ptr_next++;
                 }
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s ", arguments);
+                gui_printf (server->buffer, "%s%s ",
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            arguments);
                 arguments = ptr_next;
                 if (arguments && !arguments[0])
                     arguments = NULL;
@@ -2703,8 +2692,7 @@ irc_cmd_recv_305 (t_irc_server *server, char *host, char *nick, char *arguments)
             if (arguments[0] == ':')
                 arguments++;
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf_color (server->buffer,
-                              COLOR_WIN_CHAT, "%s\n", arguments);
+            gui_printf (server->buffer, "%s\n", arguments);
         }
     }
     server->is_away = 0;
@@ -2733,8 +2721,7 @@ irc_cmd_recv_306 (t_irc_server *server, char *host, char *nick, char *arguments)
             if (arguments[0] == ':')
                 arguments++;
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf_color (server->buffer,
-                              COLOR_WIN_CHAT, "%s\n", arguments);
+            gui_printf (server->buffer, "%s\n", arguments);
         }
     }
     server->is_away = 1;
@@ -2773,15 +2760,13 @@ irc_cmd_recv_307 (t_irc_server *server, char *host, char *nick, char *arguments)
                     pos_msg++;
                 
                 irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "[");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "] ");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT, "%s\n",
-                                  pos_msg);
+                gui_printf (server->buffer, "%s[%s%s%s] %s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_nick,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_msg);
             }
         }
     }
@@ -2837,19 +2822,18 @@ irc_cmd_recv_311 (t_irc_server *server, char *host, char *nick, char *arguments)
                             pos_realname++;
                         
                         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_DARK, "[");
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_DARK, "] (");
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_HOST, "%s@%s",
-                                          pos_user, pos_host);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_DARK, ")");
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT, ": %s\n", pos_realname);
+                        gui_printf (server->buffer,
+                                    "%s[%s%s%s] (%s%s@%s%s)%s: %s\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                    pos_nick,
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                                    pos_user,
+                                    pos_host,
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    pos_realname);
                     }
                 }
             }
@@ -2896,20 +2880,18 @@ irc_cmd_recv_312 (t_irc_server *server, char *host, char *nick, char *arguments)
                         pos_serverinfo++;
                     
                     irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_DARK, "[");
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_DARK, "] ");
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT, "%s ", pos_server);
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_DARK, "(");
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT, "%s", pos_serverinfo);
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_DARK, ")\n");
+                    gui_printf (server->buffer,
+                                "%s[%s%s%s] %s%s %s(%s%s%s)\n",
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                pos_nick,
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                pos_server,
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                pos_serverinfo,
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK));
                 }
             }
         }
@@ -2948,14 +2930,13 @@ irc_cmd_recv_313 (t_irc_server *server, char *host, char *nick, char *arguments)
                     pos_message++;
                 
                 irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "[");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "] ");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT, "%s\n", pos_message);
+                gui_printf (server->buffer, "%s[%s%s%s] %s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_nick,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_message);
             }
         }
     }
@@ -3014,18 +2995,17 @@ irc_cmd_recv_314 (t_irc_server *server, char *host, char *nick, char *arguments)
                                 pos_realname++;
                             
                             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT_DARK, " (");
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT_HOST,
-                                              "%s@%s", pos_user, pos_host);
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT_DARK, ")");
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT,
-                                              " was %s\n", pos_realname);
+                            gui_printf (server->buffer,
+                                        _("%s%s %s(%s%s@%s%s)%s was %s\n"),
+                                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                        pos_nick,
+                                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                                        pos_user,
+                                        pos_host,
+                                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                        GUI_COLOR(COLOR_WIN_CHAT),
+                                        pos_realname);
                         }
                     }
                 }
@@ -3071,8 +3051,11 @@ irc_cmd_recv_315 (t_irc_server *server, char *host, char *nick, char *arguments)
         if (!command_ignored)
         {
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", arguments);
-            gui_printf (server->buffer, " %s\n", pos);
+            gui_printf (server->buffer, "%s%s %s%s\n",
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        arguments,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        pos);
         }
     }
     else
@@ -3134,53 +3117,37 @@ irc_cmd_recv_317 (t_irc_server *server, char *host, char *nick, char *arguments)
                         sec = ((idle_time % (60 * 60 * 24)) % (60 * 60)) % 60;
                     
                         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_DARK, "[");
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_DARK, "] ");
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT, _("idle: "));
+                        gui_printf (server->buffer, _("%s[%s%s%s]%s idle: "),
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                    pos_nick,
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT));
+                        
                         if (day > 0)
-                        {
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT_CHANNEL,
-                                              "%d ", day);
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT,
-                                              (day > 1) ? _("days") : _("day"));
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT,
-                                              ", ");
-                        }
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_CHANNEL,
-                                          "%02d ", hour);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT,
-                                          (hour > 1) ? _("hours") : _("hour"));
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_CHANNEL,
-                                          " %02d ", min);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT,
-                                          (min > 1) ? _("minutes") : _("minute"));
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_CHANNEL,
-                                          " %02d ", sec);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT,
-                                          (sec > 1) ? _("seconds") : _("second"));
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT,
-                                          ", ");
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT, _("signon at: "));
+                            gui_printf (server->buffer, "%s%d %s%s, ",
+                                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                        day,
+                                        GUI_COLOR(COLOR_WIN_CHAT),
+                                        (day > 1) ? _("days") : _("day"));
+                        
                         datetime = (time_t)(atol (pos_signon));
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_CHANNEL,
-                                          "%s", ctime (&datetime));
+                        gui_printf (server->buffer,
+                                    _("%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    hour,
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    (hour > 1) ? _("hours") : _("hour"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    min,
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    (min > 1) ? _("minutes") : _("minute"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    sec,
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    (sec > 1) ? _("seconds") : _("second"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    ctime (&datetime));
                     }
                 }
             }
@@ -3220,14 +3187,13 @@ irc_cmd_recv_318 (t_irc_server *server, char *host, char *nick, char *arguments)
                     pos_message++;
             
                 irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "[");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "] ");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT, "%s\n", pos_message);
+                gui_printf (server->buffer, "%s[%s%s%s] %s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_nick,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_message);
             }
         }
     }
@@ -3265,36 +3231,33 @@ irc_cmd_recv_319 (t_irc_server *server, char *host, char *nick, char *arguments)
                     pos_channel++;
             
                 irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "[");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "] ");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT, _("Channels: "));
-            
+                gui_printf (server->buffer, "%s[%s%s%s]%s Channels: ",
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_nick,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT));
                 while (pos_channel && pos_channel[0])
                 {
                     if (pos_channel[0] == '@')
                     {
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_NICK_OP, "@");
+                        gui_printf (server->buffer, "%s@",
+                                    GUI_COLOR(COLOR_WIN_NICK_OP));
                         pos_channel++;
                     }
                     else
                     {
                         if (pos_channel[0] == '%')
                         {
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_NICK_HALFOP, "%");
+                            gui_printf (server->buffer, "%s%%",
+                                        GUI_COLOR(COLOR_WIN_NICK_HALFOP));
                             pos_channel++;
                         }
                         else
                             if (pos_channel[0] == '+')
                             {
-                                gui_printf_color (server->buffer,
-                                                  COLOR_WIN_NICK_VOICE, "+");
+                                gui_printf (server->buffer, "%s+",
+                                            GUI_COLOR(COLOR_WIN_NICK_VOICE));
                                 pos_channel++;
                             }
                     }
@@ -3306,11 +3269,10 @@ irc_cmd_recv_319 (t_irc_server *server, char *host, char *nick, char *arguments)
                         while (pos[0] == ' ')
                             pos++;
                     }
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL,
-                                      "%s%s",
-                                      pos_channel,
-                                      (pos && pos[0]) ? " " : "\n");
+                    gui_printf (server->buffer, "%s%s%s",
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                pos_channel,
+                                (pos && pos[0]) ? " " : "\n");
                     pos_channel = pos;
                 }
             }
@@ -3350,14 +3312,13 @@ irc_cmd_recv_320 (t_irc_server *server, char *host, char *nick, char *arguments)
                     pos_message++;
                 
                 irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "[");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "] ");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT, "%s\n", pos_message);
+                gui_printf (server->buffer, "%s[%s%s%s] %s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_nick,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_message);
             }
         }
     }
@@ -3568,10 +3529,9 @@ irc_cmd_recv_331 (t_irc_server *server, char *host, char *nick, char *arguments)
             if (!command_ignored)
             {
                 irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT, _("No topic set for "));
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT_CHANNEL, "%s\n", pos_channel);
+                gui_printf (ptr_channel->buffer, _("No topic set for %s%s\n"),
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                            pos_channel);
             }
         }
         else
@@ -3625,12 +3585,11 @@ irc_cmd_recv_332 (t_irc_server *server, char *host, char *nick, char *arguments)
                 if (!command_ignored)
                 {
                     irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, _("Topic for "));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL, "%s", pos);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, _(" is: \"%s\"\n"), pos2);
+                    gui_printf (ptr_channel->buffer, _("Topic for %s%s%s is: \"%s\"\n"),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                pos,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                pos2);
                 }
                 
                 gui_draw_buffer_title (ptr_channel->buffer, 1);
@@ -3697,14 +3656,13 @@ irc_cmd_recv_333 (t_irc_server *server, char *host, char *nick, char *arguments)
                     command_ignored |= ignore_check (host, "333", ptr_channel->name, server->name);
                     if (!command_ignored)
                     {
-                        irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT, _("Topic set by "));
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT_NICK, "%s", pos_nick);
                         datetime = (time_t)(atol (pos_date));
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT, ", %s", ctime (&datetime));
+                        irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
+                        gui_printf (ptr_channel->buffer, _("Topic set by %s%s%s, %s"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                    pos_nick,
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    ctime (&datetime));
                     }
                 }
                 else
@@ -3777,14 +3735,16 @@ irc_cmd_recv_341 (t_irc_server *server, char *host, char *nick, char *arguments)
                 pos_channel++;
             
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK,
-                              "%s ", arguments);
-            gui_printf (server->buffer, _("has invited"));
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK,
-                              " %s ", pos_nick);
-            gui_printf (server->buffer, _("on"));
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL,
-                              " %s\n", pos_channel);
+            gui_printf (server->buffer,
+                        _("%s%s%s has invited %s%s%s on %s%s\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        arguments,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        pos_nick,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        pos_channel);
             gui_draw_buffer_status (gui_current_window->buffer, 1);
         }
         else
@@ -3836,14 +3796,12 @@ irc_cmd_recv_344 (t_irc_server *server, char *host, char *nick, char *arguments)
                     pos_host++;
                 
                 irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT, _("Channel reop"));
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_CHANNEL, " %s", pos_channel);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT, ": ");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_HOST, "%s\n", pos_host);
+                gui_printf (server->buffer, _("Channel reop %s%s%s: %s%s\n"),
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                            pos_channel,
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                            pos_host);
             }
         }
     }
@@ -3879,8 +3837,11 @@ irc_cmd_recv_345 (t_irc_server *server, char *host, char *nick, char *arguments)
         if (!command_ignored)
         {
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", arguments);
-            gui_printf (server->buffer, " %s\n", pos);
+            gui_printf (server->buffer, "%s%s %s%s\n",
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        arguments,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        pos);
         }
     }
     else
@@ -3986,25 +3947,35 @@ irc_cmd_recv_348 (t_irc_server *server, char *host, char *nick, char *arguments)
     if (!command_ignored)
     {
         irc_display_prefix (server, buffer, PREFIX_INFO);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
-        gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_channel);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
-        gui_printf (buffer, _("exception"));
-        gui_printf_color (buffer, COLOR_WIN_CHAT_HOST, " %s ", pos_exception);
-        gui_printf (buffer, _("by"));
+        gui_printf (buffer, "%s[%s%s%s]%s exception %s%s%s by ",
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    pos_channel,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                    pos_exception,
+                    GUI_COLOR(COLOR_WIN_CHAT));
         pos = strchr (pos_user, '!');
         if (pos)
         {
             pos[0] = '\0';
-            gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, " %s ", pos_user);
-            gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "(");
-            gui_printf_color (buffer, COLOR_WIN_CHAT_HOST, "%s", pos + 1);
-            gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, ")");
+            gui_printf (buffer, "%s%s %s(%s%s%s)",
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        pos_user,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                        pos + 1,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK));
         }
         else
-            gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, " %s", pos_user);
+            gui_printf (buffer,"%s%s",
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        pos_user);
         datetime = (time_t)(atol (pos_date));
-        gui_printf_nolog (buffer, ", %s", ctime (&datetime));
+        gui_printf_nolog (buffer, "%s, %s",
+                          GUI_COLOR(COLOR_WIN_CHAT),
+                          ctime (&datetime));
     }    
     return 0;
 }
@@ -4061,11 +4032,14 @@ irc_cmd_recv_349 (t_irc_server *server, char *host, char *nick, char *arguments)
     if (!command_ignored)
     {
         irc_display_prefix (server, buffer, PREFIX_INFO);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
-        gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_channel);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
-        gui_printf_nolog (buffer, "%s\n", pos_msg);
-    }    
+        gui_printf (buffer, "%s[%s%s%s] %s%s\n",
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    pos_channel,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    pos_msg);
+    }
     return 0;
 }
 
@@ -4198,32 +4172,23 @@ irc_cmd_recv_352 (t_irc_server *server, char *host, char *nick, char *arguments)
                                     {
                                         irc_display_prefix (server, server->buffer,
                                                             PREFIX_SERVER);
-                                        gui_printf_color (server->buffer,
-                                                          COLOR_WIN_CHAT_NICK,
-                                                          "%s ", pos_nick);
-                                        gui_printf_color (server->buffer,
-                                                          COLOR_WIN_CHAT,
-                                                          _("on"));
-                                        gui_printf_color (server->buffer,
-                                                          COLOR_WIN_CHAT_CHANNEL,
-                                                          " %s", pos_channel);
-                                        gui_printf_color (server->buffer,
-                                                          COLOR_WIN_CHAT,
-                                                          " %s %s ",
-                                                          pos_attr, pos_hopcount);
-                                        gui_printf_color (server->buffer,
-                                                          COLOR_WIN_CHAT_HOST,
-                                                          "%s@%s",
-                                                          pos_user, pos_host);
-                                        gui_printf_color (server->buffer,
-                                                          COLOR_WIN_CHAT_DARK,
-                                                          " (");
-                                        gui_printf_color (server->buffer,
-                                                          COLOR_WIN_CHAT,
-                                                          "%s", pos_realname);
-                                        gui_printf_color (server->buffer,
-                                                          COLOR_WIN_CHAT_DARK,
-                                                          ")\n");
+                                        gui_printf (server->buffer,
+                                                    "%s%s%s on %s%s%s %s %s %s%s@%s %s(%s%s%s)\n",
+                                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                                    pos_nick,
+                                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                                    pos_channel,
+                                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                                    pos_attr,
+                                                    pos_hopcount,
+                                                    GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                                                    pos_user,
+                                                    pos_host,
+                                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                                    pos_realname,
+                                                    GUI_COLOR(COLOR_WIN_CHAT_DARK));
                                     }
                                 }
                             }
@@ -4386,12 +4351,11 @@ irc_cmd_recv_366 (t_irc_server *server, char *host, char *nick, char *arguments)
                 {
                     /* display users on channel */
                     irc_display_prefix (server, ptr_channel->buffer, PREFIX_SERVER);
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                                      _("Nicks "));
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
-                                      "%s", ptr_channel->name);
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT, ": ");
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK, "[");
+                    gui_printf (ptr_channel->buffer, _("Nicks %s%s%s: %s["),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                ptr_channel->name,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK));
                     
                     for (ptr_nick = ptr_channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
                     {
@@ -4400,62 +4364,41 @@ irc_cmd_recv_366 (t_irc_server *server, char *host, char *nick, char *arguments)
                         if (ptr_nick != ptr_channel->last_nick)
                             gui_printf (ptr_channel->buffer, " ");
                     }
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK, "]\n");
+                    gui_printf (ptr_channel->buffer, "%s]\n",
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK));
                     
                     /* display number of nicks, ops, halfops & voices on the channel */
                     nick_count (ptr_channel, &num_nicks, &num_op, &num_halfop, &num_voice,
                                 &num_normal);
                     irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, _("Channel "));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL,
-                                      "%s", ptr_channel->name);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, ": ");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL,
-                                      "%d ", num_nicks);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      (num_nicks > 1) ? _("nicks") : _("nick"));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_DARK, " (");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL,
-                                      "%d ", num_op);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      (num_op > 1) ? _("ops") : _("op"));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      ", ");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL,
-                                      "%d ", num_halfop);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      (num_halfop > 1) ? _("halfops") : _("halfop"));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      ", ");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL,
-                                  "%d ", num_voice);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      (num_voice > 1) ? _("voices") : _("voice"));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      ", ");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL,
-                                      "%d ", num_normal);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      _("normal"));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_DARK, ")\n");
+                    gui_printf (ptr_channel->buffer,
+                                _("Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, "
+                                  "%s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                ptr_channel->name,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                num_nicks,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                (num_nicks > 1) ? _("nicks") : _("nick"),
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                num_op,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                (num_op > 1) ? _("ops") : _("op"),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                num_halfop,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                (num_halfop > 1) ? _("halfops") : _("halfop"),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                num_voice,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                (num_voice > 1) ? _("voices") : _("voice"),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                num_normal,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                _("normal"),
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK));
                 }
                 irc_cmd_send_mode (server, ptr_channel->name);
                 if (cfg_irc_away_check > 0)
@@ -4466,10 +4409,11 @@ irc_cmd_recv_366 (t_irc_server *server, char *host, char *nick, char *arguments)
                 if (!command_ignored)
                 {
                     irc_display_prefix (server, gui_current_window->buffer, PREFIX_INFO);
-                    gui_printf_color (gui_current_window->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL, pos);
-                    gui_printf_color (gui_current_window->buffer,
-                                      COLOR_WIN_CHAT, ": %s\n", pos2);
+                    gui_printf (gui_current_window->buffer, "%s%s%s: %s\n",
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                pos,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                pos2);
                 }
                 return 0;
             }
@@ -4524,42 +4468,24 @@ irc_cmd_recv_367 (t_irc_server *server, char *host, char *nick, char *arguments)
         pos_ban++;
     
     /* look for user who set ban */
+    pos_date = NULL;
     pos_user = strchr (pos_ban, ' ');
-    if (!pos_user)
+    if (pos_user)
     {
-        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
-        gui_printf_nolog (server->buffer,
-                          _("%s cannot parse \"%s\" command\n"),
-                          WEECHAT_ERROR, "367");
-        return -1;
-    }
-    pos_user[0] = '\0';
-    pos_user++;
-    while (pos_user[0] == ' ')
+        pos_user[0] = '\0';
         pos_user++;
-    
-    /* look for date/time */
-    pos_date = strchr (pos_user, ' ');
-    if (!pos_date)
-    {
-        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
-        gui_printf_nolog (server->buffer,
-                          _("%s cannot parse \"%s\" command\n"),
-                          WEECHAT_ERROR, "367");
-        return -1;
-    }
-    pos_date[0] = '\0';
-    pos_date++;
-    while (pos_date[0] == ' ')
-        pos_date++;
-    
-    if (!pos_date || !pos_date[0])
-    {
-        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
-        gui_printf_nolog (server->buffer,
-                          _("%s cannot parse \"%s\" command\n"),
-                          WEECHAT_ERROR, "367");
-        return -1;
+        while (pos_user[0] == ' ')
+            pos_user++;
+        
+        /* look for date/time */
+        pos_date = strchr (pos_user, ' ');
+        if (pos_date)
+        {
+            pos_date[0] = '\0';
+            pos_date++;
+            while (pos_date[0] == ' ')
+                pos_date++;   
+        }
     }
     
     ptr_channel = channel_search (server, pos_channel);
@@ -4570,24 +4496,51 @@ irc_cmd_recv_367 (t_irc_server *server, char *host, char *nick, char *arguments)
     if (!command_ignored)
     {
         irc_display_prefix (server, buffer, PREFIX_INFO);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
-        gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_channel);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
-        gui_printf_color (buffer, COLOR_WIN_CHAT_HOST, "%s ", pos_ban);
-        gui_printf (buffer, _("banned by"));
-        pos = strchr (pos_user, '!');
-        if (pos)
+        if (pos_user)
         {
-            pos[0] = '\0';
-            gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, " %s ", pos_user);
-            gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "(");
-            gui_printf_color (buffer, COLOR_WIN_CHAT_HOST, "%s", pos + 1);
-            gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, ")");
+            gui_printf_nolog (buffer, _("%s[%s%s%s] %s%s%s banned by "),
+                              GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                              GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                              pos_channel,
+                              GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                              GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                              pos_ban,
+                              GUI_COLOR(COLOR_WIN_CHAT));
+            pos = strchr (pos_user, '!');
+            if (pos)
+            {
+                pos[0] = '\0';
+                gui_printf (buffer, "%s%s %s(%s%s%s)",
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_user,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                            pos + 1,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK));
+            }
+            else
+                gui_printf (buffer, "%s%s",
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_user);
+            if (pos_date)
+            {
+                datetime = (time_t)(atol (pos_date));
+                gui_printf (buffer, "%s, %s",
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            ctime (&datetime));
+            }
+            else
+                gui_printf (buffer, "\n");
         }
         else
-            gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, " %s", pos_user);
-        datetime = (time_t)(atol (pos_date));
-        gui_printf_nolog (buffer, ", %s", ctime (&datetime));
+            gui_printf_nolog (buffer, _("%s[%s%s%s] %s%s%s banned\n"),
+                              GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                              GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                              pos_channel,
+                              GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                              GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                              pos_ban,
+                              GUI_COLOR(COLOR_WIN_CHAT));
     }    
     return 0;
 }
@@ -4644,10 +4597,13 @@ irc_cmd_recv_368 (t_irc_server *server, char *host, char *nick, char *arguments)
     if (!command_ignored)
     {
         irc_display_prefix (server, buffer, PREFIX_INFO);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
-        gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_channel);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
-        gui_printf_nolog (buffer, "%s\n", pos_msg);
+        gui_printf_nolog (buffer, "%s[%s%s%s] %s%s\n",
+                          GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                          GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                          pos_channel,
+                          GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                          GUI_COLOR(COLOR_WIN_CHAT),
+                          pos_msg);
     }    
     return 0;
 }
@@ -4796,14 +4752,13 @@ irc_cmd_recv_671 (t_irc_server *server, char *host, char *nick, char *arguments)
                     pos_message++;
                 
                 irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "[");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "] ");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT, "%s\n", pos_message);
+                gui_printf (server->buffer, "%s[%s%s%s] %s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_nick,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_message);
             }
         }
     }
diff --git a/src/irc/irc-send.c b/src/irc/irc-send.c
index fea02fbbe..2581b21a3 100644
--- a/src/irc/irc-send.c
+++ b/src/irc/irc-send.c
@@ -110,11 +110,11 @@ irc_cmd_send_ame (t_irc_server *server, char *arguments)
                                   ptr_channel->name,
                                   (arguments && arguments[0]) ? arguments : "");
                     irc_display_prefix (NULL, ptr_channel->buffer, PREFIX_ACTION_ME);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_NICK, "%s", ptr_server->nick);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, " %s\n",
-                                      (arguments && arguments[0]) ? arguments : "");
+                    gui_printf (ptr_channel->buffer, "%s%s %s%s\n",
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                ptr_server->nick,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                (arguments && arguments[0]) ? arguments : "");
                 }
             }
         }
@@ -157,8 +157,7 @@ irc_cmd_send_amsg (t_irc_server *server, char *arguments)
                         {
                             irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
                                               MSG_TYPE_NICK, 1, 1, 0);
-                            gui_printf_color (ptr_channel->buffer,
-                                              COLOR_WIN_CHAT, "%s\n", arguments);   
+                            gui_printf (ptr_channel->buffer, "%s\n", arguments);   
                         }
                         else
                         {
@@ -401,20 +400,23 @@ irc_cmd_send_ctcp (t_irc_server *server, char *arguments)
         }
 
         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT, "CTCP");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "(");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, ")");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": ");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_type);
+        gui_printf (server->buffer, "CTCP%s(%s%s%s)%s: %s%s",
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    arguments,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    pos_type);
         
         if ((ascii_strcasecmp (pos_type, "ping") == 0) && (!pos_args))
         {
             gettimeofday (&tv, &tz);
             server_sendf (server, "PRIVMSG %s :\01PING %d %d\01\r\n",
                           arguments, tv.tv_sec, tv.tv_usec);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, " %d %d\n",
-                              tv.tv_sec, tv.tv_usec);
+            gui_printf (server->buffer, " %s%d %d\n",
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        tv.tv_sec, tv.tv_usec);
         }
         else
         {
@@ -422,8 +424,9 @@ irc_cmd_send_ctcp (t_irc_server *server, char *arguments)
             {
                 server_sendf (server, "PRIVMSG %s :\01%s %s\01\r\n",
                               arguments, pos_type, pos_args);
-                gui_printf_color (server->buffer, COLOR_WIN_CHAT, " %s\n",
-                                  pos_args);
+                gui_printf (server->buffer, " %s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_args);
             }
             else
             {
@@ -906,11 +909,11 @@ irc_send_me (t_irc_server *server, t_irc_channel *channel, char *arguments)
                   channel->name,
                   (arguments && arguments[0]) ? arguments : "");
     irc_display_prefix (NULL, channel->buffer, PREFIX_ACTION_ME);
-    gui_printf_color (channel->buffer,
-                      COLOR_WIN_CHAT_NICK, "%s", server->nick);
-    gui_printf_color (channel->buffer,
-                      COLOR_WIN_CHAT, " %s\n",
-                      (arguments && arguments[0]) ? arguments : "");
+    gui_printf (channel->buffer, "%s%s %s%s\n",
+                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                server->nick,
+                GUI_COLOR(COLOR_WIN_CHAT),
+                (arguments && arguments[0]) ? arguments : "");
     return 0;
 }
 
@@ -1020,9 +1023,7 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
                 {
                     irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
                                       MSG_TYPE_NICK, 1, 1, 0);
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_MSG,
-                                           COLOR_WIN_CHAT, "%s\n", pos);
+                    gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG, "%s\n", pos);
                 }
                 else
                 {
@@ -1045,9 +1046,7 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
                         {
                             irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
                                               MSG_TYPE_NICK, 1, 1, 0);
-                            gui_printf_type_color (ptr_channel->buffer,
-                                                   MSG_TYPE_MSG,
-                                                   COLOR_WIN_CHAT, "%s\n", pos);
+                            gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG, "%s\n", pos);
                         }
                         else
                         {
@@ -1081,17 +1080,15 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
                             }
                         }
                         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                        gui_printf_type_color (server->buffer,
-                                               MSG_TYPE_NICK,
-                                               COLOR_WIN_CHAT_DARK, "-");
-                        gui_printf_type_color (server->buffer,
-                                               MSG_TYPE_NICK,
-                                               COLOR_WIN_CHAT_NICK, "%s", arguments);
-                        gui_printf_type_color (server->buffer,
-                                               MSG_TYPE_NICK,
-                                               COLOR_WIN_CHAT_DARK, "-");
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT, " %s\n", msg_pwd_hidden);
+                        gui_printf_type (server->buffer, MSG_TYPE_NICK,
+                                         "%s-%s%s%s- ",
+                                         GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                         GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                         arguments,
+                                         COLOR_WIN_CHAT_DARK);
+                        gui_printf (server->buffer, "%s%s\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    msg_pwd_hidden);
                         server_sendf (server, "PRIVMSG %s :%s\r\n", arguments, pos);
                         free (msg_pwd_hidden);
                         return 0;
@@ -1112,19 +1109,16 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
                         gui_draw_buffer_title (ptr_channel->buffer, 1);
                     }
                         
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_NICK,
-                                           COLOR_WIN_CHAT_DARK, "<");
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_NICK,
-                                           COLOR_WIN_NICK_SELF,
-                                           "%s", server->nick);
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_NICK,
-                                           COLOR_WIN_CHAT_DARK, "> ");
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_MSG,
-                                           COLOR_WIN_CHAT, "%s\n", pos);
+                    gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                                     "%s<%s%s%s> ",
+                                     GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                     GUI_COLOR(COLOR_WIN_NICK_SELF),
+                                     server->nick,
+                                     GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                    gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG,
+                                     "%s%s\n",
+                                     GUI_COLOR(COLOR_WIN_CHAT),
+                                     pos);
                     server_sendf (server, "PRIVMSG %s :%s\r\n", arguments, pos);
                 }
             }
@@ -1217,11 +1211,13 @@ irc_cmd_send_notice (t_irc_server *server, char *arguments)
         while (pos[0] == ' ')
             pos++;
         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT, "notice");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "(");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, ")");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": %s\n", pos);
+        gui_printf (server->buffer, "notice%s(%s%s%s)%s: %s\n",
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    arguments,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    pos);
         server_sendf (server, "NOTICE %s :%s\r\n", arguments, pos);
     }
     else
@@ -1435,19 +1431,16 @@ irc_cmd_send_query (t_irc_server *server, char *arguments)
     /* display text if given */
     if (pos)
     {        
-        gui_printf_type_color (ptr_channel->buffer,
-                               MSG_TYPE_NICK,
-                               COLOR_WIN_CHAT_DARK, "<");
-        gui_printf_type_color (ptr_channel->buffer,
-                                MSG_TYPE_NICK,
-                                COLOR_WIN_NICK_SELF,
-                                "%s", server->nick);
-        gui_printf_type_color (ptr_channel->buffer,
-                                MSG_TYPE_NICK,
-                                COLOR_WIN_CHAT_DARK, "> ");
-        gui_printf_type_color (ptr_channel->buffer,
-                                MSG_TYPE_MSG,
-                                COLOR_WIN_CHAT, "%s\n", pos);
+        gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                         "%s<%s%s%s> ",
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                         GUI_COLOR(COLOR_WIN_NICK_SELF),
+                         server->nick,
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK));
+        gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG,
+                         "%s\n",
+                         GUI_COLOR(COLOR_WIN_CHAT),
+                         pos);
         server_sendf (server, "PRIVMSG %s :%s\r\n", arguments, pos);
     }
     return 0;
diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c
index 5cce3faa5..ea2f2d777 100644
--- a/src/irc/irc-server.c
+++ b/src/irc/irc-server.c
@@ -672,7 +672,7 @@ server_msgq_flush ()
                         irc_display_prefix (recv_msgq->server,
                                             recv_msgq->server->buffer, PREFIX_ERROR);
                         gui_printf (recv_msgq->server->buffer,
-                                    _("%s Command '%s' failed!\n"), WEECHAT_ERROR, command);
+                                    _("%s Command \"%s\" failed!\n"), WEECHAT_ERROR, command);
                         break;
                     case -2:
                         irc_display_prefix (recv_msgq->server,
@@ -684,7 +684,7 @@ server_msgq_flush ()
                         irc_display_prefix (recv_msgq->server,
                                             recv_msgq->server->buffer, PREFIX_ERROR);
                         gui_printf (recv_msgq->server->buffer,
-                                    _("%s Unknown command: cmd=%s, host=%s, args=%s\n"),
+                                    _("%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"),
                                     WEECHAT_WARNING, command, host, args);
                         break;
                 }
diff --git a/src/plugins/plugins-interface.c b/src/plugins/plugins-interface.c
index 66728d611..b65cdb540 100644
--- a/src/plugins/plugins-interface.c
+++ b/src/plugins/plugins-interface.c
@@ -482,7 +482,7 @@ weechat_plugin_get_config_str_value (t_config_option *option, void *value)
             return option->array_values[*((int *)value)];
             break;
         case OPTION_TYPE_COLOR:
-            color_name = gui_get_color_by_value (*((int *)value));
+            color_name = gui_get_color_name (*((int *)value));
             return (color_name) ? strdup (color_name) : strdup ("");
             break;
         case OPTION_TYPE_STRING:
diff --git a/weechat/BUGS b/weechat/BUGS
index 37e316020..f3c990244 100644
--- a/weechat/BUGS
+++ b/weechat/BUGS
@@ -1,13 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-WeeChat known bugs, 2005-09-24
+WeeChat known bugs, 2005-11-04
 
-- color display problems when term has white background
 - ./configure does not check that Ruby libraries are installed
 - ./configure does not check that Gtk 2.0 libraries are installed
 - when quitting WeeChat term title is not restored (if look_set_title is ON)
 - command name for /server can not contain spaces
 - when many WeeChat are launched, log file is not properly written (cleared by
   each WeeChat at startup)
-- display problems with old Konsole versions (Kde terminal) (???)
+- WeeChat may crash if too much nicks in nicklist when position is top or bottom
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 3af6b5236..94019d019 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,13 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2005-10-30
+ChangeLog - 2005-11-04
 
 
 Version 0.1.6 (under dev!):
+   * new color management system, IRC colors are now correctly
+     displayed and can be removed by new options irc_colors_receive
+     and irc_colors_send
    * added setting for having one server buffer for all servers
      (look_one_server_buffer)
    * added setting for ignoring some chars when completing nicks
@@ -18,7 +21,8 @@ Version 0.1.6 (under dev!):
      library, and perl/python are plugin scripts
    * log options (for server/channel/private) can now be set while
      WeeChat is running
-   * added some missing IRC commands, channel modes +e and +f
+   * added channel modes +e and +f
+   * added some missing IRC commands, fixed command 367
    * added colors for input buffer and current channel of status bar
    * added online help for config options (with /set full_option_name)
    * enhanced "smart" hotlist, with names (new options:
diff --git a/weechat/doc/weechat-curses.1 b/weechat/doc/weechat-curses.1
index 240066e47..e415802fe 100644
--- a/weechat/doc/weechat-curses.1
+++ b/weechat/doc/weechat-curses.1
@@ -1,4 +1,4 @@
-.TH WEECHAT 1 "September 2005" "FlashCode"
+.TH WEECHAT 1 "November 2005" "FlashCode"
 
 .SH NAME
 weechat-curses \- Wee Enhanced Environment for Chat (Curses version)
@@ -19,6 +19,10 @@ It is compliant with RFCs 1459, 2810, 2811, 2812, and 2813.
 
 .SH OPTIONS
 .TP
+.B \-a, \-\-no\-connect
+.br
+disable auto-connect to servers at startup
+.TP
 .B \-c, \-\-config
 .br
 display config file help (list of options)
@@ -43,6 +47,10 @@ display default keys
 .br
 display program license
 .TP
+.B \-p, \-\-no\-plugin
+.br
+don't load any plugin at startup
+.TP
 .B \-v, \-\-version
 .br
 display WeeChat version
diff --git a/weechat/doc/weechat_doc_en.texi b/weechat/doc/weechat_doc_en.texi
index 349f2c5e7..4c5721f1f 100644
--- a/weechat/doc/weechat_doc_en.texi
+++ b/weechat/doc/weechat_doc_en.texi
@@ -35,7 +35,7 @@
 
 @title WeeChat - User guide
 @subtitle Fast, light and extensible IRC client
-@subtitle Documentation for WeeChat v0.1.6-cvs - October, 30 2005
+@subtitle Documentation for WeeChat v0.1.6-cvs - November, 4 2005
 
 @author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
 
@@ -298,9 +298,6 @@ Type: integer (values: between 1 and 10), default value: 10@*
 @item look_color_actions
 Display actions with different colors@*
 Type: boolean (values: 'on' or 'off'), default value: 'on'@*
-@item look_remove_colors_from_msgs
-Remove colors from incoming messages@*
-Type: boolean (values: 'on' or 'off'), default value: 'on'@*
 @item look_nicklist
 Display nicklist window (for channel windows)@*
 Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@@ -453,7 +450,7 @@ Color for input text (nick name)@*
 Type: color (Curses or Gtk color), default value: 'lightcyan'@*
 @item col_input_delimiters
 Color for input text (delimiters)@*
-Type: color (Curses or Gtk color), default value: 'white'@*
+Type: color (Curses or Gtk color), default value: 'cyan'@*
 @item col_input_bg
 Background for input window@*
 Type: color (Curses or Gtk color), default value: 'default'@*
@@ -604,6 +601,12 @@ Type: boolean (values: 'on' or 'off'), default value: 'off'@*
 @item irc_highlight
 Comma separated list of words to highlight (case insensitive comparison, words may begin or end with "*" for partial match)@*
 Type: string (any string), default value: ''@*
+@item irc_colors_receive
+Keep colors from incoming messages@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
+@item irc_colors_send
+Allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %U=underline, %R=reverse)@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
 @item dcc_auto_accept_files
 Automatically accept incoming dcc files@*
 Type: boolean (values: 'on' or 'off'), default value: 'off'@*
@@ -1577,7 +1580,7 @@ them the plugin can't load):@*
 @item functions for init and end of plugin:
 @itemize @minus
 @item weechat_plugin_init: function called when plugin is loaded,
-must return PLUGIN_RC_OK (0) if successful, PLUGIN_RC_KO (-1) if error
+must return PLUGIN_RC_OK if successful, PLUGIN_RC_KO if error
 @item weechat_plugin_end: function called when plugin is unloaded
 @end itemize
 @end itemize
@@ -1831,15 +1834,17 @@ void *handler_pointer)}@*
 @*
 @emph{Notes:}@*
 @*
-Function called when message is received has to return one of these values:@*
+Function called when message is received has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{PLUGIN_RC_KO or -1}: function failed
-@item @option{PLUGIN_RC_OK or 0}: function successfully completed
-@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT or 1}: message will not be sent to
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
+@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT}: message will not be sent to
 WeeChat
-@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS or 2}: message will not be sent to
+@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS}: message will not be sent to
 other plugins
-@item @option{PLUGIN_RC_OK_IGNORE_ALL or 3}: message will not be sent to
+@item @option{PLUGIN_RC_OK_IGNORE_ALL}: message will not be sent to
 WeeChat neither other plugins
 @end itemize
 @*
@@ -1888,10 +1893,12 @@ file: %s", (arguments) ? arguments : "none");}@*
 @*
 @emph{Notes:}@*
 @*
-Function called when command is executed has to return one of these values:@*
+Function called when command is executed has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{PLUGIN_RC_KO or -1}: function failed
-@item @option{PLUGIN_RC_OK or 0}: function successfully completed
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
 @end itemize
 @*
 
@@ -2217,12 +2224,11 @@ void weechat_plugin_end (t_weechat_plugin *plugin)
 Three plugins are provided with WeeChat to use script languages: Perl,
 Python and Ruby.
 
-@subsection Perl scripts
+@subsection Load/unload scripts
 
-@subsubsection Load/unload Perl scripts
-
-Perl scripts are loaded and unloaded with @command{/perl} command.
-(type @kbd{/help perl} within WeeChat to get help about command).@*
+Perl scripts are loaded and unloaded with @command{/perl},
+@command{/python} and @command{/ruby} commands.
+(type @kbd{/help} within WeeChat to get help about commands).@*
 
 @emph{Examples:}@*
 @itemize @bullet
@@ -2232,23 +2238,32 @@ Load a Perl script: @kbd{/perl load /tmp/sample.pl}@*
 Unload all Perl scripts: @kbd{/perl unload}@*
 @item
 List all Perl scripts: @kbd{/perl}@*
+@item
+Load a Python script: @kbd{/python load /tmp/sample.py}@*
+@item
+Unload all Python scripts: @kbd{/python unload}@*
+@item
+List all Python scripts: @kbd{/python}@*
 @end itemize
 
-@subsubsection WeeChat / Perl API
+@subsection WeeChat / Scripts API
 
 @itemize @bullet
 @item
-@command{weechat::register ( name, version, shutdown_function, description );}@*
+Perl: @command{weechat::register ( name, version, shutdown_function,
+description );}@*
+Python: @command{weechat.register ( name, version, shutdown_function,
+description )}@*
 @*
-This is first function to call in Perl script.@*
-All Perl scripts for WeeChat should call this function.@*
+This is first function to call in script.@*
+All scripts for WeeChat should call this function.@*
 
 @emph{Arguments:}
 @itemize @minus
 @item @option{name}: unique name to identify script (each script must have
 unique name)
 @item @option{version}: script's version
-@item @option{shutdown_function}: Perl function called when script is
+@item @option{shutdown_function}: function called when script is
 unloaded (optional parameter, empty string means nothing is called at the end)
 @item @option{description}: short description of script.
 @end itemize
@@ -2257,13 +2272,20 @@ unloaded (optional parameter, empty string means nothing is called at the end)
 @*
 1 if script was registered, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat::register ("sample", "1.0", "sample_end", "Sample script!");}@*
+@code{weechat::register ("sample", "1.0", "sample_end", "Sample
+script!");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.register ("sample", "1.0", "sample_end", "Sample
+script!")}@*
 @*
 
 @item
-@command{weechat::print ( message, [channel, [server]] );}@*
+Perl: @command{weechat::print ( message, [channel, [server]] );}@*
+Python: @command{weechat.prnt ( message, [channel, [server]] )}@*
 @*
 Print message in a channel.@*
 
@@ -2278,15 +2300,22 @@ Print message in a channel.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
 @code{weechat::print ("message");}@*
 @code{weechat::print ("message", "#weechat");}@*
 @code{weechat::print ("message", "#weechat", "freenode");}@*
 @*
+@emph{Python examples:}@*
+@*
+@code{weechat.prnt ("message")}@*
+@code{weechat.prnt ("message", "#weechat")}@*
+@code{weechat.prnt ("message", "#weechat", "freenode")}@*
+@*
 
 @item
-@command{weechat::print_infobar ( delay, message );}@*
+Perl: @command{weechat::print_infobar ( delay, message );}@*
+Python: @command{weechat.print_infobar ( delay, message )}@*
 @*
 Print message in infobar.@*
 
@@ -2301,15 +2330,20 @@ Print message in infobar.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
 @code{weechat::print_infobar (5, "message");}@*
 @*
+@emph{Python example:}@*
+@*
+@code{weechat.print_infobar (5, "message")}@*
+@*
 
 @item
-@command{weechat::add_message_handler ( name, function );}@*
+Perl: @command{weechat::add_message_handler ( name, function );}@*
+Python: @command{weechat.add_message_handler ( name, function )}@*
 @*
-Attach a Perl function to an IRC message.@*
+Attach a script function to an IRC message.@*
 Function will be called each time IRC message will be received.@*
 
 @emph{Arguments:}
@@ -2318,14 +2352,14 @@ Function will be called each time IRC message will be received.@*
 To know list of IRC messages, please refer to RFC 1459 and/or 2812:@*
 RFC 1459: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
 RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{function}: Perl function called when message is received
+@item @option{function}: function called when message is received
 @end itemize
 @*
 @emph{Return value:}@*
 @*
-1 if Perl function was attached, 0 if error occured.@*
+1 if function was attached, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
 @code{weechat::add_message_handler ("privmsg", my_function);}@*
 @code{sub my_function}@*
@@ -2337,31 +2371,48 @@ RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
 @code{@ @ @ @ return 0;}@*
 @code{@} }@*
 @*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.add_message_handler ("privmsg", my_function)}@*
+@code{def my_function(server, args):}@*
+@code{@ @ @ @ weechat.prnt("server="+server)}@*
+@code{@ @ @ @ null, channel, message = string.split(args, ":", 2)}@*
+@code{@ @ @ @ hostmask, null, channel = string.split(string.strip(channel), " ", 2)}@*
+@code{@ @ @ @ weechat.prnt("host="+hostmask+", channel="+channel+", message="+message)}@*
+@code{@ @ @ @ return 0}@*
+@*
 @emph{Notes:}@*
 @*
-Function called when message is received has to return one of these values:@*
+Function called when message is received has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@item @option{1}: message will not be sent to WeeChat
-@item @option{2}: message will not be sent to other plugins
-@item @option{3}: message will not be sent to WeeChat neither other plugins
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
+@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT}: message will not be sent
+to WeeChat
+@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS}: message will not be sent
+to other plugins
+@item @option{PLUGIN_RC_OK_IGNORE_ALL}: message will not be sent to
+WeeChat neither other plugins
 @end itemize
 @*
 
 @item
-@command{weechat::add_command_handler ( name, function );}@*
+Perl: @command{weechat::add_command_handler ( name, function );}@*
+Python: @command{weechat.add_command_handler ( name, function )}@*
 @*
-Create new WeeChat command, linked with Perl function.@*
+Create new WeeChat command, linked with script function.@*
 Function will be called when user will launch command with @kbd{/name}.@*
 
 @emph{Arguments:}
 @itemize @minus
 @item @option{name}: name of new command@*
 This name may be existing command, so that the command is overrided by
-Perl function. Be careful when overriding WeeChat commands, they'll not be
-available until your Perl script will be unloaded.
-@item @option{function}: Perl function linked with command
+script function. Be careful when overriding WeeChat commands, they'll not be
+available until your script will be unloaded.
+@item @option{function}: function linked with command
 @item @option{description}: command description (displayed by /help
 command)
 @item @option{arguments}: short description of command arguments
@@ -2372,9 +2423,9 @@ arguments (displayed by /help command)
 @*
 @emph{Return value:}@*
 @*
-1 if Perl function was attached, 0 if error occured.@*
+1 if function was attached, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
 @code{weechat::add_command_handler ("command", my_command);}@*
 @code{sub my_command}@*
@@ -2383,37 +2434,52 @@ arguments (displayed by /help command)
 @code{@ @ @ @ return 0;}@*
 @code{@} }@*
 @*
+@emph{Python example:}@*
+@*
+@code{weechat.add_command_handler ("command", my_command)}@*
+@code{def my_command(server, args):}@*
+@code{@ @ @ @ weechat.prnt("server:"+server+" arguments:"+args)}@*
+@code{@ @ @ @ return 0}@*
+@*
 @emph{Notes:}@*
 @*
-Function called when command is executed has to return one of these values:@*
+Function called when command is executed has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
 @end itemize
 @*
 
 @item
-@command{weechat::remove_handler ( name, function );}@*
+Perl: @command{weechat::remove_handler ( name, function );}@*
+Python: @command{weechat.remove_handler ( name, function )}@*
 @*
 Remove a message or command handler.@*
 
 @emph{Arguments:}
 @itemize @minus
 @item @option{name}: name of IRC message or command handler
-@item @option{function}: Perl function
+@item @option{function}: function
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
 @code{weechat::remove_handler ("command", my_command);}@*
 @*
+@emph{Python example:}@*
+@*
+@code{weechat.remove_handler ("command", my_command)}@*
+@*
 
 @item
-@command{weechat::command ( command, [channel, [server]] );}@*
+Perl: @command{weechat::command ( command, [channel, [server]] );}@*
+Python: @command{weechat.command ( command, [channel, [server]] )}@*
 @*
 Execute a command or send a message to a channel.@*
 
@@ -2428,15 +2494,22 @@ Execute a command or send a message to a channel.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
 @code{weechat::command ("hello world!");}@*
 @code{weechat::command ("/kick toto please leave this chan", "#weechat");}@*
 @code{weechat::command ("/nick newnick", "", "freenode");}@*
 @*
+@emph{Python examples:}@*
+@*
+@code{weechat.command ("hello world!")}@*
+@code{weechat.command ("/kick toto please leave this chan", "#weechat")}@*
+@code{weechat.command ("/nick newnick", "", "freenode")}@*
+@*
 
 @item
-@command{weechat::get_info ( name, [server, [channel] ] );}@*
+Perl: @command{weechat::get_info ( name, [server, [channel] ] );}@*
+Python: @command{weechat.get_info ( name, [server, [channel] ] )}@*
 @*
 Get various info about WeeChat, server or user.@*
 
@@ -2462,391 +2535,20 @@ Get various info about WeeChat, server or user.@*
 @*
 Asked info, empty if error occured or info was not found.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
 @code{$version = weechat::get_info("version");}@*
 @code{$nick = weechat::get_info("nick", "freenode");}@*
 @*
-
-@item
-@command{weechat::get_dcc_info ( );}@*
-@*
-Get DCC list.@*
-
-Returned array has following fields:
-@itemize @minus
-@item server: IRC server
-@item channel: IRC channel
-@item type: DCC type:
-@itemize @minus
-@item 0: chat (received)
-@item 1: chat (sent)
-@item 2: file (receiving)
-@item 3: file (sending)
-@end itemize
-@item status: DCC status:
-@itemize @minus
-@item 0: waiting
-@item 1: connecting
-@item 2: active
-@item 3: done
-@item 4: failed
-@item 5: aborted
-@end itemize
-@item start_time: date/time of DCC creation
-@item start_transfer: date/time of transfer start
-@item addr: remote address
-@item port: port used for DCC
-@item nick: remote nick
-@item filename: filename
-@item local_filename: local filename
-@item size: file size
-@item pos: current position in file
-@item start_resume: restart position after interruption
-@item bytes_per_sec: bytes sent/received per second
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-DCC list, 0 if error occured.@*
-@*
-
-@item
-@command{weechat::get_config ( option );}@*
-@*
-Get WeeChat config option value.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Value of option, empty if error occured or option was not found.@*
-@*
-@emph{Examples:}@*
-@*
-@code{$value1 = weechat::get_config ("look_nicklist");}@*
-@code{$value2 = weechat::get_config ("freenode.server_autojoin");}@*
-@*
-
-@item
-@command{weechat::set_config ( option, value );}@*
-@*
-Get WeeChat config option value.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@item @option{value}: new value for option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Examples:}@*
-@*
-@code{weechat::set_config ("look_nicklist", "off");}@*
-@code{weechat::set_config ("freenode.server_autojoin"", "#weechat");}@*
-@*
-
-@item
-@command{weechat::get_plugin_config ( option );}@*
-@*
-Return value of a plugin option.@*
-Option is read from file ~/.weechat/plugins.rc and is like:@*
-@code{plugin.script.option=value}@*
-Note: plugin and script names are automatically added.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Value of option, empty if error occured or option was not found.@*
-@*
-@emph{Example:}@*
-@*
-@code{$value = weechat::get_plugin_config ("my_var");}@*
-@*
-
-@item
-@command{weechat::set_plugin_config ( option, value );}@*
-@*
-Update value of a plugin option.@*
-Option is written in file ~/.weechat/plugins.rc and is like:@*
-@code{plugin.script.option=value}@*
-Note: plugin and script names are automatically added.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@item @option{value}: new value for option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat::set_plugin_config ("my_var", "value");}@*
-@*
-
-@end itemize
-
-@subsection Python scripts
-
-@subsubsection Load/unload Python scripts
-
-Python scripts are loaded and unloaded with @command{/python} command.
-(type @kbd{/help python} within WeeChat to get help about command).@*
-
-@emph{Examples:}@*
-@itemize @bullet
-@item
-Load a Python script: @kbd{/python load /tmp/sample.py}@*
-@item
-Unload all Python scripts: @kbd{/python unload}@*
-@item
-List all Python scripts: @kbd{/python}@*
-@end itemize
-
-@subsubsection WeeChat / Python API
-
-@itemize @bullet
-@item
-@command{weechat.register ( name, version, shutdown_function, description )}@*
-@*
-This is first function to call in Python script.@*
-All Python scripts for WeeChat should call this function.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{name}: unique name to identify script (each script must have
-unique name)
-@item @option{version}: script's version
-@item @option{shutdown_function}: Python function called when script is
-unloaded (optional parameter, empty string means nothing is called at the end)
-@item @option{description}: short description of script.
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if script was registered, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat.register ("sample", "1.0", "sample_end", "Sample script!")}@*
-@*
-
-@item
-@command{weechat.prnt ( message, [channel, [server]] )}@*
-@*
-Print message in a channel.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{message}: message to display
-@item @option{channel}: name of channel
-@item @option{server}: internal name of server
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Examples:}@*
-@*
-@code{weechat.prnt ("message")}@*
-@code{weechat.prnt ("message", "#weechat")}@*
-@code{weechat.prnt ("message", "#weechat", "freenode")}@*
-@*
-
-@item
-@command{weechat.print_infobar ( delay, message )}@*
-@*
-Print message in infobar.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{delay}: after this delay (in seconds), message will be erased
-(if 0, message will not be erased).
-@item @option{message}: message to display
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat.print_infobar (5, "message")}@*
-@*
-
-@item
-@command{weechat.add_message_handler ( name, function )}@*
-@*
-Attach a Python function to an IRC message.@*
-Function will be called each time IRC message will be received.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{name}: name of IRC message@*
-To know list of IRC messages, please refer to RFC 1459 and/or 2812:@*
-RFC 1459: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
-RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{function}: Python function called when message is received
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if Python function was attached, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat.add_message_handler ("privmsg", my_function)}@*
-@code{def my_function(server, args):}@*
-@code{@ @ @ @ weechat.prnt("server="+server)}@*
-@code{@ @ @ @ null, channel, message = string.split(args, ":", 2)}@*
-@code{@ @ @ @ hostmask, null, channel = string.split(string.strip(channel), " ", 2)}@*
-@code{@ @ @ @ weechat.prnt("host="+hostmask+", channel="+channel+", message="+message)}@*
-@code{@ @ @ @ return 0}@*
-@*
-@emph{Notes:}@*
-@*
-Function called when message is received has to return one of these values:@*
-@itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@item @option{1}: message will not be sent to WeeChat
-@item @option{2}: message will not be sent to other plugins
-@item @option{3}: message will not be sent to WeeChat neither other plugins
-@end itemize
-@*
-
-@item
-@command{weechat.add_command_handler ( name, function )}@*
-@*
-Create new WeeChat command, linked with Python function.@*
-Function will be called when user will launch command with @kbd{/name}.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{name}: name of new command@*
-This name may be existing command, so that the command is overrided by
-Python function. Be careful when overriding WeeChat commands, they'll not be
-available until your Python script will be unloaded.
-@item @option{function}: Python function linked with command
-@item @option{description}: command description (displayed by /help
-command)
-@item @option{arguments}: short description of command arguments
-(displayed by /help command)
-@item @option{arguments_description}: long description of command
-arguments (displayed by /help command)
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if Python function was attached, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat.add_command_handler ("command", my_command)}@*
-@code{def my_command(server, args):}@*
-@code{@ @ @ @ weechat.prnt("server:"+server+" arguments:"+args)}@*
-@code{@ @ @ @ return 0}@*
-@*
-@emph{Notes:}@*
-@*
-Function called when command is executed has to return one of these values:@*
-@itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@end itemize
-@*
-
-@item
-@command{weechat.remove_handler ( name, function );}@*
-@*
-Remove a message or command handler.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{name}: name of IRC message or command handler
-@item @option{function}: Python function
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat.remove_handler ("command", my_command);}@*
-@*
-
-@item
-@command{weechat.command ( command, [channel, [server]] )}@*
-@*
-Execute a command or send a message to a channel.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{command}: command to execute (or message to send in a channel)
-@item @option{channel}: name of channel
-@item @option{server}: internal name of server
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Examples:}@*
-@*
-@code{weechat.command ("hello world!")}@*
-@code{weechat.command ("/kick toto please leave this chan", "#weechat")}@*
-@code{weechat.command ("/nick newnick", "", "freenode")}@*
-@*
-
-
-@item
-@command{weechat.get_info ( name, [server] )}@*
-@*
-Get various info about WeeChat, server or user.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{name}: name of info to retrieve:
-@itemize @minus
-@item @option{version}: get WeeChat version
-@item @option{nick}: get nickname
-@item @option{channel}: get channel name
-@item @option{server}: get server name
-@item @option{away}: get ``away'' flag
-@item @option{weechat_dir}: get WeeChat home dir
-@item @option{weechat_libdir}: get WeeChat system lib dir
-@item @option{weechat_sharedir}: get WeeChat system share dir
-@end itemize
-@item @option{server}: internal name of server
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Asked info, empty if error occured or info was not found.@*
-@*
-@emph{Examples:}@*
+@emph{Python examples:}@*
 @*
 @code{$version = weechat.get_info("version")}@*
 @code{$nick = weechat.get_info("nick", "freenode")}@*
 @*
 
 @item
-@command{weechat.get_dcc_info ( );}@*
+Perl: @command{weechat::get_dcc_info ( );}@*
+Python: @command{weechat.get_dcc_info ( );}@*
 @*
 Get DCC list.@*
 
@@ -2889,7 +2591,8 @@ DCC list, 0 if error occured.@*
 @*
 
 @item
-@command{weechat.get_config ( option );}@*
+Perl: @command{weechat::get_config ( option );}@*
+Python: @command{weechat.get_config ( option )}@*
 @*
 Get WeeChat config option value.@*
 
@@ -2902,14 +2605,20 @@ Get WeeChat config option value.@*
 @*
 Value of option, empty if error occured or option was not found.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
-@code{$value1 = weechat.get_config ("look_nicklist");}@*
-@code{$value2 = weechat.get_config ("freenode.server_autojoin");}@*
+@code{$value1 = weechat::get_config ("look_nicklist");}@*
+@code{$value2 = weechat::get_config ("freenode.server_autojoin");}@*
+@*
+@emph{Python examples:}@*
+@*
+@code{$value1 = weechat.get_config ("look_nicklist")}@*
+@code{$value2 = weechat.get_config ("freenode.server_autojoin")}@*
 @*
 
 @item
-@command{weechat.set_config ( option, value );}@*
+Perl: @command{weechat::set_config ( option, value );}@*
+Python: @command{weechat.set_config ( option, value )}@*
 @*
 Get WeeChat config option value.@*
 
@@ -2923,14 +2632,21 @@ Get WeeChat config option value.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
-@code{weechat.set_config ("look_nicklist", "off");}@*
-@code{weechat.set_config ("freenode.server_autojoin"", "#weechat");}@*
+@code{weechat::set_config ("look_nicklist", "off");}@*
+@code{weechat::set_config ("freenode.server_autojoin"",
+"#weechat");}@*
+@*
+@emph{Python examples:}@*
+@*
+@code{weechat.set_config ("look_nicklist", "off")}@*
+@code{weechat.set_config ("freenode.server_autojoin"", "#weechat")}@*
 @*
 
 @item
-@command{weechat.get_plugin_config ( option );}@*
+Perl: @command{weechat::get_plugin_config ( option );}@*
+Python: @command{weechat.get_plugin_config ( option )}@*
 @*
 Return value of a plugin option.@*
 Option is read from file ~/.weechat/plugins.rc and is like:@*
@@ -2946,13 +2662,18 @@ Note: plugin and script names are automatically added.@*
 @*
 Value of option, empty if error occured or option was not found.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
-@code{$value = weechat.get_plugin_config ("my_var");}@*
+@code{$value = weechat::get_plugin_config ("my_var");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{$value = weechat.get_plugin_config ("my_var")}@*
 @*
 
 @item
-@command{weechat.set_plugin_config ( option, value );}@*
+Perl: @command{weechat::set_plugin_config ( option, value );}@*
+Python: @command{weechat.set_plugin_config ( option, value )}@*
 @*
 Update value of a plugin option.@*
 Option is written in file ~/.weechat/plugins.rc and is like:@*
@@ -2969,17 +2690,17 @@ Note: plugin and script names are automatically added.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat.set_plugin_config ("my_var", "value");}@*
+@code{weechat::set_plugin_config ("my_var", "value");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.set_plugin_config ("my_var", "value")}@*
 @*
 
 @end itemize
 
-@subsection Ruby scripts
-
-Not developed!
-
 
 @c **************************** Authors / Support *****************************
 
diff --git a/weechat/doc/weechat_doc_es.texi b/weechat/doc/weechat_doc_es.texi
index d36bcd412..a4330e16d 100644
--- a/weechat/doc/weechat_doc_es.texi
+++ b/weechat/doc/weechat_doc_es.texi
@@ -36,7 +36,7 @@
 
 @title WeeChat - Gui@'on de usuario.
 @subtitle Cliente IRC r@'apido, peque@~no y extensible
-@subtitle Documentaci@'on para WeeChat v0.1.6-cvs - 30 de octubre de 2005
+@subtitle Documentaci@'on para WeeChat v0.1.6-cvs - 4 de noviembre de 2005
 
 @author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
 
@@ -298,9 +298,6 @@ Typo: entero (valores: entre 1 y 10), valor por defecto: 10@*
 @item look_color_actions
 Mostrar acciones con colores diferentes@*
 Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'on'@*
-@item look_remove_colors_from_msgs
-Quitar colores en los mensajes entrantes@*
-Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'on'@*
 @item look_nicklist
 Mostrar ventana de usuarios (para las ventanas de canal)@*
 Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'on'@*
@@ -453,7 +450,7 @@ Color para el texto de entrada (alias)@*
 Typo: color (color Curses @'o Gtk), valor por defecto: 'lightcyan'@*
 @item col_input_delimiters
 Color for input text (delimiters)@*
-Typo: color (color Curses @'o Gtk), valor por defecto: 'white'@*
+Typo: color (color Curses @'o Gtk), valor por defecto: 'cyan'@*
 @item col_input_bg
 Color de fondo para la ventana de entrada@*
 Typo: color (color Curses @'o Gtk), valor por defecto: 'default'@*
@@ -604,6 +601,12 @@ Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'off'@*
 @item irc_highlight
 Comma separated list of words to highlight (case insensitive comparison, words may begin or end with "*" for partial match)@*
 Typo: cadena (cualquier cadena), valor por defecto: ''@*
+@item irc_colors_receive
+Keep colors from incoming messages@*
+Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'on'@*
+@item irc_colors_send
+Allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %U=underline, %R=reverse)@*
+Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'on'@*
 @item dcc_auto_accept_files
 Aceptar autom@'aticamente los ficheros dcc entrantes@*
 Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'off'@*
@@ -1834,15 +1837,17 @@ void *handler_pointer)}@*
 @*
 @emph{Notes:}@*
 @*
-Function called when message is received has to return one of these values:@*
+Function called when message is received has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{PLUGIN_RC_KO or -1}: function failed
-@item @option{PLUGIN_RC_OK or 0}: function successfully completed
-@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT or 1}: message will not be sent to
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
+@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT}: message will not be sent to
 WeeChat
-@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS or 2}: message will not be sent to
+@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS}: message will not be sent to
 other plugins
-@item @option{PLUGIN_RC_OK_IGNORE_ALL or 3}: message will not be sent to
+@item @option{PLUGIN_RC_OK_IGNORE_ALL}: message will not be sent to
 WeeChat neither other plugins
 @end itemize
 @*
@@ -1891,10 +1896,12 @@ file: %s", (arguments) ? arguments : "none");}@*
 @*
 @emph{Notes:}@*
 @*
-Function called when message is received has to return one of these values:@*
+Function called when message is received has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{PLUGIN_RC_KO or -1}: function failed
-@item @option{PLUGIN_RC_OK or 0}: function successfully completed
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
 @end itemize
 @*
 
@@ -2214,151 +2221,195 @@ void weechat_plugin_end (t_weechat_plugin *plugin)
 Three plugins are provided with WeeChat to load scripts: Perl,
 Python and Ruby.
 
-@subsection Perl scripts
+@subsection Load/unload scripts
 
-@subsubsection Cargar/descargar programas Perl
+Perl scripts are loaded and unloaded with @command{/perl},
+@command{/python} and @command{/ruby} commands.
+(type @kbd{/help} within WeeChat to get help about commands).@*
 
-Los programas Perl se cargan y descargan con el comando @command{/perl}
-(escribiendo @kbd{/help perl} en WeeChat para obtener la ayuda acerca del comando).@*
-
-@emph{Ejemplos:}@*
+@emph{Examples:}@*
 @itemize @bullet
 @item
-Cargar un programa Perl: @kbd{/perl load /tmp/ejemplo.pl}@*
-@item Descargar todos los programas Perl: @kbd{/perl unload}@*
+Load a Perl script: @kbd{/perl load /tmp/sample.pl}@*
 @item
-Listar los programas Perl cargados: @kbd{/perl}@*
+Unload all Perl scripts: @kbd{/perl unload}@*
+@item
+List all Perl scripts: @kbd{/perl}@*
+@item
+Load a Python script: @kbd{/python load /tmp/sample.py}@*
+@item
+Unload all Python scripts: @kbd{/python unload}@*
+@item
+List all Python scripts: @kbd{/python}@*
 @end itemize
 
-@subsubsection Interfaz WeeChat / Perl
+@subsection WeeChat / Scripts API
 
 @itemize @bullet
 @item
-@command{weechat::register ( nombre, versi@'on, funci@'on_final, descripci@'on );}@*
+Perl: @command{weechat::register ( name, version, shutdown_function,
+description );}@*
+Python: @command{weechat.register ( name, version, shutdown_function,
+description )}@*
 @*
-Es la primera funci@'on a la que llamar en el programa Perl.@*
-Todos los programas en Perl para WeeChat deben llamar esta funci@'on.@*
+This is first function to call in script.@*
+All scripts for WeeChat should call this function.@*
 
-@emph{Par@'ametros:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{nombre}: nombre @'unico para identificar el programa (cada programa debe
-tener un nombre distinto)
-@item @option{versi@'on}: versi@'on del programa
-@item @option{funci@'on_final}: funci@'on Perl llamada cuando el programa finaliza
-(par@'ametro facultativo, una cadena llena significa que no hay ninguna funci@'on que llamar)
-@item @option{descripci@'on}: descripci@'on breve del programa
+@item @option{name}: unique name to identify script (each script must have
+unique name)
+@item @option{version}: script's version
+@item @option{shutdown_function}: function called when script is
+unloaded (optional parameter, empty string means nothing is called at the end)
+@item @option{description}: short description of script.
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 1 if script was registered, 0 if error occured.@*
 @*
-@emph{Ejemplo:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat::register ("ejemplo", "1.0", "fin_ejemplo", "programa de ejemplo...");}@*
+@code{weechat::register ("sample", "1.0", "sample_end", "Sample
+script!");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.register ("sample", "1.0", "sample_end", "Sample
+script!")}@*
 @*
 
 @item
-@command{weechat::print ( mensaje, [canal, [servidor]] );}@*
+Perl: @command{weechat::print ( message, [channel, [server]] );}@*
+Python: @command{weechat.prnt ( message, [channel, [server]] )}@*
 @*
-Escribe un mensaje en un canal.@*
+Print message in a channel.@*
 
-@emph{Par@'ametros:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{mensaje}: mensaje a escribir
-@item @option{canal}: nombre del canal
-@item @option{servidor}: (opcional) nombre interno del servidor
+@item @option{message}: message to display
+@item @option{channel}: name of channel
+@item @option{server}: internal name of server
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Ejemplos:}@*
+@emph{Perl examples:}@*
 @*
-@code{weechat::print ("mensaje");}@*
-@code{weechat::print ("mensaje", "#weechat");}@*
-@code{weechat::print ("mensaje", "#weechat", "freenode");}@*
+@code{weechat::print ("message");}@*
+@code{weechat::print ("message", "#weechat");}@*
+@code{weechat::print ("message", "#weechat", "freenode");}@*
+@*
+@emph{Python examples:}@*
+@*
+@code{weechat.prnt ("message")}@*
+@code{weechat.prnt ("message", "#weechat")}@*
+@code{weechat.prnt ("message", "#weechat", "freenode")}@*
 @*
 
 @item
-@command{weechat::print_infobar ( retraso, mensaje );}@*
+Perl: @command{weechat::print_infobar ( delay, message );}@*
+Python: @command{weechat.print_infobar ( delay, message )}@*
 @*
-Escribir un mensaje en la barra de informaciones.@*
+Print message in infobar.@*
 
-@emph{Par@'ametros:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{plazo}: periodo en segundo durante el cual se mostrar@'a el mensaje
-(si es 0, el mensaje no se borrar@'a).
-@item @option{message}: mensaje que se escribir@'a en la barra de informaciones.
+@item @option{delay}: after this delay (in seconds), message will be erased
+(if 0, message will not be erased).
+@item @option{message}: message to display
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Ejemplo:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat::print_infobar (5, "mensaje");}@*
+@code{weechat::print_infobar (5, "message");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.print_infobar (5, "message")}@*
 @*
 
 @item
-@command{weechat::add_message_handler ( nombre, funci@'on );}@*
+Perl: @command{weechat::add_message_handler ( name, function );}@*
+Python: @command{weechat.add_message_handler ( name, function )}@*
 @*
-Adjunta una funci@'on Perl a un mensaje IRC.@*
-Se llamar@'a a la funci@'on cada vez que el mensaje IRC se reciba.@*
+Attach a script function to an IRC message.@*
+Function will be called each time IRC message will be received.@*
 
-@emph{Par@'ametros:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{nombre}: nombre del mensaje IRC que producir@'a la llamada a la funci@'on.@*
-Para saber qu@'e tipo de mensajes IRC existen puede leer las 
-RFC 1459 y/o 2812:@*
+@item @option{name}: name of IRC message@*
+To know list of IRC messages, please refer to RFC 1459 and/or 2812:@*
 RFC 1459: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
 RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{funci@'on}: funci@'on en Perl llamada cuando se reciba el mensaje.
+@item @option{function}: function called when message is received
 @end itemize
 @*
 @emph{Return value:}@*
 @*
-1 if Perl function was attached, 0 if error occured.@*
+1 if function was attached, 0 if error occured.@*
 @*
-@emph{Ejemplo:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat::add_message_handler ("privmsg", mi_funcion);}@*
-@code{sub mi_funcion}@*
+@code{weechat::add_message_handler ("privmsg", my_function);}@*
+@code{sub my_function}@*
 @code{@{ }@*
-@code{@ @ @ @ weechat::print ("serveur=$_[0]\n");}@*
-@code{@ @ @ @ ($null, $canal, $mensaje) = split ":",$_[1],3;}@*
-@code{@ @ @ @ ($mascara, $null, $canal) = split " ", $canal;}@*
-@code{@ @ @ @ weechat::print ("masc=$mascara, canal=$canal, msj=$mensaje\n");}@*
+@code{@ @ @ @ weechat::print ("server=$_[0]\n");}@*
+@code{@ @ @ @ ($null, $channel, $message) = split ":",$_[1],3;}@*
+@code{@ @ @ @ ($hostmask, $null, $channel) = split " ", $channel;}@*
+@code{@ @ @ @ weechat::print ("host=$hostmask, chan=$channel, msg=$message\n");}@*
 @code{@ @ @ @ return 0;}@*
 @code{@} }@*
 @*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.add_message_handler ("privmsg", my_function)}@*
+@code{def my_function(server, args):}@*
+@code{@ @ @ @ weechat.prnt("server="+server)}@*
+@code{@ @ @ @ null, channel, message = string.split(args, ":", 2)}@*
+@code{@ @ @ @ hostmask, null, channel = string.split(string.strip(channel), " ", 2)}@*
+@code{@ @ @ @ weechat.prnt("host="+hostmask+", channel="+channel+", message="+message)}@*
+@code{@ @ @ @ return 0}@*
+@*
 @emph{Notes:}@*
 @*
-Function called when message is received has to return one of these values:@*
+Function called when message is received has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@item @option{1}: message will not be sent to WeeChat
-@item @option{2}: message will not be sent to other plugins
-@item @option{3}: message will not be sent to WeeChat neither other plugins
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
+@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT}: message will not be sent
+to WeeChat
+@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS}: message will not be sent
+to other plugins
+@item @option{PLUGIN_RC_OK_IGNORE_ALL}: message will not be sent to
+WeeChat neither other plugins
 @end itemize
 @*
 
 @item
-@command{weechat::add_command_handler ( nombre, funci@'on );}@*
+Perl: @command{weechat::add_command_handler ( name, function );}@*
+Python: @command{weechat.add_command_handler ( name, function )}@*
 @*
-A@~nadir un nuevo comando WeeChat, con un enlace a una funci@'on en Perl.@*
-Se llamar@'a a la funci@'on cuando el usuario lance el comando con @kbd{/nombre}.@*
+Create new WeeChat command, linked with script function.@*
+Function will be called when user will launch command with @kbd{/name}.@*
 
-@emph{Par@'ametros:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{nombre}: nombre del nuevo comando@*
-Puede ser un comando que ya existe, y en este caso el nuevo comando sustituir@'a
-el antiguo. Ten cuidado cuando sustituyas a un comando de WeeChat, no podr@'a acceder 
-al antiguo comando si el script Perl est@'a cargado.
-@item @option{funcion}: funci@'on Perl assiciada al comando.
+@item @option{name}: name of new command@*
+This name may be existing command, so that the command is overrided by
+script function. Be careful when overriding WeeChat commands, they'll not be
+available until your script will be unloaded.
+@item @option{function}: function linked with command
 @item @option{description}: command description (displayed by /help
 command)
 @item @option{arguments}: short description of command arguments
@@ -2369,48 +2420,63 @@ arguments (displayed by /help command)
 @*
 @emph{Return value:}@*
 @*
-1 if Perl function was attached, 0 if error occured.@*
+1 if function was attached, 0 if error occured.@*
 @*
-@emph{Ejemplo:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat::add_command_handler ("comando", mi_comando);}@*
-@code{sub mi_comando}@*
+@code{weechat::add_command_handler ("command", my_command);}@*
+@code{sub my_command}@*
 @code{@{ }@*
-@code{@ @ @ @ weechat::print("Servidor: $_[0], Par@'ametros: $_[1]\n");}@*
+@code{@ @ @ @ weechat::print("Server: $_[0], arguments: $_[1]\n");}@*
 @code{@ @ @ @ return 0;}@*
 @code{@} }@*
 @*
+@emph{Python example:}@*
+@*
+@code{weechat.add_command_handler ("command", my_command)}@*
+@code{def my_command(server, args):}@*
+@code{@ @ @ @ weechat.prnt("server:"+server+" arguments:"+args)}@*
+@code{@ @ @ @ return 0}@*
+@*
 @emph{Notes:}@*
 @*
-Function called when command is executed has to return one of these values:@*
+Function called when command is executed has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
 @end itemize
 @*
 
 @item
-@command{weechat::remove_handler ( name, function );}@*
+Perl: @command{weechat::remove_handler ( name, function );}@*
+Python: @command{weechat.remove_handler ( name, function )}@*
 @*
 Remove a message or command handler.@*
 
 @emph{Arguments:}
 @itemize @minus
 @item @option{name}: name of IRC message or command handler
-@item @option{function}: Perl function
+@item @option{function}: function
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
 @code{weechat::remove_handler ("command", my_command);}@*
 @*
+@emph{Python example:}@*
+@*
+@code{weechat.remove_handler ("command", my_command)}@*
+@*
 
 @item
-@command{weechat::command ( command, [channel, [server]] );}@*
+Perl: @command{weechat::command ( command, [channel, [server]] );}@*
+Python: @command{weechat.command ( command, [channel, [server]] )}@*
 @*
 Execute a command or send a message to a channel.@*
 
@@ -2425,384 +2491,13 @@ Execute a command or send a message to a channel.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
 @code{weechat::command ("hello world!");}@*
 @code{weechat::command ("/kick toto please leave this chan", "#weechat");}@*
 @code{weechat::command ("/nick newnick", "", "freenode");}@*
 @*
-
-@item
-@command{weechat::get_info ( nombre, [servidor, [canal] ] );}@*
-@*
-Obtener informaciones distintas sobre WeeChat, el servidor o el usuario.@*
-
-@emph{Par@'ametros:}
-@itemize @minus
-@item @option{nombre}: nombre de la informaci@'on que se quiere obtener:
-@itemize @minus
-@item @option{version}: obtener la versi@'on de WeeChat
-@item @option{nick}: obtener el seud@'onimo
-@item @option{channel}: obtener el nombre del canal
-@item @option{server}: obtener el nombre del servidor
-@item @option{away}: get ``away'' flag
-@item @option{weechat_dir}: get WeeChat home dir
-@item @option{weechat_libdir}: get WeeChat system lib dir
-@item @option{weechat_sharedir}: get WeeChat system share dir
-@end itemize
-@item @option{servidor}: nombre interno del servidor
-@item @option{canal}: nombre del canal
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Asked info, empty if error occured or info was not found.@*
-@*
-@emph{Ejemplos:}@*
-@*
-@code{$version = weechat::get_info("version");}@*
-@code{$nick = weechat::get_info("nick", "freenode");}@*
-@*
-
-@item
-@command{weechat::get_dcc_info ( );}@*
-@*
-Get DCC list.@*
-
-Returned array has following fields:
-@itemize @minus
-@item server: IRC server
-@item channel: IRC channel
-@item type: DCC type:
-@itemize @minus
-@item 0: chat (received)
-@item 1: chat (sent)
-@item 2: file (receiving)
-@item 3: file (sending)
-@end itemize
-@item status: DCC status:
-@itemize @minus
-@item 0: waiting
-@item 1: connecting
-@item 2: active
-@item 3: done
-@item 4: failed
-@item 5: aborted
-@end itemize
-@item start_time: date/time of DCC creation
-@item start_transfer: date/time of transfer start
-@item addr: remote address
-@item port: port used for DCC
-@item nick: remote nick
-@item filename: filename
-@item local_filename: local filename
-@item size: file size
-@item pos: current position in file
-@item start_resume: restart position after interruption
-@item bytes_per_sec: bytes sent/received per second
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-DCC list, 0 if error occured.@*
-@*
-
-@item
-@command{weechat::get_config ( option );}@*
-@*
-Get WeeChat config option value.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Value of option, empty if error occured or option was not found.@*
-@*
-@emph{Examples:}@*
-@*
-@code{$value1 = weechat::get_config ("look_nicklist");}@*
-@code{$value2 = weechat::get_config ("freenode.server_autojoin");}@*
-@*
-
-@item
-@command{weechat::set_config ( option, value );}@*
-@*
-Get WeeChat config option value.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@item @option{value}: new value for option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Examples:}@*
-@*
-@code{weechat::set_config ("look_nicklist", "off");}@*
-@code{weechat::set_config ("freenode.server_autojoin"", "#weechat");}@*
-@*
-
-@item
-@command{weechat::get_plugin_config ( option );}@*
-@*
-Return value of a plugin option.@*
-Option is read from file ~/.weechat/plugins.rc and is like:@*
-@code{plugin.script.option=value}@*
-Note: plugin and script names are automatically added.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Value of option, empty if error occured or option was not found.@*
-@*
-@emph{Example:}@*
-@*
-@code{$value = weechat::get_plugin_config ("my_var");}@*
-@*
-
-@item
-@command{weechat::set_plugin_config ( option, value );}@*
-@*
-Update value of a plugin option.@*
-Option is written in file ~/.weechat/plugins.rc and is like:@*
-@code{plugin.script.option=value}@*
-Note: plugin and script names are automatically added.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@item @option{value}: new value for option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat::set_plugin_config ("my_var", "value");}@*
-@*
-
-@end itemize
-
-@subsection Python scripts
-
-@subsubsection Cargar/descargar programas Python
-
-Los programas Python se cargan y descargan con el comando @command{/python}
-(escribiendo @kbd{/help python} en WeeChat para obtener la ayuda acerca del comando).@*
-
-@emph{Ejemplos:}@*
-@itemize @bullet
-@item
-Cargar un programa Python: @kbd{/python load /tmp/ejemplo.py}@*
-@item Descargar todos los programas Python: @kbd{/python unload}@*
-@item
-Listar los programas Python cargados: @kbd{/python}@*
-@end itemize
-
-@subsubsection Interfaz WeeChat / Python
-
-@itemize @bullet
-@item
-@command{weechat.register ( nombre, versi@'on, funci@'on_final, descripci@'on )}@*
-@*
-Es la primera funci@'on a la que llamar en el programa Python.@*
-Todos los programas en Python para WeeChat deben llamar esta funci@'on.@*
-
-@emph{Par@'ametros:}
-@itemize @minus
-@item @option{nombre}: nombre @'unico para identificar el programa (cada programa debe
-tener un nombre distinto)
-@item @option{versi@'on}: versi@'on del programa
-@item @option{funci@'on_final}: funci@'on Python llamada cuando el programa finaliza
-(par@'ametro facultativo, una cadena llena significa que no hay ninguna funci@'on que llamar)
-@item @option{descripci@'on}: descripci@'on breve del programa
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if script was registered, 0 if error occured.@*
-@*
-@emph{Ejemplo:}@*
-@*
-@code{weechat.register ("ejemplo", "1.0", "fin_ejemplo", "programa de ejemplo...")}@*
-@*
-
-@item
-@command{weechat.prnt ( mensaje, [canal, [servidor]] )}@*
-@*
-Escribe un mensaje en un canal.@*
-
-@emph{Par@'ametros:}
-@itemize @minus
-@item @option{mensaje}: mensaje a escribir
-@item @option{canal}: nombre del canal
-@item @option{servidor}: (opcional) nombre interno del servidor
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Ejemplos:}@*
-@*
-@code{weechat.prnt ("mensaje")}@*
-@code{weechat.prnt ("mensaje", "#weechat")}@*
-@code{weechat.prnt ("mensaje", "#weechat", "freenode")}@*
-@*
-
-@item
-@command{weechat.print_infobar ( retraso, mensaje )}@*
-@*
-Escribir un mensaje en la barra de informaciones.@*
-
-@emph{Par@'ametros:}
-@itemize @minus
-@item @option{retraso}: periodo en segundo durante el cual se mostrar@'a el mensaje
-(si es 0, el mensaje no se borrar@'a).
-@item @option{mensaje}: mensaje que se escribir@'a en la barra de informaciones.
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Ejemplo:}@*
-@*
-@code{weechat.print_infobar (5, "mensaje")}@*
-@*
-
-@item
-@command{weechat.add_message_handler ( nombre, funci@'on )}@*
-@*
-Adjunta una funci@'on Python a un mensaje IRC.@*
-Se llamar@'a a la funci@'on cada vez que el mensaje IRC se reciba.@*
-
-@emph{Par@'ametros:}
-@itemize @minus
-@item @option{nombre}: nombre del mensaje IRC que producir@'a la llamada a la funci@'on.@*
-Para saber qu@'e tipo de mensajes IRC existen puede leer las 
-RFC 1459 y/o 2812:@*
-RFC 1459: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
-RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{funci@'on}: funci@'on en Python llamada cuando se reciba el mensaje.
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if Python function was attached, 0 if error occured.@*
-@*
-@emph{Ejemplo:}@*
-@*
-@code{weechat.add_message_handler ("privmsg", mi_funcion)}@*
-@code{def mi_funcion(servidor, args):}@*
-@code{@ @ @ @ weechat.prnt("servidor="+servidor)}@*
-@code{@ @ @ @ null, canal, mensaje = string.split(args, ":", 2)}@*
-@code{@ @ @ @ mascara, null, canal = string.split(string.strip(canal), " ", 2)}@*
-@code{@ @ @ @ weechat.prnt("masc="+mascara+", canal="+canal+", msj="+mensaje)}@*
-@code{@ @ @ @ return 0}@*
-@*
-@emph{Notes:}@*
-@*
-Function called when message is received has to return one of these values:@*
-@itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@item @option{1}: message will not be sent to WeeChat
-@item @option{2}: message will not be sent to other plugins
-@item @option{3}: message will not be sent to WeeChat neither other plugins
-@end itemize
-@*
-
-@item
-@command{weechat.add_command_handler ( nombre, funci@'on )}@*
-@*
-A@~nadir un nuevo comando WeeChat, con un enlace a una funci@'on en Python.@*
-Se llamar@'a a la funci@'on cuando el usuario lance el comando con @kbd{/nombre}.@*
-
-@emph{Par@'ametros:}
-@itemize @minus
-@item @option{nombre}: nombre del nuevo comando@*
-Puede ser un comando que ya existe, y en este caso el nuevo comando sustituir@'a
-el antiguo. Ten cuidado cuando sustituyas a un comando de WeeChat, no podr@'a acceder 
-al antiguo comando si el script Python est@'a cargado.
-@item @option{funcion}: funci@'on Python assiciada al comando.
-@item @option{description}: command description (displayed by /help
-command)
-@item @option{arguments}: short description of command arguments
-(displayed by /help command)
-@item @option{arguments_description}: long description of command
-arguments (displayed by /help command)
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if Python function was attached, 0 if error occured.@*
-@*
-@emph{Ejemplo:}@*
-@*
-@code{weechat.add_command_handler ("comando", mi_comando)}@*
-@code{def mi_comando(servidor, args):}@*
-@code{@ @ @ @ weechat.prnt("Servidor:"+servidor+" Par@'ametros:"+args)}@*
-@code{@ @ @ @ return 0}@*
-@*
-@emph{Notes:}@*
-@*
-Function called when command is executed has to return one of these values:@*
-@itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@end itemize
-@*
-
-@item
-@command{weechat.remove_handler ( name, function );}@*
-@*
-Remove a message or command handler.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{name}: name of IRC message or command handler
-@item @option{function}: Python function
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat.remove_handler ("command", my_command);}@*
-@*
-
-@item
-@command{weechat.command ( command, [channel, [server]] )}@*
-@*
-Execute a command or send a message to a channel.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{command}: command to execute (or message to send in a channel)
-@item @option{channel}: name of channel
-@item @option{server}: internal name of server
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Examples:}@*
+@emph{Python examples:}@*
 @*
 @code{weechat.command ("hello world!")}@*
 @code{weechat.command ("/kick toto please leave this chan", "#weechat")}@*
@@ -2810,38 +2505,47 @@ Execute a command or send a message to a channel.@*
 @*
 
 @item
-@command{weechat.get_info ( nombre, [servidor] )}@*
+Perl: @command{weechat::get_info ( name, [server, [channel] ] );}@*
+Python: @command{weechat.get_info ( name, [server, [channel] ] )}@*
 @*
-Obtener informaciones distintas sobre WeeChat, el servidor o el usuario.@*
+Get various info about WeeChat, server or user.@*
 
-@emph{Par@'ametros:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{nombre}: nombre de la informaci@'on que se quiere obtener:
+@item @option{name}: name of info to retrieve:
 @itemize @minus
-@item @option{version}: obtener la versi@'on de WeeChat
-@item @option{nick}: obtener el seud@'onimo
-@item @option{channel}: obtener el nombre del canal
-@item @option{server}: obtener el nombre del servidor
+@item @option{version}: get WeeChat version
+@item @option{nick}: get nickname
+@item @option{channel}: get channel name
+@item @option{server}: get server name
 @item @option{away}: get ``away'' flag
 @item @option{weechat_dir}: get WeeChat home dir
 @item @option{weechat_libdir}: get WeeChat system lib dir
 @item @option{weechat_sharedir}: get WeeChat system share dir
+
 @end itemize
-@item @option{servidor}: nombre interno del servidor
+@item @option{server}: internal name of server
+@item @option{channel}: channel name
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 Asked info, empty if error occured or info was not found.@*
 @*
-@emph{Ejemplos:}@*
+@emph{Perl examples:}@*
+@*
+@code{$version = weechat::get_info("version");}@*
+@code{$nick = weechat::get_info("nick", "freenode");}@*
+@*
+@emph{Python examples:}@*
 @*
 @code{$version = weechat.get_info("version")}@*
 @code{$nick = weechat.get_info("nick", "freenode")}@*
 @*
 
 @item
-@command{weechat.get_dcc_info ( );}@*
+Perl: @command{weechat::get_dcc_info ( );}@*
+Python: @command{weechat.get_dcc_info ( );}@*
 @*
 Get DCC list.@*
 
@@ -2884,7 +2588,8 @@ DCC list, 0 if error occured.@*
 @*
 
 @item
-@command{weechat.get_config ( option );}@*
+Perl: @command{weechat::get_config ( option );}@*
+Python: @command{weechat.get_config ( option )}@*
 @*
 Get WeeChat config option value.@*
 
@@ -2897,14 +2602,20 @@ Get WeeChat config option value.@*
 @*
 Value of option, empty if error occured or option was not found.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
-@code{$value1 = weechat.get_config ("look_nicklist");}@*
-@code{$value2 = weechat.get_config ("freenode.server_autojoin");}@*
+@code{$value1 = weechat::get_config ("look_nicklist");}@*
+@code{$value2 = weechat::get_config ("freenode.server_autojoin");}@*
+@*
+@emph{Python examples:}@*
+@*
+@code{$value1 = weechat.get_config ("look_nicklist")}@*
+@code{$value2 = weechat.get_config ("freenode.server_autojoin")}@*
 @*
 
 @item
-@command{weechat.set_config ( option, value );}@*
+Perl: @command{weechat::set_config ( option, value );}@*
+Python: @command{weechat.set_config ( option, value )}@*
 @*
 Get WeeChat config option value.@*
 
@@ -2918,14 +2629,21 @@ Get WeeChat config option value.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
-@code{weechat.set_config ("look_nicklist", "off");}@*
-@code{weechat.set_config ("freenode.server_autojoin"", "#weechat");}@*
+@code{weechat::set_config ("look_nicklist", "off");}@*
+@code{weechat::set_config ("freenode.server_autojoin"",
+"#weechat");}@*
+@*
+@emph{Python examples:}@*
+@*
+@code{weechat.set_config ("look_nicklist", "off")}@*
+@code{weechat.set_config ("freenode.server_autojoin"", "#weechat")}@*
 @*
 
 @item
-@command{weechat.get_plugin_config ( option );}@*
+Perl: @command{weechat::get_plugin_config ( option );}@*
+Python: @command{weechat.get_plugin_config ( option )}@*
 @*
 Return value of a plugin option.@*
 Option is read from file ~/.weechat/plugins.rc and is like:@*
@@ -2941,13 +2659,18 @@ Note: plugin and script names are automatically added.@*
 @*
 Value of option, empty if error occured or option was not found.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
-@code{$value = weechat.get_plugin_config ("my_var");}@*
+@code{$value = weechat::get_plugin_config ("my_var");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{$value = weechat.get_plugin_config ("my_var")}@*
 @*
 
 @item
-@command{weechat.set_plugin_config ( option, value );}@*
+Perl: @command{weechat::set_plugin_config ( option, value );}@*
+Python: @command{weechat.set_plugin_config ( option, value )}@*
 @*
 Update value of a plugin option.@*
 Option is written in file ~/.weechat/plugins.rc and is like:@*
@@ -2964,17 +2687,17 @@ Note: plugin and script names are automatically added.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat.set_plugin_config ("my_var", "value");}@*
+@code{weechat::set_plugin_config ("my_var", "value");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.set_plugin_config ("my_var", "value")}@*
 @*
 
 @end itemize
 
-@subsection Ruby scripts
-
-@exclamdown{}No desarrollado!
-
 
 @c **************************** Autores / Soporte *****************************
 
diff --git a/weechat/doc/weechat_doc_fr.texi b/weechat/doc/weechat_doc_fr.texi
index a4e99d3d8..ab562e2fe 100644
--- a/weechat/doc/weechat_doc_fr.texi
+++ b/weechat/doc/weechat_doc_fr.texi
@@ -36,7 +36,7 @@
 
 @title WeeChat - Guide utilisateur
 @subtitle Client IRC rapide, l@'eger et extensible
-@subtitle Documentation pour WeeChat v0.1.6-cvs - 30 octobre 2005
+@subtitle Documentation pour WeeChat v0.1.6-cvs - 4 novembre 2005
 
 @author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
 
@@ -299,9 +299,6 @@ Type: entier (valeurs: entre 1 et 10), valeur par d@'efaut: 10@*
 @item look_color_actions
 Afficher les actions avec diff@'erentes couleurs@*
 Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
-@item look_remove_colors_from_msgs
-Supprimer les couleurs dans les messages entrants@*
-Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
 @item look_nicklist
 Afficher la fen@^etre des utilisateurs (pour les fen@^etres de canaux)@*
 Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
@@ -454,7 +451,7 @@ Couleur pour le texte saisi (pseudo)@*
 Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightcyan'@*
 @item col_input_delimiters
 Couleur pour le texte saisi (d@'elimiteurs)@*
-Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'white'@*
+Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'cyan'@*
 @item col_input_bg
 Couleur de fond pour la fen@^etre de saisie@*
 Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'default'@*
@@ -605,6 +602,12 @@ Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'off'@*
 @item irc_highlight
 Liste des mots pour la notification (s@'epar@'es par des virgules, le comparaison ne tient pas compte de la casse, les mots peuvent commencer ou se terminer par "*" pour une comparaison partielle)@*
 Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: ''@*
+@item irc_colors_receive
+Garder les couleurs dans les messages re@,{c}us@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
+@item irc_colors_send
+Autorise l'utilisateur @`a envoyer des couleurs avec des codes sp@'eciaux (%B=gras, %Cxx,yy=couleur, %U=soulign@'e, %R=invers@'e)@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
 @item dcc_auto_accept_files
 Accepte automatiquement les fichiers dcc entrants@*
 Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'off'@*
@@ -1850,15 +1853,16 @@ void *handler_pointer)}@*
 @emph{Notes :}@*
 @*
 La fonction appel@'ee lorsque le message est re@,cu doit renvoyer une
-des valeurs suivantes :@*
+des valeurs suivantes (pr@'efix@'ee par ``weechat::'' pour Perl ou
+``weechat.'' pour Python) :@*
 @itemize @minus
-@item @option{PLUGIN_RC_KO ou -1}: la fonction a @'echou@'e
-@item @option{PLUGIN_RC_OK ou 0}: la fonction a r@'eussi
-@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT ou 1}: le message ne sera pas transmis
+@item @option{PLUGIN_RC_KO}: la fonction a @'echou@'e
+@item @option{PLUGIN_RC_OK}: la fonction a r@'eussi
+@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT}: le message ne sera pas transmis
 @`a WeeChat
-@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS ou 2}: le message ne sera pas transmis
+@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS}: le message ne sera pas transmis
 @`a d'autres extensions
-@item @option{PLUGIN_RC_OK_IGNORE_ALL ou 3}: le message ne sera transmis ni @`a
+@item @option{PLUGIN_RC_OK_IGNORE_ALL}: le message ne sera transmis ni @`a
 WeeChat ni @`a d'autres extensions
 @end itemize
 @*
@@ -1911,10 +1915,11 @@ fichier: %s", (arguments) ? arguments : "aucun");}@*
 @emph{Notes :}@*
 @*
 La fonction appel@'ee lorsque la commande est ex@'ecut@'ee doit
-renvoyer une des valeurs suivantes :@*
+renvoyer une des valeurs suivantes (pr@'efix@'ee par ``weechat::''
+pour Perl ou ``weechat.'' pour Python) :@*
 @itemize @minus
-@item @option{PLUGIN_RC_KO ou -1}: la fonction a @'echou@'e
-@item @option{PLUGIN_RC_OK ou 0}: la fonction a r@'eussi
+@item @option{PLUGIN_RC_KO}: la fonction a @'echou@'e
+@item @option{PLUGIN_RC_OK}: la fonction a r@'eussi
 @end itemize
 @*
 
@@ -2249,37 +2254,47 @@ void weechat_plugin_end (t_weechat_plugin *plugin)
 Trois extensions sont fournies en standard avec WeeChat pour utiliser
 des langages de script: Perl, Python et Ruby.
 
-@subsection Scripts Perl
+@subsection Charger/d@'echarger des scripts
 
-@subsubsection Charger/d@'echarger des scripts Perl
-
-Les scripts Perl sont charg@'es et d@'echarg@'es avec la commande @command{/perl}
-(tapez @kbd{/help perl} dans WeeChat pour obtenir de l'aide sur la commande).@*
+Les scripts sont charg@'es et d@'echarg@'es avec les commandes
+@command{/perl}, @command{/python} et @command{/ruby}.
+(tapez @kbd{/help} dans WeeChat pour obtenir de l'aide sur les
+commandes).@*
 
 @emph{Exemples :}@*
 @itemize @bullet
 @item
 Charger un script Perl : @kbd{/perl load /tmp/essai.pl}@*
-@item D@'echarger tous les scripts Perl : @kbd{/perl unload}@*
+@item
+D@'echarger tous les scripts Perl : @kbd{/perl unload}@*
 @item
 Lister les scripts Perl charg@'es : @kbd{/perl}@*
+@item
+Charger un script Python : @kbd{/python load /tmp/essai.py}@*
+@item
+D@'echarger tous les scripts Python : @kbd{/python unload}@*
+@item
+Lister les scripts Python charg@'es : @kbd{/python}@*
 @end itemize
 
-@subsubsection Interface WeeChat / Perl
+@subsection Interface WeeChat / Scripts
 
 @itemize @bullet
 @item
-@command{weechat::register ( nom, version, fonction_de_fin, description );}@*
+Perl: @command{weechat::register ( nom, version, fonction_de_fin,
+description );}@*
+Python: @command{weechat.register ( nom, version, fonction_de_fin,
+description )}@*
 @*
-C'est la premi@`ere fonction @`a appeler dans le script Perl.@*
-Tout script Perl pour WeeChat doit appeler cette fonction.@*
+C'est la premi@`ere fonction @`a appeler dans le script.@*
+Tout script pour WeeChat doit appeler cette fonction.@*
 
 @emph{Param@`etres :}
 @itemize @minus
 @item @option{nom}: nom unique pour identifier le script (chaque script doit
 avoir un nom diff@'erent)
 @item @option{version}: version du script
-@item @option{fonction_de_fin}: fonction Perl appel@'ee quand le script est
+@item @option{fonction_de_fin}: fonction appel@'ee quand le script est
 d@'echarg@'e (param@`etre facultatif, une cha@^ine vide signifiant qu'il n'y a pas
 de fonction @`a appeler)
 @item @option{description}: description br@`eve du script.
@@ -2289,13 +2304,18 @@ de fonction @`a appeler)
 @*
 1 si le script a @'et@'e enregistr@'e, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemple :}@*
+@emph{Exemple en Perl :}@*
 @*
 @code{weechat::register ("essai", "1.0", "fin_essai", "Script d'essai !");}@*
 @*
+@emph{Exemple en Python :}@*
+@*
+@code{weechat.register ("essai", "1.0", "fin_essai", "Script d'essai !")}@*
+@*
 
 @item
-@command{weechat::print ( message, [canal, [serveur]] );}@*
+Perl: @command{weechat::print ( message, [canal, [serveur]] );}@*
+Python: @command{weechat.prnt ( message, [canal, [serveur]] )}@*
 @*
 Affiche un message dans un canal.@*
 
@@ -2310,15 +2330,22 @@ Affiche un message dans un canal.@*
 @*
 1 si succ@`es, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemples :}@*
+@emph{Exemples en Perl :}@*
 @*
 @code{weechat::print ("message");}@*
 @code{weechat::print ("message", "#weechat");}@*
 @code{weechat::print ("message", "#weechat", "freenode");}@*
 @*
+@emph{Exemples en Python :}@*
+@*
+@code{weechat.prnt ("message")}@*
+@code{weechat.prnt ("message", "#weechat")}@*
+@code{weechat.prnt ("message", "#weechat", "freenode")}@*
+@*
 
 @item
-@command{weechat::print_infobar ( d@'elai, message );}@*
+Perl: @command{weechat::print_infobar ( d@'elai, message );}@*
+Python: @command{weechat.print_infobar ( d@'elai, message )}@*
 @*
 Affiche un message dans la barre d'infos.@*
 
@@ -2333,16 +2360,22 @@ Affiche un message dans la barre d'infos.@*
 @*
 1 si succ@`es, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemple :}@*
+@emph{Exemple en Perl :}@*
 @*
 @code{weechat::print_infobar (5, "message");}@*
 @*
+@emph{Exemple en Python :}@*
+@*
+@code{weechat.print_infobar (5, "message")}@*
+@*
 
 @item
-@command{weechat::add_message_handler ( nom, fonction );}@*
+Perl: @command{weechat::add_message_handler ( nom, fonction );}@*
+Python: @command{weechat.add_message_handler ( nom, fonction )}@*
 @*
-Attache une fonction Perl @`a un message IRC particulier.@*
-La fonction sera appel@'ee @`a chaque fois que le message IRC sera re@,{c}u.@*
+Attache une fonction @`a un message IRC particulier.@*
+La fonction sera appel@'ee @`a chaque fois que le message IRC sera
+re@,{c}u.@*
 
 @emph{Param@`etres :}
 @itemize @minus
@@ -2351,14 +2384,14 @@ Pour conna@^itre la liste des messages IRC disponibles, merci de consulter les
 RFC 1459 et/ou 2812 :@*
 RFC 1459 : @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
 RFC 2812 : @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{fonction}: fonction Perl appel@'ee lorsque le message est re@,{c}u
+@item @option{fonction}: fonction appel@'ee lorsque le message est re@,{c}u
 @end itemize
 @*
 @emph{Valeur renvoy@'ee :}@*
 @*
-1 si la fonction Perl a @'et@'e attach@'ee, 0 si une erreur s'est produite.@*
+1 si la fonction a @'et@'e attach@'ee, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemple :}@*
+@emph{Exemple en Perl :}@*
 @*
 @code{weechat::add_message_handler ("privmsg", ma_fonction);}@*
 @code{sub ma_fonction}@*
@@ -2367,391 +2400,10 @@ RFC 2812 : @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
 @code{@ @ @ @ ($null, $canal, $message) = split ":",$_[1],3;}@*
 @code{@ @ @ @ ($masque, $null, $canal) = split " ", $canal;}@*
 @code{@ @ @ @ weechat::print ("masque=$masque, canal=$canal, msg=$message\n");}@*
-@code{@ @ @ @ return 0;}@*
+@code{@ @ @ @ return weechat::PLUGIN_RC_OK;}@*
 @code{@} }@*
 @*
-@emph{Notes :}@*
-@*
-La fonction appel@'ee lorsque le message est re@,cu doit renvoyer une
-des valeurs suivantes :@*
-@itemize @minus
-@item @option{-1}: la fonction a @'echou@'e
-@item @option{0}: la fonction a r@'eussi
-@item @option{1}: le message ne sera pas transmis @`a WeeChat
-@item @option{2}: le message ne sera pas transmis @`a d'autres extensions
-@item @option{3}: le message ne sera transmis ni @`a WeeChat ni @`a
-d'autres extensions
-@end itemize
-@*
-
-@item
-@command{weechat::add_command_handler ( nom, fonction, [description,
-arguments, arguments_description] );}@*
-@*
-Cr@'e@'e une nouvelle commande WeeChat, associ@'ee @`a une fonction Perl.@*
-La fonction sera appel@'ee lorsque l'utilisateur lancera la commande par @kbd{/nom}.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{nom}: nom de la nouvelle commande@*
-Il peut s'agir d'une commande existante, auquel cas celle-ci est @'ecras@'ee par
-la fonction Perl. Soyez prudent en @'ecrasant les commandes WeeChat, car elles
-ne seront plus accessibles tant que le script Perl sera charg@'e.
-@item @option{fonction}: fonction Perl associ@'ee @`a la commande
-@item @option{description}: description de la commande (affich@'ee par
-/help commande)
-@item @option{arguments}: br@`eve description des param@`etres de la
-commande (affich@'ee par /help commande)
-@item @option{arguments_description}: longue description des
-param@`etres de la commande (affich@'ee par /help commande)
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si la fonction Perl a @'et@'e attach@'ee, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemple :}@*
-@*
-@code{weechat::add_command_handler ("commande", ma_commande);}@*
-@code{sub ma_commande}@*
-@code{@{ }@*
-@code{@ @ @ @ weechat::print("Serveur: $_[0], param@`etres: $_[1]\n");}@*
-@code{@ @ @ @ return 0;}@*
-@code{@} }@*
-@*
-@emph{Notes :}@*
-@*
-La fonction appel@'ee lorsque la commande est ex@'ecut@'ee doit renvoyer une
-des valeurs suivantes :@*
-@itemize @minus
-@item @option{-1}: la fonction a @'echou@'e
-@item @option{0}: la fonction a r@'eussi
-@end itemize
-@*
-
-@item
-@command{weechat::remove_handler ( nom, fonction );}@*
-@*
-Supprime un gestionnaire de message ou de commande.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{nom}: nom du message IRC ou de la commande
-@item @option{fonction}: fonction Perl associ@'ee
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si succ@`es, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemple :}@*
-@*
-@code{weechat::remove_handler ("commande", ma_commande);}@*
-@*
-
-@item
-@command{weechat::command ( commande, [canal, [serveur]] );}@*
-@*
-Ex@'ecute une commande ou envoie un message @'a un canal.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{commande}: commande @'a ex@'ecuter (ou message @'a envoyer au canal)
-@item @option{canal}: nom du canal
-@item @option{serveur}: nom interne du serveur
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si succ@`es, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemples :}@*
-@*
-@code{weechat::command ("bonjour tout le monde !");}@*
-@code{weechat::command ("/kick toto merci de quitter ce canal", "#weechat");}@*
-@code{weechat::command ("/nick newnick", "", "freenode");}@*
-@*
-
-@item
-@command{weechat::get_info ( nom, [serveur, [canal] ] );}@*
-@*
-Obtenir des informations vari@'ees sur WeeChat, le serveur ou l'utilisateur.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{nom}: nom de l'info @`a obtenir :
-@itemize @minus
-@item @option{version}: obtenir la version de WeeChat
-@item @option{nick}: obtenir le pseudo
-@item @option{channel}: obtenir le nom du canal
-@item @option{server}: obtenir le nom du serveur
-@item @option{away}: obtenir le drapeau ``away''
-@item @option{weechat_dir}: obtenir le r@'epertoire maison de WeeChat
-@item @option{weechat_libdir}: obtenir le r@'epertoire ``lib''
-syst@`eme de WeeChat
-@item @option{weechat_sharedir}: obtenir le r@'epertoire ``share''
-syst@`eme de partage WeeChat
-@end itemize
-@item @option{serveur}: nom interne du serveur
-@item @option{canal}: nom du canal
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-L'information demand@'e, blanc si une erreur s'est produite ou que
-l'information n'a pas @'et@'e trouv@'ee.@*
-@*
-@emph{Exemples :}@*
-@*
-@code{$version = get_info("version");}@*
-@code{$nick = get_info("nick", "freenode");}@*
-@*
-
-@item
-@command{weechat::get_dcc_info ( );}@*
-@*
-Obtenir la liste des DCC.@*
-
-Le tableau renvoy@'e contient les champs suivants :
-@itemize @minus
-@item server: le serveur IRC
-@item channel: le canal IRC
-@item type: le type de DCC :
-@itemize @minus
-@item 0: discussion (re@,cue)
-@item 1: discussion (envoy@'ee)
-@item 2: fichier en r@'eception
-@item 3: fichier en @'emission
-@end itemize
-@item status: statut du DCC :
-@itemize @minus
-@item 0: en attente
-@item 1: en cours de connexion
-@item 2: actif
-@item 3: termin@'e
-@item 4: @'echou@'e
-@item 5: interrompu par l'utilisateur
-@end itemize
-@item start_time: la date et heure de cr@'eation du DCC
-@item start_transfer: la date et heure de d@'emarrage du transfert
-@item addr: adresse de l'utilisateur distant
-@item port: port utilis@'e pour le DCC
-@item nick: pseudo de l'utilisateur distant
-@item filename: nom de fichier
-@item local_filename: nom de fichier local
-@item size: taille du fichier
-@item pos: position actuelle dans le fichier
-@item start_resume: position de d@'emarrage apr@`es une interruption
-@item bytes_per_sec: nombre d'octets transmis par seconde depuis le d@'ebut
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-La liste des DCC, 0 si une erreur s'est produite.@*
-@*
-
-@item
-@command{weechat::get_config ( option );}@*
-@*
-Obtenir la valeur d'une option de configuration WeeChat.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{option}: nom de l'option
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-La valeur de l'option, blanc si une erreur s'est produite ou que
-l'option n'a pas @'et@'e trouv@'ee.@*
-@*
-@emph{Exemples :}@*
-@*
-@code{$value1 = weechat::get_config ("look_nicklist");}@*
-@code{$value2 = weechat::get_config ("freenode.server_autojoin");}@*
-@*
-
-@item
-@command{weechat::set_config ( option, valeur );}@*
-@*
-Modifier une otion de configuration WeeChat.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{option}: nom de l'option
-@item @option{valeur}: la nouvelle valeur pour l'option
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si succ@`es, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemples :}@*
-@*
-@code{weechat::set_config ("look_nicklist", "off");}@*
-@code{weechat::set_config ("freenode.server_autojoin, "#weechat");}@*
-@*
-
-@item
-@command{weechat::get_plugin_config ( option );}@*
-@*
-Renvoie la valeur d'une option de l'extension.@*
-L'option est lue depuis le fichier ~/.weechat/plugins.rc et est
-sous cette forme :@*
-@code{extension.script.option=valeur}@*
-NB: le nom de l'extension et du script sont ajout@'es automatiquement.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{option}: nom de l'option
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-La valeur de l'option, blanc si une erreur s'est produite ou que
-l'option n'a pas @'et@'e trouv@'ee.@*
-@*
-@emph{Exemple :}@*
-@*
-@code{$value = weechat::get_plugin_config ("ma_variable");}@*
-@*
-
-@item
-@command{weechat::set_plugin_config ( option, valeur );}@*
-@*
-Modifie la valeur d'une option de l'extension.@*
-L'option est @'ecrite dans le fichier ~/.weechat/plugins.rc et est
-sous cette forme :@*
-@code{extension.script.option=valeur}@*
-NB: le nom de l'extension et du script sont ajout@'es automatiquement.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{option}: nom de l'option
-@item @option{valeur}: la nouvelle valeur pour l'option
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si succ@`es, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemple :}@*
-@*
-@code{weechat::set_plugin_config ("ma_variable", "valeur");}@*
-@*
-
-@end itemize
-
-@subsection Scripts Python
-
-@subsubsection Charger/d@'echarger des scripts Python
-
-Les scripts Python sont charg@'es et d@'echarg@'es avec la commande @command{/python}
-(tapez @kbd{/help python} dans WeeChat pour obtenir de l'aide sur la commande).@*
-
-@emph{Exemples :}@*
-@itemize @bullet
-@item
-Charger un script Python : @kbd{/python load /tmp/essai.py}@*
-@item D@'echarger tous les scripts Python : @kbd{/python unload}@*
-@item
-Lister les scripts Python charg@'es : @kbd{/python}@*
-@end itemize
-
-@subsubsection Interface WeeChat / Python
-
-@itemize @bullet
-@item
-@command{weechat.register ( nom, version, fonction_de_fin, description )}@*
-@*
-C'est la premi@`ere fonction @`a appeler dans le script Python.@*
-Tout script Python pour WeeChat doit appeler cette fonction.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{nom}: nom unique pour identifier le script (chaque script doit
-avoir un nom diff@'erent)
-@item @option{version}: version du script
-@item @option{fonction_de_fin}: fonction Python appel@'ee quand le script est
-d@'echarg@'e (param@`etre facultatif, une cha@^ine vide signifiant qu'il n'y a pas
-de fonction @`a appeler)
-@item @option{description}: description br@`eve du script.
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si le script a @'et@'e enregistr@'e, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemple :}@*
-@*
-@code{weechat.register ("essai", "1.0", "fin_essai", "Script d'essai !")}@*
-@*
-
-@item
-@command{weechat.prnt ( message, [canal, [serveur]] )}@*
-@*
-Affiche un message dans un canal.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{message}: message @`a afficher
-@item @option{canal}: nom du canal
-@item @option{serveur}: nom interne du serveur
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si succ@`es, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemples :}@*
-@*
-@code{weechat.prnt ("message")}@*
-@code{weechat.prnt ("message", "#weechat")}@*
-@code{weechat.prnt ("message", "#weechat", "freenode")}@*
-@*
-
-@item
-@command{weechat.print_infobar ( d@'elai, message )}@*
-@*
-Affiche un message dans la barre d'infos.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{d@'elai}: d@'elai (en secondes) pendant lequel le message est affich@'e
-(si 0, le message ne sera pas effac@'e).
-@item @option{message}: message @`a afficher
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si succ@`es, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemple :}@*
-@*
-@code{weechat.print_infobar (5, "message")}@*
-@*
-
-@item
-@command{weechat.add_message_handler ( nom, fonction )}@*
-@*
-Attache une fonction Python @`a un message IRC particulier.@*
-La fonction sera appel@'ee @`a chaque fois que le message IRC sera re@,{c}u.@*
-
-@emph{Param@`etres :}
-@itemize @minus
-@item @option{nom}: nom du message IRC pour lequel la fonction est appel@'ee@*
-Pour conna@^itre la liste des messages IRC disponibles, merci de consulter les
-RFC 1459 et/ou 2812 :@*
-RFC 1459 : @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
-RFC 2812 : @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{fonction}: fonction Python appel@'ee lorsque le message est re@,{c}u
-@end itemize
-@*
-@emph{Valeur renvoy@'ee :}@*
-@*
-1 si la fonction Python a @'et@'e attach@'ee, 0 si une erreur s'est produite.@*
-@*
-@emph{Exemple :}@*
+@emph{Exemple en Python :}@*
 @*
 @code{weechat.add_message_handler ("privmsg", ma_fonction)}@*
 @code{def ma_fonction(serveur, args):}@*
@@ -2759,35 +2411,43 @@ RFC 2812 : @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
 @code{@ @ @ @ null, canal, message = string.split(args, ":", 2)}@*
 @code{@ @ @ @ masque, null, canal = string.split(string.strip(canal), " ", 2)}@*
 @code{@ @ @ @ weechat.prnt("masque="+masque+", canal="+canal+", message="+message)}@*
-@code{@ @ @ @ return 0}@*
+@code{@ @ @ @ return weechat.PLUGIN_RC_OK}@*
 @*
 @emph{Notes :}@*
 @*
 La fonction appel@'ee lorsque le message est re@,cu doit renvoyer une
-des valeurs suivantes :@*
+des valeurs suivantes (pr@'efix@'ee par ``weechat::'' pour Perl ou
+``weechat.'' pour Python) :@*
 @itemize @minus
-@item @option{-1}: la fonction a @'echou@'e
-@item @option{0}: la fonction a r@'eussi
-@item @option{1}: le message ne sera pas transmis @`a WeeChat
-@item @option{2}: le message ne sera pas transmis @`a d'autres extensions
-@item @option{3}: le message ne sera transmis ni @`a WeeChat ni @`a
-d'autres extensions
+@item @option{PLUGIN_RC_KO}: la fonction a @'echou@'e
+@item @option{PLUGIN_RC_OK}: la fonction a r@'eussi
+@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT}: le message ne sera pas
+transmis @`a WeeChat
+@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS}: le message ne sera pas
+transmis @`a d'autres extensions
+@item @option{PLUGIN_RC_OK_IGNORE_ALL}: le message ne sera transmis ni
+@`a WeeChat ni @`a d'autres extensions
 @end itemize
 @*
 
 @item
-@command{weechat.add_command_handler ( nom, fonction )}@*
+Perl: @command{weechat::add_command_handler ( nom, fonction,
+[description, arguments, arguments_description] );}@*
+Python: @command{weechat.add_command_handler ( nom, fonction,
+[description, arguments, arguments_description] )}@*
 @*
-Cr@'e@'e une nouvelle commande WeeChat, associ@'ee @`a une fonction Python.@*
-La fonction sera appel@'ee lorsque l'utilisateur lancera la commande par @kbd{/nom}.@*
+Cr@'e@'e une nouvelle commande WeeChat, associ@'ee @`a une fonction.@*
+La fonction sera appel@'ee lorsque l'utilisateur lancera la commande
+par @kbd{/nom}.@*
 
 @emph{Param@`etres :}
 @itemize @minus
 @item @option{nom}: nom de la nouvelle commande@*
-Il peut s'agir d'une commande existante, auquel cas celle-ci est @'ecras@'ee par
-la fonction Python. Soyez prudent en @'ecrasant les commandes WeeChat, car elles
-ne seront plus accessibles tant que le script Python sera charg@'e.
-@item @option{fonction}: fonction Python associ@'ee @`a la commande
+Il peut s'agir d'une commande existante, auquel cas celle-ci est
+@'ecras@'ee par la fonction du script. Soyez prudent en @'ecrasant les
+commandes WeeChat, car elles ne seront plus accessibles tant que le
+script sera charg@'e.
+@item @option{fonction}: fonction associ@'ee @`a la commande
 @item @option{description}: description de la commande (affich@'ee par
 /help commande)
 @item @option{arguments}: br@`eve description des param@`etres de la
@@ -2798,53 +2458,70 @@ param@`etres de la commande (affich@'ee par /help commande)
 @*
 @emph{Valeur renvoy@'ee :}@*
 @*
-1 si la fonction Python a @'et@'e attach@'ee, 0 si une erreur s'est produite.@*
+1 si la fonction a @'et@'e attach@'ee, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemple :}@*
+@emph{Exemple en Perl :}@*
+@*
+@code{weechat::add_command_handler ("commande", ma_commande);}@*
+@code{sub ma_commande}@*
+@code{@{ }@*
+@code{@ @ @ @ weechat::print("Serveur: $_[0], param@`etres: $_[1]\n");}@*
+@code{@ @ @ @ return weechat::PLUGIN_RC_OK;}@*
+@code{@} }@*
+@*
+@emph{Exemple en Python :}@*
 @*
 @code{weechat.add_command_handler ("commande", ma_commande)}@*
 @code{def ma_commande(serveur, args):}@*
 @code{@ @ @ @ weechat.prnt("serveur:"+serveur+" param@`etres:"+args)}@*
-@code{@ @ @ @ return 0}@*
+@code{@ @ @ @ return weechat.PLUGIN_RC_OK}@*
 @*
 @emph{Notes :}@*
 @*
-La fonction appel@'ee lorsque la commande est ex@'ecut@'ee doit renvoyer une
-des valeurs suivantes :@*
+La fonction appel@'ee lorsque la commande est ex@'ecut@'ee doit
+renvoyer une des valeurs suivantes (pr@'efix@'ee par ``weechat::''
+pour Perl ou ``weechat.'' pour Python) :@*
 @itemize @minus
-@item @option{-1}: la fonction a @'echou@'e
-@item @option{0}: la fonction a r@'eussi
+@item @option{PLUGIN_RC_KO}: la fonction a @'echou@'e
+@item @option{PLUGIN_RC_OK}: la fonction a r@'eussi
 @end itemize
 @*
 
 @item
-@command{weechat.remove_handler ( nom, fonction );}@*
+Perl: @command{weechat::remove_handler ( nom, fonction );}@*
+Python: @command{weechat.remove_handler ( nom, fonction )}@*
 @*
 Supprime un gestionnaire de message ou de commande.@*
 
 @emph{Param@`etres :}
 @itemize @minus
 @item @option{nom}: nom du message IRC ou de la commande
-@item @option{fonction}: fonction Python associ@'ee
+@item @option{fonction}: fonction associ@'ee
 @end itemize
 @*
 @emph{Valeur renvoy@'ee :}@*
 @*
 1 si succ@`es, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemple :}@*
+@emph{Exemple en Perl :}@*
 @*
-@code{weechat.remove_handler ("commande", ma_commande);}@*
+@code{weechat::remove_handler ("commande", ma_commande);}@*
+@*
+@emph{Exemple en Python :}@*
+@*
+@code{weechat.remove_handler ("commande", ma_commande)}@*
 @*
 
 @item
-@command{weechat.command ( commande, [canal, [serveur]] )}@*
+Perl: @command{weechat::command ( commande, [canal, [serveur]] );}@*
+Python: @command{weechat.command ( commande, [canal, [serveur]] )}@*
 @*
 Ex@'ecute une commande ou envoie un message @'a un canal.@*
 
 @emph{Param@`etres :}
 @itemize @minus
-@item @option{commande}: commande @'a ex@'ecuter (ou message @'a envoyer au canal)
+@item @option{commande}: commande @'a ex@'ecuter (ou message @'a
+envoyer au canal)
 @item @option{canal}: nom du canal
 @item @option{serveur}: nom interne du serveur
 @end itemize
@@ -2853,7 +2530,13 @@ Ex@'ecute une commande ou envoie un message @'a un canal.@*
 @*
 1 si succ@`es, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemples :}@*
+@emph{Exemples en Perl :}@*
+@*
+@code{weechat::command ("bonjour tout le monde !");}@*
+@code{weechat::command ("/kick toto merci de quitter ce canal", "#weechat");}@*
+@code{weechat::command ("/nick newnick", "", "freenode");}@*
+@*
+@emph{Exemples en Python :}@*
 @*
 @code{weechat.command ("bonjour tout le monde !")}@*
 @code{weechat.command ("/kick toto merci de quitter ce canal", "#weechat")}@*
@@ -2861,9 +2544,11 @@ Ex@'ecute une commande ou envoie un message @'a un canal.@*
 @*
 
 @item
-@command{weechat.get_info ( nom, [serveur] )}@*
+Perl: @command{weechat::get_info ( nom, [serveur, [canal] ] );}@*
+Python: @command{weechat.get_info ( nom, [serveur, [canal] ] )}@*
 @*
-Obtenir des informations vari@'ees sur WeeChat, le serveur ou l'utilisateur.@*
+Obtenir des informations vari@'ees sur WeeChat, le serveur ou
+l'utilisateur.@*
 
 @emph{Param@`etres :}
 @itemize @minus
@@ -2881,6 +2566,7 @@ syst@`eme de WeeChat
 syst@`eme de partage WeeChat
 @end itemize
 @item @option{serveur}: nom interne du serveur
+@item @option{canal}: nom du canal
 @end itemize
 @*
 @emph{Valeur renvoy@'ee :}@*
@@ -2888,14 +2574,20 @@ syst@`eme de partage WeeChat
 L'information demand@'e, blanc si une erreur s'est produite ou que
 l'information n'a pas @'et@'e trouv@'ee.@*
 @*
-@emph{Exemples :}@*
+@emph{Exemples en Perl :}@*
+@*
+@code{$version = get_info("version");}@*
+@code{$nick = get_info("nick", "freenode");}@*
+@*
+@emph{Exemples en Python :}@*
 @*
 @code{$version = weechat.get_info ("version")}@*
 @code{$nick = weechat.get_info ("nick", "freenode")}@*
 @*
 
 @item
-@command{weechat.get_dcc_info ( );}@*
+Perl: @command{weechat::get_dcc_info ( );}@*
+Python: @command{weechat.get_dcc_info ( )}@*
 @*
 Obtenir la liste des DCC.@*
 
@@ -2938,13 +2630,14 @@ La liste des DCC, 0 si une erreur s'est produite.@*
 @*
 
 @item
-@command{weechat.get_config ( nom );}@*
+Perl: @command{weechat::get_config ( option );}@*
+Python: @command{weechat.get_config ( option )}@*
 @*
 Obtenir la valeur d'une option de configuration WeeChat.@*
 
 @emph{Param@`etres :}
 @itemize @minus
-@item @option{nom}: nom de l'option
+@item @option{option}: nom de l'option
 @end itemize
 @*
 @emph{Valeur renvoy@'ee :}@*
@@ -2952,20 +2645,26 @@ Obtenir la valeur d'une option de configuration WeeChat.@*
 La valeur de l'option, blanc si une erreur s'est produite ou que
 l'option n'a pas @'et@'e trouv@'ee.@*
 @*
-@emph{Exemples :}@*
+@emph{Exemples en Perl :}@*
 @*
-@code{$value1 = weechat.get_config ("look_nicklist");}@*
-@code{$value2 = weechat.get_config ("freenode.server_autojoin");}@*
+@code{$value1 = weechat::get_config ("look_nicklist");}@*
+@code{$value2 = weechat::get_config ("freenode.server_autojoin");}@*
+@*
+@emph{Exemples en Python :}@*
+@*
+@code{$value1 = weechat.get_config ("look_nicklist")}@*
+@code{$value2 = weechat.get_config ("freenode.server_autojoin")}@*
 @*
 
 @item
-@command{weechat.set_config ( nom, valeur );}@*
+Perl: @command{weechat::set_config ( option, valeur );}@*
+Python: @command{weechat.set_config ( option, valeur )}@*
 @*
 Modifier une otion de configuration WeeChat.@*
 
 @emph{Param@`etres :}
 @itemize @minus
-@item @option{nom}: nom de l'option
+@item @option{option}: nom de l'option
 @item @option{valeur}: la nouvelle valeur pour l'option
 @end itemize
 @*
@@ -2973,14 +2672,20 @@ Modifier une otion de configuration WeeChat.@*
 @*
 1 si succ@`es, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemples :}@*
+@emph{Exemples en Perl :}@*
 @*
-@code{weechat.set_config ("look_nicklist", "off");}@*
-@code{weechat.set_config ("freenode.server_autojoin, "#weechat");}@*
+@code{weechat::set_config ("look_nicklist", "off");}@*
+@code{weechat::set_config ("freenode.server_autojoin, "#weechat");}@*
+@*
+@emph{Exemples en Python :}@*
+@*
+@code{weechat.set_config ("look_nicklist", "off")}@*
+@code{weechat.set_config ("freenode.server_autojoin, "#weechat")}@*
 @*
 
 @item
-@command{weechat.get_plugin_config ( option );}@*
+Perl: @command{weechat::get_plugin_config ( option );}@*
+Python: @command{weechat.get_plugin_config ( option )}@*
 @*
 Renvoie la valeur d'une option de l'extension.@*
 L'option est lue depuis le fichier ~/.weechat/plugins.rc et est
@@ -2998,13 +2703,18 @@ NB: le nom de l'extension et du script sont ajout@'es automatiquement.@*
 La valeur de l'option, blanc si une erreur s'est produite ou que
 l'option n'a pas @'et@'e trouv@'ee.@*
 @*
-@emph{Exemple :}@*
+@emph{Exemple en Perl :}@*
 @*
-@code{$value = weechat.get_plugin_config ("ma_variable");}@*
+@code{$value = weechat::get_plugin_config ("ma_variable");}@*
+@*
+@emph{Exemple en Python :}@*
+@*
+@code{$value = weechat.get_plugin_config ("ma_variable")}@*
 @*
 
 @item
-@command{weechat.set_plugin_config ( option, valeur );}@*
+Perl: @command{weechat::set_plugin_config ( option, valeur );}@*
+Python: @command{weechat.set_plugin_config ( option, valeur )}@*
 @*
 Modifie la valeur d'une option de l'extension.@*
 L'option est @'ecrite dans le fichier ~/.weechat/plugins.rc et est
@@ -3022,17 +2732,17 @@ NB: le nom de l'extension et du script sont ajout@'es automatiquement.@*
 @*
 1 si succ@`es, 0 si une erreur s'est produite.@*
 @*
-@emph{Exemple :}@*
+@emph{Exemple en Perl :}@*
 @*
-@code{weechat.set_plugin_config ("ma_variable", "valeur");}@*
+@code{weechat::set_plugin_config ("ma_variable", "valeur");}@*
+@*
+@emph{Exemple en Python :}@*
+@*
+@code{weechat.set_plugin_config ("ma_variable", "valeur")}@*
 @*
 
 @end itemize
 
-@subsection Scripts Ruby
-
-Non d@'evelopp@'e !
-
 
 @c **************************** Auteurs / Support *****************************
 
diff --git a/weechat/doc/weechat_doc_pt.texi b/weechat/doc/weechat_doc_pt.texi
index c25c22760..b9384e8b6 100644
--- a/weechat/doc/weechat_doc_pt.texi
+++ b/weechat/doc/weechat_doc_pt.texi
@@ -36,7 +36,7 @@
 
 @title WeeChat - Guia do Utilizador
 @subtitle Cliente de IRC rapido, leve e extencivel
-@subtitle Documenta@,{c}@~ao do WeeChat v0.1.6-cvs - 30 de outubro de 2005
+@subtitle Documenta@,{c}@~ao do WeeChat v0.1.6-cvs - 4 de novembro de 2005
 
 @author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
 
@@ -296,9 +296,6 @@ Type: integer (values: between 1 and 10), default value: 10@*
 @item look_color_actions
 Display actions with different colors@*
 Type: boolean (values: 'on' or 'off'), default value: 'on'@*
-@item look_remove_colors_from_msgs
-Remove colors from incoming messages@*
-Type: boolean (values: 'on' or 'off'), default value: 'on'@*
 @item look_nicklist
 Display nicklist window (for channel windows)@*
 Type: boolean (values: 'on' or 'off'), default value: 'on'@*
@@ -451,7 +448,7 @@ Color for input text (nick name)@*
 Type: color (Curses or Gtk color), default value: 'lightcyan'@*
 @item col_input_delimiters
 Color for input text (delimiters)@*
-Type: color (Curses or Gtk color), default value: 'white'@*
+Type: color (Curses or Gtk color), default value: 'cyan'@*
 @item col_input_bg
 Background for input window@*
 Type: color (Curses or Gtk color), default value: 'default'@*
@@ -602,6 +599,12 @@ Type: boolean (values: 'on' or 'off'), default value: 'off'@*
 @item irc_highlight
 Comma separated list of words to highlight (case insensitive comparison, words may begin or end with "*" for partial match)@*
 Type: string (any string), default value: ''@*
+@item irc_colors_receive
+Keep colors from incoming messages@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
+@item irc_colors_send
+Allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %U=underline, %R=reverse)@*
+Type: boolean (values: 'on' or 'off'), default value: 'on'@*
 @item dcc_auto_accept_files
 Automatically accept incoming dcc files@*
 Type: boolean (values: 'on' or 'off'), default value: 'off'@*
@@ -1829,15 +1832,17 @@ void *handler_pointer)}@*
 @*
 @emph{Notes:}@*
 @*
-Function called when message is received has to return one of these values:@*
+Function called when message is received has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{PLUGIN_RC_KO or -1}: function failed
-@item @option{PLUGIN_RC_OK or 0}: function successfully completed
-@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT or 1}: message will not be sent to
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
+@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT}: message will not be sent to
 WeeChat
-@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS or 2}: message will not be sent to
+@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS}: message will not be sent to
 other plugins
-@item @option{PLUGIN_RC_OK_IGNORE_ALL or 3}: message will not be sent to
+@item @option{PLUGIN_RC_OK_IGNORE_ALL}: message will not be sent to
 WeeChat neither other plugins
 @end itemize
 @*
@@ -1886,10 +1891,12 @@ file: %s", (arguments) ? arguments : "none");}@*
 @*
 @emph{Notes:}@*
 @*
-Function called when message is received has to return one of these values:@*
+Function called when message is received has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{PLUGIN_RC_KO or -1}: function failed
-@item @option{PLUGIN_RC_OK or 0}: function successfully completed
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
 @end itemize
 @*
 
@@ -2209,204 +2216,74 @@ void weechat_plugin_end (t_weechat_plugin *plugin)
 Three plugins are provided with WeeChat to load scripts: Perl,
 Python and Ruby.
 
-@subsection Perl scripts
+@subsection Load/unload scripts
 
-@subsubsection Carregar/Descarregar Scripts Perl
+Perl scripts are loaded and unloaded with @command{/perl},
+@command{/python} and @command{/ruby} commands.
+(type @kbd{/help} within WeeChat to get help about commands).@*
 
-Os Scripts Perl s@~ao carregados e descarregados com o comando @command{/perl}.
-(escreve @kbd{/help perl} dentro do WeeChat para obteres ajuda acerca do comando).@*
-
-@emph{Exemplos:}@*
+@emph{Examples:}@*
 @itemize @bullet
 @item
-Carregar um Script Perl: @kbd{/perl load /tmp/sample.pl}@*
+Load a Perl script: @kbd{/perl load /tmp/sample.pl}@*
 @item
-Descarregar todos os Scripts Perl: @kbd{/perl unload}@*
+Unload all Perl scripts: @kbd{/perl unload}@*
 @item
-Listar todos os Scripts Perl: @kbd{/perl}@*
+List all Perl scripts: @kbd{/perl}@*
+@item
+Load a Python script: @kbd{/python load /tmp/sample.py}@*
+@item
+Unload all Python scripts: @kbd{/python unload}@*
+@item
+List all Python scripts: @kbd{/python}@*
 @end itemize
 
-@subsubsection Interface WeeChat / Perl
+@subsection WeeChat / Scripts API
 
 @itemize @bullet
 @item
-@command{weechat::register ( nome, vers@~ao, fun@,{c}@~ao_de_shutdown, descri@,{c}@~ao );}@*
+Perl: @command{weechat::register ( name, version, shutdown_function,
+description );}@*
+Python: @command{weechat.register ( name, version, shutdown_function,
+description )}@*
 @*
-Esta @'e a primeira fun@,{c}@~ao a invocar num Script Perl.@*
-Todos os Scripts Perl para o Weechat devem invocar esta fun@,{c}@~ao.@*
+This is first function to call in script.@*
+All scripts for WeeChat should call this function.@*
 
-@emph{Argumentos:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{nome}: nome @'unico que indentifique o script (cada Script Perl deve ter um @'unico nome)
-@item @option{vers@~ao}: vers@~ao do script
-@item @option{fun@,{c}@~ao_de_shutdown}: fun@,{c}@~ao Perl invocada quando o script é descarregado (par@^ametro opcional, se deixado em branco significa que nada deve ser chamado)
-@item @option{descri@,{c}@~ao}: breve descri@,{c}@~ao do script.
+@item @option{name}: unique name to identify script (each script must have
+unique name)
+@item @option{version}: script's version
+@item @option{shutdown_function}: function called when script is
+unloaded (optional parameter, empty string means nothing is called at the end)
+@item @option{description}: short description of script.
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 1 if script was registered, 0 if error occured.@*
 @*
-@emph{Exemplo:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat::register ("sample", "1.0", "sample_end", "Sample script!");}@*
+@code{weechat::register ("sample", "1.0", "sample_end", "Sample
+script!");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.register ("sample", "1.0", "sample_end", "Sample
+script!")}@*
 @*
 
 @item
-@command{weechat::print ( mensagem, [canal, [servidor]] );}@*
+Perl: @command{weechat::print ( message, [channel, [server]] );}@*
+Python: @command{weechat.prnt ( message, [channel, [server]] )}@*
 @*
-Imprimne uma mensagem na canal.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{mensagem}: mensagem a mostrar
-@item @option{canal}: nome da canal
-@item @option{servidor}: nome interno da servidor
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Exemplos:}@*
-@*
-@code{weechat::print ("mensagem");}@*
-@code{weechat::print ("mensagem", "#weechat");}@*
-@code{weechat::print ("mensagem", "#weechat", "freenode");}@*
-@*
-
-@item
-@command{weechat::print_infobar ( atrasa, mensagem );}@*
-@*
-Imprimne uma mensagem na barra do info.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{atrasa}: depois que isto atrasa (nos segundos), a mensagem estar@'a apagada
-(se 0, mensagem n@~ao forem apagados).
-@item @option{mensagem}: mensagem a mostrar
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Exemplo:}@*
-@*
-@code{weechat::print_infobar (5, "mensagem");}@*
-@*
-
-@item
-@command{weechat::add_message_handler ( nome, fun@,{c}@~ao );}@*
-@*
-Anexa uma fun@,{c}@~ao Perl a uma mensagem de IRC.@*
-A fun@,{c}@~ao ser@'a invocada de cada vez que a mensagem IRC for recebida.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{nome}: nome da mensagem IRC@*
-Para conheceres uma lista de mensagens de IRC, por favor lê o RFC 1459 e/ou o 2812:@*
-RFC 1459: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
-RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{fun@,{c}@~ao}: fun@,{c}@~ao Perl invocada quando a mensagem é recebida
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if Perl function was attached, 0 if error occured.@*
-@*
-@emph{Exemplo:}@*
-@*
-@code{weechat::add_message_handler ("privmsg", my_function);}@*
-@code{sub my_function}@*
-@code{@{ }@*
-@code{@ @ @ @ ($null, $channel, $message) = split ":",@@_[0],3;}@*
-@code{@ @ @ @ ($hostmask, $null, $channel) = split " ", $channel;}@*
-@code{@ @ @ @ weechat::print ("host=$hostmask, chan=$channel, msg=$message\n");}@*
-@code{@ @ @ @ return 0;}@*
-@code{@} }@*
-@*
-@emph{Notes:}@*
-@*
-Function called when message is received has to return one of these values:@*
-@itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@item @option{1}: message will not be sent to WeeChat
-@item @option{2}: message will not be sent to other plugins
-@item @option{3}: message will not be sent to WeeChat neither other plugins
-@end itemize
-@*
-
-@item
-@command{weechat::add_command_handler ( nome, fun@,{c}@~ao );}@*
-@*
-Cria um novo comando do Weechat, ligado a uma fun@,{c}@~ao Perl.@*
-A fun@,{c}@~ao ser@'a chamada quando o utilizador a invocar utilizando @command{/nome}@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{nome}: nome do novo comando@*
-Este nome pode pertencer a um comando já existente, o qual ser@'a sobreposto pela fun@,{c}@~ao Perl. Tem cuidado quando fizeres isto: os comandos originais não estar@~ao acessiveis antes de teres descarregado o Script Perl.
-@item @option{fun@,{c}@~ao}: fun@,{c}@~ao Perl ligada ao comando
-@item @option{description}: command description (displayed by /help
-command)
-@item @option{arguments}: short description of command arguments
-(displayed by /help command)
-@item @option{arguments_description}: long description of command
-arguments (displayed by /help command)
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if Perl function was attached, 0 if error occured.@*
-@*
-@emph{Exemplo:}@*
-@*
-@code{weechat::add_command_handler ("command", my_command);}@*
-@code{sub my_command}@*
-@code{@{ }@*
-@code{@ @ @ @ weechat::print("Argumentos: ".@@_[0]);}@*
-@code{@ @ @ @ return 0;}@*
-@code{@} }@*
-@*
-@emph{Notes:}@*
-@*
-Function called when command is executed has to return one of these values:@*
-@itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@end itemize
-@*
-
-@item
-@command{weechat::remove_handler ( name, function );}@*
-@*
-Remove a message or command handler.@*
+Print message in a channel.@*
 
 @emph{Arguments:}
 @itemize @minus
-@item @option{name}: name of IRC message or command handler
-@item @option{function}: Perl function
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat::remove_handler ("command", my_command);}@*
-@*
-
-@item
-@command{weechat::command ( command, [channel, [server]] );}@*
-@*
-Execute a command or send a message to a channel.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{command}: command to execute (or message to send in a channel)
+@item @option{message}: message to display
 @item @option{channel}: name of channel
 @item @option{server}: internal name of server
 @end itemize
@@ -2415,315 +2292,119 @@ Execute a command or send a message to a channel.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
-@code{weechat::command ("hello world!");}@*
-@code{weechat::command ("/kick toto please leave this chan", "#weechat");}@*
-@code{weechat::command ("/nick newnick", "", "freenode");}@*
+@code{weechat::print ("message");}@*
+@code{weechat::print ("message", "#weechat");}@*
+@code{weechat::print ("message", "#weechat", "freenode");}@*
+@*
+@emph{Python examples:}@*
+@*
+@code{weechat.prnt ("message")}@*
+@code{weechat.prnt ("message", "#weechat")}@*
+@code{weechat.prnt ("message", "#weechat", "freenode")}@*
 @*
 
 @item
-@command{weechat::get_info ( nome, [servidor, [canal] ] );}@*
+Perl: @command{weechat::print_infobar ( delay, message );}@*
+Python: @command{weechat.print_infobar ( delay, message )}@*
 @*
-Comece o v@'ario info sobre WeeChat, servidor ou usu@'ario.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{nome}: nome do info a recuperar:
-@itemize @minus
-@item @option{version}: comece a vers@~ao de WeeChat
-@item @option{nick}: comece o nickname
-@item @option{channel}: comece o nome da canal
-@item @option{server}: comece o nome do servidor
-@item @option{away}: get ``away'' flag
-@item @option{weechat_dir}: get WeeChat home dir
-@item @option{weechat_libdir}: get WeeChat system lib dir
-@item @option{weechat_sharedir}: get WeeChat system share dir
-@end itemize
-@item @option{servidor}: nome interno da servidor
-@item @option{canal}: nome da canal
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Asked info, empty if error occured or info was not found.@*
-@*
-@emph{Exemplos:}@*
-@*
-@code{$version = get_info("version");}@*
-@code{$nick = get_info("nick", "freenode");}@*
-@*
-
-@item
-@command{weechat::get_dcc_info ( );}@*
-@*
-Get DCC list.@*
-
-Returned array has following fields:
-@itemize @minus
-@item server: IRC server
-@item channel: IRC channel
-@item type: DCC type:
-@itemize @minus
-@item 0: chat (received)
-@item 1: chat (sent)
-@item 2: file (receiving)
-@item 3: file (sending)
-@end itemize
-@item status: DCC status:
-@itemize @minus
-@item 0: waiting
-@item 1: connecting
-@item 2: active
-@item 3: done
-@item 4: failed
-@item 5: aborted
-@end itemize
-@item start_time: date/time of DCC creation
-@item start_transfer: date/time of transfer start
-@item addr: remote address
-@item port: port used for DCC
-@item nick: remote nick
-@item filename: filename
-@item local_filename: local filename
-@item size: file size
-@item pos: current position in file
-@item start_resume: restart position after interruption
-@item bytes_per_sec: bytes sent/received per second
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-DCC list, 0 if error occured.@*
-@*
-
-@item
-@command{weechat::get_config ( option );}@*
-@*
-Get WeeChat config option value.@*
+Print message in infobar.@*
 
 @emph{Arguments:}
 @itemize @minus
-@item @option{option}: name of option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Value of option, empty if error occured or option was not found.@*
-@*
-@emph{Examples:}@*
-@*
-@code{$value1 = weechat::get_config ("look_nicklist");}@*
-@code{$value2 = weechat::get_config ("freenode.server_autojoin");}@*
-@*
-
-@item
-@command{weechat::set_config ( option, value );}@*
-@*
-Get WeeChat config option value.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@item @option{value}: new value for option
+@item @option{delay}: after this delay (in seconds), message will be erased
+(if 0, message will not be erased).
+@item @option{message}: message to display
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat::set_config ("look_nicklist", "off");}@*
-@code{weechat::set_config ("freenode.server_autojoin"", "#weechat");}@*
+@code{weechat::print_infobar (5, "message");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.print_infobar (5, "message")}@*
 @*
 
 @item
-@command{weechat::get_plugin_config ( option );}@*
+Perl: @command{weechat::add_message_handler ( name, function );}@*
+Python: @command{weechat.add_message_handler ( name, function )}@*
 @*
-Return value of a plugin option.@*
-Option is read from file ~/.weechat/plugins.rc and is like:@*
-@code{plugin.script.option=value}@*
-Note: plugin and script names are automatically added.@*
+Attach a script function to an IRC message.@*
+Function will be called each time IRC message will be received.@*
 
 @emph{Arguments:}
 @itemize @minus
-@item @option{option}: name of option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-Value of option, empty if error occured or option was not found.@*
-@*
-@emph{Example:}@*
-@*
-@code{$value = weechat::get_plugin_config ("my_var");}@*
-@*
-
-@item
-@command{weechat::set_plugin_config ( option, value );}@*
-@*
-Update value of a plugin option.@*
-Option is written in file ~/.weechat/plugins.rc and is like:@*
-@code{plugin.script.option=value}@*
-Note: plugin and script names are automatically added.@*
-
-@emph{Arguments:}
-@itemize @minus
-@item @option{option}: name of option
-@item @option{value}: new value for option
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Example:}@*
-@*
-@code{weechat::set_plugin_config ("my_var", "value");}@*
-@*
-
-@end itemize
-
-@subsection Python scripts
-
-@subsubsection Carregar/Descarregar Scripts Python
-
-Os Scripts Python s@~ao carregados e descarregados com o comando @command{/python}.
-(escreve @kbd{/help python} dentro do WeeChat para obteres ajuda acerca do comando).@*
-
-@emph{Exemplos:}@*
-@itemize @bullet
-@item
-Carregar um Script Python: @kbd{/python load /tmp/sample.py}@*
-@item
-Descarregar todos os Scripts Python: @kbd{/python unload}@*
-@item
-Listar todos os Scripts Python: @kbd{/python}@*
-@end itemize
-
-@subsubsection Interface WeeChat / Python
-
-@itemize @bullet
-@item
-@command{weechat.register ( nome, vers@~ao, fun@,{c}@~ao_de_shutdown, descri@,{c}@~ao );}@*
-@*
-Esta @'e a primeira fun@,{c}@~ao a invocar num Script Python.@*
-Todos os Scripts Python para o Weechat devem invocar esta fun@,{c}@~ao.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{nome}: nome @'unico que indentifique o script (cada Script Python deve ter um @'unico nome)
-@item @option{vers@~ao}: vers@~ao do script
-@item @option{fun@,{c}@~ao_de_shutdown}: fun@,{c}@~ao Python invocada quando o script é descarregado (par@^ametro opcional, se deixado em branco significa que nada deve ser chamado)
-@item @option{descri@,{c}@~ao}: breve descri@,{c}@~ao do script.
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if script was registered, 0 if error occured.@*
-@*
-@emph{Exemplo:}@*
-@*
-@code{weechat.register ("sample", "1.0", "sample_end", "Sample script!")}@*
-@*
-
-@item
-@command{weechat.prnt ( mensagem, [canal, [servidor]] )}@*
-@*
-Imprimne uma mensagem na canal.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{mensagem}: mensagem a mostrar
-@item @option{canal}: nome da canal
-@item @option{servidor}: nome interno da servidor
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Exemplos:}@*
-@*
-@code{weechat.prnt ("mensagem")}@*
-@code{weechat.prnt ("mensagem", "#weechat")}@*
-@code{weechat.prnt ("mensagem", "#weechat", "freenode")}@*
-@*
-
-@item
-@command{weechat.print_infobar ( atrasa, mensagem )}@*
-@*
-Imprimne uma mensagem na barra do info.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{atrasa}: depois que isto atrasa (nos segundos), a mensagem estar@'a apagada
-(se 0, mensagem n@~ao forem apagados).
-@item @option{mensagem}: mensagem a mostrar
-@end itemize
-@*
-@emph{Return value:}@*
-@*
-1 if successful, 0 if error occured.@*
-@*
-@emph{Exemplo:}@*
-@*
-@code{weechat.print_infobar (5, "mensagem")}@*
-@*
-
-@item
-@command{weechat.add_message_handler ( nome, fun@,{c}@~ao )}@*
-@*
-Anexa uma fun@,{c}@~ao Python a uma mensagem de IRC.@*
-A fun@,{c}@~ao ser@'a invocada de cada vez que a mensagem IRC for recebida.@*
-
-@emph{Argumentos:}
-@itemize @minus
-@item @option{nome}: nome da mensagem IRC@*
-Para conheceres uma lista de mensagens de IRC, por favor lê o RFC 1459 e/ou o 2812:@*
+@item @option{name}: name of IRC message@*
+To know list of IRC messages, please refer to RFC 1459 and/or 2812:@*
 RFC 1459: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc1459.txt}@*
 RFC 2812: @uref{ftp://ftp.rfc-editor.org/in-notes/rfc2812.txt}
-@item @option{fun@,{c}@~ao}: fun@,{c}@~ao Python invocada quando a mensagem é recebida
+@item @option{function}: function called when message is received
 @end itemize
 @*
 @emph{Return value:}@*
 @*
-1 if Python function was attached, 0 if error occured.@*
+1 if function was attached, 0 if error occured.@*
 @*
-@emph{Exemplo:}@*
+@emph{Perl example:}@*
+@*
+@code{weechat::add_message_handler ("privmsg", my_function);}@*
+@code{sub my_function}@*
+@code{@{ }@*
+@code{@ @ @ @ weechat::print ("server=$_[0]\n");}@*
+@code{@ @ @ @ ($null, $channel, $message) = split ":",$_[1],3;}@*
+@code{@ @ @ @ ($hostmask, $null, $channel) = split " ", $channel;}@*
+@code{@ @ @ @ weechat::print ("host=$hostmask, chan=$channel, msg=$message\n");}@*
+@code{@ @ @ @ return 0;}@*
+@code{@} }@*
+@*
+@*
+@emph{Python example:}@*
 @*
 @code{weechat.add_message_handler ("privmsg", my_function)}@*
 @code{def my_function(server, args):}@*
 @code{@ @ @ @ weechat.prnt("server="+server)}@*
 @code{@ @ @ @ null, channel, message = string.split(args, ":", 2)}@*
 @code{@ @ @ @ hostmask, null, channel = string.split(string.strip(channel), " ", 2)}@*
-@code{@ @ @ @ weechat.prnt("host="+hostmask+", chan="+channel+", msg="+message)}@*
+@code{@ @ @ @ weechat.prnt("host="+hostmask+", channel="+channel+", message="+message)}@*
 @code{@ @ @ @ return 0}@*
 @*
 @emph{Notes:}@*
 @*
-Function called when message is received has to return one of these values:@*
+Function called when message is received has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
-@item @option{1}: message will not be sent to WeeChat
-@item @option{2}: message will not be sent to other plugins
-@item @option{3}: message will not be sent to WeeChat neither other plugins
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
+@item @option{PLUGIN_RC_OK_IGNORE_WEECHAT}: message will not be sent
+to WeeChat
+@item @option{PLUGIN_RC_OK_IGNORE_PLUGINS}: message will not be sent
+to other plugins
+@item @option{PLUGIN_RC_OK_IGNORE_ALL}: message will not be sent to
+WeeChat neither other plugins
 @end itemize
 @*
 
 @item
-@command{weechat.add_command_handler ( nome, fun@,{c}@~ao )}@*
+Perl: @command{weechat::add_command_handler ( name, function );}@*
+Python: @command{weechat.add_command_handler ( name, function )}@*
 @*
-Cria um novo comando do Weechat, ligado a uma fun@,{c}@~ao Python.@*
-A fun@,{c}@~ao ser@'a chamada quando o utilizador a invocar utilizando @command{/nome}@*
+Create new WeeChat command, linked with script function.@*
+Function will be called when user will launch command with @kbd{/name}.@*
 
-@emph{Argumentos:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{nome}: nome do novo comando@*
-Este nome pode pertencer a um comando já existente, o qual ser@'a sobreposto pela fun@,{c}@~ao Python. Tem cuidado quando fizeres isto: os comandos originais não estar@~ao acessiveis antes de teres descarregado o Script Python.
-@item @option{fun@,{c}@~ao}: fun@,{c}@~ao Python ligada ao comando
+@item @option{name}: name of new command@*
+This name may be existing command, so that the command is overrided by
+script function. Be careful when overriding WeeChat commands, they'll not be
+available until your script will be unloaded.
+@item @option{function}: function linked with command
 @item @option{description}: command description (displayed by /help
 command)
 @item @option{arguments}: short description of command arguments
@@ -2734,45 +2415,63 @@ arguments (displayed by /help command)
 @*
 @emph{Return value:}@*
 @*
-1 if Python function was attached, 0 if error occured.@*
+1 if function was attached, 0 if error occured.@*
 @*
-@emph{Exemplo:}@*
+@emph{Perl example:}@*
+@*
+@code{weechat::add_command_handler ("command", my_command);}@*
+@code{sub my_command}@*
+@code{@{ }@*
+@code{@ @ @ @ weechat::print("Server: $_[0], arguments: $_[1]\n");}@*
+@code{@ @ @ @ return 0;}@*
+@code{@} }@*
+@*
+@emph{Python example:}@*
 @*
 @code{weechat.add_command_handler ("command", my_command)}@*
 @code{def my_command(server, args):}@*
-@code{@ @ @ @ weechat.prnt("Servidor:"+server+" Argumentos:"+args)}@*
+@code{@ @ @ @ weechat.prnt("server:"+server+" arguments:"+args)}@*
+@code{@ @ @ @ return 0}@*
 @*
 @emph{Notes:}@*
 @*
-Function called when command is executed has to return one of these values:@*
+Function called when command is executed has to return one of these
+values (prefixed by ``weechat::'' for Perl and ``weechat.'' for
+Python):@*
 @itemize @minus
-@item @option{-1}: function failed
-@item @option{0}: function successfully completed
+@item @option{PLUGIN_RC_KO}: function failed
+@item @option{PLUGIN_RC_OK}: function successfully completed
 @end itemize
 @*
 
 @item
-@command{weechat.remove_handler ( name, function );}@*
+Perl: @command{weechat::remove_handler ( name, function );}@*
+Python: @command{weechat.remove_handler ( name, function )}@*
 @*
 Remove a message or command handler.@*
 
 @emph{Arguments:}
 @itemize @minus
 @item @option{name}: name of IRC message or command handler
-@item @option{function}: Python function
+@item @option{function}: function
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat.remove_handler ("command", my_command);}@*
+@code{weechat::remove_handler ("command", my_command);}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.remove_handler ("command", my_command)}@*
 @*
 
 @item
-@command{weechat.command ( command, [channel, [server]] )}@*
+Perl: @command{weechat::command ( command, [channel, [server]] );}@*
+Python: @command{weechat.command ( command, [channel, [server]] )}@*
 @*
 Execute a command or send a message to a channel.@*
 
@@ -2787,7 +2486,13 @@ Execute a command or send a message to a channel.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
+@*
+@code{weechat::command ("hello world!");}@*
+@code{weechat::command ("/kick toto please leave this chan", "#weechat");}@*
+@code{weechat::command ("/nick newnick", "", "freenode");}@*
+@*
+@emph{Python examples:}@*
 @*
 @code{weechat.command ("hello world!")}@*
 @code{weechat.command ("/kick toto please leave this chan", "#weechat")}@*
@@ -2795,38 +2500,47 @@ Execute a command or send a message to a channel.@*
 @*
 
 @item
-@command{weechat.get_info ( nome, [servidor] )}@*
+Perl: @command{weechat::get_info ( name, [server, [channel] ] );}@*
+Python: @command{weechat.get_info ( name, [server, [channel] ] )}@*
 @*
-Comece o v@'ario info sobre WeeChat, servidor ou usu@'ario.@*
+Get various info about WeeChat, server or user.@*
 
-@emph{Argumentos:}
+@emph{Arguments:}
 @itemize @minus
-@item @option{nome}: nome do info a recuperar:
+@item @option{name}: name of info to retrieve:
 @itemize @minus
-@item @option{version}: comece a vers@~ao de WeeChat
-@item @option{nick}: comece o nickname
-@item @option{channel}: comece o nome da canal
-@item @option{server}: comece o nome do servidor
+@item @option{version}: get WeeChat version
+@item @option{nick}: get nickname
+@item @option{channel}: get channel name
+@item @option{server}: get server name
 @item @option{away}: get ``away'' flag
 @item @option{weechat_dir}: get WeeChat home dir
 @item @option{weechat_libdir}: get WeeChat system lib dir
 @item @option{weechat_sharedir}: get WeeChat system share dir
+
 @end itemize
-@item @option{servidor}: nome interno da servidor
+@item @option{server}: internal name of server
+@item @option{channel}: channel name
 @end itemize
 @*
 @emph{Return value:}@*
 @*
 Asked info, empty if error occured or info was not found.@*
 @*
-@emph{Exemplos:}@*
+@emph{Perl examples:}@*
+@*
+@code{$version = weechat::get_info("version");}@*
+@code{$nick = weechat::get_info("nick", "freenode");}@*
+@*
+@emph{Python examples:}@*
 @*
 @code{$version = weechat.get_info("version")}@*
 @code{$nick = weechat.get_info("nick", "freenode")}@*
 @*
 
 @item
-@command{weechat::get_dcc_info ( );}@*
+Perl: @command{weechat::get_dcc_info ( );}@*
+Python: @command{weechat.get_dcc_info ( );}@*
 @*
 Get DCC list.@*
 
@@ -2869,7 +2583,8 @@ DCC list, 0 if error occured.@*
 @*
 
 @item
-@command{weechat.get_config ( option );}@*
+Perl: @command{weechat::get_config ( option );}@*
+Python: @command{weechat.get_config ( option )}@*
 @*
 Get WeeChat config option value.@*
 
@@ -2882,14 +2597,20 @@ Get WeeChat config option value.@*
 @*
 Value of option, empty if error occured or option was not found.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
-@code{$value1 = weechat.get_config ("look_nicklist");}@*
-@code{$value2 = weechat.get_config ("freenode.server_autojoin");}@*
+@code{$value1 = weechat::get_config ("look_nicklist");}@*
+@code{$value2 = weechat::get_config ("freenode.server_autojoin");}@*
+@*
+@emph{Python examples:}@*
+@*
+@code{$value1 = weechat.get_config ("look_nicklist")}@*
+@code{$value2 = weechat.get_config ("freenode.server_autojoin")}@*
 @*
 
 @item
-@command{weechat.set_config ( option, value );}@*
+Perl: @command{weechat::set_config ( option, value );}@*
+Python: @command{weechat.set_config ( option, value )}@*
 @*
 Get WeeChat config option value.@*
 
@@ -2903,14 +2624,21 @@ Get WeeChat config option value.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Examples:}@*
+@emph{Perl examples:}@*
 @*
-@code{weechat.set_config ("look_nicklist", "off");}@*
-@code{weechat.set_config ("freenode.server_autojoin"", "#weechat");}@*
+@code{weechat::set_config ("look_nicklist", "off");}@*
+@code{weechat::set_config ("freenode.server_autojoin"",
+"#weechat");}@*
+@*
+@emph{Python examples:}@*
+@*
+@code{weechat.set_config ("look_nicklist", "off")}@*
+@code{weechat.set_config ("freenode.server_autojoin"", "#weechat")}@*
 @*
 
 @item
-@command{weechat.get_plugin_config ( option );}@*
+Perl: @command{weechat::get_plugin_config ( option );}@*
+Python: @command{weechat.get_plugin_config ( option )}@*
 @*
 Return value of a plugin option.@*
 Option is read from file ~/.weechat/plugins.rc and is like:@*
@@ -2926,13 +2654,18 @@ Note: plugin and script names are automatically added.@*
 @*
 Value of option, empty if error occured or option was not found.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
-@code{$value = weechat.get_plugin_config ("my_var");}@*
+@code{$value = weechat::get_plugin_config ("my_var");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{$value = weechat.get_plugin_config ("my_var")}@*
 @*
 
 @item
-@command{weechat.set_plugin_config ( option, value );}@*
+Perl: @command{weechat::set_plugin_config ( option, value );}@*
+Python: @command{weechat.set_plugin_config ( option, value )}@*
 @*
 Update value of a plugin option.@*
 Option is written in file ~/.weechat/plugins.rc and is like:@*
@@ -2949,17 +2682,17 @@ Note: plugin and script names are automatically added.@*
 @*
 1 if successful, 0 if error occured.@*
 @*
-@emph{Example:}@*
+@emph{Perl example:}@*
 @*
-@code{weechat.set_plugin_config ("my_var", "value");}@*
+@code{weechat::set_plugin_config ("my_var", "value");}@*
+@*
+@emph{Python example:}@*
+@*
+@code{weechat.set_plugin_config ("my_var", "value")}@*
 @*
 
 @end itemize
 
-@subsection Ruby scripts
-
-N@~AO DESENVOLVIDO!
-
 
 @c **************************** Autores/Suporte *****************************
 
diff --git a/weechat/po/cs.po b/weechat/po/cs.po
index a112c9dbd..cc1558a81 100644
--- a/weechat/po/cs.po
+++ b/weechat/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.6-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-10-30 10:52+0100\n"
+"POT-Creation-Date: 2005-11-04 12:35+0100\n"
 "PO-Revision-Date: 2005-10-30 10:53+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -20,87 +20,87 @@ msgstr ""
 msgid "%s cannot allocate new nick\n"
 msgstr "%s nemůžu přidělit novou přezdívku\n"
 
-#: src/irc/irc-server.c:180 src/common/weeconfig.c:1968
+#: src/irc/irc-server.c:181 src/common/weeconfig.c:1974
 msgid "Unable to get user's name"
 msgstr "Nemůžu získat jméno uživatele"
 
-#: src/irc/irc-server.c:248
+#: src/irc/irc-server.c:249
 #, c-format
 msgid "%s cannot allocate new server\n"
 msgstr "%s nemůžu přidělit nový server\n"
 
-#: src/irc/irc-server.c:466
+#: src/irc/irc-server.c:467
 #, c-format
 msgid "%s error sending data to IRC server\n"
 msgstr "%s chyba při zasílání dat na IRC server\n"
 
-#: src/irc/irc-server.c:489 src/irc/irc-server.c:502 src/irc/irc-server.c:549
-#: src/irc/irc-server.c:562
+#: src/irc/irc-server.c:490 src/irc/irc-server.c:503 src/irc/irc-server.c:550
+#: src/irc/irc-server.c:563
 #, c-format
 msgid "%s not enough memory for received IRC message\n"
 msgstr "%s nedostatek paměti pro získání IRC zprávy\n"
 
-#: src/irc/irc-server.c:674
-#, c-format
-msgid "%s Command '%s' failed!\n"
-msgstr "%s Příkaz '%s' selhal!\n"
+#: src/irc/irc-server.c:675
+#, fuzzy, c-format
+msgid "%s Command \"%s\" failed!\n"
+msgstr "%s příkaz \"%s\" selhal\n"
 
-#: src/irc/irc-server.c:680
+#: src/irc/irc-server.c:681
 #, c-format
 msgid "%s No command to execute!\n"
 msgstr "%s Žádný příkaz pro provedení!\n"
 
-#: src/irc/irc-server.c:686
-#, c-format
-msgid "%s Unknown command: cmd=%s, host=%s, args=%s\n"
+#: src/irc/irc-server.c:687
+#, fuzzy, c-format
+msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
 msgstr "%s Neznámý příkaz: příkaz=%s, host=%s, parametry=%s\n"
 
-#: src/irc/irc-server.c:737
+#: src/irc/irc-server.c:738
 #, c-format
 msgid "%s cannot read data from socket, disconnecting from server...\n"
 msgstr "%s nemůžu pře�íst data ze soketu, odpojuji se od serveru...\n"
 
-#: src/irc/irc-server.c:820
+#: src/irc/irc-server.c:821
 #, c-format
 msgid "%s: Reconnecting to server in %d seconds\n"
 msgstr "%s: Navazuji nové spojení se serverem za %d sekund\n"
 
-#: src/irc/irc-server.c:854
+#: src/irc/irc-server.c:855
 #, c-format
 msgid "%s gnutls handshake failed\n"
 msgstr "%s handshake s gnutls selhal\n"
 
-#: src/irc/irc-server.c:871
+#: src/irc/irc-server.c:872
 #, c-format
 msgid "%s proxy address \"%s\" not found\n"
 msgstr "%s adresa proxy \"%s\" nenalezena\n"
 
-#: src/irc/irc-server.c:875
+#: src/irc/irc-server.c:876
 #, c-format
 msgid "%s address \"%s\" not found\n"
 msgstr "%s adresa \"%s\" nenalezena\n"
 
-#: src/irc/irc-server.c:885
+#: src/irc/irc-server.c:886
 #, c-format
 msgid "%s proxy IP address not found\n"
 msgstr "%s IP adresa proxy nenalezena\n"
 
-#: src/irc/irc-server.c:888
+#: src/irc/irc-server.c:889
 #, c-format
 msgid "%s IP address not found\n"
 msgstr "%s IP adresa nenalezena\n"
 
-#: src/irc/irc-server.c:897
+#: src/irc/irc-server.c:898
 #, c-format
 msgid "%s proxy connection refused\n"
 msgstr "%s proxy odmítla spojení\n"
 
-#: src/irc/irc-server.c:900
+#: src/irc/irc-server.c:901
 #, c-format
 msgid "%s connection refused\n"
 msgstr "%s spojení odmítnuto\n"
 
-#: src/irc/irc-server.c:908
+#: src/irc/irc-server.c:909
 #, c-format
 msgid ""
 "%s proxy fails to establish connection to server (check username/password if "
@@ -109,7 +109,7 @@ msgstr ""
 "%s selhalo zjednání spojení s proxy serverem (zkontrolujte uživatelské jméno "
 "a heslo pokud jsou vyžadovány)\n"
 
-#: src/irc/irc-server.c:1387
+#: src/irc/irc-server.c:1388
 #, c-format
 msgid ""
 "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -117,57 +117,57 @@ msgstr ""
 "%s nemohu se připojit pomocí SSL, protže WeeChat nebyl sestaven s podporou "
 "GNUtls\n"
 
-#: src/irc/irc-server.c:1396
+#: src/irc/irc-server.c:1397
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr "%s: připojuji se k serveru %s:%d%s%s přes %s proxy %s:%d%s...\n"
 
-#: src/irc/irc-server.c:1402
+#: src/irc/irc-server.c:1403
 #, c-format
 msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr "Připojuji se k serveru %s:%d%s%s přes %s proxy %s:%d%s...\n"
 
-#: src/irc/irc-server.c:1412
+#: src/irc/irc-server.c:1413
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s...\n"
 msgstr "%s: připojuji se k serveru %s:%d%s%s...\n"
 
-#: src/irc/irc-server.c:1416
+#: src/irc/irc-server.c:1417
 #, c-format
 msgid "Connecting to server %s:%d%s%s...\n"
 msgstr "Připojuji se k serveru %s:%d%s%s...\n"
 
-#: src/irc/irc-server.c:1434
+#: src/irc/irc-server.c:1435
 #, c-format
 msgid "%s gnutls init error\n"
 msgstr "%s chyba inicializace gnutls\n"
 
-#: src/irc/irc-server.c:1449
+#: src/irc/irc-server.c:1450
 #, c-format
 msgid "%s cannot create pipe\n"
 msgstr "%s nemohu vytvořit rouru\n"
 
-#: src/irc/irc-server.c:1464
+#: src/irc/irc-server.c:1465
 #, c-format
 msgid "%s cannot create socket\n"
 msgstr "%s nemohu vytvořit soket\n"
 
-#: src/irc/irc-server.c:1475
+#: src/irc/irc-server.c:1476
 #, c-format
 msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
 msgstr "%s nemohu nastavit nastavení sketu \"SO_REUSEADDR\"\n"
 
-#: src/irc/irc-server.c:1486
+#: src/irc/irc-server.c:1487
 #, c-format
 msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
 msgstr "%s nemohu nastavit nastavení soketu \"SO_KEEPALIVE\"\n"
 
-#: src/irc/irc-server.c:1517
+#: src/irc/irc-server.c:1518
 #, c-format
 msgid "%s: Reconnecting to server...\n"
 msgstr "%s: Připojuji se znovu k serveru...\n"
 
-#: src/irc/irc-server.c:1567 src/irc/irc-server.c:1576
+#: src/irc/irc-server.c:1568 src/irc/irc-server.c:1577
 msgid "Disconnected from server!\n"
 msgstr "Odpojen od serveru!\n"
 
@@ -962,7 +962,7 @@ msgstr ""
 #: src/irc/irc-commands.c:380 src/irc/irc-commands.c:381
 #: src/irc/irc-commands.c:382 src/irc/irc-commands.c:383
 #: src/irc/irc-commands.c:384 src/irc/irc-commands.c:385
-#: src/irc/irc-commands.c:490
+#: src/irc/irc-commands.c:491
 msgid "a server message"
 msgstr "zpráva serveru"
 
@@ -1143,244 +1143,249 @@ msgid "you are now an IRC operator"
 msgstr "nyní jsi IRC operátor"
 
 #: src/irc/irc-commands.c:387
+msgid "rehashing"
+msgstr ""
+
+#: src/irc/irc-commands.c:388
 msgid "server local time"
 msgstr "lokální �as serveru"
 
-#: src/irc/irc-commands.c:388
+#: src/irc/irc-commands.c:389
 msgid "no such nick/channel"
 msgstr "neexistující přezdívka/kanál"
 
-#: src/irc/irc-commands.c:390
+#: src/irc/irc-commands.c:391
 msgid "no such server"
 msgstr "neexistující server"
 
-#: src/irc/irc-commands.c:392
+#: src/irc/irc-commands.c:393
 msgid "no such channel"
 msgstr "neexistující kanál"
 
-#: src/irc/irc-commands.c:394
+#: src/irc/irc-commands.c:395
 msgid "cannot send to channel"
 msgstr "nemohu poslat na kanál"
 
-#: src/irc/irc-commands.c:396
+#: src/irc/irc-commands.c:397
 msgid "too many channels"
 msgstr "příliš mnoho kanálů"
 
-#: src/irc/irc-commands.c:398 src/irc/irc-commands.c:400
+#: src/irc/irc-commands.c:399 src/irc/irc-commands.c:401
 msgid "was no such nick"
 msgstr "byl neznámá přezdívka"
 
-#: src/irc/irc-commands.c:402
+#: src/irc/irc-commands.c:403
 msgid "no origin"
 msgstr "žádný původ"
 
-#: src/irc/irc-commands.c:404
+#: src/irc/irc-commands.c:405
 msgid "no services"
 msgstr "žádné služby"
 
-#: src/irc/irc-commands.c:406
+#: src/irc/irc-commands.c:407
 msgid "no recipient"
 msgstr "žádný příjemce"
 
-#: src/irc/irc-commands.c:408
+#: src/irc/irc-commands.c:409
 msgid "no text to send"
 msgstr "není text k poslání"
 
-#: src/irc/irc-commands.c:410
+#: src/irc/irc-commands.c:411
 msgid "no toplevel"
 msgstr "žádný nejvyšší level"
 
-#: src/irc/irc-commands.c:412
+#: src/irc/irc-commands.c:413
 msgid "wilcard in toplevel domain"
 msgstr "žna�ka pro výběr souboru v nejvyšší doméně"
 
-#: src/irc/irc-commands.c:414
+#: src/irc/irc-commands.c:415
 msgid "unknown command"
 msgstr "neznámý přkaz"
 
-#: src/irc/irc-commands.c:416
+#: src/irc/irc-commands.c:417
 msgid "MOTD is missing"
 msgstr "MOTD chybí"
 
-#: src/irc/irc-commands.c:418
+#: src/irc/irc-commands.c:419
 msgid "no administrative info"
 msgstr "žádné administrativní informace"
 
-#: src/irc/irc-commands.c:420
+#: src/irc/irc-commands.c:421
 msgid "file error"
 msgstr "chyba souboru"
 
-#: src/irc/irc-commands.c:422
+#: src/irc/irc-commands.c:423
 msgid "no nickname given"
 msgstr "žádná přezdívka nebyla dána"
 
-#: src/irc/irc-commands.c:424
+#: src/irc/irc-commands.c:425
 msgid "erroneous nickname"
 msgstr "chybová přezdívka"
 
-#: src/irc/irc-commands.c:426
+#: src/irc/irc-commands.c:427
 msgid "nickname already in use"
 msgstr "přezdívka je zrovna používaná"
 
-#: src/irc/irc-commands.c:428
+#: src/irc/irc-commands.c:429
 msgid "nickname collision"
 msgstr "kolize přezdívek"
 
-#: src/irc/irc-commands.c:430
+#: src/irc/irc-commands.c:431
 msgid "not authorized to change nickname"
 msgstr "chybí autorizace pro změnu přezdívky"
 
-#: src/irc/irc-commands.c:432
+#: src/irc/irc-commands.c:433
 msgid "user not in channel"
 msgstr "uživatel není na kanále"
 
-#: src/irc/irc-commands.c:434
+#: src/irc/irc-commands.c:435
 msgid "not on channel"
 msgstr "není na kanále"
 
-#: src/irc/irc-commands.c:436
+#: src/irc/irc-commands.c:437
 msgid "user already on channel"
 msgstr "uživatel již je na kanále"
 
-#: src/irc/irc-commands.c:438
+#: src/irc/irc-commands.c:439
 msgid "user not logged in"
 msgstr "uživatel není přihlášen"
 
-#: src/irc/irc-commands.c:440
+#: src/irc/irc-commands.c:441
 msgid "summon has been disabled"
 msgstr "svolávání bylo zakázáno"
 
-#: src/irc/irc-commands.c:442
+#: src/irc/irc-commands.c:443
 msgid "users has been disabled"
 msgstr "uživatel byl zablokován"
 
-#: src/irc/irc-commands.c:444
+#: src/irc/irc-commands.c:445
 msgid "you are not registered"
 msgstr "nejsi registrován"
 
-#: src/irc/irc-commands.c:446
+#: src/irc/irc-commands.c:447
 msgid "not enough parameters"
 msgstr "nedostatek parametrů"
 
-#: src/irc/irc-commands.c:448
+#: src/irc/irc-commands.c:449
 msgid "you may not register"
 msgstr "nemůžeš se registrovat"
 
-#: src/irc/irc-commands.c:450
+#: src/irc/irc-commands.c:451
 msgid "your host isn't among the privileged"
 msgstr "tvůj host není mezi privilegovanými"
 
-#: src/irc/irc-commands.c:452
+#: src/irc/irc-commands.c:453
 msgid "password incorrect"
 msgstr "nezprávné heslo"
 
-#: src/irc/irc-commands.c:454
+#: src/irc/irc-commands.c:455
 msgid "you are banned from this server"
 msgstr "dle tohoto serveru jsi zakázaný"
 
-#: src/irc/irc-commands.c:456
+#: src/irc/irc-commands.c:457
 msgid "channel key already set"
 msgstr "klí� kanálu je již nastaven"
 
-#: src/irc/irc-commands.c:458
+#: src/irc/irc-commands.c:459
 msgid "forwarding to another channel"
 msgstr "předávám na dalsí kanál"
 
-#: src/irc/irc-commands.c:460
+#: src/irc/irc-commands.c:461
 msgid "channel is already full"
 msgstr "kanál je již plný"
 
-#: src/irc/irc-commands.c:462
+#: src/irc/irc-commands.c:463
 msgid "unknown mode char to me"
 msgstr "neznámý znak módu"
 
-#: src/irc/irc-commands.c:464
+#: src/irc/irc-commands.c:465
 msgid "cannot join channel (invite only)"
 msgstr "nemohu se přidat na kanál (pouze na pozvání)"
 
-#: src/irc/irc-commands.c:466
+#: src/irc/irc-commands.c:467
 msgid "cannot join channel (banned from channel)"
 msgstr "nemohu se přidat na kanál (zakázaný dle kanálu)"
 
-#: src/irc/irc-commands.c:468
+#: src/irc/irc-commands.c:469
 msgid "cannot join channel (bad channel key)"
 msgstr "nemohu se přidat na kanál (špatný klí� kanálu)"
 
-#: src/irc/irc-commands.c:470
+#: src/irc/irc-commands.c:471
 msgid "bad channel mask"
 msgstr "špatná maska kanálu"
 
-#: src/irc/irc-commands.c:472
+#: src/irc/irc-commands.c:473
 msgid "channel doesn't support modes"
 msgstr "kanál nepodporuje módy"
 
-#: src/irc/irc-commands.c:474
+#: src/irc/irc-commands.c:475
 msgid "you're not an IRC operator"
 msgstr "nejsi IRC operátor"
 
-#: src/irc/irc-commands.c:476
+#: src/irc/irc-commands.c:477
 msgid "you're not channel operator"
 msgstr "nejsi operátor kanálu"
 
-#: src/irc/irc-commands.c:478
+#: src/irc/irc-commands.c:479
 msgid "you can't kill a server!"
 msgstr "nemůžeš zabít server!"
 
-#: src/irc/irc-commands.c:480
+#: src/irc/irc-commands.c:481
 msgid "your connection is restricted!"
 msgstr "tvé připojení je omezené"
 
-#: src/irc/irc-commands.c:482
+#: src/irc/irc-commands.c:483
 msgid "user is immune from kick/deop"
 msgstr "uživatel je imunní na kick/deop"
 
-#: src/irc/irc-commands.c:484
+#: src/irc/irc-commands.c:485
 msgid "no O-lines for your host"
 msgstr "žádné O-řádky pro tvůj host"
 
-#: src/irc/irc-commands.c:486
+#: src/irc/irc-commands.c:487
 msgid "unknown mode flag"
 msgstr "neznámá zna�ka módu"
 
-#: src/irc/irc-commands.c:488
+#: src/irc/irc-commands.c:489
 msgid "can't change mode for other users"
 msgstr "nemůžu změnit mód přo ostatní uživatele"
 
-#: src/irc/irc-commands.c:491
+#: src/irc/irc-commands.c:492
 msgid "whois (secure connection)"
 msgstr "whois (zabezpe�ená �ást)"
 
-#: src/irc/irc-display.c:170 src/common/command.c:873
-msgid "Server: "
-msgstr "Server: "
+#: src/irc/irc-display.c:180
+#, c-format
+msgid "%sServer: %s%s %s[%s%s%s]\n"
+msgstr ""
 
-#: src/irc/irc-display.c:175
+#: src/irc/irc-display.c:187
 msgid "connected"
 msgstr "připojen"
 
-#: src/irc/irc-display.c:175 src/common/command.c:899
+#: src/irc/irc-display.c:187
 msgid "not connected"
 msgstr "nepřipojen"
 
-#: src/irc/irc-display.c:179 src/irc/irc-display.c:184
-#: src/irc/irc-display.c:196 src/irc/irc-display.c:199
+#: src/irc/irc-display.c:191 src/irc/irc-display.c:195
+#: src/irc/irc-display.c:203 src/irc/irc-display.c:205
 msgid "yes"
 msgstr "ano"
 
-#: src/irc/irc-display.c:179 src/irc/irc-display.c:184
-#: src/irc/irc-display.c:196 src/irc/irc-display.c:199
+#: src/irc/irc-display.c:191 src/irc/irc-display.c:195
+#: src/irc/irc-display.c:203 src/irc/irc-display.c:205
 msgid "no"
 msgstr "ne"
 
-#: src/irc/irc-display.c:181
+#: src/irc/irc-display.c:193
 msgid " (temporary server, will not be saved)"
 msgstr " (do�asný server, nebude uložen)"
 
-#: src/irc/irc-display.c:203
+#: src/irc/irc-display.c:208
 msgid "(hidden)"
 msgstr "(skrytý)"
 
-#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4718
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4674
 msgid "unknown"
 msgstr "neznámý"
 
@@ -1389,516 +1394,513 @@ msgstr "neznámý"
 msgid "%s: using local hostname \"%s\"\n"
 msgstr "%s: používám lokální jméno hosta \"%s\"\n"
 
-#: src/irc/irc-send.c:167 src/common/command.c:749
+#: src/irc/irc-send.c:166 src/common/command.c:760
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr "%s nemohu najít přezdívku pro poslání zprávy\n"
 
-#: src/irc/irc-send.c:329 src/irc/irc-send.c:357 src/irc/irc-send.c:544
-#: src/irc/irc-send.c:577 src/irc/irc-send.c:610 src/irc/irc-send.c:658
-#: src/irc/irc-send.c:694 src/irc/irc-send.c:761 src/irc/irc-send.c:818
-#: src/irc/irc-send.c:1160 src/irc/irc-send.c:1258 src/irc/irc-send.c:1737
-#: src/irc/irc-send.c:1851
+#: src/irc/irc-send.c:328 src/irc/irc-send.c:356 src/irc/irc-send.c:547
+#: src/irc/irc-send.c:580 src/irc/irc-send.c:613 src/irc/irc-send.c:661
+#: src/irc/irc-send.c:697 src/irc/irc-send.c:764 src/irc/irc-send.c:821
+#: src/irc/irc-send.c:1154 src/irc/irc-send.c:1254 src/irc/irc-send.c:1730
+#: src/irc/irc-send.c:1844
 #, c-format
 msgid "%s \"%s\" command can only be executed in a channel window\n"
 msgstr "%s \"%s\" příkaz může být spuštěn pouze v okně kanálu\n"
 
-#: src/irc/irc-send.c:456 src/irc/irc-send.c:468 src/irc/irc-send.c:486
-#: src/irc/irc-send.c:1138 src/irc/irc-send.c:1231 src/irc/irc-send.c:1763
-#: src/common/command.c:1233 src/common/command.c:1647
-#: src/common/command.c:1781
+#: src/irc/irc-send.c:459 src/irc/irc-send.c:471 src/irc/irc-send.c:489
+#: src/irc/irc-send.c:1132 src/irc/irc-send.c:1227 src/irc/irc-send.c:1756
+#: src/common/command.c:1253 src/common/command.c:1695
+#: src/common/command.c:1831
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s špatný po�et parametrů pro příkaz \"%s\"\n"
 
-#: src/irc/irc-send.c:509 src/irc/irc-send.c:746 src/irc/irc-send.c:803
+#: src/irc/irc-send.c:512 src/irc/irc-send.c:749 src/irc/irc-send.c:806
 #, c-format
 msgid "%s wrong arguments for \"%s\" command\n"
 msgstr "%s špatné parametry pro příkaz \"%s\"\n"
 
-#: src/irc/irc-send.c:946 src/irc/irc-send.c:1013 src/irc/irc-send.c:1306
-#: src/irc/irc-send.c:1320 src/irc/irc-send.c:1664
+#: src/irc/irc-send.c:949 src/irc/irc-send.c:1016 src/irc/irc-send.c:1302
+#: src/irc/irc-send.c:1316 src/irc/irc-send.c:1657
 #, c-format
 msgid "%s \"%s\" command can not be executed on a server window\n"
 msgstr "%s \"%s\" příkaz nemůže být spuštěn v okně serveru\n"
 
-#: src/irc/irc-send.c:1031 src/irc/irc-send.c:1056 src/irc/irc-recv.c:499
+#: src/irc/irc-send.c:1032 src/irc/irc-send.c:1055 src/irc/irc-recv.c:500
 #, c-format
 msgid "%s nick \"%s\" not found for \"%s\" command\n"
 msgstr "%s přezdívka \"%s\" nebyla nalezena pro příkaz \"%s\"\n"
 
-#: src/irc/irc-send.c:1108 src/irc/irc-send.c:1416 src/irc/irc-recv.c:1238
-#: src/irc/irc-recv.c:2054 src/irc/irc-recv.c:2142
+#: src/irc/irc-send.c:1105 src/irc/irc-send.c:1412 src/irc/irc-recv.c:1230
+#: src/irc/irc-recv.c:2042 src/irc/irc-recv.c:2132
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr "%s nemohu vytvořít nové soukromé okno\"%s\"\n"
 
-#: src/irc/irc-send.c:1816
+#: src/irc/irc-send.c:1809
 #, c-format
 msgid "%s, compiled on %s %s\n"
 msgstr "%s, kompilováno na %s %s\n"
 
-#: src/irc/irc-recv.c:355
-msgid "You have been invited to "
+#: src/irc/irc-recv.c:362
+#, fuzzy, c-format
+msgid "You have been invited to %s%s%s by %s%s\n"
 msgstr "Byl jsi pozván na "
 
-#: src/irc/irc-recv.c:358 src/irc/irc-recv.c:3994
-msgid "by"
-msgstr "od"
-
-#: src/irc/irc-recv.c:369 src/irc/irc-recv.c:463 src/irc/irc-recv.c:1012
-#: src/irc/irc-recv.c:1397 src/irc/irc-recv.c:1656 src/irc/irc-recv.c:3559
-#: src/irc/irc-recv.c:3581 src/irc/irc-recv.c:3642 src/irc/irc-recv.c:3714
+#: src/irc/irc-recv.c:376 src/irc/irc-recv.c:469 src/irc/irc-recv.c:1008
+#: src/irc/irc-recv.c:1386 src/irc/irc-recv.c:1645 src/irc/irc-recv.c:3520
+#: src/irc/irc-recv.c:3541 src/irc/irc-recv.c:3601 src/irc/irc-recv.c:3672
 #, c-format
 msgid "%s channel \"%s\" not found for \"%s\" command\n"
 msgstr "%s kanál \"%s\" nebyl nalezen příkazem \"%s\"\n"
 
-#: src/irc/irc-recv.c:397
+#: src/irc/irc-recv.c:404
 #, c-format
 msgid "%s cannot create new channel \"%s\"\n"
 msgstr "%s nemohu vytvořit nový kanál \"%s\"\n"
 
-#: src/irc/irc-recv.c:416
-msgid " has joined "
-msgstr " se připojil "
+#: src/irc/irc-recv.c:415
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:474
-msgid " has kicked "
-msgstr " byl vykopnut "
+#: src/irc/irc-recv.c:477
+#, fuzzy, c-format
+msgid "%s%s%s has kicked %s%s%s from %s%s"
+msgstr " změnil téma pro "
 
-#: src/irc/irc-recv.c:478 src/common/command.c:1468
-msgid " from "
-msgstr " z "
+#: src/irc/irc-recv.c:562
+#, c-format
+msgid "%s%s%s has killed %s%s%s from server"
+msgstr ""
 
-#: src/irc/irc-recv.c:564
-msgid " has killed "
-msgstr " byl zabit "
-
-#: src/irc/irc-recv.c:570
-msgid " from server"
-msgstr " ze serveru"
-
-#: src/irc/irc-recv.c:580
-msgid " from server\n"
-msgstr " ze serveru\n"
-
-#: src/irc/irc-recv.c:588
+#: src/irc/irc-recv.c:584
 #, c-format
 msgid "%s host \"%s\" not found for \"%s\" command\n"
 msgstr "%s host \"%s\" nenalezen pro příkaz \"%s\"\n"
 
-#: src/irc/irc-recv.c:629
+#: src/irc/irc-recv.c:625
 msgid "sets ban on"
 msgstr "tě zakázal"
 
-#: src/irc/irc-recv.c:630
+#: src/irc/irc-recv.c:626
 msgid "removes ban on"
 msgstr "odebral zakázaní"
 
-#: src/irc/irc-recv.c:654
+#: src/irc/irc-recv.c:650
 msgid "sets exception on"
 msgstr "nastavena vyjímka na"
 
-#: src/irc/irc-recv.c:655
+#: src/irc/irc-recv.c:651
 msgid "removes exception on"
 msgstr "odstraněna vyjímka z"
 
-#: src/irc/irc-recv.c:679
+#: src/irc/irc-recv.c:675
 msgid "sets mode +f"
 msgstr "nastavil mód +f"
 
-#: src/irc/irc-recv.c:680
+#: src/irc/irc-recv.c:676
 msgid "removes mode +f"
 msgstr "odstranil mód +f"
 
-#: src/irc/irc-recv.c:704
+#: src/irc/irc-recv.c:700
 msgid "gives half channel operator status to"
 msgstr "dal polovi�ní status operátora na"
 
-#: src/irc/irc-recv.c:705
+#: src/irc/irc-recv.c:701
 msgid "removes half channel operator status from"
 msgstr "odebral polovi�ní status operátora z"
 
-#: src/irc/irc-recv.c:732
+#: src/irc/irc-recv.c:728
 msgid "sets invite-only channel flag"
 msgstr "nastavil zan�ku kanálu: pouze na pování"
 
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:729
 msgid "removes invite-only channel flag"
 msgstr "odebral zna�ku kanálu: pouze na pozvání"
 
-#: src/irc/irc-recv.c:750
+#: src/irc/irc-recv.c:746
 msgid "sets channel key to"
 msgstr "nastavil klí� kanálu na"
 
-#: src/irc/irc-recv.c:751
+#: src/irc/irc-recv.c:747
 msgid "removes channel key"
 msgstr "odebral klí� kanálu"
 
-#: src/irc/irc-recv.c:782
+#: src/irc/irc-recv.c:778
 msgid "sets the user limit to"
 msgstr "nastavil limit uživatelů na"
 
-#: src/irc/irc-recv.c:783
+#: src/irc/irc-recv.c:779
 msgid "removes user limit"
 msgstr "odebral limit uživatelů"
 
-#: src/irc/irc-recv.c:805
+#: src/irc/irc-recv.c:801
 msgid "sets moderated channel flag"
 msgstr "nastavil zna�ku moderovaného kanálu"
 
-#: src/irc/irc-recv.c:806
+#: src/irc/irc-recv.c:802
 msgid "removes moderated channel flag"
 msgstr "odebral zna�ku moderovaného kanálu"
 
-#: src/irc/irc-recv.c:816
+#: src/irc/irc-recv.c:812
 msgid "sets messages from channel only flag"
 msgstr "nastavil zna�ku kanálu: zprávy pouze z kanálu"
 
-#: src/irc/irc-recv.c:817
+#: src/irc/irc-recv.c:813
 msgid "removes messages from channel only flag"
 msgstr "odebral zna�ku kanálu: zprávy pouze z kanálu"
 
-#: src/irc/irc-recv.c:834
+#: src/irc/irc-recv.c:830
 msgid "gives channel operator status to"
 msgstr "dal status operátora na"
 
-#: src/irc/irc-recv.c:835
+#: src/irc/irc-recv.c:831
 msgid "removes channel operator status from"
 msgstr "odebral status operátora z"
 
-#: src/irc/irc-recv.c:862
+#: src/irc/irc-recv.c:858
 msgid "sets private channel flag"
 msgstr "nastavil zna�ku soukromého kanálu"
 
-#: src/irc/irc-recv.c:863
+#: src/irc/irc-recv.c:859
 msgid "removes private channel flag"
 msgstr "odebral zna�ku soukromého kanálu"
 
-#: src/irc/irc-recv.c:880
+#: src/irc/irc-recv.c:876
 msgid "sets quiet on"
 msgstr "nastavil ticho na"
 
-#: src/irc/irc-recv.c:881
+#: src/irc/irc-recv.c:877
 msgid "removes quiet on"
 msgstr "odebral ticho z"
 
-#: src/irc/irc-recv.c:898
+#: src/irc/irc-recv.c:894
 msgid "sets secret channel flag"
 msgstr "nastavil zna�ku tajného kanálu"
 
-#: src/irc/irc-recv.c:899
+#: src/irc/irc-recv.c:895
 msgid "removes secret channel flag"
 msgstr "odebral zna�ku tajného kanálu"
 
-#: src/irc/irc-recv.c:909
+#: src/irc/irc-recv.c:905
 msgid "sets topic protection"
 msgstr "nastavil protekci tématu"
 
-#: src/irc/irc-recv.c:910
+#: src/irc/irc-recv.c:906
 msgid "removes topic protection"
 msgstr "odebral protekci tématu"
 
-#: src/irc/irc-recv.c:927
+#: src/irc/irc-recv.c:923
 msgid "gives voice to"
 msgstr "dal voice na"
 
-#: src/irc/irc-recv.c:928
+#: src/irc/irc-recv.c:924
 msgid "removes voice from"
 msgstr "odebral voice z"
 
-#: src/irc/irc-recv.c:971 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1475
-#: src/irc/irc-recv.c:2209
+#: src/irc/irc-recv.c:967 src/irc/irc-recv.c:1053 src/irc/irc-recv.c:1464
+#: src/irc/irc-recv.c:2201
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr "%s \"%s\" příkaz obdržen bez hosta\n"
 
-#: src/irc/irc-recv.c:981
+#: src/irc/irc-recv.c:977
 #, c-format
 msgid "%s \"%s\" command received without channel or nickname\n"
 msgstr "%s \"%s\" příkaz obdržen bez kanálu nebo přezdívky\n"
 
-#: src/irc/irc-recv.c:1029
-msgid "mode changed by"
-msgstr "mód změnil"
+#: src/irc/irc-recv.c:1019
+#, c-format
+msgid "%s[%s%s%s/%s%s%s]%s mode changed by %s%s\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:1091
-msgid "You are "
-msgstr "Jsi "
-
-#: src/irc/irc-recv.c:1098
-msgid " is "
-msgstr " je "
-
-#: src/irc/irc-recv.c:1102
-msgid "now known as "
+#: src/irc/irc-recv.c:1088
+#, fuzzy, c-format
+msgid "You are now known as %s%s\n"
 msgstr "nyní známý jako "
 
-#: src/irc/irc-recv.c:1169
+#: src/irc/irc-recv.c:1092
+#, fuzzy, c-format
+msgid "%s%s%s is now known as %s%s\n"
+msgstr "nyní známý jako "
+
+#: src/irc/irc-recv.c:1159
 #, c-format
 msgid "%s nickname not found for \"%s\" command\n"
 msgstr "%s přezdívka nenalezena pro příkaz \"%s\"\n"
 
-#: src/irc/irc-recv.c:1185 src/irc/irc-recv.c:1217
-msgid "reply from"
-msgstr "odpověd od"
-
-#: src/irc/irc-recv.c:1220
+#: src/irc/irc-recv.c:1173
 #, c-format
-msgid ": %ld.%ld seconds\n"
-msgstr ": %ld %ld sekund\n"
+msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:1259 src/irc/irc-recv.c:2163 src/irc/irc-dcc.c:1136
+#: src/irc/irc-recv.c:1207
+#, c-format
+msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:1252 src/irc/irc-recv.c:2154 src/irc/irc-dcc.c:1153
 #, c-format
 msgid "Private %s> %s"
 msgstr "Soukromý %s> %s"
 
-#: src/irc/irc-recv.c:1322
+#: src/irc/irc-recv.c:1317
 #, c-format
 msgid "%s \"%s\" command received without host or channel\n"
 msgstr "%s \"%s\" příkaz obdržen bez hosta nebo kanálu\n"
 
-#: src/irc/irc-recv.c:1371
-msgid " has left "
-msgstr " opustil "
+#: src/irc/irc-recv.c:1357
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has left %s%s"
+msgstr ""
 
-#: src/irc/irc-recv.c:1523 src/irc/irc-recv.c:2078
+#: src/irc/irc-recv.c:1513 src/irc/irc-recv.c:2067
 #, c-format
 msgid "On %s: * %s %s"
 msgstr "Na %s: * %s %s"
 
-#: src/irc/irc-recv.c:1547
-#, c-format
-msgid "Received a CTCP SOUND \"%s\" from "
+#: src/irc/irc-recv.c:1538
+#, fuzzy, c-format
+msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
 msgstr "Obdržen CTCP ZVUK \"%s\" od "
 
-#: src/irc/irc-recv.c:1580 src/irc/irc-recv.c:1611 src/irc/irc-recv.c:1715
-#: src/irc/irc-recv.c:1755 src/irc/irc-recv.c:2118
-msgid "received from"
-msgstr "obdrženo od"
+#: src/irc/irc-recv.c:1568 src/irc/irc-recv.c:1739
+#, fuzzy, c-format
+msgid "CTCP %sPING%s received from %s%s\n"
+msgstr " obdržen od "
 
-#: src/irc/irc-recv.c:1607 src/irc/irc-recv.c:2114
-msgid "Unknown CTCP "
-msgstr "Neznámé CTCP "
+#: src/irc/irc-recv.c:1597 src/irc/irc-recv.c:2104
+#, fuzzy, c-format
+msgid "Unknown CTCP %s%s%s received from %s%s"
+msgstr "%s neznámý DCC CHAT typ obdržen od "
 
-#: src/irc/irc-recv.c:1639
+#: src/irc/irc-recv.c:1629
 #, c-format
 msgid "On %s: %s> %s"
 msgstr "Na: %s: %s> %s"
 
-#: src/irc/irc-recv.c:1771 src/irc/irc-recv.c:1792 src/irc/irc-recv.c:1808
-#: src/irc/irc-recv.c:1824 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1871
-#: src/irc/irc-recv.c:1887 src/irc/irc-recv.c:1912 src/irc/irc-recv.c:1933
-#: src/irc/irc-recv.c:1949 src/irc/irc-recv.c:1974 src/irc/irc-recv.c:1995
-#: src/irc/irc-recv.c:2010 src/irc/irc-recv.c:2185 src/irc/irc-recv.c:2529
-#: src/irc/irc-recv.c:3918 src/irc/irc-recv.c:3933 src/irc/irc-recv.c:3948
-#: src/irc/irc-recv.c:3963 src/irc/irc-recv.c:3976 src/irc/irc-recv.c:4031
-#: src/irc/irc-recv.c:4045 src/irc/irc-recv.c:4285 src/irc/irc-recv.c:4343
-#: src/irc/irc-recv.c:4502 src/irc/irc-recv.c:4517 src/irc/irc-recv.c:4532
-#: src/irc/irc-recv.c:4547 src/irc/irc-recv.c:4560 src/irc/irc-recv.c:4614
-#: src/irc/irc-recv.c:4628
+#: src/irc/irc-recv.c:1700
+#, fuzzy, c-format
+msgid "CTCP %sVERSION%s received from %s%s"
+msgstr " obdržen od "
+
+#: src/irc/irc-recv.c:1757 src/irc/irc-recv.c:1778 src/irc/irc-recv.c:1794
+#: src/irc/irc-recv.c:1810 src/irc/irc-recv.c:1836 src/irc/irc-recv.c:1857
+#: src/irc/irc-recv.c:1873 src/irc/irc-recv.c:1898 src/irc/irc-recv.c:1919
+#: src/irc/irc-recv.c:1935 src/irc/irc-recv.c:1960 src/irc/irc-recv.c:1981
+#: src/irc/irc-recv.c:1996 src/irc/irc-recv.c:2177 src/irc/irc-recv.c:2516
+#: src/irc/irc-recv.c:3879 src/irc/irc-recv.c:3894 src/irc/irc-recv.c:3909
+#: src/irc/irc-recv.c:3924 src/irc/irc-recv.c:3937 src/irc/irc-recv.c:4002
+#: src/irc/irc-recv.c:4016 src/irc/irc-recv.c:4250 src/irc/irc-recv.c:4308
+#: src/irc/irc-recv.c:4446 src/irc/irc-recv.c:4461 src/irc/irc-recv.c:4567
+#: src/irc/irc-recv.c:4581
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr "%s nemohu rozpársovat příkaz \"%s\"\n"
 
-#: src/irc/irc-recv.c:2023
+#: src/irc/irc-recv.c:2009
 #, c-format
 msgid "%s unknown DCC CHAT type received from "
 msgstr "%s neznámý DCC CHAT typ obdržen od "
 
-#: src/irc/irc-recv.c:2240
-msgid "has quit"
-msgstr "ukon�il"
+#: src/irc/irc-recv.c:2224
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has quit %s(%s%s%s)\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:2354
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr "%s \"%s\" příkaz obdržen bez kanálu\n"
 
-#: src/irc/irc-recv.c:2397
-msgid " has changed topic for "
+#: src/irc/irc-recv.c:2382
+#, fuzzy, c-format
+msgid "%s%s%s has changed topic for %s%s%s to: \"%s\"\n"
 msgstr " změnil téma pro "
 
-#: src/irc/irc-recv.c:2402
-#, c-format
-msgid " to: \"%s\"\n"
-msgstr " pro: \"%s\"\n"
-
-#: src/irc/irc-recv.c:2408
-msgid " has unset topic for "
+#: src/irc/irc-recv.c:2392
+#, fuzzy, c-format
+msgid "%s%s%s has unset topic for %s%s\n"
 msgstr " zrušil téma pro "
 
-#: src/irc/irc-recv.c:2517
-msgid "User mode"
-msgstr "Uživatelský mód"
-
-#: src/irc/irc-recv.c:2572
+#: src/irc/irc-recv.c:2502
 #, c-format
-msgid " is away: %s\n"
+msgid "User mode %s[%s%s%s/%s%s%s]\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:2557
+#, fuzzy, c-format
+msgid "%s%s%s is away: %s\n"
 msgstr " je pry�: %s\n"
 
-#: src/irc/irc-recv.c:2654
+#: src/irc/irc-recv.c:2642
 msgid "Users online: "
 msgstr "Uživatelů online: "
 
-#: src/irc/irc-recv.c:3144
-msgid "idle: "
-msgstr "ne�inný: "
+#: src/irc/irc-recv.c:2999
+#, c-format
+msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3120
+#, c-format
+msgid "%s[%s%s%s]%s idle: "
+msgstr ""
+
+#: src/irc/irc-recv.c:3132
 msgid "days"
 msgstr "dní"
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3132
 msgid "day"
 msgstr "den"
 
-#: src/irc/irc-recv.c:3162
+#: src/irc/irc-recv.c:3136
+#, c-format
+msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
+msgstr ""
+
+#: src/irc/irc-recv.c:3140
 msgid "hours"
 msgstr "hodin"
 
-#: src/irc/irc-recv.c:3162
+#: src/irc/irc-recv.c:3140
 msgid "hour"
 msgstr "hodina"
 
-#: src/irc/irc-recv.c:3168
+#: src/irc/irc-recv.c:3144
 msgid "minutes"
 msgstr "minut"
 
-#: src/irc/irc-recv.c:3168
+#: src/irc/irc-recv.c:3144
 msgid "minute"
 msgstr "minuta"
 
-#: src/irc/irc-recv.c:3174
+#: src/irc/irc-recv.c:3148
 msgid "seconds"
 msgstr "sekund"
 
-#: src/irc/irc-recv.c:3174
+#: src/irc/irc-recv.c:3148
 msgid "second"
 msgstr "sekunda"
 
-#: src/irc/irc-recv.c:3179
-msgid "signon at: "
-msgstr "připojen: "
-
-#: src/irc/irc-recv.c:3275
-msgid "Channels: "
-msgstr "Kanály: "
-
-#: src/irc/irc-recv.c:3572
-msgid "No topic set for "
+#: src/irc/irc-recv.c:3532
+#, fuzzy, c-format
+msgid "No topic set for %s%s\n"
 msgstr "Není nastaveno téma pro "
 
-#: src/irc/irc-recv.c:3629
-msgid "Topic for "
-msgstr "Téma pro "
-
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3588
 #, c-format
-msgid " is: \"%s\"\n"
-msgstr " je: \"%s\"\n"
+msgid "Topic for %s%s%s is: \"%s\"\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:3652 src/irc/irc-recv.c:3741 src/irc/irc-recv.c:3794
+#: src/irc/irc-recv.c:3611 src/irc/irc-recv.c:3699 src/irc/irc-recv.c:3754
 #, c-format
 msgid "%s cannot identify channel for \"%s\" command\n"
 msgstr "%s nemohu identifikovat kanál pro příkaz \"%s\"\n"
 
-#: src/irc/irc-recv.c:3702
-msgid "Topic set by "
+#: src/irc/irc-recv.c:3661
+#, fuzzy, c-format
+msgid "Topic set by %s%s%s, %s"
 msgstr "Téma nasteveno "
 
-#: src/irc/irc-recv.c:3723
+#: src/irc/irc-recv.c:3681
 #, c-format
 msgid "%s cannot identify date/time for \"%s\" command\n"
 msgstr "%s nemohu identofikovat datum/�as pro příkaz \"%s\"\n"
 
-#: src/irc/irc-recv.c:3732 src/irc/irc-recv.c:3803
+#: src/irc/irc-recv.c:3690 src/irc/irc-recv.c:3763
 #, c-format
 msgid "%s cannot identify nickname for \"%s\" command\n"
 msgstr "%s nemohu identifikovat přezdívku pro příkaz \"%s\"\n"
 
-#: src/irc/irc-recv.c:3782
-msgid "has invited"
-msgstr "pozval"
+#: src/irc/irc-recv.c:3739
+#, fuzzy, c-format
+msgid "%s%s%s has invited %s%s%s on %s%s\n"
+msgstr " změnil téma pro "
 
-#: src/irc/irc-recv.c:3785 src/irc/irc-recv.c:4206 src/common/command.c:1461
-msgid "on"
-msgstr "na"
-
-#: src/irc/irc-recv.c:3840
-msgid "Channel reop"
+#: src/irc/irc-recv.c:3799
+#, fuzzy, c-format
+msgid "Channel reop %s%s%s: %s%s\n"
 msgstr "reop kanálu"
 
-#: src/irc/irc-recv.c:3992
-msgid "exception"
-msgstr "vyjímka"
-
-#: src/irc/irc-recv.c:4331
+#: src/irc/irc-recv.c:4296
 #, c-format
 msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
 msgstr "%s nemohu vztvořit přezdívku \"%s\" pro kanál \"%s\"\n"
 
-#: src/irc/irc-recv.c:4390
-msgid "Nicks "
-msgstr "Přezdívky "
+#: src/irc/irc-recv.c:4354
+#, c-format
+msgid "Nicks %s%s%s: %s["
+msgstr ""
 
-#: src/irc/irc-recv.c:4410
-msgid "Channel "
-msgstr "Kanál "
+#: src/irc/irc-recv.c:4375
+#, c-format
+msgid ""
+"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:4421
+#: src/irc/irc-recv.c:4383
 msgid "nicks"
 msgstr "přezdívky"
 
-#: src/irc/irc-recv.c:4421
+#: src/irc/irc-recv.c:4383
 msgid "nick"
 msgstr "přezdívka"
 
-#: src/irc/irc-recv.c:4429
+#: src/irc/irc-recv.c:4388
 msgid "ops"
 msgstr "ops"
 
-#: src/irc/irc-recv.c:4429
+#: src/irc/irc-recv.c:4388
 msgid "op"
 msgstr "op"
 
-#: src/irc/irc-recv.c:4438
+#: src/irc/irc-recv.c:4392
 msgid "halfops"
 msgstr "�áste�ní-ops"
 
-#: src/irc/irc-recv.c:4438
+#: src/irc/irc-recv.c:4392
 msgid "halfop"
 msgstr "�áste�ný-op"
 
-#: src/irc/irc-recv.c:4447
+#: src/irc/irc-recv.c:4396
 msgid "voices"
 msgstr "voices"
 
-#: src/irc/irc-recv.c:4447
+#: src/irc/irc-recv.c:4396
 msgid "voice"
 msgstr "voice"
 
-#: src/irc/irc-recv.c:4456
+#: src/irc/irc-recv.c:4400
 msgid "normal"
 msgstr "normální"
 
-#: src/irc/irc-recv.c:4577
-msgid "banned by"
-msgstr "zakázán"
+#: src/irc/irc-recv.c:4501
+#, c-format
+msgid "%s[%s%s%s] %s%s%s banned by "
+msgstr ""
 
-#: src/irc/irc-recv.c:4672
+#: src/irc/irc-recv.c:4536
+#, c-format
+msgid "%s[%s%s%s] %s%s%s banned\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:4628
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
 msgstr ""
 "%s: přezdívka \"%s\" je již používaná, zkouším druhou přezdívku \"%s\"\n"
 
-#: src/irc/irc-recv.c:4684
+#: src/irc/irc-recv.c:4640
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
 msgstr ""
 "%s: přezdívka \"%s\" je již používaná, zkouším třetí přezdívku \"%s\"\n"
 
-#: src/irc/irc-recv.c:4696
+#: src/irc/irc-recv.c:4652
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
@@ -1907,7 +1909,7 @@ msgstr ""
 "%s: všechny deklarované přezdívky jsou již používány, zavírám spojení se "
 "serverem!\n"
 
-#: src/irc/irc-recv.c:4706
+#: src/irc/irc-recv.c:4662
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
 msgstr ""
@@ -1937,35 +1939,39 @@ msgstr "Selhal"
 msgid "Aborted"
 msgstr "Zrušeno"
 
-#: src/irc/irc-dcc.c:367 src/irc/irc-dcc.c:568 src/irc/irc-dcc.c:731
-msgid "DCC: file "
+#: src/irc/irc-dcc.c:368
+#, fuzzy, c-format
+msgid "DCC: file %s%s%s"
 msgstr "DCC: soubor "
 
-#: src/irc/irc-dcc.c:374 src/irc/irc-dcc.c:693 src/irc/irc-dcc.c:736
-msgid " (local filename: "
+#: src/irc/irc-dcc.c:374
+#, fuzzy, c-format
+msgid " (local filename: %s%s%s)"
 msgstr " (lokální jmého souboru: "
 
-#: src/irc/irc-dcc.c:382
+#: src/irc/irc-dcc.c:379
 msgid " sent to "
 msgstr " poslán "
 
-#: src/irc/irc-dcc.c:384
+#: src/irc/irc-dcc.c:381
 msgid " received from "
 msgstr " obdržen od "
 
-#: src/irc/irc-dcc.c:390
-msgid ": ok!\n"
-msgstr ": ok!\n"
+#: src/irc/irc-dcc.c:386
+msgid "OK"
+msgstr ""
 
-#: src/irc/irc-dcc.c:390
-msgid ": FAILED\n"
+#: src/irc/irc-dcc.c:386
+#, fuzzy
+msgid "FAILED"
 msgstr ": SELHAL\n"
 
-#: src/irc/irc-dcc.c:402
-msgid "DCC chat closed with "
+#: src/irc/irc-dcc.c:399
+#, fuzzy, c-format
+msgid "DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"
 msgstr "DCC rozhovor zavřen s "
 
-#: src/irc/irc-dcc.c:459
+#: src/irc/irc-dcc.c:457
 #, c-format
 msgid ""
 "%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1974,20 +1980,17 @@ msgstr ""
 "%s nemohu přiřadit DCC rozhovor k soukromému bufferu (možná má "
 "soukromýbuffer již DCC CHAT?)\n"
 
-#: src/irc/irc-dcc.c:470
-msgid "Connected to "
-msgstr "Připojen k "
+#: src/irc/irc-dcc.c:468
+#, fuzzy, c-format
+msgid "Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"
+msgstr "DCC rozhovor zavřen s "
 
-#: src/irc/irc-dcc.c:479
-msgid "via DCC chat\n"
-msgstr "přes DCC rozhovor\n"
+#: src/irc/irc-dcc.c:568
+#, fuzzy, c-format
+msgid "DCC: file %s%s%s resumed at position %u\n"
+msgstr "bude obnoven na pozici %u\n"
 
-#: src/irc/irc-dcc.c:573
-#, c-format
-msgid "resumed at position %u\n"
-msgstr "obnoveno na pozici %u\n"
-
-#: src/irc/irc-dcc.c:579 src/irc/irc-dcc.c:604
+#: src/irc/irc-dcc.c:577 src/irc/irc-dcc.c:602
 #, c-format
 msgid ""
 "%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
@@ -1996,76 +1999,79 @@ msgstr ""
 "%s nemohu obnovit soubor \"%s\" (port: %d, po�áte�ní pozice: %u): DCC "
 "nenalezeno nebo ukon�eno\n"
 
-#: src/irc/irc-dcc.c:623
+#: src/irc/irc-dcc.c:621
 #, c-format
 msgid "%s not enough memory for new DCC\n"
 msgstr "%s nedostatek paměti pro nové DCC\n"
 
-#: src/irc/irc-dcc.c:642
+#: src/irc/irc-dcc.c:640
 msgid "DCC chat"
 msgstr "DCC rozhovor"
 
-#: src/irc/irc-dcc.c:672
-msgid "Incoming DCC file from "
-msgstr "Příchozí DCC soubor od "
+#: src/irc/irc-dcc.c:671
+#, c-format
+msgid ""
+"Incoming DCC file from %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s bytes\n"
+msgstr ""
 
-#: src/irc/irc-dcc.c:683 src/irc/irc-dcc.c:697
-msgid " bytes\n"
-msgstr " bajtů\n"
+#: src/irc/irc-dcc.c:694
+#, c-format
+msgid ""
+"Sending DCC file to %s%s%s: %s%s%s (local filename: %s%s%s), %s%lu%s bytes\n"
+msgstr ""
 
-#: src/irc/irc-dcc.c:689
-msgid "Sending DCC file to "
-msgstr "Posílám DCC soubor k "
-
-#: src/irc/irc-dcc.c:703
-msgid "Incoming DCC chat request from "
+#: src/irc/irc-dcc.c:714
+#, fuzzy, c-format
+msgid "Incoming DCC chat request from %s%s%s (%s%d.%d.%d.%d%s)\n"
 msgstr "Příchozí požadavek DCC rozhovoru od "
 
-#: src/irc/irc-dcc.c:715
-msgid "Sending DCC chat request to "
+#: src/irc/irc-dcc.c:731
+#, fuzzy, c-format
+msgid "Sending DCC chat request to %s%s\n"
 msgstr "Posílám požadavek DCC rozhovoru na "
 
-#: src/irc/irc-dcc.c:742
+#: src/irc/irc-dcc.c:749
 #, c-format
-msgid "will be resumed at position %u\n"
-msgstr "bude obnoven na pozici %u\n"
+msgid ""
+"DCC: file %s%s%s (local filename: %s%s%s) will be resumed at position %u\n"
+msgstr ""
 
-#: src/irc/irc-dcc.c:810
+#: src/irc/irc-dcc.c:824
 #, c-format
 msgid "%s not enough memory for DCC SEND\n"
 msgstr "%s nedostatek pameti pro DCC SEND\n"
 
-#: src/irc/irc-dcc.c:832
+#: src/irc/irc-dcc.c:846
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr "%s nemohu přistupovat k souboru \"%s\"\n"
 
-#: src/irc/irc-dcc.c:854
+#: src/irc/irc-dcc.c:868
 #, c-format
 msgid "%s could not find address for '%s'. Falling back to local IP.\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:874
+#: src/irc/irc-dcc.c:888
 #, c-format
 msgid "%s cannot create socket for DCC\n"
 msgstr "%s nemohu vytvořit soket pro DCC\n"
 
-#: src/irc/irc-dcc.c:932
+#: src/irc/irc-dcc.c:946
 #, c-format
 msgid "%s cannot find available port for DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:976
+#: src/irc/irc-dcc.c:990
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr "%s neomhu poslat DCC\n"
 
-#: src/irc/irc-dcc.c:1057
+#: src/irc/irc-dcc.c:1071
 #, c-format
 msgid "%s error sending data to \"%s\" via DCC CHAT\n"
 msgstr "%s chyba posílání dat k \"%s\" přes DCC CHAT\n"
 
-#: src/irc/irc-dcc.c:1330
+#: src/irc/irc-dcc.c:1350
 #, c-format
 msgid ""
 "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -2074,7 +2080,7 @@ msgstr ""
 "%s DCC selhalo, protože velikost bloku je příliž velká. Zkontrolujte hodnotu "
 "\"dcc_blocksize\" nastavní, maximum je %d.\n"
 
-#: src/irc/irc-dcc.c:1405
+#: src/irc/irc-dcc.c:1425
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr "Ruším aktivní DCC: \"%s\" od %s\n"
@@ -2205,13 +2211,13 @@ msgstr "Plugin \"%s\" odebrán.\n"
 msgid "%s plugin \"%s\" not found\n"
 msgstr "%s plugin \"%s\" nenalezen\n"
 
-#: src/plugins/plugins-config.c:215 src/common/weeconfig.c:1653
+#: src/plugins/plugins-config.c:215 src/common/weeconfig.c:1659
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
 msgstr "%s %s, řádek %d: nevalidní syntax, chybí \"=\"\n"
 
-#: src/plugins/plugins-config.c:265 src/common/weeconfig.c:1826
-#: src/common/weeconfig.c:2024
+#: src/plugins/plugins-config.c:265 src/common/weeconfig.c:1832
+#: src/common/weeconfig.c:2030
 #, c-format
 msgid "%s cannot create file \"%s\"\n"
 msgstr "%s nemohu vytvořit soubor \"%s\"\n"
@@ -2241,64 +2247,64 @@ msgstr "Změnil se den na %s\n"
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s zpoždění je veliké, odpojuji se od serveru...\n"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "bytes"
 msgstr "bajtů"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Kb"
 msgstr "Kb"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Mb"
 msgstr "Mb"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Gb"
 msgstr "Gb"
 
-#: src/gui/curses/gui-display.c:1265
+#: src/gui/curses/gui-display.c:1836
 msgid "<servers>"
 msgstr "<serverů>"
 
-#: src/gui/curses/gui-display.c:1277
+#: src/gui/curses/gui-display.c:1848
 msgid "(away)"
 msgstr "(pry�)"
 
-#: src/gui/curses/gui-display.c:1411
+#: src/gui/curses/gui-display.c:1982
 msgid "[not connected] "
 msgstr "[nepřipojen] "
 
-#: src/gui/curses/gui-display.c:1421
+#: src/gui/curses/gui-display.c:1992
 msgid "Act: "
 msgstr "Aktivní: "
 
-#: src/gui/curses/gui-display.c:1509
+#: src/gui/curses/gui-display.c:2080
 #, c-format
 msgid "Lag: %.1f"
 msgstr "Zpoždění: %.1f"
 
-#: src/gui/curses/gui-display.c:1525
+#: src/gui/curses/gui-display.c:2096
 msgid "-MORE-"
 msgstr "-V�CE-"
 
-#: src/gui/curses/gui-display.c:1715
+#: src/gui/curses/gui-display.c:2274
 msgid "  [A] Accept"
 msgstr "  [A] Akceptovat"
 
-#: src/gui/curses/gui-display.c:1716 src/gui/curses/gui-display.c:1720
+#: src/gui/curses/gui-display.c:2275 src/gui/curses/gui-display.c:2279
 msgid "  [C] Cancel"
 msgstr "  [C] Storno"
 
-#: src/gui/curses/gui-display.c:1725
+#: src/gui/curses/gui-display.c:2284
 msgid "  [R] Remove"
 msgstr "  [R] Odebrat"
 
-#: src/gui/curses/gui-display.c:1729
+#: src/gui/curses/gui-display.c:2288
 msgid "  [P] Purge old DCC"
 msgstr "  [P] Pro�istit staré DCC"
 
-#: src/gui/curses/gui-display.c:1730
+#: src/gui/curses/gui-display.c:2289
 msgid "  [Q] Close DCC view"
 msgstr "  [Q] Zavřít DCC pohled"
 
@@ -2306,17 +2312,13 @@ msgstr "  [Q] Zavřít DCC pohled"
 msgid "server"
 msgstr "server"
 
-#: src/gui/gui-common.c:392
-msgid "Not enough memory for infobar message\n"
-msgstr "Nedostatek paměti pro infobar zprávu\n"
-
-#: src/gui/gui-common.c:582
+#: src/gui/gui-common.c:508
 msgid "Not enough memory for new line\n"
 msgstr "Nedostatek paměti pro nový řádek\n"
 
-#: src/gui/gui-common.c:625
-msgid "Not enough memory for new message\n"
-msgstr "Nedostatek paměti pro novou zprávu\n"
+#: src/gui/gui-common.c:844
+msgid "Not enough memory for infobar message\n"
+msgstr "Nedostatek paměti pro infobar zprávu\n"
 
 #: src/gui/gui-keyboard.c:45
 msgid "terminate line"
@@ -2466,7 +2468,7 @@ msgstr "obnov obrazovku"
 msgid "grab a key"
 msgstr "zachytit klávesu"
 
-#: src/gui/gui-keyboard.c:428 src/common/command.c:1662
+#: src/gui/gui-keyboard.c:428 src/common/command.c:1710
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr "%s nemohu napojit kalávesu \"%s\"\n"
@@ -2813,8 +2815,8 @@ msgid "%s alias cannot run another alias!\n"
 msgstr "%s alias nemůže pouštět jiný ailas!\n"
 
 #: src/common/command.c:306
-#, c-format
-msgid "%s target command \"%s\" does not exist!\n"
+#, fuzzy, c-format
+msgid "%s target command \"/%s\" does not exist!\n"
 msgstr "%s cílový příkaz \"%s\" neexistuje!\n"
 
 #: src/common/command.c:535
@@ -2862,247 +2864,269 @@ msgstr "%s příkaz \"%s\" potřebuje připojení na server!\n"
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr "%s neznámý příkaz \"%s\" (zadejte /help pro nápovědu)\n"
 
-#: src/common/command.c:773
+#: src/common/command.c:789
 #, c-format
 msgid "%s unable to call handler for message (not enough memory)\n"
 msgstr "%s nemohu zavolat handler pro zprávu (neodstatek paměti)\n"
 
-#: src/common/command.c:781
+#: src/common/command.c:797
 msgid "This window is not a channel!\n"
 msgstr "Tohe není okno kanálu!\n"
 
-#: src/common/command.c:809 src/common/command.c:833 src/common/command.c:943
+#: src/common/command.c:825 src/common/command.c:856 src/common/command.c:963
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr "%s chybí argumenty pro příkaz \"%s\"\n"
 
-#: src/common/command.c:818
+#: src/common/command.c:832
+#, fuzzy, c-format
+msgid "%s alias can not start with \"/\"\n"
+msgstr "%s alias nemůže pouštět jiný ailas!\n"
+
+#: src/common/command.c:841
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr "Alias \"%s\" => \"%s\" vytvořen\n"
 
-#: src/common/command.c:824
+#: src/common/command.c:847
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr "Selhalo vytvoření aliasu \"%s\" => \"%s\" (nedostatek paměti)\n"
 
-#: src/common/command.c:844
+#: src/common/command.c:867
 msgid "List of aliases:\n"
 msgstr "Seznam pro aliasy:\n"
 
-#: src/common/command.c:856
+#: src/common/command.c:881
 msgid "No alias defined.\n"
 msgstr "Žádné aliasy nejsou definovány.\n"
 
-#: src/common/command.c:879
-msgid "Channel: "
-msgstr "Kanál: "
+#: src/common/command.c:898
+#, fuzzy, c-format
+msgid "%sServer: %s%s\n"
+msgstr "Server: "
 
-#: src/common/command.c:882 src/common/command.c:892
-msgid " (server: "
-msgstr " (server: "
+#: src/common/command.c:903
+#, c-format
+msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
+msgstr ""
 
-#: src/common/command.c:889
-msgid "Private with: "
-msgstr "Soukromý s: "
+#: src/common/command.c:912
+#, c-format
+msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
+msgstr ""
 
-#: src/common/command.c:923
+#: src/common/command.c:920
+#, fuzzy
+msgid "not connected\n"
+msgstr "nepřipojen"
+
+#: src/common/command.c:942
 msgid "Opened buffers:\n"
 msgstr "Otevřené buffery:\n"
 
-#: src/common/command.c:966
+#: src/common/command.c:986
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr "%s nekorektní �íslo bufferu\n"
 
-#: src/common/command.c:982
+#: src/common/command.c:1002
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr "%s nemohu zavřít jediný buffer\n"
 
-#: src/common/command.c:992
+#: src/common/command.c:1012
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr "%s nemohu zavřít buffer serveru dokud jsou otevřeny kanály\n"
 
-#: src/common/command.c:1043
+#: src/common/command.c:1063
 msgid "Notify levels:  "
 msgstr "Level upozornění:  "
 
-#: src/common/command.c:1071 src/common/command.c:1093
+#: src/common/command.c:1091 src/common/command.c:1113
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr "%s nekorektní level upozornění (musí být mezi %d a %d)\n"
 
-#: src/common/command.c:1080
+#: src/common/command.c:1100
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr "%s nekorektní buffer pro upozornění (musí být kanál nebo soukromý)\n"
 
-#: src/common/command.c:1160
+#: src/common/command.c:1180
 #, c-format
 msgid "unknown parameter \"%s\" for \"%s\" command\n"
 msgstr "neznámý parametr \"%s\" pro příkaz \"%s\"\n"
 
-#: src/common/command.c:1190
+#: src/common/command.c:1210
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s již vytvořený server \"%s\"!\n"
 
-#: src/common/command.c:1198
+#: src/common/command.c:1218
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr "%s zrovna připojuji k serveru \"%s\"!\n"
 
-#: src/common/command.c:1216 src/common/command.c:1291
+#: src/common/command.c:1236 src/common/command.c:1311
 #, c-format
 msgid "%s server not found\n"
 msgstr "%s server nenalezen\n"
 
-#: src/common/command.c:1246 src/common/command.c:1774
-#: src/common/command.c:2595 src/common/command.c:2619
+#: src/common/command.c:1266 src/common/command.c:1824
+#: src/common/command.c:2671 src/common/command.c:2695
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s neznámá volba pro příkaz \"%s\"\n"
 
-#: src/common/command.c:1275
+#: src/common/command.c:1295
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr "%s nepřipojen k serveru \"%s\"!\n"
 
-#: src/common/command.c:1283
+#: src/common/command.c:1303
 msgid "Auto-reconnection is cancelled\n"
 msgstr "Automatické znovupřipojené je zrušeno\n"
 
-#: src/common/command.c:1314 src/common/weechat.c:350
+#: src/common/command.c:1334 src/common/weechat.c:364
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "%s vnitřní příkazy:\n"
 
-#: src/common/command.c:1323 src/common/weechat.c:370
+#: src/common/command.c:1344 src/common/weechat.c:384
 #, c-format
 msgid "IRC commands:\n"
 msgstr "IRC příkazy:\n"
 
-#: src/common/command.c:1336
+#: src/common/command.c:1358
 msgid "Plugin commands:\n"
 msgstr "Příkazy pluginu:\n"
 
-#: src/common/command.c:1444
+#: src/common/command.c:1474
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr "Není dostupná žádná nápověda, \"%s\" je neznámý příkaz\n"
 
-#: src/common/command.c:1466
+#: src/common/command.c:1495
+msgid "on"
+msgstr "na"
+
+#: src/common/command.c:1503
 msgid " ignoring "
 msgstr " ignoruji "
 
-#: src/common/command.c:1490
+#: src/common/command.c:1507
+msgid " from "
+msgstr " z "
+
+#: src/common/command.c:1530
 msgid "List of ignore:\n"
 msgstr "Seznam ignorování:\n"
 
-#: src/common/command.c:1505
+#: src/common/command.c:1547
 msgid "No ignore defined.\n"
 msgstr "Žádné ignorování není definováno.\n"
 
-#: src/common/command.c:1531
+#: src/common/command.c:1573
 msgid "New ignore:"
 msgstr "Nové ignorování:"
 
-#: src/common/command.c:1550
-msgid "New key binding:\n"
+#: src/common/command.c:1593
+#, fuzzy, c-format
+msgid "New key binding:  %s"
 msgstr "Nová klávesová zkratka:\n"
 
-#: src/common/command.c:1583
+#: src/common/command.c:1627
 msgid "Key bindings:\n"
 msgstr "Klávesové zkratky:\n"
 
-#: src/common/command.c:1595
+#: src/common/command.c:1641
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr "Klávesa \"%s\" odpojena\n"
 
-#: src/common/command.c:1600
+#: src/common/command.c:1647
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s nemohu odpojit klávesu \"%s\"\n"
 
-#: src/common/command.c:1608 src/common/weechat.c:401
+#: src/common/command.c:1655 src/common/weechat.c:415
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Vnitřní klávesové funkce:\n"
 
-#: src/common/command.c:1627
+#: src/common/command.c:1675
 msgid "Default key bindings restored\n"
 msgstr "Výchozí klávesové zkratky obnoveny\n"
 
-#: src/common/command.c:1633
+#: src/common/command.c:1681
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 "%s \"-yes\" argument je požadován pro reset kaláves (bezpe�nostní opatření)\n"
 
-#: src/common/command.c:1689
+#: src/common/command.c:1737
 msgid "Plugins loaded:\n"
 msgstr "Na�tené pluginy:\n"
 
-#: src/common/command.c:1703
+#: src/common/command.c:1753
 msgid "     message handlers:\n"
 msgstr "     obsluhova�e zpráv:\n"
 
-#: src/common/command.c:1712
+#: src/common/command.c:1762
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr "       IRC(%s)\n"
 
-#: src/common/command.c:1719
+#: src/common/command.c:1769
 msgid "       (no message handler)\n"
 msgstr "       (není obsluhova� zprávy)\n"
 
-#: src/common/command.c:1724
+#: src/common/command.c:1774
 msgid "     command handlers:\n"
 msgstr "     obsluhova�e příkazu:\n"
 
-#: src/common/command.c:1745
+#: src/common/command.c:1795
 msgid "       (no command handler)\n"
 msgstr "       (není obsluhova� příkazu)\n"
 
-#: src/common/command.c:1751
+#: src/common/command.c:1801
 msgid "  (no plugin)\n"
 msgstr "  (není plugin)\n"
 
-#: src/common/command.c:1787
+#: src/common/command.c:1837
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
 msgstr ""
 "Příkaz \"plugin\" není dostupný, WeeChat byl přeložen bez podpory pluginů.\n"
 
-#: src/common/command.c:1834
+#: src/common/command.c:1884
 msgid "No server.\n"
 msgstr "žádný server.\n"
 
-#: src/common/command.c:1845
+#: src/common/command.c:1895
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "Server '%s' nenalezen.\n"
 
-#: src/common/command.c:1857
+#: src/common/command.c:1907
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr "%s chybí jméno serveru pro příkaz \"%s\"\n"
 
-#: src/common/command.c:1865
+#: src/common/command.c:1915
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr "%s příliž mnoho argumentů pro příkaz \"%s\", ignoruji argumety\n"
 
-#: src/common/command.c:1884
+#: src/common/command.c:1934
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr "%s server \"%s\" nenalezen pro příkaz \"%s\"\n"
 
-#: src/common/command.c:1892
+#: src/common/command.c:1942
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -3111,172 +3135,172 @@ msgstr ""
 "%s nemůžete odebrat server \"%s\", protože jste k němu připojent. Skuste "
 "nejprve /dissconnect %s.\n"
 
-#: src/common/command.c:1908 src/common/command.c:2054
-msgid "Server"
-msgstr "Server"
-
-#: src/common/command.c:1911
-msgid "has been deleted\n"
+#: src/common/command.c:1960
+#, fuzzy, c-format
+msgid "Server %s%s%s has been deleted\n"
 msgstr "byl odebrán\n"
 
-#: src/common/command.c:1926
+#: src/common/command.c:1977
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s chybí parametry pro příkaz \"%s\"\n"
 
-#: src/common/command.c:1936
+#: src/common/command.c:1987
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr "%s server \"%s\" již existuje, nemohu jej vytvořít!\n"
 
-#: src/common/command.c:1965 src/common/command.c:1993
-#: src/common/command.c:2006 src/common/command.c:2032
+#: src/common/command.c:2016 src/common/command.c:2044
+#: src/common/command.c:2057 src/common/command.c:2083
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr "%s chybí heslo pro parametr \"%s\"\n"
 
-#: src/common/command.c:1978
+#: src/common/command.c:2029
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr "%s chybí přezdívka/přezdívky pro parametr \"%s\"\n"
 
-#: src/common/command.c:2019
+#: src/common/command.c:2070
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s chybí příkaz pro parametr \"%s\"\n"
 
-#: src/common/command.c:2057
-msgid "created\n"
-msgstr "vytvořeno\n"
+#: src/common/command.c:2105
+#, fuzzy, c-format
+msgid "Server %s%s%s created\n"
+msgstr "Server '%s' nenalezen.\n"
 
-#: src/common/command.c:2063
+#: src/common/command.c:2114
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s nemohu vytvořit server\n"
 
-#: src/common/command.c:2118
+#: src/common/command.c:2173
 msgid "(unknown)"
 msgstr "(neznámý)"
 
-#: src/common/command.c:2141
-msgid "(password hidden) "
+#: src/common/command.c:2196
+#, fuzzy, c-format
+msgid "%s(password hidden) "
 msgstr "(heslo schováno) "
 
-#: src/common/command.c:2205
+#: src/common/command.c:2263
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s server \"%s\" nenalezen\n"
 
-#: src/common/command.c:2236 src/common/command.c:2282
+#: src/common/command.c:2296 src/common/command.c:2344
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s volba nastavení \"%s\" nenalezena\n"
 
-#: src/common/command.c:2241 src/common/command.c:2274
+#: src/common/command.c:2301 src/common/command.c:2336
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s nekorektní hodnota pro volbu \"%s\"\n"
 
-#: src/common/command.c:2257
+#: src/common/command.c:2317
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr "%s volba \"%s\" nemůže být změněna dokud WeeChat běží\n"
 
-#: src/common/command.c:2362
+#: src/common/command.c:2427
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr "Nebyla nalezena žádná volba nastavení s \"%s\"\n"
 
-#: src/common/command.c:2365
+#: src/common/command.c:2430
 msgid "No config option found\n"
 msgstr "Nebyla nalezena žádná volba nastavení\n"
 
-#: src/common/command.c:2372
-msgid "Detail:\n"
+#: src/common/command.c:2437
+#, fuzzy, c-format
+msgid "%sDetail:\n"
 msgstr "Detail:\n"
 
-#: src/common/command.c:2376 src/common/weechat.c:287
+#: src/common/command.c:2443 src/common/weechat.c:301
 #, c-format
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr "  . typ boolean (hodnota: 'on' nebo 'off')\n"
 
-#: src/common/command.c:2377 src/common/command.c:2400
-#: src/common/command.c:2406 src/common/command.c:2412
-#: src/common/weechat.c:288 src/common/weechat.c:311 src/common/weechat.c:317
-#: src/common/weechat.c:323
+#: src/common/command.c:2444 src/common/command.c:2467
+#: src/common/command.c:2473 src/common/command.c:2479
+#: src/common/weechat.c:302 src/common/weechat.c:325 src/common/weechat.c:331
+#: src/common/weechat.c:337
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . výchozí hodnota: '%s'\n"
 
-#: src/common/command.c:2382 src/common/weechat.c:293
+#: src/common/command.c:2449 src/common/weechat.c:307
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . typ celo�íselný (hodnoty: mezi %d a %d)\n"
 
-#: src/common/command.c:2385 src/common/weechat.c:296
+#: src/common/command.c:2452 src/common/weechat.c:310
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . výchozí hodnota: %d\n"
 
-#: src/common/command.c:2389 src/common/weechat.c:300
+#: src/common/command.c:2456 src/common/weechat.c:314
 #, c-format
 msgid "  . type string (values: "
 msgstr "  . typ řetězec (hodnoty: "
 
-#: src/common/command.c:2402 src/common/command.c:2408
-#: src/common/command.c:2414 src/common/weechat.c:313 src/common/weechat.c:319
-#: src/common/weechat.c:325
+#: src/common/command.c:2469 src/common/command.c:2475
+#: src/common/command.c:2481 src/common/weechat.c:327 src/common/weechat.c:333
+#: src/common/weechat.c:339
 msgid "empty"
 msgstr "prázdný"
 
-#: src/common/command.c:2405 src/common/weechat.c:316
+#: src/common/command.c:2472 src/common/weechat.c:330
 #, c-format
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr "  . typ barva (Curses nebo Gtk barva, viz WeeChat dokumentace)\n"
 
-#: src/common/command.c:2411 src/common/weechat.c:322
+#: src/common/command.c:2478 src/common/weechat.c:336
 #, c-format
 msgid "  . type string (any string)\n"
 msgstr "  . typ řetězec (jakýkoliv řetězec)\n"
 
-#: src/common/command.c:2417 src/common/weechat.c:328
+#: src/common/command.c:2484 src/common/weechat.c:342
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . popis: %s\n"
 
-#: src/common/command.c:2424
+#: src/common/command.c:2495
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr "volba/volby nastavení nalezeny s \"%s\"\n"
 
-#: src/common/command.c:2427
+#: src/common/command.c:2498
 msgid "config option(s) found\n"
 msgstr "volba/volby nastavení nalezeny\n"
 
-#: src/common/command.c:2448
+#: src/common/command.c:2519
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s alias nebo příkaz \"%s\" nenalezen\n"
 
-#: src/common/command.c:2458
+#: src/common/command.c:2529
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "Alias \"%s\" odebrán\n"
 
-#: src/common/command.c:2511
+#: src/common/command.c:2585
 msgid "ignore were removed.\n"
 msgstr "ignorování bylo odebráno.\n"
 
-#: src/common/command.c:2513
+#: src/common/command.c:2587
 msgid "ignore was removed.\n"
 msgstr "ignorování bylo odebrán\n"
 
-#: src/common/command.c:2518
+#: src/common/command.c:2592
 #, c-format
 msgid "%s no ignore found\n"
 msgstr "%s žádné ignorování nenaleyeno\n"
 
-#: src/common/command.c:2543
+#: src/common/command.c:2617
 msgid "Opened windows:\n"
 msgstr "Otevřené okna:\n"
 
@@ -3323,23 +3347,23 @@ msgstr "FIFO roura zavřena\n"
 msgid "%s cannot add a buffer to hotlist\n"
 msgstr "%s nemohu přidat buffer do hotlistu\n"
 
-#: src/common/log.c:118
+#: src/common/log.c:96
 msgid "Not enough memory to write log file for a buffer\n"
 msgstr "Nedostatek paměti pro zapsání log sourobru bufferu\n"
 
-#: src/common/log.c:146
+#: src/common/log.c:124
 msgid "Unable to write log file for a buffer\n"
 msgstr "Nemůžu zapsat log soubor bufferu\n"
 
-#: src/common/log.c:150
+#: src/common/log.c:128
 msgid "****  Beginning of log  "
 msgstr "****  Beginning of log  "
 
-#: src/common/log.c:164
+#: src/common/log.c:142
 msgid "****  End of log  "
 msgstr "****  End of log  "
 
-#: src/common/weechat.c:274
+#: src/common/weechat.c:288
 #, c-format
 msgid ""
 "WeeChat configuration options (~/.weechat/weechat.rc):\n"
@@ -3348,7 +3372,7 @@ msgstr ""
 "WeeChat kofnigura�ní nastavení (~/.weechat/weechat.rc):\n"
 "\n"
 
-#: src/common/weechat.c:335
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "Moreover, you can define aliases in [alias] section, by adding lines like:\n"
@@ -3356,7 +3380,7 @@ msgstr ""
 "Mimoto můžete definovat aliasy v sekci [alias], přidáním řádku jako je "
 "tento:\n"
 
-#: src/common/weechat.c:337
+#: src/common/weechat.c:351
 #, c-format
 msgid ""
 "where 'j' is alias name, and 'join' associated command.\n"
@@ -3365,62 +3389,62 @@ msgstr ""
 "kde 'j' je jméno aliasu, a 'join' přidružený příkaz.\n"
 "\n"
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:437
 #, c-format
 msgid "%s default keys:\n"
 msgstr "%s výchozí klávesy:\n"
 
-#: src/common/weechat.c:503
+#: src/common/weechat.c:525
 #, c-format
 msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
 msgstr "%s nevalidní syntaxe pro IRC server ('%s'), ignorován\n"
 
-#: src/common/weechat.c:516
+#: src/common/weechat.c:538
 #, c-format
 msgid "%s unable to create server ('%s'), ignored\n"
 msgstr "%s nemohu vytvořit server ('%s'), ignorován\n"
 
-#: src/common/weechat.c:525
+#: src/common/weechat.c:547
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr "%s neznámý parametr '%s', ignorován\n"
 
-#: src/common/weechat.c:545
+#: src/common/weechat.c:567
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr "%s nemohu vytvořit adresář \"%s\"\n"
 
-#: src/common/weechat.c:571
+#: src/common/weechat.c:593
 #, c-format
 msgid "%s unable to get HOME directory\n"
 msgstr "%s nemohu získat HOME adresář\n"
 
-#: src/common/weechat.c:580
+#: src/common/weechat.c:602
 #, c-format
 msgid "%s not enough memory for home directory\n"
 msgstr "%s nedostatek paměti pro domácí adresář\n"
 
-#: src/common/weechat.c:590
+#: src/common/weechat.c:612
 #, c-format
 msgid "%s unable to create ~/.weechat directory\n"
 msgstr "%s nemohu vytvořit adresář ~/.weechat\n"
 
-#: src/common/weechat.c:603
+#: src/common/weechat.c:625
 #, c-format
 msgid "%s unable to create ~/.weechat/logs directory\n"
 msgstr "%s nemohu vytvořit adresář ~/.weechat/logs\n"
 
-#: src/common/weechat.c:646
+#: src/common/weechat.c:668
 #, c-format
 msgid "%s unable to create/append to log file (~/.weechat/%s)"
 msgstr "%s nemohu vytvořit/přidat do log souboru (~/.weechat/%s)"
 
-#: src/common/weechat.c:669
-#, c-format
-msgid "%sWelcome to "
+#: src/common/weechat.c:696
+#, fuzzy, c-format
+msgid "%sWelcome to %s%s%s, %s\n"
 msgstr "%sVítejte do "
 
-#: src/common/weechat.c:682 src/common/weechat.c:691
+#: src/common/weechat.c:710 src/common/weechat.c:720
 msgid "compiled on"
 msgstr "kompilováno"
 
@@ -3432,34 +3456,34 @@ msgstr "WeeChat chyba:"
 msgid "WeeChat Warning:"
 msgstr "WeeChat Upozornění:"
 
-#: src/common/weeconfig.c:103 src/common/weeconfig.c:104
+#: src/common/weeconfig.c:102 src/common/weeconfig.c:103
 msgid "set title for window (terminal for Curses GUI) with name & version"
 msgstr "nastaví titulek okna (terminálu pro Cruses GUI) s jménem a verzí"
 
-#: src/common/weeconfig.c:107 src/common/weeconfig.c:108
+#: src/common/weeconfig.c:106 src/common/weeconfig.c:107
 msgid "display WeeChat logo at startup"
 msgstr "zobrazí WeeChat logo při spuštění"
 
-#: src/common/weeconfig.c:111 src/common/weeconfig.c:112
+#: src/common/weeconfig.c:110 src/common/weeconfig.c:111
 msgid "display WeeChat version at startup"
 msgstr "zobrazí verzi WeeChat při spuštění"
 
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:114
 msgid "WeeChat slogan"
 msgstr "WeeChat slogan"
 
-#: src/common/weeconfig.c:116
+#: src/common/weeconfig.c:115
 msgid "WeeChat slogan (if empty, slogan is not used)"
 msgstr "WeeChat slogan (pokud je prázdné, není slogan použit)"
 
-#: src/common/weeconfig.c:119
+#: src/common/weeconfig.c:118
 msgid ""
 "ISO charset for decoding messages from server (used only if locale is UTF-8)"
 msgstr ""
 "Znaková sada ISO pro dekódování zpráv ze serveru (použito pouze pokud je "
 "lokalizace UTF-8)"
 
-#: src/common/weeconfig.c:120
+#: src/common/weeconfig.c:119
 msgid ""
 "ISO charset for decoding messages from server (used only if locale is UTF-8) "
 "(if empty, messages are not converted if locale is UTF-8"
@@ -3468,7 +3492,7 @@ msgstr ""
 "lokalizace UTF-8) (pokud je prázdná, pak zprávy nejsou konvertovány v "
 "případě lokalizace UTF-8"
 
-#: src/common/weeconfig.c:124
+#: src/common/weeconfig.c:123
 msgid ""
 "UTF charset for decoding messages from server (used only if locale is not "
 "UTF-8)"
@@ -3476,7 +3500,7 @@ msgstr ""
 "Znaková sada UTF pro dekódování zpráv ze serveru (použito pouze pokud není "
 "lokalizace UTF-8)"
 
-#: src/common/weeconfig.c:125
+#: src/common/weeconfig.c:124
 msgid ""
 "UTF charset for decoding messages from server (used only if locale is not "
 "UTF-8) (if empty, messages are not converted if locale is not UTF-8"
@@ -3485,11 +3509,11 @@ msgstr ""
 "lokalizace UTF-8) (pokud je prázndá, pak zprávy nejsou konvertovány v "
 "případě, žě lokalizace není UTF-8"
 
-#: src/common/weeconfig.c:129
+#: src/common/weeconfig.c:128
 msgid "charset for encoding messages sent to server"
 msgstr "znaková sada pro kódování zpráv posílaných na server"
 
-#: src/common/weeconfig.c:130
+#: src/common/weeconfig.c:129
 msgid ""
 "charset for encoding messages sent to server, examples: UFT-8, ISO-8859-1 "
 "(if empty, messages are not converted)"
@@ -3497,13 +3521,13 @@ msgstr ""
 "znaková sada pro kódování zpráv posílaných na server, příklady: UTF-8, ISO-"
 "8859-1 (pokud je prázdná, zprávy nejsou konvertovány)"
 
-#: src/common/weeconfig.c:133
+#: src/common/weeconfig.c:132
 msgid "forces internal WeeChat charset (should be empty in most cases)"
 msgstr ""
 "přebije vnitřní znakovou sadu WeeChat (ve většině případů by mělo být "
 "prázdné)"
 
-#: src/common/weeconfig.c:134
+#: src/common/weeconfig.c:133
 msgid ""
 "forces internal WeeChat charset (should be empty in most cases, that means "
 "detected charset is used)"
@@ -3511,51 +3535,47 @@ msgstr ""
 "přebije vnitřní znakovou sadu WeeChat (ve většině případů by mělo být "
 "přázdné, to znamená použití detekované znakové sady)"
 
-#: src/common/weeconfig.c:137 src/common/weeconfig.c:138
+#: src/common/weeconfig.c:136 src/common/weeconfig.c:137
 msgid "use same buffer for all servers"
 msgstr ""
 
-#: src/common/weeconfig.c:141 src/common/weeconfig.c:142
+#: src/common/weeconfig.c:140 src/common/weeconfig.c:141
 msgid "timestamp for buffers"
 msgstr "�asová známka pro buffer"
 
-#: src/common/weeconfig.c:145 src/common/weeconfig.c:146
+#: src/common/weeconfig.c:144 src/common/weeconfig.c:145
 msgid "display nick names with different colors"
 msgstr "zobrazit přezdívky různými barvami"
 
-#: src/common/weeconfig.c:149 src/common/weeconfig.c:150
+#: src/common/weeconfig.c:148 src/common/weeconfig.c:149
 msgid "number of colors to use for nicks colors"
 msgstr "po�et barev použitých pro barvy přezdívek"
 
-#: src/common/weeconfig.c:153 src/common/weeconfig.c:154
+#: src/common/weeconfig.c:152 src/common/weeconfig.c:153
 msgid "display actions with different colors"
 msgstr "zobrazit akce různými barvami"
 
-#: src/common/weeconfig.c:157 src/common/weeconfig.c:158
-msgid "remove colors from incoming messages"
-msgstr "odstranit barvy z příchozích zpráv"
-
-#: src/common/weeconfig.c:161
+#: src/common/weeconfig.c:156
 msgid "display nicklist window"
 msgstr "zobrazit okno se seznamem přezdívek"
 
-#: src/common/weeconfig.c:162
+#: src/common/weeconfig.c:157
 msgid "display nicklist window (for channel windows)"
 msgstr "zobrazit okno se seznamem přezdívek (pouze pro okno kanálu)"
 
-#: src/common/weeconfig.c:165
+#: src/common/weeconfig.c:160
 msgid "nicklist position"
 msgstr "pozice seznamu přezdívek"
 
-#: src/common/weeconfig.c:166
+#: src/common/weeconfig.c:161
 msgid "nicklist position (top, left, right (default), bottom)"
 msgstr "pozice seznamu přezdívek (top, left, right (výchozí), bottom)"
 
-#: src/common/weeconfig.c:169
+#: src/common/weeconfig.c:164
 msgid "min size for nicklist"
 msgstr "minimální velikost pro seznam přezdívek"
 
-#: src/common/weeconfig.c:170
+#: src/common/weeconfig.c:165
 msgid ""
 "min size for nicklist (width or height, depending on look_nicklist_position "
 "(0 = no min size))"
@@ -3563,11 +3583,11 @@ msgstr ""
 "minimální velikost pro seznam přezdívek (šířka nebo výšhak, závisí na "
 "look_nicklist_position (0 = není minimální velikost))"
 
-#: src/common/weeconfig.c:174
+#: src/common/weeconfig.c:169
 msgid "max size for nicklist"
 msgstr "maximální velikost pro seznam přezdívek"
 
-#: src/common/weeconfig.c:175
+#: src/common/weeconfig.c:170
 msgid ""
 "max size for nicklist (width or height, depending on look_nicklist_position "
 "(0 = no max size; if min == max and > 0, then size is fixed))"
@@ -3576,43 +3596,43 @@ msgstr ""
 "look_nicklist_position (0 = není maximální velikost; jestliže min == max a > "
 "0 pak je velikost fixní ))"
 
-#: src/common/weeconfig.c:179 src/common/weeconfig.c:180
+#: src/common/weeconfig.c:174 src/common/weeconfig.c:175
 msgid "text to display instead of nick when not connected"
 msgstr "text pro zobrazení místo přezdívky pokud není připojeno"
 
-#: src/common/weeconfig.c:183 src/common/weeconfig.c:184
+#: src/common/weeconfig.c:178 src/common/weeconfig.c:179
 msgid "display nick mode ((half)op/voice) before each nick"
 msgstr "zobrazit mód přezdívky ((�áste�ný)op/voice) před každou přezdívkou"
 
-#: src/common/weeconfig.c:187 src/common/weeconfig.c:188
+#: src/common/weeconfig.c:182 src/common/weeconfig.c:183
 msgid "display space if nick mode is not (half)op/voice"
 msgstr "zobrazit mezeru pokud mód přezdívkz není (�áste�ný)op/voice"
 
-#: src/common/weeconfig.c:191 src/common/weeconfig.c:192
+#: src/common/weeconfig.c:186 src/common/weeconfig.c:187
 msgid "the string inserted after nick completion"
 msgstr "řetězec vložený za doplňování přezdívky"
 
-#: src/common/weeconfig.c:195 src/common/weeconfig.c:196
+#: src/common/weeconfig.c:190 src/common/weeconfig.c:191
 msgid "chars ignored for nick completion"
 msgstr ""
 
-#: src/common/weeconfig.c:199 src/common/weeconfig.c:200
+#: src/common/weeconfig.c:194 src/common/weeconfig.c:195
 msgid "enable info bar"
 msgstr "povolit info bar"
 
-#: src/common/weeconfig.c:203 src/common/weeconfig.c:204
+#: src/common/weeconfig.c:198 src/common/weeconfig.c:199
 msgid "timestamp for time in infobar"
 msgstr "�asová zna�ka pro �as v infobaru"
 
-#: src/common/weeconfig.c:207 src/common/weeconfig.c:208
+#: src/common/weeconfig.c:202 src/common/weeconfig.c:203
 msgid "display seconds in infobar time"
 msgstr "zobrazit sekundy v �ase v infobaru"
 
-#: src/common/weeconfig.c:211
+#: src/common/weeconfig.c:206
 msgid "delay (in seconds) for highlight messages in infobar"
 msgstr "podržet (v sekundách) zvýrazněnou zprávu v infobaru"
 
-#: src/common/weeconfig.c:212
+#: src/common/weeconfig.c:207
 msgid ""
 "delay (in seconds) for highlight messages in infobar (0 = disable highlight "
 "notifications in infobar)"
@@ -3620,22 +3640,22 @@ msgstr ""
 "podržet (v sekundách) zvýrazněnou zprávu v infobaru (0 = zakázat zvýrazněnou "
 "notifikaci v infobaru)"
 
-#: src/common/weeconfig.c:216
+#: src/common/weeconfig.c:211
 msgid "max number of names in hotlist"
 msgstr "maximální po�et jmen v hotlistu"
 
-#: src/common/weeconfig.c:217
+#: src/common/weeconfig.c:212
 msgid ""
 "max number of names in hotlist (0 = no name displayed, only buffer numbers)"
 msgstr ""
 "maximální po�et jmen v hotlistu (0 = žádné jméno není zobrazeno, pouze �ísla "
 "bufferů)"
 
-#: src/common/weeconfig.c:220
+#: src/common/weeconfig.c:215
 msgid "level for displaying names in hotlist"
 msgstr "úroveň pro zobrazování jmen v hotlistu"
 
-#: src/common/weeconfig.c:221
+#: src/common/weeconfig.c:216
 msgid ""
 "level for displaying names in hotlist (combination of: 1=join/part, "
 "2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
@@ -3643,316 +3663,316 @@ msgstr ""
 "úroveň pro zobrazování jmen v hotlistu (kombinace: 1=připojení/odpojení "
 "2=zpráva, 4=soukromé, 8=zvýraznění, příklad: 12=soukromé+zvýraznění)"
 
-#: src/common/weeconfig.c:225
+#: src/common/weeconfig.c:220
 msgid "max length of names in hotlist"
 msgstr "maximální délka jmen v hotlistu"
 
-#: src/common/weeconfig.c:226
+#: src/common/weeconfig.c:221
 msgid "max length of names in hotlist (0 = no limit)"
 msgstr "maximální délka jmen v hotlistu (0 = bez limitu)"
 
-#: src/common/weeconfig.c:229 src/common/weeconfig.c:230
+#: src/common/weeconfig.c:224 src/common/weeconfig.c:225
 msgid "display special message when day changes"
 msgstr "zobrazit speiální zprávy při změně dne"
 
-#: src/common/weeconfig.c:233 src/common/weeconfig.c:234
+#: src/common/weeconfig.c:228 src/common/weeconfig.c:229
 msgid "timestamp for date displayed when day changed"
 msgstr "�asová známka pro zobrazení dne při změně dne"
 
-#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
+#: src/common/weeconfig.c:294 src/common/weeconfig.c:295
 msgid "color for title bar"
 msgstr "barva pro title bar"
 
-#: src/common/weeconfig.c:303 src/common/weeconfig.c:304
+#: src/common/weeconfig.c:298 src/common/weeconfig.c:299
 msgid "background for title bar"
 msgstr "pozadí pro title bar"
 
-#: src/common/weeconfig.c:309 src/common/weeconfig.c:310
+#: src/common/weeconfig.c:304 src/common/weeconfig.c:305
 msgid "color for chat text"
 msgstr "barva pro text rozhovoru"
 
-#: src/common/weeconfig.c:313
+#: src/common/weeconfig.c:308
 msgid "color for time"
 msgstr "barva �asu"
 
-#: src/common/weeconfig.c:314
+#: src/common/weeconfig.c:309
 msgid "color for time in chat window"
 msgstr "barva �asu v okně rozhovoru"
 
-#: src/common/weeconfig.c:317
+#: src/common/weeconfig.c:312
 msgid "color for time separator"
 msgstr "barva pro děli� �asu"
 
-#: src/common/weeconfig.c:318
+#: src/common/weeconfig.c:313
 msgid "color for time separator (chat window)"
 msgstr "barva pro děli� �asu (okno rozhovoru)"
 
-#: src/common/weeconfig.c:321 src/common/weeconfig.c:322
+#: src/common/weeconfig.c:316 src/common/weeconfig.c:317
 msgid "color for 1st and 3rd char of prefix"
 msgstr "barva pro první a třetí znak prefixu"
 
-#: src/common/weeconfig.c:325 src/common/weeconfig.c:326
+#: src/common/weeconfig.c:320 src/common/weeconfig.c:321
 msgid "color for middle char of prefix"
 msgstr "barva pro vnitřní znak prefixu"
 
-#: src/common/weeconfig.c:329 src/common/weeconfig.c:330
+#: src/common/weeconfig.c:324 src/common/weeconfig.c:325
 msgid "color for server name"
 msgstr ""
 
-#: src/common/weeconfig.c:333 src/common/weeconfig.c:334
+#: src/common/weeconfig.c:328 src/common/weeconfig.c:329
 msgid "color for join arrow (prefix)"
 msgstr "barva pro Å¡ipku pri 'join' (prefix)"
 
-#: src/common/weeconfig.c:337 src/common/weeconfig.c:338
+#: src/common/weeconfig.c:332 src/common/weeconfig.c:333
 msgid "color for part/quit arrow (prefix)"
 msgstr "barva pro šipku při 'quit'/'part' (prefix)"
 
-#: src/common/weeconfig.c:341
+#: src/common/weeconfig.c:336
 msgid "color for nicks in actions"
 msgstr "barva pro přezdívky v akcích"
 
-#: src/common/weeconfig.c:342
+#: src/common/weeconfig.c:337
 msgid "color for nicks in actions (chat window)"
 msgstr "barva přezdívek v akcích (okno rozhovoru)"
 
-#: src/common/weeconfig.c:345
+#: src/common/weeconfig.c:340
 msgid "color for hostnames"
 msgstr "barva jména hosta"
 
-#: src/common/weeconfig.c:346
+#: src/common/weeconfig.c:341
 msgid "color for hostnames (chat window)"
 msgstr "barva jména hosta (okno rozhovoru)"
 
-#: src/common/weeconfig.c:349
+#: src/common/weeconfig.c:344
 msgid "color for channel names in actions"
 msgstr "barva kanálu v akcích"
 
-#: src/common/weeconfig.c:350
+#: src/common/weeconfig.c:345
 msgid "color for channel names in actions (chat window)"
 msgstr "barva kanálu v akcích (okno rozhovoru)"
 
-#: src/common/weeconfig.c:353
+#: src/common/weeconfig.c:348
 msgid "color for dark separators"
 msgstr "barva pro tmavý děli�"
 
-#: src/common/weeconfig.c:354
+#: src/common/weeconfig.c:349
 msgid "color for dark separators (chat window)"
 msgstr "barva pro tmavý děli� (okno rozhovoru)"
 
-#: src/common/weeconfig.c:357
+#: src/common/weeconfig.c:352
 msgid "color for highlighted nick"
 msgstr "barva pro zvýraznění přezdívky"
 
-#: src/common/weeconfig.c:358
+#: src/common/weeconfig.c:353
 msgid "color for highlighted nick (chat window)"
 msgstr "barva pro zvýraznění přezdívky (okno rozhovoru)"
 
-#: src/common/weeconfig.c:361
+#: src/common/weeconfig.c:356
 msgid "background for chat"
 msgstr "pozadí rozhovoru"
 
-#: src/common/weeconfig.c:362
+#: src/common/weeconfig.c:357
 msgid "background for chat window"
 msgstr "pozadí okna rozhovoru"
 
-#: src/common/weeconfig.c:367 src/common/weeconfig.c:368
+#: src/common/weeconfig.c:362 src/common/weeconfig.c:363
 msgid "color for status bar"
 msgstr "barva status baru"
 
-#: src/common/weeconfig.c:371 src/common/weeconfig.c:372
+#: src/common/weeconfig.c:366 src/common/weeconfig.c:367
 msgid "color for status bar delimiters"
 msgstr "barva děli�ů status barů"
 
-#: src/common/weeconfig.c:375 src/common/weeconfig.c:376
+#: src/common/weeconfig.c:370 src/common/weeconfig.c:371
 msgid "color for current channel in status bar"
 msgstr "barva pro aktuální kanál v stavovém řádku"
 
-#: src/common/weeconfig.c:379
+#: src/common/weeconfig.c:374
 msgid "color for window with new messages"
 msgstr "barva okna s novými zprávami"
 
-#: src/common/weeconfig.c:380
+#: src/common/weeconfig.c:375
 msgid "color for window with new messages (status bar)"
 msgstr "barva okna s novými zprávami (status bar)"
 
-#: src/common/weeconfig.c:383
+#: src/common/weeconfig.c:378
 msgid "color for window with private message"
 msgstr "barva okna se soukroumou zprávou"
 
-#: src/common/weeconfig.c:384
+#: src/common/weeconfig.c:379
 msgid "color for window with private message (status bar)"
 msgstr "barva okna se soukromou zprávou (status bar)"
 
-#: src/common/weeconfig.c:387
+#: src/common/weeconfig.c:382
 msgid "color for window with highlight"
 msgstr "barva okna se zvýrazněním"
 
-#: src/common/weeconfig.c:388
+#: src/common/weeconfig.c:383
 msgid "color for window with highlight (status bar)"
 msgstr "barva okna se zvýrazněním (stavový řádek)"
 
-#: src/common/weeconfig.c:391
+#: src/common/weeconfig.c:386
 msgid "color for window with new data (not messages)"
 msgstr "barva okna s novými daty (ne zprávami)"
 
-#: src/common/weeconfig.c:392
+#: src/common/weeconfig.c:387
 msgid "color for window with new data (not messages) (status bar)"
 msgstr "barva okna s novými daty (ne zprávami) (status bar)"
 
-#: src/common/weeconfig.c:395
+#: src/common/weeconfig.c:390
 msgid "color for \"-MORE-\" text"
 msgstr "barva pro text \"-V�CE-\""
 
-#: src/common/weeconfig.c:396
+#: src/common/weeconfig.c:391
 msgid "color for window with new data (status bar)"
 msgstr "barva okna s novými daty (status bar)"
 
-#: src/common/weeconfig.c:399 src/common/weeconfig.c:400
+#: src/common/weeconfig.c:394 src/common/weeconfig.c:395
 msgid "background for status window"
 msgstr "pozadí stavového okna"
 
-#: src/common/weeconfig.c:405 src/common/weeconfig.c:406
+#: src/common/weeconfig.c:400 src/common/weeconfig.c:401
 msgid "color for info bar text"
 msgstr "barva textu v info baru"
 
-#: src/common/weeconfig.c:409 src/common/weeconfig.c:410
+#: src/common/weeconfig.c:404 src/common/weeconfig.c:405
 msgid "color for infobar delimiters"
 msgstr "barva děli�ů v infobaru"
 
-#: src/common/weeconfig.c:413 src/common/weeconfig.c:414
+#: src/common/weeconfig.c:408 src/common/weeconfig.c:409
 msgid "color for info bar highlight notification"
 msgstr "barva upozornění zvýraznění v info baru"
 
-#: src/common/weeconfig.c:417 src/common/weeconfig.c:418
+#: src/common/weeconfig.c:412 src/common/weeconfig.c:413
 msgid "background for info bar window"
 msgstr "pozadí pro okno info baru"
 
-#: src/common/weeconfig.c:423 src/common/weeconfig.c:424
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
 msgid "color for input text"
 msgstr "barva pro vstupní text"
 
-#: src/common/weeconfig.c:427 src/common/weeconfig.c:428
+#: src/common/weeconfig.c:422 src/common/weeconfig.c:423
 msgid "color for input text (channel name)"
 msgstr "barva vstupního textu (jména kanálů)"
 
-#: src/common/weeconfig.c:431 src/common/weeconfig.c:432
+#: src/common/weeconfig.c:426 src/common/weeconfig.c:427
 msgid "color for input text (nick name)"
 msgstr "barva vstupního textu (přezdívky)"
 
-#: src/common/weeconfig.c:435 src/common/weeconfig.c:436
+#: src/common/weeconfig.c:430 src/common/weeconfig.c:431
 msgid "color for input text (delimiters)"
 msgstr "barva pro vstupní text (děli�e)"
 
-#: src/common/weeconfig.c:439 src/common/weeconfig.c:440
+#: src/common/weeconfig.c:434 src/common/weeconfig.c:435
 msgid "background for input window"
 msgstr "pozadí vstupního okna"
 
-#: src/common/weeconfig.c:445 src/common/weeconfig.c:446
+#: src/common/weeconfig.c:440 src/common/weeconfig.c:441
 msgid "color for nicknames"
 msgstr "barva přezdívek"
 
-#: src/common/weeconfig.c:449 src/common/weeconfig.c:450
+#: src/common/weeconfig.c:444 src/common/weeconfig.c:445
 msgid "color for away nicknames"
 msgstr "barva přezdívek, které jsou pry�"
 
-#: src/common/weeconfig.c:453
+#: src/common/weeconfig.c:448
 msgid "color for chan owner symbol"
 msgstr "barva symbolu majitele kanálu"
 
-#: src/common/weeconfig.c:454
+#: src/common/weeconfig.c:449
 msgid "color for chan owner symbol (specific to unrealircd)"
 msgstr "barva symbolu majitele kanálu (specifický pro unrealircd)"
 
-#: src/common/weeconfig.c:457
+#: src/common/weeconfig.c:452
 msgid "color for chan admin symbol"
 msgstr "barva symbolu administrátora kanálu"
 
-#: src/common/weeconfig.c:458
+#: src/common/weeconfig.c:453
 msgid "color for chan admin symbol (specific to unrealircd)"
 msgstr "barva symbolu administrátora kanálu (specifický pro unrealircd)"
 
-#: src/common/weeconfig.c:461 src/common/weeconfig.c:462
+#: src/common/weeconfig.c:456 src/common/weeconfig.c:457
 msgid "color for operator symbol"
 msgstr "barva symbolu operátora"
 
-#: src/common/weeconfig.c:465 src/common/weeconfig.c:466
+#: src/common/weeconfig.c:460 src/common/weeconfig.c:461
 msgid "color for half-operator symbol"
 msgstr "barva symbolu �áste�ného perátora"
 
-#: src/common/weeconfig.c:469 src/common/weeconfig.c:470
+#: src/common/weeconfig.c:464 src/common/weeconfig.c:465
 msgid "color for voice symbol"
 msgstr "barva symbolu voice"
 
-#: src/common/weeconfig.c:473 src/common/weeconfig.c:474
+#: src/common/weeconfig.c:468 src/common/weeconfig.c:469
 msgid "color for '+' when scrolling nicks"
 msgstr "barva pro '+' při procházení přezdívek"
 
-#: src/common/weeconfig.c:477 src/common/weeconfig.c:478
+#: src/common/weeconfig.c:472 src/common/weeconfig.c:473
 msgid "color for nick separator"
 msgstr "barva děli�e přezdívek"
 
-#: src/common/weeconfig.c:481 src/common/weeconfig.c:482
+#: src/common/weeconfig.c:476 src/common/weeconfig.c:477
 msgid "color for local nick"
 msgstr "barva lokální přezdívky"
 
-#: src/common/weeconfig.c:485 src/common/weeconfig.c:486
-#: src/common/weeconfig.c:489 src/common/weeconfig.c:490
-#: src/common/weeconfig.c:493 src/common/weeconfig.c:494
-#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
-#: src/common/weeconfig.c:501 src/common/weeconfig.c:502
-#: src/common/weeconfig.c:505 src/common/weeconfig.c:506
-#: src/common/weeconfig.c:509 src/common/weeconfig.c:510
-#: src/common/weeconfig.c:513 src/common/weeconfig.c:514
-#: src/common/weeconfig.c:517 src/common/weeconfig.c:518
-#: src/common/weeconfig.c:521 src/common/weeconfig.c:522
+#: src/common/weeconfig.c:480 src/common/weeconfig.c:481
+#: src/common/weeconfig.c:484 src/common/weeconfig.c:485
+#: src/common/weeconfig.c:488 src/common/weeconfig.c:489
+#: src/common/weeconfig.c:492 src/common/weeconfig.c:493
+#: src/common/weeconfig.c:496 src/common/weeconfig.c:497
+#: src/common/weeconfig.c:500 src/common/weeconfig.c:501
+#: src/common/weeconfig.c:504 src/common/weeconfig.c:505
+#: src/common/weeconfig.c:508 src/common/weeconfig.c:509
+#: src/common/weeconfig.c:512 src/common/weeconfig.c:513
+#: src/common/weeconfig.c:516 src/common/weeconfig.c:517
 msgid "color for nick"
 msgstr "barva přezdívky"
 
-#: src/common/weeconfig.c:525 src/common/weeconfig.c:526
+#: src/common/weeconfig.c:520 src/common/weeconfig.c:521
 msgid "color for other nick in private window"
 msgstr "barva jiné přezdívky v soukromém okně"
 
-#: src/common/weeconfig.c:529 src/common/weeconfig.c:530
+#: src/common/weeconfig.c:524 src/common/weeconfig.c:525
 msgid "background for nicknames"
 msgstr "pozadí přezdívek"
 
-#: src/common/weeconfig.c:535
+#: src/common/weeconfig.c:530
 msgid "color for selected DCC"
 msgstr "barva vybraného DCC"
 
-#: src/common/weeconfig.c:536
+#: src/common/weeconfig.c:531
 msgid "color for selected DCC (chat window)"
 msgstr "barva vybraného DCC (okno rozhovoru)"
 
-#: src/common/weeconfig.c:539 src/common/weeconfig.c:540
+#: src/common/weeconfig.c:534 src/common/weeconfig.c:535
 msgid "color for \"waiting\" dcc status"
 msgstr "barva pro \"waiting\" status dcc"
 
-#: src/common/weeconfig.c:543 src/common/weeconfig.c:544
+#: src/common/weeconfig.c:538 src/common/weeconfig.c:539
 msgid "color for \"connecting\" dcc status"
 msgstr "barva pro \"connecting\" status dcc"
 
-#: src/common/weeconfig.c:547 src/common/weeconfig.c:548
+#: src/common/weeconfig.c:542 src/common/weeconfig.c:543
 msgid "color for \"active\" dcc status"
 msgstr "barva pro \"active\" status dcc"
 
-#: src/common/weeconfig.c:551 src/common/weeconfig.c:552
+#: src/common/weeconfig.c:546 src/common/weeconfig.c:547
 msgid "color for \"done\" dcc status"
 msgstr "barva pro \"done\" status dcc"
 
-#: src/common/weeconfig.c:555 src/common/weeconfig.c:556
+#: src/common/weeconfig.c:550 src/common/weeconfig.c:551
 msgid "color for \"failed\" dcc status"
 msgstr "barva pro \"failed\" status dcc"
 
-#: src/common/weeconfig.c:559 src/common/weeconfig.c:560
+#: src/common/weeconfig.c:554 src/common/weeconfig.c:555
 msgid "color for \"aborted\" dcc status"
 msgstr "barva pro \"aborted\" status dcc"
 
-#: src/common/weeconfig.c:573
+#: src/common/weeconfig.c:568
 msgid "max lines in history (per window)"
 msgstr "maximální po�et řádků v historii (pro okno)"
 
-#: src/common/weeconfig.c:574
+#: src/common/weeconfig.c:569
 msgid ""
 "maximum number of lines in history for one server/channel/private window (0 "
 "= unlimited)"
@@ -3960,123 +3980,123 @@ msgstr ""
 "maximální po�et řádků v historii pro jeden server/kanál/soukromé okno (0 = "
 "nekone�eně)"
 
-#: src/common/weeconfig.c:578
+#: src/common/weeconfig.c:573
 msgid "max user commands in history"
 msgstr "maximální po�et uživatelských příkazů v historii"
 
-#: src/common/weeconfig.c:579
+#: src/common/weeconfig.c:574
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr "maximální po�et uživatelských příkazů v historii (0 = nekone�ně)"
 
-#: src/common/weeconfig.c:596 src/common/weeconfig.c:597
+#: src/common/weeconfig.c:591 src/common/weeconfig.c:592
 msgid "automatically log server messages"
 msgstr "automati logovat zprávy server"
 
-#: src/common/weeconfig.c:600 src/common/weeconfig.c:601
+#: src/common/weeconfig.c:595 src/common/weeconfig.c:596
 msgid "automatically log channel chats"
 msgstr "automaticky logovat rozhovory kanálu"
 
-#: src/common/weeconfig.c:604 src/common/weeconfig.c:605
+#: src/common/weeconfig.c:599 src/common/weeconfig.c:600
 msgid "automatically log private chats"
 msgstr "automaticky logovat soukromé rozhovory"
 
-#: src/common/weeconfig.c:608 src/common/weeconfig.c:609
+#: src/common/weeconfig.c:603 src/common/weeconfig.c:604
 msgid "log messages from plugins (scripts)"
 msgstr "logovat zprávy y pluginů (skriptů)"
 
-#: src/common/weeconfig.c:612
+#: src/common/weeconfig.c:607
 msgid "path for log files"
 msgstr "cesta pro soubory logů"
 
-#: src/common/weeconfig.c:613
+#: src/common/weeconfig.c:608
 msgid "path for WeeChat log files"
 msgstr "cesta pro soubory WeeChat logů"
 
-#: src/common/weeconfig.c:616
+#: src/common/weeconfig.c:611
 msgid "timestamp for log"
 msgstr "�asová zna�ka pro log"
 
-#: src/common/weeconfig.c:617
+#: src/common/weeconfig.c:612
 msgid "timestamp for log (see man strftime for date/time specifiers)"
 msgstr "�asová zna�ka pro log (viz man strftime pro specifikaci datumu/�asu"
 
-#: src/common/weeconfig.c:620 src/common/weeconfig.c:621
+#: src/common/weeconfig.c:615 src/common/weeconfig.c:616
 msgid "hide password displayed by nickserv"
 msgstr "schovat heslo zobrazené nickservem"
 
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:639
 msgid "display message to all channels when away"
 msgstr "zobrazit zprávu na všechny kanály, jestliže jsem pry�"
 
-#: src/common/weeconfig.c:643
+#: src/common/weeconfig.c:640
 msgid "display message to all channels when (un)marking as away"
 msgstr "zobrazit zprávu na všechny kanály, když měním stav z/na pry�"
 
-#: src/common/weeconfig.c:646 src/common/weeconfig.c:647
+#: src/common/weeconfig.c:643 src/common/weeconfig.c:644
 msgid "default message when away"
 msgstr "výchozí zprávy, když jsem pry�"
 
-#: src/common/weeconfig.c:650 src/common/weeconfig.c:651
+#: src/common/weeconfig.c:647 src/common/weeconfig.c:648
 msgid "default part message (leaving channel)"
 msgstr "výchozí zpráva při opouštění kanálu"
 
-#: src/common/weeconfig.c:654
+#: src/common/weeconfig.c:651
 msgid "default quit message"
 msgstr "výchzí zpráva při ukno�ení"
 
-#: src/common/weeconfig.c:655
+#: src/common/weeconfig.c:652
 msgid ""
 "default quit message ('%v' will be replaced by WeeChat version in string)"
 msgstr ""
 "výchozí zpráva při ukno�není ('%v' bude nahrazeno verzí WeeChat v řetězci)"
 
-#: src/common/weeconfig.c:658 src/common/weeconfig.c:659
+#: src/common/weeconfig.c:655 src/common/weeconfig.c:656
 msgid "display notices as private messages"
 msgstr "zobrazit upozornění jako soukromé zprávy"
 
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:659
 msgid "interval between two checks for away"
 msgstr "interval mezi dvěmi kontrolami pro nepřítomnost"
 
-#: src/common/weeconfig.c:663
+#: src/common/weeconfig.c:660
 msgid "interval between two checks for away (in minutes, 0 = never check)"
 msgstr ""
 "interval mezi dvěmi knotrolami pro nepřítomnost (v minutách, 0 = nikdy "
 "nekontrolovat)"
 
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:663
 msgid "interval between two checks for lag"
 msgstr "interval mezi dvěmi kontrolami lagu"
 
-#: src/common/weeconfig.c:667
+#: src/common/weeconfig.c:664
 msgid "interval between two checks for lag (in seconds)"
 msgstr "interval mezi dvěmi knotrolami lagu (v sekundách)"
 
-#: src/common/weeconfig.c:670
+#: src/common/weeconfig.c:667
 msgid "minimum lag to show"
 msgstr "minimální lag, který zobrazit"
 
-#: src/common/weeconfig.c:671
+#: src/common/weeconfig.c:668
 msgid "minimum lag to show (in seconds)"
 msgstr "minimální lag, který zobrazit (v sekundách)"
 
-#: src/common/weeconfig.c:674
+#: src/common/weeconfig.c:671
 msgid "disconnect after important lag"
 msgstr "odpojit po závažném lagu"
 
-#: src/common/weeconfig.c:675
+#: src/common/weeconfig.c:672
 msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
 msgstr "odpojit po závažném lagu (v minutách, 0 = nikny neodpojit)"
 
-#: src/common/weeconfig.c:678 src/common/weeconfig.c:679
+#: src/common/weeconfig.c:675 src/common/weeconfig.c:676
 msgid "create a FIFO pipe for remote control"
 msgstr "vytvořit FIFO pro vzdálené ovládání"
 
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:679
 msgid "list of words to highlight"
 msgstr "seznam slov pro zvýraznění"
 
-#: src/common/weeconfig.c:683
+#: src/common/weeconfig.c:680
 #, fuzzy
 msgid ""
 "comma separated list of words to highlight (case insensitive comparison, "
@@ -4084,165 +4104,180 @@ msgid ""
 msgstr ""
 "�árkou oddělený seznam slov pro zvýraznění (neporovnává se velikost písmen)"
 
-#: src/common/weeconfig.c:705
+#: src/common/weeconfig.c:684 src/common/weeconfig.c:685
+#, fuzzy
+msgid "keep colors from incoming messages"
+msgstr "odstranit barvy z příchozích zpráv"
+
+#: src/common/weeconfig.c:688
+msgid "allow user to send colors"
+msgstr ""
+
+#: src/common/weeconfig.c:689
+msgid ""
+"allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %"
+"U=underline, %R=reverse)"
+msgstr ""
+
+#: src/common/weeconfig.c:711
 msgid "automatically accept dcc files"
 msgstr "automaticky akceptovat dcc soubory"
 
-#: src/common/weeconfig.c:706
+#: src/common/weeconfig.c:712
 msgid "automatically accept incoming dcc files"
 msgstr "automaticky akceptovat příchozí dcc soubory"
 
-#: src/common/weeconfig.c:709
+#: src/common/weeconfig.c:715
 msgid "automatically accept dcc chats"
 msgstr "automaticky akceptovat dcc rozhovor"
 
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:716
 msgid "automatically accept dcc chats (use carefully!)"
 msgstr "automaticky akceptovat dcc rozhovor (používejte opatrně!)"
 
-#: src/common/weeconfig.c:713
+#: src/common/weeconfig.c:719
 msgid "timeout for dcc request"
 msgstr "�asový limit pro dcc požadavek"
 
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:720
 msgid "timeout for dcc request (in seconds)"
 msgstr "�asový limit pro dcc požadavek (v sekundách)"
 
-#: src/common/weeconfig.c:717
+#: src/common/weeconfig.c:723
 msgid "block size for dcc packets"
 msgstr "velikost bloku pro dcc pakety"
 
-#: src/common/weeconfig.c:718
+#: src/common/weeconfig.c:724
 msgid "block size for dcc packets in bytes (default: 65536)"
 msgstr "velikost bloku pro dcc pakety v bajtech (výchozí: 65536)"
 
-#: src/common/weeconfig.c:721
+#: src/common/weeconfig.c:727
 msgid "allowed ports for outgoing dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:728
 msgid ""
 "restricts outgoing dcc to use only ports in the given range (useful for NAT) "
 "(syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, empty value "
 "means any port)"
 msgstr ""
 
-#: src/common/weeconfig.c:727
+#: src/common/weeconfig.c:733
 msgid "IP address for outgoing dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:728
+#: src/common/weeconfig.c:734
 msgid ""
 "IP or DNS address used for outgoing dcc (if empty, local interface IP is "
 "used)"
 msgstr ""
 
-#: src/common/weeconfig.c:732
+#: src/common/weeconfig.c:738
 msgid "path for incoming files with dcc"
 msgstr "cesta pro příchozí dcc soubory"
 
-#: src/common/weeconfig.c:733
+#: src/common/weeconfig.c:739
 msgid "path for writing incoming files with dcc (default: user home)"
 msgstr "cesta pro zápis příchozích dcc souborů (výchozí: uživatelův domov)"
 
-#: src/common/weeconfig.c:736
+#: src/common/weeconfig.c:742
 msgid "default path for sending files with dcc"
 msgstr "výchozí cesta pro odesílaní souborů pomocí dcc"
 
-#: src/common/weeconfig.c:737
+#: src/common/weeconfig.c:743
 msgid ""
 "path for reading files when sending thru dcc (when no path is specified)"
 msgstr ""
 "cesta pro �tení souborů při odesílání přes dcc (když není specifikována "
 "cesta)"
 
-#: src/common/weeconfig.c:740 src/common/weeconfig.c:741
+#: src/common/weeconfig.c:746 src/common/weeconfig.c:747
 msgid "convert spaces to underscores when sending files"
 msgstr "konvertovat mezery na podtržítka při odesílání souborů"
 
-#: src/common/weeconfig.c:744
+#: src/common/weeconfig.c:750
 msgid "automatically rename dcc files if already exists"
 msgstr "automaticky přejmenovat dcc soubory, jestliže již existují"
 
-#: src/common/weeconfig.c:745
+#: src/common/weeconfig.c:751
 msgid "rename incoming files if already exists (add '.1', '.2', ...)"
 msgstr ""
 "přejmenovat příchozí soubory, jestliže již existují (přídat '.1', '.2', ...)"
 
-#: src/common/weeconfig.c:748
+#: src/common/weeconfig.c:754
 msgid "automatically resume aborted transfers"
 msgstr "automaticky obnovit zrušený přenos"
 
-#: src/common/weeconfig.c:749
+#: src/common/weeconfig.c:755
 msgid ""
 "automatically resume dcc transfer if connection with remote host is loosed"
 msgstr "automaticky obnovit dcc přenos pokud bylo ztraceno spojení s hostem"
 
-#: src/common/weeconfig.c:768
+#: src/common/weeconfig.c:774
 msgid "use proxy"
 msgstr "použít proxy"
 
-#: src/common/weeconfig.c:769
+#: src/common/weeconfig.c:775
 msgid "use a proxy server to connect to irc server"
 msgstr "použít proxy server pro připojení na irc server"
 
-#: src/common/weeconfig.c:772
+#: src/common/weeconfig.c:778
 msgid "proxy type"
 msgstr "typ proxy"
 
-#: src/common/weeconfig.c:773
+#: src/common/weeconfig.c:779
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "typ proxy (http (výchozí), socks4, socks5)"
 
-#: src/common/weeconfig.c:776
+#: src/common/weeconfig.c:782
 msgid "use ipv6 proxy"
 msgstr "použít ipv6 proxy"
 
-#: src/common/weeconfig.c:777
+#: src/common/weeconfig.c:783
 msgid "connect to proxy in ipv6"
 msgstr "připojit na proxy v ipv6"
 
-#: src/common/weeconfig.c:780
+#: src/common/weeconfig.c:786
 msgid "proxy address"
 msgstr "proxy adresa"
 
-#: src/common/weeconfig.c:781
+#: src/common/weeconfig.c:787
 msgid "proxy server address (IP or hostname)"
 msgstr "adresa proxy serveru (IP nebo jméno hosta)"
 
-#: src/common/weeconfig.c:784
+#: src/common/weeconfig.c:790
 msgid "port for proxy"
 msgstr "port proxy"
 
-#: src/common/weeconfig.c:785
+#: src/common/weeconfig.c:791
 msgid "port for connecting to proxy server"
 msgstr "port pro připojení na proxy server"
 
-#: src/common/weeconfig.c:788
+#: src/common/weeconfig.c:794
 msgid "proxy username"
 msgstr "uživatelské jeméno proxy"
 
-#: src/common/weeconfig.c:789
+#: src/common/weeconfig.c:795
 msgid "username for proxy server"
 msgstr "uživatelské jméno pro proxy server"
 
-#: src/common/weeconfig.c:792
+#: src/common/weeconfig.c:798
 msgid "proxy password"
 msgstr "heslo proxy"
 
-#: src/common/weeconfig.c:793
+#: src/common/weeconfig.c:799
 msgid "password for proxy server"
 msgstr "heslo pro proxy server"
 
-#: src/common/weeconfig.c:806 src/common/weeconfig.c:807
+#: src/common/weeconfig.c:812 src/common/weeconfig.c:813
 msgid "path for searching plugins"
 msgstr "cesta pro hledání pluginů"
 
-#: src/common/weeconfig.c:810
+#: src/common/weeconfig.c:816
 msgid "list of plugins to load automatically"
 msgstr "seznam pluginů pro automatické na�tení"
 
-#: src/common/weeconfig.c:811
+#: src/common/weeconfig.c:817
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found (names may be partial, for example \"perl\" is ok "
@@ -4252,11 +4287,11 @@ msgstr ""
 "znamená všechny nalezené pluginy (jména mohou být �áste�ná, například \"perl"
 "\" je OK pro \"libperl.so\")"
 
-#: src/common/weeconfig.c:816
+#: src/common/weeconfig.c:822
 msgid "standard plugins extension in filename"
 msgstr "standardní přípona pluginů v jménu souboru"
 
-#: src/common/weeconfig.c:817
+#: src/common/weeconfig.c:823
 msgid ""
 "standard plugins extension in filename, used for autoload (if empty, then "
 "all files are loaded when autoload is \"*\")"
@@ -4264,93 +4299,93 @@ msgstr ""
 "standardní přípona pluginů v jménu soubor, použita při autona�ítání (pokud "
 "prázdná jsou na�teny všechny souboru pokud je autoload \"*\")"
 
-#: src/common/weeconfig.c:834
+#: src/common/weeconfig.c:840
 msgid "server name"
 msgstr "jméno serveru"
 
-#: src/common/weeconfig.c:835
+#: src/common/weeconfig.c:841
 msgid "name associated to IRC server (for display only)"
 msgstr "jméno asociované k IRC serveru (pouze pro zobrazení)"
 
-#: src/common/weeconfig.c:838
+#: src/common/weeconfig.c:844
 msgid "automatically connect to server"
 msgstr "automaticky připojit k serveru"
 
-#: src/common/weeconfig.c:839
+#: src/common/weeconfig.c:845
 msgid "automatically connect to server when WeeChat is starting"
 msgstr "automaticky připojit k serveru, když je WeeChat spouštěn"
 
-#: src/common/weeconfig.c:842
+#: src/common/weeconfig.c:848
 msgid "automatically reconnect to server"
 msgstr "automaticky znovupřipojit server"
 
-#: src/common/weeconfig.c:843
+#: src/common/weeconfig.c:849
 msgid "automatically reconnect to server when disconnected"
 msgstr "automaticky znovu připojit server, když je odpojen"
 
-#: src/common/weeconfig.c:846
+#: src/common/weeconfig.c:852
 msgid "delay before trying again to reconnect"
 msgstr "doba před novým zkušením znovupřipojení"
 
-#: src/common/weeconfig.c:847
+#: src/common/weeconfig.c:853
 msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr "doba (v sekundách) před novým zkušením znovupřipojení na server"
 
-#: src/common/weeconfig.c:850
+#: src/common/weeconfig.c:856
 msgid "server address or hostname"
 msgstr "adresa serveru nebo jméno hosta"
 
-#: src/common/weeconfig.c:851
+#: src/common/weeconfig.c:857
 msgid "IP address or hostname of IRC server"
 msgstr "IP adresa nebo jeméno hosta IRC serveru"
 
-#: src/common/weeconfig.c:854
+#: src/common/weeconfig.c:860
 msgid "port for IRC server"
 msgstr "port IRC serveru"
 
-#: src/common/weeconfig.c:855
+#: src/common/weeconfig.c:861
 msgid "port for connecting to server"
 msgstr "port pro připojení na server"
 
-#: src/common/weeconfig.c:858 src/common/weeconfig.c:859
+#: src/common/weeconfig.c:864 src/common/weeconfig.c:865
 msgid "use IPv6 protocol for server communication"
 msgstr "použít protokol IPv6 pro komunikaci se serverem"
 
-#: src/common/weeconfig.c:862 src/common/weeconfig.c:863
+#: src/common/weeconfig.c:868 src/common/weeconfig.c:869
 msgid "use SSL for server communication"
 msgstr "použít SSL pro komunikaci se serverem"
 
-#: src/common/weeconfig.c:866
+#: src/common/weeconfig.c:872
 msgid "server password"
 msgstr "heslo serveru"
 
-#: src/common/weeconfig.c:867
+#: src/common/weeconfig.c:873
 msgid "password for IRC server"
 msgstr "heslo pro IRC server"
 
-#: src/common/weeconfig.c:870
+#: src/common/weeconfig.c:876
 msgid "nickname for server"
 msgstr "přezdívka pro server"
 
-#: src/common/weeconfig.c:871
+#: src/common/weeconfig.c:877
 msgid "nickname to use on IRC server"
 msgstr "přezdívka použitá na IRC serveru"
 
-#: src/common/weeconfig.c:874
+#: src/common/weeconfig.c:880
 msgid "alternate nickname for server"
 msgstr "alternativní přezdívka pro server"
 
-#: src/common/weeconfig.c:875
+#: src/common/weeconfig.c:881
 msgid "alternate nickname to use on IRC server (if nickname is already used)"
 msgstr ""
 "alternativní přezdívka použitá na IRC serveru (pokud přezdívka je již "
 "použita)"
 
-#: src/common/weeconfig.c:878
+#: src/common/weeconfig.c:884
 msgid "2nd alternate nickname for server"
 msgstr "druhá alternativní přezdívka pro server"
 
-#: src/common/weeconfig.c:879
+#: src/common/weeconfig.c:885
 msgid ""
 "2nd alternate nickname to use on IRC server (if alternate nickname is "
 "already used)"
@@ -4358,31 +4393,31 @@ msgstr ""
 "druhá alternativní přezdívka použitá na IRC serveru (pokud alternativní "
 "přezdívka je již použita)"
 
-#: src/common/weeconfig.c:882
+#: src/common/weeconfig.c:888
 msgid "user name for server"
 msgstr "uživatelské jméno pro server"
 
-#: src/common/weeconfig.c:883
+#: src/common/weeconfig.c:889
 msgid "user name to use on IRC server"
 msgstr "uživatelské jméno použité na IRC serveru"
 
-#: src/common/weeconfig.c:886
+#: src/common/weeconfig.c:892
 msgid "real name for server"
 msgstr "skute�né jméno pro server"
 
-#: src/common/weeconfig.c:887
+#: src/common/weeconfig.c:893
 msgid "real name to use on IRC server"
 msgstr "skute�né jméno použité na IRC serveru"
 
-#: src/common/weeconfig.c:890 src/common/weeconfig.c:891
+#: src/common/weeconfig.c:896 src/common/weeconfig.c:897
 msgid "first command to run when connected to server"
 msgstr "první příkaz, který zpustit po připojení na server"
 
-#: src/common/weeconfig.c:894
+#: src/common/weeconfig.c:900
 msgid "delay (in seconds) after command was executed"
 msgstr "po�kání (v sekundách) po spušt�ní příkazu"
 
-#: src/common/weeconfig.c:895
+#: src/common/weeconfig.c:901
 msgid ""
 "delay (in seconds) after command was executed (example: give some time for "
 "authentication)"
@@ -4390,11 +4425,11 @@ msgstr ""
 "po�kání (v sekundách) po spuštění příkazu (například: dád nějaký �as pro "
 "autorizaci)"
 
-#: src/common/weeconfig.c:898
+#: src/common/weeconfig.c:904
 msgid "list of channels to join when connected to server"
 msgstr "seznam kanálů na které přistoupit po připojení na server"
 
-#: src/common/weeconfig.c:899
+#: src/common/weeconfig.c:905
 msgid ""
 "comma separated list of channels to join when connected to server (example: "
 "\"#chan1,#chan2,#chan3 key1,key2\")"
@@ -4402,15 +4437,15 @@ msgstr ""
 "�árkou rozdělený seznam kanálů na které přistoupit po připojení na server "
 "(příklad: \"#kanál1,#kanál2,#kanál3 klí�1,klí�2\")"
 
-#: src/common/weeconfig.c:902 src/common/weeconfig.c:903
+#: src/common/weeconfig.c:908 src/common/weeconfig.c:909
 msgid "automatically rejoin channels when kicked"
 msgstr "automaticky znovu přijít na kanál po vykopnutí"
 
-#: src/common/weeconfig.c:906
+#: src/common/weeconfig.c:912
 msgid "notify levels for channels of this server"
 msgstr "level upozornění pro kanály na tomto serveru"
 
-#: src/common/weeconfig.c:907
+#: src/common/weeconfig.c:913
 msgid ""
 "comma separated list of notify levels for channels of this server (format: "
 "#channel:1,..)"
@@ -4418,62 +4453,62 @@ msgstr ""
 "�árkou oddělený seznam levelů upozornění pro kanály na tomto serveru "
 "(formát: #kanál:1,..)"
 
-#: src/common/weeconfig.c:1463
+#: src/common/weeconfig.c:1469
 #, c-format
 msgid "%s %s, line %d: new server, but previous was incomplete\n"
 msgstr "%s %s, řádek %d: nový server, ale předchozí byl nekompletní\n"
 
-#: src/common/weeconfig.c:1472
+#: src/common/weeconfig.c:1478
 #, c-format
 msgid "%s %s, line %d: server '%s' already exists\n"
 msgstr "%s %s, řádek %d: server '%s' již existuje\n"
 
-#: src/common/weeconfig.c:1487
+#: src/common/weeconfig.c:1493
 #, c-format
 msgid "%s %s, line %d: unable to create server\n"
 msgstr "%s %s, řádek %d: nemohu vytvořit server\n"
 
-#: src/common/weeconfig.c:1527
+#: src/common/weeconfig.c:1533
 #, c-format
 msgid "%s unable to assign default int with string (\"%s\")\n"
 msgstr "%s nemohu přiřadit výchozí �íslo s řetězcem (\"%s\")\n"
 
-#: src/common/weeconfig.c:1538
+#: src/common/weeconfig.c:1544
 #, c-format
 msgid "%s unable to assign default color (\"%s\")\n"
 msgstr "%s nemohu přiřadit výchozí barvu (\"%s\")\n"
 
-#: src/common/weeconfig.c:1578
+#: src/common/weeconfig.c:1584
 #, c-format
 msgid "%s config file \"%s\" not found.\n"
 msgstr "%s konfigura�ní soubor \"%s\" nenalezen\n"
 
-#: src/common/weeconfig.c:1610
+#: src/common/weeconfig.c:1616
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
 msgstr "%s %s, řádek %d: nevalidní syntaxe, chybí \"]\"\n"
 
-#: src/common/weeconfig.c:1627
+#: src/common/weeconfig.c:1633
 #, c-format
 msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
 msgstr "%s %s, řádek %d: neznámý identifikátor sekce (\"%s\")\n"
 
-#: src/common/weeconfig.c:1645
+#: src/common/weeconfig.c:1651
 #, c-format
 msgid "%s %s, line %d: invalid section for option, line is ignored\n"
 msgstr "%s %s, řádek %d: nevalidní sekce pro volbu, řádek je ignorován\n"
 
-#: src/common/weeconfig.c:1690 src/common/weeconfig.c:1716
+#: src/common/weeconfig.c:1696 src/common/weeconfig.c:1722
 #, c-format
 msgid "%s %s, line %d: invalid option \"%s\"\n"
 msgstr "%s %s, řádek %d: nevalidní volba \"%s\"\n"
 
-#: src/common/weeconfig.c:1696
+#: src/common/weeconfig.c:1702
 #, c-format
 msgid "%s %s, line %d: invalid ignore options \"%s\"\n"
 msgstr "%s %s, řádek %d: nevalidní volba \"%s\" pro ignorování\n"
 
-#: src/common/weeconfig.c:1727
+#: src/common/weeconfig.c:1733
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value foroption '%s'\n"
@@ -4482,7 +4517,7 @@ msgstr ""
 "%s %s, řádek %d: nevalidní hodnota pro volbu '%s'\n"
 "O�ekáváno: hodnota boolean: 'off' nebo 'on'\n"
 
-#: src/common/weeconfig.c:1736
+#: src/common/weeconfig.c:1742
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4491,7 +4526,7 @@ msgstr ""
 "%s %s, řádek %d: nevalidní hodnota pro volbu '%s'\n"
 "O�ekáváno: celé �íslo mezi %d a %d\n"
 
-#: src/common/weeconfig.c:1747
+#: src/common/weeconfig.c:1753
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4500,21 +4535,21 @@ msgstr ""
 "%s %s, řádek %d: nevalidní hodnota pro volbu '%s'\n"
 "O�ekáváno: jeden z těchto řetězců: "
 
-#: src/common/weeconfig.c:1763
+#: src/common/weeconfig.c:1769
 #, c-format
 msgid "%s %s, line %d: invalid color name for option '%s'\n"
 msgstr "%s %s, řádek %d: nevalidní jméno barvy pro hodnotu '%s'\n"
 
-#: src/common/weeconfig.c:1832
+#: src/common/weeconfig.c:1838
 #, c-format
 msgid "%s: creating default config file...\n"
 msgstr "%s: vytvářím výchozí konfigura�ní soubor...\n"
 
-#: src/common/weeconfig.c:1833
+#: src/common/weeconfig.c:1839
 msgid "Creating default config file\n"
 msgstr "Vytvářím výchozí konfigura�ní soubor\n"
 
-#: src/common/weeconfig.c:1836 src/common/weeconfig.c:2033
+#: src/common/weeconfig.c:1842 src/common/weeconfig.c:2039
 #, c-format
 msgid ""
 "#\n"
@@ -4523,7 +4558,7 @@ msgstr ""
 "#\n"
 "# %s konfigura�ní soubor, vytvořil %s v%s %s"
 
-#: src/common/weeconfig.c:1840 src/common/weeconfig.c:2037
+#: src/common/weeconfig.c:1846 src/common/weeconfig.c:2043
 #, c-format
 msgid ""
 "# WARNING! Be careful when editing this file, WeeChat writes this file when "
@@ -4531,9 +4566,132 @@ msgid ""
 "#\n"
 msgstr ""
 
-#: src/common/weeconfig.c:2030
+#: src/common/weeconfig.c:2036
 msgid "Saving config to disk\n"
 msgstr "Ukládám konfiguraci na disk\n"
 
+#~ msgid "%s Command '%s' failed!\n"
+#~ msgstr "%s Příkaz '%s' selhal!\n"
+
+#~ msgid "by"
+#~ msgstr "od"
+
+#~ msgid " has joined "
+#~ msgstr " se připojil "
+
+#~ msgid " has kicked "
+#~ msgstr " byl vykopnut "
+
+#~ msgid " has killed "
+#~ msgstr " byl zabit "
+
+#~ msgid " from server"
+#~ msgstr " ze serveru"
+
+#~ msgid " from server\n"
+#~ msgstr " ze serveru\n"
+
+#~ msgid "mode changed by"
+#~ msgstr "mód změnil"
+
+#~ msgid "You are "
+#~ msgstr "Jsi "
+
+#~ msgid " is "
+#~ msgstr " je "
+
+#~ msgid "reply from"
+#~ msgstr "odpověd od"
+
+#~ msgid ": %ld.%ld seconds\n"
+#~ msgstr ": %ld %ld sekund\n"
+
+#~ msgid " has left "
+#~ msgstr " opustil "
+
+#~ msgid "received from"
+#~ msgstr "obdrženo od"
+
+#~ msgid "Unknown CTCP "
+#~ msgstr "Neznámé CTCP "
+
+#~ msgid "has quit"
+#~ msgstr "ukon�il"
+
+#~ msgid " to: \"%s\"\n"
+#~ msgstr " pro: \"%s\"\n"
+
+#~ msgid "User mode"
+#~ msgstr "Uživatelský mód"
+
+#~ msgid "idle: "
+#~ msgstr "ne�inný: "
+
+#~ msgid "signon at: "
+#~ msgstr "připojen: "
+
+#~ msgid "Channels: "
+#~ msgstr "Kanály: "
+
+#~ msgid "Topic for "
+#~ msgstr "Téma pro "
+
+#~ msgid " is: \"%s\"\n"
+#~ msgstr " je: \"%s\"\n"
+
+#~ msgid "has invited"
+#~ msgstr "pozval"
+
+#~ msgid "exception"
+#~ msgstr "vyjímka"
+
+#~ msgid "Nicks "
+#~ msgstr "Přezdívky "
+
+#~ msgid "Channel "
+#~ msgstr "Kanál "
+
+#~ msgid "banned by"
+#~ msgstr "zakázán"
+
+#~ msgid ": ok!\n"
+#~ msgstr ": ok!\n"
+
+#~ msgid "Connected to "
+#~ msgstr "Připojen k "
+
+#~ msgid "via DCC chat\n"
+#~ msgstr "přes DCC rozhovor\n"
+
+#~ msgid "resumed at position %u\n"
+#~ msgstr "obnoveno na pozici %u\n"
+
+#~ msgid "Incoming DCC file from "
+#~ msgstr "Příchozí DCC soubor od "
+
+#~ msgid " bytes\n"
+#~ msgstr " bajtů\n"
+
+#~ msgid "Sending DCC file to "
+#~ msgstr "Posílám DCC soubor k "
+
+#~ msgid "Not enough memory for new message\n"
+#~ msgstr "Nedostatek paměti pro novou zprávu\n"
+
+#~ msgid "Channel: "
+#~ msgstr "Kanál: "
+
+#~ msgid " (server: "
+#~ msgstr " (server: "
+
+#~ msgid "Private with: "
+#~ msgstr "Soukromý s: "
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "created\n"
+#~ msgstr "vytvořeno\n"
+
 #~ msgid "-servers-"
 #~ msgstr "-serverů-"
diff --git a/weechat/po/es.po b/weechat/po/es.po
index 94fd0bb76..7b1b92b7c 100644
--- a/weechat/po/es.po
+++ b/weechat/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.6-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-10-30 10:52+0100\n"
+"POT-Creation-Date: 2005-11-04 12:35+0100\n"
 "PO-Revision-Date: 2005-10-30 10:53+0100\n"
 "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -20,88 +20,88 @@ msgstr ""
 msgid "%s cannot allocate new nick\n"
 msgstr "%s no ha sido posible crear un nuevo nick\n"
 
-#: src/irc/irc-server.c:180 src/common/weeconfig.c:1968
+#: src/irc/irc-server.c:181 src/common/weeconfig.c:1974
 msgid "Unable to get user's name"
 msgstr "No ha sido posible obtener el nombre de usuario"
 
-#: src/irc/irc-server.c:248
+#: src/irc/irc-server.c:249
 #, c-format
 msgid "%s cannot allocate new server\n"
 msgstr "%s no ha sido posible crear un nuevo servidor\n"
 
-#: src/irc/irc-server.c:466
+#: src/irc/irc-server.c:467
 #, c-format
 msgid "%s error sending data to IRC server\n"
 msgstr "%s error enviando datos al servidor IRC\n"
 
-#: src/irc/irc-server.c:489 src/irc/irc-server.c:502 src/irc/irc-server.c:549
-#: src/irc/irc-server.c:562
+#: src/irc/irc-server.c:490 src/irc/irc-server.c:503 src/irc/irc-server.c:550
+#: src/irc/irc-server.c:563
 #, c-format
 msgid "%s not enough memory for received IRC message\n"
 msgstr "%s memoria insuficiente para un mensaje IRC recibido\n"
 
-#: src/irc/irc-server.c:674
-#, c-format
-msgid "%s Command '%s' failed!\n"
-msgstr "%s ¡Ha fallado el comando '%s' !\n"
+#: src/irc/irc-server.c:675
+#, fuzzy, c-format
+msgid "%s Command \"%s\" failed!\n"
+msgstr "%s el comando \"%s\" ha fallado\n"
 
-#: src/irc/irc-server.c:680
+#: src/irc/irc-server.c:681
 #, c-format
 msgid "%s No command to execute!\n"
 msgstr "%s ¡Ningún comando para ejecutar!\n"
 
-#: src/irc/irc-server.c:686
-#, c-format
-msgid "%s Unknown command: cmd=%s, host=%s, args=%s\n"
+#: src/irc/irc-server.c:687
+#, fuzzy, c-format
+msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
 msgstr "%s Comando desconocido: cmd=%s, host=%s, params=%s\n"
 
-#: src/irc/irc-server.c:737
+#: src/irc/irc-server.c:738
 #, c-format
 msgid "%s cannot read data from socket, disconnecting from server...\n"
 msgstr ""
 "%s no ha sido posible leer datos del socket, desconectando del servidor...\n"
 
-#: src/irc/irc-server.c:820
+#: src/irc/irc-server.c:821
 #, c-format
 msgid "%s: Reconnecting to server in %d seconds\n"
 msgstr "%s: Reconexión al servidor en %d segundos\n"
 
-#: src/irc/irc-server.c:854
+#: src/irc/irc-server.c:855
 #, c-format
 msgid "%s gnutls handshake failed\n"
 msgstr "%s el apretón de manos gnutls ha fallado\n"
 
-#: src/irc/irc-server.c:871
+#: src/irc/irc-server.c:872
 #, c-format
 msgid "%s proxy address \"%s\" not found\n"
 msgstr "%s dirección proxy \"%s\" no encontrada\n"
 
-#: src/irc/irc-server.c:875
+#: src/irc/irc-server.c:876
 #, c-format
 msgid "%s address \"%s\" not found\n"
 msgstr "%s dirección \"%s\" no encontrada\n"
 
-#: src/irc/irc-server.c:885
+#: src/irc/irc-server.c:886
 #, c-format
 msgid "%s proxy IP address not found\n"
 msgstr "%s dirección proxy IP no encontrada\n"
 
-#: src/irc/irc-server.c:888
+#: src/irc/irc-server.c:889
 #, c-format
 msgid "%s IP address not found\n"
 msgstr "%s Dirección IP no encontrada\n"
 
-#: src/irc/irc-server.c:897
+#: src/irc/irc-server.c:898
 #, c-format
 msgid "%s proxy connection refused\n"
 msgstr "%s conexión proxy rechazada\n"
 
-#: src/irc/irc-server.c:900
+#: src/irc/irc-server.c:901
 #, c-format
 msgid "%s connection refused\n"
 msgstr "%s conexión rechazada\n"
 
-#: src/irc/irc-server.c:908
+#: src/irc/irc-server.c:909
 #, c-format
 msgid ""
 "%s proxy fails to establish connection to server (check username/password if "
@@ -110,7 +110,7 @@ msgstr ""
 "%s el proxy ha fallado al establecer la conexión al servidor (comprueba el "
 "nombre de usuario o la contraseña si es necesario)\n"
 
-#: src/irc/irc-server.c:1387
+#: src/irc/irc-server.c:1388
 #, c-format
 msgid ""
 "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -118,57 +118,57 @@ msgstr ""
 "%s No ha sido posible conectar con SSL debido a que Weechat no fue compilado "
 "con soporte GNUtls\n"
 
-#: src/irc/irc-server.c:1396
+#: src/irc/irc-server.c:1397
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr "%s: conectando al servidor %s:%d%s%s vía %s proxy %s: %d%s...\n"
 
-#: src/irc/irc-server.c:1402
+#: src/irc/irc-server.c:1403
 #, c-format
 msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr "Conectando al servidor %s:%d%s%s vía %s proxy %s:%d%s...\n"
 
-#: src/irc/irc-server.c:1412
+#: src/irc/irc-server.c:1413
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s...\n"
 msgstr "%s: conectando al servidor %s:%d%s%s...\n"
 
-#: src/irc/irc-server.c:1416
+#: src/irc/irc-server.c:1417
 #, c-format
 msgid "Connecting to server %s:%d%s%s...\n"
 msgstr "Conectando al servidor %s:%d%s%s...\n"
 
-#: src/irc/irc-server.c:1434
+#: src/irc/irc-server.c:1435
 #, c-format
 msgid "%s gnutls init error\n"
 msgstr "%s error de inicialización de gnutls\n"
 
-#: src/irc/irc-server.c:1449
+#: src/irc/irc-server.c:1450
 #, c-format
 msgid "%s cannot create pipe\n"
 msgstr "%s no ha sido posible crear la interconexión\n"
 
-#: src/irc/irc-server.c:1464
+#: src/irc/irc-server.c:1465
 #, c-format
 msgid "%s cannot create socket\n"
 msgstr "%s no ha sido posible crear el socket\n"
 
-#: src/irc/irc-server.c:1475
+#: src/irc/irc-server.c:1476
 #, c-format
 msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
 msgstr "%s no ha sido posible configurar la opción socket \"SO_REUSEADDR\"\n"
 
-#: src/irc/irc-server.c:1486
+#: src/irc/irc-server.c:1487
 #, c-format
 msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
 msgstr "%s no ha sido posible configurar la opción socket \"SO_KEEPALIVE\"\n"
 
-#: src/irc/irc-server.c:1517
+#: src/irc/irc-server.c:1518
 #, c-format
 msgid "%s: Reconnecting to server...\n"
 msgstr "%s: Reconectando al servidor...\n"
 
-#: src/irc/irc-server.c:1567 src/irc/irc-server.c:1576
+#: src/irc/irc-server.c:1568 src/irc/irc-server.c:1577
 msgid "Disconnected from server!\n"
 msgstr "¡Desconectado del servidor!\n"
 
@@ -968,7 +968,7 @@ msgstr ""
 #: src/irc/irc-commands.c:380 src/irc/irc-commands.c:381
 #: src/irc/irc-commands.c:382 src/irc/irc-commands.c:383
 #: src/irc/irc-commands.c:384 src/irc/irc-commands.c:385
-#: src/irc/irc-commands.c:490
+#: src/irc/irc-commands.c:491
 msgid "a server message"
 msgstr "un mensaje de servidor"
 
@@ -1149,244 +1149,249 @@ msgid "you are now an IRC operator"
 msgstr ""
 
 #: src/irc/irc-commands.c:387
+msgid "rehashing"
+msgstr ""
+
+#: src/irc/irc-commands.c:388
 msgid "server local time"
 msgstr "hora local del servidor"
 
-#: src/irc/irc-commands.c:388
+#: src/irc/irc-commands.c:389
 msgid "no such nick/channel"
 msgstr "no existe ese usuario/canal"
 
-#: src/irc/irc-commands.c:390
+#: src/irc/irc-commands.c:391
 msgid "no such server"
 msgstr "no existe ese servidor"
 
-#: src/irc/irc-commands.c:392
+#: src/irc/irc-commands.c:393
 msgid "no such channel"
 msgstr "no existe ese canal"
 
-#: src/irc/irc-commands.c:394
+#: src/irc/irc-commands.c:395
 msgid "cannot send to channel"
 msgstr "no ha sido posible enviar al canal"
 
-#: src/irc/irc-commands.c:396
+#: src/irc/irc-commands.c:397
 msgid "too many channels"
 msgstr "demasiados canales"
 
-#: src/irc/irc-commands.c:398 src/irc/irc-commands.c:400
+#: src/irc/irc-commands.c:399 src/irc/irc-commands.c:401
 msgid "was no such nick"
 msgstr "no estaba ese usuario"
 
-#: src/irc/irc-commands.c:402
+#: src/irc/irc-commands.c:403
 msgid "no origin"
 msgstr "sin origen"
 
-#: src/irc/irc-commands.c:404
+#: src/irc/irc-commands.c:405
 msgid "no services"
 msgstr "sin servicios"
 
-#: src/irc/irc-commands.c:406
+#: src/irc/irc-commands.c:407
 msgid "no recipient"
 msgstr "sin destinatario"
 
-#: src/irc/irc-commands.c:408
+#: src/irc/irc-commands.c:409
 msgid "no text to send"
 msgstr "sin texto a enviar"
 
-#: src/irc/irc-commands.c:410
+#: src/irc/irc-commands.c:411
 msgid "no toplevel"
 msgstr "sin nivel superior"
 
-#: src/irc/irc-commands.c:412
+#: src/irc/irc-commands.c:413
 msgid "wilcard in toplevel domain"
 msgstr "carácter comodín en el dominio del nivel superior"
 
-#: src/irc/irc-commands.c:414
+#: src/irc/irc-commands.c:415
 msgid "unknown command"
 msgstr "comando desconocido"
 
-#: src/irc/irc-commands.c:416
+#: src/irc/irc-commands.c:417
 msgid "MOTD is missing"
 msgstr "MOTD falta"
 
-#: src/irc/irc-commands.c:418
+#: src/irc/irc-commands.c:419
 msgid "no administrative info"
 msgstr "sin información administrativa"
 
-#: src/irc/irc-commands.c:420
+#: src/irc/irc-commands.c:421
 msgid "file error"
 msgstr "error de fichero"
 
-#: src/irc/irc-commands.c:422
+#: src/irc/irc-commands.c:423
 msgid "no nickname given"
 msgstr "no se ha dado un nombre de usuario"
 
-#: src/irc/irc-commands.c:424
+#: src/irc/irc-commands.c:425
 msgid "erroneous nickname"
 msgstr "nombre de usuario erróneo"
 
-#: src/irc/irc-commands.c:426
+#: src/irc/irc-commands.c:427
 msgid "nickname already in use"
 msgstr "nombre de usuario ya en uso"
 
-#: src/irc/irc-commands.c:428
+#: src/irc/irc-commands.c:429
 msgid "nickname collision"
 msgstr "colisión en el nombre de usuario"
 
-#: src/irc/irc-commands.c:430
+#: src/irc/irc-commands.c:431
 msgid "not authorized to change nickname"
 msgstr "no autorizado a cambiar el nombre de usuario"
 
-#: src/irc/irc-commands.c:432
+#: src/irc/irc-commands.c:433
 msgid "user not in channel"
 msgstr "usuario no presente en el canal"
 
-#: src/irc/irc-commands.c:434
+#: src/irc/irc-commands.c:435
 msgid "not on channel"
 msgstr "no presente en el canal"
 
-#: src/irc/irc-commands.c:436
+#: src/irc/irc-commands.c:437
 msgid "user already on channel"
 msgstr "usuario ya en el canal"
 
-#: src/irc/irc-commands.c:438
+#: src/irc/irc-commands.c:439
 msgid "user not logged in"
 msgstr "usuario no registrado"
 
-#: src/irc/irc-commands.c:440
+#: src/irc/irc-commands.c:441
 msgid "summon has been disabled"
 msgstr "la petición de ayuda ha sido desactivada"
 
-#: src/irc/irc-commands.c:442
+#: src/irc/irc-commands.c:443
 msgid "users has been disabled"
 msgstr "los usuarios han sido desactivados"
 
-#: src/irc/irc-commands.c:444
+#: src/irc/irc-commands.c:445
 msgid "you are not registered"
 msgstr "usted no está registrado"
 
-#: src/irc/irc-commands.c:446
+#: src/irc/irc-commands.c:447
 msgid "not enough parameters"
 msgstr "no hay parámetros suficientes"
 
-#: src/irc/irc-commands.c:448
+#: src/irc/irc-commands.c:449
 msgid "you may not register"
 msgstr "usted no puede registrarse"
 
-#: src/irc/irc-commands.c:450
+#: src/irc/irc-commands.c:451
 msgid "your host isn't among the privileged"
 msgstr "su nombre de máquina no está entre los privilegiados"
 
-#: src/irc/irc-commands.c:452
+#: src/irc/irc-commands.c:453
 msgid "password incorrect"
 msgstr "contraseña incorrecta"
 
-#: src/irc/irc-commands.c:454
+#: src/irc/irc-commands.c:455
 msgid "you are banned from this server"
 msgstr "usted está baneado de este servidor"
 
-#: src/irc/irc-commands.c:456
+#: src/irc/irc-commands.c:457
 msgid "channel key already set"
 msgstr "clave de canal ya definida"
 
-#: src/irc/irc-commands.c:458
+#: src/irc/irc-commands.c:459
 msgid "forwarding to another channel"
 msgstr ""
 
-#: src/irc/irc-commands.c:460
+#: src/irc/irc-commands.c:461
 msgid "channel is already full"
 msgstr "el canal ya está lleno"
 
-#: src/irc/irc-commands.c:462
+#: src/irc/irc-commands.c:463
 msgid "unknown mode char to me"
 msgstr "carácter de modo desconocido para mí"
 
-#: src/irc/irc-commands.c:464
+#: src/irc/irc-commands.c:465
 msgid "cannot join channel (invite only)"
 msgstr "no es posible unirse al canal (sólo invitados)"
 
-#: src/irc/irc-commands.c:466
+#: src/irc/irc-commands.c:467
 msgid "cannot join channel (banned from channel)"
 msgstr "no es posible unirse al canal (baneado del canal)"
 
-#: src/irc/irc-commands.c:468
+#: src/irc/irc-commands.c:469
 msgid "cannot join channel (bad channel key)"
 msgstr "no es posible unirse al canal (clave de canal incorrecta)"
 
-#: src/irc/irc-commands.c:470
+#: src/irc/irc-commands.c:471
 msgid "bad channel mask"
 msgstr "máscara de canal incorrecta"
 
-#: src/irc/irc-commands.c:472
+#: src/irc/irc-commands.c:473
 msgid "channel doesn't support modes"
 msgstr "el canal no soporta los modos"
 
-#: src/irc/irc-commands.c:474
+#: src/irc/irc-commands.c:475
 msgid "you're not an IRC operator"
 msgstr "usted no es un operador IRC"
 
-#: src/irc/irc-commands.c:476
+#: src/irc/irc-commands.c:477
 msgid "you're not channel operator"
 msgstr "usted no es operador del canal"
 
-#: src/irc/irc-commands.c:478
+#: src/irc/irc-commands.c:479
 msgid "you can't kill a server!"
 msgstr "!usted no puede matar a un servidor!"
 
-#: src/irc/irc-commands.c:480
+#: src/irc/irc-commands.c:481
 msgid "your connection is restricted!"
 msgstr ""
 
-#: src/irc/irc-commands.c:482
+#: src/irc/irc-commands.c:483
 msgid "user is immune from kick/deop"
 msgstr "el usuario es inmune a kick/deop"
 
-#: src/irc/irc-commands.c:484
+#: src/irc/irc-commands.c:485
 msgid "no O-lines for your host"
 msgstr "no hay O-lines para su máquina"
 
-#: src/irc/irc-commands.c:486
+#: src/irc/irc-commands.c:487
 msgid "unknown mode flag"
 msgstr "indicador de modo desconocido"
 
-#: src/irc/irc-commands.c:488
+#: src/irc/irc-commands.c:489
 msgid "can't change mode for other users"
 msgstr "no es posible cambiar el modo para el resto de usuarios"
 
-#: src/irc/irc-commands.c:491
+#: src/irc/irc-commands.c:492
 msgid "whois (secure connection)"
 msgstr "whois (conexión segura)"
 
-#: src/irc/irc-display.c:170 src/common/command.c:873
-msgid "Server: "
-msgstr "Servidor: "
+#: src/irc/irc-display.c:180
+#, c-format
+msgid "%sServer: %s%s %s[%s%s%s]\n"
+msgstr ""
 
-#: src/irc/irc-display.c:175
+#: src/irc/irc-display.c:187
 msgid "connected"
 msgstr "conectado"
 
-#: src/irc/irc-display.c:175 src/common/command.c:899
+#: src/irc/irc-display.c:187
 msgid "not connected"
 msgstr "no conectado"
 
-#: src/irc/irc-display.c:179 src/irc/irc-display.c:184
-#: src/irc/irc-display.c:196 src/irc/irc-display.c:199
+#: src/irc/irc-display.c:191 src/irc/irc-display.c:195
+#: src/irc/irc-display.c:203 src/irc/irc-display.c:205
 msgid "yes"
 msgstr "sí"
 
-#: src/irc/irc-display.c:179 src/irc/irc-display.c:184
-#: src/irc/irc-display.c:196 src/irc/irc-display.c:199
+#: src/irc/irc-display.c:191 src/irc/irc-display.c:195
+#: src/irc/irc-display.c:203 src/irc/irc-display.c:205
 msgid "no"
 msgstr "no"
 
-#: src/irc/irc-display.c:181
+#: src/irc/irc-display.c:193
 msgid " (temporary server, will not be saved)"
 msgstr " (servidor temporal, no será guardado)"
 
-#: src/irc/irc-display.c:203
+#: src/irc/irc-display.c:208
 msgid "(hidden)"
 msgstr "(oculto)"
 
-#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4718
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4674
 msgid "unknown"
 msgstr "desconocido"
 
@@ -1395,521 +1400,518 @@ msgstr "desconocido"
 msgid "%s: using local hostname \"%s\"\n"
 msgstr "%s: utilización del nombre de máquina local \"%s\"\n"
 
-#: src/irc/irc-send.c:167 src/common/command.c:749
+#: src/irc/irc-send.c:166 src/common/command.c:760
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr "%s no ha sido posible encontrar el usuario al que enviar el mensaje\n"
 
-#: src/irc/irc-send.c:329 src/irc/irc-send.c:357 src/irc/irc-send.c:544
-#: src/irc/irc-send.c:577 src/irc/irc-send.c:610 src/irc/irc-send.c:658
-#: src/irc/irc-send.c:694 src/irc/irc-send.c:761 src/irc/irc-send.c:818
-#: src/irc/irc-send.c:1160 src/irc/irc-send.c:1258 src/irc/irc-send.c:1737
-#: src/irc/irc-send.c:1851
+#: src/irc/irc-send.c:328 src/irc/irc-send.c:356 src/irc/irc-send.c:547
+#: src/irc/irc-send.c:580 src/irc/irc-send.c:613 src/irc/irc-send.c:661
+#: src/irc/irc-send.c:697 src/irc/irc-send.c:764 src/irc/irc-send.c:821
+#: src/irc/irc-send.c:1154 src/irc/irc-send.c:1254 src/irc/irc-send.c:1730
+#: src/irc/irc-send.c:1844
 #, c-format
 msgid "%s \"%s\" command can only be executed in a channel window\n"
 msgstr ""
 "%s el comando \"%s\" sólo puede ser ejecutado en una ventana de canal\n"
 
-#: src/irc/irc-send.c:456 src/irc/irc-send.c:468 src/irc/irc-send.c:486
-#: src/irc/irc-send.c:1138 src/irc/irc-send.c:1231 src/irc/irc-send.c:1763
-#: src/common/command.c:1233 src/common/command.c:1647
-#: src/common/command.c:1781
+#: src/irc/irc-send.c:459 src/irc/irc-send.c:471 src/irc/irc-send.c:489
+#: src/irc/irc-send.c:1132 src/irc/irc-send.c:1227 src/irc/irc-send.c:1756
+#: src/common/command.c:1253 src/common/command.c:1695
+#: src/common/command.c:1831
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s número de argumentos incorrecto para el comando \"%s\"\n"
 
-#: src/irc/irc-send.c:509 src/irc/irc-send.c:746 src/irc/irc-send.c:803
+#: src/irc/irc-send.c:512 src/irc/irc-send.c:749 src/irc/irc-send.c:806
 #, c-format
 msgid "%s wrong arguments for \"%s\" command\n"
 msgstr "%s argumentos incorrecto para el comando \"%s\"\n"
 
-#: src/irc/irc-send.c:946 src/irc/irc-send.c:1013 src/irc/irc-send.c:1306
-#: src/irc/irc-send.c:1320 src/irc/irc-send.c:1664
+#: src/irc/irc-send.c:949 src/irc/irc-send.c:1016 src/irc/irc-send.c:1302
+#: src/irc/irc-send.c:1316 src/irc/irc-send.c:1657
 #, c-format
 msgid "%s \"%s\" command can not be executed on a server window\n"
 msgstr ""
 "%s el comando \"%s\" no puede ser ejecutado en una ventana de servidor\n"
 
-#: src/irc/irc-send.c:1031 src/irc/irc-send.c:1056 src/irc/irc-recv.c:499
+#: src/irc/irc-send.c:1032 src/irc/irc-send.c:1055 src/irc/irc-recv.c:500
 #, c-format
 msgid "%s nick \"%s\" not found for \"%s\" command\n"
 msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n"
 
-#: src/irc/irc-send.c:1108 src/irc/irc-send.c:1416 src/irc/irc-recv.c:1238
-#: src/irc/irc-recv.c:2054 src/irc/irc-recv.c:2142
+#: src/irc/irc-send.c:1105 src/irc/irc-send.c:1412 src/irc/irc-recv.c:1230
+#: src/irc/irc-recv.c:2042 src/irc/irc-recv.c:2132
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
 
-#: src/irc/irc-send.c:1816
+#: src/irc/irc-send.c:1809
 #, c-format
 msgid "%s, compiled on %s %s\n"
 msgstr "%s, compilado en %s %s\n"
 
-#: src/irc/irc-recv.c:355
-msgid "You have been invited to "
+#: src/irc/irc-recv.c:362
+#, fuzzy, c-format
+msgid "You have been invited to %s%s%s by %s%s\n"
 msgstr "Has sido invitado a "
 
-#: src/irc/irc-recv.c:358 src/irc/irc-recv.c:3994
-msgid "by"
-msgstr "por"
-
-#: src/irc/irc-recv.c:369 src/irc/irc-recv.c:463 src/irc/irc-recv.c:1012
-#: src/irc/irc-recv.c:1397 src/irc/irc-recv.c:1656 src/irc/irc-recv.c:3559
-#: src/irc/irc-recv.c:3581 src/irc/irc-recv.c:3642 src/irc/irc-recv.c:3714
+#: src/irc/irc-recv.c:376 src/irc/irc-recv.c:469 src/irc/irc-recv.c:1008
+#: src/irc/irc-recv.c:1386 src/irc/irc-recv.c:1645 src/irc/irc-recv.c:3520
+#: src/irc/irc-recv.c:3541 src/irc/irc-recv.c:3601 src/irc/irc-recv.c:3672
 #, c-format
 msgid "%s channel \"%s\" not found for \"%s\" command\n"
 msgstr "%s canal \"%s\" no encontrado para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:397
+#: src/irc/irc-recv.c:404
 #, c-format
 msgid "%s cannot create new channel \"%s\"\n"
 msgstr "%s no es posible crear un nuevo canal \"%s\"\n"
 
-#: src/irc/irc-recv.c:416
-msgid " has joined "
-msgstr " se ha unido "
+#: src/irc/irc-recv.c:415
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:474
-msgid " has kicked "
-msgstr " se ha expulsado "
+#: src/irc/irc-recv.c:477
+#, fuzzy, c-format
+msgid "%s%s%s has kicked %s%s%s from %s%s"
+msgstr "ha cambiado el tema por "
 
-#: src/irc/irc-recv.c:478 src/common/command.c:1468
-msgid " from "
-msgstr " de "
+#: src/irc/irc-recv.c:562
+#, c-format
+msgid "%s%s%s has killed %s%s%s from server"
+msgstr ""
 
-#: src/irc/irc-recv.c:564
-msgid " has killed "
-msgstr "ha matado"
-
-#: src/irc/irc-recv.c:570
-msgid " from server"
-msgstr "del servidor"
-
-#: src/irc/irc-recv.c:580
-msgid " from server\n"
-msgstr "del servidor\n"
-
-#: src/irc/irc-recv.c:588
+#: src/irc/irc-recv.c:584
 #, c-format
 msgid "%s host \"%s\" not found for \"%s\" command\n"
 msgstr "%s anfitrión \"%s\" no encontrado para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:629
+#: src/irc/irc-recv.c:625
 msgid "sets ban on"
 msgstr "establecer baneo en"
 
-#: src/irc/irc-recv.c:630
+#: src/irc/irc-recv.c:626
 msgid "removes ban on"
 msgstr "quitar baneo en"
 
-#: src/irc/irc-recv.c:654
+#: src/irc/irc-recv.c:650
 msgid "sets exception on"
 msgstr ""
 
-#: src/irc/irc-recv.c:655
+#: src/irc/irc-recv.c:651
 msgid "removes exception on"
 msgstr ""
 
-#: src/irc/irc-recv.c:679
+#: src/irc/irc-recv.c:675
 msgid "sets mode +f"
 msgstr ""
 
-#: src/irc/irc-recv.c:680
+#: src/irc/irc-recv.c:676
 msgid "removes mode +f"
 msgstr ""
 
-#: src/irc/irc-recv.c:704
+#: src/irc/irc-recv.c:700
 msgid "gives half channel operator status to"
 msgstr "dar estado de media operador de canal a"
 
-#: src/irc/irc-recv.c:705
+#: src/irc/irc-recv.c:701
 msgid "removes half channel operator status from"
 msgstr "eliminar el estado de media operador de canal a"
 
-#: src/irc/irc-recv.c:732
+#: src/irc/irc-recv.c:728
 msgid "sets invite-only channel flag"
 msgstr "define el canal sólo en modo invitado"
 
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:729
 msgid "removes invite-only channel flag"
 msgstr "elimina el modo sólo invitado para el canal"
 
-#: src/irc/irc-recv.c:750
+#: src/irc/irc-recv.c:746
 msgid "sets channel key to"
 msgstr "definir clave de canal en"
 
-#: src/irc/irc-recv.c:751
+#: src/irc/irc-recv.c:747
 msgid "removes channel key"
 msgstr "elimina la clave de canal"
 
-#: src/irc/irc-recv.c:782
+#: src/irc/irc-recv.c:778
 msgid "sets the user limit to"
 msgstr "define el límite de usuarios en"
 
-#: src/irc/irc-recv.c:783
+#: src/irc/irc-recv.c:779
 msgid "removes user limit"
 msgstr "elimina el límite de usuarios"
 
-#: src/irc/irc-recv.c:805
+#: src/irc/irc-recv.c:801
 msgid "sets moderated channel flag"
 msgstr "establece la moderación en el canal"
 
-#: src/irc/irc-recv.c:806
+#: src/irc/irc-recv.c:802
 msgid "removes moderated channel flag"
 msgstr "elimina la moderación en el canal"
 
-#: src/irc/irc-recv.c:816
+#: src/irc/irc-recv.c:812
 msgid "sets messages from channel only flag"
 msgstr "establece el modo sólo mensajes de usuarios del canal"
 
-#: src/irc/irc-recv.c:817
+#: src/irc/irc-recv.c:813
 msgid "removes messages from channel only flag"
 msgstr "autoriza a todos los usuarios a escribir en el canal"
 
-#: src/irc/irc-recv.c:834
+#: src/irc/irc-recv.c:830
 msgid "gives channel operator status to"
 msgstr "dar estado de operador de canal a"
 
-#: src/irc/irc-recv.c:835
+#: src/irc/irc-recv.c:831
 msgid "removes channel operator status from"
 msgstr "eliminar el estado de operador de canal a"
 
-#: src/irc/irc-recv.c:862
+#: src/irc/irc-recv.c:858
 msgid "sets private channel flag"
 msgstr "establece el canal como privado"
 
-#: src/irc/irc-recv.c:863
+#: src/irc/irc-recv.c:859
 msgid "removes private channel flag"
 msgstr "elimina el modo privado para el canal"
 
-#: src/irc/irc-recv.c:880
+#: src/irc/irc-recv.c:876
 msgid "sets quiet on"
 msgstr ""
 
-#: src/irc/irc-recv.c:881
+#: src/irc/irc-recv.c:877
 msgid "removes quiet on"
 msgstr ""
 
-#: src/irc/irc-recv.c:898
+#: src/irc/irc-recv.c:894
 msgid "sets secret channel flag"
 msgstr "establece el canal como secreto"
 
-#: src/irc/irc-recv.c:899
+#: src/irc/irc-recv.c:895
 msgid "removes secret channel flag"
 msgstr "elimina el modo secreto para el canal"
 
-#: src/irc/irc-recv.c:909
+#: src/irc/irc-recv.c:905
 msgid "sets topic protection"
 msgstr "activa la protección de tema"
 
-#: src/irc/irc-recv.c:910
+#: src/irc/irc-recv.c:906
 msgid "removes topic protection"
 msgstr "elimina la protección de tema"
 
-#: src/irc/irc-recv.c:927
+#: src/irc/irc-recv.c:923
 msgid "gives voice to"
 msgstr "da voz a"
 
-#: src/irc/irc-recv.c:928
+#: src/irc/irc-recv.c:924
 msgid "removes voice from"
 msgstr "quita la voz a"
 
-#: src/irc/irc-recv.c:971 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1475
-#: src/irc/irc-recv.c:2209
+#: src/irc/irc-recv.c:967 src/irc/irc-recv.c:1053 src/irc/irc-recv.c:1464
+#: src/irc/irc-recv.c:2201
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr "%s comando \"%s\" recibido sin host \n"
 
-#: src/irc/irc-recv.c:981
+#: src/irc/irc-recv.c:977
 #, c-format
 msgid "%s \"%s\" command received without channel or nickname\n"
 msgstr "%s comando \"%s\" recibido sin canal ó usuario\n"
 
-#: src/irc/irc-recv.c:1029
-msgid "mode changed by"
-msgstr "modo cambiado por"
+#: src/irc/irc-recv.c:1019
+#, c-format
+msgid "%s[%s%s%s/%s%s%s]%s mode changed by %s%s\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:1091
-msgid "You are "
-msgstr "Usted es "
-
-#: src/irc/irc-recv.c:1098
-msgid " is "
-msgstr "es "
-
-#: src/irc/irc-recv.c:1102
-msgid "now known as "
+#: src/irc/irc-recv.c:1088
+#, fuzzy, c-format
+msgid "You are now known as %s%s\n"
 msgstr "ahora conocido como"
 
-#: src/irc/irc-recv.c:1169
+#: src/irc/irc-recv.c:1092
+#, fuzzy, c-format
+msgid "%s%s%s is now known as %s%s\n"
+msgstr "ahora conocido como"
+
+#: src/irc/irc-recv.c:1159
 #, c-format
 msgid "%s nickname not found for \"%s\" command\n"
 msgstr "%s nombre de usuario no encontrado para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:1185 src/irc/irc-recv.c:1217
-msgid "reply from"
-msgstr "respuesta de"
-
-#: src/irc/irc-recv.c:1220
+#: src/irc/irc-recv.c:1173
 #, c-format
-msgid ": %ld.%ld seconds\n"
-msgstr ": %ld.%ld segundos\n"
+msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:1259 src/irc/irc-recv.c:2163 src/irc/irc-dcc.c:1136
+#: src/irc/irc-recv.c:1207
+#, c-format
+msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:1252 src/irc/irc-recv.c:2154 src/irc/irc-dcc.c:1153
 #, c-format
 msgid "Private %s> %s"
 msgstr "Privado %s> %s"
 
-#: src/irc/irc-recv.c:1322
+#: src/irc/irc-recv.c:1317
 #, c-format
 msgid "%s \"%s\" command received without host or channel\n"
 msgstr "%s comando \"%s\" recibido sin host o canal\n"
 
-#: src/irc/irc-recv.c:1371
-msgid " has left "
-msgstr " ha salido "
+#: src/irc/irc-recv.c:1357
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has left %s%s"
+msgstr ""
 
-#: src/irc/irc-recv.c:1523 src/irc/irc-recv.c:2078
+#: src/irc/irc-recv.c:1513 src/irc/irc-recv.c:2067
 #, c-format
 msgid "On %s: * %s %s"
 msgstr "En %s: * %s %s"
 
-#: src/irc/irc-recv.c:1547
-#, c-format
-msgid "Received a CTCP SOUND \"%s\" from "
+#: src/irc/irc-recv.c:1538
+#, fuzzy, c-format
+msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
 msgstr "Recibido un sonido CTCP \\\"%s\\\" de "
 
-#: src/irc/irc-recv.c:1580 src/irc/irc-recv.c:1611 src/irc/irc-recv.c:1715
-#: src/irc/irc-recv.c:1755 src/irc/irc-recv.c:2118
-msgid "received from"
-msgstr "recibido de"
+#: src/irc/irc-recv.c:1568 src/irc/irc-recv.c:1739
+#, fuzzy, c-format
+msgid "CTCP %sPING%s received from %s%s\n"
+msgstr " recibido de "
 
-#: src/irc/irc-recv.c:1607 src/irc/irc-recv.c:2114
-msgid "Unknown CTCP "
-msgstr ""
+#: src/irc/irc-recv.c:1597 src/irc/irc-recv.c:2104
+#, fuzzy, c-format
+msgid "Unknown CTCP %s%s%s received from %s%s"
+msgstr "%s tipo DCC CHAT desconocido recibido de "
 
-#: src/irc/irc-recv.c:1639
+#: src/irc/irc-recv.c:1629
 #, c-format
 msgid "On %s: %s> %s"
 msgstr "En %s: %s> %s"
 
-#: src/irc/irc-recv.c:1771 src/irc/irc-recv.c:1792 src/irc/irc-recv.c:1808
-#: src/irc/irc-recv.c:1824 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1871
-#: src/irc/irc-recv.c:1887 src/irc/irc-recv.c:1912 src/irc/irc-recv.c:1933
-#: src/irc/irc-recv.c:1949 src/irc/irc-recv.c:1974 src/irc/irc-recv.c:1995
-#: src/irc/irc-recv.c:2010 src/irc/irc-recv.c:2185 src/irc/irc-recv.c:2529
-#: src/irc/irc-recv.c:3918 src/irc/irc-recv.c:3933 src/irc/irc-recv.c:3948
-#: src/irc/irc-recv.c:3963 src/irc/irc-recv.c:3976 src/irc/irc-recv.c:4031
-#: src/irc/irc-recv.c:4045 src/irc/irc-recv.c:4285 src/irc/irc-recv.c:4343
-#: src/irc/irc-recv.c:4502 src/irc/irc-recv.c:4517 src/irc/irc-recv.c:4532
-#: src/irc/irc-recv.c:4547 src/irc/irc-recv.c:4560 src/irc/irc-recv.c:4614
-#: src/irc/irc-recv.c:4628
+#: src/irc/irc-recv.c:1700
+#, fuzzy, c-format
+msgid "CTCP %sVERSION%s received from %s%s"
+msgstr " recibido de "
+
+#: src/irc/irc-recv.c:1757 src/irc/irc-recv.c:1778 src/irc/irc-recv.c:1794
+#: src/irc/irc-recv.c:1810 src/irc/irc-recv.c:1836 src/irc/irc-recv.c:1857
+#: src/irc/irc-recv.c:1873 src/irc/irc-recv.c:1898 src/irc/irc-recv.c:1919
+#: src/irc/irc-recv.c:1935 src/irc/irc-recv.c:1960 src/irc/irc-recv.c:1981
+#: src/irc/irc-recv.c:1996 src/irc/irc-recv.c:2177 src/irc/irc-recv.c:2516
+#: src/irc/irc-recv.c:3879 src/irc/irc-recv.c:3894 src/irc/irc-recv.c:3909
+#: src/irc/irc-recv.c:3924 src/irc/irc-recv.c:3937 src/irc/irc-recv.c:4002
+#: src/irc/irc-recv.c:4016 src/irc/irc-recv.c:4250 src/irc/irc-recv.c:4308
+#: src/irc/irc-recv.c:4446 src/irc/irc-recv.c:4461 src/irc/irc-recv.c:4567
+#: src/irc/irc-recv.c:4581
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr "%s no es posible analizar el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:2023
+#: src/irc/irc-recv.c:2009
 #, c-format
 msgid "%s unknown DCC CHAT type received from "
 msgstr "%s tipo DCC CHAT desconocido recibido de "
 
-#: src/irc/irc-recv.c:2240
-msgid "has quit"
-msgstr "ha salido"
+#: src/irc/irc-recv.c:2224
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has quit %s(%s%s%s)\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:2354
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr "%s comando \"%s\" recibido sin canal\n"
 
-#: src/irc/irc-recv.c:2397
-msgid " has changed topic for "
+#: src/irc/irc-recv.c:2382
+#, fuzzy, c-format
+msgid "%s%s%s has changed topic for %s%s%s to: \"%s\"\n"
 msgstr "ha cambiado el tema por "
 
-#: src/irc/irc-recv.c:2402
-#, c-format
-msgid " to: \"%s\"\n"
-msgstr " a: \"%s\"\n"
-
-#: src/irc/irc-recv.c:2408
-msgid " has unset topic for "
+#: src/irc/irc-recv.c:2392
+#, fuzzy, c-format
+msgid "%s%s%s has unset topic for %s%s\n"
 msgstr " ha quitado el tema por "
 
-#: src/irc/irc-recv.c:2517
-msgid "User mode"
+#: src/irc/irc-recv.c:2502
+#, c-format
+msgid "User mode %s[%s%s%s/%s%s%s]\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2572
-#, c-format
-msgid " is away: %s\n"
+#: src/irc/irc-recv.c:2557
+#, fuzzy, c-format
+msgid "%s%s%s is away: %s\n"
 msgstr " está ausente: %s\n"
 
-#: src/irc/irc-recv.c:2654
+#: src/irc/irc-recv.c:2642
 msgid "Users online: "
 msgstr "Usuarios conectados: "
 
-#: src/irc/irc-recv.c:3144
-msgid "idle: "
-msgstr "sin actividad: "
+#: src/irc/irc-recv.c:2999
+#, c-format
+msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3120
+#, c-format
+msgid "%s[%s%s%s]%s idle: "
+msgstr ""
+
+#: src/irc/irc-recv.c:3132
 msgid "days"
 msgstr "días"
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3132
 msgid "day"
 msgstr "día"
 
-#: src/irc/irc-recv.c:3162
+#: src/irc/irc-recv.c:3136
+#, c-format
+msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
+msgstr ""
+
+#: src/irc/irc-recv.c:3140
 msgid "hours"
 msgstr "horas"
 
-#: src/irc/irc-recv.c:3162
+#: src/irc/irc-recv.c:3140
 msgid "hour"
 msgstr "hora"
 
-#: src/irc/irc-recv.c:3168
+#: src/irc/irc-recv.c:3144
 msgid "minutes"
 msgstr "minutos"
 
-#: src/irc/irc-recv.c:3168
+#: src/irc/irc-recv.c:3144
 msgid "minute"
 msgstr "minuto"
 
-#: src/irc/irc-recv.c:3174
+#: src/irc/irc-recv.c:3148
 msgid "seconds"
 msgstr "segundos"
 
-#: src/irc/irc-recv.c:3174
+#: src/irc/irc-recv.c:3148
 msgid "second"
 msgstr "segundo"
 
-#: src/irc/irc-recv.c:3179
-msgid "signon at: "
-msgstr "firmado el: "
-
-#: src/irc/irc-recv.c:3275
-msgid "Channels: "
-msgstr "Canales: "
-
-#: src/irc/irc-recv.c:3572
-msgid "No topic set for "
+#: src/irc/irc-recv.c:3532
+#, fuzzy, c-format
+msgid "No topic set for %s%s\n"
 msgstr "No hay tema definido para "
 
-#: src/irc/irc-recv.c:3629
-msgid "Topic for "
-msgstr "El tema para "
-
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3588
 #, c-format
-msgid " is: \"%s\"\n"
-msgstr " es: \"%s\"\n"
+msgid "Topic for %s%s%s is: \"%s\"\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:3652 src/irc/irc-recv.c:3741 src/irc/irc-recv.c:3794
+#: src/irc/irc-recv.c:3611 src/irc/irc-recv.c:3699 src/irc/irc-recv.c:3754
 #, c-format
 msgid "%s cannot identify channel for \"%s\" command\n"
 msgstr "%s no es posible identificar el canal para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:3702
-msgid "Topic set by "
+#: src/irc/irc-recv.c:3661
+#, fuzzy, c-format
+msgid "Topic set by %s%s%s, %s"
 msgstr "Tema definido por "
 
-#: src/irc/irc-recv.c:3723
+#: src/irc/irc-recv.c:3681
 #, c-format
 msgid "%s cannot identify date/time for \"%s\" command\n"
 msgstr "%s no es posible identificar la fecha/hora para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:3732 src/irc/irc-recv.c:3803
+#: src/irc/irc-recv.c:3690 src/irc/irc-recv.c:3763
 #, c-format
 msgid "%s cannot identify nickname for \"%s\" command\n"
 msgstr ""
 "%s no es posible determinar el nombre de usuario para el comando \"%s\"\n"
 
-#: src/irc/irc-recv.c:3782
-msgid "has invited"
-msgstr "ha invitado"
+#: src/irc/irc-recv.c:3739
+#, fuzzy, c-format
+msgid "%s%s%s has invited %s%s%s on %s%s\n"
+msgstr "ha cambiado el tema por "
 
-#: src/irc/irc-recv.c:3785 src/irc/irc-recv.c:4206 src/common/command.c:1461
-msgid "on"
-msgstr "en"
-
-#: src/irc/irc-recv.c:3840
-msgid "Channel reop"
+#: src/irc/irc-recv.c:3799
+#, c-format
+msgid "Channel reop %s%s%s: %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3992
-msgid "exception"
-msgstr ""
-
-#: src/irc/irc-recv.c:4331
+#: src/irc/irc-recv.c:4296
 #, c-format
 msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
 msgstr "%s no es posible crear el usuario \"%s\" para el canal \"%s\"\n"
 
-#: src/irc/irc-recv.c:4390
-msgid "Nicks "
-msgstr "Usuarios "
+#: src/irc/irc-recv.c:4354
+#, c-format
+msgid "Nicks %s%s%s: %s["
+msgstr ""
 
-#: src/irc/irc-recv.c:4410
-msgid "Channel "
-msgstr "Canal "
+#: src/irc/irc-recv.c:4375
+#, c-format
+msgid ""
+"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
+msgstr ""
 
-#: src/irc/irc-recv.c:4421
+#: src/irc/irc-recv.c:4383
 msgid "nicks"
 msgstr "usuarios"
 
-#: src/irc/irc-recv.c:4421
+#: src/irc/irc-recv.c:4383
 msgid "nick"
 msgstr "usuario"
 
-#: src/irc/irc-recv.c:4429
+#: src/irc/irc-recv.c:4388
 msgid "ops"
 msgstr "operadores"
 
-#: src/irc/irc-recv.c:4429
+#: src/irc/irc-recv.c:4388
 msgid "op"
 msgstr "operador"
 
-#: src/irc/irc-recv.c:4438
+#: src/irc/irc-recv.c:4392
 msgid "halfops"
 msgstr "semi-operadores"
 
-#: src/irc/irc-recv.c:4438
+#: src/irc/irc-recv.c:4392
 msgid "halfop"
 msgstr "semi-operador"
 
-#: src/irc/irc-recv.c:4447
+#: src/irc/irc-recv.c:4396
 msgid "voices"
 msgstr "voces"
 
-#: src/irc/irc-recv.c:4447
+#: src/irc/irc-recv.c:4396
 msgid "voice"
 msgstr "voz"
 
-#: src/irc/irc-recv.c:4456
+#: src/irc/irc-recv.c:4400
 msgid "normal"
 msgstr "normal"
 
-#: src/irc/irc-recv.c:4577
-msgid "banned by"
-msgstr "baneado por"
+#: src/irc/irc-recv.c:4501
+#, c-format
+msgid "%s[%s%s%s] %s%s%s banned by "
+msgstr ""
 
-#: src/irc/irc-recv.c:4672
+#: src/irc/irc-recv.c:4536
+#, c-format
+msgid "%s[%s%s%s] %s%s%s banned\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:4628
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
 msgstr ""
 "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 2º nombre de "
 "usuario \"%s\"\n"
 
-#: src/irc/irc-recv.c:4684
+#: src/irc/irc-recv.c:4640
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
 msgstr ""
 "%s: el nombre de usuario \"%s\" ya está en uso, probando con el 3º nombre de "
 "usuario \"%s\"\n"
 
-#: src/irc/irc-recv.c:4696
+#: src/irc/irc-recv.c:4652
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
@@ -1918,7 +1920,7 @@ msgstr ""
 "%s: ¡todos los nombres de usuario declarados ya están en uso, cerrando la "
 "conexión con el servidor!\n"
 
-#: src/irc/irc-recv.c:4706
+#: src/irc/irc-recv.c:4662
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
 msgstr ""
@@ -1949,35 +1951,38 @@ msgstr "Fall
 msgid "Aborted"
 msgstr "Abortado"
 
-#: src/irc/irc-dcc.c:367 src/irc/irc-dcc.c:568 src/irc/irc-dcc.c:731
-msgid "DCC: file "
+#: src/irc/irc-dcc.c:368
+#, fuzzy, c-format
+msgid "DCC: file %s%s%s"
 msgstr "DCC: fichero "
 
-#: src/irc/irc-dcc.c:374 src/irc/irc-dcc.c:693 src/irc/irc-dcc.c:736
-msgid " (local filename: "
+#: src/irc/irc-dcc.c:374
+#, fuzzy, c-format
+msgid " (local filename: %s%s%s)"
 msgstr " (nombre de fichero local: "
 
-#: src/irc/irc-dcc.c:382
+#: src/irc/irc-dcc.c:379
 msgid " sent to "
 msgstr " enviado a "
 
-#: src/irc/irc-dcc.c:384
+#: src/irc/irc-dcc.c:381
 msgid " received from "
 msgstr " recibido de "
 
-#: src/irc/irc-dcc.c:390
-msgid ": ok!\n"
-msgstr ": ok!\n"
-
-#: src/irc/irc-dcc.c:390
-msgid ": FAILED\n"
+#: src/irc/irc-dcc.c:386
+msgid "OK"
 msgstr ""
 
-#: src/irc/irc-dcc.c:402
-msgid "DCC chat closed with "
+#: src/irc/irc-dcc.c:386
+msgid "FAILED"
+msgstr ""
+
+#: src/irc/irc-dcc.c:399
+#, fuzzy, c-format
+msgid "DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"
 msgstr "DCC chat cerrada con "
 
-#: src/irc/irc-dcc.c:459
+#: src/irc/irc-dcc.c:457
 #, c-format
 msgid ""
 "%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1986,96 +1991,96 @@ msgstr ""
 "%s no se puede asociar la conversación DCC con el búfer privado (quizá el "
 "búfer privado ya tiene DCC CHAT)\n"
 
-#: src/irc/irc-dcc.c:470
-msgid "Connected to "
-msgstr "Conectado al "
+#: src/irc/irc-dcc.c:468
+#, fuzzy, c-format
+msgid "Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"
+msgstr "DCC chat cerrada con "
 
-#: src/irc/irc-dcc.c:479
-msgid "via DCC chat\n"
-msgstr "con charla DCC\n"
-
-#: src/irc/irc-dcc.c:573
+#: src/irc/irc-dcc.c:568
 #, c-format
-msgid "resumed at position %u\n"
+msgid "DCC: file %s%s%s resumed at position %u\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:579 src/irc/irc-dcc.c:604
+#: src/irc/irc-dcc.c:577 src/irc/irc-dcc.c:602
 #, c-format
 msgid ""
 "%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
 "ended\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:623
+#: src/irc/irc-dcc.c:621
 #, c-format
 msgid "%s not enough memory for new DCC\n"
 msgstr "%s no hay memoria suficiente para un nuevo DCC\n"
 
-#: src/irc/irc-dcc.c:642
+#: src/irc/irc-dcc.c:640
 msgid "DCC chat"
 msgstr "Charla DCC"
 
-#: src/irc/irc-dcc.c:672
-msgid "Incoming DCC file from "
-msgstr "Recibir fichero DCC de "
-
-#: src/irc/irc-dcc.c:683 src/irc/irc-dcc.c:697
-msgid " bytes\n"
-msgstr " bytes\n"
-
-#: src/irc/irc-dcc.c:689
-msgid "Sending DCC file to "
-msgstr "Enviar fichero DCC a "
-
-#: src/irc/irc-dcc.c:703
-msgid "Incoming DCC chat request from "
-msgstr "Recibir DCC chat de "
-
-#: src/irc/irc-dcc.c:715
-msgid "Sending DCC chat request to "
-msgstr "Enviar DCC chat a "
-
-#: src/irc/irc-dcc.c:742
+#: src/irc/irc-dcc.c:671
 #, c-format
-msgid "will be resumed at position %u\n"
+msgid ""
+"Incoming DCC file from %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s bytes\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:810
+#: src/irc/irc-dcc.c:694
+#, c-format
+msgid ""
+"Sending DCC file to %s%s%s: %s%s%s (local filename: %s%s%s), %s%lu%s bytes\n"
+msgstr ""
+
+#: src/irc/irc-dcc.c:714
+#, fuzzy, c-format
+msgid "Incoming DCC chat request from %s%s%s (%s%d.%d.%d.%d%s)\n"
+msgstr "Recibir DCC chat de "
+
+#: src/irc/irc-dcc.c:731
+#, fuzzy, c-format
+msgid "Sending DCC chat request to %s%s\n"
+msgstr "Enviar DCC chat a "
+
+#: src/irc/irc-dcc.c:749
+#, c-format
+msgid ""
+"DCC: file %s%s%s (local filename: %s%s%s) will be resumed at position %u\n"
+msgstr ""
+
+#: src/irc/irc-dcc.c:824
 #, c-format
 msgid "%s not enough memory for DCC SEND\n"
 msgstr "%s no hay memoria suficiente para el DCC SEND\n"
 
-#: src/irc/irc-dcc.c:832
+#: src/irc/irc-dcc.c:846
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr "%s no es posible acceder al fichero \"%s\"\n"
 
-#: src/irc/irc-dcc.c:854
+#: src/irc/irc-dcc.c:868
 #, c-format
 msgid "%s could not find address for '%s'. Falling back to local IP.\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:874
+#: src/irc/irc-dcc.c:888
 #, c-format
 msgid "%s cannot create socket for DCC\n"
 msgstr "%s no es posible crear socket para el DCC\n"
 
-#: src/irc/irc-dcc.c:932
+#: src/irc/irc-dcc.c:946
 #, c-format
 msgid "%s cannot find available port for DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:976
+#: src/irc/irc-dcc.c:990
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr "%s no es posible enviar el DCC\n"
 
-#: src/irc/irc-dcc.c:1057
+#: src/irc/irc-dcc.c:1071
 #, c-format
 msgid "%s error sending data to \"%s\" via DCC CHAT\n"
 msgstr "%s error enviando datos al \"%s\" con DCC CHAT\n"
 
-#: src/irc/irc-dcc.c:1330
+#: src/irc/irc-dcc.c:1350
 #, c-format
 msgid ""
 "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -2084,7 +2089,7 @@ msgstr ""
 "%s El DCC ha fallado porque el tamaño de bloque es demasiado grande. "
 "Compruebe el valor de la opción \"dcc_blocksize\", el máximo es %d.\n"
 
-#: src/irc/irc-dcc.c:1405
+#: src/irc/irc-dcc.c:1425
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr "Abandonar el DCC activo: \"%s\" de %s\n"
@@ -2202,13 +2207,13 @@ msgstr ""
 msgid "%s plugin \"%s\" not found\n"
 msgstr ""
 
-#: src/plugins/plugins-config.c:215 src/common/weeconfig.c:1653
+#: src/plugins/plugins-config.c:215 src/common/weeconfig.c:1659
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
 msgstr "%s %s, línea %d: sintaxis inválida, falta \"=\"\n"
 
-#: src/plugins/plugins-config.c:265 src/common/weeconfig.c:1826
-#: src/common/weeconfig.c:2024
+#: src/plugins/plugins-config.c:265 src/common/weeconfig.c:1832
+#: src/common/weeconfig.c:2030
 #, c-format
 msgid "%s cannot create file \"%s\"\n"
 msgstr "%s no es posible crear el fichero \"%s\"\n"
@@ -2238,64 +2243,64 @@ msgstr ""
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s el lag (retraso) es alto, desconectando del servidor...\n"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "bytes"
 msgstr "bytes"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Kb"
 msgstr "KB"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Mb"
 msgstr "MB"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Gb"
 msgstr "GB"
 
-#: src/gui/curses/gui-display.c:1265
+#: src/gui/curses/gui-display.c:1836
 msgid "<servers>"
 msgstr "<servidores>"
 
-#: src/gui/curses/gui-display.c:1277
+#: src/gui/curses/gui-display.c:1848
 msgid "(away)"
 msgstr "(ausente)"
 
-#: src/gui/curses/gui-display.c:1411
+#: src/gui/curses/gui-display.c:1982
 msgid "[not connected] "
 msgstr "[no conectado] "
 
-#: src/gui/curses/gui-display.c:1421
+#: src/gui/curses/gui-display.c:1992
 msgid "Act: "
 msgstr "Act: "
 
-#: src/gui/curses/gui-display.c:1509
+#: src/gui/curses/gui-display.c:2080
 #, c-format
 msgid "Lag: %.1f"
 msgstr "Lag: %.1f"
 
-#: src/gui/curses/gui-display.c:1525
+#: src/gui/curses/gui-display.c:2096
 msgid "-MORE-"
 msgstr "-MÁS-"
 
-#: src/gui/curses/gui-display.c:1715
+#: src/gui/curses/gui-display.c:2274
 msgid "  [A] Accept"
 msgstr "  [A] Aceptar"
 
-#: src/gui/curses/gui-display.c:1716 src/gui/curses/gui-display.c:1720
+#: src/gui/curses/gui-display.c:2275 src/gui/curses/gui-display.c:2279
 msgid "  [C] Cancel"
 msgstr "  [C] Cancelar"
 
-#: src/gui/curses/gui-display.c:1725
+#: src/gui/curses/gui-display.c:2284
 msgid "  [R] Remove"
 msgstr "  [R] Eliminar"
 
-#: src/gui/curses/gui-display.c:1729
+#: src/gui/curses/gui-display.c:2288
 msgid "  [P] Purge old DCC"
 msgstr "  [P] Purgar los viejos DCC"
 
-#: src/gui/curses/gui-display.c:1730
+#: src/gui/curses/gui-display.c:2289
 msgid "  [Q] Close DCC view"
 msgstr "  [Q] Cerrar la vista DCC"
 
@@ -2303,16 +2308,12 @@ msgstr "  [Q] Cerrar la vista DCC"
 msgid "server"
 msgstr "servidor"
 
-#: src/gui/gui-common.c:392
-msgid "Not enough memory for infobar message\n"
-msgstr "No hay suficiente memoria para el mensaje de la barra de información\n"
-
-#: src/gui/gui-common.c:582
+#: src/gui/gui-common.c:508
 msgid "Not enough memory for new line\n"
 msgstr "No hay suficiente memoria para una nueva línea\n"
 
-#: src/gui/gui-common.c:625
-msgid "Not enough memory for new message\n"
+#: src/gui/gui-common.c:844
+msgid "Not enough memory for infobar message\n"
 msgstr "No hay suficiente memoria para el mensaje de la barra de información\n"
 
 #: src/gui/gui-keyboard.c:45
@@ -2463,7 +2464,7 @@ msgstr "recargar la pantalla"
 msgid "grab a key"
 msgstr ""
 
-#: src/gui/gui-keyboard.c:428 src/common/command.c:1662
+#: src/gui/gui-keyboard.c:428 src/common/command.c:1710
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr "%s No ha sido posible atar la clave \"%s\"\n"
@@ -2791,8 +2792,8 @@ msgid "%s alias cannot run another alias!\n"
 msgstr "%s ¡el alias no puede ejecutar otro alias!\n"
 
 #: src/common/command.c:306
-#, c-format
-msgid "%s target command \"%s\" does not exist!\n"
+#, fuzzy, c-format
+msgid "%s target command \"/%s\" does not exist!\n"
 msgstr "%s ¡el comando objetivo \"%s\" no existe!\n"
 
 #: src/common/command.c:535
@@ -2842,253 +2843,275 @@ msgstr "%s 
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr "%s comando \"%s\" desconocido (escriba /help para la ayuda)\n"
 
-#: src/common/command.c:773
+#: src/common/command.c:789
 #, c-format
 msgid "%s unable to call handler for message (not enough memory)\n"
 msgstr ""
 "%s No ha sido posible llamar al manejador para el mensaje (no hay suficiente "
 "memoria)\n"
 
-#: src/common/command.c:781
+#: src/common/command.c:797
 msgid "This window is not a channel!\n"
 msgstr "¡Esta ventana no es un canal!\n"
 
-#: src/common/command.c:809 src/common/command.c:833 src/common/command.c:943
+#: src/common/command.c:825 src/common/command.c:856 src/common/command.c:963
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr "%s faltan argumentos para el comando \"%s\"\n"
 
-#: src/common/command.c:818
+#: src/common/command.c:832
+#, fuzzy, c-format
+msgid "%s alias can not start with \"/\"\n"
+msgstr "%s ¡el alias no puede ejecutar otro alias!\n"
+
+#: src/common/command.c:841
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr "Alias \"%s\" => \"%s\" creado\n"
 
-#: src/common/command.c:824
+#: src/common/command.c:847
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr ""
 "No ha sido posible crear el alias \"%s\" => \"%s\" (no hay suficiente "
 "memoria)\n"
 
-#: src/common/command.c:844
+#: src/common/command.c:867
 msgid "List of aliases:\n"
 msgstr "Lista de alias:\n"
 
-#: src/common/command.c:856
+#: src/common/command.c:881
 msgid "No alias defined.\n"
 msgstr "Ningún alias definido.\n"
 
-#: src/common/command.c:879
-msgid "Channel: "
-msgstr "Canal: "
+#: src/common/command.c:898
+#, fuzzy, c-format
+msgid "%sServer: %s%s\n"
+msgstr "Servidor: "
 
-#: src/common/command.c:882 src/common/command.c:892
-msgid " (server: "
-msgstr " (servidor: "
+#: src/common/command.c:903
+#, c-format
+msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
+msgstr ""
 
-#: src/common/command.c:889
-msgid "Private with: "
-msgstr "Privado con: "
+#: src/common/command.c:912
+#, c-format
+msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
+msgstr ""
 
-#: src/common/command.c:923
+#: src/common/command.c:920
+#, fuzzy
+msgid "not connected\n"
+msgstr "no conectado"
+
+#: src/common/command.c:942
 msgid "Opened buffers:\n"
 msgstr "Búfers abiertos:\n"
 
-#: src/common/command.c:966
+#: src/common/command.c:986
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr "%s número de búfer incorrecto\n"
 
-#: src/common/command.c:982
+#: src/common/command.c:1002
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr "%s no es posible cerrar el único búfer\n"
 
-#: src/common/command.c:992
+#: src/common/command.c:1012
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr ""
 "%s no se puede cerrar el búfer de servidor mientras haya canales abiertos\n"
 
-#: src/common/command.c:1043
+#: src/common/command.c:1063
 msgid "Notify levels:  "
 msgstr "Niveles de notificación:  "
 
-#: src/common/command.c:1071 src/common/command.c:1093
+#: src/common/command.c:1091 src/common/command.c:1113
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr "%s nivel de notificación incorrecto (debe estar entre %d y %d)\n"
 
-#: src/common/command.c:1080
+#: src/common/command.c:1100
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr "%s búfer incorrecto para notificar (debe ser canal o privado)\n"
 
-#: src/common/command.c:1160
+#: src/common/command.c:1180
 #, c-format
 msgid "unknown parameter \"%s\" for \"%s\" command\n"
 msgstr "parámetro desconocido \"%s\" para el comando \"%s\"\n"
 
-#: src/common/command.c:1190
+#: src/common/command.c:1210
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s ya conectado al servidor \"%s\"!\n"
 
-#: src/common/command.c:1198
+#: src/common/command.c:1218
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr "%s actualmente conectando al servidor \"%s\"!\n"
 
-#: src/common/command.c:1216 src/common/command.c:1291
+#: src/common/command.c:1236 src/common/command.c:1311
 #, c-format
 msgid "%s server not found\n"
 msgstr "%s servidor no encontrado\n"
 
-#: src/common/command.c:1246 src/common/command.c:1774
-#: src/common/command.c:2595 src/common/command.c:2619
+#: src/common/command.c:1266 src/common/command.c:1824
+#: src/common/command.c:2671 src/common/command.c:2695
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s opción desconocida para el comando \"%s\"\n"
 
-#: src/common/command.c:1275
+#: src/common/command.c:1295
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr "%s ¡no conectado al servidor \"%s\"!\n"
 
-#: src/common/command.c:1283
+#: src/common/command.c:1303
 msgid "Auto-reconnection is cancelled\n"
 msgstr "La reconexión automática está anulada\n"
 
-#: src/common/command.c:1314 src/common/weechat.c:350
+#: src/common/command.c:1334 src/common/weechat.c:364
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "Comandos internos %s :\n"
 
-#: src/common/command.c:1323 src/common/weechat.c:370
+#: src/common/command.c:1344 src/common/weechat.c:384
 #, c-format
 msgid "IRC commands:\n"
 msgstr "Comandos IRC :\n"
 
-#: src/common/command.c:1336
+#: src/common/command.c:1358
 msgid "Plugin commands:\n"
 msgstr ""
 
-#: src/common/command.c:1444
+#: src/common/command.c:1474
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr "No hay ayuda disponible, el comando \"%s\" es desconocido\n"
 
-#: src/common/command.c:1466
+#: src/common/command.c:1495
+msgid "on"
+msgstr "en"
+
+#: src/common/command.c:1503
 msgid " ignoring "
 msgstr ""
 
-#: src/common/command.c:1490
+#: src/common/command.c:1507
+msgid " from "
+msgstr " de "
+
+#: src/common/command.c:1530
 msgid "List of ignore:\n"
 msgstr ""
 
-#: src/common/command.c:1505
+#: src/common/command.c:1547
 msgid "No ignore defined.\n"
 msgstr ""
 
-#: src/common/command.c:1531
+#: src/common/command.c:1573
 msgid "New ignore:"
 msgstr ""
 
-#: src/common/command.c:1550
-msgid "New key binding:\n"
+#: src/common/command.c:1593
+#, fuzzy, c-format
+msgid "New key binding:  %s"
 msgstr "Nuevo anclaje de clave:\n"
 
-#: src/common/command.c:1583
+#: src/common/command.c:1627
 msgid "Key bindings:\n"
 msgstr "Anclajes de clave:\n"
 
-#: src/common/command.c:1595
+#: src/common/command.c:1641
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr "Clave \"%s\" desatada\n"
 
-#: src/common/command.c:1600
+#: src/common/command.c:1647
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s No ha sido posible desatar la clave \"%s\"\n"
 
-#: src/common/command.c:1608 src/common/weechat.c:401
+#: src/common/command.c:1655 src/common/weechat.c:415
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Funciones de clave internas:\n"
 
-#: src/common/command.c:1627
+#: src/common/command.c:1675
 msgid "Default key bindings restored\n"
 msgstr "Anclajes de clave por defecto restaurados\n"
 
-#: src/common/command.c:1633
+#: src/common/command.c:1681
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 "%s \"-yes\" se requiere argumento para resetear las claves (por razones de "
 "seguridad)\n"
 
-#: src/common/command.c:1689
+#: src/common/command.c:1737
 msgid "Plugins loaded:\n"
 msgstr ""
 
-#: src/common/command.c:1703
+#: src/common/command.c:1753
 msgid "     message handlers:\n"
 msgstr ""
 
-#: src/common/command.c:1712
+#: src/common/command.c:1762
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr ""
 
-#: src/common/command.c:1719
+#: src/common/command.c:1769
 msgid "       (no message handler)\n"
 msgstr ""
 
-#: src/common/command.c:1724
+#: src/common/command.c:1774
 msgid "     command handlers:\n"
 msgstr ""
 
-#: src/common/command.c:1745
+#: src/common/command.c:1795
 msgid "       (no command handler)\n"
 msgstr ""
 
-#: src/common/command.c:1751
+#: src/common/command.c:1801
 msgid "  (no plugin)\n"
 msgstr ""
 
-#: src/common/command.c:1787
+#: src/common/command.c:1837
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
 msgstr ""
 
-#: src/common/command.c:1834
+#: src/common/command.c:1884
 msgid "No server.\n"
 msgstr "Ningún servidor.\n"
 
-#: src/common/command.c:1845
+#: src/common/command.c:1895
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "Servidor '%s' no encontrado.\n"
 
-#: src/common/command.c:1857
+#: src/common/command.c:1907
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr "%s falta el nombre de servidor para el comando \"%s\"\n"
 
-#: src/common/command.c:1865
+#: src/common/command.c:1915
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr ""
 "%s demasiados argumentos para el comando \"%s\", ignorando parámetros\n"
 
-#: src/common/command.c:1884
+#: src/common/command.c:1934
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr "%s servidor \"%s\" no encontrado para el comando \"%s\"\n"
 
-#: src/common/command.c:1892
+#: src/common/command.c:1942
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -3097,174 +3120,174 @@ msgstr ""
 "%s usted no puede eliminar el servidor \"%s\" ya que está usted conectado a "
 "él. Pruebe /disconnect %s antes.\n"
 
-#: src/common/command.c:1908 src/common/command.c:2054
-msgid "Server"
-msgstr "Servidor"
-
-#: src/common/command.c:1911
-msgid "has been deleted\n"
+#: src/common/command.c:1960
+#, fuzzy, c-format
+msgid "Server %s%s%s has been deleted\n"
 msgstr "ha sido eliminado\n"
 
-#: src/common/command.c:1926
+#: src/common/command.c:1977
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s faltan parámetros para el comando \"%s\"\n"
 
-#: src/common/command.c:1936
+#: src/common/command.c:1987
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr "%s el servidor \"%s\" ya existe, ¡no se puede crear!\n"
 
-#: src/common/command.c:1965 src/common/command.c:1993
-#: src/common/command.c:2006 src/common/command.c:2032
+#: src/common/command.c:2016 src/common/command.c:2044
+#: src/common/command.c:2057 src/common/command.c:2083
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr "%s falta contraseña para el comando \"%s\"\n"
 
-#: src/common/command.c:1978
+#: src/common/command.c:2029
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr "%s falta(n) usuario(s) para el parámetro \"%s\"\n"
 
-#: src/common/command.c:2019
+#: src/common/command.c:2070
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s falta comando para el parámetro \"%s\"\n"
 
-#: src/common/command.c:2057
-msgid "created\n"
-msgstr "creado\n"
+#: src/common/command.c:2105
+#, fuzzy, c-format
+msgid "Server %s%s%s created\n"
+msgstr "Servidor '%s' no encontrado.\n"
 
-#: src/common/command.c:2063
+#: src/common/command.c:2114
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s no es posible crear el servidor\n"
 
-#: src/common/command.c:2118
+#: src/common/command.c:2173
 msgid "(unknown)"
 msgstr "(desconocido)"
 
-#: src/common/command.c:2141
-msgid "(password hidden) "
+#: src/common/command.c:2196
+#, fuzzy, c-format
+msgid "%s(password hidden) "
 msgstr "(contraseña oculta) "
 
-#: src/common/command.c:2205
+#: src/common/command.c:2263
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s servidor \"%s\" no encontrado\n"
 
-#: src/common/command.c:2236 src/common/command.c:2282
+#: src/common/command.c:2296 src/common/command.c:2344
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s opción de configuración \"%s\" no encontrada\n"
 
-#: src/common/command.c:2241 src/common/command.c:2274
+#: src/common/command.c:2301 src/common/command.c:2336
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s valor incorrecto para la opción \"%s\"\n"
 
-#: src/common/command.c:2257
+#: src/common/command.c:2317
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr ""
 "%s la opción \"%s\" no puede ser modificada mientras WeeChat esté en "
 "ejecución\n"
 
-#: src/common/command.c:2362
+#: src/common/command.c:2427
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr "Ninguna opción de configuración encontrada con \"%s\"\n"
 
-#: src/common/command.c:2365
+#: src/common/command.c:2430
 msgid "No config option found\n"
 msgstr "Ninguna opción de configuración encontrada\n"
 
-#: src/common/command.c:2372
-msgid "Detail:\n"
+#: src/common/command.c:2437
+#, c-format
+msgid "%sDetail:\n"
 msgstr ""
 
-#: src/common/command.c:2376 src/common/weechat.c:287
+#: src/common/command.c:2443 src/common/weechat.c:301
 #, c-format
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr "  . tipo booleano (valores: 'on' u 'off')\n"
 
-#: src/common/command.c:2377 src/common/command.c:2400
-#: src/common/command.c:2406 src/common/command.c:2412
-#: src/common/weechat.c:288 src/common/weechat.c:311 src/common/weechat.c:317
-#: src/common/weechat.c:323
+#: src/common/command.c:2444 src/common/command.c:2467
+#: src/common/command.c:2473 src/common/command.c:2479
+#: src/common/weechat.c:302 src/common/weechat.c:325 src/common/weechat.c:331
+#: src/common/weechat.c:337
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . valor por defecto: '%s'\n"
 
-#: src/common/command.c:2382 src/common/weechat.c:293
+#: src/common/command.c:2449 src/common/weechat.c:307
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . tipo entero (valores: entre %d y %d)\n"
 
-#: src/common/command.c:2385 src/common/weechat.c:296
+#: src/common/command.c:2452 src/common/weechat.c:310
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . valor por defecto: %d\n"
 
-#: src/common/command.c:2389 src/common/weechat.c:300
+#: src/common/command.c:2456 src/common/weechat.c:314
 #, c-format
 msgid "  . type string (values: "
 msgstr "  . tipo cadena (valores: "
 
-#: src/common/command.c:2402 src/common/command.c:2408
-#: src/common/command.c:2414 src/common/weechat.c:313 src/common/weechat.c:319
-#: src/common/weechat.c:325
+#: src/common/command.c:2469 src/common/command.c:2475
+#: src/common/command.c:2481 src/common/weechat.c:327 src/common/weechat.c:333
+#: src/common/weechat.c:339
 msgid "empty"
 msgstr "vacío"
 
-#: src/common/command.c:2405 src/common/weechat.c:316
+#: src/common/command.c:2472 src/common/weechat.c:330
 #, c-format
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr "  . tipo color (color Curses ó Gtk, ver la documentación de WeeChat)\n"
 
-#: src/common/command.c:2411 src/common/weechat.c:322
+#: src/common/command.c:2478 src/common/weechat.c:336
 #, c-format
 msgid "  . type string (any string)\n"
 msgstr "  . tipo cadena (cualquier cadena)\n"
 
-#: src/common/command.c:2417 src/common/weechat.c:328
+#: src/common/command.c:2484 src/common/weechat.c:342
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . descripción: %s\n"
 
-#: src/common/command.c:2424
+#: src/common/command.c:2495
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr "opción/opciones de configuración encontrada(s) con \"%s\"\n"
 
-#: src/common/command.c:2427
+#: src/common/command.c:2498
 msgid "config option(s) found\n"
 msgstr "opción/opciones de configuración encontrada(s)\n"
 
-#: src/common/command.c:2448
+#: src/common/command.c:2519
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s alias o comando \"%s\" no encontrado\n"
 
-#: src/common/command.c:2458
+#: src/common/command.c:2529
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "Alias \"%s\" eliminado\n"
 
-#: src/common/command.c:2511
+#: src/common/command.c:2585
 msgid "ignore were removed.\n"
 msgstr ""
 
-#: src/common/command.c:2513
+#: src/common/command.c:2587
 msgid "ignore was removed.\n"
 msgstr ""
 
-#: src/common/command.c:2518
+#: src/common/command.c:2592
 #, c-format
 msgid "%s no ignore found\n"
 msgstr ""
 
-#: src/common/command.c:2543
+#: src/common/command.c:2617
 msgid "Opened windows:\n"
 msgstr "Ventanas abiertas:\n"
 
@@ -3312,24 +3335,24 @@ msgstr "La tuber
 msgid "%s cannot add a buffer to hotlist\n"
 msgstr "%s no es posible añadir un búfer a la lista caliente (hotlist)\n"
 
-#: src/common/log.c:118
+#: src/common/log.c:96
 msgid "Not enough memory to write log file for a buffer\n"
 msgstr ""
 "No hay suficiente memoria para escribir un fichero de log para un búfer\n"
 
-#: src/common/log.c:146
+#: src/common/log.c:124
 msgid "Unable to write log file for a buffer\n"
 msgstr "No es posible escribir un fichero de log para un búfer\n"
 
-#: src/common/log.c:150
+#: src/common/log.c:128
 msgid "****  Beginning of log  "
 msgstr "****  Comienzo del log (registro)  "
 
-#: src/common/log.c:164
+#: src/common/log.c:142
 msgid "****  End of log  "
 msgstr "****  Fin del log  "
 
-#: src/common/weechat.c:274
+#: src/common/weechat.c:288
 #, c-format
 msgid ""
 "WeeChat configuration options (~/.weechat/weechat.rc):\n"
@@ -3338,7 +3361,7 @@ msgstr ""
 "Opciones de configuración de WeeChat (~/.weechat/weechat.rc):\n"
 "\n"
 
-#: src/common/weechat.c:335
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "Moreover, you can define aliases in [alias] section, by adding lines like:\n"
@@ -3346,7 +3369,7 @@ msgstr ""
 "Además, usted puede definir alias en la sección [alias], añadiendo líneas "
 "como:\n"
 
-#: src/common/weechat.c:337
+#: src/common/weechat.c:351
 #, c-format
 msgid ""
 "where 'j' is alias name, and 'join' associated command.\n"
@@ -3355,62 +3378,62 @@ msgstr ""
 "donde 'j' es el nombre del alias, y 'join' el comando asociado.\n"
 "\n"
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:437
 #, c-format
 msgid "%s default keys:\n"
 msgstr "%s claves por defecto:\n"
 
-#: src/common/weechat.c:503
+#: src/common/weechat.c:525
 #, c-format
 msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
 msgstr "%s sintaxis inválida para el servidor IRC ('%s'), ignorado\n"
 
-#: src/common/weechat.c:516
+#: src/common/weechat.c:538
 #, c-format
 msgid "%s unable to create server ('%s'), ignored\n"
 msgstr "%s no es posible crear el servidor ('%s'), ignorado\n"
 
-#: src/common/weechat.c:525
+#: src/common/weechat.c:547
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr "%s parámetro desconocido '%s', ignorado\n"
 
-#: src/common/weechat.c:545
+#: src/common/weechat.c:567
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr "%s no es posible crear el directorio \"%s\"\n"
 
-#: src/common/weechat.c:571
+#: src/common/weechat.c:593
 #, c-format
 msgid "%s unable to get HOME directory\n"
 msgstr "%s no ha sido posible leer el directorio HOME\n"
 
-#: src/common/weechat.c:580
+#: src/common/weechat.c:602
 #, c-format
 msgid "%s not enough memory for home directory\n"
 msgstr "%s no hay suficiente memoria para el directorio home\n"
 
-#: src/common/weechat.c:590
+#: src/common/weechat.c:612
 #, c-format
 msgid "%s unable to create ~/.weechat directory\n"
 msgstr "%s no es posible crear el directorio ~/.weechat\n"
 
-#: src/common/weechat.c:603
+#: src/common/weechat.c:625
 #, c-format
 msgid "%s unable to create ~/.weechat/logs directory\n"
 msgstr "%s no es posible crear el directorio ~/.weechat/logs\n"
 
-#: src/common/weechat.c:646
+#: src/common/weechat.c:668
 #, c-format
 msgid "%s unable to create/append to log file (~/.weechat/%s)"
 msgstr "%s no es posible crear/añadir en el fichero de log (~/.weechat/%s)"
 
-#: src/common/weechat.c:669
-#, c-format
-msgid "%sWelcome to "
+#: src/common/weechat.c:696
+#, fuzzy, c-format
+msgid "%sWelcome to %s%s%s, %s\n"
 msgstr "%sBienvenido a "
 
-#: src/common/weechat.c:682 src/common/weechat.c:691
+#: src/common/weechat.c:710 src/common/weechat.c:720
 msgid "compiled on"
 msgstr "compilado en"
 
@@ -3422,118 +3445,114 @@ msgstr "Error WeeChat:"
 msgid "WeeChat Warning:"
 msgstr "Advertencia WeeChat:"
 
-#: src/common/weeconfig.c:103 src/common/weeconfig.c:104
+#: src/common/weeconfig.c:102 src/common/weeconfig.c:103
 msgid "set title for window (terminal for Curses GUI) with name & version"
 msgstr ""
 "define el título de la ventana (el terminal para la interfaz Curses) con el "
 "nombre y la versión"
 
-#: src/common/weeconfig.c:107 src/common/weeconfig.c:108
+#: src/common/weeconfig.c:106 src/common/weeconfig.c:107
 msgid "display WeeChat logo at startup"
 msgstr "mostrar el logotipo de WeeChat en el arranque"
 
-#: src/common/weeconfig.c:111 src/common/weeconfig.c:112
+#: src/common/weeconfig.c:110 src/common/weeconfig.c:111
 msgid "display WeeChat version at startup"
 msgstr "mostrar la versión de Weechat en el arranque"
 
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:114
 msgid "WeeChat slogan"
 msgstr "eslógan de WeeChat"
 
-#: src/common/weeconfig.c:116
+#: src/common/weeconfig.c:115
 msgid "WeeChat slogan (if empty, slogan is not used)"
 msgstr "eslógan de WeeChat (si está vacío, el eslógan no será utilizado)"
 
-#: src/common/weeconfig.c:119
+#: src/common/weeconfig.c:118
 msgid ""
 "ISO charset for decoding messages from server (used only if locale is UTF-8)"
 msgstr ""
 
-#: src/common/weeconfig.c:120
+#: src/common/weeconfig.c:119
 msgid ""
 "ISO charset for decoding messages from server (used only if locale is UTF-8) "
 "(if empty, messages are not converted if locale is UTF-8"
 msgstr ""
 
-#: src/common/weeconfig.c:124
+#: src/common/weeconfig.c:123
 msgid ""
 "UTF charset for decoding messages from server (used only if locale is not "
 "UTF-8)"
 msgstr ""
 
-#: src/common/weeconfig.c:125
+#: src/common/weeconfig.c:124
 msgid ""
 "UTF charset for decoding messages from server (used only if locale is not "
 "UTF-8) (if empty, messages are not converted if locale is not UTF-8"
 msgstr ""
 
-#: src/common/weeconfig.c:129
+#: src/common/weeconfig.c:128
 msgid "charset for encoding messages sent to server"
 msgstr "juego de caracteres para codificar los mensajes enviados al servidor"
 
-#: src/common/weeconfig.c:130
+#: src/common/weeconfig.c:129
 msgid ""
 "charset for encoding messages sent to server, examples: UFT-8, ISO-8859-1 "
 "(if empty, messages are not converted)"
 msgstr ""
 
-#: src/common/weeconfig.c:133
+#: src/common/weeconfig.c:132
 msgid "forces internal WeeChat charset (should be empty in most cases)"
 msgstr ""
 
-#: src/common/weeconfig.c:134
+#: src/common/weeconfig.c:133
 msgid ""
 "forces internal WeeChat charset (should be empty in most cases, that means "
 "detected charset is used)"
 msgstr ""
 
-#: src/common/weeconfig.c:137 src/common/weeconfig.c:138
+#: src/common/weeconfig.c:136 src/common/weeconfig.c:137
 msgid "use same buffer for all servers"
 msgstr ""
 
-#: src/common/weeconfig.c:141 src/common/weeconfig.c:142
+#: src/common/weeconfig.c:140 src/common/weeconfig.c:141
 msgid "timestamp for buffers"
 msgstr "fecha y hora para las búfers"
 
-#: src/common/weeconfig.c:145 src/common/weeconfig.c:146
+#: src/common/weeconfig.c:144 src/common/weeconfig.c:145
 msgid "display nick names with different colors"
 msgstr "mostrar nombres de usuario con colores diferentes"
 
-#: src/common/weeconfig.c:149 src/common/weeconfig.c:150
+#: src/common/weeconfig.c:148 src/common/weeconfig.c:149
 msgid "number of colors to use for nicks colors"
 msgstr ""
 
-#: src/common/weeconfig.c:153 src/common/weeconfig.c:154
+#: src/common/weeconfig.c:152 src/common/weeconfig.c:153
 msgid "display actions with different colors"
 msgstr "mostrar acciones con colores diferentes"
 
-#: src/common/weeconfig.c:157 src/common/weeconfig.c:158
-msgid "remove colors from incoming messages"
-msgstr "quitar colores en los mensajes entrantes"
-
-#: src/common/weeconfig.c:161
+#: src/common/weeconfig.c:156
 msgid "display nicklist window"
 msgstr "mostrar ventana de usuarios"
 
-#: src/common/weeconfig.c:162
+#: src/common/weeconfig.c:157
 msgid "display nicklist window (for channel windows)"
 msgstr "mostrar ventana de usuarios (para las ventanas de canal)"
 
-#: src/common/weeconfig.c:165
+#: src/common/weeconfig.c:160
 msgid "nicklist position"
 msgstr "posición de la ventana de usuarios"
 
-#: src/common/weeconfig.c:166
+#: src/common/weeconfig.c:161
 msgid "nicklist position (top, left, right (default), bottom)"
 msgstr ""
 "posición de la ventana de usuarios (arriba (top), izquierda (left), derecha "
 "(right, por defecto), abajo (bottom))"
 
-#: src/common/weeconfig.c:169
+#: src/common/weeconfig.c:164
 msgid "min size for nicklist"
 msgstr "tamaño mínimo para la ventana de usuarios"
 
-#: src/common/weeconfig.c:170
+#: src/common/weeconfig.c:165
 msgid ""
 "min size for nicklist (width or height, depending on look_nicklist_position "
 "(0 = no min size))"
@@ -3541,11 +3560,11 @@ msgstr ""
 "tamaño mínimo para la ventana de usuarios (ancho o alto, dependiendo de "
 "look_nicklist_position (0 = sin tamaño mínimo))"
 
-#: src/common/weeconfig.c:174
+#: src/common/weeconfig.c:169
 msgid "max size for nicklist"
 msgstr "tamaño máximo para la ventana de usuarios"
 
-#: src/common/weeconfig.c:175
+#: src/common/weeconfig.c:170
 msgid ""
 "max size for nicklist (width or height, depending on look_nicklist_position "
 "(0 = no max size; if min == max and > 0, then size is fixed))"
@@ -3554,45 +3573,45 @@ msgstr ""
 "look_nicklist_position (0 = sin tamaño máximo, si min == max y > 0, entonces "
 "se fija el tamaño))"
 
-#: src/common/weeconfig.c:179 src/common/weeconfig.c:180
+#: src/common/weeconfig.c:174 src/common/weeconfig.c:175
 msgid "text to display instead of nick when not connected"
 msgstr "texto a mostrar en lugar del nick cuando no se está conectado"
 
-#: src/common/weeconfig.c:183 src/common/weeconfig.c:184
+#: src/common/weeconfig.c:178 src/common/weeconfig.c:179
 msgid "display nick mode ((half)op/voice) before each nick"
 msgstr "mostrar modo del usuario ((half)op/voice) antes de cada usuario"
 
-#: src/common/weeconfig.c:187 src/common/weeconfig.c:188
+#: src/common/weeconfig.c:182 src/common/weeconfig.c:183
 msgid "display space if nick mode is not (half)op/voice"
 msgstr "mostrar un espacio si el modo de usuario no es (half)op/voice"
 
-#: src/common/weeconfig.c:191 src/common/weeconfig.c:192
+#: src/common/weeconfig.c:186 src/common/weeconfig.c:187
 msgid "the string inserted after nick completion"
 msgstr "la cadena mostrada tras la finalización de los nombres de usuario"
 
-#: src/common/weeconfig.c:195 src/common/weeconfig.c:196
+#: src/common/weeconfig.c:190 src/common/weeconfig.c:191
 msgid "chars ignored for nick completion"
 msgstr ""
 
-#: src/common/weeconfig.c:199 src/common/weeconfig.c:200
+#: src/common/weeconfig.c:194 src/common/weeconfig.c:195
 msgid "enable info bar"
 msgstr "activa la barra de información"
 
-#: src/common/weeconfig.c:203 src/common/weeconfig.c:204
+#: src/common/weeconfig.c:198 src/common/weeconfig.c:199
 msgid "timestamp for time in infobar"
 msgstr "fecha y hora para las conversaciones guardadas"
 
-#: src/common/weeconfig.c:207 src/common/weeconfig.c:208
+#: src/common/weeconfig.c:202 src/common/weeconfig.c:203
 msgid "display seconds in infobar time"
 msgstr "mostrar segundos en la hora de la barra de herramientas"
 
-#: src/common/weeconfig.c:211
+#: src/common/weeconfig.c:206
 msgid "delay (in seconds) for highlight messages in infobar"
 msgstr ""
 "retraso (en segundos) para la notificación de mensajes en la barra de "
 "información"
 
-#: src/common/weeconfig.c:212
+#: src/common/weeconfig.c:207
 msgid ""
 "delay (in seconds) for highlight messages in infobar (0 = disable highlight "
 "notifications in infobar)"
@@ -3600,340 +3619,340 @@ msgstr ""
 "retraso (en segundos) para la notificación de mensajes en la barra de "
 "información (0 = desactivar las notificaciones en la barra de información)"
 
-#: src/common/weeconfig.c:216
+#: src/common/weeconfig.c:211
 msgid "max number of names in hotlist"
 msgstr ""
 
-#: src/common/weeconfig.c:217
+#: src/common/weeconfig.c:212
 msgid ""
 "max number of names in hotlist (0 = no name displayed, only buffer numbers)"
 msgstr ""
 
-#: src/common/weeconfig.c:220
+#: src/common/weeconfig.c:215
 msgid "level for displaying names in hotlist"
 msgstr ""
 
-#: src/common/weeconfig.c:221
+#: src/common/weeconfig.c:216
 msgid ""
 "level for displaying names in hotlist (combination of: 1=join/part, "
 "2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
 msgstr ""
 
-#: src/common/weeconfig.c:225
+#: src/common/weeconfig.c:220
 msgid "max length of names in hotlist"
 msgstr ""
 
-#: src/common/weeconfig.c:226
+#: src/common/weeconfig.c:221
 msgid "max length of names in hotlist (0 = no limit)"
 msgstr ""
 
-#: src/common/weeconfig.c:229 src/common/weeconfig.c:230
+#: src/common/weeconfig.c:224 src/common/weeconfig.c:225
 msgid "display special message when day changes"
 msgstr ""
 
-#: src/common/weeconfig.c:233 src/common/weeconfig.c:234
+#: src/common/weeconfig.c:228 src/common/weeconfig.c:229
 msgid "timestamp for date displayed when day changed"
 msgstr ""
 
-#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
+#: src/common/weeconfig.c:294 src/common/weeconfig.c:295
 msgid "color for title bar"
 msgstr "color para la barra de título"
 
-#: src/common/weeconfig.c:303 src/common/weeconfig.c:304
+#: src/common/weeconfig.c:298 src/common/weeconfig.c:299
 msgid "background for title bar"
 msgstr "color de fondo para la barra de título"
 
-#: src/common/weeconfig.c:309 src/common/weeconfig.c:310
+#: src/common/weeconfig.c:304 src/common/weeconfig.c:305
 msgid "color for chat text"
 msgstr "color para el texto de conversación"
 
-#: src/common/weeconfig.c:313
+#: src/common/weeconfig.c:308
 msgid "color for time"
 msgstr "color para la hora"
 
-#: src/common/weeconfig.c:314
+#: src/common/weeconfig.c:309
 msgid "color for time in chat window"
 msgstr "color para la hora en la ventana de conversación"
 
-#: src/common/weeconfig.c:317
+#: src/common/weeconfig.c:312
 msgid "color for time separator"
 msgstr "color para el separador de la hora"
 
-#: src/common/weeconfig.c:318
+#: src/common/weeconfig.c:313
 msgid "color for time separator (chat window)"
 msgstr "color para el separador de la hora (ventana de conversación)"
 
-#: src/common/weeconfig.c:321 src/common/weeconfig.c:322
+#: src/common/weeconfig.c:316 src/common/weeconfig.c:317
 msgid "color for 1st and 3rd char of prefix"
 msgstr "color para el primer o tercer carácter de prefijo"
 
-#: src/common/weeconfig.c:325 src/common/weeconfig.c:326
+#: src/common/weeconfig.c:320 src/common/weeconfig.c:321
 msgid "color for middle char of prefix"
 msgstr "color para el carácter de en medio del prefijo"
 
-#: src/common/weeconfig.c:329 src/common/weeconfig.c:330
+#: src/common/weeconfig.c:324 src/common/weeconfig.c:325
 msgid "color for server name"
 msgstr ""
 
-#: src/common/weeconfig.c:333 src/common/weeconfig.c:334
+#: src/common/weeconfig.c:328 src/common/weeconfig.c:329
 msgid "color for join arrow (prefix)"
 msgstr ""
 
-#: src/common/weeconfig.c:337 src/common/weeconfig.c:338
+#: src/common/weeconfig.c:332 src/common/weeconfig.c:333
 msgid "color for part/quit arrow (prefix)"
 msgstr ""
 
-#: src/common/weeconfig.c:341
+#: src/common/weeconfig.c:336
 msgid "color for nicks in actions"
 msgstr "color para los nombres de usuario en las acciones"
 
-#: src/common/weeconfig.c:342
+#: src/common/weeconfig.c:337
 msgid "color for nicks in actions (chat window)"
 msgstr ""
 "color para los nombres de usuario en las acciones (ventana de conversación)"
 
-#: src/common/weeconfig.c:345
+#: src/common/weeconfig.c:340
 msgid "color for hostnames"
 msgstr "color para los nombres de máquina"
 
-#: src/common/weeconfig.c:346
+#: src/common/weeconfig.c:341
 msgid "color for hostnames (chat window)"
 msgstr "color para los nombres de máquina (ventana de conversación)"
 
-#: src/common/weeconfig.c:349
+#: src/common/weeconfig.c:344
 msgid "color for channel names in actions"
 msgstr "color para los nombres de canal en las acciones"
 
-#: src/common/weeconfig.c:350
+#: src/common/weeconfig.c:345
 msgid "color for channel names in actions (chat window)"
 msgstr ""
 "color para los nombres de canal en las acciones (ventana de conversación)"
 
-#: src/common/weeconfig.c:353
+#: src/common/weeconfig.c:348
 msgid "color for dark separators"
 msgstr "color para los separadores oscuros"
 
-#: src/common/weeconfig.c:354
+#: src/common/weeconfig.c:349
 msgid "color for dark separators (chat window)"
 msgstr "color para los separadores oscuros (ventana de conversación)"
 
-#: src/common/weeconfig.c:357
+#: src/common/weeconfig.c:352
 msgid "color for highlighted nick"
 msgstr "color para el alias subrayado"
 
-#: src/common/weeconfig.c:358
+#: src/common/weeconfig.c:353
 msgid "color for highlighted nick (chat window)"
 msgstr "color para el alias subrayado (ventana de conversación)"
 
-#: src/common/weeconfig.c:361
+#: src/common/weeconfig.c:356
 msgid "background for chat"
 msgstr "color de fondo para la conversación"
 
-#: src/common/weeconfig.c:362
+#: src/common/weeconfig.c:357
 msgid "background for chat window"
 msgstr "color de fondo para la ventana de conversación"
 
-#: src/common/weeconfig.c:367 src/common/weeconfig.c:368
+#: src/common/weeconfig.c:362 src/common/weeconfig.c:363
 msgid "color for status bar"
 msgstr "color para la barra de estado"
 
-#: src/common/weeconfig.c:371 src/common/weeconfig.c:372
+#: src/common/weeconfig.c:366 src/common/weeconfig.c:367
 msgid "color for status bar delimiters"
 msgstr "color para los delimitadores de la barra de estado"
 
-#: src/common/weeconfig.c:375 src/common/weeconfig.c:376
+#: src/common/weeconfig.c:370 src/common/weeconfig.c:371
 msgid "color for current channel in status bar"
 msgstr ""
 
-#: src/common/weeconfig.c:379
+#: src/common/weeconfig.c:374
 msgid "color for window with new messages"
 msgstr "color para una ventana con mensajes nuevos"
 
-#: src/common/weeconfig.c:380
+#: src/common/weeconfig.c:375
 msgid "color for window with new messages (status bar)"
 msgstr "color para una ventana con mensajes nuevos (barra de estado)"
 
-#: src/common/weeconfig.c:383
+#: src/common/weeconfig.c:378
 msgid "color for window with private message"
 msgstr ""
 
-#: src/common/weeconfig.c:384
+#: src/common/weeconfig.c:379
 msgid "color for window with private message (status bar)"
 msgstr ""
 
-#: src/common/weeconfig.c:387
+#: src/common/weeconfig.c:382
 msgid "color for window with highlight"
 msgstr "color para una ventana con resaltado"
 
-#: src/common/weeconfig.c:388
+#: src/common/weeconfig.c:383
 msgid "color for window with highlight (status bar)"
 msgstr "color para una ventana con resaltado (barra de estado)"
 
-#: src/common/weeconfig.c:391
+#: src/common/weeconfig.c:386
 msgid "color for window with new data (not messages)"
 msgstr "color para una ventana con nuevos datos (no mensajes)"
 
-#: src/common/weeconfig.c:392
+#: src/common/weeconfig.c:387
 msgid "color for window with new data (not messages) (status bar)"
 msgstr ""
 "color para una ventana con nuevos datos (no mensajes) (barra de estado)"
 
-#: src/common/weeconfig.c:395
+#: src/common/weeconfig.c:390
 msgid "color for \"-MORE-\" text"
 msgstr "color para el texto \"-MÁS-\""
 
-#: src/common/weeconfig.c:396
+#: src/common/weeconfig.c:391
 msgid "color for window with new data (status bar)"
 msgstr "color para una ventana con nuevos datos (barra de estado)"
 
-#: src/common/weeconfig.c:399 src/common/weeconfig.c:400
+#: src/common/weeconfig.c:394 src/common/weeconfig.c:395
 msgid "background for status window"
 msgstr "color de fondo para la ventana de estado"
 
-#: src/common/weeconfig.c:405 src/common/weeconfig.c:406
+#: src/common/weeconfig.c:400 src/common/weeconfig.c:401
 msgid "color for info bar text"
 msgstr "color para el texto de la barra de información"
 
-#: src/common/weeconfig.c:409 src/common/weeconfig.c:410
+#: src/common/weeconfig.c:404 src/common/weeconfig.c:405
 msgid "color for infobar delimiters"
 msgstr "color para los delimitadores de la barra de información"
 
-#: src/common/weeconfig.c:413 src/common/weeconfig.c:414
+#: src/common/weeconfig.c:408 src/common/weeconfig.c:409
 msgid "color for info bar highlight notification"
 msgstr "color para la notificación en la barra de información"
 
-#: src/common/weeconfig.c:417 src/common/weeconfig.c:418
+#: src/common/weeconfig.c:412 src/common/weeconfig.c:413
 msgid "background for info bar window"
 msgstr "color de fondo para la ventana de la barra de información"
 
-#: src/common/weeconfig.c:423 src/common/weeconfig.c:424
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
 msgid "color for input text"
 msgstr "color para el texto de entrada"
 
-#: src/common/weeconfig.c:427 src/common/weeconfig.c:428
+#: src/common/weeconfig.c:422 src/common/weeconfig.c:423
 msgid "color for input text (channel name)"
 msgstr "color para el texto de entrada (nombre de canal)"
 
-#: src/common/weeconfig.c:431 src/common/weeconfig.c:432
+#: src/common/weeconfig.c:426 src/common/weeconfig.c:427
 msgid "color for input text (nick name)"
 msgstr "color para el texto de entrada (alias)"
 
-#: src/common/weeconfig.c:435 src/common/weeconfig.c:436
+#: src/common/weeconfig.c:430 src/common/weeconfig.c:431
 msgid "color for input text (delimiters)"
 msgstr ""
 
-#: src/common/weeconfig.c:439 src/common/weeconfig.c:440
+#: src/common/weeconfig.c:434 src/common/weeconfig.c:435
 msgid "background for input window"
 msgstr "color de fondo para la ventana de entrada"
 
-#: src/common/weeconfig.c:445 src/common/weeconfig.c:446
+#: src/common/weeconfig.c:440 src/common/weeconfig.c:441
 msgid "color for nicknames"
 msgstr "color para los nombres de usuario"
 
-#: src/common/weeconfig.c:449 src/common/weeconfig.c:450
+#: src/common/weeconfig.c:444 src/common/weeconfig.c:445
 msgid "color for away nicknames"
 msgstr "color para los usuarios ausentes"
 
-#: src/common/weeconfig.c:453
+#: src/common/weeconfig.c:448
 msgid "color for chan owner symbol"
 msgstr "color para el símbolo de propietario de canal"
 
-#: src/common/weeconfig.c:454
+#: src/common/weeconfig.c:449
 msgid "color for chan owner symbol (specific to unrealircd)"
 msgstr ""
 "color para el símbolo de propietario de canal (especificado en unrealircd)"
 
-#: src/common/weeconfig.c:457
+#: src/common/weeconfig.c:452
 msgid "color for chan admin symbol"
 msgstr "color para el símbolo de administrador de canal"
 
-#: src/common/weeconfig.c:458
+#: src/common/weeconfig.c:453
 msgid "color for chan admin symbol (specific to unrealircd)"
 msgstr ""
 "color para el símbolo de administrador de canal (especificado en unrealircd)"
 
-#: src/common/weeconfig.c:461 src/common/weeconfig.c:462
+#: src/common/weeconfig.c:456 src/common/weeconfig.c:457
 msgid "color for operator symbol"
 msgstr "color para el símbolo de operador"
 
-#: src/common/weeconfig.c:465 src/common/weeconfig.c:466
+#: src/common/weeconfig.c:460 src/common/weeconfig.c:461
 msgid "color for half-operator symbol"
 msgstr "color para el símbolo de semi-operador"
 
-#: src/common/weeconfig.c:469 src/common/weeconfig.c:470
+#: src/common/weeconfig.c:464 src/common/weeconfig.c:465
 msgid "color for voice symbol"
 msgstr "color para el símbolo de voz"
 
-#: src/common/weeconfig.c:473 src/common/weeconfig.c:474
+#: src/common/weeconfig.c:468 src/common/weeconfig.c:469
 msgid "color for '+' when scrolling nicks"
 msgstr "color para '+' al desplazar nicks"
 
-#: src/common/weeconfig.c:477 src/common/weeconfig.c:478
+#: src/common/weeconfig.c:472 src/common/weeconfig.c:473
 msgid "color for nick separator"
 msgstr "color para el separador de alias"
 
-#: src/common/weeconfig.c:481 src/common/weeconfig.c:482
+#: src/common/weeconfig.c:476 src/common/weeconfig.c:477
 msgid "color for local nick"
 msgstr "color para el alias local"
 
-#: src/common/weeconfig.c:485 src/common/weeconfig.c:486
-#: src/common/weeconfig.c:489 src/common/weeconfig.c:490
-#: src/common/weeconfig.c:493 src/common/weeconfig.c:494
-#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
-#: src/common/weeconfig.c:501 src/common/weeconfig.c:502
-#: src/common/weeconfig.c:505 src/common/weeconfig.c:506
-#: src/common/weeconfig.c:509 src/common/weeconfig.c:510
-#: src/common/weeconfig.c:513 src/common/weeconfig.c:514
-#: src/common/weeconfig.c:517 src/common/weeconfig.c:518
-#: src/common/weeconfig.c:521 src/common/weeconfig.c:522
+#: src/common/weeconfig.c:480 src/common/weeconfig.c:481
+#: src/common/weeconfig.c:484 src/common/weeconfig.c:485
+#: src/common/weeconfig.c:488 src/common/weeconfig.c:489
+#: src/common/weeconfig.c:492 src/common/weeconfig.c:493
+#: src/common/weeconfig.c:496 src/common/weeconfig.c:497
+#: src/common/weeconfig.c:500 src/common/weeconfig.c:501
+#: src/common/weeconfig.c:504 src/common/weeconfig.c:505
+#: src/common/weeconfig.c:508 src/common/weeconfig.c:509
+#: src/common/weeconfig.c:512 src/common/weeconfig.c:513
+#: src/common/weeconfig.c:516 src/common/weeconfig.c:517
 msgid "color for nick"
 msgstr ""
 
-#: src/common/weeconfig.c:525 src/common/weeconfig.c:526
+#: src/common/weeconfig.c:520 src/common/weeconfig.c:521
 msgid "color for other nick in private window"
 msgstr "color para el otro alias en la ventana privada"
 
-#: src/common/weeconfig.c:529 src/common/weeconfig.c:530
+#: src/common/weeconfig.c:524 src/common/weeconfig.c:525
 msgid "background for nicknames"
 msgstr "color de fondo para los nombres de usuario"
 
-#: src/common/weeconfig.c:535
+#: src/common/weeconfig.c:530
 msgid "color for selected DCC"
 msgstr "color para el DCC seleccionado"
 
-#: src/common/weeconfig.c:536
+#: src/common/weeconfig.c:531
 msgid "color for selected DCC (chat window)"
 msgstr "color para el DCC seleccionado (ventana de conversación)"
 
-#: src/common/weeconfig.c:539 src/common/weeconfig.c:540
+#: src/common/weeconfig.c:534 src/common/weeconfig.c:535
 msgid "color for \"waiting\" dcc status"
 msgstr "color para el estado dcc \"esperando\""
 
-#: src/common/weeconfig.c:543 src/common/weeconfig.c:544
+#: src/common/weeconfig.c:538 src/common/weeconfig.c:539
 msgid "color for \"connecting\" dcc status"
 msgstr "color para el estado dcc \"conectando\""
 
-#: src/common/weeconfig.c:547 src/common/weeconfig.c:548
+#: src/common/weeconfig.c:542 src/common/weeconfig.c:543
 msgid "color for \"active\" dcc status"
 msgstr "color para el estado dcc \"activo\""
 
-#: src/common/weeconfig.c:551 src/common/weeconfig.c:552
+#: src/common/weeconfig.c:546 src/common/weeconfig.c:547
 msgid "color for \"done\" dcc status"
 msgstr "color para el estado dcc \"terminado\""
 
-#: src/common/weeconfig.c:555 src/common/weeconfig.c:556
+#: src/common/weeconfig.c:550 src/common/weeconfig.c:551
 msgid "color for \"failed\" dcc status"
 msgstr "color para el estado dcc \"fallo\""
 
-#: src/common/weeconfig.c:559 src/common/weeconfig.c:560
+#: src/common/weeconfig.c:554 src/common/weeconfig.c:555
 msgid "color for \"aborted\" dcc status"
 msgstr "color para el estado dcc \"abortado\""
 
-#: src/common/weeconfig.c:573
+#: src/common/weeconfig.c:568
 msgid "max lines in history (per window)"
 msgstr "número máximo de líneas en el histórico (por ventana)"
 
-#: src/common/weeconfig.c:574
+#: src/common/weeconfig.c:569
 msgid ""
 "maximum number of lines in history for one server/channel/private window (0 "
 "= unlimited)"
@@ -3941,401 +3960,416 @@ msgstr ""
 "número máximo de líneas en el histórico para un servidor/canal/privado (0 = "
 "ilimitado)"
 
-#: src/common/weeconfig.c:578
+#: src/common/weeconfig.c:573
 msgid "max user commands in history"
 msgstr "número máximo de comandos de usuario en el histórico"
 
-#: src/common/weeconfig.c:579
+#: src/common/weeconfig.c:574
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr "número máximo de comandos de usuario en el histórico (0 = ilimitado)"
 
-#: src/common/weeconfig.c:596 src/common/weeconfig.c:597
+#: src/common/weeconfig.c:591 src/common/weeconfig.c:592
 msgid "automatically log server messages"
 msgstr "registrar automáticamente los mensajes de servidor"
 
-#: src/common/weeconfig.c:600 src/common/weeconfig.c:601
+#: src/common/weeconfig.c:595 src/common/weeconfig.c:596
 msgid "automatically log channel chats"
 msgstr "registrar automáticamente las conversaciones de canal"
 
-#: src/common/weeconfig.c:604 src/common/weeconfig.c:605
+#: src/common/weeconfig.c:599 src/common/weeconfig.c:600
 msgid "automatically log private chats"
 msgstr "registrar automáticamente las conversaciones privadas"
 
-#: src/common/weeconfig.c:608 src/common/weeconfig.c:609
+#: src/common/weeconfig.c:603 src/common/weeconfig.c:604
 msgid "log messages from plugins (scripts)"
 msgstr "registrar mensajes de plugins (scripts)"
 
-#: src/common/weeconfig.c:612
+#: src/common/weeconfig.c:607
 msgid "path for log files"
 msgstr "ruta para los archivos de registro (logs)"
 
-#: src/common/weeconfig.c:613
+#: src/common/weeconfig.c:608
 msgid "path for WeeChat log files"
 msgstr "ruta para los archivos de registro (logs) de WeeChat"
 
-#: src/common/weeconfig.c:616
+#: src/common/weeconfig.c:611
 msgid "timestamp for log"
 msgstr "fecha y hora para las conversaciones registradas"
 
-#: src/common/weeconfig.c:617
+#: src/common/weeconfig.c:612
 msgid "timestamp for log (see man strftime for date/time specifiers)"
 msgstr ""
 "fecha y hora para los registros (ver man strftime para el formato de fecha/"
 "hora)"
 
-#: src/common/weeconfig.c:620 src/common/weeconfig.c:621
+#: src/common/weeconfig.c:615 src/common/weeconfig.c:616
 msgid "hide password displayed by nickserv"
 msgstr "ocultar contraseña mostrada por nickserv"
 
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:639
 msgid "display message to all channels when away"
 msgstr "mostrar mensaje en todos los canales cuando se está ausente"
 
-#: src/common/weeconfig.c:643
+#: src/common/weeconfig.c:640
 msgid "display message to all channels when (un)marking as away"
 msgstr ""
 "mostrar mensaje en todos los canales cuando se vuelva del estado ausente"
 
-#: src/common/weeconfig.c:646 src/common/weeconfig.c:647
+#: src/common/weeconfig.c:643 src/common/weeconfig.c:644
 msgid "default message when away"
 msgstr "mensaje por defecto para el estado ausente"
 
-#: src/common/weeconfig.c:650 src/common/weeconfig.c:651
+#: src/common/weeconfig.c:647 src/common/weeconfig.c:648
 msgid "default part message (leaving channel)"
 msgstr "mensaje por defecto de salida (saliendo de un canal)"
 
-#: src/common/weeconfig.c:654
+#: src/common/weeconfig.c:651
 msgid "default quit message"
 msgstr "mensaje de fin por defecto"
 
-#: src/common/weeconfig.c:655
+#: src/common/weeconfig.c:652
 msgid ""
 "default quit message ('%v' will be replaced by WeeChat version in string)"
 msgstr ""
 "mensaje de fin por defecto ('%v' será reemplazado por la versión de WeeChat "
 "en la cadena)"
 
-#: src/common/weeconfig.c:658 src/common/weeconfig.c:659
+#: src/common/weeconfig.c:655 src/common/weeconfig.c:656
 msgid "display notices as private messages"
 msgstr ""
 
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:659
 msgid "interval between two checks for away"
 msgstr "intervalo entre dos comprobaciones de ausencia"
 
-#: src/common/weeconfig.c:663
+#: src/common/weeconfig.c:660
 msgid "interval between two checks for away (in minutes, 0 = never check)"
 msgstr ""
 "intervalo entre dos comprobaciones de ausencia (en minutos, 0 = no comprobar)"
 
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:663
 msgid "interval between two checks for lag"
 msgstr "intervalo entre dos medidas de lag (retraso)"
 
-#: src/common/weeconfig.c:667
+#: src/common/weeconfig.c:664
 msgid "interval between two checks for lag (in seconds)"
 msgstr "intervalo entre dos medidas de lag (en segundos)"
 
-#: src/common/weeconfig.c:670
+#: src/common/weeconfig.c:667
 msgid "minimum lag to show"
 msgstr "lag (retraso) mínimo a mostrar"
 
-#: src/common/weeconfig.c:671
+#: src/common/weeconfig.c:668
 msgid "minimum lag to show (in seconds)"
 msgstr "lag mínimo a mostrar (en segundos)"
 
-#: src/common/weeconfig.c:674
+#: src/common/weeconfig.c:671
 msgid "disconnect after important lag"
 msgstr "desconexión tras un lag importante"
 
-#: src/common/weeconfig.c:675
+#: src/common/weeconfig.c:672
 msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
 msgstr ""
 "desconexión tras un lag importante (en minutos, 0 = no desconectar nunca)"
 
-#: src/common/weeconfig.c:678 src/common/weeconfig.c:679
+#: src/common/weeconfig.c:675 src/common/weeconfig.c:676
 msgid "create a FIFO pipe for remote control"
 msgstr "crea una tubería FIFO para control remoto"
 
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:679
 msgid "list of words to highlight"
 msgstr ""
 
-#: src/common/weeconfig.c:683
+#: src/common/weeconfig.c:680
 msgid ""
 "comma separated list of words to highlight (case insensitive comparison, "
 "words may begin or end with \"*\" for partial match)"
 msgstr ""
 
-#: src/common/weeconfig.c:705
+#: src/common/weeconfig.c:684 src/common/weeconfig.c:685
+#, fuzzy
+msgid "keep colors from incoming messages"
+msgstr "quitar colores en los mensajes entrantes"
+
+#: src/common/weeconfig.c:688
+msgid "allow user to send colors"
+msgstr ""
+
+#: src/common/weeconfig.c:689
+msgid ""
+"allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %"
+"U=underline, %R=reverse)"
+msgstr ""
+
+#: src/common/weeconfig.c:711
 msgid "automatically accept dcc files"
 msgstr "aceptar automáticamente los ficheros dcc"
 
-#: src/common/weeconfig.c:706
+#: src/common/weeconfig.c:712
 msgid "automatically accept incoming dcc files"
 msgstr "aceptar automáticamente los ficheros dcc entrantes"
 
-#: src/common/weeconfig.c:709
+#: src/common/weeconfig.c:715
 msgid "automatically accept dcc chats"
 msgstr "aceptar automáticamente las peticiones de conversación dcc"
 
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:716
 msgid "automatically accept dcc chats (use carefully!)"
 msgstr ""
 "aceptar automáticamente las peticiones de conversación dcc (¡utilizar con "
 "precaución!)"
 
-#: src/common/weeconfig.c:713
+#: src/common/weeconfig.c:719
 msgid "timeout for dcc request"
 msgstr "tiempo de espera (timeout) para la petición dcc"
 
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:720
 msgid "timeout for dcc request (in seconds)"
 msgstr "tiempo de espera para la petición dcc (en segundos)"
 
-#: src/common/weeconfig.c:717
+#: src/common/weeconfig.c:723
 msgid "block size for dcc packets"
 msgstr "tamaño de bloque para los paquetes dcc"
 
-#: src/common/weeconfig.c:718
+#: src/common/weeconfig.c:724
 msgid "block size for dcc packets in bytes (default: 65536)"
 msgstr "tamaño de bloque para los paquetes dcc en bytes (por defecto: 65536)"
 
-#: src/common/weeconfig.c:721
+#: src/common/weeconfig.c:727
 msgid "allowed ports for outgoing dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:728
 msgid ""
 "restricts outgoing dcc to use only ports in the given range (useful for NAT) "
 "(syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, empty value "
 "means any port)"
 msgstr ""
 
-#: src/common/weeconfig.c:727
+#: src/common/weeconfig.c:733
 msgid "IP address for outgoing dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:728
+#: src/common/weeconfig.c:734
 msgid ""
 "IP or DNS address used for outgoing dcc (if empty, local interface IP is "
 "used)"
 msgstr ""
 
-#: src/common/weeconfig.c:732
+#: src/common/weeconfig.c:738
 msgid "path for incoming files with dcc"
 msgstr "ruta para los ficheros recibidos con dcc"
 
-#: src/common/weeconfig.c:733
+#: src/common/weeconfig.c:739
 msgid "path for writing incoming files with dcc (default: user home)"
 msgstr ""
 "ruta para los ficheros recibidos con dcc (por defecto: directorio home del "
 "usuario)"
 
-#: src/common/weeconfig.c:736
+#: src/common/weeconfig.c:742
 msgid "default path for sending files with dcc"
 msgstr "ruta por defecto para enviar ficheros con dcc"
 
-#: src/common/weeconfig.c:737
+#: src/common/weeconfig.c:743
 msgid ""
 "path for reading files when sending thru dcc (when no path is specified)"
 msgstr ""
 "ruta para la lectura de ficheros cuando se envían a través de dcc (cuando no "
 "se especifica una ruta)"
 
-#: src/common/weeconfig.c:740 src/common/weeconfig.c:741
+#: src/common/weeconfig.c:746 src/common/weeconfig.c:747
 msgid "convert spaces to underscores when sending files"
 msgstr "convertir los espacios a subrayados cuando se envían los ficheros"
 
-#: src/common/weeconfig.c:744
+#: src/common/weeconfig.c:750
 msgid "automatically rename dcc files if already exists"
 msgstr "renombrar automáticamente los ficheros dcc si ya existen"
 
-#: src/common/weeconfig.c:745
+#: src/common/weeconfig.c:751
 msgid "rename incoming files if already exists (add '.1', '.2', ...)"
 msgstr ""
 "renombrar los ficheros recibidos si ya existen (añadir '.1', '.2', ...)"
 
-#: src/common/weeconfig.c:748
+#: src/common/weeconfig.c:754
 msgid "automatically resume aborted transfers"
 msgstr "continuar automáticamente las transferencias canceladas"
 
-#: src/common/weeconfig.c:749
+#: src/common/weeconfig.c:755
 msgid ""
 "automatically resume dcc transfer if connection with remote host is loosed"
 msgstr ""
 "continuar automáticamente la transferencia dcc si se ha perdido la conexión "
 "con la máquina remota"
 
-#: src/common/weeconfig.c:768
+#: src/common/weeconfig.c:774
 msgid "use proxy"
 msgstr "utilizar un proxy"
 
-#: src/common/weeconfig.c:769
+#: src/common/weeconfig.c:775
 msgid "use a proxy server to connect to irc server"
 msgstr "utilizar un proxy para conectarse al servidor irc"
 
-#: src/common/weeconfig.c:772
+#: src/common/weeconfig.c:778
 msgid "proxy type"
 msgstr "tipo de proxy"
 
-#: src/common/weeconfig.c:773
+#: src/common/weeconfig.c:779
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "tipo de proxy(http (por defecto), socks4, socks5)"
 
-#: src/common/weeconfig.c:776
+#: src/common/weeconfig.c:782
 msgid "use ipv6 proxy"
 msgstr "usar proxy ipv6"
 
-#: src/common/weeconfig.c:777
+#: src/common/weeconfig.c:783
 msgid "connect to proxy in ipv6"
 msgstr "conectar al proxy en ipv6"
 
-#: src/common/weeconfig.c:780
+#: src/common/weeconfig.c:786
 msgid "proxy address"
 msgstr "dirección del proxy"
 
-#: src/common/weeconfig.c:781
+#: src/common/weeconfig.c:787
 msgid "proxy server address (IP or hostname)"
 msgstr "dirección del servidor proxy (IP o nombre de máquina)"
 
-#: src/common/weeconfig.c:784
+#: src/common/weeconfig.c:790
 msgid "port for proxy"
 msgstr "puerto para el proxy"
 
-#: src/common/weeconfig.c:785
+#: src/common/weeconfig.c:791
 msgid "port for connecting to proxy server"
 msgstr "puerto para conectarse al servidor proxy"
 
-#: src/common/weeconfig.c:788
+#: src/common/weeconfig.c:794
 msgid "proxy username"
 msgstr "nombre de usuario del proxy"
 
-#: src/common/weeconfig.c:789
+#: src/common/weeconfig.c:795
 msgid "username for proxy server"
 msgstr "nombre de usuario para el servidor proxy"
 
-#: src/common/weeconfig.c:792
+#: src/common/weeconfig.c:798
 msgid "proxy password"
 msgstr "contraseña para el proxy"
 
-#: src/common/weeconfig.c:793
+#: src/common/weeconfig.c:799
 msgid "password for proxy server"
 msgstr "contraseña para el servidor proxy"
 
-#: src/common/weeconfig.c:806 src/common/weeconfig.c:807
+#: src/common/weeconfig.c:812 src/common/weeconfig.c:813
 msgid "path for searching plugins"
 msgstr ""
 
-#: src/common/weeconfig.c:810
+#: src/common/weeconfig.c:816
 msgid "list of plugins to load automatically"
 msgstr ""
 
-#: src/common/weeconfig.c:811
+#: src/common/weeconfig.c:817
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found (names may be partial, for example \"perl\" is ok "
 "for \"libperl.so\")"
 msgstr ""
 
-#: src/common/weeconfig.c:816
+#: src/common/weeconfig.c:822
 msgid "standard plugins extension in filename"
 msgstr ""
 
-#: src/common/weeconfig.c:817
+#: src/common/weeconfig.c:823
 msgid ""
 "standard plugins extension in filename, used for autoload (if empty, then "
 "all files are loaded when autoload is \"*\")"
 msgstr ""
 
-#: src/common/weeconfig.c:834
+#: src/common/weeconfig.c:840
 msgid "server name"
 msgstr "nombre de servidor"
 
-#: src/common/weeconfig.c:835
+#: src/common/weeconfig.c:841
 msgid "name associated to IRC server (for display only)"
 msgstr "nombre asociado al servidor IRC (para mostrar solamente)"
 
-#: src/common/weeconfig.c:838
+#: src/common/weeconfig.c:844
 msgid "automatically connect to server"
 msgstr "conexión automática al servidor"
 
-#: src/common/weeconfig.c:839
+#: src/common/weeconfig.c:845
 msgid "automatically connect to server when WeeChat is starting"
 msgstr "conexión automática al servidor cuando WeeChat esté arrancando"
 
-#: src/common/weeconfig.c:842
+#: src/common/weeconfig.c:848
 msgid "automatically reconnect to server"
 msgstr "reconexión automática al servidor"
 
-#: src/common/weeconfig.c:843
+#: src/common/weeconfig.c:849
 msgid "automatically reconnect to server when disconnected"
 msgstr "reconexión automática al servidor tras una desconexión"
 
-#: src/common/weeconfig.c:846
+#: src/common/weeconfig.c:852
 msgid "delay before trying again to reconnect"
 msgstr "esperar antes de intentar de nuevo una reconexión"
 
-#: src/common/weeconfig.c:847
+#: src/common/weeconfig.c:853
 msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr ""
 "espera (en segundos) antes de intentar de nuevo una reconexión al servidor"
 
-#: src/common/weeconfig.c:850
+#: src/common/weeconfig.c:856
 msgid "server address or hostname"
 msgstr "dirección o nombre de máquina del servidor"
 
-#: src/common/weeconfig.c:851
+#: src/common/weeconfig.c:857
 msgid "IP address or hostname of IRC server"
 msgstr "dirección IP o nombre de máquina del servidor IRC"
 
-#: src/common/weeconfig.c:854
+#: src/common/weeconfig.c:860
 msgid "port for IRC server"
 msgstr "puerto para el servidor IRC"
 
-#: src/common/weeconfig.c:855
+#: src/common/weeconfig.c:861
 msgid "port for connecting to server"
 msgstr "puerto para conectarse al servidor"
 
-#: src/common/weeconfig.c:858 src/common/weeconfig.c:859
+#: src/common/weeconfig.c:864 src/common/weeconfig.c:865
 msgid "use IPv6 protocol for server communication"
 msgstr "usar el protocolo IPv6 para la comunicación del servidor"
 
-#: src/common/weeconfig.c:862 src/common/weeconfig.c:863
+#: src/common/weeconfig.c:868 src/common/weeconfig.c:869
 msgid "use SSL for server communication"
 msgstr "usar SSL para la comunicación del servidor"
 
-#: src/common/weeconfig.c:866
+#: src/common/weeconfig.c:872
 msgid "server password"
 msgstr "contraseña para el servidor"
 
-#: src/common/weeconfig.c:867
+#: src/common/weeconfig.c:873
 msgid "password for IRC server"
 msgstr "contraseña para el servidor IRC"
 
-#: src/common/weeconfig.c:870
+#: src/common/weeconfig.c:876
 msgid "nickname for server"
 msgstr "nombre de usuario para el servidor"
 
-#: src/common/weeconfig.c:871
+#: src/common/weeconfig.c:877
 msgid "nickname to use on IRC server"
 msgstr "nombre de usuario a utilizar en el servidor IRC"
 
-#: src/common/weeconfig.c:874
+#: src/common/weeconfig.c:880
 msgid "alternate nickname for server"
 msgstr "nombre de usuario alternativo para el servidor"
 
-#: src/common/weeconfig.c:875
+#: src/common/weeconfig.c:881
 msgid "alternate nickname to use on IRC server (if nickname is already used)"
 msgstr ""
 "nombre de usuario alternativo para el servidor IRC (si el nombre de usuario "
 "ya está en uso)"
 
-#: src/common/weeconfig.c:878
+#: src/common/weeconfig.c:884
 msgid "2nd alternate nickname for server"
 msgstr "segundo nombre de usuario alternativo para el servidor"
 
-#: src/common/weeconfig.c:879
+#: src/common/weeconfig.c:885
 msgid ""
 "2nd alternate nickname to use on IRC server (if alternate nickname is "
 "already used)"
@@ -4343,31 +4377,31 @@ msgstr ""
 "segundo nombre de usuario alternativo a utilizar en el servidor IRC (si el "
 "nombre de usuario alternativo ya está en uso)"
 
-#: src/common/weeconfig.c:882
+#: src/common/weeconfig.c:888
 msgid "user name for server"
 msgstr "nombre de usuario para el servidor"
 
-#: src/common/weeconfig.c:883
+#: src/common/weeconfig.c:889
 msgid "user name to use on IRC server"
 msgstr "nombre de usuario para el servidor IRC"
 
-#: src/common/weeconfig.c:886
+#: src/common/weeconfig.c:892
 msgid "real name for server"
 msgstr "nombre real para el servidor"
 
-#: src/common/weeconfig.c:887
+#: src/common/weeconfig.c:893
 msgid "real name to use on IRC server"
 msgstr "nombre real para el servidor IRC"
 
-#: src/common/weeconfig.c:890 src/common/weeconfig.c:891
+#: src/common/weeconfig.c:896 src/common/weeconfig.c:897
 msgid "first command to run when connected to server"
 msgstr "primer comando a ejecutar cuando se conecte a un servidor"
 
-#: src/common/weeconfig.c:894
+#: src/common/weeconfig.c:900
 msgid "delay (in seconds) after command was executed"
 msgstr "espera (en segundos) después de que el comando sea ejecutado"
 
-#: src/common/weeconfig.c:895
+#: src/common/weeconfig.c:901
 msgid ""
 "delay (in seconds) after command was executed (example: give some time for "
 "authentication)"
@@ -4375,11 +4409,11 @@ msgstr ""
 "espera (en segundos) después de que el comando sea ejecutado (ejemplo: dar "
 "algo de tiempo para la autenticación)"
 
-#: src/common/weeconfig.c:898
+#: src/common/weeconfig.c:904
 msgid "list of channels to join when connected to server"
 msgstr "lista de canales a unirse cuando se conecte a un servidor"
 
-#: src/common/weeconfig.c:899
+#: src/common/weeconfig.c:905
 msgid ""
 "comma separated list of channels to join when connected to server (example: "
 "\"#chan1,#chan2,#chan3 key1,key2\")"
@@ -4387,15 +4421,15 @@ msgstr ""
 "lista de canales (separados por comas) a unirse cuando se conecte a un "
 "servidor (ejemplo: \"#chan1,#chan2,#chan3 key1,key2\")"
 
-#: src/common/weeconfig.c:902 src/common/weeconfig.c:903
+#: src/common/weeconfig.c:908 src/common/weeconfig.c:909
 msgid "automatically rejoin channels when kicked"
 msgstr "unirse de nuevo automáticamente a los canales cuando sea expulsado"
 
-#: src/common/weeconfig.c:906
+#: src/common/weeconfig.c:912
 msgid "notify levels for channels of this server"
 msgstr "niveles de notificación para canales de este servidor"
 
-#: src/common/weeconfig.c:907
+#: src/common/weeconfig.c:913
 msgid ""
 "comma separated list of notify levels for channels of this server (format: "
 "#channel:1,..)"
@@ -4403,62 +4437,62 @@ msgstr ""
 "lista separada por comas de niveles de notificación para canales de este "
 "servidor (formato: #canal:1,...)"
 
-#: src/common/weeconfig.c:1463
+#: src/common/weeconfig.c:1469
 #, c-format
 msgid "%s %s, line %d: new server, but previous was incomplete\n"
 msgstr "%s %s, línea %d: nuevo servidor, pero el anterior estaba incompleto\n"
 
-#: src/common/weeconfig.c:1472
+#: src/common/weeconfig.c:1478
 #, c-format
 msgid "%s %s, line %d: server '%s' already exists\n"
 msgstr "%s %s, línea %d: el servidor '%s' ya existe\n"
 
-#: src/common/weeconfig.c:1487
+#: src/common/weeconfig.c:1493
 #, c-format
 msgid "%s %s, line %d: unable to create server\n"
 msgstr "%s %s, línea %d: no es posible crear el servidor\n"
 
-#: src/common/weeconfig.c:1527
+#: src/common/weeconfig.c:1533
 #, c-format
 msgid "%s unable to assign default int with string (\"%s\")\n"
 msgstr "%s no es posible asignar el valor entero con la cadena (\"%s\")\n"
 
-#: src/common/weeconfig.c:1538
+#: src/common/weeconfig.c:1544
 #, c-format
 msgid "%s unable to assign default color (\"%s\")\n"
 msgstr "%s no es posible asignar el color por defecto (\"%s\")\n"
 
-#: src/common/weeconfig.c:1578
+#: src/common/weeconfig.c:1584
 #, c-format
 msgid "%s config file \"%s\" not found.\n"
 msgstr "%s fichero de configuración \"%s\" no encontrado.\n"
 
-#: src/common/weeconfig.c:1610
+#: src/common/weeconfig.c:1616
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
 msgstr "%s %s, línea %d: sintaxis inválida, falta \"]\"\n"
 
-#: src/common/weeconfig.c:1627
+#: src/common/weeconfig.c:1633
 #, c-format
 msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
 msgstr "%s %s, línea %d: identificador de sección desconocido (\"%s\")\n"
 
-#: src/common/weeconfig.c:1645
+#: src/common/weeconfig.c:1651
 #, c-format
 msgid "%s %s, line %d: invalid section for option, line is ignored\n"
 msgstr "%s %s, línea %d: sección inválida para la opción, línea ignorada\n"
 
-#: src/common/weeconfig.c:1690 src/common/weeconfig.c:1716
+#: src/common/weeconfig.c:1696 src/common/weeconfig.c:1722
 #, c-format
 msgid "%s %s, line %d: invalid option \"%s\"\n"
 msgstr "%s %s, línea %d: opción \"%s\" inválida\n"
 
-#: src/common/weeconfig.c:1696
+#: src/common/weeconfig.c:1702
 #, c-format
 msgid "%s %s, line %d: invalid ignore options \"%s\"\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1727
+#: src/common/weeconfig.c:1733
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value foroption '%s'\n"
@@ -4467,7 +4501,7 @@ msgstr ""
 "%s %s, línea %d: valor inválido para la opción '%s'\n"
 "Esperado: valor booleano: 'off' u 'on'\n"
 
-#: src/common/weeconfig.c:1736
+#: src/common/weeconfig.c:1742
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4476,7 +4510,7 @@ msgstr ""
 "%s %s, línea %d: valor inválido para la opción %s'\n"
 "Esperado: entero comprendido entre %d y %d\n"
 
-#: src/common/weeconfig.c:1747
+#: src/common/weeconfig.c:1753
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4485,21 +4519,21 @@ msgstr ""
 "%s %s, línea %d: valor inválido para la opción '%s'\n"
 "Esperado: una de estas cadenas: "
 
-#: src/common/weeconfig.c:1763
+#: src/common/weeconfig.c:1769
 #, c-format
 msgid "%s %s, line %d: invalid color name for option '%s'\n"
 msgstr "%s %s, línea %d: nombre de color inválido para la opción '%s'\n"
 
-#: src/common/weeconfig.c:1832
+#: src/common/weeconfig.c:1838
 #, c-format
 msgid "%s: creating default config file...\n"
 msgstr "%s: creando fichero de configuración por defecto...\n"
 
-#: src/common/weeconfig.c:1833
+#: src/common/weeconfig.c:1839
 msgid "Creating default config file\n"
 msgstr "Creando fichero de configuración por defecto\n"
 
-#: src/common/weeconfig.c:1836 src/common/weeconfig.c:2033
+#: src/common/weeconfig.c:1842 src/common/weeconfig.c:2039
 #, c-format
 msgid ""
 "#\n"
@@ -4508,7 +4542,7 @@ msgstr ""
 "#\n"
 "# %s: fichero de configuración, creado por %s v%s el %s"
 
-#: src/common/weeconfig.c:1840 src/common/weeconfig.c:2037
+#: src/common/weeconfig.c:1846 src/common/weeconfig.c:2043
 #, c-format
 msgid ""
 "# WARNING! Be careful when editing this file, WeeChat writes this file when "
@@ -4516,6 +4550,118 @@ msgid ""
 "#\n"
 msgstr ""
 
-#: src/common/weeconfig.c:2030
+#: src/common/weeconfig.c:2036
 msgid "Saving config to disk\n"
 msgstr "Guardar configuración a disco\n"
+
+#~ msgid "%s Command '%s' failed!\n"
+#~ msgstr "%s ¡Ha fallado el comando '%s' !\n"
+
+#~ msgid "by"
+#~ msgstr "por"
+
+#~ msgid " has joined "
+#~ msgstr " se ha unido "
+
+#~ msgid " has kicked "
+#~ msgstr " se ha expulsado "
+
+#~ msgid " has killed "
+#~ msgstr "ha matado"
+
+#~ msgid " from server"
+#~ msgstr "del servidor"
+
+#~ msgid " from server\n"
+#~ msgstr "del servidor\n"
+
+#~ msgid "mode changed by"
+#~ msgstr "modo cambiado por"
+
+#~ msgid "You are "
+#~ msgstr "Usted es "
+
+#~ msgid " is "
+#~ msgstr "es "
+
+#~ msgid "reply from"
+#~ msgstr "respuesta de"
+
+#~ msgid ": %ld.%ld seconds\n"
+#~ msgstr ": %ld.%ld segundos\n"
+
+#~ msgid " has left "
+#~ msgstr " ha salido "
+
+#~ msgid "received from"
+#~ msgstr "recibido de"
+
+#~ msgid "has quit"
+#~ msgstr "ha salido"
+
+#~ msgid " to: \"%s\"\n"
+#~ msgstr " a: \"%s\"\n"
+
+#~ msgid "idle: "
+#~ msgstr "sin actividad: "
+
+#~ msgid "signon at: "
+#~ msgstr "firmado el: "
+
+#~ msgid "Channels: "
+#~ msgstr "Canales: "
+
+#~ msgid "Topic for "
+#~ msgstr "El tema para "
+
+#~ msgid " is: \"%s\"\n"
+#~ msgstr " es: \"%s\"\n"
+
+#~ msgid "has invited"
+#~ msgstr "ha invitado"
+
+#~ msgid "Nicks "
+#~ msgstr "Usuarios "
+
+#~ msgid "Channel "
+#~ msgstr "Canal "
+
+#~ msgid "banned by"
+#~ msgstr "baneado por"
+
+#~ msgid ": ok!\n"
+#~ msgstr ": ok!\n"
+
+#~ msgid "Connected to "
+#~ msgstr "Conectado al "
+
+#~ msgid "via DCC chat\n"
+#~ msgstr "con charla DCC\n"
+
+#~ msgid "Incoming DCC file from "
+#~ msgstr "Recibir fichero DCC de "
+
+#~ msgid " bytes\n"
+#~ msgstr " bytes\n"
+
+#~ msgid "Sending DCC file to "
+#~ msgstr "Enviar fichero DCC a "
+
+#~ msgid "Not enough memory for new message\n"
+#~ msgstr ""
+#~ "No hay suficiente memoria para el mensaje de la barra de información\n"
+
+#~ msgid "Channel: "
+#~ msgstr "Canal: "
+
+#~ msgid " (server: "
+#~ msgstr " (servidor: "
+
+#~ msgid "Private with: "
+#~ msgstr "Privado con: "
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid "created\n"
+#~ msgstr "creado\n"
diff --git a/weechat/po/fr.po b/weechat/po/fr.po
index 491663de8..2c4013b29 100644
--- a/weechat/po/fr.po
+++ b/weechat/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.6-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-10-30 10:52+0100\n"
-"PO-Revision-Date: 2005-10-30 10:53+0100\n"
+"POT-Creation-Date: 2005-11-04 12:35+0100\n"
+"PO-Revision-Date: 2005-11-04 12:35+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,88 +20,88 @@ msgstr ""
 msgid "%s cannot allocate new nick\n"
 msgstr "%s impossible d'allouer un nouveau pseudo\n"
 
-#: src/irc/irc-server.c:180 src/common/weeconfig.c:1968
+#: src/irc/irc-server.c:181 src/common/weeconfig.c:1974
 msgid "Unable to get user's name"
 msgstr "Impossible de déterminer le nom d'utilisateur"
 
-#: src/irc/irc-server.c:248
+#: src/irc/irc-server.c:249
 #, c-format
 msgid "%s cannot allocate new server\n"
 msgstr "%s impossible d'allouer un nouveau serveur\n"
 
-#: src/irc/irc-server.c:466
+#: src/irc/irc-server.c:467
 #, c-format
 msgid "%s error sending data to IRC server\n"
 msgstr "%s erreur d'envoi de données au serveur IRC\n"
 
-#: src/irc/irc-server.c:489 src/irc/irc-server.c:502 src/irc/irc-server.c:549
-#: src/irc/irc-server.c:562
+#: src/irc/irc-server.c:490 src/irc/irc-server.c:503 src/irc/irc-server.c:550
+#: src/irc/irc-server.c:563
 #, c-format
 msgid "%s not enough memory for received IRC message\n"
 msgstr "%s mémoire insuffisante pour un message IRC reçu\n"
 
-#: src/irc/irc-server.c:674
+#: src/irc/irc-server.c:675
 #, c-format
-msgid "%s Command '%s' failed!\n"
-msgstr "%s La commande '%s' a échoué !\n"
+msgid "%s Command \"%s\" failed!\n"
+msgstr "%s La commande \"%s\" a échoué !\n"
 
-#: src/irc/irc-server.c:680
+#: src/irc/irc-server.c:681
 #, c-format
 msgid "%s No command to execute!\n"
 msgstr "%s Pas de commande à exécuter !\n"
 
-#: src/irc/irc-server.c:686
+#: src/irc/irc-server.c:687
 #, c-format
-msgid "%s Unknown command: cmd=%s, host=%s, args=%s\n"
-msgstr "%s Commande inconnue: cmd=%s, hote=%s, params=%s\n"
+msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
+msgstr "%s Commande inconnue: cmd=\"%s\", hote=\"%s\", params=\"%s\"\n"
 
-#: src/irc/irc-server.c:737
+#: src/irc/irc-server.c:738
 #, c-format
 msgid "%s cannot read data from socket, disconnecting from server...\n"
 msgstr ""
 "%s impossible de lire des données sur la socket, déconnexion du serveur...\n"
 
-#: src/irc/irc-server.c:820
+#: src/irc/irc-server.c:821
 #, c-format
 msgid "%s: Reconnecting to server in %d seconds\n"
 msgstr "%s: Reconnexion au serveur dans %d secondes\n"
 
-#: src/irc/irc-server.c:854
+#: src/irc/irc-server.c:855
 #, c-format
 msgid "%s gnutls handshake failed\n"
 msgstr "%s le handshake gnutls a échoué\n"
 
-#: src/irc/irc-server.c:871
+#: src/irc/irc-server.c:872
 #, c-format
 msgid "%s proxy address \"%s\" not found\n"
 msgstr "%s adresse du proxy \"%s\" introuvable\n"
 
-#: src/irc/irc-server.c:875
+#: src/irc/irc-server.c:876
 #, c-format
 msgid "%s address \"%s\" not found\n"
 msgstr "%s adresse \"%s\" introuvable\n"
 
-#: src/irc/irc-server.c:885
+#: src/irc/irc-server.c:886
 #, c-format
 msgid "%s proxy IP address not found\n"
 msgstr "%s adresse IP du proxy introuvable\n"
 
-#: src/irc/irc-server.c:888
+#: src/irc/irc-server.c:889
 #, c-format
 msgid "%s IP address not found\n"
 msgstr "%s adresse IP introuvable\n"
 
-#: src/irc/irc-server.c:897
+#: src/irc/irc-server.c:898
 #, c-format
 msgid "%s proxy connection refused\n"
 msgstr "%s connexion au proxy refusée\n"
 
-#: src/irc/irc-server.c:900
+#: src/irc/irc-server.c:901
 #, c-format
 msgid "%s connection refused\n"
 msgstr "%s connexion refusée\n"
 
-#: src/irc/irc-server.c:908
+#: src/irc/irc-server.c:909
 #, c-format
 msgid ""
 "%s proxy fails to establish connection to server (check username/password if "
@@ -110,7 +110,7 @@ msgstr ""
 "%s le proxy n'a pas pu se connecter au serveur (vérifiez l'utilisateur/mot "
 "de passe si utilisés)\n"
 
-#: src/irc/irc-server.c:1387
+#: src/irc/irc-server.c:1388
 #, c-format
 msgid ""
 "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
@@ -118,57 +118,57 @@ msgstr ""
 "%s impossible de se connecter en SSL car WeeChat n'a pas été construit avec "
 "le support GNUtls\n"
 
-#: src/irc/irc-server.c:1396
+#: src/irc/irc-server.c:1397
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr "%s: connexion au serveur %s:%d%s%s via le proxy %s %s:%d%s...\n"
 
-#: src/irc/irc-server.c:1402
+#: src/irc/irc-server.c:1403
 #, c-format
 msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr "Connexion au serveur %s:%d%s%s via le proxy %s %s:%d%s...\n"
 
-#: src/irc/irc-server.c:1412
+#: src/irc/irc-server.c:1413
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s...\n"
 msgstr "%s: connexion au serveur %s:%d%s%s...\n"
 
-#: src/irc/irc-server.c:1416
+#: src/irc/irc-server.c:1417
 #, c-format
 msgid "Connecting to server %s:%d%s%s...\n"
 msgstr "Connexion au serveur %s:%d%s%s...\n"
 
-#: src/irc/irc-server.c:1434
+#: src/irc/irc-server.c:1435
 #, c-format
 msgid "%s gnutls init error\n"
 msgstr "%s erreur d'initialisation gnutls\n"
 
-#: src/irc/irc-server.c:1449
+#: src/irc/irc-server.c:1450
 #, c-format
 msgid "%s cannot create pipe\n"
 msgstr "%s impossible de créer le pipe\n"
 
-#: src/irc/irc-server.c:1464
+#: src/irc/irc-server.c:1465
 #, c-format
 msgid "%s cannot create socket\n"
 msgstr "%s impossible de créer la socket\n"
 
-#: src/irc/irc-server.c:1475
+#: src/irc/irc-server.c:1476
 #, c-format
 msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
 msgstr "%s impossible de paramétrer l'option socket \"SO_REUSEADDR\"\n"
 
-#: src/irc/irc-server.c:1486
+#: src/irc/irc-server.c:1487
 #, c-format
 msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
 msgstr "%s impossible de paramétrer l'option socket \"SO_KEEPALIVE\"\n"
 
-#: src/irc/irc-server.c:1517
+#: src/irc/irc-server.c:1518
 #, c-format
 msgid "%s: Reconnecting to server...\n"
 msgstr "%s: Reconnexion au serveur...\n"
 
-#: src/irc/irc-server.c:1567 src/irc/irc-server.c:1576
+#: src/irc/irc-server.c:1568 src/irc/irc-server.c:1577
 msgid "Disconnected from server!\n"
 msgstr "Déconnecté du serveur !\n"
 
@@ -970,7 +970,7 @@ msgstr ""
 #: src/irc/irc-commands.c:380 src/irc/irc-commands.c:381
 #: src/irc/irc-commands.c:382 src/irc/irc-commands.c:383
 #: src/irc/irc-commands.c:384 src/irc/irc-commands.c:385
-#: src/irc/irc-commands.c:490
+#: src/irc/irc-commands.c:491
 msgid "a server message"
 msgstr "un message du serveur"
 
@@ -1151,244 +1151,249 @@ msgid "you are now an IRC operator"
 msgstr "vous êtes maintenant un opérateur IRC"
 
 #: src/irc/irc-commands.c:387
+msgid "rehashing"
+msgstr "rechargement"
+
+#: src/irc/irc-commands.c:388
 msgid "server local time"
 msgstr "heure locale du serveur"
 
-#: src/irc/irc-commands.c:388
+#: src/irc/irc-commands.c:389
 msgid "no such nick/channel"
 msgstr "pas de tel utilisateur/canal"
 
-#: src/irc/irc-commands.c:390
+#: src/irc/irc-commands.c:391
 msgid "no such server"
 msgstr "pas de tel serveur"
 
-#: src/irc/irc-commands.c:392
+#: src/irc/irc-commands.c:393
 msgid "no such channel"
 msgstr "pas de tel canal"
 
-#: src/irc/irc-commands.c:394
+#: src/irc/irc-commands.c:395
 msgid "cannot send to channel"
 msgstr "impossible d'envoyer au canal"
 
-#: src/irc/irc-commands.c:396
+#: src/irc/irc-commands.c:397
 msgid "too many channels"
 msgstr "trop de canaux"
 
-#: src/irc/irc-commands.c:398 src/irc/irc-commands.c:400
+#: src/irc/irc-commands.c:399 src/irc/irc-commands.c:401
 msgid "was no such nick"
 msgstr "n'y avait pas de tel utilisateur"
 
-#: src/irc/irc-commands.c:402
+#: src/irc/irc-commands.c:403
 msgid "no origin"
 msgstr "pas d'origine"
 
-#: src/irc/irc-commands.c:404
+#: src/irc/irc-commands.c:405
 msgid "no services"
 msgstr "pas de service"
 
-#: src/irc/irc-commands.c:406
+#: src/irc/irc-commands.c:407
 msgid "no recipient"
 msgstr "pas de destinataire"
 
-#: src/irc/irc-commands.c:408
+#: src/irc/irc-commands.c:409
 msgid "no text to send"
 msgstr "pas de texte à envoyer"
 
-#: src/irc/irc-commands.c:410
+#: src/irc/irc-commands.c:411
 msgid "no toplevel"
 msgstr "pas de niveau supérieur"
 
-#: src/irc/irc-commands.c:412
+#: src/irc/irc-commands.c:413
 msgid "wilcard in toplevel domain"
 msgstr "caractère joker dans le domaine de niveau supérieur"
 
-#: src/irc/irc-commands.c:414
+#: src/irc/irc-commands.c:415
 msgid "unknown command"
 msgstr "commande inconnue"
 
-#: src/irc/irc-commands.c:416
+#: src/irc/irc-commands.c:417
 msgid "MOTD is missing"
 msgstr "MOTD est manquant"
 
-#: src/irc/irc-commands.c:418
+#: src/irc/irc-commands.c:419
 msgid "no administrative info"
 msgstr "pas d'information administrative"
 
-#: src/irc/irc-commands.c:420
+#: src/irc/irc-commands.c:421
 msgid "file error"
 msgstr "erreur de fichier"
 
-#: src/irc/irc-commands.c:422
+#: src/irc/irc-commands.c:423
 msgid "no nickname given"
 msgstr "pas d'utilisateur donné"
 
-#: src/irc/irc-commands.c:424
+#: src/irc/irc-commands.c:425
 msgid "erroneous nickname"
 msgstr "nom d'utilisateur erroné"
 
-#: src/irc/irc-commands.c:426
+#: src/irc/irc-commands.c:427
 msgid "nickname already in use"
 msgstr "nom d'utilisateur déjà en cours d'utilisation"
 
-#: src/irc/irc-commands.c:428
+#: src/irc/irc-commands.c:429
 msgid "nickname collision"
 msgstr "collision sur le nom d'utilisateur"
 
-#: src/irc/irc-commands.c:430
+#: src/irc/irc-commands.c:431
 msgid "not authorized to change nickname"
 msgstr "non autorisé à changer de pseudo"
 
-#: src/irc/irc-commands.c:432
+#: src/irc/irc-commands.c:433
 msgid "user not in channel"
 msgstr "utilisateur non présent dans le canal"
 
-#: src/irc/irc-commands.c:434
+#: src/irc/irc-commands.c:435
 msgid "not on channel"
 msgstr "non présent sur le canal"
 
-#: src/irc/irc-commands.c:436
+#: src/irc/irc-commands.c:437
 msgid "user already on channel"
 msgstr "utilisateur déjà sur le canal"
 
-#: src/irc/irc-commands.c:438
+#: src/irc/irc-commands.c:439
 msgid "user not logged in"
 msgstr "utilisateur non enregistré"
 
-#: src/irc/irc-commands.c:440
+#: src/irc/irc-commands.c:441
 msgid "summon has been disabled"
 msgstr "summon a été désactivé"
 
-#: src/irc/irc-commands.c:442
+#: src/irc/irc-commands.c:443
 msgid "users has been disabled"
 msgstr "users a été désactivé"
 
-#: src/irc/irc-commands.c:444
+#: src/irc/irc-commands.c:445
 msgid "you are not registered"
 msgstr "vous n'êtes pas enregistré"
 
-#: src/irc/irc-commands.c:446
+#: src/irc/irc-commands.c:447
 msgid "not enough parameters"
 msgstr "pas assez de paramètres"
 
-#: src/irc/irc-commands.c:448
+#: src/irc/irc-commands.c:449
 msgid "you may not register"
 msgstr "vous ne pouvez pas vous enregistrer"
 
-#: src/irc/irc-commands.c:450
+#: src/irc/irc-commands.c:451
 msgid "your host isn't among the privileged"
 msgstr "votre nom de machine n'est pas parmi les privilégiés"
 
-#: src/irc/irc-commands.c:452
+#: src/irc/irc-commands.c:453
 msgid "password incorrect"
 msgstr "mot de passe incorrect"
 
-#: src/irc/irc-commands.c:454
+#: src/irc/irc-commands.c:455
 msgid "you are banned from this server"
 msgstr "vous êtes banni de ce serveur"
 
-#: src/irc/irc-commands.c:456
+#: src/irc/irc-commands.c:457
 msgid "channel key already set"
 msgstr "clé du canal déjà définie"
 
-#: src/irc/irc-commands.c:458
+#: src/irc/irc-commands.c:459
 msgid "forwarding to another channel"
 msgstr "redirection vers un autre canal"
 
-#: src/irc/irc-commands.c:460
+#: src/irc/irc-commands.c:461
 msgid "channel is already full"
 msgstr "le canal est déjà plein"
 
-#: src/irc/irc-commands.c:462
+#: src/irc/irc-commands.c:463
 msgid "unknown mode char to me"
 msgstr "caractère de mode inconnu pour moi"
 
-#: src/irc/irc-commands.c:464
+#: src/irc/irc-commands.c:465
 msgid "cannot join channel (invite only)"
 msgstr "impossible de rejoindre le canal (invités seulement)"
 
-#: src/irc/irc-commands.c:466
+#: src/irc/irc-commands.c:467
 msgid "cannot join channel (banned from channel)"
 msgstr "impossible de rejoindre le canal (banni du canal)"
 
-#: src/irc/irc-commands.c:468
+#: src/irc/irc-commands.c:469
 msgid "cannot join channel (bad channel key)"
 msgstr "impossible de rejoindre le canal (mauvaise clé pour le canal)"
 
-#: src/irc/irc-commands.c:470
+#: src/irc/irc-commands.c:471
 msgid "bad channel mask"
 msgstr "mauvais masque de canal"
 
-#: src/irc/irc-commands.c:472
+#: src/irc/irc-commands.c:473
 msgid "channel doesn't support modes"
 msgstr "le canal ne supporte pas les modes"
 
-#: src/irc/irc-commands.c:474
+#: src/irc/irc-commands.c:475
 msgid "you're not an IRC operator"
 msgstr "vous n'êtres pas opérateur IRC"
 
-#: src/irc/irc-commands.c:476
+#: src/irc/irc-commands.c:477
 msgid "you're not channel operator"
 msgstr "vous n'êtes pas opérateur du canal"
 
-#: src/irc/irc-commands.c:478
+#: src/irc/irc-commands.c:479
 msgid "you can't kill a server!"
 msgstr "vous ne pouvez pas supprimer un serveur !"
 
-#: src/irc/irc-commands.c:480
+#: src/irc/irc-commands.c:481
 msgid "your connection is restricted!"
 msgstr "votre connexion est restreinte !"
 
-#: src/irc/irc-commands.c:482
+#: src/irc/irc-commands.c:483
 msgid "user is immune from kick/deop"
 msgstr "l'utilisateur est protégé des kick/deop"
 
-#: src/irc/irc-commands.c:484
+#: src/irc/irc-commands.c:485
 msgid "no O-lines for your host"
 msgstr "pas de O-lines pour votre nom de machine"
 
-#: src/irc/irc-commands.c:486
+#: src/irc/irc-commands.c:487
 msgid "unknown mode flag"
 msgstr "drapeau de mode inconnu"
 
-#: src/irc/irc-commands.c:488
+#: src/irc/irc-commands.c:489
 msgid "can't change mode for other users"
 msgstr "impossible de changer le mode pour les autres utilisateurs"
 
-#: src/irc/irc-commands.c:491
+#: src/irc/irc-commands.c:492
 msgid "whois (secure connection)"
 msgstr "qui est (connexion sécurisée)"
 
-#: src/irc/irc-display.c:170 src/common/command.c:873
-msgid "Server: "
-msgstr "Serveur: "
+#: src/irc/irc-display.c:180
+#, c-format
+msgid "%sServer: %s%s %s[%s%s%s]\n"
+msgstr "%sServeur: %s%s %s[%s%s%s]\n"
 
-#: src/irc/irc-display.c:175
+#: src/irc/irc-display.c:187
 msgid "connected"
 msgstr "connecté"
 
-#: src/irc/irc-display.c:175 src/common/command.c:899
+#: src/irc/irc-display.c:187
 msgid "not connected"
 msgstr "non connecté"
 
-#: src/irc/irc-display.c:179 src/irc/irc-display.c:184
-#: src/irc/irc-display.c:196 src/irc/irc-display.c:199
+#: src/irc/irc-display.c:191 src/irc/irc-display.c:195
+#: src/irc/irc-display.c:203 src/irc/irc-display.c:205
 msgid "yes"
 msgstr "oui"
 
-#: src/irc/irc-display.c:179 src/irc/irc-display.c:184
-#: src/irc/irc-display.c:196 src/irc/irc-display.c:199
+#: src/irc/irc-display.c:191 src/irc/irc-display.c:195
+#: src/irc/irc-display.c:203 src/irc/irc-display.c:205
 msgid "no"
 msgstr "non"
 
-#: src/irc/irc-display.c:181
+#: src/irc/irc-display.c:193
 msgid " (temporary server, will not be saved)"
 msgstr " (serveur temporaire, ne sera pas sauvé)"
 
-#: src/irc/irc-display.c:203
+#: src/irc/irc-display.c:208
 msgid "(hidden)"
 msgstr "(caché)"
 
-#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4718
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4674
 msgid "unknown"
 msgstr "inconnu"
 
@@ -1397,522 +1402,520 @@ msgstr "inconnu"
 msgid "%s: using local hostname \"%s\"\n"
 msgstr "%s: utilisation du nom de machine local \"%s\"\n"
 
-#: src/irc/irc-send.c:167 src/common/command.c:749
+#: src/irc/irc-send.c:166 src/common/command.c:760
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr "%s impossible de trouver le pseudo pour envoyer le message\n"
 
-#: src/irc/irc-send.c:329 src/irc/irc-send.c:357 src/irc/irc-send.c:544
-#: src/irc/irc-send.c:577 src/irc/irc-send.c:610 src/irc/irc-send.c:658
-#: src/irc/irc-send.c:694 src/irc/irc-send.c:761 src/irc/irc-send.c:818
-#: src/irc/irc-send.c:1160 src/irc/irc-send.c:1258 src/irc/irc-send.c:1737
-#: src/irc/irc-send.c:1851
+#: src/irc/irc-send.c:328 src/irc/irc-send.c:356 src/irc/irc-send.c:547
+#: src/irc/irc-send.c:580 src/irc/irc-send.c:613 src/irc/irc-send.c:661
+#: src/irc/irc-send.c:697 src/irc/irc-send.c:764 src/irc/irc-send.c:821
+#: src/irc/irc-send.c:1154 src/irc/irc-send.c:1254 src/irc/irc-send.c:1730
+#: src/irc/irc-send.c:1844
 #, c-format
 msgid "%s \"%s\" command can only be executed in a channel window\n"
 msgstr ""
 "%s la commande \"%s\" peut seulement être exécutée dans une fenêtre de "
 "canal\n"
 
-#: src/irc/irc-send.c:456 src/irc/irc-send.c:468 src/irc/irc-send.c:486
-#: src/irc/irc-send.c:1138 src/irc/irc-send.c:1231 src/irc/irc-send.c:1763
-#: src/common/command.c:1233 src/common/command.c:1647
-#: src/common/command.c:1781
+#: src/irc/irc-send.c:459 src/irc/irc-send.c:471 src/irc/irc-send.c:489
+#: src/irc/irc-send.c:1132 src/irc/irc-send.c:1227 src/irc/irc-send.c:1756
+#: src/common/command.c:1253 src/common/command.c:1695
+#: src/common/command.c:1831
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n"
 
-#: src/irc/irc-send.c:509 src/irc/irc-send.c:746 src/irc/irc-send.c:803
+#: src/irc/irc-send.c:512 src/irc/irc-send.c:749 src/irc/irc-send.c:806
 #, c-format
 msgid "%s wrong arguments for \"%s\" command\n"
 msgstr "%s paramètres invalides pour la commande \"%s\"\n"
 
-#: src/irc/irc-send.c:946 src/irc/irc-send.c:1013 src/irc/irc-send.c:1306
-#: src/irc/irc-send.c:1320 src/irc/irc-send.c:1664
+#: src/irc/irc-send.c:949 src/irc/irc-send.c:1016 src/irc/irc-send.c:1302
+#: src/irc/irc-send.c:1316 src/irc/irc-send.c:1657
 #, c-format
 msgid "%s \"%s\" command can not be executed on a server window\n"
 msgstr ""
 "%s la commande \"%s\" ne peut pas être exécutée dans une fenêtre serveur\n"
 
-#: src/irc/irc-send.c:1031 src/irc/irc-send.c:1056 src/irc/irc-recv.c:499
+#: src/irc/irc-send.c:1032 src/irc/irc-send.c:1055 src/irc/irc-recv.c:500
 #, c-format
 msgid "%s nick \"%s\" not found for \"%s\" command\n"
 msgstr "%s pseudo \"%s\" non trouvé pour la commande \"%s\"\n"
 
-#: src/irc/irc-send.c:1108 src/irc/irc-send.c:1416 src/irc/irc-recv.c:1238
-#: src/irc/irc-recv.c:2054 src/irc/irc-recv.c:2142
+#: src/irc/irc-send.c:1105 src/irc/irc-send.c:1412 src/irc/irc-recv.c:1230
+#: src/irc/irc-recv.c:2042 src/irc/irc-recv.c:2132
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
 
-#: src/irc/irc-send.c:1816
+#: src/irc/irc-send.c:1809
 #, c-format
 msgid "%s, compiled on %s %s\n"
 msgstr "%s, compilé le %s %s\n"
 
-#: src/irc/irc-recv.c:355
-msgid "You have been invited to "
-msgstr "Vous avez été invité sur "
+#: src/irc/irc-recv.c:362
+#, c-format
+msgid "You have been invited to %s%s%s by %s%s\n"
+msgstr "Vous avez été invité sur %s%s%s par %s%s\n"
 
-#: src/irc/irc-recv.c:358 src/irc/irc-recv.c:3994
-msgid "by"
-msgstr "par"
-
-#: src/irc/irc-recv.c:369 src/irc/irc-recv.c:463 src/irc/irc-recv.c:1012
-#: src/irc/irc-recv.c:1397 src/irc/irc-recv.c:1656 src/irc/irc-recv.c:3559
-#: src/irc/irc-recv.c:3581 src/irc/irc-recv.c:3642 src/irc/irc-recv.c:3714
+#: src/irc/irc-recv.c:376 src/irc/irc-recv.c:469 src/irc/irc-recv.c:1008
+#: src/irc/irc-recv.c:1386 src/irc/irc-recv.c:1645 src/irc/irc-recv.c:3520
+#: src/irc/irc-recv.c:3541 src/irc/irc-recv.c:3601 src/irc/irc-recv.c:3672
 #, c-format
 msgid "%s channel \"%s\" not found for \"%s\" command\n"
 msgstr "%s canal \"%s\" non trouvé pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:397
+#: src/irc/irc-recv.c:404
 #, c-format
 msgid "%s cannot create new channel \"%s\"\n"
 msgstr "%s impossible de créer le nouveau canal \"%s\"\n"
 
-#: src/irc/irc-recv.c:416
-msgid " has joined "
-msgstr " a rejoint "
+#: src/irc/irc-recv.c:415
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
+msgstr "%s%s %s(%s%s%s)%s a rejoint %s%s\n"
 
-#: src/irc/irc-recv.c:474
-msgid " has kicked "
-msgstr " a poussé dehors "
+#: src/irc/irc-recv.c:477
+#, c-format
+msgid "%s%s%s has kicked %s%s%s from %s%s"
+msgstr "%s%s%s a poussé dehors %s%s%s de %s%s"
 
-#: src/irc/irc-recv.c:478 src/common/command.c:1468
-msgid " from "
-msgstr " de "
+#: src/irc/irc-recv.c:562
+#, c-format
+msgid "%s%s%s has killed %s%s%s from server"
+msgstr "%s%s%s a tué %s%s%s du serveur"
 
-#: src/irc/irc-recv.c:564
-msgid " has killed "
-msgstr " a tué "
-
-#: src/irc/irc-recv.c:570
-msgid " from server"
-msgstr " du serveur"
-
-#: src/irc/irc-recv.c:580
-msgid " from server\n"
-msgstr " du serveur\n"
-
-#: src/irc/irc-recv.c:588
+#: src/irc/irc-recv.c:584
 #, c-format
 msgid "%s host \"%s\" not found for \"%s\" command\n"
 msgstr "%s la machine \"%s\" n'existe pas pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:629
+#: src/irc/irc-recv.c:625
 msgid "sets ban on"
 msgstr "instaure un bannissement sur"
 
-#: src/irc/irc-recv.c:630
+#: src/irc/irc-recv.c:626
 msgid "removes ban on"
 msgstr "supprime le banissement sur"
 
-#: src/irc/irc-recv.c:654
+#: src/irc/irc-recv.c:650
 msgid "sets exception on"
 msgstr "définit une exception sur"
 
-#: src/irc/irc-recv.c:655
+#: src/irc/irc-recv.c:651
 msgid "removes exception on"
 msgstr "supprime l'exception sur"
 
-#: src/irc/irc-recv.c:679
+#: src/irc/irc-recv.c:675
 msgid "sets mode +f"
 msgstr "définit le mode +f"
 
-#: src/irc/irc-recv.c:680
+#: src/irc/irc-recv.c:676
 msgid "removes mode +f"
 msgstr "supprime le mode +f"
 
-#: src/irc/irc-recv.c:704
+#: src/irc/irc-recv.c:700
 msgid "gives half channel operator status to"
 msgstr "donne le droit demi-opérateur à"
 
-#: src/irc/irc-recv.c:705
+#: src/irc/irc-recv.c:701
 msgid "removes half channel operator status from"
 msgstr "supprime le droit demi-opérateur à"
 
-#: src/irc/irc-recv.c:732
+#: src/irc/irc-recv.c:728
 msgid "sets invite-only channel flag"
 msgstr "définit le canal en mode invité seulement"
 
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:729
 msgid "removes invite-only channel flag"
 msgstr "supprime le mode invité seulement pour le canal"
 
-#: src/irc/irc-recv.c:750
+#: src/irc/irc-recv.c:746
 msgid "sets channel key to"
 msgstr "définit la clé du canal à"
 
-#: src/irc/irc-recv.c:751
+#: src/irc/irc-recv.c:747
 msgid "removes channel key"
 msgstr "supprime la clé du canal"
 
-#: src/irc/irc-recv.c:782
+#: src/irc/irc-recv.c:778
 msgid "sets the user limit to"
 msgstr "définit la limite d'utilisateurs à"
 
-#: src/irc/irc-recv.c:783
+#: src/irc/irc-recv.c:779
 msgid "removes user limit"
 msgstr "supprime la limite d'utilisateurs"
 
-#: src/irc/irc-recv.c:805
+#: src/irc/irc-recv.c:801
 msgid "sets moderated channel flag"
 msgstr "instaure la modération sur le canal"
 
-#: src/irc/irc-recv.c:806
+#: src/irc/irc-recv.c:802
 msgid "removes moderated channel flag"
 msgstr "supprime la modération sur le canal"
 
-#: src/irc/irc-recv.c:816
+#: src/irc/irc-recv.c:812
 msgid "sets messages from channel only flag"
 msgstr "interdit aux utilisateurs en dehors du canal d'y écrire"
 
-#: src/irc/irc-recv.c:817
+#: src/irc/irc-recv.c:813
 msgid "removes messages from channel only flag"
 msgstr "autorise tout utilisateur à écrire sur le canal"
 
-#: src/irc/irc-recv.c:834
+#: src/irc/irc-recv.c:830
 msgid "gives channel operator status to"
 msgstr "donne le droit opérateur à"
 
-#: src/irc/irc-recv.c:835
+#: src/irc/irc-recv.c:831
 msgid "removes channel operator status from"
 msgstr "supprime le droit opérateur à"
 
-#: src/irc/irc-recv.c:862
+#: src/irc/irc-recv.c:858
 msgid "sets private channel flag"
 msgstr "définit le canal comme privé"
 
-#: src/irc/irc-recv.c:863
+#: src/irc/irc-recv.c:859
 msgid "removes private channel flag"
 msgstr "supprime le mode privé pour le canal"
 
-#: src/irc/irc-recv.c:880
+#: src/irc/irc-recv.c:876
 msgid "sets quiet on"
 msgstr "définit le mode muet sur"
 
-#: src/irc/irc-recv.c:881
+#: src/irc/irc-recv.c:877
 msgid "removes quiet on"
 msgstr "supprime le mode muet sur"
 
-#: src/irc/irc-recv.c:898
+#: src/irc/irc-recv.c:894
 msgid "sets secret channel flag"
 msgstr "définit le canal comme secret"
 
-#: src/irc/irc-recv.c:899
+#: src/irc/irc-recv.c:895
 msgid "removes secret channel flag"
 msgstr "supprime le mode secret pour le canal"
 
-#: src/irc/irc-recv.c:909
+#: src/irc/irc-recv.c:905
 msgid "sets topic protection"
 msgstr "active la protection du titre"
 
-#: src/irc/irc-recv.c:910
+#: src/irc/irc-recv.c:906
 msgid "removes topic protection"
 msgstr "supprime la protection du titre"
 
-#: src/irc/irc-recv.c:927
+#: src/irc/irc-recv.c:923
 msgid "gives voice to"
 msgstr "donne la voix à"
 
-#: src/irc/irc-recv.c:928
+#: src/irc/irc-recv.c:924
 msgid "removes voice from"
 msgstr "supprime la voix de"
 
-#: src/irc/irc-recv.c:971 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1475
-#: src/irc/irc-recv.c:2209
+#: src/irc/irc-recv.c:967 src/irc/irc-recv.c:1053 src/irc/irc-recv.c:1464
+#: src/irc/irc-recv.c:2201
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr "%s commande \"%s\" reçue sans host\n"
 
-#: src/irc/irc-recv.c:981
+#: src/irc/irc-recv.c:977
 #, c-format
 msgid "%s \"%s\" command received without channel or nickname\n"
 msgstr "%s commande \"%s\" reçue sans canal ou utilisateur\n"
 
-#: src/irc/irc-recv.c:1029
-msgid "mode changed by"
-msgstr "mode changé par"
+#: src/irc/irc-recv.c:1019
+#, c-format
+msgid "%s[%s%s%s/%s%s%s]%s mode changed by %s%s\n"
+msgstr "%s[%s%s%s/%s%s%s]%s mode changé par %s%s\n"
 
-#: src/irc/irc-recv.c:1091
-msgid "You are "
-msgstr "Vous êtes "
+#: src/irc/irc-recv.c:1088
+#, c-format
+msgid "You are now known as %s%s\n"
+msgstr "Vous êtes maintenant connu sous le nom %s%s\n"
 
-#: src/irc/irc-recv.c:1098
-msgid " is "
-msgstr " est "
+#: src/irc/irc-recv.c:1092
+#, c-format
+msgid "%s%s%s is now known as %s%s\n"
+msgstr "%s%s%s est maintenant connu sous le nom %s%s\n"
 
-#: src/irc/irc-recv.c:1102
-msgid "now known as "
-msgstr "maintenant connu sous le nom "
-
-#: src/irc/irc-recv.c:1169
+#: src/irc/irc-recv.c:1159
 #, c-format
 msgid "%s nickname not found for \"%s\" command\n"
 msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:1185 src/irc/irc-recv.c:1217
-msgid "reply from"
-msgstr "réponse de"
-
-#: src/irc/irc-recv.c:1220
+#: src/irc/irc-recv.c:1173
 #, c-format
-msgid ": %ld.%ld seconds\n"
-msgstr ": %ld.%ld secondes\n"
+msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
+msgstr "CTCP %sVERSION%s réponse de %s%s%s: %s\n"
 
-#: src/irc/irc-recv.c:1259 src/irc/irc-recv.c:2163 src/irc/irc-dcc.c:1136
+#: src/irc/irc-recv.c:1207
+#, c-format
+msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
+msgstr "CTCP %sPING%s réponse de %s%s%s: %ld.%ld secondes\n"
+
+#: src/irc/irc-recv.c:1252 src/irc/irc-recv.c:2154 src/irc/irc-dcc.c:1153
 #, c-format
 msgid "Private %s> %s"
 msgstr "Privé %s> %s"
 
-#: src/irc/irc-recv.c:1322
+#: src/irc/irc-recv.c:1317
 #, c-format
 msgid "%s \"%s\" command received without host or channel\n"
 msgstr "%s commande \"%s\" reçue sans host ou canal\n"
 
-#: src/irc/irc-recv.c:1371
-msgid " has left "
-msgstr " a quitté "
+#: src/irc/irc-recv.c:1357
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has left %s%s"
+msgstr "%s%s %s(%s%s%s)%s a quitté %s%s"
 
-#: src/irc/irc-recv.c:1523 src/irc/irc-recv.c:2078
+#: src/irc/irc-recv.c:1513 src/irc/irc-recv.c:2067
 #, c-format
 msgid "On %s: * %s %s"
 msgstr "Sur %s: * %s %s"
 
-#: src/irc/irc-recv.c:1547
+#: src/irc/irc-recv.c:1538
 #, c-format
-msgid "Received a CTCP SOUND \"%s\" from "
-msgstr "CTCP SOUND \"%s\" reçu de "
+msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
+msgstr "CTCP %sSOUND%s \"%s\" reçu de %s%s\n"
 
-#: src/irc/irc-recv.c:1580 src/irc/irc-recv.c:1611 src/irc/irc-recv.c:1715
-#: src/irc/irc-recv.c:1755 src/irc/irc-recv.c:2118
-msgid "received from"
-msgstr "reçu de"
+#: src/irc/irc-recv.c:1568 src/irc/irc-recv.c:1739
+#, c-format
+msgid "CTCP %sPING%s received from %s%s\n"
+msgstr "CTCP %sPING%s reçu de %s%s\n"
 
-#: src/irc/irc-recv.c:1607 src/irc/irc-recv.c:2114
-msgid "Unknown CTCP "
-msgstr "CTCP inconnu "
+#: src/irc/irc-recv.c:1597 src/irc/irc-recv.c:2104
+#, c-format
+msgid "Unknown CTCP %s%s%s received from %s%s"
+msgstr "CTCP inconnu %s%s%s reçu de %s%s"
 
-#: src/irc/irc-recv.c:1639
+#: src/irc/irc-recv.c:1629
 #, c-format
 msgid "On %s: %s> %s"
 msgstr "Sur %s: %s> %s"
 
-#: src/irc/irc-recv.c:1771 src/irc/irc-recv.c:1792 src/irc/irc-recv.c:1808
-#: src/irc/irc-recv.c:1824 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1871
-#: src/irc/irc-recv.c:1887 src/irc/irc-recv.c:1912 src/irc/irc-recv.c:1933
-#: src/irc/irc-recv.c:1949 src/irc/irc-recv.c:1974 src/irc/irc-recv.c:1995
-#: src/irc/irc-recv.c:2010 src/irc/irc-recv.c:2185 src/irc/irc-recv.c:2529
-#: src/irc/irc-recv.c:3918 src/irc/irc-recv.c:3933 src/irc/irc-recv.c:3948
-#: src/irc/irc-recv.c:3963 src/irc/irc-recv.c:3976 src/irc/irc-recv.c:4031
-#: src/irc/irc-recv.c:4045 src/irc/irc-recv.c:4285 src/irc/irc-recv.c:4343
-#: src/irc/irc-recv.c:4502 src/irc/irc-recv.c:4517 src/irc/irc-recv.c:4532
-#: src/irc/irc-recv.c:4547 src/irc/irc-recv.c:4560 src/irc/irc-recv.c:4614
-#: src/irc/irc-recv.c:4628
+#: src/irc/irc-recv.c:1700
+#, c-format
+msgid "CTCP %sVERSION%s received from %s%s"
+msgstr "CTCP %sVERSION%s reçu de %s%s"
+
+#: src/irc/irc-recv.c:1757 src/irc/irc-recv.c:1778 src/irc/irc-recv.c:1794
+#: src/irc/irc-recv.c:1810 src/irc/irc-recv.c:1836 src/irc/irc-recv.c:1857
+#: src/irc/irc-recv.c:1873 src/irc/irc-recv.c:1898 src/irc/irc-recv.c:1919
+#: src/irc/irc-recv.c:1935 src/irc/irc-recv.c:1960 src/irc/irc-recv.c:1981
+#: src/irc/irc-recv.c:1996 src/irc/irc-recv.c:2177 src/irc/irc-recv.c:2516
+#: src/irc/irc-recv.c:3879 src/irc/irc-recv.c:3894 src/irc/irc-recv.c:3909
+#: src/irc/irc-recv.c:3924 src/irc/irc-recv.c:3937 src/irc/irc-recv.c:4002
+#: src/irc/irc-recv.c:4016 src/irc/irc-recv.c:4250 src/irc/irc-recv.c:4308
+#: src/irc/irc-recv.c:4446 src/irc/irc-recv.c:4461 src/irc/irc-recv.c:4567
+#: src/irc/irc-recv.c:4581
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr "%s impossible d'analyser la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:2023
+#: src/irc/irc-recv.c:2009
 #, c-format
 msgid "%s unknown DCC CHAT type received from "
 msgstr "%s type de DCC CHAT inconnu reçu de "
 
-#: src/irc/irc-recv.c:2240
-msgid "has quit"
-msgstr "a quitté"
+#: src/irc/irc-recv.c:2224
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has quit %s(%s%s%s)\n"
+msgstr "%s%s %s(%s%s%s)%s a quitté %s(%s%s%s)\n"
 
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:2354
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr "%s commande \"%s\" reçue sans canal\n"
 
-#: src/irc/irc-recv.c:2397
-msgid " has changed topic for "
-msgstr " a changé le titre pour "
-
-#: src/irc/irc-recv.c:2402
+#: src/irc/irc-recv.c:2382
 #, c-format
-msgid " to: \"%s\"\n"
-msgstr " en: \"%s\"\n"
+msgid "%s%s%s has changed topic for %s%s%s to: \"%s\"\n"
+msgstr "%s%s%s a changé le titre pour %s%s%s en: \"%s\"\n"
 
-#: src/irc/irc-recv.c:2408
-msgid " has unset topic for "
-msgstr " a retiré le titre pour "
-
-#: src/irc/irc-recv.c:2517
-msgid "User mode"
-msgstr "Mode utilisateur"
-
-#: src/irc/irc-recv.c:2572
+#: src/irc/irc-recv.c:2392
 #, c-format
-msgid " is away: %s\n"
-msgstr " est absent: %s\n"
+msgid "%s%s%s has unset topic for %s%s\n"
+msgstr "%s%s%s a retiré le titre pour %s%s\n"
 
-#: src/irc/irc-recv.c:2654
+#: src/irc/irc-recv.c:2502
+#, c-format
+msgid "User mode %s[%s%s%s/%s%s%s]\n"
+msgstr "Mode utilisateur %s[%s%s%s/%s%s%s]\n"
+
+#: src/irc/irc-recv.c:2557
+#, c-format
+msgid "%s%s%s is away: %s\n"
+msgstr "%s%s%s est absent: %s\n"
+
+#: src/irc/irc-recv.c:2642
 msgid "Users online: "
 msgstr "Utilisateurs en ligne: "
 
-#: src/irc/irc-recv.c:3144
-msgid "idle: "
-msgstr "inactivité: "
+#: src/irc/irc-recv.c:2999
+#, c-format
+msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
+msgstr "%s%s %s(%s%s@%s%s)%s était %s\n"
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3120
+#, c-format
+msgid "%s[%s%s%s]%s idle: "
+msgstr "%s[%s%s%s]%s inactivité: "
+
+#: src/irc/irc-recv.c:3132
 msgid "days"
 msgstr "jours"
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3132
 msgid "day"
 msgstr "jour"
 
-#: src/irc/irc-recv.c:3162
+#: src/irc/irc-recv.c:3136
+#, c-format
+msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
+msgstr "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signé le: %s%s"
+
+#: src/irc/irc-recv.c:3140
 msgid "hours"
 msgstr "heures"
 
-#: src/irc/irc-recv.c:3162
+#: src/irc/irc-recv.c:3140
 msgid "hour"
 msgstr "heure"
 
-#: src/irc/irc-recv.c:3168
+#: src/irc/irc-recv.c:3144
 msgid "minutes"
 msgstr "minutes"
 
-#: src/irc/irc-recv.c:3168
+#: src/irc/irc-recv.c:3144
 msgid "minute"
 msgstr "minute"
 
-#: src/irc/irc-recv.c:3174
+#: src/irc/irc-recv.c:3148
 msgid "seconds"
 msgstr "secondes"
 
-#: src/irc/irc-recv.c:3174
+#: src/irc/irc-recv.c:3148
 msgid "second"
 msgstr "seconde"
 
-#: src/irc/irc-recv.c:3179
-msgid "signon at: "
-msgstr "signé le: "
-
-#: src/irc/irc-recv.c:3275
-msgid "Channels: "
-msgstr "Canaux: "
-
-#: src/irc/irc-recv.c:3572
-msgid "No topic set for "
-msgstr "Pas de titre défini pour "
-
-#: src/irc/irc-recv.c:3629
-msgid "Topic for "
-msgstr "Le titre pour "
-
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3532
 #, c-format
-msgid " is: \"%s\"\n"
-msgstr " est: \"%s\"\n"
+msgid "No topic set for %s%s\n"
+msgstr "Pas de titre défini pour %s%s\n"
 
-#: src/irc/irc-recv.c:3652 src/irc/irc-recv.c:3741 src/irc/irc-recv.c:3794
+#: src/irc/irc-recv.c:3588
+#, c-format
+msgid "Topic for %s%s%s is: \"%s\"\n"
+msgstr "Le titre pour %s%s%s est: \"%s\"\n"
+
+#: src/irc/irc-recv.c:3611 src/irc/irc-recv.c:3699 src/irc/irc-recv.c:3754
 #, c-format
 msgid "%s cannot identify channel for \"%s\" command\n"
 msgstr "%s impossible de déterminer le canal pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:3702
-msgid "Topic set by "
-msgstr "Titre défini par "
+#: src/irc/irc-recv.c:3661
+#, c-format
+msgid "Topic set by %s%s%s, %s"
+msgstr "Titre défini par %s%s%s, %s"
 
-#: src/irc/irc-recv.c:3723
+#: src/irc/irc-recv.c:3681
 #, c-format
 msgid "%s cannot identify date/time for \"%s\" command\n"
 msgstr "%s impossible d'identifier la date/heure pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:3732 src/irc/irc-recv.c:3803
+#: src/irc/irc-recv.c:3690 src/irc/irc-recv.c:3763
 #, c-format
 msgid "%s cannot identify nickname for \"%s\" command\n"
 msgstr ""
 "%s impossible de déterminer le nom d'utilisateur pour la commande \"%s\"\n"
 
-#: src/irc/irc-recv.c:3782
-msgid "has invited"
-msgstr "a invité"
+#: src/irc/irc-recv.c:3739
+#, c-format
+msgid "%s%s%s has invited %s%s%s on %s%s\n"
+msgstr "%s%s%s a invité %s%s%s sur %s%s\n"
 
-#: src/irc/irc-recv.c:3785 src/irc/irc-recv.c:4206 src/common/command.c:1461
-msgid "on"
-msgstr "sur"
+#: src/irc/irc-recv.c:3799
+#, c-format
+msgid "Channel reop %s%s%s: %s%s\n"
+msgstr "Reop canal %s%s%s: %s%s\n"
 
-#: src/irc/irc-recv.c:3840
-msgid "Channel reop"
-msgstr "Canal reop"
-
-#: src/irc/irc-recv.c:3992
-msgid "exception"
-msgstr "exception"
-
-#: src/irc/irc-recv.c:4331
+#: src/irc/irc-recv.c:4296
 #, c-format
 msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
 msgstr "%s impossible de créer l'utilisateur \"%s\" pour le canal \"%s\"\n"
 
-#: src/irc/irc-recv.c:4390
-msgid "Nicks "
-msgstr "Utilisateurs "
+#: src/irc/irc-recv.c:4354
+#, c-format
+msgid "Nicks %s%s%s: %s["
+msgstr "Utilisateurs %s%s%s: %s["
 
-#: src/irc/irc-recv.c:4410
-msgid "Channel "
-msgstr "Canal "
+#: src/irc/irc-recv.c:4375
+#, c-format
+msgid ""
+"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
+msgstr ""
+"Canal %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
 
-#: src/irc/irc-recv.c:4421
+#: src/irc/irc-recv.c:4383
 msgid "nicks"
 msgstr "utilisateurs"
 
-#: src/irc/irc-recv.c:4421
+#: src/irc/irc-recv.c:4383
 msgid "nick"
 msgstr "utilisateur"
 
-#: src/irc/irc-recv.c:4429
+#: src/irc/irc-recv.c:4388
 msgid "ops"
 msgstr "ops"
 
-#: src/irc/irc-recv.c:4429
+#: src/irc/irc-recv.c:4388
 msgid "op"
 msgstr "op"
 
-#: src/irc/irc-recv.c:4438
+#: src/irc/irc-recv.c:4392
 msgid "halfops"
 msgstr "halfops"
 
-#: src/irc/irc-recv.c:4438
+#: src/irc/irc-recv.c:4392
 msgid "halfop"
 msgstr "halfop"
 
-#: src/irc/irc-recv.c:4447
+#: src/irc/irc-recv.c:4396
 msgid "voices"
 msgstr "voices"
 
-#: src/irc/irc-recv.c:4447
+#: src/irc/irc-recv.c:4396
 msgid "voice"
 msgstr "voice"
 
-#: src/irc/irc-recv.c:4456
+#: src/irc/irc-recv.c:4400
 msgid "normal"
 msgstr "normal"
 
-#: src/irc/irc-recv.c:4577
-msgid "banned by"
-msgstr "banni par"
+#: src/irc/irc-recv.c:4501
+#, c-format
+msgid "%s[%s%s%s] %s%s%s banned by "
+msgstr "%s[%s%s%s] %s%s%s banni par "
 
-#: src/irc/irc-recv.c:4672
+#: src/irc/irc-recv.c:4536
+#, c-format
+msgid "%s[%s%s%s] %s%s%s banned\n"
+msgstr "%s[%s%s%s] %s%s%s banni\n"
+
+#: src/irc/irc-recv.c:4628
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
 msgstr ""
 "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 2nd "
 "nom d'utilisateur \"%s\"\n"
 
-#: src/irc/irc-recv.c:4684
+#: src/irc/irc-recv.c:4640
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
 msgstr ""
 "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 3ème "
 "nom d'utilisateur \"%s\"\n"
 
-#: src/irc/irc-recv.c:4696
+#: src/irc/irc-recv.c:4652
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
@@ -1921,7 +1924,7 @@ msgstr ""
 "%s: tous les noms d'utilisateurs déclarés sont déjà en cours d'utilisation, "
 "fermeture de la connexion avec le serveur !\n"
 
-#: src/irc/irc-recv.c:4706
+#: src/irc/irc-recv.c:4662
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
 msgstr ""
@@ -1952,35 +1955,38 @@ msgstr "Echou
 msgid "Aborted"
 msgstr "Interrompu"
 
-#: src/irc/irc-dcc.c:367 src/irc/irc-dcc.c:568 src/irc/irc-dcc.c:731
-msgid "DCC: file "
-msgstr "DCC: fichier "
+#: src/irc/irc-dcc.c:368
+#, c-format
+msgid "DCC: file %s%s%s"
+msgstr "DCC: fichier %s%s%s"
 
-#: src/irc/irc-dcc.c:374 src/irc/irc-dcc.c:693 src/irc/irc-dcc.c:736
-msgid " (local filename: "
-msgstr " (nom local: "
+#: src/irc/irc-dcc.c:374
+#, c-format
+msgid " (local filename: %s%s%s)"
+msgstr " (nom local: %s%s%s)"
 
-#: src/irc/irc-dcc.c:382
+#: src/irc/irc-dcc.c:379
 msgid " sent to "
 msgstr " envoyé à "
 
-#: src/irc/irc-dcc.c:384
+#: src/irc/irc-dcc.c:381
 msgid " received from "
 msgstr " reçu de "
 
-#: src/irc/irc-dcc.c:390
-msgid ": ok!\n"
-msgstr ": ok!\n"
+#: src/irc/irc-dcc.c:386
+msgid "OK"
+msgstr "OK"
 
-#: src/irc/irc-dcc.c:390
-msgid ": FAILED\n"
-msgstr ": ECHOUE\n"
+#: src/irc/irc-dcc.c:386
+msgid "FAILED"
+msgstr "ECHOUE"
 
-#: src/irc/irc-dcc.c:402
-msgid "DCC chat closed with "
-msgstr "Discussion DCC fermée avec "
+#: src/irc/irc-dcc.c:399
+#, c-format
+msgid "DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"
+msgstr "Discussion DCC fermée avec %s%s %s(%s%d.%d.%d.%d%s)\n"
 
-#: src/irc/irc-dcc.c:459
+#: src/irc/irc-dcc.c:457
 #, c-format
 msgid ""
 "%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1989,20 +1995,17 @@ msgstr ""
 "%s impossible d'associer la discussion DCC avec un tampon privé (le tampon "
 "privé a peut-être déjà un DCC CHAT ?)\n"
 
-#: src/irc/irc-dcc.c:470
-msgid "Connected to "
-msgstr "Connecté à "
-
-#: src/irc/irc-dcc.c:479
-msgid "via DCC chat\n"
-msgstr "via une discussion DCC\n"
-
-#: src/irc/irc-dcc.c:573
+#: src/irc/irc-dcc.c:468
 #, c-format
-msgid "resumed at position %u\n"
-msgstr "recommencé en position %u\n"
+msgid "Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"
+msgstr "Connecté à %s%s %s(%s%d.%d.%d.%d%s)%s via une discussion DCC\n"
 
-#: src/irc/irc-dcc.c:579 src/irc/irc-dcc.c:604
+#: src/irc/irc-dcc.c:568
+#, c-format
+msgid "DCC: file %s%s%s resumed at position %u\n"
+msgstr "DCC: fichier %s%s%s recommencé en position %u\n"
+
+#: src/irc/irc-dcc.c:577 src/irc/irc-dcc.c:602
 #, c-format
 msgid ""
 "%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
@@ -2011,78 +2014,84 @@ msgstr ""
 "%s impossible de continuer le fichier \"%s\" (port: %d, position de départ: %"
 "u): DCC non trouvé ou terminé\n"
 
-#: src/irc/irc-dcc.c:623
+#: src/irc/irc-dcc.c:621
 #, c-format
 msgid "%s not enough memory for new DCC\n"
 msgstr "%s pas assez de mémoire pour un nouveau DCC\n"
 
-#: src/irc/irc-dcc.c:642
+#: src/irc/irc-dcc.c:640
 msgid "DCC chat"
 msgstr "Discussion DCC"
 
-#: src/irc/irc-dcc.c:672
-msgid "Incoming DCC file from "
-msgstr "Réception fichier DCC de "
-
-#: src/irc/irc-dcc.c:683 src/irc/irc-dcc.c:697
-msgid " bytes\n"
-msgstr " octets\n"
-
-#: src/irc/irc-dcc.c:689
-msgid "Sending DCC file to "
-msgstr "Envoi fichier DCC à "
-
-#: src/irc/irc-dcc.c:703
-msgid "Incoming DCC chat request from "
-msgstr "Demande de discussion DCC reçue de "
-
-#: src/irc/irc-dcc.c:715
-msgid "Sending DCC chat request to "
-msgstr "Envoi d'une demande discussion DCC à "
-
-#: src/irc/irc-dcc.c:742
+#: src/irc/irc-dcc.c:671
 #, c-format
-msgid "will be resumed at position %u\n"
-msgstr "sera redémarré à la position %u\n"
+msgid ""
+"Incoming DCC file from %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s bytes\n"
+msgstr ""
+"Réception fichier de %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s octets\n"
 
-#: src/irc/irc-dcc.c:810
+#: src/irc/irc-dcc.c:694
+#, c-format
+msgid ""
+"Sending DCC file to %s%s%s: %s%s%s (local filename: %s%s%s), %s%lu%s bytes\n"
+msgstr ""
+"Envoi fichier DCC à %s%s%s: %s%s%s (nom local: %s%s%s), %s%lu%s octets\n"
+
+#: src/irc/irc-dcc.c:714
+#, c-format
+msgid "Incoming DCC chat request from %s%s%s (%s%d.%d.%d.%d%s)\n"
+msgstr "Demande de discussion DCC reçue de %s%s%s (%s%d.%d.%d.%d%s)\n"
+
+#: src/irc/irc-dcc.c:731
+#, c-format
+msgid "Sending DCC chat request to %s%s\n"
+msgstr "Envoi d'une demande discussion DCC à %s%s\n"
+
+#: src/irc/irc-dcc.c:749
+#, c-format
+msgid ""
+"DCC: file %s%s%s (local filename: %s%s%s) will be resumed at position %u\n"
+msgstr ""
+"DCC: fichier %s%s%s (nom local: %s%s%s) sera recommencé en position %u\n"
+
+#: src/irc/irc-dcc.c:824
 #, c-format
 msgid "%s not enough memory for DCC SEND\n"
 msgstr "%s pas assez de mémoire pour le DCC SEND\n"
 
-#: src/irc/irc-dcc.c:832
+#: src/irc/irc-dcc.c:846
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr "%s impossible d'accéder au fichier \"%s\"\n"
 
-#: src/irc/irc-dcc.c:854
+#: src/irc/irc-dcc.c:868
 #, c-format
 msgid "%s could not find address for '%s'. Falling back to local IP.\n"
 msgstr ""
 "%s impossible de trouver l'adresse pour '%s'. Utilisation de l'adresse IP "
 "locale.\n"
 
-#: src/irc/irc-dcc.c:874
+#: src/irc/irc-dcc.c:888
 #, c-format
 msgid "%s cannot create socket for DCC\n"
 msgstr "%s impossible de créer la socket pour le DCC\n"
 
-#: src/irc/irc-dcc.c:932
+#: src/irc/irc-dcc.c:946
 #, c-format
 msgid "%s cannot find available port for DCC\n"
 msgstr "%s impossible de trouver un port disponible pour le DCC\n"
 
-#: src/irc/irc-dcc.c:976
+#: src/irc/irc-dcc.c:990
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr "%s impossible d'envoyer le DCC\n"
 
-#: src/irc/irc-dcc.c:1057
+#: src/irc/irc-dcc.c:1071
 #, c-format
 msgid "%s error sending data to \"%s\" via DCC CHAT\n"
 msgstr "%s erreur d'envoi de données à \"%s\" via DCC CHAT\n"
 
-#: src/irc/irc-dcc.c:1330
+#: src/irc/irc-dcc.c:1350
 #, c-format
 msgid ""
 "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -2091,7 +2100,7 @@ msgstr ""
 "%s le DCC a échoué car la taille de bloc est trop grande. Vérifiez la valeur "
 "de l'option \"dcc_blocksize\", le maximum est %d.\n"
 
-#: src/irc/irc-dcc.c:1405
+#: src/irc/irc-dcc.c:1425
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr "Abandon du DCC actif: \"%s\" de %s\n"
@@ -2227,13 +2236,13 @@ msgstr "Extension \"%s\" d
 msgid "%s plugin \"%s\" not found\n"
 msgstr "%s extension \"%s\" non trouvée\n"
 
-#: src/plugins/plugins-config.c:215 src/common/weeconfig.c:1653
+#: src/plugins/plugins-config.c:215 src/common/weeconfig.c:1659
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
 msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"=\"\n"
 
-#: src/plugins/plugins-config.c:265 src/common/weeconfig.c:1826
-#: src/common/weeconfig.c:2024
+#: src/plugins/plugins-config.c:265 src/common/weeconfig.c:1832
+#: src/common/weeconfig.c:2030
 #, c-format
 msgid "%s cannot create file \"%s\"\n"
 msgstr "%s impossible de créer le fichier \"%s\"\n"
@@ -2268,64 +2277,64 @@ msgstr "Jour chang
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s le lag est élevé, déconnexion du serveur...\n"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "bytes"
 msgstr "octets"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Kb"
 msgstr "Ko"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Mb"
 msgstr "Mo"
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Gb"
 msgstr "Go"
 
-#: src/gui/curses/gui-display.c:1265
+#: src/gui/curses/gui-display.c:1836
 msgid "<servers>"
 msgstr "<serveurs>"
 
-#: src/gui/curses/gui-display.c:1277
+#: src/gui/curses/gui-display.c:1848
 msgid "(away)"
 msgstr "(absent)"
 
-#: src/gui/curses/gui-display.c:1411
+#: src/gui/curses/gui-display.c:1982
 msgid "[not connected] "
 msgstr "[non connecté] "
 
-#: src/gui/curses/gui-display.c:1421
+#: src/gui/curses/gui-display.c:1992
 msgid "Act: "
 msgstr "Act: "
 
-#: src/gui/curses/gui-display.c:1509
+#: src/gui/curses/gui-display.c:2080
 #, c-format
 msgid "Lag: %.1f"
 msgstr "Lag: %.1f"
 
-#: src/gui/curses/gui-display.c:1525
+#: src/gui/curses/gui-display.c:2096
 msgid "-MORE-"
 msgstr "-PLUS-"
 
-#: src/gui/curses/gui-display.c:1715
+#: src/gui/curses/gui-display.c:2274
 msgid "  [A] Accept"
 msgstr "  [A] Accepter"
 
-#: src/gui/curses/gui-display.c:1716 src/gui/curses/gui-display.c:1720
+#: src/gui/curses/gui-display.c:2275 src/gui/curses/gui-display.c:2279
 msgid "  [C] Cancel"
 msgstr "  [C] Annuler"
 
-#: src/gui/curses/gui-display.c:1725
+#: src/gui/curses/gui-display.c:2284
 msgid "  [R] Remove"
 msgstr "  [R] Retirer"
 
-#: src/gui/curses/gui-display.c:1729
+#: src/gui/curses/gui-display.c:2288
 msgid "  [P] Purge old DCC"
 msgstr "  [P] Purger anciens DCC"
 
-#: src/gui/curses/gui-display.c:1730
+#: src/gui/curses/gui-display.c:2289
 msgid "  [Q] Close DCC view"
 msgstr "  [Q] Fermer la vue DCC"
 
@@ -2333,16 +2342,12 @@ msgstr "  [Q] Fermer la vue DCC"
 msgid "server"
 msgstr "serveur"
 
-#: src/gui/gui-common.c:392
-msgid "Not enough memory for infobar message\n"
-msgstr "Pas assez de mémoire pour un message de la barre d'infos\n"
-
-#: src/gui/gui-common.c:582
+#: src/gui/gui-common.c:508
 msgid "Not enough memory for new line\n"
 msgstr "Pas assez de mémoire pour une nouvelle ligne !\n"
 
-#: src/gui/gui-common.c:625
-msgid "Not enough memory for new message\n"
+#: src/gui/gui-common.c:844
+msgid "Not enough memory for infobar message\n"
 msgstr "Pas assez de mémoire pour un message de la barre d'infos\n"
 
 #: src/gui/gui-keyboard.c:45
@@ -2493,7 +2498,7 @@ msgstr "rafraichir l'
 msgid "grab a key"
 msgstr "capturer une touche"
 
-#: src/gui/gui-keyboard.c:428 src/common/command.c:1662
+#: src/gui/gui-keyboard.c:428 src/common/command.c:1710
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr "%s impossible de créer la touche \"%s\"\n"
@@ -2844,8 +2849,8 @@ msgstr "%s l'alias ne peut pas lancer un autre alias !\n"
 
 #: src/common/command.c:306
 #, c-format
-msgid "%s target command \"%s\" does not exist!\n"
-msgstr "%s la commande cible \"%s\" n'existe pas !\n"
+msgid "%s target command \"/%s\" does not exist!\n"
+msgstr "%s la commande cible \"/%s\" n'existe pas !\n"
 
 #: src/common/command.c:535
 #, c-format
@@ -2894,221 +2899,242 @@ msgstr "%s la commande \"%s\" n
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr "%s commande \"%s\" inconnue (tapez /help pour l'aide)\n"
 
-#: src/common/command.c:773
+#: src/common/command.c:789
 #, c-format
 msgid "%s unable to call handler for message (not enough memory)\n"
 msgstr ""
 "%s impossible d'appeler la fonction pour le message (mémoire insuffisante)\n"
 
-#: src/common/command.c:781
+#: src/common/command.c:797
 msgid "This window is not a channel!\n"
 msgstr "Cette fenêtre n'est pas un canal !\n"
 
-#: src/common/command.c:809 src/common/command.c:833 src/common/command.c:943
+#: src/common/command.c:825 src/common/command.c:856 src/common/command.c:963
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr "%s paramètres manquants pour la commande \"%s\"\n"
 
-#: src/common/command.c:818
+#: src/common/command.c:832
+#, c-format
+msgid "%s alias can not start with \"/\"\n"
+msgstr "%s l'alias ne peut pas commencer par \"/\"\n"
+
+#: src/common/command.c:841
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr "Alias \"%s\" => \"%s\" créé\n"
 
-#: src/common/command.c:824
+#: src/common/command.c:847
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr "Impossible de créer l'alias \"%s\" => \"%s\" (pas assez de mémoire)\n"
 
-#: src/common/command.c:844
+#: src/common/command.c:867
 msgid "List of aliases:\n"
 msgstr "Liste des alias:\n"
 
-#: src/common/command.c:856
+#: src/common/command.c:881
 msgid "No alias defined.\n"
 msgstr "Aucun alias défini.\n"
 
-#: src/common/command.c:879
-msgid "Channel: "
-msgstr "Canal: "
+#: src/common/command.c:898
+#, c-format
+msgid "%sServer: %s%s\n"
+msgstr "%sServeur: %s%s\n"
 
-#: src/common/command.c:882 src/common/command.c:892
-msgid " (server: "
-msgstr " (serveur: "
+#: src/common/command.c:903
+#, c-format
+msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
+msgstr "%sCanal: %s%s %s(serveur: %s%s%s)\n"
 
-#: src/common/command.c:889
-msgid "Private with: "
-msgstr "Privé avec: "
+#: src/common/command.c:912
+#, c-format
+msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
+msgstr "%sPrivé avec: %s%s %s(serveur: %s%s%s)\n"
 
-#: src/common/command.c:923
+#: src/common/command.c:920
+msgid "not connected\n"
+msgstr "non connecté\n"
+
+#: src/common/command.c:942
 msgid "Opened buffers:\n"
 msgstr "Tampons ouverts:\n"
 
-#: src/common/command.c:966
+#: src/common/command.c:986
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr "%s numéro de buffer incorrect\n"
 
-#: src/common/command.c:982
+#: src/common/command.c:1002
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr "%s impossible de fermer le tampon unique\n"
 
-#: src/common/command.c:992
+#: src/common/command.c:1012
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr ""
 "%s impossible de fermer le tampon du serveur tant que des canaux sont "
 "ouverts\n"
 
-#: src/common/command.c:1043
+#: src/common/command.c:1063
 msgid "Notify levels:  "
 msgstr "Niveaux de notification:  "
 
-#: src/common/command.c:1071 src/common/command.c:1093
+#: src/common/command.c:1091 src/common/command.c:1113
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr "%s niveau de notification incorrect (doit être entre %d et %d)\n"
 
-#: src/common/command.c:1080
+#: src/common/command.c:1100
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr ""
 "%s tampon incorrect pour la notification (doit être un canal ou un privé)\n"
 
-#: src/common/command.c:1160
+#: src/common/command.c:1180
 #, c-format
 msgid "unknown parameter \"%s\" for \"%s\" command\n"
 msgstr "paramètre inconnu \"%s\" pour la commande \"%s\"\n"
 
-#: src/common/command.c:1190
+#: src/common/command.c:1210
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr "%s déjà connecté au serveur \"%s\" !\n"
 
-#: src/common/command.c:1198
+#: src/common/command.c:1218
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr "%s une connexion vers le serveur \"%s\" est en cours !\n"
 
-#: src/common/command.c:1216 src/common/command.c:1291
+#: src/common/command.c:1236 src/common/command.c:1311
 #, c-format
 msgid "%s server not found\n"
 msgstr "%s serveur non trouvé\n"
 
-#: src/common/command.c:1246 src/common/command.c:1774
-#: src/common/command.c:2595 src/common/command.c:2619
+#: src/common/command.c:1266 src/common/command.c:1824
+#: src/common/command.c:2671 src/common/command.c:2695
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr "%s option inconnue pour la commande \"%s\"\n"
 
-#: src/common/command.c:1275
+#: src/common/command.c:1295
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr "%s non connecté au serveur \"%s\" !\n"
 
-#: src/common/command.c:1283
+#: src/common/command.c:1303
 msgid "Auto-reconnection is cancelled\n"
 msgstr "La reconnexion automatique est annulée\n"
 
-#: src/common/command.c:1314 src/common/weechat.c:350
+#: src/common/command.c:1334 src/common/weechat.c:364
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "Commandes internes %s :\n"
 
-#: src/common/command.c:1323 src/common/weechat.c:370
+#: src/common/command.c:1344 src/common/weechat.c:384
 #, c-format
 msgid "IRC commands:\n"
 msgstr "Commandes IRC :\n"
 
-#: src/common/command.c:1336
+#: src/common/command.c:1358
 msgid "Plugin commands:\n"
 msgstr "Commandes d'extension :\n"
 
-#: src/common/command.c:1444
+#: src/common/command.c:1474
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr "Pas d'aide disponible, la commande \"%s\" est inconnue\n"
 
-#: src/common/command.c:1466
+#: src/common/command.c:1495
+msgid "on"
+msgstr "sur"
+
+#: src/common/command.c:1503
 msgid " ignoring "
 msgstr " ignore "
 
-#: src/common/command.c:1490
+#: src/common/command.c:1507
+msgid " from "
+msgstr " de "
+
+#: src/common/command.c:1530
 msgid "List of ignore:\n"
 msgstr "Liste des ignore:\n"
 
-#: src/common/command.c:1505
+#: src/common/command.c:1547
 msgid "No ignore defined.\n"
 msgstr "Aucun ignore défini.\n"
 
-#: src/common/command.c:1531
+#: src/common/command.c:1573
 msgid "New ignore:"
 msgstr "Nouveau ignore:"
 
-#: src/common/command.c:1550
-msgid "New key binding:\n"
-msgstr "Nouvelle touche:\n"
+#: src/common/command.c:1593
+#, c-format
+msgid "New key binding:  %s"
+msgstr "Nouvelle touche:  %s"
 
-#: src/common/command.c:1583
+#: src/common/command.c:1627
 msgid "Key bindings:\n"
 msgstr "Associations de touches:\n"
 
-#: src/common/command.c:1595
+#: src/common/command.c:1641
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr "Touche \"%s\" supprimée\n"
 
-#: src/common/command.c:1600
+#: src/common/command.c:1647
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s impossible de supprimer la touche \"%s\"\n"
 
-#: src/common/command.c:1608 src/common/weechat.c:401
+#: src/common/command.c:1655 src/common/weechat.c:415
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Fonctions internes pour les touches:\n"
 
-#: src/common/command.c:1627
+#: src/common/command.c:1675
 msgid "Default key bindings restored\n"
 msgstr "Touches par défaut restaurées\n"
 
-#: src/common/command.c:1633
+#: src/common/command.c:1681
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 "%s le paramètre \"-yes\" est requis pour la réinitialisation des touches "
 "(raison de sécurité)\n"
 
-#: src/common/command.c:1689
+#: src/common/command.c:1737
 msgid "Plugins loaded:\n"
 msgstr "Extensions chargées :\n"
 
-#: src/common/command.c:1703
+#: src/common/command.c:1753
 msgid "     message handlers:\n"
 msgstr "     fonctions de message :\n"
 
-#: src/common/command.c:1712
+#: src/common/command.c:1762
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr "       IRC(%s)\n"
 
-#: src/common/command.c:1719
+#: src/common/command.c:1769
 msgid "       (no message handler)\n"
 msgstr "       (aucunne fonction de message)\n"
 
-#: src/common/command.c:1724
+#: src/common/command.c:1774
 msgid "     command handlers:\n"
 msgstr "     commandes :\n"
 
-#: src/common/command.c:1745
+#: src/common/command.c:1795
 msgid "       (no command handler)\n"
 msgstr "       (aucune commande)\n"
 
-#: src/common/command.c:1751
+#: src/common/command.c:1801
 msgid "  (no plugin)\n"
 msgstr "  (aucune extension)\n"
 
-#: src/common/command.c:1787
+#: src/common/command.c:1837
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
@@ -3116,31 +3142,31 @@ msgstr ""
 "La commande \"plugin\" n'est pas disponible, WeeChat a été compilé sans le "
 "support des extensions.\n"
 
-#: src/common/command.c:1834
+#: src/common/command.c:1884
 msgid "No server.\n"
 msgstr "Pas de serveur.\n"
 
-#: src/common/command.c:1845
+#: src/common/command.c:1895
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr "Serveur '%s' non trouvé.\n"
 
-#: src/common/command.c:1857
+#: src/common/command.c:1907
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr "%s il manque le nom du serveur pour la commande \"%s\"\n"
 
-#: src/common/command.c:1865
+#: src/common/command.c:1915
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr "%s trop de paramètres pour la commande \"%s\", paramètres ignorés\n"
 
-#: src/common/command.c:1884
+#: src/common/command.c:1934
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr "%s le serveur \"%s\" n'existe pas pour la commande \"%s\"\n"
 
-#: src/common/command.c:1892
+#: src/common/command.c:1942
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
@@ -3149,172 +3175,172 @@ msgstr ""
 "%s vous ne pouvez pas supprimer le server \"%s\" car vous êtes connecté "
 "dessus. Essayez /disconnect %s avant.\n"
 
-#: src/common/command.c:1908 src/common/command.c:2054
-msgid "Server"
-msgstr "Serveur"
+#: src/common/command.c:1960
+#, c-format
+msgid "Server %s%s%s has been deleted\n"
+msgstr "Le serveur %s%s%s a été supprimé\n"
 
-#: src/common/command.c:1911
-msgid "has been deleted\n"
-msgstr "a été supprimé\n"
-
-#: src/common/command.c:1926
+#: src/common/command.c:1977
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr "%s paramètres manquants pour la commande \"%s\"\n"
 
-#: src/common/command.c:1936
+#: src/common/command.c:1987
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr "%s le serveur \"%s\" existe déjà, impossible de le créer !\n"
 
-#: src/common/command.c:1965 src/common/command.c:1993
-#: src/common/command.c:2006 src/common/command.c:2032
+#: src/common/command.c:2016 src/common/command.c:2044
+#: src/common/command.c:2057 src/common/command.c:2083
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr "%s mot de passe manquant pour le paramètre \"%s\"\n"
 
-#: src/common/command.c:1978
+#: src/common/command.c:2029
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr "%s pseudo(s) manquant(s) pour le paramètre \"%s\"\n"
 
-#: src/common/command.c:2019
+#: src/common/command.c:2070
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr "%s commande manquante pour le paramètre \"%s\"\n"
 
-#: src/common/command.c:2057
-msgid "created\n"
-msgstr "créé\n"
+#: src/common/command.c:2105
+#, c-format
+msgid "Server %s%s%s created\n"
+msgstr "Serveur %s%s%s créé\n"
 
-#: src/common/command.c:2063
+#: src/common/command.c:2114
 #, c-format
 msgid "%s unable to create server\n"
 msgstr "%s impossible de créer le serveur\n"
 
-#: src/common/command.c:2118
+#: src/common/command.c:2173
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: src/common/command.c:2141
-msgid "(password hidden) "
-msgstr "(mot de passe caché) "
+#: src/common/command.c:2196
+#, c-format
+msgid "%s(password hidden) "
+msgstr "%s(mot de passe caché) "
 
-#: src/common/command.c:2205
+#: src/common/command.c:2263
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr "%s serveur \"%s\" non trouvé\n"
 
-#: src/common/command.c:2236 src/common/command.c:2282
+#: src/common/command.c:2296 src/common/command.c:2344
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr "%s option de configuration \"%s\" non trouvée\n"
 
-#: src/common/command.c:2241 src/common/command.c:2274
+#: src/common/command.c:2301 src/common/command.c:2336
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr "%s valeur incorrecte pour l'option \"%s\"\n"
 
-#: src/common/command.c:2257
+#: src/common/command.c:2317
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr "%s l'option \"%s\" ne peut pas être changée lorsque WeeChat tourne\n"
 
-#: src/common/command.c:2362
+#: src/common/command.c:2427
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr "Aucune option de configuration trouvée avec \"%s\"\n"
 
-#: src/common/command.c:2365
+#: src/common/command.c:2430
 msgid "No config option found\n"
 msgstr "Aucune option de configuration trouvée\n"
 
-#: src/common/command.c:2372
-msgid "Detail:\n"
-msgstr "Détail :\n"
+#: src/common/command.c:2437
+#, c-format
+msgid "%sDetail:\n"
+msgstr "%sDétail :\n"
 
-#: src/common/command.c:2376 src/common/weechat.c:287
+#: src/common/command.c:2443 src/common/weechat.c:301
 #, c-format
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr "  . type booléen (valeurs: 'on' ou 'off')\n"
 
-#: src/common/command.c:2377 src/common/command.c:2400
-#: src/common/command.c:2406 src/common/command.c:2412
-#: src/common/weechat.c:288 src/common/weechat.c:311 src/common/weechat.c:317
-#: src/common/weechat.c:323
+#: src/common/command.c:2444 src/common/command.c:2467
+#: src/common/command.c:2473 src/common/command.c:2479
+#: src/common/weechat.c:302 src/common/weechat.c:325 src/common/weechat.c:331
+#: src/common/weechat.c:337
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . valeur par défaut: '%s'\n"
 
-#: src/common/command.c:2382 src/common/weechat.c:293
+#: src/common/command.c:2449 src/common/weechat.c:307
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . type entier (valeurs: entre %d et %d)\n"
 
-#: src/common/command.c:2385 src/common/weechat.c:296
+#: src/common/command.c:2452 src/common/weechat.c:310
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . valeur par défaut: %d\n"
 
-#: src/common/command.c:2389 src/common/weechat.c:300
+#: src/common/command.c:2456 src/common/weechat.c:314
 #, c-format
 msgid "  . type string (values: "
 msgstr "  . type chaîne (valeurs: "
 
-#: src/common/command.c:2402 src/common/command.c:2408
-#: src/common/command.c:2414 src/common/weechat.c:313 src/common/weechat.c:319
-#: src/common/weechat.c:325
+#: src/common/command.c:2469 src/common/command.c:2475
+#: src/common/command.c:2481 src/common/weechat.c:327 src/common/weechat.c:333
+#: src/common/weechat.c:339
 msgid "empty"
 msgstr "vide"
 
-#: src/common/command.c:2405 src/common/weechat.c:316
+#: src/common/command.c:2472 src/common/weechat.c:330
 #, c-format
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr "  . type couleur (couleur Curses ou Gtk, voir la doc WeeChat)\n"
 
-#: src/common/command.c:2411 src/common/weechat.c:322
+#: src/common/command.c:2478 src/common/weechat.c:336
 #, c-format
 msgid "  . type string (any string)\n"
 msgstr "  . type chaîne (toute chaîne)\n"
 
-#: src/common/command.c:2417 src/common/weechat.c:328
+#: src/common/command.c:2484 src/common/weechat.c:342
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . description: %s\n"
 
-#: src/common/command.c:2424
+#: src/common/command.c:2495
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr "option(s) de configuration trouvée(s) avec \"%s\"\n"
 
-#: src/common/command.c:2427
+#: src/common/command.c:2498
 msgid "config option(s) found\n"
 msgstr "option(s) de configuration trouvée(s)\n"
 
-#: src/common/command.c:2448
+#: src/common/command.c:2519
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr "%s alias ou commande \"%s\" non trouvé\n"
 
-#: src/common/command.c:2458
+#: src/common/command.c:2529
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr "Alias \"%s\" supprimé\n"
 
-#: src/common/command.c:2511
+#: src/common/command.c:2585
 msgid "ignore were removed.\n"
 msgstr "ignore ont été supprimés.\n"
 
-#: src/common/command.c:2513
+#: src/common/command.c:2587
 msgid "ignore was removed.\n"
 msgstr "ignore a été supprimé.\n"
 
-#: src/common/command.c:2518
+#: src/common/command.c:2592
 #, c-format
 msgid "%s no ignore found\n"
 msgstr "%s aucun ignore trouvé\n"
 
-#: src/common/command.c:2543
+#: src/common/command.c:2617
 msgid "Opened windows:\n"
 msgstr "Fenêtres ouvertes:\n"
 
@@ -3361,23 +3387,23 @@ msgstr "Le tube FIFO est ferm
 msgid "%s cannot add a buffer to hotlist\n"
 msgstr "%s impossible d'ajouter le tampon à la liste des tampons actifs\n"
 
-#: src/common/log.c:118
+#: src/common/log.c:96
 msgid "Not enough memory to write log file for a buffer\n"
 msgstr "Pas assez de mémoire pour écrire un fichier log de tampon\n"
 
-#: src/common/log.c:146
+#: src/common/log.c:124
 msgid "Unable to write log file for a buffer\n"
 msgstr "Impossible d'écrire le fichier log pour un tampon\n"
 
-#: src/common/log.c:150
+#: src/common/log.c:128
 msgid "****  Beginning of log  "
 msgstr "****  Début du log  "
 
-#: src/common/log.c:164
+#: src/common/log.c:142
 msgid "****  End of log  "
 msgstr "****  Fin du log  "
 
-#: src/common/weechat.c:274
+#: src/common/weechat.c:288
 #, c-format
 msgid ""
 "WeeChat configuration options (~/.weechat/weechat.rc):\n"
@@ -3386,7 +3412,7 @@ msgstr ""
 "Options de configuration de WeeChat (~/.weechat/weechat.rc):\n"
 "\n"
 
-#: src/common/weechat.c:335
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "Moreover, you can define aliases in [alias] section, by adding lines like:\n"
@@ -3394,7 +3420,7 @@ msgstr ""
 "De plus, vous pouvez définir des alias dans la section [alias], en ajoutant "
 "des lignes comme :\n"
 
-#: src/common/weechat.c:337
+#: src/common/weechat.c:351
 #, c-format
 msgid ""
 "where 'j' is alias name, and 'join' associated command.\n"
@@ -3403,62 +3429,62 @@ msgstr ""
 "où 'j' est le nom de l'alias, et 'join' la commande associée.\n"
 "\n"
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:437
 #, c-format
 msgid "%s default keys:\n"
 msgstr "Touches par défaut %s:\n"
 
-#: src/common/weechat.c:503
+#: src/common/weechat.c:525
 #, c-format
 msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
 msgstr "%s syntaxe invalide pour le serveur IRC ('%s'), ignoré\n"
 
-#: src/common/weechat.c:516
+#: src/common/weechat.c:538
 #, c-format
 msgid "%s unable to create server ('%s'), ignored\n"
 msgstr "%s impossible de créer le serveur ('%s'), ignoré\n"
 
-#: src/common/weechat.c:525
+#: src/common/weechat.c:547
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr "%s paramètre inconnu '%s', ignoré\n"
 
-#: src/common/weechat.c:545
+#: src/common/weechat.c:567
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr "%s impossible de créer le répertoire \"%s\"\n"
 
-#: src/common/weechat.c:571
+#: src/common/weechat.c:593
 #, c-format
 msgid "%s unable to get HOME directory\n"
 msgstr "%s impossible de lire le répertoire personnel\n"
 
-#: src/common/weechat.c:580
+#: src/common/weechat.c:602
 #, c-format
 msgid "%s not enough memory for home directory\n"
 msgstr "%s pas assez de mémoire pour le répertoire personnel\n"
 
-#: src/common/weechat.c:590
+#: src/common/weechat.c:612
 #, c-format
 msgid "%s unable to create ~/.weechat directory\n"
 msgstr "%s impossible de créer le répertoire ~/.weechat\n"
 
-#: src/common/weechat.c:603
+#: src/common/weechat.c:625
 #, c-format
 msgid "%s unable to create ~/.weechat/logs directory\n"
 msgstr "%s impossible de créer le répertoire ~/.weechat/logs\n"
 
-#: src/common/weechat.c:646
+#: src/common/weechat.c:668
 #, c-format
 msgid "%s unable to create/append to log file (~/.weechat/%s)"
 msgstr "%s impossible de créer/ajouter dans le fichier de log (~/.weechat/%s)"
 
-#: src/common/weechat.c:669
+#: src/common/weechat.c:696
 #, c-format
-msgid "%sWelcome to "
-msgstr "%sBienvenue dans "
+msgid "%sWelcome to %s%s%s, %s\n"
+msgstr "%sBienvenue dans %s%s%s, %s\n"
 
-#: src/common/weechat.c:682 src/common/weechat.c:691
+#: src/common/weechat.c:710 src/common/weechat.c:720
 msgid "compiled on"
 msgstr "compilé le"
 
@@ -3470,36 +3496,36 @@ msgstr "Erreur WeeChat:"
 msgid "WeeChat Warning:"
 msgstr "Avertissement WeeChat:"
 
-#: src/common/weeconfig.c:103 src/common/weeconfig.c:104
+#: src/common/weeconfig.c:102 src/common/weeconfig.c:103
 msgid "set title for window (terminal for Curses GUI) with name & version"
 msgstr ""
 "définit le titre de la fenêtre (terminal pour l'interface Curses) avec le "
 "nom et la version"
 
-#: src/common/weeconfig.c:107 src/common/weeconfig.c:108
+#: src/common/weeconfig.c:106 src/common/weeconfig.c:107
 msgid "display WeeChat logo at startup"
 msgstr "afficher le logo WeeChat au démarrage"
 
-#: src/common/weeconfig.c:111 src/common/weeconfig.c:112
+#: src/common/weeconfig.c:110 src/common/weeconfig.c:111
 msgid "display WeeChat version at startup"
 msgstr "afficher la version de WeeChat au démarrage"
 
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:114
 msgid "WeeChat slogan"
 msgstr "slogan WeeChat"
 
-#: src/common/weeconfig.c:116
+#: src/common/weeconfig.c:115
 msgid "WeeChat slogan (if empty, slogan is not used)"
 msgstr "slogan WeeChat (si vide, le slogan ne sera pas utilisé)"
 
-#: src/common/weeconfig.c:119
+#: src/common/weeconfig.c:118
 msgid ""
 "ISO charset for decoding messages from server (used only if locale is UTF-8)"
 msgstr ""
 "jeu de caractères ISO pour décoder les messages du serveur (utilisé "
 "seulement si la locale est UTF-8)"
 
-#: src/common/weeconfig.c:120
+#: src/common/weeconfig.c:119
 msgid ""
 "ISO charset for decoding messages from server (used only if locale is UTF-8) "
 "(if empty, messages are not converted if locale is UTF-8"
@@ -3508,7 +3534,7 @@ msgstr ""
 "seulement si la locale est UTF-8) (si non renseigné, les messages ne sont "
 "pas concertis si la locale est UTF-8)"
 
-#: src/common/weeconfig.c:124
+#: src/common/weeconfig.c:123
 msgid ""
 "UTF charset for decoding messages from server (used only if locale is not "
 "UTF-8)"
@@ -3516,7 +3542,7 @@ msgstr ""
 "jeu de caractères UTF pour décoder les messages du serveur (utilisé "
 "seulement si la locale n'est pas UTF-8)"
 
-#: src/common/weeconfig.c:125
+#: src/common/weeconfig.c:124
 msgid ""
 "UTF charset for decoding messages from server (used only if locale is not "
 "UTF-8) (if empty, messages are not converted if locale is not UTF-8"
@@ -3525,11 +3551,11 @@ msgstr ""
 "seulement si la locale n'est pas UTF-8) (si non renseigné, les messages ne "
 "sont pas convertis si la locale n'est pas UTF-8)"
 
-#: src/common/weeconfig.c:129
+#: src/common/weeconfig.c:128
 msgid "charset for encoding messages sent to server"
 msgstr "jeu de caractères pour encoder les messages envoyés au serveur"
 
-#: src/common/weeconfig.c:130
+#: src/common/weeconfig.c:129
 msgid ""
 "charset for encoding messages sent to server, examples: UFT-8, ISO-8859-1 "
 "(if empty, messages are not converted)"
@@ -3537,13 +3563,13 @@ msgstr ""
 "jeu de caractères pour encoder les messages envoyés au serveur, exemples: "
 "UFT-8, ISO-8859-1 (si non renseigné, les messages ne sont pas convertis)"
 
-#: src/common/weeconfig.c:133
+#: src/common/weeconfig.c:132
 msgid "forces internal WeeChat charset (should be empty in most cases)"
 msgstr ""
 "force le jeu de caractères interne à WeeChat (doit être vide dans la plupart "
 "des cas)"
 
-#: src/common/weeconfig.c:134
+#: src/common/weeconfig.c:133
 msgid ""
 "forces internal WeeChat charset (should be empty in most cases, that means "
 "detected charset is used)"
@@ -3551,53 +3577,49 @@ msgstr ""
 "force le jeu de caractères interne à WeeChat (doit être vide dans la plupart "
 "des cas, ce qui signifie que le jeu de caractères détecté est utilisé)"
 
-#: src/common/weeconfig.c:137 src/common/weeconfig.c:138
+#: src/common/weeconfig.c:136 src/common/weeconfig.c:137
 msgid "use same buffer for all servers"
 msgstr "utiliser le même tampon pour tous les serveurs"
 
-#: src/common/weeconfig.c:141 src/common/weeconfig.c:142
+#: src/common/weeconfig.c:140 src/common/weeconfig.c:141
 msgid "timestamp for buffers"
 msgstr "format de date/heure pour les tampons"
 
-#: src/common/weeconfig.c:145 src/common/weeconfig.c:146
+#: src/common/weeconfig.c:144 src/common/weeconfig.c:145
 msgid "display nick names with different colors"
 msgstr "afficher les utilisateurs avec différentes couleurs"
 
-#: src/common/weeconfig.c:149 src/common/weeconfig.c:150
+#: src/common/weeconfig.c:148 src/common/weeconfig.c:149
 msgid "number of colors to use for nicks colors"
 msgstr "nombre de couleurs à utiliser pour les couleurs des pseudos"
 
-#: src/common/weeconfig.c:153 src/common/weeconfig.c:154
+#: src/common/weeconfig.c:152 src/common/weeconfig.c:153
 msgid "display actions with different colors"
 msgstr "afficher les actions avec différentes couleurs"
 
-#: src/common/weeconfig.c:157 src/common/weeconfig.c:158
-msgid "remove colors from incoming messages"
-msgstr "supprimer les couleurs dans les messages entrants"
-
-#: src/common/weeconfig.c:161
+#: src/common/weeconfig.c:156
 msgid "display nicklist window"
 msgstr "afficher la fenêtre des utilisateurs"
 
-#: src/common/weeconfig.c:162
+#: src/common/weeconfig.c:157
 msgid "display nicklist window (for channel windows)"
 msgstr "afficher la fenêtre des utilisateurs (pour les fenêtres de canaux)"
 
-#: src/common/weeconfig.c:165
+#: src/common/weeconfig.c:160
 msgid "nicklist position"
 msgstr "position de la fenêtre d'utilisateurs"
 
-#: src/common/weeconfig.c:166
+#: src/common/weeconfig.c:161
 msgid "nicklist position (top, left, right (default), bottom)"
 msgstr ""
 "position de la fenêtre d'utilisateurs (haut (top), gauche (left), droite "
 "(right, par défaut), bas (bottom))"
 
-#: src/common/weeconfig.c:169
+#: src/common/weeconfig.c:164
 msgid "min size for nicklist"
 msgstr "taille minimum pour la fenêtre d'utilisateurs"
 
-#: src/common/weeconfig.c:170
+#: src/common/weeconfig.c:165
 msgid ""
 "min size for nicklist (width or height, depending on look_nicklist_position "
 "(0 = no min size))"
@@ -3605,11 +3627,11 @@ msgstr ""
 "taille minimum pour la fenêtre d'utilisateurs (largeur ou hauteur, selon "
 "look_nicklist_position (0 = pas de taille minimum))"
 
-#: src/common/weeconfig.c:174
+#: src/common/weeconfig.c:169
 msgid "max size for nicklist"
 msgstr "taille maximum pour la fenêtre d'utilisateurs"
 
-#: src/common/weeconfig.c:175
+#: src/common/weeconfig.c:170
 msgid ""
 "max size for nicklist (width or height, depending on look_nicklist_position "
 "(0 = no max size; if min == max and > 0, then size is fixed))"
@@ -3618,47 +3640,47 @@ msgstr ""
 "look_nicklist_position (0 = pas de taille maximum; si min == max et > 0, "
 "alors la taille est fixe))"
 
-#: src/common/weeconfig.c:179 src/common/weeconfig.c:180
+#: src/common/weeconfig.c:174 src/common/weeconfig.c:175
 msgid "text to display instead of nick when not connected"
 msgstr ""
 "texte à afficher en lieu et place du nom d'utilisateur lorsque la connexion "
 "n'est pas active"
 
-#: src/common/weeconfig.c:183 src/common/weeconfig.c:184
+#: src/common/weeconfig.c:178 src/common/weeconfig.c:179
 msgid "display nick mode ((half)op/voice) before each nick"
 msgstr ""
 "afficher le mode de l'utilisateur ((half)op/voice) devant chaque utilisateur"
 
-#: src/common/weeconfig.c:187 src/common/weeconfig.c:188
+#: src/common/weeconfig.c:182 src/common/weeconfig.c:183
 msgid "display space if nick mode is not (half)op/voice"
 msgstr "afficher un espace si le mode utilisateur n'est pas (half)op/voice"
 
-#: src/common/weeconfig.c:191 src/common/weeconfig.c:192
+#: src/common/weeconfig.c:186 src/common/weeconfig.c:187
 msgid "the string inserted after nick completion"
 msgstr "la chaîne affichée après la complétion des pseudos"
 
-#: src/common/weeconfig.c:195 src/common/weeconfig.c:196
+#: src/common/weeconfig.c:190 src/common/weeconfig.c:191
 msgid "chars ignored for nick completion"
 msgstr "caractères à ignorer pour la complétion des pseudos"
 
-#: src/common/weeconfig.c:199 src/common/weeconfig.c:200
+#: src/common/weeconfig.c:194 src/common/weeconfig.c:195
 msgid "enable info bar"
 msgstr "active la barre d'infos"
 
-#: src/common/weeconfig.c:203 src/common/weeconfig.c:204
+#: src/common/weeconfig.c:198 src/common/weeconfig.c:199
 msgid "timestamp for time in infobar"
 msgstr "format de date/heure dans la barre d'info"
 
-#: src/common/weeconfig.c:207 src/common/weeconfig.c:208
+#: src/common/weeconfig.c:202 src/common/weeconfig.c:203
 msgid "display seconds in infobar time"
 msgstr "afficher les secondes pour l'heure dans la barre d'infos"
 
-#: src/common/weeconfig.c:211
+#: src/common/weeconfig.c:206
 msgid "delay (in seconds) for highlight messages in infobar"
 msgstr ""
 "délai (en seconds) pour la notification des messages dans la barre d'infos"
 
-#: src/common/weeconfig.c:212
+#: src/common/weeconfig.c:207
 msgid ""
 "delay (in seconds) for highlight messages in infobar (0 = disable highlight "
 "notifications in infobar)"
@@ -3666,22 +3688,22 @@ msgstr ""
 "délai (en secondes) pour la notification des messages dans la barre d'infos "
 "(0 = désactiver les notifications dans la barre d'infos)"
 
-#: src/common/weeconfig.c:216
+#: src/common/weeconfig.c:211
 msgid "max number of names in hotlist"
 msgstr "nombre maximum de noms dans la liste d'activité"
 
-#: src/common/weeconfig.c:217
+#: src/common/weeconfig.c:212
 msgid ""
 "max number of names in hotlist (0 = no name displayed, only buffer numbers)"
 msgstr ""
 "nombre maximum de noms dans la liste d'activité (0 = pas de nom affiché, "
 "seulement les numéros de tampons)"
 
-#: src/common/weeconfig.c:220
+#: src/common/weeconfig.c:215
 msgid "level for displaying names in hotlist"
 msgstr "niveau pour l'affichage des noms dans la liste d'activité"
 
-#: src/common/weeconfig.c:221
+#: src/common/weeconfig.c:216
 msgid ""
 "level for displaying names in hotlist (combination of: 1=join/part, "
 "2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
@@ -3690,321 +3712,321 @@ msgstr ""
 "1=join/part, 2=message, 4=privé, 8=highlight, par exemple: 12=privé"
 "+highlight)"
 
-#: src/common/weeconfig.c:225
+#: src/common/weeconfig.c:220
 msgid "max length of names in hotlist"
 msgstr "longueur maximum des noms dans la liste d'activité"
 
-#: src/common/weeconfig.c:226
+#: src/common/weeconfig.c:221
 msgid "max length of names in hotlist (0 = no limit)"
 msgstr "nombre maximum des noms dans la liste d'activité (0 = pas de limite)"
 
-#: src/common/weeconfig.c:229 src/common/weeconfig.c:230
+#: src/common/weeconfig.c:224 src/common/weeconfig.c:225
 msgid "display special message when day changes"
 msgstr "affiche un message quand le jour change"
 
-#: src/common/weeconfig.c:233 src/common/weeconfig.c:234
+#: src/common/weeconfig.c:228 src/common/weeconfig.c:229
 msgid "timestamp for date displayed when day changed"
 msgstr "format de date pour la date affichée quand le jour a changé"
 
-#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
+#: src/common/weeconfig.c:294 src/common/weeconfig.c:295
 msgid "color for title bar"
 msgstr "couleur pour la barre de titre"
 
-#: src/common/weeconfig.c:303 src/common/weeconfig.c:304
+#: src/common/weeconfig.c:298 src/common/weeconfig.c:299
 msgid "background for title bar"
 msgstr "couleur de fond pour la barre de titre"
 
-#: src/common/weeconfig.c:309 src/common/weeconfig.c:310
+#: src/common/weeconfig.c:304 src/common/weeconfig.c:305
 msgid "color for chat text"
 msgstr "couleur pour le texte de discussion"
 
-#: src/common/weeconfig.c:313
+#: src/common/weeconfig.c:308
 msgid "color for time"
 msgstr "couleur pour l'heure"
 
-#: src/common/weeconfig.c:314
+#: src/common/weeconfig.c:309
 msgid "color for time in chat window"
 msgstr "couleur pour l'heure dans la fenêtre de discussion"
 
-#: src/common/weeconfig.c:317
+#: src/common/weeconfig.c:312
 msgid "color for time separator"
 msgstr "couleur pour le séparateur de l'heure"
 
-#: src/common/weeconfig.c:318
+#: src/common/weeconfig.c:313
 msgid "color for time separator (chat window)"
 msgstr "couleur pour la séparation de l'heure (fenêtre de discussion)"
 
-#: src/common/weeconfig.c:321 src/common/weeconfig.c:322
+#: src/common/weeconfig.c:316 src/common/weeconfig.c:317
 msgid "color for 1st and 3rd char of prefix"
 msgstr "couleur pour le 1er et le 3ème caractère du préfixe"
 
-#: src/common/weeconfig.c:325 src/common/weeconfig.c:326
+#: src/common/weeconfig.c:320 src/common/weeconfig.c:321
 msgid "color for middle char of prefix"
 msgstr "couleur pour le caractère du milieu du préfixe"
 
-#: src/common/weeconfig.c:329 src/common/weeconfig.c:330
+#: src/common/weeconfig.c:324 src/common/weeconfig.c:325
 msgid "color for server name"
 msgstr "couleur pour le nom du serveur"
 
-#: src/common/weeconfig.c:333 src/common/weeconfig.c:334
+#: src/common/weeconfig.c:328 src/common/weeconfig.c:329
 msgid "color for join arrow (prefix)"
 msgstr "couleur pour la flèche du join (préfixe)"
 
-#: src/common/weeconfig.c:337 src/common/weeconfig.c:338
+#: src/common/weeconfig.c:332 src/common/weeconfig.c:333
 msgid "color for part/quit arrow (prefix)"
 msgstr "couleur pour la flèche du part/quit (préfixe)"
 
-#: src/common/weeconfig.c:341
+#: src/common/weeconfig.c:336
 msgid "color for nicks in actions"
 msgstr "couleur pour les noms d'utilisateur dans les actions"
 
-#: src/common/weeconfig.c:342
+#: src/common/weeconfig.c:337
 msgid "color for nicks in actions (chat window)"
 msgstr ""
 "couleur pour les noms d'utilisateurs dans les actions (fenêtre de discussion)"
 
-#: src/common/weeconfig.c:345
+#: src/common/weeconfig.c:340
 msgid "color for hostnames"
 msgstr "couleur pour les noms de machines"
 
-#: src/common/weeconfig.c:346
+#: src/common/weeconfig.c:341
 msgid "color for hostnames (chat window)"
 msgstr "couleur pour les noms de machines (fenêtre de discussion)"
 
-#: src/common/weeconfig.c:349
+#: src/common/weeconfig.c:344
 msgid "color for channel names in actions"
 msgstr "couleur pour les canaux dans les actions"
 
-#: src/common/weeconfig.c:350
+#: src/common/weeconfig.c:345
 msgid "color for channel names in actions (chat window)"
 msgstr "couleur pour les canaux dans les actions (fenêtre de discussion)"
 
-#: src/common/weeconfig.c:353
+#: src/common/weeconfig.c:348
 msgid "color for dark separators"
 msgstr "couleur pour les séparateurs sombres"
 
-#: src/common/weeconfig.c:354
+#: src/common/weeconfig.c:349
 msgid "color for dark separators (chat window)"
 msgstr "couleur pour les séparateurs sombres (fenêtre de discussion)"
 
-#: src/common/weeconfig.c:357
+#: src/common/weeconfig.c:352
 msgid "color for highlighted nick"
 msgstr "couleur pour le pseudo surligné"
 
-#: src/common/weeconfig.c:358
+#: src/common/weeconfig.c:353
 msgid "color for highlighted nick (chat window)"
 msgstr "couleur pour le pseudo surligné (fenêtre de discussion)"
 
-#: src/common/weeconfig.c:361
+#: src/common/weeconfig.c:356
 msgid "background for chat"
 msgstr "couleur de fond pour la discussion"
 
-#: src/common/weeconfig.c:362
+#: src/common/weeconfig.c:357
 msgid "background for chat window"
 msgstr "couleur de fond pour la fenêtre de discussion"
 
-#: src/common/weeconfig.c:367 src/common/weeconfig.c:368
+#: src/common/weeconfig.c:362 src/common/weeconfig.c:363
 msgid "color for status bar"
 msgstr "couleur pour la barre de statut"
 
-#: src/common/weeconfig.c:371 src/common/weeconfig.c:372
+#: src/common/weeconfig.c:366 src/common/weeconfig.c:367
 msgid "color for status bar delimiters"
 msgstr "couleur pour les délimiteurs de la barre de statut"
 
-#: src/common/weeconfig.c:375 src/common/weeconfig.c:376
+#: src/common/weeconfig.c:370 src/common/weeconfig.c:371
 msgid "color for current channel in status bar"
 msgstr "couleur pour le canal courant dans la barre de statut"
 
-#: src/common/weeconfig.c:379
+#: src/common/weeconfig.c:374
 msgid "color for window with new messages"
 msgstr "couleur pour une fenêtre avec de nouvelles infos"
 
-#: src/common/weeconfig.c:380
+#: src/common/weeconfig.c:375
 msgid "color for window with new messages (status bar)"
 msgstr "couleur pour une fenêtre avec de nouvelles infos (barre de statut)"
 
-#: src/common/weeconfig.c:383
+#: src/common/weeconfig.c:378
 msgid "color for window with private message"
 msgstr "couleur pour une fenêtre avec un message privé"
 
-#: src/common/weeconfig.c:384
+#: src/common/weeconfig.c:379
 msgid "color for window with private message (status bar)"
 msgstr "couleur pour une fenêtre avec un message privé (barre de statut)"
 
-#: src/common/weeconfig.c:387
+#: src/common/weeconfig.c:382
 msgid "color for window with highlight"
 msgstr "couleur pour une fenêtre avec un highlight"
 
-#: src/common/weeconfig.c:388
+#: src/common/weeconfig.c:383
 msgid "color for window with highlight (status bar)"
 msgstr "couleur pour une fenêtre avec un highlight (barre de statut)"
 
-#: src/common/weeconfig.c:391
+#: src/common/weeconfig.c:386
 msgid "color for window with new data (not messages)"
 msgstr "couleur pour une fenêtre avec des nouvelles données (pas des infos)"
 
-#: src/common/weeconfig.c:392
+#: src/common/weeconfig.c:387
 msgid "color for window with new data (not messages) (status bar)"
 msgstr ""
 "couleur pour une fenêtre avec des nouvelles données (pas des infos) (barre "
 "de statut)"
 
-#: src/common/weeconfig.c:395
+#: src/common/weeconfig.c:390
 msgid "color for \"-MORE-\" text"
 msgstr "couleur pour le texte \"-PLUS-\""
 
-#: src/common/weeconfig.c:396
+#: src/common/weeconfig.c:391
 msgid "color for window with new data (status bar)"
 msgstr "couleur pour une fenêtre avec des nouvelles données (barre de statut)"
 
-#: src/common/weeconfig.c:399 src/common/weeconfig.c:400
+#: src/common/weeconfig.c:394 src/common/weeconfig.c:395
 msgid "background for status window"
 msgstr "couleur de fond pour la fenêtre de statut"
 
-#: src/common/weeconfig.c:405 src/common/weeconfig.c:406
+#: src/common/weeconfig.c:400 src/common/weeconfig.c:401
 msgid "color for info bar text"
 msgstr "couleur pour la barre d'infos"
 
-#: src/common/weeconfig.c:409 src/common/weeconfig.c:410
+#: src/common/weeconfig.c:404 src/common/weeconfig.c:405
 msgid "color for infobar delimiters"
 msgstr "couleur pour les délimiteurs de la barre d'infos"
 
-#: src/common/weeconfig.c:413 src/common/weeconfig.c:414
+#: src/common/weeconfig.c:408 src/common/weeconfig.c:409
 msgid "color for info bar highlight notification"
 msgstr "couleur pour la notification dans la barre d'infos"
 
-#: src/common/weeconfig.c:417 src/common/weeconfig.c:418
+#: src/common/weeconfig.c:412 src/common/weeconfig.c:413
 msgid "background for info bar window"
 msgstr "couleur de fond pour la fenêtre de barre d'infos"
 
-#: src/common/weeconfig.c:423 src/common/weeconfig.c:424
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
 msgid "color for input text"
 msgstr "couleur pour le texte saisi"
 
-#: src/common/weeconfig.c:427 src/common/weeconfig.c:428
+#: src/common/weeconfig.c:422 src/common/weeconfig.c:423
 msgid "color for input text (channel name)"
 msgstr "couleur pour le texte saisi (nom du canal)"
 
-#: src/common/weeconfig.c:431 src/common/weeconfig.c:432
+#: src/common/weeconfig.c:426 src/common/weeconfig.c:427
 msgid "color for input text (nick name)"
 msgstr "couleur pour le texte saisi (pseudo)"
 
-#: src/common/weeconfig.c:435 src/common/weeconfig.c:436
+#: src/common/weeconfig.c:430 src/common/weeconfig.c:431
 msgid "color for input text (delimiters)"
 msgstr "couleur pour le texte saisi (délimiteurs)"
 
-#: src/common/weeconfig.c:439 src/common/weeconfig.c:440
+#: src/common/weeconfig.c:434 src/common/weeconfig.c:435
 msgid "background for input window"
 msgstr "couleur de fond pour la fenêtre de saisie"
 
-#: src/common/weeconfig.c:445 src/common/weeconfig.c:446
+#: src/common/weeconfig.c:440 src/common/weeconfig.c:441
 msgid "color for nicknames"
 msgstr "couleur pour les pseudos"
 
-#: src/common/weeconfig.c:449 src/common/weeconfig.c:450
+#: src/common/weeconfig.c:444 src/common/weeconfig.c:445
 msgid "color for away nicknames"
 msgstr "couleur pour les pseudos absents"
 
-#: src/common/weeconfig.c:453
+#: src/common/weeconfig.c:448
 msgid "color for chan owner symbol"
 msgstr "couleur pour le symbole du propriétaire du canal"
 
-#: src/common/weeconfig.c:454
+#: src/common/weeconfig.c:449
 msgid "color for chan owner symbol (specific to unrealircd)"
 msgstr ""
 "couleur pour le symbole du propriétaire du canal (spécifique à unrealircd)"
 
-#: src/common/weeconfig.c:457
+#: src/common/weeconfig.c:452
 msgid "color for chan admin symbol"
 msgstr "couleur pour le symbole administrateur du canal"
 
-#: src/common/weeconfig.c:458
+#: src/common/weeconfig.c:453
 msgid "color for chan admin symbol (specific to unrealircd)"
 msgstr ""
 "couleur pour le symbole administrateur du canal (spécifique à unrealircd)"
 
-#: src/common/weeconfig.c:461 src/common/weeconfig.c:462
+#: src/common/weeconfig.c:456 src/common/weeconfig.c:457
 msgid "color for operator symbol"
 msgstr "couleur pour le symbole opérateur"
 
-#: src/common/weeconfig.c:465 src/common/weeconfig.c:466
+#: src/common/weeconfig.c:460 src/common/weeconfig.c:461
 msgid "color for half-operator symbol"
 msgstr "couleur pour le symbole demi-opérateur"
 
-#: src/common/weeconfig.c:469 src/common/weeconfig.c:470
+#: src/common/weeconfig.c:464 src/common/weeconfig.c:465
 msgid "color for voice symbol"
 msgstr "couleur pour le symbole voix"
 
-#: src/common/weeconfig.c:473 src/common/weeconfig.c:474
+#: src/common/weeconfig.c:468 src/common/weeconfig.c:469
 msgid "color for '+' when scrolling nicks"
 msgstr "couleur pour les '+' lors du scroll sur les pseudos"
 
-#: src/common/weeconfig.c:477 src/common/weeconfig.c:478
+#: src/common/weeconfig.c:472 src/common/weeconfig.c:473
 msgid "color for nick separator"
 msgstr "couleur pour le séparateur de pseudo"
 
-#: src/common/weeconfig.c:481 src/common/weeconfig.c:482
+#: src/common/weeconfig.c:476 src/common/weeconfig.c:477
 msgid "color for local nick"
 msgstr "couleur pour le pseudo local"
 
-#: src/common/weeconfig.c:485 src/common/weeconfig.c:486
-#: src/common/weeconfig.c:489 src/common/weeconfig.c:490
-#: src/common/weeconfig.c:493 src/common/weeconfig.c:494
-#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
-#: src/common/weeconfig.c:501 src/common/weeconfig.c:502
-#: src/common/weeconfig.c:505 src/common/weeconfig.c:506
-#: src/common/weeconfig.c:509 src/common/weeconfig.c:510
-#: src/common/weeconfig.c:513 src/common/weeconfig.c:514
-#: src/common/weeconfig.c:517 src/common/weeconfig.c:518
-#: src/common/weeconfig.c:521 src/common/weeconfig.c:522
+#: src/common/weeconfig.c:480 src/common/weeconfig.c:481
+#: src/common/weeconfig.c:484 src/common/weeconfig.c:485
+#: src/common/weeconfig.c:488 src/common/weeconfig.c:489
+#: src/common/weeconfig.c:492 src/common/weeconfig.c:493
+#: src/common/weeconfig.c:496 src/common/weeconfig.c:497
+#: src/common/weeconfig.c:500 src/common/weeconfig.c:501
+#: src/common/weeconfig.c:504 src/common/weeconfig.c:505
+#: src/common/weeconfig.c:508 src/common/weeconfig.c:509
+#: src/common/weeconfig.c:512 src/common/weeconfig.c:513
+#: src/common/weeconfig.c:516 src/common/weeconfig.c:517
 msgid "color for nick"
 msgstr "couleur pour le pseudo"
 
-#: src/common/weeconfig.c:525 src/common/weeconfig.c:526
+#: src/common/weeconfig.c:520 src/common/weeconfig.c:521
 msgid "color for other nick in private window"
 msgstr "couleur pour l'autre pseudo dans la fenêtre privée"
 
-#: src/common/weeconfig.c:529 src/common/weeconfig.c:530
+#: src/common/weeconfig.c:524 src/common/weeconfig.c:525
 msgid "background for nicknames"
 msgstr "couleur de fond pour les pseudos"
 
-#: src/common/weeconfig.c:535
+#: src/common/weeconfig.c:530
 msgid "color for selected DCC"
 msgstr "couleur pour le DCC sélectionné"
 
-#: src/common/weeconfig.c:536
+#: src/common/weeconfig.c:531
 msgid "color for selected DCC (chat window)"
 msgstr "couleur pour le DCC sélectionné (fenêtre de discussion)"
 
-#: src/common/weeconfig.c:539 src/common/weeconfig.c:540
+#: src/common/weeconfig.c:534 src/common/weeconfig.c:535
 msgid "color for \"waiting\" dcc status"
 msgstr "couleur pour le statut dcc \"attente\""
 
-#: src/common/weeconfig.c:543 src/common/weeconfig.c:544
+#: src/common/weeconfig.c:538 src/common/weeconfig.c:539
 msgid "color for \"connecting\" dcc status"
 msgstr "couleur pour le statut dcc \"connexion\""
 
-#: src/common/weeconfig.c:547 src/common/weeconfig.c:548
+#: src/common/weeconfig.c:542 src/common/weeconfig.c:543
 msgid "color for \"active\" dcc status"
 msgstr "couleur pour le statut dcc \"actif\""
 
-#: src/common/weeconfig.c:551 src/common/weeconfig.c:552
+#: src/common/weeconfig.c:546 src/common/weeconfig.c:547
 msgid "color for \"done\" dcc status"
 msgstr "couleur pour le statut dcc \"terminé\""
 
-#: src/common/weeconfig.c:555 src/common/weeconfig.c:556
+#: src/common/weeconfig.c:550 src/common/weeconfig.c:551
 msgid "color for \"failed\" dcc status"
 msgstr "couleur pour le statut dcc \"échoué\""
 
-#: src/common/weeconfig.c:559 src/common/weeconfig.c:560
+#: src/common/weeconfig.c:554 src/common/weeconfig.c:555
 msgid "color for \"aborted\" dcc status"
 msgstr "couleur pour le statut dcc \"interrompu\""
 
-#: src/common/weeconfig.c:573
+#: src/common/weeconfig.c:568
 msgid "max lines in history (per window)"
 msgstr "nombre maxi de lignes dans l'historique (par fenêtre)"
 
-#: src/common/weeconfig.c:574
+#: src/common/weeconfig.c:569
 msgid ""
 "maximum number of lines in history for one server/channel/private window (0 "
 "= unlimited)"
@@ -4012,128 +4034,128 @@ msgstr ""
 "nombre maximum de lignes dans l'historique pour un serveur/fenêtre/fenêtre "
 "privée (0 = sans limite)"
 
-#: src/common/weeconfig.c:578
+#: src/common/weeconfig.c:573
 msgid "max user commands in history"
 msgstr "nombre maxi de commandes utilisateur dans l'historique"
 
-#: src/common/weeconfig.c:579
+#: src/common/weeconfig.c:574
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr ""
 "nombre maximum de commandes utilisateur dans l'historique (0 = sans limite)"
 
-#: src/common/weeconfig.c:596 src/common/weeconfig.c:597
+#: src/common/weeconfig.c:591 src/common/weeconfig.c:592
 msgid "automatically log server messages"
 msgstr "enregistrer automatiquement les messages du serveur"
 
-#: src/common/weeconfig.c:600 src/common/weeconfig.c:601
+#: src/common/weeconfig.c:595 src/common/weeconfig.c:596
 msgid "automatically log channel chats"
 msgstr "enregistrer automatiquement les conversations des canaux"
 
-#: src/common/weeconfig.c:604 src/common/weeconfig.c:605
+#: src/common/weeconfig.c:599 src/common/weeconfig.c:600
 msgid "automatically log private chats"
 msgstr "enregistrer automatiquement les conversations privées"
 
-#: src/common/weeconfig.c:608 src/common/weeconfig.c:609
+#: src/common/weeconfig.c:603 src/common/weeconfig.c:604
 msgid "log messages from plugins (scripts)"
 msgstr "enregistrer les messages des plugins (scripts)"
 
-#: src/common/weeconfig.c:612
+#: src/common/weeconfig.c:607
 msgid "path for log files"
 msgstr "chemin pour les conversations sauvegardées"
 
-#: src/common/weeconfig.c:613
+#: src/common/weeconfig.c:608
 msgid "path for WeeChat log files"
 msgstr "chemin pour les conversations sauvegardées par WeeChat"
 
-#: src/common/weeconfig.c:616
+#: src/common/weeconfig.c:611
 msgid "timestamp for log"
 msgstr "format de date/heure pour les conversations sauvegardées"
 
-#: src/common/weeconfig.c:617
+#: src/common/weeconfig.c:612
 msgid "timestamp for log (see man strftime for date/time specifiers)"
 msgstr ""
 "format de date/heure pour les conversations sauvegardées (voir man strftime "
 "pour le format de date/heure)"
 
-#: src/common/weeconfig.c:620 src/common/weeconfig.c:621
+#: src/common/weeconfig.c:615 src/common/weeconfig.c:616
 msgid "hide password displayed by nickserv"
 msgstr "masquer le mot de passe affiché par nickserv"
 
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:639
 msgid "display message to all channels when away"
 msgstr "affiche un message sur tous les canaux pour l'absence"
 
-#: src/common/weeconfig.c:643
+#: src/common/weeconfig.c:640
 msgid "display message to all channels when (un)marking as away"
 msgstr "affiche un message sur tous les canaux pour l'absence/le retour"
 
-#: src/common/weeconfig.c:646 src/common/weeconfig.c:647
+#: src/common/weeconfig.c:643 src/common/weeconfig.c:644
 msgid "default message when away"
 msgstr "message par défaut pour l'absence"
 
-#: src/common/weeconfig.c:650 src/common/weeconfig.c:651
+#: src/common/weeconfig.c:647 src/common/weeconfig.c:648
 msgid "default part message (leaving channel)"
 msgstr "message par défaut pour le part (quitte un canal)"
 
-#: src/common/weeconfig.c:654
+#: src/common/weeconfig.c:651
 msgid "default quit message"
 msgstr "message de fin par défaut"
 
-#: src/common/weeconfig.c:655
+#: src/common/weeconfig.c:652
 msgid ""
 "default quit message ('%v' will be replaced by WeeChat version in string)"
 msgstr ""
 "message de fin par défaut ('%v' sera remplacé par la version de WeeChat dans "
 "la chaîne)"
 
-#: src/common/weeconfig.c:658 src/common/weeconfig.c:659
+#: src/common/weeconfig.c:655 src/common/weeconfig.c:656
 msgid "display notices as private messages"
 msgstr "afficher les notices comme des messages privés"
 
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:659
 msgid "interval between two checks for away"
 msgstr "intervalle entre deux vérifications des absences"
 
-#: src/common/weeconfig.c:663
+#: src/common/weeconfig.c:660
 msgid "interval between two checks for away (in minutes, 0 = never check)"
 msgstr ""
 "intervalle entre deux vérifications des absences (en minutes, 0 = ne jemais "
 "vérifier)"
 
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:663
 msgid "interval between two checks for lag"
 msgstr "intervalle entre deux mesures de lag"
 
-#: src/common/weeconfig.c:667
+#: src/common/weeconfig.c:664
 msgid "interval between two checks for lag (in seconds)"
 msgstr "intervalle entre deux mesures de lag (en secondes)"
 
-#: src/common/weeconfig.c:670
+#: src/common/weeconfig.c:667
 msgid "minimum lag to show"
 msgstr "lag minimum à afficher"
 
-#: src/common/weeconfig.c:671
+#: src/common/weeconfig.c:668
 msgid "minimum lag to show (in seconds)"
 msgstr "lag minimum à afficher (en secondes)"
 
-#: src/common/weeconfig.c:674
+#: src/common/weeconfig.c:671
 msgid "disconnect after important lag"
 msgstr "déconnexion après un lag important"
 
-#: src/common/weeconfig.c:675
+#: src/common/weeconfig.c:672
 msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
 msgstr ""
 "déconnexion après un lag important (en minutes, 0 = ne jamais se déconnecter)"
 
-#: src/common/weeconfig.c:678 src/common/weeconfig.c:679
+#: src/common/weeconfig.c:675 src/common/weeconfig.c:676
 msgid "create a FIFO pipe for remote control"
 msgstr "créer un tube FIFO pour le contrôle à distance"
 
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:679
 msgid "list of words to highlight"
 msgstr "liste de mots pour la notification"
 
-#: src/common/weeconfig.c:683
+#: src/common/weeconfig.c:680
 msgid ""
 "comma separated list of words to highlight (case insensitive comparison, "
 "words may begin or end with \"*\" for partial match)"
@@ -4142,45 +4164,61 @@ msgstr ""
 "comparaison ne tient pas compte de la casse, les mots peuvent commencer ou "
 "se terminer par \"*\" pour une comparaison partielle)"
 
-#: src/common/weeconfig.c:705
+#: src/common/weeconfig.c:684 src/common/weeconfig.c:685
+msgid "keep colors from incoming messages"
+msgstr "garder les couleurs dans les messages reçus"
+
+#: src/common/weeconfig.c:688
+msgid "allow user to send colors"
+msgstr "autorise l'utilisateur à envoyer des couleurs"
+
+#: src/common/weeconfig.c:689
+msgid ""
+"allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %"
+"U=underline, %R=reverse)"
+msgstr ""
+"autorise l'utilisateur à envoyer des couleurs avec des codes spéciaux (%"
+"B=gras, %Cxx,yy=couleur, %U=souligné, %R=inversé)"
+
+#: src/common/weeconfig.c:711
 msgid "automatically accept dcc files"
 msgstr "accepte automatiquement les fichiers dcc"
 
-#: src/common/weeconfig.c:706
+#: src/common/weeconfig.c:712
 msgid "automatically accept incoming dcc files"
 msgstr "accepte automatiquement les fichiers dcc entrants"
 
-#: src/common/weeconfig.c:709
+#: src/common/weeconfig.c:715
 msgid "automatically accept dcc chats"
 msgstr "accepte automatiquement les demandes de discussion dcc"
 
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:716
 msgid "automatically accept dcc chats (use carefully!)"
 msgstr ""
 "accepte automatiquement les demandes de discussion dcc (à utiliser avec "
 "précaution !)"
 
-#: src/common/weeconfig.c:713
+#: src/common/weeconfig.c:719
 msgid "timeout for dcc request"
 msgstr "délai d'attente pour les requêtes dcc"
 
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:720
 msgid "timeout for dcc request (in seconds)"
 msgstr "délai d'attente pour les requêtes dcc (en secondes)"
 
-#: src/common/weeconfig.c:717
+#: src/common/weeconfig.c:723
 msgid "block size for dcc packets"
 msgstr "taille de bloc pour les paquets dcc"
 
-#: src/common/weeconfig.c:718
+#: src/common/weeconfig.c:724
 msgid "block size for dcc packets in bytes (default: 65536)"
 msgstr "taille de bloc pour les paquets dcc en octets (défaut: 65536)"
 
-#: src/common/weeconfig.c:721
+#: src/common/weeconfig.c:727
 msgid "allowed ports for outgoing dcc"
 msgstr "ports autorisés pour le dcc sortant"
 
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:728
 msgid ""
 "restricts outgoing dcc to use only ports in the given range (useful for NAT) "
 "(syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, empty value "
@@ -4190,11 +4228,11 @@ msgstr ""
 "pour le NAT) (syntaxe: un port simple, par exemple 5000, une plage de ports, "
 "par exemple 5000-5015, si non renseigné tout port peut être utilisé)"
 
-#: src/common/weeconfig.c:727
+#: src/common/weeconfig.c:733
 msgid "IP address for outgoing dcc"
 msgstr "adresse IP pour le dcc sortant"
 
-#: src/common/weeconfig.c:728
+#: src/common/weeconfig.c:734
 msgid ""
 "IP or DNS address used for outgoing dcc (if empty, local interface IP is "
 "used)"
@@ -4202,116 +4240,116 @@ msgstr ""
 "adresse IP ou DNS utilisée pour le dcc sortant (si non renseigné, "
 "l'interface IP locale est utilisée)"
 
-#: src/common/weeconfig.c:732
+#: src/common/weeconfig.c:738
 msgid "path for incoming files with dcc"
 msgstr "chemin les fichiers reçus par dcc"
 
-#: src/common/weeconfig.c:733
+#: src/common/weeconfig.c:739
 msgid "path for writing incoming files with dcc (default: user home)"
 msgstr ""
 "chemin pour écrire les fichiers reçus par dcc (par défaut: répertoire de "
 "l'utilisateur)"
 
-#: src/common/weeconfig.c:736
+#: src/common/weeconfig.c:742
 msgid "default path for sending files with dcc"
 msgstr "chemin par défaut pour envoyer les fichiers par dcc"
 
-#: src/common/weeconfig.c:737
+#: src/common/weeconfig.c:743
 msgid ""
 "path for reading files when sending thru dcc (when no path is specified)"
 msgstr ""
 "chemin pour lire les fichiers lorsqu'ils sont envoyés par dcc (quand aucun "
 "chemin n'est spécifié)"
 
-#: src/common/weeconfig.c:740 src/common/weeconfig.c:741
+#: src/common/weeconfig.c:746 src/common/weeconfig.c:747
 msgid "convert spaces to underscores when sending files"
 msgstr "convertir les espaces en underscores lors d'envoi de fichiers"
 
-#: src/common/weeconfig.c:744
+#: src/common/weeconfig.c:750
 msgid "automatically rename dcc files if already exists"
 msgstr "renomme automatiquement les fichiers dcc s'ils existent déjà"
 
-#: src/common/weeconfig.c:745
+#: src/common/weeconfig.c:751
 msgid "rename incoming files if already exists (add '.1', '.2', ...)"
 msgstr ""
 "renommer les fichiers reçus s'ils existent déjà (ajoute '.1', '.2', ...)"
 
-#: src/common/weeconfig.c:748
+#: src/common/weeconfig.c:754
 msgid "automatically resume aborted transfers"
 msgstr "continuer automatiquement les transferts non terminés"
 
-#: src/common/weeconfig.c:749
+#: src/common/weeconfig.c:755
 msgid ""
 "automatically resume dcc transfer if connection with remote host is loosed"
 msgstr ""
 "continuer automatiquement les transferts dcc si la connexion avec la machine "
 "distante a été perdue"
 
-#: src/common/weeconfig.c:768
+#: src/common/weeconfig.c:774
 msgid "use proxy"
 msgstr "utiliser un proxy"
 
-#: src/common/weeconfig.c:769
+#: src/common/weeconfig.c:775
 msgid "use a proxy server to connect to irc server"
 msgstr "utiliser un proxy pour se connecter au serveur irc"
 
-#: src/common/weeconfig.c:772
+#: src/common/weeconfig.c:778
 msgid "proxy type"
 msgstr "type de proxy"
 
-#: src/common/weeconfig.c:773
+#: src/common/weeconfig.c:779
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "type de proxy (http (défaut), socks4, socks5)"
 
-#: src/common/weeconfig.c:776
+#: src/common/weeconfig.c:782
 msgid "use ipv6 proxy"
 msgstr "utiliser un proxy ipv6"
 
-#: src/common/weeconfig.c:777
+#: src/common/weeconfig.c:783
 msgid "connect to proxy in ipv6"
 msgstr "se connecter au proxy en ipv6"
 
-#: src/common/weeconfig.c:780
+#: src/common/weeconfig.c:786
 msgid "proxy address"
 msgstr "adresse du proxy"
 
-#: src/common/weeconfig.c:781
+#: src/common/weeconfig.c:787
 msgid "proxy server address (IP or hostname)"
 msgstr "adresse du serveur proxy (IP ou nom)"
 
-#: src/common/weeconfig.c:784
+#: src/common/weeconfig.c:790
 msgid "port for proxy"
 msgstr "port pour le proxy"
 
-#: src/common/weeconfig.c:785
+#: src/common/weeconfig.c:791
 msgid "port for connecting to proxy server"
 msgstr "port pour se connecter au serveur proxy"
 
-#: src/common/weeconfig.c:788
+#: src/common/weeconfig.c:794
 msgid "proxy username"
 msgstr "nom d'utilisateur proxy"
 
-#: src/common/weeconfig.c:789
+#: src/common/weeconfig.c:795
 msgid "username for proxy server"
 msgstr "nom d'utilisateur pour le serveur proxy"
 
-#: src/common/weeconfig.c:792
+#: src/common/weeconfig.c:798
 msgid "proxy password"
 msgstr "mot de passe pour le proxy"
 
-#: src/common/weeconfig.c:793
+#: src/common/weeconfig.c:799
 msgid "password for proxy server"
 msgstr "mot de passe pour le serveur proxy"
 
-#: src/common/weeconfig.c:806 src/common/weeconfig.c:807
+#: src/common/weeconfig.c:812 src/common/weeconfig.c:813
 msgid "path for searching plugins"
 msgstr "chemin de recherche des extensions"
 
-#: src/common/weeconfig.c:810
+#: src/common/weeconfig.c:816
 msgid "list of plugins to load automatically"
 msgstr "list des extensions à charger automatiquement"
 
-#: src/common/weeconfig.c:811
+#: src/common/weeconfig.c:817
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found (names may be partial, for example \"perl\" is ok "
@@ -4321,11 +4359,11 @@ msgstr ""
 "toutes (séparées par des virgules, les noms peuvent être partiels, par "
 "exemple \"perl\" est ok pour \"libperl.so\")"
 
-#: src/common/weeconfig.c:816
+#: src/common/weeconfig.c:822
 msgid "standard plugins extension in filename"
 msgstr "extension standard des extensions dans le nom de fichier"
 
-#: src/common/weeconfig.c:817
+#: src/common/weeconfig.c:823
 msgid ""
 "standard plugins extension in filename, used for autoload (if empty, then "
 "all files are loaded when autoload is \"*\")"
@@ -4334,91 +4372,91 @@ msgstr ""
 "automatique (si vide, alors tous les fichiers sont chargés si autoload vaut "
 "\"*\")"
 
-#: src/common/weeconfig.c:834
+#: src/common/weeconfig.c:840
 msgid "server name"
 msgstr "nom du serveur"
 
-#: src/common/weeconfig.c:835
+#: src/common/weeconfig.c:841
 msgid "name associated to IRC server (for display only)"
 msgstr "nom associé au serveur IRC (pour affichage seulement)"
 
-#: src/common/weeconfig.c:838
+#: src/common/weeconfig.c:844
 msgid "automatically connect to server"
 msgstr "connexion automatique au serveur"
 
-#: src/common/weeconfig.c:839
+#: src/common/weeconfig.c:845
 msgid "automatically connect to server when WeeChat is starting"
 msgstr "connexion automatique au serveur quand WeeChat démarre"
 
-#: src/common/weeconfig.c:842
+#: src/common/weeconfig.c:848
 msgid "automatically reconnect to server"
 msgstr "reconnexion automatique au serveur"
 
-#: src/common/weeconfig.c:843
+#: src/common/weeconfig.c:849
 msgid "automatically reconnect to server when disconnected"
 msgstr "reconnexion automatique au serveur après une déconnexion"
 
-#: src/common/weeconfig.c:846
+#: src/common/weeconfig.c:852
 msgid "delay before trying again to reconnect"
 msgstr "délai avant de tenter une reconnexion"
 
-#: src/common/weeconfig.c:847
+#: src/common/weeconfig.c:853
 msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr "délai (en secondes) avant de tenter une reconnexion au serveur"
 
-#: src/common/weeconfig.c:850
+#: src/common/weeconfig.c:856
 msgid "server address or hostname"
 msgstr "adresse ou nom du serveur"
 
-#: src/common/weeconfig.c:851
+#: src/common/weeconfig.c:857
 msgid "IP address or hostname of IRC server"
 msgstr "adresse IP ou nom du serveur IRC"
 
-#: src/common/weeconfig.c:854
+#: src/common/weeconfig.c:860
 msgid "port for IRC server"
 msgstr "port pour le serveur IRC"
 
-#: src/common/weeconfig.c:855
+#: src/common/weeconfig.c:861
 msgid "port for connecting to server"
 msgstr "port pour se connecter au serveur"
 
-#: src/common/weeconfig.c:858 src/common/weeconfig.c:859
+#: src/common/weeconfig.c:864 src/common/weeconfig.c:865
 msgid "use IPv6 protocol for server communication"
 msgstr "utiliser le protocole IPv6 pour la communication avec le serveur"
 
-#: src/common/weeconfig.c:862 src/common/weeconfig.c:863
+#: src/common/weeconfig.c:868 src/common/weeconfig.c:869
 msgid "use SSL for server communication"
 msgstr "utiliser SSL pour la communication avec le serveur"
 
-#: src/common/weeconfig.c:866
+#: src/common/weeconfig.c:872
 msgid "server password"
 msgstr "mot de passe pour le serveur"
 
-#: src/common/weeconfig.c:867
+#: src/common/weeconfig.c:873
 msgid "password for IRC server"
 msgstr "mot de passe pour le serveur IRC"
 
-#: src/common/weeconfig.c:870
+#: src/common/weeconfig.c:876
 msgid "nickname for server"
 msgstr "pseudo pour le serveur"
 
-#: src/common/weeconfig.c:871
+#: src/common/weeconfig.c:877
 msgid "nickname to use on IRC server"
 msgstr "pseudo à utiliser sur le serveur IRC"
 
-#: src/common/weeconfig.c:874
+#: src/common/weeconfig.c:880
 msgid "alternate nickname for server"
 msgstr "pseudo alternatif pour le serveur"
 
-#: src/common/weeconfig.c:875
+#: src/common/weeconfig.c:881
 msgid "alternate nickname to use on IRC server (if nickname is already used)"
 msgstr "pseudo alternatif pour le serveur IRC (si le pseudo est déjà utilisé)"
 
-#: src/common/weeconfig.c:878
+#: src/common/weeconfig.c:884
 msgid "2nd alternate nickname for server"
 msgstr "2nd pseudo alternatif pour le serveur"
 
-#: src/common/weeconfig.c:879
+#: src/common/weeconfig.c:885
 msgid ""
 "2nd alternate nickname to use on IRC server (if alternate nickname is "
 "already used)"
@@ -4426,31 +4464,31 @@ msgstr ""
 "2nd pseudo alternatif pour le serveur IRC (si le pseudo alternatif est déjà "
 "utilisé)"
 
-#: src/common/weeconfig.c:882
+#: src/common/weeconfig.c:888
 msgid "user name for server"
 msgstr "nom d'utilisateur pour le serveur"
 
-#: src/common/weeconfig.c:883
+#: src/common/weeconfig.c:889
 msgid "user name to use on IRC server"
 msgstr "nom d'utilisateur pour le serveur IRC"
 
-#: src/common/weeconfig.c:886
+#: src/common/weeconfig.c:892
 msgid "real name for server"
 msgstr "nom réel pour le serveur"
 
-#: src/common/weeconfig.c:887
+#: src/common/weeconfig.c:893
 msgid "real name to use on IRC server"
 msgstr "nom réel pour le serveur IRC"
 
-#: src/common/weeconfig.c:890 src/common/weeconfig.c:891
+#: src/common/weeconfig.c:896 src/common/weeconfig.c:897
 msgid "first command to run when connected to server"
 msgstr "commande à exécuter en premier lorsque connecté au serveur"
 
-#: src/common/weeconfig.c:894
+#: src/common/weeconfig.c:900
 msgid "delay (in seconds) after command was executed"
 msgstr "délai (en secondes) après exécution de la commande"
 
-#: src/common/weeconfig.c:895
+#: src/common/weeconfig.c:901
 msgid ""
 "delay (in seconds) after command was executed (example: give some time for "
 "authentication)"
@@ -4458,11 +4496,11 @@ msgstr ""
 "délai (en secondes) après exécution de la commande (exemple: donner du temps "
 "pour l'authentification)"
 
-#: src/common/weeconfig.c:898
+#: src/common/weeconfig.c:904
 msgid "list of channels to join when connected to server"
 msgstr "liste des canaux à rejoindre lorsque connecté au serveur"
 
-#: src/common/weeconfig.c:899
+#: src/common/weeconfig.c:905
 msgid ""
 "comma separated list of channels to join when connected to server (example: "
 "\"#chan1,#chan2,#chan3 key1,key2\")"
@@ -4470,15 +4508,15 @@ msgstr ""
 "liste des canaux (séparés par des virgules) à rejoindre lorsque connecté au "
 "serveur (exemple: \"#chan1,#chan2,#chan3 key1,key2\")"
 
-#: src/common/weeconfig.c:902 src/common/weeconfig.c:903
+#: src/common/weeconfig.c:908 src/common/weeconfig.c:909
 msgid "automatically rejoin channels when kicked"
 msgstr "rejoindre automatiquement les canaux quand mis dehors"
 
-#: src/common/weeconfig.c:906
+#: src/common/weeconfig.c:912
 msgid "notify levels for channels of this server"
 msgstr "niveaux de notification pour les canaux de ce serveur"
 
-#: src/common/weeconfig.c:907
+#: src/common/weeconfig.c:913
 msgid ""
 "comma separated list of notify levels for channels of this server (format: "
 "#channel:1,..)"
@@ -4486,64 +4524,64 @@ msgstr ""
 "liste des niveaux de notifications (séparés par des virgules) pour les "
 "canaux de ce serveur (format: #canal:1,..)"
 
-#: src/common/weeconfig.c:1463
+#: src/common/weeconfig.c:1469
 #, c-format
 msgid "%s %s, line %d: new server, but previous was incomplete\n"
 msgstr "%s %s, ligne %d: nouveau serveur, mais le précédent était incomplet\n"
 
-#: src/common/weeconfig.c:1472
+#: src/common/weeconfig.c:1478
 #, c-format
 msgid "%s %s, line %d: server '%s' already exists\n"
 msgstr "%s %s, ligne %d: le serveur '%s' existe déjà\n"
 
-#: src/common/weeconfig.c:1487
+#: src/common/weeconfig.c:1493
 #, c-format
 msgid "%s %s, line %d: unable to create server\n"
 msgstr "%s %s, ligne %d: impossible de créer le serveur\n"
 
-#: src/common/weeconfig.c:1527
+#: src/common/weeconfig.c:1533
 #, c-format
 msgid "%s unable to assign default int with string (\"%s\")\n"
 msgstr ""
 "%s impossible d'assigner la valeur entière par défaut avec la chaîne (\"%s"
 "\")\n"
 
-#: src/common/weeconfig.c:1538
+#: src/common/weeconfig.c:1544
 #, c-format
 msgid "%s unable to assign default color (\"%s\")\n"
 msgstr "%s impossible d'assigner la couleur par défaut (\"%s\")\n"
 
-#: src/common/weeconfig.c:1578
+#: src/common/weeconfig.c:1584
 #, c-format
 msgid "%s config file \"%s\" not found.\n"
 msgstr "%s fichier de configuration \"%s\" non trouvé.\n"
 
-#: src/common/weeconfig.c:1610
+#: src/common/weeconfig.c:1616
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
 msgstr "%s %s, ligne %d: syntaxe invalide, il manque \"]\"\n"
 
-#: src/common/weeconfig.c:1627
+#: src/common/weeconfig.c:1633
 #, c-format
 msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
 msgstr "%s %s, ligne %d: section inconnue (\"%s\")\n"
 
-#: src/common/weeconfig.c:1645
+#: src/common/weeconfig.c:1651
 #, c-format
 msgid "%s %s, line %d: invalid section for option, line is ignored\n"
 msgstr "%s %s, ligne %d: section invalide pour l'option, ligne ignorée\n"
 
-#: src/common/weeconfig.c:1690 src/common/weeconfig.c:1716
+#: src/common/weeconfig.c:1696 src/common/weeconfig.c:1722
 #, c-format
 msgid "%s %s, line %d: invalid option \"%s\"\n"
 msgstr "%s %s, ligne %d: option \"%s\" invalide\n"
 
-#: src/common/weeconfig.c:1696
+#: src/common/weeconfig.c:1702
 #, c-format
 msgid "%s %s, line %d: invalid ignore options \"%s\"\n"
 msgstr "%s %s, ligne %d: options \"%s\" invalides pour le ignore\n"
 
-#: src/common/weeconfig.c:1727
+#: src/common/weeconfig.c:1733
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value foroption '%s'\n"
@@ -4552,7 +4590,7 @@ msgstr ""
 "%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
 "Attendu: valeur booléenne: 'off' ou 'on'\n"
 
-#: src/common/weeconfig.c:1736
+#: src/common/weeconfig.c:1742
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4561,7 +4599,7 @@ msgstr ""
 "%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
 "Attendu: entier compris entre %d et %d\n"
 
-#: src/common/weeconfig.c:1747
+#: src/common/weeconfig.c:1753
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
@@ -4570,21 +4608,21 @@ msgstr ""
 "%s %s, ligne %d: valeur invalide pour l'option '%s'\n"
 "Attendu: une de ces chaînes: "
 
-#: src/common/weeconfig.c:1763
+#: src/common/weeconfig.c:1769
 #, c-format
 msgid "%s %s, line %d: invalid color name for option '%s'\n"
 msgstr "%s %s, ligne %d: nom de couleur invalide pour l'option '%s'\n"
 
-#: src/common/weeconfig.c:1832
+#: src/common/weeconfig.c:1838
 #, c-format
 msgid "%s: creating default config file...\n"
 msgstr "%s: création du fichier de configuration par défaut...\n"
 
-#: src/common/weeconfig.c:1833
+#: src/common/weeconfig.c:1839
 msgid "Creating default config file\n"
 msgstr "Création du fichier de configuration par défaut\n"
 
-#: src/common/weeconfig.c:1836 src/common/weeconfig.c:2033
+#: src/common/weeconfig.c:1842 src/common/weeconfig.c:2039
 #, c-format
 msgid ""
 "#\n"
@@ -4593,7 +4631,7 @@ msgstr ""
 "#\n"
 "# %s: fichier de configuration, créé par %s v%s le %s"
 
-#: src/common/weeconfig.c:1840 src/common/weeconfig.c:2037
+#: src/common/weeconfig.c:1846 src/common/weeconfig.c:2043
 #, c-format
 msgid ""
 "# WARNING! Be careful when editing this file, WeeChat writes this file when "
@@ -4604,9 +4642,132 @@ msgstr ""
 "quittant.\n"
 "#\n"
 
-#: src/common/weeconfig.c:2030
+#: src/common/weeconfig.c:2036
 msgid "Saving config to disk\n"
 msgstr "Sauvegarde de la configuration sur disque\n"
 
+#~ msgid "%s Command '%s' failed!\n"
+#~ msgstr "%s La commande '%s' a échoué !\n"
+
+#~ msgid "by"
+#~ msgstr "par"
+
+#~ msgid " has joined "
+#~ msgstr " a rejoint "
+
+#~ msgid " has kicked "
+#~ msgstr " a poussé dehors "
+
+#~ msgid " has killed "
+#~ msgstr " a tué "
+
+#~ msgid " from server"
+#~ msgstr " du serveur"
+
+#~ msgid " from server\n"
+#~ msgstr " du serveur\n"
+
+#~ msgid "mode changed by"
+#~ msgstr "mode changé par"
+
+#~ msgid "You are "
+#~ msgstr "Vous êtes "
+
+#~ msgid " is "
+#~ msgstr " est "
+
+#~ msgid "reply from"
+#~ msgstr "réponse de"
+
+#~ msgid ": %ld.%ld seconds\n"
+#~ msgstr ": %ld.%ld secondes\n"
+
+#~ msgid " has left "
+#~ msgstr " a quitté "
+
+#~ msgid "received from"
+#~ msgstr "reçu de"
+
+#~ msgid "Unknown CTCP "
+#~ msgstr "CTCP inconnu "
+
+#~ msgid "has quit"
+#~ msgstr "a quitté"
+
+#~ msgid " to: \"%s\"\n"
+#~ msgstr " en: \"%s\"\n"
+
+#~ msgid "User mode"
+#~ msgstr "Mode utilisateur"
+
+#~ msgid "idle: "
+#~ msgstr "inactivité: "
+
+#~ msgid "signon at: "
+#~ msgstr "signé le: "
+
+#~ msgid "Channels: "
+#~ msgstr "Canaux: "
+
+#~ msgid "Topic for "
+#~ msgstr "Le titre pour "
+
+#~ msgid " is: \"%s\"\n"
+#~ msgstr " est: \"%s\"\n"
+
+#~ msgid "has invited"
+#~ msgstr "a invité"
+
+#~ msgid "exception"
+#~ msgstr "exception"
+
+#~ msgid "Nicks "
+#~ msgstr "Utilisateurs "
+
+#~ msgid "Channel "
+#~ msgstr "Canal "
+
+#~ msgid "banned by"
+#~ msgstr "banni par"
+
+#~ msgid ": ok!\n"
+#~ msgstr ": ok!\n"
+
+#~ msgid "Connected to "
+#~ msgstr "Connecté à "
+
+#~ msgid "via DCC chat\n"
+#~ msgstr "via une discussion DCC\n"
+
+#~ msgid "resumed at position %u\n"
+#~ msgstr "recommencé en position %u\n"
+
+#~ msgid "Incoming DCC file from "
+#~ msgstr "Réception fichier DCC de "
+
+#~ msgid " bytes\n"
+#~ msgstr " octets\n"
+
+#~ msgid "Sending DCC file to "
+#~ msgstr "Envoi fichier DCC à "
+
+#~ msgid "Not enough memory for new message\n"
+#~ msgstr "Pas assez de mémoire pour un message de la barre d'infos\n"
+
+#~ msgid "Channel: "
+#~ msgstr "Canal: "
+
+#~ msgid " (server: "
+#~ msgstr " (serveur: "
+
+#~ msgid "Private with: "
+#~ msgstr "Privé avec: "
+
+#~ msgid "Server"
+#~ msgstr "Serveur"
+
+#~ msgid "created\n"
+#~ msgstr "créé\n"
+
 #~ msgid "-servers-"
 #~ msgstr "-serveurs-"
diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot
index be2009428..ff2f6ec1b 100644
--- a/weechat/po/weechat.pot
+++ b/weechat/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-10-30 10:52+0100\n"
+"POT-Creation-Date: 2005-11-04 12:35+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,150 +20,150 @@ msgstr ""
 msgid "%s cannot allocate new nick\n"
 msgstr ""
 
-#: src/irc/irc-server.c:180 src/common/weeconfig.c:1968
+#: src/irc/irc-server.c:181 src/common/weeconfig.c:1974
 msgid "Unable to get user's name"
 msgstr ""
 
-#: src/irc/irc-server.c:248
+#: src/irc/irc-server.c:249
 #, c-format
 msgid "%s cannot allocate new server\n"
 msgstr ""
 
-#: src/irc/irc-server.c:466
+#: src/irc/irc-server.c:467
 #, c-format
 msgid "%s error sending data to IRC server\n"
 msgstr ""
 
-#: src/irc/irc-server.c:489 src/irc/irc-server.c:502 src/irc/irc-server.c:549
-#: src/irc/irc-server.c:562
+#: src/irc/irc-server.c:490 src/irc/irc-server.c:503 src/irc/irc-server.c:550
+#: src/irc/irc-server.c:563
 #, c-format
 msgid "%s not enough memory for received IRC message\n"
 msgstr ""
 
-#: src/irc/irc-server.c:674
+#: src/irc/irc-server.c:675
 #, c-format
-msgid "%s Command '%s' failed!\n"
+msgid "%s Command \"%s\" failed!\n"
 msgstr ""
 
-#: src/irc/irc-server.c:680
+#: src/irc/irc-server.c:681
 #, c-format
 msgid "%s No command to execute!\n"
 msgstr ""
 
-#: src/irc/irc-server.c:686
+#: src/irc/irc-server.c:687
 #, c-format
-msgid "%s Unknown command: cmd=%s, host=%s, args=%s\n"
+msgid "%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-server.c:737
+#: src/irc/irc-server.c:738
 #, c-format
 msgid "%s cannot read data from socket, disconnecting from server...\n"
 msgstr ""
 
-#: src/irc/irc-server.c:820
+#: src/irc/irc-server.c:821
 #, c-format
 msgid "%s: Reconnecting to server in %d seconds\n"
 msgstr ""
 
-#: src/irc/irc-server.c:854
+#: src/irc/irc-server.c:855
 #, c-format
 msgid "%s gnutls handshake failed\n"
 msgstr ""
 
-#: src/irc/irc-server.c:871
+#: src/irc/irc-server.c:872
 #, c-format
 msgid "%s proxy address \"%s\" not found\n"
 msgstr ""
 
-#: src/irc/irc-server.c:875
+#: src/irc/irc-server.c:876
 #, c-format
 msgid "%s address \"%s\" not found\n"
 msgstr ""
 
-#: src/irc/irc-server.c:885
+#: src/irc/irc-server.c:886
 #, c-format
 msgid "%s proxy IP address not found\n"
 msgstr ""
 
-#: src/irc/irc-server.c:888
+#: src/irc/irc-server.c:889
 #, c-format
 msgid "%s IP address not found\n"
 msgstr ""
 
-#: src/irc/irc-server.c:897
+#: src/irc/irc-server.c:898
 #, c-format
 msgid "%s proxy connection refused\n"
 msgstr ""
 
-#: src/irc/irc-server.c:900
+#: src/irc/irc-server.c:901
 #, c-format
 msgid "%s connection refused\n"
 msgstr ""
 
-#: src/irc/irc-server.c:908
+#: src/irc/irc-server.c:909
 #, c-format
 msgid ""
 "%s proxy fails to establish connection to server (check username/password if "
 "used)\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1387
+#: src/irc/irc-server.c:1388
 #, c-format
 msgid ""
 "%s cannot connect with SSL since WeeChat was not built with GNUtls support\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1396
+#: src/irc/irc-server.c:1397
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1402
+#: src/irc/irc-server.c:1403
 #, c-format
 msgid "Connecting to server %s:%d%s%s via %s proxy %s:%d%s...\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1412
+#: src/irc/irc-server.c:1413
 #, c-format
 msgid "%s: connecting to server %s:%d%s%s...\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1416
+#: src/irc/irc-server.c:1417
 #, c-format
 msgid "Connecting to server %s:%d%s%s...\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1434
+#: src/irc/irc-server.c:1435
 #, c-format
 msgid "%s gnutls init error\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1449
+#: src/irc/irc-server.c:1450
 #, c-format
 msgid "%s cannot create pipe\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1464
+#: src/irc/irc-server.c:1465
 #, c-format
 msgid "%s cannot create socket\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1475
+#: src/irc/irc-server.c:1476
 #, c-format
 msgid "%s cannot set socket option \"SO_REUSEADDR\"\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1486
+#: src/irc/irc-server.c:1487
 #, c-format
 msgid "%s cannot set socket option \"SO_KEEPALIVE\"\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1517
+#: src/irc/irc-server.c:1518
 #, c-format
 msgid "%s: Reconnecting to server...\n"
 msgstr ""
 
-#: src/irc/irc-server.c:1567 src/irc/irc-server.c:1576
+#: src/irc/irc-server.c:1568 src/irc/irc-server.c:1577
 msgid "Disconnected from server!\n"
 msgstr ""
 
@@ -861,7 +861,7 @@ msgstr ""
 #: src/irc/irc-commands.c:380 src/irc/irc-commands.c:381
 #: src/irc/irc-commands.c:382 src/irc/irc-commands.c:383
 #: src/irc/irc-commands.c:384 src/irc/irc-commands.c:385
-#: src/irc/irc-commands.c:490
+#: src/irc/irc-commands.c:491
 msgid "a server message"
 msgstr ""
 
@@ -1038,244 +1038,249 @@ msgid "you are now an IRC operator"
 msgstr ""
 
 #: src/irc/irc-commands.c:387
-msgid "server local time"
+msgid "rehashing"
 msgstr ""
 
 #: src/irc/irc-commands.c:388
+msgid "server local time"
+msgstr ""
+
+#: src/irc/irc-commands.c:389
 msgid "no such nick/channel"
 msgstr ""
 
-#: src/irc/irc-commands.c:390
+#: src/irc/irc-commands.c:391
 msgid "no such server"
 msgstr ""
 
-#: src/irc/irc-commands.c:392
+#: src/irc/irc-commands.c:393
 msgid "no such channel"
 msgstr ""
 
-#: src/irc/irc-commands.c:394
+#: src/irc/irc-commands.c:395
 msgid "cannot send to channel"
 msgstr ""
 
-#: src/irc/irc-commands.c:396
+#: src/irc/irc-commands.c:397
 msgid "too many channels"
 msgstr ""
 
-#: src/irc/irc-commands.c:398 src/irc/irc-commands.c:400
+#: src/irc/irc-commands.c:399 src/irc/irc-commands.c:401
 msgid "was no such nick"
 msgstr ""
 
-#: src/irc/irc-commands.c:402
+#: src/irc/irc-commands.c:403
 msgid "no origin"
 msgstr ""
 
-#: src/irc/irc-commands.c:404
+#: src/irc/irc-commands.c:405
 msgid "no services"
 msgstr ""
 
-#: src/irc/irc-commands.c:406
+#: src/irc/irc-commands.c:407
 msgid "no recipient"
 msgstr ""
 
-#: src/irc/irc-commands.c:408
+#: src/irc/irc-commands.c:409
 msgid "no text to send"
 msgstr ""
 
-#: src/irc/irc-commands.c:410
+#: src/irc/irc-commands.c:411
 msgid "no toplevel"
 msgstr ""
 
-#: src/irc/irc-commands.c:412
+#: src/irc/irc-commands.c:413
 msgid "wilcard in toplevel domain"
 msgstr ""
 
-#: src/irc/irc-commands.c:414
+#: src/irc/irc-commands.c:415
 msgid "unknown command"
 msgstr ""
 
-#: src/irc/irc-commands.c:416
+#: src/irc/irc-commands.c:417
 msgid "MOTD is missing"
 msgstr ""
 
-#: src/irc/irc-commands.c:418
+#: src/irc/irc-commands.c:419
 msgid "no administrative info"
 msgstr ""
 
-#: src/irc/irc-commands.c:420
+#: src/irc/irc-commands.c:421
 msgid "file error"
 msgstr ""
 
-#: src/irc/irc-commands.c:422
+#: src/irc/irc-commands.c:423
 msgid "no nickname given"
 msgstr ""
 
-#: src/irc/irc-commands.c:424
+#: src/irc/irc-commands.c:425
 msgid "erroneous nickname"
 msgstr ""
 
-#: src/irc/irc-commands.c:426
+#: src/irc/irc-commands.c:427
 msgid "nickname already in use"
 msgstr ""
 
-#: src/irc/irc-commands.c:428
+#: src/irc/irc-commands.c:429
 msgid "nickname collision"
 msgstr ""
 
-#: src/irc/irc-commands.c:430
+#: src/irc/irc-commands.c:431
 msgid "not authorized to change nickname"
 msgstr ""
 
-#: src/irc/irc-commands.c:432
+#: src/irc/irc-commands.c:433
 msgid "user not in channel"
 msgstr ""
 
-#: src/irc/irc-commands.c:434
+#: src/irc/irc-commands.c:435
 msgid "not on channel"
 msgstr ""
 
-#: src/irc/irc-commands.c:436
+#: src/irc/irc-commands.c:437
 msgid "user already on channel"
 msgstr ""
 
-#: src/irc/irc-commands.c:438
+#: src/irc/irc-commands.c:439
 msgid "user not logged in"
 msgstr ""
 
-#: src/irc/irc-commands.c:440
+#: src/irc/irc-commands.c:441
 msgid "summon has been disabled"
 msgstr ""
 
-#: src/irc/irc-commands.c:442
+#: src/irc/irc-commands.c:443
 msgid "users has been disabled"
 msgstr ""
 
-#: src/irc/irc-commands.c:444
+#: src/irc/irc-commands.c:445
 msgid "you are not registered"
 msgstr ""
 
-#: src/irc/irc-commands.c:446
+#: src/irc/irc-commands.c:447
 msgid "not enough parameters"
 msgstr ""
 
-#: src/irc/irc-commands.c:448
+#: src/irc/irc-commands.c:449
 msgid "you may not register"
 msgstr ""
 
-#: src/irc/irc-commands.c:450
+#: src/irc/irc-commands.c:451
 msgid "your host isn't among the privileged"
 msgstr ""
 
-#: src/irc/irc-commands.c:452
+#: src/irc/irc-commands.c:453
 msgid "password incorrect"
 msgstr ""
 
-#: src/irc/irc-commands.c:454
+#: src/irc/irc-commands.c:455
 msgid "you are banned from this server"
 msgstr ""
 
-#: src/irc/irc-commands.c:456
+#: src/irc/irc-commands.c:457
 msgid "channel key already set"
 msgstr ""
 
-#: src/irc/irc-commands.c:458
+#: src/irc/irc-commands.c:459
 msgid "forwarding to another channel"
 msgstr ""
 
-#: src/irc/irc-commands.c:460
+#: src/irc/irc-commands.c:461
 msgid "channel is already full"
 msgstr ""
 
-#: src/irc/irc-commands.c:462
+#: src/irc/irc-commands.c:463
 msgid "unknown mode char to me"
 msgstr ""
 
-#: src/irc/irc-commands.c:464
+#: src/irc/irc-commands.c:465
 msgid "cannot join channel (invite only)"
 msgstr ""
 
-#: src/irc/irc-commands.c:466
+#: src/irc/irc-commands.c:467
 msgid "cannot join channel (banned from channel)"
 msgstr ""
 
-#: src/irc/irc-commands.c:468
+#: src/irc/irc-commands.c:469
 msgid "cannot join channel (bad channel key)"
 msgstr ""
 
-#: src/irc/irc-commands.c:470
+#: src/irc/irc-commands.c:471
 msgid "bad channel mask"
 msgstr ""
 
-#: src/irc/irc-commands.c:472
+#: src/irc/irc-commands.c:473
 msgid "channel doesn't support modes"
 msgstr ""
 
-#: src/irc/irc-commands.c:474
+#: src/irc/irc-commands.c:475
 msgid "you're not an IRC operator"
 msgstr ""
 
-#: src/irc/irc-commands.c:476
+#: src/irc/irc-commands.c:477
 msgid "you're not channel operator"
 msgstr ""
 
-#: src/irc/irc-commands.c:478
+#: src/irc/irc-commands.c:479
 msgid "you can't kill a server!"
 msgstr ""
 
-#: src/irc/irc-commands.c:480
+#: src/irc/irc-commands.c:481
 msgid "your connection is restricted!"
 msgstr ""
 
-#: src/irc/irc-commands.c:482
+#: src/irc/irc-commands.c:483
 msgid "user is immune from kick/deop"
 msgstr ""
 
-#: src/irc/irc-commands.c:484
+#: src/irc/irc-commands.c:485
 msgid "no O-lines for your host"
 msgstr ""
 
-#: src/irc/irc-commands.c:486
+#: src/irc/irc-commands.c:487
 msgid "unknown mode flag"
 msgstr ""
 
-#: src/irc/irc-commands.c:488
+#: src/irc/irc-commands.c:489
 msgid "can't change mode for other users"
 msgstr ""
 
-#: src/irc/irc-commands.c:491
+#: src/irc/irc-commands.c:492
 msgid "whois (secure connection)"
 msgstr ""
 
-#: src/irc/irc-display.c:170 src/common/command.c:873
-msgid "Server: "
+#: src/irc/irc-display.c:180
+#, c-format
+msgid "%sServer: %s%s %s[%s%s%s]\n"
 msgstr ""
 
-#: src/irc/irc-display.c:175
+#: src/irc/irc-display.c:187
 msgid "connected"
 msgstr ""
 
-#: src/irc/irc-display.c:175 src/common/command.c:899
+#: src/irc/irc-display.c:187
 msgid "not connected"
 msgstr ""
 
-#: src/irc/irc-display.c:179 src/irc/irc-display.c:184
-#: src/irc/irc-display.c:196 src/irc/irc-display.c:199
+#: src/irc/irc-display.c:191 src/irc/irc-display.c:195
+#: src/irc/irc-display.c:203 src/irc/irc-display.c:205
 msgid "yes"
 msgstr ""
 
-#: src/irc/irc-display.c:179 src/irc/irc-display.c:184
-#: src/irc/irc-display.c:196 src/irc/irc-display.c:199
+#: src/irc/irc-display.c:191 src/irc/irc-display.c:195
+#: src/irc/irc-display.c:203 src/irc/irc-display.c:205
 msgid "no"
 msgstr ""
 
-#: src/irc/irc-display.c:181
+#: src/irc/irc-display.c:193
 msgid " (temporary server, will not be saved)"
 msgstr ""
 
-#: src/irc/irc-display.c:203
+#: src/irc/irc-display.c:208
 msgid "(hidden)"
 msgstr ""
 
-#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4718
+#: src/irc/irc-send.c:59 src/irc/irc-recv.c:4674
 msgid "unknown"
 msgstr ""
 
@@ -1284,521 +1289,518 @@ msgstr ""
 msgid "%s: using local hostname \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-send.c:167 src/common/command.c:749
+#: src/irc/irc-send.c:166 src/common/command.c:760
 #, c-format
 msgid "%s cannot find nick for sending message\n"
 msgstr ""
 
-#: src/irc/irc-send.c:329 src/irc/irc-send.c:357 src/irc/irc-send.c:544
-#: src/irc/irc-send.c:577 src/irc/irc-send.c:610 src/irc/irc-send.c:658
-#: src/irc/irc-send.c:694 src/irc/irc-send.c:761 src/irc/irc-send.c:818
-#: src/irc/irc-send.c:1160 src/irc/irc-send.c:1258 src/irc/irc-send.c:1737
-#: src/irc/irc-send.c:1851
+#: src/irc/irc-send.c:328 src/irc/irc-send.c:356 src/irc/irc-send.c:547
+#: src/irc/irc-send.c:580 src/irc/irc-send.c:613 src/irc/irc-send.c:661
+#: src/irc/irc-send.c:697 src/irc/irc-send.c:764 src/irc/irc-send.c:821
+#: src/irc/irc-send.c:1154 src/irc/irc-send.c:1254 src/irc/irc-send.c:1730
+#: src/irc/irc-send.c:1844
 #, c-format
 msgid "%s \"%s\" command can only be executed in a channel window\n"
 msgstr ""
 
-#: src/irc/irc-send.c:456 src/irc/irc-send.c:468 src/irc/irc-send.c:486
-#: src/irc/irc-send.c:1138 src/irc/irc-send.c:1231 src/irc/irc-send.c:1763
-#: src/common/command.c:1233 src/common/command.c:1647
-#: src/common/command.c:1781
+#: src/irc/irc-send.c:459 src/irc/irc-send.c:471 src/irc/irc-send.c:489
+#: src/irc/irc-send.c:1132 src/irc/irc-send.c:1227 src/irc/irc-send.c:1756
+#: src/common/command.c:1253 src/common/command.c:1695
+#: src/common/command.c:1831
 #, c-format
 msgid "%s wrong argument count for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-send.c:509 src/irc/irc-send.c:746 src/irc/irc-send.c:803
+#: src/irc/irc-send.c:512 src/irc/irc-send.c:749 src/irc/irc-send.c:806
 #, c-format
 msgid "%s wrong arguments for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-send.c:946 src/irc/irc-send.c:1013 src/irc/irc-send.c:1306
-#: src/irc/irc-send.c:1320 src/irc/irc-send.c:1664
+#: src/irc/irc-send.c:949 src/irc/irc-send.c:1016 src/irc/irc-send.c:1302
+#: src/irc/irc-send.c:1316 src/irc/irc-send.c:1657
 #, c-format
 msgid "%s \"%s\" command can not be executed on a server window\n"
 msgstr ""
 
-#: src/irc/irc-send.c:1031 src/irc/irc-send.c:1056 src/irc/irc-recv.c:499
+#: src/irc/irc-send.c:1032 src/irc/irc-send.c:1055 src/irc/irc-recv.c:500
 #, c-format
 msgid "%s nick \"%s\" not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-send.c:1108 src/irc/irc-send.c:1416 src/irc/irc-recv.c:1238
-#: src/irc/irc-recv.c:2054 src/irc/irc-recv.c:2142
+#: src/irc/irc-send.c:1105 src/irc/irc-send.c:1412 src/irc/irc-recv.c:1230
+#: src/irc/irc-recv.c:2042 src/irc/irc-recv.c:2132
 #, c-format
 msgid "%s cannot create new private window \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-send.c:1816
+#: src/irc/irc-send.c:1809
 #, c-format
 msgid "%s, compiled on %s %s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:355
-msgid "You have been invited to "
+#: src/irc/irc-recv.c:362
+#, c-format
+msgid "You have been invited to %s%s%s by %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:358 src/irc/irc-recv.c:3994
-msgid "by"
-msgstr ""
-
-#: src/irc/irc-recv.c:369 src/irc/irc-recv.c:463 src/irc/irc-recv.c:1012
-#: src/irc/irc-recv.c:1397 src/irc/irc-recv.c:1656 src/irc/irc-recv.c:3559
-#: src/irc/irc-recv.c:3581 src/irc/irc-recv.c:3642 src/irc/irc-recv.c:3714
+#: src/irc/irc-recv.c:376 src/irc/irc-recv.c:469 src/irc/irc-recv.c:1008
+#: src/irc/irc-recv.c:1386 src/irc/irc-recv.c:1645 src/irc/irc-recv.c:3520
+#: src/irc/irc-recv.c:3541 src/irc/irc-recv.c:3601 src/irc/irc-recv.c:3672
 #, c-format
 msgid "%s channel \"%s\" not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:397
+#: src/irc/irc-recv.c:404
 #, c-format
 msgid "%s cannot create new channel \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:416
-msgid " has joined "
+#: src/irc/irc-recv.c:415
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has joined %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:474
-msgid " has kicked "
+#: src/irc/irc-recv.c:477
+#, c-format
+msgid "%s%s%s has kicked %s%s%s from %s%s"
 msgstr ""
 
-#: src/irc/irc-recv.c:478 src/common/command.c:1468
-msgid " from "
+#: src/irc/irc-recv.c:562
+#, c-format
+msgid "%s%s%s has killed %s%s%s from server"
 msgstr ""
 
-#: src/irc/irc-recv.c:564
-msgid " has killed "
-msgstr ""
-
-#: src/irc/irc-recv.c:570
-msgid " from server"
-msgstr ""
-
-#: src/irc/irc-recv.c:580
-msgid " from server\n"
-msgstr ""
-
-#: src/irc/irc-recv.c:588
+#: src/irc/irc-recv.c:584
 #, c-format
 msgid "%s host \"%s\" not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:629
+#: src/irc/irc-recv.c:625
 msgid "sets ban on"
 msgstr ""
 
-#: src/irc/irc-recv.c:630
+#: src/irc/irc-recv.c:626
 msgid "removes ban on"
 msgstr ""
 
-#: src/irc/irc-recv.c:654
+#: src/irc/irc-recv.c:650
 msgid "sets exception on"
 msgstr ""
 
-#: src/irc/irc-recv.c:655
+#: src/irc/irc-recv.c:651
 msgid "removes exception on"
 msgstr ""
 
-#: src/irc/irc-recv.c:679
+#: src/irc/irc-recv.c:675
 msgid "sets mode +f"
 msgstr ""
 
-#: src/irc/irc-recv.c:680
+#: src/irc/irc-recv.c:676
 msgid "removes mode +f"
 msgstr ""
 
-#: src/irc/irc-recv.c:704
+#: src/irc/irc-recv.c:700
 msgid "gives half channel operator status to"
 msgstr ""
 
-#: src/irc/irc-recv.c:705
+#: src/irc/irc-recv.c:701
 msgid "removes half channel operator status from"
 msgstr ""
 
-#: src/irc/irc-recv.c:732
+#: src/irc/irc-recv.c:728
 msgid "sets invite-only channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:733
+#: src/irc/irc-recv.c:729
 msgid "removes invite-only channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:750
+#: src/irc/irc-recv.c:746
 msgid "sets channel key to"
 msgstr ""
 
-#: src/irc/irc-recv.c:751
+#: src/irc/irc-recv.c:747
 msgid "removes channel key"
 msgstr ""
 
-#: src/irc/irc-recv.c:782
+#: src/irc/irc-recv.c:778
 msgid "sets the user limit to"
 msgstr ""
 
-#: src/irc/irc-recv.c:783
+#: src/irc/irc-recv.c:779
 msgid "removes user limit"
 msgstr ""
 
-#: src/irc/irc-recv.c:805
+#: src/irc/irc-recv.c:801
 msgid "sets moderated channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:806
+#: src/irc/irc-recv.c:802
 msgid "removes moderated channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:816
+#: src/irc/irc-recv.c:812
 msgid "sets messages from channel only flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:817
+#: src/irc/irc-recv.c:813
 msgid "removes messages from channel only flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:834
+#: src/irc/irc-recv.c:830
 msgid "gives channel operator status to"
 msgstr ""
 
-#: src/irc/irc-recv.c:835
+#: src/irc/irc-recv.c:831
 msgid "removes channel operator status from"
 msgstr ""
 
-#: src/irc/irc-recv.c:862
+#: src/irc/irc-recv.c:858
 msgid "sets private channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:863
+#: src/irc/irc-recv.c:859
 msgid "removes private channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:880
+#: src/irc/irc-recv.c:876
 msgid "sets quiet on"
 msgstr ""
 
-#: src/irc/irc-recv.c:881
+#: src/irc/irc-recv.c:877
 msgid "removes quiet on"
 msgstr ""
 
-#: src/irc/irc-recv.c:898
+#: src/irc/irc-recv.c:894
 msgid "sets secret channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:899
+#: src/irc/irc-recv.c:895
 msgid "removes secret channel flag"
 msgstr ""
 
-#: src/irc/irc-recv.c:909
+#: src/irc/irc-recv.c:905
 msgid "sets topic protection"
 msgstr ""
 
-#: src/irc/irc-recv.c:910
+#: src/irc/irc-recv.c:906
 msgid "removes topic protection"
 msgstr ""
 
-#: src/irc/irc-recv.c:927
+#: src/irc/irc-recv.c:923
 msgid "gives voice to"
 msgstr ""
 
-#: src/irc/irc-recv.c:928
+#: src/irc/irc-recv.c:924
 msgid "removes voice from"
 msgstr ""
 
-#: src/irc/irc-recv.c:971 src/irc/irc-recv.c:1054 src/irc/irc-recv.c:1475
-#: src/irc/irc-recv.c:2209
+#: src/irc/irc-recv.c:967 src/irc/irc-recv.c:1053 src/irc/irc-recv.c:1464
+#: src/irc/irc-recv.c:2201
 #, c-format
 msgid "%s \"%s\" command received without host\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:981
+#: src/irc/irc-recv.c:977
 #, c-format
 msgid "%s \"%s\" command received without channel or nickname\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1029
-msgid "mode changed by"
+#: src/irc/irc-recv.c:1019
+#, c-format
+msgid "%s[%s%s%s/%s%s%s]%s mode changed by %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1091
-msgid "You are "
+#: src/irc/irc-recv.c:1088
+#, c-format
+msgid "You are now known as %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1098
-msgid " is "
+#: src/irc/irc-recv.c:1092
+#, c-format
+msgid "%s%s%s is now known as %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1102
-msgid "now known as "
-msgstr ""
-
-#: src/irc/irc-recv.c:1169
+#: src/irc/irc-recv.c:1159
 #, c-format
 msgid "%s nickname not found for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1185 src/irc/irc-recv.c:1217
-msgid "reply from"
-msgstr ""
-
-#: src/irc/irc-recv.c:1220
+#: src/irc/irc-recv.c:1173
 #, c-format
-msgid ": %ld.%ld seconds\n"
+msgid "CTCP %sVERSION%s reply from %s%s%s: %s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1259 src/irc/irc-recv.c:2163 src/irc/irc-dcc.c:1136
+#: src/irc/irc-recv.c:1207
+#, c-format
+msgid "CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:1252 src/irc/irc-recv.c:2154 src/irc/irc-dcc.c:1153
 #, c-format
 msgid "Private %s> %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1322
+#: src/irc/irc-recv.c:1317
 #, c-format
 msgid "%s \"%s\" command received without host or channel\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1371
-msgid " has left "
+#: src/irc/irc-recv.c:1357
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has left %s%s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1523 src/irc/irc-recv.c:2078
+#: src/irc/irc-recv.c:1513 src/irc/irc-recv.c:2067
 #, c-format
 msgid "On %s: * %s %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1547
+#: src/irc/irc-recv.c:1538
 #, c-format
-msgid "Received a CTCP SOUND \"%s\" from "
+msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1580 src/irc/irc-recv.c:1611 src/irc/irc-recv.c:1715
-#: src/irc/irc-recv.c:1755 src/irc/irc-recv.c:2118
-msgid "received from"
+#: src/irc/irc-recv.c:1568 src/irc/irc-recv.c:1739
+#, c-format
+msgid "CTCP %sPING%s received from %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:1607 src/irc/irc-recv.c:2114
-msgid "Unknown CTCP "
+#: src/irc/irc-recv.c:1597 src/irc/irc-recv.c:2104
+#, c-format
+msgid "Unknown CTCP %s%s%s received from %s%s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1639
+#: src/irc/irc-recv.c:1629
 #, c-format
 msgid "On %s: %s> %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:1771 src/irc/irc-recv.c:1792 src/irc/irc-recv.c:1808
-#: src/irc/irc-recv.c:1824 src/irc/irc-recv.c:1850 src/irc/irc-recv.c:1871
-#: src/irc/irc-recv.c:1887 src/irc/irc-recv.c:1912 src/irc/irc-recv.c:1933
-#: src/irc/irc-recv.c:1949 src/irc/irc-recv.c:1974 src/irc/irc-recv.c:1995
-#: src/irc/irc-recv.c:2010 src/irc/irc-recv.c:2185 src/irc/irc-recv.c:2529
-#: src/irc/irc-recv.c:3918 src/irc/irc-recv.c:3933 src/irc/irc-recv.c:3948
-#: src/irc/irc-recv.c:3963 src/irc/irc-recv.c:3976 src/irc/irc-recv.c:4031
-#: src/irc/irc-recv.c:4045 src/irc/irc-recv.c:4285 src/irc/irc-recv.c:4343
-#: src/irc/irc-recv.c:4502 src/irc/irc-recv.c:4517 src/irc/irc-recv.c:4532
-#: src/irc/irc-recv.c:4547 src/irc/irc-recv.c:4560 src/irc/irc-recv.c:4614
-#: src/irc/irc-recv.c:4628
+#: src/irc/irc-recv.c:1700
+#, c-format
+msgid "CTCP %sVERSION%s received from %s%s"
+msgstr ""
+
+#: src/irc/irc-recv.c:1757 src/irc/irc-recv.c:1778 src/irc/irc-recv.c:1794
+#: src/irc/irc-recv.c:1810 src/irc/irc-recv.c:1836 src/irc/irc-recv.c:1857
+#: src/irc/irc-recv.c:1873 src/irc/irc-recv.c:1898 src/irc/irc-recv.c:1919
+#: src/irc/irc-recv.c:1935 src/irc/irc-recv.c:1960 src/irc/irc-recv.c:1981
+#: src/irc/irc-recv.c:1996 src/irc/irc-recv.c:2177 src/irc/irc-recv.c:2516
+#: src/irc/irc-recv.c:3879 src/irc/irc-recv.c:3894 src/irc/irc-recv.c:3909
+#: src/irc/irc-recv.c:3924 src/irc/irc-recv.c:3937 src/irc/irc-recv.c:4002
+#: src/irc/irc-recv.c:4016 src/irc/irc-recv.c:4250 src/irc/irc-recv.c:4308
+#: src/irc/irc-recv.c:4446 src/irc/irc-recv.c:4461 src/irc/irc-recv.c:4567
+#: src/irc/irc-recv.c:4581
 #, c-format
 msgid "%s cannot parse \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2023
+#: src/irc/irc-recv.c:2009
 #, c-format
 msgid "%s unknown DCC CHAT type received from "
 msgstr ""
 
-#: src/irc/irc-recv.c:2240
-msgid "has quit"
+#: src/irc/irc-recv.c:2224
+#, c-format
+msgid "%s%s %s(%s%s%s)%s has quit %s(%s%s%s)\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2365
+#: src/irc/irc-recv.c:2354
 #, c-format
 msgid "%s \"%s\" command received without channel\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2397
-msgid " has changed topic for "
-msgstr ""
-
-#: src/irc/irc-recv.c:2402
+#: src/irc/irc-recv.c:2382
 #, c-format
-msgid " to: \"%s\"\n"
+msgid "%s%s%s has changed topic for %s%s%s to: \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2408
-msgid " has unset topic for "
-msgstr ""
-
-#: src/irc/irc-recv.c:2517
-msgid "User mode"
-msgstr ""
-
-#: src/irc/irc-recv.c:2572
+#: src/irc/irc-recv.c:2392
 #, c-format
-msgid " is away: %s\n"
+msgid "%s%s%s has unset topic for %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:2654
+#: src/irc/irc-recv.c:2502
+#, c-format
+msgid "User mode %s[%s%s%s/%s%s%s]\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:2557
+#, c-format
+msgid "%s%s%s is away: %s\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:2642
 msgid "Users online: "
 msgstr ""
 
-#: src/irc/irc-recv.c:3144
-msgid "idle: "
+#: src/irc/irc-recv.c:2999
+#, c-format
+msgid "%s%s %s(%s%s@%s%s)%s was %s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3120
+#, c-format
+msgid "%s[%s%s%s]%s idle: "
+msgstr ""
+
+#: src/irc/irc-recv.c:3132
 msgid "days"
 msgstr ""
 
-#: src/irc/irc-recv.c:3152
+#: src/irc/irc-recv.c:3132
 msgid "day"
 msgstr ""
 
-#: src/irc/irc-recv.c:3162
+#: src/irc/irc-recv.c:3136
+#, c-format
+msgid "%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"
+msgstr ""
+
+#: src/irc/irc-recv.c:3140
 msgid "hours"
 msgstr ""
 
-#: src/irc/irc-recv.c:3162
+#: src/irc/irc-recv.c:3140
 msgid "hour"
 msgstr ""
 
-#: src/irc/irc-recv.c:3168
+#: src/irc/irc-recv.c:3144
 msgid "minutes"
 msgstr ""
 
-#: src/irc/irc-recv.c:3168
+#: src/irc/irc-recv.c:3144
 msgid "minute"
 msgstr ""
 
-#: src/irc/irc-recv.c:3174
+#: src/irc/irc-recv.c:3148
 msgid "seconds"
 msgstr ""
 
-#: src/irc/irc-recv.c:3174
+#: src/irc/irc-recv.c:3148
 msgid "second"
 msgstr ""
 
-#: src/irc/irc-recv.c:3179
-msgid "signon at: "
-msgstr ""
-
-#: src/irc/irc-recv.c:3275
-msgid "Channels: "
-msgstr ""
-
-#: src/irc/irc-recv.c:3572
-msgid "No topic set for "
-msgstr ""
-
-#: src/irc/irc-recv.c:3629
-msgid "Topic for "
-msgstr ""
-
-#: src/irc/irc-recv.c:3633
+#: src/irc/irc-recv.c:3532
 #, c-format
-msgid " is: \"%s\"\n"
+msgid "No topic set for %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3652 src/irc/irc-recv.c:3741 src/irc/irc-recv.c:3794
+#: src/irc/irc-recv.c:3588
+#, c-format
+msgid "Topic for %s%s%s is: \"%s\"\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:3611 src/irc/irc-recv.c:3699 src/irc/irc-recv.c:3754
 #, c-format
 msgid "%s cannot identify channel for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3702
-msgid "Topic set by "
+#: src/irc/irc-recv.c:3661
+#, c-format
+msgid "Topic set by %s%s%s, %s"
 msgstr ""
 
-#: src/irc/irc-recv.c:3723
+#: src/irc/irc-recv.c:3681
 #, c-format
 msgid "%s cannot identify date/time for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3732 src/irc/irc-recv.c:3803
+#: src/irc/irc-recv.c:3690 src/irc/irc-recv.c:3763
 #, c-format
 msgid "%s cannot identify nickname for \"%s\" command\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3782
-msgid "has invited"
+#: src/irc/irc-recv.c:3739
+#, c-format
+msgid "%s%s%s has invited %s%s%s on %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3785 src/irc/irc-recv.c:4206 src/common/command.c:1461
-msgid "on"
+#: src/irc/irc-recv.c:3799
+#, c-format
+msgid "Channel reop %s%s%s: %s%s\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:3840
-msgid "Channel reop"
-msgstr ""
-
-#: src/irc/irc-recv.c:3992
-msgid "exception"
-msgstr ""
-
-#: src/irc/irc-recv.c:4331
+#: src/irc/irc-recv.c:4296
 #, c-format
 msgid "%s cannot create nick \"%s\" for channel \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:4390
-msgid "Nicks "
+#: src/irc/irc-recv.c:4354
+#, c-format
+msgid "Nicks %s%s%s: %s["
 msgstr ""
 
-#: src/irc/irc-recv.c:4410
-msgid "Channel "
+#: src/irc/irc-recv.c:4375
+#, c-format
+msgid ""
+"Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:4421
+#: src/irc/irc-recv.c:4383
 msgid "nicks"
 msgstr ""
 
-#: src/irc/irc-recv.c:4421
+#: src/irc/irc-recv.c:4383
 msgid "nick"
 msgstr ""
 
-#: src/irc/irc-recv.c:4429
+#: src/irc/irc-recv.c:4388
 msgid "ops"
 msgstr ""
 
-#: src/irc/irc-recv.c:4429
+#: src/irc/irc-recv.c:4388
 msgid "op"
 msgstr ""
 
-#: src/irc/irc-recv.c:4438
+#: src/irc/irc-recv.c:4392
 msgid "halfops"
 msgstr ""
 
-#: src/irc/irc-recv.c:4438
+#: src/irc/irc-recv.c:4392
 msgid "halfop"
 msgstr ""
 
-#: src/irc/irc-recv.c:4447
+#: src/irc/irc-recv.c:4396
 msgid "voices"
 msgstr ""
 
-#: src/irc/irc-recv.c:4447
+#: src/irc/irc-recv.c:4396
 msgid "voice"
 msgstr ""
 
-#: src/irc/irc-recv.c:4456
+#: src/irc/irc-recv.c:4400
 msgid "normal"
 msgstr ""
 
-#: src/irc/irc-recv.c:4577
-msgid "banned by"
+#: src/irc/irc-recv.c:4501
+#, c-format
+msgid "%s[%s%s%s] %s%s%s banned by "
 msgstr ""
 
-#: src/irc/irc-recv.c:4672
+#: src/irc/irc-recv.c:4536
+#, c-format
+msgid "%s[%s%s%s] %s%s%s banned\n"
+msgstr ""
+
+#: src/irc/irc-recv.c:4628
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:4684
+#: src/irc/irc-recv.c:4640
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:4696
+#: src/irc/irc-recv.c:4652
 #, c-format
 msgid ""
 "%s: all declared nicknames are already in use, closing connection with "
 "server!\n"
 msgstr ""
 
-#: src/irc/irc-recv.c:4706
+#: src/irc/irc-recv.c:4662
 #, c-format
 msgid "%s: nickname \"%s\" is already in use, trying 1st nickname \"%s\"\n"
 msgstr ""
@@ -1827,138 +1829,141 @@ msgstr ""
 msgid "Aborted"
 msgstr ""
 
-#: src/irc/irc-dcc.c:367 src/irc/irc-dcc.c:568 src/irc/irc-dcc.c:731
-msgid "DCC: file "
+#: src/irc/irc-dcc.c:368
+#, c-format
+msgid "DCC: file %s%s%s"
 msgstr ""
 
-#: src/irc/irc-dcc.c:374 src/irc/irc-dcc.c:693 src/irc/irc-dcc.c:736
-msgid " (local filename: "
+#: src/irc/irc-dcc.c:374
+#, c-format
+msgid " (local filename: %s%s%s)"
 msgstr ""
 
-#: src/irc/irc-dcc.c:382
+#: src/irc/irc-dcc.c:379
 msgid " sent to "
 msgstr ""
 
-#: src/irc/irc-dcc.c:384
+#: src/irc/irc-dcc.c:381
 msgid " received from "
 msgstr ""
 
-#: src/irc/irc-dcc.c:390
-msgid ": ok!\n"
+#: src/irc/irc-dcc.c:386
+msgid "OK"
 msgstr ""
 
-#: src/irc/irc-dcc.c:390
-msgid ": FAILED\n"
+#: src/irc/irc-dcc.c:386
+msgid "FAILED"
 msgstr ""
 
-#: src/irc/irc-dcc.c:402
-msgid "DCC chat closed with "
+#: src/irc/irc-dcc.c:399
+#, c-format
+msgid "DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:459
+#: src/irc/irc-dcc.c:457
 #, c-format
 msgid ""
 "%s can't associate DCC chat with private buffer (maybe private buffer has "
 "already DCC CHAT?)\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:470
-msgid "Connected to "
-msgstr ""
-
-#: src/irc/irc-dcc.c:479
-msgid "via DCC chat\n"
-msgstr ""
-
-#: src/irc/irc-dcc.c:573
+#: src/irc/irc-dcc.c:468
 #, c-format
-msgid "resumed at position %u\n"
+msgid "Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:579 src/irc/irc-dcc.c:604
+#: src/irc/irc-dcc.c:568
+#, c-format
+msgid "DCC: file %s%s%s resumed at position %u\n"
+msgstr ""
+
+#: src/irc/irc-dcc.c:577 src/irc/irc-dcc.c:602
 #, c-format
 msgid ""
 "%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
 "ended\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:623
+#: src/irc/irc-dcc.c:621
 #, c-format
 msgid "%s not enough memory for new DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:642
+#: src/irc/irc-dcc.c:640
 msgid "DCC chat"
 msgstr ""
 
-#: src/irc/irc-dcc.c:672
-msgid "Incoming DCC file from "
-msgstr ""
-
-#: src/irc/irc-dcc.c:683 src/irc/irc-dcc.c:697
-msgid " bytes\n"
-msgstr ""
-
-#: src/irc/irc-dcc.c:689
-msgid "Sending DCC file to "
-msgstr ""
-
-#: src/irc/irc-dcc.c:703
-msgid "Incoming DCC chat request from "
-msgstr ""
-
-#: src/irc/irc-dcc.c:715
-msgid "Sending DCC chat request to "
-msgstr ""
-
-#: src/irc/irc-dcc.c:742
+#: src/irc/irc-dcc.c:671
 #, c-format
-msgid "will be resumed at position %u\n"
+msgid ""
+"Incoming DCC file from %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s bytes\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:810
+#: src/irc/irc-dcc.c:694
+#, c-format
+msgid ""
+"Sending DCC file to %s%s%s: %s%s%s (local filename: %s%s%s), %s%lu%s bytes\n"
+msgstr ""
+
+#: src/irc/irc-dcc.c:714
+#, c-format
+msgid "Incoming DCC chat request from %s%s%s (%s%d.%d.%d.%d%s)\n"
+msgstr ""
+
+#: src/irc/irc-dcc.c:731
+#, c-format
+msgid "Sending DCC chat request to %s%s\n"
+msgstr ""
+
+#: src/irc/irc-dcc.c:749
+#, c-format
+msgid ""
+"DCC: file %s%s%s (local filename: %s%s%s) will be resumed at position %u\n"
+msgstr ""
+
+#: src/irc/irc-dcc.c:824
 #, c-format
 msgid "%s not enough memory for DCC SEND\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:832
+#: src/irc/irc-dcc.c:846
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:854
+#: src/irc/irc-dcc.c:868
 #, c-format
 msgid "%s could not find address for '%s'. Falling back to local IP.\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:874
+#: src/irc/irc-dcc.c:888
 #, c-format
 msgid "%s cannot create socket for DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:932
+#: src/irc/irc-dcc.c:946
 #, c-format
 msgid "%s cannot find available port for DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:976
+#: src/irc/irc-dcc.c:990
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1057
+#: src/irc/irc-dcc.c:1071
 #, c-format
 msgid "%s error sending data to \"%s\" via DCC CHAT\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1330
+#: src/irc/irc-dcc.c:1350
 #, c-format
 msgid ""
 "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
 "option, max is %d.\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1405
+#: src/irc/irc-dcc.c:1425
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr ""
@@ -2076,13 +2081,13 @@ msgstr ""
 msgid "%s plugin \"%s\" not found\n"
 msgstr ""
 
-#: src/plugins/plugins-config.c:215 src/common/weeconfig.c:1653
+#: src/plugins/plugins-config.c:215 src/common/weeconfig.c:1659
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"=\"\n"
 msgstr ""
 
-#: src/plugins/plugins-config.c:265 src/common/weeconfig.c:1826
-#: src/common/weeconfig.c:2024
+#: src/plugins/plugins-config.c:265 src/common/weeconfig.c:1832
+#: src/common/weeconfig.c:2030
 #, c-format
 msgid "%s cannot create file \"%s\"\n"
 msgstr ""
@@ -2112,64 +2117,64 @@ msgstr ""
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "bytes"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Kb"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Mb"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:804
+#: src/gui/curses/gui-display.c:1383
 msgid "Gb"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1265
+#: src/gui/curses/gui-display.c:1836
 msgid "<servers>"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1277
+#: src/gui/curses/gui-display.c:1848
 msgid "(away)"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1411
+#: src/gui/curses/gui-display.c:1982
 msgid "[not connected] "
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1421
+#: src/gui/curses/gui-display.c:1992
 msgid "Act: "
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1509
+#: src/gui/curses/gui-display.c:2080
 #, c-format
 msgid "Lag: %.1f"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1525
+#: src/gui/curses/gui-display.c:2096
 msgid "-MORE-"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1715
+#: src/gui/curses/gui-display.c:2274
 msgid "  [A] Accept"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1716 src/gui/curses/gui-display.c:1720
+#: src/gui/curses/gui-display.c:2275 src/gui/curses/gui-display.c:2279
 msgid "  [C] Cancel"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1725
+#: src/gui/curses/gui-display.c:2284
 msgid "  [R] Remove"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1729
+#: src/gui/curses/gui-display.c:2288
 msgid "  [P] Purge old DCC"
 msgstr ""
 
-#: src/gui/curses/gui-display.c:1730
+#: src/gui/curses/gui-display.c:2289
 msgid "  [Q] Close DCC view"
 msgstr ""
 
@@ -2177,16 +2182,12 @@ msgstr ""
 msgid "server"
 msgstr ""
 
-#: src/gui/gui-common.c:392
-msgid "Not enough memory for infobar message\n"
-msgstr ""
-
-#: src/gui/gui-common.c:582
+#: src/gui/gui-common.c:508
 msgid "Not enough memory for new line\n"
 msgstr ""
 
-#: src/gui/gui-common.c:625
-msgid "Not enough memory for new message\n"
+#: src/gui/gui-common.c:844
+msgid "Not enough memory for infobar message\n"
 msgstr ""
 
 #: src/gui/gui-keyboard.c:45
@@ -2337,7 +2338,7 @@ msgstr ""
 msgid "grab a key"
 msgstr ""
 
-#: src/gui/gui-keyboard.c:428 src/common/command.c:1662
+#: src/gui/gui-keyboard.c:428 src/common/command.c:1710
 #, c-format
 msgid "%s unable to bind key \"%s\"\n"
 msgstr ""
@@ -2617,7 +2618,7 @@ msgstr ""
 
 #: src/common/command.c:306
 #, c-format
-msgid "%s target command \"%s\" does not exist!\n"
+msgid "%s target command \"/%s\" does not exist!\n"
 msgstr ""
 
 #: src/common/command.c:535
@@ -2659,417 +2660,438 @@ msgstr ""
 msgid "%s unknown command \"%s\" (type /help for help)\n"
 msgstr ""
 
-#: src/common/command.c:773
+#: src/common/command.c:789
 #, c-format
 msgid "%s unable to call handler for message (not enough memory)\n"
 msgstr ""
 
-#: src/common/command.c:781
+#: src/common/command.c:797
 msgid "This window is not a channel!\n"
 msgstr ""
 
-#: src/common/command.c:809 src/common/command.c:833 src/common/command.c:943
+#: src/common/command.c:825 src/common/command.c:856 src/common/command.c:963
 #, c-format
 msgid "%s missing arguments for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:818
+#: src/common/command.c:832
+#, c-format
+msgid "%s alias can not start with \"/\"\n"
+msgstr ""
+
+#: src/common/command.c:841
 #, c-format
 msgid "Alias \"%s\" => \"%s\" created\n"
 msgstr ""
 
-#: src/common/command.c:824
+#: src/common/command.c:847
 #, c-format
 msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n"
 msgstr ""
 
-#: src/common/command.c:844
+#: src/common/command.c:867
 msgid "List of aliases:\n"
 msgstr ""
 
-#: src/common/command.c:856
+#: src/common/command.c:881
 msgid "No alias defined.\n"
 msgstr ""
 
-#: src/common/command.c:879
-msgid "Channel: "
+#: src/common/command.c:898
+#, c-format
+msgid "%sServer: %s%s\n"
 msgstr ""
 
-#: src/common/command.c:882 src/common/command.c:892
-msgid " (server: "
+#: src/common/command.c:903
+#, c-format
+msgid "%sChannel: %s%s %s(server: %s%s%s)\n"
 msgstr ""
 
-#: src/common/command.c:889
-msgid "Private with: "
+#: src/common/command.c:912
+#, c-format
+msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n"
 msgstr ""
 
-#: src/common/command.c:923
+#: src/common/command.c:920
+msgid "not connected\n"
+msgstr ""
+
+#: src/common/command.c:942
 msgid "Opened buffers:\n"
 msgstr ""
 
-#: src/common/command.c:966
+#: src/common/command.c:986
 #, c-format
 msgid "%s incorrect buffer number\n"
 msgstr ""
 
-#: src/common/command.c:982
+#: src/common/command.c:1002
 #, c-format
 msgid "%s can not close the single buffer\n"
 msgstr ""
 
-#: src/common/command.c:992
+#: src/common/command.c:1012
 #, c-format
 msgid "%s can not close server buffer while channels are opened\n"
 msgstr ""
 
-#: src/common/command.c:1043
+#: src/common/command.c:1063
 msgid "Notify levels:  "
 msgstr ""
 
-#: src/common/command.c:1071 src/common/command.c:1093
+#: src/common/command.c:1091 src/common/command.c:1113
 #, c-format
 msgid "%s incorrect notify level (must be between %d and %d)\n"
 msgstr ""
 
-#: src/common/command.c:1080
+#: src/common/command.c:1100
 #, c-format
 msgid "%s incorrect buffer for notify (must be channel or private)\n"
 msgstr ""
 
-#: src/common/command.c:1160
+#: src/common/command.c:1180
 #, c-format
 msgid "unknown parameter \"%s\" for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1190
+#: src/common/command.c:1210
 #, c-format
 msgid "%s already connected to server \"%s\"!\n"
 msgstr ""
 
-#: src/common/command.c:1198
+#: src/common/command.c:1218
 #, c-format
 msgid "%s currently connecting to server \"%s\"!\n"
 msgstr ""
 
-#: src/common/command.c:1216 src/common/command.c:1291
+#: src/common/command.c:1236 src/common/command.c:1311
 #, c-format
 msgid "%s server not found\n"
 msgstr ""
 
-#: src/common/command.c:1246 src/common/command.c:1774
-#: src/common/command.c:2595 src/common/command.c:2619
+#: src/common/command.c:1266 src/common/command.c:1824
+#: src/common/command.c:2671 src/common/command.c:2695
 #, c-format
 msgid "%s unknown option for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1275
+#: src/common/command.c:1295
 #, c-format
 msgid "%s not connected to server \"%s\"!\n"
 msgstr ""
 
-#: src/common/command.c:1283
+#: src/common/command.c:1303
 msgid "Auto-reconnection is cancelled\n"
 msgstr ""
 
-#: src/common/command.c:1314 src/common/weechat.c:350
+#: src/common/command.c:1334 src/common/weechat.c:364
 #, c-format
 msgid "%s internal commands:\n"
 msgstr ""
 
-#: src/common/command.c:1323 src/common/weechat.c:370
+#: src/common/command.c:1344 src/common/weechat.c:384
 #, c-format
 msgid "IRC commands:\n"
 msgstr ""
 
-#: src/common/command.c:1336
+#: src/common/command.c:1358
 msgid "Plugin commands:\n"
 msgstr ""
 
-#: src/common/command.c:1444
+#: src/common/command.c:1474
 #, c-format
 msgid "No help available, \"%s\" is an unknown command\n"
 msgstr ""
 
-#: src/common/command.c:1466
+#: src/common/command.c:1495
+msgid "on"
+msgstr ""
+
+#: src/common/command.c:1503
 msgid " ignoring "
 msgstr ""
 
-#: src/common/command.c:1490
+#: src/common/command.c:1507
+msgid " from "
+msgstr ""
+
+#: src/common/command.c:1530
 msgid "List of ignore:\n"
 msgstr ""
 
-#: src/common/command.c:1505
+#: src/common/command.c:1547
 msgid "No ignore defined.\n"
 msgstr ""
 
-#: src/common/command.c:1531
+#: src/common/command.c:1573
 msgid "New ignore:"
 msgstr ""
 
-#: src/common/command.c:1550
-msgid "New key binding:\n"
+#: src/common/command.c:1593
+#, c-format
+msgid "New key binding:  %s"
 msgstr ""
 
-#: src/common/command.c:1583
+#: src/common/command.c:1627
 msgid "Key bindings:\n"
 msgstr ""
 
-#: src/common/command.c:1595
+#: src/common/command.c:1641
 #, c-format
 msgid "Key \"%s\" unbinded\n"
 msgstr ""
 
-#: src/common/command.c:1600
+#: src/common/command.c:1647
 #, c-format
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:1608 src/common/weechat.c:401
+#: src/common/command.c:1655 src/common/weechat.c:415
 #, c-format
 msgid "Internal key functions:\n"
 msgstr ""
 
-#: src/common/command.c:1627
+#: src/common/command.c:1675
 msgid "Default key bindings restored\n"
 msgstr ""
 
-#: src/common/command.c:1633
+#: src/common/command.c:1681
 #, c-format
 msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n"
 msgstr ""
 
-#: src/common/command.c:1689
+#: src/common/command.c:1737
 msgid "Plugins loaded:\n"
 msgstr ""
 
-#: src/common/command.c:1703
+#: src/common/command.c:1753
 msgid "     message handlers:\n"
 msgstr ""
 
-#: src/common/command.c:1712
+#: src/common/command.c:1762
 #, c-format
 msgid "       IRC(%s)\n"
 msgstr ""
 
-#: src/common/command.c:1719
+#: src/common/command.c:1769
 msgid "       (no message handler)\n"
 msgstr ""
 
-#: src/common/command.c:1724
+#: src/common/command.c:1774
 msgid "     command handlers:\n"
 msgstr ""
 
-#: src/common/command.c:1745
+#: src/common/command.c:1795
 msgid "       (no command handler)\n"
 msgstr ""
 
-#: src/common/command.c:1751
+#: src/common/command.c:1801
 msgid "  (no plugin)\n"
 msgstr ""
 
-#: src/common/command.c:1787
+#: src/common/command.c:1837
 msgid ""
 "Command \"plugin\" is not available, WeeChat was built without plugins "
 "support.\n"
 msgstr ""
 
-#: src/common/command.c:1834
+#: src/common/command.c:1884
 msgid "No server.\n"
 msgstr ""
 
-#: src/common/command.c:1845
+#: src/common/command.c:1895
 #, c-format
 msgid "Server '%s' not found.\n"
 msgstr ""
 
-#: src/common/command.c:1857
+#: src/common/command.c:1907
 #, c-format
 msgid "%s missing servername for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1865
+#: src/common/command.c:1915
 #, c-format
 msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
 msgstr ""
 
-#: src/common/command.c:1884
+#: src/common/command.c:1934
 #, c-format
 msgid "%s server \"%s\" not found for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1892
+#: src/common/command.c:1942
 #, c-format
 msgid ""
 "%s you can not delete server \"%s\" because you are connected to. Try /"
 "disconnect %s before.\n"
 msgstr ""
 
-#: src/common/command.c:1908 src/common/command.c:2054
-msgid "Server"
+#: src/common/command.c:1960
+#, c-format
+msgid "Server %s%s%s has been deleted\n"
 msgstr ""
 
-#: src/common/command.c:1911
-msgid "has been deleted\n"
-msgstr ""
-
-#: src/common/command.c:1926
+#: src/common/command.c:1977
 #, c-format
 msgid "%s missing parameters for \"%s\" command\n"
 msgstr ""
 
-#: src/common/command.c:1936
+#: src/common/command.c:1987
 #, c-format
 msgid "%s server \"%s\" already exists, can't create it!\n"
 msgstr ""
 
-#: src/common/command.c:1965 src/common/command.c:1993
-#: src/common/command.c:2006 src/common/command.c:2032
+#: src/common/command.c:2016 src/common/command.c:2044
+#: src/common/command.c:2057 src/common/command.c:2083
 #, c-format
 msgid "%s missing password for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:1978
+#: src/common/command.c:2029
 #, c-format
 msgid "%s missing nick(s) for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:2019
+#: src/common/command.c:2070
 #, c-format
 msgid "%s missing command for \"%s\" parameter\n"
 msgstr ""
 
-#: src/common/command.c:2057
-msgid "created\n"
+#: src/common/command.c:2105
+#, c-format
+msgid "Server %s%s%s created\n"
 msgstr ""
 
-#: src/common/command.c:2063
+#: src/common/command.c:2114
 #, c-format
 msgid "%s unable to create server\n"
 msgstr ""
 
-#: src/common/command.c:2118
+#: src/common/command.c:2173
 msgid "(unknown)"
 msgstr ""
 
-#: src/common/command.c:2141
-msgid "(password hidden) "
+#: src/common/command.c:2196
+#, c-format
+msgid "%s(password hidden) "
 msgstr ""
 
-#: src/common/command.c:2205
+#: src/common/command.c:2263
 #, c-format
 msgid "%s server \"%s\" not found\n"
 msgstr ""
 
-#: src/common/command.c:2236 src/common/command.c:2282
+#: src/common/command.c:2296 src/common/command.c:2344
 #, c-format
 msgid "%s config option \"%s\" not found\n"
 msgstr ""
 
-#: src/common/command.c:2241 src/common/command.c:2274
+#: src/common/command.c:2301 src/common/command.c:2336
 #, c-format
 msgid "%s incorrect value for option \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:2257
+#: src/common/command.c:2317
 #, c-format
 msgid "%s option \"%s\" can not be changed while WeeChat is running\n"
 msgstr ""
 
-#: src/common/command.c:2362
+#: src/common/command.c:2427
 #, c-format
 msgid "No config option found with \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:2365
+#: src/common/command.c:2430
 msgid "No config option found\n"
 msgstr ""
 
-#: src/common/command.c:2372
-msgid "Detail:\n"
+#: src/common/command.c:2437
+#, c-format
+msgid "%sDetail:\n"
 msgstr ""
 
-#: src/common/command.c:2376 src/common/weechat.c:287
+#: src/common/command.c:2443 src/common/weechat.c:301
 #, c-format
 msgid "  . type boolean (values: 'on' or 'off')\n"
 msgstr ""
 
-#: src/common/command.c:2377 src/common/command.c:2400
-#: src/common/command.c:2406 src/common/command.c:2412
-#: src/common/weechat.c:288 src/common/weechat.c:311 src/common/weechat.c:317
-#: src/common/weechat.c:323
+#: src/common/command.c:2444 src/common/command.c:2467
+#: src/common/command.c:2473 src/common/command.c:2479
+#: src/common/weechat.c:302 src/common/weechat.c:325 src/common/weechat.c:331
+#: src/common/weechat.c:337
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr ""
 
-#: src/common/command.c:2382 src/common/weechat.c:293
+#: src/common/command.c:2449 src/common/weechat.c:307
 #, c-format
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr ""
 
-#: src/common/command.c:2385 src/common/weechat.c:296
+#: src/common/command.c:2452 src/common/weechat.c:310
 #, c-format
 msgid "  . default value: %d\n"
 msgstr ""
 
-#: src/common/command.c:2389 src/common/weechat.c:300
+#: src/common/command.c:2456 src/common/weechat.c:314
 #, c-format
 msgid "  . type string (values: "
 msgstr ""
 
-#: src/common/command.c:2402 src/common/command.c:2408
-#: src/common/command.c:2414 src/common/weechat.c:313 src/common/weechat.c:319
-#: src/common/weechat.c:325
+#: src/common/command.c:2469 src/common/command.c:2475
+#: src/common/command.c:2481 src/common/weechat.c:327 src/common/weechat.c:333
+#: src/common/weechat.c:339
 msgid "empty"
 msgstr ""
 
-#: src/common/command.c:2405 src/common/weechat.c:316
+#: src/common/command.c:2472 src/common/weechat.c:330
 #, c-format
 msgid "  . type color (Curses or Gtk color, look at WeeChat doc)\n"
 msgstr ""
 
-#: src/common/command.c:2411 src/common/weechat.c:322
+#: src/common/command.c:2478 src/common/weechat.c:336
 #, c-format
 msgid "  . type string (any string)\n"
 msgstr ""
 
-#: src/common/command.c:2417 src/common/weechat.c:328
+#: src/common/command.c:2484 src/common/weechat.c:342
 #, c-format
 msgid "  . description: %s\n"
 msgstr ""
 
-#: src/common/command.c:2424
+#: src/common/command.c:2495
 #, c-format
 msgid "config option(s) found with \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:2427
+#: src/common/command.c:2498
 msgid "config option(s) found\n"
 msgstr ""
 
-#: src/common/command.c:2448
+#: src/common/command.c:2519
 #, c-format
 msgid "%s alias or command \"%s\" not found\n"
 msgstr ""
 
-#: src/common/command.c:2458
+#: src/common/command.c:2529
 #, c-format
 msgid "Alias \"%s\" removed\n"
 msgstr ""
 
-#: src/common/command.c:2511
+#: src/common/command.c:2585
 msgid "ignore were removed.\n"
 msgstr ""
 
-#: src/common/command.c:2513
+#: src/common/command.c:2587
 msgid "ignore was removed.\n"
 msgstr ""
 
-#: src/common/command.c:2518
+#: src/common/command.c:2592
 #, c-format
 msgid "%s no ignore found\n"
 msgstr ""
 
-#: src/common/command.c:2543
+#: src/common/command.c:2617
 msgid "Opened windows:\n"
 msgstr ""
 
@@ -3116,98 +3138,98 @@ msgstr ""
 msgid "%s cannot add a buffer to hotlist\n"
 msgstr ""
 
-#: src/common/log.c:118
+#: src/common/log.c:96
 msgid "Not enough memory to write log file for a buffer\n"
 msgstr ""
 
-#: src/common/log.c:146
+#: src/common/log.c:124
 msgid "Unable to write log file for a buffer\n"
 msgstr ""
 
-#: src/common/log.c:150
+#: src/common/log.c:128
 msgid "****  Beginning of log  "
 msgstr ""
 
-#: src/common/log.c:164
+#: src/common/log.c:142
 msgid "****  End of log  "
 msgstr ""
 
-#: src/common/weechat.c:274
+#: src/common/weechat.c:288
 #, c-format
 msgid ""
 "WeeChat configuration options (~/.weechat/weechat.rc):\n"
 "\n"
 msgstr ""
 
-#: src/common/weechat.c:335
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "Moreover, you can define aliases in [alias] section, by adding lines like:\n"
 msgstr ""
 
-#: src/common/weechat.c:337
+#: src/common/weechat.c:351
 #, c-format
 msgid ""
 "where 'j' is alias name, and 'join' associated command.\n"
 "\n"
 msgstr ""
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:437
 #, c-format
 msgid "%s default keys:\n"
 msgstr ""
 
-#: src/common/weechat.c:503
+#: src/common/weechat.c:525
 #, c-format
 msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
 msgstr ""
 
-#: src/common/weechat.c:516
+#: src/common/weechat.c:538
 #, c-format
 msgid "%s unable to create server ('%s'), ignored\n"
 msgstr ""
 
-#: src/common/weechat.c:525
+#: src/common/weechat.c:547
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr ""
 
-#: src/common/weechat.c:545
+#: src/common/weechat.c:567
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr ""
 
-#: src/common/weechat.c:571
+#: src/common/weechat.c:593
 #, c-format
 msgid "%s unable to get HOME directory\n"
 msgstr ""
 
-#: src/common/weechat.c:580
+#: src/common/weechat.c:602
 #, c-format
 msgid "%s not enough memory for home directory\n"
 msgstr ""
 
-#: src/common/weechat.c:590
+#: src/common/weechat.c:612
 #, c-format
 msgid "%s unable to create ~/.weechat directory\n"
 msgstr ""
 
-#: src/common/weechat.c:603
+#: src/common/weechat.c:625
 #, c-format
 msgid "%s unable to create ~/.weechat/logs directory\n"
 msgstr ""
 
-#: src/common/weechat.c:646
+#: src/common/weechat.c:668
 #, c-format
 msgid "%s unable to create/append to log file (~/.weechat/%s)"
 msgstr ""
 
-#: src/common/weechat.c:669
+#: src/common/weechat.c:696
 #, c-format
-msgid "%sWelcome to "
+msgid "%sWelcome to %s%s%s, %s\n"
 msgstr ""
 
-#: src/common/weechat.c:682 src/common/weechat.c:691
+#: src/common/weechat.c:710 src/common/weechat.c:720
 msgid "compiled on"
 msgstr ""
 
@@ -3219,1038 +3241,1048 @@ msgstr ""
 msgid "WeeChat Warning:"
 msgstr ""
 
-#: src/common/weeconfig.c:103 src/common/weeconfig.c:104
+#: src/common/weeconfig.c:102 src/common/weeconfig.c:103
 msgid "set title for window (terminal for Curses GUI) with name & version"
 msgstr ""
 
-#: src/common/weeconfig.c:107 src/common/weeconfig.c:108
+#: src/common/weeconfig.c:106 src/common/weeconfig.c:107
 msgid "display WeeChat logo at startup"
 msgstr ""
 
-#: src/common/weeconfig.c:111 src/common/weeconfig.c:112
+#: src/common/weeconfig.c:110 src/common/weeconfig.c:111
 msgid "display WeeChat version at startup"
 msgstr ""
 
-#: src/common/weeconfig.c:115
+#: src/common/weeconfig.c:114
 msgid "WeeChat slogan"
 msgstr ""
 
-#: src/common/weeconfig.c:116
+#: src/common/weeconfig.c:115
 msgid "WeeChat slogan (if empty, slogan is not used)"
 msgstr ""
 
-#: src/common/weeconfig.c:119
+#: src/common/weeconfig.c:118
 msgid ""
 "ISO charset for decoding messages from server (used only if locale is UTF-8)"
 msgstr ""
 
-#: src/common/weeconfig.c:120
+#: src/common/weeconfig.c:119
 msgid ""
 "ISO charset for decoding messages from server (used only if locale is UTF-8) "
 "(if empty, messages are not converted if locale is UTF-8"
 msgstr ""
 
-#: src/common/weeconfig.c:124
+#: src/common/weeconfig.c:123
 msgid ""
 "UTF charset for decoding messages from server (used only if locale is not "
 "UTF-8)"
 msgstr ""
 
-#: src/common/weeconfig.c:125
+#: src/common/weeconfig.c:124
 msgid ""
 "UTF charset for decoding messages from server (used only if locale is not "
 "UTF-8) (if empty, messages are not converted if locale is not UTF-8"
 msgstr ""
 
-#: src/common/weeconfig.c:129
+#: src/common/weeconfig.c:128
 msgid "charset for encoding messages sent to server"
 msgstr ""
 
-#: src/common/weeconfig.c:130
+#: src/common/weeconfig.c:129
 msgid ""
 "charset for encoding messages sent to server, examples: UFT-8, ISO-8859-1 "
 "(if empty, messages are not converted)"
 msgstr ""
 
-#: src/common/weeconfig.c:133
+#: src/common/weeconfig.c:132
 msgid "forces internal WeeChat charset (should be empty in most cases)"
 msgstr ""
 
-#: src/common/weeconfig.c:134
+#: src/common/weeconfig.c:133
 msgid ""
 "forces internal WeeChat charset (should be empty in most cases, that means "
 "detected charset is used)"
 msgstr ""
 
-#: src/common/weeconfig.c:137 src/common/weeconfig.c:138
+#: src/common/weeconfig.c:136 src/common/weeconfig.c:137
 msgid "use same buffer for all servers"
 msgstr ""
 
-#: src/common/weeconfig.c:141 src/common/weeconfig.c:142
+#: src/common/weeconfig.c:140 src/common/weeconfig.c:141
 msgid "timestamp for buffers"
 msgstr ""
 
-#: src/common/weeconfig.c:145 src/common/weeconfig.c:146
+#: src/common/weeconfig.c:144 src/common/weeconfig.c:145
 msgid "display nick names with different colors"
 msgstr ""
 
-#: src/common/weeconfig.c:149 src/common/weeconfig.c:150
+#: src/common/weeconfig.c:148 src/common/weeconfig.c:149
 msgid "number of colors to use for nicks colors"
 msgstr ""
 
-#: src/common/weeconfig.c:153 src/common/weeconfig.c:154
+#: src/common/weeconfig.c:152 src/common/weeconfig.c:153
 msgid "display actions with different colors"
 msgstr ""
 
-#: src/common/weeconfig.c:157 src/common/weeconfig.c:158
-msgid "remove colors from incoming messages"
-msgstr ""
-
-#: src/common/weeconfig.c:161
+#: src/common/weeconfig.c:156
 msgid "display nicklist window"
 msgstr ""
 
-#: src/common/weeconfig.c:162
+#: src/common/weeconfig.c:157
 msgid "display nicklist window (for channel windows)"
 msgstr ""
 
-#: src/common/weeconfig.c:165
+#: src/common/weeconfig.c:160
 msgid "nicklist position"
 msgstr ""
 
-#: src/common/weeconfig.c:166
+#: src/common/weeconfig.c:161
 msgid "nicklist position (top, left, right (default), bottom)"
 msgstr ""
 
-#: src/common/weeconfig.c:169
+#: src/common/weeconfig.c:164
 msgid "min size for nicklist"
 msgstr ""
 
-#: src/common/weeconfig.c:170
+#: src/common/weeconfig.c:165
 msgid ""
 "min size for nicklist (width or height, depending on look_nicklist_position "
 "(0 = no min size))"
 msgstr ""
 
-#: src/common/weeconfig.c:174
+#: src/common/weeconfig.c:169
 msgid "max size for nicklist"
 msgstr ""
 
-#: src/common/weeconfig.c:175
+#: src/common/weeconfig.c:170
 msgid ""
 "max size for nicklist (width or height, depending on look_nicklist_position "
 "(0 = no max size; if min == max and > 0, then size is fixed))"
 msgstr ""
 
-#: src/common/weeconfig.c:179 src/common/weeconfig.c:180
+#: src/common/weeconfig.c:174 src/common/weeconfig.c:175
 msgid "text to display instead of nick when not connected"
 msgstr ""
 
-#: src/common/weeconfig.c:183 src/common/weeconfig.c:184
+#: src/common/weeconfig.c:178 src/common/weeconfig.c:179
 msgid "display nick mode ((half)op/voice) before each nick"
 msgstr ""
 
-#: src/common/weeconfig.c:187 src/common/weeconfig.c:188
+#: src/common/weeconfig.c:182 src/common/weeconfig.c:183
 msgid "display space if nick mode is not (half)op/voice"
 msgstr ""
 
-#: src/common/weeconfig.c:191 src/common/weeconfig.c:192
+#: src/common/weeconfig.c:186 src/common/weeconfig.c:187
 msgid "the string inserted after nick completion"
 msgstr ""
 
-#: src/common/weeconfig.c:195 src/common/weeconfig.c:196
+#: src/common/weeconfig.c:190 src/common/weeconfig.c:191
 msgid "chars ignored for nick completion"
 msgstr ""
 
-#: src/common/weeconfig.c:199 src/common/weeconfig.c:200
+#: src/common/weeconfig.c:194 src/common/weeconfig.c:195
 msgid "enable info bar"
 msgstr ""
 
-#: src/common/weeconfig.c:203 src/common/weeconfig.c:204
+#: src/common/weeconfig.c:198 src/common/weeconfig.c:199
 msgid "timestamp for time in infobar"
 msgstr ""
 
-#: src/common/weeconfig.c:207 src/common/weeconfig.c:208
+#: src/common/weeconfig.c:202 src/common/weeconfig.c:203
 msgid "display seconds in infobar time"
 msgstr ""
 
-#: src/common/weeconfig.c:211
+#: src/common/weeconfig.c:206
 msgid "delay (in seconds) for highlight messages in infobar"
 msgstr ""
 
-#: src/common/weeconfig.c:212
+#: src/common/weeconfig.c:207
 msgid ""
 "delay (in seconds) for highlight messages in infobar (0 = disable highlight "
 "notifications in infobar)"
 msgstr ""
 
-#: src/common/weeconfig.c:216
+#: src/common/weeconfig.c:211
 msgid "max number of names in hotlist"
 msgstr ""
 
-#: src/common/weeconfig.c:217
+#: src/common/weeconfig.c:212
 msgid ""
 "max number of names in hotlist (0 = no name displayed, only buffer numbers)"
 msgstr ""
 
-#: src/common/weeconfig.c:220
+#: src/common/weeconfig.c:215
 msgid "level for displaying names in hotlist"
 msgstr ""
 
-#: src/common/weeconfig.c:221
+#: src/common/weeconfig.c:216
 msgid ""
 "level for displaying names in hotlist (combination of: 1=join/part, "
 "2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
 msgstr ""
 
-#: src/common/weeconfig.c:225
+#: src/common/weeconfig.c:220
 msgid "max length of names in hotlist"
 msgstr ""
 
-#: src/common/weeconfig.c:226
+#: src/common/weeconfig.c:221
 msgid "max length of names in hotlist (0 = no limit)"
 msgstr ""
 
-#: src/common/weeconfig.c:229 src/common/weeconfig.c:230
+#: src/common/weeconfig.c:224 src/common/weeconfig.c:225
 msgid "display special message when day changes"
 msgstr ""
 
-#: src/common/weeconfig.c:233 src/common/weeconfig.c:234
+#: src/common/weeconfig.c:228 src/common/weeconfig.c:229
 msgid "timestamp for date displayed when day changed"
 msgstr ""
 
-#: src/common/weeconfig.c:299 src/common/weeconfig.c:300
+#: src/common/weeconfig.c:294 src/common/weeconfig.c:295
 msgid "color for title bar"
 msgstr ""
 
-#: src/common/weeconfig.c:303 src/common/weeconfig.c:304
+#: src/common/weeconfig.c:298 src/common/weeconfig.c:299
 msgid "background for title bar"
 msgstr ""
 
-#: src/common/weeconfig.c:309 src/common/weeconfig.c:310
+#: src/common/weeconfig.c:304 src/common/weeconfig.c:305
 msgid "color for chat text"
 msgstr ""
 
-#: src/common/weeconfig.c:313
+#: src/common/weeconfig.c:308
 msgid "color for time"
 msgstr ""
 
-#: src/common/weeconfig.c:314
+#: src/common/weeconfig.c:309
 msgid "color for time in chat window"
 msgstr ""
 
-#: src/common/weeconfig.c:317
+#: src/common/weeconfig.c:312
 msgid "color for time separator"
 msgstr ""
 
-#: src/common/weeconfig.c:318
+#: src/common/weeconfig.c:313
 msgid "color for time separator (chat window)"
 msgstr ""
 
-#: src/common/weeconfig.c:321 src/common/weeconfig.c:322
+#: src/common/weeconfig.c:316 src/common/weeconfig.c:317
 msgid "color for 1st and 3rd char of prefix"
 msgstr ""
 
-#: src/common/weeconfig.c:325 src/common/weeconfig.c:326
+#: src/common/weeconfig.c:320 src/common/weeconfig.c:321
 msgid "color for middle char of prefix"
 msgstr ""
 
-#: src/common/weeconfig.c:329 src/common/weeconfig.c:330
+#: src/common/weeconfig.c:324 src/common/weeconfig.c:325
 msgid "color for server name"
 msgstr ""
 
-#: src/common/weeconfig.c:333 src/common/weeconfig.c:334
+#: src/common/weeconfig.c:328 src/common/weeconfig.c:329
 msgid "color for join arrow (prefix)"
 msgstr ""
 
-#: src/common/weeconfig.c:337 src/common/weeconfig.c:338
+#: src/common/weeconfig.c:332 src/common/weeconfig.c:333
 msgid "color for part/quit arrow (prefix)"
 msgstr ""
 
-#: src/common/weeconfig.c:341
+#: src/common/weeconfig.c:336
 msgid "color for nicks in actions"
 msgstr ""
 
-#: src/common/weeconfig.c:342
+#: src/common/weeconfig.c:337
 msgid "color for nicks in actions (chat window)"
 msgstr ""
 
-#: src/common/weeconfig.c:345
+#: src/common/weeconfig.c:340
 msgid "color for hostnames"
 msgstr ""
 
-#: src/common/weeconfig.c:346
+#: src/common/weeconfig.c:341
 msgid "color for hostnames (chat window)"
 msgstr ""
 
-#: src/common/weeconfig.c:349
+#: src/common/weeconfig.c:344
 msgid "color for channel names in actions"
 msgstr ""
 
-#: src/common/weeconfig.c:350
+#: src/common/weeconfig.c:345
 msgid "color for channel names in actions (chat window)"
 msgstr ""
 
-#: src/common/weeconfig.c:353
+#: src/common/weeconfig.c:348
 msgid "color for dark separators"
 msgstr ""
 
-#: src/common/weeconfig.c:354
+#: src/common/weeconfig.c:349
 msgid "color for dark separators (chat window)"
 msgstr ""
 
-#: src/common/weeconfig.c:357
+#: src/common/weeconfig.c:352
 msgid "color for highlighted nick"
 msgstr ""
 
-#: src/common/weeconfig.c:358
+#: src/common/weeconfig.c:353
 msgid "color for highlighted nick (chat window)"
 msgstr ""
 
-#: src/common/weeconfig.c:361
+#: src/common/weeconfig.c:356
 msgid "background for chat"
 msgstr ""
 
-#: src/common/weeconfig.c:362
+#: src/common/weeconfig.c:357
 msgid "background for chat window"
 msgstr ""
 
-#: src/common/weeconfig.c:367 src/common/weeconfig.c:368
+#: src/common/weeconfig.c:362 src/common/weeconfig.c:363
 msgid "color for status bar"
 msgstr ""
 
-#: src/common/weeconfig.c:371 src/common/weeconfig.c:372
+#: src/common/weeconfig.c:366 src/common/weeconfig.c:367
 msgid "color for status bar delimiters"
 msgstr ""
 
-#: src/common/weeconfig.c:375 src/common/weeconfig.c:376
+#: src/common/weeconfig.c:370 src/common/weeconfig.c:371
 msgid "color for current channel in status bar"
 msgstr ""
 
-#: src/common/weeconfig.c:379
+#: src/common/weeconfig.c:374
 msgid "color for window with new messages"
 msgstr ""
 
-#: src/common/weeconfig.c:380
+#: src/common/weeconfig.c:375
 msgid "color for window with new messages (status bar)"
 msgstr ""
 
-#: src/common/weeconfig.c:383
+#: src/common/weeconfig.c:378
 msgid "color for window with private message"
 msgstr ""
 
-#: src/common/weeconfig.c:384
+#: src/common/weeconfig.c:379
 msgid "color for window with private message (status bar)"
 msgstr ""
 
-#: src/common/weeconfig.c:387
+#: src/common/weeconfig.c:382
 msgid "color for window with highlight"
 msgstr ""
 
-#: src/common/weeconfig.c:388
+#: src/common/weeconfig.c:383
 msgid "color for window with highlight (status bar)"
 msgstr ""
 
-#: src/common/weeconfig.c:391
+#: src/common/weeconfig.c:386
 msgid "color for window with new data (not messages)"
 msgstr ""
 
-#: src/common/weeconfig.c:392
+#: src/common/weeconfig.c:387
 msgid "color for window with new data (not messages) (status bar)"
 msgstr ""
 
-#: src/common/weeconfig.c:395
+#: src/common/weeconfig.c:390
 msgid "color for \"-MORE-\" text"
 msgstr ""
 
-#: src/common/weeconfig.c:396
+#: src/common/weeconfig.c:391
 msgid "color for window with new data (status bar)"
 msgstr ""
 
-#: src/common/weeconfig.c:399 src/common/weeconfig.c:400
+#: src/common/weeconfig.c:394 src/common/weeconfig.c:395
 msgid "background for status window"
 msgstr ""
 
-#: src/common/weeconfig.c:405 src/common/weeconfig.c:406
+#: src/common/weeconfig.c:400 src/common/weeconfig.c:401
 msgid "color for info bar text"
 msgstr ""
 
-#: src/common/weeconfig.c:409 src/common/weeconfig.c:410
+#: src/common/weeconfig.c:404 src/common/weeconfig.c:405
 msgid "color for infobar delimiters"
 msgstr ""
 
-#: src/common/weeconfig.c:413 src/common/weeconfig.c:414
+#: src/common/weeconfig.c:408 src/common/weeconfig.c:409
 msgid "color for info bar highlight notification"
 msgstr ""
 
-#: src/common/weeconfig.c:417 src/common/weeconfig.c:418
+#: src/common/weeconfig.c:412 src/common/weeconfig.c:413
 msgid "background for info bar window"
 msgstr ""
 
-#: src/common/weeconfig.c:423 src/common/weeconfig.c:424
+#: src/common/weeconfig.c:418 src/common/weeconfig.c:419
 msgid "color for input text"
 msgstr ""
 
-#: src/common/weeconfig.c:427 src/common/weeconfig.c:428
+#: src/common/weeconfig.c:422 src/common/weeconfig.c:423
 msgid "color for input text (channel name)"
 msgstr ""
 
-#: src/common/weeconfig.c:431 src/common/weeconfig.c:432
+#: src/common/weeconfig.c:426 src/common/weeconfig.c:427
 msgid "color for input text (nick name)"
 msgstr ""
 
-#: src/common/weeconfig.c:435 src/common/weeconfig.c:436
+#: src/common/weeconfig.c:430 src/common/weeconfig.c:431
 msgid "color for input text (delimiters)"
 msgstr ""
 
-#: src/common/weeconfig.c:439 src/common/weeconfig.c:440
+#: src/common/weeconfig.c:434 src/common/weeconfig.c:435
 msgid "background for input window"
 msgstr ""
 
-#: src/common/weeconfig.c:445 src/common/weeconfig.c:446
+#: src/common/weeconfig.c:440 src/common/weeconfig.c:441
 msgid "color for nicknames"
 msgstr ""
 
-#: src/common/weeconfig.c:449 src/common/weeconfig.c:450
+#: src/common/weeconfig.c:444 src/common/weeconfig.c:445
 msgid "color for away nicknames"
 msgstr ""
 
-#: src/common/weeconfig.c:453
+#: src/common/weeconfig.c:448
 msgid "color for chan owner symbol"
 msgstr ""
 
-#: src/common/weeconfig.c:454
+#: src/common/weeconfig.c:449
 msgid "color for chan owner symbol (specific to unrealircd)"
 msgstr ""
 
-#: src/common/weeconfig.c:457
+#: src/common/weeconfig.c:452
 msgid "color for chan admin symbol"
 msgstr ""
 
-#: src/common/weeconfig.c:458
+#: src/common/weeconfig.c:453
 msgid "color for chan admin symbol (specific to unrealircd)"
 msgstr ""
 
-#: src/common/weeconfig.c:461 src/common/weeconfig.c:462
+#: src/common/weeconfig.c:456 src/common/weeconfig.c:457
 msgid "color for operator symbol"
 msgstr ""
 
-#: src/common/weeconfig.c:465 src/common/weeconfig.c:466
+#: src/common/weeconfig.c:460 src/common/weeconfig.c:461
 msgid "color for half-operator symbol"
 msgstr ""
 
-#: src/common/weeconfig.c:469 src/common/weeconfig.c:470
+#: src/common/weeconfig.c:464 src/common/weeconfig.c:465
 msgid "color for voice symbol"
 msgstr ""
 
-#: src/common/weeconfig.c:473 src/common/weeconfig.c:474
+#: src/common/weeconfig.c:468 src/common/weeconfig.c:469
 msgid "color for '+' when scrolling nicks"
 msgstr ""
 
-#: src/common/weeconfig.c:477 src/common/weeconfig.c:478
+#: src/common/weeconfig.c:472 src/common/weeconfig.c:473
 msgid "color for nick separator"
 msgstr ""
 
-#: src/common/weeconfig.c:481 src/common/weeconfig.c:482
+#: src/common/weeconfig.c:476 src/common/weeconfig.c:477
 msgid "color for local nick"
 msgstr ""
 
-#: src/common/weeconfig.c:485 src/common/weeconfig.c:486
-#: src/common/weeconfig.c:489 src/common/weeconfig.c:490
-#: src/common/weeconfig.c:493 src/common/weeconfig.c:494
-#: src/common/weeconfig.c:497 src/common/weeconfig.c:498
-#: src/common/weeconfig.c:501 src/common/weeconfig.c:502
-#: src/common/weeconfig.c:505 src/common/weeconfig.c:506
-#: src/common/weeconfig.c:509 src/common/weeconfig.c:510
-#: src/common/weeconfig.c:513 src/common/weeconfig.c:514
-#: src/common/weeconfig.c:517 src/common/weeconfig.c:518
-#: src/common/weeconfig.c:521 src/common/weeconfig.c:522
+#: src/common/weeconfig.c:480 src/common/weeconfig.c:481
+#: src/common/weeconfig.c:484 src/common/weeconfig.c:485
+#: src/common/weeconfig.c:488 src/common/weeconfig.c:489
+#: src/common/weeconfig.c:492 src/common/weeconfig.c:493
+#: src/common/weeconfig.c:496 src/common/weeconfig.c:497
+#: src/common/weeconfig.c:500 src/common/weeconfig.c:501
+#: src/common/weeconfig.c:504 src/common/weeconfig.c:505
+#: src/common/weeconfig.c:508 src/common/weeconfig.c:509
+#: src/common/weeconfig.c:512 src/common/weeconfig.c:513
+#: src/common/weeconfig.c:516 src/common/weeconfig.c:517
 msgid "color for nick"
 msgstr ""
 
-#: src/common/weeconfig.c:525 src/common/weeconfig.c:526
+#: src/common/weeconfig.c:520 src/common/weeconfig.c:521
 msgid "color for other nick in private window"
 msgstr ""
 
-#: src/common/weeconfig.c:529 src/common/weeconfig.c:530
+#: src/common/weeconfig.c:524 src/common/weeconfig.c:525
 msgid "background for nicknames"
 msgstr ""
 
-#: src/common/weeconfig.c:535
+#: src/common/weeconfig.c:530
 msgid "color for selected DCC"
 msgstr ""
 
-#: src/common/weeconfig.c:536
+#: src/common/weeconfig.c:531
 msgid "color for selected DCC (chat window)"
 msgstr ""
 
-#: src/common/weeconfig.c:539 src/common/weeconfig.c:540
+#: src/common/weeconfig.c:534 src/common/weeconfig.c:535
 msgid "color for \"waiting\" dcc status"
 msgstr ""
 
-#: src/common/weeconfig.c:543 src/common/weeconfig.c:544
+#: src/common/weeconfig.c:538 src/common/weeconfig.c:539
 msgid "color for \"connecting\" dcc status"
 msgstr ""
 
-#: src/common/weeconfig.c:547 src/common/weeconfig.c:548
+#: src/common/weeconfig.c:542 src/common/weeconfig.c:543
 msgid "color for \"active\" dcc status"
 msgstr ""
 
-#: src/common/weeconfig.c:551 src/common/weeconfig.c:552
+#: src/common/weeconfig.c:546 src/common/weeconfig.c:547
 msgid "color for \"done\" dcc status"
 msgstr ""
 
-#: src/common/weeconfig.c:555 src/common/weeconfig.c:556
+#: src/common/weeconfig.c:550 src/common/weeconfig.c:551
 msgid "color for \"failed\" dcc status"
 msgstr ""
 
-#: src/common/weeconfig.c:559 src/common/weeconfig.c:560
+#: src/common/weeconfig.c:554 src/common/weeconfig.c:555
 msgid "color for \"aborted\" dcc status"
 msgstr ""
 
-#: src/common/weeconfig.c:573
+#: src/common/weeconfig.c:568
 msgid "max lines in history (per window)"
 msgstr ""
 
-#: src/common/weeconfig.c:574
+#: src/common/weeconfig.c:569
 msgid ""
 "maximum number of lines in history for one server/channel/private window (0 "
 "= unlimited)"
 msgstr ""
 
-#: src/common/weeconfig.c:578
+#: src/common/weeconfig.c:573
 msgid "max user commands in history"
 msgstr ""
 
-#: src/common/weeconfig.c:579
+#: src/common/weeconfig.c:574
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr ""
 
-#: src/common/weeconfig.c:596 src/common/weeconfig.c:597
+#: src/common/weeconfig.c:591 src/common/weeconfig.c:592
 msgid "automatically log server messages"
 msgstr ""
 
-#: src/common/weeconfig.c:600 src/common/weeconfig.c:601
+#: src/common/weeconfig.c:595 src/common/weeconfig.c:596
 msgid "automatically log channel chats"
 msgstr ""
 
-#: src/common/weeconfig.c:604 src/common/weeconfig.c:605
+#: src/common/weeconfig.c:599 src/common/weeconfig.c:600
 msgid "automatically log private chats"
 msgstr ""
 
-#: src/common/weeconfig.c:608 src/common/weeconfig.c:609
+#: src/common/weeconfig.c:603 src/common/weeconfig.c:604
 msgid "log messages from plugins (scripts)"
 msgstr ""
 
-#: src/common/weeconfig.c:612
+#: src/common/weeconfig.c:607
 msgid "path for log files"
 msgstr ""
 
-#: src/common/weeconfig.c:613
+#: src/common/weeconfig.c:608
 msgid "path for WeeChat log files"
 msgstr ""
 
-#: src/common/weeconfig.c:616
+#: src/common/weeconfig.c:611
 msgid "timestamp for log"
 msgstr ""
 
-#: src/common/weeconfig.c:617
+#: src/common/weeconfig.c:612
 msgid "timestamp for log (see man strftime for date/time specifiers)"
 msgstr ""
 
-#: src/common/weeconfig.c:620 src/common/weeconfig.c:621
+#: src/common/weeconfig.c:615 src/common/weeconfig.c:616
 msgid "hide password displayed by nickserv"
 msgstr ""
 
-#: src/common/weeconfig.c:642
+#: src/common/weeconfig.c:639
 msgid "display message to all channels when away"
 msgstr ""
 
-#: src/common/weeconfig.c:643
+#: src/common/weeconfig.c:640
 msgid "display message to all channels when (un)marking as away"
 msgstr ""
 
-#: src/common/weeconfig.c:646 src/common/weeconfig.c:647
+#: src/common/weeconfig.c:643 src/common/weeconfig.c:644
 msgid "default message when away"
 msgstr ""
 
-#: src/common/weeconfig.c:650 src/common/weeconfig.c:651
+#: src/common/weeconfig.c:647 src/common/weeconfig.c:648
 msgid "default part message (leaving channel)"
 msgstr ""
 
-#: src/common/weeconfig.c:654
+#: src/common/weeconfig.c:651
 msgid "default quit message"
 msgstr ""
 
-#: src/common/weeconfig.c:655
+#: src/common/weeconfig.c:652
 msgid ""
 "default quit message ('%v' will be replaced by WeeChat version in string)"
 msgstr ""
 
-#: src/common/weeconfig.c:658 src/common/weeconfig.c:659
+#: src/common/weeconfig.c:655 src/common/weeconfig.c:656
 msgid "display notices as private messages"
 msgstr ""
 
-#: src/common/weeconfig.c:662
+#: src/common/weeconfig.c:659
 msgid "interval between two checks for away"
 msgstr ""
 
-#: src/common/weeconfig.c:663
+#: src/common/weeconfig.c:660
 msgid "interval between two checks for away (in minutes, 0 = never check)"
 msgstr ""
 
-#: src/common/weeconfig.c:666
+#: src/common/weeconfig.c:663
 msgid "interval between two checks for lag"
 msgstr ""
 
-#: src/common/weeconfig.c:667
+#: src/common/weeconfig.c:664
 msgid "interval between two checks for lag (in seconds)"
 msgstr ""
 
-#: src/common/weeconfig.c:670
+#: src/common/weeconfig.c:667
 msgid "minimum lag to show"
 msgstr ""
 
-#: src/common/weeconfig.c:671
+#: src/common/weeconfig.c:668
 msgid "minimum lag to show (in seconds)"
 msgstr ""
 
-#: src/common/weeconfig.c:674
+#: src/common/weeconfig.c:671
 msgid "disconnect after important lag"
 msgstr ""
 
-#: src/common/weeconfig.c:675
+#: src/common/weeconfig.c:672
 msgid "disconnect after important lag (in minutes, 0 = never disconnect)"
 msgstr ""
 
-#: src/common/weeconfig.c:678 src/common/weeconfig.c:679
+#: src/common/weeconfig.c:675 src/common/weeconfig.c:676
 msgid "create a FIFO pipe for remote control"
 msgstr ""
 
-#: src/common/weeconfig.c:682
+#: src/common/weeconfig.c:679
 msgid "list of words to highlight"
 msgstr ""
 
-#: src/common/weeconfig.c:683
+#: src/common/weeconfig.c:680
 msgid ""
 "comma separated list of words to highlight (case insensitive comparison, "
 "words may begin or end with \"*\" for partial match)"
 msgstr ""
 
-#: src/common/weeconfig.c:705
+#: src/common/weeconfig.c:684 src/common/weeconfig.c:685
+msgid "keep colors from incoming messages"
+msgstr ""
+
+#: src/common/weeconfig.c:688
+msgid "allow user to send colors"
+msgstr ""
+
+#: src/common/weeconfig.c:689
+msgid ""
+"allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %"
+"U=underline, %R=reverse)"
+msgstr ""
+
+#: src/common/weeconfig.c:711
 msgid "automatically accept dcc files"
 msgstr ""
 
-#: src/common/weeconfig.c:706
+#: src/common/weeconfig.c:712
 msgid "automatically accept incoming dcc files"
 msgstr ""
 
-#: src/common/weeconfig.c:709
+#: src/common/weeconfig.c:715
 msgid "automatically accept dcc chats"
 msgstr ""
 
-#: src/common/weeconfig.c:710
+#: src/common/weeconfig.c:716
 msgid "automatically accept dcc chats (use carefully!)"
 msgstr ""
 
-#: src/common/weeconfig.c:713
+#: src/common/weeconfig.c:719
 msgid "timeout for dcc request"
 msgstr ""
 
-#: src/common/weeconfig.c:714
+#: src/common/weeconfig.c:720
 msgid "timeout for dcc request (in seconds)"
 msgstr ""
 
-#: src/common/weeconfig.c:717
+#: src/common/weeconfig.c:723
 msgid "block size for dcc packets"
 msgstr ""
 
-#: src/common/weeconfig.c:718
+#: src/common/weeconfig.c:724
 msgid "block size for dcc packets in bytes (default: 65536)"
 msgstr ""
 
-#: src/common/weeconfig.c:721
+#: src/common/weeconfig.c:727
 msgid "allowed ports for outgoing dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:722
+#: src/common/weeconfig.c:728
 msgid ""
 "restricts outgoing dcc to use only ports in the given range (useful for NAT) "
 "(syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, empty value "
 "means any port)"
 msgstr ""
 
-#: src/common/weeconfig.c:727
+#: src/common/weeconfig.c:733
 msgid "IP address for outgoing dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:728
+#: src/common/weeconfig.c:734
 msgid ""
 "IP or DNS address used for outgoing dcc (if empty, local interface IP is "
 "used)"
 msgstr ""
 
-#: src/common/weeconfig.c:732
+#: src/common/weeconfig.c:738
 msgid "path for incoming files with dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:733
+#: src/common/weeconfig.c:739
 msgid "path for writing incoming files with dcc (default: user home)"
 msgstr ""
 
-#: src/common/weeconfig.c:736
+#: src/common/weeconfig.c:742
 msgid "default path for sending files with dcc"
 msgstr ""
 
-#: src/common/weeconfig.c:737
+#: src/common/weeconfig.c:743
 msgid ""
 "path for reading files when sending thru dcc (when no path is specified)"
 msgstr ""
 
-#: src/common/weeconfig.c:740 src/common/weeconfig.c:741
+#: src/common/weeconfig.c:746 src/common/weeconfig.c:747
 msgid "convert spaces to underscores when sending files"
 msgstr ""
 
-#: src/common/weeconfig.c:744
+#: src/common/weeconfig.c:750
 msgid "automatically rename dcc files if already exists"
 msgstr ""
 
-#: src/common/weeconfig.c:745
+#: src/common/weeconfig.c:751
 msgid "rename incoming files if already exists (add '.1', '.2', ...)"
 msgstr ""
 
-#: src/common/weeconfig.c:748
+#: src/common/weeconfig.c:754
 msgid "automatically resume aborted transfers"
 msgstr ""
 
-#: src/common/weeconfig.c:749
+#: src/common/weeconfig.c:755
 msgid ""
 "automatically resume dcc transfer if connection with remote host is loosed"
 msgstr ""
 
-#: src/common/weeconfig.c:768
+#: src/common/weeconfig.c:774
 msgid "use proxy"
 msgstr ""
 
-#: src/common/weeconfig.c:769
+#: src/common/weeconfig.c:775
 msgid "use a proxy server to connect to irc server"
 msgstr ""
 
-#: src/common/weeconfig.c:772
+#: src/common/weeconfig.c:778
 msgid "proxy type"
 msgstr ""
 
-#: src/common/weeconfig.c:773
+#: src/common/weeconfig.c:779
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr ""
 
-#: src/common/weeconfig.c:776
+#: src/common/weeconfig.c:782
 msgid "use ipv6 proxy"
 msgstr ""
 
-#: src/common/weeconfig.c:777
+#: src/common/weeconfig.c:783
 msgid "connect to proxy in ipv6"
 msgstr ""
 
-#: src/common/weeconfig.c:780
+#: src/common/weeconfig.c:786
 msgid "proxy address"
 msgstr ""
 
-#: src/common/weeconfig.c:781
+#: src/common/weeconfig.c:787
 msgid "proxy server address (IP or hostname)"
 msgstr ""
 
-#: src/common/weeconfig.c:784
+#: src/common/weeconfig.c:790
 msgid "port for proxy"
 msgstr ""
 
-#: src/common/weeconfig.c:785
+#: src/common/weeconfig.c:791
 msgid "port for connecting to proxy server"
 msgstr ""
 
-#: src/common/weeconfig.c:788
+#: src/common/weeconfig.c:794
 msgid "proxy username"
 msgstr ""
 
-#: src/common/weeconfig.c:789
+#: src/common/weeconfig.c:795
 msgid "username for proxy server"
 msgstr ""
 
-#: src/common/weeconfig.c:792
+#: src/common/weeconfig.c:798
 msgid "proxy password"
 msgstr ""
 
-#: src/common/weeconfig.c:793
+#: src/common/weeconfig.c:799
 msgid "password for proxy server"
 msgstr ""
 
-#: src/common/weeconfig.c:806 src/common/weeconfig.c:807
+#: src/common/weeconfig.c:812 src/common/weeconfig.c:813
 msgid "path for searching plugins"
 msgstr ""
 
-#: src/common/weeconfig.c:810
+#: src/common/weeconfig.c:816
 msgid "list of plugins to load automatically"
 msgstr ""
 
-#: src/common/weeconfig.c:811
+#: src/common/weeconfig.c:817
 msgid ""
 "comma separated list of plugins to load automatically at startup, \"*\" "
 "means all plugins found (names may be partial, for example \"perl\" is ok "
 "for \"libperl.so\")"
 msgstr ""
 
-#: src/common/weeconfig.c:816
+#: src/common/weeconfig.c:822
 msgid "standard plugins extension in filename"
 msgstr ""
 
-#: src/common/weeconfig.c:817
+#: src/common/weeconfig.c:823
 msgid ""
 "standard plugins extension in filename, used for autoload (if empty, then "
 "all files are loaded when autoload is \"*\")"
 msgstr ""
 
-#: src/common/weeconfig.c:834
+#: src/common/weeconfig.c:840
 msgid "server name"
 msgstr ""
 
-#: src/common/weeconfig.c:835
+#: src/common/weeconfig.c:841
 msgid "name associated to IRC server (for display only)"
 msgstr ""
 
-#: src/common/weeconfig.c:838
+#: src/common/weeconfig.c:844
 msgid "automatically connect to server"
 msgstr ""
 
-#: src/common/weeconfig.c:839
+#: src/common/weeconfig.c:845
 msgid "automatically connect to server when WeeChat is starting"
 msgstr ""
 
-#: src/common/weeconfig.c:842
+#: src/common/weeconfig.c:848
 msgid "automatically reconnect to server"
 msgstr ""
 
-#: src/common/weeconfig.c:843
+#: src/common/weeconfig.c:849
 msgid "automatically reconnect to server when disconnected"
 msgstr ""
 
-#: src/common/weeconfig.c:846
+#: src/common/weeconfig.c:852
 msgid "delay before trying again to reconnect"
 msgstr ""
 
-#: src/common/weeconfig.c:847
+#: src/common/weeconfig.c:853
 msgid "delay (in seconds) before trying again to reconnect to server"
 msgstr ""
 
-#: src/common/weeconfig.c:850
+#: src/common/weeconfig.c:856
 msgid "server address or hostname"
 msgstr ""
 
-#: src/common/weeconfig.c:851
+#: src/common/weeconfig.c:857
 msgid "IP address or hostname of IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:854
+#: src/common/weeconfig.c:860
 msgid "port for IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:855
+#: src/common/weeconfig.c:861
 msgid "port for connecting to server"
 msgstr ""
 
-#: src/common/weeconfig.c:858 src/common/weeconfig.c:859
+#: src/common/weeconfig.c:864 src/common/weeconfig.c:865
 msgid "use IPv6 protocol for server communication"
 msgstr ""
 
-#: src/common/weeconfig.c:862 src/common/weeconfig.c:863
+#: src/common/weeconfig.c:868 src/common/weeconfig.c:869
 msgid "use SSL for server communication"
 msgstr ""
 
-#: src/common/weeconfig.c:866
+#: src/common/weeconfig.c:872
 msgid "server password"
 msgstr ""
 
-#: src/common/weeconfig.c:867
+#: src/common/weeconfig.c:873
 msgid "password for IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:870
+#: src/common/weeconfig.c:876
 msgid "nickname for server"
 msgstr ""
 
-#: src/common/weeconfig.c:871
+#: src/common/weeconfig.c:877
 msgid "nickname to use on IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:874
+#: src/common/weeconfig.c:880
 msgid "alternate nickname for server"
 msgstr ""
 
-#: src/common/weeconfig.c:875
+#: src/common/weeconfig.c:881
 msgid "alternate nickname to use on IRC server (if nickname is already used)"
 msgstr ""
 
-#: src/common/weeconfig.c:878
+#: src/common/weeconfig.c:884
 msgid "2nd alternate nickname for server"
 msgstr ""
 
-#: src/common/weeconfig.c:879
+#: src/common/weeconfig.c:885
 msgid ""
 "2nd alternate nickname to use on IRC server (if alternate nickname is "
 "already used)"
 msgstr ""
 
-#: src/common/weeconfig.c:882
+#: src/common/weeconfig.c:888
 msgid "user name for server"
 msgstr ""
 
-#: src/common/weeconfig.c:883
+#: src/common/weeconfig.c:889
 msgid "user name to use on IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:886
+#: src/common/weeconfig.c:892
 msgid "real name for server"
 msgstr ""
 
-#: src/common/weeconfig.c:887
+#: src/common/weeconfig.c:893
 msgid "real name to use on IRC server"
 msgstr ""
 
-#: src/common/weeconfig.c:890 src/common/weeconfig.c:891
+#: src/common/weeconfig.c:896 src/common/weeconfig.c:897
 msgid "first command to run when connected to server"
 msgstr ""
 
-#: src/common/weeconfig.c:894
+#: src/common/weeconfig.c:900
 msgid "delay (in seconds) after command was executed"
 msgstr ""
 
-#: src/common/weeconfig.c:895
+#: src/common/weeconfig.c:901
 msgid ""
 "delay (in seconds) after command was executed (example: give some time for "
 "authentication)"
 msgstr ""
 
-#: src/common/weeconfig.c:898
+#: src/common/weeconfig.c:904
 msgid "list of channels to join when connected to server"
 msgstr ""
 
-#: src/common/weeconfig.c:899
+#: src/common/weeconfig.c:905
 msgid ""
 "comma separated list of channels to join when connected to server (example: "
 "\"#chan1,#chan2,#chan3 key1,key2\")"
 msgstr ""
 
-#: src/common/weeconfig.c:902 src/common/weeconfig.c:903
+#: src/common/weeconfig.c:908 src/common/weeconfig.c:909
 msgid "automatically rejoin channels when kicked"
 msgstr ""
 
-#: src/common/weeconfig.c:906
+#: src/common/weeconfig.c:912
 msgid "notify levels for channels of this server"
 msgstr ""
 
-#: src/common/weeconfig.c:907
+#: src/common/weeconfig.c:913
 msgid ""
 "comma separated list of notify levels for channels of this server (format: "
 "#channel:1,..)"
 msgstr ""
 
-#: src/common/weeconfig.c:1463
+#: src/common/weeconfig.c:1469
 #, c-format
 msgid "%s %s, line %d: new server, but previous was incomplete\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1472
+#: src/common/weeconfig.c:1478
 #, c-format
 msgid "%s %s, line %d: server '%s' already exists\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1487
+#: src/common/weeconfig.c:1493
 #, c-format
 msgid "%s %s, line %d: unable to create server\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1527
+#: src/common/weeconfig.c:1533
 #, c-format
 msgid "%s unable to assign default int with string (\"%s\")\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1538
+#: src/common/weeconfig.c:1544
 #, c-format
 msgid "%s unable to assign default color (\"%s\")\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1578
+#: src/common/weeconfig.c:1584
 #, c-format
 msgid "%s config file \"%s\" not found.\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1610
+#: src/common/weeconfig.c:1616
 #, c-format
 msgid "%s %s, line %d: invalid syntax, missing \"]\"\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1627
+#: src/common/weeconfig.c:1633
 #, c-format
 msgid "%s %s, line %d: unknown section identifier (\"%s\")\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1645
+#: src/common/weeconfig.c:1651
 #, c-format
 msgid "%s %s, line %d: invalid section for option, line is ignored\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1690 src/common/weeconfig.c:1716
+#: src/common/weeconfig.c:1696 src/common/weeconfig.c:1722
 #, c-format
 msgid "%s %s, line %d: invalid option \"%s\"\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1696
+#: src/common/weeconfig.c:1702
 #, c-format
 msgid "%s %s, line %d: invalid ignore options \"%s\"\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1727
+#: src/common/weeconfig.c:1733
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value foroption '%s'\n"
 "Expected: boolean value: 'off' or 'on'\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1736
+#: src/common/weeconfig.c:1742
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
 "Expected: integer between %d and %d\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1747
+#: src/common/weeconfig.c:1753
 #, c-format
 msgid ""
 "%s %s, line %d: invalid value for option '%s'\n"
 "Expected: one of these strings: "
 msgstr ""
 
-#: src/common/weeconfig.c:1763
+#: src/common/weeconfig.c:1769
 #, c-format
 msgid "%s %s, line %d: invalid color name for option '%s'\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1832
+#: src/common/weeconfig.c:1838
 #, c-format
 msgid "%s: creating default config file...\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1833
+#: src/common/weeconfig.c:1839
 msgid "Creating default config file\n"
 msgstr ""
 
-#: src/common/weeconfig.c:1836 src/common/weeconfig.c:2033
+#: src/common/weeconfig.c:1842 src/common/weeconfig.c:2039
 #, c-format
 msgid ""
 "#\n"
 "# %s configuration file, created by %s v%s on %s"
 msgstr ""
 
-#: src/common/weeconfig.c:1840 src/common/weeconfig.c:2037
+#: src/common/weeconfig.c:1846 src/common/weeconfig.c:2043
 #, c-format
 msgid ""
 "# WARNING! Be careful when editing this file, WeeChat writes this file when "
@@ -4258,6 +4290,6 @@ msgid ""
 "#\n"
 msgstr ""
 
-#: src/common/weeconfig.c:2030
+#: src/common/weeconfig.c:2036
 msgid "Saving config to disk\n"
 msgstr ""
diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c
index 9cbc5cc3a..e3aea11cb 100644
--- a/weechat/src/common/command.c
+++ b/weechat/src/common/command.c
@@ -303,7 +303,7 @@ alias_new (char *alias_name, char *alias_command)
     if (!weelist_search (index_commands, alias_command))
     {
         irc_display_prefix (NULL, NULL, PREFIX_ERROR);
-        gui_printf (NULL, _("%s target command \"%s\" does not exist!\n"),
+        gui_printf (NULL, _("%s target command \"/%s\" does not exist!\n"),
                     WEECHAT_ERROR, alias_command);
         return NULL;
     }
@@ -689,7 +689,7 @@ user_command (t_irc_server *server, t_gui_buffer *buffer, char *command)
 {
     t_irc_nick *ptr_nick;
     int plugin_args_length;
-    char *plugin_args;
+    char *command_with_colors, *command_with_colors2, *plugin_args;
     
     if ((!command) || (!command[0]) || (command[0] == '\r') || (command[0] == '\n'))
         return;
@@ -709,28 +709,37 @@ user_command (t_irc_server *server, t_gui_buffer *buffer, char *command)
         
         if (server && (!BUFFER_IS_SERVER(buffer)))
         {
+            command_with_colors = (cfg_irc_colors_send) ?
+                (char *)gui_color_encode ((unsigned char *)command) : NULL;
+            
             if (CHANNEL(buffer)->dcc_chat)
                 dcc_chat_sendf ((t_irc_dcc *)(CHANNEL(buffer)->dcc_chat),
-                                "%s\r\n", command);
+                                "%s\r\n",
+                                (command_with_colors) ? command_with_colors : command);
             else
                 server_sendf (server, "PRIVMSG %s :%s\r\n",
-                              CHANNEL(buffer)->name, command);
+                              CHANNEL(buffer)->name,
+                              (command_with_colors) ?
+                              command_with_colors : command);
+            
+            command_with_colors2 = (command_with_colors) ?
+                (char *)gui_color_decode ((unsigned char *)command_with_colors, 1) : NULL;
             
             if (CHANNEL(buffer)->type == CHAT_PRIVATE)
             {
-                gui_printf_type_color (CHANNEL(buffer)->buffer,
-                                       MSG_TYPE_NICK,
-                                       COLOR_WIN_CHAT_DARK, "<");
-                gui_printf_type_color (CHANNEL(buffer)->buffer,
-                                       MSG_TYPE_NICK,
-                                       COLOR_WIN_NICK_SELF,
-                                       "%s", server->nick);
-                gui_printf_type_color (CHANNEL(buffer)->buffer,
-                                       MSG_TYPE_NICK,
-                                       COLOR_WIN_CHAT_DARK, "> ");
-                gui_printf_type_color (CHANNEL(buffer)->buffer,
-                                       MSG_TYPE_MSG,
-                                       COLOR_WIN_CHAT, "%s\n", command);
+                gui_printf_type (CHANNEL(buffer)->buffer,
+                                 MSG_TYPE_NICK,
+                                 "%s<%s%s%s> ",
+                                 GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                 GUI_COLOR(COLOR_WIN_NICK_SELF),
+                                 server->nick,
+                                 GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                gui_printf_type (CHANNEL(buffer)->buffer,
+                                 MSG_TYPE_MSG,
+                                 "%s%s\n",
+                                 GUI_COLOR(COLOR_WIN_CHAT),
+                                 (command_with_colors2) ?
+                                 command_with_colors2 : command);
             }
             else
             {
@@ -739,8 +748,10 @@ user_command (t_irc_server *server, t_gui_buffer *buffer, char *command)
                 {
                     irc_display_nick (CHANNEL(buffer)->buffer, ptr_nick, NULL,
                                       MSG_TYPE_NICK, 1, 1, 0);
-                    gui_printf_color (CHANNEL(buffer)->buffer,
-                                      COLOR_WIN_CHAT, "%s\n", command);
+                    gui_printf (CHANNEL(buffer)->buffer,
+                                "%s\n",
+                                (command_with_colors2) ?
+                                command_with_colors2 : command);
                 }
                 else
                 {
@@ -751,6 +762,11 @@ user_command (t_irc_server *server, t_gui_buffer *buffer, char *command)
                 }
             }
             
+            if (command_with_colors)
+                free (command_with_colors);
+            if (command_with_colors2)
+                free (command_with_colors2);
+            
             /* sending a copy of the message as PRIVMSG to plugins because irc server doesn't */                               
             plugin_args_length = strlen ("localhost PRIVMSG  :") +
                 strlen (CHANNEL(buffer)->name) + strlen(command) + 16;
@@ -810,6 +826,13 @@ weechat_cmd_alias (char *arguments)
                             WEECHAT_ERROR, "alias");
                 return -1;
             }
+            if (arguments[0] == '/')
+            {
+                irc_display_prefix (NULL, NULL, PREFIX_ERROR);
+                gui_printf (NULL, _("%s alias can not start with \"/\"\n"),
+                            WEECHAT_ERROR, "alias");
+                return -1;
+            }
             if (!alias_new (arguments, pos))
                 return -1;
             if (weelist_add (&index_commands, &last_index_command, arguments))
@@ -845,8 +868,10 @@ weechat_cmd_alias (char *arguments)
             for (ptr_alias = weechat_alias; ptr_alias;
                  ptr_alias = ptr_alias->next_alias)
             {
-                gui_printf (NULL, "  %s => %s\n",
+                gui_printf (NULL, "  %s %s=>%s %s\n",
                             ptr_alias->alias_name,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
                             ptr_alias->alias_command + 1);
             }
         }
@@ -867,38 +892,32 @@ void
 weechat_cmd_buffer_display_info (t_gui_buffer *buffer)
 {
     if (buffer->dcc)
-        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "DCC\n");
+        gui_printf (NULL, "%sDCC\n",
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL));
     else if (BUFFER_IS_SERVER (buffer))
-    {
-        gui_printf (NULL, _("Server: "));
-        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
-                          "%s\n", SERVER(buffer)->name);
-    }
+        gui_printf (NULL, _("%sServer: %s%s\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    SERVER(buffer)->name);
     else if (BUFFER_IS_CHANNEL (buffer))
-    {
-        gui_printf (NULL, _("Channel: "));
-        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
-                          "%s", CHANNEL(buffer)->name);
-        gui_printf (NULL, _(" (server: "));
-        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
-                          "%s", SERVER(buffer)->name);
-        gui_printf (NULL, ")\n");
-    }
+        gui_printf (NULL, _("%sChannel: %s%s %s(server: %s%s%s)\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    CHANNEL(buffer)->name,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    SERVER(buffer)->name,
+                    GUI_COLOR(COLOR_WIN_CHAT));
     else if (BUFFER_IS_PRIVATE (buffer))
-    {
-        gui_printf (NULL, _("Private with: "));
-        gui_printf_color (NULL, COLOR_WIN_CHAT_NICK,
-                          "%s", CHANNEL(buffer)->name);
-        gui_printf (NULL, _(" (server: "));
-        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
-                          "%s", SERVER(buffer)->name);
-        gui_printf (NULL, ")\n");
-    }
+        gui_printf (NULL, _("%sPrivate with: %s%s %s(server: %s%s%s)\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    CHANNEL(buffer)->name,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    SERVER(buffer)->name);
     else
-    {
-        gui_printf (NULL, _("not connected"));
-        gui_printf (NULL, "\n");
-    }
+        gui_printf (NULL, _("not connected\n"));
 }
 
 /*
@@ -924,10 +943,11 @@ weechat_cmd_buffer (int argc, char **argv)
         
         for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
         {
-            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "[");
-            gui_printf (NULL, "%d", ptr_buffer->number);
-            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "] ");
-            
+            gui_printf (NULL, "%s[%s%d%s] ",
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        ptr_buffer->number,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK));
             weechat_cmd_buffer_display_info (ptr_buffer);
         }
     }
@@ -1314,9 +1334,10 @@ weechat_cmd_help (int argc, char **argv)
             gui_printf (NULL, _("%s internal commands:\n"), PACKAGE_NAME);
             for (i = 0; weechat_commands[i].command_name; i++)
             {
-                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "   %s",
-                                  weechat_commands[i].command_name);
-                gui_printf (NULL, " - %s\n",
+                gui_printf (NULL, "   %s%s %s- %s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                            weechat_commands[i].command_name,
+                            GUI_COLOR(COLOR_WIN_CHAT),
                             _(weechat_commands[i].command_description));
             }
             gui_printf (NULL, "\n");
@@ -1325,9 +1346,10 @@ weechat_cmd_help (int argc, char **argv)
             {
                 if (irc_commands[i].cmd_function_args || irc_commands[i].cmd_function_1arg)
                 {
-                    gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "   %s",
-                                      irc_commands[i].command_name);
-                    gui_printf (NULL, " - %s\n",
+                    gui_printf (NULL, "   %s%s %s- %s\n",
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                irc_commands[i].command_name,
+                                GUI_COLOR(COLOR_WIN_CHAT),
                                 _(irc_commands[i].command_description));
                 }
             }
@@ -1342,11 +1364,13 @@ weechat_cmd_help (int argc, char **argv)
                 {
                     if (ptr_handler->type == HANDLER_COMMAND)
                     {
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "   %s",
-                                          ptr_handler->command);
+                        gui_printf (NULL, "   %s%s",
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    ptr_handler->command);
                         if (ptr_handler->description
                             && ptr_handler->description[0])
-                            gui_printf (NULL, " - %s",
+                            gui_printf (NULL, " %s- %s",
+                                        GUI_COLOR(COLOR_WIN_CHAT),
                                         ptr_handler->description);
                         gui_printf (NULL, "\n");
                     }
@@ -1361,11 +1385,13 @@ weechat_cmd_help (int argc, char **argv)
                 {
                     gui_printf (NULL, "\n");
                     gui_printf (NULL, "[w]");
-                    gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "  /%s",
-                                      weechat_commands[i].command_name);
+                    gui_printf (NULL, "  %s/%s",
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                weechat_commands[i].command_name);
                     if (weechat_commands[i].arguments &&
                         weechat_commands[i].arguments[0])
-                        gui_printf (NULL, "  %s\n",
+                        gui_printf (NULL, "  %s%s\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT),
                                     _(weechat_commands[i].arguments));
                     else
                         gui_printf (NULL, "\n");
@@ -1387,11 +1413,13 @@ weechat_cmd_help (int argc, char **argv)
                 {
                     gui_printf (NULL, "\n");
                     gui_printf (NULL, "[i]");
-                    gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "  /%s",
-                                      irc_commands[i].command_name);
+                    gui_printf (NULL, "  %s/%s",
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                irc_commands[i].command_name);
                     if (irc_commands[i].arguments &&
                         irc_commands[i].arguments[0])
-                        gui_printf (NULL, "  %s\n",
+                        gui_printf (NULL, "  %s%s\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT),
                                     _(irc_commands[i].arguments));
                     else
                         gui_printf (NULL, "\n");
@@ -1418,11 +1446,13 @@ weechat_cmd_help (int argc, char **argv)
                     {
                         gui_printf (NULL, "\n");
                         gui_printf (NULL, "[p]");
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "  /%s",
-                                          ptr_handler->command);
+                        gui_printf (NULL, "  %s/%s",
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    ptr_handler->command);
                         if (ptr_handler->arguments &&
                             ptr_handler->arguments[0])
-                            gui_printf (NULL, "  %s\n",
+                            gui_printf (NULL, "  %s%s\n",
+                                        GUI_COLOR(COLOR_WIN_CHAT),
                                         ptr_handler->arguments);
                         else
                             gui_printf (NULL, "\n");
@@ -1456,17 +1486,27 @@ void
 weechat_cmd_ignore_display (char *text, t_irc_ignore *ptr_ignore)
 {
     if (text)
-        gui_printf (NULL, "%s ", text);
+        gui_printf (NULL, "%s%s ",
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    text);
     
-    gui_printf (NULL, _("on"));
-    gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, " %s", ptr_ignore->server_name);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "/");
-    gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s", ptr_ignore->channel_name);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, ":");
-    gui_printf (NULL, _(" ignoring "));
-    gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s", ptr_ignore->type);
-    gui_printf (NULL, _(" from "));
-    gui_printf_color (NULL, COLOR_WIN_CHAT_HOST, "%s\n", ptr_ignore->mask);
+    gui_printf (NULL, "%s%s %s%s%s/%s%s%s:%s%s%s%s%s%s%s%s\n",
+                GUI_COLOR(COLOR_WIN_CHAT),
+                _("on"),
+                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                ptr_ignore->server_name,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                ptr_ignore->channel_name,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT),
+                _(" ignoring "),
+                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                ptr_ignore->type,
+                GUI_COLOR(COLOR_WIN_CHAT),
+                _(" from "),
+                GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                ptr_ignore->mask);
 }
 
 /*
@@ -1493,9 +1533,11 @@ weechat_cmd_ignore (int argc, char **argv)
                      ptr_ignore = ptr_ignore->next_ignore)
                 {
                     i++;
-                    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "[");
-                    gui_printf (NULL, "%d", i);
-                    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "] ");
+                    gui_printf (NULL, "%s[%s%d%s] ",
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                i,
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK));
                     weechat_cmd_ignore_display (NULL, ptr_ignore);
                 }
             }
@@ -1547,13 +1589,15 @@ weechat_cmd_key_display (t_gui_key *key, int new_key)
     expanded_name = gui_key_get_expanded_name (key->key);
     if (new_key)
     {
-        gui_printf (NULL, _("New key binding:\n"));
-        gui_printf (NULL, "  %s", (expanded_name) ? expanded_name : key->key);
+        irc_display_prefix (NULL, NULL, PREFIX_INFO);
+        gui_printf (NULL, _("New key binding:  %s"),
+                    (expanded_name) ? expanded_name : key->key);
     }
     else
         gui_printf (NULL, "  %20s", (expanded_name) ? expanded_name : key->key);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " => ");
-    gui_printf (NULL, "%s\n",
+    gui_printf (NULL, "%s => %s%s\n",
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT),
                 (key->function) ?
                 gui_key_function_search_by_ptr (key->function) : key->command);
     if (expanded_name)
@@ -1592,7 +1636,10 @@ weechat_cmd_key (char *arguments)
         while (arguments[0] == ' ')
             arguments++;
         if (gui_key_unbind (arguments))
+        {
+            irc_display_prefix (NULL, NULL, PREFIX_INFO);
             gui_printf (NULL, _("Key \"%s\" unbinded\n"), arguments);
+        }
         else
         {
             irc_display_prefix (NULL, NULL, PREFIX_ERROR);
@@ -1624,6 +1671,7 @@ weechat_cmd_key (char *arguments)
         {
             gui_key_free_all ();
             gui_key_init ();
+            irc_display_prefix (NULL, NULL, PREFIX_INFO);
             gui_printf (NULL, _("Default key bindings restored\n"));
         }
         else
@@ -1692,8 +1740,10 @@ weechat_cmd_plugin (int argc, char **argv)
             {
                 /* plugin info */
                 irc_display_prefix (NULL, NULL, PREFIX_PLUGIN);
-                gui_printf (NULL, "  %s v%s - %s (%s)\n",
+                gui_printf (NULL, "  %s%s%s v%s - %s (%s)\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
                             ptr_plugin->name,
+                            GUI_COLOR(COLOR_WIN_CHAT),
                             ptr_plugin->version,
                             ptr_plugin->description,
                             ptr_plugin->filename);
@@ -1904,13 +1954,14 @@ weechat_cmd_server (int argc, char **argv)
                 }
             }
             
-            irc_display_prefix (NULL, NULL, PREFIX_INFO);
-            gui_printf_color (NULL, COLOR_WIN_CHAT, _("Server"));
-            gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
-                              " %s ", server_found->name);
-            gui_printf_color (NULL, COLOR_WIN_CHAT, _("has been deleted\n"));
-            
             server_free (server_found);
+            
+            irc_display_prefix (NULL, NULL, PREFIX_INFO);
+            gui_printf (NULL, _("Server %s%s%s has been deleted\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_SERVER),
+                        server_found->name,
+                        GUI_COLOR(COLOR_WIN_CHAT));
+            
             gui_redraw_buffer (gui_current_window->buffer);
             
             return 0;
@@ -2051,10 +2102,10 @@ weechat_cmd_server (int argc, char **argv)
         if (new_server)
         {
             irc_display_prefix (NULL, NULL, PREFIX_INFO);
-            gui_printf_color (NULL, COLOR_WIN_CHAT, _("Server"));
-            gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
-                              " %s ", server.name);
-            gui_printf_color (NULL, COLOR_WIN_CHAT, _("created\n"));
+            gui_printf (NULL, _("Server %s%s%s created\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_SERVER),
+                        server.name,
+                        GUI_COLOR(COLOR_WIN_CHAT));
         }
         else
         {
@@ -2086,11 +2137,11 @@ weechat_cmd_set_display_option (t_config_option *option, char *prefix, void *val
 {
     char *color_name, *pos_nickserv, *pos_pwd, *value2;
     
-    gui_printf (NULL, "  %s%s%s",
+    gui_printf (NULL, "  %s%s%s%s = ",
                 (prefix) ? prefix : "",
                 (prefix) ? "." : "",
-                option->option_name);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " = ");
+                option->option_name,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK));
     if (!value)
     {
         if (option->option_type == OPTION_TYPE_STRING)
@@ -2101,21 +2152,25 @@ weechat_cmd_set_display_option (t_config_option *option, char *prefix, void *val
     switch (option->option_type)
     {
         case OPTION_TYPE_BOOLEAN:
-            gui_printf_color (NULL, COLOR_WIN_CHAT_HOST,
-                              "%s\n", (*((int *)value)) ? "ON" : "OFF");
+            gui_printf (NULL, "%s%s\n",
+                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                        (*((int *)value)) ? "ON" : "OFF");
             break;
         case OPTION_TYPE_INT:
-            gui_printf_color (NULL, COLOR_WIN_CHAT_HOST,
-                              "%d\n", *((int *)value));
+            gui_printf (NULL, "%s%d\n",
+                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                        *((int *)value));
             break;
         case OPTION_TYPE_INT_WITH_STRING:
-            gui_printf_color (NULL, COLOR_WIN_CHAT_HOST,
-                              "%s\n", option->array_values[*((int *)value)]);
+            gui_printf (NULL, "%s%s\n",
+                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                        option->array_values[*((int *)value)]);
             break;
         case OPTION_TYPE_COLOR:
-            color_name = gui_get_color_by_value (*((int *)value));
-            gui_printf_color (NULL, COLOR_WIN_CHAT_HOST,
-                              "%s\n", (color_name) ? color_name : _("(unknown)"));
+            color_name = gui_get_color_name (*((int *)value));
+            gui_printf (NULL, "%s%s\n",
+                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                        (color_name) ? color_name : _("(unknown)"));
             break;
         case OPTION_TYPE_STRING:
             if (*((char **)value))
@@ -2138,9 +2193,12 @@ weechat_cmd_set_display_option (t_config_option *option, char *prefix, void *val
                         pos_pwd[0] = '*';
                         pos_pwd++;
                     }
-                    gui_printf (NULL, _("(password hidden) "));
+                    gui_printf (NULL, _("%s(password hidden) "),
+                                GUI_COLOR(COLOR_WIN_CHAT));
                 }
-                gui_printf_color (NULL, COLOR_WIN_CHAT_HOST, "%s", value2);
+                gui_printf (NULL, "%s%s",
+                            GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                            value2);
                 free (value2);
             }
             gui_printf (NULL, "\n");
@@ -2210,12 +2268,14 @@ weechat_cmd_set (char *arguments)
                 switch (config_set_server_value (ptr_server, pos + 1, value))
                 {
                     case 0:
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "\n[");
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s",
-                                          config_sections[CONFIG_SECTION_SERVER].section_name);
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_NICK, " %s",
-                                          ptr_server->name);
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "]\n");
+                        gui_printf (NULL, "\n");
+                        gui_printf (NULL, "%s[%s%s %s%s]\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    config_sections[CONFIG_SECTION_SERVER].section_name,
+                                    GUI_COLOR(COLOR_WIN_CHAT_SERVER),
+                                    ptr_server->name,
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK));
                         for (i = 0; weechat_options[CONFIG_SECTION_SERVER][i].option_name; i++)
                         {
                             if (strcmp (weechat_options[CONFIG_SECTION_SERVER][i].option_name, pos + 1) == 0)
@@ -2262,10 +2322,12 @@ weechat_cmd_set (char *arguments)
                     if (config_option_set_value (ptr_option, value) == 0)
                     {
                         (void) (ptr_option->handler_change());
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "\n[");
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
-                                          "%s", config_get_section (ptr_option));
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "]\n");
+                        gui_printf (NULL, "\n");
+                        gui_printf (NULL, "%s[%s%s%s]\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    config_get_section (ptr_option),
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK));
                         weechat_cmd_set_display_option (ptr_option, NULL, NULL);
                     }
                     else
@@ -2304,11 +2366,12 @@ weechat_cmd_set (char *arguments)
                     {
                         if (!section_displayed)
                         {
-                            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "\n[");
-                            gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL,
-                                              "%s",
-                                              config_sections[i].section_name);
-                            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "]\n");
+                            gui_printf (NULL, "\n");
+                            gui_printf (NULL, "%s[%s%s%s]\n",
+                                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                        config_sections[i].section_name,
+                                        GUI_COLOR(COLOR_WIN_CHAT_DARK));
                             section_displayed = 1;
                         }
                         weechat_cmd_set_display_option (&weechat_options[i][j], NULL, NULL);
@@ -2334,12 +2397,14 @@ weechat_cmd_set (char *arguments)
                 {
                     if (!section_displayed)
                     {
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "\n[");
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s",
-                                          config_sections[CONFIG_SECTION_SERVER].section_name);
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_NICK, " %s",
-                                          ptr_server->name);
-                        gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "]\n");
+                        gui_printf (NULL, "\n");
+                        gui_printf (NULL, "%s[%s%s %s%s%s]\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    config_sections[CONFIG_SECTION_SERVER].section_name,
+                                    GUI_COLOR(COLOR_WIN_CHAT_SERVER),
+                                    ptr_server->name,
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK));
                         section_displayed = 1;
                     }
                     ptr_option_value = config_get_server_option_ptr (ptr_server,
@@ -2369,7 +2434,9 @@ weechat_cmd_set (char *arguments)
             if ((number_found == 1) && (last_section >= 0) && (last_option >= 0))
             {
                 gui_printf (NULL, "\n");
-                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, _("Detail:\n"));
+                gui_printf (NULL, _("%sDetail:\n"),
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL));
+                gui_printf (NULL, GUI_COLOR(COLOR_WIN_CHAT_CHANNEL));
                 switch (weechat_options[last_section][last_option].option_type)
                 {
                     case OPTION_TYPE_BOOLEAN:
@@ -2419,7 +2486,11 @@ weechat_cmd_set (char *arguments)
             }
             else
             {
-                gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "\n%d ", number_found);
+                gui_printf (NULL, "\n");
+                gui_printf (NULL, "%s%d %s",
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                            number_found,
+                            GUI_COLOR(COLOR_WIN_CHAT));
                 if (option)
                     gui_printf (NULL, _("config option(s) found with \"%s\"\n"),
                                 option);
@@ -2506,7 +2577,10 @@ weechat_cmd_unignore (int argc, char **argv)
     if (ret)
     {
         irc_display_prefix (NULL, NULL, PREFIX_INFO);
-        gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%d ", ret);
+        gui_printf (NULL, "%s%d%s ",
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    ret,
+                    GUI_COLOR(COLOR_WIN_CHAT));
         if (ret > 1)
             gui_printf (NULL, _("ignore were removed.\n"));
         else
@@ -2545,17 +2619,19 @@ weechat_cmd_window (int argc, char **argv)
         i = 1;
         for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
         {
-            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "[");
-            gui_printf (NULL, "%d", i);
-            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "] (");
-            gui_printf (NULL, "%d", ptr_win->win_x);
-            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, ":");
-            gui_printf (NULL, "%d", ptr_win->win_y);
-            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, ";");
-            gui_printf (NULL, "%d", ptr_win->win_width);
-            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "x");
-            gui_printf (NULL, "%d", ptr_win->win_height);
-            gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, ") ");
+            gui_printf (NULL, "%s[%s%d%s] (%s%d:%d%s;%s%dx%d%s) ",
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        i,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        ptr_win->win_x,
+                        ptr_win->win_y,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        ptr_win->win_width,
+                        ptr_win->win_height,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK));
             
             weechat_cmd_buffer_display_info (ptr_win->buffer);
             
diff --git a/weechat/src/common/completion.c b/weechat/src/common/completion.c
index 2dc6bc879..30dba84d0 100644
--- a/weechat/src/common/completion.c
+++ b/weechat/src/common/completion.c
@@ -425,7 +425,7 @@ completion_build_list (t_completion *completion, void *channel)
                             weelist_add (&completion->completion_list,
                                          &completion->last_completion,
                                          (option_value) ?
-                                             gui_get_color_by_value (*((int *)(option_value))) :
+                                             gui_get_color_name (*((int *)(option_value))) :
                                              option->default_string);
                             break;
                         case OPTION_TYPE_STRING:
diff --git a/weechat/src/common/log.c b/weechat/src/common/log.c
index 06f62f7cd..1c18553ec 100644
--- a/weechat/src/common/log.c
+++ b/weechat/src/common/log.c
@@ -72,28 +72,6 @@ log_write (t_gui_buffer *buffer, char *message)
     }
 }
 
-/*
- * log_write_line: writes a WeeChat line to log file
- */
-
-void
-log_write_line (t_gui_buffer *buffer, t_gui_line *line)
-{
-    t_gui_message *ptr_msg;
-    
-    if (buffer->log_file)
-    {    
-        log_write_date (buffer);
-        for (ptr_msg = line->messages; ptr_msg; ptr_msg = ptr_msg->next_message)
-        {
-            if (ptr_msg->type != MSG_TYPE_TIME)
-                fprintf (buffer->log_file, "%s", ptr_msg->message);
-        }
-        fprintf (buffer->log_file, "\n");
-        fflush (buffer->log_file);
-    }
-}
-
 /*
  * log_start: starts a log
  */
diff --git a/weechat/src/common/weechat.c b/weechat/src/common/weechat.c
index 58a2e348e..245776975 100644
--- a/weechat/src/common/weechat.c
+++ b/weechat/src/common/weechat.c
@@ -169,6 +169,7 @@ void
 wee_log_printf (char *message, ...)
 {
     static char buffer[4096];
+    char *ptr_buffer;
     va_list argptr;
     static time_t seconds;
     struct tm *date_tmp;
@@ -180,6 +181,17 @@ wee_log_printf (char *message, ...)
     vsnprintf (buffer, sizeof (buffer) - 1, message, argptr);
     va_end (argptr);
     
+    /* keep only valid chars */
+    ptr_buffer = buffer;
+    while (ptr_buffer[0])
+    {
+        if ((ptr_buffer[0] != '\n')
+            && (ptr_buffer[0] != '\r')
+            && ((unsigned char)(ptr_buffer[0]) < 32))
+            ptr_buffer[0] = '.';
+        ptr_buffer++;
+    }
+    
     seconds = time (NULL);
     date_tmp = localtime (&seconds);
     if (date_tmp)
@@ -667,35 +679,42 @@ weechat_welcome_message ()
 {
     if (cfg_look_startup_logo)
     {
-        gui_printf_color (NULL, COLOR_WIN_CHAT_PREFIX1,
-            "   ___       __         ______________        _____ \n"
-            "   __ |     / /___________  ____/__  /_______ __  /_\n"
-            "   __ | /| / /_  _ \\  _ \\  /    __  __ \\  __ `/  __/\n"
-            "   __ |/ |/ / /  __/  __/ /___  _  / / / /_/ // /_  \n"
-            "   ____/|__/  \\___/\\___/\\____/  /_/ /_/\\__,_/ \\__/  \n");
+        gui_printf (NULL,
+                    "%s   ___       __         ______________        _____ \n"
+                    "%s   __ |     / /___________  ____/__  /_______ __  /_\n"
+                    "%s   __ | /| / /_  _ \\  _ \\  /    __  __ \\  __ `/  __/\n"
+                    "%s   __ |/ |/ / /  __/  __/ /___  _  / / / /_/ // /_  \n"
+                    "%s   ____/|__/  \\___/\\___/\\____/  /_/ /_/\\__,_/ \\__/  \n",
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK));
     }
     if (cfg_look_weechat_slogan && cfg_look_weechat_slogan[0])
     {
-        gui_printf_color (NULL, COLOR_WIN_CHAT, _("%sWelcome to "),
-                          (cfg_look_startup_logo) ? "      " : "");
-        gui_printf_color (NULL, COLOR_WIN_CHAT_PREFIX2, PACKAGE_NAME);
-        gui_printf_color (NULL, COLOR_WIN_CHAT,
-                          ", %s\n", cfg_look_weechat_slogan);
+        gui_printf (NULL, _("%sWelcome to %s%s%s, %s\n"),
+                    (cfg_look_startup_logo) ? "      " : "",
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    PACKAGE_NAME,
+                    GUI_NO_COLOR,
+                    cfg_look_weechat_slogan);
     }
     if (cfg_look_startup_version)
     {
-        gui_printf_color (NULL, COLOR_WIN_CHAT_PREFIX2,
-                          "%s" PACKAGE_STRING,
-                          (cfg_look_startup_logo) ? "    " : "");
-        gui_printf_color (NULL, COLOR_WIN_CHAT,
-                          ", %s %s %s\n",
-                          _("compiled on"), __DATE__, __TIME__);
+        gui_printf (NULL, "%s%s%s%s, %s %s %s\n",
+                    (cfg_look_startup_logo) ? "    " : "",
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    PACKAGE_STRING,
+                    GUI_NO_COLOR,
+                    _("compiled on"), __DATE__, __TIME__);
     }
     if (cfg_look_startup_logo ||
         (cfg_look_weechat_slogan && cfg_look_weechat_slogan[0]) ||
         cfg_look_startup_version)
-        gui_printf_color (NULL, COLOR_WIN_CHAT_PREFIX1,
-            "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n");
+        gui_printf (NULL,
+                    "%s-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n",
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK));
     
     wee_log_printf ("%s (%s %s %s)\n",
                     PACKAGE_STRING, _("compiled on"), __DATE__, __TIME__);
diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c
index eaacbc5e8..89c2a0935 100644
--- a/weechat/src/common/weeconfig.c
+++ b/weechat/src/common/weeconfig.c
@@ -77,7 +77,6 @@ char *cfg_look_buffer_timestamp;
 int cfg_look_color_nicks;
 int cfg_look_color_nicks_number;
 int cfg_look_color_actions;
-int cfg_look_remove_colors_from_msgs;
 int cfg_look_nicklist;
 int cfg_look_nicklist_position;
 char *cfg_look_nicklist_position_values[] =
@@ -154,10 +153,6 @@ t_config_option weechat_options_look[] =
     N_("display actions with different colors"),
     OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
     NULL, NULL, &cfg_look_color_actions, NULL, config_change_noop },
-  { "look_remove_colors_from_msgs", N_("remove colors from incoming messages"),
-    N_("remove colors from incoming messages"),
-    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
-    NULL, NULL, &cfg_look_remove_colors_from_msgs, NULL, config_change_noop },
   { "look_nicklist", N_("display nicklist window"),
     N_("display nicklist window (for channel windows)"),
     OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
@@ -435,7 +430,7 @@ t_config_option weechat_options_colors[] =
   { "col_input_delimiters", N_("color for input text (delimiters)"),
     N_("color for input text (delimiters)"),
     OPTION_TYPE_COLOR, 0, 0, 0,
-    "white", NULL, &cfg_col_input_delimiters, NULL, &config_change_color },
+    "cyan", NULL, &cfg_col_input_delimiters, NULL, &config_change_color },
   { "col_input_bg", N_("background for input window"),
     N_("background for input window"),
     OPTION_TYPE_COLOR, 0, 0, 0,
@@ -637,6 +632,8 @@ int cfg_irc_lag_min_show;
 int cfg_irc_lag_disconnect;
 int cfg_irc_fifo_pipe;
 char *cfg_irc_highlight;
+int cfg_irc_colors_receive;
+int cfg_irc_colors_send;
 
 t_config_option weechat_options_irc[] =
 { { "irc_display_away", N_("display message to all channels when away"),
@@ -684,6 +681,15 @@ t_config_option weechat_options_irc[] =
        "words may begin or end with \"*\" for partial match)"),
     OPTION_TYPE_STRING, 0, 0, 0,
     "", NULL, NULL, &cfg_irc_highlight, &config_change_noop },
+  { "irc_colors_receive", N_("keep colors from incoming messages"),
+    N_("keep colors from incoming messages"),
+    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
+    NULL, NULL, &cfg_irc_colors_receive, NULL, config_change_noop },
+  { "irc_colors_send", N_("allow user to send colors"),
+    N_("allow user to send colors with special codes (%B=bold, %Cxx,yy=color, "
+       "%U=underline, %R=reverse)"),
+    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
+    NULL, NULL, &cfg_irc_colors_send, NULL, config_change_noop },
   { NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
 };
 
@@ -1043,7 +1049,7 @@ config_change_color ()
 {
     t_gui_window *ptr_win;
     
-    gui_init_colors ();
+    gui_rebuild_weechat_colors ();
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
         gui_redraw_buffer (ptr_win->buffer);
 }
@@ -2072,7 +2078,7 @@ config_write (char *config_name)
                         fprintf (file, "%s=%s\n",
                                  weechat_options[i][j].option_name,
                                  (weechat_options[i][j].ptr_int) ?
-                                 gui_get_color_by_value (*weechat_options[i][j].ptr_int) :
+                                 gui_get_color_name (*weechat_options[i][j].ptr_int) :
                                  weechat_options[i][j].default_string);
                         break;
                     case OPTION_TYPE_STRING:
diff --git a/weechat/src/common/weeconfig.h b/weechat/src/common/weeconfig.h
index f383a6011..929bfbe8e 100644
--- a/weechat/src/common/weeconfig.h
+++ b/weechat/src/common/weeconfig.h
@@ -92,7 +92,6 @@ extern char *cfg_look_buffer_timestamp;
 extern int cfg_look_color_nicks;
 extern int cfg_look_color_nicks_number;
 extern int cfg_look_color_actions;
-extern int cfg_look_remove_colors_from_msgs;
 extern int cfg_look_nicklist;
 extern int cfg_look_nicklist_position;
 extern int cfg_look_nicklist_min_size;
@@ -189,6 +188,8 @@ extern int cfg_irc_lag_min_show;
 extern int cfg_irc_lag_disconnect;
 extern int cfg_irc_fifo_pipe;
 extern char *cfg_irc_highlight;
+extern int cfg_irc_colors_receive;
+extern int cfg_irc_colors_send;
 
 extern int cfg_dcc_auto_accept_files;
 extern int cfg_dcc_auto_accept_chats;
diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c
index 8c2897a90..bc9708367 100644
--- a/weechat/src/gui/curses/gui-display.c
+++ b/weechat/src/gui/curses/gui-display.c
@@ -47,30 +47,49 @@
 #include "../../irc/irc.h"
 
 
-t_gui_color gui_colors[] =
-{ { "default",      -1 | A_NORMAL },
-  { "black",        COLOR_BLACK | A_NORMAL },
-  { "red",          COLOR_RED | A_NORMAL },
-  { "lightred",     COLOR_RED | A_BOLD },
-  { "green",        COLOR_GREEN | A_NORMAL },
-  { "lightgreen",   COLOR_GREEN | A_BOLD },
-  { "brown",        COLOR_YELLOW | A_NORMAL },
-  { "yellow",       COLOR_YELLOW | A_BOLD },
-  { "blue",         COLOR_BLUE | A_NORMAL },
-  { "lightblue",    COLOR_BLUE | A_BOLD },
-  { "magenta",      COLOR_MAGENTA | A_NORMAL },
-  { "lightmagenta", COLOR_MAGENTA | A_BOLD },
-  { "cyan",         COLOR_CYAN | A_NORMAL },
-  { "lightcyan",    COLOR_CYAN | A_BOLD },
-  { "white",        COLOR_WHITE | A_BOLD },
-  { NULL, 0 }
+t_gui_color gui_weechat_colors[] =
+{ { -1,                    0, 0,        "default"      },
+  { WEECHAT_COLOR_BLACK,   0, 0,        "black"        },
+  { WEECHAT_COLOR_RED,     0, 0,        "red"          },
+  { WEECHAT_COLOR_RED,     0, A_BOLD,   "lightred"     },
+  { WEECHAT_COLOR_GREEN,   0, 0,        "green"        },
+  { WEECHAT_COLOR_GREEN,   0, A_BOLD,   "lightgreen"   },
+  { WEECHAT_COLOR_YELLOW,  0, 0,        "brown"        },
+  { WEECHAT_COLOR_YELLOW,  0, A_BOLD,   "yellow"       },
+  { WEECHAT_COLOR_BLUE,    0, 0,        "blue"         },
+  { WEECHAT_COLOR_BLUE,    0, A_BOLD,   "lightblue"    },
+  { WEECHAT_COLOR_MAGENTA, 0, 0,        "magenta"      },
+  { WEECHAT_COLOR_MAGENTA, 0, A_BOLD,   "lightmagenta" },
+  { WEECHAT_COLOR_CYAN,    0, 0,        "cyan"         },
+  { WEECHAT_COLOR_CYAN,    0, A_BOLD,   "lightcyan"    },
+  { WEECHAT_COLOR_WHITE,   0, A_BOLD,   "white"        },
+  { 0,                     0, 0,        NULL           }
 };
 
-int color_attr[NUM_COLORS];
+int gui_irc_colors[16][2] =
+{ { /*  0 */ WEECHAT_COLOR_WHITE,   A_BOLD },
+  { /*  1 */ WEECHAT_COLOR_BLACK,   0      },
+  { /*  2 */ WEECHAT_COLOR_BLUE,    0      },
+  { /*  3 */ WEECHAT_COLOR_GREEN,   0      },
+  { /*  4 */ WEECHAT_COLOR_RED,     A_BOLD },
+  { /*  5 */ WEECHAT_COLOR_RED,     0      },
+  { /*  6 */ WEECHAT_COLOR_MAGENTA, 0      },
+  { /*  7 */ WEECHAT_COLOR_YELLOW,  0      },
+  { /*  8 */ WEECHAT_COLOR_YELLOW,  A_BOLD },
+  { /*  9 */ WEECHAT_COLOR_GREEN,   A_BOLD },
+  { /* 10 */ WEECHAT_COLOR_CYAN,    0      },
+  { /* 11 */ WEECHAT_COLOR_CYAN,    A_BOLD },
+  { /* 12 */ WEECHAT_COLOR_BLUE,    A_BOLD },
+  { /* 13 */ WEECHAT_COLOR_MAGENTA, A_BOLD },
+  { /* 14 */ WEECHAT_COLOR_WHITE,   0      },
+  { /* 15 */ WEECHAT_COLOR_WHITE,   A_BOLD }
+};
+
+t_gui_color *gui_color[NUM_COLORS];
 
 
 /*
- * gui_assign_color: assign a color (read from config)
+ * gui_assign_color: assign a WeeChat color (read from config)
  */
 
 int
@@ -80,11 +99,11 @@ gui_assign_color (int *color, char *color_name)
     
     /* look for curses colors in table */
     i = 0;
-    while (gui_colors[i].name)
+    while (gui_weechat_colors[i].string)
     {
-        if (ascii_strcasecmp (gui_colors[i].name, color_name) == 0)
+        if (ascii_strcasecmp (gui_weechat_colors[i].string, color_name) == 0)
         {
-            *color = gui_colors[i].color;
+            *color = i;
             return 1;
         }
         i++;
@@ -95,79 +114,434 @@ gui_assign_color (int *color, char *color_name)
 }
 
 /*
- * gui_get_color_by_name: get color by name
- */
-
-int
-gui_get_color_by_name (char *color_name)
-{
-    int i;
-    
-    /* look for curses colors in table */
-    i = 0;
-    while (gui_colors[i].name)
-    {
-        if (ascii_strcasecmp (gui_colors[i].name, color_name) == 0)
-            return gui_colors[i].color;
-        i++;
-    }
-    
-    /* color not found */
-    return -1;
-}
-
-/*
- * gui_get_color_by_value: get color name by value
+ * gui_get_color_name: get color name
  */
 
 char *
-gui_get_color_by_value (int color_value)
+gui_get_color_name (int num_color)
 {
-    int i;
-    
-    /* look for curses colors in table */
-    i = 0;
-    while (gui_colors[i].name)
-    {
-        if (gui_colors[i].color == color_value)
-            return gui_colors[i].name;
-        i++;
-    }
-    
-    /* color not found */
-    return NULL;
+    return gui_weechat_colors[num_color].string;
 }
 
 /*
- * gui_window_set_color: set color for window
+ * gui_color_decode: parses a message (coming from IRC server),
+ *                   and according:
+ *                     - remove any color/style in message
+ *                   or:
+ *                     - change colors by codes to be compatible with
+ *                       other IRC clients 
+ *                   After use, string returned has to be free()
+ */
+
+unsigned char *
+gui_color_decode (unsigned char *string, int keep_colors)
+{
+    unsigned char *out;
+    int out_length, out_pos;
+    char str_fg[3], str_bg[3];
+    int fg, bg, attr;
+    
+    out_length = (strlen ((char *)string) * 2) + 1;
+    out = (unsigned char *)malloc (out_length);
+    if (!out)
+        return NULL;
+    
+    out_pos = 0;
+    while (string[0] && (out_pos < out_length - 1))
+    {
+        switch (string[0])
+        {
+            case GUI_ATTR_BOLD_CHAR:
+            case GUI_ATTR_RESET_CHAR:
+            case GUI_ATTR_FIXED_CHAR:
+            case GUI_ATTR_REVERSE_CHAR:
+            case GUI_ATTR_REVERSE2_CHAR:
+            case GUI_ATTR_ITALIC_CHAR:
+            case GUI_ATTR_UNDERLINE_CHAR:
+                if (keep_colors)
+                    out[out_pos++] = string[0];
+                string++;
+                break;
+            case GUI_ATTR_COLOR_CHAR:
+                string++;
+                str_fg[0] = '\0';
+                str_bg[0] = '\0';
+                if (isdigit (string[0]))
+                {
+                    str_fg[0] = string[0];
+                    str_fg[1] = '\0';
+                    string++;
+                    if (isdigit (string[0]))
+                    {
+                        str_fg[1] = string[0];
+                        str_fg[2] = '\0';
+                        string++;
+                    }
+                }
+                if (string[0] == ',')
+                {
+                    string++;
+                    if (isdigit (string[0]))
+                    {
+                        str_bg[0] = string[0];
+                        str_bg[1] = '\0';
+                        string++;
+                        if (isdigit (string[0]))
+                        {
+                            str_bg[1] = string[0];
+                            str_bg[2] = '\0';
+                            string++;
+                        }
+                    }
+                }
+                if (keep_colors)
+                {
+                    if (!str_fg[0] && !str_bg[0])
+                        out[out_pos++] = GUI_ATTR_COLOR_CHAR;
+                    else
+                    {
+                        attr = 0;
+                        if (str_fg[0])
+                        {
+                            sscanf (str_fg, "%d", &fg);
+                            fg %= 16;
+                            attr |= gui_irc_colors[fg][1];
+                        }
+                        if (str_bg[0])
+                        {
+                            sscanf (str_bg, "%d", &bg);
+                            bg %= 16;
+                            attr |= gui_irc_colors[bg][1];
+                        }
+                        if (attr & A_BOLD)
+                        {
+                            out[out_pos++] = GUI_ATTR_WEECHAT_SET_CHAR;
+                            out[out_pos++] = GUI_ATTR_BOLD_CHAR;
+                        }
+                        else
+                        {
+                            out[out_pos++] = GUI_ATTR_WEECHAT_REMOVE_CHAR;
+                            out[out_pos++] = GUI_ATTR_BOLD_CHAR;
+                        }
+                        out[out_pos++] = GUI_ATTR_COLOR_CHAR;
+                        if (str_fg[0])
+                        {
+                            out[out_pos++] = (gui_irc_colors[fg][0] / 10) + '0';
+                            out[out_pos++] = (gui_irc_colors[fg][0] % 10) + '0';
+                        }
+                        if (str_bg[0])
+                        {
+                            out[out_pos++] = ',';
+                            out[out_pos++] = (gui_irc_colors[bg][0] / 10) + '0';
+                            out[out_pos++] = (gui_irc_colors[bg][0] % 10) + '0';
+                        }
+                    }
+                }
+                break;
+            case GUI_ATTR_WEECHAT_SET_CHAR:
+            case GUI_ATTR_WEECHAT_REMOVE_CHAR:
+                string++;
+                if (string[0])
+                {
+                    if (keep_colors)
+                    {
+                        out[out_pos++] = *(string - 1);
+                        out[out_pos++] = string[0];
+                    }
+                    string++;
+                }
+                break;
+            default:
+                out[out_pos++] = string[0];
+                string++;
+        }
+    }
+    out[out_pos] = '\0';
+    return out;
+}
+
+/*
+ * gui_color_encode: parses a message (entered by user), and
+ *                   encode special chars (%B, %C, ..) in IRC colors
+ *                   After use, string returned has to be free()
+ */
+
+unsigned char *
+gui_color_encode (unsigned char *string)
+{
+    unsigned char *out;
+    int out_length, out_pos;
+    
+    out_length = strlen ((char *)string) + 1;
+    out = (unsigned char *)malloc (out_length);
+    if (!out)
+        return NULL;
+    
+    out_pos = 0;
+    while (string[0] && (out_pos < out_length - 1))
+    {
+        switch (string[0])
+        {
+            case '%':
+                string++;
+                switch (string[0])
+                {
+                    case 'B': /* bold */
+                        out[out_pos++] = GUI_ATTR_BOLD_CHAR;
+                        string++;
+                        break;
+                    case 'C': /* color */
+                        out[out_pos++] = GUI_ATTR_COLOR_CHAR;
+                        string++;
+                        if (isdigit (string[0]))
+                        {
+                            out[out_pos++] = string[0];
+                            string++;
+                            if (isdigit (string[0]))
+                            {
+                                out[out_pos++] = string[0];
+                                string++;
+                            }
+                        }
+                        if (string[0] == ',')
+                        {
+                            out[out_pos++] = ',';
+                            string++;
+                            if (isdigit (string[0]))
+                            {
+                                out[out_pos++] = string[0];
+                                string++;
+                                if (isdigit (string[0]))
+                                {
+                                out[out_pos++] = string[0];
+                                string++;
+                                }
+                            }
+                        }
+                        break;
+                    case 'R': /* reverse */
+                        out[out_pos++] = GUI_ATTR_REVERSE_CHAR;
+                        string++;
+                        break;
+                    case 'U': /* underline */
+                        out[out_pos++] = GUI_ATTR_UNDERLINE_CHAR;
+                        string++;
+                        break;
+                    default:
+                        out[out_pos++] = '%';
+                        out[out_pos++] = string[0];
+                        string++;
+                }
+                break;
+            default:
+                out[out_pos++] = string[0];
+                string++;
+        }
+    }
+    out[out_pos] = '\0';
+    return out;
+}
+
+/*
+ * gui_color_build: build a WeeChat color with foreground,
+ *                  background and attributes (attributes are
+ *                  given with foreground color, with a OR)
+ */
+
+t_gui_color *
+gui_color_build (int number, int foreground, int background)
+{
+    t_gui_color *new_color;
+    
+    new_color = (t_gui_color *)malloc (sizeof (t_gui_color));
+    if (!new_color)
+        return NULL;
+    
+    new_color->foreground = gui_weechat_colors[foreground].foreground;
+    new_color->background = gui_weechat_colors[background].foreground;
+    new_color->attributes = gui_weechat_colors[foreground].attributes;
+    new_color->string = (char *)malloc (4);
+    if (new_color->string)
+        snprintf (new_color->string, 4,
+                  "%s%02d",
+                  GUI_ATTR_WEECHAT_COLOR_STR, number);
+    
+    return new_color;
+}
+
+/*
+ * gui_color_get_pair: get color pair with a WeeChat color number
+ */
+
+int
+gui_color_get_pair (int num_color)
+{
+    int fg, bg;
+    
+    fg = gui_color[num_color]->foreground;
+    bg = gui_color[num_color]->background;
+    
+    if (((fg == -1) || (fg == 99))
+        && ((bg == -1) || (bg == 99)))
+        return 63;
+    if ((fg == -1) || (fg == 99))
+        fg = WEECHAT_COLOR_WHITE;
+    if ((bg == -1) || (bg == 99))
+        bg = 0;
+    
+    return (bg * 8) + fg;
+}
+
+/*
+ * gui_window_set_weechat_color: set WeeChat color for window
  */
 
 void
-gui_window_set_color (WINDOW *window, int num_color)
+gui_window_set_weechat_color (WINDOW *window, int num_color)
 {
     if (has_colors ())
     {
-        if (color_attr[num_color - 1] & A_BOLD)
-            wattron (window, COLOR_PAIR (num_color) | A_BOLD);
+        wattroff (window, A_BOLD | A_UNDERLINE | A_REVERSE);
+        wattron (window, COLOR_PAIR(gui_color_get_pair (num_color)) |
+                 gui_color[num_color]->attributes);
+    }
+}
+
+/*
+ * gui_window_chat_set_style: set style (bold, underline, ..)
+ *                            for a chat window
+ */
+
+void
+gui_window_chat_set_style (t_gui_window *window, int style)
+{
+    if (has_colors ())
+    {
+        wattron (window->win_chat, style);
+    }
+}
+
+/*
+ * gui_window_chat_remove_style: remove style (bold, underline, ..)
+ *                               for a chat window
+ */
+
+void
+gui_window_chat_remove_style (t_gui_window *window, int style)
+{
+    if (has_colors ())
+    {
+        wattroff (window->win_chat, style);
+    }
+}
+
+/*
+ * gui_window_chat_toggle_style: toggle a style (bold, underline, ..)
+ *                               for a chat window
+ */
+
+void
+gui_window_chat_toggle_style (t_gui_window *window, int style)
+{
+    window->current_style_attr ^= style;
+    if (window->current_style_attr & style)
+        gui_window_chat_set_style (window, style);
+    else
+        gui_window_chat_remove_style (window, style);
+}
+
+/*
+ * gui_window_chat_reset_style: reset style (color and attr)
+ *                              for a chat window
+ */
+
+void
+gui_window_chat_reset_style (t_gui_window *window)
+{
+    window->current_style_fg = -1;
+    window->current_style_bg = -1;
+    window->current_style_attr = 0;
+    window->current_color_attr = 0;
+    
+    gui_window_set_weechat_color (window->win_chat, COLOR_WIN_CHAT);
+    gui_window_chat_remove_style (window,
+                                  A_BOLD | A_UNDERLINE | A_REVERSE);
+}
+
+/*
+ * gui_window_chat_set_color_style: set style for color
+ */
+
+void
+gui_window_chat_set_color_style (t_gui_window *window, int style)
+{
+    window->current_color_attr |= style;
+    wattron (window->win_chat, style);
+}
+
+/*
+ * gui_window_chat_remove_color_style: remove style for color
+ */
+
+void
+gui_window_chat_remove_color_style (t_gui_window *window, int style)
+{
+    window->current_color_attr &= !style;
+    wattroff (window->win_chat, style);
+}
+
+/*
+ * gui_window_chat_reset_color_style: reset style for color
+ */
+
+void
+gui_window_chat_reset_color_style (t_gui_window *window)
+{
+    wattroff (window->win_chat, window->current_color_attr);
+    window->current_color_attr = 0;
+}
+
+/*
+ * gui_window_chat_set_color: set color for a chat window
+ */
+
+void
+gui_window_chat_set_color (t_gui_window *window, int fg, int bg)
+{
+    if (has_colors ())
+    {
+        if (((fg == -1) || (fg == 99))
+            && ((bg == -1) || (bg == 99)))
+            wattron (window->win_chat, COLOR_PAIR(63));
         else
         {
-            wattroff (window, A_BOLD);
-            wattron (window, COLOR_PAIR (num_color));
+            if ((fg == -1) || (fg == 99))
+                fg = WEECHAT_COLOR_WHITE;
+            if ((bg == -1) || (bg == 99))
+                bg = 0;
+            wattron (window->win_chat, COLOR_PAIR((bg * 8) + fg));
         }
     }
 }
 
 /*
- * gui_buffer_has_nicklist: returns 1 if buffer has nicklist
+ * gui_window_chat_set_weechat_color: set a WeeChat color for a chat window
  */
 
-int
-gui_buffer_has_nicklist (t_gui_buffer *buffer)
+void
+gui_window_chat_set_weechat_color (t_gui_window *window, int weechat_color)
 {
-    return (((CHANNEL(buffer)) && (CHANNEL(buffer)->type == CHAT_CHANNEL)) ? 1 : 0);
+    if (has_colors ())
+    {
+        gui_window_chat_reset_style (window);
+        gui_window_chat_set_style (window,
+                                   gui_color[weechat_color]->attributes);
+        gui_window_chat_set_color (window,
+                                   gui_color[weechat_color]->foreground,
+                                   gui_color[weechat_color]->background);
+    }
 }
 
-
 /*
  * gui_calculate_pos_size: calculate position and size for a buffer & subwindows
  */
@@ -300,11 +674,12 @@ gui_calculate_pos_size (t_gui_window *window)
  */
 
 void
-gui_curses_window_clear (WINDOW *window)
+gui_curses_window_clear (WINDOW *window, int num_color)
 {
     if (!gui_ok)
         return;
     
+    wbkgdset(window, ' ' | COLOR_PAIR (gui_color_get_pair (num_color)));
     werase (window);
     wmove (window, 0, 0);
 }
@@ -325,7 +700,7 @@ gui_draw_window_separator (t_gui_window *window)
                                         1,
                                         window->win_y,
                                         window->win_x - 1);
-        gui_window_set_color (window->win_separator, COLOR_WIN_TITLE);
+        gui_window_set_weechat_color (window->win_separator, COLOR_WIN_TITLE);
         wborder (window->win_separator, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ');
         wnoutrefresh (window->win_separator);
         refresh ();
@@ -350,9 +725,9 @@ gui_draw_buffer_title (t_gui_buffer *buffer, int erase)
         if (ptr_win->buffer == buffer)
         {
             if (erase)
-              gui_curses_window_clear (ptr_win->win_title);
+                gui_curses_window_clear (ptr_win->win_title, COLOR_WIN_TITLE);
             
-            gui_window_set_color (ptr_win->win_title, COLOR_WIN_TITLE);
+            gui_window_set_weechat_color (ptr_win->win_title, COLOR_WIN_TITLE);
             snprintf (format, 32, "%%-%ds", ptr_win->win_width);
             if (CHANNEL(buffer))
             {
@@ -395,15 +770,14 @@ void
 gui_display_new_line (t_gui_window *window, int num_lines, int count,
                       int *lines_displayed, int simulate)
 {
-    char format_empty[32];
-    
     if ((count == 0) || (*lines_displayed >= num_lines - count))
     {
         if ((!simulate) && (window->win_chat_cursor_x <= window->win_chat_width - 1))
         {
-            snprintf (format_empty, 32, "%%-%ds",
-                      window->win_chat_width - window->win_chat_cursor_x);
-            wprintw (window->win_chat, format_empty, " ");
+            wmove (window->win_chat,
+                   window->win_chat_cursor_y,
+                   window->win_chat_cursor_x);
+            wclrtoeol (window->win_chat);
         }
         window->win_chat_cursor_y++;
     }
@@ -412,20 +786,203 @@ gui_display_new_line (t_gui_window *window, int num_lines, int count,
 }
 
 /*
- * gui_message_get_next_char: returns next char of message at offset
+ * gui_word_get_next_char: returns next char of a word
+ *                         special chars like colors, bold, .. are skipped
+ */
+
+char *
+gui_word_get_next_char (t_gui_window *window, unsigned char *string, int apply_style)
+{
+    char str_fg[3], str_bg[3];
+    int fg, bg, weechat_color;
+    
+    while (string[0])
+    {
+        switch (string[0])
+        {
+            case GUI_ATTR_BOLD_CHAR:
+                string++;
+                if (apply_style)
+                    gui_window_chat_toggle_style (window, A_BOLD);
+                break;
+            case GUI_ATTR_COLOR_CHAR:
+                string++;
+                str_fg[0] = '\0';
+                str_bg[0] = '\0';
+                fg = 99;
+                bg = 99;
+                if (isdigit (string[0]))
+                {
+                    str_fg[0] = string[0];
+                    str_fg[1] = '\0';
+                    string++;
+                    if (isdigit (string[0]))
+                    {
+                        str_fg[1] = string[0];
+                        str_fg[2] = '\0';
+                        string++;
+                    }
+                }
+                if (string[0] == ',')
+                {
+                    string++;
+                    if (isdigit (string[0]))
+                    {
+                        str_bg[0] = string[0];
+                        str_bg[1] = '\0';
+                        string++;
+                        if (isdigit (string[0]))
+                        {
+                            str_bg[1] = string[0];
+                            str_bg[2] = '\0';
+                            string++;
+                        }
+                    }
+                }
+                if (apply_style)
+                {
+                    if (str_fg[0] || str_bg[0])
+                    {
+                        if (str_fg[0])
+                            sscanf (str_fg, "%d", &fg);
+                        else
+                            fg = window->current_style_fg;
+                        if (str_bg[0])
+                            sscanf (str_bg, "%d", &bg);
+                        else
+                            bg = window->current_style_bg;
+                    }
+                    if (!str_fg[0] && !str_bg[0])
+                        gui_window_chat_reset_color_style (window);
+                    window->current_style_fg = fg;
+                    window->current_style_bg = bg;
+                    gui_window_chat_set_color (window, fg, bg);
+                }
+                break;
+            case GUI_ATTR_RESET_CHAR:
+                string++;
+                if (apply_style)
+                    gui_window_chat_reset_style (window);
+                break;
+            case GUI_ATTR_FIXED_CHAR:
+                string++;
+                break;
+            case GUI_ATTR_REVERSE_CHAR:
+            case GUI_ATTR_REVERSE2_CHAR:
+                string++;
+                if (apply_style)
+                    gui_window_chat_toggle_style (window, A_REVERSE);
+                break;
+            case GUI_ATTR_WEECHAT_COLOR_CHAR:
+                string++;
+                if (isdigit (string[0]) && isdigit (string[1]))
+                {
+                    str_fg[0] = string[0];
+                    str_fg[1] = string[1];
+                    str_fg[2] = '\0';
+                    string += 2;
+                    if (apply_style)
+                    {
+                        sscanf (str_fg, "%d", &weechat_color);
+                        gui_window_chat_set_weechat_color (window, weechat_color);
+                    }
+                }
+                break;
+            case GUI_ATTR_WEECHAT_SET_CHAR:
+                string++;
+                switch (string[0])
+                {
+                    case GUI_ATTR_BOLD_CHAR:
+                        string++;
+                        if (apply_style)
+                            gui_window_chat_set_color_style (window, A_BOLD);
+                        break;
+                    case GUI_ATTR_REVERSE_CHAR:
+                    case GUI_ATTR_REVERSE2_CHAR:
+                        string++;
+                        if (apply_style)
+                            gui_window_chat_set_color_style (window, A_REVERSE);
+                        break;
+                    case GUI_ATTR_UNDERLINE_CHAR:
+                        string++;
+                        if (apply_style)
+                            gui_window_chat_set_color_style (window, A_UNDERLINE);
+                        break;
+                }
+                break;
+            case GUI_ATTR_WEECHAT_REMOVE_CHAR:
+                string++;
+                switch (string[0])
+                {
+                    case GUI_ATTR_BOLD_CHAR:
+                        string++;
+                        if (apply_style)
+                            gui_window_chat_remove_color_style (window, A_BOLD);
+                        break;
+                    case GUI_ATTR_REVERSE_CHAR:
+                    case GUI_ATTR_REVERSE2_CHAR:
+                        string++;
+                        if (apply_style)
+                            gui_window_chat_remove_color_style (window, A_REVERSE);
+                        break;
+                    case GUI_ATTR_UNDERLINE_CHAR:
+                        string++;
+                        if (apply_style)
+                            gui_window_chat_remove_color_style (window, A_UNDERLINE);
+                        break;
+                }
+                break;
+            case GUI_ATTR_ITALIC_CHAR:
+                string++;
+                break;
+            case GUI_ATTR_UNDERLINE_CHAR:
+                string++;
+                if (apply_style)
+                    gui_window_chat_toggle_style (window, A_UNDERLINE);
+                break;
+            default:
+                if (string[0] < 32)
+                    string++;
+                else
+                    return utf8_next_char ((char *)string);
+        }
+            
+    }
+    
+    /* nothing found except color/attrib codes, so return NULL */
+    return NULL;
+}
+
+/*
+ * gui_display_word_raw: display word on chat buffer, letter by letter
+ *                       special chars like color, bold, .. are interpreted
  */
 
 void
-gui_message_get_next_char (t_gui_message **message, int *offset)
+gui_display_word_raw (t_gui_window *window, char *string)
 {
-    if (!(*message))
-        return;
+    char *prev_char, *next_char, saved_char;
     
-    (*offset) += utf8_char_size ((*message)->message + (*offset));
-    if (!((*message)->message[*offset]))
+    wmove (window->win_chat,
+           window->win_chat_cursor_y,
+           window->win_chat_cursor_x);
+    
+    while (string && string[0])
     {
-        *message = (*message)->next_message;
-        *offset = 0;
+        next_char = gui_word_get_next_char (window, (unsigned char *)string, 1);
+        if (!next_char)
+            return;
+        
+        prev_char = utf8_prev_char (string, next_char);
+        if (prev_char)
+        {
+            saved_char = next_char[0];
+            next_char[0] = '\0';
+            wprintw (window->win_chat, "%s", prev_char);
+            next_char[0] = saved_char;
+        }
+        
+        string = next_char;
     }
 }
 
@@ -434,35 +991,34 @@ gui_message_get_next_char (t_gui_message **message, int *offset)
  */
 
 void
-gui_display_word (t_gui_window *window, t_gui_line *line,
-                  t_gui_message *message, int offset,
-                  t_gui_message *end_msg, int end_offset,
+gui_display_word (t_gui_window *window,
+                  t_gui_line *line,
+                  char *data,
+                  char *end_offset,
                   int num_lines, int count, int *lines_displayed, int simulate)
 {
-    char format_align[32];
-    char saved_char_end, saved_char;
-    int pos_saved_char, end_of_word, chars_to_display, num_displayed;
+    char *end_line, saved_char_end, saved_char;
+    int pos_saved_char, chars_to_display, num_displayed;
     
-    if (!message || !end_msg ||
+    if (!data ||
         ((!simulate) && (window->win_chat_cursor_y > window->win_chat_height - 1)))
         return;
     
-    snprintf (format_align, 32, "%%-%ds", line->length_align);
-    
-    saved_char_end = '\0';
-    if (end_msg)
+    end_line = data + strlen (data);
+        
+    if (end_offset[0])
     {
-        saved_char_end = end_msg->message[end_offset + 1];
-        end_msg->message[end_offset + 1] = '\0';
+        saved_char_end = end_offset[1];
+        end_offset[1] = '\0';
+    }
+    else
+    {
+        end_offset = NULL;
+        saved_char_end = '\0';
     }
     
-    end_of_word = 0;
-    while (!end_of_word)
+    while (data && data[0])
     {
-        /* set text color if beginning of message */
-        if (!simulate)
-            gui_window_set_color (window->win_chat, message->color);
-        
         /* insert spaces for align text under time/nick */
         if ((line->length_align > 0) &&
             (window->win_chat_cursor_x == 0) &&
@@ -471,77 +1027,55 @@ gui_display_word (t_gui_window *window, t_gui_line *line,
             (line->length_align < (window->win_chat_width - 5)))
         {
             if (!simulate)
-                mvwprintw (window->win_chat,
-                           window->win_chat_cursor_y, 
-                           window->win_chat_cursor_x,
-                           format_align, " ");
+            {
+                wmove (window->win_chat,
+                       window->win_chat_cursor_y,
+                       window->win_chat_cursor_x);
+                wclrtoeol (window->win_chat);
+            }
             window->win_chat_cursor_x += line->length_align;
         }
         
-        chars_to_display = utf8_strlen (message->message + offset);
+        chars_to_display = gui_word_strlen (window, data);
 
         /* too long for current line */
         if (window->win_chat_cursor_x + chars_to_display > window->win_chat_width)
         {
             num_displayed = window->win_chat_width - window->win_chat_cursor_x;
-            pos_saved_char = utf8_real_pos (message->message + offset, num_displayed);
-            saved_char = message->message[offset + pos_saved_char];
-            message->message[offset + pos_saved_char] = '\0';
+            pos_saved_char = gui_word_real_pos (window, data, num_displayed);
+            saved_char = data[pos_saved_char];
+            data[pos_saved_char] = '\0';
             if ((!simulate) &&
                 ((count == 0) || (*lines_displayed >= num_lines - count)))
-                mvwprintw (window->win_chat,
-                           window->win_chat_cursor_y, 
-                           window->win_chat_cursor_x,
-                           "%s", message->message + offset);
-            message->message[offset + pos_saved_char] = saved_char;
-            offset += pos_saved_char;
+                gui_display_word_raw (window, data);
+            data[pos_saved_char] = saved_char;
+            data += pos_saved_char;
         }
         else
         {
             num_displayed = chars_to_display;
             if ((!simulate) &&
                 ((count == 0) || (*lines_displayed >= num_lines - count)))
-                mvwprintw (window->win_chat,
-                           window->win_chat_cursor_y, 
-                           window->win_chat_cursor_x,
-                           "%s", message->message + offset);
-            if (message == end_msg)
-            {
-                if (end_msg)
-                    end_msg->message[end_offset + 1] = saved_char_end;
-                if (saved_char_end == '\0')
-                {
-                    message = message->next_message;
-                    offset = 0;
-                }
-                else
-                    offset = end_offset + 1;
-            }
-            else
-            {
-                message = message->next_message;
-                offset = 0;
-            }
+                gui_display_word_raw (window, data);
+            data += strlen (data);
         }
         
         window->win_chat_cursor_x += num_displayed;
         
         /* display new line? */
-        if (!message ||
+        if ((data >= end_line) ||
             ((window->win_chat_cursor_y <= window->win_chat_height - 1) &&
             (window->win_chat_cursor_x > (window->win_chat_width - 1))))
             gui_display_new_line (window, num_lines, count,
                                   lines_displayed, simulate);
         
-        /* end of word? */
-        if (!message || (message->prev_message == end_msg) ||
-            ((message == end_msg) && (offset > end_offset)) ||
+        if ((data >= end_line) ||
             (window->win_chat_cursor_y >= window->win_chat_height))
-            end_of_word = 1;
+            data = NULL;
     }
-        
-    if (end_msg)
-        end_msg->message[end_offset + 1] = saved_char_end;
+    
+    if (end_offset)
+        end_offset[1] = saved_char_end;
 }
 
 /*
@@ -549,39 +1083,57 @@ gui_display_word (t_gui_window *window, t_gui_line *line,
  */
 
 void
-gui_get_word_info (t_gui_message *message, int offset,
-                   t_gui_message **word_start_msg, int *word_start_offset,
-                   t_gui_message **word_end_msg, int *word_end_offset,
+gui_get_word_info (t_gui_window *window,
+                   char *data,
+                   int *word_start_offset, int *word_end_offset,
                    int *word_length_with_spaces, int *word_length)
 {
-    *word_start_msg = NULL;
+    char *start_data, *prev_char, *next_char;
+    int leading_spaces, char_size;
+    
     *word_start_offset = 0;
-    *word_end_msg = NULL;
     *word_end_offset = 0;
     *word_length_with_spaces = 0;
     *word_length = 0;
     
-    /* leading spaces */
-    while (message && (message->message[offset] == ' '))
-    {
-        (*word_length_with_spaces)++;
-        gui_message_get_next_char (&message, &offset);
-    }
+    start_data = data;
     
-    /* not only spaces? */
-    if (message)
+    leading_spaces = 1;
+    while (data && data[0])
     {
-        *word_start_msg = message;
-        *word_start_offset = offset;
-        
-        /* find end of word */
-        while (message && (message->message[offset]) && (message->message[offset] != ' '))
+        next_char = gui_word_get_next_char (window, (unsigned char *)data, 0);
+        if (next_char)
         {
-            *word_end_msg = message;
-            *word_end_offset = offset + utf8_char_size (message->message + offset) - 1;
-            (*word_length_with_spaces) += utf8_char_size (message->message + offset);
-            (*word_length) += utf8_char_size (message->message + offset);
-            gui_message_get_next_char (&message, &offset);
+            prev_char = utf8_prev_char (data, next_char);
+            if (prev_char)
+            {
+                if (prev_char[0] != ' ')
+                {
+                    if (leading_spaces)
+                        *word_start_offset = prev_char - start_data;
+                    leading_spaces = 0;
+                    char_size = next_char - prev_char;
+                    *word_end_offset = next_char - start_data - 1;
+                    (*word_length_with_spaces) += char_size;
+                    (*word_length) += char_size;
+                }
+                else
+                {
+                    if (leading_spaces)
+                        (*word_length_with_spaces)++;
+                    else
+                    {
+                        *word_end_offset = prev_char - start_data - 1;
+                        return;
+                    }
+                }
+                data = next_char;
+            }
+        }
+        else
+        {
+            *word_end_offset = data + strlen (data) - start_data - 1;
+            return;
         }
     }
 }
@@ -598,11 +1150,12 @@ gui_get_word_info (t_gui_message *message, int offset,
 int
 gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulate)
 {
-    int num_lines, x, y, offset, lines_displayed;
-    t_gui_message *ptr_message, *word_start_msg, *word_end_msg;
+    int num_lines, x, y, lines_displayed;
     int word_start_offset, word_end_offset;
     int word_length_with_spaces, word_length;
     int skip_spaces;
+    char *ptr_data, *ptr_end_offset, *next_char, *prev_char;
+    char *ptr_style, saved_char;
     
     if (simulate)
     {
@@ -623,17 +1176,22 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
         window->win_chat_cursor_y = y;
     }
     
-    ptr_message = line->messages;
-    offset = 0;
+    /* reset color & style for a new line */
+    gui_window_chat_reset_style (window);
+    
     lines_displayed = 0;
-    while (ptr_message)
+    ptr_data = line->data;
+    while (ptr_data && ptr_data[0])
     {
         skip_spaces = 0;
-        gui_get_word_info (ptr_message, offset,
-                           &word_start_msg, &word_start_offset,
-                           &word_end_msg, &word_end_offset,
+        gui_get_word_info (window,
+                           ptr_data,
+                           &word_start_offset,
+                           &word_end_offset,
                            &word_length_with_spaces, &word_length);
         
+        ptr_end_offset = ptr_data + word_end_offset;
+        
         if (word_length > 0)
         {
             /* spaces + word too long for current line */
@@ -642,8 +1200,20 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
             {
                 gui_display_new_line (window, num_lines, count,
                                       &lines_displayed, simulate);
-                ptr_message = word_start_msg;
-                offset = word_start_offset;
+                /* apply styles before jumping to start of word */
+                if (!simulate && (word_start_offset > 0))
+                {
+                    saved_char = ptr_data[word_start_offset];
+                    ptr_data[word_start_offset] = '\0';
+                    ptr_style = ptr_data;
+                    while ((ptr_style = gui_word_get_next_char (window, (unsigned char *)ptr_style, 1)) != NULL)
+                    {
+                        /* loop until no style/char available */
+                    }
+                    ptr_data[word_start_offset] = saved_char;
+                }
+                /* jump to start of word */
+                ptr_data += word_start_offset;
             }
             
             /* word is exactly width => we'll skip next leading spaces for next line */
@@ -651,25 +1221,34 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
                 skip_spaces = 1;
             
             /* display word */
-            gui_display_word (window, line,
-                              ptr_message, offset,
-                              word_end_msg, word_end_offset,
+            gui_display_word (window, line, ptr_data,
+                              ptr_end_offset,
                               num_lines, count, &lines_displayed, simulate);
             
             if (window->win_chat_cursor_y >= window->win_chat_height)
-                ptr_message = NULL;
+                ptr_data = NULL;
             else
             {
                 /* move pointer after end of word */
-                ptr_message = word_end_msg;
-                offset = word_end_offset;
-                gui_message_get_next_char (&ptr_message, &offset);
+                ptr_data = ptr_end_offset + 1;
+                if (*(ptr_data - 1) == '\0')
+                    ptr_data = NULL;
                 
                 /* skip leading spaces? */
                 if (skip_spaces)
                 {
-                    while (ptr_message && (ptr_message->message[offset] == ' '))
-                        gui_message_get_next_char (&ptr_message, &offset);
+                    while (ptr_data && (ptr_data[0] == ' '))
+                    {
+                        next_char = gui_word_get_next_char (window,
+                                                            (unsigned char *)ptr_data, 0);
+                        if (!next_char)
+                            break;
+                        prev_char = utf8_prev_char (ptr_data, next_char);
+                        if (prev_char && (prev_char[0] == ' '))
+                            ptr_data = next_char;
+                        else
+                            break;
+                    }
                 }
             }
         }
@@ -677,7 +1256,7 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
         {
             gui_display_new_line (window, num_lines, count,
                                   &lines_displayed, simulate);
-            ptr_message = NULL;
+            ptr_data = NULL;
         }
     }
     
@@ -817,7 +1396,7 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
         {
             if (erase)
             {
-                gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
+                gui_window_set_weechat_color (ptr_win->win_chat, COLOR_WIN_CHAT);
                 
                 snprintf (format_empty, 32, "%%-%ds", ptr_win->win_chat_width);
                 for (i = 0; i < ptr_win->win_chat_height; i++)
@@ -826,7 +1405,7 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
                 }
             }
             
-            gui_window_set_color (ptr_win->win_chat, COLOR_WIN_CHAT);
+            gui_window_set_weechat_color (ptr_win->win_chat, COLOR_WIN_CHAT);
             
             if (buffer->dcc)
             {
@@ -839,9 +1418,9 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
                         break;
                     
                     /* nickname and filename */
-                    gui_window_set_color (ptr_win->win_chat,
-                                          (ptr_dcc == dcc_selected) ?
-                                          COLOR_DCC_SELECTED : COLOR_WIN_CHAT);
+                    gui_window_set_weechat_color (ptr_win->win_chat,
+                                                  (ptr_dcc == dcc_selected) ?
+                                                  COLOR_DCC_SELECTED : COLOR_WIN_CHAT);
                     mvwprintw (ptr_win->win_chat, i, 0, "%s %-16s ",
                                (ptr_dcc == dcc_selected) ? "***" : "   ",
                                ptr_dcc->nick);
@@ -861,14 +1440,14 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
                     }
                     
                     /* status */
-                    gui_window_set_color (ptr_win->win_chat,
-                                          (ptr_dcc == dcc_selected) ?
-                                          COLOR_DCC_SELECTED : COLOR_WIN_CHAT);
+                    gui_window_set_weechat_color (ptr_win->win_chat,
+                                                  (ptr_dcc == dcc_selected) ?
+                                                  COLOR_DCC_SELECTED : COLOR_WIN_CHAT);
                     mvwprintw (ptr_win->win_chat, i + 1, 0, "%s %s ",
                                (ptr_dcc == dcc_selected) ? "***" : "   ",
                                (DCC_IS_RECV(ptr_dcc->type)) ? "-->>" : "<<--");
-                    gui_window_set_color (ptr_win->win_chat,
-                                          COLOR_DCC_WAITING + ptr_dcc->status);
+                    gui_window_set_weechat_color (ptr_win->win_chat,
+                                                  COLOR_DCC_WAITING + ptr_dcc->status);
                     buf = weechat_convert_encoding ((local_utf8) ?
                                                     cfg_look_charset_decode_iso : cfg_look_charset_decode_utf,
                                                     (cfg_look_charset_internal && cfg_look_charset_internal[0]) ?
@@ -878,9 +1457,9 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
                     free (buf);
                     
                     /* other infos */
-                    gui_window_set_color (ptr_win->win_chat,
-                                          (ptr_dcc == dcc_selected) ?
-                                          COLOR_DCC_SELECTED : COLOR_WIN_CHAT);
+                    gui_window_set_weechat_color (ptr_win->win_chat,
+                                                  (ptr_dcc == dcc_selected) ?
+                                                  COLOR_DCC_SELECTED : COLOR_WIN_CHAT);
                     if (DCC_IS_FILE(ptr_dcc->type))
                     {
                         wprintw (ptr_win->win_chat, "  [");
@@ -1021,7 +1600,7 @@ gui_draw_buffer_nick (t_gui_buffer *buffer, int erase)
     char format[32], format_empty[32];
     t_irc_nick *ptr_nick;
     
-    if (!gui_ok)
+    if (!gui_ok || !BUFFER_HAS_NICKLIST(buffer))
         return;
     
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
@@ -1030,7 +1609,7 @@ gui_draw_buffer_nick (t_gui_buffer *buffer, int erase)
         {
             if (erase)
             {
-                gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK);
+                gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK);
                 
                 snprintf (format_empty, 32, "%%-%ds", ptr_win->win_nick_width);
                 for (i = 0; i < ptr_win->win_nick_height; i++)
@@ -1039,177 +1618,174 @@ gui_draw_buffer_nick (t_gui_buffer *buffer, int erase)
                 }
             }
             
-            if (gui_buffer_has_nicklist (buffer))
+            max_length = nick_get_max_length (CHANNEL(buffer));
+            if ((buffer->num_displayed > 0) &&
+                ((max_length + 2) != ptr_win->win_nick_width))
             {
-                max_length = nick_get_max_length (CHANNEL(buffer));
-                if ((buffer->num_displayed > 0) &&
-                    ((max_length + 2) != ptr_win->win_nick_width))
-                {
-                    gui_calculate_pos_size (ptr_win);
-                    delwin (ptr_win->win_chat);
-                    delwin (ptr_win->win_nick);
-                    ptr_win->win_chat = newwin (ptr_win->win_chat_height,
-                                                ptr_win->win_chat_width,
-                                                ptr_win->win_chat_y,
-                                                ptr_win->win_chat_x);
-                    ptr_win->win_nick = newwin (ptr_win->win_nick_height,
-                                                ptr_win->win_nick_width,
-                                                ptr_win->win_nick_y,
-                                                ptr_win->win_nick_x);
-                    gui_draw_buffer_chat (buffer, 1);
-                    
-                    gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK);
-                    
-                    snprintf (format_empty, 32, "%%-%ds", ptr_win->win_nick_width);
-                    for (i = 0; i < ptr_win->win_nick_height; i++)
-                    {
-                        mvwprintw (ptr_win->win_nick, i, 0, format_empty, " ");
-                    }
-                }
-                snprintf (format, 32, "%%.%ds",
-                          ((cfg_look_nicklist_min_size > 0)
-                           && (max_length < cfg_look_nicklist_min_size)) ?
-                          cfg_look_nicklist_min_size :
-                          (((cfg_look_nicklist_max_size > 0)
-                           && (max_length > cfg_look_nicklist_max_size)) ?
-                          cfg_look_nicklist_max_size : max_length));
+                gui_calculate_pos_size (ptr_win);
+                delwin (ptr_win->win_chat);
+                delwin (ptr_win->win_nick);
+                ptr_win->win_chat = newwin (ptr_win->win_chat_height,
+                                            ptr_win->win_chat_width,
+                                            ptr_win->win_chat_y,
+                                            ptr_win->win_chat_x);
+                ptr_win->win_nick = newwin (ptr_win->win_nick_height,
+                                            ptr_win->win_nick_width,
+                                            ptr_win->win_nick_y,
+                                            ptr_win->win_nick_x);
+                gui_draw_buffer_chat (buffer, 1);
                 
-                if (has_colors ())
+                gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK);
+                
+                snprintf (format_empty, 32, "%%-%ds", ptr_win->win_nick_width);
+                for (i = 0; i < ptr_win->win_nick_height; i++)
+                {
+                    mvwprintw (ptr_win->win_nick, i, 0, format_empty, " ");
+                }
+            }
+            snprintf (format, 32, "%%.%ds",
+                      ((cfg_look_nicklist_min_size > 0)
+                       && (max_length < cfg_look_nicklist_min_size)) ?
+                      cfg_look_nicklist_min_size :
+                      (((cfg_look_nicklist_max_size > 0)
+                        && (max_length > cfg_look_nicklist_max_size)) ?
+                       cfg_look_nicklist_max_size : max_length));
+            
+            if (has_colors ())
+            {
+                gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK_SEP);
+                switch (cfg_look_nicklist_position)
+                {
+                    case CFG_LOOK_NICKLIST_LEFT:
+                        mvwvline (ptr_win->win_nick,
+                                  0, ptr_win->win_nick_width - 1, ACS_VLINE,
+                                  ptr_win->win_chat_height);
+                        break;
+                    case CFG_LOOK_NICKLIST_RIGHT:
+                        mvwvline (ptr_win->win_nick,
+                                  0, 0, ACS_VLINE,
+                                  ptr_win->win_chat_height);
+                        break;
+                    case CFG_LOOK_NICKLIST_TOP:
+                        mvwhline (ptr_win->win_nick,
+                                  ptr_win->win_nick_height - 1, 0, ACS_HLINE,
+                                  ptr_win->win_chat_width);
+                        break;
+                    case CFG_LOOK_NICKLIST_BOTTOM:
+                        mvwhline (ptr_win->win_nick,
+                                  0, 0, ACS_HLINE,
+                                  ptr_win->win_chat_width);
+                        break;
+                }
+            }
+            
+            gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK);
+            x = 0;
+            y = (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM) ? 1 : 0;
+            column = 0;
+            
+            if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ||
+                (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM))
+                nicks_displayed = (ptr_win->win_width / (max_length + 2)) * (ptr_win->win_height - 1);
+            else
+                nicks_displayed = ptr_win->win_nick_height;
+            
+            ptr_nick = CHANNEL(buffer)->nicks;
+            for (i = 0; i < ptr_win->win_nick_start; i++)
+            {
+                if (!ptr_nick)
+                    break;
+                ptr_nick = ptr_nick->next_nick;
+            }
+            if (ptr_nick)
+            {
+                for (i = 0; i < nicks_displayed; i++)
                 {
-                    gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK_SEP);
                     switch (cfg_look_nicklist_position)
                     {
                         case CFG_LOOK_NICKLIST_LEFT:
-                            mvwvline (ptr_win->win_nick,
-                                      0, ptr_win->win_nick_width - 1, ACS_VLINE,
-                                      ptr_win->win_chat_height);
+                            x = 0;
                             break;
                         case CFG_LOOK_NICKLIST_RIGHT:
-                            mvwvline (ptr_win->win_nick,
-                                      0, 0, ACS_VLINE,
-                                      ptr_win->win_chat_height);
+                            x = 1;
                             break;
                         case CFG_LOOK_NICKLIST_TOP:
-                            mvwhline (ptr_win->win_nick,
-                                      ptr_win->win_nick_height - 1, 0, ACS_HLINE,
-                                      ptr_win->win_chat_width);
-                            break;
                         case CFG_LOOK_NICKLIST_BOTTOM:
-                            mvwhline (ptr_win->win_nick,
-                                      0, 0, ACS_HLINE,
-                                      ptr_win->win_chat_width);
+                            x = column;
                             break;
                     }
-                }
-                
-                gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK);
-                x = 0;
-                y = (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM) ? 1 : 0;
-                column = 0;
-                
-                if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ||
-                    (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM))
-                    nicks_displayed = (ptr_win->win_width / (max_length + 2)) * (ptr_win->win_height - 1);
-                else
-                    nicks_displayed = ptr_win->win_nick_height;
-                
-                ptr_nick = CHANNEL(buffer)->nicks;
-                for (i = 0; i < ptr_win->win_nick_start; i++)
-                {
-                    if (!ptr_nick)
-                        break;
-                    ptr_nick = ptr_nick->next_nick;
-                }
-                if (ptr_nick)
-                {
-                    for (i = 0; i < nicks_displayed; i++)
+                    if ( ((i == 0) && (ptr_win->win_nick_start > 0))
+                         || ((i == nicks_displayed - 1) && (ptr_nick->next_nick)) )
                     {
-                        switch (cfg_look_nicklist_position)
+                        gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK_MORE);
+                        j = (max_length + 1) >= 4 ? 4 : max_length + 1;
+                        for (x = 1; x <= j; x++)
+                            mvwprintw (ptr_win->win_nick, y, x, "+");
+                    }
+                    else
+                    {
+                        if (ptr_nick->is_chanowner)
                         {
-                            case CFG_LOOK_NICKLIST_LEFT:
-                                x = 0;
-                                break;
-                            case CFG_LOOK_NICKLIST_RIGHT:
-                                x = 1;
-                                break;
-                            case CFG_LOOK_NICKLIST_TOP:
-                            case CFG_LOOK_NICKLIST_BOTTOM:
-                                x = column;
-                                break;
+                            gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK_CHANOWNER);
+                            mvwprintw (ptr_win->win_nick, y, x, "~");
+                            x++;
                         }
-                        if ( ((i == 0) && (ptr_win->win_nick_start > 0))
-                            || ((i == nicks_displayed - 1) && (ptr_nick->next_nick)) )
+                        else if (ptr_nick->is_chanadmin)
                         {
-                            gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK_MORE);
-                            j = (max_length + 1) >= 4 ? 4 : max_length + 1;
-                            for (x = 1; x <= j; x++)
-                                mvwprintw (ptr_win->win_nick, y, x, "+");
+                            gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK_CHANADMIN);
+                            mvwprintw (ptr_win->win_nick, y, x, "&");
+                            x++;
+                        }
+                        else if (ptr_nick->is_op)
+                        {
+                            gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK_OP);
+                            mvwprintw (ptr_win->win_nick, y, x, "@");
+                            x++;
+                        }
+                        else if (ptr_nick->is_halfop)
+                        {
+                            gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK_HALFOP);
+                            mvwprintw (ptr_win->win_nick, y, x, "%%");
+                            x++;
+                        }
+                        else if (ptr_nick->has_voice)
+                        {
+                            gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK_VOICE);
+                            mvwprintw (ptr_win->win_nick, y, x, "+");
+                            x++;
                         }
                         else
                         {
-                            if (ptr_nick->is_chanowner)
-                            {
-                                gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK_CHANOWNER);
-                                mvwprintw (ptr_win->win_nick, y, x, "~");
-                                x++;
-                            }
-                            else if (ptr_nick->is_chanadmin)
-                            {
-                                gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK_CHANADMIN);
-                                mvwprintw (ptr_win->win_nick, y, x, "&");
-                                x++;
-                            }
-                            else if (ptr_nick->is_op)
-                            {
-                                gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK_OP);
-                                mvwprintw (ptr_win->win_nick, y, x, "@");
-                                x++;
-                            }
-                            else if (ptr_nick->is_halfop)
-                            {
-                                gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK_HALFOP);
-                                mvwprintw (ptr_win->win_nick, y, x, "%%");
-                                x++;
-                            }
-                            else if (ptr_nick->has_voice)
-                            {
-                                gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK_VOICE);
-                                mvwprintw (ptr_win->win_nick, y, x, "+");
-                                x++;
-                            }
-                            else
-                            {
-                                gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK);
-                                mvwprintw (ptr_win->win_nick, y, x, " ");
-                                x++;
-                            }
-                            gui_window_set_color (ptr_win->win_nick,
-                                                  ((cfg_irc_away_check > 0) && (ptr_nick->is_away)) ?
-                                                  COLOR_WIN_NICK_AWAY : COLOR_WIN_NICK);
-                            mvwprintw (ptr_win->win_nick, y, x, format, ptr_nick->nick);
-                            
-                            ptr_nick = ptr_nick->next_nick;
-                            
-                            if (!ptr_nick)
-                                break;
+                            gui_window_set_weechat_color (ptr_win->win_nick, COLOR_WIN_NICK);
+                            mvwprintw (ptr_win->win_nick, y, x, " ");
+                            x++;
                         }
-                        y++;
-                        if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ||
-                            (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM))
+                        gui_window_set_weechat_color (ptr_win->win_nick,
+                                                      ((cfg_irc_away_check > 0) && (ptr_nick->is_away)) ?
+                                                      COLOR_WIN_NICK_AWAY : COLOR_WIN_NICK);
+                        mvwprintw (ptr_win->win_nick, y, x, format, ptr_nick->nick);
+                        
+                        ptr_nick = ptr_nick->next_nick;
+                        
+                        if (!ptr_nick)
+                            break;
+                    }
+                    y++;
+                    if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ||
+                        (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM))
+                    {
+                        if (y - ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM) ? 1 : 0) >= ptr_win->win_nick_height - 1)
                         {
-                            if (y - ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM) ? 1 : 0) >= ptr_win->win_nick_height - 1)
-                            {
-                                column += max_length + 2;
-                                y = (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ?
-                                    0 : 1;
-                            }
+                            column += max_length + 2;
+                            y = (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) ?
+                                0 : 1;
                         }
                     }
                 }
             }
-            wnoutrefresh (ptr_win->win_nick);
-            refresh ();
         }
+        wnoutrefresh (ptr_win->win_nick);
+        refresh ();
     }
 }
 
@@ -1234,64 +1810,59 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
     
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
     {
-        if (has_colors ())
-            wbkgdset(ptr_win->win_status, ' ' | COLOR_PAIR (COLOR_WIN_STATUS));
-        
         if (erase)
-            gui_curses_window_clear (ptr_win->win_status);
+            gui_curses_window_clear (ptr_win->win_status, COLOR_WIN_STATUS);
         
-        gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS);
-        /* wborder (ptr_win->win_status, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '); */
-        wmove (ptr_win->win_status, 0, 0);
+        gui_window_set_weechat_color (ptr_win->win_status, COLOR_WIN_STATUS);
         
         /* display number of buffers */
-        gui_window_set_color (ptr_win->win_status,
-                              COLOR_WIN_STATUS_DELIMITERS);
-        wprintw (ptr_win->win_status, "[");
-        gui_window_set_color (ptr_win->win_status,
-                              COLOR_WIN_STATUS);
+        gui_window_set_weechat_color (ptr_win->win_status,
+                                      COLOR_WIN_STATUS_DELIMITERS);
+        mvwprintw (ptr_win->win_status, 0, 0, "[");
+        gui_window_set_weechat_color (ptr_win->win_status,
+                                      COLOR_WIN_STATUS);
         wprintw (ptr_win->win_status, "%d",
                  (last_gui_buffer) ? last_gui_buffer->number : 0);
-        gui_window_set_color (ptr_win->win_status,
-                              COLOR_WIN_STATUS_DELIMITERS);
+        gui_window_set_weechat_color (ptr_win->win_status,
+                                      COLOR_WIN_STATUS_DELIMITERS);
         wprintw (ptr_win->win_status, "] ");
         
         /* display "<servers>" or current server */
         if (ptr_win->buffer->all_servers)
         {
             wprintw (ptr_win->win_status, "[");
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS);
             wprintw (ptr_win->win_status, _("<servers>"));
-            gui_window_set_color (ptr_win->win_status,
-                              COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, "] ");
         }
         else if (SERVER(ptr_win->buffer) && SERVER(ptr_win->buffer)->name)
         {
             wprintw (ptr_win->win_status, "[");
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS);
             wprintw (ptr_win->win_status, "%s", SERVER(ptr_win->buffer)->name);
             if (SERVER(ptr_win->buffer)->is_away)
                 wprintw (ptr_win->win_status, _("(away)"));
-            gui_window_set_color (ptr_win->win_status,
-                              COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, "] ");
         }
         
         /* infos about current buffer */
         if (SERVER(ptr_win->buffer) && !CHANNEL(ptr_win->buffer))
         {
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS);
             wprintw (ptr_win->win_status, "%d",
                      ptr_win->buffer->number);
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, ":");
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS_CHANNEL);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_CHANNEL);
             if (SERVER(ptr_win->buffer)->is_connected)
                 wprintw (ptr_win->win_status, "[%s] ",
                          SERVER(ptr_win->buffer)->name);
@@ -1303,35 +1874,35 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
                 server_get_number_buffer (SERVER(ptr_win->buffer),
                                           &server_pos,
                                           &server_total);
-                gui_window_set_color (ptr_win->win_status,
-                                      COLOR_WIN_STATUS_DELIMITERS);
+                gui_window_set_weechat_color (ptr_win->win_status,
+                                              COLOR_WIN_STATUS_DELIMITERS);
                 wprintw (ptr_win->win_status, "(");
-                gui_window_set_color (ptr_win->win_status,
-                                      COLOR_WIN_STATUS);
+                gui_window_set_weechat_color (ptr_win->win_status,
+                                              COLOR_WIN_STATUS);
                 wprintw (ptr_win->win_status, "%d", server_pos);
-                gui_window_set_color (ptr_win->win_status,
-                                      COLOR_WIN_STATUS_DELIMITERS);
+                gui_window_set_weechat_color (ptr_win->win_status,
+                                              COLOR_WIN_STATUS_DELIMITERS);
                 wprintw (ptr_win->win_status, "/");
-                gui_window_set_color (ptr_win->win_status,
-                                      COLOR_WIN_STATUS);
+                gui_window_set_weechat_color (ptr_win->win_status,
+                                              COLOR_WIN_STATUS);
                 wprintw (ptr_win->win_status, "%d", server_total);
-                gui_window_set_color (ptr_win->win_status,
-                                      COLOR_WIN_STATUS_DELIMITERS);
+                gui_window_set_weechat_color (ptr_win->win_status,
+                                              COLOR_WIN_STATUS_DELIMITERS);
                 wprintw (ptr_win->win_status, ") ");
 
             }
         }
         if (SERVER(ptr_win->buffer) && CHANNEL(ptr_win->buffer))
         {
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS);
             wprintw (ptr_win->win_status, "%d",
                      ptr_win->buffer->number);
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, ":");
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS_CHANNEL);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_CHANNEL);
             if ((!CHANNEL(ptr_win->buffer)->nicks)
                 && (CHANNEL(ptr_win->buffer)->type != CHAT_PRIVATE))
                 wprintw (ptr_win->win_status, "(%s)",
@@ -1344,11 +1915,11 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
                 /* display channel modes */
                 if (CHANNEL(ptr_win->buffer)->type == CHAT_CHANNEL)
                 {
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS_DELIMITERS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS_DELIMITERS);
                     wprintw (ptr_win->win_status, "(");
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS);
                     i = 0;
                     first_mode = 1;
                     while (CHANNEL(ptr_win->buffer)->modes[i])
@@ -1371,40 +1942,40 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
                     if (CHANNEL(ptr_win->buffer)->modes[CHANNEL_MODE_LIMIT] != ' ')
                         wprintw (ptr_win->win_status, ",%d",
                                  CHANNEL(ptr_win->buffer)->limit);
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS_DELIMITERS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS_DELIMITERS);
                     wprintw (ptr_win->win_status, ")");
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS);
                 }
                 
                 /* display DCC if private is DCC CHAT */
                 if ((CHANNEL(ptr_win->buffer)->type == CHAT_PRIVATE)
                     && (CHANNEL(ptr_win->buffer)->dcc_chat))
                 {
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS_DELIMITERS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS_DELIMITERS);
                     wprintw (ptr_win->win_status, "(");
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS_CHANNEL);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS_CHANNEL);
                     wprintw (ptr_win->win_status, "DCC");
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS_DELIMITERS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS_DELIMITERS);
                     wprintw (ptr_win->win_status, ")");
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS);
                 }
             }
             wprintw (ptr_win->win_status, " ");
         }
         if (!SERVER(ptr_win->buffer))
         {
-            gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (ptr_win->win_status, COLOR_WIN_STATUS);
             wprintw (ptr_win->win_status, "%d",
                      ptr_win->buffer->number);
-            gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status, COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, ":");
-            gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS_CHANNEL);
+            gui_window_set_weechat_color (ptr_win->win_status, COLOR_WIN_STATUS_CHANNEL);
             if (ptr_win->buffer->dcc)
                 wprintw (ptr_win->win_status, "<DCC> ");
             else
@@ -1414,10 +1985,10 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
         /* display list of other active windows (if any) with numbers */
         if (hotlist)
         {
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, "[");
-            gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (ptr_win->win_status, COLOR_WIN_STATUS);
             wprintw (ptr_win->win_status, _("Act: "));
             
             names_count = 0;
@@ -1427,23 +1998,23 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
                 switch (ptr_hotlist->priority)
                 {
                     case HOTLIST_LOW:
-                        gui_window_set_color (ptr_win->win_status,
-                                              COLOR_WIN_STATUS_DATA_OTHER);
+                        gui_window_set_weechat_color (ptr_win->win_status,
+                                                      COLOR_WIN_STATUS_DATA_OTHER);
                         display_name = ((cfg_look_hotlist_names_level & 1) != 0);
                         break;
                     case HOTLIST_MSG:
-                        gui_window_set_color (ptr_win->win_status,
-                                              COLOR_WIN_STATUS_DATA_MSG);
+                        gui_window_set_weechat_color (ptr_win->win_status,
+                                                      COLOR_WIN_STATUS_DATA_MSG);
                         display_name = ((cfg_look_hotlist_names_level & 2) != 0);
                         break;
                     case HOTLIST_PRIVATE:
-                        gui_window_set_color (ptr_win->win_status,
-                                              COLOR_WIN_STATUS_DATA_PRIVATE);
+                        gui_window_set_weechat_color (ptr_win->win_status,
+                                                      COLOR_WIN_STATUS_DATA_PRIVATE);
                         display_name = ((cfg_look_hotlist_names_level & 4) != 0);
                         break;
                     case HOTLIST_HIGHLIGHT:
-                        gui_window_set_color (ptr_win->win_status,
-                                              COLOR_WIN_STATUS_DATA_HIGHLIGHT);
+                        gui_window_set_weechat_color (ptr_win->win_status,
+                                                      COLOR_WIN_STATUS_DATA_HIGHLIGHT);
                         display_name = ((cfg_look_hotlist_names_level & 8) != 0);
                         break;
                     default:
@@ -1454,11 +2025,11 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
                 {
                     wprintw (ptr_win->win_status, "%d",
                              ptr_hotlist->buffer->number);
-                    gui_window_set_color (ptr_win->win_status,
-                                              COLOR_WIN_STATUS_DELIMITERS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS_DELIMITERS);
                     wprintw (ptr_win->win_status, ":");
-                    gui_window_set_color (ptr_win->win_status,
-                                          COLOR_WIN_STATUS);
+                    gui_window_set_weechat_color (ptr_win->win_status,
+                                                  COLOR_WIN_STATUS);
                     wprintw (ptr_win->win_status, "DCC");
                 }
                 else
@@ -1471,12 +2042,12 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
                     {
                         names_count++;
                         
-                        gui_window_set_color (ptr_win->win_status,
-                                              COLOR_WIN_STATUS_DELIMITERS);
+                        gui_window_set_weechat_color (ptr_win->win_status,
+                                                      COLOR_WIN_STATUS_DELIMITERS);
                         wprintw (ptr_win->win_status, ":");
                         
-                        gui_window_set_color (ptr_win->win_status,
-                                              COLOR_WIN_STATUS);
+                        gui_window_set_weechat_color (ptr_win->win_status,
+                                                      COLOR_WIN_STATUS);
                         if (cfg_look_hotlist_names_length == 0)
                             snprintf (format, sizeof (format) - 1, "%%s");
                         else
@@ -1492,8 +2063,8 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
                 if (ptr_hotlist->next_hotlist)
                     wprintw (ptr_win->win_status, ",");
             }
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, "] ");
         }
         
@@ -1502,20 +2073,20 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
         {
             if (SERVER(ptr_win->buffer)->lag / 1000 >= cfg_irc_lag_min_show)
             {
-                gui_window_set_color (ptr_win->win_status,
-                                      COLOR_WIN_STATUS_DELIMITERS);
+                gui_window_set_weechat_color (ptr_win->win_status,
+                                              COLOR_WIN_STATUS_DELIMITERS);
                 wprintw (ptr_win->win_status, "[");
-                gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS);
+                gui_window_set_weechat_color (ptr_win->win_status, COLOR_WIN_STATUS);
                 wprintw (ptr_win->win_status, _("Lag: %.1f"),
                          ((float)(SERVER(ptr_win->buffer)->lag)) / 1000);
-                gui_window_set_color (ptr_win->win_status,
-                                      COLOR_WIN_STATUS_DELIMITERS);
+                gui_window_set_weechat_color (ptr_win->win_status,
+                                              COLOR_WIN_STATUS_DELIMITERS);
                 wprintw (ptr_win->win_status, "]");
             }
         }
         
         /* display "-MORE-" (if last line is not displayed) & nicks count */
-        if (gui_buffer_has_nicklist (ptr_win->buffer))
+        if (BUFFER_HAS_NICKLIST(ptr_win->buffer))
         {
             snprintf (str_nicks, sizeof (str_nicks) - 1, "%d", CHANNEL(ptr_win->buffer)->nicks_count);
             x = ptr_win->win_width - strlen (str_nicks) - 4;
@@ -1526,7 +2097,7 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
         x -= strlen (more) - 1;
         if (x < 0)
             x = 0;
-        gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS_MORE);
+        gui_window_set_weechat_color (ptr_win->win_status, COLOR_WIN_STATUS_MORE);
         if (ptr_win->start_line)
             mvwprintw (ptr_win->win_status, 0, x, "%s", more);
         else
@@ -1534,15 +2105,15 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
             snprintf (format, sizeof (format) - 1, "%%-%ds", (int)(strlen (more)));
             mvwprintw (ptr_win->win_status, 0, x, format, " ");
         }
-        if (gui_buffer_has_nicklist (ptr_win->buffer))
+        if (BUFFER_HAS_NICKLIST(ptr_win->buffer))
         {
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, " [");
-            gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (ptr_win->win_status, COLOR_WIN_STATUS);
             wprintw (ptr_win->win_status, "%s", str_nicks);
-            gui_window_set_color (ptr_win->win_status,
-                                  COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_status,
+                                          COLOR_WIN_STATUS_DELIMITERS);
             wprintw (ptr_win->win_status, "]");
         }
         free (more);
@@ -1575,7 +2146,7 @@ gui_draw_buffer_infobar_time (t_gui_buffer *buffer)
         local_time = localtime (&time_seconds);
         if (local_time)
         {
-            gui_window_set_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
+            gui_window_set_weechat_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
             mvwprintw (ptr_win->win_infobar,
                        0, 1,
                        "%02d:%02d",
@@ -1609,24 +2180,19 @@ gui_draw_buffer_infobar (t_gui_buffer *buffer, int erase)
     
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
     {
-        if (has_colors ())
-            wbkgdset(ptr_win->win_infobar, ' ' | COLOR_PAIR (COLOR_WIN_INFOBAR));
-        
         if (erase)
-            gui_curses_window_clear (ptr_win->win_infobar);
-
-        gui_window_set_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
-        /* wborder (ptr_win->win_infobar, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '); */
-        wmove (ptr_win->win_infobar, 0, 0);
+            gui_curses_window_clear (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
+        
+        gui_window_set_weechat_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
         
         time_seconds = time (NULL);
         local_time = localtime (&time_seconds);
         if (local_time)
         {
             strftime (text_time, 1024, cfg_look_infobar_timestamp, local_time);
-            gui_window_set_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR_DELIMITERS);
             wprintw (ptr_win->win_infobar, "[");
-            gui_window_set_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
+            gui_window_set_weechat_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
             wprintw (ptr_win->win_infobar,
                      "%02d:%02d",
                      local_time->tm_hour, local_time->tm_min);
@@ -1634,17 +2200,17 @@ gui_draw_buffer_infobar (t_gui_buffer *buffer, int erase)
                 wprintw (ptr_win->win_infobar,
                          ":%02d",
                          local_time->tm_sec);
-            gui_window_set_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR_DELIMITERS);
             wprintw (ptr_win->win_infobar, "]");
-            gui_window_set_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
+            gui_window_set_weechat_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR);
             wprintw (ptr_win->win_infobar,
                      " %s", text_time);
         }
         if (gui_infobar)
         {
-            gui_window_set_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR_DELIMITERS);
+            gui_window_set_weechat_color (ptr_win->win_infobar, COLOR_WIN_INFOBAR_DELIMITERS);
             wprintw (ptr_win->win_infobar, " | ");
-            gui_window_set_color (ptr_win->win_infobar, gui_infobar->color);
+            gui_window_set_weechat_color (ptr_win->win_infobar, gui_infobar->color);
             wprintw (ptr_win->win_infobar, "%s", gui_infobar->text);
         }
         
@@ -1662,13 +2228,13 @@ gui_get_input_width (t_gui_window *window)
 {
     if (CHANNEL(window->buffer))
         return (window->win_width - strlen (CHANNEL(window->buffer)->name) -
-                strlen (SERVER(window->buffer)->nick) - 3);
+                strlen (SERVER(window->buffer)->nick) - 4);
     else
     {
         if (SERVER(window->buffer) && (SERVER(window->buffer)->is_connected))
-            return (window->win_width - strlen (SERVER(window->buffer)->nick) - 2);
+            return (window->win_width - strlen (SERVER(window->buffer)->nick) - 3);
         else
-            return (window->win_width - strlen (cfg_look_no_nickname) - 2);
+            return (window->win_width - strlen (cfg_look_no_nickname) - 3);
     }
 }
 
@@ -1693,14 +2259,7 @@ gui_draw_buffer_input (t_gui_buffer *buffer, int erase)
         if (ptr_win->buffer == buffer)
         {
             if (erase)
-                gui_curses_window_clear (ptr_win->win_input);
-    
-            if (has_colors ())
-            {
-                gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT);
-                wborder (ptr_win->win_input, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ');
-                wnoutrefresh (ptr_win->win_input);
-            }
+                gui_curses_window_clear (ptr_win->win_input, COLOR_WIN_INPUT);
             
             if (buffer->dcc)
             {
@@ -1764,13 +2323,15 @@ gui_draw_buffer_input (t_gui_buffer *buffer, int erase)
                 }
                 if (CHANNEL(buffer))
                 {
-                    gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_CHANNEL);
-                    mvwprintw (ptr_win->win_input, 0, 0, "%s ", CHANNEL(buffer)->name);
-                    gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_NICK);
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT_DELIMITERS);
+                    mvwprintw (ptr_win->win_input, 0, 0, "[");
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT_CHANNEL);
+                    wprintw (ptr_win->win_input, "%s ", CHANNEL(buffer)->name);
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT_NICK);
                     wprintw (ptr_win->win_input, "%s", SERVER(buffer)->nick);
-                    gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_DELIMITERS);
-                    wprintw (ptr_win->win_input, "> ");
-                    gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT);
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT_DELIMITERS);
+                    wprintw (ptr_win->win_input, "] ");
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT);
                     snprintf (format, 32, "%%-%ds", input_width);
                     if (ptr_win == gui_current_window)
                         wprintw (ptr_win->win_input, format,
@@ -1781,7 +2342,7 @@ gui_draw_buffer_input (t_gui_buffer *buffer, int erase)
                                  "");
                     wclrtoeol (ptr_win->win_input);
                     ptr_win->win_input_x = utf8_strlen (CHANNEL(buffer)->name) +
-                        utf8_strlen (SERVER(buffer)->nick) + 3 +
+                        utf8_strlen (SERVER(buffer)->nick) + 4 +
                         (buffer->input_buffer_pos - buffer->input_buffer_1st_display);
                     if (ptr_win == gui_current_window)
                         move (ptr_win->win_y + ptr_win->win_height - 1,
@@ -1789,15 +2350,17 @@ gui_draw_buffer_input (t_gui_buffer *buffer, int erase)
                 }
                 else
                 {
-                    gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_NICK);
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT_DELIMITERS);
+                    mvwprintw (ptr_win->win_input, 0, 0, "[");
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT_NICK);
                     if (SERVER(buffer) && (SERVER(buffer)->is_connected))
                         ptr_nickname = SERVER(buffer)->nick;
                     else
                         ptr_nickname = cfg_look_no_nickname;
-                    mvwprintw (ptr_win->win_input, 0, 0, "%s", ptr_nickname);
-                    gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_DELIMITERS);
-                    wprintw (ptr_win->win_input, "> ");
-                    gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT);
+                    wprintw (ptr_win->win_input, "%s", ptr_nickname);
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT_DELIMITERS);
+                    wprintw (ptr_win->win_input, "] ");
+                    gui_window_set_weechat_color (ptr_win->win_input, COLOR_WIN_INPUT);
                     snprintf (format, 32, "%%-%ds", input_width);
                     if (ptr_win == gui_current_window)
                         wprintw (ptr_win->win_input, format,
@@ -1807,7 +2370,7 @@ gui_draw_buffer_input (t_gui_buffer *buffer, int erase)
                         wprintw (ptr_win->win_input, format,
                                  "");
                     wclrtoeol (ptr_win->win_input);
-                    ptr_win->win_input_x = utf8_strlen (ptr_nickname) + 2 +
+                    ptr_win->win_input_x = utf8_strlen (ptr_nickname) + 3 +
                         (buffer->input_buffer_pos - buffer->input_buffer_1st_display);
                     if (ptr_win == gui_current_window)
                         move (ptr_win->win_y + ptr_win->win_height - 1,
@@ -1932,11 +2495,17 @@ gui_switch_to_buffer (t_gui_window *window, t_gui_buffer *buffer)
     /* create status/infobar windows */
     if (cfg_look_infobar)
     {
-        window->win_infobar = newwin (1, window->win_width, window->win_y + window->win_height - 2, window->win_x);
-        window->win_status = newwin (1, window->win_width, window->win_y + window->win_height - 3, window->win_x);
+        window->win_infobar = newwin (1, window->win_width,
+                                      window->win_y + window->win_height - 2,
+                                      window->win_x);
+        window->win_status = newwin (1, window->win_width,
+                                     window->win_y + window->win_height - 3,
+                                     window->win_x);
     }
     else
-        window->win_status = newwin (1, window->win_width, window->win_y + window->win_height - 2, window->win_x);
+        window->win_status = newwin (1, window->win_width,
+                                     window->win_y + window->win_height - 2,
+                                     window->win_x);
     
     window->start_line = NULL;
     window->start_line_pos = 0;
@@ -2035,7 +2604,7 @@ gui_window_nick_beginning (t_gui_window *window)
     if (!gui_ok)
         return;
     
-    if (gui_buffer_has_nicklist (window->buffer))
+    if (BUFFER_HAS_NICKLIST(window->buffer))
     {
         if (window->win_nick_start > 0)
         {
@@ -2057,7 +2626,7 @@ gui_window_nick_end (t_gui_window *window)
     if (!gui_ok)
         return;
     
-    if (gui_buffer_has_nicklist (window->buffer))
+    if (BUFFER_HAS_NICKLIST(window->buffer))
     {
         new_start =
             CHANNEL(window->buffer)->nicks_count - window->win_nick_height;
@@ -2084,7 +2653,7 @@ gui_window_nick_page_up (t_gui_window *window)
     if (!gui_ok)
         return;
     
-    if (gui_buffer_has_nicklist (window->buffer))
+    if (BUFFER_HAS_NICKLIST(window->buffer))
     {
         if (window->win_nick_start > 0)
         {
@@ -2106,7 +2675,7 @@ gui_window_nick_page_down (t_gui_window *window)
     if (!gui_ok)
         return;
     
-    if (gui_buffer_has_nicklist (window->buffer))
+    if (BUFFER_HAS_NICKLIST(window->buffer))
     {
         if ((CHANNEL(window->buffer)->nicks_count > window->win_nick_height)
             && (window->win_nick_start + window->win_nick_height - 1
@@ -2421,6 +2990,7 @@ gui_refresh_screen ()
     }
     
     gui_current_window = old_current_window;
+    gui_switch_to_buffer (gui_current_window, gui_current_window->buffer);
     gui_redraw_buffer (gui_current_window->buffer);
 }
 
@@ -2436,6 +3006,93 @@ gui_pre_init (int *argc, char **argv[])
     (void) argv;
 }
 
+/*
+ * gui_init_weechat_colors: init WeeChat colors
+ */
+
+void
+gui_init_weechat_colors ()
+{
+    int i;
+    
+    /* init WeeChat colors */
+    gui_color[COLOR_WIN_TITLE] = gui_color_build (COLOR_WIN_TITLE, cfg_col_title, cfg_col_title_bg);
+    gui_color[COLOR_WIN_CHAT] = gui_color_build (COLOR_WIN_CHAT, cfg_col_chat, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_TIME] = gui_color_build (COLOR_WIN_CHAT_TIME, cfg_col_chat_time, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_TIME_SEP] = gui_color_build (COLOR_WIN_CHAT_TIME_SEP, cfg_col_chat_time_sep, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_PREFIX1] = gui_color_build (COLOR_WIN_CHAT_PREFIX1, cfg_col_chat_prefix1, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_PREFIX2] = gui_color_build (COLOR_WIN_CHAT_PREFIX2, cfg_col_chat_prefix2, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_SERVER] = gui_color_build (COLOR_WIN_CHAT_SERVER, cfg_col_chat_server, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_JOIN] = gui_color_build (COLOR_WIN_CHAT_JOIN, cfg_col_chat_join, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_PART] = gui_color_build (COLOR_WIN_CHAT_PART, cfg_col_chat_part, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_NICK] = gui_color_build (COLOR_WIN_CHAT_NICK, cfg_col_chat_nick, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_HOST] = gui_color_build (COLOR_WIN_CHAT_HOST, cfg_col_chat_host, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_CHANNEL] = gui_color_build (COLOR_WIN_CHAT_CHANNEL, cfg_col_chat_channel, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_DARK] = gui_color_build (COLOR_WIN_CHAT_DARK, cfg_col_chat_dark, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_CHAT_HIGHLIGHT] = gui_color_build (COLOR_WIN_CHAT_HIGHLIGHT, cfg_col_chat_highlight, cfg_col_chat_bg);
+    gui_color[COLOR_WIN_STATUS] = gui_color_build (COLOR_WIN_STATUS, cfg_col_status, cfg_col_status_bg);
+    gui_color[COLOR_WIN_STATUS_DELIMITERS] = gui_color_build (COLOR_WIN_STATUS_DELIMITERS, cfg_col_status_delimiters, cfg_col_status_bg);
+    gui_color[COLOR_WIN_STATUS_CHANNEL] = gui_color_build (COLOR_WIN_STATUS_CHANNEL, cfg_col_status_channel, cfg_col_status_bg);
+    gui_color[COLOR_WIN_STATUS_DATA_MSG] = gui_color_build (COLOR_WIN_STATUS_DATA_MSG, cfg_col_status_data_msg, cfg_col_status_bg);
+    gui_color[COLOR_WIN_STATUS_DATA_PRIVATE] = gui_color_build (COLOR_WIN_STATUS_DATA_PRIVATE, cfg_col_status_data_private, cfg_col_status_bg);
+    gui_color[COLOR_WIN_STATUS_DATA_HIGHLIGHT] = gui_color_build (COLOR_WIN_STATUS_DATA_HIGHLIGHT, cfg_col_status_data_highlight, cfg_col_status_bg);
+    gui_color[COLOR_WIN_STATUS_DATA_OTHER] = gui_color_build (COLOR_WIN_STATUS_DATA_OTHER, cfg_col_status_data_other, cfg_col_status_bg);
+    gui_color[COLOR_WIN_STATUS_MORE] = gui_color_build (COLOR_WIN_STATUS_MORE, cfg_col_status_more, cfg_col_status_bg);
+    gui_color[COLOR_WIN_INFOBAR] = gui_color_build (COLOR_WIN_INFOBAR, cfg_col_infobar, cfg_col_infobar_bg);
+    gui_color[COLOR_WIN_INFOBAR_DELIMITERS] = gui_color_build (COLOR_WIN_INFOBAR_DELIMITERS, cfg_col_infobar_delimiters, cfg_col_infobar_bg);
+    gui_color[COLOR_WIN_INFOBAR_HIGHLIGHT] = gui_color_build (COLOR_WIN_INFOBAR_HIGHLIGHT, cfg_col_infobar_highlight, cfg_col_infobar_bg);
+    gui_color[COLOR_WIN_INPUT] = gui_color_build (COLOR_WIN_INPUT, cfg_col_input, cfg_col_input_bg);
+    gui_color[COLOR_WIN_INPUT_CHANNEL] = gui_color_build (COLOR_WIN_INPUT_CHANNEL, cfg_col_input_channel, cfg_col_input_bg);
+    gui_color[COLOR_WIN_INPUT_NICK] = gui_color_build (COLOR_WIN_INPUT_NICK, cfg_col_input_nick, cfg_col_input_bg);
+    gui_color[COLOR_WIN_INPUT_DELIMITERS] = gui_color_build (COLOR_WIN_INPUT_DELIMITERS, cfg_col_input_delimiters, cfg_col_input_bg);
+    gui_color[COLOR_WIN_NICK] = gui_color_build (COLOR_WIN_NICK, cfg_col_nick, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_AWAY] = gui_color_build (COLOR_WIN_NICK_AWAY, cfg_col_nick_away, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_CHANOWNER] = gui_color_build (COLOR_WIN_NICK_CHANOWNER, cfg_col_nick_chanowner, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_CHANADMIN] = gui_color_build (COLOR_WIN_NICK_CHANADMIN, cfg_col_nick_chanadmin, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_OP] = gui_color_build (COLOR_WIN_NICK_OP, cfg_col_nick_op, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_HALFOP] = gui_color_build (COLOR_WIN_NICK_HALFOP, cfg_col_nick_halfop, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_VOICE] = gui_color_build (COLOR_WIN_NICK_VOICE, cfg_col_nick_voice, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_MORE] = gui_color_build (COLOR_WIN_NICK_MORE, cfg_col_nick_more, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_SEP] = gui_color_build (COLOR_WIN_NICK_SEP, cfg_col_nick_sep, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_SELF] = gui_color_build (COLOR_WIN_NICK_SELF, cfg_col_nick_self, cfg_col_nick_bg);
+    gui_color[COLOR_WIN_NICK_PRIVATE] = gui_color_build (COLOR_WIN_NICK_PRIVATE, cfg_col_nick_private, cfg_col_nick_bg);
+
+    for (i = 0; i < COLOR_WIN_NICK_NUMBER; i++)
+    {
+        gui_color[COLOR_WIN_NICK_1 + i] = gui_color_build (COLOR_WIN_NICK_1 + i, cfg_col_nick_colors[i], cfg_col_chat_bg);
+    }
+        
+    gui_color[COLOR_DCC_SELECTED] = gui_color_build (COLOR_DCC_SELECTED, cfg_col_dcc_selected, cfg_col_chat_bg);
+    gui_color[COLOR_DCC_WAITING] = gui_color_build (COLOR_DCC_WAITING, cfg_col_dcc_waiting, cfg_col_chat_bg);
+    gui_color[COLOR_DCC_CONNECTING] = gui_color_build (COLOR_DCC_CONNECTING, cfg_col_dcc_connecting, cfg_col_chat_bg);
+    gui_color[COLOR_DCC_ACTIVE] = gui_color_build (COLOR_DCC_ACTIVE, cfg_col_dcc_active, cfg_col_chat_bg);
+    gui_color[COLOR_DCC_DONE] = gui_color_build (COLOR_DCC_DONE, cfg_col_dcc_done, cfg_col_chat_bg);
+    gui_color[COLOR_DCC_FAILED] = gui_color_build (COLOR_DCC_FAILED, cfg_col_dcc_failed, cfg_col_chat_bg);
+    gui_color[COLOR_DCC_ABORTED] = gui_color_build (COLOR_DCC_ABORTED, cfg_col_dcc_aborted, cfg_col_chat_bg);
+}
+
+/*
+ * gui_rebuild_weechat_colors: rebuild WeeChat colors
+ */
+
+void
+gui_rebuild_weechat_colors ()
+{
+    int i;
+    
+    for (i = 0; i < NUM_COLORS; i++)
+    {
+        if (gui_color[i])
+        {
+            if (gui_color[i]->string)
+                free (gui_color[i]->string);
+            free (gui_color[i]);
+            gui_color[i] = NULL;
+        }
+    }
+    gui_init_weechat_colors ();
+}
+
 /*
  * gui_init_colors: init GUI colors
  */
@@ -2444,162 +3101,23 @@ void
 gui_init_colors ()
 {
     int i;
+    char shift_colors[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
     
     if (has_colors ())
     {
         start_color ();
         use_default_colors ();
         
-        init_pair (COLOR_WIN_TITLE,
-            cfg_col_title, cfg_col_title_bg);
-        init_pair (COLOR_WIN_CHAT,
-            cfg_col_chat, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_TIME,
-            cfg_col_chat_time, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_TIME_SEP,
-            cfg_col_chat_time_sep, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_PREFIX1,
-            cfg_col_chat_prefix1, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_PREFIX2,
-            cfg_col_chat_prefix2, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_SERVER,
-            cfg_col_chat_server, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_JOIN,
-            cfg_col_chat_join, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_PART,
-            cfg_col_chat_part, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_NICK,
-            cfg_col_chat_nick, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_HOST,
-            cfg_col_chat_host, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_CHANNEL,
-            cfg_col_chat_channel, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_DARK,
-            cfg_col_chat_dark, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_CHAT_HIGHLIGHT,
-            cfg_col_chat_highlight, cfg_col_chat_bg);
-        init_pair (COLOR_WIN_STATUS,
-            cfg_col_status, cfg_col_status_bg);
-        init_pair (COLOR_WIN_STATUS_DELIMITERS,
-            cfg_col_status_delimiters, cfg_col_status_bg);
-        init_pair (COLOR_WIN_STATUS_CHANNEL,
-            cfg_col_status_channel, cfg_col_status_bg);
-        init_pair (COLOR_WIN_STATUS_DATA_MSG,
-            cfg_col_status_data_msg, cfg_col_status_bg);
-        init_pair (COLOR_WIN_STATUS_DATA_PRIVATE,
-            cfg_col_status_data_private, cfg_col_status_bg);
-        init_pair (COLOR_WIN_STATUS_DATA_HIGHLIGHT,
-            cfg_col_status_data_highlight, cfg_col_status_bg);
-        init_pair (COLOR_WIN_STATUS_DATA_OTHER,
-            cfg_col_status_data_other, cfg_col_status_bg);
-        init_pair (COLOR_WIN_STATUS_MORE,
-            cfg_col_status_more, cfg_col_status_bg);
-        init_pair (COLOR_WIN_INFOBAR,
-            cfg_col_infobar, cfg_col_infobar_bg);
-        init_pair (COLOR_WIN_INFOBAR_DELIMITERS,
-            cfg_col_infobar_delimiters, cfg_col_infobar_bg);
-        init_pair (COLOR_WIN_INFOBAR_HIGHLIGHT,
-            cfg_col_infobar_highlight, cfg_col_infobar_bg);
-        init_pair (COLOR_WIN_INPUT,
-            cfg_col_input, cfg_col_input_bg);
-        init_pair (COLOR_WIN_INPUT_CHANNEL,
-            cfg_col_input_channel, cfg_col_input_bg);
-        init_pair (COLOR_WIN_INPUT_NICK,
-            cfg_col_input_nick, cfg_col_input_bg);
-        init_pair (COLOR_WIN_INPUT_DELIMITERS,
-            cfg_col_input_delimiters, cfg_col_input_bg);
-        init_pair (COLOR_WIN_NICK,
-            cfg_col_nick, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_AWAY,
-            cfg_col_nick_away, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_CHANOWNER,
-            cfg_col_nick_chanowner, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_CHANADMIN,
-            cfg_col_nick_chanadmin, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_OP,
-            cfg_col_nick_op, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_HALFOP,
-            cfg_col_nick_halfop, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_VOICE,
-            cfg_col_nick_voice, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_MORE,
-            cfg_col_nick_more, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_SEP,
-            cfg_col_nick_sep, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_SELF,
-            cfg_col_nick_self, cfg_col_nick_bg);
-        init_pair (COLOR_WIN_NICK_PRIVATE,
-            cfg_col_nick_private, cfg_col_nick_bg);
+        for (i = 1; i < COLOR_PAIRS; i++)
+            init_pair (i, shift_colors[i % 8], (i < 8) ? -1 : shift_colors[i / 8]);
         
-        for (i = 0; i < COLOR_WIN_NICK_NUMBER; i++)
-        {
-            init_pair (COLOR_WIN_NICK_FIRST + i, cfg_col_nick_colors[i], cfg_col_chat_bg);
-            color_attr[COLOR_WIN_NICK_FIRST + i - 1] = (cfg_col_nick_colors[i] >= 0) ? cfg_col_nick_colors[i] & A_BOLD : 0;
-        }
+        /* disable white on white, replaced by black on white */
+        init_pair (63, -1, -1);
         
-        init_pair (COLOR_DCC_SELECTED,
-            cfg_col_dcc_selected, cfg_col_chat_bg);
-        init_pair (COLOR_DCC_WAITING,
-            cfg_col_dcc_waiting, cfg_col_chat_bg);
-        init_pair (COLOR_DCC_CONNECTING,
-            cfg_col_dcc_connecting, cfg_col_chat_bg);
-        init_pair (COLOR_DCC_ACTIVE,
-            cfg_col_dcc_active, cfg_col_chat_bg);
-        init_pair (COLOR_DCC_DONE,
-            cfg_col_dcc_done, cfg_col_chat_bg);
-        init_pair (COLOR_DCC_FAILED,
-            cfg_col_dcc_failed, cfg_col_chat_bg);
-        init_pair (COLOR_DCC_ABORTED,
-            cfg_col_dcc_aborted, cfg_col_chat_bg);
-            
-        color_attr[COLOR_WIN_TITLE - 1] = (cfg_col_title >= 0) ? cfg_col_title & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT - 1] = (cfg_col_chat >= 0) ? cfg_col_chat & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_TIME - 1] = (cfg_col_chat_time >= 0) ? cfg_col_chat_time & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_TIME_SEP - 1] = (cfg_col_chat_time_sep >= 0) ? cfg_col_chat_time_sep & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_DARK - 1] = (cfg_col_chat_dark >= 0) ? cfg_col_chat_dark & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_PREFIX1 - 1] = (cfg_col_chat_prefix1 >= 0) ? cfg_col_chat_prefix1 & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_PREFIX2 - 1] = (cfg_col_chat_prefix2 >= 0) ? cfg_col_chat_prefix2 & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_SERVER - 1] = (cfg_col_chat_server >= 0) ? cfg_col_chat_server & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_JOIN - 1] = (cfg_col_chat_join >= 0) ? cfg_col_chat_join & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_PART - 1] = (cfg_col_chat_part >= 0) ? cfg_col_chat_part & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_NICK - 1] = (cfg_col_chat_nick >= 0) ? cfg_col_chat_nick & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_HOST - 1] = (cfg_col_chat_host >= 0) ? cfg_col_chat_host & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_CHANNEL - 1] = (cfg_col_chat_channel >= 0) ? cfg_col_chat_channel & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_DARK - 1] = (cfg_col_chat_dark >= 0) ? cfg_col_chat_dark & A_BOLD : 0;
-        color_attr[COLOR_WIN_CHAT_HIGHLIGHT - 1] = (cfg_col_chat_highlight >= 0) ? cfg_col_chat_highlight & A_BOLD : 0;
-        color_attr[COLOR_WIN_STATUS - 1] = (cfg_col_status >= 0) ? cfg_col_status & A_BOLD : 0;
-        color_attr[COLOR_WIN_STATUS_DELIMITERS - 1] = (cfg_col_status_delimiters >= 0) ? cfg_col_status_delimiters & A_BOLD : 0;
-        color_attr[COLOR_WIN_STATUS_CHANNEL - 1] = (cfg_col_status_channel >= 0) ? cfg_col_status_channel & A_BOLD : 0;
-        color_attr[COLOR_WIN_STATUS_DATA_MSG - 1] = (cfg_col_status_data_msg >= 0) ? cfg_col_status_data_msg & A_BOLD : 0;
-        color_attr[COLOR_WIN_STATUS_DATA_PRIVATE - 1] = (cfg_col_status_data_private >= 0) ? cfg_col_status_data_private & A_BOLD : 0;
-        color_attr[COLOR_WIN_STATUS_DATA_HIGHLIGHT - 1] = (cfg_col_status_data_highlight >= 0) ? cfg_col_status_data_highlight & A_BOLD : 0;
-        color_attr[COLOR_WIN_STATUS_DATA_OTHER - 1] = (cfg_col_status_data_other >= 0) ? cfg_col_status_data_other & A_BOLD : 0;
-        color_attr[COLOR_WIN_STATUS_MORE - 1] = (cfg_col_status_more >= 0) ? cfg_col_status_more & A_BOLD : 0;
-        color_attr[COLOR_WIN_INFOBAR - 1] = (cfg_col_infobar >= 0) ? cfg_col_infobar & A_BOLD : 0;
-        color_attr[COLOR_WIN_INFOBAR_DELIMITERS - 1] = (cfg_col_infobar_delimiters >= 0) ? cfg_col_infobar_delimiters & A_BOLD : 0;
-        color_attr[COLOR_WIN_INFOBAR_HIGHLIGHT - 1] = (cfg_col_infobar_highlight >= 0) ? cfg_col_infobar_highlight & A_BOLD : 0;
-        color_attr[COLOR_WIN_INPUT - 1] = (cfg_col_input >= 0) ? cfg_col_input & A_BOLD : 0;
-        color_attr[COLOR_WIN_INPUT_CHANNEL - 1] = (cfg_col_input_channel >= 0) ? cfg_col_input_channel & A_BOLD : 0;
-        color_attr[COLOR_WIN_INPUT_NICK - 1] = (cfg_col_input_nick >= 0) ? cfg_col_input_nick & A_BOLD : 0;
-        color_attr[COLOR_WIN_INPUT_DELIMITERS - 1] = (cfg_col_input_delimiters >= 0) ? cfg_col_input_delimiters & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK - 1] = (cfg_col_nick >= 0) ? cfg_col_nick & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_AWAY - 1] = (cfg_col_nick_away >= 0) ? cfg_col_nick_away & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_CHANOWNER - 1] = (cfg_col_nick_chanowner >= 0) ? cfg_col_nick_chanowner & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_CHANADMIN - 1] = (cfg_col_nick_chanadmin >= 0) ? cfg_col_nick_chanadmin & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_OP - 1] = (cfg_col_nick_op >= 0) ? cfg_col_nick_op & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_HALFOP - 1] = (cfg_col_nick_halfop >= 0) ? cfg_col_nick_halfop & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_VOICE - 1] = (cfg_col_nick_voice >= 0) ? cfg_col_nick_voice & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_MORE - 1] = (cfg_col_nick_more >= 0) ? cfg_col_nick_more & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_SEP - 1] = 0;
-        color_attr[COLOR_WIN_NICK_SELF - 1] = (cfg_col_nick_self >= 0) ? cfg_col_nick_self & A_BOLD : 0;
-        color_attr[COLOR_WIN_NICK_PRIVATE - 1] = (cfg_col_nick_private >= 0) ? cfg_col_nick_private & A_BOLD : 0;
-        color_attr[COLOR_DCC_SELECTED - 1] = (cfg_col_dcc_selected >= 0) ? cfg_col_dcc_selected & A_BOLD : 0;
-        color_attr[COLOR_DCC_WAITING - 1] = (cfg_col_dcc_waiting >= 0) ? cfg_col_dcc_waiting & A_BOLD : 0;
-        color_attr[COLOR_DCC_CONNECTING - 1] = (cfg_col_dcc_connecting >= 0) ? cfg_col_dcc_connecting & A_BOLD : 0;
-        color_attr[COLOR_DCC_ACTIVE - 1] = (cfg_col_dcc_active >= 0) ? cfg_col_dcc_active & A_BOLD : 0;
-        color_attr[COLOR_DCC_DONE - 1] = (cfg_col_dcc_done >= 0) ? cfg_col_dcc_done & A_BOLD : 0;
-        color_attr[COLOR_DCC_FAILED - 1] = (cfg_col_dcc_failed >= 0) ? cfg_col_dcc_failed & A_BOLD : 0;
-        color_attr[COLOR_DCC_ABORTED - 1] = (cfg_col_dcc_aborted >= 0) ? cfg_col_dcc_aborted & A_BOLD : 0;
+        /* white on default bg is default (-1) */
+        init_pair (WEECHAT_COLOR_WHITE, -1, -1);
+        
+        gui_init_weechat_colors ();
     }
 }
 
@@ -2705,243 +3223,3 @@ gui_end ()
     refresh ();
     endwin ();
 }
-
-/*
- * gui_add_message: add a message to a buffer
- */
-
-void
-gui_add_message (t_gui_buffer *buffer, int type, int color, char *message)
-{
-    char *pos;
-    int length;
-    char *ptr_string;
-    
-    /* create new line if previous was ending by '\n' (or if 1st line) */
-    if (buffer->line_complete)
-    {
-        buffer->line_complete = 0;
-        if (!gui_new_line (buffer))
-            return;
-    }
-    if (!gui_new_message (buffer))
-        return;
-    
-    buffer->last_line->last_message->type = type;
-    buffer->last_line->last_message->color = color;
-    pos = strchr (message, '\n');
-    if (pos)
-    {
-        pos[0] = '\0';
-        buffer->line_complete = 1;
-    }
-    buffer->last_line->last_message->message = strdup (message);
-    ptr_string = buffer->last_line->last_message->message;
-    while (ptr_string[0])
-    {
-        if ((ptr_string[0] > 0) && (ptr_string[0] < 32))
-            ptr_string[0] = 32;
-        ptr_string++;
-    }
-    length = utf8_strlen (message);
-    buffer->last_line->length += length;
-    if (type & MSG_TYPE_MSG)
-        buffer->last_line->line_with_message = 1;
-    if (type & MSG_TYPE_HIGHLIGHT)
-        buffer->last_line->line_with_highlight = 1;
-    if ((type & MSG_TYPE_TIME) || (type & MSG_TYPE_NICK) || (type & MSG_TYPE_PREFIX))
-        buffer->last_line->length_align += length;
-    if (type & MSG_TYPE_NOLOG)
-        buffer->last_line->log_write = 0;
-    if (pos)
-    {
-        pos[0] = '\n';
-        if (buffer->num_displayed > 0)
-            gui_draw_buffer_chat (buffer, 0);
-        if (gui_add_hotlist && (buffer->num_displayed == 0))
-        {
-            if (3 - buffer->last_line->line_with_message -
-                buffer->last_line->line_with_highlight <=
-                buffer->notify_level)
-            {
-                if (buffer->last_line->line_with_highlight)
-                    hotlist_add (HOTLIST_HIGHLIGHT, buffer);
-                else if (BUFFER_IS_PRIVATE(buffer) && (buffer->last_line->line_with_message))
-                    hotlist_add (HOTLIST_PRIVATE, buffer);
-                else if (buffer->last_line->line_with_message)
-                    hotlist_add (HOTLIST_MSG, buffer);
-                else
-                    hotlist_add (HOTLIST_LOW, buffer);
-                gui_draw_buffer_status (gui_current_window->buffer, 1);
-            }
-        }
-    }
-    if (buffer->line_complete && buffer->log_file && buffer->last_line->log_write)
-        log_write_line (buffer, buffer->last_line);
-}
-
-/*
- * gui_printf_internal: display a message in a buffer
- *                      This function should NEVER be called directly.
- *                      You should use macros defined in gui.h
- */
-
-void
-gui_printf_internal (t_gui_buffer *buffer, int display_time, int type, int color, char *message, ...)
-{
-    static char buf[8192];
-    char text_time[1024];
-    char text_time_char[2];
-    time_t time_seconds;
-    struct tm *local_time;
-    int time_first_digit, time_last_digit;
-    char *pos, *buf2, *buf3;
-    int i, j;
-    va_list argptr;
-    static time_t seconds;
-    struct tm *date_tmp;
-    
-    if (gui_init_ok)
-    {
-        if (color == -1)
-            color = COLOR_WIN_CHAT;
-    
-        if (buffer == NULL)
-        {
-            type |= MSG_TYPE_NOLOG;
-            if (SERVER(gui_current_window->buffer))
-                buffer = SERVER(gui_current_window->buffer)->buffer;
-            else
-                buffer = gui_current_window->buffer;
-            
-            if (!buffer || buffer->dcc)
-                buffer = gui_buffers;
-        }
-    
-        if (buffer == NULL)
-        {
-            wee_log_printf ("WARNING: gui_printf_internal without buffer! This is a bug, "
-                            "please send to developers - thanks\n");
-            return;
-        }
-        
-        if (buffer->dcc)
-            buffer = gui_buffers;
-        
-        if (buffer->dcc)
-            return;
-    }
-    
-    va_start (argptr, message);
-    vsnprintf (buf, sizeof (buf) - 1, message, argptr);
-    va_end (argptr);
-    
-    if (!buf[0])
-        return;
-    
-    if (cfg_look_remove_colors_from_msgs)
-    {
-        buf2 = (char *) malloc (strlen (buf) + 2);
-        i = 0;
-        j = 0;
-        while (buf[i])
-        {
-            if (buf[i] == 0x02)
-                i++;
-            else
-            {
-                if (buf[i] == 0x03)
-                {
-                    if ((buf[i+1] >= '0') && (buf[i+1] <= '9')
-                    && (buf[i+2] >= '0') && (buf[i+2] <= '9'))
-                        i += 3;
-                    else
-                        i++;
-                }
-                else
-                    buf2[j++] = buf[i++];
-            }
-        }
-        buf2[j] = '\0';
-    }
-    else
-        buf2 = strdup (buf);
-    
-    if (!local_utf8 || !utf8_is_valid (buf2))
-        buf3 = weechat_convert_encoding ((local_utf8) ?
-                                         cfg_look_charset_decode_iso : cfg_look_charset_decode_utf,
-                                         (cfg_look_charset_internal && cfg_look_charset_internal[0]) ?
-                                         cfg_look_charset_internal : local_charset,
-                                         buf2);
-    else
-        buf3 = strdup (buf2);
-    
-    if (gui_init_ok)
-    {
-        seconds = time (NULL);
-        date_tmp = localtime (&seconds);
-        
-        pos = buf3 - 1;
-        while (pos)
-        {
-            if (display_time
-                && cfg_look_buffer_timestamp && cfg_look_buffer_timestamp[0]
-                && ((!buffer->last_line) || (buffer->line_complete)))
-            {
-                time_seconds = time (NULL);
-                local_time = localtime (&time_seconds);
-                strftime (text_time, sizeof (text_time), cfg_look_buffer_timestamp, local_time);
-                
-                time_first_digit = -1;
-                time_last_digit = -1;
-                i = 0;
-                while (text_time[i])
-                {
-                    if (isdigit (text_time[i]))
-                    {
-                        if (time_first_digit == -1)
-                            time_first_digit = i;
-                        time_last_digit = i;
-                    }
-                    i++;
-                }
-                
-                text_time_char[1] = '\0';
-                i = 0;
-                while (text_time[i])
-                {
-                    text_time_char[0] = text_time[i];
-                    if (time_first_digit < 0)
-                        gui_add_message (buffer, MSG_TYPE_TIME, COLOR_WIN_CHAT_TIME,
-                                         text_time_char);
-                    else
-                    {
-                        if ((i < time_first_digit) || (i > time_last_digit))
-                            gui_add_message (buffer, MSG_TYPE_TIME, COLOR_WIN_CHAT_DARK,
-                                             text_time_char);
-                        else
-                        {
-                            if (isdigit (text_time[i]))
-                                gui_add_message (buffer, MSG_TYPE_TIME, COLOR_WIN_CHAT_TIME,
-                                                 text_time_char);
-                            else
-                                gui_add_message (buffer, MSG_TYPE_TIME, COLOR_WIN_CHAT_TIME_SEP,
-                                                 text_time_char);
-                        }
-                    }
-                    i++;
-                }
-                gui_add_message (buffer, MSG_TYPE_TIME, COLOR_WIN_CHAT_DARK, " ");
-            }
-            gui_add_message (buffer, type, color, pos + 1);
-            pos = strchr (pos + 1, '\n');
-            if (pos && !pos[1])
-                pos = NULL;
-        }
-    }
-    else
-        printf ("%s", buf3);
-    
-    free (buf2);
-    free (buf3);
-}
diff --git a/weechat/src/gui/gui-common.c b/weechat/src/gui/gui-common.c
index 96066a30b..2f4c6163f 100644
--- a/weechat/src/gui/gui-common.c
+++ b/weechat/src/gui/gui-common.c
@@ -31,6 +31,7 @@
 #include <string.h>
 #include <signal.h>
 #include <time.h>
+#include <ctype.h>
 
 #include "../common/weechat.h"
 #include "gui.h"
@@ -302,19 +303,12 @@ gui_buffer_clear (t_gui_buffer *buffer)
 {
     t_gui_window *ptr_win;
     t_gui_line *ptr_line;
-    t_gui_message *ptr_message;
     
     while (buffer->lines)
     {
         ptr_line = buffer->lines->next_line;
-        while (buffer->lines->messages)
-        {
-            ptr_message = buffer->lines->messages->next_message;
-            if (buffer->lines->messages->message)
-                free (buffer->lines->messages->message);
-            free (buffer->lines->messages);
-            buffer->lines->messages = ptr_message;
-        }
+        if (buffer->lines->data)
+            free (buffer->lines->data);
         free (buffer->lines);
         buffer->lines = ptr_line;
     }
@@ -351,47 +345,6 @@ gui_buffer_clear_all ()
         gui_buffer_clear (ptr_buffer);
 }
 
-/* 
- * gui_infobar_printf: display message in infobar
- */
-
-void
-gui_infobar_printf (int time_displayed, int color, char *message, ...)
-{
-    static char buffer[1024];
-    va_list argptr;
-    t_gui_infobar *ptr_infobar;
-    char *pos, *buf2;
-    
-    va_start (argptr, message);
-    vsnprintf (buffer, sizeof (buffer) - 1, message, argptr);
-    va_end (argptr);
-    
-    buf2 = weechat_convert_encoding ((local_utf8) ?
-                                     cfg_look_charset_decode_iso : cfg_look_charset_decode_utf,
-                                     (cfg_look_charset_internal && cfg_look_charset_internal[0]) ?
-                                     cfg_look_charset_internal : local_charset,
-                                     buffer);
-    
-    ptr_infobar = (t_gui_infobar *)malloc (sizeof (t_gui_infobar));
-    if (ptr_infobar)
-    {
-        ptr_infobar->color = color;
-        ptr_infobar->text = strdup (buf2);
-        pos = strchr (ptr_infobar->text, '\n');
-        if (pos)
-            pos[0] = '\0';
-        ptr_infobar->remaining_time = (time_displayed <= 0) ? -1 : time_displayed;
-        ptr_infobar->next_infobar = gui_infobar;
-        gui_infobar = ptr_infobar;
-        gui_draw_buffer_infobar (gui_current_window->buffer, 1);
-    }
-    else
-        wee_log_printf (_("Not enough memory for infobar message\n"));
-    
-    free (buf2);
-}
-
 /*
  * gui_window_free: delete a window
  */
@@ -415,25 +368,6 @@ gui_window_free (t_gui_window *window)
     free (window);
 }
 
-/*
- * gui_infobar_remove: remove last displayed message in infobar
- */
-
-void
-gui_infobar_remove ()
-{
-    t_gui_infobar *new_infobar;
-    
-    if (gui_infobar)
-    {
-        new_infobar = gui_infobar->next_infobar;
-        if (gui_infobar->text)
-            free (gui_infobar->text);
-        free (gui_infobar);
-        gui_infobar = new_infobar;
-    }
-}
-
 /*
  * gui_line_free: delete a line from a buffer
  */
@@ -442,8 +376,7 @@ void
 gui_line_free (t_gui_line *line)
 {
     t_gui_window *ptr_win;
-    t_gui_message *ptr_message;
-
+    
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
     {
         if (ptr_win->start_line == line)
@@ -452,14 +385,8 @@ gui_line_free (t_gui_line *line)
             ptr_win->start_line_pos = 0;
         }
     }
-    while (line->messages)
-    {
-        ptr_message = line->messages->next_message;
-        if (line->messages->message)
-            free (line->messages->message);
-        free (line->messages);
-        line->messages = ptr_message;
-    }
+    if (line->data)
+        free (line->data);
     free (line);
 }
 
@@ -566,8 +493,7 @@ gui_new_line (t_gui_buffer *buffer)
         new_line->log_write = 1;
         new_line->line_with_message = 0;
         new_line->line_with_highlight = 0;
-        new_line->messages = NULL;
-        new_line->last_message = NULL;
+        new_line->data = NULL;
         if (!buffer->lines)
             buffer->lines = new_line;
         else
@@ -602,30 +528,345 @@ gui_new_line (t_gui_buffer *buffer)
 }
 
 /*
- * gui_new_message: create a new message for last line of a buffer
+ * gui_word_strlen: returns length of a word
+ *                  special chars like color, bold, .. are ignored
  */
 
-t_gui_message *
-gui_new_message (t_gui_buffer *buffer)
+int
+gui_word_strlen (t_gui_window *window, char *string)
 {
-    t_gui_message *new_message;
+    int length;
     
-    if ((new_message = (t_gui_message *) malloc (sizeof (struct t_gui_message))))
+    length = 0;
+    while (string && string[0])
     {
-        if (!buffer->last_line->messages)
-            buffer->last_line->messages = new_message;
-        else
-            buffer->last_line->last_message->next_message = new_message;
-        new_message->prev_message = buffer->last_line->last_message;
-        new_message->next_message = NULL;
-        buffer->last_line->last_message = new_message;
+        string = gui_word_get_next_char (window, (unsigned char *)string, 0);
+        if (string)
+            length++;
+    }
+    return length;
+}
+
+/*
+ * gui_word_real_pos: get real position in string (ignoring color/bold/.. chars)
+ */
+
+int
+gui_word_real_pos (t_gui_window *window, char *string, int pos)
+{
+    char *saved_pos;
+    int real_pos;
+    
+    if (pos <= 0)
+        return 0;
+    
+    real_pos = 0;
+    while (string && string[0] && (pos > 0))
+    {
+        saved_pos = string;
+        string = gui_word_get_next_char (window, (unsigned char *)string, 0);
+        pos--;
+        if (string)
+            real_pos += (string - saved_pos);
+    }
+    return real_pos;
+}
+
+/*
+ * gui_add_to_line: add a message to last line of buffer
+ */
+
+void
+gui_add_to_line (t_gui_buffer *buffer, int type, char *message)
+{
+    char *pos;
+    int length;
+    
+    /* create new line if previous was ending by '\n' (or if 1st line) */
+    if (buffer->line_complete)
+    {
+        buffer->line_complete = 0;
+        if (!gui_new_line (buffer))
+            return;
+    }
+    
+    pos = strchr (message, '\n');
+    if (pos)
+    {
+        pos[0] = '\0';
+        buffer->line_complete = 1;
+    }
+    if (buffer->last_line->data)
+    {
+        buffer->last_line->data = (char *) realloc (buffer->last_line->data,
+                                                    strlen (buffer->last_line->data) +
+                                                    strlen (message) + 1);
+        strcat (buffer->last_line->data, message);
     }
     else
+        buffer->last_line->data = strdup (message);
+    
+    length = gui_word_strlen (NULL, message);
+    buffer->last_line->length += length;
+    if (type & MSG_TYPE_MSG)
+        buffer->last_line->line_with_message = 1;
+    if (type & MSG_TYPE_HIGHLIGHT)
+        buffer->last_line->line_with_highlight = 1;
+    if ((type & MSG_TYPE_TIME) || (type & MSG_TYPE_NICK) || (type & MSG_TYPE_PREFIX))
+        buffer->last_line->length_align += length;
+    if (type & MSG_TYPE_NOLOG)
+        buffer->last_line->log_write = 0;
+    if (pos)
     {
-        wee_log_printf (_("Not enough memory for new message\n"));
-        return NULL;
+        pos[0] = '\n';
+        if (buffer->num_displayed > 0)
+            gui_draw_buffer_chat (buffer, 0);
+        if (gui_add_hotlist && (buffer->num_displayed == 0))
+        {
+            if (3 - buffer->last_line->line_with_message -
+                buffer->last_line->line_with_highlight <=
+                buffer->notify_level)
+            {
+                if (buffer->last_line->line_with_highlight)
+                    hotlist_add (HOTLIST_HIGHLIGHT, buffer);
+                else if (BUFFER_IS_PRIVATE(buffer) && (buffer->last_line->line_with_message))
+                    hotlist_add (HOTLIST_PRIVATE, buffer);
+                else if (buffer->last_line->line_with_message)
+                    hotlist_add (HOTLIST_MSG, buffer);
+                else
+                    hotlist_add (HOTLIST_LOW, buffer);
+                gui_draw_buffer_status (gui_current_window->buffer, 1);
+            }
+        }
+    }
+    if (buffer->line_complete && buffer->log_file && buffer->last_line->log_write)
+    {
+        log_write (buffer, buffer->last_line->data);
+        log_write (buffer, "\n");
+    }
+}
+
+/*
+ * gui_printf_internal: display a message in a buffer
+ *                      This function should NEVER be called directly.
+ *                      You should use macros defined in gui.h
+ */
+
+void
+gui_printf_internal (t_gui_buffer *buffer, int display_time, int type, char *message, ...)
+{
+    static char buf[8192];
+    char text_time[1024];
+    char text_time_char[2];
+    time_t time_seconds;
+    struct tm *local_time;
+    int time_first_digit, time_last_digit;
+    char *pos, *buf2;
+    int i;
+    va_list argptr;
+    static time_t seconds;
+    struct tm *date_tmp;
+    
+    if (gui_init_ok)
+    {
+        if (buffer == NULL)
+        {
+            type |= MSG_TYPE_NOLOG;
+            if (SERVER(gui_current_window->buffer))
+                buffer = SERVER(gui_current_window->buffer)->buffer;
+            else
+                buffer = gui_current_window->buffer;
+            
+            if (!buffer || buffer->dcc)
+                buffer = gui_buffers;
+        }
+    
+        if (buffer == NULL)
+        {
+            wee_log_printf ("WARNING: gui_printf_internal without buffer! This is a bug, "
+                            "please send to developers - thanks\n");
+            return;
+        }
+        
+        if (buffer->dcc)
+            buffer = gui_buffers;
+        
+        if (buffer->dcc)
+            return;
+    }
+    
+    va_start (argptr, message);
+    vsnprintf (buf, sizeof (buf) - 1, message, argptr);
+    va_end (argptr);
+    
+    if (!buf[0])
+        return;
+    
+    if (!local_utf8 || !utf8_is_valid (buf))
+        buf2 = weechat_convert_encoding ((local_utf8) ?
+                                         cfg_look_charset_decode_iso : cfg_look_charset_decode_utf,
+                                         (cfg_look_charset_internal && cfg_look_charset_internal[0]) ?
+                                         cfg_look_charset_internal : local_charset,
+                                         buf);
+    else
+        buf2 = strdup (buf);
+    
+    if (gui_init_ok)
+    {
+        seconds = time (NULL);
+        date_tmp = localtime (&seconds);
+        
+        pos = buf2 - 1;
+        while (pos)
+        {
+            if (display_time
+                && cfg_look_buffer_timestamp && cfg_look_buffer_timestamp[0]
+                && ((!buffer->last_line) || (buffer->line_complete)))
+            {
+                time_seconds = time (NULL);
+                local_time = localtime (&time_seconds);
+                strftime (text_time, sizeof (text_time), cfg_look_buffer_timestamp, local_time);
+                
+                time_first_digit = -1;
+                time_last_digit = -1;
+                i = 0;
+                while (text_time[i])
+                {
+                    if (isdigit (text_time[i]))
+                    {
+                        if (time_first_digit == -1)
+                            time_first_digit = i;
+                        time_last_digit = i;
+                    }
+                    i++;
+                }
+                
+                text_time_char[1] = '\0';
+                i = 0;
+                while (text_time[i])
+                {
+                    text_time_char[0] = text_time[i];
+                    if (time_first_digit < 0)
+                    {
+                        gui_add_to_line (buffer, MSG_TYPE_TIME,
+                                         GUI_COLOR(COLOR_WIN_CHAT_TIME));
+                        gui_add_to_line (buffer, MSG_TYPE_TIME, text_time_char);
+                    }
+                    else
+                    {
+                        if ((i < time_first_digit) || (i > time_last_digit))
+                        {
+                            gui_add_to_line (buffer, MSG_TYPE_TIME,
+                                             GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                            gui_add_to_line (buffer, MSG_TYPE_TIME, text_time_char);
+                        }
+                        else
+                        {
+                            if (isdigit (text_time[i]))
+                            {
+                                gui_add_to_line (buffer, MSG_TYPE_TIME,
+                                                 GUI_COLOR(COLOR_WIN_CHAT_TIME));
+                                gui_add_to_line (buffer, MSG_TYPE_TIME, text_time_char);
+                            }
+                            else
+                            {
+                                gui_add_to_line (buffer, MSG_TYPE_TIME,
+                                                 GUI_COLOR(COLOR_WIN_CHAT_TIME_SEP));
+                                gui_add_to_line (buffer, MSG_TYPE_TIME, text_time_char);
+                            }
+                        }
+                    }
+                    i++;
+                }
+                gui_add_to_line (buffer, MSG_TYPE_TIME, GUI_COLOR(COLOR_WIN_CHAT));
+                gui_add_to_line (buffer, MSG_TYPE_TIME, " ");
+            }
+            gui_add_to_line (buffer, type, pos + 1);
+            pos = strchr (pos + 1, '\n');
+            if (pos && !pos[1])
+                pos = NULL;
+        }
+    }
+    else
+        printf ("%s", buf2);
+    
+    free (buf2);
+}
+
+/* 
+ * gui_infobar_printf: display message in infobar
+ */
+
+void
+gui_infobar_printf (int time_displayed, int color, char *message, ...)
+{
+    static char buffer[1024];
+    va_list argptr;
+    t_gui_infobar *ptr_infobar;
+    char *pos, *buf2, *buf3;
+    
+    va_start (argptr, message);
+    vsnprintf (buffer, sizeof (buffer) - 1, message, argptr);
+    va_end (argptr);
+    
+    buf2 = (char *)gui_color_decode ((unsigned char *)buffer, 0);
+    
+    if (buf2)
+    {
+        if (!local_utf8 || !utf8_is_valid (buf2))
+            buf3 = weechat_convert_encoding ((local_utf8) ?
+                                             cfg_look_charset_decode_iso : cfg_look_charset_decode_utf,
+                                             (cfg_look_charset_internal && cfg_look_charset_internal[0]) ?
+                                             cfg_look_charset_internal : local_charset,
+                                             buf2);
+        else
+            buf3 = strdup (buf2);
+    }
+    else
+        buf3 = NULL;
+    
+    if (buf3)
+    {
+        ptr_infobar = (t_gui_infobar *)malloc (sizeof (t_gui_infobar));
+        if (ptr_infobar)
+        {
+            ptr_infobar->color = color;
+            ptr_infobar->text = strdup (buf3);
+            pos = strchr (ptr_infobar->text, '\n');
+            if (pos)
+                pos[0] = '\0';
+            ptr_infobar->remaining_time = (time_displayed <= 0) ? -1 : time_displayed;
+            ptr_infobar->next_infobar = gui_infobar;
+            gui_infobar = ptr_infobar;
+            gui_draw_buffer_infobar (gui_current_window->buffer, 1);
+        }
+        else
+            wee_log_printf (_("Not enough memory for infobar message\n"));
+    }
+    
+    if (buf2)
+        free (buf2);
+    if (buf3)
+        free (buf3);
+}
+
+/*
+ * gui_infobar_remove: remove last displayed message in infobar
+ */
+
+void
+gui_infobar_remove ()
+{
+    t_gui_infobar *new_infobar;
+    
+    if (gui_infobar)
+    {
+        new_infobar = gui_infobar->next_infobar;
+        if (gui_infobar->text)
+            free (gui_infobar->text);
+        free (gui_infobar);
+        gui_infobar = new_infobar;
     }
-    return new_message;
 }
 
 /*
@@ -1219,9 +1460,7 @@ void
 gui_buffer_print_log (t_gui_buffer *buffer)
 {
     t_gui_line *ptr_line;
-    t_gui_message *ptr_message;
     int num;
-    char buf[4096];
     
     wee_log_printf ("[buffer (addr:0x%X)]\n", buffer);
     wee_log_printf ("  num_displayed. . . . : %d\n",   buffer->num_displayed);
@@ -1266,16 +1505,10 @@ gui_buffer_print_log (t_gui_buffer *buffer)
     
     while (ptr_line)
     {
-        buf[0] = '\0';
-        for (ptr_message = ptr_line->messages; ptr_message;
-            ptr_message = ptr_message->next_message)
-        {
-            if (strlen (buf) + strlen (ptr_message->message) + 1 >= sizeof (buf))
-                break;
-            strcat (buf, ptr_message->message);
-        }
         num--;
-        wee_log_printf ("       line N-%05d: %s\n", num, buf);
+        wee_log_printf ("       line N-%05d: %s\n",
+                        num,
+                        (ptr_line->data) ? ptr_line->data : "(empty)");
         
         ptr_line = ptr_line->next_line;
     }
diff --git a/weechat/src/gui/gui.h b/weechat/src/gui/gui.h
index fdc5f4493..09f13dbca 100644
--- a/weechat/src/gui/gui.h
+++ b/weechat/src/gui/gui.h
@@ -26,57 +26,114 @@
 
 #define INPUT_BUFFER_BLOCK_SIZE 256
 
-#define NUM_COLORS                      57
-#define COLOR_WIN_TITLE                 1
-#define COLOR_WIN_CHAT                  2
-#define COLOR_WIN_CHAT_TIME             3
-#define COLOR_WIN_CHAT_TIME_SEP         4
-#define COLOR_WIN_CHAT_PREFIX1          5
-#define COLOR_WIN_CHAT_PREFIX2          6
-#define COLOR_WIN_CHAT_SERVER           7
-#define COLOR_WIN_CHAT_JOIN             8
-#define COLOR_WIN_CHAT_PART             9
-#define COLOR_WIN_CHAT_NICK             10
-#define COLOR_WIN_CHAT_HOST             11
-#define COLOR_WIN_CHAT_CHANNEL          12
-#define COLOR_WIN_CHAT_DARK             13
-#define COLOR_WIN_CHAT_HIGHLIGHT        14
-#define COLOR_WIN_STATUS                15
-#define COLOR_WIN_STATUS_DELIMITERS     16
-#define COLOR_WIN_STATUS_CHANNEL        17
-#define COLOR_WIN_STATUS_DATA_MSG       18
-#define COLOR_WIN_STATUS_DATA_PRIVATE   19
-#define COLOR_WIN_STATUS_DATA_HIGHLIGHT 20
-#define COLOR_WIN_STATUS_DATA_OTHER     21
-#define COLOR_WIN_STATUS_MORE           22
-#define COLOR_WIN_INFOBAR               23
-#define COLOR_WIN_INFOBAR_DELIMITERS    24
-#define COLOR_WIN_INFOBAR_HIGHLIGHT     25
-#define COLOR_WIN_INPUT                 26
-#define COLOR_WIN_INPUT_CHANNEL         27
-#define COLOR_WIN_INPUT_NICK            28
-#define COLOR_WIN_INPUT_DELIMITERS      29
-#define COLOR_WIN_NICK                  30
-#define COLOR_WIN_NICK_AWAY             31
-#define COLOR_WIN_NICK_CHANOWNER        32
-#define COLOR_WIN_NICK_CHANADMIN        33
-#define COLOR_WIN_NICK_OP               34
-#define COLOR_WIN_NICK_HALFOP           35
-#define COLOR_WIN_NICK_VOICE            36
-#define COLOR_WIN_NICK_MORE             37
-#define COLOR_WIN_NICK_SEP              38
-#define COLOR_WIN_NICK_SELF             39
-#define COLOR_WIN_NICK_PRIVATE          40
-#define COLOR_WIN_NICK_FIRST            41
-#define COLOR_WIN_NICK_LAST             50
-#define COLOR_WIN_NICK_NUMBER           (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1)
-#define COLOR_DCC_SELECTED              51
-#define COLOR_DCC_WAITING               52
-#define COLOR_DCC_CONNECTING            53
-#define COLOR_DCC_ACTIVE                54
-#define COLOR_DCC_DONE                  55
-#define COLOR_DCC_FAILED                56
-#define COLOR_DCC_ABORTED               57
+/* shift ncurses colors for compatibility with colors
+   in IRC messages (same as other IRC clients) */
+
+#define WEECHAT_COLOR_BLACK   COLOR_BLACK
+#define WEECHAT_COLOR_RED     COLOR_BLUE
+#define WEECHAT_COLOR_GREEN   COLOR_GREEN
+#define WEECHAT_COLOR_YELLOW  COLOR_CYAN
+#define WEECHAT_COLOR_BLUE    COLOR_RED
+#define WEECHAT_COLOR_MAGENTA COLOR_MAGENTA
+#define WEECHAT_COLOR_CYAN    COLOR_YELLOW
+#define WEECHAT_COLOR_WHITE   COLOR_WHITE
+
+#define COLOR_WIN_NICK_NUMBER 10
+
+typedef enum t_weechat_color t_weechat_color;
+
+enum t_weechat_color
+{
+    COLOR_WIN_TITLE = 0,
+    COLOR_WIN_CHAT,
+    COLOR_WIN_CHAT_TIME,
+    COLOR_WIN_CHAT_TIME_SEP,
+    COLOR_WIN_CHAT_PREFIX1,
+    COLOR_WIN_CHAT_PREFIX2,
+    COLOR_WIN_CHAT_SERVER,
+    COLOR_WIN_CHAT_JOIN,
+    COLOR_WIN_CHAT_PART,
+    COLOR_WIN_CHAT_NICK,
+    COLOR_WIN_CHAT_HOST,
+    COLOR_WIN_CHAT_CHANNEL,
+    COLOR_WIN_CHAT_DARK,
+    COLOR_WIN_CHAT_HIGHLIGHT,
+    COLOR_WIN_STATUS,
+    COLOR_WIN_STATUS_DELIMITERS,
+    COLOR_WIN_STATUS_CHANNEL,
+    COLOR_WIN_STATUS_DATA_MSG,
+    COLOR_WIN_STATUS_DATA_PRIVATE,
+    COLOR_WIN_STATUS_DATA_HIGHLIGHT,
+    COLOR_WIN_STATUS_DATA_OTHER,
+    COLOR_WIN_STATUS_MORE,
+    COLOR_WIN_INFOBAR,
+    COLOR_WIN_INFOBAR_DELIMITERS,
+    COLOR_WIN_INFOBAR_HIGHLIGHT,
+    COLOR_WIN_INPUT,
+    COLOR_WIN_INPUT_CHANNEL,
+    COLOR_WIN_INPUT_NICK,
+    COLOR_WIN_INPUT_DELIMITERS,
+    COLOR_WIN_NICK,
+    COLOR_WIN_NICK_AWAY,
+    COLOR_WIN_NICK_CHANOWNER,
+    COLOR_WIN_NICK_CHANADMIN,
+    COLOR_WIN_NICK_OP,
+    COLOR_WIN_NICK_HALFOP,
+    COLOR_WIN_NICK_VOICE,
+    COLOR_WIN_NICK_MORE,
+    COLOR_WIN_NICK_SEP,
+    COLOR_WIN_NICK_SELF,
+    COLOR_WIN_NICK_PRIVATE,
+    COLOR_WIN_NICK_1,
+    COLOR_WIN_NICK_2,
+    COLOR_WIN_NICK_3,
+    COLOR_WIN_NICK_4,
+    COLOR_WIN_NICK_5,
+    COLOR_WIN_NICK_6,
+    COLOR_WIN_NICK_7,
+    COLOR_WIN_NICK_8,
+    COLOR_WIN_NICK_9,
+    COLOR_WIN_NICK_10,
+    COLOR_DCC_SELECTED,
+    COLOR_DCC_WAITING,
+    COLOR_DCC_CONNECTING,
+    COLOR_DCC_ACTIVE,
+    COLOR_DCC_DONE,
+    COLOR_DCC_FAILED,
+    COLOR_DCC_ABORTED,
+    NUM_COLORS
+};
+
+/* attributes in IRC messages for color & style (bold, ..) */
+
+#define GUI_ATTR_BOLD_CHAR        '\x02'
+#define GUI_ATTR_BOLD_STR         "\x02"
+#define GUI_ATTR_COLOR_CHAR       '\x03'
+#define GUI_ATTR_COLOR_STR        "\x03"
+#define GUI_ATTR_RESET_CHAR       '\x0F'
+#define GUI_ATTR_RESET_STR        "\x0F"
+#define GUI_ATTR_FIXED_CHAR       '\x11'
+#define GUI_ATTR_FIXED_STR        "\x11"
+#define GUI_ATTR_REVERSE_CHAR     '\x12'
+#define GUI_ATTR_REVERSE_STR      "\x12"
+#define GUI_ATTR_REVERSE2_CHAR    '\x16'
+#define GUI_ATTR_REVERSE2_STR     "\x16"
+#define GUI_ATTR_ITALIC_CHAR      '\x1D'
+#define GUI_ATTR_ITALIC_STR       "\x1D"
+#define GUI_ATTR_UNDERLINE_CHAR   '\x1F'
+#define GUI_ATTR_UNDERLINE_STR    "\x1F"
+
+/* WeeChat internal attributes (should never be in IRC messages) */
+
+#define GUI_ATTR_WEECHAT_COLOR_CHAR  '\x19'
+#define GUI_ATTR_WEECHAT_COLOR_STR   "\x19"
+#define GUI_ATTR_WEECHAT_SET_CHAR    '\x1A'
+#define GUI_ATTR_WEECHAT_SET_STR     "\x1A"
+#define GUI_ATTR_WEECHAT_REMOVE_CHAR '\x1B'
+#define GUI_ATTR_WEECHAT_REMOVE_STR  "\x1B"
+
+#define GUI_COLOR(color) ((gui_color[color]) ? gui_color[color]->string : "")
+#define GUI_NO_COLOR     GUI_ATTR_RESET_STR
 
 #define SERVER(buffer)  ((t_irc_server *)(buffer->server))
 #define CHANNEL(buffer) ((t_irc_channel *)(buffer->channel))
@@ -85,6 +142,8 @@
 #define BUFFER_IS_CHANNEL(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHAT_CHANNEL))
 #define BUFFER_IS_PRIVATE(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHAT_PRIVATE))
 
+#define BUFFER_HAS_NICKLIST(buffer) (BUFFER_IS_CHANNEL(buffer))
+
 #define MSG_TYPE_TIME      1
 #define MSG_TYPE_PREFIX    2
 #define MSG_TYPE_NICK      4
@@ -94,22 +153,16 @@
 #define MSG_TYPE_NOLOG     64
 
 #define gui_printf(buffer, fmt, argz...) \
-    gui_printf_internal(buffer, 1, MSG_TYPE_INFO, -1, fmt, ##argz)
-
-#define gui_printf_color(buffer, color, fmt, argz...) \
-    gui_printf_internal(buffer, 1, MSG_TYPE_INFO, color, fmt, ##argz)
+    gui_printf_internal(buffer, 1, MSG_TYPE_INFO, fmt, ##argz)
 
 #define gui_printf_type(buffer, type, fmt, argz...) \
-    gui_printf_internal(buffer, 1, type, -1, fmt, ##argz)
-
-#define gui_printf_type_color(buffer, type, color, fmt, argz...) \
-    gui_printf_internal(buffer, 1, type, color, fmt, ##argz)
+    gui_printf_internal(buffer, 1, type, fmt, ##argz)
 
 #define gui_printf_nolog(buffer, fmt, argz...) \
-    gui_printf_internal(buffer, 1, MSG_TYPE_INFO | MSG_TYPE_NOLOG, -1, fmt, ##argz)
+    gui_printf_internal(buffer, 1, MSG_TYPE_INFO | MSG_TYPE_NOLOG, fmt, ##argz)
 
 #define gui_printf_nolog_notime(buffer, fmt, argz...) \
-    gui_printf_internal(buffer, 0, MSG_TYPE_NOLOG, -1, fmt, ##argz)
+    gui_printf_internal(buffer, 0, MSG_TYPE_NOLOG, fmt, ##argz)
 
 #define NOTIFY_LEVEL_MIN        0
 #define NOTIFY_LEVEL_MAX        3
@@ -118,38 +171,14 @@
 #define KEY_SHOW_MODE_DISPLAY   1
 #define KEY_SHOW_MODE_BIND      2
 
-typedef struct t_gui_message t_gui_message;
-
-struct t_gui_message
-{
-    int type;                       /* type of message (time, nick, other)  */
-    int color;                      /* color of message                     */
-    char *message;                  /* message content                      */
-    t_gui_message *prev_message;    /* link to previous message for line    */
-    t_gui_message *next_message;    /* link to next message for line        */
-};
-
-typedef struct t_gui_line t_gui_line;
-
-struct t_gui_line
-{
-    int length;                     /* length of the line (in char)         */
-    int length_align;               /* alignment length (time or time/nick) */
-    int log_write;                  /* = 1 if line will be written to log   */
-    int line_with_message;          /* line contains a message from a user? */
-    int line_with_highlight;        /* line contains highlight              */
-    t_gui_message *messages;        /* messages for the line                */
-    t_gui_message *last_message;    /* last message of the line             */
-    t_gui_line *prev_line;          /* link to previous line                */
-    t_gui_line *next_line;          /* link to next line                    */
-};
-
 typedef struct t_gui_color t_gui_color;
 
 struct t_gui_color
 {
-    char *name;
-    int color;
+    int foreground;                 /* foreground color                     */
+    int background;                 /* background color                     */
+    int attributes;                 /* attributes (bold, ..)                */
+    char *string;                   /* WeeChat color: "\x19??", ?? is #color*/
 };
 
 typedef struct t_gui_infobar t_gui_infobar;
@@ -164,6 +193,20 @@ struct t_gui_infobar
     t_gui_infobar *next_infobar;    /* next message for infobar             */
 };
 
+typedef struct t_gui_line t_gui_line;
+
+struct t_gui_line
+{
+    int length;                     /* length of the line (in char)         */
+    int length_align;               /* alignment length (time or time/nick) */
+    int log_write;                  /* = 1 if line will be written to log   */
+    int line_with_message;          /* line contains a message from a user? */
+    int line_with_highlight;        /* line contains highlight              */
+    char *data;                     /* line content                         */
+    t_gui_line *prev_line;          /* link to previous line                */
+    t_gui_line *next_line;          /* link to next line                    */
+};
+
 typedef struct t_gui_buffer t_gui_buffer;
 
 struct t_gui_buffer
@@ -260,6 +303,11 @@ struct t_gui_window
     /* windows for Qt GUI */
     /* TODO: declare Qt window */
     
+    int current_style_fg;;          /* current color used for foreground    */
+    int current_style_bg;;          /* current color used for background    */
+    int current_style_attr;         /* current attributes (bold, ..)        */
+    int current_color_attr;         /* attr sum of last color(s) displayed  */
+    
     /* DCC */
     void *dcc_first;                /* first dcc displayed                  */
     void *dcc_selected;             /* selected dcc                         */
@@ -316,6 +364,8 @@ extern int gui_key_grab;
 extern int gui_key_grab_count;
 extern char *gui_input_clipboard;
 
+extern t_gui_color *gui_color[NUM_COLORS];
+
 /* GUI independent functions: windows & buffers */
 
 extern t_gui_window *gui_window_new (int, int, int, int);
@@ -327,7 +377,9 @@ extern void gui_window_free (t_gui_window *);
 extern void gui_infobar_remove ();
 extern void gui_buffer_free (t_gui_buffer *, int);
 extern t_gui_line *gui_new_line (t_gui_buffer *);
-extern t_gui_message *gui_new_message (t_gui_buffer *);
+extern int gui_word_strlen (t_gui_window *, char *);
+extern int gui_word_real_pos (t_gui_window *, char *, int);
+extern void gui_printf_internal (t_gui_buffer *, int, int, char *, ...);
 extern void gui_optimize_input_buffer_size (t_gui_buffer *);
 extern void gui_exec_action_dcc (t_gui_window *, char *);
 extern int gui_insert_string_input (t_gui_window *, char *, int);
@@ -403,11 +455,13 @@ extern void gui_key_free_all ();
 /* GUI dependant functions: display */
 
 extern int gui_assign_color (int *, char *);
-extern int gui_get_color_by_name (char *);
-extern char *gui_get_color_by_value (int);
+extern char *gui_get_color_name (int);
+extern unsigned char *gui_color_decode (unsigned char *, int);
+extern unsigned char *gui_color_encode (unsigned char *);
 extern int gui_buffer_has_nicklist (t_gui_buffer *);
 extern void gui_calculate_pos_size (t_gui_window *);
 extern void gui_draw_buffer_title (t_gui_buffer *, int);
+extern char *gui_word_get_next_char (t_gui_window *, unsigned char *, int);
 extern void gui_draw_buffer_chat (t_gui_buffer *, int);
 extern void gui_draw_buffer_nick (t_gui_buffer *, int);
 extern void gui_draw_buffer_status (t_gui_buffer *, int);
@@ -434,11 +488,10 @@ extern void gui_window_merge_auto (t_gui_window *);
 extern void gui_window_merge_all (t_gui_window *);
 extern void gui_refresh_screen ();
 extern void gui_pre_init (int *, char **[]);
-extern void gui_init_colors ();
+extern void gui_rebuild_weechat_colors ();
 extern void gui_set_window_title ();
 extern void gui_init ();
 extern void gui_end ();
-extern void gui_printf_internal (t_gui_buffer *, int, int, int, char *, ...);
 extern void gui_input_default_key_bindings ();
 extern void gui_main_loop ();
 
diff --git a/weechat/src/irc/irc-commands.c b/weechat/src/irc/irc-commands.c
index 2ddd68485..f994d2262 100644
--- a/weechat/src/irc/irc-commands.c
+++ b/weechat/src/irc/irc-commands.c
@@ -384,6 +384,7 @@ t_irc_command irc_commands[] =
   { "375", N_("a server message"),            "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
   { "376", N_("a server message"),            "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
   { "381", N_("you are now an IRC operator"), "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
+  { "382", N_("rehashing"),                   "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
   { "391", N_("server local time"),           "", "", 0, 0, 1, NULL, NULL, irc_cmd_recv_server_msg },
   { "401", N_("no such nick/channel"),
     "", "", 0, MAX_ARGS, 1, NULL, NULL, irc_cmd_recv_error },
diff --git a/weechat/src/irc/irc-dcc.c b/weechat/src/irc/irc-dcc.c
index 739fe93c1..103791aa2 100644
--- a/weechat/src/irc/irc-dcc.c
+++ b/weechat/src/irc/irc-dcc.c
@@ -364,30 +364,26 @@ dcc_close (t_irc_dcc *ptr_dcc, int status)
         {
             irc_display_prefix (ptr_dcc->server, ptr_dcc->server->buffer,
                                 PREFIX_INFO);
-            gui_printf (ptr_dcc->server->buffer, _("DCC: file "));
-            gui_printf_color (ptr_dcc->server->buffer,
-                              COLOR_WIN_CHAT_CHANNEL,
-                              "%s",
-                              ptr_dcc->filename);
+            gui_printf (ptr_dcc->server->buffer,
+                        _("DCC: file %s%s%s"),
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        ptr_dcc->filename,
+                        GUI_COLOR(COLOR_WIN_CHAT));
             if (ptr_dcc->local_filename)
-            {
-                gui_printf (ptr_dcc->server->buffer, _(" (local filename: "));
-                gui_printf_color (ptr_dcc->server->buffer,
-                                  COLOR_WIN_CHAT_CHANNEL,
-                                  "%s",
-                                  ptr_dcc->local_filename);
-                gui_printf (ptr_dcc->server->buffer, ")");
-            }
+                gui_printf (ptr_dcc->server->buffer,
+                            _(" (local filename: %s%s%s)"),
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                            ptr_dcc->local_filename,
+                            GUI_COLOR(COLOR_WIN_CHAT));
             if (ptr_dcc->type == DCC_FILE_SEND)
                 gui_printf (ptr_dcc->server->buffer, _(" sent to "));
             else
                 gui_printf (ptr_dcc->server->buffer, _(" received from "));
-            gui_printf_color (ptr_dcc->server->buffer,
-                              COLOR_WIN_CHAT_NICK,
-                              "%s",
-                              ptr_dcc->nick);
-            gui_printf (ptr_dcc->server->buffer,
-                        (status == DCC_DONE) ? _(": ok!\n") : _(": FAILED\n"));
+            gui_printf (ptr_dcc->server->buffer, "%s%s%s: %s\n",
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        ptr_dcc->nick,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        (status == DCC_DONE) ? _("OK") : _("FAILED"));
         }
     }
     if (status == DCC_ABORTED)
@@ -399,15 +395,17 @@ dcc_close (t_irc_dcc *ptr_dcc, int status)
             else
                 ptr_buffer = ptr_dcc->server->buffer;
             irc_display_prefix (ptr_dcc->server, ptr_buffer, PREFIX_INFO);
-            gui_printf (ptr_buffer, _("DCC chat closed with "));
-            gui_printf_color (ptr_buffer, COLOR_WIN_CHAT_NICK,
-                              "%s", ptr_dcc->nick);
-            gui_printf_color (ptr_buffer, COLOR_WIN_CHAT_DARK, " (");
-            gui_printf_color (ptr_buffer, COLOR_WIN_CHAT_HOST,
-                              "%d.%d.%d.%d",
-                              ptr_dcc->addr >> 24, (ptr_dcc->addr >> 16) & 0xff,
-                              (ptr_dcc->addr >> 8) & 0xff, ptr_dcc->addr & 0xff);
-            gui_printf_color (ptr_buffer, COLOR_WIN_CHAT_DARK, ")\n");
+            gui_printf (ptr_buffer,
+                        _("DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        ptr_dcc->nick,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                        ptr_dcc->addr >> 24,
+                        (ptr_dcc->addr >> 16) & 0xff,
+                        (ptr_dcc->addr >> 8) & 0xff,
+                        ptr_dcc->addr & 0xff,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK));
         }
     }
     
@@ -467,16 +465,17 @@ dcc_channel_for_chat (t_irc_dcc *ptr_dcc)
     irc_display_prefix (ptr_dcc->server, ptr_dcc->channel->buffer,
                         PREFIX_INFO);
     gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_MSG,
-                     _("Connected to "));
-    gui_printf_color (ptr_dcc->channel->buffer, COLOR_WIN_CHAT_NICK,
-                      "%s", ptr_dcc->nick);
-    gui_printf_color (ptr_dcc->channel->buffer, COLOR_WIN_CHAT_DARK, " (");
-    gui_printf_color (ptr_dcc->channel->buffer, COLOR_WIN_CHAT_HOST,
-                      "%d.%d.%d.%d",
-                      ptr_dcc->addr >> 24, (ptr_dcc->addr >> 16) & 0xff,
-                      (ptr_dcc->addr >> 8) & 0xff, ptr_dcc->addr & 0xff);
-    gui_printf_color (ptr_dcc->channel->buffer, COLOR_WIN_CHAT_DARK, ") ");
-    gui_printf (ptr_dcc->channel->buffer, _("via DCC chat\n"));
+                     _("Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"),
+                     GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                     ptr_dcc->nick,
+                     GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                     GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                     ptr_dcc->addr >> 24,
+                     (ptr_dcc->addr >> 16) & 0xff,
+                     (ptr_dcc->addr >> 8) & 0xff,
+                     ptr_dcc->addr & 0xff,
+                     GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                     GUI_COLOR(COLOR_WIN_CHAT));
 }
 
 /*
@@ -565,12 +564,11 @@ dcc_accept_resume (t_irc_server *server, char *filename, int port,
         
         irc_display_prefix (ptr_dcc->server, ptr_dcc->server->buffer,
                             PREFIX_INFO);
-        gui_printf (ptr_dcc->server->buffer, _("DCC: file "));
-        gui_printf_color (ptr_dcc->server->buffer,
-                          COLOR_WIN_CHAT_CHANNEL,
-                          "%s ",
-                          ptr_dcc->filename);
-        gui_printf (ptr_dcc->server->buffer, _("resumed at position %u\n"),
+        gui_printf (ptr_dcc->server->buffer,
+                    _("DCC: file %s%s%s resumed at position %u\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    ptr_dcc->filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
                     ptr_dcc->start_resume);
         dcc_redraw (HOTLIST_MSG);
     }
@@ -669,51 +667,70 @@ dcc_add (t_irc_server *server, int type, unsigned long addr, int port, char *nic
     if (type == DCC_FILE_RECV)
     {
         irc_display_prefix (server, server->buffer, PREFIX_INFO);
-        gui_printf (server->buffer, _("Incoming DCC file from "));
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, " (");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_HOST,
-                          "%d.%d.%d.%d",
-                          addr >> 24, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, ")");
-        gui_printf (server->buffer, ": ");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", filename);
-        gui_printf (server->buffer, ", ");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%lu", size);
-        gui_printf (server->buffer, _(" bytes\n"));
+        gui_printf (server->buffer,
+                    _("Incoming DCC file from %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s bytes\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    nick,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                    addr >> 24,
+                    (addr >> 16) & 0xff,
+                    (addr >> 8) & 0xff,
+                    addr & 0xff,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    size,
+                    GUI_COLOR(COLOR_WIN_CHAT));
         dcc_redraw (HOTLIST_MSG);
     }
     if (type == DCC_FILE_SEND)
     {
         irc_display_prefix (server, server->buffer, PREFIX_INFO);
-        gui_printf (server->buffer, _("Sending DCC file to "));
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);
-        gui_printf (server->buffer, ": ");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", filename);
-        gui_printf (server->buffer, _(" (local filename: "));
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", local_filename);
-        gui_printf (server->buffer, "), ");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%lu", size);
-        gui_printf (server->buffer, _(" bytes\n"));
+        gui_printf (server->buffer,
+                    _("Sending DCC file to %s%s%s: %s%s%s "
+                      "(local filename: %s%s%s), %s%lu%s bytes\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    nick,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    local_filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    size,
+                    GUI_COLOR(COLOR_WIN_CHAT));
         dcc_redraw (HOTLIST_MSG);
     }
     if (type == DCC_CHAT_RECV)
     {
         irc_display_prefix (server, server->buffer, PREFIX_INFO);
-        gui_printf (server->buffer, _("Incoming DCC chat request from "));
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, " (");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_HOST,
-                          "%d.%d.%d.%d",
-                          addr >> 24, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, ")\n");
+        gui_printf (server->buffer,
+                    _("Incoming DCC chat request from %s%s%s "
+                      "(%s%d.%d.%d.%d%s)\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    nick,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                    addr >> 24,
+                    (addr >> 16) & 0xff,
+                    (addr >> 8) & 0xff,
+                    addr & 0xff,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK));
         dcc_redraw (HOTLIST_MSG);
     }
     if (type == DCC_CHAT_SEND)
     {
         irc_display_prefix (server, server->buffer, PREFIX_INFO);
-        gui_printf (server->buffer, _("Sending DCC chat request to "));
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s\n", nick);
+        gui_printf (server->buffer,
+                    _("Sending DCC chat request to %s%s\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    nick);
         dcc_redraw (HOTLIST_MSG);
     }
     
@@ -728,18 +745,15 @@ dcc_add (t_irc_server *server, int type, unsigned long addr, int port, char *nic
     {
         irc_display_prefix (new_dcc->server, new_dcc->server->buffer,
                             PREFIX_INFO);
-        gui_printf (new_dcc->server->buffer, _("DCC: file "));
-        gui_printf_color (new_dcc->server->buffer,
-                          COLOR_WIN_CHAT_CHANNEL,
-                          "%s",
-                          new_dcc->filename);
-        gui_printf (new_dcc->server->buffer, _(" (local filename: "));
-        gui_printf_color (new_dcc->server->buffer,
-                          COLOR_WIN_CHAT_CHANNEL,
-                          "%s",
-                          new_dcc->local_filename);
-        gui_printf (new_dcc->server->buffer, ") ");
-        gui_printf (new_dcc->server->buffer, _("will be resumed at position %u\n"),
+        gui_printf (new_dcc->server->buffer,
+                    _("DCC: file %s%s%s (local filename: %s%s%s) "
+                      "will be resumed at position %u\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    new_dcc->filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    new_dcc->local_filename,
+                    GUI_COLOR(COLOR_WIN_CHAT),
                     new_dcc->start_resume);
         dcc_redraw (HOTLIST_MSG);
     }
@@ -1070,6 +1084,7 @@ dcc_chat_recv (t_irc_dcc *ptr_dcc)
 {
     static char buffer[4096 + 2];
     char *buf2, *pos, *ptr_buf, *next_ptr_buf;
+    char *ptr_buf_color;
     int num_read;
 
     num_read = recv (ptr_dcc->sock, buffer, sizeof (buffer) - 2, 0);
@@ -1120,40 +1135,45 @@ dcc_chat_recv (t_irc_dcc *ptr_dcc)
             
             if (ptr_buf)
             {
-                gui_printf_type_color (ptr_dcc->channel->buffer,
-                                       MSG_TYPE_NICK,
-                                       COLOR_WIN_CHAT_DARK, "<");
+                ptr_buf_color = (char *)gui_color_decode ((unsigned char *)ptr_buf,
+                                                          cfg_irc_colors_receive);
+                gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_NICK,
+                                 "%s<", GUI_COLOR(COLOR_WIN_CHAT_DARK));
                 if (irc_is_highlight (ptr_buf, ptr_dcc->server->nick))
                 {
-                    gui_printf_type_color (ptr_dcc->channel->buffer,
-                                           MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
-                                           COLOR_WIN_CHAT_HIGHLIGHT,
-                                           "%s", ptr_dcc->nick);
+                    gui_printf_type (ptr_dcc->channel->buffer,
+                                     MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
+                                     "%s%s",
+                                     GUI_COLOR(COLOR_WIN_CHAT_HIGHLIGHT),
+                                     ptr_dcc->nick);
                     if ( (cfg_look_infobar_delay_highlight > 0)
                         && (ptr_dcc->channel->buffer != gui_current_window->buffer) )
                         gui_infobar_printf (cfg_look_infobar_delay_highlight,
                                             COLOR_WIN_INFOBAR_HIGHLIGHT,
                                             _("Private %s> %s"),
-                                            ptr_dcc->nick, ptr_buf);
+                                            ptr_dcc->nick,
+                                            (ptr_buf_color) ? ptr_buf_color : ptr_buf);
                 }
                 else
-                    gui_printf_type_color (ptr_dcc->channel->buffer,
-                                           MSG_TYPE_NICK,
-                                           COLOR_WIN_NICK_PRIVATE,
-                                           "%s", ptr_dcc->nick);
-                gui_printf_type_color (ptr_dcc->channel->buffer,
-                                       MSG_TYPE_NICK,
-                                       COLOR_WIN_CHAT_DARK, "> ");
-                gui_printf_type_color (ptr_dcc->channel->buffer,
-                                       MSG_TYPE_MSG,
-                                       COLOR_WIN_CHAT, "%s\n", ptr_buf);
+                    gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_NICK,
+                                     "%s%s",
+                                     GUI_COLOR(COLOR_WIN_NICK_PRIVATE),
+                                     ptr_dcc->nick);
+                gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_NICK,
+                                 "%s> ", GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                gui_printf_type (ptr_dcc->channel->buffer, MSG_TYPE_MSG,
+                                 "%s%s\n",
+                                 GUI_COLOR(COLOR_WIN_CHAT),
+                                 (ptr_buf_color) ? ptr_buf_color : ptr_buf);
+                if (ptr_buf_color)
+                    free (ptr_buf_color);
             }
             
             ptr_buf = next_ptr_buf;
         }
         
         if (buf2)
-            free (buf2);
+free (buf2);
     }
     else
     {
diff --git a/weechat/src/irc/irc-display.c b/weechat/src/irc/irc-display.c
index 10d2a103a..e6aa330cd 100644
--- a/weechat/src/irc/irc-display.c
+++ b/weechat/src/irc/irc-display.c
@@ -52,25 +52,34 @@ irc_display_prefix (t_irc_server *server, t_gui_buffer *buffer, char *prefix)
     
     if (prefix[0] == prefix[2])
     {
-        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_PREFIX1, "%c", prefix[0]);
-        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_PREFIX2, "%c", prefix[1]);
-        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_PREFIX1, "%c ", prefix[2]);
+        gui_printf_type (buffer, type, "%s%c%s%c%s%c ",
+                         GUI_COLOR(COLOR_WIN_CHAT_PREFIX1),
+                         prefix[0],
+                         GUI_COLOR(COLOR_WIN_CHAT_PREFIX2),
+                         prefix[1],
+                         GUI_COLOR(COLOR_WIN_CHAT_PREFIX1),
+                         prefix[2]);
     }
     else
     {
         if (strcmp (prefix, PREFIX_JOIN) == 0)
-            gui_printf_color (buffer, COLOR_WIN_CHAT_JOIN, "%s ", prefix);
+            gui_printf_type (buffer, type, "%s%s ",
+                             GUI_COLOR(COLOR_WIN_CHAT_JOIN), prefix);
         else if (strcmp (prefix, PREFIX_PART) == 0)
-            gui_printf_color (buffer, COLOR_WIN_CHAT_PART, "%s ", prefix);
+            gui_printf_type (buffer, type, "%s%s ",
+                             GUI_COLOR(COLOR_WIN_CHAT_PART), prefix);
         else
-            gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%s ", prefix);
+            gui_printf_type (buffer, type, "%s%s ",
+                             GUI_COLOR(COLOR_WIN_CHAT_PREFIX1), prefix);
     }
     if (server && (server->buffer == buffer) && buffer->all_servers)
     {
-        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_DARK, "[");
-        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_SERVER, "%s", server->name);
-        gui_printf_type_color (buffer, type, COLOR_WIN_CHAT_DARK, "] ");
+        gui_printf_type (buffer, type, "%s[%s%s%s] ",
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                         GUI_COLOR(COLOR_WIN_CHAT_SERVER), server->name,
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK));
     }
+    gui_printf_type (buffer, type, GUI_NO_COLOR);
 }
 
 /*
@@ -80,58 +89,51 @@ irc_display_prefix (t_irc_server *server, t_gui_buffer *buffer, char *prefix)
 
 void
 irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, char *nickname,
-                  int message_type, int display_around, int color_nick, int no_nickmode)
+                  int type, int display_around, int color_nick, int no_nickmode)
 {
     if (display_around)
-        gui_printf_type_color (buffer,
-                               message_type, COLOR_WIN_CHAT_DARK,
-                               (nick) ? "<" : ">");
+        gui_printf_type (buffer, type, "%s%s",
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                         (nick) ? "<" : ">");
     if (nick && cfg_look_nickmode)
     {
         if (nick->is_chanowner)
-            gui_printf_type_color (buffer,
-                                   message_type,
-                                   COLOR_WIN_NICK_OP, "~");
+            gui_printf_type (buffer, type, "%s~",
+                             GUI_COLOR(COLOR_WIN_NICK_OP));
         else if (nick->is_chanadmin)
-            gui_printf_type_color (buffer,
-                                   message_type,
-                                   COLOR_WIN_NICK_OP, "&");
+            gui_printf_type (buffer, type, "%s&",
+                             GUI_COLOR(COLOR_WIN_NICK_OP));
         else if (nick->is_op)
-            gui_printf_type_color (buffer,
-                                   message_type,
-                                   COLOR_WIN_NICK_OP, "@");
+            gui_printf_type (buffer, type, "%s@",
+                             GUI_COLOR(COLOR_WIN_NICK_OP));
         else if (nick->is_halfop)
-            gui_printf_type_color (buffer,
-                                   message_type,
-                                   COLOR_WIN_NICK_HALFOP, "%%");
+            gui_printf_type (buffer, type, "%s%%",
+                             GUI_COLOR(COLOR_WIN_NICK_HALFOP));
         else if (nick->has_voice)
-            gui_printf_type_color (buffer,
-                                   message_type,
-                                   COLOR_WIN_NICK_VOICE, "+");
+            gui_printf_type (buffer, type, "%s+",
+                             GUI_COLOR(COLOR_WIN_NICK_VOICE));
         else
             if (cfg_look_nickmode_empty && !no_nickmode)
-                gui_printf_type_color (buffer,
-                                       message_type,
-                                       COLOR_WIN_CHAT, " ");
+                gui_printf_type (buffer, type, "%s ",
+                                 GUI_COLOR(COLOR_WIN_CHAT));
     }
     if (color_nick < 0)
-        gui_printf_type_color (buffer,
-                               message_type,
-                               COLOR_WIN_CHAT_HIGHLIGHT,
-                               "%s", (nick) ? nick->nick : nickname);
+        gui_printf_type (buffer, type, "%s%s",
+                         GUI_COLOR(COLOR_WIN_CHAT_HIGHLIGHT),
+                         (nick) ? nick->nick : nickname);
     else
-        gui_printf_type_color (buffer,
-                               message_type,
-                               (nick && color_nick) ?
+        gui_printf_type (buffer, type, "%s%s",
+                         GUI_COLOR((nick && color_nick) ?
                                    ((cfg_look_color_nicks) ?
-                                   nick->color : COLOR_WIN_CHAT) :
-                                   COLOR_WIN_CHAT,
-                               "%s", (nick) ? nick->nick : nickname);
+                                    nick->color : COLOR_WIN_CHAT) :
+                                   COLOR_WIN_CHAT),
+                         (nick) ? nick->nick : nickname);
     
     if (display_around)
-        gui_printf_type_color (buffer,
-                               message_type, COLOR_WIN_CHAT_DARK,
-                               (nick) ? "> " : "< ");
+        gui_printf_type (buffer, type, "%s%s",
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                         (nick) ? "> " : "< ");
+    gui_printf_type (buffer, type, GUI_NO_COLOR);
 }
 
 /*
@@ -144,19 +146,27 @@ irc_display_mode (t_irc_server *server, t_gui_buffer *buffer,
                   char *symbol, char *nick_host, char *message, char *param)
 {
     irc_display_prefix (server, buffer, PREFIX_INFO);
-    gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
-    gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", channel_name);
-    gui_printf_color (buffer, COLOR_WIN_CHAT, "/");
-    gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%c%s", set_flag, symbol);
-    gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
-    gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, "%s", nick_host);
+    gui_printf (buffer, "%s[%s%s%s/%s%c%s%s] %s%s",
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                channel_name,
+                GUI_COLOR(COLOR_WIN_CHAT),
+                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                set_flag,
+                symbol,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                nick_host);
     if (param)
-    {
-        gui_printf_color (buffer, COLOR_WIN_CHAT, " %s ", message);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, "%s\n", param);
-    }
+        gui_printf (buffer, " %s%s %s%s\n",
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    message,
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    param);
     else
-        gui_printf_color (buffer, COLOR_WIN_CHAT, " %s\n", message);
+        gui_printf (buffer, " %s\n",
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    message);
 }
 
 /*
@@ -167,65 +177,56 @@ void
 irc_display_server (t_irc_server *server)
 {
     gui_printf (NULL, "\n");
-    gui_printf_color (NULL, COLOR_WIN_CHAT, _("Server: "));
-    gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s", server->name);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " [");
-    gui_printf_color (NULL, COLOR_WIN_CHAT, "%s",
-                      (server->is_connected) ?
-                          _("connected") : _("not connected"));
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "]\n");
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_autoconnect        : %s%s\n",
-                      (server->autoconnect) ? _("yes") : _("no"),
-                      (server->command_line) ?
-                          _(" (temporary server, will not be saved)") : "");
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_autoreconnect . . .: %s\n",
-                      (server->autoreconnect) ? _("yes") : _("no"));
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_autoreconnect_delay: %d seconds\n",
-                      server->autoreconnect_delay);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_address . . . . . .: %s\n",
-                      server->address);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_port  . . . . . . .: %d\n",
-                      server->port);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_ipv6  . . . . . . .: %s\n",
-                      (server->ipv6) ? _("yes") : _("no"));
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_ssl . . . . . . . .: %s\n",
-                      (server->ssl) ? _("yes") : _("no"));
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_password  . . . . .: %s\n",
-                      (server->password && server->password[0]) ?
-                      _("(hidden)") : "");
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_nick1/2/3 . . . . .: %s", server->nick1);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " / ");
-    gui_printf_color (NULL, COLOR_WIN_CHAT, "%s", server->nick2);
-    gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " / ");
-    gui_printf_color (NULL, COLOR_WIN_CHAT, "%s\n", server->nick3);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_username  . . . . .: %s\n",
-                      server->username);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_realname  . . . . .: %s\n",
-                      server->realname);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_command . . . . . .: %s\n",
-                      (server->command && server->command[0]) ?
-                      server->command : "");
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_command_delay . . .: %d seconds\n",
-                      server->command_delay);
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_autojoin  . . . . .: %s\n",
-                      (server->autojoin && server->autojoin[0]) ?
-                      server->autojoin : "");
-    gui_printf_color (NULL, COLOR_WIN_CHAT,
-                      "  server_notify_levels . . .: %s\n",
-                      (server->notify_levels && server->notify_levels[0]) ?
-                      server->notify_levels : "");
+    gui_printf (NULL, _("%sServer: %s%s %s[%s%s%s]\n"),
+                GUI_COLOR(COLOR_WIN_CHAT),
+                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                server->name,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT),
+                (server->is_connected) ?
+                _("connected") : _("not connected"),
+                GUI_COLOR(COLOR_WIN_CHAT_DARK));
+    
+    gui_printf (NULL, "  server_autoconnect . . . .: %s%s\n",
+                (server->autoconnect) ? _("yes") : _("no"),
+                (server->command_line) ?
+                _(" (temporary server, will not be saved)") : "");
+    gui_printf (NULL, "  server_autoreconnect . . .: %s\n",
+                (server->autoreconnect) ? _("yes") : _("no"));
+    gui_printf (NULL, "  server_autoreconnect_delay: %d seconds\n",
+                server->autoreconnect_delay);
+    gui_printf (NULL, "  server_address . . . . . .: %s\n",
+                server->address);
+    gui_printf (NULL, "  server_port  . . . . . . .: %d\n",
+                server->port);
+    gui_printf (NULL, "  server_ipv6  . . . . . . .: %s\n",
+                (server->ipv6) ? _("yes") : _("no"));
+    gui_printf (NULL, "  server_ssl . . . . . . . .: %s\n",
+                (server->ssl) ? _("yes") : _("no"));
+    gui_printf (NULL, "  server_password  . . . . .: %s\n",
+                (server->password && server->password[0]) ?
+                _("(hidden)") : "");
+    gui_printf (NULL, "  server_nick1/2/3 . . . . .: %s %s/ %s%s %s/ %s%s\n",
+                server->nick1,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT),
+                server->nick2,
+                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                GUI_COLOR(COLOR_WIN_CHAT),
+                server->nick3);
+    gui_printf (NULL, "  server_username  . . . . .: %s\n",
+                server->username);
+    gui_printf (NULL, "  server_realname  . . . . .: %s\n",
+               server->realname);
+    gui_printf (NULL, "  server_command . . . . . .: %s\n",
+                (server->command && server->command[0]) ?
+                server->command : "");
+    gui_printf (NULL, "  server_command_delay . . .: %d seconds\n",
+                server->command_delay);
+    gui_printf (NULL, "  server_autojoin  . . . . .: %s\n",
+                (server->autojoin && server->autojoin[0]) ?
+                server->autojoin : "");
+    gui_printf (NULL, "  server_notify_levels . . .: %s\n",
+                (server->notify_levels && server->notify_levels[0]) ?
+                server->notify_levels : "");
 }
diff --git a/weechat/src/irc/irc-nick.c b/weechat/src/irc/irc-nick.c
index 615606e6e..a91fcd7af 100644
--- a/weechat/src/irc/irc-nick.c
+++ b/weechat/src/irc/irc-nick.c
@@ -49,7 +49,7 @@ nick_find_color (t_irc_nick *nick)
     }
     color = (color % cfg_look_color_nicks_number);
     
-    return COLOR_WIN_NICK_FIRST + color;
+    return COLOR_WIN_NICK_1 + color;
 }
 
 /*
diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c
index cf59fe2b7..24c9bd2d0 100644
--- a/weechat/src/irc/irc-recv.c
+++ b/weechat/src/irc/irc-recv.c
@@ -203,7 +203,7 @@ irc_recv_command (t_irc_server *server, char *entire_line,
                   char *host, char *command, char *arguments)
 {
     int i, cmd_found, return_code;
-    char *pos, *nick;
+    char *pos, *nick, *args_after_color;
     
     if (command == NULL)
         return -2;
@@ -247,7 +247,13 @@ irc_recv_command (t_irc_server *server, char *entire_line,
         nick = (host) ? strdup (host) : NULL;
         if (pos)
             pos[0] = '!';
-        return_code = (int) (irc_commands[i].recv_function) (server, host, nick, arguments);
+        args_after_color = (char *)gui_color_decode ((unsigned char *)arguments,
+                                                     cfg_irc_colors_receive);
+        return_code = (int) (irc_commands[i].recv_function) (server, host, nick,
+                                                             (args_after_color) ?
+                                                             args_after_color : arguments);
+        if (args_after_color)
+            free (args_after_color);
         if (nick)
             free (nick);
         return return_code;
@@ -302,9 +308,10 @@ irc_cmd_recv_error (t_irc_server *server, char *host, char *nick, char *argument
                 pos++;
             if (first)
                 irc_display_prefix (server, ptr_buffer, PREFIX_ERROR);
-            gui_printf_color (ptr_buffer,
-                              COLOR_WIN_CHAT,
-                              "%s%s\n", (first) ? "" : ": ", pos);
+            gui_printf (ptr_buffer, "%s%s%s\n",
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        (first) ? "" : ": ",
+                        pos);
             pos = NULL;
         }
         else
@@ -317,10 +324,10 @@ irc_cmd_recv_error (t_irc_server *server, char *host, char *nick, char *argument
                     ptr_buffer = ptr_channel->buffer;
                 irc_display_prefix (server, ptr_buffer, PREFIX_ERROR);
             }
-            gui_printf_color (ptr_buffer,
-                              COLOR_WIN_CHAT_CHANNEL,
-                              "%s%s",
-                              (first) ? "" : " ", pos);
+            gui_printf (ptr_buffer, "%s%s%s",
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        (first) ? "" : " ",
+                        pos);
             first = 0;
             pos = pos2 + 1;
         }
@@ -352,12 +359,12 @@ irc_cmd_recv_invite (t_irc_server *server, char *host, char *nick, char *argumen
         if (!command_ignored)
         {
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf (server->buffer, _("You have been invited to "));
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL,
-                              "%s ", pos_channel);
-            gui_printf (server->buffer, _("by"));
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK,
-                              " %s\n", nick);
+            gui_printf (server->buffer, _("You have been invited to %s%s%s by %s%s\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        pos_channel,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        nick);
             hotlist_add (HOTLIST_HIGHLIGHT, server->buffer);
             gui_draw_buffer_status (gui_current_window->buffer, 1);
         }
@@ -404,18 +411,17 @@ irc_cmd_recv_join (t_irc_server *server, char *host, char *nick, char *arguments
     {
         pos = strchr (host, '!');
         irc_display_prefix (server, ptr_channel->buffer, PREFIX_JOIN);
-        gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
-                          "%s ", nick);
-        gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
-                          "(");
-        gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_HOST,
-                          "%s", (pos) ? pos + 1 : "");
-        gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
-                          ")");
-        gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                          _(" has joined "));
-        gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
-                          "%s\n", arguments);
+        gui_printf (ptr_channel->buffer,
+                    _("%s%s %s(%s%s%s)%s has joined %s%s\n"),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    nick,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                    (pos) ? pos + 1 : "",
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    arguments);
     }
     (void) nick_new (ptr_channel, nick, 0, 0, 0, 0, 0);
     gui_draw_buffer_nick (ptr_channel->buffer, 1);
@@ -468,28 +474,23 @@ irc_cmd_recv_kick (t_irc_server *server, char *host, char *nick, char *arguments
         if (!command_ignored)
         {
             irc_display_prefix (server, ptr_channel->buffer, PREFIX_PART);
-            gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
-                              "%s", nick);
-            gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                              _(" has kicked "));
-            gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
-                              "%s", pos_nick);
-            gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                              _(" from "));
+            gui_printf (ptr_channel->buffer, _("%s%s%s has kicked %s%s%s from %s%s"),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        nick,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        pos_nick,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        arguments);
             if (pos_comment)
-            {
-                gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
-                                  "%s ", arguments);
-                gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
-                                  "(");
-                gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                                  "%s", pos_comment);
-                gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
-                                  ")\n");
-            }
+                gui_printf (ptr_channel->buffer, " %s(%s%s%s)\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_comment,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK));
             else
-                gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
-                                  "%s\n", arguments);
+                gui_printf (ptr_channel->buffer, "\n");
         }
     }
     else
@@ -558,26 +559,21 @@ irc_cmd_recv_kill (t_irc_server *server, char *host, char *nick, char *arguments
                 && !ignore_check (host, "kill", ptr_channel->name, server->name))
             {
                 irc_display_prefix (server, ptr_channel->buffer, PREFIX_PART);
-                gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
-                                  "%s", nick);
-                gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                                  _(" has killed "));
-                gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_NICK,
-                                  "%s", arguments);
+                gui_printf (ptr_channel->buffer, _("%s%s%s has killed %s%s%s from server"),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            nick,
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            arguments,
+                            GUI_COLOR(COLOR_WIN_CHAT));
                 if (pos_comment)
-                {
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                                      _(" from server"));
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
-                                      " (");
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                                      "%s", pos_comment);
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK,
-                                      ")\n");
-                }
+                    gui_printf (ptr_channel->buffer, " %s(%s%s%s)\n",
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                pos_comment,
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK));
                 else
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                                      _(" from server\n"));
+                    gui_printf (ptr_channel->buffer, "\n");
             }
         }
     }
@@ -1020,14 +1016,17 @@ irc_cmd_recv_mode (t_irc_server *server, char *host, char *nick, char *arguments
         if (!command_ignored)
         {
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "[");
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, "/");
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK,
-                              "%s", (pos[0] == ':') ? pos + 1 : pos);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "] ");
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("mode changed by"));
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s\n", nick);
+            gui_printf (server->buffer, _("%s[%s%s%s/%s%s%s]%s mode changed by %s%s\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        arguments,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        (pos[0] == ':') ? pos + 1 : pos,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        nick);
         }
     }
     return 0;
@@ -1086,27 +1085,18 @@ irc_cmd_recv_nick (t_irc_server *server, char *host, char *nick, char *arguments
             {
                 irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
                 if (nick_is_me)
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      _("You are "));
+                    gui_printf (ptr_channel->buffer, _("You are now known as %s%s\n"),
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                arguments);
                 else
-                {
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_NICK,
-                                      "%s", nick);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, _(" is "));
-                }
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT,
-                                  _("now known as "));
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT_NICK,
-                                  "%s\n",
-                                  arguments);
+                    gui_printf (ptr_channel->buffer, _("%s%s%s is now known as %s%s\n"),
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                nick,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                arguments);
             }
-            if (gui_buffer_has_nicklist (ptr_channel->buffer))
-                gui_draw_buffer_nick (ptr_channel->buffer, 1);
+            gui_draw_buffer_nick (ptr_channel->buffer, 1);
             gui_add_hotlist = 1;
         }
     }
@@ -1180,11 +1170,13 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *nick, char *argumen
             if (pos2)
                 pos2[0] = '\0';
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, "CTCP ");
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "VERSION ");
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("reply from"));
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s", nick);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": %s\n", pos);
+            gui_printf (server->buffer, _("CTCP %sVERSION%s reply from %s%s%s: %s\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        nick,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        pos);
         }
         else
         {
@@ -1212,14 +1204,14 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *nick, char *argumen
                         difftime = ((sec2 * 1000000) + usec2) - ((sec1 * 1000000) + usec1);
                         
                         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                        gui_printf_color (server->buffer, COLOR_WIN_CHAT, "CTCP ");
-                        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "PING ");
-                        gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("reply from"));
-                        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, " %s", nick);
-                        gui_printf_color (server->buffer, COLOR_WIN_CHAT,
-                                          _(": %ld.%ld seconds\n"),
-                                          difftime / 1000000,
-                                          (difftime % 1000000) / 1000);
+                        gui_printf (server->buffer, _("CTCP %sPING%s reply from %s%s%s: %ld.%ld seconds\n"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                    nick,
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    difftime / 1000000,
+                                    (difftime % 1000000) / 1000);
                     }
                 }
             }
@@ -1243,15 +1235,16 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *nick, char *argumen
                     if (!ptr_channel->topic)
                         ptr_channel->topic = strdup ((host2) ? host2 : "");
                     
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_NICK,
-                                           COLOR_WIN_CHAT_DARK, "<");
+                    gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                                     "%s<",
+                                     GUI_COLOR(COLOR_WIN_CHAT_DARK));
                     if (irc_is_highlight (pos, server->nick))
                     {
-                        gui_printf_type_color (ptr_channel->buffer,
-                                               MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
-                                               COLOR_WIN_CHAT_HIGHLIGHT,
-                                               "%s", nick);
+                        gui_printf_type (ptr_channel->buffer,
+                                         MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
+                                         "%s%s",
+                                         GUI_COLOR(COLOR_WIN_CHAT_HIGHLIGHT),
+                                         nick);
                         if ( (cfg_look_infobar_delay_highlight > 0)
                              && (ptr_channel->buffer != gui_current_window->buffer) )
                             gui_infobar_printf (cfg_look_infobar_delay_highlight,
@@ -1260,35 +1253,37 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *nick, char *argumen
                                                 nick, pos);
                     }
                     else
-                        gui_printf_type_color (ptr_channel->buffer,
-                                               MSG_TYPE_NICK,
-                                               COLOR_WIN_NICK_PRIVATE,
-                                               "%s", nick);
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_NICK,
-                                           COLOR_WIN_CHAT_DARK, "> ");
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_MSG,
-                                           COLOR_WIN_CHAT, "%s\n", pos);
+                        gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                                         "%s%s",
+                                         GUI_COLOR(COLOR_WIN_NICK_PRIVATE),
+                                         nick);
+                    gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                                     "%s> ",
+                                     GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                    gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG,
+                                     "%s%s\n",
+                                     GUI_COLOR(COLOR_WIN_CHAT),
+                                     pos);
                 }
                 else
                 {
                     irc_display_prefix (server, server->buffer, PREFIX_SERVER);
                     if (host)
                     {
-                        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", nick);
+                        gui_printf (server->buffer, "%s%s",
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK), nick);
                         if (host2)
-                        {
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT_DARK, " (");
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT_HOST, "%s", host2);
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT_DARK, ")");
-                        }
-                        gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": ");
+                            gui_printf (server->buffer, " %s(%s%s%s)",
+                                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                                        host2,
+                                        GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                        gui_printf (server->buffer, "%s: ",
+                                    GUI_COLOR(COLOR_WIN_CHAT));
                     }
-                    gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", pos);
+                    gui_printf (server->buffer, "%s%s\n",
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                pos);
                     if ((nick) && (ascii_strcasecmp (nick, "nickserv") != 0) &&
                         (ascii_strcasecmp (nick, "chanserv") != 0) &&
                         (ascii_strcasecmp (nick, "memoserv") != 0))
@@ -1359,33 +1354,27 @@ irc_cmd_recv_part (t_irc_server *server, char *host, char *nick, char *arguments
                 {
                     pos = strchr (host, '!');
                     irc_display_prefix (server, ptr_channel->buffer, PREFIX_PART);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_NICK, "%s ", nick);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_DARK, "(");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_HOST, "%s", (pos) ? pos + 1 : "");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_DARK, ")");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, _(" has left "));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL,
-                                      "%s", ptr_channel->name);
+                    gui_printf (ptr_channel->buffer, _("%s%s %s(%s%s%s)%s has left %s%s"),
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                nick,
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                                (pos) ? pos + 1 : "",
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                ptr_channel->name);
                     if (pos_args && pos_args[0])
-                    {
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT_DARK, " (");
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT, "%s", pos_args);
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT_DARK, ")");
-                    }
-                    gui_printf (ptr_channel->buffer, "\n");
+                        gui_printf (ptr_channel->buffer, " %s(%s%s%s)\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    pos_args,
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                    else
+                        gui_printf (ptr_channel->buffer, "\n");
                 }
                 
-                if (gui_buffer_has_nicklist (ptr_channel->buffer))
-                    gui_draw_buffer_nick (ptr_channel->buffer, 1);
+                gui_draw_buffer_nick (ptr_channel->buffer, 1);
                 gui_draw_buffer_status (ptr_channel->buffer, 1);
             }
         }
@@ -1511,10 +1500,11 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                         irc_display_prefix (server, ptr_channel->buffer, PREFIX_ACTION_ME);
                         if (irc_is_highlight (pos, server->nick))
                         {
-                            gui_printf_type_color (ptr_channel->buffer,
-                                                   MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
-                                                   COLOR_WIN_CHAT_HIGHLIGHT,
-                                                   "%s", nick);
+                            gui_printf_type (ptr_channel->buffer,
+                                             MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
+                                             "%s%s",
+                                             GUI_COLOR(COLOR_WIN_CHAT_HIGHLIGHT),
+                                             nick);
                             if ( (cfg_look_infobar)
                                  && (cfg_look_infobar_delay_highlight > 0)
                                  && (ptr_channel->buffer != gui_current_window->buffer) )
@@ -1525,11 +1515,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                                                     nick, pos);
                         }
                         else
-                            gui_printf_type_color (ptr_channel->buffer,
-                                                   MSG_TYPE_MSG,
-                                                   COLOR_WIN_CHAT_NICK, "%s", nick);
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT, " %s\n", pos);
+                            gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG,
+                                             "%s%s",
+                                             GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                             nick);
+                        gui_printf (ptr_channel->buffer, " %s%s\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT), pos);
                     }
                     return 0;
                 }
@@ -1544,11 +1535,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                     {
                         irc_display_prefix (server, ptr_channel->buffer, PREFIX_SERVER);
                         gui_printf (ptr_channel->buffer,
-                                    _("Received a CTCP SOUND \"%s\" from "),
-                                    pos);
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT_NICK,
-                                          "%s\n", nick);
+                                    _("Received a CTCP %sSOUND%s \"%s\" from %s%s\n"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    pos,
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                    nick);
                     }
                     return 0;
                 }
@@ -1572,14 +1564,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                         server_sendf (server, "NOTICE %s :\01PING\01\r\n",
                                       nick);
                     irc_display_prefix (server, ptr_channel->buffer, PREFIX_SERVER);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, "CTCP ");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL, "PING ");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, _("received from"));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_NICK, " %s\n", nick);
+                    gui_printf (ptr_channel->buffer,
+                                _("CTCP %sPING%s received from %s%s\n"),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                nick);
                     return 0;
                 }
                 
@@ -1603,17 +1593,17 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                     if (!command_ignored)
                     {
                         irc_display_prefix (server, ptr_channel->buffer, PREFIX_SERVER);
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT, _("Unknown CTCP "));
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT_CHANNEL, "%s ", pos);
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT, _("received from"));
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT_NICK, " %s", nick);
+                        gui_printf (ptr_channel->buffer,
+                                    _("Unknown CTCP %s%s%s received from %s%s"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    pos,
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                    nick);
                         if (pos2)
-                            gui_printf_color (ptr_channel->buffer,
-                                              COLOR_WIN_CHAT, ": %s\n", pos2);
+                            gui_printf (ptr_channel->buffer, "%s: %s\n",
+                                        GUI_COLOR(COLOR_WIN_CHAT),
+                                        pos2);
                         else
                             gui_printf (ptr_channel->buffer, "\n");
                     }
@@ -1644,9 +1634,8 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                         irc_display_nick (ptr_channel->buffer, ptr_nick,
                                           (ptr_nick) ? NULL : nick,
                                           MSG_TYPE_NICK, 1, 1, 0);
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_MSG,
-                                           COLOR_WIN_CHAT, "%s\n", pos);
+                    gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG,
+                                     "%s\n", pos);
                 }
             }
             else
@@ -1689,7 +1678,7 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                     }
                     
                     buf = (struct utsname *) malloc (sizeof (struct utsname));
-                    if (buf && (uname (buf) == 0))
+                    if (buf && (uname (buf) >= 0))
                     {
                         server_sendf (server,
                                       "NOTICE %s :%sVERSION %s v%s"
@@ -1707,17 +1696,16 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                                       nick, "\01", PACKAGE_NAME, PACKAGE_VERSION, __DATE__,
                                       "\01\r\n");
                     irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT, "CTCP ");
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL, "VERSION ");
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT, _("received from"));
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_NICK, " %s", nick);
+                    gui_printf (server->buffer,
+                                _("CTCP %sVERSION%s received from %s%s"),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                nick);
                     if (pos2)
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT, ": %s\n", pos2);
+                        gui_printf (server->buffer, "%s: %s\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    pos2);
                     else
                         gui_printf (server->buffer, "\n");
                 }
@@ -1747,14 +1735,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                         server_sendf (server, "NOTICE %s :\01PING\01\r\n",
                                       nick);
                     irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT, "CTCP ");
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL, "PING ");
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT, _("received from"));
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_NICK, " %s\n", nick);
+                    gui_printf (server->buffer,
+                                _("CTCP %sPING%s received from %s%s\n"),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                nick);
                 }
                 return 0;
             }
@@ -2022,9 +2008,11 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                         gui_printf_nolog (server->buffer,
                                           _("%s unknown DCC CHAT type received from "),
                                           WEECHAT_ERROR);
-                        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK,
-                                          "%s", nick);
-                        gui_printf (server->buffer, ": \"%s\"\n", pos_file);
+                        gui_printf (server->buffer, "%s%s%s: \"%s\"\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                    nick,
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    pos_file);
                         return -1;
                     }
                     
@@ -2066,10 +2054,11 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                     irc_display_prefix (server, ptr_channel->buffer, PREFIX_ACTION_ME);
                     if (irc_is_highlight (pos, server->nick))
                     {
-                        gui_printf_type_color (ptr_channel->buffer,
-                                               MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
-                                               COLOR_WIN_CHAT_HIGHLIGHT,
-                                               "%s", nick);
+                        gui_printf_type (ptr_channel->buffer,
+                                         MSG_TYPE_MSG | MSG_TYPE_HIGHLIGHT,
+                                         "%s%s",
+                                         GUI_COLOR(COLOR_WIN_CHAT_HIGHLIGHT),
+                                         nick);
                         if ( (cfg_look_infobar)
                              && (cfg_look_infobar_delay_highlight > 0)
                              && (ptr_channel->buffer != gui_current_window->buffer) )
@@ -2080,11 +2069,12 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                                                 nick, pos);
                     }
                     else
-                        gui_printf_type_color (ptr_channel->buffer,
-                                               MSG_TYPE_MSG,
-                                               COLOR_WIN_CHAT_NICK, "%s", nick);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, " %s\n", pos);
+                        gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG,
+                                         "%s%s",
+                                         GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                         nick);
+                    gui_printf (ptr_channel->buffer, " %s%s\n",
+                                GUI_COLOR(COLOR_WIN_CHAT), pos);
                 }
             }
             else
@@ -2110,17 +2100,17 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                                 pos2 = NULL;
                         }
                         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT, _("Unknown CTCP "));
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_CHANNEL, "%s ", pos);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT, _("received from"));
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_NICK, " %s", nick);
+                        gui_printf (server->buffer,
+                                    _("Unknown CTCP %s%s%s received from %s%s"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    pos,
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                    nick);
                         if (pos2)
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT, ": %s\n", pos2);
+                            gui_printf (server->buffer, "%s: %s\n",
+                                        GUI_COLOR(COLOR_WIN_CHAT),
+                                        pos2);
                         else
                             gui_printf (server->buffer, "\n");
                     }
@@ -2147,15 +2137,16 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                         if (!ptr_channel->topic)
                             ptr_channel->topic = strdup (host2);
                         
-                        gui_printf_type_color (ptr_channel->buffer,
-                                               MSG_TYPE_NICK,
-                                               COLOR_WIN_CHAT_DARK, "<");
+                        gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                                         "%s<",
+                                         GUI_COLOR(COLOR_WIN_CHAT_DARK));
                         if (irc_is_highlight (pos, server->nick))
                         {
-                            gui_printf_type_color (ptr_channel->buffer,
-                                                   MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
-                                                   COLOR_WIN_CHAT_HIGHLIGHT,
-                                                   "%s", nick);
+                            gui_printf_type (ptr_channel->buffer,
+                                             MSG_TYPE_NICK | MSG_TYPE_HIGHLIGHT,
+                                             "%s%s",
+                                             GUI_COLOR(COLOR_WIN_CHAT_HIGHLIGHT),
+                                             nick);
                             if ( (cfg_look_infobar_delay_highlight > 0)
                                  && (ptr_channel->buffer != gui_current_window->buffer) )
                                 gui_infobar_printf (cfg_look_infobar_delay_highlight,
@@ -2164,16 +2155,17 @@ irc_cmd_recv_privmsg (t_irc_server *server, char *host, char *nick, char *argume
                                                     nick, pos);
                         }
                         else
-                            gui_printf_type_color (ptr_channel->buffer,
-                                                   MSG_TYPE_NICK,
-                                                   COLOR_WIN_NICK_PRIVATE,
-                                                   "%s", nick);
-                        gui_printf_type_color (ptr_channel->buffer,
-                                               MSG_TYPE_NICK,
-                                               COLOR_WIN_CHAT_DARK, "> ");
-                        gui_printf_type_color (ptr_channel->buffer,
-                                               MSG_TYPE_MSG,
-                                               COLOR_WIN_CHAT, "%s\n", pos);
+                            gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                                             "%s%s",
+                                             GUI_COLOR(COLOR_WIN_NICK_PRIVATE),
+                                             nick);
+                        gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                                         "%s> ",
+                                         GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                        gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG,
+                                         "%s%s\n",
+                                         GUI_COLOR(COLOR_WIN_CHAT),
+                                         pos);
                     }
                 }
             }
@@ -2228,26 +2220,21 @@ irc_cmd_recv_quit (t_irc_server *server, char *host, char *nick, char *arguments
             {
                 pos = strchr (host, '!');
                 irc_display_prefix (server, ptr_channel->buffer, PREFIX_QUIT);
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s ", nick);
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT_DARK, "(");
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT_HOST, "%s", (pos) ? pos + 1 : "");
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT_DARK, ") ");
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT, _("has quit"));
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT_DARK, " (");
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT, "%s",
-                                  arguments);
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT_DARK, ")\n");
+                gui_printf (ptr_channel->buffer,
+                            _("%s%s %s(%s%s%s)%s has quit %s(%s%s%s)\n"),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            nick,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                            (pos) ? pos + 1 : "",
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            arguments,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK));
             }
-            if (gui_buffer_has_nicklist (ptr_channel->buffer))
-                gui_draw_buffer_nick (ptr_channel->buffer, 1);
+            gui_draw_buffer_nick (ptr_channel->buffer, 1);
             gui_draw_buffer_status (ptr_channel->buffer, 1);
         }
     }
@@ -2281,7 +2268,8 @@ irc_cmd_recv_server_msg (t_irc_server *server, char *host, char *nick, char *arg
     if (!command_ignored)
     {
         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", arguments);
+        gui_printf (server->buffer, "%s%s\n",
+                    GUI_COLOR(COLOR_WIN_CHAT), arguments);
     }
     return 0;
 }
@@ -2324,18 +2312,19 @@ irc_cmd_recv_server_reply (t_irc_server *server, char *host, char *nick, char *a
             {
                 if (pos[0] == ':')
                     pos++;
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT,
-                                  "%s%s\n", (first) ? "" : ": ", pos);
+                gui_printf (server->buffer, "%s%s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            (first) ? "" : ": ",
+                            pos);
                 pos = NULL;
             }
             else
             {
                 pos2[0] = '\0';
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_CHANNEL,
-                                  "%s%s\n",
-                                  (first) ? "" : " ", pos);
+                gui_printf (server->buffer, "%s%s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                            (first) ? "" : " ",
+                            pos);
                 first = 0;
                 pos = pos2 + 1;
             }
@@ -2388,28 +2377,24 @@ irc_cmd_recv_topic (t_irc_server *server, char *host, char *nick, char *argument
     if (!command_ignored)
     {
         irc_display_prefix (server, buffer, PREFIX_INFO);
-        gui_printf_color (buffer,
-                          COLOR_WIN_CHAT_NICK, "%s",
-                          nick);
         if (pos)
-        {
-            gui_printf_color (buffer,
-                              COLOR_WIN_CHAT, _(" has changed topic for "));
-            gui_printf_color (buffer,
-                              COLOR_WIN_CHAT_CHANNEL, "%s",
-                              arguments);
-            gui_printf_color (buffer,
-                              COLOR_WIN_CHAT, _(" to: \"%s\"\n"),
-                              pos);
-        }
+            gui_printf (buffer,
+                        _("%s%s%s has changed topic for %s%s%s to: \"%s\"\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        nick,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        arguments,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        pos);
         else
-        {
-            gui_printf_color (buffer,
-                              COLOR_WIN_CHAT, _(" has unset topic for "));
-            gui_printf_color (buffer,
-                              COLOR_WIN_CHAT_CHANNEL, "%s\n",
-                              arguments);
-        }
+            gui_printf (buffer,
+                        _("%s%s%s has unset topic for %s%s\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        nick,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        arguments);
     }
     
     if (ptr_channel)
@@ -2514,12 +2499,14 @@ irc_cmd_recv_221 (t_irc_server *server, char *host, char *nick, char *arguments)
         if (!command_ignored)
         {
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, _("User mode"));
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, " [");
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, "/");
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, pos_mode);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "]\n");
+            gui_printf (server->buffer, _("User mode %s[%s%s%s/%s%s%s]\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        arguments,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        pos_mode,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK));
         }
     }
     else
@@ -2566,10 +2553,12 @@ irc_cmd_recv_301 (t_irc_server *server, char *host, char *nick, char *arguments)
             if (!command_ignored)
             {
                 irc_display_prefix (server, gui_current_window->buffer, PREFIX_INFO);
-                gui_printf_color (gui_current_window->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                gui_printf_color (gui_current_window->buffer,
-                                  COLOR_WIN_CHAT, _(" is away: %s\n"), pos_message);
+                gui_printf (gui_current_window->buffer,
+                            _("%s%s%s is away: %s\n"),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_nick,
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_message);
             }
         }
     }
@@ -2616,12 +2605,12 @@ irc_cmd_recv_302 (t_irc_server *server, char *host, char *nick, char *arguments)
                     }
                     
                     irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_NICK, "%s", arguments);
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT, "=");
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_HOST, "%s\n", pos_host);
+                    gui_printf (server->buffer, "%s%s%s=%s%s\n",
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                arguments,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                                pos_host);
                 }
                 else
                     ptr_next = NULL;
@@ -2650,8 +2639,7 @@ irc_cmd_recv_303 (t_irc_server *server, char *host, char *nick, char *arguments)
     if (!command_ignored)
     {
         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-        gui_printf_color (server->buffer,
-                          COLOR_WIN_CHAT, _("Users online: "));
+        gui_printf (server->buffer, _("Users online: "));
         
         arguments = strchr (arguments, ' ');
         if (arguments)
@@ -2670,8 +2658,9 @@ irc_cmd_recv_303 (t_irc_server *server, char *host, char *nick, char *arguments)
                     while (ptr_next[0] == ' ')
                         ptr_next++;
                 }
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s ", arguments);
+                gui_printf (server->buffer, "%s%s ",
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            arguments);
                 arguments = ptr_next;
                 if (arguments && !arguments[0])
                     arguments = NULL;
@@ -2703,8 +2692,7 @@ irc_cmd_recv_305 (t_irc_server *server, char *host, char *nick, char *arguments)
             if (arguments[0] == ':')
                 arguments++;
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf_color (server->buffer,
-                              COLOR_WIN_CHAT, "%s\n", arguments);
+            gui_printf (server->buffer, "%s\n", arguments);
         }
     }
     server->is_away = 0;
@@ -2733,8 +2721,7 @@ irc_cmd_recv_306 (t_irc_server *server, char *host, char *nick, char *arguments)
             if (arguments[0] == ':')
                 arguments++;
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf_color (server->buffer,
-                              COLOR_WIN_CHAT, "%s\n", arguments);
+            gui_printf (server->buffer, "%s\n", arguments);
         }
     }
     server->is_away = 1;
@@ -2773,15 +2760,13 @@ irc_cmd_recv_307 (t_irc_server *server, char *host, char *nick, char *arguments)
                     pos_msg++;
                 
                 irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "[");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "] ");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT, "%s\n",
-                                  pos_msg);
+                gui_printf (server->buffer, "%s[%s%s%s] %s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_nick,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_msg);
             }
         }
     }
@@ -2837,19 +2822,18 @@ irc_cmd_recv_311 (t_irc_server *server, char *host, char *nick, char *arguments)
                             pos_realname++;
                         
                         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_DARK, "[");
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_DARK, "] (");
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_HOST, "%s@%s",
-                                          pos_user, pos_host);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_DARK, ")");
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT, ": %s\n", pos_realname);
+                        gui_printf (server->buffer,
+                                    "%s[%s%s%s] (%s%s@%s%s)%s: %s\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                    pos_nick,
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                                    pos_user,
+                                    pos_host,
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    pos_realname);
                     }
                 }
             }
@@ -2896,20 +2880,18 @@ irc_cmd_recv_312 (t_irc_server *server, char *host, char *nick, char *arguments)
                         pos_serverinfo++;
                     
                     irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_DARK, "[");
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_DARK, "] ");
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT, "%s ", pos_server);
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_DARK, "(");
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT, "%s", pos_serverinfo);
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_DARK, ")\n");
+                    gui_printf (server->buffer,
+                                "%s[%s%s%s] %s%s %s(%s%s%s)\n",
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                pos_nick,
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                pos_server,
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                pos_serverinfo,
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK));
                 }
             }
         }
@@ -2948,14 +2930,13 @@ irc_cmd_recv_313 (t_irc_server *server, char *host, char *nick, char *arguments)
                     pos_message++;
                 
                 irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "[");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "] ");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT, "%s\n", pos_message);
+                gui_printf (server->buffer, "%s[%s%s%s] %s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_nick,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_message);
             }
         }
     }
@@ -3014,18 +2995,17 @@ irc_cmd_recv_314 (t_irc_server *server, char *host, char *nick, char *arguments)
                                 pos_realname++;
                             
                             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT_DARK, " (");
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT_HOST,
-                                              "%s@%s", pos_user, pos_host);
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT_DARK, ")");
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT,
-                                              " was %s\n", pos_realname);
+                            gui_printf (server->buffer,
+                                        _("%s%s %s(%s%s@%s%s)%s was %s\n"),
+                                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                        pos_nick,
+                                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                                        pos_user,
+                                        pos_host,
+                                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                        GUI_COLOR(COLOR_WIN_CHAT),
+                                        pos_realname);
                         }
                     }
                 }
@@ -3071,8 +3051,11 @@ irc_cmd_recv_315 (t_irc_server *server, char *host, char *nick, char *arguments)
         if (!command_ignored)
         {
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", arguments);
-            gui_printf (server->buffer, " %s\n", pos);
+            gui_printf (server->buffer, "%s%s %s%s\n",
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        arguments,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        pos);
         }
     }
     else
@@ -3134,53 +3117,37 @@ irc_cmd_recv_317 (t_irc_server *server, char *host, char *nick, char *arguments)
                         sec = ((idle_time % (60 * 60 * 24)) % (60 * 60)) % 60;
                     
                         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_DARK, "[");
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_DARK, "] ");
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT, _("idle: "));
+                        gui_printf (server->buffer, _("%s[%s%s%s]%s idle: "),
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                    pos_nick,
+                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                    GUI_COLOR(COLOR_WIN_CHAT));
+                        
                         if (day > 0)
-                        {
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT_CHANNEL,
-                                              "%d ", day);
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT,
-                                              (day > 1) ? _("days") : _("day"));
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_CHAT,
-                                              ", ");
-                        }
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_CHANNEL,
-                                          "%02d ", hour);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT,
-                                          (hour > 1) ? _("hours") : _("hour"));
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_CHANNEL,
-                                          " %02d ", min);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT,
-                                          (min > 1) ? _("minutes") : _("minute"));
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_CHANNEL,
-                                          " %02d ", sec);
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT,
-                                          (sec > 1) ? _("seconds") : _("second"));
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT,
-                                          ", ");
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT, _("signon at: "));
+                            gui_printf (server->buffer, "%s%d %s%s, ",
+                                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                        day,
+                                        GUI_COLOR(COLOR_WIN_CHAT),
+                                        (day > 1) ? _("days") : _("day"));
+                        
                         datetime = (time_t)(atol (pos_signon));
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT_CHANNEL,
-                                          "%s", ctime (&datetime));
+                        gui_printf (server->buffer,
+                                    _("%s%02d %s%s %s%02d %s%s %s%02d %s%s, signon at: %s%s"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    hour,
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    (hour > 1) ? _("hours") : _("hour"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    min,
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    (min > 1) ? _("minutes") : _("minute"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    sec,
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    (sec > 1) ? _("seconds") : _("second"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                    ctime (&datetime));
                     }
                 }
             }
@@ -3220,14 +3187,13 @@ irc_cmd_recv_318 (t_irc_server *server, char *host, char *nick, char *arguments)
                     pos_message++;
             
                 irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "[");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "] ");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT, "%s\n", pos_message);
+                gui_printf (server->buffer, "%s[%s%s%s] %s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_nick,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_message);
             }
         }
     }
@@ -3265,36 +3231,33 @@ irc_cmd_recv_319 (t_irc_server *server, char *host, char *nick, char *arguments)
                     pos_channel++;
             
                 irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "[");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "] ");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT, _("Channels: "));
-            
+                gui_printf (server->buffer, "%s[%s%s%s]%s Channels: ",
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_nick,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT));
                 while (pos_channel && pos_channel[0])
                 {
                     if (pos_channel[0] == '@')
                     {
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_NICK_OP, "@");
+                        gui_printf (server->buffer, "%s@",
+                                    GUI_COLOR(COLOR_WIN_NICK_OP));
                         pos_channel++;
                     }
                     else
                     {
                         if (pos_channel[0] == '%')
                         {
-                            gui_printf_color (server->buffer,
-                                              COLOR_WIN_NICK_HALFOP, "%");
+                            gui_printf (server->buffer, "%s%%",
+                                        GUI_COLOR(COLOR_WIN_NICK_HALFOP));
                             pos_channel++;
                         }
                         else
                             if (pos_channel[0] == '+')
                             {
-                                gui_printf_color (server->buffer,
-                                                  COLOR_WIN_NICK_VOICE, "+");
+                                gui_printf (server->buffer, "%s+",
+                                            GUI_COLOR(COLOR_WIN_NICK_VOICE));
                                 pos_channel++;
                             }
                     }
@@ -3306,11 +3269,10 @@ irc_cmd_recv_319 (t_irc_server *server, char *host, char *nick, char *arguments)
                         while (pos[0] == ' ')
                             pos++;
                     }
-                    gui_printf_color (server->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL,
-                                      "%s%s",
-                                      pos_channel,
-                                      (pos && pos[0]) ? " " : "\n");
+                    gui_printf (server->buffer, "%s%s%s",
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                pos_channel,
+                                (pos && pos[0]) ? " " : "\n");
                     pos_channel = pos;
                 }
             }
@@ -3350,14 +3312,13 @@ irc_cmd_recv_320 (t_irc_server *server, char *host, char *nick, char *arguments)
                     pos_message++;
                 
                 irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "[");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "] ");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT, "%s\n", pos_message);
+                gui_printf (server->buffer, "%s[%s%s%s] %s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_nick,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_message);
             }
         }
     }
@@ -3568,10 +3529,9 @@ irc_cmd_recv_331 (t_irc_server *server, char *host, char *nick, char *arguments)
             if (!command_ignored)
             {
                 irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT, _("No topic set for "));
-                gui_printf_color (ptr_channel->buffer,
-                                  COLOR_WIN_CHAT_CHANNEL, "%s\n", pos_channel);
+                gui_printf (ptr_channel->buffer, _("No topic set for %s%s\n"),
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                            pos_channel);
             }
         }
         else
@@ -3625,12 +3585,11 @@ irc_cmd_recv_332 (t_irc_server *server, char *host, char *nick, char *arguments)
                 if (!command_ignored)
                 {
                     irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, _("Topic for "));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL, "%s", pos);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, _(" is: \"%s\"\n"), pos2);
+                    gui_printf (ptr_channel->buffer, _("Topic for %s%s%s is: \"%s\"\n"),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                pos,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                pos2);
                 }
                 
                 gui_draw_buffer_title (ptr_channel->buffer, 1);
@@ -3697,14 +3656,13 @@ irc_cmd_recv_333 (t_irc_server *server, char *host, char *nick, char *arguments)
                     command_ignored |= ignore_check (host, "333", ptr_channel->name, server->name);
                     if (!command_ignored)
                     {
-                        irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT, _("Topic set by "));
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT_NICK, "%s", pos_nick);
                         datetime = (time_t)(atol (pos_date));
-                        gui_printf_color (ptr_channel->buffer,
-                                          COLOR_WIN_CHAT, ", %s", ctime (&datetime));
+                        irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
+                        gui_printf (ptr_channel->buffer, _("Topic set by %s%s%s, %s"),
+                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                    pos_nick,
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    ctime (&datetime));
                     }
                 }
                 else
@@ -3777,14 +3735,16 @@ irc_cmd_recv_341 (t_irc_server *server, char *host, char *nick, char *arguments)
                 pos_channel++;
             
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK,
-                              "%s ", arguments);
-            gui_printf (server->buffer, _("has invited"));
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK,
-                              " %s ", pos_nick);
-            gui_printf (server->buffer, _("on"));
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL,
-                              " %s\n", pos_channel);
+            gui_printf (server->buffer,
+                        _("%s%s%s has invited %s%s%s on %s%s\n"),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        arguments,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        pos_nick,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        pos_channel);
             gui_draw_buffer_status (gui_current_window->buffer, 1);
         }
         else
@@ -3836,14 +3796,12 @@ irc_cmd_recv_344 (t_irc_server *server, char *host, char *nick, char *arguments)
                     pos_host++;
                 
                 irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT, _("Channel reop"));
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_CHANNEL, " %s", pos_channel);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT, ": ");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_HOST, "%s\n", pos_host);
+                gui_printf (server->buffer, _("Channel reop %s%s%s: %s%s\n"),
+                            GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                            pos_channel,
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                            pos_host);
             }
         }
     }
@@ -3879,8 +3837,11 @@ irc_cmd_recv_345 (t_irc_server *server, char *host, char *nick, char *arguments)
         if (!command_ignored)
         {
             irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", arguments);
-            gui_printf (server->buffer, " %s\n", pos);
+            gui_printf (server->buffer, "%s%s %s%s\n",
+                        GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                        arguments,
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        pos);
         }
     }
     else
@@ -3986,25 +3947,35 @@ irc_cmd_recv_348 (t_irc_server *server, char *host, char *nick, char *arguments)
     if (!command_ignored)
     {
         irc_display_prefix (server, buffer, PREFIX_INFO);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
-        gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_channel);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
-        gui_printf (buffer, _("exception"));
-        gui_printf_color (buffer, COLOR_WIN_CHAT_HOST, " %s ", pos_exception);
-        gui_printf (buffer, _("by"));
+        gui_printf (buffer, "%s[%s%s%s]%s exception %s%s%s by ",
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    pos_channel,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                    pos_exception,
+                    GUI_COLOR(COLOR_WIN_CHAT));
         pos = strchr (pos_user, '!');
         if (pos)
         {
             pos[0] = '\0';
-            gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, " %s ", pos_user);
-            gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "(");
-            gui_printf_color (buffer, COLOR_WIN_CHAT_HOST, "%s", pos + 1);
-            gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, ")");
+            gui_printf (buffer, "%s%s %s(%s%s%s)",
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        pos_user,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                        GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                        pos + 1,
+                        GUI_COLOR(COLOR_WIN_CHAT_DARK));
         }
         else
-            gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, " %s", pos_user);
+            gui_printf (buffer,"%s%s",
+                        GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                        pos_user);
         datetime = (time_t)(atol (pos_date));
-        gui_printf_nolog (buffer, ", %s", ctime (&datetime));
+        gui_printf_nolog (buffer, "%s, %s",
+                          GUI_COLOR(COLOR_WIN_CHAT),
+                          ctime (&datetime));
     }    
     return 0;
 }
@@ -4061,11 +4032,14 @@ irc_cmd_recv_349 (t_irc_server *server, char *host, char *nick, char *arguments)
     if (!command_ignored)
     {
         irc_display_prefix (server, buffer, PREFIX_INFO);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
-        gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_channel);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
-        gui_printf_nolog (buffer, "%s\n", pos_msg);
-    }    
+        gui_printf (buffer, "%s[%s%s%s] %s%s\n",
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    pos_channel,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    pos_msg);
+    }
     return 0;
 }
 
@@ -4198,32 +4172,23 @@ irc_cmd_recv_352 (t_irc_server *server, char *host, char *nick, char *arguments)
                                     {
                                         irc_display_prefix (server, server->buffer,
                                                             PREFIX_SERVER);
-                                        gui_printf_color (server->buffer,
-                                                          COLOR_WIN_CHAT_NICK,
-                                                          "%s ", pos_nick);
-                                        gui_printf_color (server->buffer,
-                                                          COLOR_WIN_CHAT,
-                                                          _("on"));
-                                        gui_printf_color (server->buffer,
-                                                          COLOR_WIN_CHAT_CHANNEL,
-                                                          " %s", pos_channel);
-                                        gui_printf_color (server->buffer,
-                                                          COLOR_WIN_CHAT,
-                                                          " %s %s ",
-                                                          pos_attr, pos_hopcount);
-                                        gui_printf_color (server->buffer,
-                                                          COLOR_WIN_CHAT_HOST,
-                                                          "%s@%s",
-                                                          pos_user, pos_host);
-                                        gui_printf_color (server->buffer,
-                                                          COLOR_WIN_CHAT_DARK,
-                                                          " (");
-                                        gui_printf_color (server->buffer,
-                                                          COLOR_WIN_CHAT,
-                                                          "%s", pos_realname);
-                                        gui_printf_color (server->buffer,
-                                                          COLOR_WIN_CHAT_DARK,
-                                                          ")\n");
+                                        gui_printf (server->buffer,
+                                                    "%s%s%s on %s%s%s %s %s %s%s@%s %s(%s%s%s)\n",
+                                                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                                    pos_nick,
+                                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                                    pos_channel,
+                                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                                    pos_attr,
+                                                    pos_hopcount,
+                                                    GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                                                    pos_user,
+                                                    pos_host,
+                                                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                                    pos_realname,
+                                                    GUI_COLOR(COLOR_WIN_CHAT_DARK));
                                     }
                                 }
                             }
@@ -4386,12 +4351,11 @@ irc_cmd_recv_366 (t_irc_server *server, char *host, char *nick, char *arguments)
                 {
                     /* display users on channel */
                     irc_display_prefix (server, ptr_channel->buffer, PREFIX_SERVER);
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT,
-                                      _("Nicks "));
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_CHANNEL,
-                                      "%s", ptr_channel->name);
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT, ": ");
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK, "[");
+                    gui_printf (ptr_channel->buffer, _("Nicks %s%s%s: %s["),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                ptr_channel->name,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK));
                     
                     for (ptr_nick = ptr_channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
                     {
@@ -4400,62 +4364,41 @@ irc_cmd_recv_366 (t_irc_server *server, char *host, char *nick, char *arguments)
                         if (ptr_nick != ptr_channel->last_nick)
                             gui_printf (ptr_channel->buffer, " ");
                     }
-                    gui_printf_color (ptr_channel->buffer, COLOR_WIN_CHAT_DARK, "]\n");
+                    gui_printf (ptr_channel->buffer, "%s]\n",
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK));
                     
                     /* display number of nicks, ops, halfops & voices on the channel */
                     nick_count (ptr_channel, &num_nicks, &num_op, &num_halfop, &num_voice,
                                 &num_normal);
                     irc_display_prefix (server, ptr_channel->buffer, PREFIX_INFO);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, _("Channel "));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL,
-                                      "%s", ptr_channel->name);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, ": ");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL,
-                                      "%d ", num_nicks);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      (num_nicks > 1) ? _("nicks") : _("nick"));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_DARK, " (");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL,
-                                      "%d ", num_op);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      (num_op > 1) ? _("ops") : _("op"));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      ", ");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL,
-                                      "%d ", num_halfop);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      (num_halfop > 1) ? _("halfops") : _("halfop"));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      ", ");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL,
-                                  "%d ", num_voice);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      (num_voice > 1) ? _("voices") : _("voice"));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      ", ");
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL,
-                                      "%d ", num_normal);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT,
-                                      _("normal"));
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_DARK, ")\n");
+                    gui_printf (ptr_channel->buffer,
+                                _("Channel %s%s%s: %s%d%s %s %s(%s%d%s %s, "
+                                  "%s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n"),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                ptr_channel->name,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                num_nicks,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                (num_nicks > 1) ? _("nicks") : _("nick"),
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                num_op,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                (num_op > 1) ? _("ops") : _("op"),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                num_halfop,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                (num_halfop > 1) ? _("halfops") : _("halfop"),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                num_voice,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                (num_voice > 1) ? _("voices") : _("voice"),
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                num_normal,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                _("normal"),
+                                GUI_COLOR(COLOR_WIN_CHAT_DARK));
                 }
                 irc_cmd_send_mode (server, ptr_channel->name);
                 if (cfg_irc_away_check > 0)
@@ -4466,10 +4409,11 @@ irc_cmd_recv_366 (t_irc_server *server, char *host, char *nick, char *arguments)
                 if (!command_ignored)
                 {
                     irc_display_prefix (server, gui_current_window->buffer, PREFIX_INFO);
-                    gui_printf_color (gui_current_window->buffer,
-                                      COLOR_WIN_CHAT_CHANNEL, pos);
-                    gui_printf_color (gui_current_window->buffer,
-                                      COLOR_WIN_CHAT, ": %s\n", pos2);
+                    gui_printf (gui_current_window->buffer, "%s%s%s: %s\n",
+                                GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                                pos,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                pos2);
                 }
                 return 0;
             }
@@ -4524,42 +4468,24 @@ irc_cmd_recv_367 (t_irc_server *server, char *host, char *nick, char *arguments)
         pos_ban++;
     
     /* look for user who set ban */
+    pos_date = NULL;
     pos_user = strchr (pos_ban, ' ');
-    if (!pos_user)
+    if (pos_user)
     {
-        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
-        gui_printf_nolog (server->buffer,
-                          _("%s cannot parse \"%s\" command\n"),
-                          WEECHAT_ERROR, "367");
-        return -1;
-    }
-    pos_user[0] = '\0';
-    pos_user++;
-    while (pos_user[0] == ' ')
+        pos_user[0] = '\0';
         pos_user++;
-    
-    /* look for date/time */
-    pos_date = strchr (pos_user, ' ');
-    if (!pos_date)
-    {
-        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
-        gui_printf_nolog (server->buffer,
-                          _("%s cannot parse \"%s\" command\n"),
-                          WEECHAT_ERROR, "367");
-        return -1;
-    }
-    pos_date[0] = '\0';
-    pos_date++;
-    while (pos_date[0] == ' ')
-        pos_date++;
-    
-    if (!pos_date || !pos_date[0])
-    {
-        irc_display_prefix (server, server->buffer, PREFIX_ERROR);
-        gui_printf_nolog (server->buffer,
-                          _("%s cannot parse \"%s\" command\n"),
-                          WEECHAT_ERROR, "367");
-        return -1;
+        while (pos_user[0] == ' ')
+            pos_user++;
+        
+        /* look for date/time */
+        pos_date = strchr (pos_user, ' ');
+        if (pos_date)
+        {
+            pos_date[0] = '\0';
+            pos_date++;
+            while (pos_date[0] == ' ')
+                pos_date++;   
+        }
     }
     
     ptr_channel = channel_search (server, pos_channel);
@@ -4570,24 +4496,51 @@ irc_cmd_recv_367 (t_irc_server *server, char *host, char *nick, char *arguments)
     if (!command_ignored)
     {
         irc_display_prefix (server, buffer, PREFIX_INFO);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
-        gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_channel);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
-        gui_printf_color (buffer, COLOR_WIN_CHAT_HOST, "%s ", pos_ban);
-        gui_printf (buffer, _("banned by"));
-        pos = strchr (pos_user, '!');
-        if (pos)
+        if (pos_user)
         {
-            pos[0] = '\0';
-            gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, " %s ", pos_user);
-            gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "(");
-            gui_printf_color (buffer, COLOR_WIN_CHAT_HOST, "%s", pos + 1);
-            gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, ")");
+            gui_printf_nolog (buffer, _("%s[%s%s%s] %s%s%s banned by "),
+                              GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                              GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                              pos_channel,
+                              GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                              GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                              pos_ban,
+                              GUI_COLOR(COLOR_WIN_CHAT));
+            pos = strchr (pos_user, '!');
+            if (pos)
+            {
+                pos[0] = '\0';
+                gui_printf (buffer, "%s%s %s(%s%s%s)",
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_user,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                            pos + 1,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK));
+            }
+            else
+                gui_printf (buffer, "%s%s",
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_user);
+            if (pos_date)
+            {
+                datetime = (time_t)(atol (pos_date));
+                gui_printf (buffer, "%s, %s",
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            ctime (&datetime));
+            }
+            else
+                gui_printf (buffer, "\n");
         }
         else
-            gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, " %s", pos_user);
-        datetime = (time_t)(atol (pos_date));
-        gui_printf_nolog (buffer, ", %s", ctime (&datetime));
+            gui_printf_nolog (buffer, _("%s[%s%s%s] %s%s%s banned\n"),
+                              GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                              GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                              pos_channel,
+                              GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                              GUI_COLOR(COLOR_WIN_CHAT_HOST),
+                              pos_ban,
+                              GUI_COLOR(COLOR_WIN_CHAT));
     }    
     return 0;
 }
@@ -4644,10 +4597,13 @@ irc_cmd_recv_368 (t_irc_server *server, char *host, char *nick, char *arguments)
     if (!command_ignored)
     {
         irc_display_prefix (server, buffer, PREFIX_INFO);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
-        gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_channel);
-        gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
-        gui_printf_nolog (buffer, "%s\n", pos_msg);
+        gui_printf_nolog (buffer, "%s[%s%s%s] %s%s\n",
+                          GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                          GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                          pos_channel,
+                          GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                          GUI_COLOR(COLOR_WIN_CHAT),
+                          pos_msg);
     }    
     return 0;
 }
@@ -4796,14 +4752,13 @@ irc_cmd_recv_671 (t_irc_server *server, char *host, char *nick, char *arguments)
                     pos_message++;
                 
                 irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "[");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_NICK, "%s", pos_nick);
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT_DARK, "] ");
-                gui_printf_color (server->buffer,
-                                  COLOR_WIN_CHAT, "%s\n", pos_message);
+                gui_printf (server->buffer, "%s[%s%s%s] %s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                            pos_nick,
+                            GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_message);
             }
         }
     }
diff --git a/weechat/src/irc/irc-send.c b/weechat/src/irc/irc-send.c
index fea02fbbe..2581b21a3 100644
--- a/weechat/src/irc/irc-send.c
+++ b/weechat/src/irc/irc-send.c
@@ -110,11 +110,11 @@ irc_cmd_send_ame (t_irc_server *server, char *arguments)
                                   ptr_channel->name,
                                   (arguments && arguments[0]) ? arguments : "");
                     irc_display_prefix (NULL, ptr_channel->buffer, PREFIX_ACTION_ME);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT_NICK, "%s", ptr_server->nick);
-                    gui_printf_color (ptr_channel->buffer,
-                                      COLOR_WIN_CHAT, " %s\n",
-                                      (arguments && arguments[0]) ? arguments : "");
+                    gui_printf (ptr_channel->buffer, "%s%s %s%s\n",
+                                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                ptr_server->nick,
+                                GUI_COLOR(COLOR_WIN_CHAT),
+                                (arguments && arguments[0]) ? arguments : "");
                 }
             }
         }
@@ -157,8 +157,7 @@ irc_cmd_send_amsg (t_irc_server *server, char *arguments)
                         {
                             irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
                                               MSG_TYPE_NICK, 1, 1, 0);
-                            gui_printf_color (ptr_channel->buffer,
-                                              COLOR_WIN_CHAT, "%s\n", arguments);   
+                            gui_printf (ptr_channel->buffer, "%s\n", arguments);   
                         }
                         else
                         {
@@ -401,20 +400,23 @@ irc_cmd_send_ctcp (t_irc_server *server, char *arguments)
         }
 
         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT, "CTCP");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "(");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, ")");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": ");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_CHANNEL, "%s", pos_type);
+        gui_printf (server->buffer, "CTCP%s(%s%s%s)%s: %s%s",
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    arguments,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
+                    pos_type);
         
         if ((ascii_strcasecmp (pos_type, "ping") == 0) && (!pos_args))
         {
             gettimeofday (&tv, &tz);
             server_sendf (server, "PRIVMSG %s :\01PING %d %d\01\r\n",
                           arguments, tv.tv_sec, tv.tv_usec);
-            gui_printf_color (server->buffer, COLOR_WIN_CHAT, " %d %d\n",
-                              tv.tv_sec, tv.tv_usec);
+            gui_printf (server->buffer, " %s%d %d\n",
+                        GUI_COLOR(COLOR_WIN_CHAT),
+                        tv.tv_sec, tv.tv_usec);
         }
         else
         {
@@ -422,8 +424,9 @@ irc_cmd_send_ctcp (t_irc_server *server, char *arguments)
             {
                 server_sendf (server, "PRIVMSG %s :\01%s %s\01\r\n",
                               arguments, pos_type, pos_args);
-                gui_printf_color (server->buffer, COLOR_WIN_CHAT, " %s\n",
-                                  pos_args);
+                gui_printf (server->buffer, " %s%s\n",
+                            GUI_COLOR(COLOR_WIN_CHAT),
+                            pos_args);
             }
             else
             {
@@ -906,11 +909,11 @@ irc_send_me (t_irc_server *server, t_irc_channel *channel, char *arguments)
                   channel->name,
                   (arguments && arguments[0]) ? arguments : "");
     irc_display_prefix (NULL, channel->buffer, PREFIX_ACTION_ME);
-    gui_printf_color (channel->buffer,
-                      COLOR_WIN_CHAT_NICK, "%s", server->nick);
-    gui_printf_color (channel->buffer,
-                      COLOR_WIN_CHAT, " %s\n",
-                      (arguments && arguments[0]) ? arguments : "");
+    gui_printf (channel->buffer, "%s%s %s%s\n",
+                GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                server->nick,
+                GUI_COLOR(COLOR_WIN_CHAT),
+                (arguments && arguments[0]) ? arguments : "");
     return 0;
 }
 
@@ -1020,9 +1023,7 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
                 {
                     irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
                                       MSG_TYPE_NICK, 1, 1, 0);
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_MSG,
-                                           COLOR_WIN_CHAT, "%s\n", pos);
+                    gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG, "%s\n", pos);
                 }
                 else
                 {
@@ -1045,9 +1046,7 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
                         {
                             irc_display_nick (ptr_channel->buffer, ptr_nick, NULL,
                                               MSG_TYPE_NICK, 1, 1, 0);
-                            gui_printf_type_color (ptr_channel->buffer,
-                                                   MSG_TYPE_MSG,
-                                                   COLOR_WIN_CHAT, "%s\n", pos);
+                            gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG, "%s\n", pos);
                         }
                         else
                         {
@@ -1081,17 +1080,15 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
                             }
                         }
                         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-                        gui_printf_type_color (server->buffer,
-                                               MSG_TYPE_NICK,
-                                               COLOR_WIN_CHAT_DARK, "-");
-                        gui_printf_type_color (server->buffer,
-                                               MSG_TYPE_NICK,
-                                               COLOR_WIN_CHAT_NICK, "%s", arguments);
-                        gui_printf_type_color (server->buffer,
-                                               MSG_TYPE_NICK,
-                                               COLOR_WIN_CHAT_DARK, "-");
-                        gui_printf_color (server->buffer,
-                                          COLOR_WIN_CHAT, " %s\n", msg_pwd_hidden);
+                        gui_printf_type (server->buffer, MSG_TYPE_NICK,
+                                         "%s-%s%s%s- ",
+                                         GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                         GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                                         arguments,
+                                         COLOR_WIN_CHAT_DARK);
+                        gui_printf (server->buffer, "%s%s\n",
+                                    GUI_COLOR(COLOR_WIN_CHAT),
+                                    msg_pwd_hidden);
                         server_sendf (server, "PRIVMSG %s :%s\r\n", arguments, pos);
                         free (msg_pwd_hidden);
                         return 0;
@@ -1112,19 +1109,16 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
                         gui_draw_buffer_title (ptr_channel->buffer, 1);
                     }
                         
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_NICK,
-                                           COLOR_WIN_CHAT_DARK, "<");
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_NICK,
-                                           COLOR_WIN_NICK_SELF,
-                                           "%s", server->nick);
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_NICK,
-                                           COLOR_WIN_CHAT_DARK, "> ");
-                    gui_printf_type_color (ptr_channel->buffer,
-                                           MSG_TYPE_MSG,
-                                           COLOR_WIN_CHAT, "%s\n", pos);
+                    gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                                     "%s<%s%s%s> ",
+                                     GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                                     GUI_COLOR(COLOR_WIN_NICK_SELF),
+                                     server->nick,
+                                     GUI_COLOR(COLOR_WIN_CHAT_DARK));
+                    gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG,
+                                     "%s%s\n",
+                                     GUI_COLOR(COLOR_WIN_CHAT),
+                                     pos);
                     server_sendf (server, "PRIVMSG %s :%s\r\n", arguments, pos);
                 }
             }
@@ -1217,11 +1211,13 @@ irc_cmd_send_notice (t_irc_server *server, char *arguments)
         while (pos[0] == ' ')
             pos++;
         irc_display_prefix (server, server->buffer, PREFIX_SERVER);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT, "notice");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, "(");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_NICK, "%s", arguments);
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT_DARK, ")");
-        gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": %s\n", pos);
+        gui_printf (server->buffer, "notice%s(%s%s%s)%s: %s\n",
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT_NICK),
+                    arguments,
+                    GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                    GUI_COLOR(COLOR_WIN_CHAT),
+                    pos);
         server_sendf (server, "NOTICE %s :%s\r\n", arguments, pos);
     }
     else
@@ -1435,19 +1431,16 @@ irc_cmd_send_query (t_irc_server *server, char *arguments)
     /* display text if given */
     if (pos)
     {        
-        gui_printf_type_color (ptr_channel->buffer,
-                               MSG_TYPE_NICK,
-                               COLOR_WIN_CHAT_DARK, "<");
-        gui_printf_type_color (ptr_channel->buffer,
-                                MSG_TYPE_NICK,
-                                COLOR_WIN_NICK_SELF,
-                                "%s", server->nick);
-        gui_printf_type_color (ptr_channel->buffer,
-                                MSG_TYPE_NICK,
-                                COLOR_WIN_CHAT_DARK, "> ");
-        gui_printf_type_color (ptr_channel->buffer,
-                                MSG_TYPE_MSG,
-                                COLOR_WIN_CHAT, "%s\n", pos);
+        gui_printf_type (ptr_channel->buffer, MSG_TYPE_NICK,
+                         "%s<%s%s%s> ",
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK),
+                         GUI_COLOR(COLOR_WIN_NICK_SELF),
+                         server->nick,
+                         GUI_COLOR(COLOR_WIN_CHAT_DARK));
+        gui_printf_type (ptr_channel->buffer, MSG_TYPE_MSG,
+                         "%s\n",
+                         GUI_COLOR(COLOR_WIN_CHAT),
+                         pos);
         server_sendf (server, "PRIVMSG %s :%s\r\n", arguments, pos);
     }
     return 0;
diff --git a/weechat/src/irc/irc-server.c b/weechat/src/irc/irc-server.c
index 5cce3faa5..ea2f2d777 100644
--- a/weechat/src/irc/irc-server.c
+++ b/weechat/src/irc/irc-server.c
@@ -672,7 +672,7 @@ server_msgq_flush ()
                         irc_display_prefix (recv_msgq->server,
                                             recv_msgq->server->buffer, PREFIX_ERROR);
                         gui_printf (recv_msgq->server->buffer,
-                                    _("%s Command '%s' failed!\n"), WEECHAT_ERROR, command);
+                                    _("%s Command \"%s\" failed!\n"), WEECHAT_ERROR, command);
                         break;
                     case -2:
                         irc_display_prefix (recv_msgq->server,
@@ -684,7 +684,7 @@ server_msgq_flush ()
                         irc_display_prefix (recv_msgq->server,
                                             recv_msgq->server->buffer, PREFIX_ERROR);
                         gui_printf (recv_msgq->server->buffer,
-                                    _("%s Unknown command: cmd=%s, host=%s, args=%s\n"),
+                                    _("%s Unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"),
                                     WEECHAT_WARNING, command, host, args);
                         break;
                 }
diff --git a/weechat/src/plugins/plugins-interface.c b/weechat/src/plugins/plugins-interface.c
index 66728d611..b65cdb540 100644
--- a/weechat/src/plugins/plugins-interface.c
+++ b/weechat/src/plugins/plugins-interface.c
@@ -482,7 +482,7 @@ weechat_plugin_get_config_str_value (t_config_option *option, void *value)
             return option->array_values[*((int *)value)];
             break;
         case OPTION_TYPE_COLOR:
-            color_name = gui_get_color_by_value (*((int *)value));
+            color_name = gui_get_color_name (*((int *)value));
             return (color_name) ? strdup (color_name) : strdup ("");
             break;
         case OPTION_TYPE_STRING: