Version 0.3.5

core: fix compilation of doc in standalone package
core: update portuguese translations
2026-06-24 20:06:38 +02:00 · 2011-05-15 09:19:27 +02:00 · 2011-05-15 09:05:11 +02:00 · 2011-05-15 08:27:27 +02:00 · 2011-05-14 22:57:30 +02:00 · 2011-05-14 19:49:22 +02:00
104 changed files with 4338 additions and 2452 deletions
@@ -33,7 +33,7 @@ ENDIF(PREFIX)

 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "3")
-SET(VERSION_PATCH "5-rc1")
+SET(VERSION_PATCH "5")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(LICENSE "GPL3")
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
@@ -1,12 +1,21 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.5-rc1, 2011-04-21
+v0.3.5, 2011-05-15


-Version 0.3.5 (under dev!)
+Version 0.3.5 (2011-05-15)
 --------------------------

+* 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,20 @@ 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 parsing of message 332 when no topic neither colon are found
+  (bug with bip proxy)
+* irc: fix nick color in private when option irc.look.nick_color_force is
+  changed
+* 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 +93,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
@@ -1,10 +1,10 @@
 WeeChat News
 ============
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.5-rc1, 2011-04-21
+v0.3.5, 2011-05-15


-Version 0.3.5 (under dev!)
+Version 0.3.5 (2011-05-15)
 --------------------------

 Important release notes:
@@ -16,6 +16,16 @@ Important release notes:
  option 'irc.color.nick_prefixes', therefore following options will be lost:
  'irc.color.nick_prefix_op', 'irc.color.nick_prefix_halfop',
  'irc.color.nick_prefix_voice', 'irc.color.nick_prefix_user'
+* count of messages have been added to hotlist by default, if you want to come
+  back to old behaviour, do that:
+** `/set weechat.look.hotlist_count_max 0`
+** `/set weechat.look.hotlist_buffer_separator ","`
+* when you are away, all buffers are now added to hotlist by default (even if
+  they are displayed in a window), if you want to come back to old behaviour, do
+  that:
+** `/set weechat.look.hotlist_add_buffer_if_away off`
+* new keys were added, use command `/key missing` to add them or `/key listdiff`
+  to see differences between your current keys and WeeChat default keys

 Version 0.3.4 (2011-01-16)
 --------------------------
@@ -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, 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])
 LICENSE="GPL3"

 # Checks for programs
@@ -22,4 +22,4 @@ SUBDIRS = . en fr pl de ru ja it

 man_MANS = weechat-curses.1

-EXTRA_DIST = $(man_MANS) docgen.pl CMakeLists.txt asciidoc.css
+EXTRA_DIST = $(man_MANS) docgen.pl CMakeLists.txt asciidoc.conf asciidoc.css
@@ -36,23 +36,23 @@ all-local: weechat_user.de.html \

 # user's guide
 weechat_user.de.html: weechat_user.de.txt $(wildcard autogen/user/*.txt)
-	$(ASCIIDOC) -a toc -a toclevels=3 -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -f `pwd`/../asciidoc.conf -n -o weechat_user.de.html weechat_user.de.txt
+	$(ASCIIDOC) -a toc -a toclevels=3 -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_user.de.html weechat_user.de.txt

 # scripting guide
 weechat_scripting.de.html: weechat_scripting.de.txt
-	$(ASCIIDOC) -a toc -a toclevels=3 -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_scripting.de.html weechat_scripting.de.txt
+	$(ASCIIDOC) -a toc -a toclevels=3 -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_scripting.de.html weechat_scripting.de.txt

 # FAQ
 weechat_faq.de.html: weechat_faq.de.txt
-	$(ASCIIDOC) -a toc -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -f `pwd`/../asciidoc.conf -n -o weechat_faq.de.html weechat_faq.de.txt
+	$(ASCIIDOC) -a toc -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_faq.de.html weechat_faq.de.txt

 # quickstart
 weechat_quickstart.de.html: weechat_quickstart.de.txt
-	$(ASCIIDOC) -a toc -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_quickstart.de.html weechat_quickstart.de.txt
+	$(ASCIIDOC) -a toc -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_quickstart.de.html weechat_quickstart.de.txt

 # tester's guide
 weechat_tester.de.html: weechat_tester.de.txt
-	$(ASCIIDOC) -a toc -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_tester.de.html weechat_tester.de.txt
+	$(ASCIIDOC) -a toc -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_tester.de.html weechat_tester.de.txt

 # install docs

@@ -12,7 +12,7 @@

 | irc | irc_channel_nicks_hosts | Liste der Nicks und Hostnamen des aktuellen Channels

-| irc | irc_channel_topic | Topic des aktuellen IRC-Channels
+| irc | irc_channel_topic | Thema des aktuellen IRC-Channels

 | irc | irc_channels | Channels auf allen IRC Servern

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

@@ -230,13 +230,13 @@ reason: Begründung für den Rauswurf

 [command]*`links`* Alle dem antwortenden Server bekannten Servernamen auflisten::
 ........................................
-/links  [[<server>>] <server_mask>]
+/links  [[<server>] <server_mask>]

     Server: dieser Server soll die Anfrage beantworten
 Servermaske: die aufzulistenden Server sollen diesem Muster entsprechen
 ........................................

-[command]*`list`* Channels mit ihren Topics auflisten::
+[command]*`list`* Channels mit ihrem Thema auflisten::
 ........................................
 /list  [<channel>[,<channel>...]] [<server>] [-re <regex>]

@@ -283,7 +283,7 @@ Channel-Modi:
  p: privater Channel
  s: geheimer Channel
  i: geschlossener Channel (Zutritt nur mit Einladung)
-  t: nur Operatoren dürfen das Topic setzen
+  t: nur Operatoren dürfen das Thema setzen
  n: keine Channeln-Nachrichten von außerhalb des Channels
  m: moderierter Channel (schreiben nur mit Voice)
  l: maximale Anzahl an Usern im Channel festlegen
@@ -301,7 +301,7 @@ User-Modi:
 Die Liste der hier dargestellten Modi ist nicht vollständig. Es sollte die Dokumentation des jeweiligen Servers zu Rate gezogen werden um alle verfügbaren Modi zu erfahren.

 Beispiele:
-  Schützt das Topic des Channels #weechat:
+  Schützt das Thema des Channels #weechat:
    /mode #weechat +t
  sich auf dem Server unsichtbar machen:
    /mode nick +i
@@ -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: `Farbe in dem das neue Thema des Channels dargestellt werden soll, falls das Thema des Channels geändert wurde`
+** 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: `Farbe in dem das alte Thema des Channels dargestellt werden soll, falls das Thema des Channels geändert wurde`
+** 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
@@ -124,7 +134,7 @@
 ** Werte: on, off (Standardwert: `on`)

 * *irc.look.display_old_topic*
-** Beschreibung: `Zeige den alten Topic, falls der Channel-Topic geändert wurde`
+** Beschreibung: `Zeige das alte Thema, falls das Thema des Channels geändert wurde`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)

@@ -274,7 +284,7 @@
 ** Werte: on, off (Standardwert: `on`)

 * *irc.look.topic_strip_colors*
-** Beschreibung: `Farben werden im Topic gestrippt (wird nur genutzt wenn der Buffer-Titel angezeigt wird)`
+** Beschreibung: `Farben werden im Channel-Thema entfernt (wird nur genutzt wenn der Buffer-Titel angezeigt wird)`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)

@@ -483,6 +493,11 @@
 ** Typ: integer
 ** Werte: 0 .. 2147483647 (Standardwert: `2048`)

+* *irc.server_default.ssl_priorities*
+** Beschreibung: `Zeichenkette mit Prioritäten für gnutls (für die korrekte Syntax siehe gnutls Dokumentation unter Funktion gnutls_priority_init. Gebräuchliche Zeichenketten sind: "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
@@ -113,22 +113,22 @@ Beispiele:

 [command]*`color`* definiert Farbaliase und stellt eine Palette der möglichen Farben dar::
 ........................................
-/color  alias <color> <alias>
+/color  alias <color> <name>
        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,20 +539,22 @@ 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: passt die Größe aller Fenster an
        merge: vereinigt Fenster miteinander (all = alle Fenster vereinigen)
-      page_up: Scrollt eine Seite nach oben
-    page_down: Scrollt eine Seite nach unten
+      page_up: scrollt eine Seite nach oben
+    page_down: scrollt eine Seite nach unten
      refresh: Seite wird neu aufgebaut
-       scroll: Scrollt eine Anzahl an Zeilen (+/-N) oder zu einer gewissen Zeit: s=Sekunden, m=Minuten, h=Stunden, d=Tage, M=Monate, y=Jahre
-    scroll_up: Scrollt ein paar Zeilen nach oben
-  scroll_down: Scrollt ein paar Zeilen nach unten
-   scroll_top: Scrollt zum Anfang des Buffers
-scroll_bottom: Scrollt zum Ende des  Buffers
-scroll_previous_highlight: Scrollt zum vorherigen Hightlight
-scroll_next_highlight: Scrollt zum nächsten Highlight
+       scroll: scrollt eine Anzahl an Zeilen (+/-N) oder zu einer gewissen Zeit: s=Sekunden, m=Minuten, h=Stunden, d=Tage, M=Monate, y=Jahre
+    scroll_up: scrollt ein paar Zeilen nach oben
+  scroll_down: scrollt ein paar Zeilen nach unten
+   scroll_top: scrollt zum Anfang des Buffers
+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.
+Bei splith und splitv gibt "pct" die neue Größe des Fensters im Verhältnis zur aktuellen Größe an. Zum Beispiel würde ein Wert von 25 bedeuten, dass das neue Fenster nur noch ein Viertel der Größe des alten Fensters hat.

 Beispiele:
  Springt zum Fenster mit dem Buffer #1:
@@ -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
@@ -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]]
@@ -88,19 +88,19 @@ welche Pakete optional genutzt werden können.

 [width="80%",cols="4,^2,13",options="header"]
 |========================================
-| Paket   ^(1)^          | benötigt | Funktion
-| cmake                  | *ja*     | zum kompilieren (autotools ist möglich. cmake wird aber empfohlen)
-| libncursesw5-dev ^(2)^ | *ja*     | ncurses Oberfläche
-| libgcrypt11-dev        | nein     | SASL Authentifikation am IRC Server mittels DH-BLOWFISH Methode
-| libgnutls-dev          | nein     | SSL Verbindung zu einem IRC Server
-| libaspell-dev          | nein     | aspell Erweiterung
-| libperl-dev            | nein     | perl Erweiterung
-| python-dev             | nein     | python Erweiterung
-| ruby1.8-dev            | nein     | ruby Erweiterung
-| liblua5.1-0-dev        | nein     | lua Erweiterung
-| tcl-dev (>= 8.5)       | nein     | tcl Erweiterung
-| asciidoc (>= 8.5.0)    | nein     | erstellt Dokumentation (HTML Dateien)
-| source-highlight       | nein     | Syntax highlight für Quelltext in HTML Dokumentation
+| Paket ^(1)^              | benötigt | Funktion
+| cmake                    | *ja*     | zum kompilieren (autotools ist möglich. cmake wird aber empfohlen)
+| libncursesw5-dev ^(2)^   | *ja*     | ncurses Oberfläche
+| libgcrypt11-dev          | nein     | SASL Authentifikation am IRC Server mittels DH-BLOWFISH Methode
+| libgnutls-dev (>= 2.2.0) | nein     | SSL Verbindung zu einem IRC Server
+| libaspell-dev            | nein     | aspell Erweiterung
+| libperl-dev              | nein     | perl Erweiterung
+| python-dev               | nein     | python Erweiterung
+| ruby1.8-dev              | nein     | ruby Erweiterung
+| liblua5.1-0-dev          | nein     | lua Erweiterung
+| tcl-dev (>= 8.5)         | nein     | tcl Erweiterung
+| asciidoc (>= 8.5.0)      | nein     | erstellt Dokumentation (HTML Dateien)
+| source-highlight         | nein     | Syntax highlight für Quelltext in HTML Dokumentation
 |========================================

 [NOTE]
@@ -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) | passt die Größe aller Fenster an | /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
@@ -713,8 +715,8 @@ Zu den Basisfarben können zusätzlich Farben zwischen eins und der maximalen An
 genutzt werden die vom jeweiligen Terminal zur Verfügung gestellt werden.

 Mit dem `/color` Befehl kann man sich sowohl die aktuelle Farbpalette anzeigen lassen als
-auch die Anzahl der zu nutzenden Farben. Mit 'alt+c' kann man vorübergehend zu den Terminalfarben
-wechseln um eine Farbe auszuwählen.
+auch die Anzahl der zu nutzenden Farben. Mit @k(A-)@k(c) kann man vorübergehend zu den
+Terminalfarben wechseln um eine Farbe auszuwählen.

 Um zum Beispiel die Uhrzeit in einem Buffer in einem schönen Orange darzustellen:

@@ -39,27 +39,27 @@ all-local: weechat_user.en.html \

 # user's guide
 weechat_user.en.html: weechat_user.en.txt $(wildcard autogen/user/*.txt)
-	$(ASCIIDOC) -a toc -a toclevels=3 -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -f `pwd`/../asciidoc.conf -n -o weechat_user.en.html weechat_user.en.txt
+	$(ASCIIDOC) -a toc -a toclevels=3 -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_user.en.html weechat_user.en.txt

 # plugin API reference
 weechat_plugin_api.en.html: weechat_plugin_api.en.txt $(wildcard autogen/plugin_api/*.txt)
-	$(ASCIIDOC) -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_plugin_api.en.html weechat_plugin_api.en.txt
+	$(ASCIIDOC) -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_plugin_api.en.html weechat_plugin_api.en.txt

 # scripting guide
 weechat_scripting.en.html: weechat_scripting.en.txt
-	$(ASCIIDOC) -a toc -a toclevels=3 -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_scripting.en.html weechat_scripting.en.txt
+	$(ASCIIDOC) -a toc -a toclevels=3 -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_scripting.en.html weechat_scripting.en.txt

 # FAQ
 weechat_faq.en.html: weechat_faq.en.txt
-	$(ASCIIDOC) -a toc -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -f `pwd`/../asciidoc.conf -n -o weechat_faq.en.html weechat_faq.en.txt
+	$(ASCIIDOC) -a toc -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_faq.en.html weechat_faq.en.txt

 # quickstart
 weechat_quickstart.en.html: weechat_quickstart.en.txt
-	$(ASCIIDOC) -a toc -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_quickstart.en.html weechat_quickstart.en.txt
+	$(ASCIIDOC) -a toc -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_quickstart.en.html weechat_quickstart.en.txt

 # tester's guide
 weechat_tester.en.html: weechat_tester.en.txt
-	$(ASCIIDOC) -a toc -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_tester.en.html weechat_tester.en.txt
+	$(ASCIIDOC) -a toc -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_tester.en.html weechat_tester.en.txt

 # install docs

@@ -230,7 +230,7 @@ reason: reason for kill

 [command]*`links`* list all servernames which are known by the server answering the query::
 ........................................
-/links  [[<server>>] <server_mask>]
+/links  [[<server>] <server_mask>]

     server: this server should answer the query
 server_mask: list of servers must match this mask
@@ -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
@@ -113,7 +113,7 @@ Examples:

 [command]*`color`* define color aliases and display palette of colors::
 ........................................
-/color  alias <color> <alias>
+/color  alias <color> <name>
        unalias <color>
        reset

@@ -330,7 +330,7 @@ Without argument, this command displays saved layout.
 ........................................
 /mute  [-current | -buffer <name> | -all] command

-current: no output on curent buffer
+-current: no output on current buffer
 -buffer: no output on specified buffer
    name: full buffer name (examples: "irc.server.freenode", "irc.freenode.#weechat")
    -all: no output on ALL buffers
@@ -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: balance the sizes of all windows
        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
@@ -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
@@ -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]]
@@ -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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^

@@ -5763,7 +5847,7 @@ void weechat_printf_date (struct t_gui_buffer *buffer, time_t date,
 Arguments:

 * 'buffer': buffer pointer, if NULL, message is displayed on WeeChat buffer
-* 'date': date for message
+* 'date': date for message (0 means current date/time)
 * 'message': message to display

 C example:
@@ -5822,7 +5906,7 @@ void weechat_printf_date_tags (struct t_gui_buffer *buffer, time_t date,
 Arguments:

 * 'buffer': buffer pointer, if NULL, message is displayed on WeeChat buffer
-* 'date': date for message
+* 'date': date for message (0 means current date/time)
 * 'tags': comma separated list of tags
 * 'message': message to display

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

@@ -733,7 +733,7 @@ WeeChat version
 ^^^^^^^^^^^^^^^

 The best way to check version is to ask "version_number" and make integer
-comparison with hexidecimal version number.
+comparison with hexadecimal version number.

 Example:

@@ -88,19 +88,19 @@ compile WeeChat.

 [width="80%",cols="4,^2,13",options="header"]
 |========================================
-| Package ^(1)^          | Required | Feature
-| cmake                  | *yes*    | build (autotools still possible, but cmake is recommended)
-| libncursesw5-dev ^(2)^ | *yes*    | ncurses interface
-| libgcrypt11-dev        | no       | SASL authentication with IRC server using DH-BLOWFISH mechanism
-| libgnutls-dev          | no       | SSL connection to IRC server
-| libaspell-dev          | no       | aspell plugin
-| libperl-dev            | no       | perl plugin
-| python-dev             | no       | python plugin
-| ruby1.8-dev            | no       | ruby plugin
-| liblua5.1-0-dev        | no       | lua plugin
-| tcl-dev (>= 8.5)       | no       | tcl plugin
-| asciidoc (>= 8.5.0)    | no       | build documentation (HTML files)
-| source-highlight       | no       | syntax highlight for sources in HTML documentation
+| Package ^(1)^            | Required | Feature
+| cmake                    | *yes*    | build (autotools still possible, but cmake is recommended)
+| libncursesw5-dev ^(2)^   | *yes*    | ncurses interface
+| libgcrypt11-dev          | no       | SASL authentication with IRC server using DH-BLOWFISH mechanism
+| libgnutls-dev (>= 2.2.0) | no       | SSL connection to IRC server
+| libaspell-dev            | no       | aspell plugin
+| libperl-dev              | no       | perl plugin
+| python-dev               | no       | python plugin
+| ruby1.8-dev              | no       | ruby plugin
+| liblua5.1-0-dev          | no       | lua plugin
+| tcl-dev (>= 8.5)         | no       | tcl plugin
+| asciidoc (>= 8.5.0)      | no       | build documentation (HTML files)
+| source-highlight         | no       | syntax highlight for sources in HTML documentation
 |========================================

 [NOTE]
@@ -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) | Balance the sizes of all windows | /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
@@ -709,7 +711,7 @@ display buffers and bars).
 In addition to basic colors, you can use a color number between 1 and the limit
 of your terminal.

-Use command `/color` to see current colors and limits. With 'alt+c' you can
+Use command `/color` to see current colors and limits. With @k(A-)@k(c) you can
 temporarily switch to terminal colors to choose a color.

 For example if you want to display time in orange in buffer, do:
@@ -1242,8 +1244,8 @@ when replying to CTCP:
 | $site        | WeeChat site                | http://www.weechat.org
 | $download    | WeeChat site, download page | http://www.weechat.org/download
 | $time        | current date/time           | Sun Sep 13 15:48:31 2009
-| $username    | username on IRC server      | nick
-| $realname    | realname on IRC server      | My name
+| $username    | user name on IRC server     | nick
+| $realname    | real name on IRC server     | My name
 |========================================

 If CTCP options are not defined (by default), CTCP replies are:
@@ -39,27 +39,27 @@ all-local: weechat_user.fr.html \

 # user's guide
 weechat_user.fr.html: weechat_user.fr.txt $(wildcard autogen/user/*.txt)
-	$(ASCIIDOC) -a toc -a toclevels=3 -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -f `pwd`/../asciidoc.conf -n -o weechat_user.fr.html weechat_user.fr.txt
+	$(ASCIIDOC) -a toc -a toclevels=3 -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_user.fr.html weechat_user.fr.txt

 # plugin API reference
 weechat_plugin_api.fr.html: weechat_plugin_api.fr.txt $(wildcard autogen/plugin_api/*.txt)
-	$(ASCIIDOC) -a toc -a toclevels=4 -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_plugin_api.fr.html weechat_plugin_api.fr.txt
+	$(ASCIIDOC) -a toc -a toclevels=4 -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_plugin_api.fr.html weechat_plugin_api.fr.txt

 # scripting guide
 weechat_scripting.fr.html: weechat_scripting.fr.txt
-	$(ASCIIDOC) -a toc -a toclevels=3 -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_scripting.fr.html weechat_scripting.fr.txt
+	$(ASCIIDOC) -a toc -a toclevels=3 -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_scripting.fr.html weechat_scripting.fr.txt

 # FAQ
 weechat_faq.fr.html: weechat_faq.fr.txt
-	$(ASCIIDOC) -a toc -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -f `pwd`/../asciidoc.conf -n -o weechat_faq.fr.html weechat_faq.fr.txt
+	$(ASCIIDOC) -a toc -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_faq.fr.html weechat_faq.fr.txt

 # quickstart
 weechat_quickstart.fr.html: weechat_quickstart.fr.txt
-	$(ASCIIDOC) -a toc -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_quickstart.fr.html weechat_quickstart.fr.txt
+	$(ASCIIDOC) -a toc -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_quickstart.fr.html weechat_quickstart.fr.txt

 # tester's guide
 weechat_tester.fr.html: weechat_tester.fr.txt
-	$(ASCIIDOC) -a toc -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_tester.fr.html weechat_tester.fr.txt
+	$(ASCIIDOC) -a toc -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_tester.fr.html weechat_tester.fr.txt

 # install docs

@@ -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
@@ -113,7 +113,7 @@ Exemples:

 [command]*`color`* définir des alias de couleurs et afficher la palette des couleurs::
 ........................................
-/color  alias <couleur> <alias>
+/color  alias <couleur> <nom>
        unalias <couleur>
        reset

@@ -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: équilibrer la taille de toutes les fenêtres
        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
@@ -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
@@ -42,7 +42,7 @@ Quelques fonctionnalités (version > = 0.3.x) :
 * support aspell
 * double encodage (décodage/encodage)
 * développé à partir de zéro (non basé sur un quelconque client)
-* multi-platformes
+* multi plates-formes
 * 100% GPL et libre

 Plus d'infos sur cette page : http://www.weechat.org/features
@@ -73,7 +73,7 @@ Si vous compilez avec les autotools (et non cmake), vérifiez que vous avez bien
 la dernière version d'autoconf et automake.

 Une autre façon de faire est de compiler le "paquet devel", qui nécessite moins
-de dépendences. Ce paquet est construit quasiment tous les jours à partir de la
+de dépendances. Ce paquet est construit quasiment tous les jours à partir de la
 base git. Notez que ce paquet peut ne pas correspondre exactement à la base
 git et qu'il est moins pratique que de cloner la base git pour installer des
 mises à jour.
@@ -178,7 +178,7 @@ Un tampon ('buffer') est composé d'un numéro, un nom, des lignes affichées
 (ainsi que d'autres données).

 Une fenêtre ('window') est une zone de l'écran affichant un tampon. Il est
-possible de découper l'écran horizontaleent ou verticalement en plusieurs
+possible de découper l'écran horizontalement ou verticalement en plusieurs
 fenêtres.

 Chaque fenêtre affiche un tampon. Un tampon peut être caché (affiché par
@@ -200,7 +200,7 @@ Par exemple :
 ----------------------------------------

 Si jamais vous n'étiez pas satisfait avec ça, supprimez simplement la nouvelle
-barre, WeeChat recrééra automatiquement la barre par défaut "input" si l'objet
+barre, WeeChat recréera automatiquement la barre par défaut "input" si l'objet
 "input_text" n'est utilisé dans aucune barre :

 ----------------------------------------
@@ -356,7 +356,7 @@ Vous pouvez définir une touche, par exemple :
 /key bind meta-q /buffer *11
 ----------------------------------------

-La liste des touches par défaut est dans le Guide utlisateur.
+La liste des touches par défaut est dans le Guide utilisateur.


 [[global_history]]
@@ -392,7 +392,7 @@ La commande `/ignore` est une commande IRC, donc elle s'applique uniquement aux
 tampons IRC (serveurs et canaux).
 Elle permet d'ignorer des pseudos ou nom d'hôtes pour un serveur ou un canal
 (la commande ne s'applique pas au contenu des messages).
-Les messages corespondants sont supprimés par l'extension IRC avant affichage
+Les messages correspondants sont supprimés par l'extension IRC avant affichage
 (donc vous ne les verrez jamais).

 La commande `/filter` est une commande "core", donc elle s'applique à n"importe
@@ -511,7 +511,7 @@ Selon la version de WeeChat :
 * avec WeeChat > = 0.3.x : utilisez le script 'launcher.pl' (disponible sur la
  page des scripts), puis configurez une commande système (jouant un son,
  affichant un message à l'écran, etc...) comme ceci : +
-  `/set plugins.var.perl.launcher.signal.weechat_highlight "/chemin/vers/commande parametres"`
+  `/set plugins.var.perl.launcher.signal.weechat_highlight "/chemin/vers/commande paramètres"`

 De nombreux autres scripts de notification existent, merci de consulter la
 liste des extensions/scripts : http://www.weechat.org/scripts
@@ -668,13 +668,13 @@ $ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat-curses


 [[supported_os]]
-Quelle est la liste des plate-formes supportées par WeeChat ? Sera-t-il porté sur d'autres systèmes d'exploitation ?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Quelle est la liste des plates-formes supportées par WeeChat ? Sera-t-il porté sur d'autres systèmes d'exploitation ?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 La liste complète est sur cette page : http://www.weechat.org/download

-Nous faisons le maximum pour supporter le plus de plate-formes possible.
-Toute aide est la bienvenue pour les systèmes que nous n'avons pas, pous y
+Nous faisons le maximum pour supporter le plus de plates-formes possible.
+Toute aide est la bienvenue pour les systèmes que nous n'avons pas, pour y
 tester WeeChat.


@@ -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]]
@@ -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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^

@@ -5826,7 +5909,7 @@ Paramètres :

 * 'buffer' : pointeur vers le tampon, si NULL, le message est affiché sur le
  tampon Weechat
-* 'date' : date pour le message
+* 'date' : date pour le message (0 signifie la date/heure courante)
 * 'message' : message à afficher

 Exemple en C :
@@ -5888,7 +5971,7 @@ Paramètres :

 * 'buffer' : pointeur vers le tampon, si NULL, le message est affiché sur le
  tampon Weechat
-* 'date' : date pour le message
+* 'date' : date pour le message (0 signifie la date/heure courante)
 * 'tags' : liste d'étiquettes ("tags") séparées par des virgules
 * 'message' : message à afficher

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

@@ -90,19 +90,19 @@ compiler WeeChat.

 [width="80%",cols="4,^2,13",options="header"]
 |========================================
-| Paquet ^(1)^           | Requis | Fonctionnalité
-| cmake                  | *oui*  | construction (autotools toujours possible, mais cmake est recommandé)
-| libncursesw5-dev ^(2)^ | *oui*  | interface ncurses
-| libgcrypt11-dev        | non    | authentification SASL avec le serveur IRC, en utilisant le mécanisme DH-BLOWFISH
-| libgnutls-dev          | non    | connexion SSL au serveur IRC
-| libaspell-dev          | non    | extension aspell
-| libperl-dev            | non    | extension perl
-| python-dev             | non    | extension python
-| ruby1.8-dev            | non    | extension ruby
-| liblua5.1-0-dev        | non    | extension lua
-| tcl-dev (>= 8.5)       | non    | extension tcl
-| asciidoc (>= 8.5.0)    | non    | construction de la documentation (fichiers HTML)
-| source-highlight       | non    | coloration des sources dans la documentation HTML
+| Paquet ^(1)^             | Requis | Fonctionnalité
+| cmake                    | *oui*  | construction (autotools toujours possible, mais cmake est recommandé)
+| libncursesw5-dev ^(2)^   | *oui*  | interface ncurses
+| libgcrypt11-dev          | non    | authentification SASL avec le serveur IRC, en utilisant le mécanisme DH-BLOWFISH
+| libgnutls-dev (>= 2.2.0) | non    | connexion SSL au serveur IRC
+| libaspell-dev            | non    | extension aspell
+| libperl-dev              | non    | extension perl
+| python-dev               | non    | extension python
+| ruby1.8-dev              | non    | extension ruby
+| liblua5.1-0-dev          | non    | extension lua
+| tcl-dev (>= 8.5)         | non    | extension tcl
+| asciidoc (>= 8.5.0)      | non    | construction de la documentation (fichiers HTML)
+| source-highlight         | non    | coloration des sources dans la documentation HTML
 |========================================

 [NOTE]
@@ -496,7 +496,7 @@ Touches pour les tampons / fenêtres
 | @k(F10)                   | Faire défiler le titre du tampon vers la droite | /bar scroll title * x+50%
 | @k(F11)                   | Monter d'une page dans la liste des pseudos | /bar scroll nicklist * y-100%
 | @k(F12)                   | Descendre d'une page dans la liste des pseudos | /bar scroll nicklist * y+100%
-| @k(A-)@k(F11)             | ller au début de la liste des pseudos | /bar scroll nicklist * yb
+| @k(A-)@k(F11)             | Aller au début de la liste des pseudos | /bar scroll nicklist * yb
 | @k(A-)@k(F12)             | Aller à la fin de la liste des pseudos | /bar scroll nicklist * ye
 | @k(A-)@k(a)               | Sauter au prochain tampon avec activité (avec priorité : highlight, message, autre) | /input jump_smart
 | @k(A-)@k(j) , @k(A-)@k(l) | Sauter au dernier tampon | /input jump_last_buffer
@@ -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) | Equilibrer la taille de toutes les fenêtres | /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
@@ -722,7 +724,7 @@ En plus des couleurs de base, vous pouvez utiliser un numéro de couleur entre 1
 et la limite de votre terminal.

 Utilisez la commande `/color` pour voir les couleurs et les limites. Avec la
-touche 'alt+c', vous pouvez basculer temporairement vers les couleurs du
+touche @k(A-)@k(c), vous pouvez basculer temporairement vers les couleurs du
 terminal pour choisir une couleur.

 Par exemple si vous souhaitez afficher l'heure en orange dans le tampon,
@@ -1272,7 +1274,7 @@ automatiquement remplacées par WeeChat lors de la réponse au CTCP :
 | Code         | Description                       | Valeur / exemple
 | $clientinfo  | liste des CTCP supportés          | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION
 | $version     | version de WeeChat                | 0.3.0
-| $compilation | date de compi lation WeeChat      | Sep 13 2009
+| $compilation | date de compilation WeeChat       | Sep 13 2009
 | $osinfo      | information sur l'OS              | Linux 2.6.31 / i686
 | $site        | site WeeChat                      | http://www.weechat.org
 | $download    | site WeeChat, page téléchargement | http://www.weechat.org/download
@@ -1380,7 +1382,7 @@ Liste non exhaustive des messages ou alias que vous pouvez paramétrer :
 | 367     | banlist       | liste de bannissement
 | 368     | banlist       | fin de la liste de bannissement
 | 369     | whowas        | whowas (fin)
-| 378     | whois         | whois (connection depuis)
+| 378     | whois         | whois (connexion depuis)
 | 379     | whois         | whois (utilise les modes)
 | 432     |               | pseudo erroné
 | 433     |               | pseudo déjà en cours d'utilisation
@@ -1665,7 +1667,7 @@ Exemple du rmodifier par défaut pour la commande `/oper` :
 * groupes : `1,2*`

 A chaque fois que les modifiers "history_add" ou "input_text_display" sont
-appelés, l'expression régulière est vérifiée. Si la chaîne correspont, alors
+appelés, l'expression régulière est vérifiée. Si la chaîne correspond, alors
 elle est remplacée par les groupes capturés, tels que définis dans la chaîne
 des groupes.

@@ -38,27 +38,27 @@ all-local: weechat_user.it.html \

 # user's guide
 weechat_user.it.html: weechat_user.it.txt $(wildcard autogen/user/*.txt)
-	$(ASCIIDOC) -a toc -a toclevels=3 -a toc-title='Indice' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -f `pwd`/../asciidoc.conf -n -o weechat_user.it.html weechat_user.it.txt
+	$(ASCIIDOC) -a toc -a toclevels=3 -a toc-title='Indice' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_user.it.html weechat_user.it.txt

 # plugin API reference
 weechat_plugin_api.it.html: weechat_plugin_api.it.txt $(wildcard autogen/plugin_api/*.txt)
-	$(ASCIIDOC) -a toc -a toclevels=4 -a toc-title='Indice' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_plugin_api.it.html weechat_plugin_api.it.txt
+	$(ASCIIDOC) -a toc -a toclevels=4 -a toc-title='Indice' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_plugin_api.it.html weechat_plugin_api.it.txt

 # scripting guide
 weechat_scripting.it.html: weechat_scripting.it.txt
-	$(ASCIIDOC) -a toc -a toclevels=3 -a toc-title='Indice' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_scripting.it.html weechat_scripting.it.txt
+	$(ASCIIDOC) -a toc -a toclevels=3 -a toc-title='Indice' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_scripting.it.html weechat_scripting.it.txt

 # FAQ
 weechat_faq.it.html: weechat_faq.it.txt
-	$(ASCIIDOC) -a toc -a toc-title='Indice' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -f `pwd`/../asciidoc.conf -n -o weechat_faq.it.html weechat_faq.it.txt
+	$(ASCIIDOC) -a toc -a toc-title='Indice' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_faq.it.html weechat_faq.it.txt

 # quickstart
 weechat_quickstart.it.html: weechat_quickstart.it.txt
-	$(ASCIIDOC) -a toc -a toc_title='Indice' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_quickstart.it.html weechat_quickstart.it.txt
+	$(ASCIIDOC) -a toc -a toc_title='Indice' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_quickstart.it.html weechat_quickstart.it.txt

 # tester's guide
 weechat_tester.it.html: weechat_tester.it.txt
-	$(ASCIIDOC) -a toc -a toc_title='Indice' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_tester.it.html weechat_tester.it.txt
+	$(ASCIIDOC) -a toc -a toc_title='Indice' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_tester.it.html weechat_tester.it.txt

 # install docs

@@ -44,7 +44,7 @@

 | weechat | history | cronologia dei comandi | puntatore al buffer (se non impostato, restituisce la cronologia globale) (opzionale) | -

-| weechat | hook | elenco di hook | - | type,arguments (type is command/timer/.., arguments to get only some hooks (can start or end with "*" as wildcard), both are optional)
+| weechat | hook | elenco di hook | - | tipo,argomenti (il tipo è comando/timer/.., gli argomenti sono necessari solo per ottenere alcuni hook, (possono iniziare o terminare con "*" come carattere jolly, entrambi sono opzionali)

 | weechat | hotlist | elenco dei buffer nella hotlist | - | -

@@ -39,7 +39,7 @@
 ** 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: `green`)

 * *irc.color.nick_prefixes*
-** descrizione: `color for nick prefixes using mode char (o=op, h=halfop, v=voice, ..), format is: "o:color1;h:color2;v:color3" (if a mode is not found, WeeChat will try with next modes received from server ("PREFIX"); a special mode "*" can be used as default color if no mode has been found in list)`
+** descrizione: `colore per i prefissi dei nick usando il carattere di modalità (o=operatore, h=halfop, v=voce, ..), il formato è: "o:colore1;h:colore2;v:colore3" (se una modalità non viene trovata, WeeChat proverà con le modalità successive ricevute dal server ("PREFIX"); può essere usata una modalità speciale "*" come colore prefefinito se non viene trovata nessuna modalità nella lista)`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"q:lightred;a:lightcyan;o:lightgreen;h:lightmagenta;v:yellow;*:lightblue"`)

@@ -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: `colore del nuovo argomento del canale (quando viene cambiato)`
+** 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: `colore del precedente argomento del canale (quando viene cambiato)`
+** 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
@@ -364,7 +374,7 @@
 ** valori: on, off (valore predefinito: `on`)

 * *irc.server_default.autoreconnect_delay*
-** descrizione: `ritardo (in secondi) prima di effettuare una nuova connessione al server`
+** descrizione: `ritardo (in secondi) prima di riprovare a riconnettersi al server`
 ** tipo: intero
 ** valori: 1 .. 65535 (valore predefinito: `10`)

@@ -394,7 +404,7 @@
 ** valori: qualsiasi stringa (valore predefinito: `""`)

 * *irc.server_default.command_delay*
-** descrizione: `ritardo (in secondi) dopo l'esecuzione del programma (esempio: fornire il tempo per l'autenticazione)`
+** descrizione: `ritardo (in secondi) dopo l'esecuzione del comando (esempio: fornire il tempo per l'autenticazione)`
 ** tipo: intero
 ** valori: 0 .. 3600 (valore predefinito: `0`)

@@ -483,6 +493,11 @@
 ** tipo: intero
 ** valori: 0 .. 2147483647 (valore predefinito: `2048`)

+* *irc.server_default.ssl_priorities*
+** descrizione: `stringa con le priorità per gnutls (per la sintassi, consultare la documentazione per la funzione gnutls_priority_init nel manuale di gnutls, stringhe comuni sono: "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
@@ -113,22 +113,22 @@ Examples:

 [command]*`color`* definisce gli alias dei colori e visualizza la tavolozza dei colori::
 ........................................
-/color  alias <colore> <alias>
+/color  alias <colore> <nome>
        unalias <colore>
        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: aggiunge un alias per un colore
+unalias: elimina un alias
+ colore: numero colore (>= 0, il massimo dipende dal terminale, di solito 63 o 255)
+   nome: nome alias per il colore (ad esempio: "arancione")
+  reset: ripristina tutte le coppie di colore (richiesto quando non ci sono più coppie disponibili se il ripristino automatico è disabilitato, consultare l'opzione weechat.look.color_pairs_auto_reset)

-Without argument, this command displays colors in a new buffer.
+Senza argomento, il comando mostra i colori in un nuovo buffer.

-Examples:
-  add alias "orange" for color 214:
-    /color alias 214 orange
-  delete color 214:
+Esempi:
+  aggiunge alias "arancione" per il colore 214:
+    /color alias 214 arancione
+  elimina il colore 214:
    /color unalias 214
 ........................................

@@ -166,51 +166,51 @@ windows: mostra l'albero delle finestre
         add <nome> <buffer>[,<buffer>...] <tag> <regex>]
         del <nome>|-all

-   list: list all filters
- enable: enable filters (filters are enabled by default)
-disable: disable filters
- toggle: toggle filters
-   name: filter name
-    add: add a filter
-    del: delete a filter
-   -all: delete all filters
- buffer: comma separated list of buffers where filter is active:
-         - this is full name including plugin (example: "irc.freenode.#weechat")
-         - "*" means all buffers
-         - a name starting with '!' is excluded
-         - name can start or end with '*' to match many buffers
-   tags: comma separated list of tags, for example: "irc_join,irc_part,irc_quit"
-  regex: regular expression to search in line
-         - use '\t' to separate prefix from message, special chars like '|' must be escaped: '\|'
-         - if regex starts with '!', then matching result is reversed (use '\!' to start with '!')
-         - two regular expressions are created: one for prefix and one for message
+         list: elenca tutti i filtri
+       enable: abilita filtri (i filtri sono abilitati di default)
+      disable: disabilita filtri
+       toggle: abilita/disabilita filtri
+         nome: nome del filtro
+          add: aggiunge un filtro
+          del: elimina un filtro
+         -all: elimina tutti i filtri
+       buffer: elenco separato da virgole di buffer in cui il filtro è attivo:
+               - nome completo che include il plugin (esempio: "irc.freenode.#weechat)
+               - "*" indica tutti i buffer
+               - un nome preceduto da '!' viene escluso
+               - un nome può iniziare o terminare con '*' per includere più buffer
+          tag: elenco di tag separati da virgole, per esempio: "irc_join,irc_part,irc_quit"
+        regex: espressione regolare da cercare nella riga
+               - usare '\t' per separare il prefisso dal messaggio, caratteri speciali come "|" vanno preceduti dal carattere escape: '\|')
+               - se l'espressione regolare inizia con '!', il risultato corrispondente viene invertito (usare '\!' per iniziare con '!')

-The default key alt+'=' toggles filtering on/off.
+               -vengono create due espressioni regolari: una per il prefisso e l'altra per il messaggio

-Tags most commonly used:
-  no_filter, no_highlight, no_log, log0..log9 (log level),
+Il tasto predefinito alt+'=' abilita/disabilita il filtro.
+
+Tag utilizzati di frequente:
+  no_filter, no_highlight, no_log, log0..log9 (livello di log),
  notify_none, notify_message, notify_private, notify_highlight,
-  nick_xxx (xxx is nick in message),
-  irc_xxx (xxx is command name or number, see /server raw),
-  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
+  nick_xxx (xxx è il nick nel messaggio),
+  irc_xxx (xxx è il nome comando o il numero, consultare /server raw),   irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.

-Examples:
-  use IRC smart filter on all buffers:
-    /filter add irc_smart * irc_smart_filter *
-  use IRC smart filter on all buffers except those with "#weechat" in name:
-    /filter add irc_smart *,!*#weechat* irc_smart_filter *
-  filter all IRC join/part/quit messages:
-    /filter add joinquit * irc_join,irc_part,irc_quit *
-  filter nicks displayed when joining channels or with /names:
+Esempi:
+  usa il filtro intelligente IRC per tutti i buffer:
+     /filter add irc_smart * irc_smart_filter *
+  usa il filtro intelligente IRC su tutti i buffer tranne quelli che contengono "#weechat" nel nome:
+     /filter add irc_smart *,!*weechat* irc_smart_filter
+  filtra tutti i messaggi entrata/uscita/abbandono di IRC:
+     /filter add joinquit * irc_join,irc_part,irc_quit *
+  filtra i nick visualizzati all'ingresso in un canale o con /names:
    /filter add nicks * irc_366 *
-  filter nick "toto" on IRC channel #weechat:
-    /filter add toto irc.freenode.#weechat * toto\t
-  keep only nick "titi" on IRC channel #test:
-    /filter add titi irc.freenode.#test * !titi\t
-  filter lines containing word "spam":
+  filtra il nick "tizio" sul canale IRC #weechat
+    /filter add tizio irc.freenode.#esempio * tizio\t
+  filtra solo il nick "caio" sul canale IRC #test:
+    /filter add caio irc.freenode.#test * !caio\t
+  filtra le righe contententi la parola "spam":
    /filter add filterspam * * spam
-  filter lines containing "weechat sucks" on IRC channel #weechat:
-    /filter add sucks irc.freenode.#weechat * weechat sucks
+  filtra le righe contententi "weechat fa schifo" sul canale IRC #weechat:
+    /filter add schifo irc.freenode.#weechat * weechat fa schifo
 ........................................

 [command]*`help`* visualizza l'aiuto su comandi e opzioni::
@@ -520,10 +520,12 @@ Esempi:
         -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: elenca le finestre aperte (senza argomento, questa lista viene visualizzata)
@@ -537,6 +539,7 @@ Esempi:
       splith: divide la finestra attiva orizzontalmente
       splitv: divide la finestra attiva verticalmente
       resize: ridimensiona finestra, la nuova dimensione è <pct> percentuale della finestra genitore
+      balance: bilancia le dimensioni tutte le finestre
        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
@@ -548,6 +551,7 @@ Esempi:
 scroll_bottom: scorre fino alla fine del buffer buffer
 scroll_previous_highlight: passa all'evento precedente
    scroll_next_highlight: passa all'evento successivo
+         swap: scambia i buffer di due finestra (con direzione opzionale per la finestra di destinazione)
         zoom: ingrandimento sulla finestra

 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
@@ -149,7 +149,7 @@
 ** 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: `lightgreen`)

 * *weechat.color.input_text_not_found*
-** descrizione: `colore del testo per la ricerca del testo fallita sulla riga di input`
+** descrizione: `colore del testo per la ricerca del testo fallita nella riga di input`
 ** 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: `red`)

@@ -174,22 +174,22 @@
 ** 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: `blue`)

 * *weechat.color.status_count_highlight*
-** descrizione: `text color for count of highlight messages in hotlist (status bar)`
+** descrizione: `colore del testo per il conteggio dei messaggi evento nella hotlist (barra di stato)`
 ** 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: `magenta`)

 * *weechat.color.status_count_msg*
-** descrizione: `text color for count of messages in hotlist (status bar)`
+** descrizione: `colore del testo per il conteggio dei messaggi nella hotlist (barra di stato)`
 ** 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: `brown`)

 * *weechat.color.status_count_other*
-** descrizione: `text color for count of other messages in hotlist (status bar)`
+** descrizione: `colore del testo per il conteggio di altri messaggi nella hotlist (barra di stato)`
 ** 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`)

 * *weechat.color.status_count_private*
-** descrizione: `text color for count of private messages in hotlist (status bar)`
+** descrizione: `colore del testo per il conteggio dei messaggi privati nella hotlist (barra di stato)`
 ** 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: `green`)

@@ -329,7 +329,7 @@
 ** valori: qualsiasi stringa (valore predefinito: `"%H:%M:%S"`)

 * *weechat.look.color_pairs_auto_reset*
-** descrizione: `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)`
+** descrizione: `ripristina automaticamente la tabella delle coppie colore quando il numero di coppie disponibili è minore o uguale a questo numero (-1 = disabilita il ripristino automatico, dunque è necessario "/color reset" quando la tabella è al completo)`
 ** tipo: intero
 ** valori: -1 .. 256 (valore predefinito: `5`)

@@ -369,7 +369,7 @@
 ** valori: qualsiasi stringa (valore predefinito: `""`)

 * *weechat.look.highlight_tags*
-** descrizione: `comma separated list of tags to highlight (case insensitive comparison, examples: "irc_notice" for IRC notices, "nick_flashcode" for messages from nick "FlashCode")`
+** descrizione: `elenco separato da virgole di tag da evidenziare (senza differenza tra maiuscole/minuscole, esempi: "irc_notice" per gli annunci IRC, "nick_flashcode" per i messaggi dal nick "FlashCode")`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `""`)

@@ -378,18 +378,23 @@
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"-"`)

+* *weechat.look.hotlist_add_buffer_if_away*
+** descrizione: `aggiunge qualsiasi buffer alla hotlist (inclusi buffer corrente o visibili) se la variabile locale "away" è impostata sul buffer`
+** tipo: bool
+** valori: on, off (valore predefinito: `on`)
+
 * *weechat.look.hotlist_buffer_separator*
-** descrizione: `string displayed between buffers in hotlist`
+** descrizione: `stringa mostrata tra i buffer nella hotlist`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `", "`)

 * *weechat.look.hotlist_count_max*
-** descrizione: `max number of messages count to display in hotlist for a buffer (0 = never display messages count)`
+** descrizione: `numero massimo del conteggio di messaggi da mostrare nella hotlist per un buffer (0 = non mostrare mai il contatore messaggi)`
 ** tipo: intero
 ** valori: 0 .. 4 (valore predefinito: `2`)

 * *weechat.look.hotlist_count_min_msg*
-** descrizione: `display messages count if number of messages is greater or equal to this value`
+** descrizione: `mostra il conteggio dei messaggi se il numero di messaggi è maggiore o uguale a questo valore`
 ** tipo: intero
 ** valori: 1 .. 100 (valore predefinito: `2`)

@@ -429,7 +434,7 @@
 ** valori: on, off (valore predefinito: `on`)

 * *weechat.look.input_cursor_scroll*
-** descrizione: `number of chars displayed after end of input line when scrolling to display end of line`
+** descrizione: `numero di caratteri mostrati dopo la fine della riga di input quando si scorre per mostrare la fine riga`
 ** tipo: intero
 ** valori: 0 .. 100 (valore predefinito: `20`)

@@ -8,16 +8,15 @@ Generale
 --------


-// TRANSLATION MISSING
 [[weechat_name]]
-Where does the name "WeeChat" come from?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Da dove viene il nome "WeeChat"?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-"Wee" is a recursive acronym and stands for "Wee Enhanced Environment".
-So complete name is "Wee Enhanced Environment for Chat".
+"Wee" è un acronimo ricorsivo che sta per "Wee Enhanced Environment".
+Quindi il nome completo è "Wee Enhanced Envoronment for Chat."

-"Wee" also means "very small" (and yes, there is other meaning, but it does not
-apply to WeeChat!).
+"Wee" significa anche "molto piccolo" (e sì, c'è un altro significato, ma
+non c'entra con WeeChat!).


 [[why_choose_weechat]]
@@ -679,7 +678,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]]
@@ -2967,10 +2967,20 @@ 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
+** 'const void *key': chiave
+** return value: hash della chiave
 * '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
+** 'const void *key1': prima chiave
+** 'const void *key2': seconda chiave
+** valore restituito:
+*** numero negativo se 'key1' è minore di 'key2'
+*** 0 se 'key1' è uguale a 'key2'
+*** numero positivo se 'key1' è maggiore di 'key2'

 Valore restituito:

@@ -3462,9 +3472,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 +3577,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 +3835,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 +3863,13 @@ 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:
+*** 1 se il valore è corretto
+*** 0 se il valore non è valido
 * '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 +5557,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 +5568,52 @@ elif rc == weechat.WEECHAT_CONFIG_OPTION_SET_ERROR:
    # ...
 ----------------------------------------

+weechat_config_set_desc_plugin
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+_Novità nella versione 0.3.5._
+
+Imposta la descrizione per l'opzione nel file di configurazione dei plugin
+(plugins.conf).
+
+Prototipo:
+
+[source,C]
+----------------------------------------
+void weechat_config_set_desc_plugin (const char *option_name,
+                                     const char *description);
+----------------------------------------
+
+Argomenti:
+
+* 'option_name': nome dell'opzione, WeeChat aggiungerà il prefisso "plugins.desc.xxx."
+  (dove "xxx" è il nome del plugin corrente)
+* 'description': descrizione per l'opzione
+
+[NOTE]
+Non è un problema se l'opzione (plugins.var.xx.option_name) non esiste.
+Una futura creazione dell'opzione con questo nome userà questa descrizione.
+
+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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^

@@ -5766,7 +5852,7 @@ Argomenti:

 * 'buffer': puntatore al buffer, se NULL, il messaggio viene visualizzato
  sul buffer di WeeChat
-* 'date': data per il messaggio
+* 'date': data per il messaggio (0 vuol dire data/ora corrente)
 * 'message': messaggio da visualizzare

 Esempio in C:
@@ -5827,7 +5913,7 @@ Argomenti:

 * 'buffer': puntatore al buffer, se NULL il messaggio viene visualizzato
  sul buffer di WeeChat
-* 'date': data per il messaggio
+* 'date': data per il messaggio (0 vuol dire data/ora corrente)
 * 'tags': lista di tag separati da virgole
 * 'message': messaggio da visualizzare

@@ -5999,13 +6085,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 +6208,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 +6284,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 +6354,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 +6425,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 +6435,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 +6559,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 +6574,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 +6700,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 +6711,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 +6802,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 +6994,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 +7003,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 +7274,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 +7552,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 +7622,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 +7826,22 @@ Argomenti:
  qualsiasi stringa |
  stringa con i codici colori IRC, o senza colore

-| irc | irc_in_xxx ^1^ |
+| irc | irc_in_xxx ^(1)^ |
  nome server |
-  contenuto del messaggio ricevuto dal server IRC |
+  contenuto del messaggio ricevuto dal server IRC (prima della codifica del set caratteri) |
  nuovo contenuto del messaggio

-| irc | irc_out_xxx ^1^ |
+| irc | irc_in2_xxx ^(1)^ |
+  nome server |
+  contenuto del messaggio ricevuto dal server IRC (dopo la codifica del set caratteri) |
+  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 +7875,16 @@ 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
+** valore restituito: nuova stringa
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat

 Valore restituito:
@@ -7873,10 +8004,12 @@ 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
+** valore restituito: valore dell'info richiesta
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat

 Valore restituito:
@@ -7947,10 +8080,12 @@ 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
+** valore restituito: tabella hash richiesta
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat

 Valore restituito:
@@ -8008,10 +8143,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 +8158,14 @@ 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
+** valore restituito: lista info richiesta
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat

 Valore restituito:
@@ -8174,14 +8311,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:
@@ -9037,13 +9181,12 @@ window = weechat.current_window()
 current_window = weechat.current_window()
 ----------------------------------------

-// TRANSLATION MISSING
 weechat_window_search_with_buffer
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

 _Novità nella versione 0.3.5._

-Return pointer to window displaying buffer.
+Restituisce il puntatore alla finestra che mostra il buffer.

 Prototipo:

@@ -9054,11 +9197,12 @@ struct t_gui_window *weechat_window_search_with_buffer (struct t_gui_buffer *buf

 Argomenti:

-* 'buffer': buffer pointer
+* 'buffer': puntatore al buffer

 Valore restituito:

-* pointer to window displaying buffer (NULL if no window is displaying buffer)
+* puntatore alla finestra che mostra il buffer (NULL se nessuna finestra sta
+  mostrando il buffer)

 Esempio in C:

@@ -10078,7 +10222,11 @@ 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
+** valore restituito: contenuto dell'elemento barra
 * 'build_callback_data': puntatore fornito alla callback quando
  chiamata da WeeChat

@@ -11610,7 +11758,14 @@ 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
+** 'int object_id': id dell'oggetto
+** 'struct t_infolist *infolist': lista info con il contenuto dell'oggetto
+** valore restituito:
+*** 'WEECHAT_RC_OK'
+*** 'WEECHAT_RC_ERROR'
 * 'callback_read_data': puntatore assegnato per la lettura della chiamata
  quando chiamato da WeeChat

@@ -92,19 +92,19 @@ compilare WeeChat.

 [width="80%",cols="4,^2,13",options="header"]
 |========================================
-| Pacchetto ^(1)^        | Richiesto | Caratteristica
-| cmake                  | *sì*      | compilazione (ancora possibile con autotools, ma si raccomanda cmake)
-| libncursesw5-dev ^(2)^ | *sì*      | interfaccia ncurses
-| libgcrypt11-dev        | no        | autenticazione SASL per i server IRC che utilizzano il meccanismo DH-BLOWFISH
-| libgnutls-dev          | no        | connessione SSL al server IRC
-| libaspell-dev          | no        | plugin aspell
-| libperl-dev            | no        | plugin perl
-| python-dev             | no        | plugin python
-| ruby1.8-dev            | no        | plugin ruby
-| liblua5.1-0-dev        | no        | plugin lua
-| tcl-dev (>= 8.5)       | no        | plugin tcl
-| asciidoc (>= 8.5.0)    | no        | compilazione della documentazione (file HTML)
-| source-highlight       | no        | evidenziazione della sintassi per i sorgenti nella documentazione HTML
+| Pacchetto ^(1)^          | Richiesto | Caratteristica
+| cmake                    | *sì*      | compilazione (ancora possibile con autotools, ma si raccomanda cmake)
+| libncursesw5-dev ^(2)^   | *sì*      | interfaccia ncurses
+| libgcrypt11-dev          | no        | autenticazione SASL per i server IRC che utilizzano il meccanismo DH-BLOWFISH
+| libgnutls-dev (>= 2.2.0) | no        | connessione SSL al server IRC
+| libaspell-dev            | no        | plugin aspell
+| libperl-dev              | no        | plugin perl
+| python-dev               | no        | plugin python
+| ruby1.8-dev              | no        | plugin ruby
+| liblua5.1-0-dev          | no        | plugin lua
+| tcl-dev (>= 8.5)         | no        | plugin tcl
+| asciidoc (>= 8.5.0)      | no        | compilazione della documentazione (file HTML)
+| source-highlight         | no        | evidenziazione della sintassi per i sorgenti nella documentazione HTML
 |========================================

 [NOTE]
@@ -387,13 +387,11 @@ La barra 'stato' ha i seguenti elementi predefiniti:
 | buffer_count               | [6]                   | numero di buffer aperti
 | buffer_plugin              | [irc/freenode]        | plugin del buffer attivo (il plugin irc può aggiungere il nome del server irc usato dal buffer)
 | buffer_number              | 3                     | numero del buffer corrente
-// TRANSLATION MISSING
-| buffer_name                | #test(+n)             | nome del buffer attivo (with channel modes for irc channels)
+| buffer_name                | #test(+n)             | nome del buffer attivo (con le modalità canale per i canali irc)
 | buffer_nicklist_count      | {5}                   | numero di nick nella lista nick
 | buffer_filter              | *                     | indicatore filtraggio: `*` significa che alcune righe sono filtrate (nascoste), valori vuoti indicano che tutte le righe sono visualizzate
 | lag                        | [Ritardo: 2.5]        | indicatore ritardo, in secondi (nascosto se il ritardo è basso)
-// TRANSLATION MISSING
-| hotlist                    | [Att: 4:#abc(2,5), 6] | elenco dei buffer con attività (messaggi non letti) (in example, 2 highlights and 5 unread messages on '#abc', one unread message on buffer #6)
+| hotlist                    | [Att: 4:#abc(2,5), 6] | elenco dei buffer con attività (messaggi non letti) (nell'esempio, 2 eventi e 5 messaggi non letti su #abc, un messaggio non letto sul buffer #6)
 | completion                 | abc(2) def(5)         | elenco di parole per il completamento, con il numero di completamenti possibili per ogni parola
 | scroll                     | -ANCORA(50)-          | indicatore di scorrimento, con il numero di righe sotto l'ultima riga visualizzata
 |========================================
@@ -512,6 +510,8 @@ 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
+| @k(A-)@k(w) , @k(A-)@k(b) | Bilancia le dimensioni di tutte le finestre | /window balance
+| @k(A-)@k(w) , @k(A-)@k(s) | Scambia i buffer di due finestra | /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
@@ -722,10 +722,10 @@ sullo schermo (per mostrare buffer e barre).
 In aggiunta ai colori di base, si può usare un numero per il colore compreso
 tra 1 e il limite del proprio terminale.

-Il comando '/color' mostra i colori attivi ed i limiti. Com 'alt+c' si può
+Il comando '/color' mostra i colori attivi ed i limiti. Com @k(A-)@k(c) si può
 passare temporaneamente ai colori del terminale per sceglierne uno.

-For example if you want to display time in orange in buffer, do:
+Se ad esempio si desidera visualizzare l'ora in arancione nel buffer:

 ----------------------------------------
 /set weechat.color.chat_time 214
@@ -877,22 +877,21 @@ Comandi

 include::autogen/user/aspell_commands.txt[]

-// TRANSLATION MISSING
 [[aspell_speller_options]]
-Speller options
-^^^^^^^^^^^^^^^
+Opzioni ortografiche
+^^^^^^^^^^^^^^^^^^^^

-Speller options can be defined by adding options in section "option" of aspell
-configuration.
+Le opzioni ortografiche possono essere definite aggiungendo opzioni nella
+sezione "opzioni" della configurazione di aspell.

-The option name is an aspell configuration option. List of options can be found
-in a shell with following command:
+Il nome dell'opzione è un parametro di configurazione per aspell. L'elenco
+delle opzioni disponibili può essere trovato nel terminale col seguente comando:

 ----------------------------------------
 $ aspell config
 ----------------------------------------

-For example, to enable option "ignore-case":
+Ad esempio, per abilitare l'opzione "ignore-case":

 ----------------------------------------
 /set aspell.option.ignore-case "true"
@@ -26,7 +26,7 @@ all-local: weechat_quickstart.ja.html

 # quickstart
 weechat_quickstart.ja.html: weechat_quickstart.ja.txt
-	$(ASCIIDOC) -a toc -a toc-title='目次' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_quickstart.ja.html weechat_quickstart.ja.txt
+	$(ASCIIDOC) -a toc -a toc-title='目次' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_quickstart.ja.html weechat_quickstart.ja.txt

 # install docs

@@ -31,15 +31,15 @@ all-local: weechat_faq.pl.html \

 # FAQ
 weechat_faq.pl.html: weechat_faq.pl.txt
-	$(ASCIIDOC) -a toc -a toc-title='Spis treści' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -f `pwd`/../asciidoc.conf -n -o weechat_faq.pl.html weechat_faq.pl.txt
+	$(ASCIIDOC) -a toc -a toc-title='Spis treści' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_faq.pl.html weechat_faq.pl.txt

 # quickstart
 weechat_quickstart.pl.html: weechat_quickstart.pl.txt
-	$(ASCIIDOC) -a toc -a toc-title='Spis treści' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_quickstart.pl.html weechat_quickstart.pl.txt
+	$(ASCIIDOC) -a toc -a toc-title='Spis treści' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_quickstart.pl.html weechat_quickstart.pl.txt

 # tester's guide
 weechat_tester.pl.html: weechat_tester.pl.txt
-	$(ASCIIDOC) -a toc -a toc-title='Spis treści' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_tester.pl.html weechat_tester.pl.txt
+	$(ASCIIDOC) -a toc -a toc-title='Spis treści' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_tester.pl.html weechat_tester.pl.txt

 # install docs

@@ -8,16 +8,16 @@ Ogólne
 ------


-// TRANSLATION MISSING
+
 [[weechat_name]]
-Where does the name "WeeChat" come from?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Skąd się wzieła nazwa "WeeChat"?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-"Wee" is a recursive acronym and stands for "Wee Enhanced Environment".
-So complete name is "Wee Enhanced Environment for Chat".
+"Wee" to akronim rekursywny oznaczającym "Wee Enhanced Environment".
+Stąd kompletna nazwa to "Wee Enhanced Environment for Chat".

-"Wee" also means "very small" (and yes, there is other meaning, but it does not
-apply to WeeChat!).
+"Wee" oznacza również "bardzo mały" (tak jest jeszcze inne znaczenie, ale nie
+pasuje ono do WeeChat!).


 [[why_choose_weechat]]
@@ -181,24 +181,23 @@ Każde okno wyświetla jeden bufor. Bufor może być ukryty (nie wyświetlany pr
 okno) lub wyświetlany w jednym lub więcej oknach.


-// TRANSLATION MISSING
 [[one_input_root_bar]]
-Is it possible to display only one input bar for all windows (after split)?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Czy jest możliwe wyświetlanie tylko jednego paska wejściowego dla wszystkich okien (po podzieleniu)?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-Yes, you will have to create a bar with type "root" (with an item to know in
-which window you are), then delete current input bar.
+Tak, należy stworzyć pasek typu "root" (z elementem mówiącym, w którym oknie
+aktualnie jesteśmy), następnie usunąć obecny pasek wejściowy.

-For example:
+Na przykład:

 ----------------------------------------
 /bar add rootinput root bottom 1 0 [buffer_name]+[input_prompt]+(away),[input_search],[input_paste],input_text
 /bar del input
 ----------------------------------------

-If ever you are not satisfied with that, just delete new bar, WeeChat will
-automatically create default bar "input" if item "input_text" is not used in
-any bar:
+Jeśli kiedyś przestanie ci to odpowiadać, po prostu usuń ten pasek, WeeChat 
+autmatycznie stwrzy nowy pasek "input" jeśli element "input_text" nie zostanie 
+użyty w żadnym z pasków:

 ----------------------------------------
 /bar del rootinput
@@ -272,10 +271,9 @@ zalecane wartości to:
 * w screenie: 'screen-256color'
 * poza screenem: 'xterm-256color', 'rxvt-256color', 'putty-256color',...

-// TRANSLATION MISSING
 [NOTE]
-You may have to install package "ncurses-term" to use these values in 'TERM'
-variable.
+Może okazać się konieczne zainstalownie pakietu "ncurses-term" w celu użycia 
+tych wartości w zmiennej 'TERM'.

 Jeśli używasz screena, możesz dodać to do swojego '~/.screenrc':

@@ -291,12 +289,10 @@ nie należy panikować! Można to zmienić bez konieczności restartu, za pomoc
 /upgrade
 ----------------------------------------

-// TRANSLATION MISSING
-For version 0.3.4, you must use command `/color` to add new colors.
+Dla wersji 0.3.4, musisz użyć komendy `/color` w celu dodania nowych kolorów.

-// TRANSLATION MISSING
-For versions > = 0.3.5, you can use any color number in options (optional: you
-can add color aliases with command `/color`).
+Dla wersji > = 0.3.5, można używać dowolnego numeru koloru w opcjach (opcjonalnie:
+można stworzyć alias dla koloru za pomocą komendy `/color`).

 Więcej informacji na temat zarządzania kolorami można uzyskać w poradniku użytkownika.

@@ -351,15 +347,14 @@ Można również samemu stworzyć skrót, na przykład:
 Lista domyślnych skrótów znajduje się w poradniku użytkownika.


-// TRANSLATION MISSING
 [[global_history]]
-How to use global history (instead of buffer history) with up and down keys?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Jak używać globalnej histori (zamiast histori buforu) za pomoca strzałek góra/dół?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-You can bind the up and down keys on global history (default keys for global
-history are @k(C-)@k(↑) and @k(C-)@k(↓)).
+Możesz przypisać strzałki w góre i dół do globalnej histori (domyślnie dla 
+globalnej historii przypisane są klawisze @k(C-)@k(↑) oraz @k(C-)@k(↓)).

-Example:
+Przykład:

 ----------------------------------------
 /key bind meta2-A /input history_global_previous
@@ -367,8 +362,8 @@ Example:
 ----------------------------------------

 [NOTE]
-Keys "meta2-A" and "meta2-B" may be different in your terminal. To find key
-code press @k(A-)@k(k) then key (up or down).
+Klawisze "meta2-A" i "meta2-B" mogą być inne dla twojego treminala. W celu 
+znalezienia ich kodów wciśnij @k(A-)@k(k) następnie przycisk (góra lub dół).


 [[irc]]
@@ -524,12 +519,11 @@ Jeśli widzisz błędy związanie z certyfikatami, możesz wyłączyć opjcę "s
 ----------------------------------------


-// TRANSLATION MISSING
 [[irc_ssl_freenode]]
-How can I connect to freenode server using SSL?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Jak mogę połączyć się z serwerem freenode używając SSL?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-You must download certificate, convert it, then add it in WeeChat:
+Musisz pobrać certyfikat, skonwertowć go, następnie dodać go w WeeChat:

 ----------------------------------------
 $ cd /tmp
@@ -539,7 +533,7 @@ $ mkdir ~/.weechat/ssl
 $ cat GandiStandardSSLCA.pem >>~/.weechat/ssl/CAs.pem
 ----------------------------------------

-Under WeeChat, setup server port, SSL, dhkey_size, then connect:
+Pod WeeChat, ustawić port serwera, SSL, dhkey_size, następnie się połączyć:

 ----------------------------------------
 /set irc.server.freenode.addresses "chat.freenode.net/7000"
@@ -668,7 +662,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]]
@@ -26,7 +26,7 @@ all-local: weechat_quickstart.ru.html

 # quickstart
 weechat_quickstart.ru.html: weechat_quickstart.ru.txt
-	$(ASCIIDOC) -a toc -a toc-title='Содержание' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=`pwd`/../asciidoc.css -n -o weechat_quickstart.ru.html weechat_quickstart.ru.txt
+	$(ASCIIDOC) -a toc -a toc-title='Содержание' -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_quickstart.ru.html weechat_quickstart.ru.txt

 # install docs

@@ -1,4 +1,4 @@
-.TH WEECHAT 1 "January 2011" "Sebastien Helleu"
+.TH WEECHAT 1 "May 2011" "Sebastien Helleu"

 .SH NAME
 weechat-curses \- Wee Enhanced Environment for Chat (Curses version)
@@ -20,10 +20,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.3.5-dev\n"
+"Project-Id-Version: WeeChat 0.3.5\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-05-15 08:45+0200\n"
+"PO-Revision-Date: 2011-05-15 08:28+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"
@@ -1032,10 +1032,9 @@ msgstr ""
 msgid "define color aliases and display palette of colors"
 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"
+msgid "alias <color> <name> || unalias <color> || reset"
+msgstr "alias <color> <name> || 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"
@@ -1489,7 +1489,7 @@ msgid "[-current | -buffer <name> | -all] command"
 msgstr "[-current | -buffer <name> | -all] command"

 msgid ""
-"-current: no output on curent buffer\n"
+"-current: no output on current buffer\n"
 " -buffer: no output on specified buffer\n"
 "    name: full buffer name (examples: \"irc.server.freenode\", \"irc."
 "freenode.#weechat\")\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: balance the sizes of all windows\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,24 +1931,27 @@ 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: passt die Größe aller Fenster an\n"
 "        merge: vereinigt Fenster miteinander (all = alle Fenster "
 "vereinigen)\n"
-"      page_up: Scrollt eine Seite nach oben\n"
-"    page_down: Scrollt eine Seite nach unten\n"
+"      page_up: scrollt eine Seite nach oben\n"
+"    page_down: scrollt eine Seite nach unten\n"
 "      refresh: Seite wird neu aufgebaut\n"
-"       scroll: Scrollt eine Anzahl an Zeilen (+/-N) oder zu einer gewissen "
+"       scroll: scrollt eine Anzahl an Zeilen (+/-N) oder zu einer gewissen "
 "Zeit: s=Sekunden, m=Minuten, h=Stunden, d=Tage, M=Monate, y=Jahre\n"
-"    scroll_up: Scrollt ein paar Zeilen nach oben\n"
-"  scroll_down: Scrollt ein paar Zeilen nach unten\n"
-"   scroll_top: Scrollt zum Anfang des Buffers\n"
-"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"
+"    scroll_up: scrollt ein paar Zeilen nach oben\n"
+"  scroll_down: scrollt ein paar Zeilen nach unten\n"
+"   scroll_top: scrollt zum Anfang des Buffers\n"
+"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 "
-"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.\n"
+"zur aktuellen Größe an. Zum Beispiel würde ein Wert von 25 bedeuten, dass "
+"das neue Fenster nur noch ein Viertel der Größe des alten Fensters hat.\n"
 "\n"
 "Beispiele:\n"
 "  Springt zum Fenster mit dem Buffer #1:\n"
@@ -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 "ungültige Priorität"
+
 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"
@@ -4256,8 +4277,8 @@ msgstr ""
 msgid "list all servernames which are known by the server answering the query"
 msgstr "Alle dem antwortenden Server bekannten Servernamen auflisten"

-msgid "[[<server>>] <server_mask>]"
-msgstr "[[<server>>] <server_mask>]"
+msgid "[[<server>] <server_mask>]"
+msgstr "[[<server>] <server_mask>]"

 msgid ""
 "     server: this server should answer the query\n"
@@ -4267,7 +4288,7 @@ msgstr ""
 "Servermaske: die aufzulistenden Server sollen diesem Muster entsprechen"

 msgid "list channels and their topic"
-msgstr "Channels mit ihren Topics auflisten"
+msgstr "Channels mit ihrem Thema auflisten"

 msgid "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
 msgstr "[<channel>[,<channel>...]] [<server>] [-re <regex>]"
@@ -4368,7 +4389,7 @@ msgstr ""
 "  p: privater Channel\n"
 "  s: geheimer Channel\n"
 "  i: geschlossener Channel (Zutritt nur mit Einladung)\n"
-"  t: nur Operatoren dürfen das Topic setzen\n"
+"  t: nur Operatoren dürfen das Thema setzen\n"
 "  n: keine Channeln-Nachrichten von außerhalb des Channels\n"
 "  m: moderierter Channel (schreiben nur mit Voice)\n"
 "  l: maximale Anzahl an Usern im Channel festlegen\n"
@@ -4388,7 +4409,7 @@ msgstr ""
 "verfügbaren Modi zu erfahren.\n"
 "\n"
 "Beispiele:\n"
-"  Schützt das Topic des Channels #weechat:\n"
+"  Schützt das Thema des Channels #weechat:\n"
 "    /mode #weechat +t\n"
 "  sich auf dem Server unsichtbar machen:\n"
 "    /mode nick +i"
@@ -4984,7 +5005,7 @@ msgid "nicks and hostnames of current IRC channel"
 msgstr "Liste der Nicks und Hostnamen des aktuellen Channels"

 msgid "topic of current IRC channel"
-msgstr "Topic des aktuellen IRC-Channels"
+msgstr "Thema des aktuellen IRC-Channels"

 msgid "channels on all IRC servers"
 msgstr "Channels auf allen IRC Servern"
@@ -5001,6 +5022,13 @@ 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 ""
+"%s%s: ungültige Zeichenkette für Prioritäten, Fehler befindet sich an "
+"folgender Position der Zeichenkette: \"%s\""
+
 #, c-format
 msgid ""
 "%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
@@ -5058,6 +5086,16 @@ 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 ""
+"Zeichenkette mit Prioritäten für gnutls (für die korrekte Syntax siehe "
+"gnutls Dokumentation unter Funktion gnutls_priority_init. Gebräuchliche "
+"Zeichenketten sind: \"PERFORMANCE\", \"NORMAL\", \"SECURE128\", "
+"\"SECURE256\", \"EXPORT\", \"NONE\")"
+
 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 "
@@ -5319,7 +5357,7 @@ msgid "display host in part/quit messages"
 msgstr "Zeigt den Host in einer part/quit Nachricht an"

 msgid "display old topic when channel topic is changed"
-msgstr "Zeige den alten Topic, falls der Channel-Topic geändert wurde"
+msgstr "Zeige das alte Thema, falls das Thema des Channels geändert wurde"

 msgid "display remote away message only once in private"
 msgstr ""
@@ -5435,8 +5473,8 @@ msgstr "aktiviert einen Filter für Nachrichten von einem \"Nick\""

 msgid "strip colors in topic (used only when displaying buffer title)"
 msgstr ""
-"Farben werden im Topic gestrippt (wird nur genutzt wenn der Buffer-Titel "
-"angezeigt wird)"
+"Farben werden im Channel-Thema entfernt (wird nur genutzt wenn der Buffer-"
+"Titel angezeigt wird)"

 msgid "color for text in join messages"
 msgstr ""
@@ -5500,6 +5538,16 @@ msgstr ""
 "Textfarbe in der die Begründung einer part/quit Nachricht angezeigt werden "
 "soll"

+msgid "color for old channel topic (when topic is changed)"
+msgstr ""
+"Farbe in dem das alte Thema des Channels dargestellt werden soll, falls das "
+"Thema des Channels geändert wurde"
+
+msgid "color for new channel topic (when topic is changed)"
+msgstr ""
+"Farbe in dem das neue Thema des Channels dargestellt werden soll, falls das "
+"Thema des Channels geändert wurde"
+
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -5875,23 +5923,23 @@ 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 Thema 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 Thema 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"
-msgstr "%s%s%s%s hat das Topic von %s%s%s entfernt"
+msgstr "%s%s%s%s hat das Thema von %s%s%s entfernt"

 #, c-format
 msgid "%sWallops from %s%s %s(%s%s%s)%s: %s"
@@ -5952,32 +6000,32 @@ msgstr "%sChannel %s%s%s erstellt am %s"

 #, c-format
 msgid "%sNo topic set for channel %s%s"
-msgstr "%sKein Topic für %s%s gesetzt"
+msgstr "%sKein Thema für %s%s gesetzt"

 #, c-format
 msgid "%sTopic for %s%s%s is \"%s%s\""
-msgstr "%sDas Topic von %s%s%s lautet: \"%s%s\""
+msgstr "%sDas Thema von %s%s%s lautet: \"%s%s\""

 #. TRANSLATORS: "%s" after "on" is a date
 #, c-format
 msgid "%sTopic set by %s%s%s%s%s%s%s%s%s on %s"
-msgstr "%sTopic festgelegt von %s%s%s%s%s%s%s%s%s am %s"
+msgstr "%sThema wurde festgelegt von %s%s%s%s%s%s%s%s%s am %s"

 #. TRANSLATORS: "%s" after "on" is a date
 #, c-format
 msgid "%sTopic set on %s"
-msgstr "%sTopic festgelegt am %s"
+msgstr "%sThema festgelegt am %s"

 #. TRANSLATORS: "%s" after "on" is a date
 #, c-format
 msgid "%sTopic for %s%s%s set by %s%s%s%s%s%s%s%s%s on %s"
-msgstr "%sTopic für %s%s%s festgelegt von %s%s%s%s%s%s%s%s%s am %s"
+msgstr "%sThema für %s%s%s festgelegt von %s%s%s%s%s%s%s%s%s am %s"

 # "%s" nach "on" ist ein Datum
 #. TRANSLATORS: "%s" after "on" is a date
 #, c-format
 msgid "%sTopic for %s%s%s set on %s"
-msgstr "%sDas Topic von %s%s%s wurde festgelegt am: %s"
+msgstr "%sDas Thema von %s%s%s wurde festgelegt am: %s"

 #, c-format
 msgid "%s%s%s%s has invited %s%s%s to %s%s%s"
@@ -6722,13 +6770,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 +6890,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 +7923,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"
@@ -19,10 +19,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.3.5-dev\n"
+"Project-Id-Version: WeeChat 0.3.5\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-05-15 08:45+0200\n"
+"PO-Revision-Date: 2011-05-15 08:29+0200\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -1020,8 +1020,8 @@ msgstr ""
 msgid "define color aliases and display palette of colors"
 msgstr "définir des alias de couleurs et afficher la palette des couleurs"

-msgid "alias <color> <alias> || unalias <color> || reset"
-msgstr "alias <couleur> <alias> || unalias <couleur> || reset"
+msgid "alias <color> <name> || unalias <color> || reset"
+msgstr "alias <couleur> <nom> || unalias <couleur> || reset"

 msgid ""
 "  alias: add an alias for a color\n"
@@ -1456,7 +1456,7 @@ msgid "[-current | -buffer <name> | -all] command"
 msgstr "[-current | -buffer <nom> | -all] commande"

 msgid ""
-"-current: no output on curent buffer\n"
+"-current: no output on current buffer\n"
 " -buffer: no output on specified buffer\n"
 "    name: full buffer name (examples: \"irc.server.freenode\", \"irc."
 "freenode.#weechat\")\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: balance the sizes of all windows\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: équilibrer la taille de toutes les fenêtres\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)"

@@ -4179,7 +4195,7 @@ msgid "list all servernames which are known by the server answering the query"
 msgstr ""
 "lister tous les noms de serveurs connus du serveur qui répondent à la requête"

-msgid "[[<server>>] <server_mask>]"
+msgid "[[<server>] <server_mask>]"
 msgstr "[[<serveur>] <masque_serveur>]"

 msgid ""
@@ -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):"

@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.3.5-dev\n"
+"Project-Id-Version: WeeChat 0.3.5\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 11:21+0200\n"
+"POT-Creation-Date: 2011-05-15 08:45+0200\n"
+"PO-Revision-Date: 2011-05-15 08:29+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Hungarian\n"
@@ -986,7 +986,7 @@ msgstr ""
 msgid "define color aliases and display palette of colors"
 msgstr ""

-msgid "alias <color> <alias> || unalias <color> || reset"
+msgid "alias <color> <name> || unalias <color> || reset"
 msgstr ""

 msgid ""
@@ -1267,7 +1267,7 @@ msgid "[-current | -buffer <name> | -all] command"
 msgstr ""

 msgid ""
-"-current: no output on curent buffer\n"
+"-current: no output on current buffer\n"
 " -buffer: no output on specified buffer\n"
 "    name: full buffer name (examples: \"irc.server.freenode\", \"irc."
 "freenode.#weechat\")\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: balance the sizes of all windows\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)"

@@ -3708,7 +3719,7 @@ msgstr ""
 "ismer"

 #, fuzzy
-msgid "[[<server>>] <server_mask>]"
+msgid "[[<server>] <server_mask>]"
 msgstr "[[szerver] szerver_maszk]"

 msgid ""
@@ -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 ""

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2010 Marco Paolone <marcopaolone@gmail.com>
+# Copyright (C) 2009-2011 Marco Paolone <marcopaolone@gmail.com>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.3.5-dev\n"
+"Project-Id-Version: WeeChat 0.3.5\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-05-15 08:45+0200\n"
+"PO-Revision-Date: 2011-05-15 08:30+0200\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Italian\n"
@@ -145,9 +145,9 @@ msgstr "  %s (plugin: %s)"
 msgid "No bar item defined"
 msgstr "Nessun elemento barra definito"

-#, fuzzy, c-format
+#, c-format
 msgid "%sError: name can not start with \"#\""
-msgstr "%sErrore: impossibile creare il file \"%s\""
+msgstr "%sErrore: il nome non può iniziare con \"#\""

 #, c-format
 msgid "%sNot enough memory"
@@ -1012,10 +1012,9 @@ msgstr ""
 msgid "define color aliases and display palette of colors"
 msgstr "definisce gli alias dei colori e visualizza la tavolozza dei colori"

-msgid "alias <color> <alias> || unalias <color> || reset"
-msgstr "alias <colore> <alias> || unalias <colore> || reset"
+msgid "alias <color> <name> || unalias <color> || reset"
+msgstr "alias <colore> <nome> || unalias <colore> || reset"

-#, fuzzy
 msgid ""
 "  alias: add an alias for a color\n"
 "unalias: delete an alias\n"
@@ -1038,14 +1037,15 @@ msgstr ""
 " colore: numero colore (>= 0, il massimo dipende dal terminale, di solito 63 "
 "o 255)\n"
 "   nome: nome alias per il colore (ad esempio: \"arancione\")\n"
-"  reset: ripristina tutte le coppie di colore (utile quando non ci sono più "
-"coppie disponibili)\n"
+"  reset: ripristina tutte le coppie di colore (richiesto quando non ci sono "
+"più coppie disponibili se il ripristino automatico è disabilitato, "
+"consultare l'opzione weechat.look.color_pairs_auto_reset)\n"
 "\n"
-"senza argomento, il comando mostra i colori in un nuovo buffer.\n"
+"Senza argomento, il comando mostra i colori in un nuovo buffer.\n"
 "\n"
 "Esempi:\n"
 "  aggiunge alias \"arancione\" per il colore 214:\n"
-"    /color alias 214 orange\n"
+"    /color alias 214 arancione\n"
 "  elimina il colore 214:\n"
 "    /color unalias 214"

@@ -1112,7 +1112,6 @@ msgstr ""
 "list || enable|disable|toggle [<nome>] || add <nome> <buffer>[,<buffer>...] "
 "<tag> <regex>] || del <nome>|-all"

-#, fuzzy
 msgid ""
 "   list: list all filters\n"
 " enable: enable filters (filters are enabled by default)\n"
@@ -1198,7 +1197,7 @@ msgstr ""
 "\n"
 "Tag utilizzati di frequente:\n"
 "  no_filter, no_highlight, no_log, log0..log9 (livello di log),\n"
-"  notify_message, notify_private, notify_highlight,\n"
+"  notify_none, notify_message, notify_private, notify_highlight,\n"
 "  nick_xxx (xxx è il nick nel messaggio),\n"
 "  irc_xxx (xxx è il nome comando o il numero, consultare /server raw),   "
 "irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
@@ -1449,7 +1448,7 @@ msgid "[-current | -buffer <name> | -all] command"
 msgstr "[-current | -buffer <nome> | -all] comando"

 msgid ""
-"-current: no output on curent buffer\n"
+"-current: no output on current buffer\n"
 " -buffer: no output on specified buffer\n"
 "    name: full buffer name (examples: \"irc.server.freenode\", \"irc."
 "freenode.#weechat\")\n"
@@ -1810,14 +1809,14 @@ msgstr "gestione finestre"

 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 "
@@ -1833,6 +1832,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
+"      balance: balance the sizes of all windows\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 +1845,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 "
@@ -1875,6 +1877,7 @@ msgstr ""
 "       splitv: divide la finestra attiva verticalmente\n"
 "       resize: ridimensiona finestra, la nuova dimensione è <pct> "
 "percentuale della finestra genitore\n"
+"      balance: bilancia le dimensioni tutte le finestre\n"
 "        merge: unisce la finestra con un'altra (all = mantiente una sola "
 "finestra)\n"
 "      page_up: scorre di una pagina in alto\n"
@@ -1888,6 +1891,8 @@ msgstr ""
 "scroll_bottom: scorre fino alla fine del buffer buffer\n"
 "scroll_previous_highlight: passa all'evento precedente\n"
 "    scroll_next_highlight: passa all'evento successivo\n"
+"         swap: scambia i buffer di due finestra (con direzione opzionale per "
+"la finestra di destinazione)\n"
 "         zoom: ingrandimento sulla finestra\n"
 "\n"
 "Per splith e splitv, pct è una percentuale che rappresenta la dimensione "
@@ -2055,6 +2060,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 ""
+"ripristina automaticamente la tabella delle coppie colore quando il numero "
+"di coppie disponibili è minore o uguale a questo numero (-1 = disabilita il "
+"ripristino automatico, dunque è necessario \"/color reset\" quando la "
+"tabella è al completo)"

 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
@@ -2107,14 +2116,14 @@ msgstr ""
 "circondata da caratteri :(alfanumerici, \"-\", \"_\" or \"|\"), "
 "l'espressione regolare è esatta, esempio \"FlashCode|flashy\""

-#, fuzzy
 msgid ""
 "comma separated list of tags to highlight (case insensitive comparison, "
 "examples: \"irc_notice\" for IRC notices, \"nick_flashcode\" for messages "
 "from nick \"FlashCode\")"
 msgstr ""
-"elenco separato da virgole di tag da evidenziare (maiuscole/minuscole, le "
-"parole potrebbero cominciare o terminare con \"*\" per un riscontro parziale)"
+"elenco separato da virgole di tag da evidenziare (senza differenza tra "
+"maiuscole/minuscole, esempi: \"irc_notice\" per gli annunci IRC, "
+"\"nick_flashcode\" per i messaggi dal nick \"FlashCode\")"

 msgid ""
 "char used to draw horizontal separators around bars (empty value will draw a "
@@ -2126,19 +2135,29 @@ msgstr ""
 "con la selezione dell'URL in alcuni terminali), i caratteri wide NON sono "
 "consentiti"

-#, fuzzy
+msgid ""
+"add any buffer to hotlist (including current or visible buffers) if local "
+"variable \"away\" is set on buffer"
+msgstr ""
+"aggiunge qualsiasi buffer alla hotlist (inclusi buffer corrente o visibili) "
+"se la variabile locale \"away\" è impostata sul buffer"
+
 msgid "string displayed between buffers in hotlist"
-msgstr "elenco dei buffer nella hotlist"
+msgstr "stringa mostrata tra i buffer nella hotlist"

 msgid ""
 "max number of messages count to display in hotlist for a buffer (0 = never "
 "display messages count)"
 msgstr ""
+"numero massimo del conteggio di messaggi da mostrare nella hotlist per un "
+"buffer (0 = non mostrare mai il contatore messaggi)"

 msgid ""
 "display messages count if number of messages is greater or equal to this "
 "value"
 msgstr ""
+"mostra il conteggio dei messaggi se il numero di messaggi è maggiore o "
+"uguale a questo valore"

 msgid ""
 "max number of names in hotlist (0 = no name displayed, only buffer numbers)"
@@ -2184,13 +2203,12 @@ msgstr ""
 "mantiene solo numeri univoci nella hotlist (vale solo per gli elementi della "
 "hotlist per cui il nome NON viene visualizzato dopo il numero)"

-#, fuzzy
 msgid ""
 "number of chars displayed after end of input line when scrolling to display "
 "end of line"
 msgstr ""
-"numero di caratteri mostrati dopo la fine della riga di input allo "
-"scorrimento per visualizzare la fine riga"
+"numero di caratteri mostrati dopo la fine della riga di input quando si "
+"scorre per mostrare la fine riga"

 msgid ""
 "share commands, text, or both in input for all buffers (there is still local "
@@ -2469,21 +2487,24 @@ msgid "text color for buffer with new data (not messages) (status bar)"
 msgstr ""
 "colore del testo per il buffer con nuovi dati (non messaggi) (barra di stato)"

-#, fuzzy
 msgid "text color for count of messages in hotlist (status bar)"
-msgstr "colore del testo per il buffer con evento (barra di stato)"
+msgstr ""
+"colore del testo per il conteggio dei messaggi nella hotlist (barra di stato)"

-#, fuzzy
 msgid "text color for count of private messages in hotlist (status bar)"
-msgstr "colore del testo per il buffer con evento (barra di stato)"
+msgstr ""
+"colore del testo per il conteggio dei messaggi privati nella hotlist (barra "
+"di stato)"

-#, fuzzy
 msgid "text color for count of highlight messages in hotlist (status bar)"
-msgstr "colore del testo per il buffer con evento (barra di stato)"
+msgstr ""
+"colore del testo per il conteggio dei messaggi evento nella hotlist (barra "
+"di stato)"

-#, fuzzy
 msgid "text color for count of other messages in hotlist (status bar)"
-msgstr "colore del testo per il buffer con evento (barra di stato)"
+msgstr ""
+"colore del testo per il conteggio di altri messaggi nella hotlist (barra di "
+"stato)"

 msgid "text color for buffer with new data (status bar)"
 msgstr "colore del testo per il buffer con nuovi dati (barra di stato)"
@@ -2492,7 +2513,7 @@ msgid "text color for time (status bar)"
 msgstr "colore del testo per l'ora (barra di stato)"

 msgid "text color for unsuccessful text search in input line"
-msgstr "colore del testo per la ricerca del testo fallita sulla riga di input"
+msgstr "colore del testo per la ricerca del testo fallita nella riga di input"

 msgid "text color for actions in input line"
 msgstr "colore del testo per le azioni sulla riga di input"
@@ -2733,6 +2754,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 "priorità non valide"
+
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "tipo di proxy (http (predefinito), socks4, socks5)"

@@ -2879,7 +2903,7 @@ msgstr "Coppie colore di WeeChat (in uso: %d, rimaste: %d):"

 #, c-format
 msgid "Last auto reset of pairs: %s"
-msgstr ""
+msgstr "Ultimo ripristino automatico delle coppie: %s"

 msgid "WeeChat basic colors:"
 msgstr "Colori base di WeeChat"
@@ -3003,7 +3027,7 @@ msgstr "%s-ANCORA(%d)-"

 #. TRANSLATORS: if possible use short word or abbreviation here ("Act" is abbreviation of "Activity" in english)
 msgid "Act: "
-msgstr "Att: "
+msgstr "Attività: "

 #, c-format
 msgid "Notify changed for \"%s%s.%s%s\": \"%s%s%s\" to \"%s%s%s\""
@@ -3235,10 +3259,12 @@ msgid ""
 "option for aspell (for list of available options and format, run command "
 "\"aspell config\" in a shell)"
 msgstr ""
+"opzione per aspell (per un elenco di opzioni e formato disponibili, eseguire "
+"il comando \"aspell config\" in un terminale)"

-#, fuzzy, c-format
+#, c-format
 msgid "%s%s: error creating aspell option \"%s\" => \"%s\""
-msgstr "%s%s: errore nella creazione del dizionario aspell \"%s\" => \"%s\""
+msgstr "%s%s: errore nella creazione dell'opzione aspell \"%s\" => \"%s\""

 msgid "color used for misspelled words"
 msgstr "colore utilizzato per le parole non corrette"
@@ -3687,9 +3713,9 @@ msgstr "Nessun server trovato con \"%s\""
 msgid "%s%s: server \"%s\" already exists, can't create it!"
 msgstr "%s%s: il server \"%s\" esiste già, impossibile crearlo!"

-#, fuzzy, c-format
+#, c-format
 msgid "%s%s: name can not start with \"#\""
-msgstr "%s%s: impossibile accedere al file \"%s\""
+msgstr "%s%s: il nome non può iniziare con \"#\""

 #, c-format
 msgid "%s%s: unable to create server"
@@ -4135,7 +4161,7 @@ msgid "list all servernames which are known by the server answering the query"
 msgstr ""
 "elenca tutti i nomi server conosciuti dal server che risponde alla richiesta"

-msgid "[[<server>>] <server_mask>]"
+msgid "[[<server>] <server_mask>]"
 msgstr "[[<server>] <mask_server>]"

 msgid ""
@@ -4871,6 +4897,12 @@ 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 ""
+"%s%s: stringa delle proprietà non valida, errore in questa posizione: \"%s\""
+
 #, c-format
 msgid ""
 "%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
@@ -4924,6 +4956,16 @@ 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 ""
+"stringa con le priorità per gnutls (per la sintassi, consultare la "
+"documentazione per la funzione gnutls_priority_init nel manuale di gnutls, "
+"stringhe comuni sono: \"PERFORMANCE\", \"NORMAL\", \"SECURE128\", "
+"\"SECURE256\", \"EXPORT\", \"NONE\")"
+
 msgid "size of the key used during the Diffie-Hellman Key Exchange"
 msgstr ""
 "dimensione della chiave utilizzata durante lo Scambio Chiavi Diffie-Hellman"
@@ -4953,8 +4995,7 @@ msgid "automatically reconnect to server when disconnected"
 msgstr "riconnette automaticamente al server alla disconnessione"

 msgid "delay (in seconds) before trying again to reconnect to server"
-msgstr ""
-"ritardo (in secondi) prima di effettuare una nuova connessione al server"
+msgstr "ritardo (in secondi) prima di riprovare a riconnettersi al server"

 msgid "nicknames to use on server (separated by comma)"
 msgstr "nick da utilizzare sul server (separati da virgole)"
@@ -4985,7 +5026,7 @@ msgid ""
 "delay (in seconds) after command was executed (example: give some time for "
 "authentication)"
 msgstr ""
-"ritardo (in secondi) dopo l'esecuzione del programma (esempio: fornire il "
+"ritardo (in secondi) dopo l'esecuzione del comando (esempio: fornire il "
 "tempo per l'autenticazione)"

 msgid ""
@@ -5300,6 +5341,11 @@ msgid ""
 "will try with next modes received from server (\"PREFIX\"); a special mode "
 "\"*\" can be used as default color if no mode has been found in list)"
 msgstr ""
+"colore per i prefissi dei nick usando il carattere di modalità (o=operatore, "
+"h=halfop, v=voce, ..), il formato è: \"o:colore1;h:colore2;v:colore3\" (se "
+"una modalità non viene trovata, WeeChat proverà con le modalità successive "
+"ricevute dal server (\"PREFIX\"); può essere usata una modalità speciale \"*"
+"\" come colore prefefinito se non viene trovata nessuna modalità nella lista)"

 msgid "color for nick prefix (prefix is custom string displayed before nick)"
 msgstr ""
@@ -5337,6 +5383,12 @@ msgstr ""
 msgid "color for reason in part/quit messages"
 msgstr "colore per il motivo nei messaggi di uscita/abbandono"

+msgid "color for old channel topic (when topic is changed)"
+msgstr "colore del precedente argomento del canale (quando viene cambiato)"
+
+msgid "color for new channel topic (when topic is changed)"
+msgstr "colore del nuovo argomento del canale (quando viene cambiato)"
+
 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
 "delay*2 for each retry, ..)"
@@ -5708,17 +5760,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"
@@ -6537,13 +6589,13 @@ msgstr ""
 msgid "list of hooks"
 msgstr "elenco di hook"

-#, 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 ""
-"tipo,argomenti (il tipo è comando/timer/.., l'argomento solo per ottenere "
-"alcuni hook, entrambi sono opzionali)"
+"tipo,argomenti (il tipo è comando/timer/.., gli argomenti sono necessari "
+"solo per ottenere alcuni hook, (possono iniziare o terminare con \"*\" come "
+"carattere jolly, entrambi sono opzionali)"

 msgid "list of buffers in hotlist"
 msgstr "elenco dei buffer nella hotlist"
@@ -6654,6 +6706,9 @@ msgstr "%sErrore: plugin \"%s\" non trovato"
 msgid "Plugins unloaded"
 msgstr "Plugin disattivati"

+msgid "description of plugin option"
+msgstr "descrizione dell'opzione del plugin"
+
 msgid "Actions (letter+enter):"
 msgstr "Azioni (lettera+invio)"

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010 Ivan Sichmann Freitas <ivansichfreitas@gmail.com>
+# Copyright (C) 2010-2011 Ivan Sichmann Freitas <ivansichfreitas@gmail.com>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -18,9 +18,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.3.5-dev\n"
+"Project-Id-Version: WeeChat 0.3.5\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-04-19 20:09+0200\n"
+"POT-Creation-Date: 2011-05-15 08:45+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"
@@ -226,11 +226,11 @@ msgstr "Nenhuma variável local definida para o buffer \"%s\""

 #, c-format
 msgid "%sInvalid color number \"%s\" (must be between %d and %d)"
-msgstr ""
+msgstr "%sNúmero de cor inválido \"%s\" (precisa ser entre %d e %d)"

 #, c-format
 msgid "%sColor \"%s\" is not defined in palette"
-msgstr ""
+msgstr "%sCor \"%s\" não está definida na palheta"

 #, c-format
 msgid "%sPlugin \"%s\" not found"
@@ -350,6 +350,8 @@ msgstr "máximo de caracteres"
 msgid "color"
 msgstr "cor"

+# I don't think translating the color names would be necessary
+#, fuzzy
 msgid ""
 "a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)"
 "green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal "
@@ -357,6 +359,11 @@ msgid ""
 "color only, not background): \"*\" for bold, \"!\" for reverse, \"_\" for "
 "underline"
 msgstr ""
+"um nome de cor do WeeChat (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"

 #. TRANSLATORS: please do not translate "(null)"
 msgid "undefined value allowed (null)"
@@ -1022,11 +1029,14 @@ msgstr ""
 "    /buffer +1"

 msgid "define color aliases and display palette of colors"
-msgstr ""
+msgstr "define apelidos para cores e mostra a palheta de cores"

-msgid "alias <color> <alias> || unalias <color> || reset"
-msgstr ""
+#, fuzzy
+msgid "alias <color> <name> || unalias <color> || reset"
+msgstr "alias <cor> <apelido> || unalias <cor> || reset"

+# Translate orange? Is it a internal name?
+# TODO: revisit here when color names were specified as translatable or not
 msgid ""
 "  alias: add an alias for a color\n"
 "unalias: delete an alias\n"
@@ -1044,6 +1054,21 @@ msgid ""
 "  delete color 214:\n"
 "    /color unalias 214"
 msgstr ""
+"  alias: adiciona um apelido para uma cor\n"
+"unalias: deleta um apelido\n"
+"  color: número da cor (>= 0, o máximo depende do terminal, em geral 63 ou "
+"255)\n"
+"   name: nome da cor para a cor (\"orange\")\n"
+"  reset: restaura todas os pares de cores (util quando não há mais pares "
+"disponíveis)\n"
+"\n"
+"Sem argumentos, este comando exibe cores em um buffer novo.\n"
+"\n"
+"Exemplos:\n"
+"  add alias \"orange\" for color 214:\n"
+"    /color alias 214 orange\n"
+"  delete color 214:\n"
+"    /color unalias 214"

 msgid "launch explicit WeeChat or plugin command"
 msgstr "executar explicitamente um comando do WeeChat ou de um plugin"
@@ -1214,7 +1239,7 @@ msgid "display help about commands and options"
 msgstr "mostra a ajuda sobre comandos e opções"

 msgid "-list|-listfull [<plugin> [<plugin>...]] || <command> || <option>"
-msgstr ""
+msgstr "-list|-listfull [<plugin> [<plugin>...]] || <comando> || <opção>"

 msgid ""
 "    -list: list commands, by plugin (without argument, this list is "
@@ -1224,13 +1249,18 @@ msgid ""
 "  command: a command name\n"
 "   option: an option name (use /set to see list)"
 msgstr ""
+"    -list: lista comandos, por plugin (sem argumentos, esta lista é "
+"exibida)\n"
+"-listfull: lista comandos com descrição, por plugin\n"
+"   plugin: lista comandos para este plugin\n"
+"  comando: um nome de comando\n"
+"    opção: um nome de opção (use /set para ver a lista)"

 msgid "show buffer command history"
 msgstr "mostra o histórico de linhas de comando do buffer"

-#, fuzzy
 msgid "clear || <value>"
-msgstr "[clear | valor]"
+msgstr "clear || <valor>"

 msgid ""
 "clear: clear history\n"
@@ -1242,10 +1272,11 @@ msgstr ""
 msgid "functions for command line"
 msgstr "funções para linha de comando"

-#, fuzzy
 msgid "<action> [<arguments>]"
-msgstr "[-yes] [argumentos]"
+msgstr "<ação> [<argumentos>]"

+# Translate the actions or not?
+#, fuzzy
 msgid ""
 "list of actions:\n"
 "  return: simulate key \"enter\"\n"
@@ -1289,18 +1320,58 @@ msgid ""
 "\n"
 "This command is used by key bindings or plugins."
 msgstr ""
+"lista de ações:\n"
+"  return: simula a tecla \"enter\"\n"
+"  complete_next: completa uma palavra com a próxima correspondência\n"
+"  complete_previous: completa uma palavra com a correspondência anterior\n"
+"  search_text: procura por texto no buffer\n"
+"  delete_previous_char: deleta o caractere anterior\n"
+"  delete_next_char: deleta o próximo caractere\n"
+"  delete_previous_word: deleta a palavra anterior\n"
+"  delete_next_word: deleta a próxima palavra\n"
+"  delete_beginning_of_line: delete from beginning of line until cursor\n"
+"  delete_end_of_line: delete from cursor until end of line\n"
+"  delete_line: delete entire line\n"
+"  clipboard_paste: paste from clipboard\n"
+"  transpose_chars: transpose two chars\n"
+"  undo: undo last command line action\n"
+"  redo: redo last command line action\n"
+"  move_beginning_of_line: move cursor to beginning of line\n"
+"  move_end_of_line: move cursor to end of line\n"
+"  move_previous_char: move cursor to previous char\n"
+"  move_next_char: move cursor to next char\n"
+"  move_previous_word: move cursor to previous word\n"
+"  move_next_word: move cursor to next word\n"
+"  history_previous: recall previous command in current buffer history\n"
+"  history_next: recall next command in current buffer history\n"
+"  history_global_previous: recall previous command in global history\n"
+"  history_global_next: recall next command in global history\n"
+"  jump_smart: jump to next buffer with activity\n"
+"  jump_last_buffer: jump to last buffer\n"
+"  jump_previously_visited_buffer: jump to previously visited buffer\n"
+"  jump_next_visited_buffer: jump to next visited buffer\n"
+"  hotlist_clear: clear hotlist\n"
+"  grab_key: grab a key\n"
+"  grab_key_command: grab a key with its associated command\n"
+"  scroll_unread: scroll to unread marker\n"
+"  set_unread: set unread marker for all buffers\n"
+"  set_unread_current_buffer: set unread marker for current buffer\n"
+"  switch_active_buffer: switch to next merged buffer\n"
+"  switch_active_buffer_previous: switch to previous merged buffer\n"
+"  insert: insert text in command line\n"
+"\n"
+"This command is used by key bindings or plugins."

 msgid "bind/unbind keys"
 msgstr "vincular/desvincular teclas"

 # it may be needed to translate this
-#, fuzzy
 msgid ""
 "list|listdefault|listdiff || bind <key> [<command> [<args>]] || unbind <key> "
 "|| reset <key> || resetall -yes || missing"
 msgstr ""
-"[list | listdefault | listdiff] | [bind key [command [args]]] | [unbind key] "
-"| [reset key] | [resetall -yes] | [missing]"
+"list|listdefault|listdiff || bind <tecla> [<comando> [<args>]] || unbind "
+"<tecla> || reset <tecla> || resetall -yes || missing"

 msgid ""
 "       list: list all current keys (without argument, this list is "
@@ -1357,10 +1428,10 @@ msgstr ""
 msgid "save/apply/reset layout for buffers and windows"
 msgstr "salvar/aplicar/resetar a disposição dos buffers e janelas"

-#, fuzzy
 msgid ""
 "save [buffers|windows] || apply [buffers|windows] || reset [buffers|windows]"
-msgstr "[[save | apply | reset] [buffers | windows]]"
+msgstr ""
+"save [buffers|janelas] || apply [buffers|janelas] || reset [buffers|janelas]"

 msgid ""
 "   save: save current layout\n"
@@ -1382,12 +1453,12 @@ msgstr ""
 msgid "execute a command silently"
 msgstr "executa um comando silenciosamente"

-#, fuzzy
 msgid "[-current | -buffer <name> | -all] command"
-msgstr "[-current | -buffer name | -all] comando"
+msgstr "[-current | -buffer <nome> | -all] comando"

+#, fuzzy
 msgid ""
-"-current: no output on curent buffer\n"
+"-current: no output on current buffer\n"
 " -buffer: no output on specified buffer\n"
 "    name: full buffer name (examples: \"irc.server.freenode\", \"irc."
 "freenode.#weechat\")\n"
@@ -1408,7 +1479,7 @@ msgid ""
 msgstr ""
 "-current: sem saída no buffer atual\n"
 " -buffer: sem saída em um buffer específico\n"
-"    name: nome completo para o buffer (exemplos: \"irc.server.freenode\", "
+"    nome: nome completo para o buffer (exemplos: \"irc.server.freenode\", "
 "\"irc.freenode.#weechat\")\n"
 "    -all: nenhuma saída em TODOS os buffers\n"
 " command: comando a ser executado silenciosamente (um '/' é automaticamente "
@@ -1433,8 +1504,8 @@ msgid ""
 "list|listfull [<name>] || load <filename> || autoload || reload|unload "
 "[<name>]"
 msgstr ""
-"[list [name]] | [listfull [name]] | [load filename] | [autoload] | [reload "
-"[name]] | [unload [name]]"
+"list|listfull [<nome>] || load <arquivo> || autoload || reload|unload "
+"[<name>]"

 # Find a better translation to the reload option
 #, fuzzy
@@ -1463,13 +1534,12 @@ msgstr ""
 msgid "manage proxies"
 msgstr "gerenciar proxies"

-#, fuzzy
 msgid ""
 "list || add <name> <type> <address> <port> [<username> [<password>]] || del "
 "<name>|-all || set <name> <option> <value>"
 msgstr ""
-"[add proxyname type address port [username [password]]] | [del proxyname|-"
-"all] | [set proxyname option value] | [list]"
+"list || add <nome> <tipo> <endereço> <porta> [<nome de usuário> [<senha>]] "
+"|| del <nome>|-all || set <nome> <opção> <valor>"

 #, fuzzy
 msgid ""
@@ -1750,15 +1820,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 +1844,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
+"      balance: balance the sizes of all windows\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 +1857,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 +2145,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 +2670,9 @@ msgid ""
 "with another home using \"--dir\" command line option.\n"
 msgstr ""

+msgid "invalid priorities"
+msgstr ""
+
 msgid "proxy type (http (default), socks4, socks5)"
 msgstr ""

@@ -3783,7 +3865,7 @@ msgstr ""
 msgid "list all servernames which are known by the server answering the query"
 msgstr ""

-msgid "[[<server>>] <server_mask>]"
+msgid "[[<server>] <server_mask>]"
 msgstr ""

 msgid ""
@@ -4354,6 +4436,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 +4483,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 +4812,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 +5163,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 +5991,9 @@ msgstr ""
 msgid "Plugins unloaded"
 msgstr ""

+msgid "description of plugin option"
+msgstr ""
+
 msgid "Actions (letter+enter):"
 msgstr ""

@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.3.5-dev\n"
+"Project-Id-Version: WeeChat 0.3.5\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-05-15 08:45+0200\n"
+"PO-Revision-Date: 2011-05-15 08:31+0200\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Russian\n"
@@ -993,7 +993,7 @@ msgstr ""
 msgid "define color aliases and display palette of colors"
 msgstr ""

-msgid "alias <color> <alias> || unalias <color> || reset"
+msgid "alias <color> <name> || unalias <color> || reset"
 msgstr ""

 msgid ""
@@ -1276,7 +1276,7 @@ msgid "[-current | -buffer <name> | -all] command"
 msgstr ""

 msgid ""
-"-current: no output on curent buffer\n"
+"-current: no output on current buffer\n"
 " -buffer: no output on specified buffer\n"
 "    name: full buffer name (examples: \"irc.server.freenode\", \"irc."
 "freenode.#weechat\")\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: balance the sizes of all windows\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)"

@@ -3725,7 +3736,7 @@ msgid "list all servernames which are known by the server answering the query"
 msgstr "перечислить все серверы известные серверу, отвечающему на запрос"

 #, fuzzy
-msgid "[[<server>>] <server_mask>]"
+msgid "[[<server>] <server_mask>]"
 msgstr "[[сервер] маска_сервера]"

 msgid ""
@@ -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 ""

@@ -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-05-15 08:45+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"
@@ -854,7 +854,7 @@ msgstr ""
 msgid "define color aliases and display palette of colors"
 msgstr ""

-msgid "alias <color> <alias> || unalias <color> || reset"
+msgid "alias <color> <name> || unalias <color> || reset"
 msgstr ""

 msgid ""
@@ -1108,7 +1108,7 @@ msgid "[-current | -buffer <name> | -all] command"
 msgstr ""

 msgid ""
-"-current: no output on curent buffer\n"
+"-current: no output on current buffer\n"
 " -buffer: no output on specified buffer\n"
 "    name: full buffer name (examples: \"irc.server.freenode\", \"irc."
 "freenode.#weechat\")\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: balance the sizes of all windows\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 ""

@@ -3249,7 +3260,7 @@ msgstr ""
 msgid "list all servernames which are known by the server answering the query"
 msgstr ""

-msgid "[[<server>>] <server_mask>]"
+msgid "[[<server>] <server_mask>]"
 msgstr ""

 msgid ""
@@ -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 ""

@@ -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)
    {
@@ -4746,7 +4786,7 @@ command_init ()
                  &command_buffer, NULL);
    hook_command (NULL, "color",
                  N_("define color aliases and display palette of colors"),
-                  N_("alias <color> <alias>"
+                  N_("alias <color> <name>"
                     " || unalias <color>"
                     " || reset"),
                  N_("  alias: add an alias for a color\n"
@@ -5021,7 +5061,7 @@ command_init ()
    hook_command (NULL, "mute",
                  N_("execute a command silently"),
                  N_("[-current | -buffer <name> | -all] command"),
-                  N_("-current: no output on curent buffer\n"
+                  N_("-current: no output on current buffer\n"
                     " -buffer: no output on specified buffer\n"
                     "    name: full buffer name (examples: "
                     "\"irc.server.freenode\", \"irc.freenode.#weechat\")\n"
@@ -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: balance the sizes of all windows\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);
 }

@@ -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)
@@ -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",
@@ -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;
@@ -194,14 +194,15 @@ debug_windows_tree_display (struct t_gui_window_tree *tree, int indent)
            /* leaf */
            snprintf (format,
                      sizeof (format),
-                      "%%-%dsleaf: 0x%%lx (parent:0x%%lx), win=0x%%lx, "
-                      "child1=0x%%lx, child2=0x%%lx, %%d,%%d %%dx%%d, "
-                      "%%d%%%%x%%d%%%%",
+                      "%%-%dsleaf: 0x%%lx, parent:0x%%lx, child1=0x%%lx, "
+                      "child2=0x%%lx, win=0x%%lx (%%d,%%d %%dx%%d"
+                      " %%d%%%%x%%d%%%%)",
                      indent * 2);
            gui_chat_printf (NULL,
                             format,
-                             " ", tree, tree->parent_node, tree->window,
+                             " ", tree, tree->parent_node,
                             tree->child1, tree->child2,
+                             tree->window,
                             tree->window->win_x, tree->window->win_y,
                             tree->window->win_width, tree->window->win_height,
                             tree->window->win_width_pct,
@@ -212,12 +213,13 @@ debug_windows_tree_display (struct t_gui_window_tree *tree, int indent)
            /* node */
            snprintf (format,
                      sizeof (format),
-                      "%%-%dsnode: 0x%%lx (parent:0x%%lx), win=0x%%lx, "
-                      "child1=0x%%lx, child2=0x%%lx",
+                      "%%-%dsnode: 0x%%lx, parent:0x%%lx, pct:%%d, "
+                      "horizontal:%%d, child1=0x%%lx, child2=0x%%lx",
                      indent * 2);
            gui_chat_printf (NULL,
                             format,
-                             " ", tree, tree->parent_node, tree->window,
+                             " ", tree, tree->parent_node, tree->split_pct,
+                             tree->split_horizontal,
                             tree->child1, tree->child2);
        }
        
@@ -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));
@@ -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);
@@ -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;
@@ -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++)
@@ -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? */
@@ -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");
@@ -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 " "
@@ -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,128 @@ gui_window_switch_right (struct t_gui_window *window)
    }
 }

+/*
+ * gui_window_balance_count: count number of windows in a tree with a given
+ *                           split, for balancing windows
+ */
+
+int
+gui_window_balance_count (struct t_gui_window_tree *tree, int split_horizontal)
+{
+    int count;
+    
+    count = 0;
+    if (tree)
+    {
+        if (!tree->window && (tree->split_horizontal == split_horizontal))
+        {
+            if ((tree->child1 && tree->child1->window)
+                || (tree->child2 && tree->child2->window))
+            {
+                count++;
+            }
+        }
+        count += gui_window_balance_count (tree->child1, split_horizontal);
+        count += gui_window_balance_count (tree->child2, split_horizontal);
+    }
+    return count;
+}
+
+/*
+ * 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, count_left, count_right, new_split_pct;
+    
+    balanced = 0;
+    if (tree && tree->child1 && tree->child2)
+    {
+        count_left = gui_window_balance_count (tree->child1, tree->split_horizontal) + 1;
+        count_right = gui_window_balance_count (tree->child2, tree->split_horizontal) + 1;
+        if (count_right > count_left)
+            new_split_pct = (count_left * 100) / (count_left + count_right);
+        else
+            new_split_pct = (count_right * 100) / (count_left + count_right);
+        if (new_split_pct < 1)
+            new_split_pct = 1;
+        if (new_split_pct > 99)
+            new_split_pct = 99;
+        if ((tree->split_horizontal && (count_right > count_left))
+            || (!tree->split_horizontal && (count_left > count_right)))
+            new_split_pct = 100 - new_split_pct;
+        if (tree->split_pct != new_split_pct)
+        {
+            tree->split_pct = new_split_pct;
+            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,
@@ -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
 */
@@ -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)
@@ -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;
@@ -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);
@@ -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
@@ -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
@@ -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 == ' ')
                {
@@ -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 ();
@@ -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;
    
    /*
@@ -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))
@@ -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,
@@ -4877,7 +4881,7 @@ irc_command_init ()
    weechat_hook_command ("links",
                          N_("list all servernames which are known by the "
                             "server answering the query"),
-                          N_("[[<server>>] <server_mask>]"),
+                          N_("[[<server>] <server_mask>]"),
                          N_("     server: this server should answer the "
                             "query\n"
                             "server_mask: list of servers must match this "
@@ -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 */

@@ -190,6 +192,11 @@ irc_config_compute_nick_colors ()
                    ptr_nick->color = strdup (irc_nick_find_color (ptr_nick->name));
                }
            }
+            if (ptr_channel->pv_remote_nick_color)
+            {
+                free (ptr_channel->pv_remote_nick_color);
+                ptr_channel->pv_remote_nick_color = NULL;
+            }
        }
    }
    
@@ -800,6 +807,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 +1262,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 +1281,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 +1293,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 +1305,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 +1317,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 +1331,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 +1358,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 +1370,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 +1382,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 +1394,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 +1406,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 +1418,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 +1431,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 +1443,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 +1455,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 +1467,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 +1479,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 +1491,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 +1503,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 +1516,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 +1531,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 +1544,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 +1557,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 +1569,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 +1581,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 +1596,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 +1610,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 +1624,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 +1637,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 +1650,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 +1663,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 +1676,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 +1690,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 +1876,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 +2306,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",
@@ -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 ();
@@ -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",
@@ -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)",
@@ -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,
@@ -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)
@@ -2834,27 +2838,36 @@ IRC_PROTOCOL_CALLBACK(332)
     *   :server 332 mynick #channel :topic of channel
     */
    
-    IRC_PROTOCOL_MIN_ARGS(5);
+    IRC_PROTOCOL_MIN_ARGS(4);
    
-    pos_topic = (argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4];
+    pos_topic = NULL;
+    if (argc >= 5)
+        pos_topic = (argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4];
    
    ptr_channel = irc_channel_search (server, argv[3]);
    
    if (ptr_channel && ptr_channel->nicks)
    {
-        topic_no_color = (weechat_config_boolean (irc_config_network_colors_receive)) ?
-            NULL : irc_color_decode (pos_topic, 0);
-        irc_channel_set_topic (ptr_channel,
-                               (topic_no_color) ? topic_no_color : pos_topic);
-        if (topic_no_color)
-            free (topic_no_color);
+        if (pos_topic)
+        {
+            topic_no_color = (weechat_config_boolean (irc_config_network_colors_receive)) ?
+                NULL : irc_color_decode (pos_topic, 0);
+            irc_channel_set_topic (ptr_channel,
+                                   (topic_no_color) ? topic_no_color : pos_topic);
+            if (topic_no_color)
+                free (topic_no_color);
+        }
        ptr_buffer = ptr_channel->buffer;
    }
    else
        ptr_buffer = server->buffer;
-
-    topic_color = irc_color_decode (pos_topic,
-                                    (weechat_config_boolean (irc_config_network_colors_receive)) ? 1 : 0);
+    
+    topic_color = NULL;
+    if (pos_topic)
+    {
+        topic_color = irc_color_decode (pos_topic,
+                                        (weechat_config_boolean (irc_config_network_colors_receive)) ? 1 : 0);
+    }
    weechat_printf_tags (irc_msgbuffer_get_target_buffer (server, NULL,
                                                          command, NULL,
                                                          ptr_buffer),
@@ -2864,7 +2877,7 @@ IRC_PROTOCOL_CALLBACK(332)
                         IRC_COLOR_CHAT_CHANNEL,
                         argv[3],
                         IRC_COLOR_CHAT,
-                         (topic_color) ? topic_color : pos_topic,
+                         (topic_color) ? topic_color : ((pos_topic) ? pos_topic : ""),
                         IRC_COLOR_CHAT);
    if (topic_color)
        free (topic_color);
@@ -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')",
@@ -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                  */
@@ -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
 */
@@ -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);

@@ -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);
 }
@@ -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 ();
@@ -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;
@@ -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))
@@ -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 },
@@ -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");
@@ -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;
    
@@ -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, "" },
@@ -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);
@@ -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"
@@ -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);
@@ -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",
@@ -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,        \
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sebastien Helleu	fcec129c37	Version 0.3.5	2011-05-15 09:19:27 +02:00
Sebastien Helleu	6068f7d268	core: fix compilation of doc in standalone package	2011-05-15 09:05:11 +02:00
Sebastien Helleu	267b82199c	core: update portuguese translations	2011-05-15 08:27:27 +02:00
Sebastien Helleu	cc8e59519e	core: update spanish translations	2011-05-14 22:57:30 +02:00
Sebastien Helleu	3083d6ede3	irc: fix typo in /help links	2011-05-14 19:49:22 +02:00
Sebastien Helleu	2097da95f3	doc: update polish translations and FAQ	2011-05-14 19:21:07 +02:00
Sebastien Helleu	36a23a1068	doc: update italian user guide	2011-05-14 19:15:42 +02:00
Sebastien Helleu	eeb1d3068d	doc: fix typos	2011-05-13 16:46:44 +02:00
Sebastien Helleu	c3456a9068	core: fix argument name in /help color	2011-05-11 18:40:20 +02:00
Jiri Golembiovsky	b6b18c58f1	Updated czech translations	2011-05-10 21:51:12 +02:00
Sebastien Helleu	2df030f4f6	doc: update italian translations and user guide	2011-05-10 07:56:30 +02:00
Sebastien Helleu	8529f78177	doc: update german translations and user guide	2011-05-09 18:41:06 +02:00
Sebastien Helleu	b2551ce0ef	doc: add note about new keys in release notes	2011-05-08 19:46:01 +02:00
Sebastien Helleu	f9eb26f546	Version 0.3.5-rc3	2011-05-08 12:56:43 +02:00
Sebastien Helleu	02d10acd11	core: ensure that new split percent is between 1 and 99 for balance of windows	2011-05-08 09:48:29 +02:00
Sebastien Helleu	bce12fd38c	weercd.py: fix typo, add action in weercd.conf	2011-05-07 18:29:53 +02:00
Sebastien Helleu	d961711797	core: fix balance of windows with vertical split	2011-05-07 18:13:32 +02:00
Sebastien Helleu	8c9ba6b563	core: fix balance of windows	2011-05-07 17:30:22 +02:00
Sebastien Helleu	5fde03f7fc	core: improve output of /debug windows	2011-05-07 17:17:13 +02:00
Sebastien Helleu	705dff4a00	weercd.py: add option "action": "flood" = flood client, "user" = send custom messages to client	2011-05-06 16:34:18 +02:00
Sebastien Helleu	9754d0cbbd	irc: fix parsing of message 332 when no topic neither colon are found (bug with bip proxy)	2011-05-06 16:33:06 +02:00
Sebastien Helleu	ae57815e23	doc: add new hotlist features in release notes and way to come back to old behaviour	2011-05-06 10:49:23 +02:00
Sebastien Helleu	9748b3d041	doc: update italian plugin API reference	2011-05-05 15:05:53 +02:00
Sebastien Helleu	bc6b5a8a67	doc: add value 0 for date in functions printf_date and printf_date_tags of plugin API reference	2011-05-05 10:03:48 +02:00
Sebastien Helleu	33557e94ab	doc: update gnutls version required (min 2.2.0) in user guide	2011-05-04 14:35:48 +02:00
Sebastien Helleu	b5cbdc54d2	doc: update german translations and docs	2011-05-04 09:02:24 +02:00
Sebastien Helleu	6e0f2fab8c	doc: update italian translations and docs	2011-05-03 08:44:10 +02:00
Sebastien Helleu	c417d6e135	irc: fix nick color in private when option irc.look.nick_color_force is changed	2011-05-02 16:31:21 +02:00
Sebastien Helleu	97bc4b6eed	Version 0.3.5-rc2	2011-05-01 11:05:26 +02:00
Sebastien Helleu	baa6e59efb	core: fix compiler warning on function wattr_get (on pointers to attrs and pair)	2011-05-01 10:56:34 +02:00
Sebastien Helleu	1ad6ab1fe0	xfer: remove unused variable	2011-05-01 10:55:36 +02:00
Sebastien Helleu	c92c04e298	fifo: remove unused variable	2011-05-01 10:55:25 +02:00
Sebastien Helleu	97de735761	core: remove unused variables	2011-05-01 10:55:10 +02:00
Sebastien Helleu	b9298a80c1	doc: fix callbacks of function weechat_config_new_option in plugin API reference	2011-04-29 17:47:16 +02:00
Sebastien Helleu	c47f6e81c4	irc: fix tags for messages sent with /msg command (bug #33169 )	2011-04-29 15:41:51 +02:00
Sebastien Helleu	02e2b21d3e	doc: add return value for callbacks in plugin API reference	2011-04-29 12:25:07 +02:00
Sebastien Helleu	43a53a87aa	irc: add new options irc.color.topic_old and irc.color.topic_new	2011-04-28 14:27:31 +02:00
Sebastien Helleu	7baf4b8b22	core: update german translations	2011-04-28 12:44:30 +02:00
Sebastien Helleu	f393d0a3d2	irc: add option "ssl_priorities" in servers (task #10106 , debian #624055 )	2011-04-28 12:29:56 +02:00
Sebastien Helleu	f4f90e85fb	perl: fix memory leak when calling perl functions (bug #32895 )	2011-04-26 22:26:53 +02:00
Sebastien Helleu	2c65354226	doc: change URL for support page in FAQ	2011-04-26 22:22:12 +02:00
Sebastien Helleu	f002c8e7de	irc: add modifier "irc_in2_xxx" (called after charset decoding)	2011-04-26 18:19:27 +02:00
Sebastien Helleu	3fd2af8184	api: add new function config_set_desc_plugin (task #10925 )	2011-04-26 17:47:49 +02:00
Sebastien Helleu	51f836feb8	core: fix scroll on buffers with free content	2011-04-26 12:39:35 +02:00
Sebastien Helleu	4ea7fe2627	doc: fix typo in plugin API reference for function config_set_plugin	2011-04-25 18:36:09 +02:00
Sebastien Helleu	4130ea6e77	relay: fix crash on /upgrade when nick in irc client is not yet set	2011-04-25 11:19:47 +02:00
Sebastien Helleu	7dabe70800	core: update ChangeLog	2011-04-24 18:15:22 +02:00
Sebastien Helleu	0b8eb5396b	core: fix scroll in windows with /window scroll (skip lines "Day changed to")	2011-04-24 18:12:11 +02:00
Sebastien Helleu	d6e4b2cc87	core: add date and date_printed of each line in dump of buffers	2011-04-24 18:07:56 +02:00
Sebastien Helleu	175a4e2fa5	core: recalculate buffer_max_length when buffer short name is changed (patch #7441 )	2011-04-24 10:25:45 +02:00
Sebastien Helleu	0b0626d98b	core: add option weechat.look.hotlist_add_buffer_if_away	2011-04-24 09:07:15 +02:00
Sebastien Helleu	cd73fac2f8	irc: use tag "notify_none" for self messages	2011-04-24 08:24:28 +02:00
Sebastien Helleu	70b0f12469	core: add buffer to hotlist if away is set on buffer (even if buffer is displayed) (task #10948 ), do not update hotlist during upgrade	2011-04-23 17:23:17 +02:00
Sebastien Helleu	909fe8a2b5	core: add option "balance" for command /window (key: alt+"w" + alt+"b")	2011-04-23 13:21:10 +02:00
Sebastien Helleu	634478dd54	core: add option "swap" for command /window (key: alt+"w" + alt+"s") (task #11001 )	2011-04-22 21:56:54 +02:00