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
54 changed files with 2317 additions and 2126 deletions
@@ -33,7 +33,7 @@ ENDIF(PREFIX)

 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "3")
-SET(VERSION_PATCH "5-rc2")
+SET(VERSION_PATCH "5")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(LICENSE "GPL3")
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
@@ -1,10 +1,10 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.5-rc2, 2011-05-01
+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")
@@ -63,6 +63,10 @@ Version 0.3.5 (under dev!)
  (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)
@@ -1,10 +1,10 @@
 WeeChat News
 ============
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.5-rc2, 2011-05-01
+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-rc2, 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-rc2])
+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

@@ -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
@@ -59,12 +59,12 @@
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `default`)

 * *irc.color.topic_new*
-** Beschreibung: `color for new channel topic (when topic is changed)`
+** 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: `color for old channel topic (when topic is changed)`
+** 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`)

@@ -134,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`)

@@ -284,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`)

@@ -494,7 +494,7 @@
 ** Werte: 0 .. 2147483647 (Standardwert: `2048`)

 * *irc.server_default.ssl_priorities*
-** Beschreibung: `string with priorities for gnutls (for syntax, see documentation of function gnutls_priority_init in gnutls manual, common strings are: "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")`
+** 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"`)

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

@@ -539,22 +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: Größe aller Fenster auf 50% ändern
+      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:
@@ -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,7 +501,7 @@ Tastenbefehle für Buffer / Fenster
 | @k(A-)@k(w) , @k(A-)@k(↓) | wechselt zum unteren Fenster | /window down
 | @k(A-)@k(w) , @k(A-)@k(←) | wechselt zum linken Fenster | /window left
 | @k(A-)@k(w) , @k(A-)@k(→) | wechselt zum rechten Fenster | /window right
-| @k(A-)@k(w) , @k(A-)@k(b) | Größenanpassung aller Fenster auf 50% | /window balance
+| @k(A-)@k(w) , @k(A-)@k(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
@@ -715,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
@@ -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
@@ -539,7 +539,7 @@ Examples:
       splith: split current window horizontally
       splitv: split current window vertically
       resize: resize window size, new size is <pct> percentage of parent window
-      balance: resize all windows to 50%
+      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
@@ -5847,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:
@@ -5906,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

@@ -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,7 +503,7 @@ Keys for buffers / windows
 | @k(A-)@k(w) , @k(A-)@k(↓) | Switch to window below | /window down
 | @k(A-)@k(w) , @k(A-)@k(←) | Switch to window on the left | /window left
 | @k(A-)@k(w) , @k(A-)@k(→) | Switch to window on the right | /window right
-| @k(A-)@k(w) , @k(A-)@k(b) | Resize all windows to 50% | /window balance
+| @k(A-)@k(w) , @k(A-)@k(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
@@ -711,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:
@@ -1244,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

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

@@ -539,7 +539,7 @@ Exemples:
       splith: éclater la fenêtre en deux horizontalement
       splitv: éclater la fenêtre en deux verticalement
       resize: redimensionner une fenêtre, la nouvelle taille est <pct> pourcentage de la fenêtre parent
-      balance: redimensionner toutes les fenêtres à 50%
+      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
@@ -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.


@@ -5909,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 :
@@ -5971,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

@@ -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,7 +511,7 @@ Touches pour les tampons / fenêtres
 | @k(A-)@k(w) , @k(A-)@k(↓) | Sauter à la fenêtre en dessous | /window down
 | @k(A-)@k(w) , @k(A-)@k(←) | Sauter à la fenêtre de gauche | /window left
 | @k(A-)@k(w) , @k(A-)@k(→) | Sauter à la fenêtre de droite | /window right
-| @k(A-)@k(w) , @k(A-)@k(b) | Redimensionner toutes les fenêtres à 50% | /window balance
+| @k(A-)@k(w) , @k(A-)@k(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
@@ -724,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,
@@ -1274,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
@@ -1382,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
@@ -1667,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"`)

@@ -59,12 +59,12 @@
 ** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `default`)

 * *irc.color.topic_new*
-** descrizione: `color for new channel topic (when topic is changed)`
+** 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: `color for old channel topic (when topic is changed)`
+** 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`)

@@ -374,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`)

@@ -404,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`)

@@ -494,7 +494,7 @@
 ** valori: 0 .. 2147483647 (valore predefinito: `2048`)

 * *irc.server_default.ssl_priorities*
-** descrizione: `string with priorities for gnutls (for syntax, see documentation of function gnutls_priority_init in gnutls manual, common strings are: "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")`
+** 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"`)

@@ -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::
@@ -519,7 +519,7 @@ Esempi:
 /window  list
         -1|+1|b#|up|down|left|right
         splith|splitv [<pct>]
-         resize [+/-]<pct>
+         resize [+/-] <pct>
         balance
         merge [all]
         page_up|page_down
@@ -528,42 +528,42 @@ Esempi:
         swap [up|down|left|right]
         zoom

-         list: list opened windows (without argument, this list is displayed)
-           -1: jump to previous window
-           +1: jump to next window
-           b#: jump to next window displaying buffer number #
-           up: switch to window above current one
-         down: switch to window below current one
-         left: switch to window on the left
-        right: switch to window on the right
-       splith: split current window horizontally
-       splitv: split current window vertically
-       resize: resize window size, new size is <pct> percentage of parent window
-      balance: resize all windows to 50%
-        merge: merge window with another (all = keep only one window)
-      page_up: scroll one page up
-    page_down: scroll one page down
-      refresh: refresh screen
-       scroll: scroll number of lines (+/-N) or with time: s=seconds, m=minutes, h=hours, d=days, M=months, y=years
-    scroll_up: scroll a few lines up
-  scroll_down: scroll a few lines down
-   scroll_top: scroll to top of buffer
-scroll_bottom: scroll to bottom of buffer
-scroll_previous_highlight: scroll to previous highlight
-scroll_next_highlight: scroll to next highlight
-         swap: swap buffers of two windows (with optional direction for target window)
-         zoom: zoom on window
+         list: elenca le finestre aperte (senza argomento, questa lista viene visualizzata)
+           -1: salta alla finestra precedente
+           +1: salta alla finestra successiva
+           b#: salta alla finestra successiva che visualizza il buffer numero #
+           up: passa alla finestra superiore a quella corrente
+         down: passa alla finestra inferiore a quella attiva
+         left: passa alla finestra a sinistra
+        right: passa alla finestra a destra
+       splith: divide la finestra attiva orizzontalmente
+       splitv: divide la finestra attiva verticalmente
+       resize: ridimensiona finestra, la nuova dimensione è <pct> percentuale della finestra genitore
+      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
+      refresh: aggiorna lo schermo
+       scroll: scorre di un numero di righe (+/-N) o in base al tempo: s=secondi, m=minuti, h=ore, d=giorni, M=mesi, y=anni
+    scroll_up: scorre di alcune righe in alto
+  scroll_down: scorre di alcune righe in basso
+   scroll_top: scorre fino all'inizio del buffer
+scroll_bottom: scorre fino alla fine del buffer buffer
+scroll_previous_highlight: passa all'evento precedente
+    scroll_next_highlight: passa all'evento successivo
+         swap: scambia i buffer di due finestra (con direzione opzionale per la finestra di destinazione)
+         zoom: ingrandimento sulla finestra

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

-Examples:
-  jump to window displaying buffer #1:
+Esempi:
+  salta alla finestra che visualizza il buffer #1:
    /window b1
-  scroll 2 lines up:
+  scorre di due righe in alto:
    /window scroll -2
-  scroll 2 days up:
+  scorre all'indietro di due giorni:
    /window scroll -2d
-  scroll to beginning of current day:
-    /window scroll -d
+  scorre all'inizio del giorno attuale:
+     /window scroll -d
 ........................................

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

@@ -379,22 +379,22 @@
 ** valori: qualsiasi stringa (valore predefinito: `"-"`)

 * *weechat.look.hotlist_add_buffer_if_away*
-** descrizione: `add any buffer to hotlist (including current or visible buffers) if local variable "away" is set on buffer`
+** 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`)

@@ -434,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]]
@@ -2969,23 +2969,18 @@ Argomenti:
  "string" (viene usata una funzione predefinita per le stringhe, e solo per le
  stringhe), argomenti e valore restituito:
 ** 'struct t_hashtable *hashtable': puntatore alla tabella hash
-// TRANSLATION MISSING
-** 'const void *key': key
-// TRANSLATION MISSING
-** return value: hash of the key
+** '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), argomenti e valore restituito:
 ** 'struct t_hashtable *hashtable': puntatore alla tabella hash
-// TRANSLATION MISSING
-** 'const void *key1': first key
-// TRANSLATION MISSING
-** 'const void *key2': second key
-// TRANSLATION MISSING
-** return value:
-*** negative number if 'key1' is less than 'key2'
-*** 0 if 'key1' equals 'key2'
-*** positive number if 'key1' is greater than 'key2'
+** '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:

@@ -3873,10 +3868,8 @@ Argomenti:
 ** 'struct t_config_option *option': puntatore all'opzione
 ** 'const char *value': nuovo valore per l'opzione
 ** valore restituito:
-// TRANSLATION MISSING
-*** 1 if value is ok
-// TRANSLATION MISSING
-*** 0 if value is invalid
+*** 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
@@ -5575,13 +5568,13 @@ elif rc == weechat.WEECHAT_CONFIG_OPTION_SET_ERROR:
    # ...
 ----------------------------------------

-// TRANSLATION MISSING
 weechat_config_set_desc_plugin
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

 _Novità nella versione 0.3.5._

-Set description for option in plugins configuration file (plugins.conf).
+Imposta la descrizione per l'opzione nel file di configurazione dei plugin
+(plugins.conf).

 Prototipo:

@@ -5593,13 +5586,13 @@ void weechat_config_set_desc_plugin (const char *option_name,

 Argomenti:

-* 'option_name': option name, WeeChat will add prefix "plugins.desc.xxx."
-  (where "xxx" is current plugin name)
-* 'description': description for option
+* '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]
-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.
+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:

@@ -5859,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:
@@ -5920,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

@@ -7833,16 +7826,14 @@ Argomenti:
  qualsiasi stringa |
  stringa con i codici colori IRC, o senza colore

-// TRANSLATION MISSING
 | irc | irc_in_xxx ^(1)^ |
  nome server |
-  contenuto del messaggio ricevuto dal server IRC (before charset decoding) |
+  contenuto del messaggio ricevuto dal server IRC (prima della codifica del set caratteri) |
  nuovo contenuto del messaggio

-// TRANSLATION MISSING
 | irc | irc_in2_xxx ^(1)^ |
  nome server |
-  contenuto del messaggio ricevuto dal server IRC (after charset decoding) |
+  contenuto del messaggio ricevuto dal server IRC (dopo la codifica del set caratteri) |
  nuovo contenuto del messaggio

 | irc | irc_out_xxx ^(1)^ |
@@ -7893,8 +7884,7 @@ Argomenti:
 ** 'const char *modifier': nome del modificatore
 ** 'const char *modifier_data': dati per il modificatore
 ** 'const char *string': stringa da modificare
-// TRANSLATION MISSING
-** valore restituito: new string
+** valore restituito: nuova stringa
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat

 Valore restituito:
@@ -8019,8 +8009,7 @@ Argomenti:
 ** 'void *data': puntatore
 ** 'const char *info_name': nome della info
 ** 'const char *arguments': argomenti addizionali, dipendono dalle info
-// TRANSLATION MISSING
-** valore restituito: value of info asked
+** valore restituito: valore dell'info richiesta
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat

 Valore restituito:
@@ -8096,8 +8085,7 @@ Argomenti:
 ** 'void *data': puntatore
 ** 'const char *info_name': nome della info
 ** 'struct t_hashtable *hashtable': tabella hash, in base alla info
-// TRANSLATION MISSING
-** valore restituito: hashtable asked
+** valore restituito: tabella hash richiesta
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat

 Valore restituito:
@@ -8177,8 +8165,7 @@ Argomenti:
 ** 'void *pointer': puntatore ad un oggetto che la lista info deve restituire
   (per ricevere un solo elemento della lista info)
 ** 'const char *arguments': argomento aggiuntivo, dipende dalla lista info
-// TRANSLATION MISSING
-** valore restituito: infolist asked
+** valore restituito: lista info richiesta
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat

 Valore restituito:
@@ -9194,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:

@@ -9211,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:

@@ -10239,8 +10226,7 @@ Argomenti:
 ** 'void *data': puntatore
 ** 'struct t_gui_bar_item *item': puntatore all'elemento barra
 ** 'struct t_gui_window *window': puntatore alla finestra
-// TRANSLATION MISSING
-** valore restituito: content of bar item
+** valore restituito: contenuto dell'elemento barra
 * 'build_callback_data': puntatore fornito alla callback quando
  chiamata da WeeChat

@@ -11775,10 +11761,8 @@ Argomenti:
  di aggiornamento, argomenti e valore restituito:
 ** 'void *data': puntatore
 ** 'struct t_upgrade_file *upgrade_file': puntatore al file di aggiornamento
-// TRANSLATION MISSING
-** 'int object_id': object id
-// TRANSLATION MISSING
-** 'struct t_infolist *infolist': infolist with content of object
+** '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'
@@ -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,9 +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
-// TRANSLATION MISSING
-| @k(A-)@k(w) , @k(A-)@k(b) | Resize all windows to 50% | /window balance
-| @k(A-)@k(w) , @k(A-)@k(s) | Swap buffers of two windows | /window swap
+| @k(A-)@k(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
@@ -725,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
@@ -880,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"
@@ -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-28 14:19+0200\n"
-"PO-Revision-Date: 2011-04-28 14:22+0200\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"
@@ -1032,8 +1032,8 @@ 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"

 msgid ""
 "  alias: add an alias for a color\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"
@@ -1886,7 +1886,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
-"      balance: resize all windows to 50%\n"
+"      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"
@@ -1931,27 +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: Größe aller Fenster auf 50% ändern\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"
@@ -2839,7 +2839,7 @@ msgstr ""
 "Verzeichnis zu starten.\n"

 msgid "invalid priorities"
-msgstr ""
+msgstr "ungültige Priorität"

 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "Proxy-Typ (http (Standard), socks4, socks5)"
@@ -4277,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"
@@ -4288,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>]"
@@ -4389,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"
@@ -4409,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"
@@ -5005,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"
@@ -5026,6 +5026,8 @@ msgstr "Nicks für die eine Benachrichtigung existiert"
 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 ""
@@ -5089,6 +5091,10 @@ msgid ""
 "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 ""
@@ -5351,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 ""
@@ -5467,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 ""
@@ -5532,13 +5538,15 @@ msgstr ""
 "Textfarbe in der die Begründung einer part/quit Nachricht angezeigt werden "
 "soll"

-#, fuzzy
 msgid "color for old channel topic (when topic is changed)"
-msgstr "Zeige den alten Topic, falls der Channel-Topic geändert wurde"
+msgstr ""
+"Farbe in dem das alte Thema des Channels dargestellt werden soll, falls das "
+"Thema des Channels geändert wurde"

-#, fuzzy
 msgid "color for new channel topic (when topic is changed)"
-msgstr "Zeige den alten Topic, falls der Channel-Topic geändert wurde"
+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 = "
@@ -5917,12 +5925,12 @@ 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%s\" to \"%s%s%s\""
 msgstr ""
-"%s%s%s%s hat das Topic für den Channel %s%s%s von \"%s%s%s\" auf \"%s%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%s\""
-msgstr "%s%s%s%s hat das Topic für den Channel %s%s%s auf \"%s%s%s\" gesetzt."
+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%s\")"
@@ -5931,7 +5939,7 @@ msgstr ""

 #, 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"
@@ -5992,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"
@@ -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-28 14:19+0200\n"
-"PO-Revision-Date: 2011-04-28 14:20+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"
@@ -1841,7 +1841,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
-"      balance: resize all windows to 50%\n"
+"      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"
@@ -1885,7 +1885,7 @@ msgstr ""
 "       splitv: éclater la fenêtre en deux verticalement\n"
 "       resize: redimensionner une fenêtre, la nouvelle taille est <pct> "
 "pourcentage de la fenêtre parent\n"
-"      balance: redimensionner toutes les fenêtres à 50%\n"
+"      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"
@@ -4195,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 ""
@@ -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-28 14:19+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"
@@ -1543,7 +1543,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
-"      balance: resize all windows to 50%\n"
+"      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"
@@ -3719,7 +3719,7 @@ msgstr ""
 "ismer"

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

 msgid ""
@@ -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-28 14:19+0200\n"
-"PO-Revision-Date: 2011-04-28 14:24+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"
@@ -1808,7 +1807,6 @@ msgstr ""
 msgid "manage windows"
 msgstr "gestione finestre"

-#, fuzzy
 msgid ""
 "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]"
 "<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|"
@@ -1816,11 +1814,10 @@ msgid ""
 "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"

-#, fuzzy
 msgid ""
 "         list: list opened windows (without argument, this list is "
 "displayed)\n"
@@ -1835,7 +1832,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
-"      balance: resize all windows to 50%\n"
+"      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"
@@ -1880,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"
@@ -1893,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 "
@@ -2060,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 "
@@ -2112,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 "
@@ -2135,20 +2139,25 @@ 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"

-#, fuzzy
 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)"
@@ -2194,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 "
@@ -2479,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)"
@@ -2502,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"
@@ -2744,7 +2755,7 @@ msgstr ""
 "con un'altra home usando l'opzione da riga di comando  \"--dir\".\n"

 msgid "invalid priorities"
-msgstr ""
+msgstr "priorità non valide"

 msgid "proxy type (http (default), socks4, socks5)"
 msgstr "tipo di proxy (http (predefinito), socks4, socks5)"
@@ -2892,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"
@@ -3016,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\""
@@ -3248,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"
@@ -3700,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"
@@ -4148,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 ""
@@ -4888,6 +4901,7 @@ msgstr "nick nella lista notifiche"
 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 ""
@@ -4947,6 +4961,10 @@ msgid ""
 "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 ""
@@ -4977,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)"
@@ -5009,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 ""
@@ -5324,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 ""
@@ -5361,13 +5383,11 @@ msgstr ""
 msgid "color for reason in part/quit messages"
 msgstr "colore per il motivo nei messaggi di uscita/abbandono"

-#, fuzzy
 msgid "color for old channel topic (when topic is changed)"
-msgstr "visualizza l'argomento del canale precedente quando viene cambiato"
+msgstr "colore del precedente argomento del canale (quando viene cambiato)"

-#, fuzzy
 msgid "color for new channel topic (when topic is changed)"
-msgstr "visualizza l'argomento del canale precedente quando viene cambiato"
+msgstr "colore del nuovo argomento del canale (quando viene cambiato)"

 msgid ""
 "growing factor for autoreconnect delay to server (1 = always same delay, 2 = "
@@ -6569,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"
@@ -6686,9 +6706,8 @@ msgstr "%sErrore: plugin \"%s\" non trovato"
 msgid "Plugins unloaded"
 msgstr "Plugin disattivati"

-#, fuzzy
 msgid "description of plugin option"
-msgstr "puntatore allo script (opzionale)"
+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-28 14:19+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 ""
@@ -1774,7 +1844,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
-"      balance: resize all windows to 50%\n"
+"      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"
@@ -3795,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 ""
@@ -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-28 14:19+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"
@@ -1552,7 +1552,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
-"      balance: resize all windows to 50%\n"
+"      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"
@@ -3736,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 ""
@@ -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-28 14:19+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"
@@ -1351,7 +1351,7 @@ msgid ""
 "       splitv: split current window vertically\n"
 "       resize: resize window size, new size is <pct> percentage of parent "
 "window\n"
-"      balance: resize all windows to 50%\n"
+"      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"
@@ -3260,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 ""
@@ -4786,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"
@@ -5061,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"
@@ -5287,7 +5287,7 @@ command_init ()
                     "       splitv: split current window vertically\n"
                     "       resize: resize window size, new size is <pct> "
                     "percentage of parent window\n"
-                     "      balance: resize all windows to 50%\n"
+                     "      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"
@@ -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);
        }
        
@@ -1955,6 +1955,33 @@ 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
@@ -1964,14 +1991,27 @@ gui_window_switch_right (struct t_gui_window *window)
 int
 gui_window_balance (struct t_gui_window_tree *tree)
 {
-    int balanced;
+    int balanced, count_left, count_right, new_split_pct;
    
    balanced = 0;
    if (tree && tree->child1 && tree->child2)
    {
-        if (tree->split_pct != 50)
+        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 = 50;
+            tree->split_pct = new_split_pct;
            balanced = 1;
        }
        balanced |= gui_window_balance (tree->child1);
@@ -4881,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 "
@@ -192,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;
+            }
        }
    }
    
@@ -2838,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),
@@ -2868,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);
@@ -4,6 +4,7 @@
 host=
 port=7777
 debug=off
+action=flood
 wait=0
 sleep=0
 maxchans=5
@@ -53,22 +53,23 @@
 import sys, socket, select, time, random, string, re

 NAME    = 'weercd'
-VERSION = '0.3'
+VERSION = '0.4'

 options = {
-    'host'       : ['',     'Host for socket bind'],
-    'port'       : ['7777', 'Port for socket bind'],
-    'debug'      : ['off',  'Debug (on/off)'],
-    'wait'       : ['0',    'Time to wait before flooding client (float, in seconds)'],
-    'sleep'      : ['0',    'Sleep for select, delay between 2 messages sent to client (float, in seconds)'],
-    'maxchans'   : ['5',    'Max channels to join'],
-    'maxnicks'   : ['100',  'Max nicks per channel'],
-    'usernotices': ['on',   'Send notices to user (on/off)'],
-    'channotices': ['on',   'Send notices to channels (on/off)'],
+    'host'       : ['',      'Host for socket bind'],
+    'port'       : ['7777',  'Port for socket bind'],
+    'debug'      : ['off',   'Debug (on/off)'],
+    'action'     : ['flood', 'Action of server: "flood" = flood client, "user" = send custom messages to client'],
+    'wait'       : ['0',     'Time to wait before flooding client (float, in seconds)'],
+    'sleep'      : ['0',     'Sleep for select, delay between 2 messages sent to client (float, in seconds)'],
+    'maxchans'   : ['5',     'Max channels to join'],
+    'maxnicks'   : ['100',   'Max nicks per channel'],
+    'usernotices': ['on',    'Send notices to user (on/off)'],
+    'channotices': ['on',    'Send notices to channels (on/off)'],
 }

 def usage():
-    ''' Display usage. '''
+    """Display usage."""
    global options
    print('\nUsage: %s [option=value [option=value ...]] | [-h | --help]\n' % sys.argv[0])
    print('  option=value  option with value (see table below)')
@@ -81,7 +82,7 @@ def usage():
    sys.exit(0)

 def setoption(string):
-    ''' Set option with string using format "option=value". '''
+    """Set option with string using format "option=value"."""
    global options
    items = string.strip().split('=', 1)
    if len(items) == 2:
@@ -94,14 +95,14 @@ def setoption(string):
                print('WARNING: unknown option "%s"' % key)

 def getoption(option):
-    ''' Get value of an option. '''
+    """Get value of an option."""
    global options
    if option in options:
        return options[option][0]
    return None

 def getdictoptions():
-    ''' Get dict with options and values. '''
+    """Get dict with options and values."""
    global options
    d = {}
    for key in options:
@@ -109,7 +110,7 @@ def getdictoptions():
    return d

 def readconfig(filename):
-    ''' Read configuration file. '''
+    """Read configuration file."""
    try:
        lines = open(filename, 'rb').readlines()
        for line in lines:
@@ -118,7 +119,7 @@ def readconfig(filename):
        pass

 def strrand(minlength=1, maxlength=50, spaces=False):
-    ''' Return string with random lenght and content. '''
+    """Return string with random lenght and content."""
    length = random.randint(minlength, maxlength)
    strspace = ''
    if spaces:
@@ -142,10 +143,14 @@ class Client:
        self.starttime = time.time()
        self.connect()
        if not self.quit:
-            self.flood()
+            action = getoption('action')
+            if action == 'flood':
+                self.action_flood()
+            elif action == 'user':
+                self.action_user()

    def send(self, data):
-        ''' Send one message to client. '''
+        """Send one message to client."""
        if getoption('debug') == 'on':
            print('<-- %s' % data)
        msg = '%s\r\n' % data
@@ -154,7 +159,7 @@ class Client:
        self.outcount += 1

    def recv(self, data):
-        ''' Read one message from client. '''
+        """Read one message from client."""
        if getoption('debug') == 'on':
            print('--> %s' % data)
        if data.startswith('PING '):
@@ -175,7 +180,7 @@ class Client:
        self.incount += 1

    def read(self, timeout):
-        ''' Read data from client. '''
+        """Read data from client."""
        inr, outr, exceptr = select.select([self.sock], [], [], timeout)
        if inr:
            data = self.sock.recv(4096)
@@ -192,7 +197,7 @@ class Client:
                self.lastbuf = data

    def connect(self):
-        ''' Tell client that connection is ok. '''
+        """Tell client that connection is ok."""
        try:
            while self.nick == '':
                self.read(0.1)
@@ -213,8 +218,8 @@ class Client:
            rnick = self.channels[channel][random.randint(0, len(self.channels[channel])-1)]
        return rnick

-    def flood(self):
-        ''' Yay, funny stuff here! Flood client! '''
+    def action_flood(self):
+        """Yay, funny stuff here! Flood client!"""
        wait = int(getoption('wait'))
        if wait > 0:
            print('Wait %d seconds' % wait)
@@ -306,6 +311,22 @@ class Client:
            self.endmsg = 'quit received'
            return

+    def action_user(self):
+        """Send custom messages to client"""
+        try:
+            while 1:
+                sys.stdout.write('Message to send to client: ')
+                sys.stdout.flush()
+                message = sys.stdin.readline()
+                self.send(message)
+        except Exception as e:
+            self.endmsg = 'connection lost'
+            self.endexcept = e
+            return
+        except KeyboardInterrupt:
+            self.endmsg = 'interrupted'
+            return
+
    def stats(self):
        msgexcept = ''
        if self.endexcept:
@@ -23,7 +23,7 @@
 #

 %define name weechat
-%define version 0.3.4
+%define version 0.3.5
 %define release 1

 Name:      %{name}
@@ -73,6 +73,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}/weechat-plugin.h

 %changelog
+* Sun May 15 2011 Sebastien Helleu <flashcode@flashtux.org> 0.3.5-1
+- Released version 0.3.5
 * Sun Jan 16 2011 Sebastien Helleu <flashcode@flashtux.org> 0.3.4-1
 - Released version 0.3.4
 * Sat Aug 07 2010 Sebastien Helleu <flashcode@flashtux.org> 0.3.3-1
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