Version 0.3.5-rc2

CMakeLists.txt

@@ -33,7 +33,7 @@ ENDIF(PREFIX)
 
 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "3")
-SET(VERSION_PATCH "5-rc1")
+SET(VERSION_PATCH "5-rc2")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(LICENSE "GPL3")
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")

ChangeLog

@@ -1,12 +1,21 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.5-rc1, 2011-04-21
+v0.3.5-rc2, 2011-05-01
 
 
 Version 0.3.5 (under dev!)
 --------------------------
 
+* core: fix scroll in windows with /window scroll (skip lines "Day changed to")
+* core: recalculate buffer_max_length when buffer short name is changed
+  (patch #7441)
+* core: add buffer to hotlist if away is set on buffer (even if buffer is
+  displayed), new option weechat.look.hotlist_add_buffer_if_away (task #10948)
+* core: do not update hotlist during upgrade
+* core: add option "balance" for command /window (key: alt+"w" + alt+"b")
+* core: add option "swap" for command /window (key: alt+"w" + alt+"s")
+  (task #11001)
 * core: apply new value of option weechat.look.buffer_notify_default to all
   opened buffers
 * core: prohibit names beginning with "#" for bars, proxies, filters and IRC
@@ -48,11 +57,16 @@ Version 0.3.5 (under dev!)
   being added with command "/color"), auto reset of color pairs with option
   weechat.look.color_pairs_auto_reset
 * core: allow background for nick colors (using ":")
+* api: add new function config_set_desc_plugin (task #10925)
 * api: add new functions buffer_match_list and window_search_with_buffer
 * plugins: fix memory leaks when setting buffer callbacks after /upgrade
   (plugins: irc, relay, xfer, scripts)
 * aspell: add section "option" in aspell.conf for speller options (task #11083)
 * aspell: fix spellers used after switch of window (bug #32811)
+* irc: fix tags for messages sent with /msg command (bug #33169)
+* irc: add new options irc.color.topic_old and irc.color.topic_new
+* irc: add option "ssl_priorities" in servers (task #10106, debian #624055)
+* irc: add modifier "irc_in2_xxx" (called after charset decoding)
 * irc: fix memory leak when copying or renaming server
 * irc: do not rejoin channels where /part has been issued before reconnection
   to server (bug #33029)
@@ -75,6 +89,8 @@ Version 0.3.5 (under dev!)
 * irc: add many missing commands for target buffer (options irc.msgbuffer.xxx)
   (bug #32216)
 * lua: fix crash when many scripts are executing callbacks at same time
+* perl: fix memory leak when calling perl functions (bug #32895)
+* relay: fix crash on /upgrade when nick in irc client is not yet set
 * relay: allow colon in server password received from client
 * relay: do not send join for private buffers to client
 * rmodifier: fix reload of file rmodifier.conf

NEWS

@@ -1,7 +1,7 @@
 WeeChat News
 ============
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.5-rc1, 2011-04-21
+v0.3.5-rc2, 2011-05-01
 
 
 Version 0.3.5 (under dev!)

configure.in

@@ -24,10 +24,10 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.3.5-rc1, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.3.5-rc2, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([src/core/weechat.c])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.3.5-rc1])
+AM_INIT_AUTOMAKE([weechat], [0.3.5-rc2])
 LICENSE="GPL3"
 
 # Checks for programs

doc/de/autogen/plugin_api/infolists.txt

@@ -44,7 +44,7 @@
 
 | weechat | history | Verlaufspeicher der Befehle | Buffer Pointer (falls nicht gesetzt, wird der globale Verlauf zurückgegeben) (optional) | -
 
-| weechat | hook | Auflistung der Hooks | - | type,arguments (type is command/timer/.., arguments to get only some hooks (can start or end with "*" as wildcard), both are optional)
+| weechat | hook | Auflistung der Hooks | - | type,arguments (type ist ein command/timer/.., arguments dient dazu nur einige hooks abzufragen (darf mit einem "*" als Platzhalter beginnen oder enden), beide Optionen sind optional)
 
 | weechat | hotlist | Liste der Buffer in Hotlist | - | -
 

doc/de/autogen/user/irc_options.txt

@@ -58,6 +58,16 @@
 ** 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 werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `default`)
 
+* *irc.color.topic_new*
+** Beschreibung: `color for new channel topic (when topic is changed)`
+** 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 werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `white`)
+
+* *irc.color.topic_old*
+** Beschreibung: `color for old channel topic (when topic is changed)`
+** 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 werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `darkgray`)
+
 * *irc.look.buffer_switch_autojoin*
 ** Beschreibung: `wechselt automatisch zum Channel-Buffer falls dieser automatisch betreten wurde (mittels der Server-Option "autojoin")`
 ** Typ: boolesch
@@ -483,6 +493,11 @@
 ** Typ: integer
 ** Werte: 0 .. 2147483647 (Standardwert: `2048`)
 
+* *irc.server_default.ssl_priorities*
+** Beschreibung: `string with priorities for gnutls (for syntax, see documentation of function gnutls_priority_init in gnutls manual, common strings are: "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"NORMAL"`)
+
 * *irc.server_default.ssl_verify*
 ** Beschreibung: `Überprüfe ob die SSL-Verbindung vertrauenswürdig ist`
 ** Typ: boolesch

doc/de/autogen/user/weechat_commands.txt

@@ -117,18 +117,18 @@ Beispiele:
         unalias <color>
         reset
 
-  alias: add an alias for a color
-unalias: delete an alias
-  color: color number (>= 0, max depends on terminal, commonly 63 or 255)
-   name: alias name for color (for example: "orange")
-  reset: reset all color pairs (required when no more color pairs are available if automatic reset is disabled, see option weechat.look.color_pairs_auto_reset)
+  alias: weißt einer Farbzahl einen Namen zu
+unalias: entfernt einen Namen
+  color: Farbnummer (>= 0, maximale Anzahl ist abhängig vom Terminal, üblicherweise 63 oder 255 Farben)
+   name: Aliasname für eine Farbe (zum Beispiel: "orange")
+  reset: setzt alle Farbpaarungen zurück (nützlich falls keine Farbpaarung mehr verfügbar sein sollte und die automatische Reset-Option deaktiviert ist, siehe Option: weechat.look.color_pairs_auto_reset)
 
-Without argument, this command displays colors in a new buffer.
+Ohne Angabe von Argumenten wird in einem separaten Buffer die darstellbare Farbpalette angezeigt.
 
-Examples:
-  add alias "orange" for color 214:
+Beispiele:
+  der Farbe 214 wird das Alias "orange" zugeordnet:
     /color alias 214 orange
-  delete color 214:
+  löscht die Farbe 214:
     /color unalias 214
 ........................................
 
@@ -520,10 +520,12 @@ Beispiele:
          -1|+1|b#|up|down|left|right
          splith|splitv [<pct>]
          resize [+/-]<pct>
+         balance
          merge [all]
          page_up|page_down
          refresh
          scroll|scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight
+         swap [up|down|left|right]
          zoom
 
          list: listet die geöffneten Fenster (ohne Angabe von Parametern wird diese Funktion aufgerufen)
@@ -537,6 +539,7 @@ Beispiele:
        splith: teilt das aktuelle Fenster horizontal
        splitv: teilt das aktuelle Fenster vertikal
        resize: verändert die Größe des aktuellen Fensters. Die neue Größe des Fensters ist prozentual <pct> zum Stammfensters groß
+      balance: Größe aller Fenster auf 50% ändern
         merge: vereinigt Fenster miteinander (all = alle Fenster vereinigen)
       page_up: Scrollt eine Seite nach oben
     page_down: Scrollt eine Seite nach unten
@@ -548,6 +551,7 @@ Beispiele:
 scroll_bottom: Scrollt zum Ende des  Buffers
 scroll_previous_highlight: Scrollt zum vorherigen Hightlight
 scroll_next_highlight: Scrollt zum nächsten Highlight
+         swap: tauscht die Buffer von zwei Fenstern (mit optionaler Angabe für das Zielfenster)
          zoom: vergrößert auf Fenster
 
 Bei splith und splitv gibt "pct" die neue Größe des Fensters im Verhältnis zur aktuellen Größe an. Zum Beispiel würde der Wert 25 bedeuten, dass das neue Fenster nur noch ein Viertel der Größe des alten Fensters hat.

doc/de/autogen/user/weechat_options.txt

@@ -329,7 +329,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `"%H:%M:%S"`)
 
 * *weechat.look.color_pairs_auto_reset*
-** Beschreibung: `automatically reset table of color pairs when number of available pairs is lower or equal to this number (-1 = disable automatic reset, and then a manual "/color reset" is needed when table is full)`
+** Beschreibung: `automatischer Reset der Farbpaarungen sobald die verfügbare Anzahl an Paaren kleiner oder gleich der hier angegebenen Anzahl ist (-1 = deaktiviert den automatischen Reset, dann ist ein manueller Reset mittels "/color reset" notwendig falls alle Farbpaarungen belegt sind)`
 ** Typ: integer
 ** Werte: -1 .. 256 (Standardwert: `5`)
 
@@ -378,6 +378,11 @@
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"-"`)
 
+* *weechat.look.hotlist_add_buffer_if_away*
+** Beschreibung: `fügt einen beliebigen Buffer zur Hotlist hinzu (dies schließt den aktuellen oder jeden anderen sichtbaren Buffer ein) sofern die lokale Variable "away" für den Buffer gesetzt wurde`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
 * *weechat.look.hotlist_buffer_separator*
 ** Beschreibung: `Zeichen welches zum Trennen zwischen den verschiedenen Buffern in der Hotlist genutzt werden soll.`
 ** Typ: Zeichenkette

doc/de/weechat_faq.de.txt

@@ -698,7 +698,7 @@ Ich möchte den Entwicklern von WeeChat helfen. Was kann ich tun?
 Es gibt einiges zu tun z.B. testen, programmieren, Dokumentation, ...
 
 Bitte kontaktiere uns via IRC oder email, schaue auf die Support-Seite:
-http://www.weechat.org/about
+http://www.weechat.org/support
 
 
 [[donate]]

doc/de/weechat_user.de.txt

@@ -501,6 +501,8 @@ Tastenbefehle für Buffer / Fenster
 | @k(A-)@k(w) , @k(A-)@k(↓) | wechselt zum unteren Fenster | /window down
 | @k(A-)@k(w) , @k(A-)@k(←) | wechselt zum linken Fenster | /window left
 | @k(A-)@k(w) , @k(A-)@k(→) | wechselt zum rechten Fenster | /window right
+| @k(A-)@k(w) , @k(A-)@k(b) | Größenanpassung aller Fenster auf 50% | /window balance
+| @k(A-)@k(w) , @k(A-)@k(s) | Wechselt Buffer von zwei Fenstern | /window swap
 | @k(A-)@k(z)               | Zoom für aktuelles Fenster (nochmals @k(A-)@k(z): stellt die vorherigen Einstellungen wieder her) | /window zoom
 | @k(A-)@k(<)               | springt zum letzten besuchten Buffer | /input jump_previously_visited_buffer
 | @k(A-)@k(>)               | springt zum nächsten besuchten Buffer | /input jump_next_visited_buffer

doc/en/autogen/user/irc_options.txt

@@ -58,6 +58,16 @@
 ** type: color
 ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `default`)
 
+* *irc.color.topic_new*
+** description: `color for new channel topic (when topic is changed)`
+** type: color
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `white`)
+
+* *irc.color.topic_old*
+** description: `color for old channel topic (when topic is changed)`
+** type: color
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `darkgray`)
+
 * *irc.look.buffer_switch_autojoin*
 ** description: `auto switch to channel buffer when it is auto joined (with server option "autojoin")`
 ** type: boolean
@@ -483,6 +493,11 @@
 ** type: integer
 ** values: 0 .. 2147483647 (default value: `2048`)
 
+* *irc.server_default.ssl_priorities*
+** description: `string with priorities for gnutls (for syntax, see documentation of function gnutls_priority_init in gnutls manual, common strings are: "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")`
+** type: string
+** values: any string (default value: `"NORMAL"`)
+
 * *irc.server_default.ssl_verify*
 ** description: `check that the ssl connection is fully trusted`
 ** type: boolean

doc/en/autogen/user/weechat_commands.txt

@@ -520,10 +520,12 @@ Examples:
          -1|+1|b#|up|down|left|right
          splith|splitv [<pct>]
          resize [+/-]<pct>
+         balance
          merge [all]
          page_up|page_down
          refresh
          scroll|scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight
+         swap [up|down|left|right]
          zoom
 
          list: list opened windows (without argument, this list is displayed)
@@ -537,6 +539,7 @@ Examples:
        splith: split current window horizontally
        splitv: split current window vertically
        resize: resize window size, new size is <pct> percentage of parent window
+      balance: resize all windows to 50%
         merge: merge window with another (all = keep only one window)
       page_up: scroll one page up
     page_down: scroll one page down
@@ -548,6 +551,7 @@ Examples:
 scroll_bottom: scroll to bottom of buffer
 scroll_previous_highlight: scroll to previous highlight
 scroll_next_highlight: scroll to next highlight
+         swap: swap buffers of two windows (with optional direction for target window)
          zoom: zoom on window
 
 For splith and splitv, pct is a percentage which represents size of new window, computed with current window as size reference. For example 25 means create a new window with size = current_size / 4

doc/en/autogen/user/weechat_options.txt

@@ -378,6 +378,11 @@
 ** type: string
 ** values: any string (default value: `"-"`)
 
+* *weechat.look.hotlist_add_buffer_if_away*
+** description: `add any buffer to hotlist (including current or visible buffers) if local variable "away" is set on buffer`
+** type: boolean
+** values: on, off (default value: `on`)
+
 * *weechat.look.hotlist_buffer_separator*
 ** description: `string displayed between buffers in hotlist`
 ** type: string

doc/en/weechat_faq.en.txt

@@ -659,7 +659,7 @@ I want to help WeeChat developers. What can I do?
 There's many tasks to do (testing, code, documentation, ...)
 
 Please contact us via IRC or mail, look at support page:
-http://www.weechat.org/about
+http://www.weechat.org/support
 
 
 [[donate]]

doc/en/weechat_plugin_api.en.txt

@@ -2975,10 +2975,20 @@ Arguments:
 ** 'WEECHAT_HASHTABLE_TIME'
 * 'callback_hash_key': callback used to "hash" a key (key as integer value), can
   be NULL if key type is "string" (a default function is used for strings, and
-  only for strings)
+  only for strings), arguments and return value:
+** 'struct t_hashtable *hashtable': hashtable pointer
+** 'const void *key': key
+** return value: hash of the key
 * 'callback_keycmp': callback used to compare two keys, can be NULL if value
   type is "string" (a default comparison function is used for strings, and only
-  for strings)
+  for strings), arguments and return value:
+** 'struct t_hashtable *hashtable': hashtable pointer
+** 'const void *key1': first key
+** 'const void *key2': second key
+** return value:
+*** negative number if 'key1' is less than 'key2'
+*** 0 if 'key1' equals 'key2'
+*** positive number if 'key1' is greater than 'key2'
 
 Return value:
 
@@ -3471,9 +3481,13 @@ Arguments:
 
 * 'name': name of configuration file (without path or extension)
 * 'callback_reload': function called when configuration file is reloaded with
-  `/reload` (optional, can be NULL), arguments:
+  `/reload` (optional, can be NULL), arguments and return value:
 ** 'void *data': pointer
 ** 'struct t_config_file *config_file': configuration file pointer
+** return value:
+*** 'WEECHAT_CONFIG_READ_OK'
+*** 'WEECHAT_CONFIG_READ_MEMORY_ERROR'
+*** 'WEECHAT_CONFIG_READ_FILE_NOT_FOUND'
 * 'callback_reload_data': pointer given to reload callback when it is called
   by WeeChat
 
@@ -3571,45 +3585,67 @@ Arguments:
   it is forbidden
 * 'callback_read': function called when an option in section is read from disk
   (should be NULL in most cases, except if options in section need custom
-  function), arguments:
+  function), arguments and return value:
 ** 'void *data': pointer
 ** 'struct t_config_file *config_file': configuration file pointer
 ** 'struct t_config_section *section': section pointer
 ** 'const char *option_name': name of option
 ** 'const char *value': value
+** return value:
+*** 'WEECHAT_CONFIG_READ_OK'
+*** 'WEECHAT_CONFIG_READ_MEMORY_ERROR'
+*** 'WEECHAT_CONFIG_READ_FILE_NOT_FOUND'
 * 'callback_read_data': pointer given to callback when it is called by WeeChat
 * 'callback_write': function called when section is written in file (should be
   NULL for most cases, except if section needs to be written by a custom
-  function), arguments:
+  function), arguments and return value:
 ** 'void *data': pointer
 ** 'struct t_config_file *config_file': configuration file pointer
 ** 'struct t_config_section *section': section pointer
 ** 'const char *option_name': name of option
+** return value:
+*** 'WEECHAT_CONFIG_WRITE_OK'
+*** 'WEECHAT_CONFIG_WRITE_ERROR'
+*** 'WEECHAT_CONFIG_WRITE_MEMORY_ERROR'
 * callback_write_data: pointer given to callback when it is called by WeeChat
 * callback_write_default: function called when default values for section must
   be written in file, arguments:
 ** 'void *data': pointer
 ** 'struct t_config_file *config_file': configuration file pointer
 ** 'const char *section_name': name of section
+** return value:
+*** 'WEECHAT_CONFIG_WRITE_OK'
+*** 'WEECHAT_CONFIG_WRITE_ERROR'
+*** 'WEECHAT_CONFIG_WRITE_MEMORY_ERROR'
 * 'callback_write_default_data': pointer given to callback when it is called by
   WeeChat
 * 'callback_create_option': function called when a new option is created in
   section (NULL if section does not allow new options to be created),
-  arguments:
+  arguments and return value:
 ** 'void *data': pointer
 ** 'struct t_config_file *config_file': configuration file pointer
 ** 'struct t_config_section *section': section pointer
 ** 'const char *option_name': name of option
 ** 'const char *value': value
+** return value:
+*** 'WEECHAT_CONFIG_OPTION_SET_OK_CHANGED'
+*** 'WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE'
+*** 'WEECHAT_CONFIG_OPTION_SET_ERROR'
+*** 'WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND'
 * 'callback_create_option_data': pointer given to callback when it is called by
   WeeChat
 * 'callback_delete_option': function called when an option is deleted in
   section (NULL if section does not allow options to be deleted),
-  arguments:
+  arguments and return value:
 ** 'void *data': pointer
 ** 'struct t_config_file *config_file': configuration file pointer
 ** 'struct t_config_section *section': section pointer
 ** 'struct t_config_option *option': option pointer
+** return value:
+*** 'WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET'
+*** 'WEECHAT_CONFIG_OPTION_UNSET_OK_RESET'
+*** 'WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED'
+*** 'WEECHAT_CONFIG_OPTION_UNSET_ERROR'
 * 'callback_delete_option_data': pointer given to callback when it is called by
   WeeChat
 
@@ -3807,11 +3843,11 @@ struct t_config_option *weechat_config_new_option (
                                 struct t_config_option *option,
                                 const char *value),
     void *callback_check_value_data,
-    int (*callback_change)(void *data,
-                           struct t_config_option *option),
+    void (*callback_change)(void *data,
+                            struct t_config_option *option),
     void *callback_change_data,
-    int (*callback_delete)(void *data,
-                           struct t_config_option *option),
+    void (*callback_delete)(void *data,
+                            struct t_config_option *option),
     void *callback_delete_data);
 ----------------------------------------
 
@@ -3835,10 +3871,13 @@ Arguments:
 * 'null_value_allowed': 1 if 'null' (undefined value) is allowed for option,
   otherwise 0
 * 'callback_check_value': function called to check new value for option
-  (optional), arguments:
+  (optional), arguments and return value:
 ** 'void *data': pointer
 ** 'struct t_config_option *option': option pointer
 ** 'const char *value': new value for option
+** return value:
+*** 1 if value is ok
+*** 0 if value is invalid
 * 'callback_check_value_data': pointer given to check_value callback when it
   is called by WeeChat
 * 'callback_change': function called when value of option has changed
@@ -5517,7 +5556,7 @@ Script (Python):
 rc = weechat.config_set_plugin(option_name, value)
 
 # example
-rc = weechat.config_is_set_plugin("option", "test_value")
+rc = weechat.config_set_plugin("option", "test_value")
 if rc == weechat.WEECHAT_CONFIG_OPTION_SET_OK_CHANGED:
     # ...
 elif rc == weechat.WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE:
@@ -5528,6 +5567,51 @@ elif rc == weechat.WEECHAT_CONFIG_OPTION_SET_ERROR:
     # ...
 ----------------------------------------
 
+weechat_config_set_desc_plugin
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+_New in version 0.3.5._
+
+Set description for option in plugins configuration file (plugins.conf).
+
+Prototype:
+
+[source,C]
+----------------------------------------
+void weechat_config_set_desc_plugin (const char *option_name,
+                                     const char *description);
+----------------------------------------
+
+Arguments:
+
+* 'option_name': option name, WeeChat will add prefix "plugins.desc.xxx."
+  (where "xxx" is current plugin name)
+* 'description': description for option
+
+[NOTE]
+It is not a problem if option (plugins.var.xxx.option_name) does not exist.
+A future creation of option with this name will use this description.
+
+C example:
+
+[source,C]
+----------------------------------------
+weechat_config_set_desc_plugin ("option", "description of option");
+----------------------------------------
+
+Script (Python):
+
+[source,python]
+----------------------------------------
+# prototype
+weechat.config_set_desc_plugin(option_name, description)
+
+# example
+version = weechat.info_get("version_number", "") or 0
+if int(version) >= 0x00030500:
+    weechat.config_set_desc_plugin("option", "description of option")
+----------------------------------------
+
 weechat_config_unset_plugin
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -5993,13 +6077,16 @@ Arguments:
   argument, separated by space. Many completions are possible for one
   argument, separated by "|". Many templates are possible for same command,
   separated by "||".
-* 'callback': function called when command is used, arguments:
+* 'callback': function called when command is used, arguments and return value:
 ** 'void *data': pointer
 ** 'struct t_gui_buffer *buffer': buffer where command is executed
 ** 'int argc': number of arguments given for command
 ** 'char **argv': arguments given for command
 ** 'char **argv_eol': arguments given for command (until end of line for each
    argument)
+** return value:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 Default completion codes are:
@@ -6109,10 +6196,14 @@ Arguments:
 
 * 'command': command to hook, can start or end with "*" as wildcard
   (priority allowed, see note about <<hook_priority,priority>>)
-* 'callback': function called when command is run, arguments:
+* 'callback': function called when command is run, arguments and return value:
 ** 'void *data': pointer
 ** 'struct t_gui_buffer *buffer': buffer where command is executed
 ** 'const char *command': the command executed, with its arguments
+** return value:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_OK_EAT'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 [NOTE]
@@ -6180,9 +6271,12 @@ Arguments:
   if interval = 60000 (60 seconds), and align_second = 60, then timer is
   called each minute when second is 00
 * 'max_calls': number of calls to timer (if 0, then timer has no end)
-* 'callback': function called when time is reached, arguments:
+* 'callback': function called when time is reached, arguments and return value:
 ** 'void *data': pointer
 ** 'int remaining_calls': remaining calls (-1 if timer has no end)
+** return value:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 Return value:
@@ -6246,9 +6340,12 @@ Arguments:
 * 'flag_write': 1 = catch write event, 0 = ignore
 * 'flag_exception': 1 = catch exception event, 0 = ignore
 * 'callback': function called a selected event occurs for file (or socket),
-  arguments:
+  arguments and return value:
 ** 'void *data': pointer
 ** 'int fd': file descriptor
+** return value:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 Return value:
@@ -6314,7 +6411,7 @@ Arguments:
 * 'timeout': timeout for command (in milliseconds): after this timeout, child
   process is killed (0 means no timeout)
 * 'callback': function called when data from child is available, or when child
-  has ended, arguments:
+  has ended, arguments and return value:
 ** 'void *data': pointer
 ** 'const char *command': command executed by child
 ** 'int return_code': return code:
@@ -6323,6 +6420,9 @@ Arguments:
     running) or 'WEECHAT_HOOK_PROCESS_ERROR' (error when launching command)
 ** 'out': standard output of command (stdout)
 ** 'err': error output of command (stderr)
+** return value:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 Return value:
@@ -6441,7 +6541,8 @@ Arguments:
 * 'gnutls_dhkey_size': size of the key used during the Diffie-Hellman Key
   Exchange (GnuTLS)
 * 'local_hostname': local hostname to use for connection (optional)
-* 'callback': function called when connection is ok or failed, arguments:
+* 'callback': function called when connection is ok or failed, arguments and
+  return value:
 ** 'void *data': pointer
 ** 'int status': connection status:
 *** 'WEECHAT_HOOK_CONNECT_OK': connection ok
@@ -6456,6 +6557,9 @@ Arguments:
 ** 'gnutls_rc': result value of 'gnutls_handshake()'
 ** 'const char *error': result value of 'gnutls_strerror(gnutls_rc)'
 ** 'const char *ip_address': IP address found
+** return value:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 Return value:
@@ -6578,7 +6682,8 @@ Arguments:
 * 'message': only messages with this string will be caught (optional)
 * 'strip_colors': if 1, colors will be stripped from message displayed, before
   calling callback
-* 'callback': function called when a message is printed, arguments:
+* 'callback': function called when a message is printed, arguments and return
+  value:
 ** 'void *data': pointer
 ** 'struct t_gui_buffer *buffer': buffer pointer
 ** 'time_t date': date
@@ -6588,6 +6693,9 @@ Arguments:
 ** 'int highlight': 1 if line has highlight, otherwise 0
 ** 'const char *prefix': prefix
 ** 'const char *message': message
+** return value:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 Return value:
@@ -6861,7 +6969,8 @@ Arguments:
 [NOTE]
 ^(1)^ 'xxx' is IRC server name, 'yyy' is IRC command name.
 
-* 'callback': function called when signal is received, arguments:
+* 'callback': function called when signal is received, arguments and return
+  value:
 ** 'void *data': pointer
 ** 'const char *signal': signal received
 ** 'const char *type_data': type of data sent with signal:
@@ -6869,6 +6978,9 @@ Arguments:
 *** 'WEECHAT_HOOK_SIGNAL_INT': integer number
 *** 'WEECHAT_HOOK_SIGNAL_POINTER': pointer
 ** 'void *signal_data': data sent with signal
+** return value:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 Return value:
@@ -7129,10 +7241,14 @@ Arguments:
 ^(1)^ 'xxx' is signal argument used in redirection, 'yyy' is redirection
 pattern.
 
-* 'callback': function called when signal is received, arguments:
+* 'callback': function called when signal is received, arguments and return
+  value:
 ** 'void *data': pointer
 ** 'const char *signal': signal received
 ** 'struct t_hashtable *hashtable': hashtable
+** return value:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 Return value:
@@ -7399,10 +7515,14 @@ Arguments:
 * 'option': option, format is full name, as used with command `/set` (for
   example: `weechat.look.item_time_format`)
   (priority allowed, see note about <<hook_priority,priority>>)
-* 'callback': function called when configuration option is changed, arguments:
+* 'callback': function called when configuration option is changed, arguments
+  and return value:
 ** 'void *data': pointer
 ** 'const char *option': name of option
 ** 'const char *value': new value for option
+** return value:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 Return value:
@@ -7466,13 +7586,16 @@ Arguments:
   (priority allowed, see note about <<hook_priority,priority>>)
 * 'description': description of completion
 * 'callback': function called when completion item is used (user is completing
-  something using this item), arguments:
+  something using this item), arguments and return value:
 ** 'void *data': pointer
 ** 'const char *completion_item': name of completion item
 ** 'struct t_gui_buffer *buffer': buffer where completion is made
 ** 'struct t_gui_completion *completion': structure used to add words for
    completion (see
    <<_weechat_hook_completion_list_add,weechat_hook_completion_list_add>>)
+** return value:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 [NOTE]
@@ -7665,7 +7788,12 @@ Arguments:
 
 | irc | irc_in_xxx ^(1)^ |
   server name |
-  content of message received from IRC server |
+  content of message received from IRC server (before charset decoding) |
+  new content of message
+
+| irc | irc_in2_xxx ^(1)^ |
+  server name |
+  content of message received from IRC server (after charset decoding) |
   new content of message
 
 | irc | irc_out_xxx ^(1)^ |
@@ -7708,12 +7836,12 @@ Arguments:
 ^(1)^ 'xxx' is IRC command name. +
 ^(2)^ 'yyy' is bar name.
 
-* 'callback': function called when modifier is used, arguments:
+* 'callback': function called when modifier is used, arguments and return value:
 ** 'void *data': pointer
 ** 'const char *modifier': name of modifier
 ** 'const char *modifier_data': data for modifier
-** 'const char *string': string to modify (function must return copy of this
-   string, no changes are allowed in this string)
+** 'const char *string': string to modify
+** return value: new string
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 Return value:
@@ -7831,10 +7959,11 @@ Arguments:
   (priority allowed, see note about <<hook_priority,priority>>)
 * 'description': description
 * 'args_description': description of arguments (optional, can be NULL)
-* 'callback': function called when info is asked, arguments:
+* 'callback': function called when info is asked, arguments and return value:
 ** 'void *data': pointer
 ** 'const char *info_name': name of info
 ** 'const char *arguments': additional arguments, depending on info
+** return value: value of info asked
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 Return value:
@@ -7903,10 +8032,11 @@ Arguments:
 * 'args_description': description of expected hashtable (optional, can be NULL)
 * 'output_description': description of hashtable returned by callback
   (optional, can be NULL)
-* 'callback': function called when info is asked, arguments:
+* 'callback': function called when info is asked, arguments and return value:
 ** 'void *data': pointer
 ** 'const char *info_name': name of info
 ** 'struct t_hashtable *hashtable': hashtable, depending on info
+** return value: hashtable asked
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 Return value:
@@ -7963,10 +8093,10 @@ struct t_hook *weechat_hook_infolist (const char *infolist_name,
                                       const char *description,
                                       const char *pointer_description,
                                       const char *args_description,
-                                      const char *(*callback)(void *data,
-                                                              const char *infolist_name,
-                                                              void *pointer,
-                                      const char *arguments),
+                                      struct t_infolist *(*callback)(void *data,
+                                                                     const char *infolist_name,
+                                                                     void *pointer,
+                                                                     const char *arguments),
                                       void *callback_data);
 ----------------------------------------
 
@@ -7977,12 +8107,14 @@ Arguments:
 * 'description': description
 * 'pointer_description': description of pointer (optional, can be NULL)
 * 'args_description': description of arguments (optional, can be NULL)
-* 'callback': function called when infolist is asked, arguments:
+* 'callback': function called when infolist is asked, arguments and return
+  value:
 ** 'void *data': pointer
 ** 'const char *infolist_name': name of infolist
 ** 'void *pointer': pointer to an object that infolist must return (to get only
    one item in infolist)
 ** 'const char *arguments': additional arguments, depending on infolist
+** return value: infolist asked
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 Return value:
@@ -8127,14 +8259,21 @@ Arguments:
 
 * 'name': name of buffer (must be unique for plugin)
 * 'input_callback': function called when input text is entered on buffer,
-  arguments:
-*** 'void *data': pointer
-*** 'struct t_gui_buffer *buffer': buffer pointer
-*** 'const char *input_data': input data
+  arguments and return value:
+** 'void *data': pointer
+** 'struct t_gui_buffer *buffer': buffer pointer
+** 'const char *input_data': input data
+** return value:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': pointer given to callback when it is called by WeeChat
-* 'close_callback': function called when buffer is closed, arguments:
-*** 'void *data': pointer
-*** 'struct t_gui_buffer *buffer': buffer pointer
+* 'close_callback': function called when buffer is closed, arguments and return
+  value:
+** 'void *data': pointer
+** 'struct t_gui_buffer *buffer': buffer pointer
+** return value:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 Return value:
@@ -10011,8 +10150,12 @@ struct t_gui_bar_item *weechat_bar_item_new (const char *name,
 Arguments:
 
 * 'name': bar item name
-* 'build_callback': function called when bar item is built: it must return
-  content of bar item
+* 'build_callback': function called when bar item is built, arguments and
+  return value:
+** 'void *data': pointer
+** 'struct t_gui_bar_item *item': item pointer
+** 'struct t_gui_window *window': window pointer
+** return value: content of bar item
 * 'build_callback_data': pointer given to build callback, when it is called by
   WeeChat
 
@@ -11515,7 +11658,15 @@ int weechat_upgrade_read (struct t_upgrade_file *upgrade_file,
 Arguments:
 
 * 'upgrade_file': upgrade file pointer
-* 'callback_read': function called for each object read in upgrade file
+* 'callback_read': function called for each object read in upgrade file,
+  arguments and return value:
+** 'void *data': pointer
+** 'struct t_upgrade_file *upgrade_file': pointer to upgrade file
+** 'int object_id': object id
+** 'struct t_infolist *infolist': infolist with content of object
+** return value:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_read_data': pointer given to read callback when it is called by
   WeeChat
 

doc/en/weechat_user.en.txt

@@ -503,6 +503,8 @@ Keys for buffers / windows
 | @k(A-)@k(w) , @k(A-)@k(↓) | Switch to window below | /window down
 | @k(A-)@k(w) , @k(A-)@k(←) | Switch to window on the left | /window left
 | @k(A-)@k(w) , @k(A-)@k(→) | Switch to window on the right | /window right
+| @k(A-)@k(w) , @k(A-)@k(b) | Resize all windows to 50% | /window balance
+| @k(A-)@k(w) , @k(A-)@k(s) | Swap buffers of two windows | /window swap
 | @k(A-)@k(z)               | Zoom on current window (@k(A-)@k(z) again: restore initial windows state, before zoom) | /window zoom
 | @k(A-)@k(<)               | Switch to previous buffer in list of visited buffers | /input jump_previously_visited_buffer
 | @k(A-)@k(>)               | Switch to next buffer in list of visited buffers | /input jump_next_visited_buffer

doc/fr/autogen/user/irc_options.txt

@@ -58,6 +58,16 @@
 ** type: couleur
 ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `default`)
 
+* *irc.color.topic_new*
+** description: `couleur pour le nouveau titre du canal (lorsque le titre est changé)`
+** type: couleur
+** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `white`)
+
+* *irc.color.topic_old*
+** description: `couleur pour l'ancien titre du canal (lorsque le titre est changé)`
+** type: couleur
+** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `darkgray`)
+
 * *irc.look.buffer_switch_autojoin*
 ** description: `basculer automatiquement vers le tampon du canal lorsqu'il est automatiquement rejoint (avec l'option du serveur "autojoin")`
 ** type: booléen
@@ -483,6 +493,11 @@
 ** type: entier
 ** valeurs: 0 .. 2147483647 (valeur par défaut: `2048`)
 
+* *irc.server_default.ssl_priorities*
+** description: `chaîne avec les priorités pour gnutls (pour la syntaxe, voir la documentation de la fonction gnutls_priority_init du manuel gnutls, les chaînes courantes sont: "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")`
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: `"NORMAL"`)
+
 * *irc.server_default.ssl_verify*
 ** description: `vérifier que la connexion ssl est entièrement de confiance`
 ** type: booléen

doc/fr/autogen/user/weechat_commands.txt

@@ -520,10 +520,12 @@ Exemples:
          -1|+1|b#|up|down|left|right
          splith|splitv [<pct>]
          resize [+/-]<pct>
+         balance
          merge [all]
          page_up|page_down
          refresh
          scroll|scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight
+         swap [up|down|left|right]
          zoom
 
          list: lister les fenêtres ouvertes (sans paramètre, cette liste est affichée)
@@ -537,6 +539,7 @@ Exemples:
        splith: éclater la fenêtre en deux horizontalement
        splitv: éclater la fenêtre en deux verticalement
        resize: redimensionner une fenêtre, la nouvelle taille est <pct> pourcentage de la fenêtre parent
+      balance: redimensionner toutes les fenêtres à 50%
         merge: fusionner la fenêtre avec une autre
       page_up: faire défiler d'une page vers le haut
     page_down: faire défiler d'une page vers le bas
@@ -548,6 +551,7 @@ Exemples:
 scroll_bottom: faire défiler jusqu'en bas du tampon
 scroll_previous_highlight: faire défiler jusqu'au highlight précédent
 scroll_next_highlight: faire défiler jusqu'au highlight suivant
+         swap: échanger les tampons de deux fenêtres (avec une direction facultative pour la fenêtre cible)
          zoom: zoomer sur la fenêtre
 
 Pour splith et splitv, pct est un pourcentage qui représente la taille de la nouvelle fenêtre, calculée par rapport à la taille de la fenêtre courante. Par exemple 25 signifie créer une fenêtre qui a pour taille: taille_courante / 4

doc/fr/autogen/user/weechat_options.txt

@@ -378,6 +378,11 @@
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `"-"`)
 
+* *weechat.look.hotlist_add_buffer_if_away*
+** description: `ajouter tout tampon dans la hotlist (incluant le tampon courant ou les tampons visibles) si la variable locale "away" est définie sur le tampon`
+** type: booléen
+** valeurs: on, off (valeur par défaut: `on`)
+
 * *weechat.look.hotlist_buffer_separator*
 ** description: `chaîne affichée entre les tampons dans la hotlist`
 ** type: chaîne

doc/fr/weechat_faq.fr.txt

@@ -685,7 +685,7 @@ Je souhaiterais aider les développeurs WeeChat. Que puis-je faire ?
 Il y a plusieurs choses à faire (test, code, documentation, etc...)
 
 Merci de prendre contact avec nous par IRC ou mail, consultez la page
-support : http://www.weechat.org/about
+support : http://www.weechat.org/support
 
 
 [[donate]]

doc/fr/weechat_plugin_api.fr.txt

@@ -3006,10 +3006,20 @@ Paramètres :
 * 'callback_hash_key' : fonction appelée pour rendre le "hash" d'une clé (la clé
   sous forme de nombre entier), peut être NULL si le type de clé est "string"
   (une fonction par défaut est utilisée pour les chaînes, et seulement pour les
-  chaînes)
+  chaînes). Paramètres et valeur de retour :
+** 'struct t_hashtable *hashtable' : pointeur vers la hashtable
+** 'const void *key' : clé
+** valeur de retour : "hash" de la clé
 * 'callback_keycmp' : fonction appelée pour comparer deux clés, peut être NULL
   si le type de valeur est "string" (une fonction par défaut est utilisée pour
-  les chaînes, et seulement pour les chaînes)
+  les chaînes, et seulement pour les chaînes). Paramètres et valeur de retour :
+** 'struct t_hashtable *hashtable' : pointeur vers la hashtable
+** 'const void *key1' : première clé
+** 'const void *key2' : seconde clé
+** valeur de retour :
+*** nombre négatif si 'key1' est inférieur à 'key2'
+*** 0 si 'key1' est égal à 'key2'
+*** nombre positif si 'key1' est supérieur à 'key2'
 
 Valeur de retour :
 
@@ -3504,10 +3514,15 @@ Paramètres :
 
 * 'name' : nom du nouveau fichier de configuration (sans chemin ou extension)
 * 'callback_reload' : fonction appelée quand le fichier de configuration est
-  rechargé avec `/reload` (optionnel, peut être NULL), paramètres :
+  rechargé avec `/reload` (optionnel, peut être NULL), paramètres et valeur de
+  retour :
 ** 'void *data' : pointeur
 ** 'struct t_config_file *config_file' : pointeur vers le fichier de
    configuration
+** valeur de retour :
+*** 'WEECHAT_CONFIG_READ_OK'
+*** 'WEECHAT_CONFIG_READ_MEMORY_ERROR'
+*** 'WEECHAT_CONFIG_READ_FILE_NOT_FOUND'
 * 'callback_reload_data' : pointeur donné au "callback" de rechargement
   lorsqu'il est appelé par WeeChat
 
@@ -3605,36 +3620,50 @@ Paramètres :
   dans la section, ou 0 si c'est interdit
 * 'callback_read' : fonction appelée quand une option de la section est lue
   depuis le disque (devrait être NULL dans la plupart des cas, sauf si des
-  options de la section nécessitent une fonction personnalisée), paramètres :
+  options de la section nécessitent une fonction personnalisée), paramètres et
+  valeur de retour :
 ** 'void *data' : pointeur
 ** 'struct t_config_file *config_file' : pointeur vers le fichier de
    configuration
 ** 'struct t_config_section *section' : pointeur vers la section
 ** 'const char *option_name' : nom de l'option
 ** 'const char *value' : valeur
+** valeur de retour :
+*** 'WEECHAT_CONFIG_READ_OK'
+*** 'WEECHAT_CONFIG_READ_MEMORY_ERROR'
+*** 'WEECHAT_CONFIG_READ_FILE_NOT_FOUND'
 * 'callback_read_data' : pointeur donné au "callback" quand il est appelé par
    WeeChat
 * 'callback_write' : fonction appelée lorsque la section est écrite dans le
   fichier (devrait être NULL dans la plupart des cas, sauf si la section
-  nécessite d'être écrite par une fonction personnalisée), paramètres :
+  nécessite d'être écrite par une fonction personnalisée), paramètres et valeur
+  de retour :
 ** 'void *data' : pointeur
 ** 'struct t_config_file *config_file' : pointeur vers le fichier de
    configuration
 ** 'struct t_config_section *section' : pointeur vers la section
 ** 'const char *option_name' : nom de l'option
+** valeur de retour :
+*** 'WEECHAT_CONFIG_WRITE_OK'
+*** 'WEECHAT_CONFIG_WRITE_ERROR'
+*** 'WEECHAT_CONFIG_WRITE_MEMORY_ERROR'
 * callback_write_data : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 * callback_write_default : fonction appelée lorsque les valeurs par défaut
-  doivent être écrites dans le fichier, paramètres :
+  doivent être écrites dans le fichier, paramètres et valeur de retour :
 ** 'void *data' : pointeur
 ** 'struct t_config_file *config_file' : pointeur vers le fichier de
    configuration
 ** 'const char *section_name' : nom de la section
+** valeur de retour :
+*** 'WEECHAT_CONFIG_WRITE_OK'
+*** 'WEECHAT_CONFIG_WRITE_ERROR'
+*** 'WEECHAT_CONFIG_WRITE_MEMORY_ERROR'
 * 'callback_write_default_data' : pointeur donné au "callback" lorsqu'il est
   appelé par WeeChat
 * 'callback_create_option' : fonction appelée lorsqu'une nouvelle option est
   créée dans la section (NULL si la section n'autorise pas la création de
-  nouvelles options), paramètres :
+  nouvelles options), paramètres et valeur de retour :
 ** 'void *data' : pointeur
 ** 'struct t_config_file *config_file' : pointeur vers le fichier de
    configuration
@@ -3645,12 +3674,17 @@ Paramètres :
   appelé par WeeChat
 * 'callback_delete_option' : fonction appelée lorsqu'une option est supprimée
   de la section (NULL si la section n'autorise pas la suppression d'options),
-  paramètres :
+  paramètres et valeur de retour :
 ** 'void *data' : pointeur
 ** 'struct t_config_file *config_file' : pointeur vers le fichier de
    configuration
 ** 'struct t_config_section *section' : pointeur vers la section
 ** 'struct t_config_option *option' : pointeur vers l'option
+** valeur de retour :
+*** 'WEECHAT_CONFIG_OPTION_SET_OK_CHANGED'
+*** 'WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE'
+*** 'WEECHAT_CONFIG_OPTION_SET_ERROR'
+*** 'WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND'
 * 'callback_delete_option_data' : pointeur donné au "callback" lorsqu'il est
   appelé par WeeChat
 
@@ -3849,11 +3883,11 @@ struct t_config_option *weechat_config_new_option (
                                 struct t_config_option *option,
                                 const char *value),
     void *callback_check_value_data,
-    int (*callback_change)(void *data,
-                           struct t_config_option *option),
+    void (*callback_change)(void *data,
+                            struct t_config_option *option),
     void *callback_change_data,
-    int (*callback_delete)(void *data,
-                           struct t_config_option *option),
+    void (*callback_delete)(void *data,
+                            struct t_config_option *option),
     void *callback_delete_data);
 ----------------------------------------
 
@@ -3878,10 +3912,13 @@ Paramètres :
 * 'null_value_allowed' : 1 si 'null' (valeur non définie) est autorisé pour
   l'option, sinon 0
 * 'callback_check_value' : fonction appelée pour vérifier la nouvelle valeur
-  de l'option (optionnel), paramètres :
+  de l'option (optionnel), paramètres et valeur de retour :
 ** 'void *data' : pointeur
 ** 'struct t_config_option *option' : pointeur vers l'option
 ** 'const char *value' : nouvelle valeur pour l'option
+** valeur de retour :
+*** 1 si la valeur est ok
+*** 0 si la valeur est invalide
 * 'callback_check_value_data' : pointeur donné au "callback" lorsqu'il est
   appelé par WeeChat
 * 'callback_change' : fonction appelée lorsque la valeur de l'option a changé
@@ -5575,7 +5612,7 @@ Script (Python) :
 rc = weechat.config_set_plugin(option_name, value)
 
 # exemple
-rc = weechat.config_is_set_plugin("option", "valeur_test")
+rc = weechat.config_set_plugin("option", "valeur_test")
 if rc == weechat.WEECHAT_CONFIG_OPTION_SET_OK_CHANGED:
     # ...
 elif rc == weechat.WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE:
@@ -5586,6 +5623,52 @@ elif rc == weechat.WEECHAT_CONFIG_OPTION_SET_ERROR:
     # ...
 ----------------------------------------
 
+weechat_config_set_desc_plugin
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+_Nouveau dans la version 0.3.5._
+
+Affecter une description pour une option dans le fichier de configuration des
+extensions (plugins.conf).
+
+Prototype :
+
+[source,C]
+----------------------------------------
+void weechat_config_set_desc_plugin (const char *option_name,
+                                     const char *description);
+----------------------------------------
+
+Paramètres :
+
+* 'option_name' : nom de l'option, WeeChat ajoutera le préfixe
+  "plugins.desc.xxx." (où "xxx" est le nom de l'extension courante)
+* 'description' : description pour l'option
+
+[NOTE]
+Ce n'est pas un problème si l'option (plugins.var.xxx.option_name) n'existe pas.
+Une création future de cette option utilisera cette description.
+
+Exemple en C :
+
+[source,C]
+----------------------------------------
+weechat_config_set_desc_plugin ("option", "description de l'option");
+----------------------------------------
+
+Script (Python) :
+
+[source,python]
+----------------------------------------
+# prototype
+weechat.config_set_desc_plugin(option_name, description)
+
+# exemple
+version = weechat.info_get("version_number", "") or 0
+if int(version) >= 0x00030500:
+    weechat.config_set_desc_plugin("option", "description de l'option")
+----------------------------------------
+
 weechat_config_unset_plugin
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -6063,13 +6146,17 @@ Paramètres :
   complétions sont possibles pour un paramètre, séparées par "|". Plusieurs
   modèles de complétions sont possibles pour une même commande, séparés par
   "||".
-* 'callback' : fonction appelée lorsque la commande est utilisée, paramètres :
+* 'callback' : fonction appelée lorsque la commande est utilisée, paramètres et
+  valeur de retour :
 ** 'void *data' : pointeur
 ** 'struct t_gui_buffer *buffer' : tampon où la commande est exécutée
 ** 'int argc' : nombre de paramètres passés à la commande
 ** 'char **argv' : paramètres pour la commande
 ** 'char **argv_eol' : paramètres pour la commande (jusqu'à fin de ligne pour
    chaque paramètre)
+** valeur de retour :
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -6181,10 +6268,15 @@ Paramètres :
 * 'command' : commande à intercepter, peut commencer ou se terminer par le
   caractère joker "*"
   (priorité autorisée, voir la note sur la <<hook_priority,priorité>>)
-* 'callback' : fonction appelée lorsque la commande est exécutée, paramètres :
+* 'callback' : fonction appelée lorsque la commande est exécutée, paramètres et
+  valeur de retour :
 ** 'void *data' : pointeur
 ** 'struct t_gui_buffer *buffer' : tampon où la command est exécutée
 ** 'const char *command' : la commande exécutée, avec ses paramètres
+** valeur de retour :
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_OK_EAT'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -6254,10 +6346,14 @@ Paramètres :
   alors le timer sera appelé chaque minutes quand la seconde sera 00
 * 'max_calls' : nombre maximum d'appels au timer (si 0, le timer n'a pas de
   fin)
-* 'callback' : fonction appelée quand le délai est atteint, paramètres :
+* 'callback' : fonction appelée quand le délai est atteint, paramètres et valeur
+  de retour :
 ** 'void *data' : pointeur
 ** 'int remaining_calls' : nombre d'appels restants (-1 si le timer n'a pas de
    fin)
+** valeur de retour :
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -6322,9 +6418,12 @@ Paramètres :
 * 'flag_write' : 1 = intercepter un évènement d'éctiture, 0 = ignorer
 * 'flag_exception' : 1 = intercepter un évènement d'exception, 0 = ignorer
 * 'callback' : fonction appelée lorsqu'un des évènements sélectionnés se
-  produit pour le fichier (ou la socket), paramètres :
+  produit pour le fichier (ou la socket), paramètres et valeur de retour :
 ** 'void *data' : pointeur
 ** 'int fd' : descripteur de fichier
+** valeur de retour :
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -6391,7 +6490,7 @@ Paramètres :
 * 'timeout' : timeout pour la commande (en millisecondes) : après ce délai, le
   processus fils est tué (0 signifie pas de limite)
 * 'callback' : function appelée quand des données du fils sont disponibles, or
-  ou quand le fils s'est terminé, paramètres :
+  ou quand le fils s'est terminé, paramètres et valeur de retour :
 ** 'void *data' : pointeur
 ** 'const char *command' : commande exécutée par le fils
 ** 'int return_code' : code retour :
@@ -6401,6 +6500,9 @@ Paramètres :
     la commande)
 ** 'out' : sortie standard de la commande (stdout)
 ** 'err' : erreurs de la commande (stderr)
+** valeur de retour :
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -6524,7 +6626,7 @@ Paramètres :
 * 'local_hostname' : nom de machine local à utiliser pour la connexion
   (optionnel)
 * 'callback' : fonction appelée lorsque la connexion est ok ou a échoué,
-  paramètres :
+  paramètres et valeur de retour :
 ** 'void *data' : pointeur
 ** 'int status' : connection status :
 *** 'WEECHAT_HOOK_CONNECT_OK' : connextion ok
@@ -6540,6 +6642,9 @@ Paramètres :
 ** 'gnutls_rc' : valeur retour de 'gnutls_handshake()'
 ** 'const char *error' : valeur retour de 'gnutls_strerror(gnutls_rc)'
 ** 'const char *ip_address' : adresse IP trouvée
+** valeur de retour :
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -6665,7 +6770,8 @@ Paramètres :
   (optionnel)
 * 'strip_colors' : si 1, les couleurs seront supprimées du message affiché,
   avant d'appeler le "callback"
-* 'callback' : fonction appelée lorsqu'un message est affiché, paramètres :
+* 'callback' : fonction appelée lorsqu'un message est affiché, paramètres et
+  valeur de retour :
 ** 'void *data' : pointeur
 ** 'struct t_gui_buffer *buffer' : pointeur vers le tampon
 ** 'time_t date' : date
@@ -6675,6 +6781,9 @@ Paramètres :
 ** 'int highlight' : 1 si la ligne contient un highlight, sinon 0
 ** 'const char *prefix' : préfixe
 ** 'const char *message' : message
+** valeur de retour :
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -6949,7 +7058,8 @@ Paramètres :
 [NOTE]
 ^(1)^ 'xxx' est le nom du serveur IRC, 'yyy' est le nom d'une commande IRC.
 
-* 'callback' : fonction appelée quand le signal est reçu, paramètres :
+* 'callback' : fonction appelée quand le signal est reçu, paramètres et valeur
+  de retour :
 ** 'void *data' : pointeur
 ** 'const char *signal' : signal reçu
 ** 'const char *type_data' : type de donnée reçu avec le signal :
@@ -6957,6 +7067,9 @@ Paramètres :
 *** 'WEECHAT_HOOK_SIGNAL_INT' : nombre entier
 *** 'WEECHAT_HOOK_SIGNAL_POINTER' : pointeur
 ** 'void *signal_data' : données envoyées avec le signal
+** valeur de retour :
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -7226,10 +7339,14 @@ Paramètres :
 ^(1)^ 'xxx' est l'argument "signal" utilisé dans la redirection, 'yyy' est le
 modèle de redirection ("pattern").
 
-* 'callback' : fonction appelée quand le signal est reçu, paramètres :
+* 'callback' : fonction appelée quand le signal est reçu, paramètres et valeur
+  de retour :
 ** 'void *data' : pointeur
 ** 'const char *signal' : signal reçu
 ** 'struct t_hashtable *hashtable' : hashtable
+** valeur de retour :
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -7507,10 +7624,13 @@ Paramètres :
   commande `/set` (par exemple : `weechat.look.item_time_format`)
   (priorité autorisée, voir la note sur la <<hook_priority,priorité>>)
 * 'callback' : fonction appelée lorsque l'option de configuration est modifiée,
-  paramètres :
+  paramètres et valeur de retour :
 ** 'void *data' : pointeur
 ** 'const char *option' : nom de l'option
 ** 'const char *value' : nouvelle valeur pour l'option
+** valeur de retour :
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -7576,13 +7696,16 @@ Paramètres :
 * 'description' : description de la complétion
 * 'callback' : fonction appelée lorsque la complétion est utilisée
   (l'utilisateur est en train de compléter quelque chose qui fait appel à cette
-  complétion), paramètres :
+  complétion), paramètres et valeur de retour :
 ** 'void *data' : pointeur
 ** 'const char *completion_item' : nom de la complétion
 ** 'struct t_gui_buffer *buffer' : tampon où la complétion est effectuée
 ** 'struct t_gui_completion *completion' : structure utilisée pour ajouter
    les mots pour la complétion (voir
    <<_weechat_hook_completion_list_add,weechat_hook_completion_list_add>>)
+** valeur de retour :
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -7779,7 +7902,12 @@ Paramètres :
 
 | irc | irc_in_xxx ^(1)^ |
   nom de serveur |
-  contenu du message reçu du serveur IRC |
+  contenu du message reçu du serveur IRC (avant décodage du jeu de caractères) |
+  nouveau contenu du message
+
+| irc | irc_in2_xxx ^(1)^ |
+  nom de serveur |
+  contenu du message reçu du serveur IRC (après décodage du jeu de caractères) |
   nouveau contenu du message
 
 | irc | irc_out_xxx ^(1)^ |
@@ -7825,12 +7953,13 @@ Paramètres :
 ^(1)^ 'xxx' est un nom de commande IRC. +
 ^(2)^ 'yyy' est le nom de la barre.
 
-* 'callback' : fonction appelée lorsque le "modifieur" est utilisé, paramètres :
+* 'callback' : fonction appelée lorsque le "modifieur" est utilisé, paramètres
+  et valeur de retour :
 ** 'void *data' : pointeur
 ** 'const char *modifier' : nom du "modifieur"
 ** 'const char *modifier_data' : données pour le "modifieur"
-** 'const char *string' : chaîne à modifier (la fonction doit retourner une
-   copie de cette chaîne, aucun changement n'est autorisé dans cette chaîne)
+** 'const char *string' : chaîne à modifier
+** valeur de retour : nouvelle chaîne
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -7950,11 +8079,13 @@ Paramètres :
   (priorité autorisée, voir la note sur la <<hook_priority,priorité>>)
 * 'description' : description
 * 'args_description' : description des paramètres (optionnel, peut être NULL)
-* 'callback' : fonction appelée quand l'information est demandée, paramètres :
+* 'callback' : fonction appelée quand l'information est demandée, paramètres et
+  valeur de retour :
 ** 'void *data' : pointeur
 ** 'const char *info_name' : nom de l'information
 ** 'const char *arguments' : paramètres additionnels, dépendant de
    l'information
+** valeur de retour : valeur de l'information demandée
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -8026,10 +8157,12 @@ Paramètres :
   (optionnel, peut être NULL)
 * 'output_description' : description de la hashtable retournée par le "callback"
   (optionnel, peut être NULL)
-* 'callback' : fonction appelée quand l'information est demandée, paramètres :
+* 'callback' : fonction appelée quand l'information est demandée, paramètres et
+  valeur de retour :
 ** 'void *data' : pointeur
 ** 'const char *info_name' : nom de l'information
 ** 'struct t_hashtable *hashtable' : hashtable, dépendant de l'information
+** valeur de retour : hashtable demandée
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -8088,10 +8221,10 @@ struct t_hook *weechat_hook_infolist (const char *infolist_name,
                                       const char *description,
                                       const char *pointer_description,
                                       const char *args_description,
-                                      const char *(*callback)(void *data,
-                                                              const char *infolist_name,
-                                                              void *pointer,
-                                      const char *arguments),
+                                      struct t_infolist *(*callback)(void *data,
+                                                                     const char *infolist_name,
+                                                                     void *pointer,
+                                                                     const char *arguments),
                                       void *callback_data);
 ----------------------------------------
 
@@ -8102,12 +8235,14 @@ Paramètres :
 * 'description' : description
 * 'pointer_description' : description du pointeur (optionnel, peut être NULL)
 * 'args_description' : description des paramètres (optionnel, peut être NULL)
-* 'callback' : fonction appelée quand l'infolist est demandée, paramètres :
+* 'callback' : fonction appelée quand l'infolist est demandée, paramètres et
+  valeur de retour :
 ** 'void *data' : pointeur
 ** 'const char *infolist_name' : nom de l'infolist
 ** 'void *pointer' : pointeur vers un objet que l'infolist doit retourner (pour
    obtenir unituqment cet objet dans l'infolist)
 ** 'const char *arguments' : paramètres additionnels, dépendant de l'infolist
+** valeur de retour : infolist demandée
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -8253,15 +8388,22 @@ Paramètres :
 
 * 'name' : nom du tampon (doit être unique pour l'extension)
 * 'input_callback' : fonction appelée lorsque du texte saisi est envoyé au
-  tampon, paramètres :
-*** 'void *data' : pointeur
-*** 'struct t_gui_buffer *buffer' : pointeur vers le tampon
-*** 'const char *input_data' : données en entrée
+  tampon, paramètres et valeur de retour :
+** 'void *data' : pointeur
+** 'struct t_gui_buffer *buffer' : pointeur vers le tampon
+** 'const char *input_data' : données en entrée
+** valeur de retour :
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
-* 'close_callback' : fonction appelée lorsque le tampon est fermé, paramètres :
-*** 'void *data' : pointeur
-*** 'struct t_gui_buffer *buffer' : pointeur vers le tampon
+* 'close_callback' : fonction appelée lorsque le tampon est fermé, paramètres et
+  valeur de retour :
+** 'void *data' : pointeur
+** 'struct t_gui_buffer *buffer' : pointeur vers le tampon
+** valeur de retour :
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -10167,8 +10309,12 @@ struct t_gui_bar_item *weechat_bar_item_new (const char *name,
 Paramètres :
 
 * 'name' : nom de l'objet de barre
-* 'build_callback' : fonction appelée lorsque l'objet est construit : elle doit
-  retourner le contenu de l'objet de barre
+* 'build_callback' : fonction appelée lorsque l'objet est construit, paramètres
+  et valeur de retour :
+** 'void *data' : pointeur
+** 'struct t_gui_bar_item *item' : pointeur vers l'objet de barre
+** 'struct t_gui_window *window' : pointeur vers la fenêtre
+** valeur de retour : contenu de l'objet de barre
 * 'build_callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 
@@ -11695,7 +11841,14 @@ Paramètres :
 
 * 'upgrade_file' : pointeur vers le fichier de mise à jour
 * 'callback_read' : fonction appelée pour chaque objet lu dans le fichier de
-  mise à jour
+  mise à jour, paramètres et valeur de retour :
+** 'void *data' : pointeur
+** 'struct t_upgrade_file *upgrade_file' : pointeur vers le fichier de mise à jour
+** 'int object_id' : identifiant de l'objet
+** 'struct t_infolist *infolist' : infolist avec le contenu de l'objet
+** valeur de retour :
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_read_data' : pointeur donné au "callback" lorsqu'il est appelé par
   WeeChat
 

doc/fr/weechat_user.fr.txt

@@ -511,6 +511,8 @@ Touches pour les tampons / fenêtres
 | @k(A-)@k(w) , @k(A-)@k(↓) | Sauter à la fenêtre en dessous | /window down
 | @k(A-)@k(w) , @k(A-)@k(←) | Sauter à la fenêtre de gauche | /window left
 | @k(A-)@k(w) , @k(A-)@k(→) | Sauter à la fenêtre de droite | /window right
+| @k(A-)@k(w) , @k(A-)@k(b) | Redimensionner toutes les fenêtres à 50% | /window balance
+| @k(A-)@k(w) , @k(A-)@k(s) | Echanger les tampons de deux fenêtres | /window swap
 | @k(A-)@k(z)               | Zoom sur la fenêtre courante (@k(A-)@k(z) de nouveau : restaurer l'état initial des fenêtres, avant le zoom) | /window zoom
 | @k(A-)@k(<)               | Sauter au tampon précédent dans la liste des tampons visités | /input jump_previously_visited_buffer
 | @k(A-)@k(>)               | Sauter au tampon suivant dans la liste des tampons visités | /input jump_next_visited_buffer

doc/it/autogen/user/irc_options.txt

@@ -58,6 +58,16 @@
 ** tipo: colore
 ** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `default`)
 
+* *irc.color.topic_new*
+** descrizione: `color for new channel topic (when topic is changed)`
+** tipo: colore
+** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `white`)
+
+* *irc.color.topic_old*
+** descrizione: `color for old channel topic (when topic is changed)`
+** tipo: colore
+** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `darkgray`)
+
 * *irc.look.buffer_switch_autojoin*
 ** descrizione: `passa automaticamente al buffer del canale con l'ingresso automatico abilitato (con l'opzione del server "autojoin")`
 ** tipo: bool
@@ -483,6 +493,11 @@
 ** tipo: intero
 ** valori: 0 .. 2147483647 (valore predefinito: `2048`)
 
+* *irc.server_default.ssl_priorities*
+** descrizione: `string with priorities for gnutls (for syntax, see documentation of function gnutls_priority_init in gnutls manual, common strings are: "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")`
+** tipo: stringa
+** valori: qualsiasi stringa (valore predefinito: `"NORMAL"`)
+
 * *irc.server_default.ssl_verify*
 ** descrizione: `verifica che la connessione ssl sia totalmente fidata`
 ** tipo: bool

doc/it/autogen/user/weechat_commands.txt

@@ -519,47 +519,51 @@ Esempi:
 /window  list
          -1|+1|b#|up|down|left|right
          splith|splitv [<pct>]
-         resize [+/-] <pct>
+         resize [+/-]<pct>
+         balance
          merge [all]
          page_up|page_down
          refresh
          scroll|scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight
+         swap [up|down|left|right]
          zoom
 
-         list: elenca le finestre aperte (senza argomento, questa lista viene visualizzata)
-           -1: salta alla finestra precedente
-           +1: salta alla finestra successiva
-           b#: salta alla finestra successiva che visualizza il buffer numero #
-           up: passa alla finestra superiore a quella corrente
-         down: passa alla finestra inferiore a quella attiva
-         left: passa alla finestra a sinistra
-        right: passa alla finestra a destra
-       splith: divide la finestra attiva orizzontalmente
-       splitv: divide la finestra attiva verticalmente
-       resize: ridimensiona finestra, la nuova dimensione è <pct> percentuale della finestra genitore
-        merge: unisce la finestra con un'altra (all = mantiente una sola finestra)
-      page_up: scorre di una pagina in alto
-    page_down: scorre di una pagina in basso
-      refresh: aggiorna lo schermo
-       scroll: scorre di un numero di righe (+/-N) o in base al tempo: s=secondi, m=minuti, h=ore, d=giorni, M=mesi, y=anni
-    scroll_up: scorre di alcune righe in alto
-  scroll_down: scorre di alcune righe in basso
-   scroll_top: scorre fino all'inizio del buffer
-scroll_bottom: scorre fino alla fine del buffer buffer
-scroll_previous_highlight: passa all'evento precedente
-    scroll_next_highlight: passa all'evento successivo
-         zoom: ingrandimento sulla finestra
+         list: list opened windows (without argument, this list is displayed)
+           -1: jump to previous window
+           +1: jump to next window
+           b#: jump to next window displaying buffer number #
+           up: switch to window above current one
+         down: switch to window below current one
+         left: switch to window on the left
+        right: switch to window on the right
+       splith: split current window horizontally
+       splitv: split current window vertically
+       resize: resize window size, new size is <pct> percentage of parent window
+      balance: resize all windows to 50%
+        merge: merge window with another (all = keep only one window)
+      page_up: scroll one page up
+    page_down: scroll one page down
+      refresh: refresh screen
+       scroll: scroll number of lines (+/-N) or with time: s=seconds, m=minutes, h=hours, d=days, M=months, y=years
+    scroll_up: scroll a few lines up
+  scroll_down: scroll a few lines down
+   scroll_top: scroll to top of buffer
+scroll_bottom: scroll to bottom of buffer
+scroll_previous_highlight: scroll to previous highlight
+scroll_next_highlight: scroll to next highlight
+         swap: swap buffers of two windows (with optional direction for target window)
+         zoom: zoom on window
 
-Per splith e splitv, pct è una percentuale che rappresenta la dimensione della nuova finestra, calcolata con la finestra attiva come riferimento per la dimensione. Per esempio 25 vuol dire creare una finestra di dimensione = dimensione_attuale / 4
+For splith and splitv, pct is a percentage which represents size of new window, computed with current window as size reference. For example 25 means create a new window with size = current_size / 4
 
-Esempi:
-  salta alla finestra che visualizza il buffer #1:
+Examples:
+  jump to window displaying buffer #1:
     /window b1
-  scorre di due righe in alto:
+  scroll 2 lines up:
     /window scroll -2
-  scorre all'indietro di due giorni:
+  scroll 2 days up:
     /window scroll -2d
-  scorre all'inizio del giorno attuale:
-     /window scroll -d
+  scroll to beginning of current day:
+    /window scroll -d
 ........................................
 

doc/it/autogen/user/weechat_options.txt

@@ -378,6 +378,11 @@
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"-"`)
 
+* *weechat.look.hotlist_add_buffer_if_away*
+** descrizione: `add any buffer to hotlist (including current or visible buffers) if local variable "away" is set on buffer`
+** tipo: bool
+** valori: on, off (valore predefinito: `on`)
+
 * *weechat.look.hotlist_buffer_separator*
 ** descrizione: `string displayed between buffers in hotlist`
 ** tipo: stringa

doc/it/weechat_faq.it.txt

@@ -679,7 +679,7 @@ Voglio aiutare gli sviluppatori di WeeChat. Cosa posso fare?
 Ci sono molti compiti da fare (testing, scrittura del codice, documentazione, ...)
 
 Per favore contattateci su IRC o via mail e consultate la pagina di supporto:
-http://www.weechat.org/about
+http://www.weechat.org/support
 
 
 [[donate]]

doc/it/weechat_plugin_api.it.txt

@@ -2967,10 +2967,25 @@ Argomenti:
 * 'callback_hash_key': callback utilizzata per effettuare un "hash" di una
   chiave (chiave come valore intero), può essere NULL se il tipo della chiave è
   "string" (viene usata una funzione predefinita per le stringhe, e solo per le
-  stringhe)
+  stringhe), argomenti e valore restituito:
+** 'struct t_hashtable *hashtable': puntatore alla tabella hash
+// TRANSLATION MISSING
+** 'const void *key': key
+// TRANSLATION MISSING
+** return value: hash of the key
 * 'callback_keycmp': callback utilizzata per comparare due chiavi, può essere
   NULL se il tipo di valore è "string" (una funzione di confronto predefinita è
-  usata per le stringhe e solo per le stringhe)
+  usata per le stringhe e solo per le stringhe), argomenti e valore restituito:
+** 'struct t_hashtable *hashtable': puntatore alla tabella hash
+// TRANSLATION MISSING
+** 'const void *key1': first key
+// TRANSLATION MISSING
+** 'const void *key2': second key
+// TRANSLATION MISSING
+** return value:
+*** negative number if 'key1' is less than 'key2'
+*** 0 if 'key1' equals 'key2'
+*** positive number if 'key1' is greater than 'key2'
 
 Valore restituito:
 
@@ -3462,9 +3477,14 @@ Argomenti:
 
 * 'name': nome del file di configurazione (senza percorso o estensione)
 * 'callback_reload': funzione chiamata quando il file di configurazione viene
-  ricaricato con `/reload` (opzionale, può essere NULL), argomenti:
+  ricaricato con `/reload` (opzionale, può essere NULL), argomenti e valore
+  restituito:
 ** 'void *data': puntatore
 ** 'struct t_config_file *config_file': puntatore al file di configurazione
+** valore restituito:
+*** 'WEECHAT_CONFIG_READ_OK'
+*** 'WEECHAT_CONFIG_READ_MEMORY_ERROR'
+*** 'WEECHAT_CONFIG_READ_FILE_NOT_FOUND'
 * 'callback_reload_data': puntatore fornito per ricaricare il callback
   quando richiesto da WeeChat
 
@@ -3562,45 +3582,67 @@ Argomenti:
   oppure 0 se non gli è consentito
 * 'callback_read': funzione chiamata quando un'opzione nella sezione viene letta
   da disco (dovrebbe essere NULL in molti casi, tranne se l'opzione nella sezione
-  necessita di una funzione personalizza), argomenti:
+  necessita di una funzione personalizza), argomenti e valore restituito:
 ** 'void *data': puntatore
 ** 'struct t_config_file *config_file': puntatore al file di configurazione
 ** 'struct t_config_section *section': puntatore alla sezione
 ** 'const char *option_name': nome dell'opzione
 ** 'const char *value': valore
+** valore restituito:
+*** 'WEECHAT_CONFIG_READ_OK'
+*** 'WEECHAT_CONFIG_READ_MEMORY_ERROR'
+*** 'WEECHAT_CONFIG_READ_FILE_NOT_FOUND'
 * 'callback_read_data': puntatore fornito al callback quando chiamato da WeeChat
 * 'callback_write': funzione chiamata quando la sezione è scritta nel file (dovrebbe
   essere NULL in molti casi, tranne se la sezione necessita di una funzione
-  personalizzata), argomenti:
+  personalizzata), argomenti e valore restituito:
 ** 'void *data': puntatore
 ** 'struct t_config_file *config_file': puntatore al file di configurazione
 ** 'struct t_config_section *section': puntatore alla sezione
 ** 'const char *option_name': nome dell'opzione
+** valore restituito:
+*** 'WEECHAT_CONFIG_WRITE_OK'
+*** 'WEECHAT_CONFIG_WRITE_ERROR'
+*** 'WEECHAT_CONFIG_WRITE_MEMORY_ERROR'
 * callback_write_data: puntatore fornito al callback quando chiamato da WeeChat
 * callback_write_default: funzione chiamata quando i valori predefiniti per la sezione
-  devono essere scritti in un file, argomenti:
+  devono essere scritti in un file, argomenti e valore restituito:
 ** 'void *data': puntatore
 ** 'struct t_config_file *config_file': puntatore al file di configurazione
 ** 'const char *section_name': nome della sezione
+** valore restituito:
+*** 'WEECHAT_CONFIG_WRITE_OK'
+*** 'WEECHAT_CONFIG_WRITE_ERROR'
+*** 'WEECHAT_CONFIG_WRITE_MEMORY_ERROR'
 * 'callback_write_default_data': puntatore fornito al callback quando chiamato da
   WeeChat
 * 'callback_create_option': funzione chiamata quando viene creata una nuova
   opzione nella sezione (NULL se la sezione non consente di creare nuove
-  opzioni), argomenti:
+  opzioni), argomenti e valore restituito:
 ** 'void *data': puntatore
 ** 'struct t_config_file *config_file': puntatore al file di configurazione
 ** 'struct t_config_section *section': puntatore alla sezione
 ** 'const char *option_name': nome dell'opzione
 ** 'const char *value': valore
+** valore restituito:
+*** 'WEECHAT_CONFIG_OPTION_SET_OK_CHANGED'
+*** 'WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE'
+*** 'WEECHAT_CONFIG_OPTION_SET_ERROR'
+*** 'WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND'
 * 'callback_create_option_data': puntatore fornito al callback quando chiamato
   da WeeChat
 * 'callback_delete_option': funzione chiamata quando un'opzione viene eliminata
   nella sezione (NULL se la sezione non consente di eliminare delle opzioni),
-  argomenti:
+  argomenti e valore restituito:
 ** 'void *data': puntatore
 ** 'struct t_config_file *config_file': puntatore al file di configurazione
 ** 'struct t_config_section *section': puntatore alla sezione
 ** 'struct t_config_option *option': puntatore all'opzione
+** valore restituito:
+*** 'WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET'
+*** 'WEECHAT_CONFIG_OPTION_UNSET_OK_RESET'
+*** 'WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED'
+*** 'WEECHAT_CONFIG_OPTION_UNSET_ERROR'
 * 'callback_delete_option_data': puntatore fornito al callback quando chiamato
   da WeeChat
 
@@ -3798,11 +3840,11 @@ struct t_config_option *weechat_config_new_option (
                                 struct t_config_option *option,
                                 const char *value),
     void *callback_check_value_data,
-    int (*callback_change)(void *data,
-                           struct t_config_option *option),
+    void (*callback_change)(void *data,
+                            struct t_config_option *option),
     void *callback_change_data,
-    int (*callback_delete)(void *data,
-                           struct t_config_option *option),
+    void (*callback_delete)(void *data,
+                            struct t_config_option *option),
     void *callback_delete_data);
 ----------------------------------------
 
@@ -3826,10 +3868,15 @@ Argomenti:
 * 'null_value_allowed': 1 se 'null' (valore non definito) è consentito per l'opzione,
   altrimenti 0
 * 'callback_check_value': funzione chiamata per verificare il nuovo valore per
-  l'opzione (ozionale), argomenti:
+  l'opzione (ozionale), argomenti e valore restituito:
 ** 'void *data': puntatore
 ** 'struct t_config_option *option': puntatore all'opzione
 ** 'const char *value': nuovo valore per l'opzione
+** valore restituito:
+// TRANSLATION MISSING
+*** 1 if value is ok
+// TRANSLATION MISSING
+*** 0 if value is invalid
 * 'callback_check_value_data': puntatore fornito alla callback check_value
   quando chiamato da WeeChat
 * 'callback_change': funzione chiamata quando il valore dell'opzione è stata
@@ -5517,7 +5564,7 @@ Script (Python):
 rc = weechat.config_set_plugin(option_name, value)
 
 # esempio
-rc = weechat.config_is_set_plugin("option", "test_value")
+rc = weechat.config_set_plugin("option", "test_value")
 if rc == weechat.WEECHAT_CONFIG_OPTION_SET_OK_CHANGED:
     # ...
 elif rc == weechat.WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE:
@@ -5528,6 +5575,52 @@ elif rc == weechat.WEECHAT_CONFIG_OPTION_SET_ERROR:
     # ...
 ----------------------------------------
 
+// TRANSLATION MISSING
+weechat_config_set_desc_plugin
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+_Novità nella versione 0.3.5._
+
+Set description for option in plugins configuration file (plugins.conf).
+
+Prototipo:
+
+[source,C]
+----------------------------------------
+void weechat_config_set_desc_plugin (const char *option_name,
+                                     const char *description);
+----------------------------------------
+
+Argomenti:
+
+* 'option_name': option name, WeeChat will add prefix "plugins.desc.xxx."
+  (where "xxx" is current plugin name)
+* 'description': description for option
+
+[NOTE]
+It is not a problem if option (plugins.var.xxx.option_name) does not exist.
+A future creation of option with this name will use this description.
+
+Esempio in C:
+
+[source,C]
+----------------------------------------
+weechat_config_set_desc_plugin ("option", "description of option");
+----------------------------------------
+
+Script (Python):
+
+[source,python]
+----------------------------------------
+# prototipo
+weechat.config_set_desc_plugin(option_name, description)
+
+# esempio
+version = weechat.info_get("version_number", "") or 0
+if int(version) >= 0x00030500:
+    weechat.config_set_desc_plugin("option", "description of option")
+----------------------------------------
+
 weechat_config_unset_plugin
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -5999,13 +6092,17 @@ Argomenti:
   per ogni argomento, separati da spazio. Sono possibili più  completamenti sono
   possibili per un singolo argomento, separati da "|". Più modelli sono possibili per
   lo stesso comando, separati da "||".
-* 'callback': funzione chiamata quando viene utilizzato il comando, argomenti:
+* 'callback': funzione chiamata quando viene utilizzato il comando, argomenti e
+  valore restituito:
 ** 'void *data': puntatore
 ** 'struct t_gui_buffer *buffer': buffer quando il comando viene eseguito
 ** 'int argc': numero di argomenti forniti per un comando
 ** 'char **argv': argomenti forniti per un comando
 ** 'char **argv_eol': argomenti forniti per un comando (fino a fine riga per ogni
    argomento)
+** valore restituito:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': puntatore fornito dalla callback quando chiamata da WeeChat
 
 I codici predefiniti per il completamento sono:
@@ -6118,10 +6215,15 @@ Argomenti:
 * 'command': comando su cui eseguire l'hook, può iniziare o terminare con "*"
   (priorità consentita, consultare la nota riguardo la
   <<hook_priority,priority>>)
-* 'callback': funzione chiamata quando il comando è in esecuzione, argomenti:
+* 'callback': funzione chiamata quando il comando è in esecuzione, argomenti e
+  valore restituito:
 ** 'void *data': puntatore
 ** 'struct t_gui_buffer *buffer': buffer dove viene eseguito il comando
 ** 'const char *command': il comando eseguito, con i propri argomenti
+** valore restituito:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_OK_EAT'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat
 
 [NOTE]
@@ -6189,9 +6291,13 @@ Argomenti:
   if interval = 60000 (60 seconds), and align_second = 60, then timer is
   called each minute when second is 00
 * 'max_calls': number of calls to timer (if 0, then timer has no end)
-* 'callback': function called when time is reached, arguments:
+* 'callback': function called when time is reached, argomenti e valore
+  restituito:
 ** 'void *data': pointer
 ** 'int remaining_calls': remaining calls (-1 if timer has no end)
+** valore restituito:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': pointer given to callback when it is called by WeeChat
 
 Valore restituito:
@@ -6255,9 +6361,12 @@ Argomenti:
 * 'flag_write': 1 = cattura l'evento scrittura (write), 0 = ignora
 * 'flag_exception': 1 = cattura l'eccezione evento (event), 0 = ignora
 * 'callback': funzione che chiama un evento selezionato che si verifica
-  per un file (o un socket), argomenti:
+  per un file (o un socket), argomenti e valore restituito:
 ** 'void *data': puntatore
 ** 'int fd': descrittore file
+** valore restituito:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': puntatore fornito alla calback quando chiamata da WeeChat
 
 Valore restituito:
@@ -6323,7 +6432,7 @@ Argomenti:
 * 'timeout': timeout per il comando (in millisecondi): dopo questo timeout,
   il processo figlio viene terminato (0 vuol dire nessun timeout)
 * 'callback': funzione chiamata quando i dati dal processo figlio sono disponibili,
-  oppure quando è terminato, argomenti:
+  oppure quando è terminato, argomenti e valore restituito:
 ** 'void *data': puntatore
 ** 'const char *command': comando eseguito dal processo figlio
 ** 'int return_code': codice restituito:
@@ -6333,6 +6442,9 @@ Argomenti:
     esecuzione del comando)
 ** 'out': output standard del comando (stdout)
 ** 'err': output di errore del comando (stderr)
+** valore restituito:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': puntatore fornito alla callback quando fornita da WeeChat
 
 Valore restituito:
@@ -6454,7 +6566,7 @@ Argomenti:
 * 'local_hostname': nome host locale da utilizzare per la connessione
   (opzionale)
 * 'callback': funzione chiamata quando la connessione è avvenuta con
-  successo oppure no, argomenti:
+  successo oppure no, argomenti e valore restituito:
 ** 'void *data': puntatore
 ** 'int status': stato della connessione:
 *** 'WEECHAT_HOOK_CONNECT_OK': connessione avvenuta con successo
@@ -6469,6 +6581,9 @@ Argomenti:
 ** 'gnutls_rc': valore del risultato di 'gnutls_handshake()'
 ** 'const char *error': valore del risultato di 'gnutls_strerror(gnutls_rc)'
 ** 'const char *ip_address': indirizzo IP trovato
+** valore restituito:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat
 
 Valore restituito:
@@ -6592,7 +6707,8 @@ Argomenti:
 * 'message': verranno catturati solo i messaggi con questa stringa (opzionale)
 * 'strip_colors': se 1, i colori verranno estratti dal messaggio visualizzato, prima
   di chiamare la callback
-* 'callback': funzione chiamata quando viene stampato un messaggio, argomenti:
+* 'callback': funzione chiamata quando viene stampato un messaggio, argomenti e
+  valore restituito:
 ** 'void *data': puntatore
 ** 'struct t_gui_buffer *buffer': puntatore al buffer
 ** 'time_t date': data
@@ -6602,6 +6718,9 @@ Argomenti:
 ** 'int highlight': 1 se la riga viene evidenziata, altrimenti 0
 ** 'const char *prefix': prefisso
 ** 'const char *message': messaggio
+** valore restituito:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat
 
 Valore restituito:
@@ -6690,7 +6809,7 @@ Argomenti:
   utilizzato dal plugin irc, il segnale viene inviato
   anche se il messaggio è stato ignorato)
 
-| irc | xxx,irc_out_yyy ^1^ | string: messaggio |
+| irc | xxx,irc_out_yyy ^(1)^ | string: messaggio |
   messaggio irc inviato al server
 
 | irc | xxx,irc_outtags_yyy ^(1)^ | stringa: tag + ";" + messaggio |
@@ -6882,7 +7001,8 @@ Argomenti:
 [NOTE]
 ^(1)^ 'xxx' è il nome del server IRC, 'yyy' è il nome del comando IRC.
 
-* 'callback': funzione chiamata a segnale ricevuto, argomenti:
+* 'callback': funzione chiamata a segnale ricevuto, argomenti e valore
+  restituito:
 ** 'void *data': puntatore
 ** 'const char *signal': segnale ricevuto
 ** 'const char *type_data': tipo di dati inviati con il segnale:
@@ -6890,6 +7010,9 @@ Argomenti:
 *** 'WEECHAT_HOOK_SIGNAL_INT': numero intero
 *** 'WEECHAT_HOOK_SIGNAL_POINTER': puntatore
 ** 'void *signal_data': dati inviati con il segnale
+** valore restituito:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat
 
 Valore restituito:
@@ -7158,10 +7281,14 @@ Argomenti:
 ^(1)^ 'xxx' è l'argomento del segnale usato nella redirezione, 'yyy' è lo schema
 di redirezione.
 
-* 'callback': funzione chiamata a segnale ricevuto, argomenti:
+* 'callback': funzione chiamata a segnale ricevuto, argomenti e valore
+  restituito:
 ** 'void *data': puntatore
 ** 'const char *signal': segnale ricevuto
 ** 'struct t_hashtable *hashtable': tabella hash
+** valore restituito:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat
 
 Valore restituito:
@@ -7432,10 +7559,13 @@ Argomenti:
   (priorità consentita, consultare la note riguardo la
   <<hook_priority,priority>>)
 * 'callback': funzione chiamata quando l'opzione di configurazione è cambiata,
-  argomenti:
+  argomenti e valore restituito:
 ** 'void *data': puntatore
 ** 'const char *option': nome dell'opzione
 ** 'const char *value': nuovo valore per l'opzione
+** valore restituito:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat
 
 Valore restituito:
@@ -7499,13 +7629,17 @@ Argomenti:
   (priorità consentita, consultare la nota riguardo la
   <<hook_priority,priority>>)
 * 'callback': funzione chiamata quando viene usato l'elemento completamento
-  (l'utente sta completando qualcosa usando questo elemento), argomenti:
+  (l'utente sta completando qualcosa usando questo elemento), argomenti e valore
+  restituito:
 ** 'void *data': puntatore
 ** 'const char *completion_item': nome dell'elemento del completamento
 ** 'struct t_gui_buffer *buffer': buffer dove viene eseguito il completamento
 ** 'struct t_gui_completion *completion': struttura usata per aggiungere
    parole per il completamento (consultare
    <<_weechat_hook_completion_list_add,weechat_hook_completion_list_add>>)
+** valore restituito:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat
 
 [NOTE]
@@ -7699,17 +7833,24 @@ Argomenti:
   qualsiasi stringa |
   stringa con i codici colori IRC, o senza colore
 
-| irc | irc_in_xxx ^1^ |
+// TRANSLATION MISSING
+| irc | irc_in_xxx ^(1)^ |
   nome server |
-  contenuto del messaggio ricevuto dal server IRC |
+  contenuto del messaggio ricevuto dal server IRC (before charset decoding) |
   nuovo contenuto del messaggio
 
-| irc | irc_out_xxx ^1^ |
+// TRANSLATION MISSING
+| irc | irc_in2_xxx ^(1)^ |
+  nome server |
+  contenuto del messaggio ricevuto dal server IRC (after charset decoding) |
+  nuovo contenuto del messaggio
+
+| irc | irc_out_xxx ^(1)^ |
   nome server |
   contenuto del messaggio che sta per essere inviato al server IRC |
   nuovo contenuto del messaggio
 
-| weechat | bar_condition_yyy ^2^ |
+| weechat | bar_condition_yyy ^(2)^ |
   stringa con puntatore alla finestra ("0x123..") |
   stringa vuota |
   "1" per visualizzare la barra, "0" per nasconderla
@@ -7743,17 +7884,17 @@ Argomenti:
 |========================================
 
 [NOTE]
-^1^ 'xxx' è il nome del comando IRC. +
-^2^ 'yyy' è il nome della barra.
+^(1)^ 'xxx' è il nome del comando IRC. +
+^(2)^ 'yyy' è il nome della barra.
 
 * 'callback': funzione chiamata quando viene usato il modificatore,
-  argomenti:
+  argomenti e valore restituito:
 ** 'void *data': puntatore
 ** 'const char *modifier': nome del modificatore
 ** 'const char *modifier_data': dati per il modificatore
-** 'const char *string': stringa da modificare (la funzione deve restituire
-   una copia di questa stringa, non è consentito alcun cambiamento in
-    questa stringa)
+** 'const char *string': stringa da modificare
+// TRANSLATION MISSING
+** valore restituito: new string
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat
 
 Valore restituito:
@@ -7873,10 +8014,13 @@ Argomenti:
   <<hook_priority,priority>>)
 * 'description': descrizione
 * 'args_description': descrizione degli argomenti
-* 'callback': funzione chiamata alla richiesta di una info, argomenti:
+* 'callback': funzione chiamata alla richiesta di una info, argomenti e valore
+  restituito:
 ** 'void *data': puntatore
 ** 'const char *info_name': nome della info
 ** 'const char *arguments': argomenti addizionali, dipendono dalle info
+// TRANSLATION MISSING
+** valore restituito: value of info asked
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat
 
 Valore restituito:
@@ -7947,10 +8091,13 @@ Argomenti:
   essere NULL)
 * 'output_description': descrizione della tabella hash restituita dalla
   callback (opzionale, può essere NULL)
-* 'callback': funzione chiamata alla richiesta della info, argomenti:
+* 'callback': funzione chiamata alla richiesta della info, argomenti e valore
+  restituito:
 ** 'void *data': puntatore
 ** 'const char *info_name': nome della info
 ** 'struct t_hashtable *hashtable': tabella hash, in base alla info
+// TRANSLATION MISSING
+** valore restituito: hashtable asked
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat
 
 Valore restituito:
@@ -8008,10 +8155,10 @@ struct t_hook *weechat_hook_infolist (const char *infolist_name,
                                       const char *description,
                                       const char *pointer_description,
                                       const char *args_description,
-                                      const char *(*callback)(void *data,
-                                                              const char *infolist_name,
-                                                              void *pointer,
-                                      const char *arguments),
+                                      struct t_infolist *(*callback)(void *data,
+                                                                     const char *infolist_name,
+                                                                     void *pointer,
+                                                                     const char *arguments),
                                       void *callback_data);
 ----------------------------------------
 
@@ -8023,12 +8170,15 @@ Argomenti:
 * 'description': descrizione
 * 'pointer_description': descrizione del puntatore (opzionale, può essere NULL)
 * 'args_description': descrizione degli argomenti (opzionale, può essere NULL)
-* 'callback': funzione chiamata alla richiesta della lista info, argomenti:
+* 'callback': funzione chiamata alla richiesta della lista info, argomenti e
+  valore restituito:
 ** 'void *data': puntatore
 ** 'const char *infolist_name': nome della lista info
 ** 'void *pointer': puntatore ad un oggetto che la lista info deve restituire
    (per ricevere un solo elemento della lista info)
 ** 'const char *arguments': argomento aggiuntivo, dipende dalla lista info
+// TRANSLATION MISSING
+** valore restituito: infolist asked
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat
 
 Valore restituito:
@@ -8174,14 +8324,21 @@ Argomenti:
 
 * 'name': nome del buffer (deve essere unico per il plugin)
 * 'input_callback': funzione chiamata quando il testo in input è stato
-  inserito nel buffer, argomenti:
-*** 'void *data': puntatore
-*** 'struct t_gui_buffer *buffer': puntatore al buffer
-*** 'const char *input_data': dati in input
+  inserito nel buffer, argomenti e valore restituito:
+** 'void *data': puntatore
+** 'struct t_gui_buffer *buffer': puntatore al buffer
+** 'const char *input_data': dati in input
+** valore restituito:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat
-* 'close_callback': funzione chiamata alla chiusura del buffer, argomenti:
-*** 'void *data': puntatore
-*** 'struct t_gui_buffer *buffer': puntatore al buffer
+* 'close_callback': funzione chiamata alla chiusura del buffer, argomenti e
+  valore restituito:
+** 'void *data': puntatore
+** 'struct t_gui_buffer *buffer': puntatore al buffer
+** valore restituito:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat
 
 Valore restituito:
@@ -10078,7 +10235,12 @@ Argomenti:
 
 * 'name': nome dell'elemento barra
 * 'build_callback': funzione chiamata quando l'elemento barra viene
-  compilato; deve restituire il contenuto dell'elemento barra
+  compilato, argomenti e valore restituito:
+** 'void *data': puntatore
+** 'struct t_gui_bar_item *item': puntatore all'elemento barra
+** 'struct t_gui_window *window': puntatore alla finestra
+// TRANSLATION MISSING
+** valore restituito: content of bar item
 * 'build_callback_data': puntatore fornito alla callback quando
   chiamata da WeeChat
 
@@ -11610,7 +11772,16 @@ Argomenti:
 
 * 'upgrade_file': puntatore al file di aggiornamento
 * 'callback_read': funzione chiamata per ogni oggetto letto nel file
-  di aggiornamento
+  di aggiornamento, argomenti e valore restituito:
+** 'void *data': puntatore
+** 'struct t_upgrade_file *upgrade_file': puntatore al file di aggiornamento
+// TRANSLATION MISSING
+** 'int object_id': object id
+// TRANSLATION MISSING
+** 'struct t_infolist *infolist': infolist with content of object
+** valore restituito:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_read_data': puntatore assegnato per la lettura della chiamata
   quando chiamato da WeeChat
 

doc/it/weechat_user.it.txt

@@ -512,6 +512,9 @@ Tasti per buffer / finestre
 | @k(A-)@k(w) , @k(A-)@k(↓) | Passa alla finestra in basso | /window down
 | @k(A-)@k(w) , @k(A-)@k(←) | Passa alla finestra sulla sinistra | /window left
 | @k(A-)@k(w) , @k(A-)@k(→) | Passa alla finestrs sulla destra | /window right
+// TRANSLATION MISSING
+| @k(A-)@k(w) , @k(A-)@k(b) | Resize all windows to 50% | /window balance
+| @k(A-)@k(w) , @k(A-)@k(s) | Swap buffers of two windows | /window swap
 | @k(A-)@k(z)               | Ingrandimento sulla finestra attiva (@k(A-)@k(z) di nuovo: ripristina lo stato iniziale della finestra, prima dell'ingrandimento) | /window zoom
 | @k(A-)@k(<)               | Passa al buffer precedente nella lista dei buffer visitati | /input jump_previously_visited_buffer
 | @k(A-)@k(>)               | Passa al buffer successivo nella lista dei buffer visitati | /input jump_next_visited_buffer

doc/pl/weechat_faq.pl.txt

@@ -668,7 +668,7 @@ Chcę pomóc programistą WeeChat. Co mogę zrobić?
 Jest wiele zadań do zrobienia (testowanie, kod, dokumentacja, ...)
 
 Skontaktuj się z nami na IRC lub mailowo, szczegóły:
-http://www.weechat.org/about
+http://www.weechat.org/support
 
 
 [[donate]]

po/cs.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.5-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-04-19 20:09+0200\n"
+"POT-Creation-Date: 2011-04-28 14:19+0200\n"
 "PO-Revision-Date: 2011-04-10 17:32+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1721,15 +1721,16 @@ msgstr "spravuje okna"
 #, fuzzy
 msgid ""
 "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]"
-"<pct> || merge [all] || page_up|page_down || refresh || scroll|scroll_up|"
-"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
-"scroll_next_highlight || zoom"
+"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|"
+"scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
+"scroll_next_highlight || swap [up|down|left|right] || zoom"
 msgstr ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all] | page_up | page_down | refresh | scroll | "
 "scroll_up | scroll_down | scroll_top | scroll_bottom | "
 "scroll_previous_highlight | scroll_next_highlight | zoom]"
 
+#, fuzzy
 msgid ""
 "         list: list opened windows (without argument, this list is "
 "displayed)\n"
@@ -1744,6 +1745,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
+"      balance: resize all windows to 50%\n"
 "        merge: merge window with another (all = keep only one window)\n"
 "      page_up: scroll one page up\n"
 "    page_down: scroll one page down\n"
@@ -1756,6 +1758,8 @@ msgid ""
 "scroll_bottom: scroll to bottom of buffer\n"
 "scroll_previous_highlight: scroll to previous highlight\n"
 "scroll_next_highlight: scroll to next highlight\n"
+"         swap: swap buffers of two windows (with optional direction for "
+"target window)\n"
 "         zoom: zoom on window\n"
 "\n"
 "For splith and splitv, pct is a percentage which represents size of new "
@@ -2023,6 +2027,11 @@ msgstr ""
 "hodnota vykreslí skutečnou čáru při použití ncurses, ale může způsobit "
 "problém s výběrem URL v některých terminálech"
 
+msgid ""
+"add any buffer to hotlist (including current or visible buffers) if local "
+"variable \"away\" is set on buffer"
+msgstr ""
+
 #, fuzzy
 msgid "string displayed between buffers in hotlist"
 msgstr "seznam bufferů v hotlistu"
@@ -2608,6 +2617,9 @@ msgstr ""
 "Pokud používá tento soubor jiný proces WeeChat, skuste WeeChat pustit\n"
 "s jiným domovským adresářem pomocí \"--dir\" volby příkazové řádky.\n"
 
+msgid "invalid priorities"
+msgstr ""
+
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "typ proxy (http (výchozí), socks4, socks5)"
 
@@ -4797,6 +4809,11 @@ msgstr "čísla pro definované ignorování"
 msgid "nicks in notify list"
 msgstr "%s: žádné ignorování v seznamu"
 
+#, c-format
+msgid ""
+"%s%s: invalid priorities string, error at this position in string: \"%s\""
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
@@ -4851,6 +4868,12 @@ msgstr ""
 "cesta pro hledání pluginů (\"%h\" bude nahrazeno domácím adresářem WeeChat, "
 "\"~/.weechat\" je výchozí)"
 
+msgid ""
+"string with priorities for gnutls (for syntax, see documentation of function "
+"gnutls_priority_init in gnutls manual, common strings are: \"PERFORMANCE\", "
+"\"NORMAL\", \"SECURE128\", \"SECURE256\", \"EXPORT\", \"NONE\")"
+msgstr ""
+
 msgid "size of the key used during the Diffie-Hellman Key Exchange"
 msgstr "velikost klíče použitého při použití výměny klíčů Diffie Hellman"
 
@@ -5228,6 +5251,14 @@ msgstr "barva ukazatele lagu, pokud bylo od serveru obdrženo pong"
 msgid "color for reason in part/quit messages"
 msgstr "barva textu důvodu ve zprávách odchodu/ukončení"
 
+#, fuzzy
+msgid "color for old channel topic (when topic is changed)"
+msgstr "zobrazit staré téma rozhovoru, když se téma změní"
+
+#, fuzzy
+msgid "color for new channel topic (when topic is changed)"
+msgstr "zobrazit staré téma rozhovoru, když se téma změní"
+
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -5601,16 +5632,16 @@ msgstr "%s%s%s%s%s%s%s%s%s%s skončil"
 msgid "%s%s: \"%s\" command received without channel"
 msgstr "%s%s: obdržen \"%s\" příkaz bez kanálu"
 
-#, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\""
+#, fuzzy, c-format
+msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\""
 msgstr "%s%s%s%s změnil téma pro %s%s%s z \"%s%s\" na \"%s%s\""
 
-#, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
+#, fuzzy, c-format
+msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\""
 msgstr "%s%s%s%s změnil téma pro %s%s%s na \"%s%s\""
 
 #, fuzzy, c-format
-msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")"
 msgstr "%s%s%s%s změnil téma pro %s%s%s na \"%s%s\""
 
 #, c-format
@@ -6539,6 +6570,10 @@ msgstr "%sChyba: plugin \"%s\" nenalezen"
 msgid "Plugins unloaded"
 msgstr "Pluginy odebrány"
 
+#, fuzzy
+msgid "description of plugin option"
+msgstr "ukazatel skriptu (volitelný)"
+
 msgid "Actions (letter+enter):"
 msgstr "Akce (písmeno+enter):"
 

po/de.po

@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.5-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-04-19 20:09+0200\n"
-"PO-Revision-Date: 2011-04-15 21:04+0100\n"
+"POT-Creation-Date: 2011-04-28 14:19+0200\n"
+"PO-Revision-Date: 2011-04-28 14:22+0200\n"
 "Last-Translator: Nils G.\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: \n"
@@ -153,9 +153,9 @@ msgstr "  %s (Erweiterung: %s)"
 msgid "No bar item defined"
 msgstr "Es wurde kein Bar-Item festgelegt"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%sError: name can not start with \"#\""
-msgstr "%sFehler: kann die Datei \"%s\" nicht erstellen"
+msgstr "%sFehler: Name darf nicht mit \"#\"beginnen"
 
 #, c-format
 msgid "%sNot enough memory"
@@ -1035,7 +1035,6 @@ msgstr "definiert Farbaliase und stellt eine Palette der möglichen Farben dar"
 msgid "alias <color> <alias> || unalias <color> || reset"
 msgstr "alias <color> <alias> || unalias <color> || reset"
 
-#, fuzzy
 msgid ""
 "  alias: add an alias for a color\n"
 "unalias: delete an alias\n"
@@ -1056,12 +1055,13 @@ msgstr ""
 "  alias: weißt einer Farbzahl einen Namen zu\n"
 "unalias: entfernt einen Namen\n"
 "  color: Farbnummer (>= 0, maximale Anzahl ist abhängig vom Terminal, "
-"üblicherweise 63 oder 255)\n"
+"üblicherweise 63 oder 255 Farben)\n"
 "   name: Aliasname für eine Farbe (zum Beispiel: \"orange\")\n"
 "  reset: setzt alle Farbpaarungen zurück (nützlich falls keine Farbpaarung "
-"mehr verfügbar sein sollte)\n"
+"mehr verfügbar sein sollte und die automatische Reset-Option deaktiviert "
+"ist, siehe Option: weechat.look.color_pairs_auto_reset)\n"
 "\n"
-"Ohne Angabe von Argumenten wird in einem neuen Buffer die nutzbare "
+"Ohne Angabe von Argumenten wird in einem separaten Buffer die darstellbare "
 "Farbpalette angezeigt.\n"
 "\n"
 "Beispiele:\n"
@@ -1863,14 +1863,14 @@ msgstr "Fenster verwalten"
 
 msgid ""
 "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]"
-"<pct> || merge [all] || page_up|page_down || refresh || scroll|scroll_up|"
-"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
-"scroll_next_highlight || zoom"
+"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|"
+"scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
+"scroll_next_highlight || swap [up|down|left|right] || zoom"
 msgstr ""
 "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]"
-"<pct> || merge [all] || page_up|page_down || refresh || scroll|scroll_up|"
-"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
-"scroll_next_highlight || zoom"
+"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|"
+"scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
+"scroll_next_highlight || swap [up|down|left|right] || zoom"
 
 msgid ""
 "         list: list opened windows (without argument, this list is "
@@ -1886,6 +1886,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
+"      balance: resize all windows to 50%\n"
 "        merge: merge window with another (all = keep only one window)\n"
 "      page_up: scroll one page up\n"
 "    page_down: scroll one page down\n"
@@ -1898,6 +1899,8 @@ msgid ""
 "scroll_bottom: scroll to bottom of buffer\n"
 "scroll_previous_highlight: scroll to previous highlight\n"
 "scroll_next_highlight: scroll to next highlight\n"
+"         swap: swap buffers of two windows (with optional direction for "
+"target window)\n"
 "         zoom: zoom on window\n"
 "\n"
 "For splith and splitv, pct is a percentage which represents size of new "
@@ -1928,6 +1931,7 @@ msgstr ""
 "       splitv: teilt das aktuelle Fenster vertikal\n"
 "       resize: verändert die Größe des aktuellen Fensters. Die neue Größe "
 "des Fensters ist prozentual <pct> zum Stammfensters groß\n"
+"      balance: Größe aller Fenster auf 50% ändern\n"
 "        merge: vereinigt Fenster miteinander (all = alle Fenster "
 "vereinigen)\n"
 "      page_up: Scrollt eine Seite nach oben\n"
@@ -1941,6 +1945,8 @@ msgstr ""
 "scroll_bottom: Scrollt zum Ende des  Buffers\n"
 "scroll_previous_highlight: Scrollt zum vorherigen Hightlight\n"
 "scroll_next_highlight: Scrollt zum nächsten Highlight\n"
+"         swap: tauscht die Buffer von zwei Fenstern (mit optionaler Angabe "
+"für das Zielfenster)\n"
 "         zoom: vergrößert auf Fenster\n"
 "\n"
 "Bei splith und splitv gibt \"pct\" die neue Größe des Fensters im Verhältnis "
@@ -2113,6 +2119,10 @@ msgid ""
 "lower or equal to this number (-1 = disable automatic reset, and then a "
 "manual \"/color reset\" is needed when table is full)"
 msgstr ""
+"automatischer Reset der Farbpaarungen sobald die verfügbare Anzahl an Paaren "
+"kleiner oder gleich der hier angegebenen Anzahl ist (-1 = deaktiviert den "
+"automatischen Reset, dann ist ein manueller Reset mittels \"/color reset\" "
+"notwendig falls alle Farbpaarungen belegt sind)"
 
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
@@ -2189,6 +2199,14 @@ msgstr ""
 "Linie. Dies kann allerdings bei einigen Terminals zu Fehlern führen, falls "
 "die URL Auswahl genutzt wird. Wide Chars sind für diese Option NICHT erlaubt."
 
+msgid ""
+"add any buffer to hotlist (including current or visible buffers) if local "
+"variable \"away\" is set on buffer"
+msgstr ""
+"fügt einen beliebigen Buffer zur Hotlist hinzu (dies schließt den aktuellen "
+"oder jeden anderen sichtbaren Buffer ein) sofern die lokale Variable \"away"
+"\" für den Buffer gesetzt wurde"
+
 msgid "string displayed between buffers in hotlist"
 msgstr ""
 "Zeichen welches zum Trennen zwischen den verschiedenen Buffern in der "
@@ -2820,6 +2838,9 @@ msgstr ""
 "Aufruf der \"--dir\" Kommandozeilenoption, WeeChat mit einem anderen Home-"
 "Verzeichnis zu starten.\n"
 
+msgid "invalid priorities"
+msgstr ""
+
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "Proxy-Typ (http (Standard), socks4, socks5)"
 
@@ -2965,7 +2986,7 @@ msgstr "WeeChat Farbpaare (in Benutzung: %d, noch frei verfügbar: %d):"
 
 #, c-format
 msgid "Last auto reset of pairs: %s"
-msgstr ""
+msgstr "zuletzt durchgeführter Reset der Farbpaare: %s"
 
 msgid "WeeChat basic colors:"
 msgstr "WeeChat Basisfarben:"
@@ -3799,9 +3820,9 @@ msgstr ""
 "%s%s: Der Server \"%s\" existiert bereits und kann daher nicht angelegt "
 "werden!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s%s: name can not start with \"#\""
-msgstr "%s%s: Es kann nicht auf die Datei \"%s\" zugreifen werden"
+msgstr "%s%s: Name darf nicht mit \"#\" beginnen"
 
 #, c-format
 msgid "%s%s: unable to create server"
@@ -5001,6 +5022,11 @@ msgstr "Anzahl für festgelegte /ignores"
 msgid "nicks in notify list"
 msgstr "Nicks für die eine Benachrichtigung existiert"
 
+#, c-format
+msgid ""
+"%s%s: invalid priorities string, error at this position in string: \"%s\""
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
@@ -5058,6 +5084,12 @@ msgstr ""
 "(\"%h\" wird durch das WeeChat Verzeichnis ersetzt, Standardverzeichnis: "
 "\"~/.weechat\")"
 
+msgid ""
+"string with priorities for gnutls (for syntax, see documentation of function "
+"gnutls_priority_init in gnutls manual, common strings are: \"PERFORMANCE\", "
+"\"NORMAL\", \"SECURE128\", \"SECURE256\", \"EXPORT\", \"NONE\")"
+msgstr ""
+
 msgid "size of the key used during the Diffie-Hellman Key Exchange"
 msgstr ""
 "Größe des Schlüssels der während des Diffie-Hellman-Schlüsselaustausches "
@@ -5500,6 +5532,14 @@ msgstr ""
 "Textfarbe in der die Begründung einer part/quit Nachricht angezeigt werden "
 "soll"
 
+#, fuzzy
+msgid "color for old channel topic (when topic is changed)"
+msgstr "Zeige den alten Topic, falls der Channel-Topic geändert wurde"
+
+#, fuzzy
+msgid "color for new channel topic (when topic is changed)"
+msgstr "Zeige den alten Topic, falls der Channel-Topic geändert wurde"
+
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -5875,19 +5915,19 @@ msgid "%s%s: \"%s\" command received without channel"
 msgstr "%s%s: Der Befehl \"%s\" wurde ohne Channel empfangen"
 
 #, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\""
+msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\""
 msgstr ""
-"%s%s%s%s hat das Topic für den Channel %s%s%s von \"%s%s\" auf \"%s%s\" "
+"%s%s%s%s hat das Topic für den Channel %s%s%s von \"%s%s%s\" auf \"%s%s%s\" "
 "geändert."
 
 #, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
-msgstr "%s%s%s%s hat das Topic für den Channel %s%s%s auf \"%s%s\" gesetzt."
+msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\""
+msgstr "%s%s%s%s hat das Topic für den Channel %s%s%s auf \"%s%s%s\" gesetzt."
 
 #, c-format
-msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")"
 msgstr ""
-"%s%s%s%s hat das Thema für %s%s%s zurückgesetzt (altes Thema: \"%s%s\")"
+"%s%s%s%s hat das Thema für %s%s%s zurückgesetzt (altes Thema: \"%s%s%s\")"
 
 #, c-format
 msgid "%s%s%s%s has unset topic for %s%s%s"
@@ -6722,13 +6762,13 @@ msgstr ""
 msgid "list of hooks"
 msgstr "Auflistung der Hooks"
 
-#, fuzzy
 msgid ""
 "type,arguments (type is command/timer/.., arguments to get only some hooks "
 "(can start or end with \"*\" as wildcard), both are optional)"
 msgstr ""
-"type,arguments (type ist command/timer/.., arguments dient dazu nur einige "
-"hooks abzufragen, beide Optionen sind optional)"
+"type,arguments (type ist ein command/timer/.., arguments dient dazu nur "
+"einige hooks abzufragen (darf mit einem \"*\" als Platzhalter beginnen oder "
+"enden), beide Optionen sind optional)"
 
 msgid "list of buffers in hotlist"
 msgstr "Liste der Buffer in Hotlist"
@@ -6842,6 +6882,9 @@ msgstr "%sFehler: Die Erweiterung \"%s\" wurde nicht gefunden"
 msgid "Plugins unloaded"
 msgstr "Erweiterungen wurden deinstalliert"
 
+msgid "description of plugin option"
+msgstr "Beschreibung der Erweiterungsoption"
+
 msgid "Actions (letter+enter):"
 msgstr "Aktion (Zeichen+Enter):"
 
@@ -7872,32 +7915,3 @@ msgstr "Hashtable (Ausgabe)"
 
 msgid "Pointer"
 msgstr "Pointer"
-
-#~ msgid "color for prefix of nick which is op/admin/owner on channel"
-#~ msgstr "Textfarbe für den Nick-Präfix von op/admin/owner in einem Channel"
-
-#~ msgid "color for prefix of nick which is halfop on channel"
-#~ msgstr "Textfarbe für den Nick-Präfix des halfop in einem Channel"
-
-#~ msgid "color for prefix of nick which has voice on channel"
-#~ msgstr ""
-#~ "Textfarbe für den Nick-Präfix für einen User mit Voice Rechten in einem "
-#~ "Channel"
-
-#~ msgid "color for prefix of nick which is user on channel"
-#~ msgstr "Textfarbe für den Nick-Präfix eines Users in einem Channel"
-
-#, fuzzy
-#~ msgid "comma separated list of tags that will force highlight"
-#~ msgstr ""
-#~ "Durch Kommata getrennte Liste der Wörterbücher, die in diesem Buffer "
-#~ "genutzt werden"
-
-#~ msgid "%s%s: channel \"%s\" not found for \"%s\" command"
-#~ msgstr "%s%s: Channel \"%s\" für den \"%s\"-Befehl nicht gefunden"
-
-#~ msgid "hook type: command, timer, .. (optional)"
-#~ msgstr "hook Type: command, timer, .. (optional)"
-
-#~ msgid "a color name"
-#~ msgstr "ein Farbname"

po/es.po

@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.5-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-04-19 20:09+0200\n"
-"PO-Revision-Date: 2011-04-10 17:31+0200\n"
+"POT-Creation-Date: 2011-04-28 14:19+0200\n"
+"PO-Revision-Date: 2011-04-28 14:24+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Spanish\n"
@@ -1760,15 +1760,16 @@ msgstr "gestión de ventanas"
 #, fuzzy
 msgid ""
 "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]"
-"<pct> || merge [all] || page_up|page_down || refresh || scroll|scroll_up|"
-"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
-"scroll_next_highlight || zoom"
+"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|"
+"scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
+"scroll_next_highlight || swap [up|down|left|right] || zoom"
 msgstr ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all] | page_up | page_down | refresh | scroll | "
 "scroll_up | scroll_down | scroll_top | scroll_bottom | "
 "scroll_previous_highlight | scroll_next_highlight | zoom]"
 
+#, fuzzy
 msgid ""
 "         list: list opened windows (without argument, this list is "
 "displayed)\n"
@@ -1783,6 +1784,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
+"      balance: resize all windows to 50%\n"
 "        merge: merge window with another (all = keep only one window)\n"
 "      page_up: scroll one page up\n"
 "    page_down: scroll one page down\n"
@@ -1795,6 +1797,8 @@ msgid ""
 "scroll_bottom: scroll to bottom of buffer\n"
 "scroll_previous_highlight: scroll to previous highlight\n"
 "scroll_next_highlight: scroll to next highlight\n"
+"         swap: swap buffers of two windows (with optional direction for "
+"target window)\n"
 "         zoom: zoom on window\n"
 "\n"
 "For splith and splitv, pct is a percentage which represents size of new "
@@ -2074,6 +2078,11 @@ msgstr ""
 "dibujará una línea verdadera con ncurses, pero puede causar errores con la "
 "selección de URLs en algunas terminales"
 
+msgid ""
+"add any buffer to hotlist (including current or visible buffers) if local "
+"variable \"away\" is set on buffer"
+msgstr ""
+
 #, fuzzy
 msgid "string displayed between buffers in hotlist"
 msgstr "lista de buffers en la lista de actividad"
@@ -2674,6 +2683,9 @@ msgstr ""
 "con otro directorio de inicio usando la opción de línea de comandos \"--dir"
 "\"\n"
 
+msgid "invalid priorities"
+msgstr ""
+
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "tipo de proxy(http (por defecto), socks4, socks5)"
 
@@ -4905,6 +4917,11 @@ msgstr "números para los ignores definidos"
 msgid "nicks in notify list"
 msgstr "apodos en la lista de notificación"
 
+#, c-format
+msgid ""
+"%s%s: invalid priorities string, error at this position in string: \"%s\""
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
@@ -4958,6 +4975,12 @@ msgstr ""
 "(\"%h\" será reemplazado por el directorio raíz de WeeChat, \"~/.weechat\" "
 "por defecto)"
 
+msgid ""
+"string with priorities for gnutls (for syntax, see documentation of function "
+"gnutls_priority_init in gnutls manual, common strings are: \"PERFORMANCE\", "
+"\"NORMAL\", \"SECURE128\", \"SECURE256\", \"EXPORT\", \"NONE\")"
+msgstr ""
+
 msgid "size of the key used during the Diffie-Hellman Key Exchange"
 msgstr "tamaño de la llave usada durante Diffie-Hellman Key Exchange"
 
@@ -5361,6 +5384,14 @@ msgstr "color del indicador de lag, cuando se recibió el pong del servidor"
 msgid "color for reason in part/quit messages"
 msgstr "color para el mensaje de salida/abandono"
 
+#, fuzzy
+msgid "color for old channel topic (when topic is changed)"
+msgstr "mostrar el tema anterior cuando se cambia el tema del canal"
+
+#, fuzzy
+msgid "color for new channel topic (when topic is changed)"
+msgstr "mostrar el tema anterior cuando se cambia el tema del canal"
+
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -5733,16 +5764,16 @@ msgid "%s%s: \"%s\" command received without channel"
 msgstr "%s%s: comando \"%s\" recibido sin un canal"
 
 #, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\""
-msgstr "%s%s%s%s ha cambiado el tema para %s%s%s de \"%s%s\" a \"%s%s\""
+msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\""
+msgstr "%s%s%s%s ha cambiado el tema para %s%s%s de \"%s%s%s\" a \"%s%s%s\""
 
 #, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
-msgstr "%s%s%s%s ha cambiado el tema para %s%s%s a \"%s%s\""
+msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\""
+msgstr "%s%s%s%s ha cambiado el tema para %s%s%s a \"%s%s%s\""
 
 #, c-format
-msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
-msgstr "%s%s%s%s ha borrado el tema para %s%s%s (tema anterior: \"%s%s\")"
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")"
+msgstr "%s%s%s%s ha borrado el tema para %s%s%s (tema anterior: \"%s%s%s\")"
 
 #, c-format
 msgid "%s%s%s%s has unset topic for %s%s%s"
@@ -6684,6 +6715,10 @@ msgstr "%sError: plugin \"%s\" no encontrado"
 msgid "Plugins unloaded"
 msgstr "Plugins descargados"
 
+#, fuzzy
+msgid "description of plugin option"
+msgstr "puntero del script (opcional)"
+
 msgid "Actions (letter+enter):"
 msgstr "Acciones (letra+enter)"
 

po/fr.po

@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.5-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-04-19 20:09+0200\n"
-"PO-Revision-Date: 2011-04-19 20:10+0200\n"
+"POT-Creation-Date: 2011-04-28 14:19+0200\n"
+"PO-Revision-Date: 2011-04-28 14:20+0200\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -1818,14 +1818,14 @@ msgstr "gestion des fenêtres"
 
 msgid ""
 "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]"
-"<pct> || merge [all] || page_up|page_down || refresh || scroll|scroll_up|"
-"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
-"scroll_next_highlight || zoom"
+"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|"
+"scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
+"scroll_next_highlight || swap [up|down|left|right] || zoom"
 msgstr ""
 "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]"
-"<pct> || merge [all] || page_up|page_down || refresh || scroll|scroll_up|"
-"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
-"scroll_next_highlight || zoom"
+"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|"
+"scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
+"scroll_next_highlight || swap [up|down|left|right] || zoom"
 
 msgid ""
 "         list: list opened windows (without argument, this list is "
@@ -1841,6 +1841,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
+"      balance: resize all windows to 50%\n"
 "        merge: merge window with another (all = keep only one window)\n"
 "      page_up: scroll one page up\n"
 "    page_down: scroll one page down\n"
@@ -1853,6 +1854,8 @@ msgid ""
 "scroll_bottom: scroll to bottom of buffer\n"
 "scroll_previous_highlight: scroll to previous highlight\n"
 "scroll_next_highlight: scroll to next highlight\n"
+"         swap: swap buffers of two windows (with optional direction for "
+"target window)\n"
 "         zoom: zoom on window\n"
 "\n"
 "For splith and splitv, pct is a percentage which represents size of new "
@@ -1882,6 +1885,7 @@ msgstr ""
 "       splitv: éclater la fenêtre en deux verticalement\n"
 "       resize: redimensionner une fenêtre, la nouvelle taille est <pct> "
 "pourcentage de la fenêtre parent\n"
+"      balance: redimensionner toutes les fenêtres à 50%\n"
 "        merge: fusionner la fenêtre avec une autre\n"
 "      page_up: faire défiler d'une page vers le haut\n"
 "    page_down: faire défiler d'une page vers le bas\n"
@@ -1894,6 +1898,8 @@ msgstr ""
 "scroll_bottom: faire défiler jusqu'en bas du tampon\n"
 "scroll_previous_highlight: faire défiler jusqu'au highlight précédent\n"
 "scroll_next_highlight: faire défiler jusqu'au highlight suivant\n"
+"         swap: échanger les tampons de deux fenêtres (avec une direction "
+"facultative pour la fenêtre cible)\n"
 "         zoom: zoomer sur la fenêtre\n"
 "\n"
 "Pour splith et splitv, pct est un pourcentage qui représente la taille de la "
@@ -2138,6 +2144,13 @@ msgstr ""
 "problèmes d'affichage avec la sélection d'URL sous certains terminaux), les "
 "caractères larges ne sont PAS autorisés ici"
 
+msgid ""
+"add any buffer to hotlist (including current or visible buffers) if local "
+"variable \"away\" is set on buffer"
+msgstr ""
+"ajouter tout tampon dans la hotlist (incluant le tampon courant ou les "
+"tampons visibles) si la variable locale \"away\" est définie sur le tampon"
+
 msgid "string displayed between buffers in hotlist"
 msgstr "chaîne affichée entre les tampons dans la hotlist"
 
@@ -2766,6 +2779,9 @@ msgstr ""
 "un autre répertoire de base en utilisant l'option de ligne de commande \"--"
 "dir\".\n"
 
+msgid "invalid priorities"
+msgstr "priorités invalides"
+
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "type de proxy (http (défaut), socks4, socks5)"
 
@@ -4918,6 +4934,13 @@ msgstr "numéros pour les ignores définis"
 msgid "nicks in notify list"
 msgstr "pseudos dans la liste de notifications"
 
+#, c-format
+msgid ""
+"%s%s: invalid priorities string, error at this position in string: \"%s\""
+msgstr ""
+"%s%s: chaîne de priorités invalide, erreur à cette position dans la chaîne : "
+"\"%s\""
+
 #, c-format
 msgid ""
 "%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
@@ -4973,6 +4996,16 @@ msgstr ""
 "pseudo (\"%h\" sera remplacé par le répertoire de base WeeChat, par défaut: "
 "\"~/.weechat\")"
 
+msgid ""
+"string with priorities for gnutls (for syntax, see documentation of function "
+"gnutls_priority_init in gnutls manual, common strings are: \"PERFORMANCE\", "
+"\"NORMAL\", \"SECURE128\", \"SECURE256\", \"EXPORT\", \"NONE\")"
+msgstr ""
+"chaîne avec les priorités pour gnutls (pour la syntaxe, voir la "
+"documentation de la fonction gnutls_priority_init du manuel gnutls, les "
+"chaînes courantes sont: \"PERFORMANCE\", \"NORMAL\", \"SECURE128\", "
+"\"SECURE256\", \"EXPORT\", \"NONE\")"
+
 msgid "size of the key used during the Diffie-Hellman Key Exchange"
 msgstr "taille de clé utilisée pour l'échange de clé Diffie-Hellman"
 
@@ -5392,6 +5425,12 @@ msgstr ""
 msgid "color for reason in part/quit messages"
 msgstr "couleur pour la raison dans les messages part/quit"
 
+msgid "color for old channel topic (when topic is changed)"
+msgstr "couleur pour l'ancien titre du canal (lorsque le titre est changé)"
+
+msgid "color for new channel topic (when topic is changed)"
+msgstr "couleur pour le nouveau titre du canal (lorsque le titre est changé)"
+
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -5761,16 +5800,16 @@ msgid "%s%s: \"%s\" command received without channel"
 msgstr "%s%s: commande \"%s\" reçue sans canal"
 
 #, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\""
-msgstr "%s%s%s%s a changé le titre pour %s%s%s de \"%s%s\" en \"%s%s\""
+msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\""
+msgstr "%s%s%s%s a changé le titre pour %s%s%s de \"%s%s%s\" en \"%s%s%s\""
 
 #, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
-msgstr "%s%s%s%s a changé le titre pour %s%s%s en \"%s%s\""
+msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\""
+msgstr "%s%s%s%s a changé le titre pour %s%s%s en \"%s%s%s\""
 
 #, c-format
-msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
-msgstr "%s%s%s%s a retiré le titre pour %s%s%s (ancien titre: \"%s%s\")"
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")"
+msgstr "%s%s%s%s a retiré le titre pour %s%s%s (ancien titre: \"%s%s%s\")"
 
 #, c-format
 msgid "%s%s%s%s has unset topic for %s%s%s"
@@ -6710,6 +6749,9 @@ msgstr "%sErreur: extension \"%s\" non trouvée"
 msgid "Plugins unloaded"
 msgstr "Extensions déchargées"
 
+msgid "description of plugin option"
+msgstr "description de l'option d'extension"
+
 msgid "Actions (letter+enter):"
 msgstr "Actions (lettre+entrée):"
 

po/hu.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.5-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-04-19 20:09+0200\n"
+"POT-Creation-Date: 2011-04-28 14:19+0200\n"
 "PO-Revision-Date: 2011-04-10 11:21+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1521,9 +1521,9 @@ msgstr "ablakok kezelése"
 #, fuzzy
 msgid ""
 "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]"
-"<pct> || merge [all] || page_up|page_down || refresh || scroll|scroll_up|"
-"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
-"scroll_next_highlight || zoom"
+"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|"
+"scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
+"scroll_next_highlight || swap [up|down|left|right] || zoom"
 msgstr ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
@@ -1543,6 +1543,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
+"      balance: resize all windows to 50%\n"
 "        merge: merge window with another (all = keep only one window)\n"
 "      page_up: scroll one page up\n"
 "    page_down: scroll one page down\n"
@@ -1555,6 +1556,8 @@ msgid ""
 "scroll_bottom: scroll to bottom of buffer\n"
 "scroll_previous_highlight: scroll to previous highlight\n"
 "scroll_next_highlight: scroll to next highlight\n"
+"         swap: swap buffers of two windows (with optional direction for "
+"target window)\n"
 "         zoom: zoom on window\n"
 "\n"
 "For splith and splitv, pct is a percentage which represents size of new "
@@ -1806,6 +1809,11 @@ msgid ""
 "terminals), wide chars are NOT allowed here"
 msgstr ""
 
+msgid ""
+"add any buffer to hotlist (including current or visible buffers) if local "
+"variable \"away\" is set on buffer"
+msgstr ""
+
 #, fuzzy
 msgid "string displayed between buffers in hotlist"
 msgstr "kiemelendő szavak listája"
@@ -2402,6 +2410,9 @@ msgstr ""
 "Ha egy másik WeeChat folyamat használja ezt a fájlt, próbálja másik\n"
 "saját könyvtárral futtatni a WeeChat-et a \"--dir\" opció segítségével!\n"
 
+msgid "invalid priorities"
+msgstr ""
+
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "proxy típus (http (alapértelmezett), socks4, socks5)"
 
@@ -4479,6 +4490,11 @@ msgstr ""
 msgid "nicks in notify list"
 msgstr "%s nem található ilyen mellőzés\n"
 
+#, c-format
+msgid ""
+"%s%s: invalid priorities string, error at this position in string: \"%s\""
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
@@ -4525,6 +4541,12 @@ msgstr ""
 "modulok elérési útvonala ('%h' helyére automatikusan a WeeChat saját  "
 "könyvtára, alapértelmezésben ~/.weechat, kerül)"
 
+msgid ""
+"string with priorities for gnutls (for syntax, see documentation of function "
+"gnutls_priority_init in gnutls manual, common strings are: \"PERFORMANCE\", "
+"\"NORMAL\", \"SECURE128\", \"SECURE256\", \"EXPORT\", \"NONE\")"
+msgstr ""
+
 msgid "size of the key used during the Diffie-Hellman Key Exchange"
 msgstr ""
 
@@ -4899,6 +4921,12 @@ msgstr ""
 msgid "color for reason in part/quit messages"
 msgstr "alapértelmezett kilépő üzenet"
 
+msgid "color for old channel topic (when topic is changed)"
+msgstr ""
+
+msgid "color for new channel topic (when topic is changed)"
+msgstr ""
+
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -5279,15 +5307,15 @@ msgid "%s%s: \"%s\" command received without channel"
 msgstr "%s \"%s\" parancs érkezett szoba megadása nélkül\n"
 
 #, fuzzy, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\""
+msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\""
 msgstr "%s%s%s megváltoztatta a %s%s%s szoba témáját:"
 
 #, fuzzy, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
+msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\""
 msgstr "%s%s%s megváltoztatta a %s%s%s szoba témáját:"
 
 #, fuzzy, c-format
-msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")"
 msgstr "%s%s%s megváltoztatta a %s%s%s szoba témáját:"
 
 #, fuzzy, c-format
@@ -6166,6 +6194,9 @@ msgstr "%s a \"%s\" modul nem található\n"
 msgid "Plugins unloaded"
 msgstr "Betöltött modulok:\n"
 
+msgid "description of plugin option"
+msgstr ""
+
 msgid "Actions (letter+enter):"
 msgstr ""
 

po/it.po

@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.5-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-04-19 20:09+0200\n"
-"PO-Revision-Date: 2011-04-10 17:33+0200\n"
+"POT-Creation-Date: 2011-04-28 14:19+0200\n"
+"PO-Revision-Date: 2011-04-28 14:24+0200\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Italian\n"
@@ -1808,17 +1808,19 @@ msgstr ""
 msgid "manage windows"
 msgstr "gestione finestre"
 
+#, fuzzy
 msgid ""
 "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]"
-"<pct> || merge [all] || page_up|page_down || refresh || scroll|scroll_up|"
-"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
-"scroll_next_highlight || zoom"
+"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|"
+"scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
+"scroll_next_highlight || swap [up|down|left|right] || zoom"
 msgstr ""
 "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-] "
 "<pct> || merge [all] || page_up|page_down || refresh || scroll|scroll_up|"
 "scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
 "scroll_next_highlight || zoom"
 
+#, fuzzy
 msgid ""
 "         list: list opened windows (without argument, this list is "
 "displayed)\n"
@@ -1833,6 +1835,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
+"      balance: resize all windows to 50%\n"
 "        merge: merge window with another (all = keep only one window)\n"
 "      page_up: scroll one page up\n"
 "    page_down: scroll one page down\n"
@@ -1845,6 +1848,8 @@ msgid ""
 "scroll_bottom: scroll to bottom of buffer\n"
 "scroll_previous_highlight: scroll to previous highlight\n"
 "scroll_next_highlight: scroll to next highlight\n"
+"         swap: swap buffers of two windows (with optional direction for "
+"target window)\n"
 "         zoom: zoom on window\n"
 "\n"
 "For splith and splitv, pct is a percentage which represents size of new "
@@ -2126,6 +2131,11 @@ msgstr ""
 "con la selezione dell'URL in alcuni terminali), i caratteri wide NON sono "
 "consentiti"
 
+msgid ""
+"add any buffer to hotlist (including current or visible buffers) if local "
+"variable \"away\" is set on buffer"
+msgstr ""
+
 #, fuzzy
 msgid "string displayed between buffers in hotlist"
 msgstr "elenco dei buffer nella hotlist"
@@ -2733,6 +2743,9 @@ msgstr ""
 "Se un'altra istanza di WeeChat usa questo file, eseguire WeeChat\n"
 "con un'altra home usando l'opzione da riga di comando  \"--dir\".\n"
 
+msgid "invalid priorities"
+msgstr ""
+
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "tipo di proxy (http (predefinito), socks4, socks5)"
 
@@ -4871,6 +4884,11 @@ msgstr "numero di ignore definiti"
 msgid "nicks in notify list"
 msgstr "nick nella lista notifiche"
 
+#, c-format
+msgid ""
+"%s%s: invalid priorities string, error at this position in string: \"%s\""
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
@@ -4924,6 +4942,12 @@ msgstr ""
 "nick (\"%h\" sarà sostituito dalla home di WeeChat, \"~/.weechat come "
 "predefinita)"
 
+msgid ""
+"string with priorities for gnutls (for syntax, see documentation of function "
+"gnutls_priority_init in gnutls manual, common strings are: \"PERFORMANCE\", "
+"\"NORMAL\", \"SECURE128\", \"SECURE256\", \"EXPORT\", \"NONE\")"
+msgstr ""
+
 msgid "size of the key used during the Diffie-Hellman Key Exchange"
 msgstr ""
 "dimensione della chiave utilizzata durante lo Scambio Chiavi Diffie-Hellman"
@@ -5337,6 +5361,14 @@ msgstr ""
 msgid "color for reason in part/quit messages"
 msgstr "colore per il motivo nei messaggi di uscita/abbandono"
 
+#, fuzzy
+msgid "color for old channel topic (when topic is changed)"
+msgstr "visualizza l'argomento del canale precedente quando viene cambiato"
+
+#, fuzzy
+msgid "color for new channel topic (when topic is changed)"
+msgstr "visualizza l'argomento del canale precedente quando viene cambiato"
+
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -5708,17 +5740,17 @@ msgid "%s%s: \"%s\" command received without channel"
 msgstr "%s%s: comando \"%s\" ricevuto senza alcun canale"
 
 #, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\""
-msgstr "%s%s%s%s ha cambiato l'argomento per %s%s%s da \"%s%s\" a \"%s%s\""
+msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\""
+msgstr "%s%s%s%s ha cambiato l'argomento per %s%s%s da \"%s%s%s\" a \"%s%s%s\""
 
 #, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
-msgstr "%s%s%s%s ha cambiato argomento per %s%s%s in \"%s%s\""
+msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\""
+msgstr "%s%s%s%s ha cambiato argomento per %s%s%s in \"%s%s%s\""
 
 #, c-format
-msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")"
 msgstr ""
-"%s%s%s%s ha rimosso l'argomento per %s%s%s (argomento precedente: \"%s%s\")"
+"%s%s%s%s ha rimosso l'argomento per %s%s%s (argomento precedente: \"%s%s%s\")"
 
 #, c-format
 msgid "%s%s%s%s has unset topic for %s%s%s"
@@ -6654,6 +6686,10 @@ msgstr "%sErrore: plugin \"%s\" non trovato"
 msgid "Plugins unloaded"
 msgstr "Plugin disattivati"
 
+#, fuzzy
+msgid "description of plugin option"
+msgstr "puntatore allo script (opzionale)"
+
 msgid "Actions (letter+enter):"
 msgstr "Azioni (lettera+invio)"
 

po/pl.po

@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.5-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-04-19 20:09+0200\n"
+"POT-Creation-Date: 2011-04-28 14:19+0200\n"
 "PO-Revision-Date: 2011-04-10 17:32+0200\n"
 "Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1766,15 +1766,16 @@ msgstr "zarządza oknami"
 #, fuzzy
 msgid ""
 "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]"
-"<pct> || merge [all] || page_up|page_down || refresh || scroll|scroll_up|"
-"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
-"scroll_next_highlight || zoom"
+"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|"
+"scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
+"scroll_next_highlight || swap [up|down|left|right] || zoom"
 msgstr ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all] | page_up | page_down | refresh | scroll | "
 "scroll_up | scroll_down | scroll_top | scroll_bottom | "
 "scroll_previous_highlight | scroll_next_highlight | zoom]"
 
+#, fuzzy
 msgid ""
 "         list: list opened windows (without argument, this list is "
 "displayed)\n"
@@ -1789,6 +1790,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
+"      balance: resize all windows to 50%\n"
 "        merge: merge window with another (all = keep only one window)\n"
 "      page_up: scroll one page up\n"
 "    page_down: scroll one page down\n"
@@ -1801,6 +1803,8 @@ msgid ""
 "scroll_bottom: scroll to bottom of buffer\n"
 "scroll_previous_highlight: scroll to previous highlight\n"
 "scroll_next_highlight: scroll to next highlight\n"
+"         swap: swap buffers of two windows (with optional direction for "
+"target window)\n"
 "         zoom: zoom on window\n"
 "\n"
 "For splith and splitv, pct is a percentage which represents size of new "
@@ -2080,6 +2084,11 @@ msgstr ""
 "linii w ncurses, jednak może powodowac błędy w zaznaczaniu URLi w niektórych "
 "terminalach"
 
+msgid ""
+"add any buffer to hotlist (including current or visible buffers) if local "
+"variable \"away\" is set on buffer"
+msgstr ""
+
 #, fuzzy
 msgid "string displayed between buffers in hotlist"
 msgstr "lista buforów w hotliście"
@@ -2668,6 +2677,9 @@ msgstr ""
 "Jeżeli inny proces WeeChat używa tego pliku, spróbuj uruchomić WeeChat\n"
 "w innym katalogu domowym używając w linii komend opcji \"--dir\".\n"
 
+msgid "invalid priorities"
+msgstr ""
+
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "typ proxy (http (domyślny), socks4, socks5)"
 
@@ -4884,6 +4896,11 @@ msgstr "numery zdefiniowanych irgnorów"
 msgid "nicks in notify list"
 msgstr "nicki na liście powiadomień"
 
+#, c-format
+msgid ""
+"%s%s: invalid priorities string, error at this position in string: \"%s\""
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
@@ -4936,6 +4953,12 @@ msgstr ""
 "plik certyfikatu SSL używany do automatycznego uwierzytelnienia nicka (\"%h"
 "\" zostanie zastąpione katalogiem domowym WeeChat, domyślnie \"~/.weechat\")"
 
+msgid ""
+"string with priorities for gnutls (for syntax, see documentation of function "
+"gnutls_priority_init in gnutls manual, common strings are: \"PERFORMANCE\", "
+"\"NORMAL\", \"SECURE128\", \"SECURE256\", \"EXPORT\", \"NONE\")"
+msgstr ""
+
 msgid "size of the key used during the Diffie-Hellman Key Exchange"
 msgstr ""
 "rozmiar klucza używanego podczas połączenia Wymiany Kluczy Diffie-Hellmana"
@@ -5335,6 +5358,14 @@ msgstr "kolor wskaźnika opóźnienia, kiedy otrzymamy pong od serwera"
 msgid "color for reason in part/quit messages"
 msgstr "kolor tekstu powodu opuszczenia kanału/wyjścia z IRC"
 
+#, fuzzy
+msgid "color for old channel topic (when topic is changed)"
+msgstr "wyświetl stary temat, kiedy zmieniany jest temat kanału"
+
+#, fuzzy
+msgid "color for new channel topic (when topic is changed)"
+msgstr "wyświetl stary temat, kiedy zmieniany jest temat kanału"
+
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -5704,16 +5735,16 @@ msgstr "%s%s%s%s%s%s%s%s%s%s wyszedł z IRC"
 msgid "%s%s: \"%s\" command received without channel"
 msgstr "%s%s: \"%s\" komenda otrzymana bez kanału"
 
-#, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\""
+#, fuzzy, c-format
+msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\""
 msgstr "%s%s%s%s zmienił temat %s%s%s z \"%s%s\" na \"%s%s\""
 
-#, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
+#, fuzzy, c-format
+msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\""
 msgstr "%s%s%s%s zmienił temat %s%s%s na \"%s%s\""
 
-#, c-format
-msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+#, fuzzy, c-format
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")"
 msgstr "%s%s%s%s skasował temat dla %s%s%s (stary temat: \"%s%s\")"
 
 #, c-format
@@ -6629,6 +6660,10 @@ msgstr "%sBłąd: nie znaleziono wtyczki \"%s\""
 msgid "Plugins unloaded"
 msgstr "Wyładowano pluginy"
 
+#, fuzzy
+msgid "description of plugin option"
+msgstr "wskaźnik skryptu (opcjonalne)"
+
 msgid "Actions (letter+enter):"
 msgstr "Akcje (litera+enter)"
 

po/pt_BR.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.5-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-04-19 20:09+0200\n"
+"POT-Creation-Date: 2011-04-28 14:19+0200\n"
 "PO-Revision-Date: 2011-04-10 11:22+0200\n"
 "Last-Translator: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1750,15 +1750,16 @@ msgstr "gerencia janelas"
 #, fuzzy
 msgid ""
 "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]"
-"<pct> || merge [all] || page_up|page_down || refresh || scroll|scroll_up|"
-"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
-"scroll_next_highlight || zoom"
+"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|"
+"scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
+"scroll_next_highlight || swap [up|down|left|right] || zoom"
 msgstr ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all] | page_up | page_down | refresh | scroll | "
 "scroll_up | scroll_down | scroll_top | scroll_bottom | "
 "scroll_previous_highlight | scroll_next_highlight | zoom]"
 
+#, fuzzy
 msgid ""
 "         list: list opened windows (without argument, this list is "
 "displayed)\n"
@@ -1773,6 +1774,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
+"      balance: resize all windows to 50%\n"
 "        merge: merge window with another (all = keep only one window)\n"
 "      page_up: scroll one page up\n"
 "    page_down: scroll one page down\n"
@@ -1785,6 +1787,8 @@ msgid ""
 "scroll_bottom: scroll to bottom of buffer\n"
 "scroll_previous_highlight: scroll to previous highlight\n"
 "scroll_next_highlight: scroll to next highlight\n"
+"         swap: swap buffers of two windows (with optional direction for "
+"target window)\n"
 "         zoom: zoom on window\n"
 "\n"
 "For splith and splitv, pct is a percentage which represents size of new "
@@ -2071,6 +2075,11 @@ msgstr ""
 "vai desenha ruma linha real com ncurses, mas pode causar bugs com seleção de "
 "URL em alguns terminais"
 
+msgid ""
+"add any buffer to hotlist (including current or visible buffers) if local "
+"variable \"away\" is set on buffer"
+msgstr ""
+
 msgid "string displayed between buffers in hotlist"
 msgstr ""
 
@@ -2591,6 +2600,9 @@ msgid ""
 "with another home using \"--dir\" command line option.\n"
 msgstr ""
 
+msgid "invalid priorities"
+msgstr ""
+
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr ""
 
@@ -4354,6 +4366,11 @@ msgstr ""
 msgid "nicks in notify list"
 msgstr ""
 
+#, c-format
+msgid ""
+"%s%s: invalid priorities string, error at this position in string: \"%s\""
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
@@ -4396,6 +4413,12 @@ msgid ""
 "be replaced by WeeChat home, \"~/.weechat\" by default)"
 msgstr ""
 
+msgid ""
+"string with priorities for gnutls (for syntax, see documentation of function "
+"gnutls_priority_init in gnutls manual, common strings are: \"PERFORMANCE\", "
+"\"NORMAL\", \"SECURE128\", \"SECURE256\", \"EXPORT\", \"NONE\")"
+msgstr ""
+
 msgid "size of the key used during the Diffie-Hellman Key Exchange"
 msgstr ""
 
@@ -4719,6 +4742,12 @@ msgstr ""
 msgid "color for reason in part/quit messages"
 msgstr ""
 
+msgid "color for old channel topic (when topic is changed)"
+msgstr ""
+
+msgid "color for new channel topic (when topic is changed)"
+msgstr ""
+
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -5064,15 +5093,15 @@ msgid "%s%s: \"%s\" command received without channel"
 msgstr ""
 
 #, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\""
+msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\""
 msgstr ""
 
 #, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
+msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\""
 msgstr ""
 
 #, c-format
-msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")"
 msgstr ""
 
 #, c-format
@@ -5892,6 +5921,9 @@ msgstr ""
 msgid "Plugins unloaded"
 msgstr ""
 
+msgid "description of plugin option"
+msgstr ""
+
 msgid "Actions (letter+enter):"
 msgstr ""
 

po/ru.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.5-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-04-19 20:09+0200\n"
+"POT-Creation-Date: 2011-04-28 14:19+0200\n"
 "PO-Revision-Date: 2011-04-10 17:33+0200\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1530,9 +1530,9 @@ msgstr "управление окнами"
 #, fuzzy
 msgid ""
 "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]"
-"<pct> || merge [all] || page_up|page_down || refresh || scroll|scroll_up|"
-"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
-"scroll_next_highlight || zoom"
+"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|"
+"scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
+"scroll_next_highlight || swap [up|down|left|right] || zoom"
 msgstr ""
 "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
 "[pct] | resize pct | merge [all]]"
@@ -1552,6 +1552,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
+"      balance: resize all windows to 50%\n"
 "        merge: merge window with another (all = keep only one window)\n"
 "      page_up: scroll one page up\n"
 "    page_down: scroll one page down\n"
@@ -1564,6 +1565,8 @@ msgid ""
 "scroll_bottom: scroll to bottom of buffer\n"
 "scroll_previous_highlight: scroll to previous highlight\n"
 "scroll_next_highlight: scroll to next highlight\n"
+"         swap: swap buffers of two windows (with optional direction for "
+"target window)\n"
 "         zoom: zoom on window\n"
 "\n"
 "For splith and splitv, pct is a percentage which represents size of new "
@@ -1815,6 +1818,11 @@ msgid ""
 "terminals), wide chars are NOT allowed here"
 msgstr ""
 
+msgid ""
+"add any buffer to hotlist (including current or visible buffers) if local "
+"variable \"away\" is set on buffer"
+msgstr ""
+
 #, fuzzy
 msgid "string displayed between buffers in hotlist"
 msgstr "максимальная длина имён в хотлисте"
@@ -2418,6 +2426,9 @@ msgstr ""
 "WeeChat\n"
 "с другой домашней директорией используя параметр \"--dir\".\n"
 
+msgid "invalid priorities"
+msgstr ""
+
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "тип proxy сервера (http (по-умолчанию), socks4, socks5)"
 
@@ -4488,6 +4499,11 @@ msgstr ""
 msgid "nicks in notify list"
 msgstr "%s игнорирования не найдены\n"
 
+#, c-format
+msgid ""
+"%s%s: invalid priorities string, error at this position in string: \"%s\""
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
@@ -4534,6 +4550,12 @@ msgstr ""
 "путь поиска pluginов ('%h' заменяется на домашний каталог WeeChat, по "
 "умолчанию - ~/.weechat)"
 
+msgid ""
+"string with priorities for gnutls (for syntax, see documentation of function "
+"gnutls_priority_init in gnutls manual, common strings are: \"PERFORMANCE\", "
+"\"NORMAL\", \"SECURE128\", \"SECURE256\", \"EXPORT\", \"NONE\")"
+msgstr ""
+
 msgid "size of the key used during the Diffie-Hellman Key Exchange"
 msgstr ""
 
@@ -4906,6 +4928,12 @@ msgstr ""
 msgid "color for reason in part/quit messages"
 msgstr "сообщение о выходе по-умолчанию"
 
+msgid "color for old channel topic (when topic is changed)"
+msgstr ""
+
+msgid "color for new channel topic (when topic is changed)"
+msgstr ""
+
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -5293,15 +5321,15 @@ msgid "%s%s: \"%s\" command received without channel"
 msgstr "%s \"%s\" команда получена без канала\n"
 
 #, fuzzy, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\""
+msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\""
 msgstr "%s%s%s сменил тему %s%s%s на:"
 
 #, fuzzy, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
+msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\""
 msgstr "%s%s%s сменил тему %s%s%s на:"
 
 #, fuzzy, c-format
-msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")"
 msgstr "%s%s%s сменил тему %s%s%s на:"
 
 #, fuzzy, c-format
@@ -6180,6 +6208,9 @@ msgstr "%s plugin \"%s\" не найден\n"
 msgid "Plugins unloaded"
 msgstr "Загруженные plugin'ы\n"
 
+msgid "description of plugin option"
+msgstr ""
+
 msgid "Actions (letter+enter):"
 msgstr ""
 

po/weechat.pot

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-04-19 20:09+0200\n"
+"POT-Creation-Date: 2011-04-28 14:19+0200\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"
@@ -1332,9 +1332,9 @@ msgstr ""
 
 msgid ""
 "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]"
-"<pct> || merge [all] || page_up|page_down || refresh || scroll|scroll_up|"
-"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
-"scroll_next_highlight || zoom"
+"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|"
+"scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
+"scroll_next_highlight || swap [up|down|left|right] || zoom"
 msgstr ""
 
 msgid ""
@@ -1351,6 +1351,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
+"      balance: resize all windows to 50%\n"
 "        merge: merge window with another (all = keep only one window)\n"
 "      page_up: scroll one page up\n"
 "    page_down: scroll one page down\n"
@@ -1363,6 +1364,8 @@ msgid ""
 "scroll_bottom: scroll to bottom of buffer\n"
 "scroll_previous_highlight: scroll to previous highlight\n"
 "scroll_next_highlight: scroll to next highlight\n"
+"         swap: swap buffers of two windows (with optional direction for "
+"target window)\n"
 "         zoom: zoom on window\n"
 "\n"
 "For splith and splitv, pct is a percentage which represents size of new "
@@ -1561,6 +1564,11 @@ msgid ""
 "terminals), wide chars are NOT allowed here"
 msgstr ""
 
+msgid ""
+"add any buffer to hotlist (including current or visible buffers) if local "
+"variable \"away\" is set on buffer"
+msgstr ""
+
 msgid "string displayed between buffers in hotlist"
 msgstr ""
 
@@ -2066,6 +2074,9 @@ msgid ""
 "with another home using \"--dir\" command line option.\n"
 msgstr ""
 
+msgid "invalid priorities"
+msgstr ""
+
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr ""
 
@@ -3815,6 +3826,11 @@ msgstr ""
 msgid "nicks in notify list"
 msgstr ""
 
+#, c-format
+msgid ""
+"%s%s: invalid priorities string, error at this position in string: \"%s\""
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
@@ -3857,6 +3873,12 @@ msgid ""
 "be replaced by WeeChat home, \"~/.weechat\" by default)"
 msgstr ""
 
+msgid ""
+"string with priorities for gnutls (for syntax, see documentation of function "
+"gnutls_priority_init in gnutls manual, common strings are: \"PERFORMANCE\", "
+"\"NORMAL\", \"SECURE128\", \"SECURE256\", \"EXPORT\", \"NONE\")"
+msgstr ""
+
 msgid "size of the key used during the Diffie-Hellman Key Exchange"
 msgstr ""
 
@@ -4180,6 +4202,12 @@ msgstr ""
 msgid "color for reason in part/quit messages"
 msgstr ""
 
+msgid "color for old channel topic (when topic is changed)"
+msgstr ""
+
+msgid "color for new channel topic (when topic is changed)"
+msgstr ""
+
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -4525,15 +4553,15 @@ msgid "%s%s: \"%s\" command received without channel"
 msgstr ""
 
 #, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\""
+msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\""
 msgstr ""
 
 #, c-format
-msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
+msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\""
 msgstr ""
 
 #, c-format
-msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")"
 msgstr ""
 
 #, c-format
@@ -5353,6 +5381,9 @@ msgstr ""
 msgid "Plugins unloaded"
 msgstr ""
 
+msgid "description of plugin option"
+msgstr ""
+
 msgid "Actions (letter+enter):"
 msgstr ""
 

src/core/wee-command.c

@@ -4477,6 +4477,14 @@ COMMAND_CALLBACK(window)
         return WEECHAT_RC_OK;
     }
     
+    /* balance windows */
+    if (string_strcasecmp (argv[1], "balance") == 0)
+    {
+        if (gui_window_balance (gui_windows_tree))
+            gui_window_ask_refresh (1);
+        return WEECHAT_RC_OK;
+    }
+    
     /* merge windows */
     if (string_strcasecmp (argv[1], "merge") == 0)
     {
@@ -4515,8 +4523,10 @@ COMMAND_CALLBACK(window)
         error = NULL;
         number = strtol (argv[1] + 1, &error, 10);
         if (error && !error[0])
+        {
             gui_window_switch_by_buffer (gui_current_window, number);
-        return WEECHAT_RC_OK;
+            return WEECHAT_RC_OK;
+        }
     }
     
     /* switch to previous window */
@@ -4568,7 +4578,37 @@ COMMAND_CALLBACK(window)
             gui_window_scroll (gui_current_window, argv[2]);
         return WEECHAT_RC_OK;
     }
-
+    
+    /* swap windows */
+    if (string_strcasecmp (argv[1], "swap") == 0)
+    {
+        if (argc > 2)
+        {
+            if (string_strcasecmp (argv[2], "up") == 0)
+                gui_window_swap (gui_current_window, 1);
+            else if (string_strcasecmp (argv[2], "down") == 0)
+                gui_window_swap (gui_current_window, 3);
+            else if (string_strcasecmp (argv[2], "left") == 0)
+                gui_window_swap (gui_current_window, 4);
+            else if (string_strcasecmp (argv[2], "right") == 0)
+                gui_window_swap (gui_current_window, 2);
+            else
+            {
+                gui_chat_printf (NULL,
+                                 _("%sError: unknown option for \"%s\" "
+                                   "command"),
+                                 gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
+                                 "window swap");
+                return WEECHAT_RC_OK;
+            }
+        }
+        else
+        {
+            gui_window_swap (gui_current_window, 0);
+        }
+        return WEECHAT_RC_OK;
+    }
+    
     /* zoom window */
     if (string_strcasecmp (argv[1], "zoom") == 0)
     {
@@ -5225,12 +5265,14 @@ command_init ()
                      " || -1|+1|b#|up|down|left|right"
                      " || splith|splitv [<pct>]"
                      " || resize [+/-]<pct>"
+                     " || balance"
                      " || merge [all]"
                      " || page_up|page_down"
                      " || refresh"
                      " || scroll|scroll_up|scroll_down|scroll_top|"
                      "scroll_bottom|scroll_previous_highlight|"
                      "scroll_next_highlight"
+                     " || swap [up|down|left|right]"
                      " || zoom"),
                   N_("         list: list opened windows (without argument, "
                      "this list is displayed)\n"
@@ -5245,6 +5287,7 @@ command_init ()
                      "       splitv: split current window vertically\n"
                      "       resize: resize window size, new size is <pct> "
                      "percentage of parent window\n"
+                     "      balance: resize all windows to 50%\n"
                      "        merge: merge window with another (all = keep only one "
                      "window)\n"
                      "      page_up: scroll one page up\n"
@@ -5258,6 +5301,8 @@ command_init ()
                      "scroll_bottom: scroll to bottom of buffer\n"
                      "scroll_previous_highlight: scroll to previous highlight\n"
                      "scroll_next_highlight: scroll to next highlight\n"
+                     "         swap: swap buffers of two windows (with optional "
+                     "direction for target window)\n"
                      "         zoom: zoom on window\n\n"
                      "For splith and splitv, pct is a percentage which "
                      "represents size of new window, computed with current "
@@ -5272,11 +5317,12 @@ command_init ()
                      "    /window scroll -2d\n"
                      "  scroll to beginning of current day:\n"
                      "    /window scroll -d"),
-                  "list|-1|+1|up|down|left|right|splith|splitv|resize|page_up|"
-                  "page_down|refresh|scroll_up|scroll|scroll_down|scroll_top|"
-                  "scroll_bottom|scroll_previous_highlight|"
-                  "scroll_next_highlight|zoom"
-                  " || merge all",
+                  "list || -1 || +1 || up || down || left || right"
+                  " || splith || splitv || resize || balance || page_up"
+                  " || page_down || refresh || scroll || scroll_up"
+                  " || scroll_down || scroll_top || scroll_bottom"
+                  " || scroll_previous_highlight || scroll_next_highlight"
+                  " || swap up|down|left|right || zoom || merge all",
                   &command_window, NULL);
 }
 

src/core/wee-config-file.c

@@ -1046,7 +1046,6 @@ config_file_option_set (struct t_config_option *option, const char *value,
                         int run_callback)
 {
     int value_int, i, rc, new_value_ok, old_value_was_null, old_value;
-    int num_colors;
     long number;
     char *error;
     
@@ -1267,7 +1266,6 @@ config_file_option_set (struct t_config_option *option, const char *value,
                     old_value = CONFIG_COLOR(option);
                 if (option->value)
                 {
-                    num_colors = gui_color_get_weechat_colors_number ();
                     value_int = -1;
                     new_value_ok = 0;
                     if (strncmp (value, "++", 2) == 0)

src/core/wee-config.c

@@ -89,6 +89,7 @@ struct t_config_option *config_look_highlight;
 struct t_config_option *config_look_highlight_regex;
 struct t_config_option *config_look_highlight_tags;
 struct t_config_option *config_look_hline_char;
+struct t_config_option *config_look_hotlist_add_buffer_if_away;
 struct t_config_option *config_look_hotlist_buffer_separator;
 struct t_config_option *config_look_hotlist_count_max;
 struct t_config_option *config_look_hotlist_count_min_msg;
@@ -1625,6 +1626,12 @@ config_weechat_init_options ()
            "will draw a real line with ncurses, but may cause bugs with URL "
            "selection under some terminals), wide chars are NOT allowed here"),
         NULL, 0, 0, "-", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
+    config_look_hotlist_add_buffer_if_away = config_file_new_option (
+        weechat_config_file, ptr_section,
+        "hotlist_add_buffer_if_away", "boolean",
+        N_("add any buffer to hotlist (including current or visible buffers) "
+           "if local variable \"away\" is set on buffer"),
+        NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
     config_look_hotlist_buffer_separator = config_file_new_option (
         weechat_config_file, ptr_section,
         "hotlist_buffer_separator", "string",

src/core/wee-config.h

@@ -115,6 +115,7 @@ extern struct t_config_option *config_look_day_change_time_format;
 extern struct t_config_option *config_look_highlight;
 extern struct t_config_option *config_look_highlight_regex;
 extern struct t_config_option *config_look_hline_char;
+extern struct t_config_option *config_look_hotlist_add_buffer_if_away;
 extern struct t_config_option *config_look_hotlist_buffer_separator;
 extern struct t_config_option *config_look_hotlist_count_max;
 extern struct t_config_option *config_look_hotlist_count_min_msg;

src/core/wee-hook.c

@@ -1638,9 +1638,10 @@ hook_process_run (struct t_hook *hook_process)
  */
 
 struct t_hook *
-hook_connect (struct t_weechat_plugin *plugin, const char *proxy, const char *address,
-              int port, int sock, int ipv6, void *gnutls_sess, void *gnutls_cb,
-              int gnutls_dhkey_size, const char *local_hostname,
+hook_connect (struct t_weechat_plugin *plugin, const char *proxy,
+              const char *address, int port, int sock, int ipv6,
+              void *gnutls_sess, void *gnutls_cb, int gnutls_dhkey_size,
+              const char *gnutls_priorities, const char *local_hostname,
               t_hook_callback_connect *callback, void *callback_data)
 {
     struct t_hook *new_hook;
@@ -1651,6 +1652,7 @@ hook_connect (struct t_weechat_plugin *plugin, const char *proxy, const char *ad
     (void) gnutls_sess;
     (void) gnutls_cb;
     (void) gnutls_dhkey_size;
+    (void) gnutls_priorities;
 #endif
     
     if ((sock < 0) || !address || (port <= 0) || !callback)
@@ -1680,6 +1682,8 @@ hook_connect (struct t_weechat_plugin *plugin, const char *proxy, const char *ad
     new_hook_connect->gnutls_sess = gnutls_sess;
     new_hook_connect->gnutls_cb = gnutls_cb;
     new_hook_connect->gnutls_dhkey_size = gnutls_dhkey_size;
+    new_hook_connect->gnutls_priorities = (gnutls_priorities) ?
+        strdup (gnutls_priorities) : NULL;
 #endif
     new_hook_connect->local_hostname = (local_hostname) ?
         strdup (local_hostname) : NULL;
@@ -3418,6 +3422,7 @@ hook_print_log ()
                         log_printf ("    gnutls_sess . . . . . : 0x%lx", HOOK_CONNECT(ptr_hook, gnutls_sess));
                         log_printf ("    gnutls_cb . . . . . . : 0x%lx", HOOK_CONNECT(ptr_hook, gnutls_cb));
                         log_printf ("    gnutls_dhkey_size . . : %d",    HOOK_CONNECT(ptr_hook, gnutls_dhkey_size));
+                        log_printf ("    gnutls_priorities . . : '%s'",  HOOK_CONNECT(ptr_hook, gnutls_priorities));
 #endif
                         log_printf ("    local_hostname. . . . : '%s'",  HOOK_CONNECT(ptr_hook, local_hostname));
                         log_printf ("    child_read. . . . . . : %d",    HOOK_CONNECT(ptr_hook, child_read));

src/core/wee-hook.h

@@ -221,6 +221,7 @@ struct t_hook_connect
     gnutls_session_t *gnutls_sess;     /* GnuTLS session (SSL connection)   */
     gnutls_callback_t *gnutls_cb;      /* GnuTLS callback during handshake  */
     int gnutls_dhkey_size;             /* Diffie Hellman Key Exchange size  */
+    char *gnutls_priorities;           /* GnuTLS priorities                 */
 #endif
     char *local_hostname;              /* force local hostname (optional)   */
     int child_read;                    /* to read data in pipe from child   */
@@ -408,6 +409,7 @@ extern struct t_hook *hook_connect (struct t_weechat_plugin *plugin,
                                     int port, int sock, int ipv6,
                                     void *gnutls_session, void *gnutls_cb,
                                     int gnutls_dhkey_size,
+                                    const char *gnutls_priorities,
                                     const char *local_hostname,
                                     t_hook_callback_connect *callback,
                                     void *callback_data);

src/core/wee-network.c

@@ -59,14 +59,6 @@ int network_init_ok = 0;
 
 #ifdef HAVE_GNUTLS
 gnutls_certificate_credentials gnutls_xcred; /* GnuTLS client credentials   */
-const int gnutls_cert_type_prio[] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
-#if LIBGNUTLS_VERSION_NUMBER >= 0x010700
-    const int gnutls_prot_prio[] = { GNUTLS_TLS1_2, GNUTLS_TLS1_1,
-                                     GNUTLS_TLS1_0, GNUTLS_SSL3, 0 };
-#else
-    const int gnutls_prot_prio[] = { GNUTLS_TLS1_1, GNUTLS_TLS1_0,
-                                     GNUTLS_SSL3, 0 };
-#endif
 #endif
 
 
@@ -1004,6 +996,10 @@ void
 network_connect_with_fork (struct t_hook *hook_connect)
 {
     int child_pipe[2];
+#ifdef HAVE_GNUTLS
+    int rc;
+    const char *pos_error;
+#endif
 #ifndef __CYGWIN__
     pid_t pid;
 #endif
@@ -1012,20 +1008,27 @@ network_connect_with_fork (struct t_hook *hook_connect)
     /* initialize GnuTLS if SSL asked */
     if (HOOK_CONNECT(hook_connect, gnutls_sess))
     {
-        if (gnutls_init (HOOK_CONNECT(hook_connect, gnutls_sess), GNUTLS_CLIENT) != 0)
+        if (gnutls_init (HOOK_CONNECT(hook_connect, gnutls_sess), GNUTLS_CLIENT) != GNUTLS_E_SUCCESS)
         {
             (void) (HOOK_CONNECT(hook_connect, callback))
                 (hook_connect->callback_data,
-                 '0' + WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR,
+                 WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR,
                  0, NULL, NULL);
             unhook (hook_connect);
             return;
         }
-        gnutls_set_default_priority (*HOOK_CONNECT(hook_connect, gnutls_sess));
-        gnutls_certificate_type_set_priority (*HOOK_CONNECT(hook_connect, gnutls_sess),
-                                              gnutls_cert_type_prio);
-        gnutls_protocol_set_priority (*HOOK_CONNECT(hook_connect, gnutls_sess),
-                                      gnutls_prot_prio);
+        rc = gnutls_priority_set_direct (*HOOK_CONNECT(hook_connect, gnutls_sess),
+                                         HOOK_CONNECT(hook_connect, gnutls_priorities),
+                                         &pos_error);
+        if (rc != GNUTLS_E_SUCCESS)
+        {
+            (void) (HOOK_CONNECT(hook_connect, callback))
+                (hook_connect->callback_data,
+                 WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR,
+                 0, _("invalid priorities"), NULL);
+            unhook (hook_connect);
+            return;
+        }
         gnutls_credentials_set (*HOOK_CONNECT(hook_connect, gnutls_sess),
                                 GNUTLS_CRD_CERTIFICATE,
                                 gnutls_xcred);
@@ -1039,7 +1042,7 @@ network_connect_with_fork (struct t_hook *hook_connect)
     {
         (void) (HOOK_CONNECT(hook_connect, callback))
             (hook_connect->callback_data,
-             '0' + WEECHAT_HOOK_CONNECT_MEMORY_ERROR,
+             WEECHAT_HOOK_CONNECT_MEMORY_ERROR,
              0, NULL, NULL);
         unhook (hook_connect);
         return;
@@ -1062,7 +1065,7 @@ network_connect_with_fork (struct t_hook *hook_connect)
         case -1:
             (void) (HOOK_CONNECT(hook_connect, callback))
                 (hook_connect->callback_data,
-                 '0' + WEECHAT_HOOK_CONNECT_MEMORY_ERROR,
+                 WEECHAT_HOOK_CONNECT_MEMORY_ERROR,
                  0, NULL, NULL);
             unhook (hook_connect);
             return;

src/core/wee-upgrade.c

@@ -566,8 +566,7 @@ upgrade_weechat_read_cb (void *data,
                             memcpy (&creation_time, buf, size);
                             new_hotlist = gui_hotlist_add (ptr_buffer,
                                                            infolist_integer (infolist, "priority"),
-                                                           &creation_time,
-                                                           1);
+                                                           &creation_time);
                             if (new_hotlist)
                             {
                                 for (i = 0; i < GUI_HOTLIST_NUM_PRIORITIES; i++)

src/gui/curses/gui-curses-chat.c

@@ -317,7 +317,9 @@ gui_chat_display_word (struct t_gui_window *window,
     int pos_saved_char, chars_to_display, num_displayed;
     int length_align;
     attr_t attrs;
+    attr_t *ptr_attrs;
     short pair;
+    short *ptr_pair;
     
     if (!data ||
         ((!simulate) && (window->win_chat_cursor_y >= window->win_chat_height)))
@@ -360,7 +362,10 @@ gui_chat_display_word (struct t_gui_window *window,
             {
                 if (!simulate)
                 {
-                    wattr_get (GUI_WINDOW_OBJECTS(window)->win_chat, &attrs, &pair, NULL);
+                    ptr_attrs = &attrs;
+                    ptr_pair = &pair;
+                    wattr_get (GUI_WINDOW_OBJECTS(window)->win_chat,
+                               ptr_attrs, ptr_pair, NULL);
                     gui_window_set_weechat_color (GUI_WINDOW_OBJECTS(window)->win_chat,
                                                   GUI_COLOR_CHAT_PREFIX_SUFFIX);
                     gui_chat_display_word_raw (window,
@@ -1130,7 +1135,6 @@ gui_chat_draw (struct t_gui_buffer *buffer, int erase)
                     {
                         ptr_win->scroll->start_line = NULL;
                         ptr_win->scroll->start_line_pos = 0;
-                        gui_hotlist_remove_buffer (ptr_win->buffer);
                     }
                     
                     /* cursor is below end line of chat window? */

src/gui/curses/gui-curses-keyboard.c

@@ -185,6 +185,8 @@ gui_keyboard_default_bindings ()
     BIND(/* m-w,m-right */ "meta-wmeta2-1;3C",   "/window right");
     BIND(/* m-w,m-left  */ "meta-wmeta-meta2-D", "/window left");
     BIND(/* m-w,m-left  */ "meta-wmeta2-1;3D",   "/window left");
+    BIND(/* m-w,m-b     */ "meta-wmeta-b",       "/window balance");
+    BIND(/* m-w,m-s     */ "meta-wmeta-s",       "/window swap");
     BIND(/* m-z         */ "meta-z",             "/window zoom");
     BIND(/* m-=         */ "meta-=",             "/filter toggle");
     BIND(/* m-0         */ "meta-0",             "/buffer *10");

src/gui/curses/gui-curses-main.c

@@ -127,6 +127,8 @@ gui_main_init ()
     {
         gui_init_ok = 1;
         
+        ptr_buffer->num_displayed = 1;
+        
         /* set title for core buffer */
         gui_buffer_set_title (ptr_buffer,
                               "WeeChat " PACKAGE_VERSION " "

src/gui/curses/gui-curses-window.c

@@ -1040,7 +1040,8 @@ gui_window_switch_to_buffer (struct t_gui_window *window,
     window->buffer = buffer;
     gui_buffer_add_value_num_displayed (buffer, 1);
     
-    gui_hotlist_remove_buffer (buffer);
+    if (!weechat_upgrading && (old_buffer != buffer))
+        gui_hotlist_remove_buffer (buffer);
     
     if (gui_ok)
     {
@@ -1954,6 +1955,88 @@ gui_window_switch_right (struct t_gui_window *window)
     }
 }
 
+/*
+ * gui_window_balance: balance windows (set all splits to 50%)
+ *                     return 1 if some windows have been balanced
+ *                            0 if nothing was changed
+ */
+
+int
+gui_window_balance (struct t_gui_window_tree *tree)
+{
+    int balanced;
+    
+    balanced = 0;
+    if (tree && tree->child1 && tree->child2)
+    {
+        if (tree->split_pct != 50)
+        {
+            tree->split_pct = 50;
+            balanced = 1;
+        }
+        balanced |= gui_window_balance (tree->child1);
+        balanced |= gui_window_balance (tree->child2);
+    }
+    return balanced;
+}
+
+/*
+ * gui_window_swap: swap buffers of two windows
+ *                  direction can be: 0 = auto (swap with sister)
+ *                                    1 = window above
+ *                                    2 = window on the right
+ *                                    3 = window below
+ *                                    4 = window on the left
+ */
+
+void
+gui_window_swap (struct t_gui_window *window, int direction)
+{
+    struct t_gui_window_tree *parent, *sister;
+    struct t_gui_window *window2, *ptr_win;
+    struct t_gui_buffer *buffer1;
+    
+    if (!window || !gui_ok)
+        return;
+    
+    window2 = NULL;
+    
+    if (direction == 0)
+    {
+        /* search sister window */
+        parent = window->ptr_tree->parent_node;
+        if (parent)
+        {
+            sister = (parent->child1->window == window) ?
+                parent->child2 : parent->child1;
+            if (sister->window)
+                window2 = sister->window;
+        }
+    }
+    else
+    {
+        /* search window using direction */
+        for (ptr_win = gui_windows; ptr_win;
+             ptr_win = ptr_win->next_window)
+        {
+            if ((ptr_win != window) &&
+                (gui_window_side_by_side (window, ptr_win) == direction))
+            {
+                window2 = ptr_win;
+                break;
+            }
+        }
+    }
+    
+    /* let's swap! */
+    if (window2 && (window->buffer != window2->buffer))
+    {
+        buffer1 = window->buffer;
+        gui_window_switch_to_buffer (window, window2->buffer, 0);
+        gui_window_switch_to_buffer (window2, buffer1, 0);
+    }
+}
+
 /*
  * gui_window_refresh_screen: called when term size is modified
  *                            full_refresh == 1 when Ctrl+L is pressed,

src/gui/gtk/gui-gtk-window.c

@@ -791,6 +791,39 @@ gui_window_switch_right (struct t_gui_window *window)
     }
 }
 
+/*
+ * gui_window_balance: balance windows (set all splits to 50%)
+ *                     return 1 if some windows have been balanced
+ *                            0 if nothing was changed
+ */
+
+int
+gui_window_balance (struct t_gui_window_tree *tree)
+{
+    (void) tree;
+    
+    /* TODO: write this function for Gtk */
+    return 0;
+}
+
+/*
+ * gui_window_swap: swap buffer of two windows
+ *                  direction can be: 0 = auto (swap with sister)
+ *                                    1 = window above
+ *                                    2 = window on the right
+ *                                    3 = window below
+ *                                    4 = window on the left
+ */
+
+void
+gui_window_swap (struct t_gui_window *window, int direction)
+{
+    (void) window;
+    (void) direction;
+    
+    /* TODO: write this function for Gtk */
+}
+
 /*
  * gui_window_refresh_screen: called when term size is modified
  */

src/gui/gui-buffer.c

@@ -898,6 +898,9 @@ gui_buffer_set_short_name (struct t_gui_buffer *buffer, const char *short_name)
         if (buffer->short_name)
             free (buffer->short_name);
         buffer->short_name = strdup (short_name);
+        if (buffer->mixed_lines)
+            gui_line_compute_buffer_max_length (buffer, buffer->mixed_lines);
+        gui_buffer_ask_chat_refresh (buffer, 1);
         
         hook_signal_send ("buffer_renamed",
                           WEECHAT_HOOK_SIGNAL_POINTER, buffer);
@@ -1346,7 +1349,7 @@ gui_buffer_set (struct t_gui_buffer *buffer, const char *property,
             error = NULL;
             number = strtol (value, &error, 10);
             if (error && !error[0])
-                (void) gui_hotlist_add (buffer, number, NULL, 1);
+                (void) gui_hotlist_add (buffer, number, NULL);
         }
     }
     
@@ -2206,7 +2209,6 @@ gui_buffer_move_to_number (struct t_gui_buffer *buffer, int number)
 {
     struct t_gui_buffer *ptr_first_buffer, *ptr_last_buffer, *ptr_buffer;
     struct t_gui_buffer *ptr_buffer_pos;
-    char buf1_str[16], buf2_str[16], *argv[2] = { NULL, NULL };
     
     /* if only one buffer then return */
     if (gui_buffers == last_gui_buffer)
@@ -2240,8 +2242,6 @@ gui_buffer_move_to_number (struct t_gui_buffer *buffer, int number)
     if ((ptr_first_buffer == gui_buffers) && (ptr_last_buffer == last_gui_buffer))
         return;
     
-    snprintf (buf2_str, sizeof (buf2_str) - 1, "%d", buffer->number);
-    
     /* remove buffer(s) from list */
     if (ptr_first_buffer == gui_buffers)
     {
@@ -2328,10 +2328,6 @@ gui_buffer_move_to_number (struct t_gui_buffer *buffer, int number)
         ptr_buffer->number++;
     }
     
-    snprintf (buf1_str, sizeof (buf1_str) - 1, "%d", buffer->number);
-    argv[0] = buf1_str;
-    argv[1] = buf2_str;
-    
     hook_signal_send ("buffer_moved",
                       WEECHAT_HOOK_SIGNAL_POINTER, buffer);
 }
@@ -3003,6 +2999,7 @@ gui_buffer_dump_hexa (struct t_gui_buffer *buffer)
     struct t_gui_line *ptr_line;
     int num_line;
     char *prefix_without_colors, *message_without_colors, *tags;
+    char buf[256];
     
     log_printf ("[buffer dump hexa (addr:0x%lx)]", buffer);
     num_line = 1;
@@ -3028,6 +3025,12 @@ gui_buffer_dump_hexa (struct t_gui_buffer *buffer)
         log_printf ("  tags: %s", (tags) ? tags : "(none)");
         if (tags)
             free (tags);
+        snprintf (buf, sizeof (buf), "%s", ctime (&ptr_line->data->date));
+        buf[strlen (buf) - 1] = '\0';
+        log_printf ("  date:         %d = %s", ptr_line->data->date, buf);
+        snprintf (buf, sizeof (buf), "%s", ctime (&ptr_line->data->date_printed));
+        buf[strlen (buf) - 1] = '\0';
+        log_printf ("  date_printed: %d = %s", ptr_line->data->date_printed, buf);
         
         /* display raw message for line */
         if (ptr_line->data->message)

src/gui/gui-hotlist.c

@@ -31,6 +31,7 @@
 
 #include "../core/weechat.h"
 #include "../core/wee-config.h"
+#include "../core/wee-hashtable.h"
 #include "../core/wee-hook.h"
 #include "../core/wee-infolist.h"
 #include "../core/wee-log.h"
@@ -282,21 +283,24 @@ gui_hotlist_add_hotlist (struct t_gui_hotlist **hotlist,
 struct t_gui_hotlist *
 gui_hotlist_add (struct t_gui_buffer *buffer,
                  enum t_gui_hotlist_priority priority,
-                 struct timeval *creation_time, int allow_current_buffer)
+                 struct timeval *creation_time)
 {
     struct t_gui_hotlist *new_hotlist, *ptr_hotlist;
     int i, count[GUI_HOTLIST_NUM_PRIORITIES];
+    const char *away;
     
     if (!buffer || !gui_add_hotlist)
         return NULL;
     
-    /* do not add current buffer */
-    if ((buffer == gui_current_window->buffer)
-        && (!allow_current_buffer || (!gui_buffer_is_scrolled (buffer))))
+    /* do not add core buffer if upgrading */
+    if (weechat_upgrading && (buffer == gui_buffer_search_main ()))
         return NULL;
     
-    /* do not add buffer if it is displayed in a window */
-    if (buffer->num_displayed > 0)
+    /* do not add buffer if it is displayed and away is not set */
+    away = hashtable_get (buffer->local_variables, "away");
+    if ((buffer->num_displayed > 0)
+        && ((!away || !away[0])
+            || !CONFIG_BOOLEAN(config_look_hotlist_add_buffer_if_away)))
         return NULL;
     
     if (priority > GUI_HOTLIST_MAX)
@@ -431,6 +435,9 @@ gui_hotlist_remove_buffer (struct t_gui_buffer *buffer)
     int hotlist_changed;
     struct t_gui_hotlist *ptr_hotlist, *next_hotlist;
     
+    if (weechat_upgrading)
+        return;
+    
     hotlist_changed = 0;
     
     ptr_hotlist = gui_hotlist;

src/gui/gui-hotlist.h

@@ -55,8 +55,7 @@ extern int gui_add_hotlist;
 
 extern struct t_gui_hotlist *gui_hotlist_add (struct t_gui_buffer *buffer,
                                               enum t_gui_hotlist_priority priority,
-                                              struct timeval *creation_time,
-                                              int allow_current_buffer);
+                                              struct timeval *creation_time);
 extern void gui_hotlist_resort ();
 extern void gui_hotlist_clear ();
 extern void gui_hotlist_remove_buffer (struct t_gui_buffer *buffer);

src/gui/gui-input.c

@@ -1173,6 +1173,7 @@ gui_input_jump_smart (struct t_gui_buffer *buffer)
             if (!gui_hotlist_initial_buffer)
                 gui_hotlist_initial_buffer = window->buffer;
             gui_window_switch_to_buffer (window, gui_hotlist->buffer, 1);
+            gui_hotlist_remove_buffer (window->buffer);
             gui_window_scroll_bottom (window);
         }
         else

src/gui/gui-line.c

@@ -848,7 +848,7 @@ gui_line_add (struct t_gui_buffer *buffer, time_t date,
     {
         if (new_line->data->highlight)
         {
-            (void) gui_hotlist_add (buffer, GUI_HOTLIST_HIGHLIGHT, NULL, 1);
+            (void) gui_hotlist_add (buffer, GUI_HOTLIST_HIGHLIGHT, NULL);
             if (!weechat_upgrading)
             {
                 message_for_signal = gui_chat_build_string_prefix_message (new_line);
@@ -875,7 +875,7 @@ gui_line_add (struct t_gui_buffer *buffer, time_t date,
                 }
             }
             if (notify_level >= GUI_HOTLIST_MIN)
-                (void) gui_hotlist_add (buffer, notify_level, NULL, 1);
+                (void) gui_hotlist_add (buffer, notify_level, NULL);
         }
     }
     else

src/gui/gui-window.c

@@ -798,7 +798,10 @@ gui_window_scroll (struct t_gui_window *window, char *scroll)
         {
             ptr_line = (window->scroll->start_line) ?
                 window->scroll->start_line : window->buffer->lines->last_line;
-            while (ptr_line && !gui_line_is_displayed (ptr_line))
+            while (ptr_line
+                   && (!gui_line_is_displayed (ptr_line)
+                       || ((window->buffer->type == GUI_BUFFER_TYPE_FORMATTED)
+                           && (ptr_line->data->date == 0))))
             {
                 ptr_line = ptr_line->prev_line;
             }
@@ -807,7 +810,10 @@ gui_window_scroll (struct t_gui_window *window, char *scroll)
         {
             ptr_line = (window->scroll->start_line) ?
                 window->scroll->start_line : window->buffer->lines->first_line;
-            while (ptr_line && !gui_line_is_displayed (ptr_line))
+            while (ptr_line
+                   && (!gui_line_is_displayed (ptr_line)
+                       || ((window->buffer->type == GUI_BUFFER_TYPE_FORMATTED)
+                           && (ptr_line->data->date == 0))))
             {
                 ptr_line = ptr_line->next_line;
             }
@@ -825,7 +831,9 @@ gui_window_scroll (struct t_gui_window *window, char *scroll)
             ptr_line = (direction < 0) ?
                 gui_line_get_prev_displayed (ptr_line) : gui_line_get_next_displayed (ptr_line);
             
-            if (ptr_line)
+            if (ptr_line
+                && ((window->buffer->type != GUI_BUFFER_TYPE_FORMATTED)
+                    || (ptr_line->data->date != 0)))
             {
                 if (time_letter == ' ')
                 {

src/gui/gui-window.h

@@ -187,6 +187,8 @@ extern void gui_window_switch_up (struct t_gui_window *window);
 extern void gui_window_switch_down (struct t_gui_window *window);
 extern void gui_window_switch_left (struct t_gui_window *window);
 extern void gui_window_switch_right (struct t_gui_window *window);
+extern int gui_window_balance (struct t_gui_window_tree *tree);
+extern void gui_window_swap (struct t_gui_window *window, int direction);
 extern void gui_window_refresh_screen (int full_refresh);
 extern void gui_window_set_title (const char *title);
 extern void gui_window_term_display_infos ();

src/plugins/fifo/fifo.c

@@ -236,14 +236,14 @@ fifo_remove ()
 void
 fifo_exec (const char *text)
 {
-    char *text2, *pos_msg, *pos_buffer, *pos;
+    char *text2, *pos_msg, *pos_buffer;
     struct t_gui_buffer *ptr_buffer;
     
     text2 = strdup (text);
     if (!text2)
         return;
     
-    pos = NULL;
+    pos_msg = NULL;
     ptr_buffer = NULL;
     
     /*

src/plugins/irc/irc-color.h

@@ -57,6 +57,9 @@
 
 /* macros for WeeChat core and IRC colors */
 
+#define IRC_COLOR_BAR_FG weechat_color("bar_fg")
+#define IRC_COLOR_BAR_BG weechat_color("bar_bg")
+#define IRC_COLOR_BAR_DELIM weechat_color("bar_delim")
 #define IRC_COLOR_CHAT weechat_color("chat")
 #define IRC_COLOR_CHAT_CHANNEL weechat_color("chat_channel")
 #define IRC_COLOR_CHAT_DELIMITERS weechat_color("chat_delimiters")
@@ -72,16 +75,15 @@
 #define IRC_COLOR_NICK_PREFIX_USER weechat_color(weechat_config_string(irc_config_color_nick_prefix_user))
 #define IRC_COLOR_NICK_PREFIX weechat_color(weechat_config_string(irc_config_color_nick_prefix))
 #define IRC_COLOR_NICK_SUFFIX weechat_color(weechat_config_string(irc_config_color_nick_suffix))
-#define IRC_COLOR_BAR_FG weechat_color("bar_fg")
-#define IRC_COLOR_BAR_BG weechat_color("bar_bg")
-#define IRC_COLOR_BAR_DELIM weechat_color("bar_delim")
+#define IRC_COLOR_NOTICE weechat_color(weechat_config_string(irc_config_color_notice))
 #define IRC_COLOR_STATUS_NUMBER weechat_color("status_number")
 #define IRC_COLOR_STATUS_NAME weechat_color("status_name")
 #define IRC_COLOR_STATUS_NAME_SSL weechat_color("status_name_ssl")
 #define IRC_COLOR_MESSAGE_JOIN weechat_color(weechat_config_string(irc_config_color_message_join))
 #define IRC_COLOR_MESSAGE_QUIT weechat_color(weechat_config_string(irc_config_color_message_quit))
 #define IRC_COLOR_REASON_QUIT weechat_color(weechat_config_string(irc_config_color_reason_quit))
-#define IRC_COLOR_NOTICE weechat_color(weechat_config_string(irc_config_color_notice))
+#define IRC_COLOR_TOPIC_OLD weechat_color(weechat_config_string(irc_config_color_topic_old))
+#define IRC_COLOR_TOPIC_NEW weechat_color(weechat_config_string(irc_config_color_topic_new))
 #define IRC_COLOR_INPUT_NICK weechat_color(weechat_config_string(irc_config_color_input_nick))
 #define IRC_COLOR_ITEM_AWAY weechat_color(weechat_config_string(irc_config_color_item_away))
 #define IRC_COLOR_ITEM_CHANNEL_MODES weechat_color(weechat_config_string(irc_config_color_item_channel_modes))

src/plugins/irc/irc-command.c

@@ -353,9 +353,9 @@ irc_command_me_channel (struct t_irc_server *server,
                           weechat_config_boolean (irc_config_network_colors_receive)) : NULL;
     weechat_printf_tags (channel->buffer,
                          irc_protocol_tags ("privmsg",
-                                            "irc_action,no_highlight",
+                                            "irc_action,notify_none,no_highlight",
                                             server->nick),
-                         "%s%s%s %s%s",
+                         "%s%s%s%s %s",
                          weechat_prefix ("action"),
                          IRC_COLOR_CHAT_NICK_SELF,
                          server->nick,
@@ -2513,15 +2513,18 @@ irc_command_msg (void *data, struct t_gui_buffer *buffer, int argc,
                         }
                         else
                         {
-                            weechat_printf (ptr_server->buffer,
-                                            "%sMSG%s(%s%s%s)%s: %s",
-                                            weechat_prefix ("network"),
-                                            IRC_COLOR_CHAT_DELIMITERS,
-                                            IRC_COLOR_CHAT_NICK,
-                                            targets[i],
-                                            IRC_COLOR_CHAT_DELIMITERS,
-                                            IRC_COLOR_CHAT,
-                                            (string) ? string : argv_eol[arg_text]);
+                            weechat_printf_tags (ptr_server->buffer,
+                                                 irc_protocol_tags ("privmsg",
+                                                                    "notify_none,no_highlight",
+                                                                    ptr_server->nick),
+                                                 "%sMSG%s(%s%s%s)%s: %s",
+                                                 weechat_prefix ("network"),
+                                                 IRC_COLOR_CHAT_DELIMITERS,
+                                                 IRC_COLOR_CHAT_NICK,
+                                                 targets[i],
+                                                 IRC_COLOR_CHAT_DELIMITERS,
+                                                 IRC_COLOR_CHAT,
+                                                 (string) ? string : argv_eol[arg_text]);
                         }
                         if (string)
                             free (string);
@@ -2675,18 +2678,19 @@ irc_command_notice (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));
         ptr_channel = irc_channel_search (ptr_server, argv[arg_nick]);
-        weechat_printf ((ptr_channel) ? ptr_channel->buffer : ptr_server->buffer,
-                        "%s%s%s%s -> %s%s%s: %s",
-                        weechat_prefix ("network"),
-                        IRC_COLOR_NOTICE,
-                        /* TRANSLATORS: "Notice" is command name in IRC protocol (translation is frequently the same word) */
-                        _("Notice"),
-                        IRC_COLOR_CHAT,
-                        (irc_channel_is_channel (argv[arg_nick])) ?
-                        IRC_COLOR_CHAT_CHANNEL : IRC_COLOR_CHAT_NICK,
-                        argv[arg_nick],
-                        IRC_COLOR_CHAT,
-                        (string) ? string : argv_eol[arg_text]);
+        weechat_printf_tags ((ptr_channel) ? ptr_channel->buffer : ptr_server->buffer,
+                             "notify_none,no_highlight",
+                             "%s%s%s%s -> %s%s%s: %s",
+                             weechat_prefix ("network"),
+                             IRC_COLOR_NOTICE,
+                             /* TRANSLATORS: "Notice" is command name in IRC protocol (translation is frequently the same word) */
+                             _("Notice"),
+                             IRC_COLOR_CHAT,
+                             (irc_channel_is_channel (argv[arg_nick])) ?
+                             IRC_COLOR_CHAT_CHANNEL : IRC_COLOR_CHAT_NICK,
+                             argv[arg_nick],
+                             IRC_COLOR_CHAT,
+                             (string) ? string : argv_eol[arg_text]);
         if (string)
             free (string);
         irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,

src/plugins/irc/irc-config.c

@@ -109,6 +109,8 @@ struct t_config_option *irc_config_color_item_channel_modes;
 struct t_config_option *irc_config_color_item_lag_counting;
 struct t_config_option *irc_config_color_item_lag_finished;
 struct t_config_option *irc_config_color_reason_quit;
+struct t_config_option *irc_config_color_topic_old;
+struct t_config_option *irc_config_color_topic_new;
 
 /* IRC config, network section */
 
@@ -800,6 +802,76 @@ irc_config_server_default_change_cb (void *data, struct t_config_option *option)
     }
 }
 
+/*
+ * irc_config_check_gnutls_priorities: check string with GnuTLS priorities
+ *                                     return NULL if ok, or pointer to char
+ *                                     with error in string
+ */
+
+const char *
+irc_config_check_gnutls_priorities (const char *priorities)
+{
+#ifdef HAVE_GNUTLS
+    gnutls_priority_t priority_cache;
+    const char *pos_error;
+    int rc;
+    
+    if (!priorities || !priorities[0])
+        return NULL;
+
+    rc = gnutls_priority_init (&priority_cache, priorities, &pos_error);
+    if (rc == GNUTLS_E_SUCCESS)
+        return NULL;
+    if (pos_error)
+        return pos_error;
+    return priorities;
+#else
+    /* make C compiler happy */
+    (void) priorities;
+
+    return NULL;
+#endif
+}
+
+/*
+ * irc_config_server_check_value_cb: callback called to check a server option
+ *                                   when it is modified
+ */
+
+int
+irc_config_server_check_value_cb (void *data,
+                                  struct t_config_option *option,
+                                  const char *value)
+{
+    int index_option;
+    const char *pos_error;
+    
+    /* make C compiler happy */
+    (void) option;
+    
+    index_option = irc_server_search_option (data);
+    if (index_option >= 0)
+    {
+        switch (index_option)
+        {
+            case IRC_SERVER_OPTION_SSL_PRIORITIES:
+                pos_error = irc_config_check_gnutls_priorities (value);
+                if (pos_error)
+                {
+                    weechat_printf (NULL,
+                                    _("%s%s: invalid priorities string, error "
+                                      "at this position in string: \"%s\""),
+                                    weechat_prefix ("error"), IRC_PLUGIN_NAME,
+                                    pos_error);
+                    return 0;
+                }
+                break;
+        }
+    }
+    
+    return 1;
+}
+
 /*
  * irc_config_server_change_cb: callback called when a server option is modified
  */
@@ -1185,6 +1257,8 @@ irc_config_server_new_option (struct t_config_file *config_file,
                               const char *default_value,
                               const char *value,
                               int null_value_allowed,
+                              void *callback_check_value,
+                              void *callback_check_value_data,
                               void *callback_change,
                               void *callback_change_data)
 {
@@ -1202,7 +1276,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1214,7 +1288,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1226,7 +1300,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1238,7 +1312,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1252,7 +1326,22 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
+                callback_change, callback_change_data,
+                NULL, NULL);
+            break;
+        case IRC_SERVER_OPTION_SSL_PRIORITIES:
+            new_option = weechat_config_new_option (
+                config_file, section,
+                option_name, "string",
+                N_("string with priorities for gnutls (for syntax, see "
+                   "documentation of function gnutls_priority_init in gnutls "
+                   "manual, common strings are: \"PERFORMANCE\", \"NORMAL\", "
+                    "\"SECURE128\", \"SECURE256\", \"EXPORT\", \"NONE\")"),
+                NULL, 0, 0,
+                default_value, value,
+                null_value_allowed,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1264,7 +1353,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, INT_MAX,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1276,7 +1365,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1288,7 +1377,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1300,7 +1389,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 "plain|dh-blowfish", 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1312,7 +1401,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1324,7 +1413,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1337,7 +1426,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 1, 3600,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1349,7 +1438,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1361,7 +1450,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1373,7 +1462,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 1, 65535,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1385,7 +1474,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1397,7 +1486,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1409,7 +1498,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1422,7 +1511,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1437,7 +1526,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1450,7 +1539,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 3600,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1463,7 +1552,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1475,7 +1564,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1487,7 +1576,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 3600*24,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1502,7 +1591,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 1, 3600,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1516,7 +1605,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 60,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1530,7 +1619,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 60,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1543,7 +1632,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 60 * 24 * 7,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1556,7 +1645,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 1000000,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1569,7 +1658,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1582,7 +1671,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
-                NULL, NULL,
+                callback_check_value, callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1596,8 +1685,8 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 default_value, value,
                 null_value_allowed,
                 (section == irc_config_section_server_default) ?
-                &irc_config_server_default_check_notify : NULL,
-                NULL,
+                &irc_config_server_default_check_notify : callback_check_value,
+                callback_check_value_data,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
@@ -1782,6 +1871,8 @@ irc_config_server_create_default_options (struct t_config_section *section)
             irc_server_option_default[i],
             default_value,
             0,
+            &irc_config_server_check_value_cb,
+            irc_server_option_string[i],
             &irc_config_server_default_change_cb,
             irc_server_option_string[i]);
     }
@@ -2210,6 +2301,18 @@ irc_config_init ()
         N_("color for reason in part/quit messages"),
         NULL, -1, 0, "default", NULL, 0, NULL, NULL,
         NULL, NULL, NULL, NULL);
+    irc_config_color_topic_old = weechat_config_new_option (
+        irc_config_file, ptr_section,
+        "topic_old", "color",
+        N_("color for old channel topic (when topic is changed)"),
+        NULL, -1, 0, "darkgray", NULL, 0, NULL, NULL,
+        NULL, NULL, NULL, NULL);
+    irc_config_color_topic_new = weechat_config_new_option (
+        irc_config_file, ptr_section,
+        "topic_new", "color",
+        N_("color for new channel topic (when topic is changed)"),
+        NULL, -1, 0, "white", NULL, 0, NULL, NULL,
+        NULL, NULL, NULL, NULL);
     
     /* network */
     ptr_section = weechat_config_new_section (irc_config_file, "network",

src/plugins/irc/irc-config.h

@@ -132,6 +132,8 @@ extern struct t_config_option *irc_config_color_item_channel_modes;
 extern struct t_config_option *irc_config_color_item_lag_counting;
 extern struct t_config_option *irc_config_color_item_lag_finished;
 extern struct t_config_option *irc_config_color_reason_quit;
+extern struct t_config_option *irc_config_color_topic_old;
+extern struct t_config_option *irc_config_color_topic_new;
 
 extern struct t_config_option *irc_config_network_autoreconnect_delay_growing;
 extern struct t_config_option *irc_config_network_autoreconnect_delay_max;
@@ -154,6 +156,9 @@ extern struct t_hashtable *irc_config_hashtable_nick_color_force;
 extern struct t_hashtable *irc_config_hashtable_nick_prefixes;
 
 extern void irc_config_set_nick_colors ();
+extern int irc_config_server_check_value_cb (void *data,
+                                             struct t_config_option *option,
+                                             const char *value);
 extern void irc_config_server_change_cb (void *data,
                                          struct t_config_option *option);
 struct t_config_option *irc_config_server_new_option (struct t_config_file *config_file,
@@ -163,6 +168,8 @@ struct t_config_option *irc_config_server_new_option (struct t_config_file *conf
                                                       const char *default_value,
                                                       const char *value,
                                                       int null_value_allowed,
+                                                      void *callback_check_value,
+                                                      void *callback_check_value_data,
                                                       void *callback_change,
                                                       void *callback_change_data);
 extern int irc_config_init ();

src/plugins/irc/irc-ctcp.c

@@ -263,7 +263,8 @@ irc_ctcp_reply_to_nick (struct t_irc_server *server,
     {
         weechat_printf_tags ((channel) ? channel->buffer : server->buffer,
                              irc_protocol_tags (command,
-                                                "irc_ctcp,irc_ctcp_reply,no_highlight",
+                                                "irc_ctcp,irc_ctcp_reply,"
+                                                "notify_none,no_highlight",
                                                 NULL),
                              _("%sCTCP reply to %s%s%s: %s%s%s%s%s"),
                              weechat_prefix ("network"),
@@ -931,7 +932,7 @@ irc_ctcp_recv (struct t_irc_server *server, const char *command,
                     weechat_printf_tags (ptr_channel->buffer,
                                          irc_protocol_tags (command,
                                                             (nick_is_me) ?
-                                                            "irc_action,notify_private,no_highlight" :
+                                                            "irc_action,notify_none,no_highlight" :
                                                             "irc_action,notify_private",
                                                             nick),
                                          "%s%s%s%s%s%s",

src/plugins/irc/irc-display.c

@@ -220,6 +220,14 @@ irc_display_server (struct t_irc_server *server, int with_detail)
             weechat_printf (NULL, "  ssl_cert . . . . . . : %s'%s'",
                             IRC_COLOR_CHAT_VALUE,
                             weechat_config_string (server->options[IRC_SERVER_OPTION_SSL_CERT]));
+        /* ssl_priorities */
+        if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL_PRIORITIES]))
+            weechat_printf (NULL, "  ssl_priorities . . . :   ('%s')",
+                            IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_SSL_PRIORITIES));
+        else
+            weechat_printf (NULL, "  ssl_priorities . . . : %s'%s'",
+                            IRC_COLOR_CHAT_VALUE,
+                            weechat_config_string (server->options[IRC_SERVER_OPTION_SSL_PRIORITIES]));
         /* ssl_dhkey_size */
         if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL_DHKEY_SIZE]))
             weechat_printf (NULL, "  ssl_dhkey_size . . . :   (%d)",

src/plugins/irc/irc-input.c

@@ -60,7 +60,7 @@ irc_input_user_message_display (struct t_gui_buffer *buffer, const char *text)
         
         weechat_printf_tags (buffer,
                              irc_protocol_tags ("privmsg",
-                                                "notify_message,no_highlight",
+                                                "notify_none,no_highlight",
                                                 (ptr_nick) ? ptr_nick->name : ptr_server->nick),
                              "%s%s",
                              irc_nick_as_prefix (ptr_server,

src/plugins/irc/irc-protocol.c

@@ -1446,7 +1446,7 @@ IRC_PROTOCOL_CALLBACK(privmsg)
         weechat_printf_tags (ptr_channel->buffer,
                              irc_protocol_tags (command,
                                                 (nick_is_me) ?
-                                                "notify_private,no_highlight" :
+                                                "notify_none,no_highlight" :
                                                 "notify_private",
                                                 nick),
                              "%s%s",
@@ -1696,7 +1696,7 @@ IRC_PROTOCOL_CALLBACK(topic)
                                                                       ptr_buffer),
                                      irc_protocol_tags (command, NULL, NULL),
                                      _("%s%s%s%s has changed topic for %s%s%s "
-                                       "from \"%s%s\" to \"%s%s\""),
+                                       "from \"%s%s%s\" to \"%s%s%s\""),
                                      weechat_prefix ("network"),
                                      IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
                                      nick,
@@ -1704,8 +1704,10 @@ IRC_PROTOCOL_CALLBACK(topic)
                                      IRC_COLOR_CHAT_CHANNEL,
                                      argv[2],
                                      IRC_COLOR_CHAT,
+                                     IRC_COLOR_TOPIC_OLD,
                                      (old_topic_color) ? old_topic_color : ptr_channel->topic,
                                      IRC_COLOR_CHAT,
+                                     IRC_COLOR_TOPIC_NEW,
                                      (topic_color) ? topic_color : pos_topic,
                                      IRC_COLOR_CHAT);
                 if (old_topic_color)
@@ -1717,8 +1719,8 @@ IRC_PROTOCOL_CALLBACK(topic)
                                                                       command, NULL,
                                                                       ptr_buffer),
                                      irc_protocol_tags (command, NULL, NULL),
-                                     _("%s%s%s%s has changed topic for %s%s%s to "
-                                       "\"%s%s\""),
+                                     _("%s%s%s%s has changed topic for %s%s%s "
+                                       "to \"%s%s%s\""),
                                      weechat_prefix ("network"),
                                      IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
                                      nick,
@@ -1726,6 +1728,7 @@ IRC_PROTOCOL_CALLBACK(topic)
                                      IRC_COLOR_CHAT_CHANNEL,
                                      argv[2],
                                      IRC_COLOR_CHAT,
+                                     IRC_COLOR_TOPIC_NEW,
                                      (topic_color) ? topic_color : pos_topic,
                                      IRC_COLOR_CHAT);
             }
@@ -1744,7 +1747,7 @@ IRC_PROTOCOL_CALLBACK(topic)
                                                                       ptr_buffer),
                                      irc_protocol_tags (command, NULL, NULL),
                                      _("%s%s%s%s has unset topic for %s%s%s "
-                                       "(old topic: \"%s%s\")"),
+                                       "(old topic: \"%s%s%s\")"),
                                      weechat_prefix ("network"),
                                      IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
                                      nick,
@@ -1752,6 +1755,7 @@ IRC_PROTOCOL_CALLBACK(topic)
                                      IRC_COLOR_CHAT_CHANNEL,
                                      argv[2],
                                      IRC_COLOR_CHAT,
+                                     IRC_COLOR_TOPIC_OLD,
                                      (old_topic_color) ? old_topic_color : ptr_channel->topic,
                                      IRC_COLOR_CHAT);
                 if (old_topic_color)

src/plugins/irc/irc-server.c

@@ -66,7 +66,7 @@ struct t_irc_message *irc_msgq_last_msg = NULL;
 
 char *irc_server_option_string[IRC_SERVER_NUM_OPTIONS] =
 { "addresses", "proxy", "ipv6",
-  "ssl", "ssl_cert", "ssl_dhkey_size", "ssl_verify",
+  "ssl", "ssl_cert", "ssl_priorities", "ssl_dhkey_size", "ssl_verify",
   "password", "sasl_mechanism", "sasl_username", "sasl_password", "sasl_timeout",
   "autoconnect", "autoreconnect", "autoreconnect_delay",
   "nicks", "username", "realname", "local_hostname",
@@ -80,7 +80,7 @@ char *irc_server_option_string[IRC_SERVER_NUM_OPTIONS] =
 
 char *irc_server_option_default[IRC_SERVER_NUM_OPTIONS] =
 { "", "", "off",
-  "off", "", "2048", "on",
+  "off", "", "NORMAL", "2048", "on",
   "", "plain", "", "", "15",
   "off", "on", "10",
   "", "", "", "",
@@ -687,6 +687,8 @@ irc_server_alloc (const char *name)
                                               NULL,
                                               NULL,
                                               1,
+                                              &irc_config_server_check_value_cb,
+                                              irc_server_option_string[i],
                                               &irc_config_server_change_cb,
                                               irc_server_option_string[i]);
             irc_config_server_change_cb (irc_server_option_string[i],
@@ -1902,7 +1904,7 @@ void
 irc_server_msgq_flush ()
 {
     struct t_irc_message *next;
-    char *ptr_data, *new_msg, *ptr_msg, *pos;
+    char *ptr_data, *new_msg, *new_msg2, *ptr_msg, *ptr_msg2, *pos;
     char *nick, *host, *command, *channel, *arguments;
     char *msg_decoded, *msg_decoded_without_color;
     char str_modifier[64], modifier_data[256];
@@ -1997,24 +1999,46 @@ irc_server_msgq_flush ()
                             weechat_string_remove_color ((msg_decoded) ? msg_decoded : ptr_msg,
                                                          "?");
                         
-                        /* parse and execute command */
-                        if (irc_redirect_message (irc_recv_msgq->server,
-                                                  (msg_decoded_without_color) ?
-                                                  msg_decoded_without_color : ((msg_decoded) ? msg_decoded : ptr_msg),
-                                                  command, arguments))
+                        /* call modifier after charset */
+                        ptr_msg2 = (msg_decoded_without_color) ?
+                            msg_decoded_without_color : ((msg_decoded) ? msg_decoded : ptr_msg);
+                        snprintf (str_modifier, sizeof (str_modifier),
+                                  "irc_in2_%s",
+                                  (command) ? command : "unknown");
+                        new_msg2 = weechat_hook_modifier_exec (str_modifier,
+                                                               irc_recv_msgq->server->name,
+                                                               ptr_msg2);
+                        if (new_msg2 && (strcmp (ptr_msg2, new_msg2) == 0))
                         {
-                            /* message redirected, we'll not display it! */
-                        }
-                        else
-                        {
-                            /* message not redirected, display it */
-                            irc_protocol_recv_command (irc_recv_msgq->server,
-                                                       (msg_decoded_without_color) ?
-                                                       msg_decoded_without_color : ((msg_decoded) ? msg_decoded : ptr_msg),
-                                                       command,
-                                                       channel);
+                            free (new_msg2);
+                            new_msg2 = NULL;
                         }
                         
+                        /* message not dropped? */
+                        if (!new_msg2 || new_msg2[0])
+                        {
+                            /* use new message (returned by plugin) */
+                            if (new_msg2)
+                                ptr_msg2 = new_msg2;
+                            
+                            /* parse and execute command */
+                            if (irc_redirect_message (irc_recv_msgq->server,
+                                                      ptr_msg2, command,
+                                                      arguments))
+                            {
+                                /* message redirected, we'll not display it! */
+                            }
+                            else
+                            {
+                                /* message not redirected, display it */
+                                irc_protocol_recv_command (irc_recv_msgq->server,
+                                                           ptr_msg2, command,
+                                                           channel);
+                            }
+                        }
+                        
+                        if (new_msg2)
+                            free (new_msg2);
                         if (nick)
                             free (nick);
                         if (host)
@@ -3337,6 +3361,7 @@ irc_server_connect (struct t_irc_server *server)
                                                  (server->ssl_connected) ? &server->gnutls_sess : NULL,
                                                  (server->ssl_connected) ? irc_server_gnutls_callback : NULL,
                                                  IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_SSL_DHKEY_SIZE),
+                                                 IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_SSL_PRIORITIES),
                                                  IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_LOCAL_HOSTNAME),
                                                  &irc_server_connect_cb,
                                                  server);
@@ -3346,7 +3371,7 @@ irc_server_connect (struct t_irc_server *server)
                                                  server->current_port,
                                                  server->sock,
                                                  IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_IPV6),
-                                                 NULL, NULL, 0,
+                                                 NULL, NULL, 0, NULL,
                                                  IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_LOCAL_HOSTNAME),
                                                  &irc_server_connect_cb,
                                                  server);
@@ -3954,6 +3979,9 @@ irc_server_add_to_infolist (struct t_infolist *infolist,
     if (!weechat_infolist_new_var_string (ptr_item, "ssl_cert",
                                           IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_SSL_CERT)))
         return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "ssl_priorities",
+                                          IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_SSL_PRIORITIES)))
+        return 0;
     if (!weechat_infolist_new_var_integer (ptr_item, "ssl_dhkey_size",
                                            IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_SSL_DHKEY_SIZE)))
         return 0;
@@ -4144,6 +4172,13 @@ irc_server_print_log ()
         else
             weechat_log_printf ("  ssl_cert . . . . . . : '%s'",
                                 weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_SSL_CERT]));
+        /* ssl_priorities */
+        if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_SSL_PRIORITIES]))
+            weechat_log_printf ("  ssl_priorities . . . : null ('%s')",
+                                IRC_SERVER_OPTION_STRING(ptr_server, IRC_SERVER_OPTION_SSL_PRIORITIES));
+        else
+            weechat_log_printf ("  ssl_priorities . . . : '%s'",
+                                weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_SSL_PRIORITIES]));
         /* ssl_dhkey_size */
         if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_SSL_DHKEY_SIZE]))
             weechat_log_printf ("  ssl_dhkey_size . . . : null ('%d')",

src/plugins/irc/irc-server.h

@@ -38,6 +38,7 @@ enum t_irc_server_option
     IRC_SERVER_OPTION_IPV6,          /* use IPv6 protocol                    */
     IRC_SERVER_OPTION_SSL,           /* SSL protocol                         */
     IRC_SERVER_OPTION_SSL_CERT,      /* client ssl certificate file          */
+    IRC_SERVER_OPTION_SSL_PRIORITIES, /* gnutls priorities                   */
     IRC_SERVER_OPTION_SSL_DHKEY_SIZE, /* Diffie Hellman key size             */
     IRC_SERVER_OPTION_SSL_VERIFY,    /* check if the connection is trusted   */
     IRC_SERVER_OPTION_PASSWORD,      /* password for server                  */

src/plugins/plugin-api.c

@@ -168,6 +168,19 @@ plugin_api_config_set_plugin (struct t_weechat_plugin *plugin,
     return plugin_config_set (plugin->name, option_name, value);
 }
 
+/*
+ * plugin_api_config_set_desc_plugin: set description of a plugin config option
+ */
+
+void
+plugin_api_config_set_desc_plugin (struct t_weechat_plugin *plugin,
+                                   const char *option_name,
+                                   const char *description)
+{
+    if (plugin && option_name)
+        plugin_config_set_desc (plugin->name, option_name, description);
+}
+
 /*
  * plugin_api_config_unset_plugin: unset plugin config option
  */

src/plugins/plugin-api.h

@@ -36,6 +36,9 @@ extern int plugin_api_config_is_set_plugin (struct t_weechat_plugin *plugin,
 extern int plugin_api_config_set_plugin (struct t_weechat_plugin *plugin,
                                          const char *option_name,
                                          const char *value);
+extern void plugin_api_config_set_desc_plugin (struct t_weechat_plugin *plugin,
+                                               const char *option_name,
+                                               const char *description);
 extern int plugin_api_config_unset_plugin (struct t_weechat_plugin *plugin,
                                            const char *option_name);
 

src/plugins/plugin-config.c

@@ -43,6 +43,7 @@
 
 struct t_config_file *plugin_config_file = NULL;
 struct t_config_section *plugin_config_section_var = NULL;
+struct t_config_section *plugin_config_section_desc = NULL;
 
 
 /*
@@ -130,6 +131,85 @@ plugin_config_set (const char *plugin_name, const char *option_name,
     return rc;
 }
 
+/*
+ * plugin_config_desc_changed_cb: called when description of an option is
+ *                                changed
+ */
+
+void
+plugin_config_desc_changed_cb (void *data, struct t_config_option *option)
+{
+    struct t_config_option *ptr_option;
+    
+    /* make C compiler happy */
+    (void) data;
+    
+    ptr_option = config_file_search_option (plugin_config_file,
+                                            plugin_config_section_var,
+                                            option->name);
+    if (ptr_option)
+    {
+        if (ptr_option->description)
+        {
+            free (ptr_option->description);
+            ptr_option->description = NULL;
+        }
+        if (option->value)
+            ptr_option->description = strdup (option->value);
+    }
+}
+
+/*
+ * plugin_config_set_desc_internal: set description for a plugin option
+ *                                  (internal function)
+ *                                  This function should not be called directly.
+ */
+
+void
+plugin_config_set_desc_internal (const char *option, const char *value)
+{
+    struct t_config_option *ptr_option;
+    
+    ptr_option = config_file_search_option (plugin_config_file,
+                                            plugin_config_section_desc,
+                                            option);
+    if (ptr_option)
+    {
+        config_file_option_set (ptr_option, value, 1);
+    }
+    else
+    {
+        ptr_option = config_file_new_option (
+            plugin_config_file, plugin_config_section_desc,
+            option, "string", _("description of plugin option"),
+            NULL, 0, 0, "", value, 0, NULL, NULL,
+            &plugin_config_desc_changed_cb, NULL, NULL, NULL);
+    }
+}
+
+/*
+ * plugin_config_set_desc: set description for a plugin option
+ */
+
+void
+plugin_config_set_desc (const char *plugin_name, const char *option_name,
+                        const char *description)
+{
+    int length;
+    char *option_full_name;
+    
+    length = strlen (plugin_name) + 1 + strlen (option_name) + 1;
+    option_full_name = malloc (length);
+    if (option_full_name)
+    {
+        snprintf (option_full_name, length, "%s.%s",
+                  plugin_name, option_name);
+        string_tolower (option_full_name);
+        plugin_config_set_desc_internal (option_full_name, description);
+        free (option_full_name);
+    }
+}
+
 /*
  * plugin_config_reload: reload plugins configuration file
  */
@@ -140,8 +220,9 @@ plugin_config_reload (void *data, struct t_config_file *config_file)
     /* make C compiler happy */
     (void) data;
     
-    /* remove all plugin options */
+    /* remove all plugin options and descriptions */
     config_file_section_free_options (plugin_config_section_var);
+    config_file_section_free_options (plugin_config_section_desc);
     
     /* reload plugins config file */
     return config_file_reload (config_file);
@@ -156,20 +237,93 @@ plugin_config_create_option (void *data, struct t_config_file *config_file,
                              struct t_config_section *section,
                              const char *option_name, const char *value)
 {
-    struct t_config_option *ptr_option;
+    struct t_config_option *ptr_option_desc, *ptr_option;
     
     /* make C compiler happy */
     (void) data;
+
+    ptr_option_desc = config_file_search_option (config_file,
+                                                 plugin_config_section_desc,
+                                                 option_name);
     
     ptr_option = config_file_new_option (
         config_file, section,
-        option_name, "string", NULL,
+        option_name, "string",
+        (ptr_option_desc) ? CONFIG_STRING(ptr_option_desc) : NULL,
         NULL, 0, 0, "", value, 0, NULL, NULL, NULL, NULL, NULL, NULL);
     
     return (ptr_option) ?
         WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE : WEECHAT_CONFIG_OPTION_SET_ERROR;
 }
 
+/*
+ * plugin_config_create_desc: set plugin option description
+ */
+
+int
+plugin_config_create_desc (void *data, struct t_config_file *config_file,
+                           struct t_config_section *section,
+                           const char *option_name, const char *value)
+{
+    struct t_config_option *ptr_option_var, *ptr_option;
+    
+    /* make C compiler happy */
+    (void) data;
+    
+    ptr_option_var = config_file_search_option (config_file,
+                                                plugin_config_section_var,
+                                                option_name);
+    if (ptr_option_var)
+    {
+        if (ptr_option_var->description)
+        {
+            free (ptr_option_var->description);
+            ptr_option_var->description = NULL;
+        }
+        if (value)
+            ptr_option_var->description = strdup (value);
+    }
+    
+    ptr_option = config_file_new_option (
+        config_file, section,
+        option_name, "string", _("description of plugin option"),
+        NULL, 0, 0, "", value, 0, NULL, NULL,
+        &plugin_config_desc_changed_cb, NULL, NULL, NULL);
+    
+    return (ptr_option) ?
+        WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE : WEECHAT_CONFIG_OPTION_SET_ERROR;
+}
+
+/*
+ * plugin_config_delete_desc: delete plugin option description
+ */
+
+int
+plugin_config_delete_desc (void *data, struct t_config_file *config_file,
+                           struct t_config_section *section,
+                           struct t_config_option *option)
+{
+    struct t_config_option *ptr_option_var;
+    
+    /* make C compiler happy */
+    (void) data;
+    (void) section;
+    
+    ptr_option_var = config_file_search_option (config_file,
+                                                plugin_config_section_var,
+                                                option->name);
+    if (ptr_option_var)
+    {
+        if (ptr_option_var->description)
+        {
+            free (ptr_option_var->description);
+            ptr_option_var->description = NULL;
+        }
+    }
+    
+    return WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED;
+}
+
 /*
  * plugin_config_init: init plugins config structure
  */
@@ -188,9 +342,19 @@ plugin_config_init ()
             NULL, NULL,
             &plugin_config_create_option, NULL,
             NULL, NULL);
+        plugin_config_section_desc = config_file_new_section (
+            plugin_config_file, "desc", 1, 1,
+            NULL, NULL,
+            NULL, NULL,
+            NULL, NULL,
+            &plugin_config_create_desc, NULL,
+            &plugin_config_delete_desc, NULL);
     }
     else
+    {
         plugin_config_section_var = NULL;
+        plugin_config_section_desc = NULL;
+    }
 }
 
 /*
@@ -220,6 +384,7 @@ plugin_config_write ()
 void
 plugin_config_end ()
 {
-    /* free all plugin config options */
+    /* free all plugin config options and descriptions */
     config_file_section_free_options (plugin_config_section_var);
+    config_file_section_free_options (plugin_config_section_desc);
 }

src/plugins/plugin-config.h

@@ -29,6 +29,9 @@ extern struct t_config_option *plugin_config_search (const char *plugin_name,
                                                      const char *option_name);
 extern int plugin_config_set (const char *plugin_name, const char *option_name,
                               const char *value);
+extern void plugin_config_set_desc (const char *plugin_name,
+                                    const char *option_name,
+                                    const char *description);
 extern void plugin_config_init ();
 extern int plugin_config_read ();
 extern int plugin_config_write ();

src/plugins/plugin.c

@@ -575,6 +575,7 @@ plugin_load (const char *filename)
         new_plugin->config_get_plugin = &plugin_api_config_get_plugin;
         new_plugin->config_is_set_plugin = &plugin_api_config_is_set_plugin;
         new_plugin->config_set_plugin = &plugin_api_config_set_plugin;
+        new_plugin->config_set_desc_plugin = &plugin_api_config_set_desc_plugin;
         new_plugin->config_unset_plugin = &plugin_api_config_unset_plugin;
         
         new_plugin->prefix = &plugin_api_prefix;

src/plugins/relay/relay-client-irc.c

@@ -1017,7 +1017,10 @@ relay_client_irc_alloc_with_infolist (struct t_relay_client *client,
     {
         RELAY_IRC_DATA(client, address) = strdup (weechat_infolist_string (infolist, "address"));
         RELAY_IRC_DATA(client, password_ok) = weechat_infolist_integer (infolist, "password_ok");
-        RELAY_IRC_DATA(client, nick) = strdup (weechat_infolist_string (infolist, "nick"));
+        if (weechat_infolist_string (infolist, "nick"))
+            RELAY_IRC_DATA(client, nick) = strdup (weechat_infolist_string (infolist, "nick"));
+        else
+            RELAY_IRC_DATA(client, nick) = NULL;
         RELAY_IRC_DATA(client, user_received) = weechat_infolist_integer (infolist, "user_received");
         RELAY_IRC_DATA(client, connected) = weechat_infolist_integer (infolist, "connected");
         if (RELAY_IRC_DATA(client, connected))

src/plugins/scripts/lua/weechat-lua-api.c

@@ -2911,6 +2911,44 @@ weechat_lua_api_config_set_plugin (lua_State *L)
     LUA_RETURN_INT(rc);
 }
 
+/*
+ * weechat_lua_api_config_set_desc_plugin: set description of a plugin option
+ */
+
+static int
+weechat_lua_api_config_set_desc_plugin (lua_State *L)
+{
+    const char *option, *description;
+    int n;
+    
+    /* make C compiler happy */
+    (void) L;
+    
+    if (!lua_current_script || !lua_current_script->name)
+    {
+        WEECHAT_SCRIPT_MSG_NOT_INIT(LUA_CURRENT_SCRIPT_NAME, "config_set_desc_plugin");
+        LUA_RETURN_ERROR;
+    }
+    
+    n = lua_gettop (lua_current_interpreter);
+    
+    if (n < 2)
+    {
+        WEECHAT_SCRIPT_MSG_WRONG_ARGS(LUA_CURRENT_SCRIPT_NAME, "config_set_desc_plugin");
+        LUA_RETURN_ERROR;
+    }
+    
+    option = lua_tostring (lua_current_interpreter, -2);
+    description = lua_tostring (lua_current_interpreter, -1);
+    
+    script_api_config_set_desc_plugin (weechat_lua_plugin,
+                                       lua_current_script,
+                                       option,
+                                       description);
+    
+    LUA_RETURN_OK;
+}
+
 /*
  * weechat_lua_api_config_unset_plugin: unset plugin option
  */
@@ -3691,6 +3729,7 @@ weechat_lua_api_hook_connect (lua_State *L)
                                                       NULL, /* gnutls session */
                                                       NULL, /* gnutls callback */
                                                       0,    /* gnutls DH key size */
+                                                      NULL, /* gnutls priorities */
                                                       local_hostname,
                                                       &weechat_lua_api_hook_connect_cb,
                                                       function,
@@ -7800,6 +7839,7 @@ const struct luaL_reg weechat_lua_api_funcs[] = {
     { "config_get_plugin", &weechat_lua_api_config_get_plugin },
     { "config_is_set_plugin", &weechat_lua_api_config_is_set_plugin },
     { "config_set_plugin", &weechat_lua_api_config_set_plugin },
+    { "config_set_desc_plugin", &weechat_lua_api_config_set_desc_plugin },
     { "config_unset_plugin", &weechat_lua_api_config_unset_plugin },
     { "prefix", &weechat_lua_api_prefix },
     { "color", &weechat_lua_api_color },

src/plugins/scripts/perl/weechat-perl-api.c

@@ -2610,6 +2610,41 @@ XS (XS_weechat_api_config_set_plugin)
     PERL_RETURN_INT(rc);
 }
 
+/*
+ * weechat::config_set_desc_plugin: set description of a plugin option
+ */
+
+XS (XS_weechat_api_config_set_desc_plugin)
+{
+    char *option, *description;
+    dXSARGS;
+    
+    /* make C compiler happy */
+    (void) cv;
+    
+    if (!perl_current_script || !perl_current_script->name)
+    {
+        WEECHAT_SCRIPT_MSG_NOT_INIT(PERL_CURRENT_SCRIPT_NAME, "config_set_desc_plugin");
+        PERL_RETURN_ERROR;
+    }
+    
+    if (items < 2)
+    {
+        WEECHAT_SCRIPT_MSG_WRONG_ARGS(PERL_CURRENT_SCRIPT_NAME, "config_set_desc_plugin");
+        PERL_RETURN_ERROR;
+    }
+    
+    option = SvPV (ST (0), PL_na);
+    description = SvPV (ST (1), PL_na);
+    
+    script_api_config_set_desc_plugin (weechat_perl_plugin,
+                                       perl_current_script,
+                                       option,
+                                       description);
+    
+    PERL_RETURN_OK;
+}
+
 /*
  * weechat::config_unset_plugin: unset a plugin option
  */
@@ -3320,6 +3355,7 @@ XS (XS_weechat_api_hook_connect)
                                                       NULL, /* gnutls session */
                                                       NULL, /* gnutls callback */
                                                       0,    /* gnutls DH key size */
+                                                      NULL, /* gnutls priorities */
                                                       local_hostname,
                                                       &weechat_perl_api_hook_connect_cb,
                                                       function,
@@ -6729,6 +6765,7 @@ weechat_perl_api_init (pTHX)
     newXS ("weechat::config_get_plugin", XS_weechat_api_config_get_plugin, "weechat");
     newXS ("weechat::config_is_set_plugin", XS_weechat_api_config_is_set_plugin, "weechat");
     newXS ("weechat::config_set_plugin", XS_weechat_api_config_set_plugin, "weechat");
+    newXS ("weechat::config_set_desc_plugin", XS_weechat_api_config_set_desc_plugin, "weechat");
     newXS ("weechat::config_unset_plugin", XS_weechat_api_config_unset_plugin, "weechat");
     newXS ("weechat::prefix", XS_weechat_api_prefix, "weechat");
     newXS ("weechat::color", XS_weechat_api_color, "weechat");

src/plugins/scripts/perl/weechat-perl.c

@@ -206,43 +206,6 @@ weechat_perl_hash_to_hashtable (SV *hash, int hashtable_size)
     return hashtable;
 }
 
-/*
- * weechat_perl_exec_pv: encapsulation of call to perl_call_pv
- */
-
-int
-weechat_perl_exec_pv (const char *func, const char *format, void **argv)
-{
-    int i, argc;
-    HV *hash;
-    
-    dSP;
-    
-    PUSHMARK(SP);
-    if (format && format[0])
-    {
-        argc = strlen (format);
-        for (i = 0; i < argc; i++)
-        {
-            switch (format[i])
-            {
-                case 's': /* string */
-                    XPUSHs(sv_2mortal(newSVpv((char *)argv[i], 0)));
-                    break;
-                case 'i': /* integer */
-                    XPUSHs(sv_2mortal(newSViv(*((int *)argv[i]))));
-                    break;
-                case 'h': /* hash */
-                    hash = weechat_perl_hashtable_to_hash (argv[i]);
-                    XPUSHs(sv_2mortal((SV *)hash));
-                    break;
-            }
-        }
-        PUTBACK;
-    }
-    return perl_call_pv (func, G_EVAL | G_SCALAR);
-}
-
 /*
  * weechat_perl_exec: execute a perl function
  */
@@ -255,16 +218,14 @@ weechat_perl_exec (struct t_plugin_script *script,
     char *func;
     unsigned int count;
     void *ret_value;
-    int *ret_i, mem_err, length;
+    int *ret_i, mem_err, length, i, argc;
     SV *ret_s;
+    HV *hash;
     struct t_plugin_script *old_perl_current_script;
 #ifdef MULTIPLICITY
     void *old_context;
 #endif
     
-    /* this code is placed here to conform ISO C90 */
-    dSP;
-    
     old_perl_current_script = perl_current_script;
     perl_current_script = script;
     
@@ -285,10 +246,33 @@ weechat_perl_exec (struct t_plugin_script *script,
               function);
 #endif
     
+    dSP;
     ENTER;
     SAVETMPS;
     
-    count = weechat_perl_exec_pv (func, format, argv);
+    PUSHMARK(SP);
+    if (format && format[0])
+    {
+        argc = strlen (format);
+        for (i = 0; i < argc; i++)
+        {
+            switch (format[i])
+            {
+                case 's': /* string */
+                    XPUSHs(sv_2mortal(newSVpv((char *)argv[i], 0)));
+                    break;
+                case 'i': /* integer */
+                    XPUSHs(sv_2mortal(newSViv(*((int *)argv[i]))));
+                    break;
+                case 'h': /* hash */
+                    hash = weechat_perl_hashtable_to_hash (argv[i]);
+                    XPUSHs(sv_2mortal((SV *)hash));
+                    break;
+            }
+        }
+    }
+    PUTBACK;
+    count = perl_call_pv (func, G_EVAL | G_SCALAR);
     
     ret_value = NULL;
     mem_err = 1;
@@ -346,7 +330,8 @@ weechat_perl_exec (struct t_plugin_script *script,
             }
         }
     }
-    
+
+    PUTBACK;
     FREETMPS;
     LEAVE;
     

src/plugins/scripts/python/weechat-python-api.c

@@ -2759,6 +2759,41 @@ weechat_python_api_config_set_plugin (PyObject *self, PyObject *args)
     PYTHON_RETURN_INT(rc);
 }
 
+/*
+ * weechat_python_api_config_set_desc_plugin: set description of a plugin option
+ */
+
+static PyObject *
+weechat_python_api_config_set_desc_plugin (PyObject *self, PyObject *args)
+{
+    char *option, *description;
+    
+    /* make C compiler happy */
+    (void) self;
+    
+    if (!python_current_script || !python_current_script->name)
+    {
+        WEECHAT_SCRIPT_MSG_NOT_INIT(PYTHON_CURRENT_SCRIPT_NAME, "config_set_desc_plugin");
+        PYTHON_RETURN_ERROR;
+    }
+    
+    option = NULL;
+    description = NULL;
+    
+    if (!PyArg_ParseTuple (args, "ss", &option, &description))
+    {
+        WEECHAT_SCRIPT_MSG_WRONG_ARGS(PYTHON_CURRENT_SCRIPT_NAME, "config_set_desc_plugin");
+        PYTHON_RETURN_ERROR;
+    }
+    
+    script_api_config_set_desc_plugin (weechat_python_plugin,
+                                       python_current_script,
+                                       option,
+                                       description);
+    
+    PYTHON_RETURN_OK;
+}
+
 /*
  * weechat_python_api_config_unset_plugin: unset plugin option
  */
@@ -3512,6 +3547,7 @@ weechat_python_api_hook_connect (PyObject *self, PyObject *args)
                                                       NULL, /* gnutls session */
                                                       NULL, /* gnutls callback */
                                                       0,    /* gnutls DH key size */
+                                                      NULL, /* gnutls priorities */
                                                       local_hostname,
                                                       &weechat_python_api_hook_connect_cb,
                                                       function,
@@ -7066,6 +7102,7 @@ PyMethodDef weechat_python_funcs[] =
     { "config_get_plugin", &weechat_python_api_config_get_plugin, METH_VARARGS, "" },
     { "config_is_set_plugin", &weechat_python_api_config_is_set_plugin, METH_VARARGS, "" },
     { "config_set_plugin", &weechat_python_api_config_set_plugin, METH_VARARGS, "" },
+    { "config_set_desc_plugin", &weechat_python_api_config_set_desc_plugin, METH_VARARGS, "" },
     { "config_unset_plugin", &weechat_python_api_config_unset_plugin, METH_VARARGS, "" },
     { "prefix", &weechat_python_api_prefix, METH_VARARGS, "" },
     { "color", &weechat_python_api_color, METH_VARARGS, "" },

src/plugins/scripts/ruby/weechat-ruby-api.c

@@ -2992,6 +2992,45 @@ weechat_ruby_api_config_set_plugin (VALUE class, VALUE option, VALUE value)
     RUBY_RETURN_INT(rc);
 }
 
+/*
+ * weechat_ruby_api_config_set_desc_plugin: set description of a plugin option
+ */
+
+static VALUE
+weechat_ruby_api_config_set_desc_plugin (VALUE class, VALUE option,
+                                         VALUE description)
+{
+    char *c_option, *c_description;
+    
+    /* make C compiler happy */
+    (void) class;
+    
+    if (!ruby_current_script || !ruby_current_script->name)
+    {
+        WEECHAT_SCRIPT_MSG_NOT_INIT(RUBY_CURRENT_SCRIPT_NAME, "config_set_desc_plugin");
+        RUBY_RETURN_ERROR;
+    }
+    
+    if (NIL_P (option) || NIL_P (description))
+    {
+        WEECHAT_SCRIPT_MSG_WRONG_ARGS(RUBY_CURRENT_SCRIPT_NAME, "config_set_desc_plugin");
+        RUBY_RETURN_ERROR;
+    }
+    
+    Check_Type (option, T_STRING);
+    Check_Type (description, T_STRING);
+    
+    c_option = StringValuePtr (option);
+    c_description = StringValuePtr (description);
+    
+    script_api_config_set_desc_plugin (weechat_ruby_plugin,
+                                       ruby_current_script,
+                                       c_option,
+                                       c_description);
+    
+    RUBY_RETURN_OK;
+}
+
 /*
  * weechat_ruby_api_config_unset_plugin: unset plugin option
  */
@@ -3817,6 +3856,7 @@ weechat_ruby_api_hook_connect (VALUE class, VALUE proxy, VALUE address,
                                                       NULL, /* gnutls session */
                                                       NULL, /* gnutls callback */
                                                       0,    /* gnutls DH key size */
+                                                      NULL, /* gnutls priorities */
                                                       c_local_hostname,
                                                       &weechat_ruby_api_hook_connect_cb,
                                                       c_function,
@@ -7737,6 +7777,7 @@ weechat_ruby_api_init (VALUE ruby_mWeechat)
     rb_define_module_function (ruby_mWeechat, "config_get_plugin", &weechat_ruby_api_config_get_plugin, 1);
     rb_define_module_function (ruby_mWeechat, "config_is_set_plugin", &weechat_ruby_api_config_is_set_plugin, 1);
     rb_define_module_function (ruby_mWeechat, "config_set_plugin", &weechat_ruby_api_config_set_plugin, 2);
+    rb_define_module_function (ruby_mWeechat, "config_set_desc_plugin", &weechat_ruby_api_config_set_desc_plugin, 2);
     rb_define_module_function (ruby_mWeechat, "config_unset_plugin", &weechat_ruby_api_config_unset_plugin, 1);
     rb_define_module_function (ruby_mWeechat, "prefix", &weechat_ruby_api_prefix, 1);
     rb_define_module_function (ruby_mWeechat, "color", &weechat_ruby_api_color, 1);

src/plugins/scripts/script-api.c

@@ -929,6 +929,7 @@ script_api_hook_connect (struct t_weechat_plugin *weechat_plugin,
                          const char *proxy, const char *address, int port,
                          int sock, int ipv6, void *gnutls_sess,
                          void *gnutls_cb, int gnutls_dhkey_size,
+                         const char *gnutls_priorities,
                          const char *local_hostname,
                          int (*callback)(void *data, int status,
                                          int gnutls_rc,
@@ -946,8 +947,8 @@ script_api_hook_connect (struct t_weechat_plugin *weechat_plugin,
     
     new_hook = weechat_hook_connect (proxy, address, port, sock, ipv6,
                                      gnutls_sess, gnutls_cb, gnutls_dhkey_size,
-                                     local_hostname, callback,
-                                     new_script_callback);
+                                     gnutls_priorities, local_hostname,
+                                     callback, new_script_callback);
     if (!new_hook)
     {
         script_callback_free_data (new_script_callback);
@@ -1680,6 +1681,31 @@ script_api_config_set_plugin (struct t_weechat_plugin *weechat_plugin,
     return return_code;
 }
 
+/*
+ * script_api_config_set_plugin: set value of a script config option
+ *                               format in file is "plugin.script.option"
+ */
+
+void
+script_api_config_set_desc_plugin (struct t_weechat_plugin *weechat_plugin,
+                                   struct t_plugin_script *script,
+                                   const char *option, const char *description)
+{
+    char *option_fullname;
+    
+    option_fullname = malloc ((strlen (script->name) +
+                               strlen (option) + 2));
+    if (!option_fullname)
+        return;
+    
+    strcpy (option_fullname, script->name);
+    strcat (option_fullname, ".");
+    strcat (option_fullname, option);
+    
+    weechat_config_set_desc_plugin (option_fullname, description);
+    free (option_fullname);
+}
+
 /*
  * script_api_config_unset_plugin: unset script config option
  *                                 format in file is "plugin.script.option"

src/plugins/scripts/script-api.h

@@ -170,8 +170,10 @@ extern struct t_hook *script_api_hook_connect (struct t_weechat_plugin *weechat_
                                                int port,
                                                int sock,
                                                int ipv6,
-                                               void *gnutls_sess, void *gnutls_cb,
+                                               void *gnutls_sess,
+                                               void *gnutls_cb,
                                                int gnutls_dhkey_size,
+                                               const char *gnutls_priorities,
                                                const char *local_hostname,
                                                int (*callback)(void *data,
                                                                int status,
@@ -317,6 +319,10 @@ extern int script_api_config_is_set_plugin (struct t_weechat_plugin *weechat_plu
 extern int script_api_config_set_plugin (struct t_weechat_plugin *weechat_plugin,
                                          struct t_plugin_script *script,
                                          const char *option, const char *value);
+extern void script_api_config_set_desc_plugin (struct t_weechat_plugin *weechat_plugin,
+                                               struct t_plugin_script *script,
+                                               const char *option,
+                                               const char *description);
 extern int script_api_config_unset_plugin (struct t_weechat_plugin *weechat_plugin,
                                            struct t_plugin_script *script,
                                            const char *option);

src/plugins/scripts/tcl/weechat-tcl-api.c

@@ -2984,6 +2984,44 @@ weechat_tcl_api_config_set_plugin (ClientData clientData, Tcl_Interp *interp,
     TCL_RETURN_INT(rc);
 }
 
+/*
+ * weechat_tcl_api_config_set_desc_plugin: set description of a plugin option
+ */
+
+static int
+weechat_tcl_api_config_set_desc_plugin (ClientData clientData, Tcl_Interp *interp,
+                                        int objc, Tcl_Obj *CONST objv[])
+{
+    Tcl_Obj *objp;
+    char *option, *description;
+    int i;
+    
+    /* make C compiler happy */
+    (void) clientData;
+    
+    if (!tcl_current_script || !tcl_current_script->name)
+    {
+        WEECHAT_SCRIPT_MSG_NOT_INIT(TCL_CURRENT_SCRIPT_NAME, "config_set_desc_plugin");
+        TCL_RETURN_ERROR;
+    }
+    
+    if (objc < 3)
+    {
+        WEECHAT_SCRIPT_MSG_WRONG_ARGS(TCL_CURRENT_SCRIPT_NAME, "config_set_desc_plugin");
+        TCL_RETURN_ERROR;
+    }
+    
+    option = Tcl_GetStringFromObj (objv[1], &i);
+    description = Tcl_GetStringFromObj (objv[2], &i);
+    
+    script_api_config_set_desc_plugin (weechat_tcl_plugin,
+                                       tcl_current_script,
+                                       option,
+                                       description);
+    
+    TCL_RETURN_OK;
+}
+
 /*
  * weechat_tcl_api_config_set_plugin: unset plugin option
  */
@@ -3776,6 +3814,7 @@ weechat_tcl_api_hook_connect (ClientData clientData, Tcl_Interp *interp,
                                                       NULL, /* gnutls session */
                                                       NULL, /* gnutls callback */
                                                       0,    /* gnutls DH key size */
+                                                      NULL, /* gnutls priorities */
                                                       local_hostname,
                                                       &weechat_tcl_api_hook_connect_cb,
                                                       function,
@@ -7639,6 +7678,8 @@ void weechat_tcl_api_init (Tcl_Interp *interp)
                           weechat_tcl_api_config_is_set_plugin, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
     Tcl_CreateObjCommand (interp, "weechat::config_set_plugin",
                           weechat_tcl_api_config_set_plugin, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
+    Tcl_CreateObjCommand (interp, "weechat::config_set_desc_plugin",
+                          weechat_tcl_api_config_set_desc_plugin, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
     Tcl_CreateObjCommand (interp, "weechat::config_unset_plugin",
                           weechat_tcl_api_config_unset_plugin, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
     Tcl_CreateObjCommand (interp, "weechat::prefix",

src/plugins/weechat-plugin.h

@@ -45,7 +45,7 @@ struct timeval;
  */
 
 /* API version (used to check that plugin has same API and can be loaded) */
-#define WEECHAT_PLUGIN_API_VERSION "20110413-01"
+#define WEECHAT_PLUGIN_API_VERSION "20110428-01"
 
 /* macros for defining plugin infos */
 #define WEECHAT_PLUGIN_NAME(__name)                                     \
@@ -407,6 +407,9 @@ struct t_weechat_plugin
                                  const char *option_name);
     int (*config_set_plugin) (struct t_weechat_plugin *plugin,
                               const char *option_name, const char *value);
+    void (*config_set_desc_plugin) (struct t_weechat_plugin *plugin,
+                                    const char *option_name,
+                                    const char *description);
     int (*config_unset_plugin) (struct t_weechat_plugin *plugin,
                                 const char *option_name);
     
@@ -468,6 +471,7 @@ struct t_weechat_plugin
                                     int ipv6,
                                     void *gnutls_sess, void *gnutls_cb,
                                     int gnutls_dhkey_size,
+                                    const char *gnutls_priorities,
                                     const char *local_hostname,
                                     int (*callback)(void *data,
                                                     int status,
@@ -1101,6 +1105,9 @@ extern int weechat_plugin_end (struct t_weechat_plugin *plugin);
 #define weechat_config_set_plugin(__option, __value)                    \
     weechat_plugin->config_set_plugin(weechat_plugin, __option,         \
                                       __value)
+#define weechat_config_set_desc_plugin(__option, __description)         \
+    weechat_plugin->config_set_desc_plugin(weechat_plugin, __option,    \
+                                      __description)
 #define weechat_config_unset_plugin(__option)                           \
     weechat_plugin->config_unset_plugin(weechat_plugin, __option)
 
@@ -1153,12 +1160,13 @@ extern int weechat_plugin_end (struct t_weechat_plugin *plugin);
                                  __callback, __callback_data)
 #define weechat_hook_connect(__proxy, __address, __port, __sock,        \
                             __ipv6, __gnutls_sess, __gnutls_cb,         \
-                             __gnutls_dhkey_size, __local_hostname,     \
-                             __callback, __data)                        \
+                             __gnutls_dhkey_size, __gnutls_priorities,  \
+                             __local_hostname,  __callback, __data)     \
     weechat_plugin->hook_connect(weechat_plugin, __proxy, __address,    \
                                  __port, __sock, __ipv6, __gnutls_sess, \
                                  __gnutls_cb, __gnutls_dhkey_size,      \
-                                 __local_hostname, __callback, __data)
+                                 __gnutls_priorities, __local_hostname, \
+                                 __callback, __data)
 #define weechat_hook_print(__buffer, __tags, __msg, __strip__colors,    \
                            __callback, __data)                          \
     weechat_plugin->hook_print(weechat_plugin, __buffer, __tags,        \

src/plugins/xfer/xfer-network.c

@@ -92,7 +92,6 @@ xfer_network_child_read_cb (void *arg_xfer, int fd)
     struct t_xfer *xfer;
     char bufpipe[1 + 1 + 32 + 1];
     int num_read;
-    char *error;
     
     /* make C compiler happy */
     (void) fd;
@@ -102,7 +101,6 @@ xfer_network_child_read_cb (void *arg_xfer, int fd)
     num_read = read (xfer->child_read, bufpipe, sizeof (bufpipe));
     if (num_read > 0)
     {
-        error = NULL;
         sscanf (bufpipe + 2, "%llu", &xfer->pos);
         xfer->last_activity = time (NULL);
         xfer_file_calculate_speed (xfer, 0);