Version 0.4.2-rc2

core: update german translations
aspell: fix detection of word start/end when there are apostrophes or minus chars before/after word (thanks to Nils Görs)
2026-06-25 04:16:38 +02:00 · 2013-09-20 23:22:40 +02:00 · 2013-09-20 23:10:04 +02:00 · 2013-09-20 19:31:34 +02:00 · 2013-09-20 16:47:34 +02:00 · 2013-09-20 15:34:24 +02:00
56 changed files with 696 additions and 545 deletions
@@ -33,7 +33,7 @@ ENDIF(PREFIX)

 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "4")
-SET(VERSION_PATCH "2-rc1")
+SET(VERSION_PATCH "2-rc2")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(LICENSE "GPL3")
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
@@ -1,7 +1,7 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.4.2-rc1, 2013-09-02
+v0.4.2-rc2, 2013-09-20


 This document lists all changes for each version.
@@ -14,12 +14,13 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 Version 0.4.2 (under dev!)
 --------------------------

+* core: fix memory leak on unhook of a print hook (if using tags)
 * core: fix computation of columns in output of /help (take care about size of
  time/buffer/prefix)
 * core: display day change message dynamically (do not store it as a line in
-  buffer), rename option weechat.look.day_change_time_format to
-  weechat.look.day_change_message, new options weechat.look.day_change_message2
-  and weechat.color.chat_day_change (task #12775)
+  buffer), split option weechat.look.day_change_time_format into two options
+  weechat.look.day_change_message_{1date|2dates}, new option
+  weechat.color.chat_day_change (task #12775)
 * core: add syntax "@buffer:item" in bar items to force the buffer used when
  displaying the bar item (task #12717)
 * core: add search of regular expression in buffer, don't reset search type on
@@ -86,6 +87,8 @@ Version 0.4.2 (under dev!)
 * api: use pointer for infolist "hook" to return only one hook
 * api: add new function strlen_screen
 * plugins: remove the demo plugin
+* aspell: fix detection of word start/end when there are apostrophes or minus
+  chars before/after word
 * aspell: rename option aspell.look.color to aspell.color.misspelled, add option
  aspell.color.suggestions
 * aspell: add support of enchant library (patch #6858)
@@ -1,7 +1,7 @@
 WeeChat Release Notes
 =====================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.4.2-rc1, 2013-09-02
+v0.4.2-rc2, 2013-09-20


 This document lists important changes for each version, that require manual
@@ -21,12 +21,11 @@ Version 0.4.2 (under dev!)
 The day change message is now dynamically displayed, and therefore is not stored
 as a line in buffer any more.

-Option 'weechat.look.day_change_time_format' has been renamed to
-'weechat.look.day_change_message' (color codes are allowed in this option, see
-`/help eval`).
+Option 'weechat.look.day_change_time_format' has been split into two options
+'weechat.look.day_change_message_{1date|2dates}' (color codes are allowed in
+these options, see `/help eval`).

-New options 'weechat.look.day_change_message2' and
-'weechat.color.chat_day_change' have been added.
+New color option 'weechat.color.chat_day_change' has been added.

 After `/upgrade` from an old version, you will see two messages for each day
 change. This is a normal behavior and will not happen again with the next day
@@ -24,7 +24,7 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.4.2-rc1, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.4.2-rc2, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE
@@ -299,7 +299,7 @@
 ** Werte: on, off (Standardwert: `on`)

 * [[option_irc.look.smart_filter_delay]] *irc.look.smart_filter_delay*
-** Beschreibung: `Verzögerung, in Minuten, in denen join/part/quit Nachrichten gefiltert werden`
+** Beschreibung: `delay for filtering join/part/quit messages (in minutes): if the nick did not speak during the last N minutes, the join/part/quit is filtered`
 ** Typ: integer
 ** Werte: 1 .. 10080 (Standardwert: `5`)

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

 * [[option_irc.server_default.autojoin]] *irc.server_default.autojoin*
-** Beschreibung: `durch Kommata getrennte Liste der Channels, die beim Verbinden zum Server betreten werden sollen (Beispiel: "#chan1,#chan2,#chan3 key1,key2") (Hinweis: Inhalt ist evaluiert, siehe /help eval)`
+** Beschreibung: `durch Kommata getrennte Liste der Channels, die beim Verbinden zum Server betreten werden sollen (Beispiel: "#chan1,#chan2,#chan3 key1,key2") (Hinweis: Inhalt wird evaluiert, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

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

 * [[option_irc.server_default.command]] *irc.server_default.command*
-** Beschreibung: `enthält Befehle die nach der Verbindung zum Server ausgeführt werden sollen. Mehrere Befehle müssen durch ein ";" getrennt werden. Möchte man ein Semikolon nutzen muss man "\;" verwenden. Die speziellen Variablen $nick, $channel und $server werden dabei durch den jeweiligen Wert ersetzt (Hinweis: Inhalt ist evaluiert, siehe /help eval)`
+** Beschreibung: `enthält Befehle die nach der Verbindung zum Server ausgeführt werden sollen. Mehrere Befehle müssen durch ein ";" getrennt werden. Möchte man ein Semikolon nutzen muss man "\;" verwenden. Die speziellen Variablen $nick, $channel und $server werden dabei durch den jeweiligen Wert ersetzt (Hinweis: Inhalt wird evaluiert, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

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

 * [[option_irc.server_default.password]] *irc.server_default.password*
-** Beschreibung: `Passwort für den Server`
+** Beschreibung: `Passwort für Server (Hinweis: Inhalt wird evaluiert, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

@@ -519,7 +519,7 @@
 ** Werte: plain, dh-blowfish, dh-aes, external (Standardwert: `plain`)

 * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
-** Beschreibung: `Passwort für SASL Authentifikation (Hinweis: Inhalt ist evaluiert, siehe /help eval)`
+** Beschreibung: `Passwort für SASL Authentifikation (Hinweis: Inhalt wird evaluiert, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

@@ -529,7 +529,7 @@
 ** Werte: 1 .. 3600 (Standardwert: `15`)

 * [[option_irc.server_default.sasl_username]] *irc.server_default.sasl_username*
-** Beschreibung: `Username für SASL Authentifikation (Hinweis: Inhalt ist evaluiert, siehe /help eval)`
+** Beschreibung: `Username für SASL Authentifikation (Hinweis: Inhalt wird evaluiert, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

@@ -104,7 +104,7 @@
 ** Werte: 1 .. 1024 (Standardwert: `5`)

 * [[option_relay.network.password]] *relay.network.password*
-** Beschreibung: `Passwort wird von Clients benötigt um Zugriff auf dieses Relay zu erhalten (kein Eintrag bedeutet dass kein Passwort benötigt wird)`
+** Beschreibung: `Passwort wird von Clients benötigt um Zugriff auf dieses Relay zu erhalten (kein Eintrag bedeutet, dass kein Passwort benötigt wird) (Hinweis: Inhalt wird evaluiert, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

@@ -624,20 +624,22 @@ Wird keine Datei angegeben dann werden alle Konfigurationen (WeeChat und Erweite

 passphrase: ändern der Passphrase (ohne Passphrase, werden die Daten in der Datei sec.conf in Klartext gesichert)
   -delete: löscht Passphrase
-   decrypt: entschlüsselt Daten nachträglich (dies passiert nur die Passphrase beim Start nicht angegeben wurde)
+   decrypt: entschlüsselt Daten nachträglich (dies passiert nur falls die Passphrase beim Start nicht angegeben wurde)
  -discard: verwirft alle verschlüsselten Daten
-       set: ändert eine schutzwürdige Information oder fügt eine hinzu
+       set: fügt eine schutzwürdige Information hinzu oder ändert eine bestehende
       del: entfernt eine schutzwürdige Information

-Ohne Angabe von Argumenten wird ein neuer Buffer geöffnet und die geschützten Daten können dort eingesehen werden.
+Ohne Angabe von Argumenten wird ein neuer Buffer geöffnet und die schutzwürdigen Informationen können dort eingesehen werden.

-Wird eine Passphrase verwendet (Daten liegen verschlüsselt vor), fragt WeeChat beim Start nach der Passphrase.
+Wird eine Passphrase verwendet (Daten liegen verschlüsselt vor), fragt WeeChat beim Start die Passphrase ab.
 Es ist möglich eine Umgebungsvariable "WEECHAT_PASSPHRASE" zu setzen um die Eingabeaufforderung beim Programmstart zu vermeiden (diese Variable wird auch von WeeChat beim /upgrade verwendet).

 schutzwürdige Daten mit dem Format ${sec.data.xxx} können wie folgt genutzt werden:
  - Argument in der Befehlszeile für "--run-command"
-  - IRC Server Optionen: autojoin, command, password, sasl_{username|password}
  - Option weechat.startup.command_{before|after}_plugins
+  - Proxy-Optionen: username, password
+  - IRC Server Optionen: autojoin, command, password, sasl_{username|password}
+  - Option relay.network.password
  - Befehl /eval.

 Beispiele:
@@ -414,7 +414,7 @@
 ** Werte: none, highlight, message, all (Standardwert: `all`)

 * [[option_weechat.look.buffer_time_format]] *weechat.look.buffer_time_format*
-** Beschreibung: `Format für die Uhrzeit, die in jeder Zeile eines Buffers dargestellt wird (siehe man strftime, welche Platzhalter für das Datum und die Uhrzeit verwendet werden) (Hinweis: Inhalt ist evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval). Beispiel: Uhrzeit in Graustufen (Unterstützung von 256 Farben notwendig): "${color:252}%H${color:245}%M${color:240}%S"`
+** Beschreibung: `Format für die Uhrzeit, die in jeder Zeile eines Buffers dargestellt wird (siehe man strftime, welche Platzhalter für das Datum und die Uhrzeit verwendet werden) (Hinweis: Inhalt wird evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval). Beispiel: Uhrzeit in Graustufen (Unterstützung von 256 Farben notwendig): "${color:252}%H${color:245}%M${color:240}%S"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%H:%M:%S"`)

@@ -483,13 +483,13 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)

-* [[option_weechat.look.day_change_message]] *weechat.look.day_change_message*
-** Beschreibung: `message displayed when the day has changed, with one date displayed (for example at beginning of buffer) (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
+* [[option_weechat.look.day_change_message_1date]] *weechat.look.day_change_message_1date*
+** Beschreibung: `Nachricht welche bei einem Datumswechsel angezeigt wird (zum Beispiel als erste Zeile im Buffer) (siehe man strftime, welche Platzhalter für das Datum und die Uhrzeit verwendet werden) (Hinweis: Inhalt wird evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"-- %a, %d %b %Y --"`)

-* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2*
-** Beschreibung: `message displayed when the day has changed, with two dates displayed (between two messages); the second date specifiers must start with two "%" because strftime is called two times on this string (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
+* [[option_weechat.look.day_change_message_2dates]] *weechat.look.day_change_message_2dates*
+** Beschreibung: `Nachricht welche bei einem Datumswechsel angezeigt wird, dabei werden zwei Daten angegeben die zwischen zwei Nachrichten liegen; der zweite Platzhalter muss mit zwei "%" angegeben werden, da strftime auch zweimal aufgerufen wird (siehe man strftime, welche Platzhalter für das Datum und die Uhrzeit verwendet werden) (Hinweis: Inhalt wird evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`)

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

 * [[option_weechat.look.hotlist_prefix]] *weechat.look.hotlist_prefix*
-** Beschreibung: `Text der am Ende der Hotlist angezeigt werden soll`
+** Beschreibung: `Text der vor der Hotlist angezeigt werden soll`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"H: "`)

@@ -669,7 +669,7 @@
 ** Werte: -1 .. 2147483647 (Standardwert: `1`)

 * [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
-** Beschreibung: `Präfix, dass bei einer Action-Nachricht genutzt wird (Hinweis: Inhalt ist evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
+** Beschreibung: `Präfix, dass bei einer Action-Nachricht genutzt wird (Hinweis: Inhalt wird evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `" *"`)

@@ -719,22 +719,22 @@
 ** Werte: on, off (Standardwert: `on`)

 * [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
-** Beschreibung: `Präfix, dass bei einer Fehlernachricht genutzt wird (Hinweis: Inhalt ist evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
+** Beschreibung: `Präfix, dass bei einer Fehlernachricht genutzt wird (Hinweis: Inhalt wird evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"=!="`)

 * [[option_weechat.look.prefix_join]] *weechat.look.prefix_join*
-** Beschreibung: `Präfix, dass bei einer Join-Nachricht genutzt wird (Hinweis: Inhalt ist evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
+** Beschreibung: `Präfix, dass bei einer Join-Nachricht genutzt wird (Hinweis: Inhalt wird evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"-->"`)

 * [[option_weechat.look.prefix_network]] *weechat.look.prefix_network*
-** Beschreibung: `Präfix, dass bei einer Netzwerknachricht genutzt wird (Hinweis: Inhalt ist evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
+** Beschreibung: `Präfix, dass bei einer Netzwerknachricht genutzt wird (Hinweis: Inhalt wird evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"--"`)

 * [[option_weechat.look.prefix_quit]] *weechat.look.prefix_quit*
-** Beschreibung: `Präfix, dass bei einer Quit-Nachricht genutzt wird (Hinweis: Inhalt ist evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
+** Beschreibung: `Präfix, dass bei einer Quit-Nachricht genutzt wird (Hinweis: Inhalt wird evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"<--"`)

@@ -869,12 +869,12 @@
 ** Werte: on, off (Standardwert: `on`)

 * [[option_weechat.startup.command_after_plugins]] *weechat.startup.command_after_plugins*
-** Beschreibung: `Nach dem Start von WeeChat wird dieser Befehl aufgerufen. Dies geschieht nachdem die Erweiterungen geladen worden sind (mehrere Befehle sind durch ";" zu trennen) (Hinweis: Inhalt ist evaluiert, siehe /help eval)`
+** Beschreibung: `Nach dem Start von WeeChat wird dieser Befehl aufgerufen. Dies geschieht nachdem die Erweiterungen geladen worden sind (mehrere Befehle sind durch ";" zu trennen) (Hinweis: Inhalt wird evaluiert, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

 * [[option_weechat.startup.command_before_plugins]] *weechat.startup.command_before_plugins*
-** Beschreibung: `Nach dem Start von WeeChat wird dieser Befehl aufgerufen. Dies geschieht bevor die Erweiterungen geladen werden (mehrere Befehle sind durch ";" zu trennen) (Hinweis: Inhalt ist evaluiert, siehe /help eval)`
+** Beschreibung: `Nach dem Start von WeeChat wird dieser Befehl aufgerufen. Dies geschieht bevor die Erweiterungen geladen werden (mehrere Befehle sind durch ";" zu trennen) (Hinweis: Inhalt wird evaluiert, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

@@ -527,17 +527,16 @@ Connect durchführen:
 /connect freenode
 ----------------------------------------

-// TRANSLATION MISSING
 [[irc_oauth]]
-How to connect to a server that requires "oauth"?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Wie stellt man eine Verbindung zu einem Server her, der "oauth" verlangt?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-Some servers like 'twitch' require oauth to connect.
+Einige Server, wie z.B. 'twitch', verlangen oauth für eine Verbindung.

-The oauth is simply a password with the value "oauth:XXXX".
+Bei oauth handelt es sich lediglich um ein Passwort mit dem Format "oauth:XXXX".

-You can create such server and connect with following commands (replace name
-and address by appropriate values):
+Mit folgenden Befehlen kann man einen Server erstellen und sich mit diesem
+verbinden (Name und Adresse muss durch entsprechende Werte ersetzt werden):

 ----------------------------------------
 /server add name irc.server.org -password="oauth:XXXX"
@@ -729,15 +729,14 @@ Items

 Die Option 'items' ist ein String, mit einer Anzahl von Bar-Items. Diese werden
 durch Komma voneinander getrennt (auf dem Bildschirm wird das Komma durch ein
-Leerzeichen ersetzt) oder man nutzt ein "+" (Item werden ohne Leerzeichen
-angezeigt).
+Leerzeichen ersetzt). Möchte man die Items ohne Leerzeichen darstellen, nutzt
+man ein "+", zwischen den Items.

 Eine Liste von Bar-Items kann man sich mit dem Befehl `/bar listitems` anzeigen lassen.

-// TRANSLATION MISSING
-Before or after item name, you can use chars (that are not alphanumeric, "-" or
-"_"). They will be displayed before/after item with the delimiters color
-defined in bar (option 'color_delim').
+Vor oder nach dem Item können Zeichen eingefügt werden. Diese dürfen nicht alphanumerisch,
+"-" oder "_" sein. Die Zeichen werden mit der entsprechenden Farbe, für Trennzeichen,
+dargestellt (Option 'color_delim').

 Beispiel einer Bar mit den Items, "[time],buffer_number+:+buffer_plugin+.+buffer_name":

@@ -747,18 +746,16 @@ Beispiel einer Bar mit den Items, "[time],buffer_number+:+buffer_plugin+.+buffer
 └─────────────────────────────────────────────────────────────────────────────────────────┘
 ........................................

-// TRANSLATION MISSING
-A special syntax can be used to force the buffer used when displaying the bar
-item: "@buffer:item" (where "buffer" is the full name of buffer and "item" is
-the name of a bar item).
+Eine Besonderheit stellt die Möglichkeit dar, ein Item eines bestimmten Buffers
+anzuzeigen. Syntax: "@buffer:item" ("buffer" ist der vollständige Name des Buffers
+und "item" der Name der Bar-Item)

-// TRANSLATION MISSING
-This is useful in root bars, to display item for a specific buffer which is
-not displayed in the current window (or even not displayed at all).
+Dies ist für root-Bars sinnvoll, um gezielt ein Item eines bestimmten Buffers
+anzuzeigen, welcher nicht im aktuellen Fenster oder überhaupt nicht sichtbar
+ist.

-// TRANSLATION MISSING
-Example: nicklist of bitlbee in a root bar (if the bar is called
-'bitlist' and if bitlbee server is called 'bitlbee'):
+Beispiel: Nickliste von bitlbee permanent in einer root-Bar darstellen (die Bar
+heißt hierbei 'bitlist' und der Name des bitlbee Servers 'bitlbee'):

 ----------------------------------------
 /set weechat.bar.bitlist.items "@irc.bitlbee.&bitlbee:buffer_nicklist"
@@ -768,7 +765,7 @@ Example: nicklist of bitlbee in a root bar (if the bar is called
 Darstellung innerhalb einer Bar
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

-Es gibt vier Möglichkeiten Text innerhalb einer Bar darzustellen:
+Es gibt folgende vier Möglichkeiten um Text innerhalb einer Bar darzustellen:

 * `horizontal`: die Items werden horizontal, von links nach rechts, dargestellt.
   Sollten neue Zeilen dargestellt werden, dann werden diese durch ein Leerzeichen
@@ -853,7 +850,7 @@ kann nur für Bars vom Typ 'window' genutzt werden).

 Folgende Zeichenketten sind möglich:

-* 'active': das Fenster muss das aktive Fenster sein
+* 'active'  : das Fenster muss das aktive Fenster sein
 * 'inactive': das Fenster muss das inaktive Fenster sein
 * 'nicklist': der Buffer der in einem Fenster dargestellt wird, muss eine
              Nickliste anzeigen.
@@ -862,7 +859,7 @@ Folgende Zeichenketten sind möglich:

 Für den Ausdruck sind folgende Variablen verfügbar:

-* `${active}`: wahr, wenn Fenster aktiv ist
+* `${active}`  : wahr, wenn Fenster aktiv ist
 * `${inactive}`: wahr, wenn Fenster inaktiv ist
 * `${nicklist}`: wahr, wenn der Buffer im Fenster eine Nicklist anzeigt.

@@ -902,7 +899,6 @@ der entsprechende Buffer in der Hotlist angezeigt werden soll.

 Der Wert für die Benachrichtigungsstufe kann mittels folgender Option festgelegt
 werden:
-The default notify level can be set using option
 <<option_weechat.look.buffer_notify_default,weechat.look.buffer_notify_default>>,
 Der Standardwert ist 'all'.

@@ -915,14 +911,14 @@ Der Standardwert ist 'all'.
 | all                    | 'highlight' + 'private Nachrichten' + 'normal Nachrichten' + 'Nachrichten mit einer niedrigen Priorität'
 |========================================

-Benachrichtigungsstufen können für mehrere Buffer definiert werden, zum Beispiel
+Benachrichtigungsstufen können für mehrere Buffer definiert werden. Zum Beispiel
 für alle Buffer des IRC Servers "freenode":

 ----------------------------------------
 /set weechat.notify.irc.freenode message
 ----------------------------------------

-Setzt die Benachrichtigungsstufe, ausschließlich für den Channel "#weechat",
+Setzt die Benachrichtigungsstufe ausschließlich für den Channel "#weechat",
 auf die Stufe 'highlight':

 ----------------------------------------
@@ -1252,7 +1248,7 @@ Bespiele von Ereignissen:
 * `ctrl-alt-wheeldown`

 [TIP]
-Wird eine Funktion im "mouse"-Kontext hinzufügt ist es möglich mehrere Mausereignisse
+Wird eine Funktion im "mouse"-Kontext hinzufügt ist es möglich, mehrere Mausereignisse
 mittels `*` abzufangen. Zum Beispiel fängt `button1-gesture-*` alle Mausgesten ab, die
 mit der linken Maustaste eingeleitet werden.

@@ -1621,6 +1617,7 @@ Standarderweiterungen:
 | logger      | erstellt Protokolldateien von Buffern
 | relay       | Daten via Netzwerk übermitteln
 | rmodifier   | wandelt Schlüsselwörter mit regulären Ausdrücken
+| script      | Skripten-Manager
 | python      | Python-Skript API
 | perl        | Perl-Skript API
 | ruby        | Ruby-Skript API
@@ -299,7 +299,7 @@
 ** values: on, off (default value: `on`)

 * [[option_irc.look.smart_filter_delay]] *irc.look.smart_filter_delay*
-** description: `delay for filtering join/part/quit messages (in minutes)`
+** description: `delay for filtering join/part/quit messages (in minutes): if the nick did not speak during the last N minutes, the join/part/quit is filtered`
 ** type: integer
 ** values: 1 .. 10080 (default value: `5`)

@@ -499,7 +499,7 @@
 ** values: any string (default value: `""`)

 * [[option_irc.server_default.password]] *irc.server_default.password*
-** description: `password for server`
+** description: `password for server (note: content is evaluated, see /help eval)`
 ** type: string
 ** values: any string (default value: `""`)

@@ -104,7 +104,7 @@
 ** values: 1 .. 1024 (default value: `5`)

 * [[option_relay.network.password]] *relay.network.password*
-** description: `password required by clients to access this relay (empty value means no password required)`
+** description: `password required by clients to access this relay (empty value means no password required) (note: content is evaluated, see /help eval)`
 ** type: string
 ** values: any string (default value: `""`)

@@ -636,8 +636,10 @@ It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the p

 Secured data with format ${sec.data.xxx} can be used in:
  - command line argument "--run-command"
-  - irc server options: autojoin, command, password, sasl_{username|password}
  - options weechat.startup.command_{before|after}_plugins
+  - proxy options: username, password
+  - irc server options: autojoin, command, password, sasl_{username|password}
+  - option relay.network.password
  - command /eval.

 Examples:
@@ -483,12 +483,12 @@
 ** type: boolean
 ** values: on, off (default value: `on`)

-* [[option_weechat.look.day_change_message]] *weechat.look.day_change_message*
+* [[option_weechat.look.day_change_message_1date]] *weechat.look.day_change_message_1date*
 ** description: `message displayed when the day has changed, with one date displayed (for example at beginning of buffer) (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** type: string
 ** values: any string (default value: `"-- %a, %d %b %Y --"`)

-* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2*
+* [[option_weechat.look.day_change_message_2dates]] *weechat.look.day_change_message_2dates*
 ** description: `message displayed when the day has changed, with two dates displayed (between two messages); the second date specifiers must start with two "%" because strftime is called two times on this string (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** type: string
 ** values: any string (default value: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`)
@@ -1593,6 +1593,7 @@ Default plugins are:
 | logger    | Log buffers to files
 | relay     | Relay data via network
 | rmodifier | Alter modifier strings with regular expressions
+| script    | Scripts manager
 | python    | Python scripting API
 | perl      | Perl scripting API
 | ruby      | Ruby scripting API
@@ -299,7 +299,7 @@
 ** valeurs: on, off (valeur par défaut: `on`)

 * [[option_irc.look.smart_filter_delay]] *irc.look.smart_filter_delay*
-** description: `délai pour filtrer les messages join/part/quit (en minutes)`
+** description: `délai pour filtrer les messages join/part/quit (en minutes): si le pseudo n'a pas parlé durant les N dernières minutes, le join/part/quit est filtré`
 ** type: entier
 ** valeurs: 1 .. 10080 (valeur par défaut: `5`)

@@ -499,7 +499,7 @@
 ** valeurs: toute chaîne (valeur par défaut: `""`)

 * [[option_irc.server_default.password]] *irc.server_default.password*
-** description: `mot de passe pour le serveur`
+** description: `mot de passe pour le serveur (note: le contenu est évalué, voir /help eval)`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `""`)

@@ -104,7 +104,7 @@
 ** valeurs: 1 .. 1024 (valeur par défaut: `5`)

 * [[option_relay.network.password]] *relay.network.password*
-** description: `mot de passe requis par les clients pour accéder à ce relai (une valeur vide indique que le mot de passe n'est pas nécessaire)`
+** description: `mot de passe requis par les clients pour accéder à ce relai (une valeur vide indique que le mot de passe n'est pas nécessaire) (note: le contenu est évalué, voir /help eval)`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `""`)

@@ -236,7 +236,7 @@ Des variables sont remplacées dans l'expression, en utilisant le format ${varia
  1. une couleur (format: color:xxx)
  2. une option (format: fichier.section.option)
  3. une variable locale du tampon
-  4. un un hdata/variable (la valeur est automatiquement convertie en chaîne), par défaut "window" et "buffer" pointent vers la fenêtre et le tampon courants.
+  4. un hdata/variable (la valeur est automatiquement convertie en chaîne), par défaut "window" et "buffer" pointent vers la fenêtre et le tampon courants.
 Le format du hdata peut être le suivant :
  hdata.var1.var2...: démarrer avec un hdata (le pointeur doit être connu), et demander les variables l'une après l'autre (d'autres hdata peuvent être suivis)
  hdata[list].var1.var2...: démarrer avec un hdata en utilisant une liste, par exemple :
@@ -423,7 +423,7 @@ listdefault: afficher les touches par défaut
   resetall: restaurer les touches aux valeurs par défaut et supprimer TOUTES les touches personnelles (utiliser avec précaution !)
    missing: ajouter les touches manquantes (en utilisant les touches par défaut), pratique après installation d'une nouvelle version de WeeChat

-Lors de l'association d'une commande à une touche, il est recommandé d'utiliser la touche alt+k (ou Echap puis k), et puis de presser la touche à associer: cela insère le code de la touche dans la ligne de commande.
+Lors de l'association d'une commande à une touche, il est recommandé d'utiliser la touche alt+k (ou Échap puis k), et puis de presser la touche à associer: cela insère le code de la touche dans la ligne de commande.

 Pour le contexte "mouse" (possible aussi pour le contexte "cursor"), la touche a le format: "@zone:touche" ou "@zone1>zone2:touche" où la zone peut être :
          *: n'importe quelle zone à l'écran
@@ -636,8 +636,10 @@ Il est possible de définir la variable d'environnement WEECHAT_PASSPHRASE pour

 Les données sécurisées avec le format ${sec.data.xxx} peuvent être utilisées dans :
  - le paramètre de ligne de commande "--run-command"
-  - les options de serveur irc: autojoin, command, password, sasl_{username|password}
  - les options weechat.startup.command_{before|after}_plugins
+  - les options de proxy: username, password
+  - les options de serveur irc: autojoin, command, password, sasl_{username|password}
+  - l'option relay.network.password
  - la commande /eval.

 Exemples :
@@ -483,12 +483,12 @@
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: `on`)

-* [[option_weechat.look.day_change_message]] *weechat.look.day_change_message*
+* [[option_weechat.look.day_change_message_1date]] *weechat.look.day_change_message_1date*
 ** description: `message affiché lorsque le jour a changé, avec une date affichée (par exemple au début d'un tampon) (voir man strftime pour le format de date/heure) (note: le contenu est évalué, donc vous pouvez utiliser des couleurs avec le format "${color:xxx}", voir /help eval)`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `"-- %a, %d %b %Y --"`)

-* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2*
+* [[option_weechat.look.day_change_message_2dates]] *weechat.look.day_change_message_2dates*
 ** description: `message affiché lorsque le jour a changé, avec deux dates affichées (entre deux messages); les formats pour la seconde date doivent démarrer par deux "%" car strftime est appelé deux fois sur cette chaîne (voir man strftime pour le format de date/heure) (note: le contenu est évalué, donc vous pouvez utiliser des couleurs avec le format "${color:xxx}", voir /help eval)`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`)
@@ -509,7 +509,7 @@
 ** valeurs: toute chaîne (valeur par défaut: `""`)

 * [[option_weechat.look.highlight_regex]] *weechat.look.highlight_regex*
-** description: `expression régulière utilisée pour vérifier si un message a un "highlight" ou non, au moins une correspondance dans la chaîne doit être entourée de caractères de mot (alpha-numérique, "-", "_" ou "|"), l'expression régulière est insensible à la casse (utilisez "(?-i)" au début pour la rendre sensible à la casse), exemples: "flashcode|flashy", "(?-i)FlashCode|flashy"`
+** description: `expression régulière utilisée pour vérifier si un message a un "highlight" ou non, au moins une correspondance dans la chaîne doit être entourée de caractères de mot (alphanumérique, "-", "_" ou "|"), l'expression régulière est insensible à la casse (utilisez "(?-i)" au début pour la rendre sensible à la casse), exemples: "flashcode|flashy", "(?-i)FlashCode|flashy"`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `""`)

@@ -1229,7 +1229,7 @@ _Nouveau dans la version 0.3.4._
 Vérifie si une chaîne a un ou plusieurs "highlights", en utilisant une
 expression régulière.
 Pour au moins une correspondance dans la chaîne, elle doit être entourée de
-caractères de mot (caractère alpha-numérique, "-", "_" ou "|").
+caractères de mot (caractère alphanumérique, "-", "_" ou "|").

 Prototype :

@@ -1401,7 +1401,7 @@ Cette fonction n'est pas disponible dans l'API script.
 weechat_string_split_command
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

-Eclate une liste de commandes séparées par 'separator' (qui peut être échappé
+Éclate une liste de commandes séparées par 'separator' (qui peut être échappé
 par "\" dans la chaîne).

 Prototype :
@@ -1725,7 +1725,7 @@ weechat_string_eval_expression

 _Nouveau dans la version 0.4.0, mis à jour dans la 0.4.2._

-Evalue l'expression et retourne le résultat sous forme de chaîne.
+Évalue l'expression et retourne le résultat sous forme de chaîne.
 Les variables spéciales avec le format `${variable}` sont étendues (voir la
 commande `/eval` dans le 'Guide utilisateur WeeChat').

@@ -5439,7 +5439,7 @@ value = weechat.config_color_default(option)
 weechat_config_write_option
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^

-Ecrit une ligne dans le fichier de configuration avec l'option et sa valeur
+Écrit une ligne dans le fichier de configuration avec l'option et sa valeur
 (cette fonction doit être appelée uniquement dans un "callback" "write" ou
 "write_default" pour une section).

@@ -5489,7 +5489,7 @@ def my_section_write_cb(data, config_file, section_name):
 weechat_config_write_line
 ^^^^^^^^^^^^^^^^^^^^^^^^^

-Ecrit une ligne dans un fichier de configuration (cette fonction doit être
+Écrit une ligne dans un fichier de configuration (cette fonction doit être
 appelée uniquement dans un "callback" "write" ou "write_default" pour une
 section).

@@ -5543,7 +5543,7 @@ def my_section_write_cb(data, config_file, section_name):
 weechat_config_write
 ^^^^^^^^^^^^^^^^^^^^

-Ecrit un fichier de configuration sur le disque.
+Écrit un fichier de configuration sur le disque.

 Prototype :

@@ -6663,7 +6663,7 @@ La fonction s'appelle "print_y" dans les scripts ("prnt_y" en Python).
 weechat_log_printf
 ^^^^^^^^^^^^^^^^^^

-Ecrit un message dans le fichier de log WeeChat (weechat.log).
+Écrit un message dans le fichier de log WeeChat (weechat.log).

 Prototype :

@@ -12346,7 +12346,7 @@ Fonctions pour le réseau.
 weechat_network_pass_proxy
 ^^^^^^^^^^^^^^^^^^^^^^^^^^

-Etablit une connexion/authentification avec un proxy.
+Établit une connexion/authentification avec un proxy.

 [IMPORTANT]
 Cette fonction est bloquante sur l'appel à connect(), donc elle doit être
@@ -12393,7 +12393,7 @@ Cette fonction n'est pas disponible dans l'API script.
 weechat_network_connect_to
 ^^^^^^^^^^^^^^^^^^^^^^^^^^

-Etablit une connexion à une machine distante.
+Établit une connexion à une machine distante.

 [IMPORTANT]
 Cette fonction est bloquante sur l'appel à connect(), donc elle doit être
@@ -14801,7 +14801,7 @@ upgrade_file = weechat.upgrade_new("mon_fichier", 1)
 weechat_upgrade_write_object
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

-Ecrit un objet dans le fichier de mise à jour.
+Écrit un objet dans le fichier de mise à jour.

 Prototype :

@@ -38,8 +38,8 @@ Ses principales fonctionnalités sont les suivantes :
 La page d'accueil de WeeChat est ici : http://weechat.org/

 [[pre-requisites]]
-Pré-requis
-~~~~~~~~~~
+Prérequis
+~~~~~~~~~

 Pour installer WeeChat, vous devez avoir :

@@ -137,7 +137,7 @@ $ make
 ----------------------------------------
 $ mkdir build
 $ cd build
-$ cmake .. -DPREFIX=/chemin/vers/repertoire
+$ cmake .. -DPREFIX=/chemin/vers/répertoire
 $ make
 $ make install
 ----------------------------------------
@@ -281,7 +281,7 @@ $ make

 ----------------------------------------
 $ ./autogen.sh
-$ ./configure --prefix=/chemin/vers/repertoire
+$ ./configure --prefix=/chemin/vers/répertoire
 $ make
 $ make install
 ----------------------------------------
@@ -1052,8 +1052,8 @@ Touches pour les tampons / fenêtres
 | @k(A-)@k(w) , @k(A-)@k(↓) | Sauter à la fenêtre en dessous | /window down
 | @k(A-)@k(w) , @k(A-)@k(←) | Sauter à la fenêtre de gauche | /window left
 | @k(A-)@k(w) , @k(A-)@k(→) | Sauter à la fenêtre de droite | /window right
-| @k(A-)@k(w) , @k(A-)@k(b) | Equilibrer la taille de toutes les fenêtres | /window balance
-| @k(A-)@k(w) , @k(A-)@k(s) | Echanger les tampons de deux fenêtres | /window swap
+| @k(A-)@k(w) , @k(A-)@k(b) | Équilibrer la taille de toutes les fenêtres | /window balance
+| @k(A-)@k(w) , @k(A-)@k(s) | Échanger les tampons de deux fenêtres | /window swap
 | @k(A-)@k(z)               | Zoomer sur la fenêtre courante (@k(A-)@k(z) de nouveau : restaurer l'état initial des fenêtres, avant le zoom) | /window zoom
 | @k(A-)@k(<)               | Sauter au tampon précédent dans la liste des tampons visités | /input jump_previously_visited_buffer
 | @k(A-)@k(>)               | Sauter au tampon suivant dans la liste des tampons visités | /input jump_next_visited_buffer
@@ -1250,7 +1250,7 @@ extensions/scripts) :

 [width="50%",cols="3m,4",options="header"]
 |========================================
-| Evènement  | Description
+| Évènement  | Description
 | event-down | Le bouton a été pressé mais pas encore relâché
 | event-drag | La souris a bougé avec le bouton pressé
 |========================================
@@ -1574,7 +1574,7 @@ Sections :
 | network    | /set weechat.network.*                    | Options réseau/SSL
 | bar        | <<command_weechat_bar,/bar>>              +
               /set weechat.bar.*                        | Options des barres
-| layout     | <<command_weechat_layout,/layout>>        | Layouts
+| layout     | <<command_weechat_layout,/layout>>        | Dispositions
 | notify     | <<command_weechat_buffer,/buffer notify>> | Niveaux de notification des tampons (les options peuvent être ajoutées/supprimées dans la section)
 | filter     | <<command_weechat_filter,/filter>>        | Filtres
 | key        | <<command_weechat_key,/key>>              | Touches pour le contexte "default"
@@ -1636,6 +1636,7 @@ Les extensions par défaut sont :
 | logger    | Enregistrement des tampons dans des fichiers
 | relay     | Relai de données via le réseau
 | rmodifier | Modification des chaînes de "modifier" avec des expressions régulières
+| script    | Gestionnaire de scripts
 | python    | Interface (API) pour scripts Python
 | perl      | Interface (API) pour scripts Perl
 | ruby      | Interface (API) pour scripts Ruby
@@ -2017,7 +2018,7 @@ irc.server.xxx.ssl_verify::

 [NOTE]
 L'option "ssl_verify" est activée par défaut, donc la vérification est stricte
-et peut échouer, même si cela pouvait être ok dans les versions inférieures à
+et peut échouer, même si cela pouvait être OK dans les versions inférieures à
 0.3.1.

 [[irc_connect_oftc_with_certificate]]
@@ -2246,7 +2247,7 @@ automatiquement remplacées par WeeChat lors de la réponse au CTCP :

 [NOTE]
 ^(1)^ La version git est la sortie de la commande `git describe`. Elle est
-connue seulement si WeeChat a été compilé dans le repository git et si git était
+connue seulement si WeeChat a été compilé dans le dépôt git et si git était
 installé.

 Si les options CTCP ne sont pas définies (par défaut), les réponses CTCP sont :
@@ -2768,7 +2769,7 @@ Exemple du rmodifier par défaut pour la commande `/oper` :
 * expression régulière : `^(/oper +\S+ +)(.*)`
 * groupes : `1,2*`

-A chaque fois que les modifiers "history_add" ou "input_text_display" sont
+À 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 correspond, alors
 elle est remplacée par les groupes capturés, tels que définis dans la chaîne
 des groupes.
@@ -2791,8 +2792,8 @@ langages.

 Une autre extension appelée "script" est un gestionnaire de scripts et est
 utilisé pour charger/décharger des scripts pour n'importe quel langage, et
-installer/supprimer des scripts du repository WeeChat, qui sont visibles à cette
-URL: http://weechat.org/scripts
+installer/supprimer des scripts du dépôt WeeChat, qui sont visibles à cette URL:
+http://weechat.org/scripts

 Pour plus d'informations sur comment écrire des scripts, ou sur l'API
 WeeChat pour les scripts, merci de lire le 'Le Guide pour Scripts WeeChat'.
@@ -299,7 +299,7 @@
 ** valori: on, off (valore predefinito: `on`)

 * [[option_irc.look.smart_filter_delay]] *irc.look.smart_filter_delay*
-** descrizione: `ritardo per il filtraggio dei messaggi di entrata/uscita/abbandono (in minuti)`
+** descrizione: `delay for filtering join/part/quit messages (in minutes): if the nick did not speak during the last N minutes, the join/part/quit is filtered`
 ** tipo: intero
 ** valori: 1 .. 10080 (valore predefinito: `5`)

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

 * [[option_irc.server_default.password]] *irc.server_default.password*
-** descrizione: `password per il server`
+** descrizione: `password for server (note: content is evaluated, see /help eval)`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `""`)

@@ -104,7 +104,7 @@
 ** valori: 1 .. 1024 (valore predefinito: `5`)

 * [[option_relay.network.password]] *relay.network.password*
-** descrizione: `password richiesta dai client per accedere a questo relay (un valore nullo corrisponde a nessuna password richiesta)`
+** descrizione: `password required by clients to access this relay (empty value means no password required) (note: content is evaluated, see /help eval)`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `""`)

@@ -636,8 +636,10 @@ It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the p

 Secured data with format ${sec.data.xxx} can be used in:
  - command line argument "--run-command"
-  - irc server options: autojoin, command, password, sasl_{username|password}
  - options weechat.startup.command_{before|after}_plugins
+  - proxy options: username, password
+  - irc server options: autojoin, command, password, sasl_{username|password}
+  - option relay.network.password
  - command /eval.

 Examples:
@@ -483,12 +483,12 @@
 ** tipo: bool
 ** valori: on, off (valore predefinito: `on`)

-* [[option_weechat.look.day_change_message]] *weechat.look.day_change_message*
+* [[option_weechat.look.day_change_message_1date]] *weechat.look.day_change_message_1date*
 ** descrizione: `message displayed when the day has changed, with one date displayed (for example at beginning of buffer) (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"-- %a, %d %b %Y --"`)

-* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2*
+* [[option_weechat.look.day_change_message_2dates]] *weechat.look.day_change_message_2dates*
 ** descrizione: `message displayed when the day has changed, with two dates displayed (between two messages); the second date specifiers must start with two "%" because strftime is called two times on this string (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`)
@@ -1645,6 +1645,7 @@ I plugin predefiniti sono:
 | logger    | Registra i buffer su file
 | relay     | Relay dei dati via rete
 | rmodifier | Cambia le stringhe del modificatore con espressioni regolari
+| script    | Gestore script
 | python    | API per lo scripting in Python
 | perl      | API per lo scripting in Perl
 | ruby      | API per lo scripting in Ruby
@@ -299,7 +299,7 @@
 ** 値: on, off (デフォルト値: `on`)

 * [[option_irc.look.smart_filter_delay]] *irc.look.smart_filter_delay*
-** 説明: `参加/退出/終了 メッセージのフィルタリングを遅らせる (秒単位)`
+** 説明: `delay for filtering join/part/quit messages (in minutes): if the nick did not speak during the last N minutes, the join/part/quit is filtered`
 ** タイプ: 整数
 ** 値: 1 .. 10080 (デフォルト値: `5`)

@@ -499,7 +499,7 @@
 ** 値: 未制約文字列 (デフォルト値: `""`)

 * [[option_irc.server_default.password]] *irc.server_default.password*
-** 説明: `サーバのパスワード`
+** 説明: `password for server (note: content is evaluated, see /help eval)`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `""`)

@@ -104,7 +104,7 @@
 ** 値: 1 .. 1024 (デフォルト値: `5`)

 * [[option_relay.network.password]] *relay.network.password*
-** 説明: `このリレーを利用するためにクライアントが必要なパスワード (空の場合パスワードなし)`
+** 説明: `password required by clients to access this relay (empty value means no password required) (note: content is evaluated, see /help eval)`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `""`)

@@ -622,34 +622,36 @@ file: 保存する設定ファイル (拡張子 ".conf" は不要)
         set <name> <value>
         del <name>

-passphrase: パスフレーズを変更 (パスフレーズがない場合、sec.conf ファイルに平文でデータを保存します)
-   -delete: パスフレーズを削除
-   decrypt: 暗号化されているデータを復号化 (起動時にパスフレーズが設定されていない場合に起きます)
-  -discard: 全ての暗号化データを破棄
-       set: 保護データを追加または変更
-       del: 保護データを削除
+passphrase: change the passphrase (without passphrase, data is stored as plain text in file sec.conf)
+   -delete: delete passphrase
+   decrypt: decrypt data still encrypted (it happens only if passphrase was not given on startup)
+  -discard: discard all data still encrypted
+       set: add or change secured data
+       del: delete secured data

-引数がない場合、新しいバッファに保護データを表示します。
+Without argument, this command displays secured data in a new buffer.

-パスフレーズを利用する場合 (データが暗号化されている場合)、WeeChat は起動時にパスフレーズを尋ねます。
-環境変数 "WEECHAT_PASSPHRASE" を利用すれば入力を回避できます (WeeChat は /upgrade の時に同じ変数を利用します)。
+When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
+It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade).

-${sec.data.xxx} の形でフォーマットされた保護データは以下の様に利用できます:
-  - コマンドライン引数 "--run-command"
-  - irc サーバオプション: autojoin、command、password、sasl_{username|password}
-  - weechat.startup.command_{before|after}_plugins オプション
-  - /eval コマンド。
+Secured data with format ${sec.data.xxx} can be used in:
+  - command line argument "--run-command"
+  - options weechat.startup.command_{before|after}_plugins
+  - proxy options: username, password
+  - irc server options: autojoin, command, password, sasl_{username|password}
+  - option relay.network.password
+  - command /eval.

-例:
-  パスフレーズを設定:
+Examples:
+  set a passphrase:
    /secure passphrase this is my passphrase
-  freenode の SASL パスワードを暗号化:
+  encrypt freenode SASL password:
    /secure set freenode mypassword
    /set irc.server.freenode.sasl_password "${sec.data.freenode}"
-  oftc の nickserv 用パスワードを暗号化:
+  encrypt oftc password for nickserv:
    /secure set oftc mypassword
    /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
-  ニックネーム "mynick" を取り戻すためのエイリアス ghost を設定
+  alias to ghost the nick "mynick":
    /alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode}
 ........................................

@@ -483,12 +483,12 @@
 ** タイプ: ブール
 ** 値: on, off (デフォルト値: `on`)

-* [[option_weechat.look.day_change_message]] *weechat.look.day_change_message*
+* [[option_weechat.look.day_change_message_1date]] *weechat.look.day_change_message_1date*
 ** 説明: `message displayed when the day has changed, with one date displayed (for example at beginning of buffer) (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `"-- %a, %d %b %Y --"`)

-* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2*
+* [[option_weechat.look.day_change_message_2dates]] *weechat.look.day_change_message_2dates*
 ** 説明: `message displayed when the day has changed, with two dates displayed (between two messages); the second date specifiers must start with two "%" because strftime is called two times on this string (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`)
@@ -1545,6 +1545,7 @@ GNU/Linux の場合、プラグインファイルは ".so" という拡張子を
 | logger    | バッファの内容をファイルに保存
 | relay     | ネットワーク経由でデータを中継
 | rmodifier | 正規表現を用いた文字列の置換
+| script    | スクリプトマネージャ
 | python    | Python スクリプト API
 | perl      | Perl スクリプト API
 | ruby      | Ruby スクリプト API
@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.2-rc1\n"
+"Project-Id-Version: WeeChat 0.4.2-rc2\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-01 15:56+0200\n"
-"PO-Revision-Date: 2013-09-02 21:20+0200\n"
+"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"PO-Revision-Date: 2013-09-20 23:10+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: cs\n"
@@ -1994,9 +1994,11 @@ msgid ""
 "\n"
 "Secured data with format ${sec.data.xxx} can be used in:\n"
 "  - command line argument \"--run-command\"\n"
+"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - proxy options: username, password\n"
 "  - irc server options: autojoin, command, password, sasl_{username|"
 "password}\n"
-"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - option relay.network.password\n"
 "  - command /eval.\n"
 "\n"
 "Examples:\n"
@@ -3520,11 +3522,11 @@ msgstr "adresa proxy serveru (IP nebo jméno hosta)"
 msgid "port for connecting to proxy server"
 msgstr "port pro připojení na proxy server"

-msgid "username for proxy server"
-msgstr "uživatelské jméno pro proxy server"
+msgid "username for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""

-msgid "password for proxy server"
-msgstr "heslo pro proxy server"
+msgid "password for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""

 msgid "Please enter your passphrase to decrypt the data secured by WeeChat:"
 msgstr ""
@@ -6018,8 +6020,9 @@ msgstr "velikost klíče použitého při použití výměny klíčů Diffie Hel
 msgid "check that the SSL connection is fully trusted"
 msgstr "ověřit, že je ssl spojení zcela důvěryhodné"

-msgid "password for server"
-msgstr "heslo pro server"
+#, fuzzy
+msgid "password for server (note: content is evaluated, see /help eval)"
+msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů"

 #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
 msgid ""
@@ -6447,8 +6450,10 @@ msgstr ""
 "filtrovat join/part/quit/nick zprávy pro přezdívky pokud po nějaký čas "
 "nemluví na kanále (musíte vytvořit filter na tag \"irc_smart_filter\")"

-msgid "delay for filtering join/part/quit messages (in minutes)"
-msgstr "zpoždění pro filtrování zpráv join/part/quit (v minutách)"
+msgid ""
+"delay for filtering join/part/quit messages (in minutes): if the nick did "
+"not speak during the last N minutes, the join/part/quit is filtered"
+msgstr ""

 #. TRANSLATORS: please do not translate "join"
 msgid "enable smart filter for \"join\" messages"
@@ -8350,9 +8355,10 @@ msgstr ""
 msgid "maximum number of clients connecting to a port"
 msgstr "maximální počet klientů připojených k portu"

+#, fuzzy
 msgid ""
 "password required by clients to access this relay (empty value means no "
-"password required)"
+"password required) (note: content is evaluated, see /help eval)"
 msgstr ""
 "heslo vyžadované klienty pro přístup k tomuto přesměrováni (prázdná hodnota "
 "značí, že heslo není vyžadováno)"
@@ -20,10 +20,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.2-rc1\n"
+"Project-Id-Version: WeeChat 0.4.2-rc2\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-01 18:16+0200\n"
-"PO-Revision-Date: 2013-09-02 21:20+0200\n"
+"POT-Creation-Date: 2013-09-20 23:07+0200\n"
+"PO-Revision-Date: 2013-09-20 23:10+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
 "Language: de_DE\n"
@@ -2229,9 +2229,11 @@ msgid ""
 "\n"
 "Secured data with format ${sec.data.xxx} can be used in:\n"
 "  - command line argument \"--run-command\"\n"
+"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - proxy options: username, password\n"
 "  - irc server options: autojoin, command, password, sasl_{username|"
 "password}\n"
-"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - option relay.network.password\n"
 "  - command /eval.\n"
 "\n"
 "Examples:\n"
@@ -2251,17 +2253,18 @@ msgstr ""
 "passphrase: ändern der Passphrase (ohne Passphrase, werden die Daten in der "
 "Datei sec.conf in Klartext gesichert)\n"
 "   -delete: löscht Passphrase\n"
-"   decrypt: entschlüsselt Daten nachträglich (dies passiert nur die "
+"   decrypt: entschlüsselt Daten nachträglich (dies passiert nur falls die "
 "Passphrase beim Start nicht angegeben wurde)\n"
 "  -discard: verwirft alle verschlüsselten Daten\n"
-"       set: ändert eine schutzwürdige Information oder fügt eine hinzu\n"
+"       set: fügt eine schutzwürdige Information hinzu oder ändert eine "
+"bestehende\n"
 "       del: entfernt eine schutzwürdige Information\n"
 "\n"
 "Ohne Angabe von Argumenten wird ein neuer Buffer geöffnet und die "
-"geschützten Daten können dort eingesehen werden.\n"
+"schutzwürdigen Informationen können dort eingesehen werden.\n"
 "\n"
 "Wird eine Passphrase verwendet (Daten liegen verschlüsselt vor), fragt "
-"WeeChat beim Start nach der Passphrase.\n"
+"WeeChat beim Start die Passphrase ab.\n"
 "Es ist möglich eine Umgebungsvariable \"WEECHAT_PASSPHRASE\" zu setzen um "
 "die Eingabeaufforderung beim Programmstart zu vermeiden (diese Variable wird "
 "auch von WeeChat beim /upgrade verwendet).\n"
@@ -2269,9 +2272,11 @@ msgstr ""
 "schutzwürdige Daten mit dem Format ${sec.data.xxx} können wie folgt genutzt "
 "werden:\n"
 "  - Argument in der Befehlszeile für \"--run-command\"\n"
+"  - Option weechat.startup.command_{before|after}_plugins\n"
+"  - Proxy-Optionen: username, password\n"
 "  - IRC Server Optionen: autojoin, command, password, sasl_{username|"
 "password}\n"
-"  - Option weechat.startup.command_{before|after}_plugins\n"
+"  - Option relay.network.password\n"
 "  - Befehl /eval.\n"
 "\n"
 "Beispiele:\n"
@@ -2803,7 +2808,7 @@ msgid ""
 msgstr ""
 "Nach dem Start von WeeChat wird dieser Befehl aufgerufen. Dies geschieht "
 "nachdem die Erweiterungen geladen worden sind (mehrere Befehle sind durch \";"
-"\" zu trennen) (Hinweis: Inhalt ist evaluiert, siehe /help eval)"
+"\" zu trennen) (Hinweis: Inhalt wird evaluiert, siehe /help eval)"

 msgid ""
 "command executed when WeeChat starts, before loading plugins (note: content "
@@ -2811,7 +2816,7 @@ msgid ""
 msgstr ""
 "Nach dem Start von WeeChat wird dieser Befehl aufgerufen. Dies geschieht "
 "bevor die Erweiterungen geladen werden (mehrere Befehle sind durch \";\" zu "
-"trennen) (Hinweis: Inhalt ist evaluiert, siehe /help eval)"
+"trennen) (Hinweis: Inhalt wird evaluiert, siehe /help eval)"

 msgid "display WeeChat logo at startup"
 msgstr "WeeChat-Logo beim Start anzeigen"
@@ -2896,7 +2901,7 @@ msgid ""
 msgstr ""
 "Format für die Uhrzeit, die in jeder Zeile eines Buffers dargestellt wird "
 "(siehe man strftime, welche Platzhalter für das Datum und die Uhrzeit "
-"verwendet werden) (Hinweis: Inhalt ist evaluiert, somit kann mittels des "
+"verwendet werden) (Hinweis: Inhalt wird evaluiert, somit kann mittels des "
 "Formats \"${color:xxx} Farben gesetzt werden, siehe /help eval). Beispiel: "
 "Uhrzeit in Graustufen (Unterstützung von 256 Farben notwendig): "
 "\"${color:252}%H${color:245}%M${color:240}%S\""
@@ -3004,20 +3009,19 @@ msgid "display special message when day changes"
 msgstr "bei einem Datumswechsel wird eine entsprechende Nachricht angezeigt"

 #. TRANSLATORS: string "${color:xxx}" must NOT be translated
-#, fuzzy
 msgid ""
 "message displayed when the day has changed, with one date displayed (for "
 "example at beginning of buffer) (see man strftime for date/time specifiers) "
 "(note: content is evaluated, so you can use colors with format \"${color:"
 "xxx}\", see /help eval)"
 msgstr ""
-"Nachricht welche bei einem Datumswechsel angezeigt wird (siehe man strftime, "
-"welche Platzhalter für das Datum und die Uhrzeit verwendet werden) (Hinweis: "
-"Inhalt ist evaluiert, somit kann mittels des Formats \"${color:xxx} Farben "
-"gesetzt werden, siehe /help eval)"
+"Nachricht welche bei einem Datumswechsel angezeigt wird (zum Beispiel als "
+"erste Zeile im Buffer) (siehe man strftime, welche Platzhalter für das Datum "
+"und die Uhrzeit verwendet werden) (Hinweis: Inhalt wird evaluiert, somit "
+"kann mittels des Formats \"${color:xxx} Farben gesetzt werden, siehe /help "
+"eval)"

 #. TRANSLATORS: string "${color:xxx}" must NOT be translated
-#, fuzzy
 msgid ""
 "message displayed when the day has changed, with two dates displayed "
 "(between two messages); the second date specifiers must start with two \"%\" "
@@ -3025,10 +3029,12 @@ msgid ""
 "date/time specifiers) (note: content is evaluated, so you can use colors "
 "with format \"${color:xxx}\", see /help eval)"
 msgstr ""
-"Nachricht welche bei einem Datumswechsel angezeigt wird (siehe man strftime, "
-"welche Platzhalter für das Datum und die Uhrzeit verwendet werden) (Hinweis: "
-"Inhalt ist evaluiert, somit kann mittels des Formats \"${color:xxx} Farben "
-"gesetzt werden, siehe /help eval)"
+"Nachricht welche bei einem Datumswechsel angezeigt wird, dabei werden zwei "
+"Daten angegeben die zwischen zwei Nachrichten liegen; der zweite Platzhalter "
+"muss mit zwei \"%\" angegeben werden, da strftime auch zweimal aufgerufen "
+"wird (siehe man strftime, welche Platzhalter für das Datum und die Uhrzeit "
+"verwendet werden) (Hinweis: Inhalt wird evaluiert, somit kann mittels des "
+"Formats \"${color:xxx} Farben gesetzt werden, siehe /help eval)"

 msgid ""
 "if set, the eat_newline_glitch will be set to 0; this is used to not add new "
@@ -3140,7 +3146,7 @@ msgstr ""
 "der Hotlist dargestellt"

 msgid "text displayed at the beginning of the hotlist"
-msgstr "Text der am Ende der Hotlist angezeigt werden soll"
+msgstr "Text der vor der Hotlist angezeigt werden soll"

 msgid ""
 "if set, uses short names to display buffer names in hotlist (start after "
@@ -3281,7 +3287,7 @@ msgid ""
 "prefix for error messages (note: content is evaluated, so you can use colors "
 "with format \"${color:xxx}\", see /help eval)"
 msgstr ""
-"Präfix, dass bei einer Fehlernachricht genutzt wird (Hinweis: Inhalt ist "
+"Präfix, dass bei einer Fehlernachricht genutzt wird (Hinweis: Inhalt wird "
 "evaluiert, somit kann mittels des Formats \"${color:xxx} Farben gesetzt "
 "werden, siehe /help eval)"

@@ -3290,7 +3296,7 @@ msgid ""
 "prefix for network messages (note: content is evaluated, so you can use "
 "colors with format \"${color:xxx}\", see /help eval)"
 msgstr ""
-"Präfix, dass bei einer Netzwerknachricht genutzt wird (Hinweis: Inhalt ist "
+"Präfix, dass bei einer Netzwerknachricht genutzt wird (Hinweis: Inhalt wird "
 "evaluiert, somit kann mittels des Formats \"${color:xxx} Farben gesetzt "
 "werden, siehe /help eval)"

@@ -3299,7 +3305,7 @@ msgid ""
 "prefix for action messages (note: content is evaluated, so you can use "
 "colors with format \"${color:xxx}\", see /help eval)"
 msgstr ""
-"Präfix, dass bei einer Action-Nachricht genutzt wird (Hinweis: Inhalt ist "
+"Präfix, dass bei einer Action-Nachricht genutzt wird (Hinweis: Inhalt wird "
 "evaluiert, somit kann mittels des Formats \"${color:xxx} Farben gesetzt "
 "werden, siehe /help eval)"

@@ -3308,7 +3314,7 @@ msgid ""
 "prefix for join messages (note: content is evaluated, so you can use colors "
 "with format \"${color:xxx}\", see /help eval)"
 msgstr ""
-"Präfix, dass bei einer Join-Nachricht genutzt wird (Hinweis: Inhalt ist "
+"Präfix, dass bei einer Join-Nachricht genutzt wird (Hinweis: Inhalt wird "
 "evaluiert, somit kann mittels des Formats \"${color:xxx} Farben gesetzt "
 "werden, siehe /help eval)"

@@ -3317,7 +3323,7 @@ msgid ""
 "prefix for quit messages (note: content is evaluated, so you can use colors "
 "with format \"${color:xxx}\", see /help eval)"
 msgstr ""
-"Präfix, dass bei einer Quit-Nachricht genutzt wird (Hinweis: Inhalt ist "
+"Präfix, dass bei einer Quit-Nachricht genutzt wird (Hinweis: Inhalt wird "
 "evaluiert, somit kann mittels des Formats \"${color:xxx} Farben gesetzt "
 "werden, siehe /help eval)"

@@ -4019,11 +4025,13 @@ msgstr "Adresse des Proxy-Servers (IP oder Hostname)"
 msgid "port for connecting to proxy server"
 msgstr "Port, auf dem der Proxy-Server läuft"

-msgid "username for proxy server"
-msgstr "Benutzername für die Proxy-Verbindung"
+msgid "username for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""
+"Username für Proxy Server (Hinweis: Inhalt wird evaluiert, siehe /help eval)"

-msgid "password for proxy server"
-msgstr "Passwort für die Proxy-Verbindung"
+msgid "password for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""
+"Passwort für Proxy Server (Hinweis: Inhalt wird evaluiert, siehe /help eval)"

 msgid "Please enter your passphrase to decrypt the data secured by WeeChat:"
 msgstr ""
@@ -6687,8 +6695,8 @@ msgstr ""
 msgid "check that the SSL connection is fully trusted"
 msgstr "Überprüft ob die SSL-Verbindung vertrauenswürdig ist"

-msgid "password for server"
-msgstr "Passwort für den Server"
+msgid "password for server (note: content is evaluated, see /help eval)"
+msgstr "Passwort für Server (Hinweis: Inhalt wird evaluiert, siehe /help eval)"

 #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
 msgid ""
@@ -6715,13 +6723,13 @@ msgstr ""
 msgid ""
 "username for SASL authentication (note: content is evaluated, see /help eval)"
 msgstr ""
-"Username für SASL Authentifikation (Hinweis: Inhalt ist evaluiert, siehe /"
+"Username für SASL Authentifikation (Hinweis: Inhalt wird evaluiert, siehe /"
 "help eval)"

 msgid ""
 "password for SASL authentication (note: content is evaluated, see /help eval)"
 msgstr ""
-"Passwort für SASL Authentifikation (Hinweis: Inhalt ist evaluiert, siehe /"
+"Passwort für SASL Authentifikation (Hinweis: Inhalt wird evaluiert, siehe /"
 "help eval)"

 msgid "timeout (in seconds) before giving up SASL authentication"
@@ -6769,7 +6777,7 @@ msgstr ""
 "Mehrere Befehle müssen durch ein \";\" getrennt werden. Möchte man ein "
 "Semikolon nutzen muss man \"\\;\" verwenden. Die speziellen Variablen $nick, "
 "$channel und $server werden dabei durch den jeweiligen Wert ersetzt "
-"(Hinweis: Inhalt ist evaluiert, siehe /help eval)"
+"(Hinweis: Inhalt wird evaluiert, siehe /help eval)"

 msgid ""
 "delay (in seconds) after command was executed (example: give some time for "
@@ -6785,7 +6793,7 @@ msgid ""
 msgstr ""
 "durch Kommata getrennte Liste der Channels, die beim Verbinden zum Server "
 "betreten werden sollen (Beispiel: \"#chan1,#chan2,#chan3 key1,key2\") "
-"(Hinweis: Inhalt ist evaluiert, siehe /help eval)"
+"(Hinweis: Inhalt wird evaluiert, siehe /help eval)"

 msgid ""
 "automatically rejoin channels after kick; you can define a buffer local "
@@ -7214,9 +7222,10 @@ msgstr ""
 "Channel inaktiv gewesen ist. Dazu muss ein Filter mit dem Schlagwort "
 "\"irc_smart_filter\" erstellt werden"

-msgid "delay for filtering join/part/quit messages (in minutes)"
+msgid ""
+"delay for filtering join/part/quit messages (in minutes): if the nick did "
+"not speak during the last N minutes, the join/part/quit is filtered"
 msgstr ""
-"Verzögerung, in Minuten, in denen join/part/quit Nachrichten gefiltert werden"

 #. TRANSLATORS: please do not translate "join"
 msgid "enable smart filter for \"join\" messages"
@@ -9212,10 +9221,11 @@ msgstr "maximale Anzahl an Clients die mit einem Port verbunden sein dürfen"

 msgid ""
 "password required by clients to access this relay (empty value means no "
-"password required)"
+"password required) (note: content is evaluated, see /help eval)"
 msgstr ""
 "Passwort wird von Clients benötigt um Zugriff auf dieses Relay zu erhalten "
-"(kein Eintrag bedeutet dass kein Passwort benötigt wird)"
+"(kein Eintrag bedeutet, dass kein Passwort benötigt wird) (Hinweis: Inhalt "
+"wird evaluiert, siehe /help eval)"

 msgid ""
 "file with SSL certificate and private key (for serving clients with SSL)"
@@ -20,10 +20,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.2-rc1\n"
+"Project-Id-Version: WeeChat 0.4.2-rc2\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-01 15:56+0200\n"
-"PO-Revision-Date: 2013-09-02 21:20+0200\n"
+"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"PO-Revision-Date: 2013-09-20 23:11+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: es\n"
@@ -2104,9 +2104,11 @@ msgid ""
 "\n"
 "Secured data with format ${sec.data.xxx} can be used in:\n"
 "  - command line argument \"--run-command\"\n"
+"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - proxy options: username, password\n"
 "  - irc server options: autojoin, command, password, sasl_{username|"
 "password}\n"
-"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - option relay.network.password\n"
 "  - command /eval.\n"
 "\n"
 "Examples:\n"
@@ -3720,11 +3722,11 @@ msgstr "dirección del servidor proxy (IP o nombre de máquina)"
 msgid "port for connecting to proxy server"
 msgstr "puerto para conectarse al servidor proxy"

-msgid "username for proxy server"
-msgstr "nombre de usuario para el servidor proxy"
+msgid "username for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""

-msgid "password for proxy server"
-msgstr "contraseña para el servidor proxy"
+msgid "password for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""

 msgid "Please enter your passphrase to decrypt the data secured by WeeChat:"
 msgstr ""
@@ -6238,8 +6240,9 @@ msgstr "tamaño de la llave usada durante Diffie-Hellman Key Exchange"
 msgid "check that the SSL connection is fully trusted"
 msgstr "verificar que la conexión SSL es confiable completamente"

-msgid "password for server"
-msgstr "contraseña del servidor"
+#, fuzzy
+msgid "password for server (note: content is evaluated, see /help eval)"
+msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins"

 #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
 #, fuzzy
@@ -6704,9 +6707,10 @@ msgstr ""
 "últimos minutos en el canal (debes crear un filtro para la etiqueta "
 "\"irc_smart_filter\")"

-msgid "delay for filtering join/part/quit messages (in minutes)"
+msgid ""
+"delay for filtering join/part/quit messages (in minutes): if the nick did "
+"not speak during the last N minutes, the join/part/quit is filtered"
 msgstr ""
-"tiempo de espera para filtrar mensajes de unión/abandono/salida (en minutos)"

 #. TRANSLATORS: please do not translate "join"
 msgid "enable smart filter for \"join\" messages"
@@ -8626,9 +8630,10 @@ msgstr ""
 msgid "maximum number of clients connecting to a port"
 msgstr "número máximo de clientes conectados a un puerto"

+#, fuzzy
 msgid ""
 "password required by clients to access this relay (empty value means no "
-"password required)"
+"password required) (note: content is evaluated, see /help eval)"
 msgstr ""
 "los clientes requieren una clave para acceder este repetidor (sin valor "
 "significa que no se requiere clave)"
@@ -19,10 +19,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.2-rc1\n"
+"Project-Id-Version: WeeChat 0.4.2-rc2\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-01 18:16+0200\n"
-"PO-Revision-Date: 2013-09-02 21:20+0200\n"
+"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"PO-Revision-Date: 2013-09-20 23:11+0200\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -1404,9 +1404,9 @@ msgstr ""
 "  1. une couleur (format: color:xxx)\n"
 "  2. une option (format: fichier.section.option)\n"
 "  3. une variable locale du tampon\n"
-"  4. un un hdata/variable (la valeur est automatiquement convertie en "
-"chaîne), par défaut \"window\" et \"buffer\" pointent vers la fenêtre et le "
-"tampon courants.\n"
+"  4. un hdata/variable (la valeur est automatiquement convertie en chaîne), "
+"par défaut \"window\" et \"buffer\" pointent vers la fenêtre et le tampon "
+"courants.\n"
 "Le format du hdata peut être le suivant :\n"
 "  hdata.var1.var2...: démarrer avec un hdata (le pointeur doit être connu), "
 "et demander les variables l'une après l'autre (d'autres hdata peuvent être "
@@ -1810,7 +1810,7 @@ msgstr ""
 "défaut), pratique après installation d'une nouvelle version de WeeChat\n"
 "\n"
 "Lors de l'association d'une commande à une touche, il est recommandé "
-"d'utiliser la touche alt+k (ou Echap puis k), et puis de presser la touche à "
+"d'utiliser la touche alt+k (ou Échap puis k), et puis de presser la touche à "
 "associer: cela insère le code de la touche dans la ligne de commande.\n"
 "\n"
 "Pour le contexte \"mouse\" (possible aussi pour le contexte \"cursor\"), la "
@@ -2171,9 +2171,11 @@ msgid ""
 "\n"
 "Secured data with format ${sec.data.xxx} can be used in:\n"
 "  - command line argument \"--run-command\"\n"
+"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - proxy options: username, password\n"
 "  - irc server options: autojoin, command, password, sasl_{username|"
 "password}\n"
-"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - option relay.network.password\n"
 "  - command /eval.\n"
 "\n"
 "Examples:\n"
@@ -2210,9 +2212,11 @@ msgstr ""
 "Les données sécurisées avec le format ${sec.data.xxx} peuvent être utilisées "
 "dans :\n"
 "  - le paramètre de ligne de commande \"--run-command\"\n"
+"  - les options weechat.startup.command_{before|after}_plugins\n"
+"  - les options de proxy: username, password\n"
 "  - les options de serveur irc: autojoin, command, password, sasl_{username|"
 "password}\n"
-"  - les options weechat.startup.command_{before|after}_plugins\n"
+"  - l'option relay.network.password\n"
 "  - la commande /eval.\n"
 "\n"
 "Exemples :\n"
@@ -2989,7 +2993,7 @@ msgid ""
 msgstr ""
 "expression régulière utilisée pour vérifier si un message a un \"highlight\" "
 "ou non, au moins une correspondance dans la chaîne doit être entourée de "
-"caractères de mot (alpha-numérique, \"-\", \"_\" ou \"|\"), l'expression "
+"caractères de mot (alphanumérique, \"-\", \"_\" ou \"|\"), l'expression "
 "régulière est insensible à la casse (utilisez \"(?-i)\" au début pour la "
 "rendre sensible à la casse), exemples: \"flashcode|flashy\", \"(?-"
 "i)FlashCode|flashy\""
@@ -3781,7 +3785,7 @@ msgstr "%sErreur de lecture de la configuration"

 #, c-format
 msgid "Writing configuration file %s %s"
-msgstr "Ecriture du fichier de configuration %s %s"
+msgstr "Écriture du fichier de configuration %s %s"

 msgid "(default options)"
 msgstr "(options par défaut)"
@@ -3910,11 +3914,15 @@ msgstr "adresse du serveur proxy (IP ou nom de machine)"
 msgid "port for connecting to proxy server"
 msgstr "port pour se connecter au serveur proxy"

-msgid "username for proxy server"
-msgstr "nom d'utilisateur pour le serveur proxy"
+msgid "username for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""
+"nom d'utilisateur pour le serveur proxy (note: le contenu est évalué, voir /"
+"help eval)"

-msgid "password for proxy server"
-msgstr "mot de passe pour le serveur proxy"
+msgid "password for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""
+"mot de passe pour le serveur proxy (note: le contenu est évalué, voir /help "
+"eval)"

 msgid "Please enter your passphrase to decrypt the data secured by WeeChat:"
 msgstr ""
@@ -6529,8 +6537,9 @@ msgstr "taille de clé utilisée pour l'échange de clé Diffie-Hellman"
 msgid "check that the SSL connection is fully trusted"
 msgstr "vérifier que la connexion SSL est entièrement de confiance"

-msgid "password for server"
-msgstr "mot de passe pour le serveur"
+msgid "password for server (note: content is evaluated, see /help eval)"
+msgstr ""
+"mot de passe pour le serveur (note: le contenu est évalué, voir /help eval)"

 #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
 msgid ""
@@ -7027,8 +7036,12 @@ msgstr ""
 "pendant quelques minutes sur le canal (vous devez créer un filtre sur le tag "
 "\"irc_smart_filter\")"

-msgid "delay for filtering join/part/quit messages (in minutes)"
-msgstr "délai pour filtrer les messages join/part/quit (en minutes)"
+msgid ""
+"delay for filtering join/part/quit messages (in minutes): if the nick did "
+"not speak during the last N minutes, the join/part/quit is filtered"
+msgstr ""
+"délai pour filtrer les messages join/part/quit (en minutes): si le pseudo "
+"n'a pas parlé durant les N dernières minutes, le join/part/quit est filtré"

 #. TRANSLATORS: please do not translate "join"
 msgid "enable smart filter for \"join\" messages"
@@ -8764,7 +8777,7 @@ msgid "No connected client for relay"
 msgstr "Pas de client connecté pour le relai"

 msgid "Listening on ports:"
-msgstr "Ecoute sur les ports:"
+msgstr "Écoute sur les ports:"

 #, c-format
 msgid "  port %s%d%s, relay: %s%s%s, %s, started on: %s"
@@ -8978,10 +8991,11 @@ msgstr "nombre maximum de clients qui se connectent sur un port"

 msgid ""
 "password required by clients to access this relay (empty value means no "
-"password required)"
+"password required) (note: content is evaluated, see /help eval)"
 msgstr ""
 "mot de passe requis par les clients pour accéder à ce relai (une valeur vide "
-"indique que le mot de passe n'est pas nécessaire)"
+"indique que le mot de passe n'est pas nécessaire) (note: le contenu est "
+"évalué, voir /help eval)"

 msgid ""
 "file with SSL certificate and private key (for serving clients with SSL)"
@@ -9653,7 +9667,7 @@ msgid "Description"
 msgstr "Description"

 msgid "Tags"
-msgstr "Etiquettes"
+msgstr "Étiquettes"

 msgid "Status"
 msgstr "Statut"
@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.2-rc1\n"
+"Project-Id-Version: WeeChat 0.4.2-rc2\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-01 15:56+0200\n"
-"PO-Revision-Date: 2013-09-02 21:20+0200\n"
+"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"PO-Revision-Date: 2013-09-20 23:11+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: hu\n"
@@ -1742,9 +1742,11 @@ msgid ""
 "\n"
 "Secured data with format ${sec.data.xxx} can be used in:\n"
 "  - command line argument \"--run-command\"\n"
+"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - proxy options: username, password\n"
 "  - irc server options: autojoin, command, password, sasl_{username|"
 "password}\n"
-"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - option relay.network.password\n"
 "  - command /eval.\n"
 "\n"
 "Examples:\n"
@@ -3146,11 +3148,11 @@ msgstr "proxy szerver címe (IP-cím vagy gépnév)"
 msgid "port for connecting to proxy server"
 msgstr "proxy szerverhez való csatlakozáskor használt port"

-msgid "username for proxy server"
-msgstr "felhasználónév a proxy szerverhez"
+msgid "username for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""

-msgid "password for proxy server"
-msgstr "jelszó a proxy szerverhez"
+msgid "password for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""

 msgid "Please enter your passphrase to decrypt the data secured by WeeChat:"
 msgstr ""
@@ -5561,9 +5563,8 @@ msgstr ""
 msgid "check that the SSL connection is fully trusted"
 msgstr ""

-#, fuzzy
-msgid "password for server"
-msgstr "jelszó az IRC szerveren"
+msgid "password for server (note: content is evaluated, see /help eval)"
+msgstr ""

 #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
 msgid ""
@@ -5949,7 +5950,9 @@ msgid ""
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
 msgstr ""

-msgid "delay for filtering join/part/quit messages (in minutes)"
+msgid ""
+"delay for filtering join/part/quit messages (in minutes): if the nick did "
+"not speak during the last N minutes, the join/part/quit is filtered"
 msgstr ""

 #. TRANSLATORS: please do not translate "join"
@@ -7791,7 +7794,7 @@ msgstr ""

 msgid ""
 "password required by clients to access this relay (empty value means no "
-"password required)"
+"password required) (note: content is evaluated, see /help eval)"
 msgstr ""

 msgid ""
@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.2-rc1\n"
+"Project-Id-Version: WeeChat 0.4.2-rc2\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-01 15:56+0200\n"
-"PO-Revision-Date: 2013-09-02 21:20+0200\n"
+"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"PO-Revision-Date: 2013-09-20 23:11+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: it\n"
@@ -2146,9 +2146,11 @@ msgid ""
 "\n"
 "Secured data with format ${sec.data.xxx} can be used in:\n"
 "  - command line argument \"--run-command\"\n"
+"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - proxy options: username, password\n"
 "  - irc server options: autojoin, command, password, sasl_{username|"
 "password}\n"
-"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - option relay.network.password\n"
 "  - command /eval.\n"
 "\n"
 "Examples:\n"
@@ -3785,11 +3787,11 @@ msgstr "indirizzo del server proxy (IP o nome host)"
 msgid "port for connecting to proxy server"
 msgstr "porta per la connessione al server proxy"

-msgid "username for proxy server"
-msgstr "nome utente per il server proxy"
+msgid "username for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""

-msgid "password for proxy server"
-msgstr "password per il server proxy"
+msgid "password for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""

 msgid "Please enter your passphrase to decrypt the data secured by WeeChat:"
 msgstr ""
@@ -6315,8 +6317,10 @@ msgstr "dimensione della chiave usata durante lo Scambio Chiavi Diffie-Hellman"
 msgid "check that the SSL connection is fully trusted"
 msgstr "verifica che la connessione SSL sia totalmente fidata"

-msgid "password for server"
-msgstr "password per il server"
+#, fuzzy
+msgid "password for server (note: content is evaluated, see /help eval)"
+msgstr ""
+"comando eseguito all'avvio di WeeChat, prima del caricamento dei plugin"

 #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
 msgid ""
@@ -6779,10 +6783,10 @@ msgstr ""
 "per alcuni minuti sul canale (è necessario creare un filtro sul tag "
 "\"irc_smart_filter\")"

-msgid "delay for filtering join/part/quit messages (in minutes)"
+msgid ""
+"delay for filtering join/part/quit messages (in minutes): if the nick did "
+"not speak during the last N minutes, the join/part/quit is filtered"
 msgstr ""
-"ritardo per il filtraggio dei messaggi di entrata/uscita/abbandono (in "
-"minuti)"

 #. TRANSLATORS: please do not translate "join"
 msgid "enable smart filter for \"join\" messages"
@@ -8712,9 +8716,10 @@ msgstr ""
 msgid "maximum number of clients connecting to a port"
 msgstr "numero massimo di client connessi ad una porta"

+#, fuzzy
 msgid ""
 "password required by clients to access this relay (empty value means no "
-"password required)"
+"password required) (note: content is evaluated, see /help eval)"
 msgstr ""
 "password richiesta dai client per accedere a questo relay (un valore nullo "
 "corrisponde a nessuna password richiesta)"
@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.2-rc1\n"
+"Project-Id-Version: WeeChat 0.4.2-rc2\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-01 15:56+0200\n"
-"PO-Revision-Date: 2013-09-02 21:20+0200\n"
+"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"PO-Revision-Date: 2013-09-20 23:11+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/WeeChat>\n"
 "Language: ja\n"
@@ -2098,6 +2098,7 @@ msgstr ""
 "passphrase <passphrase>|-delete || decrypt <passphrase>|-discard || set "
 "<name> <value> || del <name>"

+#, fuzzy
 msgid ""
 "passphrase: change the passphrase (without passphrase, data is stored as "
 "plain text in file sec.conf)\n"
@@ -2117,9 +2118,11 @@ msgid ""
 "\n"
 "Secured data with format ${sec.data.xxx} can be used in:\n"
 "  - command line argument \"--run-command\"\n"
+"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - proxy options: username, password\n"
 "  - irc server options: autojoin, command, password, sasl_{username|"
 "password}\n"
-"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - option relay.network.password\n"
 "  - command /eval.\n"
 "\n"
 "Examples:\n"
@@ -3757,11 +3760,11 @@ msgstr "プロキシサーバアドレス (IP アドレスかホスト名)"
 msgid "port for connecting to proxy server"
 msgstr "プロキシサーバの接続ポート"

-msgid "username for proxy server"
-msgstr "プロキシサーバのユーザ名"
+msgid "username for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""

-msgid "password for proxy server"
-msgstr "プロキシサーバのパスワード"
+msgid "password for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""

 msgid "Please enter your passphrase to decrypt the data secured by WeeChat:"
 msgstr ""
@@ -6294,8 +6297,10 @@ msgstr "Diffie-Hellman 鍵交換で使われる鍵長"
 msgid "check that the SSL connection is fully trusted"
 msgstr "SSL 接続が完全に信頼できることを確認"

-msgid "password for server"
-msgstr "サーバのパスワード"
+#, fuzzy
+msgid "password for server (note: content is evaluated, see /help eval)"
+msgstr ""
+"SASL 認証のパスワード (注意: 値は評価されます、/help eval を参照してください)"

 #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
 msgid ""
@@ -6756,8 +6761,10 @@ msgstr ""
 "ジをフィルタする (\"irc_smart_filter\" タグのフィルタを作らなければいけませ"
 "ん)"

-msgid "delay for filtering join/part/quit messages (in minutes)"
-msgstr "参加/退出/終了 メッセージのフィルタリングを遅らせる (秒単位)"
+msgid ""
+"delay for filtering join/part/quit messages (in minutes): if the nick did "
+"not speak during the last N minutes, the join/part/quit is filtered"
+msgstr ""

 #. TRANSLATORS: please do not translate "join"
 msgid "enable smart filter for \"join\" messages"
@@ -8640,9 +8647,10 @@ msgstr ""
 msgid "maximum number of clients connecting to a port"
 msgstr "ポートに接続するクライアントの最大数"

+#, fuzzy
 msgid ""
 "password required by clients to access this relay (empty value means no "
-"password required)"
+"password required) (note: content is evaluated, see /help eval)"
 msgstr ""
 "このリレーを利用するためにクライアントが必要なパスワード (空の場合パスワード"
 "なし)"
@@ -19,17 +19,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.2-rc1\n"
+"Project-Id-Version: WeeChat 0.4.2-rc2\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-01 15:56+0200\n"
-"PO-Revision-Date: 2013-09-02 21:21+0200\n"
+"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"PO-Revision-Date: 2013-09-20 23:12+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 1.5.5\n"

 #. TRANSLATORS: "%s %s" after "compiled on" is date and time
@@ -2145,6 +2146,7 @@ msgstr ""
 "passphrase <hasło>|-delete || decrypt <hasło>|-discard || set <nazwa> "
 "<wartość> || del <nazwa>"

+#, fuzzy
 msgid ""
 "passphrase: change the passphrase (without passphrase, data is stored as "
 "plain text in file sec.conf)\n"
@@ -2164,9 +2166,11 @@ msgid ""
 "\n"
 "Secured data with format ${sec.data.xxx} can be used in:\n"
 "  - command line argument \"--run-command\"\n"
+"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - proxy options: username, password\n"
 "  - irc server options: autojoin, command, password, sasl_{username|"
 "password}\n"
-"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - option relay.network.password\n"
 "  - command /eval.\n"
 "\n"
 "Examples:\n"
@@ -3844,11 +3848,11 @@ msgstr "adres serwera proxy (adres IP lub nazwa hosta)"
 msgid "port for connecting to proxy server"
 msgstr "port do połączeń z serwerem proxy"

-msgid "username for proxy server"
-msgstr "nazwa użytkownika dla serwera proxy"
+msgid "username for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""

-msgid "password for proxy server"
-msgstr "hasło do serwera proxy"
+msgid "password for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""

 msgid "Please enter your passphrase to decrypt the data secured by WeeChat:"
 msgstr ""
@@ -6413,8 +6417,11 @@ msgstr ""
 msgid "check that the SSL connection is fully trusted"
 msgstr "sprawdź czy połączenie ssl jest w pełni zaufane"

-msgid "password for server"
-msgstr "hasło dla serwera"
+#, fuzzy
+msgid "password for server (note: content is evaluated, see /help eval)"
+msgstr ""
+"hasło dla uwierzytelniania SASL (uwaga: zawartość jest przetwarzana, zobacz /"
+"help eval)"

 #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
 msgid ""
@@ -6900,9 +6907,10 @@ msgstr ""
 "aktywnymi od kilku minut na kanale (musisz stworzyć filtr na tagu "
 "\"irc_smart_filter\")"

-msgid "delay for filtering join/part/quit messages (in minutes)"
+msgid ""
+"delay for filtering join/part/quit messages (in minutes): if the nick did "
+"not speak during the last N minutes, the join/part/quit is filtered"
 msgstr ""
-"odstęp dla filtrowania wiadomości wejścia/opuszczenia/wyjścia (w minutach)"

 #. TRANSLATORS: please do not translate "join"
 msgid "enable smart filter for \"join\" messages"
@@ -8811,9 +8819,10 @@ msgstr ""
 msgid "maximum number of clients connecting to a port"
 msgstr "maksymalna ilość klientów łączących się na port"

+#, fuzzy
 msgid ""
 "password required by clients to access this relay (empty value means no "
-"password required)"
+"password required) (note: content is evaluated, see /help eval)"
 msgstr ""
 "hasło wymagane od klientów do połączenia z tym pośrednikiem (pusta wartość "
 "oznacza brak wymaganego hasła)"
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010-2011 Ivan Sichmann Freitas <ivansichfreitas@gmail.com>
+# Copyright (C) 2010-2013 Ivan Sichmann Freitas <ivansichfreitas@gmail.com>
 # Copyright (C) 2011 Sergio Durigan Junior <sergiosdj@gmail.com>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -19,10 +19,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.2-rc1\n"
+"Project-Id-Version: WeeChat 0.4.2-rc2\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-01 15:56+0200\n"
-"PO-Revision-Date: 2013-09-02 21:21+0200\n"
+"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"PO-Revision-Date: 2013-09-20 23:11+0200\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: pt_BR\n"
@@ -67,7 +67,6 @@ msgstr ""
 msgid "Usage: %s [option...] [plugin:option...]\n"
 msgstr "Uso: %s [opção...] [plugin:opção...]\n"

-#, fuzzy
 msgid ""
 "  -a, --no-connect         disable auto-connect to servers at startup\n"
 "  -c, --colors             display default colors in terminal\n"
@@ -83,24 +82,24 @@ msgid ""
 "  -v, --version            display WeeChat version\n"
 "  plugin:option            option for plugin (see man weechat)\n"
 msgstr ""
-"  -a, --no-connect  desabilita a auto-conexão a servidores durante a "
+"  -a, --no-connect         desabilita a auto-conexão a servidores durante a "
 "inicialização\n"
-"  -c, --colors      exibe as cores padrões no terminal\n"
-"  -d, --dir <path>  configura diretório do WeeChat (padrão: ~/.weechat)\n"
-"  -h, --help        esta ajuda\n"
-"  -k, --keys        mostra as teclas de atalho padrão do WeeChat\n"
-"  -l, --license     mostra a licença do WeeChat\n"
-"  -p, --no-plugin   não carrega nenhum plugin durante a inicialização\n"
-"  -s, --no-script   não carrega nenhum script durante a inicialização\n"
-"  -v, --version     mostra a versão do WeeChat\n"
-"  plugin:opção      opção para o plugin\n"
-"                    por exemplo, o plugin irc pode conectar\n"
-"                    a um servidor pela url, dessa forma:\n"
-"                    irc[6][s]://[apelido[:senha]@]irc.exemplo.org[:porta][/"
-"#canal1][,#canal2[...]]\n"
-"                    (veja a documentação sobre plugins para mais "
-"informações\n"
-"                    sobre possíveis opções)\n"
+"  -c, --colors             exibe as cores padrões no terminal\n"
+"  -d, --dir <path>         configura diretório do WeeChat (padrão: ~/."
+"weechat)\n"
+"  -h, --help               mostra esta ajuda\n"
+"  -l, --license            mostra a licença do WeeChat\n"
+"  -p, --no-plugin          não carrega nenhum plugin durante a "
+"inicialização\n"
+"  -r, --run-command <cmd>  executa comandos após a inicialização\n"
+"                           (vários comandos são separados por ponto-e-"
+"vírgula)\n"
+"  -s, --no-script          não carrega nenhum script durante a "
+"inicialização\n"
+"      --upgrade            atualiza o WeeChat através dos arquivos de sessão "
+"(veja /help upgrade no WeeChat)\n"
+"  -v, --version            mostra a versão do WeeChat\n"
+"  plugin:option            opção para o plugin (veja o manual do WeeChat)\n"

 #, c-format
 msgid "Error: missing argument for \"%s\" option\n"
@@ -198,9 +197,9 @@ msgstr "Todas as barras foram excluídas"
 msgid "%sError: unknown bar \"%s\""
 msgstr "%sErro: barra desconhecida \"%s\""

-#, fuzzy, c-format
+#, c-format
 msgid "Bar \"%s\" deleted"
-msgstr "Barra excluída"
+msgstr "Barra \"%s\" excluída"

 #, c-format
 msgid "%sError: unable to set option \"%s\" for bar \"%s\""
@@ -229,17 +228,17 @@ msgstr "  %s[%s%d%s]%s (%s) %s%s%s (notificar: %s)"
 msgid "%sError: incorrect buffer number"
 msgstr "%sErro: número do buffer incorreto"

-#, fuzzy, c-format
+#, c-format
 msgid "%sError: buffer not found"
-msgstr "%sErro: filtro \"%s\" não encontrado"
+msgstr "%sErro: buffer não encontrado"

 #, c-format
 msgid "%sError: WeeChat main buffer can't be closed"
 msgstr "%sErro: o buffer principal do WeeChat não pode ser fechado"

-#, fuzzy, c-format
+#, c-format
 msgid "%sError: unable to set notify level \"%s\""
-msgstr "%sErro: não foi possível configurar a opção \"%s\" para a barra \"%s\""
+msgstr "%sErro: incapaz de configurar o nível de notificação \"%s\""

 #, c-format
 msgid "Local variables for buffer \"%s\":"
@@ -498,13 +497,11 @@ msgid_plural "%d new keys added (context: \"%s\")"
 msgstr[0] "%d nova tecla adicionada"
 msgstr[1] "%d novas teclas adicionadas (context: \"%s\")"

-#, fuzzy
 msgid "Saved layouts:"
-msgstr "Disposição dos buffers salva:"
+msgstr "Disposição dos buffers salvada:"

-#, fuzzy
 msgid " (current layout)"
-msgstr "valor atual"
+msgstr " (disposição atual)"

 msgid "No layout saved"
 msgstr "Nenhuma disposição salva"
@@ -514,13 +511,11 @@ msgstr "Nenhuma disposição salva"
 msgid "Layout of %s%s%s saved in \"%s\" (current layout: %s)"
 msgstr ""

-#, fuzzy
 msgid "buffers"
-msgstr "buffer"
+msgstr "buffers"

-#, fuzzy
 msgid "windows"
-msgstr "janela"
+msgstr "janelas"

 msgid "Layout of buffers+windows reset (current layout: -)"
 msgstr ""
@@ -530,21 +525,21 @@ msgid "Layout \"%s\" deleted (current layout: %s)"
 msgstr ""

 #. TRANSLATORS: %s%s%s is "buffers" or "windows" or "buffers+windows"
-#, fuzzy, c-format
+#, c-format
 msgid "Layout of %s%s%s reset in \"%s\""
-msgstr "%sTópico para o canal %s%s%s definido em %s"
+msgstr "Disposição de %s%s%s reconfigurada em \"%s\""

-#, fuzzy, c-format
+#, c-format
 msgid "%sError: unknown layout \"%s\""
-msgstr "%sErro: barra desconhecida \"%s\""
+msgstr "%sErro: disposição desconhecida \"%s\""

-#, fuzzy, c-format
+#, c-format
 msgid "%sError: layout \"%s\" already exists for \"%s\" command"
-msgstr "%sErro: outro comando \"%s\" já existe para o plugin \"%s\""
+msgstr "%sErro: disposição \"%s\" já existe para comando \"%s\""

-#, fuzzy, c-format
+#, c-format
 msgid "Layout \"%s\" has been renamed to \"%s\""
-msgstr "Filtro \"%s\" renomeado para \"%s\""
+msgstr "Disposição \"%s\" renomeado para \"%s\""

 msgid "Mouse enabled"
 msgstr "Mouse habilitado"
@@ -559,11 +554,9 @@ msgstr "Plugins carregados:"
 msgid "  written by \"%s\", license: %s"
 msgstr "  escrito por \"%s\", licença: %s"

-#, fuzzy
 msgid "    commands hooked:"
 msgstr "    comandos relacionados:"

-#, fuzzy
 msgid "    command_run hooked:"
 msgstr "    command_run relacionado:"

@@ -611,7 +604,6 @@ msgstr "    processos relacionados:"
 msgid "      command: '%s', child pid: %d"
 msgstr "      comando: '%s', pid do filho: %d"

-#, fuzzy
 msgid "    connect hooked:"
 msgstr "    conexões relacionadas:"

@@ -646,11 +638,9 @@ msgstr "(todos)"
 msgid "    configuration options hooked:"
 msgstr "    opções de configuração relacionadas:"

-#, fuzzy
 msgid "    completions hooked:"
 msgstr "    completações relacionadas:"

-#, fuzzy
 msgid "    modifiers hooked:"
 msgstr "    modificadores relacionados:"

@@ -738,9 +728,8 @@ msgstr "%sErro: falhou ao salvar as opções para %s"
 msgid "There is no encrypted data"
 msgstr ""

-#, fuzzy
 msgid "All encrypted data has been deleted"
-msgstr "Todas as barras foram excluídas"
+msgstr "Toda informação criptografada foi deletada"

 msgid "Encrypted data has been successfully decrypted"
 msgstr ""
@@ -755,34 +744,32 @@ msgid ""
 "secured data or passphrase"
 msgstr ""

-#, fuzzy
 msgid "Passphrase deleted"
-msgstr "Barra excluída"
+msgstr "Password deletado"

 msgid "Passphrase is not set"
-msgstr ""
+msgstr "Password não foi definido"

 msgid "Passphrase changed"
-msgstr ""
+msgstr "Password alterado"

 msgid "Passphrase added"
-msgstr ""
+msgstr "Password adicionado"

 #, c-format
 msgid "Secured data \"%s\" set"
 msgstr ""

-#, fuzzy, c-format
+#, c-format
 msgid "Secured data \"%s\" deleted"
-msgstr "Barra excluída"
+msgstr "Dados seguros \"%s\" deletados"

-#, fuzzy, c-format
+#, c-format
 msgid "%sSecured data \"%s\" not found"
-msgstr "%s%s: script \"%s\" não encontrado"
+msgstr "%sDados seguros \"%s\" não encontrados"

-#, fuzzy
 msgid "default: "
-msgstr "valor padrão"
+msgstr "padrão: "

 msgid "(unknown)"
 msgstr "(desconhecido)"
@@ -795,41 +782,41 @@ msgstr ""
 "%sOpção \"%s\" não encontrada (dica: você pode usar \"*\" no começo e/ou fim "
 "da opção para ver uma sublista)"

-#, fuzzy
 msgid "No option found"
-msgstr "Nenhum plugin encontrado"
+msgstr "Nenhuma opção encontrada"

-#, fuzzy, c-format
+#, c-format
 msgid "%s%d%s option with value changed (matching with \"%s\")"
 msgid_plural "%s%d%s options with value changed (matching with \"%s\")"
-msgstr[0] "%s%d%s opção de configuração encontrada casando com \"%s\""
-msgstr[1] "%s%d%s opções de configuração encontradas casando com \"%s\""
+msgstr[0] "%s%d%s opção de configuração com valor trocado (casando com \"%s\")"
+msgstr[1] ""
+"%s%d%s opções de configuração com valor trocado (casando com \"%s\")"

-#, fuzzy, c-format
+#, c-format
 msgid "%s%d%s option (matching with \"%s\")"
 msgid_plural "%s%d%s options (matching with \"%s\")"
-msgstr[0] "%s%d%s opção de configuração encontrada casando com \"%s\""
-msgstr[1] "%s%d%s opções de configuração encontradas casando com \"%s\""
+msgstr[0] "%s%d%s opção de configuração (casando com \"%s\")"
+msgstr[1] "%s%d%s opções de configuração (casando com \"%s\")"

-#, fuzzy, c-format
+#, c-format
 msgid "%s%d%s option"
 msgid_plural "%s%d%s options"
-msgstr[0] "%s%d%s opção de configuração não encontrada"
-msgstr[1] "%s%d%s opções de configuração não encontradas"
+msgstr[0] "%s%d%s opção de configuração"
+msgstr[1] "%s%d%s opções de configuração"

-#, fuzzy, c-format
+#, c-format
 msgid "%s%d%s option with value changed"
 msgid_plural "%s%d%s options with value changed"
-msgstr[0] "%s%d%s opção de configuração não encontrada"
-msgstr[1] "%s%d%s opções de configuração não encontradas"
+msgstr[0] "%s%d%s opção de configuração com valor trocado"
+msgstr[1] "%s%d%s opções de configuração com valor trocado"

 #, c-format
 msgid "%sError: failed to set option \"%s\""
 msgstr "%sErro: falhou ao configurar a opção \"%s\""

-#, fuzzy, c-format
+#, c-format
 msgid "%sError: option \"%s\" not found"
-msgstr "%sErro: plugin \"%s\" não encontrado"
+msgstr "%sErro: opção \"%s\" não encontrado"

 msgid "Option changed: "
 msgstr "Opção mudada: "
@@ -935,26 +922,24 @@ msgstr ""
 "%sErro: impossível mesclar janelas, não já nenhuma outra janela com o mesmo "
 "tamanho perto da atual"

-#, fuzzy
 msgid "set or remove away status"
-msgstr "Alternar status de ausente"
+msgstr "ativar ou remover o status de ausente"

 msgid "[-all] [<message>]"
 msgstr "[-all] [<mensagem>]"

-#, fuzzy
 msgid ""
 "   -all: set or remove away status on all connected servers\n"
 "message: message for away (if no message is given, away status is removed)"
 msgstr ""
-"   -all: alterna o status de ausência em todos os servidores conectados\n"
+"   -all: ativa ou remove o status de ausência em todos os servidores "
+"conectados\n"
 "message: mensagem para ausência (se nenhuma mensagem for fornecida, o status "
 "de ausência é removido)"

 msgid "manage bars"
 msgstr "gerenciar barras"

-#, fuzzy
 msgid ""
 "list|listfull|listitems || add <name> <type>[,<condition>] <position> <size> "
 "<separator> <item1>[,<item2>...] || default [input|title|status|nicklist] || "
@@ -966,7 +951,7 @@ msgstr ""
 "status|nicklist] || del <nome>|-all || set <nome> <opção> <valor> || hide|"
 "show|toggle <nome> || scroll <nome> <janela> <valor_de_rolagem>"

-# in the option "position", the parameters must be passes in english, but the
+# in the option "position", the parameters must be passed in english, but the
 # options were translated (inside parentesis) to become clearer
 #, fuzzy
 msgid ""
@@ -1070,16 +1055,16 @@ msgstr ""
 msgid "manage buffers"
 msgstr "gerenciar buffers"

-#, fuzzy
 msgid ""
 "list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap "
 "<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || close "
 "[<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> <value> "
 "|| get <property> || <number>|<name>"
 msgstr ""
-"list || clear [<número>|<nome>|-merged|-all] || move|merge <número> || "
-"unmerge [<número>|-all] || close [<n1>[-<n2>]|<nome>] || notify <nível> || "
-"localvar || set <propriedade> <valor> || get <propriedade> || <número>|<nome>"
+"list || clear [<número>|<nome>|-merged|-all] || move|merge <número> || swap "
+"<número1>|<nome1> [<número2>|<nome2>] || unmerge [<número>|-all] || close "
+"[<n1>[-<n2>]|<nome>] || notify <nível> || localvar || set <propriedade> "
+"<valor> || get <propriedade> || <número>|<nome>"

 # must find a better translation to "hotlist"
 #, fuzzy
@@ -1182,9 +1167,8 @@ msgstr ""
 msgid "define color aliases and display palette of colors"
 msgstr "define apelidos para cores e mostra a palheta de cores"

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

 # Translate orange? Is it a internal name?
 # TODO: revisit here when color names were specified as translatable or not
@@ -1782,14 +1766,13 @@ msgstr ""
 msgid "save/apply/reset layout for buffers and windows"
 msgstr "salvar/aplicar/resetar a disposição dos buffers e janelas"

-#, fuzzy
 msgid ""
 "save [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || leave "
 "|| reset [<name>] [buffers|windows] || rename <name> <new_name>"
 msgstr ""
-"save [buffers|janelas] || apply [buffers|janelas] || reset [buffers|janelas]"
+"save [<nome>] [buffers|windows] || apply [<nome>] [buffers|windows] || leave "
+"|| reset [<nome>] [buffers|windows] || rename <nome> <novo_nome>"

-#, fuzzy
 msgid ""
 "   save: save current layout\n"
 "  apply: apply saved layout\n"
@@ -1805,11 +1788,15 @@ msgid ""
 msgstr ""
 "   save: salvar a disposição atual\n"
 "  apply: aplicar a disposição salva\n"
-"  reset: remover a disposição salva\n"
+"  leave: deixar a disposição atual (não atualiza nenhuma disposição)\n"
+"  reset: reset buffers and/or windows in a saved layout\n"
+"         (if both buffers and windows are reset, the layout is removed)\n"
+" rename: rename a layout\n"
+"   name: name for saved layout (default is \"default\")\n"
 "buffers: salva/aplica apenas os buffers (ordem dos buffers)\n"
 "windows: salva/aplica apenas às janelas (buffer mostrado por cada janela)\n"
 "\n"
-"Sem argumentos, este comando mosta a disposição salva"
+"Sem argumentos, este comando mosta a disposição salva."

 msgid "mouse control"
 msgstr "controle do mouse"
@@ -2004,7 +1991,6 @@ msgstr "executa um comando várias vezes"
 msgid "[-interval <delay>] <count> <command>"
 msgstr "[-interval <tempo_de_espera>] <contador> <comandos>"

-#, fuzzy
 msgid ""
 "  delay: delay between execution of commands (in milliseconds)\n"
 "  count: number of times to execute command\n"
@@ -2017,9 +2003,16 @@ msgid ""
 "  scroll 2 pages up:\n"
 "    /repeat 2 /window page_up"
 msgstr ""
-" plugin: nome do plugin ('weechat' para comandos internos do weechat)\n"
-"command: comando a ser executado (um '/' é automaticamente adicionado se não "
-"for encontrado no começo de um comando)"
+"  delay: atraso entre execução dos comandos (em milisegundos)\n"
+"  count: número de vezes que o comando deve ser executado\n"
+"command: comando a ser executado (um '/' é automaticamente adicionado se "
+"nenhum for encontrado no começo do comando)\n"
+"\n"
+"Todos os comandos são executados no buffer onde este comando é executado.\n"
+"\n"
+"Exemplo:\n"
+"  Rolar 2 páginas para cima:\n"
+"    /repeat 2 /window page_up"

 msgid "save configuration files to disk"
 msgstr "salva configurações dos arquivos no disco"
@@ -2061,9 +2054,11 @@ msgid ""
 "\n"
 "Secured data with format ${sec.data.xxx} can be used in:\n"
 "  - command line argument \"--run-command\"\n"
+"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - proxy options: username, password\n"
 "  - irc server options: autojoin, command, password, sasl_{username|"
 "password}\n"
-"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - option relay.network.password\n"
 "  - command /eval.\n"
 "\n"
 "Examples:\n"
@@ -2084,11 +2079,9 @@ msgstr ""
 msgid "set config options"
 msgstr "define opções de configuração"

-#, fuzzy
 msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
-msgstr "[<opção> [<valor>]]"
+msgstr "[<opção> [<valor>]] || diff [<opção> [<opção>...]]"

-#, fuzzy
 msgid ""
 "option: name of an option (can start or end with '*' to list many options)\n"
 " value: new value for option\n"
@@ -2115,12 +2108,13 @@ msgid ""
 msgstr ""
 "opção: nome de uma opção\n"
 "valor: novo valor para a opção\n"
+" diff: mostra apenas opções mudadas\n"
 "\n"
 "O novo valor pode ser, de acordo com o tipo de variável:\n"
 "  boolean: on, off ou toggle\n"
 "  integer: número, ++número ou --número\n"
-"  string : qualquer string (\"\" para uma string vazia)\n"
-"  color  : nome de cor, ++número ou --número\n"
+"   string: qualquer string (\"\" para uma string vazia)\n"
+"    color: nome de cor, ++número ou --número\n"
 "\n"
 "Para todos os tipos, voce pode usar null para remover o valor da opção "
 "(valor indefinido). Isto funciona apenas para algumas variáveis especiais de "
@@ -2130,7 +2124,11 @@ msgstr ""
 "  mostrar opções sobre destaque:\n"
 "    /set *highlight*\n"
 "  adicionar uma palavra ao destaque:\n"
-"    /set weechat.look.highlight \"word\""
+"    /set weechat.look.highlight \"word\"\n"
+"  mostrar opções alteradas:\n"
+"    /set diff\n"
+"  mostrar opções alteradas no plugin irc:\n"
+"    /set diff irc.*"

 msgid "unset/reset config options"
 msgstr "indefine/restaura opções de configuração"
@@ -2166,9 +2164,8 @@ msgstr ""
 msgid "upgrade WeeChat without disconnecting from servers"
 msgstr "atualiza o WeeChat sem desconectar dos servidores"

-#, fuzzy
 msgid "[<path_to_binary>|-quit]"
-msgstr "[<caminho_para_o_binário>]"
+msgstr "[<caminho_para_o_binário>|-quit]"

 #, fuzzy
 msgid ""
@@ -2220,7 +2217,19 @@ msgstr ""
 "  2. descarrega todos os plugins (arquivos de configuração (*.conf) são "
 "escritos no disco)\n"
 "  3. salva o config do WeeChat (weechat.conf)\n"
-"  4. executa o novo binário do WeeChat."
+"  4. executa o novo binário do WeeChat.\n"
+"Com a opção \"-quit\", o processo é ligeiramente diferente:\n"
+"  1. fecha *TODAS* as conexões (irc, xfer, relay, ...)\n"
+"  2. salvar as sessões em arquivos (*.upgrade)\n"
+"  3. descarregar todos os plugins\n"
+"  4. salvar as configurações do WeeChat\n"
+"  5. termina WeeChat\n"
+"Então posteriormente você pode restaurar a sessão com o comando: weechat --"
+"upgrade\n"
+"IMPORTANTE: você deve restaurar a sessão com exatamente com a mesma "
+"configuração (files *.conf).\n"
+"É possível restaurar a sessão do WeeChat em outra máquina se você copiar o "
+"conteúdo do diretório \"~/.weechat\"."

 msgid "show WeeChat uptime"
 msgstr "mostra o tempo de execução do WeeChat"
@@ -2296,7 +2305,6 @@ msgstr ""
 msgid "manage windows"
 msgstr "gerencia janelas"

-#, fuzzy
 msgid ""
 "list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|"
 "splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || "
@@ -2307,11 +2315,14 @@ msgid ""
 "scroll_next_highlight|scroll_unread [-window <number>] || swap [-window "
 "<number>] [up|down|left|right] || zoom[-window <number>]"
 msgstr ""
-"list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize "
-"[+/-]<pct> || balance || merge [all] || page_up|page_down || refresh || "
-"scroll [+/-]<valor>[s|m|h|d|M|y] || scroll_horiz [+/-]<valor>[%] || "
-"scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|"
-"scroll_next_highlight || swap [up|down|left|right] || zoom"
+"list || -1|+1|b#|up|down|left|right [-window <número>] || <número> || splith|"
+"splitv [-window <número>] [<pct>] || resize [-window <número>] [+/-]<pct> || "
+"balance || merge [-window <número>] [all] || page_up|page_down [-window "
+"<número>] || refresh || scroll [-window <número>] [+/-]<valor>[s|m|h|d|M|y] "
+"|| scroll_horiz [-window <número>] [+/-]<valor>[%] || scroll_up|scroll_down|"
+"scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|"
+"scroll_next_highlight|scroll_unread [-window <número>] || swap [-window "
+"<number>] [up|down|left|right] || zoom[-window <número>]"

 #, fuzzy
 msgid ""
@@ -2445,13 +2456,9 @@ msgstr "nomes dos filtros"
 msgid "commands (weechat and plugins)"
 msgstr "comandos (weechat e plugins)"

-# Find a better translation to 'hooked' in this context
-#, fuzzy
 msgid "names of infos hooked"
 msgstr "nomes das informações associadas"

-# Find a better translation to 'hooked' in this context
-#, fuzzy
 msgid "names of infolists hooked"
 msgstr "nomes de listas de informação associadas"

@@ -2501,10 +2508,10 @@ msgstr ""

 msgid "areas (\"chat\" or bar name) for free cursor movement"
 msgstr ""
+"areas (\"chat\" ou nome da barra) para livre movimento do cursor do mouse"

-#, fuzzy
 msgid "names of layouts"
-msgstr "nomes das barras"
+msgstr "nomes das disposições"

 msgid "names of secured data (file sec.conf, section data)"
 msgstr ""
@@ -2539,26 +2546,26 @@ msgstr "apelido para cor"
 msgid "%sError: palette option must be numeric"
 msgstr "%sErro: opção da palheta deve ser numérica"

-#, fuzzy, c-format
+#, c-format
 msgid "%sWarning: unknown option for section \"%s\": %s (value: \"%s\")"
-msgstr "%sAviso: %s, linha %d: opção \"%s\" desconhecido para seção \"%s\""
+msgstr "%sAviso: opção desconhecida para seção \"%s\": %s (valor: \"%s\")"

 msgid "Notify level for buffer"
 msgstr "Nível de notificação para o buffer"

-#, fuzzy
 msgid ""
 "command executed when WeeChat starts, after loading plugins (note: content "
 "is evaluated, see /help eval)"
 msgstr ""
-"comando executado quando o WeeChat inicia, após o carregamento dos plugins"
+"comando executado quando o WeeChat inicia, após o carregamento dos plugins "
+"(nota: o conteúdo é avaliado, veja /help eval)"

-#, fuzzy
 msgid ""
 "command executed when WeeChat starts, before loading plugins (note: content "
 "is evaluated, see /help eval)"
 msgstr ""
-"comando executado quando o WeeChat inicia, antes do carregamento dos plugins"
+"comando executado quando o WeeChat inicia, antes do carregamento dos plugins "
+"(nota: conteúdo é avaliado, veja /help eval)"

 msgid "display WeeChat logo at startup"
 msgstr "mosta o logo do WeeChat na inicialização"
@@ -2615,7 +2622,6 @@ msgstr ""
 "na lista atual"

 #. TRANSLATORS: string "${color:xxx}" must NOT be translated
-#, fuzzy
 msgid ""
 "time format for each line displayed in buffers (see man strftime for date/"
 "time specifiers) (note: content is evaluated, so you can use colors with "
@@ -2624,9 +2630,10 @@ msgid ""
 "${color:240}%S\""
 msgstr ""
 "formato de tempo para cada linha mostrada nos buffers (veja man strftime "
-"para especificadores de data/tempo),, cores são permitidas com o formato "
-"\"${cor}\", por exemplo o tempo francês: \"${lightblue}%H${white}%M"
-"${lightred}%S\""
+"para especificadores de data/tempo) (nota: o conteúdo é avaliado, então voce "
+"pode usar cores com formato \"${color:xxx}\", veja /help eval); para exemplo "
+"de tempo usando escala de cinza (requer suporte à 256 cores): "
+"\"${color:252}%H${color:245}$M${color:240}%S\""

 msgid ""
 "force \"bold\" attribute for light colors and \"darkgray\" in basic colors "
@@ -2664,9 +2671,9 @@ msgid ""
 "window, or if line is from a merged buffer not selected)"
 msgstr ""

-#, fuzzy
 msgid "use a different color for offline nicks (not in nicklist any more)"
-msgstr "cor de texto para apelidos desconectados"
+msgstr ""
+"cor de texto para apelidos desconectados (não mais na lista de apelidos)"

 msgid ""
 "automatically reset table of color pairs when number of available pairs is "
@@ -2845,9 +2852,8 @@ msgstr ""
 "group_time_desc, group_number_asc, group_number_desc, number_asc, "
 "number_desc)"

-#, fuzzy
 msgid "text displayed at the end of the hotlist"
-msgstr "string exibida entre buffers na lista de atividade"
+msgstr "texto exibido no final da lista de atividade"

 msgid ""
 "keep only unique numbers in hotlist (this applies only on hotlist items "
@@ -2914,16 +2920,16 @@ msgid ""
 "allow only binding of \"safe\" keys (beginning with a ctrl or meta code)"
 msgstr ""

-#, fuzzy
 msgid "text to display before nick in prefix of message, example: \"<\""
-msgstr "texto a ser exibido antes do apelido na janela de chat"
+msgstr ""
+"texto a ser exibido antes do apelido no prefixo da mensagem, exemplo: \"<\""

-#, fuzzy
 msgid "text to display after nick in prefix of message, example: \">\""
-msgstr "texto a ser exibido depois do apelido na janela de chat"
+msgstr ""
+"texto a ser exibido depois do apelido no prefixo da mensage, examplo: \">\""

 msgid "enable mouse support"
-msgstr ""
+msgstr "habilita suporte à mouse"

 msgid ""
 "delay (in milliseconds) to grab a mouse event: WeeChat will wait this delay "
@@ -2942,11 +2948,10 @@ msgid ""
 "sequence for end of bracketed paste (\"ESC[201~\") was not received in time"
 msgstr ""

-#, fuzzy
 msgid ""
 "max number of lines for paste without asking user (-1 = disable this feature)"
 msgstr ""
-"número máximo de linhas para serem coladas sem perguntar ao usuário (0 = "
+"número máximo de linhas para serem coladas sem perguntar ao usuário (-1 = "
 "desabilita essa característica)"

 #. TRANSLATORS: string "${color:xxx}" must NOT be translated
@@ -3012,13 +3017,13 @@ msgstr ""
 "tamanho máximo para o nome do buffer, quando muitos buffers estão mesclados "
 "com o mesmo número (0 = sem tamanho máximo)"

-#, fuzzy
 msgid ""
 "char to display if buffer name is truncated (when many buffers are merged "
 "with same number) (must be exactly one char on screen)"
 msgstr ""
-"mostra '+' se o nome do buffer está truncado (quando muitos buffers estão "
-"mesclados com o mesmo número)"
+"caractere a ser exibido se o nome do buffer está truncado (quando muitos "
+"buffers são mesclados com o mesmo número) (precisa ser exatamente um "
+"caractere na tela)"

 msgid ""
 "prefix displayed for a message with same nick as previous message: use a "
@@ -3026,10 +3031,8 @@ msgid ""
 "prefix, or an empty string to disable feature (display prefix)"
 msgstr ""

-# Find a better translation to "string"
-#, fuzzy
 msgid "string displayed after prefix"
-msgstr "string mostrada após prefixo"
+msgstr "cadeia de caracteres mostrada após prefixo"

 msgid "use a marker (line or char) on buffers to show first unread line"
 msgstr ""
@@ -3073,43 +3076,41 @@ msgstr ""
 msgid "alert user when text sought is not found in buffer"
 msgstr "alertar usuário quando o texto solicitado não é encontrado no buffer"

-#, fuzzy
 msgid ""
 "char used to draw horizontal separators around bars and windows (empty value "
 "will draw a real line with ncurses, but may cause bugs with URL selection "
 "under some terminals), wide chars are NOT allowed here"
 msgstr ""
-"caractere usado para desenhar separadores horizontais em volta de barras "
-"(valor vazio vai desenhar uma linha real com ncurses, mas pode causar bugs "
-"com seleção de URL em alguns terminais), caracteres extendidos NÃO são "
+"caractere usado para desenhar separadores horizontais em volta de barras e "
+"janelas(valor vazio vai desenhar uma linha real com ncurses, mas pode causar "
+"bugs com seleção de URL em alguns terminais), caracteres extendidos NÃO são "
 "aceitos aqui"

-#, fuzzy
 msgid ""
 "char used to draw vertical separators around bars and windows (empty value "
 "will draw a real line with ncurses), wide chars are NOT allowed here"
 msgstr ""
-"caractere usado para desenhar separadores verticais em volta de barras "
-"(valor vazio vai desenhar uam linha real com ncurses), caracteres extendidos "
-"NÃO são aceitos aqui"
+"caractere usado para desenhar separadores verticais em volta de barras e "
+"janelas(valor vazio vai desenhar uam linha real com ncurses), caracteres "
+"extendidos NÃO são aceitos aqui"

 msgid "set title for window (terminal for Curses GUI) with name and version"
 msgstr ""
 "define o título para a janela (terminal para a interface Curses) com nome e "
 "versão"

-#, fuzzy
 msgid ""
 "time format for dates converted to strings and displayed in messages (see "
 "man strftime for date/time specifiers)"
 msgstr ""
-"formato de tempo para datas convertidas para strings e mostradas em mensagens"
+"formato de tempo para datas convertidas para strings e mostradas em "
+"mensagens (veja man strftime fpara especificadores de data/tempo)"

 msgid "display an horizontal separator between windows"
-msgstr ""
+msgstr "exibe um separador horizontal entre janelas"

 msgid "display a vertical separator between windows"
-msgstr ""
+msgstr "exibe um separador vertical entre janelas"

 msgid "text color for '+' when scrolling bars"
 msgstr "cor de texto para '+' quando estiver rolando barras"
@@ -3126,11 +3127,8 @@ msgstr "cor do texto para nomes de buffer"
 msgid "text color for channel names"
 msgstr "cor do texto para nomes de canal"

-#, fuzzy
 msgid "text color for message displayed when the day has changed"
-msgstr ""
-"cor de texto para marcadores de mensagens (mostrados com o comando /debug "
-"tags)"
+msgstr "cor de texto para mensagem exibida quando o dia muda"

 msgid "text color for delimiters"
 msgstr "cor de texto para delimitadores"
@@ -3139,10 +3137,14 @@ msgid ""
 "text color for chat when line is inactive (buffer is merged with other "
 "buffers and is not selected)"
 msgstr ""
+"cor do texto para a conversa quando a linha é inativa (buffer foi mesclado "
+"com outros buffers e não está selecionada)"

 msgid ""
 "text color for chat when window is inactive (not current selected window)"
 msgstr ""
+"cor do texto para conversa quando a janela está inativa (sem janela "
+"atualmente selecionada)"

 msgid "text color for nicks in chat window"
 msgstr "cor do texto para apelidos na janela de conversa"
@@ -3155,23 +3157,19 @@ msgstr ""
 "cor do texto para apelidos (lista de cores separada por vírgulas, fundo é "
 "permitido com o formato: \"fg:bg\", por exemplo: \"lightred:blue\")"

-#, fuzzy
 msgid "color for nick prefix (string displayed before nick in prefix)"
 msgstr ""
-"cor para o prefixo do apelido (o prefixo é uma string customizada exibida "
-"antes de um apelido)"
+"cor para o prefixo do apelido (string exibida antes de um apelido no prefixo)"

-#, fuzzy
 msgid "text color for offline nick (not in nicklist any more)"
-msgstr "cor de texto para apelidos desconectados"
+msgstr ""
+"cor de texto para apelidos desconectados (não mais na lista de apelidos)"

-#, fuzzy
 msgid "text color for offline nick with highlight"
-msgstr "cor de texto para apelidos desconectados"
+msgstr "cor de texto para apelidos desconectados com destaque"

-#, fuzzy
 msgid "background color for offline nick with highlight"
-msgstr "cor de fundo para prefixo de destacado"
+msgstr "cor de fundo para apelido desconectado com destaque"

 msgid "text color for other nick in private buffer"
 msgstr "cor de texto para outros apelidos em buffers privados"
@@ -3179,11 +3177,9 @@ msgstr "cor de texto para outros apelidos em buffers privados"
 msgid "text color for local nick in chat window"
 msgstr "cor de texto para apelido local na janela de conversa"

-#, fuzzy
 msgid "color for nick suffix (string displayed after nick in prefix)"
 msgstr ""
-"cor para o sufixo do apelido (o sufixo é uma string customizada exibida "
-"depois de um apelido)"
+"cor para o sufixo do apelido (string exibida depois do apelido no prefixo)"

 msgid "text color for highlighted prefix"
 msgstr "cor de texto para prefixo de destacado"
@@ -3614,10 +3610,10 @@ msgstr ""
 msgid "port for connecting to proxy server"
 msgstr ""

-msgid "username for proxy server"
+msgid "username for proxy server (note: content is evaluated, see /help eval)"
 msgstr ""

-msgid "password for proxy server"
+msgid "password for proxy server (note: content is evaluated, see /help eval)"
 msgstr ""

 msgid "Please enter your passphrase to decrypt the data secured by WeeChat:"
@@ -5773,8 +5769,11 @@ msgstr "tamanho da chave utilizada durante a Troca de Chaves Diffie-Hellman"
 msgid "check that the SSL connection is fully trusted"
 msgstr "verificar que a conexão SSL é totalmente confiável"

-msgid "password for server"
-msgstr "senha para o servidor"
+#, fuzzy
+msgid "password for server (note: content is evaluated, see /help eval)"
+msgstr ""
+"comando executado quando o WeeChat inicia, antes do carregamento dos plugins "
+"(nota: conteúdo é avaliado, veja /help eval)"

 #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
 msgid ""
@@ -6170,7 +6169,9 @@ msgid ""
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
 msgstr ""

-msgid "delay for filtering join/part/quit messages (in minutes)"
+msgid ""
+"delay for filtering join/part/quit messages (in minutes): if the nick did "
+"not speak during the last N minutes, the join/part/quit is filtered"
 msgstr ""

 #. TRANSLATORS: please do not translate "join"
@@ -7996,9 +7997,10 @@ msgstr ""
 msgid "maximum number of clients connecting to a port"
 msgstr "número máximo de clientes conectando-se a uma porta"

+#, fuzzy
 msgid ""
 "password required by clients to access this relay (empty value means no "
-"password required)"
+"password required) (note: content is evaluated, see /help eval)"
 msgstr ""
 "senha necessária para clientes acessarem este relay (vazio significa que "
 "nenhuma senha é necessária)"
@@ -19,17 +19,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.2-rc1\n"
+"Project-Id-Version: WeeChat 0.4.2-rc2\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-01 15:56+0200\n"
-"PO-Revision-Date: 2013-09-02 21:21+0200\n"
+"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"PO-Revision-Date: 2013-09-20 23:13+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Poedit-Bookmarks: -1,-1,608,-1,-1,-1,-1,-1,-1,-1\n"

 #. TRANSLATORS: "%s %s" after "compiled on" is date and time
@@ -1763,9 +1764,11 @@ msgid ""
 "\n"
 "Secured data with format ${sec.data.xxx} can be used in:\n"
 "  - command line argument \"--run-command\"\n"
+"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - proxy options: username, password\n"
 "  - irc server options: autojoin, command, password, sasl_{username|"
 "password}\n"
-"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - option relay.network.password\n"
 "  - command /eval.\n"
 "\n"
 "Examples:\n"
@@ -3173,11 +3176,11 @@ msgstr "адрес proxy-сервера (IP или хост)"
 msgid "port for connecting to proxy server"
 msgstr "порт, используемый при подключении к proxy-серверу"

-msgid "username for proxy server"
-msgstr "имя пользователя, используемое при подключения к proxy-серверу"
+msgid "username for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""

-msgid "password for proxy server"
-msgstr "пароль к proxy серверу"
+msgid "password for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""

 msgid "Please enter your passphrase to decrypt the data secured by WeeChat:"
 msgstr ""
@@ -5585,9 +5588,8 @@ msgstr ""
 msgid "check that the SSL connection is fully trusted"
 msgstr ""

-#, fuzzy
-msgid "password for server"
-msgstr "пароль, используемый при подключении к IRC серверу"
+msgid "password for server (note: content is evaluated, see /help eval)"
+msgstr ""

 #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
 msgid ""
@@ -5971,7 +5973,9 @@ msgid ""
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
 msgstr ""

-msgid "delay for filtering join/part/quit messages (in minutes)"
+msgid ""
+"delay for filtering join/part/quit messages (in minutes): if the nick did "
+"not speak during the last N minutes, the join/part/quit is filtered"
 msgstr ""

 #. TRANSLATORS: please do not translate "join"
@@ -7818,7 +7822,7 @@ msgstr ""

 msgid ""
 "password required by clients to access this relay (empty value means no "
-"password required)"
+"password required) (note: content is evaluated, see /help eval)"
 msgstr ""

 msgid ""
@@ -18,10 +18,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: WeeChat 0.4.2-rc1\n"
+"Project-Id-Version: WeeChat 0.4.2-rc2\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-01 15:56+0200\n"
-"PO-Revision-Date: 2013-09-02 21:21+0200\n"
+"POT-Creation-Date: 2013-09-20 16:43+0200\n"
+"PO-Revision-Date: 2013-09-20 23:12+0200\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: tr\n"
@@ -1569,9 +1569,11 @@ msgid ""
 "\n"
 "Secured data with format ${sec.data.xxx} can be used in:\n"
 "  - command line argument \"--run-command\"\n"
+"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - proxy options: username, password\n"
 "  - irc server options: autojoin, command, password, sasl_{username|"
 "password}\n"
-"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - option relay.network.password\n"
 "  - command /eval.\n"
 "\n"
 "Examples:\n"
@@ -2797,11 +2799,11 @@ msgstr ""
 msgid "port for connecting to proxy server"
 msgstr ""

-msgid "username for proxy server"
-msgstr "vekil sunucu için kullanıcı adı"
+msgid "username for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""

-msgid "password for proxy server"
-msgstr "vekil sunucu için parola"
+msgid "password for proxy server (note: content is evaluated, see /help eval)"
+msgstr ""

 msgid "Please enter your passphrase to decrypt the data secured by WeeChat:"
 msgstr ""
@@ -4913,8 +4915,8 @@ msgstr ""
 msgid "check that the SSL connection is fully trusted"
 msgstr ""

-msgid "password for server"
-msgstr "sunucu için parola"
+msgid "password for server (note: content is evaluated, see /help eval)"
+msgstr ""

 #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
 msgid ""
@@ -5261,7 +5263,9 @@ msgid ""
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
 msgstr ""

-msgid "delay for filtering join/part/quit messages (in minutes)"
+msgid ""
+"delay for filtering join/part/quit messages (in minutes): if the nick did "
+"not speak during the last N minutes, the join/part/quit is filtered"
 msgstr ""

 #. TRANSLATORS: please do not translate "join"
@@ -6948,7 +6952,7 @@ msgstr ""

 msgid ""
 "password required by clients to access this relay (empty value means no "
-"password required)"
+"password required) (note: content is evaluated, see /help eval)"
 msgstr ""

 msgid ""
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-09-01 15:56+0200\n"
+"POT-Creation-Date: 2013-09-20 16:43+0200\n"
 "PO-Revision-Date: 2013-02-14 18:20+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1573,9 +1573,11 @@ msgid ""
 "\n"
 "Secured data with format ${sec.data.xxx} can be used in:\n"
 "  - command line argument \"--run-command\"\n"
+"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - proxy options: username, password\n"
 "  - irc server options: autojoin, command, password, sasl_{username|"
 "password}\n"
-"  - options weechat.startup.command_{before|after}_plugins\n"
+"  - option relay.network.password\n"
 "  - command /eval.\n"
 "\n"
 "Examples:\n"
@@ -2801,10 +2803,10 @@ msgstr ""
 msgid "port for connecting to proxy server"
 msgstr ""

-msgid "username for proxy server"
+msgid "username for proxy server (note: content is evaluated, see /help eval)"
 msgstr ""

-msgid "password for proxy server"
+msgid "password for proxy server (note: content is evaluated, see /help eval)"
 msgstr ""

 msgid "Please enter your passphrase to decrypt the data secured by WeeChat:"
@@ -4872,7 +4874,7 @@ msgstr ""
 msgid "check that the SSL connection is fully trusted"
 msgstr ""

-msgid "password for server"
+msgid "password for server (note: content is evaluated, see /help eval)"
 msgstr ""

 #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
@@ -5220,7 +5222,9 @@ msgid ""
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
 msgstr ""

-msgid "delay for filtering join/part/quit messages (in minutes)"
+msgid ""
+"delay for filtering join/part/quit messages (in minutes): if the nick did "
+"not speak during the last N minutes, the join/part/quit is filtered"
 msgstr ""

 #. TRANSLATORS: please do not translate "join"
@@ -6912,7 +6916,7 @@ msgstr ""

 msgid ""
 "password required by clients to access this relay (empty value means no "
-"password required)"
+"password required) (note: content is evaluated, see /help eval)"
 msgstr ""

 msgid ""
@@ -6901,9 +6901,11 @@ command_init ()
                     "variable is used by WeeChat on /upgrade).\n\n"
                     "Secured data with format ${sec.data.xxx} can be used in:\n"
                     "  - command line argument \"--run-command\"\n"
+                     "  - options weechat.startup.command_{before|after}_plugins\n"
+                     "  - proxy options: username, password\n"
                     "  - irc server options: autojoin, command, password, "
                     "sasl_{username|password}\n"
-                     "  - options weechat.startup.command_{before|after}_plugins\n"
+                     "  - option relay.network.password\n"
                     "  - command /eval.\n\n"
                     "Examples:\n"
                     "  set a passphrase:\n"
@@ -99,8 +99,8 @@ struct t_config_option *config_look_color_real_white;
 struct t_config_option *config_look_command_chars;
 struct t_config_option *config_look_confirm_quit;
 struct t_config_option *config_look_day_change;
-struct t_config_option *config_look_day_change_message;
-struct t_config_option *config_look_day_change_message2;
+struct t_config_option *config_look_day_change_message_1date;
+struct t_config_option *config_look_day_change_message_2dates;
 struct t_config_option *config_look_eat_newline_glitch;
 struct t_config_option *config_look_emphasized_attributes;
 struct t_config_option *config_look_highlight;
@@ -2069,18 +2069,18 @@ config_weechat_init_options ()
        "day_change", "boolean",
        N_("display special message when day changes"),
        NULL, 0, 0, "on", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
-    config_look_day_change_message = config_file_new_option (
+    config_look_day_change_message_1date = config_file_new_option (
        weechat_config_file, ptr_section,
-        "day_change_message", "string",
+        "day_change_message_1date", "string",
        /* TRANSLATORS: string "${color:xxx}" must NOT be translated */
        N_("message displayed when the day has changed, with one date displayed "
           "(for example at beginning of buffer) (see man strftime for "
           "date/time specifiers) (note: content is evaluated, so you can use "
           "colors with format \"${color:xxx}\", see /help eval)"),
        NULL, 0, 0, "-- %a, %d %b %Y --", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
-    config_look_day_change_message2 = config_file_new_option (
+    config_look_day_change_message_2dates = config_file_new_option (
        weechat_config_file, ptr_section,
-        "day_change_message2", "string",
+        "day_change_message_2dates", "string",
        /* TRANSLATORS: string "${color:xxx}" must NOT be translated */
        N_("message displayed when the day has changed, with two dates displayed "
           "(between two messages); the second date specifiers must start with "
@@ -116,8 +116,8 @@ extern struct t_config_option *config_look_color_real_white;
 extern struct t_config_option *config_look_command_chars;
 extern struct t_config_option *config_look_confirm_quit;
 extern struct t_config_option *config_look_day_change;
-extern struct t_config_option *config_look_day_change_message;
-extern struct t_config_option *config_look_day_change_message2;
+extern struct t_config_option *config_look_day_change_message_1date;
+extern struct t_config_option *config_look_day_change_message_2dates;
 extern struct t_config_option *config_look_eat_newline_glitch;
 extern struct t_config_option *config_look_emphasized_attributes;
 extern struct t_config_option *config_look_highlight;
@@ -3333,6 +3333,8 @@ unhook (struct t_hook *hook)
 #endif
                break;
            case HOOK_TYPE_PRINT:
+                if (HOOK_PRINT(hook, tags_array))
+                    string_free_split (HOOK_PRINT(hook, tags_array));
                if (HOOK_PRINT(hook, message))
                    free (HOOK_PRINT(hook, message));
                break;
@@ -48,6 +48,7 @@

 #include "weechat.h"
 #include "wee-network.h"
+#include "wee-eval.h"
 #include "wee-hook.h"
 #include "wee-config.h"
 #include "wee-proxy.h"
@@ -238,17 +239,27 @@ int
 network_pass_httpproxy (struct t_proxy *proxy, int sock, const char *address,
                        int port)
 {
-    char buffer[256], authbuf[128], authbuf_base64[512];
+    char buffer[256], authbuf[128], authbuf_base64[512], *username, *password;
    int length;

    if (CONFIG_STRING(proxy->options[PROXY_OPTION_USERNAME])
        && CONFIG_STRING(proxy->options[PROXY_OPTION_USERNAME])[0])
    {
        /* authentication */
-        snprintf (authbuf, sizeof (authbuf), "%s:%s",
-                  CONFIG_STRING(proxy->options[PROXY_OPTION_USERNAME]),
-                  (CONFIG_STRING(proxy->options[PROXY_OPTION_PASSWORD])) ?
-                  CONFIG_STRING(proxy->options[PROXY_OPTION_PASSWORD]) : "");
+        username = eval_expression (CONFIG_STRING(proxy->options[PROXY_OPTION_USERNAME]),
+                                    NULL, NULL, NULL);
+        if (!username)
+            return 0;
+        password = eval_expression (CONFIG_STRING(proxy->options[PROXY_OPTION_PASSWORD]),
+                                    NULL, NULL, NULL);
+        if (!password)
+        {
+            free (username);
+            return 0;
+        }
+        snprintf (authbuf, sizeof (authbuf), "%s:%s", username, password);
+        free (username);
+        free (password);
        string_encode_base64 (authbuf, strlen (authbuf), authbuf_base64);
        length = snprintf (buffer, sizeof (buffer),
                           "CONNECT %s:%d HTTP/1.0\r\nProxy-Authorization: "
@@ -340,16 +351,22 @@ network_pass_socks4proxy (struct t_proxy *proxy, int sock, const char *address,
 {
    struct t_network_socks4 socks4;
    unsigned char buffer[24];
-    char ip_addr[NI_MAXHOST];
+    char ip_addr[NI_MAXHOST], *username;
    int length;

+    username = eval_expression (CONFIG_STRING(proxy->options[PROXY_OPTION_USERNAME]),
+                                NULL, NULL, NULL);
+    if (!username)
+        return 0;
+
    socks4.version = 4;
    socks4.method = 1;
    socks4.port = htons (port);
    network_resolve (address, ip_addr, NULL);
    socks4.address = inet_addr (ip_addr);
-    strncpy (socks4.user, CONFIG_STRING(proxy->options[PROXY_OPTION_USERNAME]),
-             sizeof (socks4.user) - 1);
+    strncpy (socks4.user, username, sizeof (socks4.user) - 1);
+
+    free (username);

    length = 8 + strlen (socks4.user) + 1;
    if (network_send_with_retry (sock, (char *) &socks4, length, 0) != length)
@@ -388,6 +405,7 @@ network_pass_socks5proxy (struct t_proxy *proxy, int sock, const char *address,
    unsigned char buffer[288];
    int username_len, password_len, addr_len, addr_buffer_len;
    unsigned char *addr_buffer;
+    char *username, *password;

    socks5.version = 5;
    socks5.nmethods = 1;
@@ -419,16 +437,29 @@ network_pass_socks5proxy (struct t_proxy *proxy, int sock, const char *address,
            return 0;

        /* authentication as in RFC 1929 */
-        username_len = strlen (CONFIG_STRING(proxy->options[PROXY_OPTION_USERNAME]));
-        password_len = strlen (CONFIG_STRING(proxy->options[PROXY_OPTION_PASSWORD]));
+        username = eval_expression (CONFIG_STRING(proxy->options[PROXY_OPTION_USERNAME]),
+                                    NULL, NULL, NULL);
+        if (!username)
+            return 0;
+        password = eval_expression (CONFIG_STRING(proxy->options[PROXY_OPTION_PASSWORD]),
+                                    NULL, NULL, NULL);
+        if (!password)
+        {
+            free (username);
+            return 0;
+        }
+        username_len = strlen (username);
+        password_len = strlen (password);

        /* make username/password buffer */
        buffer[0] = 1;
        buffer[1] = (unsigned char) username_len;
-        memcpy(buffer + 2, CONFIG_STRING(proxy->options[PROXY_OPTION_USERNAME]), username_len);
+        memcpy (buffer + 2, username, username_len);
        buffer[2 + username_len] = (unsigned char) password_len;
-        memcpy (buffer + 3 + username_len,
-                CONFIG_STRING(proxy->options[PROXY_OPTION_PASSWORD]), password_len);
+        memcpy (buffer + 3 + username_len, password, password_len);
+
+        free (username);
+        free (password);

        if (network_send_with_retry (sock, buffer, 3 + username_len + password_len, 0) < 3 + username_len + password_len)
            return 0;
@@ -337,7 +337,8 @@ proxy_create_option (const char *proxy_name, int index_option,
                ptr_option = config_file_new_option (
                    weechat_config_file, weechat_config_section_proxy,
                    option_name, "string",
-                    N_("username for proxy server"),
+                    N_("username for proxy server "
+                       "(note: content is evaluated, see /help eval)"),
                    NULL, 0, 0, value, NULL, 0,
                    NULL, NULL, NULL, NULL, NULL, NULL);
                break;
@@ -345,7 +346,8 @@ proxy_create_option (const char *proxy_name, int index_option,
                ptr_option = config_file_new_option (
                    weechat_config_file, weechat_config_section_proxy,
                    option_name, "string",
-                    N_("password for proxy server"),
+                    N_("password for proxy server "
+                       "(note: content is evaluated, see /help eval)"),
                    NULL, 0, 0, value, NULL, 0,
                    NULL, NULL, NULL, NULL, NULL, NULL);
                break;
@@ -606,13 +606,13 @@ gui_chat_display_day_changed (struct t_gui_window *window,
    if (date1)
    {
        strftime (temp_message, sizeof (temp_message),
-                  CONFIG_STRING(config_look_day_change_message2), date1);
+                  CONFIG_STRING(config_look_day_change_message_2dates), date1);
        strftime (message, sizeof (message), temp_message, date2);
    }
    else
    {
        strftime (message, sizeof (message),
-                  CONFIG_STRING(config_look_day_change_message), date2);
+                  CONFIG_STRING(config_look_day_change_message_1date), date2);
    }

    message_with_color = (strstr (message, "${")) ?
@@ -545,14 +545,14 @@ weechat_aspell_modifier_cb (void *data, const char *modifier,
    long unsigned int value;
    struct t_gui_buffer *buffer;
    struct t_aspell_speller_buffer *ptr_speller_buffer;
-    char *result, *ptr_string, *pos_space, *ptr_end, save_end;
+    char *result, *ptr_string, *pos_space, *ptr_end, *ptr_end_valid, save_end;
    char *word_for_suggestions, *old_suggestions, *suggestions;
    char *word_and_suggestions;
    const char *color_normal, *color_error, *ptr_suggestions;
    int utf8_char_int, char_size;
    int length, index_result, length_word, word_ok;
    int length_color_normal, length_color_error, rc;
-    int input_pos, current_pos, word_start_pos, word_end_pos;
+    int input_pos, current_pos, word_start_pos, word_end_pos, word_end_pos_valid;

    /* make C compiler happy */
    (void) data;
@@ -672,11 +672,9 @@ weechat_aspell_modifier_cb (void *data, const char *modifier,
        current_pos = 0;
        while (ptr_string[0])
        {
-            /* find start of word */
+            /* find start of word: it must start with an alphanumeric char */
            utf8_char_int = weechat_utf8_char_int (ptr_string);
-            while ((!iswalnum (utf8_char_int) && (utf8_char_int != '\'')
-                    && (utf8_char_int != '-'))
-                   || iswspace (utf8_char_int))
+            while ((!iswalnum (utf8_char_int)) || iswspace (utf8_char_int))
            {
                char_size = weechat_utf8_char_size (ptr_string);
                memcpy (result + index_result, ptr_string, char_size);
@@ -692,19 +690,29 @@ weechat_aspell_modifier_cb (void *data, const char *modifier,

            word_start_pos = current_pos;
            word_end_pos = current_pos;
+            word_end_pos_valid = current_pos;

-            /* find end of word */
+            /* find end of word: ' and - allowed in word, but not at the end */
+            ptr_end_valid = ptr_string;
            ptr_end = weechat_utf8_next_char (ptr_string);
            utf8_char_int = weechat_utf8_char_int (ptr_end);
            while (iswalnum (utf8_char_int) || (utf8_char_int == '\'')
                   || (utf8_char_int == '-'))
            {
-                ptr_end = weechat_utf8_next_char (ptr_end);
                word_end_pos++;
+                if (iswalnum (utf8_char_int))
+                {
+                    /* pointer to last alphanumeric char in the word */
+                    ptr_end_valid = ptr_end;
+                    word_end_pos_valid = word_end_pos;
+                }
+                ptr_end = weechat_utf8_next_char (ptr_end);
                if (!ptr_end[0])
                    break;
                utf8_char_int = weechat_utf8_char_int (ptr_end);
            }
+            ptr_end = weechat_utf8_next_char (ptr_end_valid);
+            word_end_pos = word_end_pos_valid;
            word_ok = 0;
            if (weechat_aspell_string_is_url (ptr_string))
            {
@@ -1578,7 +1578,8 @@ irc_config_server_new_option (struct t_config_file *config_file,
            new_option = weechat_config_new_option (
                config_file, section,
                option_name, "string",
-                N_("password for server"),
+                N_("password for server "
+                   "(note: content is evaluated, see /help eval)"),
                NULL, 0, 0,
                default_value, value,
                null_value_allowed,
@@ -2513,7 +2514,9 @@ irc_config_init ()
    irc_config_look_smart_filter_delay = weechat_config_new_option (
        irc_config_file, ptr_section,
        "smart_filter_delay", "integer",
-        N_("delay for filtering join/part/quit messages (in minutes)"),
+        N_("delay for filtering join/part/quit messages (in minutes): if the "
+           "nick did not speak during the last N minutes, the join/part/quit is "
+           "filtered"),
        NULL, 1, 60*24*7, "5", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
    irc_config_look_smart_filter_join = weechat_config_new_option (
        irc_config_file, ptr_section,
@@ -1296,7 +1296,7 @@ void
 relay_irc_recv (struct t_relay_client *client, const char *data)
 {
    char str_time[128], str_signal[128], str_server_channel[256];
-    char str_command[128], *target, **irc_argv, *pos;
+    char str_command[128], *target, **irc_argv, *pos, *password;
    const char *irc_command, *irc_channel, *irc_args, *irc_args2;
    int irc_argc, redirect_msg;
    const char *nick, *irc_is_channel, *isupport, *info, *pos_password;
@@ -1366,11 +1366,16 @@ relay_irc_recv (struct t_relay_client *client, const char *data)
                        pos_password = pos + 1;
                    }
                }
-                if (!RELAY_IRC_DATA(client, password_ok)
-                    && (strcmp (weechat_config_string (relay_config_network_password),
-                                pos_password) == 0))
+                if (!RELAY_IRC_DATA(client, password_ok))
                {
-                    RELAY_IRC_DATA(client, password_ok) = 1;
+                    password = weechat_string_eval_expression (weechat_config_string (relay_config_network_password),
+                                                               NULL, NULL, NULL);
+                    if (password)
+                    {
+                        if (strcmp (password, pos_password) == 0)
+                            RELAY_IRC_DATA(client, password_ok) = 1;
+                        free (password);
+                    }
                }
            }
        }
@@ -1773,9 +1778,10 @@ void
 relay_irc_alloc (struct t_relay_client *client)
 {
    struct t_relay_irc_data *irc_data;
-    const char *password;
+    char *password;

-    password = weechat_config_string (relay_config_network_password);
+    password = weechat_string_eval_expression (weechat_config_string (relay_config_network_password),
+                                               NULL, NULL, NULL);

    client->protocol_data = malloc (sizeof (*irc_data));
    if (client->protocol_data)
@@ -1792,6 +1798,9 @@ relay_irc_alloc (struct t_relay_client *client)
        RELAY_IRC_DATA(client, hook_signal_irc_disc) = NULL;
        RELAY_IRC_DATA(client, hook_hsignal_irc_redir) = NULL;
    }
+
+    if (password)
+        free (password);
 }

 /*
@@ -629,7 +629,8 @@ relay_config_init ()
        relay_config_file, ptr_section,
        "password", "string",
        N_("password required by clients to access this relay (empty value "
-            "means no password required)"),
+            "means no password required) (note: content is evaluated, see "
+           "/help eval)"),
        NULL, 0, 0, "", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
    relay_config_network_ssl_cert_key = weechat_config_new_option (
        relay_config_file, ptr_section,
@@ -165,7 +165,7 @@ relay_weechat_protocol_is_sync (struct t_relay_client *ptr_client,

 RELAY_WEECHAT_PROTOCOL_CALLBACK(init)
 {
-    char **options, *pos;
+    char **options, *pos, *password;
    int num_options, i, compression;

    RELAY_WEECHAT_PROTOCOL_MIN_ARGS(1);
@@ -182,10 +182,13 @@ RELAY_WEECHAT_PROTOCOL_CALLBACK(init)
                pos++;
                if (strcmp (options[i], "password") == 0)
                {
-                    if (strcmp (weechat_config_string (relay_config_network_password),
-                                pos) == 0)
+                    password = weechat_string_eval_expression (weechat_config_string (relay_config_network_password),
+                                                               NULL, NULL, NULL);
+                    if (password)
                    {
-                        RELAY_WEECHAT_DATA(client, password_ok) = 1;
+                        if (strcmp (password, pos) == 0)
+                            RELAY_WEECHAT_DATA(client, password_ok) = 1;
+                        free (password);
                    }
                }
                else if (strcmp (options[i], "compression") == 0)
@@ -167,9 +167,10 @@ void
 relay_weechat_alloc (struct t_relay_client *client)
 {
    struct t_relay_weechat_data *weechat_data;
-    const char *password;
+    char *password;

-    password = weechat_config_string (relay_config_network_password);
+    password = weechat_string_eval_expression (weechat_config_string (relay_config_network_password),
+                                               NULL, NULL, NULL);

    client->protocol_data = malloc (sizeof (*weechat_data));
    if (client->protocol_data)
@@ -198,6 +199,9 @@ relay_weechat_alloc (struct t_relay_client *client)

        relay_weechat_hook_signals (client);
    }
+
+    if (password)
+        free (password);
 }

 /*
Author	SHA1	Message	Date
Sebastien Helleu	1deba9894e	Version 0.4.2-rc2	2013-09-20 23:22:40 +02:00
Nils Görs	474a498b48	core: update german translations	2013-09-20 23:10:04 +02:00
Sebastien Helleu	a9ca95241d	aspell: fix detection of word start/end when there are apostrophes or minus chars before/after word (thanks to Nils Görs)	2013-09-20 19:31:34 +02:00
Sebastien Helleu	2fcdba1332	irc: add extra info in /help irc.look.smart_filter_delay	2013-09-20 16:47:34 +02:00
Sebastien Helleu	1b9b2434f6	doc: add plugin "script" in list of plugins (user's guide)	2013-09-20 15:34:24 +02:00
Sebastien Helleu	7f27d88ca6	core: add proxy options username/password in /help secure	2013-09-20 10:27:08 +02:00
Nils Görs	1aaf9440b8	core: update german translations	2013-09-19 16:40:37 +02:00
Sebastien Helleu	2110c6d92e	core: add support of secured data in proxy options username/password (evaluate content)	2013-09-19 15:12:04 +02:00
Sebastien Helleu	087e9cc008	irc: add note about evaluated content of "password" server option	2013-09-19 15:12:04 +02:00
Sebastien Helleu	e900579fba	relay: add support of secured data in option relay.network.password (evaluate content) (patch from Nils Görs)	2013-09-19 15:11:51 +02:00
Sebastien Helleu	252feedde4	core: fix memory leak on unhook of a print hook (if using tags)	2013-09-19 10:19:29 +02:00
Nils Görs	266b9e1e2a	core: update german translations	2013-09-17 07:27:49 +02:00
Sebastien Helleu	f620249193	doc: fix typo in french user's guide	2013-09-17 07:26:31 +02:00
Ivan Sichmann Freitas	556d324756	core: update portuguese translations	2013-09-16 11:24:45 +02:00
Sebastien Helleu	facccc81ef	doc: fix typos in french translations and docs	2013-09-16 11:04:10 +02:00
Nils Görs	cb77e7c5db	doc: update german translations, FAQ and user's guide	2013-09-05 07:31:42 +02:00
Sebastien Helleu	9c36b7c693	core: rename options weechat.look.day_change_message(2) to weechat.look.day_change_message_{1date\|2dates}	2013-09-03 10:27:14 +02:00