Version 0.4.0-rc3

core: fix click in item "buffer_nicklist" when nicklist is a root bar (bug #38080 )
Argument "*" is now silently ignored in command /window. When item "buffer_nicklist" is in a root bar, we use current window/buffer to find which nick has been clicked (same behaviour as callback used to display bar item "buffer_nicklist").
2026-06-25 04:16:38 +02:00 · 2013-01-14 12:21:19 +01:00 · 2013-01-14 12:16:25 +01:00 · 2013-01-14 11:35:52 +01:00 · 2013-01-12 20:24:09 +01:00 · 2013-01-12 20:21:56 +01:00
72 changed files with 1028 additions and 694 deletions
@@ -33,7 +33,7 @@ ENDIF(PREFIX)

 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "4")
-SET(VERSION_PATCH "0-rc2")
+SET(VERSION_PATCH "0-rc3")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(LICENSE "GPL3")
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
@@ -81,6 +81,7 @@ OPTION(ENABLE_SCRIPT    "Enable Script plugin (scripts manager)"    ON)
 OPTION(ENABLE_SCRIPTS   "Enable script plugins (perl, python, ...)" ON)
 OPTION(ENABLE_PERL      "Enable Perl scripting language"            ON)
 OPTION(ENABLE_PYTHON    "Enable Python scripting language"          ON)
+OPTION(ENABLE_PYTHON3   "Use Python 3.x if found (NOT recommended)" OFF)
 OPTION(ENABLE_RUBY      "Enable Ruby scripting language"            ON)
 OPTION(ENABLE_LUA       "Enable Lua scripting language"             ON)
 OPTION(ENABLE_TCL       "Enable Tcl scripting language"             ON)
@@ -1,12 +1,16 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.4.0-rc2, 2013-01-05
+v0.4.0-rc3, 2013-01-14


 Version 0.4.0 (under dev!)
 --------------------------

+* core: fix click in item "buffer_nicklist" when nicklist is a root bar
+  (bug #38080)
+* core: fix line returned when clicking on a bar (according to position and
+  filling) (bug #38069)
 * core: fix refresh of bars when applying layout (bug #37944, bug #37952)
 * core: add buffer pointer in arguments for signals "input_search",
  "input_text_changed" and "input_text_cursor_moved"
@@ -51,6 +55,8 @@ Version 0.4.0 (under dev!)
  (problem with nick displayed in first line of screen) (bug #37556)
 * core: fix wrapping of words with wide chars (the break was made before the
  correct position)
+* api: allow return code WEECHAT_RC_OK_EAT in callbacks of hook_signal and
+  hook_hsignal (stop sending the signal immediately)
 * api: allow creation of structure with hdata_update (allowed for hdata
  "history")
 * api: use hashtable "options" for command arguments in function
@@ -71,6 +77,10 @@ Version 0.4.0 (under dev!)
  aspell.check.suggestions (task #12061)
 * aspell: fix creation of spellers when number of dictionaries is different
  between two buffers
+* guile: fix bad conversion of shared strings (replace calls to
+  scm_i_string_chars by scm_to_locale_string) (bug #38067)
+* irc: fix display of actions (/me) when they are received from a relay client
+  (in channel and private buffers) (bug #38027)
 * irc: fix memory leak when updating modes of channel
 * irc: add tags "irc_nick1_xxx" and "irc_nick2_yyy" in message displayed for
  command "NICK"
@@ -98,6 +108,11 @@ Version 0.4.0 (under dev!)
 * irc: fix crash when message 352 has too few arguments (bug #37513)
 * irc: remove unneeded server disconnect when server buffer is closed and server
  is already disconnected
+* perl: display script filename in error messages
+* perl: fix calls to callbacks during load of script when multiplicity is
+  disabled (bug #38044)
+* relay: fix duplicated messages sent to irc clients (when messages are
+  redirected) (bug #37870)
 * relay: fix memory leak when adding hdata to a message (weechat protocol)
 * relay: add backlog and server capability "server-time" for irc protocol, add
  new options relay.irc.backlog_max_minutes, relay.irc.backlog_max_number,
@@ -165,7 +180,7 @@ Version 0.3.9 (2012-09-29)
 * core: add function "hook_set" in plugin API, add "subplugin" in hooks (set by
  script plugins), display subplugin in /help on commands (task #12049)
 * core: add option weechat.look.jump_smart_back_to_buffer (jump back to initial
-  buffer after reaching end of hotlist, on by default, which is old behaviour)
+  buffer after reaching end of hotlist, on by default, which is old behavior)
 * core: add default key alt+"s" (toggle aspell)
 * core: add cmake option "MANDIR" (bug #36776)
 * core: add callback "nickcmp" in buffers
@@ -213,7 +228,7 @@ Version 0.3.9 (2012-09-29)
 * irc: add bar item "buffer_modes", remove option irc.look.item_channel_modes
  (task #12022)
 * irc: fix parsing of user modes (ignore everything after first space)
-  (bug #36756)
+  (bug #36756, bug #31572)
 * irc: add option irc.look.ctcp_time_format to customize reply to CTCP TIME
  (task #12150)
 * irc: fix freeze when reading on socket with SSL enabled (use non-blocking
@@ -358,7 +373,7 @@ Version 0.3.7 (2012-02-26)
  gnome-terminal
 * core: add option "hooks" for command /debug
 * core: add option "weechat.look.scroll_bottom_after_switch" (if enabled,
-  restore old behaviour before fix of bug #25555 in version 0.3.5)
+  restore old behavior before fix of bug #25555 in version 0.3.5)
 * core: apply filters after full reload of configuration files (with /reload)
  (bug #31182)
 * core: allow list for option weechat.plugin.extension (makes weechat.conf
@@ -701,7 +716,7 @@ Version 0.3.4 (2011-01-16)
  when chars are added to a text not found (bug #31167)
 * core: fix memory leaks when removing item in hashtable and when setting
  highlight words in buffer
-* core: use similar behaviour for keys bound to local or global history
+* core: use similar behavior for keys bound to local or global history
  (bug #30759)
 * api: add priority for hooks (task #10550)
 * api: add new functions: list_search_pos, list_casesearch_pos,
@@ -868,7 +883,7 @@ Version 0.3.2 (2010-04-18)
 * alias: add custom completion for aliases (task #9479)
 * scripts: allow script commands to reload only one script
 * scripts: fix bug with callbacks when loading a script already loaded
-* perl: fix crash when MULTIPLICITY is disabled
+* perl: fix crash when multiplicity is disabled
 * perl: fix crash when callbacks are called during script initialization
  (bug #29018)
 * perl: fix crash on /quit or unload of plugin under FreeBSD and Cygwin
@@ -1413,7 +1428,7 @@ Version 0.1.8 (2006-03-18)
 * add new plugins functions: add_timer_handler, remove_timer_handler,
  remove_infobar
 * plugin messages handlers now called when message is ignored (by /ignore)
-* new behaviour for messages ignored by a message handler: now WeeChat
+* new behavior for messages ignored by a message handler: now WeeChat
  executes standard handler, treating message as "ignored"
 * many commands allowed for aliases
 * many commands allowed when connecting to server
@@ -1,7 +1,7 @@
 WeeChat Release Notes
 =====================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.4.0-rc2, 2013-01-05
+v0.4.0-rc3, 2013-01-14


 Version 0.4.0 (under dev!)
@@ -132,11 +132,11 @@ Important release notes:
  'irc.color.nick_prefix_op', 'irc.color.nick_prefix_halfop',
  'irc.color.nick_prefix_voice', 'irc.color.nick_prefix_user'
 * count of messages have been added to hotlist by default, if you want to come
-  back to old behaviour, do that:
+  back to old behavior, do that:
 ** `/set weechat.look.hotlist_count_max 0`
 ** `/set weechat.look.hotlist_buffer_separator ","`
 * when you are away, all buffers are now added to hotlist by default (even if
-  they are displayed in a window), if you want to come back to old behaviour, do
+  they are displayed in a window), if you want to come back to old behavior, do
  that:
 ** `/set weechat.look.hotlist_add_buffer_if_away off`
 * new keys were added, use command `/key missing` to add them or `/key listdiff`
@@ -33,10 +33,17 @@ IF(PYTHON_FOUND)
   SET(PYTHON_FIND_QUIETLY TRUE)
 ENDIF(PYTHON_FOUND)

-FIND_PROGRAM(PYTHON_EXECUTABLE
-  NAMES python2.7 python2.6 python2.5 python
-  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
-  )
+IF(ENABLE_PYTHON3)
+  FIND_PROGRAM(PYTHON_EXECUTABLE
+    NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+    )
+ELSE(ENABLE_PYTHON3)
+  FIND_PROGRAM(PYTHON_EXECUTABLE
+    NAMES python2.7 python2.6 python2.5 python
+    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+    )
+ENDIF(ENABLE_PYTHON3)

 IF(PYTHON_EXECUTABLE)
  EXECUTE_PROCESS(
@@ -58,11 +65,17 @@ IF(PYTHON_EXECUTABLE)
    NAMES Python.h
    PATHS ${PYTHON_INC_DIR}
    )
-
-  FIND_LIBRARY(PYTHON_LIBRARY
-    NAMES python2.7 python2.6 python2.5 python
-    PATHS ${PYTHON_POSSIBLE_LIB_PATH}
-    )
+  IF(ENABLE_PYTHON3)
+    FIND_LIBRARY(PYTHON_LIBRARY
+      NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+      PATHS ${PYTHON_POSSIBLE_LIB_PATH}
+      )
+  ELSE(ENABLE_PYTHON3)
+    FIND_LIBRARY(PYTHON_LIBRARY
+      NAMES python2.7 python2.6 python2.5 python
+      PATHS ${PYTHON_POSSIBLE_LIB_PATH}
+      )
+  ENDIF(ENABLE_PYTHON3)

  IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
    EXECUTE_PROCESS(
@@ -24,7 +24,7 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.4.0-rc2, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.4.0-rc3, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([configure.in])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE
@@ -140,6 +140,7 @@ AC_ARG_ENABLE(script,       [  --disable-script        turn off Script plugin (d
 AC_ARG_ENABLE(scripts,      [  --disable-scripts       turn off script plugins (perl, python, ...) (default=compiled if found)],enable_scripts=$enableval,enable_scripts=yes)
 AC_ARG_ENABLE(perl,         [  --disable-perl          turn off Perl script plugin (default=compiled if found)],enable_perl=$enableval,enable_perl=yes)
 AC_ARG_ENABLE(python,       [  --disable-python        turn off Python script plugin (default=compiled if found)],enable_python=$enableval,enable_python=yes)
+AC_ARG_ENABLE(python3,      [  --enable-python3        use Python 3.x if found (NOT recommended) (default=off)],enable_python3=$enableval,enable_python3=no)
 AC_ARG_ENABLE(ruby,         [  --disable-ruby          turn off Ruby script plugin (default=compiled if found)],enable_ruby=$enableval,enable_ruby=yes)
 AC_ARG_ENABLE(lua,          [  --disable-lua           turn off Lua script plugin (default=compiled if found)],enable_lua=$enableval,enable_lua=yes)
 AC_ARG_ENABLE(tcl,          [  --disable-tcl           turn off Tcl script plugin (default=compiled if found)],enable_tcl=$enableval,enable_tcl=yes)
@@ -465,7 +466,11 @@ fi
 PYTHON_VERSION=

 if test "x$enable_python" = "xyes" ; then
-    AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2.5 python2 python)
+    if test "x$enable_python3" = "xyes" ; then
+        AC_PATH_PROGS(PYTHON, python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python2 python)
+    else
+        AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2.5 python2 python)
+    fi
    if test -z $PYTHON ; then
        AC_MSG_WARN([
 *** Python must be installed on your system but python interpreter couldn't be found in path.
@@ -489,8 +494,8 @@ if test "x$enable_python" = "xyes" ; then
            if test -r "$PYTHON_INCLUDE/Python.h"; then
                PYTHON_CFLAGS="-I$PYTHON_INCLUDE"
                AC_MSG_RESULT(found)
-                PYTHON_LIB=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"`
-                PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('SYSLIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED')"`
+                PYTHON_LIB=`$PYTHON -c "import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_config_var('LIBPL'))"`
+                PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('SYSLIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED'))"`
                AC_MSG_CHECKING(for Python library)
                if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so"; then
                   PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
@@ -367,6 +367,7 @@
  'items_num_lines' (pointer) +
  'items_refresh_needed' (pointer) +
  'screen_col_size' (integer) +
+  'screen_lines' (integer) +
  'coords_count' (integer) +
  'coords' (pointer) +
  'gui_objects' (pointer) +
@@ -204,7 +204,7 @@
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `blue`)

 * [[option_weechat.color.separator]] *weechat.color.separator*
-** Beschreibung: `color for window separators (when split) and separators beside bars (like nicklist)`
+** Beschreibung: `Farbe der Trennlinie von Fenstern (bei Fenster geteilt sind) und Bars (wie z.B. Nicklist)`
 ** Typ: Farbe
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `blue`)

@@ -99,7 +99,7 @@
 ** Werte: 1024 .. 102400 (Standardwert: `65536`)

 * [[option_xfer.network.fast_send]] *xfer.network.fast_send*
-** Beschreibung: `wartet beim Versenden von Dateien nicht auf ein Bestätigungssignal (ACK)`
+** Beschreibung: `beim Versenden von Daten wird nicht auf ein Bestätigungssignal (ACK) gewartet`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)

@@ -109,7 +109,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

 * [[option_xfer.network.port_range]] *xfer.network.port_range*
-** Beschreibung: `schränkt den ausgehenden Datenversand bzw. die Chats auf die ausschließliche Nutzung von Ports in einem vorgegebenen Bereich ein (hilfreich bei NAT) (Syntax: ein einzelner Port, z.B. 5000 oder ein Port-Bereich, z.B. 5000-5015. Es wird empfohlen Ports zu nutzen welche Größer als 1024 sind. Denn nur der User "root" kann auf den Port-Bereich <1024 zugreifen)`
+** Beschreibung: `schränkt den ausgehenden Datenversand/Chats auf die ausschließliche Nutzung von Ports in einem vorgegebenen Bereich ein (hilfreich bei NAT) (Syntax: ein einzelner Port, z.B. 5000 oder ein Port-Bereich, z.B. 5000-5015. Es wird empfohlen nur Ports zu nutzen die über 1024 liegen. Denn nur der User "root" kann auf den Port-Bereich unter 1024 zugreifen)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

@@ -701,7 +701,7 @@ skript_optionen = {
    "Option2" : "Wert2",
    "Option3" : "Wert3",
 }
-for option, standardwert in skript_optionen.iteritems():
+for option, standardwert in skript_optionen.items():
    if not weechat.config_is_set_plugin(option):
        weechat.config_set_plugin(option, standardwert)
 ----------------------------------------
@@ -100,7 +100,7 @@ $ make install
 Falls Du cmake nicht hast, ist es auch möglich die autotools zu nutzen:

 ----------------------------------------------------------
-$ ./autogen.sh       # (nur bei geklontem git Repository)
+$ ./autogen.sh
 $ ./configure --prefix=$HOME/weechat-git
 $ make
 $ make install
@@ -367,6 +367,7 @@
  'items_num_lines' (pointer) +
  'items_refresh_needed' (pointer) +
  'screen_col_size' (integer) +
+  'screen_lines' (integer) +
  'coords_count' (integer) +
  'coords' (pointer) +
  'gui_objects' (pointer) +
@@ -319,7 +319,7 @@ Translations for WeeChat and plugins are done with gettext, files are in 'po/' d
 |========================================
 | Path/file      | Description
 | po/            | Translation files (gettext)
-|    XX.po       | Translations for language XX (fr, de, it, ...), base language is english
+|    XX.po       | Translations for language XX (fr, de, it, ...), base language is English
 |    weechat.pot | Template for translations (auto-built)
 |========================================

@@ -405,7 +405,7 @@ foo ()
 ----------------------------------------

 * Use explicit variable names, for example "nicks_count" instead of "n" or "nc".
-  Exception: in `for` loops, where variables like "i" or "n" are ok.
+  Exception: in `for` loops, where variables like "i" or "n" are OK.
 * Initialize local variables after declaration, in body of function, example:

 [source,C]
@@ -421,7 +421,7 @@ foo ()
 }
 ----------------------------------------

-* Use parentheses to explicitely show how expression is evaluated, even if
+* Use parentheses to explicitly show how expression is evaluated, even if
  they are not required, for example: write `x + (y * z)` instead of `x + y * z`
 * Place curly brackets `{ }` alone on lines, and indent them with number of
  spaces used for line above opening curly bracket (the `if` in example):
@@ -945,7 +945,7 @@ Where 'component' is one of following:

 Some rules to follow:

-* use only english
+* use only English
 * use infinitive form of verb
 * if commit is related to something in tracker (bug, task, patch), write it
  in parenthesis after the message (format: bug #12345, task #12345, patch #12345)
@@ -957,7 +957,7 @@ core: add callback "nickcmp" for nick comparison in buffers
 irc: fix freeze when reading on socket with SSL enabled (bug #35097)
 ruby: add detection of ruby version 1.9.3 in cmake
 python: fix crash when unloading a script without pointer to interpreter
-core: update japanese translations (patch #7783)
+core: update Japanese translations (patch #7783)
 ----------------------------------------

 [[translations]]
@@ -977,7 +977,7 @@ $ cd po
 $ msginit -i weechat.pot -l nl_NL -o nl.po
 ----------------------------------------

-Base language for WeeChat is english, so you must of course understand english
+Base language for WeeChat is English, so you must of course understand English
 in order to translate to your language.

 When done, you *have* to check your file with script 'msgcheck.py'
@@ -1019,7 +1019,7 @@ Asciidoc

 Asciidoc files are in directory 'doc/XX/' where 'XX' is language (en, fr, de, it, ...)

-First make a copy of an english asciidoc file (in directory 'doc/en/'), then work on it.
+First make a copy of an English asciidoc file (in directory 'doc/en/'), then work on it.

 The translations missing in files are indicated by this string:

@@ -142,7 +142,7 @@ This may be caused by bad value of the TERM variable in your shell (look at
 output of `echo $TERM` in your terminal, *outside screen/tmux*).

 For example, 'xterm-color' may display such weird chars, you can use 'xterm'
-which is ok (like many other values).
+which is OK (like many other values).

 If needed, fix your TERM variable: `export TERM="xxx"`.

@@ -263,7 +263,7 @@ How can I click on long URLs (more than one line)?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 By default, WeeChat displays time and prefix for each line and optional bars
-around chat area. To make easier url click, you can move nicklist to top and
+around chat area. To make easier URL click, you can move nicklist to top and
 remove alignment on nick:

 ----------------------------------------
@@ -274,7 +274,7 @@ remove alignment on nick:

 With WeeChat ≥ 0.3.6, you can enable option "eat_newline_glitch", so that
 new line char is not added at the end of each line displayed (it will not break
-url selection):
+URL selection):

 ----------------------------------------
 /set weechat.look.eat_newline_glitch on
@@ -314,7 +314,7 @@ and issue these commands when script is loaded:
 /upgrade
 ----------------------------------------

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

 [[256_colors]]
@@ -7994,6 +7994,8 @@ Arguments:
 ** 'void *signal_data': data sent with signal
 ** return value:
 *** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_OK_EAT' (stop sending the signal immediately)
+    (_new in version 0.4.0_)
 *** 'WEECHAT_RC_ERROR'
 * 'callback_data': pointer given to callback when it is called by WeeChat

@@ -8262,6 +8264,8 @@ pattern.
 ** 'struct t_hashtable *hashtable': hashtable
 ** return value:
 *** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_OK_EAT' (stop sending the signal immediately)
+    (_new in version 0.4.0_)
 *** 'WEECHAT_RC_ERROR'
 * 'callback_data': pointer given to callback when it is called by WeeChat

@@ -10165,7 +10169,7 @@ Arguments:
  set cursor position in buffer input

 | input_get_unknown_commands | "0" or "1" |
-  "0" to disable unknown commands on this buffer (default behaviour), "1" to
+  "0" to disable unknown commands on this buffer (default behavior), "1" to
  get unknown commands, for example if user type "/unknowncmd", buffer will
  receive it (no error about unknown command)

@@ -11889,7 +11893,7 @@ void weechat_command (struct t_gui_buffer *buffer, const char *command);
 Arguments:

 * 'buffer': buffer pointer (command is executed on this buffer, use NULL for
-  WeeChat core buffer)
+  current buffer)
 * 'command': command to execute (if beginning with a "/"), or text to send to
  buffer

@@ -416,7 +416,7 @@ There are two different identifiers ('id'):

 * 'id' sent by 'client': 'relay' will answer with same 'id' in its answer
 * 'id' of an event: on some events, 'relay' will send message to 'client' using
-  a speficic 'id', beginning with underscore (see table below)
+  a specific 'id', beginning with underscore (see table below)

 WeeChat reserved identifiers:

@@ -466,7 +466,7 @@ WeeChat reserved identifiers:

 | _buffer_localvar_changed | Local variable changed  | buffer |
  'number' (integer), 'full_name' (string), 'local_variables' (hashtable) |
-  Change local variable inbuffer
+  Change local variable in buffer

 | _buffer_localvar_removed | Local variable removed  | buffer |
  'number' (integer), 'full_name' (string), 'local_variables' (hashtable) |
@@ -782,7 +782,7 @@ A 'info' contains a name and a value (both are strings).
 * 'name' (string): name of info
 * 'value' (string): value

-Exemple of info 'version':
+Example of info 'version':

 .......................................
 ┌─────────┬───────────────────┐
@@ -687,7 +687,7 @@ script_options = {
    "option2" : "value2",
    "option3" : "value3",
 }
-for option, default_value in script_options.iteritems():
+for option, default_value in script_options.items():
    if not weechat.config_is_set_plugin(option):
        weechat.config_set_plugin(option, default_value)
 ----------------------------------------
@@ -791,7 +791,7 @@ message received, so that you can modify it.
 ----------------------------------------
 def modifier_cb(data, modifier, modifier_data, string):
    # add server name to all messages received
-    # (ok that's not very useful, but that's just an example!)
+    # (OK that's not very useful, but that's just an example!)
    return "%s %s" % (string, modifier_data)

 weechat.hook_modifier("irc_in_privmsg", "modifier_cb", "")
@@ -94,7 +94,7 @@ $ make install
 If you don't have cmake, it's still possible to use autotools:

 ----------------------------------------------------------
-$ ./autogen.sh       # (only if you cloned git repository)
+$ ./autogen.sh
 $ ./configure --prefix=$HOME/weechat-git
 $ make
 $ make install
@@ -93,7 +93,7 @@ compile WeeChat.
 | zlib1g-dev             |             | *yes*    | compression of packets in relay plugin (weechat protocol), script plugin
 | libgcrypt11-dev        |             | *yes*    | SASL authentication with IRC server using DH-BLOWFISH mechanism, script plugin
 | libgnutls-dev          | ≥ 2.2.0     |          | SSL connection to IRC server, support of SSL in relay plugin
-| gettext                |             |          | internationalization (translation of messages; base language is english)
+| gettext                |             |          | internationalization (translation of messages; base language is English)
 | ca-certificates        |             |          | certificates for SSL connections
 | libaspell-dev          |             |          | aspell plugin
 | python-dev             | ≥ 2.5 ^(3)^ |          | python plugin
@@ -590,7 +590,7 @@ List of bar options:

 | size | integer ≥ 0 |
  The size of the bar: number of columns for position left/right, number
-  of lines for position top/tobbom. A size of `0` means automatic, so the size
+  of lines for position top/bottom. A size of `0` means automatic, so the size
  will be computed according to content displayed in bar.

 | size_max | integer ≥ 0 |
@@ -1510,7 +1510,7 @@ suggestions is set in option 'aspell.check.suggestions'.
 To enable suggestions you must set option 'aspell.check.suggestions' to an
 integer ≥ 0 and add the bar item "aspell_suggest" to a bar, like 'status'.

-Example of suggestions with english dictionary (`en`):
+Example of suggestions with English dictionary (`en`):

 ........................................
 │[12:55] [6] [irc/freenode] 3:#test(+n){4} [print,prone,prune]                    │
@@ -1518,7 +1518,7 @@ Example of suggestions with english dictionary (`en`):
 └─────────────────────────────────────────────────────────────────────────────────┘
 ........................................

-Example of suggestions with english and french dictionaries (`en,fr`):
+Example of suggestions with English and French dictionaries (`en,fr`):

 ........................................
 │[12:55] [6] [irc/freenode] 3:#test(+n){4} [print,prone,prune/prime,primer,primé] │
@@ -1753,7 +1753,7 @@ irc.server.xxx.ssl_verify::

 [NOTE]
 Option "ssl_verify" is on by default, so verification is strict and may fail,
-even if it was ok with versions prior to 0.3.1.
+even if it was OK with versions prior to 0.3.1.

 [[irc_connect_oftc_with_certificate]]
 First example: connect to oftc and check certificate
@@ -1801,8 +1801,8 @@ SASL authentication
 ^^^^^^^^^^^^^^^^^^^

 WeeChat supports SASL authentication, using three mechanisms: "plain" (plain
-text password), "dh-blowfish" (crypted password) or "external" (client side SSL
-cert).
+text password), "dh-blowfish" (encrypted password) or "external" (client side
+SSL cert).

 Options in servers are:

@@ -1833,7 +1833,7 @@ First, make sure to have WeeChat compiled with <<dependencies,libgcrypt11-dev>>
 (if built from sources); it's not mandatory, but "dh-blowfish" ensures stronger
 security compared to "plain" authentication system with SASL.

-In first place, install TOR. For Debian (and derivated):
+In first place, install TOR. For Debian (and derived):

 ----------------------------------------
 $ sudo apt-get install tor
@@ -2509,8 +2509,8 @@ until this sentence, you can start again!).

 Ways to get support:

-* IRC: server 'irc.freenode.net', channels '#weechat' (english) and
-  '#weechat-fr' (french)
+* IRC: server 'irc.freenode.net', channels '#weechat' (English) and
+  '#weechat-fr' (French)
 * Mailing list:
 ** subscribe: http://mail.nongnu.org/mailman/listinfo/weechat-support
 ** send mail to weechat-support@nongnu.org
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2012-2013 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2012-2013 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -367,6 +367,7 @@
  'items_num_lines' (pointer) +
  'items_refresh_needed' (pointer) +
  'screen_col_size' (integer) +
+  'screen_lines' (integer) +
  'coords_count' (integer) +
  'coords' (pointer) +
  'gui_objects' (pointer) +
@@ -197,7 +197,7 @@ Pour déplacer la barre en bas :
 Comment puis-je réduire la longueur des pseudos ou supprimer l'alignement des pseudos dans la zone de discussion ?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-Pour réduire la longueur maxi des pseudos dans la zone de discussion :
+Pour réduire la longueur maximum des pseudos dans la zone de discussion :

 ----------------------------------------
 /set weechat.look.prefix_align_max 15
@@ -215,7 +215,7 @@ Comment utiliser une ligne de commande sur plusieurs lignes ?

 L'option 'size' dans la barre input peut être définie à une valeur supérieure
 à 1 (pour une taille fixe, la taille par défaut est 1) ou 0 pour une taille
-dynamique, et alors l'option 'size_max' définira la taille maxi (0 = pas de
+dynamique, et alors l'option 'size_max' définira la taille maximum (0 = pas de
 limite).

 Exemple avec une taille dynamique :
@@ -224,7 +224,7 @@ Exemple avec une taille dynamique :
 /set weechat.bar.input.size 0
 ----------------------------------------

-Taille maxi de 2 :
+Taille maximum de 2 :

 ----------------------------------------
 /set weechat.bar.input.size_max 2
@@ -562,7 +562,7 @@ Comment puis-je être identifié avant de rejoindre les canaux ?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 Si le serveur supporte SASL, vous devriez l'utiliser au lieu d'envoyer une
-command pour l'authentification avec nickserv, par exemple :
+commande pour l'authentification avec nickserv, par exemple :

 ----------------------------------------
 /set irc.server_default.sasl_mechanism dh-blowfish
@@ -597,8 +597,8 @@ de les voir en désactivant les filtres (par défaut, la touche @k(A-)@k(=)
 active/désactive les filtres).

 [[filter_irc_join_part_quit]]
-Comment puis-je filter les messages join/part/quit sur les canaux IRC ?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Comment puis-je filtrer les messages join/part/quit sur les canaux IRC ?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 Avec le filtre intelligent (pour garder les join/part/quit des utilisateurs qui
 ont parlé récemment) :
@@ -8107,6 +8107,8 @@ Paramètres :
 ** 'void *signal_data' : données envoyées avec le signal
 ** valeur de retour :
 *** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_OK_EAT' (arrêter l'envoi du signal immédiatement)
+    (_nouveau dans la version 0.4.0_)
 *** 'WEECHAT_RC_ERROR'
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
  WeeChat
@@ -8384,6 +8386,8 @@ modèle de redirection ("pattern").
 ** 'struct t_hashtable *hashtable' : hashtable
 ** valeur de retour :
 *** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_OK_EAT' (arrêter l'envoi du signal immédiatement)
+    (_nouveau dans la version 0.4.0_)
 *** 'WEECHAT_RC_ERROR'
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
  WeeChat
@@ -12092,7 +12096,7 @@ void weechat_command (struct t_gui_buffer *buffer, const char *command);
 Paramètres :

 * 'buffer' : pointeur vers le tampon (la commande est exécutée sur ce tampon,
-  NULL pour le tampon "core")
+  NULL pour le tampon courant)
 * 'command' : commande à exécuter (si elle commence par "/"), ou texte à
  envoyer au tampon

@@ -147,7 +147,7 @@ Se connecter au serveur IRC et rejoindre les canaux

 [NOTE]
 Cette commande peut aussi être utilisée pour créer et se connecter au serveur
-sans utiliser la commande `/server` (devrais-je répéter que vous pouvez voir
+sans utiliser la commande `/server` (dois-je répéter que vous pouvez voir
 l'aide pour cette commande avec `/help connect` ?).

 Par défaut, les tampons des serveurs sont mélangés avec le tampon 'core'
@@ -247,7 +247,7 @@ De nombreux scripts externes (de contributeurs) sont disponibles pour WeeChat :
 http://www.weechat.org/scripts

 Vous pouvez gérer les scripts dans WeeChat avec la commande `/script` (voir
-`/help script` pour plus d'info).
+`/help script` pour plus d'infos).


 [[more_doc]]
@@ -704,7 +704,7 @@ script_options = {
    "option2" : "valeur2",
    "option3" : "valeur3",
 }
-for option, default_value in script_options.iteritems():
+for option, default_value in script_options.items():
    if not weechat.config_is_set_plugin(option):
        weechat.config_set_plugin(option, default_value)
 ----------------------------------------
@@ -733,7 +733,7 @@ def config_cb(data, option, value):
 # ...

 weechat.hook_config("plugins.var.python." + SCRIPT_NAME + ".*", "config_cb", "")
-# pour les autres languages, remplacez "python" par le language ("perl", "ruby", "lua" ou "tcl")
+# pour les autres langages, remplacez "python" par le langage ("perl", "ruby", "lua" ou "tcl")
 ----------------------------------------

 [[config_options_weechat]]
@@ -98,7 +98,7 @@ $ make install
 Si vous n'avez pas cmake, il est toujours possible d'utiliser les autotools :

 -----------------------------------------------------------------
-$ ./autogen.sh       # (seulement si vous avez cloné la base git)
+$ ./autogen.sh
 $ ./configure --prefix=$HOME/weechat-git
 $ make
 $ make install
@@ -103,7 +103,7 @@ compiler WeeChat.
 | ruby1.9.1-dev          | ≥ 1.8       |        | extension ruby
 | liblua5.1-0-dev        |             |        | extension lua
 | tcl-dev                | ≥ 8.5       |        | extension tcl
-| guile-1.8-dev          |             |        | extention guile (scheme)
+| guile-1.8-dev          |             |        | extension guile (scheme)
 | asciidoc               | ≥ 8.5.0     |        | construction de la documentation (fichiers HTML)
 | source-highlight       |             |        | coloration des sources dans la documentation HTML
 |========================================
@@ -434,7 +434,7 @@ La barre 'status' contient les objets (items) suivants par défaut :
 | buffer_nicklist_count | {4}                   | nombre de pseudos dans la liste des pseudos
 | buffer_filter         | *                     | indicateur de filtrage : `*` signifie que des lignes sont filtrées (cachées), une valeur vide signifie que toutes les lignes sont affichées
 | lag                   | [Lag: 2.5]            | indicateur de "lag" (ralentissements réseau), en secondes (caché si le lag est faible)
-| hotlist               | [Act: 4:#abc(2,5), 6] | liste des tampons où il y a de l'activité (messages non lus) (dans cet exemple, 2 highlights et 5 messages non lus sur '#abc', un message non lu sur le buffer numéro 6)
+| hotlist               | [Act: 4:#abc(2,5), 6] | liste des tampons où il y a de l'activité (messages non lus) (dans cet exemple, 2 highlights et 5 messages non lus sur '#abc', un message non lu sur le tampon numéro 6)
 | completion            | abc(2) def(5)         | liste des mots pour la complétion, avec le nombre de complétions possibles pour chaque mot
 | scroll                | -PLUS(50)-            | indicateur de scroll, avec le nombre de lignes sous la dernière ligne affichée
 |========================================
@@ -751,7 +751,7 @@ Quelques exemples de remplissage pour la barre 'nicklist' :
 Conditions
 ^^^^^^^^^^

-L'option 'conditions' est uen chaîne évaluée pour savoir si la barre doit être
+L'option 'conditions' est une chaîne évaluée pour savoir si la barre doit être
 affichée ou non dans la fenêtre (elle est utilisée seulement pour les barres
 avec type 'window').

@@ -782,7 +782,7 @@ liste de pseudos, et seulement si la largeur de fenêtre est supérieurs à 100
 /set weechat.bar.nicklist.conditions "${nicklist} && ${window.win_width} > 100"
 ----------------------------------------

-Même condition, mais affichier toujours la liste de pseudos sur le tampon
+Même condition, mais afficher toujours la liste de pseudos sur le tampon
 '&bitlbee' (même si la fenêtre est petite) :

 ----------------------------------------
@@ -865,7 +865,7 @@ Touches pour la ligne de commande
 | @k(C-)@k(c) , @k(b) | Insérer le code pour mettre le texte en gras | /input insert \x02
 | @k(C-)@k(c) , @k(c) | Insérer le code pour écrire en couleur | /input insert \x03
 | @k(C-)@k(c) , @k(i) | Insérer le code pour mettre le texte en italique | /input insert \x1D
-| @k(C-)@k(c) , @k(o) | Insérer le code pour réinitaliser la couleur | /input insert \x0F
+| @k(C-)@k(c) , @k(o) | Insérer le code pour réinitialiser la couleur | /input insert \x0F
 | @k(C-)@k(c) , @k(r) | Insérer le code pour écrire en couleur inversée | /input insert \x12
 | @k(C-)@k(c) , @k(u) | Insérer le code pour écrire en souligné | /input insert \x15
 | @k(Del)          .2+| Effacer le caractère suivant sur la ligne de commande .2+| /input delete_next_char
@@ -996,7 +996,7 @@ Ces touches sont utilisées dans le contexte "cursor" (mouvement libre du curseu
 | @k(K)        | liste des pseudos | Retirer par la force et bannir le pseudo | /window ${_window_number};/kickban ${nick}
 | @k(q)        | liste des pseudos | Ouvrir une discussion avec le pseudo | /window ${_window_number};/query ${nick};/cursor stop
 | @k(w)        | liste des pseudos | Effectuer un whois sur le pseudo | /window ${_window_number};/whois ${nick}
-| @k(Enter) .3+| -              .3+| Stop cursor mode .3+| /cursor stop
+| @k(Enter) .3+| -              .3+| Arrêter le mode curseur ("cursor") .3+| /cursor stop
 | @k(C-)@k(j)
 | @k(C-)@k(m)
 |========================================
@@ -1022,8 +1022,8 @@ Ces touches sont utilisées dans le contexte "mouse", c'est-à-dire lorsqu'un
 | ⇓       | -            | chat                 | Descendre de quelques lignes dans l'historique du tampon | /window scroll_down -window ${_window_number}
 | ⇑       | -            | chat (tampon script) | Monter de 5 lignes dans le tampon script | /script up 5
 | ⇓       | -            | chat (tampon script) | Descendre de 5 lignes dans le tampon script | /script down 5
-| @k(C-)⇑ | -            | chat                 | Faire défiler horizontallement vers la gauche | /window scroll_horiz -window ${_window_number} -10%
-| @k(C-)⇓ | -            | chat                 | Faire défiler horizontallement vers la droite | /window scroll_horiz -window ${_window_number} +10%
+| @k(C-)⇑ | -            | chat                 | Faire défiler horizontalement vers la gauche | /window scroll_horiz -window ${_window_number} -10%
+| @k(C-)⇓ | -            | chat                 | Faire défiler horizontalement vers la droite | /window scroll_horiz -window ${_window_number} +10%
 | ◾◽◽     | up           | liste des pseudos    | Monter d'une page dans la liste des pseudos | /bar scroll nicklist ${_window_number} -100%
 | ◾◽◽     | down         | liste des pseudos    | Descendre d'une page dans la liste des pseudos | /bar scroll nicklist ${_window_number} +100%
 | ◾◽◽     | up (long)    | liste des pseudos    | Aller au début de la liste des pseudos | /bar scroll nicklist ${_window_number} b
@@ -1164,7 +1164,7 @@ avec le bouton gauche.

 [TIP]
 Vous pouvez trouver le nom de l'évènement avec la commande `/input grab_mouse`
-puis en faisant l'action avec la souris. Cela insèrera le nom de l'évènement
+puis en faisant l'action avec la souris. Cela insérera le nom de l'évènement
 sur la ligne de commande.

 [[command_line]]
@@ -367,6 +367,7 @@
  'items_num_lines' (pointer) +
  'items_refresh_needed' (pointer) +
  'screen_col_size' (integer) +
+  'screen_lines' (integer) +
  'coords_count' (integer) +
  'coords' (pointer) +
  'gui_objects' (pointer) +
@@ -8072,6 +8072,9 @@ Argomenti:
 ** 'void *signal_data': dati inviati con il segnale
 ** valore restituito:
 *** 'WEECHAT_RC_OK'
+// TRANSLATION MISSING
+*** 'WEECHAT_RC_OK_EAT' (stop sending the signal immediately)
+    (_novità nella versione 0.4.0_)
 *** 'WEECHAT_RC_ERROR'
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat

@@ -8348,6 +8351,9 @@ di redirezione.
 ** 'struct t_hashtable *hashtable': tabella hash
 ** valore restituito:
 *** 'WEECHAT_RC_OK'
+// TRANSLATION MISSING
+*** 'WEECHAT_RC_OK_EAT' (stop sending the signal immediately)
+    (_novità nella versione 0.4.0_)
 *** 'WEECHAT_RC_ERROR'
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat

@@ -12029,7 +12035,7 @@ void weechat_command (struct t_gui_buffer *buffer, const char *command);
 Argomenti:

 * 'buffer': puntatore al buffer (il comando viene eseguito su questo buffer,
-  utilizzare NULL per il buffer core di WeeChat)
+  utilizzare NULL per il buffer corrente)
 * 'command': comando da eseguire (se preceduto da "/"), oppure il testo
  viene inviato sul buffer

@@ -703,7 +703,7 @@ script_options = {
    "option2" : "value2",
    "option3" : "value3",
 }
-for option, default_value in script_options.iteritems():
+for option, default_value in script_options.items():
    if not weechat.config_is_set_plugin(option):
        weechat.config_set_plugin(option, default_value)
 ----------------------------------------
@@ -97,7 +97,7 @@ $ make install
 Se cmake non è installato, è ancora possibile usare gli autotools:

 ----------------------------------------------------------
-$ ./autogen.sh       # (solo se clonato il deposito git)
+$ ./autogen.sh
 $ ./configure --prefix=$HOME/weechat-git
 $ make
 $ make install
@@ -606,7 +606,7 @@ List of bar options:

 | size | integer ≥ 0 |
  The size of the bar: number of columns for position left/right, number
-  of lines for position top/tobbom. A size of `0` means automatic, so the size
+  of lines for position top/bottom. A size of `0` means automatic, so the size
  will be computed according to content displayed in bar.

 | size_max | integer ≥ 0 |
@@ -1544,7 +1544,7 @@ suggestions is set in option 'aspell.check.suggestions'.
 To enable suggestions you must set option 'aspell.check.suggestions' to an
 integer ≥ 0 and add the bar item "aspell_suggest" to a bar, like 'status'.

-Example of suggestions with english dictionary (`en`):
+Example of suggestions with English dictionary (`en`):

 ........................................
 │[12:55] [6] [irc/freenode] 3:#test(+n){4} [print,prone,prune]                    │
@@ -1552,7 +1552,7 @@ Example of suggestions with english dictionary (`en`):
 └─────────────────────────────────────────────────────────────────────────────────┘
 ........................................

-Example of suggestions with english and french dictionaries (`en,fr`):
+Example of suggestions with English and French dictionaries (`en,fr`):

 ........................................
 │[12:55] [6] [irc/freenode] 3:#test(+n){4} [print,prone,prune/prime,primer,primé] │
@@ -367,6 +367,7 @@
  'items_num_lines' (pointer) +
  'items_refresh_needed' (pointer) +
  'screen_col_size' (integer) +
+  'screen_lines' (integer) +
  'coords_count' (integer) +
  'coords' (pointer) +
  'gui_objects' (pointer) +
@@ -657,7 +657,7 @@ script_options = {
    "option2" : "value2",
    "option3" : "value3",
 }
-for option, default_value in script_options.iteritems():
+for option, default_value in script_options.items():
    if not weechat.config_is_set_plugin(option):
        weechat.config_set_plugin(option, default_value)
 ----------------------------------------
@@ -89,7 +89,7 @@ $ make install
 cmake が無い場合は autotools を使うことも可能です:

 ----------------------------------------------------------
-$ ./autogen.sh       # (git リポジトリから clone した場合のみ)
+$ ./autogen.sh
 $ ./configure --prefix=$HOME/weechat-git
 $ make
 $ make install
@@ -3,10 +3,9 @@ WeeChat FAQ (Często zadawane pytania)
 Sébastien Helleu <flashcode@flashtux.org>


-// TRANSLATION MISSING
 [NOTE]
-This document is written for WeeChat versions ≥ 0.3.0 but should preferably be
-used with latest stable version of WeeChat.
+Ten dokument jest napisany dla WeeChat w wersji ≥ 0.3.0, ale powinien być używany
+dla najnowszej stabilnej wersji.


 [[general]]
@@ -205,22 +204,21 @@ W celu ograniczenia długości nicków w oknie rozmowy:
 /set weechat.look.prefix_align none
 ----------------------------------------

-// TRANSLATION MISSING
 [[input_bar_size]]
-How to use command line with more than one line?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Jak używać linii poleceń z więcej niż jednym wierszem?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-The option 'size' in input bar can be set to a value higher than 1 (for fixed
-size, default size is 1) or 0 for dynamic size, and then option 'size_max' will
-set the max size (0 = no limit).
+Opcja 'size' paska wprowadzania może zostać ustawiona na wartość wyższą niż 1
+(dla ustalonej wartości, domyślny rozmiar to 1) lub 0 dla dynamicznego rozmiaru,
+następnie opcja 'size_max' ustali maksymalny rozmiar (0 = brak limitu).

-Example with dynamic size:
+Przykład dynamicznego rozmiaru:

 ----------------------------------------
 /set weechat.bar.input.size 0
 ----------------------------------------

-Max size of 2:
+Maksymalny rozmiar równy 2:

 ----------------------------------------
 /set weechat.bar.input.size_max 2
@@ -475,14 +473,13 @@ działa to dla X/Y większych dla 94.
 Powinieneś użyć terminala wspierającego położenia UTF-8 dla myszy, jak
 rxvt-unicode.

-// TRANSLATION MISSING
 [[mouse_select_paste]]
-How can I select or paste text in terminal when mouse is enabled in WeeChat?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Jak mogę zaznaczyć lub wkleić tekst w terminalu z włączoną obsługa myszy w WeeChat?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-When mouse is enabled in WeeChat, you can use @k(-S-) modifier to select or
-click in terminal, as if the mouse was disabled (on some terminals like iTerm,
-you have to use @k(-A-) instead of @k(-S-)).
+Kiedy obsługa myszy jest włączona w WeeChat, można użyć modyfikatora @k(-S-) do zaznaczania
+lub kliknać w terminalu, tak jak w przypadku wyłączonej obsługi myszy (w niektórych
+terminalach jak iTerm należy użyć @k(-A-) zamiast @k(-S-)).

 [[irc]]
 IRC
@@ -539,22 +536,21 @@ Ustaw port serwera, SSL, dhkey_size, następnie się połącz:
 /connect freenode
 ----------------------------------------

-// TRANSLATION MISSING
 [[irc_sasl]]
-How can I be identified before joining channels?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Jak mogę się zidentyfikować przed wejściem na kanały?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-If server supports SASL, you should use that instead of sending command for
-nickserv authentication, for example:
+Jeśli serwer wspiera SASL, możesz użyć tego zamiast wysyłać komendę do nickserva,
+na przykład:

 ----------------------------------------
 /set irc.server_default.sasl_mechanism dh-blowfish
-/set irc.server.freenode.sasl_username "mynick"
+/set irc.server.freenode.sasl_username "nick"
 /set irc.server.freenode.sasl_password "xxxxxxx"
 ----------------------------------------

-If server does not support SASL, you can add a delay (between command and join
-of channels):
+Jeśli serwer nie wspiera SASL, możesz dodać odstęp pomiędzy komendą a wejściem
+na kanały):

 ----------------------------------------
 /set irc.server.freenode.command_delay 5
@@ -741,15 +737,13 @@ W celu zmniejszenia używanej pamięci możesz zastosować się do poniższych r

 * używać najnowsze stabilnej wersji (powinna mieć mniej wycieków pamięci
  niż starsze wersje)
-* nie ładować nieużywanych pluginów, np: aspell, fifo, logger, perl, python,
+* nie ładuj nieużywanych pluginów, np: aspell, fifo, logger, perl, python,
  ruby, lua, tcl, guile, xfer (używana do DCC)
 * ładować tylko naprawdę używane skrypty
-// TRANSLATION MISSING
-* do not load certificates if SSL is *NOT* used: set empty string in option
+* nie ładuj certyfikatów jeśli SSL *NIE* jest używany: ustaw pusty ciąg w opcji
  'weechat.network.gnutls_ca_file'
-// TRANSLATION MISSING
-* reduce value of option 'weechat.history.max_buffer_lines_number' or set value
-  of option 'weechat.history.max_buffer_lines_minutes'
+* zmniejsz wartość dla opcji 'weechat.history.max_buffer_lines_number' lub ustaw
+  wartość opcji 'weechat.history.max_buffer_lines_minutes'
 * zmniejszyć wartość opcji 'weechat.history.max_commands'

 [[development]]
@@ -101,17 +101,15 @@ Aby włączyć automatyczne łączenie się z serwerem przy starcie:

  /set irc.server.oftc.autoconnect on

-// TRANSLATION MISSING
-If SASL is available on server, you can use it for authentication (you will be
-identified before you join channels):
+Jeśli SASL jest dostępny na serwerze, można użyć go do uwierzytelnienia (zostaniesz
+zidentyfikowany przed wejściem na kanał):

  /set irc.server_default.sasl_mechanism dh-blowfish
  /set irc.server.oftc.sasl_username "mójnick"
  /set irc.server.oftc.sasl_password "xxxxxxx"

-// TRANSLATION MISSING
-To run a command after connection to server, for example to authenticate
-with nickserv (only if you don't use SASL for authentication):
+Żeby wykonać komendę po połączeniu z serwerem, na przykład uwierzytelnienie
+przez nickserv (tylko jeśli nie uwierzytelniasz się przez SASL):

  /set irc.server.oftc.command "/msg nickserv identify xxxxxxx"

@@ -235,9 +233,8 @@ skrypty).
 Wiele zewnętrznych skryptów (od społeczności) jest dostępnych dla WeeChat:
 http://www.weechat.org/scripts

-// TRANSLATION MISSING
-You can manage scripts in WeeChat with command `/script` (see `/help script`
-for more info).
+Możesz zarządzac skryptami w WeeChat dzięki komendzie `/script` (zobacz `/help script`
+po więcej informacji).


 [[more_doc]]
@@ -99,9 +99,8 @@ Argumenty:
 * 'wersja': string, wersja
 * 'licencja': string, licencja
 * 'opis': string, krótki opis skryptu
-// TRANSLATION MISSING
 * 'funkcja_wyłączająca': string, nazwa funkcji wywoływanej podczas wyładowania skryptu
-  (can be empty string)
+  (może być pusty ciąg)
 * 'kodowanie': string, kodowane skryptu (jeśli skrypt jest napisany
  w UTF-8 można nie podawać tej wartości - UTF-8 to domyślne kodowanie)

@@ -686,7 +685,7 @@ script_options = {
    "opcja2" : "wartość2",
    "opcja3" : "wartość3",
 }
-for option, default_value in script_options.iteritems():
+for option, default_value in script_options.items():
    if not weechat.config_is_set_plugin(option):
        weechat.config_set_plugin(option, default_value)
 ----------------------------------------
@@ -94,7 +94,7 @@ $ make install
 Jeśli nie posiadasz cmake, nadal jest możliwe użycie autotools:

 ----------------------------------------------------------
-$ ./autogen.sh       # (only if you cloned git repository)
+$ ./autogen.sh
 $ ./configure --prefix=$HOME/weechat-git
 $ make
 $ make install
@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.0-rc1\n"
+"Project-Id-Version: WeeChat 0.4.0-rc3\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-04 17:43+0100\n"
-"PO-Revision-Date: 2013-01-01 12:57+0100\n"
+"POT-Creation-Date: 2013-01-14 12:18+0100\n"
+"PO-Revision-Date: 2013-01-14 12:17+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Czech\n"
@@ -7984,9 +7984,13 @@ msgstr "%s%s: adresa \"%s\" nenalezena"
 msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
 msgstr "%s%s: nemohu nastavit nastavení sketu \"SO_REUSEADDR\""

+#, fuzzy, c-format
+msgid "%s%s: cannot create socket: error %d %s"
+msgstr "%s%s: nemohu vytvořit soket pro xfer"
+
 #, c-format
-msgid "%s%s: cannot create socket"
-msgstr "%s%s nemohu vytvořit soket"
+msgid "%s%s: try /set relay.network.ipv6 off"
+msgstr ""

 #, fuzzy, c-format
 msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
@@ -9313,3 +9317,6 @@ msgstr ""

 msgid "Constants"
 msgstr ""
+
+#~ msgid "%s%s: cannot create socket"
+#~ msgstr "%s%s nemohu vytvořit soket"
@@ -20,10 +20,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.0-rc1\n"
+"Project-Id-Version: WeeChat 0.4.0-rc3\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-04 17:43+0100\n"
-"PO-Revision-Date: 2012-12-25 11:59+0100\n"
+"POT-Creation-Date: 2013-01-14 12:18+0100\n"
+"PO-Revision-Date: 2013-01-14 12:17+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
 "Language: \n"
@@ -3196,13 +3196,12 @@ msgstr ""
 "ist die Option aktiviert dann wird eine vertikale Trennlinie zwischen "
 "Fenstern gezeichnet"

-#, fuzzy
 msgid ""
 "color for window separators (when split) and separators beside bars (like "
 "nicklist)"
 msgstr ""
-"Hintergrundfarbe der Fenster-Separatoren im Chatfenster (bei geteiltem "
-"Bildschirm)"
+"Farbe der Trennlinie von Fenstern (bei Fenster geteilt sind) und Bars (wie z."
+"B. Nicklist)"

 msgid "text color for '+' when scrolling bars"
 msgstr "Farbe des '+' beim Scrollen von Info-Bars"
@@ -8711,8 +8710,12 @@ msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
 msgstr "%s%s Fehler beim Erstellen der Socket-Option \"SO_REUSEADDR\""

 #, c-format
-msgid "%s%s: cannot create socket"
-msgstr "%s%s: Socket konnte nicht angelegt werden"
+msgid "%s%s: cannot create socket: error %d %s"
+msgstr "%s%s: Socket kann nicht erstellt werden: Fehler %d %s"
+
+#, c-format
+msgid "%s%s: try /set relay.network.ipv6 off"
+msgstr "%s%s: versuche /set relay.network.ipv6 off"

 #, c-format
 msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
@@ -10002,7 +10005,7 @@ msgstr "Blockgröße für versendete Pakete (in Bytes)"

 msgid "does not wait for ACK when sending file"
 msgstr ""
-"wartet beim Versenden von Dateien nicht auf ein Bestätigungssignal (ACK)"
+"beim Versenden von Daten wird nicht auf ein Bestätigungssignal (ACK) gewartet"

 msgid ""
 "restricts outgoing files/chats to use only ports in the given range (useful "
@@ -10010,11 +10013,11 @@ msgid ""
 "empty value means any port, it's recommended to use ports greater than 1024, "
 "because only root can use ports below 1024)"
 msgstr ""
-"schränkt den ausgehenden Datenversand bzw. die Chats auf die ausschließliche "
-"Nutzung von Ports in einem vorgegebenen Bereich ein (hilfreich bei NAT) "
-"(Syntax: ein einzelner Port, z.B. 5000 oder ein Port-Bereich, z.B. "
-"5000-5015. Es wird empfohlen Ports zu nutzen welche Größer als 1024 sind. "
-"Denn nur der User \"root\" kann auf den Port-Bereich <1024 zugreifen)"
+"schränkt den ausgehenden Datenversand/Chats auf die ausschließliche Nutzung "
+"von Ports in einem vorgegebenen Bereich ein (hilfreich bei NAT) (Syntax: ein "
+"einzelner Port, z.B. 5000 oder ein Port-Bereich, z.B. 5000-5015. Es wird "
+"empfohlen nur Ports zu nutzen die über 1024 liegen. Denn nur der User \"root"
+"\" kann auf den Port-Bereich unter 1024 zugreifen)"

 msgid ""
 "IP or DNS address used for sending files/chats (if empty, local interface IP "
@@ -10166,6 +10169,14 @@ msgstr "Type"
 msgid "Constants"
 msgstr "Konstanten"

+#~ msgid "%s%s: cannot create socket"
+#~ msgstr "%s%s: Socket konnte nicht angelegt werden"
+
+#~ msgid "background color for window separators (when split)"
+#~ msgstr ""
+#~ "Hintergrundfarbe der Fenster-Separatoren im Chatfenster (bei geteiltem "
+#~ "Bildschirm)"
+
 #~ msgid "No configuration option found"
 #~ msgstr "Konfigurationsoption nicht gefunden"

@@ -20,10 +20,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.0-rc1\n"
+"Project-Id-Version: WeeChat 0.4.0-rc3\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-04 17:43+0100\n"
-"PO-Revision-Date: 2013-01-01 12:57+0100\n"
+"POT-Creation-Date: 2013-01-14 12:18+0100\n"
+"PO-Revision-Date: 2013-01-14 12:17+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Spanish\n"
@@ -8257,9 +8257,13 @@ msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
 msgstr ""
 "%s%s: no ha sido posible configurar la opción del socket \"SO_REUSEADDR\""

+#, fuzzy, c-format
+msgid "%s%s: cannot create socket: error %d %s"
+msgstr "%s%s: no ha sido posible crear el socket para la transferencia"
+
 #, c-format
-msgid "%s%s: cannot create socket"
-msgstr "%s%s: no ha sido posible crear el socket"
+msgid "%s%s: try /set relay.network.ipv6 off"
+msgstr ""

 #, fuzzy, c-format
 msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
@@ -9597,3 +9601,6 @@ msgstr "Tipo"

 msgid "Constants"
 msgstr "Constantes"
+
+#~ msgid "%s%s: cannot create socket"
+#~ msgstr "%s%s: no ha sido posible crear el socket"
@@ -19,10 +19,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.0-rc1\n"
+"Project-Id-Version: WeeChat 0.4.0-rc3\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-04 17:43+0100\n"
-"PO-Revision-Date: 2013-01-04 17:43+0100\n"
+"POT-Creation-Date: 2013-01-14 12:18+0100\n"
+"PO-Revision-Date: 2013-01-14 12:17+0100\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -8475,8 +8475,12 @@ msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
 msgstr "%s%s: impossible d'activer l'option socket \"SO_REUSEADDR\""

 #, c-format
-msgid "%s%s: cannot create socket"
-msgstr "%s%s: impossible de créer la socket"
+msgid "%s%s: cannot create socket: error %d %s"
+msgstr "%s%s: impossible de créer la socket: erreur %d %s"
+
+#, c-format
+msgid "%s%s: try /set relay.network.ipv6 off"
+msgstr "%s%s: essayez /set relay.network.ipv6 off"

 #, c-format
 msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
@@ -9901,3 +9905,6 @@ msgstr "Type"

 msgid "Constants"
 msgstr "Constantes"
+
+#~ msgid "%s%s: cannot create socket"
+#~ msgstr "%s%s: impossible de créer la socket"
@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.0-rc1\n"
+"Project-Id-Version: WeeChat 0.4.0-rc3\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-04 17:43+0100\n"
-"PO-Revision-Date: 2013-01-01 12:58+0100\n"
+"POT-Creation-Date: 2013-01-14 12:18+0100\n"
+"PO-Revision-Date: 2013-01-14 12:17+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Hungarian\n"
@@ -7470,9 +7470,13 @@ msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
 msgstr "%s nem sikerült a \"SO_REUSEADDR\" csatornaopciót beállítani\n"

 #, fuzzy, c-format
-msgid "%s%s: cannot create socket"
+msgid "%s%s: cannot create socket: error %d %s"
 msgstr "%s nem sikerült a csatornát létrehozni\n"

+#, c-format
+msgid "%s%s: try /set relay.network.ipv6 off"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
 msgstr "%s nem sikerült a \"SO_KEEPALIVE\" csatornaopciót beállítani\n"
@@ -8793,3 +8797,7 @@ msgstr ""

 msgid "Constants"
 msgstr ""
+
+#, fuzzy
+#~ msgid "%s%s: cannot create socket"
+#~ msgstr "%s nem sikerült a csatornát létrehozni\n"
@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.0-rc1\n"
+"Project-Id-Version: WeeChat 0.4.0-rc3\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-04 17:43+0100\n"
-"PO-Revision-Date: 2013-01-01 12:58+0100\n"
+"POT-Creation-Date: 2013-01-14 12:18+0100\n"
+"PO-Revision-Date: 2013-01-14 12:17+0100\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Italian\n"
@@ -8250,9 +8250,13 @@ msgstr "%s%s: indirizzo IP \"%s\" non consentito per il relay"
 msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
 msgstr "%s%s: impossibile impostare l'opzione del socket \"SO_REUSEADDR\""

+#, fuzzy, c-format
+msgid "%s%s: cannot create socket: error %d %s"
+msgstr "%s%s: impossibile creare il socker per xfer"
+
 #, c-format
-msgid "%s%s: cannot create socket"
-msgstr "%s%s: impossibile creare il socket"
+msgid "%s%s: try /set relay.network.ipv6 off"
+msgstr ""

 #, fuzzy, c-format
 msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
@@ -9585,3 +9589,6 @@ msgstr "Tipo"

 msgid "Constants"
 msgstr "Costanti"
+
+#~ msgid "%s%s: cannot create socket"
+#~ msgstr "%s%s: impossibile creare il socket"
@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.0-rc1\n"
+"Project-Id-Version: WeeChat 0.4.0-rc3\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-04 17:43+0100\n"
-"PO-Revision-Date: 2013-01-02 03:32+0900\n"
+"POT-Creation-Date: 2013-01-14 12:18+0100\n"
+"PO-Revision-Date: 2013-01-14 12:18+0100\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/WeeChat>\n"
 "Language: ja\n"
@@ -8181,9 +8181,13 @@ msgstr "%s%s: IP アドレス \"%s\" はリレーの許可がありません"
 msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
 msgstr "%s%s: ソケットオプション \"SO_REUSEADDR\" の設定に失敗"

+#, fuzzy, c-format
+msgid "%s%s: cannot create socket: error %d %s"
+msgstr "%s%s: xfer 用のソケットの作成に失敗"
+
 #, c-format
-msgid "%s%s: cannot create socket"
-msgstr "%s%s: ソケットの作成に失敗"
+msgid "%s%s: try /set relay.network.ipv6 off"
+msgstr ""

 #, c-format
 msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
@@ -9568,3 +9572,6 @@ msgstr "タイプ"

 msgid "Constants"
 msgstr "定数"
+
+#~ msgid "%s%s: cannot create socket"
+#~ msgstr "%s%s: ソケットの作成に失敗"
@@ -19,10 +19,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.0-rc1\n"
+"Project-Id-Version: WeeChat 0.4.0-rc3\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-04 17:43+0100\n"
-"PO-Revision-Date: 2013-01-01 12:58+0100\n"
+"POT-Creation-Date: 2013-01-14 12:18+0100\n"
+"PO-Revision-Date: 2013-01-14 12:18+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Polish\n"
@@ -8187,9 +8187,13 @@ msgstr "%s%s: adres IP \"%s\" nie posiada zezwolenia na połączenie"
 msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
 msgstr "%s%s: nie można ustawić opcji gniazda \"SO_REUSEADDR\""

+#, fuzzy, c-format
+msgid "%s%s: cannot create socket: error %d %s"
+msgstr "%s%s: nie można utworzyć gniazda dla xfer"
+
 #, c-format
-msgid "%s%s: cannot create socket"
-msgstr "%s%s: nie można utworzyć gniazda"
+msgid "%s%s: try /set relay.network.ipv6 off"
+msgstr ""

 #, fuzzy, c-format
 msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
@@ -9515,3 +9519,6 @@ msgstr "Typ"

 msgid "Constants"
 msgstr "Stałe"
+
+#~ msgid "%s%s: cannot create socket"
+#~ msgstr "%s%s: nie można utworzyć gniazda"
@@ -19,10 +19,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.0-rc1\n"
+"Project-Id-Version: WeeChat 0.4.0-rc3\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-04 17:43+0100\n"
-"PO-Revision-Date: 2013-01-01 12:58+0100\n"
+"POT-Creation-Date: 2013-01-14 12:18+0100\n"
+"PO-Revision-Date: 2013-01-14 12:18+0100\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Portuguese\n"
@@ -7625,9 +7625,13 @@ msgstr "%s%s: endereço IP \"%s\" não permitido para relay"
 msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
 msgstr "%s%s: não foi possível setar opção \"SO_REUSEADDR\" para o socket"

+#, fuzzy, c-format
+msgid "%s%s: cannot create socket: error %d %s"
+msgstr "%s%s: não foi possível criar socket para transferência"
+
 #, c-format
-msgid "%s%s: cannot create socket"
-msgstr "%s%s: não foi possível criar socket"
+msgid "%s%s: try /set relay.network.ipv6 off"
+msgstr ""

 #, fuzzy, c-format
 msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
@@ -8943,3 +8947,6 @@ msgstr ""

 msgid "Constants"
 msgstr ""
+
+#~ msgid "%s%s: cannot create socket"
+#~ msgstr "%s%s: não foi possível criar socket"
@@ -19,10 +19,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.0-rc1\n"
+"Project-Id-Version: WeeChat 0.4.0-rc3\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-04 17:43+0100\n"
-"PO-Revision-Date: 2013-01-01 12:58+0100\n"
+"POT-Creation-Date: 2013-01-14 12:18+0100\n"
+"PO-Revision-Date: 2013-01-14 12:18+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Russian\n"
@@ -7494,9 +7494,13 @@ msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
 msgstr "%s не могу установить настройку сокета \"SO_REUSEADDR\"\n"

 #, fuzzy, c-format
-msgid "%s%s: cannot create socket"
+msgid "%s%s: cannot create socket: error %d %s"
 msgstr "%s невозможно создать сокет\n"

+#, c-format
+msgid "%s%s: try /set relay.network.ipv6 off"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: cannot set socket option \"IPV6_V6ONLY\" to value %d"
 msgstr "%s не могу установить настройку сокета \"SO_KEEPALIVE\"\n"
@@ -8810,3 +8814,7 @@ msgstr ""

 msgid "Constants"
 msgstr ""
+
+#, fuzzy
+#~ msgid "%s%s: cannot create socket"
+#~ msgstr "%s невозможно создать сокет\n"
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-04 17:43+0100\n"
+"POT-Creation-Date: 2013-01-14 12: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"
@@ -6584,7 +6584,11 @@ msgid "%s%s: cannot set socket option \"SO_REUSEADDR\""
 msgstr ""

 #, c-format
-msgid "%s%s: cannot create socket"
+msgid "%s%s: cannot create socket: error %d %s"
+msgstr ""
+
+#, c-format
+msgid "%s%s: try /set relay.network.ipv6 off"
 msgstr ""

 #, c-format
@@ -5376,6 +5376,10 @@ COMMAND_CALLBACK(window)
        return WEECHAT_RC_OK;
    }

+    /* silently ignore argument "*" (can heppen when clicking in a root bar) */
+    if (strcmp (argv_eol[1], "*") == 0)
+        return WEECHAT_RC_OK;
+
    /* refresh screen */
    if (string_strcasecmp (argv[1], "refresh") == 0)
    {
@@ -1,7 +1,7 @@
 /*
 * wee-eval.c - evaluate expressions with references to internal vars
 *
- * Copyright (C) 2013 Sebastien Helleu <flashcode@flashtux.org>
+ * Copyright (C) 2012-2013 Sebastien Helleu <flashcode@flashtux.org>
 *
 * This file is part of WeeChat, the extensible chat client.
 *
@@ -569,6 +569,8 @@ eval_expression_internal (const char *expr, struct t_hashtable *pointers,
            tmp_value = eval_expression_internal (sub_expr, pointers, extra_vars, 0);
            free (sub_expr);
            rc = eval_is_true (tmp_value);
+            if (tmp_value)
+                free (tmp_value);
            /*
             * if rc == 0 with "&&" or rc == 1 with "||", no need to evaluate
             * second sub-expression, just return the rc
@@ -576,8 +578,6 @@ eval_expression_internal (const char *expr, struct t_hashtable *pointers,
            if ((!rc && (logic == EVAL_LOGICAL_OP_AND))
                || (rc && (logic == EVAL_LOGICAL_OP_OR)))
            {
-                if (tmp_value)
-                    free (tmp_value);
                value = strdup ((rc) ? EVAL_STR_TRUE : EVAL_STR_FALSE);
                goto end;
            }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Sebastien Helleu <flashcode@flashtux.org>
+ * Copyright (C) 2012-2013 Sebastien Helleu <flashcode@flashtux.org>
 *
 * This file is part of WeeChat, the extensible chat client.
 *
@@ -2175,6 +2175,7 @@ void
 hook_signal_send (const char *signal, const char *type_data, void *signal_data)
 {
    struct t_hook *ptr_hook, *next_hook;
+    int rc;

    hook_exec_start ();

@@ -2188,9 +2189,12 @@ hook_signal_send (const char *signal, const char *type_data, void *signal_data)
            && (string_match (signal, HOOK_SIGNAL(ptr_hook, signal), 0)))
        {
            ptr_hook->running = 1;
-            (void) (HOOK_SIGNAL(ptr_hook, callback))
+            rc = (HOOK_SIGNAL(ptr_hook, callback))
                (ptr_hook->callback_data, signal, type_data, signal_data);
            ptr_hook->running = 0;
+
+            if (rc == WEECHAT_RC_OK_EAT)
+                break;
        }

        ptr_hook = next_hook;
@@ -2248,6 +2252,7 @@ void
 hook_hsignal_send (const char *signal, struct t_hashtable *hashtable)
 {
    struct t_hook *ptr_hook, *next_hook;
+    int rc;

    hook_exec_start ();

@@ -2261,9 +2266,12 @@ hook_hsignal_send (const char *signal, struct t_hashtable *hashtable)
            && (string_match (signal, HOOK_HSIGNAL(ptr_hook, signal), 0)))
        {
            ptr_hook->running = 1;
-            (void) (HOOK_HSIGNAL(ptr_hook, callback))
+            rc = (HOOK_HSIGNAL(ptr_hook, callback))
                (ptr_hook->callback_data, signal, hashtable);
            ptr_hook->running = 0;
+
+            if (rc == WEECHAT_RC_OK_EAT)
+                break;
        }

        ptr_hook = next_hook;
@@ -1,7 +1,7 @@
 /*
 * wee-url.c - URL transfer
 *
- * Copyright (C) 2013 Sebastien Helleu <flashcode@flashtux.org>
+ * Copyright (C) 2012-2013 Sebastien Helleu <flashcode@flashtux.org>
 *
 * This file is part of WeeChat, the extensible chat client.
 *
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Sebastien Helleu <flashcode@flashtux.org>
+ * Copyright (C) 2012-2013 Sebastien Helleu <flashcode@flashtux.org>
 *
 * This file is part of WeeChat, the extensible chat client.
 *
@@ -1516,7 +1516,8 @@ gui_chat_draw (struct t_gui_buffer *buffer, int clear_chat)
    for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
    {
        if ((ptr_win->buffer->number == buffer->number)
-            && (ptr_win->win_chat_x >= 0) && (ptr_win->win_chat_y >= 0))
+            && (ptr_win->win_chat_x >= 0) && (ptr_win->win_chat_y >= 0)
+            && (GUI_WINDOW_OBJECTS(ptr_win)->win_chat))
        {
            gui_window_coords_alloc (ptr_win);

@@ -1539,18 +1539,23 @@ gui_bar_item_focus_buffer_nicklist (void *data,
    /* make C compiler happy */
    (void) data;

-    str_window = hashtable_get (info, "_window");
    str_bar_item_line = hashtable_get (info, "_bar_item_line");
-
-    if (!str_window || !str_window[0]
-        || !str_bar_item_line || !str_bar_item_line[0])
+    if (!str_bar_item_line || !str_bar_item_line[0])
        return NULL;

-    rc = sscanf (str_window, "%lx", &value);
-    if ((rc == EOF) || (rc == 0))
-        return NULL;
-
-    window = (struct t_gui_window *)value;
+    str_window = hashtable_get (info, "_window");
+    if (str_window && str_window[0])
+    {
+        rc = sscanf (str_window, "%lx", &value);
+        if ((rc == EOF) || (rc == 0))
+            return NULL;
+        window = (struct t_gui_window *)value;
+    }
+    else
+    {
+        /* no window, is it a root bar? then use current window */
+        window = gui_current_window;
+    }
    if (!window)
        return NULL;

@@ -121,8 +121,8 @@ gui_bar_window_search_by_xy (struct t_gui_window *window, int x, int y,
 {
    struct t_gui_bar *ptr_bar;
    struct t_gui_bar_window *ptr_bar_window;
-    int filling, num_cols, column, lines, lines_old, i, j, coord_x, coord_y;
-    int item, subitem;
+    int filling, position, num_cols, column, lines, lines_old, i, j;
+    int coord_x, coord_y, item, subitem;

    *bar_window = NULL;
    *bar_item = NULL;
@@ -162,6 +162,7 @@ gui_bar_window_search_by_xy (struct t_gui_window *window, int x, int y,
    if (*bar_window)
    {
        filling = gui_bar_get_filling ((*bar_window)->bar);
+        position = CONFIG_INTEGER((*bar_window)->bar->options[GUI_BAR_OPTION_POSITION]);

        *bar_item_line = y - (*bar_window)->y + (*bar_window)->scroll_y;
        *bar_item_col = x - (*bar_window)->x + (*bar_window)->scroll_x;
@@ -169,7 +170,20 @@ gui_bar_window_search_by_xy (struct t_gui_window *window, int x, int y,
        if ((filling == GUI_BAR_FILLING_COLUMNS_HORIZONTAL)
            && ((*bar_window)->screen_col_size > 0))
        {
-            num_cols = (*bar_window)->width / (*bar_window)->screen_col_size;
+            if ((position == GUI_BAR_POSITION_LEFT)
+                || (position == GUI_BAR_POSITION_RIGHT))
+            {
+                /*
+                 * when the bar is on left/right, the last space (after last
+                 * column) is not displayed, so we add 1 to width for finding
+                 * number of columns
+                 */
+                num_cols = ((*bar_window)->width + 1) / (*bar_window)->screen_col_size;
+            }
+            else
+            {
+                num_cols = (*bar_window)->width / (*bar_window)->screen_col_size;
+            }
            column = *bar_item_col / (*bar_window)->screen_col_size;
            *bar_item_line = (*bar_item_line * num_cols) + column;
            *bar_item_col = *bar_item_col - (column * ((*bar_window)->screen_col_size));
@@ -179,7 +193,7 @@ gui_bar_window_search_by_xy (struct t_gui_window *window, int x, int y,
            && ((*bar_window)->screen_col_size > 0))
        {
            column = *bar_item_col / (*bar_window)->screen_col_size;
-            *bar_item_line = (column * ((*bar_window)->height)) + *bar_item_line;
+            *bar_item_line = (column * ((*bar_window)->screen_lines)) + *bar_item_line;
            *bar_item_col = *bar_item_col % ((*bar_window)->screen_col_size);
        }

@@ -412,6 +426,7 @@ gui_bar_window_content_alloc (struct t_gui_bar_window *bar_window)
    bar_window->items_num_lines = NULL;
    bar_window->items_refresh_needed = NULL;
    bar_window->screen_col_size = 0;
+    bar_window->screen_lines = 0;
    bar_window->items_subcount = malloc (bar_window->items_count *
                                         sizeof (*bar_window->items_subcount));
    if (!bar_window->items_subcount)
@@ -819,6 +834,7 @@ gui_bar_window_content_get_with_filling (struct t_gui_bar_window *bar_window,
                lines = bar_window->height;
            }
            bar_window->screen_col_size = max_length_screen + 1;
+            bar_window->screen_lines = lines;

            /* build array with pointers to split items */

@@ -1084,6 +1100,7 @@ gui_bar_window_new (struct t_gui_bar *bar, struct t_gui_window *window)
        new_bar_window->items_num_lines = NULL;
        new_bar_window->items_refresh_needed = NULL;
        new_bar_window->screen_col_size = 0;
+        new_bar_window->screen_lines = 0;
        new_bar_window->coords_count = 0;
        new_bar_window->coords = NULL;
        gui_bar_window_objects_init (new_bar_window);
@@ -1424,6 +1441,7 @@ gui_bar_window_hdata_bar_window_cb (void *data, const char *hdata_name)
        HDATA_VAR(struct t_gui_bar_window, items_num_lines, POINTER, 0, NULL, NULL);
        HDATA_VAR(struct t_gui_bar_window, items_refresh_needed, POINTER, 0, NULL, NULL);
        HDATA_VAR(struct t_gui_bar_window, screen_col_size, INTEGER, 0, NULL, NULL);
+        HDATA_VAR(struct t_gui_bar_window, screen_lines, INTEGER, 0, NULL, NULL);
        HDATA_VAR(struct t_gui_bar_window, coords_count, INTEGER, 0, NULL, NULL);
        HDATA_VAR(struct t_gui_bar_window, coords, POINTER, 0, NULL, NULL);
        HDATA_VAR(struct t_gui_bar_window, gui_objects, POINTER, 0, NULL, NULL);
@@ -1496,6 +1514,8 @@ gui_bar_window_add_to_infolist (struct t_infolist *infolist,
    }
    if (!infolist_new_var_integer (ptr_item, "screen_col_size", bar_window->screen_col_size))
        return 0;
+    if (!infolist_new_var_integer (ptr_item, "screen_lines", bar_window->screen_lines))
+        return 0;
    if (!infolist_new_var_pointer (ptr_item, "gui_objects", bar_window->gui_objects))
        return 0;

@@ -1550,8 +1570,9 @@ gui_bar_window_print_log (struct t_gui_bar_window *bar_window)
            log_printf ("    items_content. . . . . . : 0x%lx", bar_window->items_content);
        }
    }
-    log_printf ("    screen_col_size. . . . : %d",    bar_window->screen_col_size);
-    log_printf ("    coords_count . . . . . : %d",    bar_window->coords_count);
+    log_printf ("    screen_col_size. . . . : %d", bar_window->screen_col_size);
+    log_printf ("    screen_lines . . . . . : %d", bar_window->screen_lines);
+    log_printf ("    coords_count . . . . . : %d", bar_window->coords_count);
    for (i = 0; i < bar_window->coords_count; i++)
    {
        log_printf ("    coords[%03d]. . . . . . : item=%d, subitem=%d, "
@@ -49,6 +49,8 @@ struct t_gui_bar_window
    int **items_refresh_needed;     /* refresh needed for (sub)item?        */
    int screen_col_size;            /* size of columns on screen            */
                                    /* (for filling with columns)           */
+    int screen_lines;               /* number of lines on screen            */
+                                    /* (for filling with columns)           */
    int coords_count;               /* number of coords saved               */
    struct t_gui_bar_window_coords **coords; /* coords for filling horiz.   */
                                    /* (size is 5 * coords_count)           */
@@ -143,6 +143,20 @@ gui_chat_utf_char_valid (const char *utf_char)
    return 1;
 }

+/*
+ * Returns number of char needed on screen to display a char.
+ */
+
+int
+gui_chat_char_size_screen (const char *utf_char)
+{
+    /* if char is invalid, it will be displayed as one space on screen */
+    if (!gui_chat_utf_char_valid (utf_char))
+        return 1;
+
+    return utf8_char_size_screen (utf_char);
+}
+
 /*
 * Returns number of char needed on screen to display a word (special chars like
 * colors/attributes are ignored).
@@ -160,7 +174,7 @@ gui_chat_strlen_screen (const char *string)
                                            (unsigned char *)string, 0, 0, 0);
        if (string)
        {
-            size_on_screen = (gui_chat_utf_char_valid (string)) ? utf8_char_size_screen (string) : 1;
+            size_on_screen = gui_chat_char_size_screen (string);
            if (size_on_screen > 0)
                length += size_on_screen;
            string = utf8_next_char (string);
@@ -208,7 +222,7 @@ gui_chat_string_add_offset_screen (const char *string, int offset_screen)
                                            0, 0, 0);
        if (string)
        {
-            size_on_screen = (gui_chat_utf_char_valid (string)) ? utf8_char_size_screen (string) : 1;
+            size_on_screen = gui_chat_char_size_screen (string);
            offset_screen -= size_on_screen;
            string = utf8_next_char (string);
        }
@@ -240,7 +254,7 @@ gui_chat_string_real_pos (const char *string, int pos)
                                                0, 0, 0);
        if (ptr_string)
        {
-            size_on_screen = (((unsigned char)ptr_string[0]) < 32) ? 1 : utf8_char_size_screen (ptr_string);
+            size_on_screen = gui_chat_char_size_screen (ptr_string);
            if (size_on_screen > 0)
                pos -= size_on_screen;
            ptr_string = utf8_next_char (ptr_string);
@@ -293,7 +307,7 @@ gui_chat_get_word_info (struct t_gui_window *window,
                        *word_start_offset = next_char - start_data;
                    leading_spaces = 0;
                    *word_end_offset = next_char2 - start_data - 1;
-                    char_size_screen = utf8_char_size_screen (next_char);
+                    char_size_screen = gui_chat_char_size_screen (next_char);
                    (*word_length_with_spaces) += char_size_screen;
                    (*word_length) += char_size_screen;
                }
@@ -2,7 +2,7 @@
 * weechat-aspell-bar-item.c - bar items for aspell plugin
 *
 * Copyright (C) 2012 Nils Görs <weechatter@arcor.de>
- * Copyright (C) 2013 Sebastien Helleu <flashcode@flashtux.org>
+ * Copyright (C) 2012-2013 Sebastien Helleu <flashcode@flashtux.org>
 *
 * This file is part of WeeChat, the extensible chat client.
 *
@@ -325,7 +325,7 @@ weechat_aspell_spellers_already_ok (const char *dict_list)
            }
            ptr_speller = ptr_speller->next_speller;
        }
-        if (ptr_speller && ptr_speller->next_speller)
+        if (ptr_speller)
            rc = 0;
        weechat_string_free_split (argv);
    }
@@ -204,6 +204,7 @@ weechat_guile_alist_to_hashtable (SCM alist, int size, const char *type_keys,
    struct t_hashtable *hashtable;
    int length, i;
    SCM pair;
+    char *str, *str2;

    hashtable = weechat_hashtable_new (size,
                                       type_keys,
@@ -219,21 +220,25 @@ weechat_guile_alist_to_hashtable (SCM alist, int size, const char *type_keys,
        pair = scm_list_ref (alist, scm_from_int (i));
        if (strcmp (type_values, WEECHAT_HASHTABLE_STRING) == 0)
        {
-            weechat_hashtable_set (hashtable,
-                                   scm_i_string_chars (scm_list_ref (pair,
-                                                                     scm_from_int (0))),
-                                   scm_i_string_chars (scm_list_ref (pair,
-                                                                     scm_from_int (1))));
+            str = scm_to_locale_string (scm_list_ref (pair, scm_from_int (0)));
+            str2 = scm_to_locale_string (scm_list_ref (pair, scm_from_int (1)));
+            weechat_hashtable_set (hashtable, str, str2);
+            if (str)
+                free (str);
+            if (str2)
+                free (str2);
        }
        else if (strcmp (type_values, WEECHAT_HASHTABLE_POINTER) == 0)
        {
-            weechat_hashtable_set (hashtable,
-                                   scm_i_string_chars (scm_list_ref (pair,
-                                                                     scm_from_int (0))),
+            str = scm_to_locale_string (scm_list_ref (pair, scm_from_int (0)));
+            str2 = scm_to_locale_string (scm_list_ref (pair, scm_from_int (1)));
+            weechat_hashtable_set (hashtable, str,
                                   plugin_script_str2ptr (weechat_guile_plugin,
-                                                          NULL, NULL,
-                                                          scm_i_string_chars (scm_list_ref (pair,
-                                                                                            scm_from_int (1)))));
+                                                          NULL, NULL, str2));
+            if (str)
+                free (str);
+            if (str2)
+                free (str2);
        }
    }

@@ -2684,7 +2684,7 @@ irc_command_msg (void *data, struct t_gui_buffer *buffer, int argc,
                }
                string = irc_color_decode (argv_eol[arg_text],
                                           weechat_config_boolean (irc_config_network_colors_receive));
-                irc_input_user_message_display (ptr_channel->buffer,
+                irc_input_user_message_display (ptr_channel->buffer, 0,
                                                (string) ? string : argv_eol[arg_text]);
                if (string)
                    free (string);
@@ -2739,6 +2739,7 @@ irc_command_msg (void *data, struct t_gui_buffer *buffer, int argc,
                        {
                            /* standard message (to "#channel") */
                            irc_input_user_message_display (ptr_channel->buffer,
+                                                            0,
                                                            (string) ? string : argv_eol[arg_text]);
                        }
                        if (string)
@@ -2788,6 +2789,7 @@ irc_command_msg (void *data, struct t_gui_buffer *buffer, int argc,
                        if (ptr_channel)
                        {
                            irc_input_user_message_display (ptr_channel->buffer,
+                                                            0,
                                                            (string) ? string : argv_eol[arg_text]);
                        }
                        else
@@ -3474,7 +3476,7 @@ irc_command_query (void *data, struct t_gui_buffer *buffer, int argc,
        {
            string = irc_color_decode (argv_eol[arg_text],
                                       weechat_config_boolean (irc_config_network_colors_receive));
-            irc_input_user_message_display (ptr_channel->buffer,
+            irc_input_user_message_display (ptr_channel->buffer, 0,
                                            (string) ? string : argv_eol[arg_text]);
            if (string)
                free (string);
@@ -37,15 +37,34 @@

 /*
 * Displays user message.
+ *
+ * If action != 0, then message is displayed as an action (like command /me).
+ * If action == 0, but message is detected as an action (beginning with
+ * "\01ACTION "), then action is forced.
 */

 void
-irc_input_user_message_display (struct t_gui_buffer *buffer, const char *text)
+irc_input_user_message_display (struct t_gui_buffer *buffer, int action,
+                                const char *text)
 {
    struct t_irc_nick *ptr_nick;
-    char *text_decoded, str_tags[256], *str_color;
+    char *pos, *text2, *text_decoded, str_tags[256], *str_color;
+    const char *ptr_text;

-    text_decoded = irc_color_decode (text,
+    /* if message is an action, force "action" to 1 and extract message */
+    if (strncmp (text, "\01ACTION ", 8) == 0)
+    {
+        action = 1;
+        pos = strchr (text + 8, '\01');
+        if (pos)
+            text2 = weechat_strndup (text + 8, pos - text - 8);
+        else
+            text2 = strdup (text + 8);
+    }
+    else
+        text2 = strdup (text);
+
+    text_decoded = irc_color_decode ((text2) ? text2 : text,
                                     weechat_config_boolean (irc_config_network_colors_send));

    IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
@@ -59,24 +78,52 @@ irc_input_user_message_display (struct t_gui_buffer *buffer, const char *text)
                                        ptr_server->nick);
        }

-        str_color = irc_color_for_tags (weechat_config_color (weechat_config_get ("weechat.color.chat_nick_self")));
-        snprintf (str_tags, sizeof (str_tags),
-                  "notify_none,no_highlight,prefix_nick_%s",
-                  (str_color) ? str_color : "default");
-        if (str_color)
-            free (str_color);
-        weechat_printf_tags (buffer,
-                             irc_protocol_tags ("privmsg",
-                                                str_tags,
-                                                (ptr_nick) ? ptr_nick->name : ptr_server->nick),
-                             "%s%s",
-                             irc_nick_as_prefix (ptr_server,
-                                                 (ptr_nick) ? ptr_nick : NULL,
-                                                 (ptr_nick) ? NULL : ptr_server->nick,
-                                                 IRC_COLOR_CHAT_NICK_SELF),
-                             (text_decoded) ? text_decoded : text);
+        if (action)
+        {
+            snprintf (str_tags, sizeof (str_tags),
+                      "irc_action,notify_none,no_highlight");
+        }
+        else
+        {
+            str_color = irc_color_for_tags (weechat_config_color (weechat_config_get ("weechat.color.chat_nick_self")));
+            snprintf (str_tags, sizeof (str_tags),
+                      "notify_none,no_highlight,prefix_nick_%s",
+                      (str_color) ? str_color : "default");
+            if (str_color)
+                free (str_color);
+        }
+        ptr_text = (text_decoded) ? text_decoded : ((text2) ? text2 : text);
+        if (action)
+        {
+            weechat_printf_tags (buffer,
+                                 irc_protocol_tags ("privmsg",
+                                                    str_tags,
+                                                    (ptr_nick) ? ptr_nick->name : ptr_server->nick),
+                                 "%s%s%s%s%s %s",
+                                 weechat_prefix ("action"),
+                                 irc_nick_mode_for_display (ptr_server, ptr_nick, 0),
+                                 IRC_COLOR_CHAT_NICK_SELF,
+                                 ptr_server->nick,
+                                 IRC_COLOR_RESET,
+                                 ptr_text);
+        }
+        else
+        {
+            weechat_printf_tags (buffer,
+                                 irc_protocol_tags ("privmsg",
+                                                    str_tags,
+                                                    (ptr_nick) ? ptr_nick->name : ptr_server->nick),
+                                 "%s%s",
+                                 irc_nick_as_prefix (ptr_server,
+                                                     (ptr_nick) ? ptr_nick : NULL,
+                                                     (ptr_nick) ? NULL : ptr_server->nick,
+                                                     IRC_COLOR_CHAT_NICK_SELF),
+                                 ptr_text);
+        }
    }

+    if (text2)
+        free (text2);
    if (text_decoded)
        free (text_decoded);
 }
@@ -91,7 +138,7 @@ void
 irc_input_send_user_message (struct t_gui_buffer *buffer, int flags,
                             const char *tags, char *message)
 {
-    int number;
+    int number, action;
    char hash_key[32], *str_args;
    struct t_hashtable *hashtable;

@@ -114,6 +161,7 @@ irc_input_send_user_message (struct t_gui_buffer *buffer, int flags,
                                  ptr_channel->name, message);
    if (hashtable)
    {
+        action = (strncmp (message, "\01ACTION ", 8) == 0);
        number = 1;
        while (1)
        {
@@ -121,7 +169,7 @@ irc_input_send_user_message (struct t_gui_buffer *buffer, int flags,
            str_args = weechat_hashtable_get (hashtable, hash_key);
            if (!str_args)
                break;
-            irc_input_user_message_display (buffer, str_args);
+            irc_input_user_message_display (buffer, action, str_args);
            number++;
        }
        weechat_hashtable_free (hashtable);
@@ -23,7 +23,7 @@
 struct t_gui_buffer;

 extern void irc_input_user_message_display (struct t_gui_buffer *buffer,
-                                            const char *text);
+                                            int action, const char *text);
 extern int irc_input_data_cb (void *data, struct t_gui_buffer *buffer,
                              const char *input_data);
 extern int irc_input_send_cb (void *data, const char *signal,
@@ -91,6 +91,9 @@
 #define API_DEF_FUNC(__name)                                           \
    newXS ("weechat::" #__name, XS_weechat_api_##__name, "weechat");

+#ifdef NO_PERL_MULTIPLICITY
+#undef MULTIPLICITY
+#endif

 extern void boot_DynaLoader (pTHX_ CV* cv);

@@ -153,6 +156,9 @@ XS (XS_weechat_api_register)
                                             description, shutdown_func, charset);
    if (perl_current_script)
    {
+#ifndef MULTIPLICITY
+        perl_current_script->interpreter = SvPV_nolen (eval_pv ("__PACKAGE__", TRUE));
+#endif
        perl_registered_script = perl_current_script;
        if ((weechat_perl_plugin->debug >= 2) || !perl_quiet)
        {
@@ -90,7 +90,7 @@ char *perl_weechat_code =
    "    open FILE, $filename or return \"__WEECHAT_PERL_ERROR__\";"
    "    $_ = <FILE>;"
    "    close FILE;"
-    "    return $_;"
+    "    return qq{\n#line 1 \"$filename\"\n$_};"
    "}"
    "sub weechat_perl_load_eval_file"
    "{"
@@ -361,7 +361,7 @@ relay_irc_tag_relay_client_id (const char *tags)
 }

 /*
- * Callback for signal "irc_out".
+ * Callback for signal "irc_outtags".
 *
 * This is called when a message is sent to IRC server (by irc plugin or any
 * other plugin/script).
@@ -398,7 +398,7 @@ relay_irc_signal_irc_outtags_cb (void *data, const char *signal,

    if (weechat_relay_plugin->debug >= 2)
    {
-        weechat_printf (NULL, "%s: irc_out: client: %s%s%s, message: %s",
+        weechat_printf (NULL, "%s: irc_outtags: client: %s%s%s, message: %s",
                        RELAY_PLUGIN_NAME,
                        RELAY_COLOR_CHAT_CLIENT,
                        client->desc,
@@ -495,6 +495,12 @@ relay_irc_signal_irc_disc_cb (void *data, const char *signal,

    client = (struct t_relay_client *)data;

+    if (weechat_relay_plugin->debug >= 2)
+    {
+        weechat_printf (NULL, "%s: irc_disconnected: data: %s",
+                        RELAY_PLUGIN_NAME, (char *)signal_data);
+    }
+
    if (strcmp ((char *)signal_data, client->protocol_args) == 0)
    {
        relay_client_set_status (client, RELAY_STATUS_DISCONNECTED);
@@ -513,21 +519,34 @@ int
 relay_irc_hsignal_irc_redir_cb (void *data, const char *signal,
                                struct t_hashtable *hashtable)
 {
+    struct t_relay_client *client;
    int rc, client_id, num_messages, i;
    char pattern[128], **messages;
    const char *output;
-    struct t_relay_client *ptr_client;

-    /* make C compiler happy */
-    (void) data;
+    client = (struct t_relay_client *)data;
+
+    if (weechat_relay_plugin->debug >= 2)
+    {
+        weechat_printf (NULL, "%s: %s: client: %s%s%s",
+                        RELAY_PLUGIN_NAME,
+                        signal,
+                        RELAY_COLOR_CHAT_CLIENT,
+                        client->desc,
+                        RELAY_COLOR_CHAT);
+    }

    rc = sscanf (signal, "irc_redirection_relay_%d_%s",
                 &client_id, pattern);
    if (rc != 2)
        return WEECHAT_RC_OK;

-    ptr_client = relay_client_search_by_id (client_id);
-    if (!ptr_client)
+    /* check that client id found in signal exists */
+    if (!relay_client_search_by_id (client_id))
+        return WEECHAT_RC_OK;
+
+    /* ignore redirection if it is for another relay client */
+    if (client->id != client_id)
        return WEECHAT_RC_OK;

    output = weechat_hashtable_get (hashtable, "output");
@@ -539,7 +558,7 @@ relay_irc_hsignal_irc_redir_cb (void *data, const char *signal,
    {
        for (i = 0; i < num_messages; i++)
        {
-            relay_irc_sendf (ptr_client, messages[i]);
+            relay_irc_sendf (client, messages[i]);
        }
        weechat_string_free_split (messages);
    }
@@ -1170,7 +1189,7 @@ relay_irc_hook_signals (struct t_relay_client *client)
    RELAY_IRC_DATA(client, hook_hsignal_irc_redir) =
        weechat_hook_hsignal ("irc_redirection_relay_*",
                              &relay_irc_hsignal_irc_redir_cb,
-                              NULL);
+                              client);
 }

 /*
@@ -1664,7 +1683,7 @@ relay_irc_recv_one_msg (struct t_relay_client *client, char *data)
                    weechat_hashtable_set (hash_redirect, "pattern", "userhost");
                }
                /*
-                 * if redirection has been enabled, send the hsignel for
+                 * if redirection has been enabled, send the hsignal for
                 * redirection of IRC message
                 */
                if (redirect_msg)
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <time.h>
 #include <fcntl.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -378,8 +379,15 @@ relay_server_create_socket (struct t_relay_server *server)
    if (server->sock < 0)
    {
        weechat_printf (NULL,
-                        _("%s%s: cannot create socket"),
-                        weechat_prefix ("error"), RELAY_PLUGIN_NAME);
+                        _("%s%s: cannot create socket: error %d %s"),
+                        weechat_prefix ("error"), RELAY_PLUGIN_NAME,
+                        errno, strerror (errno));
+        if (errno == EAFNOSUPPORT)
+        {
+            weechat_printf (NULL,
+                            _("%s%s: try /set relay.network.ipv6 off"),
+                            weechat_prefix ("error"), RELAY_PLUGIN_NAME);
+        }
        return 0;
    }
Author	SHA1	Message	Date
Sebastien Helleu	08d27eb81c	Version 0.4.0-rc3	2013-01-14 12:21:19 +01:00
Sebastien Helleu	e0deceb366	core: fix click in item "buffer_nicklist" when nicklist is a root bar (bug #38080 ) Argument "*" is now silently ignored in command /window. When item "buffer_nicklist" is in a root bar, we use current window/buffer to find which nick has been clicked (same behaviour as callback used to display bar item "buffer_nicklist").	2013-01-14 12:16:25 +01:00
Sebastien Helleu	f14f34e9af	core: fix display bugs with non-printable chars like tabs (part of messages not displayed) (bug #38076 ) This bug was introduced by commit `70ce7fe3b6`.	2013-01-14 11:35:52 +01:00
Sebastien Helleu	d39bb4d6ab	core: update version in gettext files	2013-01-12 20:24:09 +01:00
Nils Görs	f1540115d0	core: update german translations	2013-01-12 20:21:56 +01:00
Krzysztof Koroscik	1af6148067	doc: update polish FAQ, quickstart and scripting guide	2013-01-12 19:56:19 +01:00
Sebastien Helleu	6fdee3aa9f	core: fix crash in display of chat area when the ncurses chat window is not initialized This can happen when a window becomes too small for display: then we set the ncurses chat window to NULL. So when displaying buffer, we'll skip it if the ncurses chat window is NULL. Steps to reproduce crash: 1. /window splith 2. /window resize -1 (many times, until chat area is less than one line) 3. /window balance	2013-01-12 19:40:04 +01:00
Sebastien Helleu	4123263b8c	guile: fix bad conversion of shared strings (replace calls to scm_i_string_chars by scm_to_locale_string) (bug #38067 )	2013-01-12 19:27:00 +01:00
Sebastien Helleu	1b56e084dc	core: fix typo in comment	2013-01-12 09:35:21 +01:00
Sebastien Helleu	1e20dd16e5	core: fix line returned when clicking on a bar (according to position and filling) (bug #38069 )	2013-01-12 09:31:57 +01:00
Sebastien Helleu	a6bc15e69d	aspell: fix spellers used when switching buffer The bug happened when two buffers have different number of dictionaries and start with same dictionaries. For example buffer #1 with [en,fr] and buffer #2 with [en]. When switching from buffer #1 to buffer #2, aspell does not use only [en], but [en,fr].	2013-01-11 17:25:53 +01:00
Sebastien Helleu	db62b272b5	Revert "aspell: store dictionaries in buffer local variable "aspell_dict"" This reverts commit `8b61a55764`. The local variable in buffers introduced new display bugs and would need some extra code and optimizations to fix. This will be reintroduced after the release of version 0.4.0.	2013-01-11 16:07:45 +01:00
Sebastien Helleu	57024ab1e4	relay: fix duplicated messages sent to irc clients (when messages are redirected) (bug #37870 )	2013-01-11 10:30:44 +01:00
Sebastien Helleu	ca205ccb8c	relay: fix typo in comment	2013-01-11 10:28:28 +01:00
Sebastien Helleu	f1580f5276	relay: add debug message for signal "irc_disconnected"	2013-01-11 10:27:26 +01:00
Sebastien Helleu	3c782bd905	relay: fix name of signal in debug message (replace "irc_out" by "irc_outtags")	2013-01-11 09:28:58 +01:00
Sebastien Helleu	8b61a55764	aspell: store dictionaries in buffer local variable "aspell_dict"	2013-01-10 23:30:14 +01:00
Sebastien Helleu	53c6b62ae3	core: fix some copyright dates	2013-01-10 23:14:33 +01:00
Sebastien Helleu	d5a5af88ca	core: replace "behaviour" by "behavior"	2013-01-10 19:20:07 +01:00
Sebastien Helleu	87df83a1fb	doc: fix buffer argument for function "command": NULL value means current buffer, not core buffer (bug #38057 )	2013-01-10 19:13:19 +01:00
Sebastien Helleu	aaa0cf1954	core: add bug #31572 (fixed) in ChangeLog	2013-01-10 15:12:02 +01:00
Sebastien Helleu	6d636b6118	Revert "perl: simplify code to load scripts" This reverts commit `793a3cb1ba`. This commit was causing crash on Linux when loading scripts like buffers.pl.	2013-01-10 09:32:19 +01:00
Nei	793a3cb1ba	perl: simplify code to load scripts	2013-01-09 18:15:51 +01:00
Nei	224a0f0afa	perl: display script filename in error messages	2013-01-08 22:09:03 +01:00
Nei	2ca30ed7a9	perl: fix calls to callbacks during load of script when multiplicity is disabled (bug #38044 )	2013-01-08 22:02:30 +01:00
Sebastien Helleu	7d1ad59dde	relay: add message when address family is not supported by protocol (on socket creation)	2013-01-08 08:14:07 +01:00
Sebastien Helleu	1a646d5dbf	relay: add error number and string when socket creation fails	2013-01-07 21:34:05 +01:00
Sebastien Helleu	c34ae99b9a	doc: fix typos	2013-01-07 10:31:32 +01:00
Sebastien Helleu	125068f101	doc: replace iteritems() by items() in scripting guide (compatibility with Python 3.x)	2013-01-07 10:00:02 +01:00
Sebastien Helleu	ae618bcf6a	doc: remove comment for autogen.sh in tester's guide (command required even for tarball)	2013-01-07 09:50:29 +01:00
Sebastien Helleu	cd37f12059	core: fix memory leak in evaluation of expression when a logical operator ("&&" or "\|\|") is found	2013-01-07 08:24:40 +01:00
Sebastien Helleu	bd21daebd1	api: allow return code WEECHAT_RC_OK_EAT in callbacks of hook_signal and hook_hsignal (stop sending the signal immediately)	2013-01-06 19:38:38 +01:00
Sebastien Helleu	faccb87a10	irc: fix display of actions (/me) when they are received from a relay client (in channel and private buffers) (bug #38027 )	2013-01-06 12:25:34 +01:00
Sebastien Helleu	323801f869	core: add cmake option ENABLE_PYTHON3 and configure option --enable-python3 With this option, the python plugin will be built and linked with Python 3 (if found, or Python 2 as fallback). This option it not (yet) recommended, because many scripts are working only with Python 2.x. It should be used only to tests scripts with Python 3.x in WeeChat.	2013-01-05 20:46:22 +01:00