24 files changed, 1240 insertions, 1164 deletions

diff --git a/doc/buildxml.pl b/doc/buildxml.pl
index 479fbed75..f56419774 100755
--- a/doc/buildxml.pl
+++ b/doc/buildxml.pl
@@ -32,7 +32,7 @@
                   "en_US" => "values",
                   "es_ES" => "valores");
 %all_default   = ("fr_FR" => "valeur par défaut",
-                  "en_US" => "default values",
+                  "en_US" => "default value",
                   "es_ES" => "valor por defecto");
 %all_desc      = ("fr_FR" => "description",
                   "en_US" => "description",
diff --git a/doc/en/config.xml b/doc/en/config.xml
index 460117f99..21864ad44 100644
--- a/doc/en/config.xml
+++ b/doc/en/config.xml
@@ -9,1175 +9,1175 @@
   <entry><option>look_set_title</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Set title for window (terminal for Curses GUI) with name and version</entry>
 </row>
 <row>
   <entry><option>look_startup_logo</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Display WeeChat logo at startup</entry>
 </row>
 <row>
   <entry><option>look_startup_version</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Display WeeChat version at startup</entry>
 </row>
 <row>
   <entry><option>look_weechat_slogan</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'the geekest IRC client!'</entry>
   <entry>WeeChat slogan (if empty, slogan is not used)</entry>
 </row>
 <row>
   <entry><option>look_charset_decode_iso</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'ISO-8859-1'</entry>
   <entry>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</entry>
 </row>
 <row>
   <entry><option>look_charset_decode_utf</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'UTF-8'</entry>
   <entry>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</entry>
 </row>
 <row>
   <entry><option>look_charset_encode</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Charset for encoding messages sent to server, examples: UFT-8, ISO-8859-1 (if empty, messages are not converted)</entry>
 </row>
 <row>
   <entry><option>look_charset_internal</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Forces internal WeeChat charset (should be empty in most cases, that means detected charset is used)</entry>
 </row>
 <row>
   <entry><option>look_one_server_buffer</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Use same buffer for all servers</entry>
 </row>
 <row>
   <entry><option>look_open_near_server</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Open new channels/privates near server</entry>
 </row>
 <row>
   <entry><option>look_scroll_amount</option></entry>
   <entry>integer</entry>
   <entry>between 1 and 2147483647</entry>
-  <entry></entry>
+  <entry>3</entry>
   <entry>How many lines to scroll by with scroll_up and scroll_down</entry>
 </row>
 <row>
   <entry><option>look_buffer_timestamp</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'[%H:%M:%S]'</entry>
   <entry>Timestamp for buffers</entry>
 </row>
 <row>
   <entry><option>look_color_nicks_number</option></entry>
   <entry>integer</entry>
   <entry>between 1 and 10</entry>
-  <entry></entry>
+  <entry>10</entry>
   <entry>Number of colors to use for nicks colors</entry>
 </row>
 <row>
   <entry><option>look_color_actions</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Display actions with different colors</entry>
 </row>
 <row>
   <entry><option>look_nicklist</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Display nicklist window (for channel windows)</entry>
 </row>
 <row>
   <entry><option>look_nicklist_position</option></entry>
   <entry>string</entry>
   <entry>'left', 'right', 'top', 'bottom'</entry>
-  <entry></entry>
+  <entry>'right'</entry>
   <entry>Nicklist position (top, left, right (default), bottom)</entry>
 </row>
 <row>
   <entry><option>look_nicklist_min_size</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 100</entry>
-  <entry></entry>
+  <entry>0</entry>
   <entry>Min size for nicklist (width or height, depending on look_nicklist_position (0 = no min size))</entry>
 </row>
 <row>
   <entry><option>look_nicklist_max_size</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 100</entry>
-  <entry></entry>
+  <entry>0</entry>
   <entry>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))</entry>
 </row>
 <row>
   <entry><option>look_no_nickname</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'-cmd-'</entry>
   <entry>Text to display instead of nick when not connected</entry>
 </row>
 <row>
   <entry><option>look_nickmode</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Display nick mode ((half)op/voice) before each nick</entry>
 </row>
 <row>
   <entry><option>look_nickmode_empty</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Display space if nick mode is not (half)op/voice</entry>
 </row>
 <row>
   <entry><option>look_nick_completor</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>':'</entry>
   <entry>The string inserted after nick completion</entry>
 </row>
 <row>
   <entry><option>look_nick_completion_ignore</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'[]-^'</entry>
   <entry>Chars ignored for nick completion</entry>
 </row>
 <row>
   <entry><option>look_nick_complete_first</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Complete only with first nick found</entry>
 </row>
 <row>
   <entry><option>look_infobar</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Enable info bar</entry>
 </row>
 <row>
   <entry><option>look_infobar_timestamp</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'%B, %A %d %Y'</entry>
   <entry>Timestamp for time in infobar</entry>
 </row>
 <row>
   <entry><option>look_infobar_seconds</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Display seconds in infobar time</entry>
 </row>
 <row>
   <entry><option>look_infobar_delay_highlight</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 2147483647</entry>
-  <entry></entry>
+  <entry>7</entry>
   <entry>Delay (in seconds) for highlight messages in infobar (0 = disable highlight notifications in infobar)</entry>
 </row>
 <row>
   <entry><option>look_hotlist_names_count</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 32</entry>
-  <entry></entry>
+  <entry>3</entry>
   <entry>Max number of names in hotlist (0 = no name displayed, only buffer numbers)</entry>
 </row>
 <row>
   <entry><option>look_hotlist_names_level</option></entry>
   <entry>integer</entry>
   <entry>between 1 and 15</entry>
-  <entry></entry>
+  <entry>12</entry>
   <entry>Level for displaying names in hotlist (combination of: 1=join/part, 2=message, 4=private, 8=highlight, for example: 12=private+highlight)</entry>
 </row>
 <row>
   <entry><option>look_hotlist_names_length</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 32</entry>
-  <entry></entry>
+  <entry>0</entry>
   <entry>Max length of names in hotlist (0 = no limit)</entry>
 </row>
 <row>
   <entry><option>look_day_change</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Display special message when day changes</entry>
 </row>
 <row>
   <entry><option>look_day_change_timestamp</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'%a, %d %b %Y'</entry>
   <entry>Timestamp for date displayed when day changed</entry>
 </row>
 <row>
   <entry><option>look_read_marker</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>' '</entry>
   <entry>Use a marker on servers/channels to show first unread line</entry>
 </row>
 <row>
   <entry><option>col_real_white</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>If set, uses real white color, disabled by default for terms with white background (if you never use white background, you should turn on this option to see real white instead of default term foreground color)</entry>
 </row>
 <row>
   <entry><option>col_separator</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'blue'</entry>
   <entry>Color for window separators (when splited)</entry>
 </row>
 <row>
   <entry><option>col_title</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for title bar</entry>
 </row>
 <row>
   <entry><option>col_title_bg</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'blue'</entry>
   <entry>Background for title bar</entry>
 </row>
 <row>
   <entry><option>col_chat</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for chat text</entry>
 </row>
 <row>
   <entry><option>col_chat_time</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for time in chat window</entry>
 </row>
 <row>
   <entry><option>col_chat_time_sep</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'brown'</entry>
   <entry>Color for time separator (chat window)</entry>
 </row>
 <row>
   <entry><option>col_chat_prefix1</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightcyan'</entry>
   <entry>Color for 1st and 3rd char of prefix</entry>
 </row>
 <row>
   <entry><option>col_chat_prefix2</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'white'</entry>
   <entry>Color for middle char of prefix</entry>
 </row>
 <row>
   <entry><option>col_chat_server</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'brown'</entry>
   <entry>Color for server name</entry>
 </row>
 <row>
   <entry><option>col_chat_join</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightgreen'</entry>
   <entry>Color for join arrow (prefix)</entry>
 </row>
 <row>
   <entry><option>col_chat_part</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightred'</entry>
   <entry>Color for part/quit arrow (prefix)</entry>
 </row>
 <row>
   <entry><option>col_chat_nick</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightcyan'</entry>
   <entry>Color for nicks in actions (chat window)</entry>
 </row>
 <row>
   <entry><option>col_chat_host</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'cyan'</entry>
   <entry>Color for hostnames (chat window)</entry>
 </row>
 <row>
   <entry><option>col_chat_channel</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'white'</entry>
   <entry>Color for channel names in actions (chat window)</entry>
 </row>
 <row>
   <entry><option>col_chat_dark</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'green'</entry>
   <entry>Color for dark separators (chat window)</entry>
 </row>
 <row>
   <entry><option>col_chat_highlight</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'yellow'</entry>
   <entry>Color for highlighted nick (chat window)</entry>
 </row>
 <row>
   <entry><option>col_chat_bg</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Background for chat window</entry>
 </row>
 <row>
   <entry><option>col_chat_read_marker</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'yellow'</entry>
   <entry>Color for unread data marker</entry>
 </row>
 <row>
   <entry><option>col_chat_read_marker_bg</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'magenta'</entry>
   <entry>Background for unread data marker</entry>
 </row>
 <row>
   <entry><option>col_status</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for status bar</entry>
 </row>
 <row>
   <entry><option>col_status_delimiters</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'cyan'</entry>
   <entry>Color for status bar delimiters</entry>
 </row>
 <row>
   <entry><option>col_status_channel</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'white'</entry>
   <entry>Color for current channel in status bar</entry>
 </row>
 <row>
   <entry><option>col_status_data_msg</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'yellow'</entry>
   <entry>Color for window with new messages (status bar)</entry>
 </row>
 <row>
   <entry><option>col_status_private</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightmagenta'</entry>
   <entry>Color for window with private message (status bar)</entry>
 </row>
 <row>
   <entry><option>col_status_highlight</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightred'</entry>
   <entry>Color for window with highlight (status bar)</entry>
 </row>
 <row>
   <entry><option>col_status_data_other</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for window with new data (not messages) (status bar)</entry>
 </row>
 <row>
   <entry><option>col_status_more</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'white'</entry>
   <entry>Color for window with new data (status bar)</entry>
 </row>
 <row>
   <entry><option>col_status_bg</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'blue'</entry>
   <entry>Background for status window</entry>
 </row>
 <row>
   <entry><option>col_infobar</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'black'</entry>
   <entry>Color for info bar text</entry>
 </row>
 <row>
   <entry><option>col_infobar_delimiters</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'blue'</entry>
   <entry>Color for infobar delimiters</entry>
 </row>
 <row>
   <entry><option>col_infobar_highlight</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'white'</entry>
   <entry>Color for info bar highlight notification</entry>
 </row>
 <row>
   <entry><option>col_infobar_bg</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'cyan'</entry>
   <entry>Background for info bar window</entry>
 </row>
 <row>
   <entry><option>col_input</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for input text</entry>
 </row>
 <row>
   <entry><option>col_input_channel</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'white'</entry>
   <entry>Color for input text (channel name)</entry>
 </row>
 <row>
   <entry><option>col_input_nick</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightcyan'</entry>
   <entry>Color for input text (nick name)</entry>
 </row>
 <row>
   <entry><option>col_input_delimiters</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'cyan'</entry>
   <entry>Color for input text (delimiters)</entry>
 </row>
 <row>
   <entry><option>col_input_bg</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Background for input window</entry>
 </row>
 <row>
   <entry><option>col_nick</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for nicknames</entry>
 </row>
 <row>
   <entry><option>col_nick_away</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'cyan'</entry>
   <entry>Color for away nicknames</entry>
 </row>
 <row>
   <entry><option>col_nick_chanowner</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightgreen'</entry>
   <entry>Color for chan owner symbol (specific to unrealircd)</entry>
 </row>
 <row>
   <entry><option>col_nick_chanadmin</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightgreen'</entry>
   <entry>Color for chan admin symbol (specific to unrealircd)</entry>
 </row>
 <row>
   <entry><option>col_nick_op</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightgreen'</entry>
   <entry>Color for operator symbol</entry>
 </row>
 <row>
   <entry><option>col_nick_halfop</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightmagenta'</entry>
   <entry>Color for half-operator symbol</entry>
 </row>
 <row>
   <entry><option>col_nick_voice</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'yellow'</entry>
   <entry>Color for voice symbol</entry>
 </row>
 <row>
   <entry><option>col_nick_more</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightmagenta'</entry>
   <entry>Color for '+' when scrolling nicks</entry>
 </row>
 <row>
   <entry><option>col_nick_sep</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'blue'</entry>
   <entry>Color for nick separator</entry>
 </row>
 <row>
   <entry><option>col_nick_self</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'white'</entry>
   <entry>Color for local nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color1</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'cyan'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color2</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'magenta'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color3</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'green'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color4</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'brown'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color5</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightblue'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color6</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color7</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightcyan'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color8</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightmagenta'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color9</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightgreen'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color10</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'blue'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_private</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for other nick in private window</entry>
 </row>
 <row>
   <entry><option>col_nick_bg</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Background for nicknames</entry>
 </row>
 <row>
   <entry><option>col_chat_dcc_selected</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'white'</entry>
   <entry>Color for selected DCC (chat window)</entry>
 </row>
 <row>
   <entry><option>col_dcc_waiting</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightcyan'</entry>
   <entry>Color for "waiting" dcc status</entry>
 </row>
 <row>
   <entry><option>col_dcc_connecting</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'yellow'</entry>
   <entry>Color for "connecting" dcc status</entry>
 </row>
 <row>
   <entry><option>col_dcc_active</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightblue'</entry>
   <entry>Color for "active" dcc status</entry>
 </row>
 <row>
   <entry><option>col_dcc_done</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightgreen'</entry>
   <entry>Color for "done" dcc status</entry>
 </row>
 <row>
   <entry><option>col_dcc_failed</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightred'</entry>
   <entry>Color for "failed" dcc status</entry>
 </row>
 <row>
   <entry><option>col_dcc_aborted</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightred'</entry>
   <entry>Color for "aborted" dcc status</entry>
 </row>
 <row>
   <entry><option>history_max_lines</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 2147483647</entry>
-  <entry></entry>
+  <entry>4096</entry>
   <entry>Maximum number of lines in history for one server/channel/private window (0 = unlimited)</entry>
 </row>
 <row>
   <entry><option>history_max_commands</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 2147483647</entry>
-  <entry></entry>
+  <entry>100</entry>
   <entry>Maximum number of user commands in history (0 = unlimited)</entry>
 </row>
 <row>
   <entry><option>history_display_default</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 2147483647</entry>
-  <entry></entry>
+  <entry>5</entry>
   <entry>Maximum number of commands to display by default in history listing (0 = unlimited)</entry>
 </row>
 <row>
   <entry><option>log_auto_server</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Automatically log server messages</entry>
 </row>
 <row>
   <entry><option>log_auto_channel</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Automatically log channel chats</entry>
 </row>
 <row>
   <entry><option>log_auto_private</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Automatically log private chats</entry>
 </row>
 <row>
   <entry><option>log_plugin_msg</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Log messages from plugins (scripts)</entry>
 </row>
 <row>
   <entry><option>log_path</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'%h/logs/'</entry>
   <entry>Path for WeeChat log files ('%h' will be replaced by WeeChat home, ~/.weechat by default)</entry>
 </row>
 <row>
   <entry><option>log_timestamp</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'%Y %b %d %H:%M:%S'</entry>
   <entry>Timestamp for log (see man strftime for date/time specifiers)</entry>
 </row>
 <row>
   <entry><option>log_hide_nickserv_pwd</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Hide password displayed by nickserv</entry>
 </row>
 <row>
   <entry><option>irc_display_away</option></entry>
   <entry>string</entry>
   <entry>'off', 'local', 'channel'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Display message when (un)marking as away</entry>
 </row>
 <row>
   <entry><option>irc_show_away_once</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Show remote away message only once in private</entry>
 </row>
 <row>
   <entry><option>irc_default_msg_part</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'WeeChat %v'</entry>
   <entry>Default part message (leaving channel) ('%v' will be replaced by WeeChat version in string)</entry>
 </row>
 <row>
   <entry><option>irc_default_msg_quit</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'WeeChat %v'</entry>
   <entry>Default quit message ('%v' will be replaced by WeeChat version in string)</entry>
 </row>
 <row>
   <entry><option>irc_notice_as_pv</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Display notices as private messages</entry>
 </row>
 <row>
   <entry><option>irc_away_check</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 2147483647</entry>
-  <entry></entry>
+  <entry>0</entry>
   <entry>Interval between two checks for away (in minutes, 0 = never check)</entry>
 </row>
 <row>
   <entry><option>irc_away_check_max_nicks</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 2147483647</entry>
-  <entry></entry>
+  <entry>0</entry>
   <entry>Do not check away nicks on channels with high number of nicks (0 = unlimited)</entry>
 </row>
 <row>
   <entry><option>irc_lag_check</option></entry>
   <entry>integer</entry>
   <entry>between 30 and 2147483647</entry>
-  <entry></entry>
+  <entry>60</entry>
   <entry>Interval between two checks for lag (in seconds)</entry>
 </row>
 <row>
   <entry><option>irc_lag_min_show</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 2147483647</entry>
-  <entry></entry>
+  <entry>1</entry>
   <entry>Minimum lag to show (in seconds)</entry>
 </row>
 <row>
   <entry><option>irc_lag_disconnect</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 2147483647</entry>
-  <entry></entry>
+  <entry>5</entry>
   <entry>Disconnect after important lag (in minutes, 0 = never disconnect)</entry>
 </row>
 <row>
   <entry><option>irc_fifo_pipe</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Create a FIFO pipe for remote control</entry>
 </row>
 <row>
   <entry><option>irc_highlight</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Comma separated list of words to highlight (case insensitive comparison, words may begin or end with "*" for partial match)</entry>
 </row>
 <row>
   <entry><option>irc_colors_receive</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>When off, colors codes are ignored in incoming messages</entry>
 </row>
 <row>
   <entry><option>irc_colors_send</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %U=underline, %R=reverse)</entry>
 </row>
 <row>
   <entry><option>dcc_auto_accept_files</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Automatically accept incoming dcc files</entry>
 </row>
 <row>
   <entry><option>dcc_auto_accept_chats</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Automatically accept dcc chats (use carefully!)</entry>
 </row>
 <row>
   <entry><option>dcc_timeout</option></entry>
   <entry>integer</entry>
   <entry>between 1 and 2147483647</entry>
-  <entry></entry>
+  <entry>300</entry>
   <entry>Timeout for dcc request (in seconds)</entry>
 </row>
 <row>
   <entry><option>dcc_blocksize</option></entry>
   <entry>integer</entry>
   <entry>between 1024 and 102400</entry>
-  <entry></entry>
+  <entry>65536</entry>
   <entry>Block size for dcc packets in bytes (default: 65536)</entry>
 </row>
 <row>
   <entry><option>dcc_port_range</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>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)</entry>
 </row>
 <row>
   <entry><option>dcc_own_ip</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>IP or DNS address used for outgoing dcc (if empty, local interface IP is used)</entry>
 </row>
 <row>
   <entry><option>dcc_download_path</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'%h/dcc'</entry>
   <entry>Path for writing incoming files with dcc (default: user home)</entry>
 </row>
 <row>
   <entry><option>dcc_upload_path</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'~'</entry>
   <entry>Path for reading files when sending thru dcc (when no path is specified)</entry>
 </row>
 <row>
   <entry><option>dcc_convert_spaces</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Convert spaces to underscores when sending files</entry>
 </row>
 <row>
   <entry><option>dcc_auto_rename</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Rename incoming files if already exists (add '.1', '.2', ...)</entry>
 </row>
 <row>
   <entry><option>dcc_auto_resume</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Automatically resume dcc transfer if connection with remote host is loosed</entry>
 </row>
 <row>
   <entry><option>proxy_use</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Use a proxy server to connect to irc server</entry>
 </row>
 <row>
   <entry><option>proxy_type</option></entry>
   <entry>string</entry>
   <entry>'http', 'socks4', 'socks5'</entry>
-  <entry></entry>
+  <entry>'http'</entry>
   <entry>Proxy type (http (default), socks4, socks5)</entry>
 </row>
 <row>
   <entry><option>proxy_ipv6</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Connect to proxy in ipv6</entry>
 </row>
 <row>
   <entry><option>proxy_address</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Proxy server address (IP or hostname)</entry>
 </row>
 <row>
   <entry><option>proxy_port</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 65535</entry>
-  <entry></entry>
+  <entry>3128</entry>
   <entry>Port for connecting to proxy server</entry>
 </row>
 <row>
   <entry><option>proxy_username</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Username for proxy server</entry>
 </row>
 <row>
   <entry><option>proxy_password</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Password for proxy server</entry>
 </row>
 <row>
   <entry><option>plugins_path</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'%h/plugins'</entry>
   <entry>Path for searching plugins ('%h' will be replaced by WeeChat home, ~/.weechat by default)</entry>
 </row>
 <row>
   <entry><option>plugins_autoload</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'*'</entry>
   <entry>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")</entry>
 </row>
 <row>
   <entry><option>plugins_extension</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'.so'</entry>
   <entry>Standard plugins extension in filename, used for autoload (if empty, then all files are loaded when autoload is "*")</entry>
 </row>
 <row>
   <entry><option>server_name</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Name associated to IRC server (for display only)</entry>
 </row>
 <row>
   <entry><option>server_autoconnect</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Automatically connect to server when WeeChat is starting</entry>
 </row>
 <row>
   <entry><option>server_autoreconnect</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Automatically reconnect to server when disconnected</entry>
 </row>
 <row>
   <entry><option>server_autoreconnect_delay</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 65535</entry>
-  <entry></entry>
+  <entry>30</entry>
   <entry>Delay (in seconds) before trying again to reconnect to server</entry>
 </row>
 <row>
   <entry><option>server_address</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>IP address or hostname of IRC server</entry>
 </row>
 <row>
   <entry><option>server_port</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 65535</entry>
-  <entry></entry>
+  <entry>6667</entry>
   <entry>Port for connecting to server</entry>
 </row>
 <row>
   <entry><option>server_ipv6</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Use IPv6 protocol for server communication</entry>
 </row>
 <row>
   <entry><option>server_ssl</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Use SSL for server communication</entry>
 </row>
 <row>
   <entry><option>server_password</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Password for IRC server</entry>
 </row>
 <row>
   <entry><option>server_nick1</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Nickname to use on IRC server</entry>
 </row>
 <row>
   <entry><option>server_nick2</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Alternate nickname to use on IRC server (if nickname is already used)</entry>
 </row>
 <row>
   <entry><option>server_nick3</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>2nd alternate nickname to use on IRC server (if alternate nickname is already used)</entry>
 </row>
 <row>
   <entry><option>server_username</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>User name to use on IRC server</entry>
 </row>
 <row>
   <entry><option>server_realname</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Real name to use on IRC server</entry>
 </row>
 <row>
   <entry><option>server_command</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Command(s) to run when connected to server (many commands should be separated by ';', use '\;' for a semicolon)</entry>
 </row>
 <row>
   <entry><option>server_command_delay</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 5</entry>
-  <entry></entry>
+  <entry>0</entry>
   <entry>Delay (in seconds) after command was executed (example: give some time for authentication)</entry>
 </row>
 <row>
   <entry><option>server_autojoin</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Comma separated list of channels to join when connected to server (example: "#chan1,#chan2,#chan3 key1,key2")</entry>
 </row>
 <row>
   <entry><option>server_autorejoin</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Automatically rejoin channels when kicked</entry>
 </row>
 <row>
   <entry><option>server_notify_levels</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Comma separated list of notify levels for channels of this server (format: #channel:1,..)</entry>
 </row>
 <row>
   <entry><option>server_charset_decode_iso</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Comma separated list of charsets for server and channels, to decode ISO (format: server:charset,#channel:charset,..)</entry>
 </row>
 <row>
   <entry><option>server_charset_decode_utf</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Comma separated list of charsets for server and channels, to decode UTF (format: server:charset,#channel:charset,..)</entry>
 </row>
 <row>
   <entry><option>server_charset_encode</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Comma separated list of charsets for server and channels, to encode messages (format: server:charset,#channel:charset,..)</entry>
 </row>
diff --git a/doc/fr/config.xml b/doc/fr/config.xml
index 6ca2ed83f..f5f621c9a 100644
--- a/doc/fr/config.xml
+++ b/doc/fr/config.xml
@@ -926,7 +926,7 @@
   <entry><option>dcc_download_path</option></entry>
   <entry>chaîne</entry>
   <entry>toute chaîne</entry>
-  <entry>'~'</entry>
+  <entry>'%h/dcc'</entry>
   <entry>Chemin pour écrire les fichiers reçus par dcc (par défaut: répertoire de l'utilisateur)</entry>
 </row>
 <row>
diff --git a/po/cs.po b/po/cs.po
index 29b61345d..6a6a3c19a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.8-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-03-03 11:15+0100\n"
+"POT-Creation-Date: 2006-03-04 16:18+0100\n"
 "PO-Revision-Date: 2006-02-22 10:26+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1939,38 +1939,38 @@ msgstr "Selhal"
 msgid "Aborted"
 msgstr "Zrušeno"
 
-#: src/irc/irc-dcc.c:383
+#: src/irc/irc-dcc.c:388
 #, c-format
 msgid "DCC: file %s%s%s"
 msgstr "DCC: soubor %s%s%s"
 
-#: src/irc/irc-dcc.c:389
+#: src/irc/irc-dcc.c:394
 #, c-format
 msgid " (local filename: %s%s%s)"
 msgstr " (lokální jmého souboru: %s%s%s)"
 
-#: src/irc/irc-dcc.c:394
+#: src/irc/irc-dcc.c:399
 msgid " sent to "
 msgstr " poslán "
 
-#: src/irc/irc-dcc.c:396
+#: src/irc/irc-dcc.c:401
 msgid " received from "
 msgstr " obdrĹľen od "
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "OK"
 msgstr "OK"
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "FAILED"
 msgstr "SELHALO"
 
-#: src/irc/irc-dcc.c:414
+#: src/irc/irc-dcc.c:419
 #, c-format
 msgid "DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"
 msgstr "DCC rozhovor zavřen s %s%s %s(%s%d.%d.%d.%d%s)\n"
 
-#: src/irc/irc-dcc.c:474
+#: src/irc/irc-dcc.c:479
 #, c-format
 msgid ""
 "%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1979,17 +1979,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:485
+#: src/irc/irc-dcc.c:490
 #, c-format
 msgid "Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"
 msgstr "Připojeno na %s%s %s(%s%d.%d.%d.%d.%s)%s přes DCC rozhovor\n"
 
-#: src/irc/irc-dcc.c:585
+#: src/irc/irc-dcc.c:590
 #, c-format
 msgid "DCC: file %s%s%s resumed at position %u\n"
 msgstr "DCC: soubor %s%s%s bude obnoven na pozici %u\n"
 
-#: src/irc/irc-dcc.c:594 src/irc/irc-dcc.c:619
+#: src/irc/irc-dcc.c:599 src/irc/irc-dcc.c:624
 #, c-format
 msgid ""
 "%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
@@ -1998,23 +1998,23 @@ msgstr ""
 "%s nemohu obnovit soubor \"%s\" (port: %d, počáteční pozice: %u): DCC "
 "nenalezeno nebo ukonÄŤeno\n"
 
-#: src/irc/irc-dcc.c:686
+#: src/irc/irc-dcc.c:691
 #, 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:705
+#: src/irc/irc-dcc.c:710
 msgid "DCC chat"
 msgstr "DCC rozhovor"
 
-#: src/irc/irc-dcc.c:732
+#: src/irc/irc-dcc.c:737
 #, 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 ""
 "Příchozí DCC soubor od %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s bytů\n"
 
-#: src/irc/irc-dcc.c:755
+#: src/irc/irc-dcc.c:760
 #, c-format
 msgid ""
 "Sending DCC file to %s%s%s: %s%s%s (local filename: %s%s%s), %s%lu%s bytes\n"
@@ -2022,17 +2022,17 @@ msgstr ""
 "Posílám DCC soubor k %s%s%s: %s%s%s (lokální jméno souboru: %s%s%s), %s%lu%s "
 "bytĹŻ\n"
 
-#: src/irc/irc-dcc.c:775
+#: src/irc/irc-dcc.c:780
 #, 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 %s%s%s (%s%d.%d.%d.%d%s)\n"
 
-#: src/irc/irc-dcc.c:792
+#: src/irc/irc-dcc.c:797
 #, c-format
 msgid "Sending DCC chat request to %s%s\n"
 msgstr "Posílám požadavek DCC rozhovoru na %s%s\n"
 
-#: src/irc/irc-dcc.c:810
+#: src/irc/irc-dcc.c:815
 #, c-format
 msgid ""
 "DCC: file %s%s%s (local filename: %s%s%s) will be resumed at position %u\n"
@@ -2040,47 +2040,47 @@ msgstr ""
 "DCC: soubor %s%s%s (lokální jméno souboru: %s%s%s) bude obnoven na pozici %"
 "u\n"
 
-#: src/irc/irc-dcc.c:885
+#: src/irc/irc-dcc.c:895
 #, c-format
 msgid "%s not enough memory for DCC SEND\n"
 msgstr "%s nedostatek pameti pro DCC SEND\n"
 
-#: src/irc/irc-dcc.c:907
+#: src/irc/irc-dcc.c:915
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr "%s nemohu přistupovat k souboru \"%s\"\n"
 
-#: src/irc/irc-dcc.c:929
+#: src/irc/irc-dcc.c:937
 #, c-format
 msgid "%s could not find address for '%s'. Falling back to local IP.\n"
 msgstr "%s nemůžu najíž adresu pro '%s'. Navracím se k lokální IP.\n"
 
-#: src/irc/irc-dcc.c:949
+#: src/irc/irc-dcc.c:957
 #, c-format
 msgid "%s cannot create socket for DCC\n"
 msgstr "%s nemohu vytvořit soket pro DCC\n"
 
-#: src/irc/irc-dcc.c:1007
+#: src/irc/irc-dcc.c:1015
 #, c-format
 msgid "%s cannot find available port for DCC\n"
 msgstr "%s nemĹŻĹľu najĂ­t dostupnĂ˝ port pro DCC\n"
 
-#: src/irc/irc-dcc.c:1051
+#: src/irc/irc-dcc.c:1059
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr "%s neomhu poslat DCC\n"
 
-#: src/irc/irc-dcc.c:1131
+#: src/irc/irc-dcc.c:1139
 #, 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:1217
+#: src/irc/irc-dcc.c:1225
 #, c-format
 msgid "Private %s> %s"
 msgstr "SoukromĂ˝ %s> %s"
 
-#: src/irc/irc-dcc.c:1416
+#: src/irc/irc-dcc.c:1424
 #, c-format
 msgid ""
 "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -2089,7 +2089,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:1491
+#: src/irc/irc-dcc.c:1499
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr "Ruším aktivní DCC: \"%s\" od %s\n"
@@ -2263,12 +2263,12 @@ msgstr ""
 msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
 msgstr "%s server/kanál (%s/%s) nenaleyen pro exec příkaz pluginu\n"
 
-#: src/gui/curses/gui-input.c:350
+#: src/gui/curses/gui-input.c:353
 #, c-format
 msgid "Day changed to %s\n"
 msgstr "Změnil se den na %s\n"
 
-#: src/gui/curses/gui-input.c:436
+#: src/gui/curses/gui-input.c:439
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s zpoždění je veliké, odpojuji se od serveru...\n"
@@ -2354,11 +2354,11 @@ msgstr ""
 msgid "server"
 msgstr "server"
 
-#: src/gui/gui-common.c:765
+#: src/gui/gui-common.c:768
 msgid "Not enough memory for new line\n"
 msgstr "Nedostatek paměti pro nový řádek\n"
 
-#: src/gui/gui-common.c:1134
+#: src/gui/gui-common.c:1137
 msgid "Not enough memory for infobar message\n"
 msgstr "Nedostatek paměti pro infobar zprávu\n"
 
@@ -3181,12 +3181,12 @@ msgstr "%s nepřipojen k serveru \"%s\"!\n"
 msgid "Auto-reconnection is cancelled\n"
 msgstr "Automatické znovupřipojené je zrušeno\n"
 
-#: src/common/command.c:1909 src/common/weechat.c:456
+#: src/common/command.c:1909 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "%s vnitřní příkazy:\n"
 
-#: src/common/command.c:1919 src/common/weechat.c:476
+#: src/common/command.c:1919 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr "IRC příkazy:\n"
@@ -3236,7 +3236,7 @@ msgstr "Klávesa \"%s\" odpojena\n"
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s nemohu odpojit klávesu \"%s\"\n"
 
-#: src/common/command.c:2286 src/common/weechat.c:508
+#: src/common/command.c:2286 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Vnitřní klávesové funkce:\n"
@@ -3419,8 +3419,8 @@ msgstr "  . typ boolean (hodnota: 'on' nebo 'off')\n"
 
 #: src/common/command.c:3133 src/common/command.c:3156
 #: src/common/command.c:3162 src/common/command.c:3168
-#: src/common/weechat.c:392 src/common/weechat.c:417 src/common/weechat.c:424
-#: src/common/weechat.c:431
+#: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
+#: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . výchozí hodnota: '%s'\n"
@@ -3430,7 +3430,7 @@ msgstr "  . výchozí hodnota: '%s'\n"
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . typ celoÄŤĂ­selnĂ˝ (hodnoty: mezi %d a %d)\n"
 
-#: src/common/command.c:3141 src/common/weechat.c:401
+#: src/common/command.c:3141 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . výchozí hodnota: %d\n"
@@ -3440,8 +3440,8 @@ msgid "  . type string (values: "
 msgstr "  . typ řetězec (hodnoty: "
 
 #: src/common/command.c:3158 src/common/command.c:3164
-#: src/common/command.c:3170 src/common/weechat.c:419 src/common/weechat.c:426
-#: src/common/weechat.c:433
+#: src/common/command.c:3170 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/weechat.c:436
 msgid "empty"
 msgstr "prázdný"
 
@@ -3453,7 +3453,7 @@ msgstr "  . typ barva (Curses nebo Gtk barva, viz WeeChat dokumentace)\n"
 msgid "  . type string (any string)\n"
 msgstr "  . typ řetězec (jakýkoliv řetězec)\n"
 
-#: src/common/command.c:3173 src/common/weechat.c:436
+#: src/common/command.c:3173 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . popis: %s\n"
@@ -3584,19 +3584,19 @@ 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:127
+#: src/common/log.c:116 src/common/log.c:132
 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:158
+#: src/common/log.c:163
 msgid "Unable to write log file for a buffer\n"
 msgstr "NemĹŻĹľu zapsat log soubor bufferu\n"
 
-#: src/common/log.c:162
+#: src/common/log.c:167
 msgid "****  Beginning of log  "
 msgstr "****  Beginning of log  "
 
-#: src/common/log.c:176
+#: src/common/log.c:181
 msgid "****  End of log  "
 msgstr "****  End of log  "
 
@@ -3910,7 +3910,7 @@ msgstr "%s nemohu smazat soubor se sezenĂ­m (%s)\n"
 msgid "Upgrade completed successfully\n"
 msgstr "Aktualizace dokončena úspěšně\n"
 
-#: src/common/weechat.c:346
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "%s (c) Copyright 2003-2006, compiled on %s %s\n"
@@ -3919,7 +3919,7 @@ msgstr ""
 "%s (c) Copzright 2003-2006, zkompilováno %s %s\n"
 "VyvĂ­jĂ­ FlashCode <flashcode@flashtux.org> - %s"
 
-#: src/common/weechat.c:350
+#: src/common/weechat.c:353
 #, c-format
 msgid ""
 "Usage: %s [options ...]\n"
@@ -3930,7 +3930,7 @@ msgstr ""
 "   nebo: %s [irc[6][s]://[nickname[:password]@]irc.example.org[:port][/"
 "channel][,channel[...]]"
 
-#: src/common/weechat.c:354
+#: src/common/weechat.c:357
 #, c-format
 msgid ""
 "  -a, --no-connect        disable auto-connect to servers at startup\n"
@@ -3958,7 +3958,7 @@ msgstr ""
 "  -v, --version           zobrazĂ­ verzi WeeChat\n"
 "  -w, --weechat-commands  zobrazí příkazy WeeChat\n"
 
-#: src/common/weechat.c:377
+#: src/common/weechat.c:380
 #, c-format
 msgid ""
 "WeeChat configuration options (<weechat_home>/weechat.rc):\n"
@@ -3967,112 +3967,112 @@ msgstr ""
 "WeeChat kofniguraÄŤnĂ­ nastavenĂ­ (<weechat_home>/weechat.rc):\n"
 "\n"
 
-#: src/common/weechat.c:390
+#: src/common/weechat.c:393
 #, c-format
 msgid "  . type: boolean\n"
 msgstr "  . typ: boolean\n"
 
-#: src/common/weechat.c:391
+#: src/common/weechat.c:394
 #, c-format
 msgid "  . values: 'on' or 'off'\n"
 msgstr "  . hodnoty: 'on' or 'off'\n"
 
-#: src/common/weechat.c:397
+#: src/common/weechat.c:400
 #, c-format
 msgid "  . type: integer\n"
 msgstr "  . typ: celoÄŤĂ­selnĂ˝\n"
 
-#: src/common/weechat.c:398
+#: src/common/weechat.c:401
 #, c-format
 msgid "  . values: between %d and %d\n"
 msgstr "  . hodnoty: mezi %d a %d\n"
 
-#: src/common/weechat.c:405 src/common/weechat.c:429
+#: src/common/weechat.c:408 src/common/weechat.c:432
 #, c-format
 msgid "  . type: string\n"
 msgstr "  . typ: řetězec\n"
 
-#: src/common/weechat.c:406
+#: src/common/weechat.c:409
 #, c-format
 msgid "  . values: "
 msgstr "  . hodnoty: "
 
-#: src/common/weechat.c:422
+#: src/common/weechat.c:425
 #, c-format
 msgid "  . type: color\n"
 msgstr "  . typ: barva\n"
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:426
 #, c-format
 msgid "  . values: Curses or Gtk color\n"
 msgstr "  . hodnoty: Curses nebo Gtk barva\n"
 
-#: src/common/weechat.c:430
+#: src/common/weechat.c:433
 #, c-format
 msgid "  . values: any string\n"
 msgstr "  . hodnoty: typ řetězec (jakýkoliv řetězec)\n"
 
-#: src/common/weechat.c:530
+#: src/common/weechat.c:533
 #, c-format
 msgid "%s default keys:\n"
 msgstr "%s výchozí klávesy:\n"
 
-#: src/common/weechat.c:579
+#: src/common/weechat.c:582
 #, c-format
 msgid "%s missing argument for --dir option\n"
 msgstr "%s chybĂ­ argument pro --dir volbu\n"
 
-#: src/common/weechat.c:624
+#: src/common/weechat.c:627
 #, c-format
 msgid "%s missing argument for --session option\n"
 msgstr "%s chybĂ­ argument pro --session volbu\n"
 
-#: src/common/weechat.c:645
+#: src/common/weechat.c:648
 #, 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:659
+#: src/common/weechat.c:662
 #, 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:668
+#: src/common/weechat.c:671
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr "%s neznámý parametr '%s', ignorován\n"
 
-#: src/common/weechat.c:688
+#: src/common/weechat.c:691
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr "%s nemohu vytvořit adresář \"%s\"\n"
 
-#: src/common/weechat.c:711
+#: src/common/weechat.c:714
 #, c-format
 msgid "%s unable to get HOME directory\n"
 msgstr "%s nemohu získat HOME adresář\n"
 
-#: src/common/weechat.c:720
+#: src/common/weechat.c:723
 #, 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:731 src/common/weechat.c:744
+#: src/common/weechat.c:734 src/common/weechat.c:755 src/common/weechat.c:768
 #, c-format
 msgid "%s unable to create \"%s\" directory\n"
 msgstr "%s nemohu vytvořit adresář \"%s\"\n"
 
-#: src/common/weechat.c:790
+#: src/common/weechat.c:814
 #, c-format
 msgid "%s unable to create/append to log file (%s/%s)"
 msgstr "%s nemohu vytvořit/přidat do log souboru (%s/%s)"
 
-#: src/common/weechat.c:841
+#: src/common/weechat.c:865
 #, c-format
 msgid "%sWelcome to %s%s%s, %s\n"
 msgstr "%sVĂ­tejte do %s%s%s, %s\n"
 
-#: src/common/weechat.c:855 src/common/weechat.c:865
+#: src/common/weechat.c:879 src/common/weechat.c:889
 msgid "compiled on"
 msgstr "kompilováno"
 
diff --git a/po/es.po b/po/es.po
index 252bbb44f..32b7bd887 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.8-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-03-03 11:15+0100\n"
+"POT-Creation-Date: 2006-03-04 16:18+0100\n"
 "PO-Revision-Date: 2006-02-22 10:25+0100\n"
 "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1955,38 +1955,38 @@ msgstr "Falló"
 msgid "Aborted"
 msgstr "Abortado"
 
-#: src/irc/irc-dcc.c:383
+#: src/irc/irc-dcc.c:388
 #, c-format
 msgid "DCC: file %s%s%s"
 msgstr "DCC: fichero %s%s%s"
 
-#: src/irc/irc-dcc.c:389
+#: src/irc/irc-dcc.c:394
 #, c-format
 msgid " (local filename: %s%s%s)"
 msgstr " (nombre de fichero local: %s%s%s)"
 
-#: src/irc/irc-dcc.c:394
+#: src/irc/irc-dcc.c:399
 msgid " sent to "
 msgstr " enviado a "
 
-#: src/irc/irc-dcc.c:396
+#: src/irc/irc-dcc.c:401
 msgid " received from "
 msgstr " recibido de "
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "OK"
 msgstr "OK"
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "FAILED"
 msgstr "FALLÓ"
 
-#: src/irc/irc-dcc.c:414
+#: src/irc/irc-dcc.c:419
 #, c-format
 msgid "DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"
 msgstr "Charla DCC cerrada con %s%s %s(%s%d.%d.%d.%d%s)\n"
 
-#: src/irc/irc-dcc.c:474
+#: src/irc/irc-dcc.c:479
 #, c-format
 msgid ""
 "%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1995,17 +1995,17 @@ 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:485
+#: src/irc/irc-dcc.c:490
 #, c-format
 msgid "Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"
 msgstr "Conectado a %s%s %s(%s%d.%d.%d.%d%s)%s a través de una charla DCC\n"
 
-#: src/irc/irc-dcc.c:585
+#: src/irc/irc-dcc.c:590
 #, c-format
 msgid "DCC: file %s%s%s resumed at position %u\n"
 msgstr "DCC: archivo %s%s%s reanudado en la posición %u\n"
 
-#: src/irc/irc-dcc.c:594 src/irc/irc-dcc.c:619
+#: src/irc/irc-dcc.c:599 src/irc/irc-dcc.c:624
 #, c-format
 msgid ""
 "%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
@@ -2014,16 +2014,16 @@ msgstr ""
 "%s no puede reanudar el archivo \"%s\" (puerto: %d, posición de inicio: %u): "
 "DCC no encontrado o terminado\n"
 
-#: src/irc/irc-dcc.c:686
+#: src/irc/irc-dcc.c:691
 #, 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:705
+#: src/irc/irc-dcc.c:710
 msgid "DCC chat"
 msgstr "Charla DCC"
 
-#: src/irc/irc-dcc.c:732
+#: src/irc/irc-dcc.c:737
 #, 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"
@@ -2031,7 +2031,7 @@ msgstr ""
 "Archivo DCC entrante desde %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s "
 "bytes\n"
 
-#: src/irc/irc-dcc.c:755
+#: src/irc/irc-dcc.c:760
 #, c-format
 msgid ""
 "Sending DCC file to %s%s%s: %s%s%s (local filename: %s%s%s), %s%lu%s bytes\n"
@@ -2039,17 +2039,17 @@ msgstr ""
 "Enviando archivo DCC a %s%s%s: %s%s%s (nombre de archivo local: %s%s%s), %s%"
 "lu%s bytes\n"
 
-#: src/irc/irc-dcc.c:775
+#: src/irc/irc-dcc.c:780
 #, c-format
 msgid "Incoming DCC chat request from %s%s%s (%s%d.%d.%d.%d%s)\n"
 msgstr "Petición de charla DCC entrante desde %s%s%s (%s%d.%d.%d.%d%s)\n"
 
-#: src/irc/irc-dcc.c:792
+#: src/irc/irc-dcc.c:797
 #, c-format
 msgid "Sending DCC chat request to %s%s\n"
 msgstr "Envío de petición de charla DCC a %s%s\n"
 
-#: src/irc/irc-dcc.c:810
+#: src/irc/irc-dcc.c:815
 #, c-format
 msgid ""
 "DCC: file %s%s%s (local filename: %s%s%s) will be resumed at position %u\n"
@@ -2057,47 +2057,47 @@ msgstr ""
 "DCC: el archivo %s%s%s (nombre de archivo local: %s%s%s) será reanudado en "
 "la posición %u\n"
 
-#: src/irc/irc-dcc.c:885
+#: src/irc/irc-dcc.c:895
 #, 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:907
+#: src/irc/irc-dcc.c:915
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr "%s no es posible acceder al fichero \"%s\"\n"
 
-#: src/irc/irc-dcc.c:929
+#: src/irc/irc-dcc.c:937
 #, c-format
 msgid "%s could not find address for '%s'. Falling back to local IP.\n"
 msgstr "%s no pudo encontrar la dirección para '%s'. Utilizando la IP local.\n"
 
-#: src/irc/irc-dcc.c:949
+#: src/irc/irc-dcc.c:957
 #, 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:1007
+#: src/irc/irc-dcc.c:1015
 #, c-format
 msgid "%s cannot find available port for DCC\n"
 msgstr "%s no puede encontrar un puerto disponible para el DCC\n"
 
-#: src/irc/irc-dcc.c:1051
+#: src/irc/irc-dcc.c:1059
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr "%s no es posible enviar el DCC\n"
 
-#: src/irc/irc-dcc.c:1131
+#: src/irc/irc-dcc.c:1139
 #, 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:1217
+#: src/irc/irc-dcc.c:1225
 #, c-format
 msgid "Private %s> %s"
 msgstr "Privado %s> %s"
 
-#: src/irc/irc-dcc.c:1416
+#: src/irc/irc-dcc.c:1424
 #, c-format
 msgid ""
 "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -2106,7 +2106,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:1491
+#: src/irc/irc-dcc.c:1499
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr "Abandonar el DCC activo: \"%s\" de %s\n"
@@ -2285,12 +2285,12 @@ msgstr ""
 msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
 msgstr ""
 
-#: src/gui/curses/gui-input.c:350
+#: src/gui/curses/gui-input.c:353
 #, c-format
 msgid "Day changed to %s\n"
 msgstr "Día cambiado a %s\n"
 
-#: src/gui/curses/gui-input.c:436
+#: src/gui/curses/gui-input.c:439
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s el lag (retraso) es alto, desconectando del servidor...\n"
@@ -2376,11 +2376,11 @@ msgstr ""
 msgid "server"
 msgstr "servidor"
 
-#: src/gui/gui-common.c:765
+#: src/gui/gui-common.c:768
 msgid "Not enough memory for new line\n"
 msgstr "No hay suficiente memoria para una nueva línea\n"
 
-#: src/gui/gui-common.c:1134
+#: src/gui/gui-common.c:1137
 msgid "Not enough memory for infobar message\n"
 msgstr "No hay suficiente memoria para el mensaje de la barra de información\n"
 
@@ -3215,12 +3215,12 @@ msgstr "%s ˇno conectado al servidor \"%s\"!\n"
 msgid "Auto-reconnection is cancelled\n"
 msgstr "La reconexión automática está anulada\n"
 
-#: src/common/command.c:1909 src/common/weechat.c:456
+#: src/common/command.c:1909 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "Comandos internos %s :\n"
 
-#: src/common/command.c:1919 src/common/weechat.c:476
+#: src/common/command.c:1919 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr "Comandos IRC :\n"
@@ -3270,7 +3270,7 @@ msgstr "Clave \"%s\" desatada\n"
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s No ha sido posible desatar la clave \"%s\"\n"
 
-#: src/common/command.c:2286 src/common/weechat.c:508
+#: src/common/command.c:2286 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Funciones de clave internas:\n"
@@ -3458,8 +3458,8 @@ msgstr "  . tipo booleano (valores: 'on' u 'off')\n"
 
 #: src/common/command.c:3133 src/common/command.c:3156
 #: src/common/command.c:3162 src/common/command.c:3168
-#: src/common/weechat.c:392 src/common/weechat.c:417 src/common/weechat.c:424
-#: src/common/weechat.c:431
+#: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
+#: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . valor por defecto: '%s'\n"
@@ -3469,7 +3469,7 @@ msgstr "  . valor por defecto: '%s'\n"
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . tipo entero (valores: entre %d y %d)\n"
 
-#: src/common/command.c:3141 src/common/weechat.c:401
+#: src/common/command.c:3141 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . valor por defecto: %d\n"
@@ -3479,8 +3479,8 @@ msgid "  . type string (values: "
 msgstr "  . tipo cadena (valores: "
 
 #: src/common/command.c:3158 src/common/command.c:3164
-#: src/common/command.c:3170 src/common/weechat.c:419 src/common/weechat.c:426
-#: src/common/weechat.c:433
+#: src/common/command.c:3170 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/weechat.c:436
 msgid "empty"
 msgstr "vacío"
 
@@ -3492,7 +3492,7 @@ msgstr "  . tipo color (color Curses o Gtk, ver la documentación de WeeChat)\n"
 msgid "  . type string (any string)\n"
 msgstr "  . tipo cadena (cualquier cadena)\n"
 
-#: src/common/command.c:3173 src/common/weechat.c:436
+#: src/common/command.c:3173 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . descripción: %s\n"
@@ -3626,20 +3626,20 @@ msgstr "La tubería FIFO está cerrada\n"
 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:127
+#: src/common/log.c:116 src/common/log.c:132
 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:158
+#: src/common/log.c:163
 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:162
+#: src/common/log.c:167
 msgid "****  Beginning of log  "
 msgstr "****  Comienzo del log (registro)  "
 
-#: src/common/log.c:176
+#: src/common/log.c:181
 msgid "****  End of log  "
 msgstr "****  Fin del log  "
 
@@ -3957,7 +3957,7 @@ msgstr "%s no se puede eliminar el archivo de sesión (%s)\n"
 msgid "Upgrade completed successfully\n"
 msgstr "Actualización completada con éxito\n"
 
-#: src/common/weechat.c:346
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "%s (c) Copyright 2003-2006, compiled on %s %s\n"
@@ -3966,7 +3966,7 @@ msgstr ""
 "%s (c) Copyright 2003-2006, compilado a %s %s\n"
 "Desarrollado por FlashCode <flashcode@flashtux.org> - %s"
 
-#: src/common/weechat.c:350
+#: src/common/weechat.c:353
 #, c-format
 msgid ""
 "Usage: %s [options ...]\n"
@@ -3977,7 +3977,7 @@ msgstr ""
 "  ó: %s [irc[6][s]://[usuario[:contraseńa]@]irc.ejemplo.org[:puerto][/"
 "channel]"
 
-#: src/common/weechat.c:354
+#: src/common/weechat.c:357
 #, fuzzy, c-format
 msgid ""
 "  -a, --no-connect        disable auto-connect to servers at startup\n"
@@ -4005,7 +4005,7 @@ msgstr ""
 "  -v, --version           mostrar versión de Weechat\n"
 "  -w, --weechat-commands  mostrar comandos de Weechat\n"
 
-#: src/common/weechat.c:377
+#: src/common/weechat.c:380
 #, c-format
 msgid ""
 "WeeChat configuration options (<weechat_home>/weechat.rc):\n"
@@ -4014,112 +4014,112 @@ msgstr ""
 "Opciones de configuración de WeeChat (<weechat_home>/weechat.rc):\n"
 "\n"
 
-#: src/common/weechat.c:390
+#: src/common/weechat.c:393
 #, c-format
 msgid "  . type: boolean\n"
 msgstr "  . tipo: booleano\n"
 
-#: src/common/weechat.c:391
+#: src/common/weechat.c:394
 #, c-format
 msgid "  . values: 'on' or 'off'\n"
 msgstr "  . valores: 'on' u 'off'\n"
 
-#: src/common/weechat.c:397
+#: src/common/weechat.c:400
 #, c-format
 msgid "  . type: integer\n"
 msgstr "  . tipo: entero\n"
 
-#: src/common/weechat.c:398
+#: src/common/weechat.c:401
 #, c-format
 msgid "  . values: between %d and %d\n"
 msgstr "  . valores: entre %d y %d\n"
 
-#: src/common/weechat.c:405 src/common/weechat.c:429
+#: src/common/weechat.c:408 src/common/weechat.c:432
 #, c-format
 msgid "  . type: string\n"
 msgstr "  . tipo: cadena\n"
 
-#: src/common/weechat.c:406
+#: src/common/weechat.c:409
 #, c-format
 msgid "  . values: "
 msgstr "  . valores: "
 
-#: src/common/weechat.c:422
+#: src/common/weechat.c:425
 #, c-format
 msgid "  . type: color\n"
 msgstr "  . tipo: color\n"
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:426
 #, c-format
 msgid "  . values: Curses or Gtk color\n"
 msgstr "  . valores: color Curses o Gtk\n"
 
-#: src/common/weechat.c:430
+#: src/common/weechat.c:433
 #, c-format
 msgid "  . values: any string\n"
 msgstr "  . valores: cualquier cadena\n"
 
-#: src/common/weechat.c:530
+#: src/common/weechat.c:533
 #, c-format
 msgid "%s default keys:\n"
 msgstr "%s claves por defecto:\n"
 
-#: src/common/weechat.c:579
+#: src/common/weechat.c:582
 #, c-format
 msgid "%s missing argument for --dir option\n"
 msgstr "%s falta un argumento para la opción --dir\n"
 
-#: src/common/weechat.c:624
+#: src/common/weechat.c:627
 #, c-format
 msgid "%s missing argument for --session option\n"
 msgstr "%s falta un argumento para la opción --session\n"
 
-#: src/common/weechat.c:645
+#: src/common/weechat.c:648
 #, 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:659
+#: src/common/weechat.c:662
 #, 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:668
+#: src/common/weechat.c:671
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr "%s parámetro desconocido '%s', ignorado\n"
 
-#: src/common/weechat.c:688
+#: src/common/weechat.c:691
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr "%s no es posible crear el directorio \"%s\"\n"
 
-#: src/common/weechat.c:711
+#: src/common/weechat.c:714
 #, 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:720
+#: src/common/weechat.c:723
 #, 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:731 src/common/weechat.c:744
+#: src/common/weechat.c:734 src/common/weechat.c:755 src/common/weechat.c:768
 #, c-format
 msgid "%s unable to create \"%s\" directory\n"
 msgstr "%s no es posible crear el directorio \"%s\"\n"
 
-#: src/common/weechat.c:790
+#: src/common/weechat.c:814
 #, c-format
 msgid "%s unable to create/append to log file (%s/%s)"
 msgstr "%s no es posible crear/ańadir en el fichero de log (%s/%s)"
 
-#: src/common/weechat.c:841
+#: src/common/weechat.c:865
 #, c-format
 msgid "%sWelcome to %s%s%s, %s\n"
 msgstr "%sBienvenido a %s%s%s, %s\n"
 
-#: src/common/weechat.c:855 src/common/weechat.c:865
+#: src/common/weechat.c:879 src/common/weechat.c:889
 msgid "compiled on"
 msgstr "compilado en"
 
diff --git a/po/fr.po b/po/fr.po
index 3c8655413..c15c7b1c9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.8-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-03-03 11:15+0100\n"
+"POT-Creation-Date: 2006-03-04 16:18+0100\n"
 "PO-Revision-Date: 2006-03-03 11:16+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1952,38 +1952,38 @@ msgstr "Echoué"
 msgid "Aborted"
 msgstr "Interrompu"
 
-#: src/irc/irc-dcc.c:383
+#: src/irc/irc-dcc.c:388
 #, c-format
 msgid "DCC: file %s%s%s"
 msgstr "DCC: fichier %s%s%s"
 
-#: src/irc/irc-dcc.c:389
+#: src/irc/irc-dcc.c:394
 #, c-format
 msgid " (local filename: %s%s%s)"
 msgstr " (nom local: %s%s%s)"
 
-#: src/irc/irc-dcc.c:394
+#: src/irc/irc-dcc.c:399
 msgid " sent to "
 msgstr " envoyé ŕ "
 
-#: src/irc/irc-dcc.c:396
+#: src/irc/irc-dcc.c:401
 msgid " received from "
 msgstr " reçu de "
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "OK"
 msgstr "OK"
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "FAILED"
 msgstr "ECHOUE"
 
-#: src/irc/irc-dcc.c:414
+#: src/irc/irc-dcc.c:419
 #, 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:474
+#: src/irc/irc-dcc.c:479
 #, c-format
 msgid ""
 "%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1992,17 +1992,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:485
+#: src/irc/irc-dcc.c:490
 #, c-format
 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:585
+#: src/irc/irc-dcc.c:590
 #, 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:594 src/irc/irc-dcc.c:619
+#: src/irc/irc-dcc.c:599 src/irc/irc-dcc.c:624
 #, c-format
 msgid ""
 "%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
@@ -2011,89 +2011,89 @@ 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:686
+#: src/irc/irc-dcc.c:691
 #, 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:705
+#: src/irc/irc-dcc.c:710
 msgid "DCC chat"
 msgstr "Discussion DCC"
 
-#: src/irc/irc-dcc.c:732
+#: src/irc/irc-dcc.c:737
 #, 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 ""
 "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:755
+#: src/irc/irc-dcc.c:760
 #, 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:775
+#: src/irc/irc-dcc.c:780
 #, 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:792
+#: src/irc/irc-dcc.c:797
 #, 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:810
+#: src/irc/irc-dcc.c:815
 #, 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:885
+#: src/irc/irc-dcc.c:895
 #, 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:907
+#: src/irc/irc-dcc.c:915
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr "%s impossible d'accéder au fichier \"%s\"\n"
 
-#: src/irc/irc-dcc.c:929
+#: src/irc/irc-dcc.c:937
 #, 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:949
+#: src/irc/irc-dcc.c:957
 #, 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:1007
+#: src/irc/irc-dcc.c:1015
 #, 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:1051
+#: src/irc/irc-dcc.c:1059
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr "%s impossible d'envoyer le DCC\n"
 
-#: src/irc/irc-dcc.c:1131
+#: src/irc/irc-dcc.c:1139
 #, 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:1217
+#: src/irc/irc-dcc.c:1225
 #, c-format
 msgid "Private %s> %s"
 msgstr "Privé %s> %s"
 
-#: src/irc/irc-dcc.c:1416
+#: src/irc/irc-dcc.c:1424
 #, c-format
 msgid ""
 "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -2102,7 +2102,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:1491
+#: src/irc/irc-dcc.c:1499
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr "Abandon du DCC actif: \"%s\" de %s\n"
@@ -2283,12 +2283,12 @@ msgstr ""
 "%s serveur/canal (%s/%s) non trouvé pour l'exécution de commande de "
 "l'extension\n"
 
-#: src/gui/curses/gui-input.c:350
+#: src/gui/curses/gui-input.c:353
 #, c-format
 msgid "Day changed to %s\n"
 msgstr "Jour changé: %s\n"
 
-#: src/gui/curses/gui-input.c:436
+#: src/gui/curses/gui-input.c:439
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s le lag est élevé, déconnexion du serveur...\n"
@@ -2374,11 +2374,11 @@ msgstr "  [Q] Fermer la vue IRC brut"
 msgid "server"
 msgstr "serveur"
 
-#: src/gui/gui-common.c:765
+#: src/gui/gui-common.c:768
 msgid "Not enough memory for new line\n"
 msgstr "Pas assez de mémoire pour une nouvelle ligne !\n"
 
-#: src/gui/gui-common.c:1134
+#: src/gui/gui-common.c:1137
 msgid "Not enough memory for infobar message\n"
 msgstr "Pas assez de mémoire pour un message de la barre d'infos\n"
 
@@ -3212,12 +3212,12 @@ msgstr "%s non connecté au serveur \"%s\" !\n"
 msgid "Auto-reconnection is cancelled\n"
 msgstr "La reconnexion automatique est annulée\n"
 
-#: src/common/command.c:1909 src/common/weechat.c:456
+#: src/common/command.c:1909 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "Commandes internes %s :\n"
 
-#: src/common/command.c:1919 src/common/weechat.c:476
+#: src/common/command.c:1919 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr "Commandes IRC :\n"
@@ -3267,7 +3267,7 @@ msgstr "Touche \"%s\" supprimée\n"
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s impossible de supprimer la touche \"%s\"\n"
 
-#: src/common/command.c:2286 src/common/weechat.c:508
+#: src/common/command.c:2286 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Fonctions internes pour les touches:\n"
@@ -3452,8 +3452,8 @@ msgstr "  . type booléen (valeurs: 'on' ou 'off')\n"
 
 #: src/common/command.c:3133 src/common/command.c:3156
 #: src/common/command.c:3162 src/common/command.c:3168
-#: src/common/weechat.c:392 src/common/weechat.c:417 src/common/weechat.c:424
-#: src/common/weechat.c:431
+#: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
+#: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . valeur par défaut: '%s'\n"
@@ -3463,7 +3463,7 @@ msgstr "  . valeur par défaut: '%s'\n"
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . type entier (valeurs: entre %d et %d)\n"
 
-#: src/common/command.c:3141 src/common/weechat.c:401
+#: src/common/command.c:3141 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . valeur par défaut: %d\n"
@@ -3473,8 +3473,8 @@ msgid "  . type string (values: "
 msgstr "  . type chaîne (valeurs: "
 
 #: src/common/command.c:3158 src/common/command.c:3164
-#: src/common/command.c:3170 src/common/weechat.c:419 src/common/weechat.c:426
-#: src/common/weechat.c:433
+#: src/common/command.c:3170 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/weechat.c:436
 msgid "empty"
 msgstr "vide"
 
@@ -3486,7 +3486,7 @@ msgstr "  . type couleur (couleur Curses ou Gtk, voir la doc WeeChat)\n"
 msgid "  . type string (any string)\n"
 msgstr "  . type chaîne (toute chaîne)\n"
 
-#: src/common/command.c:3173 src/common/weechat.c:436
+#: src/common/command.c:3173 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . description: %s\n"
@@ -3619,19 +3619,19 @@ msgstr "Le tube FIFO est fermé\n"
 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:127
+#: src/common/log.c:116 src/common/log.c:132
 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:158
+#: src/common/log.c:163
 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:162
+#: src/common/log.c:167
 msgid "****  Beginning of log  "
 msgstr "****  Début du log  "
 
-#: src/common/log.c:176
+#: src/common/log.c:181
 msgid "****  End of log  "
 msgstr "****  Fin du log  "
 
@@ -3948,7 +3948,7 @@ msgstr "%s impossible de supprimer le fichier de session (%s)\n"
 msgid "Upgrade completed successfully\n"
 msgstr "Mise ŕ jour effectuée avec succčs\n"
 
-#: src/common/weechat.c:346
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "%s (c) Copyright 2003-2006, compiled on %s %s\n"
@@ -3957,7 +3957,7 @@ msgstr ""
 "%s (c) Copyright 2003-2006, compilé le %s %s\n"
 "Développé par FlashCode <flashcode@flashtux.org> - %s"
 
-#: src/common/weechat.c:350
+#: src/common/weechat.c:353
 #, c-format
 msgid ""
 "Usage: %s [options ...]\n"
@@ -3968,7 +3968,7 @@ msgstr ""
 "         ou: %s [irc[6][s]://[pseudo[:mot_passe]@]irc.exemple.org[:port][/"
 "canal][,canal[...]]"
 
-#: src/common/weechat.c:354
+#: src/common/weechat.c:357
 #, c-format
 msgid ""
 "  -a, --no-connect        disable auto-connect to servers at startup\n"
@@ -3998,7 +3998,7 @@ msgstr ""
 "  -v, --version           afficher la version de WeeChat\n"
 "  -w, --weechat-commands  afficher les commandes WeeChat\n"
 
-#: src/common/weechat.c:377
+#: src/common/weechat.c:380
 #, c-format
 msgid ""
 "WeeChat configuration options (<weechat_home>/weechat.rc):\n"
@@ -4007,112 +4007,112 @@ msgstr ""
 "Options de configuration de WeeChat (<weechat_home>/weechat.rc):\n"
 "\n"
 
-#: src/common/weechat.c:390
+#: src/common/weechat.c:393
 #, c-format
 msgid "  . type: boolean\n"
 msgstr "  . type: booléen\n"
 
-#: src/common/weechat.c:391
+#: src/common/weechat.c:394
 #, c-format
 msgid "  . values: 'on' or 'off'\n"
 msgstr "  . valeurs: 'on' ou 'off'\n"
 
-#: src/common/weechat.c:397
+#: src/common/weechat.c:400
 #, c-format
 msgid "  . type: integer\n"
 msgstr "  . type: entier\n"
 
-#: src/common/weechat.c:398
+#: src/common/weechat.c:401
 #, c-format
 msgid "  . values: between %d and %d\n"
 msgstr "  . valeurs: entre %d et %d\n"
 
-#: src/common/weechat.c:405 src/common/weechat.c:429
+#: src/common/weechat.c:408 src/common/weechat.c:432
 #, c-format
 msgid "  . type: string\n"
 msgstr "  . type: chaîne\n"
 
-#: src/common/weechat.c:406
+#: src/common/weechat.c:409
 #, c-format
 msgid "  . values: "
 msgstr "  . valeurs: "
 
-#: src/common/weechat.c:422
+#: src/common/weechat.c:425
 #, c-format
 msgid "  . type: color\n"
 msgstr "  . type: couleur\n"
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:426
 #, c-format
 msgid "  . values: Curses or Gtk color\n"
 msgstr "  . valeurs: couleur Curses ou Gtk\n"
 
-#: src/common/weechat.c:430
+#: src/common/weechat.c:433
 #, c-format
 msgid "  . values: any string\n"
 msgstr "  . valeurs: toute chaîne\n"
 
-#: src/common/weechat.c:530
+#: src/common/weechat.c:533
 #, c-format
 msgid "%s default keys:\n"
 msgstr "Touches par défaut %s:\n"
 
-#: src/common/weechat.c:579
+#: src/common/weechat.c:582
 #, c-format
 msgid "%s missing argument for --dir option\n"
 msgstr "%s paramčtre manquant pour l'option --dir\n"
 
-#: src/common/weechat.c:624
+#: src/common/weechat.c:627
 #, c-format
 msgid "%s missing argument for --session option\n"
 msgstr "%s paramčtre manquant pour l'option --session\n"
 
-#: src/common/weechat.c:645
+#: src/common/weechat.c:648
 #, 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:659
+#: src/common/weechat.c:662
 #, 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:668
+#: src/common/weechat.c:671
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr "%s paramčtre inconnu '%s', ignoré\n"
 
-#: src/common/weechat.c:688
+#: src/common/weechat.c:691
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr "%s impossible de créer le répertoire \"%s\"\n"
 
-#: src/common/weechat.c:711
+#: src/common/weechat.c:714
 #, c-format
 msgid "%s unable to get HOME directory\n"
 msgstr "%s impossible de lire le répertoire personnel\n"
 
-#: src/common/weechat.c:720
+#: src/common/weechat.c:723
 #, 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:731 src/common/weechat.c:744
+#: src/common/weechat.c:734 src/common/weechat.c:755 src/common/weechat.c:768
 #, c-format
 msgid "%s unable to create \"%s\" directory\n"
 msgstr "%s impossible de créer le répertoire \"%s\"\n"
 
-#: src/common/weechat.c:790
+#: src/common/weechat.c:814
 #, c-format
 msgid "%s unable to create/append to log file (%s/%s)"
 msgstr "%s impossible de créer/ajouter dans le fichier de log (%s/%s)"
 
-#: src/common/weechat.c:841
+#: src/common/weechat.c:865
 #, c-format
 msgid "%sWelcome to %s%s%s, %s\n"
 msgstr "%sBienvenue dans %s%s%s, %s\n"
 
-#: src/common/weechat.c:855 src/common/weechat.c:865
+#: src/common/weechat.c:879 src/common/weechat.c:889
 msgid "compiled on"
 msgstr "compilé le"
 
diff --git a/po/hu.po b/po/hu.po
index a68e51981..034447cad 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.8-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-03-03 11:15+0100\n"
+"POT-Creation-Date: 2006-03-04 16:18+0100\n"
 "PO-Revision-Date: 2006-02-22 10:26+0100\n"
 "Last-Translator: voroskoi <voroskoi@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1945,146 +1945,146 @@ msgstr "Sikertelen"
 msgid "Aborted"
 msgstr "MegszakĂ­tva"
 
-#: src/irc/irc-dcc.c:383
+#: src/irc/irc-dcc.c:388
 #, c-format
 msgid "DCC: file %s%s%s"
 msgstr "DCC: fájl %s%s%s"
 
-#: src/irc/irc-dcc.c:389
+#: src/irc/irc-dcc.c:394
 #, c-format
 msgid " (local filename: %s%s%s)"
 msgstr " (helyi fájlnév: %s%s%s)"
 
-#: src/irc/irc-dcc.c:394
+#: src/irc/irc-dcc.c:399
 msgid " sent to "
 msgstr " fogadó fél: "
 
-#: src/irc/irc-dcc.c:396
+#: src/irc/irc-dcc.c:401
 msgid " received from "
 msgstr " küldő fél: "
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "OK"
 msgstr "Rendben"
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "FAILED"
 msgstr "SIKERTELEN"
 
-#: src/irc/irc-dcc.c:414
+#: src/irc/irc-dcc.c:419
 #, c-format
 msgid "DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"
 msgstr "DCC beszélgetés vége: %s%s %s(%s%d.%d.%d.%d%s)\n"
 
-#: src/irc/irc-dcc.c:474
+#: src/irc/irc-dcc.c:479
 #, 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:485
+#: src/irc/irc-dcc.c:490
 #, c-format
 msgid "Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:585
+#: src/irc/irc-dcc.c:590
 #, c-format
 msgid "DCC: file %s%s%s resumed at position %u\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:594 src/irc/irc-dcc.c:619
+#: src/irc/irc-dcc.c:599 src/irc/irc-dcc.c:624
 #, 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:686
+#: src/irc/irc-dcc.c:691
 #, c-format
 msgid "%s not enough memory for new DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:705
+#: src/irc/irc-dcc.c:710
 msgid "DCC chat"
 msgstr ""
 
-#: src/irc/irc-dcc.c:732
+#: src/irc/irc-dcc.c:737
 #, 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:755
+#: src/irc/irc-dcc.c:760
 #, 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:775
+#: src/irc/irc-dcc.c:780
 #, c-format
 msgid "Incoming DCC chat request from %s%s%s (%s%d.%d.%d.%d%s)\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:792
+#: src/irc/irc-dcc.c:797
 #, c-format
 msgid "Sending DCC chat request to %s%s\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:810
+#: src/irc/irc-dcc.c:815
 #, 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:885
+#: src/irc/irc-dcc.c:895
 #, c-format
 msgid "%s not enough memory for DCC SEND\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:907
+#: src/irc/irc-dcc.c:915
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:929
+#: src/irc/irc-dcc.c:937
 #, c-format
 msgid "%s could not find address for '%s'. Falling back to local IP.\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:949
+#: src/irc/irc-dcc.c:957
 #, c-format
 msgid "%s cannot create socket for DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1007
+#: src/irc/irc-dcc.c:1015
 #, c-format
 msgid "%s cannot find available port for DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1051
+#: src/irc/irc-dcc.c:1059
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1131
+#: src/irc/irc-dcc.c:1139
 #, c-format
 msgid "%s error sending data to \"%s\" via DCC CHAT\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1217
+#: src/irc/irc-dcc.c:1225
 #, c-format
 msgid "Private %s> %s"
 msgstr "Privát %s> %s"
 
-#: src/irc/irc-dcc.c:1416
+#: src/irc/irc-dcc.c:1424
 #, 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:1491
+#: src/irc/irc-dcc.c:1499
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr ""
@@ -2250,12 +2250,12 @@ msgstr ""
 msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
 msgstr "%s (%s/%s) szerver/szoba nem található a modul futtatása parancshoz\n"
 
-#: src/gui/curses/gui-input.c:350
+#: src/gui/curses/gui-input.c:353
 #, c-format
 msgid "Day changed to %s\n"
 msgstr "A mai dátum: %s\n"
 
-#: src/gui/curses/gui-input.c:436
+#: src/gui/curses/gui-input.c:439
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s túl nagy a késés(lag), lecsatlakozás a szerverről...\n"
@@ -2341,11 +2341,11 @@ msgstr ""
 msgid "server"
 msgstr "szerver"
 
-#: src/gui/gui-common.c:765
+#: src/gui/gui-common.c:768
 msgid "Not enough memory for new line\n"
 msgstr "Nincs elég memória az új sorhoz\n"
 
-#: src/gui/gui-common.c:1134
+#: src/gui/gui-common.c:1137
 msgid "Not enough memory for infobar message\n"
 msgstr "Nincs elég memória az információs pult üzenethez\n"
 
@@ -3137,12 +3137,12 @@ msgstr "%s nincs csatlakozva a \"%s\" szerverhez!\n"
 msgid "Auto-reconnection is cancelled\n"
 msgstr "Autómata újracsatlakozás megszakítva\n"
 
-#: src/common/command.c:1909 src/common/weechat.c:456
+#: src/common/command.c:1909 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "%s belső parancsok:\n"
 
-#: src/common/command.c:1919 src/common/weechat.c:476
+#: src/common/command.c:1919 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr "IRC parancsok:\n"
@@ -3192,7 +3192,7 @@ msgstr ""
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:2286 src/common/weechat.c:508
+#: src/common/command.c:2286 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr ""
@@ -3377,8 +3377,8 @@ msgstr "  . típus logikai (értékek: 'on' vagy 'off')\n"
 
 #: src/common/command.c:3133 src/common/command.c:3156
 #: src/common/command.c:3162 src/common/command.c:3168
-#: src/common/weechat.c:392 src/common/weechat.c:417 src/common/weechat.c:424
-#: src/common/weechat.c:431
+#: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
+#: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . alapérték: '%s'\n"
@@ -3388,7 +3388,7 @@ msgstr "  . alapérték: '%s'\n"
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . típus szám (értékek: %d és %d között)\n"
 
-#: src/common/command.c:3141 src/common/weechat.c:401
+#: src/common/command.c:3141 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . alapérték: %d\n"
@@ -3398,8 +3398,8 @@ msgid "  . type string (values: "
 msgstr "  . típus szöveg (értékek: "
 
 #: src/common/command.c:3158 src/common/command.c:3164
-#: src/common/command.c:3170 src/common/weechat.c:419 src/common/weechat.c:426
-#: src/common/weechat.c:433
+#: src/common/command.c:3170 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/weechat.c:436
 msgid "empty"
 msgstr "ĂĽres"
 
@@ -3411,7 +3411,7 @@ msgstr "  . típus szín (Curses vagy Gtk szín, lásd WeeChat dokumentáció)\n
 msgid "  . type string (any string)\n"
 msgstr "  . típus szöveg (bármilyen szöveg)\n"
 
-#: src/common/command.c:3173 src/common/weechat.c:436
+#: src/common/command.c:3173 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . leírás : %s\n"
@@ -3545,19 +3545,19 @@ msgstr "FIFO cső bezárva\n"
 msgid "%s cannot add a buffer to hotlist\n"
 msgstr ""
 
-#: src/common/log.c:127
+#: src/common/log.c:116 src/common/log.c:132
 msgid "Not enough memory to write log file for a buffer\n"
 msgstr "Nincs elegendő memória a puffer naplójának írásához\n"
 
-#: src/common/log.c:158
+#: src/common/log.c:163
 msgid "Unable to write log file for a buffer\n"
 msgstr "Nem sikerült naplófájlt írni a puffernek\n"
 
-#: src/common/log.c:162
+#: src/common/log.c:167
 msgid "****  Beginning of log  "
 msgstr "****  Naplófájl kezdete  "
 
-#: src/common/log.c:176
+#: src/common/log.c:181
 msgid "****  End of log  "
 msgstr "****  Naplófájl vége  "
 
@@ -3872,7 +3872,7 @@ msgstr "%s nem sikerült a \"%s\" fájlt létrehozni\n"
 msgid "Upgrade completed successfully\n"
 msgstr "A frissítés sikeresen megtörtént\n"
 
-#: src/common/weechat.c:346
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "%s (c) Copyright 2003-2006, compiled on %s %s\n"
@@ -3881,7 +3881,7 @@ msgstr ""
 "%s (c) Copyright 2003-2006, fordĂ­tva: %s %s\n"
 "Fejlesztő: FlashCode <flashcode@flashtux.org> - %s"
 
-#: src/common/weechat.c:350
+#: src/common/weechat.c:353
 #, c-format
 msgid ""
 "Usage: %s [options ...]\n"
@@ -3892,7 +3892,7 @@ msgstr ""
 "     vagy: %s [irc[6][s]://[név[:jelszó]@]irc.pelda.org[:port][/szoba][,szoba"
 "[...]]"
 
-#: src/common/weechat.c:354
+#: src/common/weechat.c:357
 #, c-format
 msgid ""
 "  -a, --no-connect        disable auto-connect to servers at startup\n"
@@ -3920,7 +3920,7 @@ msgstr ""
 "  -v, --version           WeeChat verziójának mutatása\n"
 "  -w, --weechat-commands  WeeChat parancsok mutatása\n"
 
-#: src/common/weechat.c:377
+#: src/common/weechat.c:380
 #, c-format
 msgid ""
 "WeeChat configuration options (<weechat_home>/weechat.rc):\n"
@@ -3929,112 +3929,112 @@ msgstr ""
 "WeeChat beállítási opciók (<weechat_home>/weechat.rc):\n"
 "\n"
 
-#: src/common/weechat.c:390
+#: src/common/weechat.c:393
 #, c-format
 msgid "  . type: boolean\n"
 msgstr "  . tĂ­pus: logikai\n"
 
-#: src/common/weechat.c:391
+#: src/common/weechat.c:394
 #, c-format
 msgid "  . values: 'on' or 'off'\n"
 msgstr "  . értékek: 'on' vagy 'off'\n"
 
-#: src/common/weechat.c:397
+#: src/common/weechat.c:400
 #, c-format
 msgid "  . type: integer\n"
 msgstr "  . típus: szám\n"
 
-#: src/common/weechat.c:398
+#: src/common/weechat.c:401
 #, c-format
 msgid "  . values: between %d and %d\n"
 msgstr "  . értékek: %d és %d között\n"
 
-#: src/common/weechat.c:405 src/common/weechat.c:429
+#: src/common/weechat.c:408 src/common/weechat.c:432
 #, c-format
 msgid "  . type: string\n"
 msgstr "  . típus: szöveg\n"
 
-#: src/common/weechat.c:406
+#: src/common/weechat.c:409
 #, c-format
 msgid "  . values: "
 msgstr "  . értékek: "
 
-#: src/common/weechat.c:422
+#: src/common/weechat.c:425
 #, c-format
 msgid "  . type: color\n"
 msgstr "  . tĂ­pus: szĂ­n\n"
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:426
 #, c-format
 msgid "  . values: Curses or Gtk color\n"
 msgstr "  . értékek: Curses vagy Gtk színek\n"
 
-#: src/common/weechat.c:430
+#: src/common/weechat.c:433
 #, c-format
 msgid "  . values: any string\n"
 msgstr "  . érték: bármilyen szóveg\n"
 
-#: src/common/weechat.c:530
+#: src/common/weechat.c:533
 #, c-format
 msgid "%s default keys:\n"
 msgstr "%s alapértelmezett billentyűk:\n"
 
-#: src/common/weechat.c:579
+#: src/common/weechat.c:582
 #, c-format
 msgid "%s missing argument for --dir option\n"
 msgstr "%s hiányzó argumentum a --dir opciónak\n"
 
-#: src/common/weechat.c:624
+#: src/common/weechat.c:627
 #, c-format
 msgid "%s missing argument for --session option\n"
 msgstr "%s hiányzó argumentum a --session opciónak\n"
 
-#: src/common/weechat.c:645
+#: src/common/weechat.c:648
 #, c-format
 msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
 msgstr "%s érvénytelen szintaxis az IRC szervernek ('%s'), mellőzve\n"
 
-#: src/common/weechat.c:659
+#: src/common/weechat.c:662
 #, c-format
 msgid "%s unable to create server ('%s'), ignored\n"
 msgstr "%s nem sikerült a szervert ('%s') létrehozni, mellőzve\n"
 
-#: src/common/weechat.c:668
+#: src/common/weechat.c:671
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr "%s ismeretlen paraméter: '%s', mellőzve\n"
 
-#: src/common/weechat.c:688
+#: src/common/weechat.c:691
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr "%s nem sikerült a \"%s\" könyvtárat létrehozni\n"
 
-#: src/common/weechat.c:711
+#: src/common/weechat.c:714
 #, c-format
 msgid "%s unable to get HOME directory\n"
 msgstr "%s nem sikerült a HOME könyvtárat beállítani\n"
 
-#: src/common/weechat.c:720
+#: src/common/weechat.c:723
 #, c-format
 msgid "%s not enough memory for home directory\n"
 msgstr "%s nincs elég memória a HOME könyvtárhoz\n"
 
-#: src/common/weechat.c:731 src/common/weechat.c:744
+#: src/common/weechat.c:734 src/common/weechat.c:755 src/common/weechat.c:768
 #, c-format
 msgid "%s unable to create \"%s\" directory\n"
 msgstr "%s nem sikerült a \"%s\" könyvtárat létrehozni\n"
 
-#: src/common/weechat.c:790
+#: src/common/weechat.c:814
 #, c-format
 msgid "%s unable to create/append to log file (%s/%s)"
 msgstr "%s nem sikerült létrehozni/hozzáírni a naplófájlhoz (%s/%s)"
 
-#: src/common/weechat.c:841
+#: src/common/weechat.c:865
 #, c-format
 msgid "%sWelcome to %s%s%s, %s\n"
 msgstr "%sÜdvözöljük %s%s%s, %s\n"
 
-#: src/common/weechat.c:855 src/common/weechat.c:865
+#: src/common/weechat.c:879 src/common/weechat.c:889
 msgid "compiled on"
 msgstr "lefordĂ­tva:"
 
diff --git a/po/weechat.pot b/po/weechat.pot
index b677cb166..0d0dfa0da 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: 2006-03-03 11:15+0100\n"
+"POT-Creation-Date: 2006-03-04 16:18+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"
@@ -1826,146 +1826,146 @@ msgstr ""
 msgid "Aborted"
 msgstr ""
 
-#: src/irc/irc-dcc.c:383
+#: src/irc/irc-dcc.c:388
 #, c-format
 msgid "DCC: file %s%s%s"
 msgstr ""
 
-#: src/irc/irc-dcc.c:389
+#: src/irc/irc-dcc.c:394
 #, c-format
 msgid " (local filename: %s%s%s)"
 msgstr ""
 
-#: src/irc/irc-dcc.c:394
+#: src/irc/irc-dcc.c:399
 msgid " sent to "
 msgstr ""
 
-#: src/irc/irc-dcc.c:396
+#: src/irc/irc-dcc.c:401
 msgid " received from "
 msgstr ""
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "OK"
 msgstr ""
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "FAILED"
 msgstr ""
 
-#: src/irc/irc-dcc.c:414
+#: src/irc/irc-dcc.c:419
 #, c-format
 msgid "DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:474
+#: src/irc/irc-dcc.c:479
 #, 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:485
+#: src/irc/irc-dcc.c:490
 #, c-format
 msgid "Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:585
+#: src/irc/irc-dcc.c:590
 #, c-format
 msgid "DCC: file %s%s%s resumed at position %u\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:594 src/irc/irc-dcc.c:619
+#: src/irc/irc-dcc.c:599 src/irc/irc-dcc.c:624
 #, 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:686
+#: src/irc/irc-dcc.c:691
 #, c-format
 msgid "%s not enough memory for new DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:705
+#: src/irc/irc-dcc.c:710
 msgid "DCC chat"
 msgstr ""
 
-#: src/irc/irc-dcc.c:732
+#: src/irc/irc-dcc.c:737
 #, 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:755
+#: src/irc/irc-dcc.c:760
 #, 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:775
+#: src/irc/irc-dcc.c:780
 #, c-format
 msgid "Incoming DCC chat request from %s%s%s (%s%d.%d.%d.%d%s)\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:792
+#: src/irc/irc-dcc.c:797
 #, c-format
 msgid "Sending DCC chat request to %s%s\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:810
+#: src/irc/irc-dcc.c:815
 #, 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:885
+#: src/irc/irc-dcc.c:895
 #, c-format
 msgid "%s not enough memory for DCC SEND\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:907
+#: src/irc/irc-dcc.c:915
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:929
+#: src/irc/irc-dcc.c:937
 #, c-format
 msgid "%s could not find address for '%s'. Falling back to local IP.\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:949
+#: src/irc/irc-dcc.c:957
 #, c-format
 msgid "%s cannot create socket for DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1007
+#: src/irc/irc-dcc.c:1015
 #, c-format
 msgid "%s cannot find available port for DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1051
+#: src/irc/irc-dcc.c:1059
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1131
+#: src/irc/irc-dcc.c:1139
 #, c-format
 msgid "%s error sending data to \"%s\" via DCC CHAT\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1217
+#: src/irc/irc-dcc.c:1225
 #, c-format
 msgid "Private %s> %s"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1416
+#: src/irc/irc-dcc.c:1424
 #, 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:1491
+#: src/irc/irc-dcc.c:1499
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr ""
@@ -2119,12 +2119,12 @@ msgstr ""
 msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
 msgstr ""
 
-#: src/gui/curses/gui-input.c:350
+#: src/gui/curses/gui-input.c:353
 #, c-format
 msgid "Day changed to %s\n"
 msgstr ""
 
-#: src/gui/curses/gui-input.c:436
+#: src/gui/curses/gui-input.c:439
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr ""
@@ -2210,11 +2210,11 @@ msgstr ""
 msgid "server"
 msgstr ""
 
-#: src/gui/gui-common.c:765
+#: src/gui/gui-common.c:768
 msgid "Not enough memory for new line\n"
 msgstr ""
 
-#: src/gui/gui-common.c:1134
+#: src/gui/gui-common.c:1137
 msgid "Not enough memory for infobar message\n"
 msgstr ""
 
@@ -2943,12 +2943,12 @@ msgstr ""
 msgid "Auto-reconnection is cancelled\n"
 msgstr ""
 
-#: src/common/command.c:1909 src/common/weechat.c:456
+#: src/common/command.c:1909 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr ""
 
-#: src/common/command.c:1919 src/common/weechat.c:476
+#: src/common/command.c:1919 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr ""
@@ -2998,7 +2998,7 @@ msgstr ""
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:2286 src/common/weechat.c:508
+#: src/common/command.c:2286 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr ""
@@ -3177,8 +3177,8 @@ msgstr ""
 
 #: src/common/command.c:3133 src/common/command.c:3156
 #: src/common/command.c:3162 src/common/command.c:3168
-#: src/common/weechat.c:392 src/common/weechat.c:417 src/common/weechat.c:424
-#: src/common/weechat.c:431
+#: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
+#: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr ""
@@ -3188,7 +3188,7 @@ msgstr ""
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr ""
 
-#: src/common/command.c:3141 src/common/weechat.c:401
+#: src/common/command.c:3141 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr ""
@@ -3198,8 +3198,8 @@ msgid "  . type string (values: "
 msgstr ""
 
 #: src/common/command.c:3158 src/common/command.c:3164
-#: src/common/command.c:3170 src/common/weechat.c:419 src/common/weechat.c:426
-#: src/common/weechat.c:433
+#: src/common/command.c:3170 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/weechat.c:436
 msgid "empty"
 msgstr ""
 
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "  . type string (any string)\n"
 msgstr ""
 
-#: src/common/command.c:3173 src/common/weechat.c:436
+#: src/common/command.c:3173 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr ""
@@ -3338,19 +3338,19 @@ msgstr ""
 msgid "%s cannot add a buffer to hotlist\n"
 msgstr ""
 
-#: src/common/log.c:127
+#: src/common/log.c:116 src/common/log.c:132
 msgid "Not enough memory to write log file for a buffer\n"
 msgstr ""
 
-#: src/common/log.c:158
+#: src/common/log.c:163
 msgid "Unable to write log file for a buffer\n"
 msgstr ""
 
-#: src/common/log.c:162
+#: src/common/log.c:167
 msgid "****  Beginning of log  "
 msgstr ""
 
-#: src/common/log.c:176
+#: src/common/log.c:181
 msgid "****  End of log  "
 msgstr ""
 
@@ -3662,14 +3662,14 @@ msgstr ""
 msgid "Upgrade completed successfully\n"
 msgstr ""
 
-#: src/common/weechat.c:346
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "%s (c) Copyright 2003-2006, compiled on %s %s\n"
 "Developed by FlashCode <flashcode@flashtux.org> - %s"
 msgstr ""
 
-#: src/common/weechat.c:350
+#: src/common/weechat.c:353
 #, c-format
 msgid ""
 "Usage: %s [options ...]\n"
@@ -3677,7 +3677,7 @@ msgid ""
 "[,channel[...]]"
 msgstr ""
 
-#: src/common/weechat.c:354
+#: src/common/weechat.c:357
 #, c-format
 msgid ""
 "  -a, --no-connect        disable auto-connect to servers at startup\n"
@@ -3693,119 +3693,119 @@ msgid ""
 "  -w, --weechat-commands  display WeeChat commands\n"
 msgstr ""
 
-#: src/common/weechat.c:377
+#: src/common/weechat.c:380
 #, c-format
 msgid ""
 "WeeChat configuration options (<weechat_home>/weechat.rc):\n"
 "\n"
 msgstr ""
 
-#: src/common/weechat.c:390
+#: src/common/weechat.c:393
 #, c-format
 msgid "  . type: boolean\n"
 msgstr ""
 
-#: src/common/weechat.c:391
+#: src/common/weechat.c:394
 #, c-format
 msgid "  . values: 'on' or 'off'\n"
 msgstr ""
 
-#: src/common/weechat.c:397
+#: src/common/weechat.c:400
 #, c-format
 msgid "  . type: integer\n"
 msgstr ""
 
-#: src/common/weechat.c:398
+#: src/common/weechat.c:401
 #, c-format
 msgid "  . values: between %d and %d\n"
 msgstr ""
 
-#: src/common/weechat.c:405 src/common/weechat.c:429
+#: src/common/weechat.c:408 src/common/weechat.c:432
 #, c-format
 msgid "  . type: string\n"
 msgstr ""
 
-#: src/common/weechat.c:406
+#: src/common/weechat.c:409
 #, c-format
 msgid "  . values: "
 msgstr ""
 
-#: src/common/weechat.c:422
+#: src/common/weechat.c:425
 #, c-format
 msgid "  . type: color\n"
 msgstr ""
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:426
 #, c-format
 msgid "  . values: Curses or Gtk color\n"
 msgstr ""
 
-#: src/common/weechat.c:430
+#: src/common/weechat.c:433
 #, c-format
 msgid "  . values: any string\n"
 msgstr ""
 
-#: src/common/weechat.c:530
+#: src/common/weechat.c:533
 #, c-format
 msgid "%s default keys:\n"
 msgstr ""
 
-#: src/common/weechat.c:579
+#: src/common/weechat.c:582
 #, c-format
 msgid "%s missing argument for --dir option\n"
 msgstr ""
 
-#: src/common/weechat.c:624
+#: src/common/weechat.c:627
 #, c-format
 msgid "%s missing argument for --session option\n"
 msgstr ""
 
-#: src/common/weechat.c:645
+#: src/common/weechat.c:648
 #, c-format
 msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
 msgstr ""
 
-#: src/common/weechat.c:659
+#: src/common/weechat.c:662
 #, c-format
 msgid "%s unable to create server ('%s'), ignored\n"
 msgstr ""
 
-#: src/common/weechat.c:668
+#: src/common/weechat.c:671
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr ""
 
-#: src/common/weechat.c:688
+#: src/common/weechat.c:691
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr ""
 
-#: src/common/weechat.c:711
+#: src/common/weechat.c:714
 #, c-format
 msgid "%s unable to get HOME directory\n"
 msgstr ""
 
-#: src/common/weechat.c:720
+#: src/common/weechat.c:723
 #, c-format
 msgid "%s not enough memory for home directory\n"
 msgstr ""
 
-#: src/common/weechat.c:731 src/common/weechat.c:744
+#: src/common/weechat.c:734 src/common/weechat.c:755 src/common/weechat.c:768
 #, c-format
 msgid "%s unable to create \"%s\" directory\n"
 msgstr ""
 
-#: src/common/weechat.c:790
+#: src/common/weechat.c:814
 #, c-format
 msgid "%s unable to create/append to log file (%s/%s)"
 msgstr ""
 
-#: src/common/weechat.c:841
+#: src/common/weechat.c:865
 #, c-format
 msgid "%sWelcome to %s%s%s, %s\n"
 msgstr ""
 
-#: src/common/weechat.c:855 src/common/weechat.c:865
+#: src/common/weechat.c:879 src/common/weechat.c:889
 msgid "compiled on"
 msgstr ""
 
diff --git a/src/common/log.c b/src/common/log.c
index f6881052e..6738b0404 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -107,15 +107,20 @@ void
 log_start (t_gui_buffer *buffer)
 {
     int length;
-    char *ptr_home, *log_path, *log_path2, *ptr_path;
+    char *log_path, *log_path2;
     
-    ptr_home = getenv ("HOME");
-    log_path = weechat_strreplace (cfg_log_path, "~", ptr_home);
-    log_path2 = weechat_strreplace ((log_path) ?
-                                    log_path : cfg_log_path,
-                                    "%h", weechat_home);
-    ptr_path = (log_path2) ? log_path2 : ((log_path) ? log_path : cfg_log_path);
-    length = strlen (ptr_path) + 64;
+    log_path = weechat_strreplace (cfg_log_path, "~", getenv ("HOME"));
+    log_path2 = weechat_strreplace (log_path, "%h", weechat_home);
+    if (!log_path || !log_path2)
+    {
+        weechat_log_printf (_("Not enough memory to write log file for a buffer\n"));
+        if (log_path)
+            free (log_path);
+        if (log_path2)
+            free (log_path2);
+        return;
+    }
+    length = strlen (log_path2) + 64;
     if (SERVER(buffer))
         length += strlen (SERVER(buffer)->name);
     if (CHANNEL(buffer))
@@ -132,7 +137,7 @@ log_start (t_gui_buffer *buffer)
         return;
     }
     
-    strcpy (buffer->log_filename, ptr_path);
+    strcpy (buffer->log_filename, log_path2);
     if (log_path)
         free (log_path);
     if (log_path2)
diff --git a/src/common/weechat.c b/src/common/weechat.c
index 4342fa3b6..d94878514 100644
--- a/src/common/weechat.c
+++ b/src/common/weechat.c
@@ -273,6 +273,9 @@ weechat_strreplace (char *string, char *search, char *replace)
     char *pos, *new_string;
     int length1, length2, length_new, count;
     
+    if (!string || !search || !replace)
+        return NULL;
+    
     length1 = strlen (search);
     length2 = strlen (replace);
     
@@ -694,13 +697,13 @@ weechat_create_dir (char *directory)
 }
 
 /*
- * weechat_create_home_dirs: create WeeChat directories (if not found)
+ * weechat_create_home_dirs: create WeeChat directories
  */
 
 void
 weechat_create_home_dirs ()
 {
-    char *ptr_home, *dir_name;
+    char *ptr_home;
     int dir_length;
 
     if (!weechat_home)
@@ -732,21 +735,42 @@ weechat_create_home_dirs ()
                  WEECHAT_ERROR, weechat_home);
         weechat_shutdown (EXIT_FAILURE, 0);
     }
+}
+
+/*
+ * weechat_create_config_dirs: create config directories (read from config file)
+ */
+
+void
+weechat_create_config_dirs ()
+{
+    char *dir1, *dir2;
     
-    dir_length = strlen (weechat_home) + 64;
-    dir_name = (char *) malloc (dir_length * sizeof (char));
-    
-    /* create "<weechat_home>/logs" */
-    snprintf (dir_name, dir_length, "%s%s%s", weechat_home, DIR_SEPARATOR,
-              "logs");
-    if (!weechat_create_dir (dir_name))
-    {
+    /* create logs directory" */
+    dir1 = weechat_strreplace (cfg_log_path, "~", getenv ("HOME"));
+    dir2 = weechat_strreplace (dir1, "%h", weechat_home);
+    if (weechat_create_dir (dir2))
+        chmod (dir2, 0700);
+    else
         fprintf (stderr, _("%s unable to create \"%s\" directory\n"),
-                 WEECHAT_WARNING, dir_name);
-    }
-    chmod (dir_name, 0700);
+                 WEECHAT_WARNING, dir2);
+    if (dir1)
+        free (dir1);
+    if (dir2)
+        free (dir2);
     
-    free (dir_name);
+    /* create DCC download directory */
+    dir1 = weechat_strreplace (cfg_dcc_download_path, "~", getenv ("HOME"));
+    dir2 = weechat_strreplace (dir1, "%h", weechat_home);
+    if (weechat_create_dir (dir2))
+        chmod (dir2, 0700);
+    else
+        fprintf (stderr, _("%s unable to create \"%s\" directory\n"),
+                 WEECHAT_WARNING, dir2);
+    if (dir1)
+        free (dir1);
+    if (dir2)
+        free (dir2);
 }
 
 /*
@@ -1040,6 +1064,7 @@ main (int argc, char *argv[])
     weechat_init_log ();                /* init log file                    */
     command_index_build ();             /* build cmd index for completion   */
     weechat_config_read ();             /* read configuration               */
+    weechat_create_config_dirs ();      /* create config directories        */
     utf8_init ();                       /* init UTF-8 in WeeChat            */
     gui_init ();                        /* init WeeChat interface           */
     fifo_create ();                     /* FIFO pipe for remote control     */
diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c
index 0cf3af771..e44c5b12e 100644
--- a/src/common/weeconfig.c
+++ b/src/common/weeconfig.c
@@ -791,7 +791,7 @@ t_config_option weechat_options_dcc[] =
   { "dcc_download_path", N_("path for incoming files with dcc"),
     N_("path for writing incoming files with dcc (default: user home)"),
     OPTION_TYPE_STRING, 0, 0, 0,
-    "~", NULL, NULL, &cfg_dcc_download_path, &config_change_noop },
+    "%h/dcc", NULL, NULL, &cfg_dcc_download_path, &config_change_noop },
   { "dcc_upload_path", N_("default path for sending files with dcc"),
     N_("path for reading files when sending thru dcc (when no path is specified)"),
     OPTION_TYPE_STRING, 0, 0, 0, "~",
diff --git a/src/irc/irc-dcc.c b/src/irc/irc-dcc.c
index 2729d100a..4a9d8593e 100644
--- a/src/irc/irc-dcc.c
+++ b/src/irc/irc-dcc.c
@@ -146,34 +146,39 @@ dcc_file_is_resumable (t_irc_dcc *ptr_dcc, char *filename)
 void
 dcc_find_filename (t_irc_dcc *ptr_dcc)
 {
-    char *ptr_home, *filename2;
+    char *dir1, *dir2, *filename2;
     
     if (!DCC_IS_FILE(ptr_dcc->type))
         return;
     
-    ptr_home = getenv ("HOME");
-    ptr_dcc->local_filename = (char *) malloc (strlen (cfg_dcc_download_path) +
+    dir1 = weechat_strreplace (cfg_dcc_download_path, "~", getenv ("HOME"));
+    if (!dir1)
+        return;
+    dir2 = weechat_strreplace (dir1, "%h", weechat_home);
+    if (!dir2)
+    {
+        free (dir1);
+        return;
+    }
+    
+    ptr_dcc->local_filename = (char *) malloc (strlen (dir2) +
                                                strlen (ptr_dcc->nick) +
-                                               strlen (ptr_dcc->filename) +
-                                               ((cfg_dcc_download_path[0] == '~') ?
-                                                strlen (ptr_home) : 0) +
-                                               4);
+                                               strlen (ptr_dcc->filename) + 4);
     if (!ptr_dcc->local_filename)
         return;
     
-    if (cfg_dcc_download_path[0] == '~')
-    {
-        strcpy (ptr_dcc->local_filename, ptr_home);
-        strcat (ptr_dcc->local_filename, cfg_dcc_download_path + 1);
-    }
-    else
-        strcpy (ptr_dcc->local_filename, cfg_dcc_download_path);
+    strcpy (ptr_dcc->local_filename, dir2);
     if (ptr_dcc->local_filename[strlen (ptr_dcc->local_filename) - 1] != DIR_SEPARATOR_CHAR)
         strcat (ptr_dcc->local_filename, DIR_SEPARATOR);
     strcat (ptr_dcc->local_filename, ptr_dcc->nick);
     strcat (ptr_dcc->local_filename, ".");
     strcat (ptr_dcc->local_filename, ptr_dcc->filename);
     
+    if (dir1)
+        free (dir1);
+    if (dir2 )
+        free (dir2);
+    
     /* file already exists? */
     if (access (ptr_dcc->local_filename, F_OK) == 0)
     {
@@ -847,7 +852,7 @@ dcc_add (t_irc_server *server, int type, unsigned long addr, int port, char *nic
 void
 dcc_send_request (t_irc_server *server, int type, char *nick, char *filename)
 {
-    char *ptr_home, *filename2, *short_filename, *pos;
+    char *dir1, *dir2, *filename2, *short_filename, *pos;
     int spaces, args, port_start, port_end;
     struct stat st;
     int sock, port;
@@ -872,12 +877,17 @@ dcc_send_request (t_irc_server *server, int type, char *nick, char *filename)
             filename2 = strdup (filename);
         else
         {
-            ptr_home = getenv ("HOME");
-            filename2 = (char *) malloc (strlen (cfg_dcc_upload_path) +
-                                         strlen (filename) +
-                                         ((cfg_dcc_upload_path[0] == '~') ?
-                                             strlen (ptr_home) : 0) +
-                                         4);
+            dir1 = weechat_strreplace (cfg_dcc_upload_path, "~", getenv ("HOME"));
+            if (!dir1)
+                return;
+            dir2 = weechat_strreplace (dir1, "%h", weechat_home);
+            if (!dir2)
+            {
+                free (dir1);
+                return;
+            }
+            filename2 = (char *) malloc (strlen (dir2) +
+                                         strlen (filename) + 4);
             if (!filename2)
             {
                 irc_display_prefix (server, server->buffer, PREFIX_ERROR);
@@ -886,16 +896,14 @@ dcc_send_request (t_irc_server *server, int type, char *nick, char *filename)
                             WEECHAT_ERROR);
                 return;
             }
-            if (cfg_dcc_upload_path[0] == '~')
-            {
-                strcpy (filename2, ptr_home);
-                strcat (filename2, cfg_dcc_upload_path + 1);
-            }
-            else
-                strcpy (filename2, cfg_dcc_upload_path);
+            strcpy (filename2, dir2);
             if (filename2[strlen (filename2) - 1] != DIR_SEPARATOR_CHAR)
                 strcat (filename2, DIR_SEPARATOR);
             strcat (filename2, filename);
+            if (dir1)
+                free (dir1);
+            if (dir2)
+                free (dir2);
         }
 #endif
         
diff --git a/weechat/doc/buildxml.pl b/weechat/doc/buildxml.pl
index 479fbed75..f56419774 100755
--- a/weechat/doc/buildxml.pl
+++ b/weechat/doc/buildxml.pl
@@ -32,7 +32,7 @@
                   "en_US" => "values",
                   "es_ES" => "valores");
 %all_default   = ("fr_FR" => "valeur par défaut",
-                  "en_US" => "default values",
+                  "en_US" => "default value",
                   "es_ES" => "valor por defecto");
 %all_desc      = ("fr_FR" => "description",
                   "en_US" => "description",
diff --git a/weechat/doc/en/config.xml b/weechat/doc/en/config.xml
index 460117f99..21864ad44 100644
--- a/weechat/doc/en/config.xml
+++ b/weechat/doc/en/config.xml
@@ -9,1175 +9,1175 @@
   <entry><option>look_set_title</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Set title for window (terminal for Curses GUI) with name and version</entry>
 </row>
 <row>
   <entry><option>look_startup_logo</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Display WeeChat logo at startup</entry>
 </row>
 <row>
   <entry><option>look_startup_version</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Display WeeChat version at startup</entry>
 </row>
 <row>
   <entry><option>look_weechat_slogan</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'the geekest IRC client!'</entry>
   <entry>WeeChat slogan (if empty, slogan is not used)</entry>
 </row>
 <row>
   <entry><option>look_charset_decode_iso</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'ISO-8859-1'</entry>
   <entry>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</entry>
 </row>
 <row>
   <entry><option>look_charset_decode_utf</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'UTF-8'</entry>
   <entry>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</entry>
 </row>
 <row>
   <entry><option>look_charset_encode</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Charset for encoding messages sent to server, examples: UFT-8, ISO-8859-1 (if empty, messages are not converted)</entry>
 </row>
 <row>
   <entry><option>look_charset_internal</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Forces internal WeeChat charset (should be empty in most cases, that means detected charset is used)</entry>
 </row>
 <row>
   <entry><option>look_one_server_buffer</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Use same buffer for all servers</entry>
 </row>
 <row>
   <entry><option>look_open_near_server</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Open new channels/privates near server</entry>
 </row>
 <row>
   <entry><option>look_scroll_amount</option></entry>
   <entry>integer</entry>
   <entry>between 1 and 2147483647</entry>
-  <entry></entry>
+  <entry>3</entry>
   <entry>How many lines to scroll by with scroll_up and scroll_down</entry>
 </row>
 <row>
   <entry><option>look_buffer_timestamp</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'[%H:%M:%S]'</entry>
   <entry>Timestamp for buffers</entry>
 </row>
 <row>
   <entry><option>look_color_nicks_number</option></entry>
   <entry>integer</entry>
   <entry>between 1 and 10</entry>
-  <entry></entry>
+  <entry>10</entry>
   <entry>Number of colors to use for nicks colors</entry>
 </row>
 <row>
   <entry><option>look_color_actions</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Display actions with different colors</entry>
 </row>
 <row>
   <entry><option>look_nicklist</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Display nicklist window (for channel windows)</entry>
 </row>
 <row>
   <entry><option>look_nicklist_position</option></entry>
   <entry>string</entry>
   <entry>'left', 'right', 'top', 'bottom'</entry>
-  <entry></entry>
+  <entry>'right'</entry>
   <entry>Nicklist position (top, left, right (default), bottom)</entry>
 </row>
 <row>
   <entry><option>look_nicklist_min_size</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 100</entry>
-  <entry></entry>
+  <entry>0</entry>
   <entry>Min size for nicklist (width or height, depending on look_nicklist_position (0 = no min size))</entry>
 </row>
 <row>
   <entry><option>look_nicklist_max_size</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 100</entry>
-  <entry></entry>
+  <entry>0</entry>
   <entry>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))</entry>
 </row>
 <row>
   <entry><option>look_no_nickname</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'-cmd-'</entry>
   <entry>Text to display instead of nick when not connected</entry>
 </row>
 <row>
   <entry><option>look_nickmode</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Display nick mode ((half)op/voice) before each nick</entry>
 </row>
 <row>
   <entry><option>look_nickmode_empty</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Display space if nick mode is not (half)op/voice</entry>
 </row>
 <row>
   <entry><option>look_nick_completor</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>':'</entry>
   <entry>The string inserted after nick completion</entry>
 </row>
 <row>
   <entry><option>look_nick_completion_ignore</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'[]-^'</entry>
   <entry>Chars ignored for nick completion</entry>
 </row>
 <row>
   <entry><option>look_nick_complete_first</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Complete only with first nick found</entry>
 </row>
 <row>
   <entry><option>look_infobar</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Enable info bar</entry>
 </row>
 <row>
   <entry><option>look_infobar_timestamp</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'%B, %A %d %Y'</entry>
   <entry>Timestamp for time in infobar</entry>
 </row>
 <row>
   <entry><option>look_infobar_seconds</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Display seconds in infobar time</entry>
 </row>
 <row>
   <entry><option>look_infobar_delay_highlight</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 2147483647</entry>
-  <entry></entry>
+  <entry>7</entry>
   <entry>Delay (in seconds) for highlight messages in infobar (0 = disable highlight notifications in infobar)</entry>
 </row>
 <row>
   <entry><option>look_hotlist_names_count</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 32</entry>
-  <entry></entry>
+  <entry>3</entry>
   <entry>Max number of names in hotlist (0 = no name displayed, only buffer numbers)</entry>
 </row>
 <row>
   <entry><option>look_hotlist_names_level</option></entry>
   <entry>integer</entry>
   <entry>between 1 and 15</entry>
-  <entry></entry>
+  <entry>12</entry>
   <entry>Level for displaying names in hotlist (combination of: 1=join/part, 2=message, 4=private, 8=highlight, for example: 12=private+highlight)</entry>
 </row>
 <row>
   <entry><option>look_hotlist_names_length</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 32</entry>
-  <entry></entry>
+  <entry>0</entry>
   <entry>Max length of names in hotlist (0 = no limit)</entry>
 </row>
 <row>
   <entry><option>look_day_change</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Display special message when day changes</entry>
 </row>
 <row>
   <entry><option>look_day_change_timestamp</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'%a, %d %b %Y'</entry>
   <entry>Timestamp for date displayed when day changed</entry>
 </row>
 <row>
   <entry><option>look_read_marker</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>' '</entry>
   <entry>Use a marker on servers/channels to show first unread line</entry>
 </row>
 <row>
   <entry><option>col_real_white</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>If set, uses real white color, disabled by default for terms with white background (if you never use white background, you should turn on this option to see real white instead of default term foreground color)</entry>
 </row>
 <row>
   <entry><option>col_separator</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'blue'</entry>
   <entry>Color for window separators (when splited)</entry>
 </row>
 <row>
   <entry><option>col_title</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for title bar</entry>
 </row>
 <row>
   <entry><option>col_title_bg</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'blue'</entry>
   <entry>Background for title bar</entry>
 </row>
 <row>
   <entry><option>col_chat</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for chat text</entry>
 </row>
 <row>
   <entry><option>col_chat_time</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for time in chat window</entry>
 </row>
 <row>
   <entry><option>col_chat_time_sep</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'brown'</entry>
   <entry>Color for time separator (chat window)</entry>
 </row>
 <row>
   <entry><option>col_chat_prefix1</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightcyan'</entry>
   <entry>Color for 1st and 3rd char of prefix</entry>
 </row>
 <row>
   <entry><option>col_chat_prefix2</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'white'</entry>
   <entry>Color for middle char of prefix</entry>
 </row>
 <row>
   <entry><option>col_chat_server</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'brown'</entry>
   <entry>Color for server name</entry>
 </row>
 <row>
   <entry><option>col_chat_join</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightgreen'</entry>
   <entry>Color for join arrow (prefix)</entry>
 </row>
 <row>
   <entry><option>col_chat_part</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightred'</entry>
   <entry>Color for part/quit arrow (prefix)</entry>
 </row>
 <row>
   <entry><option>col_chat_nick</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightcyan'</entry>
   <entry>Color for nicks in actions (chat window)</entry>
 </row>
 <row>
   <entry><option>col_chat_host</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'cyan'</entry>
   <entry>Color for hostnames (chat window)</entry>
 </row>
 <row>
   <entry><option>col_chat_channel</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'white'</entry>
   <entry>Color for channel names in actions (chat window)</entry>
 </row>
 <row>
   <entry><option>col_chat_dark</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'green'</entry>
   <entry>Color for dark separators (chat window)</entry>
 </row>
 <row>
   <entry><option>col_chat_highlight</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'yellow'</entry>
   <entry>Color for highlighted nick (chat window)</entry>
 </row>
 <row>
   <entry><option>col_chat_bg</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Background for chat window</entry>
 </row>
 <row>
   <entry><option>col_chat_read_marker</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'yellow'</entry>
   <entry>Color for unread data marker</entry>
 </row>
 <row>
   <entry><option>col_chat_read_marker_bg</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'magenta'</entry>
   <entry>Background for unread data marker</entry>
 </row>
 <row>
   <entry><option>col_status</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for status bar</entry>
 </row>
 <row>
   <entry><option>col_status_delimiters</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'cyan'</entry>
   <entry>Color for status bar delimiters</entry>
 </row>
 <row>
   <entry><option>col_status_channel</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'white'</entry>
   <entry>Color for current channel in status bar</entry>
 </row>
 <row>
   <entry><option>col_status_data_msg</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'yellow'</entry>
   <entry>Color for window with new messages (status bar)</entry>
 </row>
 <row>
   <entry><option>col_status_private</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightmagenta'</entry>
   <entry>Color for window with private message (status bar)</entry>
 </row>
 <row>
   <entry><option>col_status_highlight</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightred'</entry>
   <entry>Color for window with highlight (status bar)</entry>
 </row>
 <row>
   <entry><option>col_status_data_other</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for window with new data (not messages) (status bar)</entry>
 </row>
 <row>
   <entry><option>col_status_more</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'white'</entry>
   <entry>Color for window with new data (status bar)</entry>
 </row>
 <row>
   <entry><option>col_status_bg</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'blue'</entry>
   <entry>Background for status window</entry>
 </row>
 <row>
   <entry><option>col_infobar</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'black'</entry>
   <entry>Color for info bar text</entry>
 </row>
 <row>
   <entry><option>col_infobar_delimiters</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'blue'</entry>
   <entry>Color for infobar delimiters</entry>
 </row>
 <row>
   <entry><option>col_infobar_highlight</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'white'</entry>
   <entry>Color for info bar highlight notification</entry>
 </row>
 <row>
   <entry><option>col_infobar_bg</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'cyan'</entry>
   <entry>Background for info bar window</entry>
 </row>
 <row>
   <entry><option>col_input</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for input text</entry>
 </row>
 <row>
   <entry><option>col_input_channel</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'white'</entry>
   <entry>Color for input text (channel name)</entry>
 </row>
 <row>
   <entry><option>col_input_nick</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightcyan'</entry>
   <entry>Color for input text (nick name)</entry>
 </row>
 <row>
   <entry><option>col_input_delimiters</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'cyan'</entry>
   <entry>Color for input text (delimiters)</entry>
 </row>
 <row>
   <entry><option>col_input_bg</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Background for input window</entry>
 </row>
 <row>
   <entry><option>col_nick</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for nicknames</entry>
 </row>
 <row>
   <entry><option>col_nick_away</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'cyan'</entry>
   <entry>Color for away nicknames</entry>
 </row>
 <row>
   <entry><option>col_nick_chanowner</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightgreen'</entry>
   <entry>Color for chan owner symbol (specific to unrealircd)</entry>
 </row>
 <row>
   <entry><option>col_nick_chanadmin</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightgreen'</entry>
   <entry>Color for chan admin symbol (specific to unrealircd)</entry>
 </row>
 <row>
   <entry><option>col_nick_op</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightgreen'</entry>
   <entry>Color for operator symbol</entry>
 </row>
 <row>
   <entry><option>col_nick_halfop</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightmagenta'</entry>
   <entry>Color for half-operator symbol</entry>
 </row>
 <row>
   <entry><option>col_nick_voice</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'yellow'</entry>
   <entry>Color for voice symbol</entry>
 </row>
 <row>
   <entry><option>col_nick_more</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightmagenta'</entry>
   <entry>Color for '+' when scrolling nicks</entry>
 </row>
 <row>
   <entry><option>col_nick_sep</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'blue'</entry>
   <entry>Color for nick separator</entry>
 </row>
 <row>
   <entry><option>col_nick_self</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'white'</entry>
   <entry>Color for local nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color1</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'cyan'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color2</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'magenta'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color3</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'green'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color4</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'brown'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color5</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightblue'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color6</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color7</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightcyan'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color8</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightmagenta'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color9</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightgreen'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_color10</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'blue'</entry>
   <entry>Color for nick</entry>
 </row>
 <row>
   <entry><option>col_nick_private</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Color for other nick in private window</entry>
 </row>
 <row>
   <entry><option>col_nick_bg</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'default'</entry>
   <entry>Background for nicknames</entry>
 </row>
 <row>
   <entry><option>col_chat_dcc_selected</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'white'</entry>
   <entry>Color for selected DCC (chat window)</entry>
 </row>
 <row>
   <entry><option>col_dcc_waiting</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightcyan'</entry>
   <entry>Color for "waiting" dcc status</entry>
 </row>
 <row>
   <entry><option>col_dcc_connecting</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'yellow'</entry>
   <entry>Color for "connecting" dcc status</entry>
 </row>
 <row>
   <entry><option>col_dcc_active</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightblue'</entry>
   <entry>Color for "active" dcc status</entry>
 </row>
 <row>
   <entry><option>col_dcc_done</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightgreen'</entry>
   <entry>Color for "done" dcc status</entry>
 </row>
 <row>
   <entry><option>col_dcc_failed</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightred'</entry>
   <entry>Color for "failed" dcc status</entry>
 </row>
 <row>
   <entry><option>col_dcc_aborted</option></entry>
   <entry>color</entry>
   <entry>Curses or Gtk color</entry>
-  <entry></entry>
+  <entry>'lightred'</entry>
   <entry>Color for "aborted" dcc status</entry>
 </row>
 <row>
   <entry><option>history_max_lines</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 2147483647</entry>
-  <entry></entry>
+  <entry>4096</entry>
   <entry>Maximum number of lines in history for one server/channel/private window (0 = unlimited)</entry>
 </row>
 <row>
   <entry><option>history_max_commands</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 2147483647</entry>
-  <entry></entry>
+  <entry>100</entry>
   <entry>Maximum number of user commands in history (0 = unlimited)</entry>
 </row>
 <row>
   <entry><option>history_display_default</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 2147483647</entry>
-  <entry></entry>
+  <entry>5</entry>
   <entry>Maximum number of commands to display by default in history listing (0 = unlimited)</entry>
 </row>
 <row>
   <entry><option>log_auto_server</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Automatically log server messages</entry>
 </row>
 <row>
   <entry><option>log_auto_channel</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Automatically log channel chats</entry>
 </row>
 <row>
   <entry><option>log_auto_private</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Automatically log private chats</entry>
 </row>
 <row>
   <entry><option>log_plugin_msg</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Log messages from plugins (scripts)</entry>
 </row>
 <row>
   <entry><option>log_path</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'%h/logs/'</entry>
   <entry>Path for WeeChat log files ('%h' will be replaced by WeeChat home, ~/.weechat by default)</entry>
 </row>
 <row>
   <entry><option>log_timestamp</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'%Y %b %d %H:%M:%S'</entry>
   <entry>Timestamp for log (see man strftime for date/time specifiers)</entry>
 </row>
 <row>
   <entry><option>log_hide_nickserv_pwd</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Hide password displayed by nickserv</entry>
 </row>
 <row>
   <entry><option>irc_display_away</option></entry>
   <entry>string</entry>
   <entry>'off', 'local', 'channel'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Display message when (un)marking as away</entry>
 </row>
 <row>
   <entry><option>irc_show_away_once</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Show remote away message only once in private</entry>
 </row>
 <row>
   <entry><option>irc_default_msg_part</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'WeeChat %v'</entry>
   <entry>Default part message (leaving channel) ('%v' will be replaced by WeeChat version in string)</entry>
 </row>
 <row>
   <entry><option>irc_default_msg_quit</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'WeeChat %v'</entry>
   <entry>Default quit message ('%v' will be replaced by WeeChat version in string)</entry>
 </row>
 <row>
   <entry><option>irc_notice_as_pv</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Display notices as private messages</entry>
 </row>
 <row>
   <entry><option>irc_away_check</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 2147483647</entry>
-  <entry></entry>
+  <entry>0</entry>
   <entry>Interval between two checks for away (in minutes, 0 = never check)</entry>
 </row>
 <row>
   <entry><option>irc_away_check_max_nicks</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 2147483647</entry>
-  <entry></entry>
+  <entry>0</entry>
   <entry>Do not check away nicks on channels with high number of nicks (0 = unlimited)</entry>
 </row>
 <row>
   <entry><option>irc_lag_check</option></entry>
   <entry>integer</entry>
   <entry>between 30 and 2147483647</entry>
-  <entry></entry>
+  <entry>60</entry>
   <entry>Interval between two checks for lag (in seconds)</entry>
 </row>
 <row>
   <entry><option>irc_lag_min_show</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 2147483647</entry>
-  <entry></entry>
+  <entry>1</entry>
   <entry>Minimum lag to show (in seconds)</entry>
 </row>
 <row>
   <entry><option>irc_lag_disconnect</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 2147483647</entry>
-  <entry></entry>
+  <entry>5</entry>
   <entry>Disconnect after important lag (in minutes, 0 = never disconnect)</entry>
 </row>
 <row>
   <entry><option>irc_fifo_pipe</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Create a FIFO pipe for remote control</entry>
 </row>
 <row>
   <entry><option>irc_highlight</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Comma separated list of words to highlight (case insensitive comparison, words may begin or end with "*" for partial match)</entry>
 </row>
 <row>
   <entry><option>irc_colors_receive</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>When off, colors codes are ignored in incoming messages</entry>
 </row>
 <row>
   <entry><option>irc_colors_send</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %U=underline, %R=reverse)</entry>
 </row>
 <row>
   <entry><option>dcc_auto_accept_files</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Automatically accept incoming dcc files</entry>
 </row>
 <row>
   <entry><option>dcc_auto_accept_chats</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Automatically accept dcc chats (use carefully!)</entry>
 </row>
 <row>
   <entry><option>dcc_timeout</option></entry>
   <entry>integer</entry>
   <entry>between 1 and 2147483647</entry>
-  <entry></entry>
+  <entry>300</entry>
   <entry>Timeout for dcc request (in seconds)</entry>
 </row>
 <row>
   <entry><option>dcc_blocksize</option></entry>
   <entry>integer</entry>
   <entry>between 1024 and 102400</entry>
-  <entry></entry>
+  <entry>65536</entry>
   <entry>Block size for dcc packets in bytes (default: 65536)</entry>
 </row>
 <row>
   <entry><option>dcc_port_range</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>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)</entry>
 </row>
 <row>
   <entry><option>dcc_own_ip</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>IP or DNS address used for outgoing dcc (if empty, local interface IP is used)</entry>
 </row>
 <row>
   <entry><option>dcc_download_path</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'%h/dcc'</entry>
   <entry>Path for writing incoming files with dcc (default: user home)</entry>
 </row>
 <row>
   <entry><option>dcc_upload_path</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'~'</entry>
   <entry>Path for reading files when sending thru dcc (when no path is specified)</entry>
 </row>
 <row>
   <entry><option>dcc_convert_spaces</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Convert spaces to underscores when sending files</entry>
 </row>
 <row>
   <entry><option>dcc_auto_rename</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Rename incoming files if already exists (add '.1', '.2', ...)</entry>
 </row>
 <row>
   <entry><option>dcc_auto_resume</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Automatically resume dcc transfer if connection with remote host is loosed</entry>
 </row>
 <row>
   <entry><option>proxy_use</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Use a proxy server to connect to irc server</entry>
 </row>
 <row>
   <entry><option>proxy_type</option></entry>
   <entry>string</entry>
   <entry>'http', 'socks4', 'socks5'</entry>
-  <entry></entry>
+  <entry>'http'</entry>
   <entry>Proxy type (http (default), socks4, socks5)</entry>
 </row>
 <row>
   <entry><option>proxy_ipv6</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Connect to proxy in ipv6</entry>
 </row>
 <row>
   <entry><option>proxy_address</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Proxy server address (IP or hostname)</entry>
 </row>
 <row>
   <entry><option>proxy_port</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 65535</entry>
-  <entry></entry>
+  <entry>3128</entry>
   <entry>Port for connecting to proxy server</entry>
 </row>
 <row>
   <entry><option>proxy_username</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Username for proxy server</entry>
 </row>
 <row>
   <entry><option>proxy_password</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Password for proxy server</entry>
 </row>
 <row>
   <entry><option>plugins_path</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'%h/plugins'</entry>
   <entry>Path for searching plugins ('%h' will be replaced by WeeChat home, ~/.weechat by default)</entry>
 </row>
 <row>
   <entry><option>plugins_autoload</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'*'</entry>
   <entry>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")</entry>
 </row>
 <row>
   <entry><option>plugins_extension</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>'.so'</entry>
   <entry>Standard plugins extension in filename, used for autoload (if empty, then all files are loaded when autoload is "*")</entry>
 </row>
 <row>
   <entry><option>server_name</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Name associated to IRC server (for display only)</entry>
 </row>
 <row>
   <entry><option>server_autoconnect</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Automatically connect to server when WeeChat is starting</entry>
 </row>
 <row>
   <entry><option>server_autoreconnect</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Automatically reconnect to server when disconnected</entry>
 </row>
 <row>
   <entry><option>server_autoreconnect_delay</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 65535</entry>
-  <entry></entry>
+  <entry>30</entry>
   <entry>Delay (in seconds) before trying again to reconnect to server</entry>
 </row>
 <row>
   <entry><option>server_address</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>IP address or hostname of IRC server</entry>
 </row>
 <row>
   <entry><option>server_port</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 65535</entry>
-  <entry></entry>
+  <entry>6667</entry>
   <entry>Port for connecting to server</entry>
 </row>
 <row>
   <entry><option>server_ipv6</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Use IPv6 protocol for server communication</entry>
 </row>
 <row>
   <entry><option>server_ssl</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'off'</entry>
   <entry>Use SSL for server communication</entry>
 </row>
 <row>
   <entry><option>server_password</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Password for IRC server</entry>
 </row>
 <row>
   <entry><option>server_nick1</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Nickname to use on IRC server</entry>
 </row>
 <row>
   <entry><option>server_nick2</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Alternate nickname to use on IRC server (if nickname is already used)</entry>
 </row>
 <row>
   <entry><option>server_nick3</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>2nd alternate nickname to use on IRC server (if alternate nickname is already used)</entry>
 </row>
 <row>
   <entry><option>server_username</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>User name to use on IRC server</entry>
 </row>
 <row>
   <entry><option>server_realname</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Real name to use on IRC server</entry>
 </row>
 <row>
   <entry><option>server_command</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Command(s) to run when connected to server (many commands should be separated by ';', use '\;' for a semicolon)</entry>
 </row>
 <row>
   <entry><option>server_command_delay</option></entry>
   <entry>integer</entry>
   <entry>between 0 and 5</entry>
-  <entry></entry>
+  <entry>0</entry>
   <entry>Delay (in seconds) after command was executed (example: give some time for authentication)</entry>
 </row>
 <row>
   <entry><option>server_autojoin</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Comma separated list of channels to join when connected to server (example: "#chan1,#chan2,#chan3 key1,key2")</entry>
 </row>
 <row>
   <entry><option>server_autorejoin</option></entry>
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
-  <entry></entry>
+  <entry>'on'</entry>
   <entry>Automatically rejoin channels when kicked</entry>
 </row>
 <row>
   <entry><option>server_notify_levels</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Comma separated list of notify levels for channels of this server (format: #channel:1,..)</entry>
 </row>
 <row>
   <entry><option>server_charset_decode_iso</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Comma separated list of charsets for server and channels, to decode ISO (format: server:charset,#channel:charset,..)</entry>
 </row>
 <row>
   <entry><option>server_charset_decode_utf</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Comma separated list of charsets for server and channels, to decode UTF (format: server:charset,#channel:charset,..)</entry>
 </row>
 <row>
   <entry><option>server_charset_encode</option></entry>
   <entry>string</entry>
   <entry>any string</entry>
-  <entry></entry>
+  <entry>''</entry>
   <entry>Comma separated list of charsets for server and channels, to encode messages (format: server:charset,#channel:charset,..)</entry>
 </row>
diff --git a/weechat/doc/fr/config.xml b/weechat/doc/fr/config.xml
index 6ca2ed83f..f5f621c9a 100644
--- a/weechat/doc/fr/config.xml
+++ b/weechat/doc/fr/config.xml
@@ -926,7 +926,7 @@
   <entry><option>dcc_download_path</option></entry>
   <entry>chaîne</entry>
   <entry>toute chaîne</entry>
-  <entry>'~'</entry>
+  <entry>'%h/dcc'</entry>
   <entry>Chemin pour écrire les fichiers reçus par dcc (par défaut: répertoire de l'utilisateur)</entry>
 </row>
 <row>
diff --git a/weechat/po/cs.po b/weechat/po/cs.po
index 29b61345d..6a6a3c19a 100644
--- a/weechat/po/cs.po
+++ b/weechat/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.8-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-03-03 11:15+0100\n"
+"POT-Creation-Date: 2006-03-04 16:18+0100\n"
 "PO-Revision-Date: 2006-02-22 10:26+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1939,38 +1939,38 @@ msgstr "Selhal"
 msgid "Aborted"
 msgstr "Zrušeno"
 
-#: src/irc/irc-dcc.c:383
+#: src/irc/irc-dcc.c:388
 #, c-format
 msgid "DCC: file %s%s%s"
 msgstr "DCC: soubor %s%s%s"
 
-#: src/irc/irc-dcc.c:389
+#: src/irc/irc-dcc.c:394
 #, c-format
 msgid " (local filename: %s%s%s)"
 msgstr " (lokální jmého souboru: %s%s%s)"
 
-#: src/irc/irc-dcc.c:394
+#: src/irc/irc-dcc.c:399
 msgid " sent to "
 msgstr " poslán "
 
-#: src/irc/irc-dcc.c:396
+#: src/irc/irc-dcc.c:401
 msgid " received from "
 msgstr " obdrĹľen od "
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "OK"
 msgstr "OK"
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "FAILED"
 msgstr "SELHALO"
 
-#: src/irc/irc-dcc.c:414
+#: src/irc/irc-dcc.c:419
 #, c-format
 msgid "DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"
 msgstr "DCC rozhovor zavřen s %s%s %s(%s%d.%d.%d.%d%s)\n"
 
-#: src/irc/irc-dcc.c:474
+#: src/irc/irc-dcc.c:479
 #, c-format
 msgid ""
 "%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1979,17 +1979,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:485
+#: src/irc/irc-dcc.c:490
 #, c-format
 msgid "Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"
 msgstr "Připojeno na %s%s %s(%s%d.%d.%d.%d.%s)%s přes DCC rozhovor\n"
 
-#: src/irc/irc-dcc.c:585
+#: src/irc/irc-dcc.c:590
 #, c-format
 msgid "DCC: file %s%s%s resumed at position %u\n"
 msgstr "DCC: soubor %s%s%s bude obnoven na pozici %u\n"
 
-#: src/irc/irc-dcc.c:594 src/irc/irc-dcc.c:619
+#: src/irc/irc-dcc.c:599 src/irc/irc-dcc.c:624
 #, c-format
 msgid ""
 "%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
@@ -1998,23 +1998,23 @@ msgstr ""
 "%s nemohu obnovit soubor \"%s\" (port: %d, počáteční pozice: %u): DCC "
 "nenalezeno nebo ukonÄŤeno\n"
 
-#: src/irc/irc-dcc.c:686
+#: src/irc/irc-dcc.c:691
 #, 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:705
+#: src/irc/irc-dcc.c:710
 msgid "DCC chat"
 msgstr "DCC rozhovor"
 
-#: src/irc/irc-dcc.c:732
+#: src/irc/irc-dcc.c:737
 #, 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 ""
 "Příchozí DCC soubor od %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s bytů\n"
 
-#: src/irc/irc-dcc.c:755
+#: src/irc/irc-dcc.c:760
 #, c-format
 msgid ""
 "Sending DCC file to %s%s%s: %s%s%s (local filename: %s%s%s), %s%lu%s bytes\n"
@@ -2022,17 +2022,17 @@ msgstr ""
 "Posílám DCC soubor k %s%s%s: %s%s%s (lokální jméno souboru: %s%s%s), %s%lu%s "
 "bytĹŻ\n"
 
-#: src/irc/irc-dcc.c:775
+#: src/irc/irc-dcc.c:780
 #, 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 %s%s%s (%s%d.%d.%d.%d%s)\n"
 
-#: src/irc/irc-dcc.c:792
+#: src/irc/irc-dcc.c:797
 #, c-format
 msgid "Sending DCC chat request to %s%s\n"
 msgstr "Posílám požadavek DCC rozhovoru na %s%s\n"
 
-#: src/irc/irc-dcc.c:810
+#: src/irc/irc-dcc.c:815
 #, c-format
 msgid ""
 "DCC: file %s%s%s (local filename: %s%s%s) will be resumed at position %u\n"
@@ -2040,47 +2040,47 @@ msgstr ""
 "DCC: soubor %s%s%s (lokální jméno souboru: %s%s%s) bude obnoven na pozici %"
 "u\n"
 
-#: src/irc/irc-dcc.c:885
+#: src/irc/irc-dcc.c:895
 #, c-format
 msgid "%s not enough memory for DCC SEND\n"
 msgstr "%s nedostatek pameti pro DCC SEND\n"
 
-#: src/irc/irc-dcc.c:907
+#: src/irc/irc-dcc.c:915
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr "%s nemohu přistupovat k souboru \"%s\"\n"
 
-#: src/irc/irc-dcc.c:929
+#: src/irc/irc-dcc.c:937
 #, c-format
 msgid "%s could not find address for '%s'. Falling back to local IP.\n"
 msgstr "%s nemůžu najíž adresu pro '%s'. Navracím se k lokální IP.\n"
 
-#: src/irc/irc-dcc.c:949
+#: src/irc/irc-dcc.c:957
 #, c-format
 msgid "%s cannot create socket for DCC\n"
 msgstr "%s nemohu vytvořit soket pro DCC\n"
 
-#: src/irc/irc-dcc.c:1007
+#: src/irc/irc-dcc.c:1015
 #, c-format
 msgid "%s cannot find available port for DCC\n"
 msgstr "%s nemĹŻĹľu najĂ­t dostupnĂ˝ port pro DCC\n"
 
-#: src/irc/irc-dcc.c:1051
+#: src/irc/irc-dcc.c:1059
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr "%s neomhu poslat DCC\n"
 
-#: src/irc/irc-dcc.c:1131
+#: src/irc/irc-dcc.c:1139
 #, 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:1217
+#: src/irc/irc-dcc.c:1225
 #, c-format
 msgid "Private %s> %s"
 msgstr "SoukromĂ˝ %s> %s"
 
-#: src/irc/irc-dcc.c:1416
+#: src/irc/irc-dcc.c:1424
 #, c-format
 msgid ""
 "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -2089,7 +2089,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:1491
+#: src/irc/irc-dcc.c:1499
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr "Ruším aktivní DCC: \"%s\" od %s\n"
@@ -2263,12 +2263,12 @@ msgstr ""
 msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
 msgstr "%s server/kanál (%s/%s) nenaleyen pro exec příkaz pluginu\n"
 
-#: src/gui/curses/gui-input.c:350
+#: src/gui/curses/gui-input.c:353
 #, c-format
 msgid "Day changed to %s\n"
 msgstr "Změnil se den na %s\n"
 
-#: src/gui/curses/gui-input.c:436
+#: src/gui/curses/gui-input.c:439
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s zpoždění je veliké, odpojuji se od serveru...\n"
@@ -2354,11 +2354,11 @@ msgstr ""
 msgid "server"
 msgstr "server"
 
-#: src/gui/gui-common.c:765
+#: src/gui/gui-common.c:768
 msgid "Not enough memory for new line\n"
 msgstr "Nedostatek paměti pro nový řádek\n"
 
-#: src/gui/gui-common.c:1134
+#: src/gui/gui-common.c:1137
 msgid "Not enough memory for infobar message\n"
 msgstr "Nedostatek paměti pro infobar zprávu\n"
 
@@ -3181,12 +3181,12 @@ msgstr "%s nepřipojen k serveru \"%s\"!\n"
 msgid "Auto-reconnection is cancelled\n"
 msgstr "Automatické znovupřipojené je zrušeno\n"
 
-#: src/common/command.c:1909 src/common/weechat.c:456
+#: src/common/command.c:1909 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "%s vnitřní příkazy:\n"
 
-#: src/common/command.c:1919 src/common/weechat.c:476
+#: src/common/command.c:1919 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr "IRC příkazy:\n"
@@ -3236,7 +3236,7 @@ msgstr "Klávesa \"%s\" odpojena\n"
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s nemohu odpojit klávesu \"%s\"\n"
 
-#: src/common/command.c:2286 src/common/weechat.c:508
+#: src/common/command.c:2286 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Vnitřní klávesové funkce:\n"
@@ -3419,8 +3419,8 @@ msgstr "  . typ boolean (hodnota: 'on' nebo 'off')\n"
 
 #: src/common/command.c:3133 src/common/command.c:3156
 #: src/common/command.c:3162 src/common/command.c:3168
-#: src/common/weechat.c:392 src/common/weechat.c:417 src/common/weechat.c:424
-#: src/common/weechat.c:431
+#: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
+#: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . výchozí hodnota: '%s'\n"
@@ -3430,7 +3430,7 @@ msgstr "  . výchozí hodnota: '%s'\n"
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . typ celoÄŤĂ­selnĂ˝ (hodnoty: mezi %d a %d)\n"
 
-#: src/common/command.c:3141 src/common/weechat.c:401
+#: src/common/command.c:3141 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . výchozí hodnota: %d\n"
@@ -3440,8 +3440,8 @@ msgid "  . type string (values: "
 msgstr "  . typ řetězec (hodnoty: "
 
 #: src/common/command.c:3158 src/common/command.c:3164
-#: src/common/command.c:3170 src/common/weechat.c:419 src/common/weechat.c:426
-#: src/common/weechat.c:433
+#: src/common/command.c:3170 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/weechat.c:436
 msgid "empty"
 msgstr "prázdný"
 
@@ -3453,7 +3453,7 @@ msgstr "  . typ barva (Curses nebo Gtk barva, viz WeeChat dokumentace)\n"
 msgid "  . type string (any string)\n"
 msgstr "  . typ řetězec (jakýkoliv řetězec)\n"
 
-#: src/common/command.c:3173 src/common/weechat.c:436
+#: src/common/command.c:3173 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . popis: %s\n"
@@ -3584,19 +3584,19 @@ 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:127
+#: src/common/log.c:116 src/common/log.c:132
 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:158
+#: src/common/log.c:163
 msgid "Unable to write log file for a buffer\n"
 msgstr "NemĹŻĹľu zapsat log soubor bufferu\n"
 
-#: src/common/log.c:162
+#: src/common/log.c:167
 msgid "****  Beginning of log  "
 msgstr "****  Beginning of log  "
 
-#: src/common/log.c:176
+#: src/common/log.c:181
 msgid "****  End of log  "
 msgstr "****  End of log  "
 
@@ -3910,7 +3910,7 @@ msgstr "%s nemohu smazat soubor se sezenĂ­m (%s)\n"
 msgid "Upgrade completed successfully\n"
 msgstr "Aktualizace dokončena úspěšně\n"
 
-#: src/common/weechat.c:346
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "%s (c) Copyright 2003-2006, compiled on %s %s\n"
@@ -3919,7 +3919,7 @@ msgstr ""
 "%s (c) Copzright 2003-2006, zkompilováno %s %s\n"
 "VyvĂ­jĂ­ FlashCode <flashcode@flashtux.org> - %s"
 
-#: src/common/weechat.c:350
+#: src/common/weechat.c:353
 #, c-format
 msgid ""
 "Usage: %s [options ...]\n"
@@ -3930,7 +3930,7 @@ msgstr ""
 "   nebo: %s [irc[6][s]://[nickname[:password]@]irc.example.org[:port][/"
 "channel][,channel[...]]"
 
-#: src/common/weechat.c:354
+#: src/common/weechat.c:357
 #, c-format
 msgid ""
 "  -a, --no-connect        disable auto-connect to servers at startup\n"
@@ -3958,7 +3958,7 @@ msgstr ""
 "  -v, --version           zobrazĂ­ verzi WeeChat\n"
 "  -w, --weechat-commands  zobrazí příkazy WeeChat\n"
 
-#: src/common/weechat.c:377
+#: src/common/weechat.c:380
 #, c-format
 msgid ""
 "WeeChat configuration options (<weechat_home>/weechat.rc):\n"
@@ -3967,112 +3967,112 @@ msgstr ""
 "WeeChat kofniguraÄŤnĂ­ nastavenĂ­ (<weechat_home>/weechat.rc):\n"
 "\n"
 
-#: src/common/weechat.c:390
+#: src/common/weechat.c:393
 #, c-format
 msgid "  . type: boolean\n"
 msgstr "  . typ: boolean\n"
 
-#: src/common/weechat.c:391
+#: src/common/weechat.c:394
 #, c-format
 msgid "  . values: 'on' or 'off'\n"
 msgstr "  . hodnoty: 'on' or 'off'\n"
 
-#: src/common/weechat.c:397
+#: src/common/weechat.c:400
 #, c-format
 msgid "  . type: integer\n"
 msgstr "  . typ: celoÄŤĂ­selnĂ˝\n"
 
-#: src/common/weechat.c:398
+#: src/common/weechat.c:401
 #, c-format
 msgid "  . values: between %d and %d\n"
 msgstr "  . hodnoty: mezi %d a %d\n"
 
-#: src/common/weechat.c:405 src/common/weechat.c:429
+#: src/common/weechat.c:408 src/common/weechat.c:432
 #, c-format
 msgid "  . type: string\n"
 msgstr "  . typ: řetězec\n"
 
-#: src/common/weechat.c:406
+#: src/common/weechat.c:409
 #, c-format
 msgid "  . values: "
 msgstr "  . hodnoty: "
 
-#: src/common/weechat.c:422
+#: src/common/weechat.c:425
 #, c-format
 msgid "  . type: color\n"
 msgstr "  . typ: barva\n"
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:426
 #, c-format
 msgid "  . values: Curses or Gtk color\n"
 msgstr "  . hodnoty: Curses nebo Gtk barva\n"
 
-#: src/common/weechat.c:430
+#: src/common/weechat.c:433
 #, c-format
 msgid "  . values: any string\n"
 msgstr "  . hodnoty: typ řetězec (jakýkoliv řetězec)\n"
 
-#: src/common/weechat.c:530
+#: src/common/weechat.c:533
 #, c-format
 msgid "%s default keys:\n"
 msgstr "%s výchozí klávesy:\n"
 
-#: src/common/weechat.c:579
+#: src/common/weechat.c:582
 #, c-format
 msgid "%s missing argument for --dir option\n"
 msgstr "%s chybĂ­ argument pro --dir volbu\n"
 
-#: src/common/weechat.c:624
+#: src/common/weechat.c:627
 #, c-format
 msgid "%s missing argument for --session option\n"
 msgstr "%s chybĂ­ argument pro --session volbu\n"
 
-#: src/common/weechat.c:645
+#: src/common/weechat.c:648
 #, 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:659
+#: src/common/weechat.c:662
 #, 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:668
+#: src/common/weechat.c:671
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr "%s neznámý parametr '%s', ignorován\n"
 
-#: src/common/weechat.c:688
+#: src/common/weechat.c:691
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr "%s nemohu vytvořit adresář \"%s\"\n"
 
-#: src/common/weechat.c:711
+#: src/common/weechat.c:714
 #, c-format
 msgid "%s unable to get HOME directory\n"
 msgstr "%s nemohu získat HOME adresář\n"
 
-#: src/common/weechat.c:720
+#: src/common/weechat.c:723
 #, 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:731 src/common/weechat.c:744
+#: src/common/weechat.c:734 src/common/weechat.c:755 src/common/weechat.c:768
 #, c-format
 msgid "%s unable to create \"%s\" directory\n"
 msgstr "%s nemohu vytvořit adresář \"%s\"\n"
 
-#: src/common/weechat.c:790
+#: src/common/weechat.c:814
 #, c-format
 msgid "%s unable to create/append to log file (%s/%s)"
 msgstr "%s nemohu vytvořit/přidat do log souboru (%s/%s)"
 
-#: src/common/weechat.c:841
+#: src/common/weechat.c:865
 #, c-format
 msgid "%sWelcome to %s%s%s, %s\n"
 msgstr "%sVĂ­tejte do %s%s%s, %s\n"
 
-#: src/common/weechat.c:855 src/common/weechat.c:865
+#: src/common/weechat.c:879 src/common/weechat.c:889
 msgid "compiled on"
 msgstr "kompilováno"
 
diff --git a/weechat/po/es.po b/weechat/po/es.po
index 252bbb44f..32b7bd887 100644
--- a/weechat/po/es.po
+++ b/weechat/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.8-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-03-03 11:15+0100\n"
+"POT-Creation-Date: 2006-03-04 16:18+0100\n"
 "PO-Revision-Date: 2006-02-22 10:25+0100\n"
 "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1955,38 +1955,38 @@ msgstr "Falló"
 msgid "Aborted"
 msgstr "Abortado"
 
-#: src/irc/irc-dcc.c:383
+#: src/irc/irc-dcc.c:388
 #, c-format
 msgid "DCC: file %s%s%s"
 msgstr "DCC: fichero %s%s%s"
 
-#: src/irc/irc-dcc.c:389
+#: src/irc/irc-dcc.c:394
 #, c-format
 msgid " (local filename: %s%s%s)"
 msgstr " (nombre de fichero local: %s%s%s)"
 
-#: src/irc/irc-dcc.c:394
+#: src/irc/irc-dcc.c:399
 msgid " sent to "
 msgstr " enviado a "
 
-#: src/irc/irc-dcc.c:396
+#: src/irc/irc-dcc.c:401
 msgid " received from "
 msgstr " recibido de "
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "OK"
 msgstr "OK"
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "FAILED"
 msgstr "FALLÓ"
 
-#: src/irc/irc-dcc.c:414
+#: src/irc/irc-dcc.c:419
 #, c-format
 msgid "DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"
 msgstr "Charla DCC cerrada con %s%s %s(%s%d.%d.%d.%d%s)\n"
 
-#: src/irc/irc-dcc.c:474
+#: src/irc/irc-dcc.c:479
 #, c-format
 msgid ""
 "%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1995,17 +1995,17 @@ 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:485
+#: src/irc/irc-dcc.c:490
 #, c-format
 msgid "Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"
 msgstr "Conectado a %s%s %s(%s%d.%d.%d.%d%s)%s a través de una charla DCC\n"
 
-#: src/irc/irc-dcc.c:585
+#: src/irc/irc-dcc.c:590
 #, c-format
 msgid "DCC: file %s%s%s resumed at position %u\n"
 msgstr "DCC: archivo %s%s%s reanudado en la posición %u\n"
 
-#: src/irc/irc-dcc.c:594 src/irc/irc-dcc.c:619
+#: src/irc/irc-dcc.c:599 src/irc/irc-dcc.c:624
 #, c-format
 msgid ""
 "%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
@@ -2014,16 +2014,16 @@ msgstr ""
 "%s no puede reanudar el archivo \"%s\" (puerto: %d, posición de inicio: %u): "
 "DCC no encontrado o terminado\n"
 
-#: src/irc/irc-dcc.c:686
+#: src/irc/irc-dcc.c:691
 #, 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:705
+#: src/irc/irc-dcc.c:710
 msgid "DCC chat"
 msgstr "Charla DCC"
 
-#: src/irc/irc-dcc.c:732
+#: src/irc/irc-dcc.c:737
 #, 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"
@@ -2031,7 +2031,7 @@ msgstr ""
 "Archivo DCC entrante desde %s%s%s (%s%d.%d.%d.%d%s)%s: %s%s%s, %s%lu%s "
 "bytes\n"
 
-#: src/irc/irc-dcc.c:755
+#: src/irc/irc-dcc.c:760
 #, c-format
 msgid ""
 "Sending DCC file to %s%s%s: %s%s%s (local filename: %s%s%s), %s%lu%s bytes\n"
@@ -2039,17 +2039,17 @@ msgstr ""
 "Enviando archivo DCC a %s%s%s: %s%s%s (nombre de archivo local: %s%s%s), %s%"
 "lu%s bytes\n"
 
-#: src/irc/irc-dcc.c:775
+#: src/irc/irc-dcc.c:780
 #, c-format
 msgid "Incoming DCC chat request from %s%s%s (%s%d.%d.%d.%d%s)\n"
 msgstr "Petición de charla DCC entrante desde %s%s%s (%s%d.%d.%d.%d%s)\n"
 
-#: src/irc/irc-dcc.c:792
+#: src/irc/irc-dcc.c:797
 #, c-format
 msgid "Sending DCC chat request to %s%s\n"
 msgstr "Envío de petición de charla DCC a %s%s\n"
 
-#: src/irc/irc-dcc.c:810
+#: src/irc/irc-dcc.c:815
 #, c-format
 msgid ""
 "DCC: file %s%s%s (local filename: %s%s%s) will be resumed at position %u\n"
@@ -2057,47 +2057,47 @@ msgstr ""
 "DCC: el archivo %s%s%s (nombre de archivo local: %s%s%s) será reanudado en "
 "la posición %u\n"
 
-#: src/irc/irc-dcc.c:885
+#: src/irc/irc-dcc.c:895
 #, 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:907
+#: src/irc/irc-dcc.c:915
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr "%s no es posible acceder al fichero \"%s\"\n"
 
-#: src/irc/irc-dcc.c:929
+#: src/irc/irc-dcc.c:937
 #, c-format
 msgid "%s could not find address for '%s'. Falling back to local IP.\n"
 msgstr "%s no pudo encontrar la dirección para '%s'. Utilizando la IP local.\n"
 
-#: src/irc/irc-dcc.c:949
+#: src/irc/irc-dcc.c:957
 #, 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:1007
+#: src/irc/irc-dcc.c:1015
 #, c-format
 msgid "%s cannot find available port for DCC\n"
 msgstr "%s no puede encontrar un puerto disponible para el DCC\n"
 
-#: src/irc/irc-dcc.c:1051
+#: src/irc/irc-dcc.c:1059
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr "%s no es posible enviar el DCC\n"
 
-#: src/irc/irc-dcc.c:1131
+#: src/irc/irc-dcc.c:1139
 #, 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:1217
+#: src/irc/irc-dcc.c:1225
 #, c-format
 msgid "Private %s> %s"
 msgstr "Privado %s> %s"
 
-#: src/irc/irc-dcc.c:1416
+#: src/irc/irc-dcc.c:1424
 #, c-format
 msgid ""
 "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -2106,7 +2106,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:1491
+#: src/irc/irc-dcc.c:1499
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr "Abandonar el DCC activo: \"%s\" de %s\n"
@@ -2285,12 +2285,12 @@ msgstr ""
 msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
 msgstr ""
 
-#: src/gui/curses/gui-input.c:350
+#: src/gui/curses/gui-input.c:353
 #, c-format
 msgid "Day changed to %s\n"
 msgstr "Día cambiado a %s\n"
 
-#: src/gui/curses/gui-input.c:436
+#: src/gui/curses/gui-input.c:439
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s el lag (retraso) es alto, desconectando del servidor...\n"
@@ -2376,11 +2376,11 @@ msgstr ""
 msgid "server"
 msgstr "servidor"
 
-#: src/gui/gui-common.c:765
+#: src/gui/gui-common.c:768
 msgid "Not enough memory for new line\n"
 msgstr "No hay suficiente memoria para una nueva línea\n"
 
-#: src/gui/gui-common.c:1134
+#: src/gui/gui-common.c:1137
 msgid "Not enough memory for infobar message\n"
 msgstr "No hay suficiente memoria para el mensaje de la barra de información\n"
 
@@ -3215,12 +3215,12 @@ msgstr "%s ˇno conectado al servidor \"%s\"!\n"
 msgid "Auto-reconnection is cancelled\n"
 msgstr "La reconexión automática está anulada\n"
 
-#: src/common/command.c:1909 src/common/weechat.c:456
+#: src/common/command.c:1909 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "Comandos internos %s :\n"
 
-#: src/common/command.c:1919 src/common/weechat.c:476
+#: src/common/command.c:1919 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr "Comandos IRC :\n"
@@ -3270,7 +3270,7 @@ msgstr "Clave \"%s\" desatada\n"
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s No ha sido posible desatar la clave \"%s\"\n"
 
-#: src/common/command.c:2286 src/common/weechat.c:508
+#: src/common/command.c:2286 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Funciones de clave internas:\n"
@@ -3458,8 +3458,8 @@ msgstr "  . tipo booleano (valores: 'on' u 'off')\n"
 
 #: src/common/command.c:3133 src/common/command.c:3156
 #: src/common/command.c:3162 src/common/command.c:3168
-#: src/common/weechat.c:392 src/common/weechat.c:417 src/common/weechat.c:424
-#: src/common/weechat.c:431
+#: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
+#: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . valor por defecto: '%s'\n"
@@ -3469,7 +3469,7 @@ msgstr "  . valor por defecto: '%s'\n"
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . tipo entero (valores: entre %d y %d)\n"
 
-#: src/common/command.c:3141 src/common/weechat.c:401
+#: src/common/command.c:3141 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . valor por defecto: %d\n"
@@ -3479,8 +3479,8 @@ msgid "  . type string (values: "
 msgstr "  . tipo cadena (valores: "
 
 #: src/common/command.c:3158 src/common/command.c:3164
-#: src/common/command.c:3170 src/common/weechat.c:419 src/common/weechat.c:426
-#: src/common/weechat.c:433
+#: src/common/command.c:3170 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/weechat.c:436
 msgid "empty"
 msgstr "vacío"
 
@@ -3492,7 +3492,7 @@ msgstr "  . tipo color (color Curses o Gtk, ver la documentación de WeeChat)\n"
 msgid "  . type string (any string)\n"
 msgstr "  . tipo cadena (cualquier cadena)\n"
 
-#: src/common/command.c:3173 src/common/weechat.c:436
+#: src/common/command.c:3173 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . descripción: %s\n"
@@ -3626,20 +3626,20 @@ msgstr "La tubería FIFO está cerrada\n"
 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:127
+#: src/common/log.c:116 src/common/log.c:132
 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:158
+#: src/common/log.c:163
 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:162
+#: src/common/log.c:167
 msgid "****  Beginning of log  "
 msgstr "****  Comienzo del log (registro)  "
 
-#: src/common/log.c:176
+#: src/common/log.c:181
 msgid "****  End of log  "
 msgstr "****  Fin del log  "
 
@@ -3957,7 +3957,7 @@ msgstr "%s no se puede eliminar el archivo de sesión (%s)\n"
 msgid "Upgrade completed successfully\n"
 msgstr "Actualización completada con éxito\n"
 
-#: src/common/weechat.c:346
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "%s (c) Copyright 2003-2006, compiled on %s %s\n"
@@ -3966,7 +3966,7 @@ msgstr ""
 "%s (c) Copyright 2003-2006, compilado a %s %s\n"
 "Desarrollado por FlashCode <flashcode@flashtux.org> - %s"
 
-#: src/common/weechat.c:350
+#: src/common/weechat.c:353
 #, c-format
 msgid ""
 "Usage: %s [options ...]\n"
@@ -3977,7 +3977,7 @@ msgstr ""
 "  ó: %s [irc[6][s]://[usuario[:contraseńa]@]irc.ejemplo.org[:puerto][/"
 "channel]"
 
-#: src/common/weechat.c:354
+#: src/common/weechat.c:357
 #, fuzzy, c-format
 msgid ""
 "  -a, --no-connect        disable auto-connect to servers at startup\n"
@@ -4005,7 +4005,7 @@ msgstr ""
 "  -v, --version           mostrar versión de Weechat\n"
 "  -w, --weechat-commands  mostrar comandos de Weechat\n"
 
-#: src/common/weechat.c:377
+#: src/common/weechat.c:380
 #, c-format
 msgid ""
 "WeeChat configuration options (<weechat_home>/weechat.rc):\n"
@@ -4014,112 +4014,112 @@ msgstr ""
 "Opciones de configuración de WeeChat (<weechat_home>/weechat.rc):\n"
 "\n"
 
-#: src/common/weechat.c:390
+#: src/common/weechat.c:393
 #, c-format
 msgid "  . type: boolean\n"
 msgstr "  . tipo: booleano\n"
 
-#: src/common/weechat.c:391
+#: src/common/weechat.c:394
 #, c-format
 msgid "  . values: 'on' or 'off'\n"
 msgstr "  . valores: 'on' u 'off'\n"
 
-#: src/common/weechat.c:397
+#: src/common/weechat.c:400
 #, c-format
 msgid "  . type: integer\n"
 msgstr "  . tipo: entero\n"
 
-#: src/common/weechat.c:398
+#: src/common/weechat.c:401
 #, c-format
 msgid "  . values: between %d and %d\n"
 msgstr "  . valores: entre %d y %d\n"
 
-#: src/common/weechat.c:405 src/common/weechat.c:429
+#: src/common/weechat.c:408 src/common/weechat.c:432
 #, c-format
 msgid "  . type: string\n"
 msgstr "  . tipo: cadena\n"
 
-#: src/common/weechat.c:406
+#: src/common/weechat.c:409
 #, c-format
 msgid "  . values: "
 msgstr "  . valores: "
 
-#: src/common/weechat.c:422
+#: src/common/weechat.c:425
 #, c-format
 msgid "  . type: color\n"
 msgstr "  . tipo: color\n"
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:426
 #, c-format
 msgid "  . values: Curses or Gtk color\n"
 msgstr "  . valores: color Curses o Gtk\n"
 
-#: src/common/weechat.c:430
+#: src/common/weechat.c:433
 #, c-format
 msgid "  . values: any string\n"
 msgstr "  . valores: cualquier cadena\n"
 
-#: src/common/weechat.c:530
+#: src/common/weechat.c:533
 #, c-format
 msgid "%s default keys:\n"
 msgstr "%s claves por defecto:\n"
 
-#: src/common/weechat.c:579
+#: src/common/weechat.c:582
 #, c-format
 msgid "%s missing argument for --dir option\n"
 msgstr "%s falta un argumento para la opción --dir\n"
 
-#: src/common/weechat.c:624
+#: src/common/weechat.c:627
 #, c-format
 msgid "%s missing argument for --session option\n"
 msgstr "%s falta un argumento para la opción --session\n"
 
-#: src/common/weechat.c:645
+#: src/common/weechat.c:648
 #, 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:659
+#: src/common/weechat.c:662
 #, 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:668
+#: src/common/weechat.c:671
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr "%s parámetro desconocido '%s', ignorado\n"
 
-#: src/common/weechat.c:688
+#: src/common/weechat.c:691
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr "%s no es posible crear el directorio \"%s\"\n"
 
-#: src/common/weechat.c:711
+#: src/common/weechat.c:714
 #, 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:720
+#: src/common/weechat.c:723
 #, 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:731 src/common/weechat.c:744
+#: src/common/weechat.c:734 src/common/weechat.c:755 src/common/weechat.c:768
 #, c-format
 msgid "%s unable to create \"%s\" directory\n"
 msgstr "%s no es posible crear el directorio \"%s\"\n"
 
-#: src/common/weechat.c:790
+#: src/common/weechat.c:814
 #, c-format
 msgid "%s unable to create/append to log file (%s/%s)"
 msgstr "%s no es posible crear/ańadir en el fichero de log (%s/%s)"
 
-#: src/common/weechat.c:841
+#: src/common/weechat.c:865
 #, c-format
 msgid "%sWelcome to %s%s%s, %s\n"
 msgstr "%sBienvenido a %s%s%s, %s\n"
 
-#: src/common/weechat.c:855 src/common/weechat.c:865
+#: src/common/weechat.c:879 src/common/weechat.c:889
 msgid "compiled on"
 msgstr "compilado en"
 
diff --git a/weechat/po/fr.po b/weechat/po/fr.po
index 3c8655413..c15c7b1c9 100644
--- a/weechat/po/fr.po
+++ b/weechat/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.8-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-03-03 11:15+0100\n"
+"POT-Creation-Date: 2006-03-04 16:18+0100\n"
 "PO-Revision-Date: 2006-03-03 11:16+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1952,38 +1952,38 @@ msgstr "Echoué"
 msgid "Aborted"
 msgstr "Interrompu"
 
-#: src/irc/irc-dcc.c:383
+#: src/irc/irc-dcc.c:388
 #, c-format
 msgid "DCC: file %s%s%s"
 msgstr "DCC: fichier %s%s%s"
 
-#: src/irc/irc-dcc.c:389
+#: src/irc/irc-dcc.c:394
 #, c-format
 msgid " (local filename: %s%s%s)"
 msgstr " (nom local: %s%s%s)"
 
-#: src/irc/irc-dcc.c:394
+#: src/irc/irc-dcc.c:399
 msgid " sent to "
 msgstr " envoyé ŕ "
 
-#: src/irc/irc-dcc.c:396
+#: src/irc/irc-dcc.c:401
 msgid " received from "
 msgstr " reçu de "
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "OK"
 msgstr "OK"
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "FAILED"
 msgstr "ECHOUE"
 
-#: src/irc/irc-dcc.c:414
+#: src/irc/irc-dcc.c:419
 #, 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:474
+#: src/irc/irc-dcc.c:479
 #, c-format
 msgid ""
 "%s can't associate DCC chat with private buffer (maybe private buffer has "
@@ -1992,17 +1992,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:485
+#: src/irc/irc-dcc.c:490
 #, c-format
 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:585
+#: src/irc/irc-dcc.c:590
 #, 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:594 src/irc/irc-dcc.c:619
+#: src/irc/irc-dcc.c:599 src/irc/irc-dcc.c:624
 #, c-format
 msgid ""
 "%s can't resume file \"%s\" (port: %d, start position: %u): DCC not found or "
@@ -2011,89 +2011,89 @@ 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:686
+#: src/irc/irc-dcc.c:691
 #, 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:705
+#: src/irc/irc-dcc.c:710
 msgid "DCC chat"
 msgstr "Discussion DCC"
 
-#: src/irc/irc-dcc.c:732
+#: src/irc/irc-dcc.c:737
 #, 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 ""
 "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:755
+#: src/irc/irc-dcc.c:760
 #, 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:775
+#: src/irc/irc-dcc.c:780
 #, 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:792
+#: src/irc/irc-dcc.c:797
 #, 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:810
+#: src/irc/irc-dcc.c:815
 #, 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:885
+#: src/irc/irc-dcc.c:895
 #, 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:907
+#: src/irc/irc-dcc.c:915
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr "%s impossible d'accéder au fichier \"%s\"\n"
 
-#: src/irc/irc-dcc.c:929
+#: src/irc/irc-dcc.c:937
 #, 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:949
+#: src/irc/irc-dcc.c:957
 #, 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:1007
+#: src/irc/irc-dcc.c:1015
 #, 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:1051
+#: src/irc/irc-dcc.c:1059
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr "%s impossible d'envoyer le DCC\n"
 
-#: src/irc/irc-dcc.c:1131
+#: src/irc/irc-dcc.c:1139
 #, 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:1217
+#: src/irc/irc-dcc.c:1225
 #, c-format
 msgid "Private %s> %s"
 msgstr "Privé %s> %s"
 
-#: src/irc/irc-dcc.c:1416
+#: src/irc/irc-dcc.c:1424
 #, c-format
 msgid ""
 "%s DCC failed because blocksize is too big. Check value of \"dcc_blocksize\" "
@@ -2102,7 +2102,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:1491
+#: src/irc/irc-dcc.c:1499
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr "Abandon du DCC actif: \"%s\" de %s\n"
@@ -2283,12 +2283,12 @@ msgstr ""
 "%s serveur/canal (%s/%s) non trouvé pour l'exécution de commande de "
 "l'extension\n"
 
-#: src/gui/curses/gui-input.c:350
+#: src/gui/curses/gui-input.c:353
 #, c-format
 msgid "Day changed to %s\n"
 msgstr "Jour changé: %s\n"
 
-#: src/gui/curses/gui-input.c:436
+#: src/gui/curses/gui-input.c:439
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s le lag est élevé, déconnexion du serveur...\n"
@@ -2374,11 +2374,11 @@ msgstr "  [Q] Fermer la vue IRC brut"
 msgid "server"
 msgstr "serveur"
 
-#: src/gui/gui-common.c:765
+#: src/gui/gui-common.c:768
 msgid "Not enough memory for new line\n"
 msgstr "Pas assez de mémoire pour une nouvelle ligne !\n"
 
-#: src/gui/gui-common.c:1134
+#: src/gui/gui-common.c:1137
 msgid "Not enough memory for infobar message\n"
 msgstr "Pas assez de mémoire pour un message de la barre d'infos\n"
 
@@ -3212,12 +3212,12 @@ msgstr "%s non connecté au serveur \"%s\" !\n"
 msgid "Auto-reconnection is cancelled\n"
 msgstr "La reconnexion automatique est annulée\n"
 
-#: src/common/command.c:1909 src/common/weechat.c:456
+#: src/common/command.c:1909 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "Commandes internes %s :\n"
 
-#: src/common/command.c:1919 src/common/weechat.c:476
+#: src/common/command.c:1919 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr "Commandes IRC :\n"
@@ -3267,7 +3267,7 @@ msgstr "Touche \"%s\" supprimée\n"
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr "%s impossible de supprimer la touche \"%s\"\n"
 
-#: src/common/command.c:2286 src/common/weechat.c:508
+#: src/common/command.c:2286 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr "Fonctions internes pour les touches:\n"
@@ -3452,8 +3452,8 @@ msgstr "  . type booléen (valeurs: 'on' ou 'off')\n"
 
 #: src/common/command.c:3133 src/common/command.c:3156
 #: src/common/command.c:3162 src/common/command.c:3168
-#: src/common/weechat.c:392 src/common/weechat.c:417 src/common/weechat.c:424
-#: src/common/weechat.c:431
+#: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
+#: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . valeur par défaut: '%s'\n"
@@ -3463,7 +3463,7 @@ msgstr "  . valeur par défaut: '%s'\n"
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . type entier (valeurs: entre %d et %d)\n"
 
-#: src/common/command.c:3141 src/common/weechat.c:401
+#: src/common/command.c:3141 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . valeur par défaut: %d\n"
@@ -3473,8 +3473,8 @@ msgid "  . type string (values: "
 msgstr "  . type chaîne (valeurs: "
 
 #: src/common/command.c:3158 src/common/command.c:3164
-#: src/common/command.c:3170 src/common/weechat.c:419 src/common/weechat.c:426
-#: src/common/weechat.c:433
+#: src/common/command.c:3170 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/weechat.c:436
 msgid "empty"
 msgstr "vide"
 
@@ -3486,7 +3486,7 @@ msgstr "  . type couleur (couleur Curses ou Gtk, voir la doc WeeChat)\n"
 msgid "  . type string (any string)\n"
 msgstr "  . type chaîne (toute chaîne)\n"
 
-#: src/common/command.c:3173 src/common/weechat.c:436
+#: src/common/command.c:3173 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . description: %s\n"
@@ -3619,19 +3619,19 @@ msgstr "Le tube FIFO est fermé\n"
 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:127
+#: src/common/log.c:116 src/common/log.c:132
 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:158
+#: src/common/log.c:163
 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:162
+#: src/common/log.c:167
 msgid "****  Beginning of log  "
 msgstr "****  Début du log  "
 
-#: src/common/log.c:176
+#: src/common/log.c:181
 msgid "****  End of log  "
 msgstr "****  Fin du log  "
 
@@ -3948,7 +3948,7 @@ msgstr "%s impossible de supprimer le fichier de session (%s)\n"
 msgid "Upgrade completed successfully\n"
 msgstr "Mise ŕ jour effectuée avec succčs\n"
 
-#: src/common/weechat.c:346
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "%s (c) Copyright 2003-2006, compiled on %s %s\n"
@@ -3957,7 +3957,7 @@ msgstr ""
 "%s (c) Copyright 2003-2006, compilé le %s %s\n"
 "Développé par FlashCode <flashcode@flashtux.org> - %s"
 
-#: src/common/weechat.c:350
+#: src/common/weechat.c:353
 #, c-format
 msgid ""
 "Usage: %s [options ...]\n"
@@ -3968,7 +3968,7 @@ msgstr ""
 "         ou: %s [irc[6][s]://[pseudo[:mot_passe]@]irc.exemple.org[:port][/"
 "canal][,canal[...]]"
 
-#: src/common/weechat.c:354
+#: src/common/weechat.c:357
 #, c-format
 msgid ""
 "  -a, --no-connect        disable auto-connect to servers at startup\n"
@@ -3998,7 +3998,7 @@ msgstr ""
 "  -v, --version           afficher la version de WeeChat\n"
 "  -w, --weechat-commands  afficher les commandes WeeChat\n"
 
-#: src/common/weechat.c:377
+#: src/common/weechat.c:380
 #, c-format
 msgid ""
 "WeeChat configuration options (<weechat_home>/weechat.rc):\n"
@@ -4007,112 +4007,112 @@ msgstr ""
 "Options de configuration de WeeChat (<weechat_home>/weechat.rc):\n"
 "\n"
 
-#: src/common/weechat.c:390
+#: src/common/weechat.c:393
 #, c-format
 msgid "  . type: boolean\n"
 msgstr "  . type: booléen\n"
 
-#: src/common/weechat.c:391
+#: src/common/weechat.c:394
 #, c-format
 msgid "  . values: 'on' or 'off'\n"
 msgstr "  . valeurs: 'on' ou 'off'\n"
 
-#: src/common/weechat.c:397
+#: src/common/weechat.c:400
 #, c-format
 msgid "  . type: integer\n"
 msgstr "  . type: entier\n"
 
-#: src/common/weechat.c:398
+#: src/common/weechat.c:401
 #, c-format
 msgid "  . values: between %d and %d\n"
 msgstr "  . valeurs: entre %d et %d\n"
 
-#: src/common/weechat.c:405 src/common/weechat.c:429
+#: src/common/weechat.c:408 src/common/weechat.c:432
 #, c-format
 msgid "  . type: string\n"
 msgstr "  . type: chaîne\n"
 
-#: src/common/weechat.c:406
+#: src/common/weechat.c:409
 #, c-format
 msgid "  . values: "
 msgstr "  . valeurs: "
 
-#: src/common/weechat.c:422
+#: src/common/weechat.c:425
 #, c-format
 msgid "  . type: color\n"
 msgstr "  . type: couleur\n"
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:426
 #, c-format
 msgid "  . values: Curses or Gtk color\n"
 msgstr "  . valeurs: couleur Curses ou Gtk\n"
 
-#: src/common/weechat.c:430
+#: src/common/weechat.c:433
 #, c-format
 msgid "  . values: any string\n"
 msgstr "  . valeurs: toute chaîne\n"
 
-#: src/common/weechat.c:530
+#: src/common/weechat.c:533
 #, c-format
 msgid "%s default keys:\n"
 msgstr "Touches par défaut %s:\n"
 
-#: src/common/weechat.c:579
+#: src/common/weechat.c:582
 #, c-format
 msgid "%s missing argument for --dir option\n"
 msgstr "%s paramčtre manquant pour l'option --dir\n"
 
-#: src/common/weechat.c:624
+#: src/common/weechat.c:627
 #, c-format
 msgid "%s missing argument for --session option\n"
 msgstr "%s paramčtre manquant pour l'option --session\n"
 
-#: src/common/weechat.c:645
+#: src/common/weechat.c:648
 #, 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:659
+#: src/common/weechat.c:662
 #, 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:668
+#: src/common/weechat.c:671
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr "%s paramčtre inconnu '%s', ignoré\n"
 
-#: src/common/weechat.c:688
+#: src/common/weechat.c:691
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr "%s impossible de créer le répertoire \"%s\"\n"
 
-#: src/common/weechat.c:711
+#: src/common/weechat.c:714
 #, c-format
 msgid "%s unable to get HOME directory\n"
 msgstr "%s impossible de lire le répertoire personnel\n"
 
-#: src/common/weechat.c:720
+#: src/common/weechat.c:723
 #, 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:731 src/common/weechat.c:744
+#: src/common/weechat.c:734 src/common/weechat.c:755 src/common/weechat.c:768
 #, c-format
 msgid "%s unable to create \"%s\" directory\n"
 msgstr "%s impossible de créer le répertoire \"%s\"\n"
 
-#: src/common/weechat.c:790
+#: src/common/weechat.c:814
 #, c-format
 msgid "%s unable to create/append to log file (%s/%s)"
 msgstr "%s impossible de créer/ajouter dans le fichier de log (%s/%s)"
 
-#: src/common/weechat.c:841
+#: src/common/weechat.c:865
 #, c-format
 msgid "%sWelcome to %s%s%s, %s\n"
 msgstr "%sBienvenue dans %s%s%s, %s\n"
 
-#: src/common/weechat.c:855 src/common/weechat.c:865
+#: src/common/weechat.c:879 src/common/weechat.c:889
 msgid "compiled on"
 msgstr "compilé le"
 
diff --git a/weechat/po/hu.po b/weechat/po/hu.po
index a68e51981..034447cad 100644
--- a/weechat/po/hu.po
+++ b/weechat/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.1.8-cvs\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2006-03-03 11:15+0100\n"
+"POT-Creation-Date: 2006-03-04 16:18+0100\n"
 "PO-Revision-Date: 2006-02-22 10:26+0100\n"
 "Last-Translator: voroskoi <voroskoi@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1945,146 +1945,146 @@ msgstr "Sikertelen"
 msgid "Aborted"
 msgstr "MegszakĂ­tva"
 
-#: src/irc/irc-dcc.c:383
+#: src/irc/irc-dcc.c:388
 #, c-format
 msgid "DCC: file %s%s%s"
 msgstr "DCC: fájl %s%s%s"
 
-#: src/irc/irc-dcc.c:389
+#: src/irc/irc-dcc.c:394
 #, c-format
 msgid " (local filename: %s%s%s)"
 msgstr " (helyi fájlnév: %s%s%s)"
 
-#: src/irc/irc-dcc.c:394
+#: src/irc/irc-dcc.c:399
 msgid " sent to "
 msgstr " fogadó fél: "
 
-#: src/irc/irc-dcc.c:396
+#: src/irc/irc-dcc.c:401
 msgid " received from "
 msgstr " küldő fél: "
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "OK"
 msgstr "Rendben"
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "FAILED"
 msgstr "SIKERTELEN"
 
-#: src/irc/irc-dcc.c:414
+#: src/irc/irc-dcc.c:419
 #, c-format
 msgid "DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"
 msgstr "DCC beszélgetés vége: %s%s %s(%s%d.%d.%d.%d%s)\n"
 
-#: src/irc/irc-dcc.c:474
+#: src/irc/irc-dcc.c:479
 #, 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:485
+#: src/irc/irc-dcc.c:490
 #, c-format
 msgid "Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:585
+#: src/irc/irc-dcc.c:590
 #, c-format
 msgid "DCC: file %s%s%s resumed at position %u\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:594 src/irc/irc-dcc.c:619
+#: src/irc/irc-dcc.c:599 src/irc/irc-dcc.c:624
 #, 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:686
+#: src/irc/irc-dcc.c:691
 #, c-format
 msgid "%s not enough memory for new DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:705
+#: src/irc/irc-dcc.c:710
 msgid "DCC chat"
 msgstr ""
 
-#: src/irc/irc-dcc.c:732
+#: src/irc/irc-dcc.c:737
 #, 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:755
+#: src/irc/irc-dcc.c:760
 #, 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:775
+#: src/irc/irc-dcc.c:780
 #, c-format
 msgid "Incoming DCC chat request from %s%s%s (%s%d.%d.%d.%d%s)\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:792
+#: src/irc/irc-dcc.c:797
 #, c-format
 msgid "Sending DCC chat request to %s%s\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:810
+#: src/irc/irc-dcc.c:815
 #, 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:885
+#: src/irc/irc-dcc.c:895
 #, c-format
 msgid "%s not enough memory for DCC SEND\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:907
+#: src/irc/irc-dcc.c:915
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:929
+#: src/irc/irc-dcc.c:937
 #, c-format
 msgid "%s could not find address for '%s'. Falling back to local IP.\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:949
+#: src/irc/irc-dcc.c:957
 #, c-format
 msgid "%s cannot create socket for DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1007
+#: src/irc/irc-dcc.c:1015
 #, c-format
 msgid "%s cannot find available port for DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1051
+#: src/irc/irc-dcc.c:1059
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1131
+#: src/irc/irc-dcc.c:1139
 #, c-format
 msgid "%s error sending data to \"%s\" via DCC CHAT\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1217
+#: src/irc/irc-dcc.c:1225
 #, c-format
 msgid "Private %s> %s"
 msgstr "Privát %s> %s"
 
-#: src/irc/irc-dcc.c:1416
+#: src/irc/irc-dcc.c:1424
 #, 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:1491
+#: src/irc/irc-dcc.c:1499
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr ""
@@ -2250,12 +2250,12 @@ msgstr ""
 msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
 msgstr "%s (%s/%s) szerver/szoba nem található a modul futtatása parancshoz\n"
 
-#: src/gui/curses/gui-input.c:350
+#: src/gui/curses/gui-input.c:353
 #, c-format
 msgid "Day changed to %s\n"
 msgstr "A mai dátum: %s\n"
 
-#: src/gui/curses/gui-input.c:436
+#: src/gui/curses/gui-input.c:439
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr "%s túl nagy a késés(lag), lecsatlakozás a szerverről...\n"
@@ -2341,11 +2341,11 @@ msgstr ""
 msgid "server"
 msgstr "szerver"
 
-#: src/gui/gui-common.c:765
+#: src/gui/gui-common.c:768
 msgid "Not enough memory for new line\n"
 msgstr "Nincs elég memória az új sorhoz\n"
 
-#: src/gui/gui-common.c:1134
+#: src/gui/gui-common.c:1137
 msgid "Not enough memory for infobar message\n"
 msgstr "Nincs elég memória az információs pult üzenethez\n"
 
@@ -3137,12 +3137,12 @@ msgstr "%s nincs csatlakozva a \"%s\" szerverhez!\n"
 msgid "Auto-reconnection is cancelled\n"
 msgstr "Autómata újracsatlakozás megszakítva\n"
 
-#: src/common/command.c:1909 src/common/weechat.c:456
+#: src/common/command.c:1909 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr "%s belső parancsok:\n"
 
-#: src/common/command.c:1919 src/common/weechat.c:476
+#: src/common/command.c:1919 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr "IRC parancsok:\n"
@@ -3192,7 +3192,7 @@ msgstr ""
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:2286 src/common/weechat.c:508
+#: src/common/command.c:2286 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr ""
@@ -3377,8 +3377,8 @@ msgstr "  . típus logikai (értékek: 'on' vagy 'off')\n"
 
 #: src/common/command.c:3133 src/common/command.c:3156
 #: src/common/command.c:3162 src/common/command.c:3168
-#: src/common/weechat.c:392 src/common/weechat.c:417 src/common/weechat.c:424
-#: src/common/weechat.c:431
+#: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
+#: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr "  . alapérték: '%s'\n"
@@ -3388,7 +3388,7 @@ msgstr "  . alapérték: '%s'\n"
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr "  . típus szám (értékek: %d és %d között)\n"
 
-#: src/common/command.c:3141 src/common/weechat.c:401
+#: src/common/command.c:3141 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr "  . alapérték: %d\n"
@@ -3398,8 +3398,8 @@ msgid "  . type string (values: "
 msgstr "  . típus szöveg (értékek: "
 
 #: src/common/command.c:3158 src/common/command.c:3164
-#: src/common/command.c:3170 src/common/weechat.c:419 src/common/weechat.c:426
-#: src/common/weechat.c:433
+#: src/common/command.c:3170 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/weechat.c:436
 msgid "empty"
 msgstr "ĂĽres"
 
@@ -3411,7 +3411,7 @@ msgstr "  . típus szín (Curses vagy Gtk szín, lásd WeeChat dokumentáció)\n
 msgid "  . type string (any string)\n"
 msgstr "  . típus szöveg (bármilyen szöveg)\n"
 
-#: src/common/command.c:3173 src/common/weechat.c:436
+#: src/common/command.c:3173 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr "  . leírás : %s\n"
@@ -3545,19 +3545,19 @@ msgstr "FIFO cső bezárva\n"
 msgid "%s cannot add a buffer to hotlist\n"
 msgstr ""
 
-#: src/common/log.c:127
+#: src/common/log.c:116 src/common/log.c:132
 msgid "Not enough memory to write log file for a buffer\n"
 msgstr "Nincs elegendő memória a puffer naplójának írásához\n"
 
-#: src/common/log.c:158
+#: src/common/log.c:163
 msgid "Unable to write log file for a buffer\n"
 msgstr "Nem sikerült naplófájlt írni a puffernek\n"
 
-#: src/common/log.c:162
+#: src/common/log.c:167
 msgid "****  Beginning of log  "
 msgstr "****  Naplófájl kezdete  "
 
-#: src/common/log.c:176
+#: src/common/log.c:181
 msgid "****  End of log  "
 msgstr "****  Naplófájl vége  "
 
@@ -3872,7 +3872,7 @@ msgstr "%s nem sikerült a \"%s\" fájlt létrehozni\n"
 msgid "Upgrade completed successfully\n"
 msgstr "A frissítés sikeresen megtörtént\n"
 
-#: src/common/weechat.c:346
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "%s (c) Copyright 2003-2006, compiled on %s %s\n"
@@ -3881,7 +3881,7 @@ msgstr ""
 "%s (c) Copyright 2003-2006, fordĂ­tva: %s %s\n"
 "Fejlesztő: FlashCode <flashcode@flashtux.org> - %s"
 
-#: src/common/weechat.c:350
+#: src/common/weechat.c:353
 #, c-format
 msgid ""
 "Usage: %s [options ...]\n"
@@ -3892,7 +3892,7 @@ msgstr ""
 "     vagy: %s [irc[6][s]://[név[:jelszó]@]irc.pelda.org[:port][/szoba][,szoba"
 "[...]]"
 
-#: src/common/weechat.c:354
+#: src/common/weechat.c:357
 #, c-format
 msgid ""
 "  -a, --no-connect        disable auto-connect to servers at startup\n"
@@ -3920,7 +3920,7 @@ msgstr ""
 "  -v, --version           WeeChat verziójának mutatása\n"
 "  -w, --weechat-commands  WeeChat parancsok mutatása\n"
 
-#: src/common/weechat.c:377
+#: src/common/weechat.c:380
 #, c-format
 msgid ""
 "WeeChat configuration options (<weechat_home>/weechat.rc):\n"
@@ -3929,112 +3929,112 @@ msgstr ""
 "WeeChat beállítási opciók (<weechat_home>/weechat.rc):\n"
 "\n"
 
-#: src/common/weechat.c:390
+#: src/common/weechat.c:393
 #, c-format
 msgid "  . type: boolean\n"
 msgstr "  . tĂ­pus: logikai\n"
 
-#: src/common/weechat.c:391
+#: src/common/weechat.c:394
 #, c-format
 msgid "  . values: 'on' or 'off'\n"
 msgstr "  . értékek: 'on' vagy 'off'\n"
 
-#: src/common/weechat.c:397
+#: src/common/weechat.c:400
 #, c-format
 msgid "  . type: integer\n"
 msgstr "  . típus: szám\n"
 
-#: src/common/weechat.c:398
+#: src/common/weechat.c:401
 #, c-format
 msgid "  . values: between %d and %d\n"
 msgstr "  . értékek: %d és %d között\n"
 
-#: src/common/weechat.c:405 src/common/weechat.c:429
+#: src/common/weechat.c:408 src/common/weechat.c:432
 #, c-format
 msgid "  . type: string\n"
 msgstr "  . típus: szöveg\n"
 
-#: src/common/weechat.c:406
+#: src/common/weechat.c:409
 #, c-format
 msgid "  . values: "
 msgstr "  . értékek: "
 
-#: src/common/weechat.c:422
+#: src/common/weechat.c:425
 #, c-format
 msgid "  . type: color\n"
 msgstr "  . tĂ­pus: szĂ­n\n"
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:426
 #, c-format
 msgid "  . values: Curses or Gtk color\n"
 msgstr "  . értékek: Curses vagy Gtk színek\n"
 
-#: src/common/weechat.c:430
+#: src/common/weechat.c:433
 #, c-format
 msgid "  . values: any string\n"
 msgstr "  . érték: bármilyen szóveg\n"
 
-#: src/common/weechat.c:530
+#: src/common/weechat.c:533
 #, c-format
 msgid "%s default keys:\n"
 msgstr "%s alapértelmezett billentyűk:\n"
 
-#: src/common/weechat.c:579
+#: src/common/weechat.c:582
 #, c-format
 msgid "%s missing argument for --dir option\n"
 msgstr "%s hiányzó argumentum a --dir opciónak\n"
 
-#: src/common/weechat.c:624
+#: src/common/weechat.c:627
 #, c-format
 msgid "%s missing argument for --session option\n"
 msgstr "%s hiányzó argumentum a --session opciónak\n"
 
-#: src/common/weechat.c:645
+#: src/common/weechat.c:648
 #, c-format
 msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
 msgstr "%s érvénytelen szintaxis az IRC szervernek ('%s'), mellőzve\n"
 
-#: src/common/weechat.c:659
+#: src/common/weechat.c:662
 #, c-format
 msgid "%s unable to create server ('%s'), ignored\n"
 msgstr "%s nem sikerült a szervert ('%s') létrehozni, mellőzve\n"
 
-#: src/common/weechat.c:668
+#: src/common/weechat.c:671
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr "%s ismeretlen paraméter: '%s', mellőzve\n"
 
-#: src/common/weechat.c:688
+#: src/common/weechat.c:691
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr "%s nem sikerült a \"%s\" könyvtárat létrehozni\n"
 
-#: src/common/weechat.c:711
+#: src/common/weechat.c:714
 #, c-format
 msgid "%s unable to get HOME directory\n"
 msgstr "%s nem sikerült a HOME könyvtárat beállítani\n"
 
-#: src/common/weechat.c:720
+#: src/common/weechat.c:723
 #, c-format
 msgid "%s not enough memory for home directory\n"
 msgstr "%s nincs elég memória a HOME könyvtárhoz\n"
 
-#: src/common/weechat.c:731 src/common/weechat.c:744
+#: src/common/weechat.c:734 src/common/weechat.c:755 src/common/weechat.c:768
 #, c-format
 msgid "%s unable to create \"%s\" directory\n"
 msgstr "%s nem sikerült a \"%s\" könyvtárat létrehozni\n"
 
-#: src/common/weechat.c:790
+#: src/common/weechat.c:814
 #, c-format
 msgid "%s unable to create/append to log file (%s/%s)"
 msgstr "%s nem sikerült létrehozni/hozzáírni a naplófájlhoz (%s/%s)"
 
-#: src/common/weechat.c:841
+#: src/common/weechat.c:865
 #, c-format
 msgid "%sWelcome to %s%s%s, %s\n"
 msgstr "%sÜdvözöljük %s%s%s, %s\n"
 
-#: src/common/weechat.c:855 src/common/weechat.c:865
+#: src/common/weechat.c:879 src/common/weechat.c:889
 msgid "compiled on"
 msgstr "lefordĂ­tva:"
 
diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot
index b677cb166..0d0dfa0da 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: 2006-03-03 11:15+0100\n"
+"POT-Creation-Date: 2006-03-04 16:18+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"
@@ -1826,146 +1826,146 @@ msgstr ""
 msgid "Aborted"
 msgstr ""
 
-#: src/irc/irc-dcc.c:383
+#: src/irc/irc-dcc.c:388
 #, c-format
 msgid "DCC: file %s%s%s"
 msgstr ""
 
-#: src/irc/irc-dcc.c:389
+#: src/irc/irc-dcc.c:394
 #, c-format
 msgid " (local filename: %s%s%s)"
 msgstr ""
 
-#: src/irc/irc-dcc.c:394
+#: src/irc/irc-dcc.c:399
 msgid " sent to "
 msgstr ""
 
-#: src/irc/irc-dcc.c:396
+#: src/irc/irc-dcc.c:401
 msgid " received from "
 msgstr ""
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "OK"
 msgstr ""
 
-#: src/irc/irc-dcc.c:401
+#: src/irc/irc-dcc.c:406
 msgid "FAILED"
 msgstr ""
 
-#: src/irc/irc-dcc.c:414
+#: src/irc/irc-dcc.c:419
 #, c-format
 msgid "DCC chat closed with %s%s %s(%s%d.%d.%d.%d%s)\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:474
+#: src/irc/irc-dcc.c:479
 #, 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:485
+#: src/irc/irc-dcc.c:490
 #, c-format
 msgid "Connected to %s%s %s(%s%d.%d.%d.%d%s)%s via DCC chat\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:585
+#: src/irc/irc-dcc.c:590
 #, c-format
 msgid "DCC: file %s%s%s resumed at position %u\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:594 src/irc/irc-dcc.c:619
+#: src/irc/irc-dcc.c:599 src/irc/irc-dcc.c:624
 #, 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:686
+#: src/irc/irc-dcc.c:691
 #, c-format
 msgid "%s not enough memory for new DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:705
+#: src/irc/irc-dcc.c:710
 msgid "DCC chat"
 msgstr ""
 
-#: src/irc/irc-dcc.c:732
+#: src/irc/irc-dcc.c:737
 #, 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:755
+#: src/irc/irc-dcc.c:760
 #, 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:775
+#: src/irc/irc-dcc.c:780
 #, c-format
 msgid "Incoming DCC chat request from %s%s%s (%s%d.%d.%d.%d%s)\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:792
+#: src/irc/irc-dcc.c:797
 #, c-format
 msgid "Sending DCC chat request to %s%s\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:810
+#: src/irc/irc-dcc.c:815
 #, 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:885
+#: src/irc/irc-dcc.c:895
 #, c-format
 msgid "%s not enough memory for DCC SEND\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:907
+#: src/irc/irc-dcc.c:915
 #, c-format
 msgid "%s cannot access file \"%s\"\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:929
+#: src/irc/irc-dcc.c:937
 #, c-format
 msgid "%s could not find address for '%s'. Falling back to local IP.\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:949
+#: src/irc/irc-dcc.c:957
 #, c-format
 msgid "%s cannot create socket for DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1007
+#: src/irc/irc-dcc.c:1015
 #, c-format
 msgid "%s cannot find available port for DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1051
+#: src/irc/irc-dcc.c:1059
 #, c-format
 msgid "%s cannot send DCC\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1131
+#: src/irc/irc-dcc.c:1139
 #, c-format
 msgid "%s error sending data to \"%s\" via DCC CHAT\n"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1217
+#: src/irc/irc-dcc.c:1225
 #, c-format
 msgid "Private %s> %s"
 msgstr ""
 
-#: src/irc/irc-dcc.c:1416
+#: src/irc/irc-dcc.c:1424
 #, 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:1491
+#: src/irc/irc-dcc.c:1499
 #, c-format
 msgid "Aborting active DCC: \"%s\" from %s\n"
 msgstr ""
@@ -2119,12 +2119,12 @@ msgstr ""
 msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
 msgstr ""
 
-#: src/gui/curses/gui-input.c:350
+#: src/gui/curses/gui-input.c:353
 #, c-format
 msgid "Day changed to %s\n"
 msgstr ""
 
-#: src/gui/curses/gui-input.c:436
+#: src/gui/curses/gui-input.c:439
 #, c-format
 msgid "%s lag is high, disconnecting from server...\n"
 msgstr ""
@@ -2210,11 +2210,11 @@ msgstr ""
 msgid "server"
 msgstr ""
 
-#: src/gui/gui-common.c:765
+#: src/gui/gui-common.c:768
 msgid "Not enough memory for new line\n"
 msgstr ""
 
-#: src/gui/gui-common.c:1134
+#: src/gui/gui-common.c:1137
 msgid "Not enough memory for infobar message\n"
 msgstr ""
 
@@ -2943,12 +2943,12 @@ msgstr ""
 msgid "Auto-reconnection is cancelled\n"
 msgstr ""
 
-#: src/common/command.c:1909 src/common/weechat.c:456
+#: src/common/command.c:1909 src/common/weechat.c:459
 #, c-format
 msgid "%s internal commands:\n"
 msgstr ""
 
-#: src/common/command.c:1919 src/common/weechat.c:476
+#: src/common/command.c:1919 src/common/weechat.c:479
 #, c-format
 msgid "IRC commands:\n"
 msgstr ""
@@ -2998,7 +2998,7 @@ msgstr ""
 msgid "%s unable to unbind key \"%s\"\n"
 msgstr ""
 
-#: src/common/command.c:2286 src/common/weechat.c:508
+#: src/common/command.c:2286 src/common/weechat.c:511
 #, c-format
 msgid "Internal key functions:\n"
 msgstr ""
@@ -3177,8 +3177,8 @@ msgstr ""
 
 #: src/common/command.c:3133 src/common/command.c:3156
 #: src/common/command.c:3162 src/common/command.c:3168
-#: src/common/weechat.c:392 src/common/weechat.c:417 src/common/weechat.c:424
-#: src/common/weechat.c:431
+#: src/common/weechat.c:395 src/common/weechat.c:420 src/common/weechat.c:427
+#: src/common/weechat.c:434
 #, c-format
 msgid "  . default value: '%s'\n"
 msgstr ""
@@ -3188,7 +3188,7 @@ msgstr ""
 msgid "  . type integer (values: between %d and %d)\n"
 msgstr ""
 
-#: src/common/command.c:3141 src/common/weechat.c:401
+#: src/common/command.c:3141 src/common/weechat.c:404
 #, c-format
 msgid "  . default value: %d\n"
 msgstr ""
@@ -3198,8 +3198,8 @@ msgid "  . type string (values: "
 msgstr ""
 
 #: src/common/command.c:3158 src/common/command.c:3164
-#: src/common/command.c:3170 src/common/weechat.c:419 src/common/weechat.c:426
-#: src/common/weechat.c:433
+#: src/common/command.c:3170 src/common/weechat.c:422 src/common/weechat.c:429
+#: src/common/weechat.c:436
 msgid "empty"
 msgstr ""
 
@@ -3211,7 +3211,7 @@ msgstr ""
 msgid "  . type string (any string)\n"
 msgstr ""
 
-#: src/common/command.c:3173 src/common/weechat.c:436
+#: src/common/command.c:3173 src/common/weechat.c:439
 #, c-format
 msgid "  . description: %s\n"
 msgstr ""
@@ -3338,19 +3338,19 @@ msgstr ""
 msgid "%s cannot add a buffer to hotlist\n"
 msgstr ""
 
-#: src/common/log.c:127
+#: src/common/log.c:116 src/common/log.c:132
 msgid "Not enough memory to write log file for a buffer\n"
 msgstr ""
 
-#: src/common/log.c:158
+#: src/common/log.c:163
 msgid "Unable to write log file for a buffer\n"
 msgstr ""
 
-#: src/common/log.c:162
+#: src/common/log.c:167
 msgid "****  Beginning of log  "
 msgstr ""
 
-#: src/common/log.c:176
+#: src/common/log.c:181
 msgid "****  End of log  "
 msgstr ""
 
@@ -3662,14 +3662,14 @@ msgstr ""
 msgid "Upgrade completed successfully\n"
 msgstr ""
 
-#: src/common/weechat.c:346
+#: src/common/weechat.c:349
 #, c-format
 msgid ""
 "%s (c) Copyright 2003-2006, compiled on %s %s\n"
 "Developed by FlashCode <flashcode@flashtux.org> - %s"
 msgstr ""
 
-#: src/common/weechat.c:350
+#: src/common/weechat.c:353
 #, c-format
 msgid ""
 "Usage: %s [options ...]\n"
@@ -3677,7 +3677,7 @@ msgid ""
 "[,channel[...]]"
 msgstr ""
 
-#: src/common/weechat.c:354
+#: src/common/weechat.c:357
 #, c-format
 msgid ""
 "  -a, --no-connect        disable auto-connect to servers at startup\n"
@@ -3693,119 +3693,119 @@ msgid ""
 "  -w, --weechat-commands  display WeeChat commands\n"
 msgstr ""
 
-#: src/common/weechat.c:377
+#: src/common/weechat.c:380
 #, c-format
 msgid ""
 "WeeChat configuration options (<weechat_home>/weechat.rc):\n"
 "\n"
 msgstr ""
 
-#: src/common/weechat.c:390
+#: src/common/weechat.c:393
 #, c-format
 msgid "  . type: boolean\n"
 msgstr ""
 
-#: src/common/weechat.c:391
+#: src/common/weechat.c:394
 #, c-format
 msgid "  . values: 'on' or 'off'\n"
 msgstr ""
 
-#: src/common/weechat.c:397
+#: src/common/weechat.c:400
 #, c-format
 msgid "  . type: integer\n"
 msgstr ""
 
-#: src/common/weechat.c:398
+#: src/common/weechat.c:401
 #, c-format
 msgid "  . values: between %d and %d\n"
 msgstr ""
 
-#: src/common/weechat.c:405 src/common/weechat.c:429
+#: src/common/weechat.c:408 src/common/weechat.c:432
 #, c-format
 msgid "  . type: string\n"
 msgstr ""
 
-#: src/common/weechat.c:406
+#: src/common/weechat.c:409
 #, c-format
 msgid "  . values: "
 msgstr ""
 
-#: src/common/weechat.c:422
+#: src/common/weechat.c:425
 #, c-format
 msgid "  . type: color\n"
 msgstr ""
 
-#: src/common/weechat.c:423
+#: src/common/weechat.c:426
 #, c-format
 msgid "  . values: Curses or Gtk color\n"
 msgstr ""
 
-#: src/common/weechat.c:430
+#: src/common/weechat.c:433
 #, c-format
 msgid "  . values: any string\n"
 msgstr ""
 
-#: src/common/weechat.c:530
+#: src/common/weechat.c:533
 #, c-format
 msgid "%s default keys:\n"
 msgstr ""
 
-#: src/common/weechat.c:579
+#: src/common/weechat.c:582
 #, c-format
 msgid "%s missing argument for --dir option\n"
 msgstr ""
 
-#: src/common/weechat.c:624
+#: src/common/weechat.c:627
 #, c-format
 msgid "%s missing argument for --session option\n"
 msgstr ""
 
-#: src/common/weechat.c:645
+#: src/common/weechat.c:648
 #, c-format
 msgid "%s invalid syntax for IRC server ('%s'), ignored\n"
 msgstr ""
 
-#: src/common/weechat.c:659
+#: src/common/weechat.c:662
 #, c-format
 msgid "%s unable to create server ('%s'), ignored\n"
 msgstr ""
 
-#: src/common/weechat.c:668
+#: src/common/weechat.c:671
 #, c-format
 msgid "%s unknown parameter '%s', ignored\n"
 msgstr ""
 
-#: src/common/weechat.c:688
+#: src/common/weechat.c:691
 #, c-format
 msgid "%s cannot create directory \"%s\"\n"
 msgstr ""
 
-#: src/common/weechat.c:711
+#: src/common/weechat.c:714
 #, c-format
 msgid "%s unable to get HOME directory\n"
 msgstr ""
 
-#: src/common/weechat.c:720
+#: src/common/weechat.c:723
 #, c-format
 msgid "%s not enough memory for home directory\n"
 msgstr ""
 
-#: src/common/weechat.c:731 src/common/weechat.c:744
+#: src/common/weechat.c:734 src/common/weechat.c:755 src/common/weechat.c:768
 #, c-format
 msgid "%s unable to create \"%s\" directory\n"
 msgstr ""
 
-#: src/common/weechat.c:790
+#: src/common/weechat.c:814
 #, c-format
 msgid "%s unable to create/append to log file (%s/%s)"
 msgstr ""
 
-#: src/common/weechat.c:841
+#: src/common/weechat.c:865
 #, c-format
 msgid "%sWelcome to %s%s%s, %s\n"
 msgstr ""
 
-#: src/common/weechat.c:855 src/common/weechat.c:865
+#: src/common/weechat.c:879 src/common/weechat.c:889
 msgid "compiled on"
 msgstr ""
 
diff --git a/weechat/src/common/log.c b/weechat/src/common/log.c
index f6881052e..6738b0404 100644
--- a/weechat/src/common/log.c
+++ b/weechat/src/common/log.c
@@ -107,15 +107,20 @@ void
 log_start (t_gui_buffer *buffer)
 {
     int length;
-    char *ptr_home, *log_path, *log_path2, *ptr_path;
+    char *log_path, *log_path2;
     
-    ptr_home = getenv ("HOME");
-    log_path = weechat_strreplace (cfg_log_path, "~", ptr_home);
-    log_path2 = weechat_strreplace ((log_path) ?
-                                    log_path : cfg_log_path,
-                                    "%h", weechat_home);
-    ptr_path = (log_path2) ? log_path2 : ((log_path) ? log_path : cfg_log_path);
-    length = strlen (ptr_path) + 64;
+    log_path = weechat_strreplace (cfg_log_path, "~", getenv ("HOME"));
+    log_path2 = weechat_strreplace (log_path, "%h", weechat_home);
+    if (!log_path || !log_path2)
+    {
+        weechat_log_printf (_("Not enough memory to write log file for a buffer\n"));
+        if (log_path)
+            free (log_path);
+        if (log_path2)
+            free (log_path2);
+        return;
+    }
+    length = strlen (log_path2) + 64;
     if (SERVER(buffer))
         length += strlen (SERVER(buffer)->name);
     if (CHANNEL(buffer))
@@ -132,7 +137,7 @@ log_start (t_gui_buffer *buffer)
         return;
     }
     
-    strcpy (buffer->log_filename, ptr_path);
+    strcpy (buffer->log_filename, log_path2);
     if (log_path)
         free (log_path);
     if (log_path2)
diff --git a/weechat/src/common/weechat.c b/weechat/src/common/weechat.c
index 4342fa3b6..d94878514 100644
--- a/weechat/src/common/weechat.c
+++ b/weechat/src/common/weechat.c
@@ -273,6 +273,9 @@ weechat_strreplace (char *string, char *search, char *replace)
     char *pos, *new_string;
     int length1, length2, length_new, count;
     
+    if (!string || !search || !replace)
+        return NULL;
+    
     length1 = strlen (search);
     length2 = strlen (replace);
     
@@ -694,13 +697,13 @@ weechat_create_dir (char *directory)
 }
 
 /*
- * weechat_create_home_dirs: create WeeChat directories (if not found)
+ * weechat_create_home_dirs: create WeeChat directories
  */
 
 void
 weechat_create_home_dirs ()
 {
-    char *ptr_home, *dir_name;
+    char *ptr_home;
     int dir_length;
 
     if (!weechat_home)
@@ -732,21 +735,42 @@ weechat_create_home_dirs ()
                  WEECHAT_ERROR, weechat_home);
         weechat_shutdown (EXIT_FAILURE, 0);
     }
+}
+
+/*
+ * weechat_create_config_dirs: create config directories (read from config file)
+ */
+
+void
+weechat_create_config_dirs ()
+{
+    char *dir1, *dir2;
     
-    dir_length = strlen (weechat_home) + 64;
-    dir_name = (char *) malloc (dir_length * sizeof (char));
-    
-    /* create "<weechat_home>/logs" */
-    snprintf (dir_name, dir_length, "%s%s%s", weechat_home, DIR_SEPARATOR,
-              "logs");
-    if (!weechat_create_dir (dir_name))
-    {
+    /* create logs directory" */
+    dir1 = weechat_strreplace (cfg_log_path, "~", getenv ("HOME"));
+    dir2 = weechat_strreplace (dir1, "%h", weechat_home);
+    if (weechat_create_dir (dir2))
+        chmod (dir2, 0700);
+    else
         fprintf (stderr, _("%s unable to create \"%s\" directory\n"),
-                 WEECHAT_WARNING, dir_name);
-    }
-    chmod (dir_name, 0700);
+                 WEECHAT_WARNING, dir2);
+    if (dir1)
+        free (dir1);
+    if (dir2)
+        free (dir2);
     
-    free (dir_name);
+    /* create DCC download directory */
+    dir1 = weechat_strreplace (cfg_dcc_download_path, "~", getenv ("HOME"));
+    dir2 = weechat_strreplace (dir1, "%h", weechat_home);
+    if (weechat_create_dir (dir2))
+        chmod (dir2, 0700);
+    else
+        fprintf (stderr, _("%s unable to create \"%s\" directory\n"),
+                 WEECHAT_WARNING, dir2);
+    if (dir1)
+        free (dir1);
+    if (dir2)
+        free (dir2);
 }
 
 /*
@@ -1040,6 +1064,7 @@ main (int argc, char *argv[])
     weechat_init_log ();                /* init log file                    */
     command_index_build ();             /* build cmd index for completion   */
     weechat_config_read ();             /* read configuration               */
+    weechat_create_config_dirs ();      /* create config directories        */
     utf8_init ();                       /* init UTF-8 in WeeChat            */
     gui_init ();                        /* init WeeChat interface           */
     fifo_create ();                     /* FIFO pipe for remote control     */
diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c
index 0cf3af771..e44c5b12e 100644
--- a/weechat/src/common/weeconfig.c
+++ b/weechat/src/common/weeconfig.c
@@ -791,7 +791,7 @@ t_config_option weechat_options_dcc[] =
   { "dcc_download_path", N_("path for incoming files with dcc"),
     N_("path for writing incoming files with dcc (default: user home)"),
     OPTION_TYPE_STRING, 0, 0, 0,
-    "~", NULL, NULL, &cfg_dcc_download_path, &config_change_noop },
+    "%h/dcc", NULL, NULL, &cfg_dcc_download_path, &config_change_noop },
   { "dcc_upload_path", N_("default path for sending files with dcc"),
     N_("path for reading files when sending thru dcc (when no path is specified)"),
     OPTION_TYPE_STRING, 0, 0, 0, "~",
diff --git a/weechat/src/irc/irc-dcc.c b/weechat/src/irc/irc-dcc.c
index 2729d100a..4a9d8593e 100644
--- a/weechat/src/irc/irc-dcc.c
+++ b/weechat/src/irc/irc-dcc.c
@@ -146,34 +146,39 @@ dcc_file_is_resumable (t_irc_dcc *ptr_dcc, char *filename)
 void
 dcc_find_filename (t_irc_dcc *ptr_dcc)
 {
-    char *ptr_home, *filename2;
+    char *dir1, *dir2, *filename2;
     
     if (!DCC_IS_FILE(ptr_dcc->type))
         return;
     
-    ptr_home = getenv ("HOME");
-    ptr_dcc->local_filename = (char *) malloc (strlen (cfg_dcc_download_path) +
+    dir1 = weechat_strreplace (cfg_dcc_download_path, "~", getenv ("HOME"));
+    if (!dir1)
+        return;
+    dir2 = weechat_strreplace (dir1, "%h", weechat_home);
+    if (!dir2)
+    {
+        free (dir1);
+        return;
+    }
+    
+    ptr_dcc->local_filename = (char *) malloc (strlen (dir2) +
                                                strlen (ptr_dcc->nick) +
-                                               strlen (ptr_dcc->filename) +
-                                               ((cfg_dcc_download_path[0] == '~') ?
-                                                strlen (ptr_home) : 0) +
-                                               4);
+                                               strlen (ptr_dcc->filename) + 4);
     if (!ptr_dcc->local_filename)
         return;
     
-    if (cfg_dcc_download_path[0] == '~')
-    {
-        strcpy (ptr_dcc->local_filename, ptr_home);
-        strcat (ptr_dcc->local_filename, cfg_dcc_download_path + 1);
-    }
-    else
-        strcpy (ptr_dcc->local_filename, cfg_dcc_download_path);
+    strcpy (ptr_dcc->local_filename, dir2);
     if (ptr_dcc->local_filename[strlen (ptr_dcc->local_filename) - 1] != DIR_SEPARATOR_CHAR)
         strcat (ptr_dcc->local_filename, DIR_SEPARATOR);
     strcat (ptr_dcc->local_filename, ptr_dcc->nick);
     strcat (ptr_dcc->local_filename, ".");
     strcat (ptr_dcc->local_filename, ptr_dcc->filename);
     
+    if (dir1)
+        free (dir1);
+    if (dir2 )
+        free (dir2);
+    
     /* file already exists? */
     if (access (ptr_dcc->local_filename, F_OK) == 0)
     {
@@ -847,7 +852,7 @@ dcc_add (t_irc_server *server, int type, unsigned long addr, int port, char *nic
 void
 dcc_send_request (t_irc_server *server, int type, char *nick, char *filename)
 {
-    char *ptr_home, *filename2, *short_filename, *pos;
+    char *dir1, *dir2, *filename2, *short_filename, *pos;
     int spaces, args, port_start, port_end;
     struct stat st;
     int sock, port;
@@ -872,12 +877,17 @@ dcc_send_request (t_irc_server *server, int type, char *nick, char *filename)
             filename2 = strdup (filename);
         else
         {
-            ptr_home = getenv ("HOME");
-            filename2 = (char *) malloc (strlen (cfg_dcc_upload_path) +
-                                         strlen (filename) +
-                                         ((cfg_dcc_upload_path[0] == '~') ?
-                                             strlen (ptr_home) : 0) +
-                                         4);
+            dir1 = weechat_strreplace (cfg_dcc_upload_path, "~", getenv ("HOME"));
+            if (!dir1)
+                return;
+            dir2 = weechat_strreplace (dir1, "%h", weechat_home);
+            if (!dir2)
+            {
+                free (dir1);
+                return;
+            }
+            filename2 = (char *) malloc (strlen (dir2) +
+                                         strlen (filename) + 4);
             if (!filename2)
             {
                 irc_display_prefix (server, server->buffer, PREFIX_ERROR);
@@ -886,16 +896,14 @@ dcc_send_request (t_irc_server *server, int type, char *nick, char *filename)
                             WEECHAT_ERROR);
                 return;
             }
-            if (cfg_dcc_upload_path[0] == '~')
-            {
-                strcpy (filename2, ptr_home);
-                strcat (filename2, cfg_dcc_upload_path + 1);
-            }
-            else
-                strcpy (filename2, cfg_dcc_upload_path);
+            strcpy (filename2, dir2);
             if (filename2[strlen (filename2) - 1] != DIR_SEPARATOR_CHAR)
                 strcat (filename2, DIR_SEPARATOR);
             strcat (filename2, filename);
+            if (dir1)
+                free (dir1);
+            if (dir2)
+                free (dir2);
         }
 #endif