Version 1.2

core: update Japanese translations

AUTHORS.asciidoc

@@ -47,6 +47,7 @@ Alphabetically:
 * Jim Ramsay (lack)
 * Jiri Golembiovsky (GolemJ)
 * Julien Louis (ptitlouis)
+* Karthik K
 * Koka El Kiwi (KiwiDash)
 * Krzysztof Koroscik (soltys)
 * Kyle Fuller (kylef)

CMakeLists.txt

@@ -35,7 +35,7 @@ endif()
 
 # version
 set(VERSION_MAJOR "1")
-set(VERSION_MINOR "2-rc1")
+set(VERSION_MINOR "2")
 set(VERSION_PATCH "")
 if(VERSION_PATCH STREQUAL "")
   set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR})

ChangeLog.asciidoc

@@ -15,10 +15,12 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 (file 'ReleaseNotes.asciidoc' in sources).
 
 
-== Version 1.2 (under dev)
+== Version 1.2 (2015-05-10)
 
 === New features
 
+* core: add signals "signal_sigterm" and "signal_sigquit" (closes #114)
+* core: use environment variable WEECHAT_HOME on startup (closes #391)
 * core: remove WeeChat version from config files (closes #407)
 * core: add options weechat.look.quote_{nick_prefix|nick_suffix|time_format} to
   customize quoted messages in cursor mode (closes #403)
@@ -31,7 +33,14 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 * core: add option "-s" in command /eval to split expression before evaluating
   it (no more split by default) (closes #324)
 * core: add priority in plugins to initialize them in order
+* api: add support of environment variables in function
+  string_eval_expression() and command /eval
+* api: add support of full color option name in functions color() and
+  string_eval_expression() and in command /eval
 * api: add "_chat_line" (line pointer) in hashtable of hook_focus
+* irc: display a warning when the option irc.look.display_away is set to
+  "channel"
+* irc: optimize search of a nick in nicklist (up to 3x faster)
 * irc: add support of SHA-256 and SHA-512 algorithms in server option
   "ssl_fingerprint" (closes #281)
 * irc: add option "-noswitch" in command /query (closes #394)
@@ -44,10 +53,15 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 
 === Bugs fixed
 
+* core: add missing completions in command /input
 * guile: fix value returned in case of error in functions:
   config_option_reset, config_color, config_color_default, config_write,
   config_read, config_reload, hook_command, buffer_string_replace_local_var,
   command
+* irc: fix color of new nick in nick changes messages when option
+  irc.look.color_nicks_in_server_messages is off
+* irc: fix crash when setting an invalid regex with "/list -re" during a /list
+  server response (closes #412)
 * irc: fix display of PART messages on channels with +a (anonymous flag)
   (closes #396)
 * irc: remove useless rename of channel buffer on JOIN received with different

ReleaseNotes.asciidoc

@@ -17,7 +17,7 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
 (file 'ChangeLog.asciidoc' in sources).
 
 
-== Version 1.2 (under dev)
+== Version 1.2 (2015-05-10)
 
 The word chars are now customizable with two options:
 

configure.ac

@@ -24,7 +24,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 1.2-rc1, flashcode@flashtux.org)
+AC_INIT(WeeChat, 1.2, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([foreign])
@@ -58,7 +58,7 @@ solaris*)
 esac
 
 # Gettext
-ALL_LINGUAS="fr es cs hu de ru pl it ja pt_BR tr"
+ALL_LINGUAS="cs de es fr hu it ja pl pt_BR ru tr"
 AM_GNU_GETTEXT
 AM_GNU_GETTEXT_VERSION([0.18])
 

doc/de/autogen/user/weechat_commands.asciidoc

@@ -280,9 +280,10 @@ Einige Variablen werden im Ausdruck, mittels der Formatierung ${Variable}, erset
   2. Zeichen welche in einer Zeichenkette nicht dargestellt werden sollen (Format: "hide:Zeichen,Zeichenkette")
   3. eine Farbe (Format: color:xxx)
   4. eine Info (Format: "info:name,arguments", Argumente sind optional)
-  5. der Name einer Einstellung (Format: file.section.option)
-  6. der Name einer lokalen Variablen eines Buffer
-  7. ein hdata Name/Variable (der Wert wird automatisch als Zeichenkette konvertiert), standardmäßig wird für "window" und "buffer" das aktuelle Fenster/Buffer verwendet.
+  5. eine Umgebungsvariable (Format: "env:XXX")
+  6. der Name einer Programmoption (Format: file.section.option)
+  7. der Name einer lokalen Variablen eines Buffer
+  8. ein hdata Name/Variable (der Wert wird automatisch als Zeichenkette konvertiert), standardmäßig wird für "window" und "buffer" das aktuelle Fenster/Buffer verwendet.
 Das Format für hdata kann wie folgt aufgebaut sein:
   hdata.var1.var2...: startet mit hdata (der Pointer muss bekannt sein) und fragt eine Variable nach der anderen ab (weitere hdata können folgen)
   hdata[list].var1.var2...: startet hdata mittels einer Liste, zum Beispiel:
@@ -291,13 +292,14 @@ Das Format für hdata kann wie folgt aufgebaut sein:
 Die vorhandenen Namen für hdata und Variablen sind in der "Anleitung für API Erweiterung", Bereich "weechat_hdata_get". beschrieben
 
 Beispiele (einfache Zeichenketten):
-  /eval -n ${info:version}                 ==> 0.4.3
-  /eval -n ${weechat.look.scroll_amount}   ==> 3
-  /eval -n ${window}                       ==> 0x2549aa0
-  /eval -n ${window.buffer}                ==> 0x2549320
-  /eval -n ${window.buffer.full_name}      ==> core.weechat
-  /eval -n ${window.buffer.number}         ==> 1
-  /eval -n ${\t}                           ==> <tab>
+  /eval -n ${info:version}                     ==> 0.4.3
+  /eval -n ${env:HOME}                         ==> /home/user
+  /eval -n ${weechat.look.scroll_amount}       ==> 3
+  /eval -n ${window}                           ==> 0x2549aa0
+  /eval -n ${window.buffer}                    ==> 0x2549320
+  /eval -n ${window.buffer.full_name}          ==> core.weechat
+  /eval -n ${window.buffer.number}             ==> 1
+  /eval -n ${\t}                               ==> <tab>
   /eval -n ${hide:-,${relay.network.password}} ==> --------
 
 Beispiele (Bedingungen):

doc/de/cmdline_options.de.asciidoc

@@ -2,12 +2,14 @@
     deaktiviert das automatische Verbinden mit den Servern beim Start von WeeChat.
 
 *-c*, *--colors*::
-    Zeigt die Standardfarben im Terminal an.
+    zeigt die Standardfarben im Terminal an.
 
 *-d*, *--dir* '<path>'::
-    legt den Konfigurationsordner für WeeChat fest (Voreinstellung: ~/.weechat) in
-    dem die Erweiterungen, Skripten, Protokolldateien etc.pp. gesichert werden.
+    legt den Konfigurationsordner für WeeChat fest in welchem die Erweiterungen,
+    Skripten, Protokolldateien etc.pp. gesichert werden (Voreinstellung: ~/.weechat).
     Sollte das Verzeichnis nicht existieren wird es beim Start angelegt.
+    Wird diese Option nicht genutzt, wird die Umgebungsvariable WEECHAT_HOME genutzt
+    (sofern diese vorhanden ist).
 
 *-h*, *--help*::
     zeigt einen Hilfstext an.
@@ -19,14 +21,14 @@
     unterbindet das Laden der Erweiterungen beim Programmstart.
 
 *-r*, *--run-command* '<command>'::
-    startet einen oder mehrere Befehle, nachdem WeeChat gestartet wurde
+    führt einen oder mehrere Befehle aus, nachdem WeeChat gestartet wurde
     (mehrere Befehle müssen durch Kommata voneinander getrennt werden).
 
 *-s*, *--no-script*::
     Skripten werden beim Programmstart nicht geladen.
 
 *--upgrade*::
-    führt ein WeeChat Upgrade mittels Sitzungsdateien, die mit dem Befehl `/upgrade -quit` erstellt wurden, durch.
+    führt ein WeeChat Upgrade mit Sitzungsdateien durch, die mittels dem Befehl `/upgrade -quit` erstellt wurden.
 
 *-v*, *--version*::
     zeigt die Version von WeeChat an.

doc/de/weechat_user.de.asciidoc

@@ -92,78 +92,78 @@ Unter OS X kann http://brew.sh/[Homebrew] verwendet werden:
 folgende Tabelle beschreibt, welche Pakete zwingend notwendig sind um WeeChat
 zu kompilieren und welche Pakete optional genutzt werden können.
 
-[width="100%",cols="5,^3,^3,^3,.^13",options="header"]
+[width="100%",cols="5,^3,^3,.^13",options="header"]
 |===
-| Paket ^(1)^ | Min Version | Max Version | benötigt | Funktion
+| Paket ^(1)^ | Version | benötigt | Funktion
 
-| cmake | | | *ja* |
+| cmake | | *ja* |
   Zum kompilieren (autotools ist möglich. cmake wird aber empfohlen)
 
-| pkg-config | | | *ja* |
+| pkg-config | | *ja* |
   entdeckt installierte Bibliotheken
 
-| libncursesw5-dev ^(2)^ | | | *ja* |
+| libncursesw5-dev ^(2)^ | | *ja* |
   Ncurses Oberfläche
 
-| libcurl4-gnutls-dev | | | *ja* |
+| libcurl4-gnutls-dev | | *ja* |
   URL Transfer
 
-| zlib1g-dev | | | *ja* |
+| zlib1g-dev | | *ja* |
   Kompression für Pakete, die mittels Relay- (WeeChat Protokoll),
   Script-Erweiterung übertragen werden
 
-| libgcrypt20-dev | | | *ja* |
+| libgcrypt20-dev | | *ja* |
   Geschützte Daten, IRC SASL Authentifikation (DH-BLOWFISH/DH-AES),
   Skript-Erweiterung
 
-| libgnutls28-dev | 2.2.0 ^(3)^ | | |
+| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | |
   SSL Verbindung zu einem IRC Server, Unterstützung von SSL in der
   Relay-Erweiterung, IRC SASL Authentifikation (ECDSA-NIST256P-CHALLENGE)
 
-| gettext | | | |
+| gettext | | |
   Internationalisierung (Übersetzung der Mitteilungen; Hauptsprache ist
   englisch)
 
-| ca-certificates | | | |
+| ca-certificates | | |
   Zertifikate für SSL Verbindungen
 
-| libaspell-dev oder libenchant-dev | | | |
+| libaspell-dev oder libenchant-dev | | |
   Aspell Erweiterung
 
-| python-dev | 2.5 ^(4)^ | | |
+| python-dev | ≥ 2.5 ^(4)^ | |
   Python Erweiterung
 
-| libperl-dev | | | |
+| libperl-dev | | |
   Perl Erweiterung
 
-| ruby2.1-dev | 1.8 | | |
+| ruby2.1-dev | ≥ 1.8 | |
   Ruby Erweiterung
 
-| liblua5.2-dev | | | |
+| liblua5.2-dev | | |
   Lua Erweiterung
 
-| tcl-dev | 8.5 | | |
+| tcl-dev | ≥ 8.5 | |
   Tcl Erweiterung
 
-| guile-2.0-dev | 2.0 | | |
+| guile-2.0-dev | ≥ 2.0 | |
   Guile (scheme) Erweiterung
 
-| libv8-dev | | 3.24.3 | |
+| libv8-dev | ≤ 3.24.3 | |
   Javascript Erweiterung
 
-| asciidoc | 8.5.0 | | |
+| asciidoc | ≥ 8.5.0 | |
   Zum Erstellen der man page und der Dokumentation
 
-| source-highlight | | | |
+| source-highlight | | |
   Syntax Highlight für Quelltext in Dokumentation
 
-| xsltproc, docbook-xml, docbook-xsl | | | |
+| xsltproc, docbook-xml, docbook-xsl | | |
   Erstellt man page
 
-| libcpputest-dev | 3.4 | | |
+| libcpputest-dev | ≥ 3.4 | |
   Testlauf
 
-| C++ compiler | | | |
+| C++ compiler | | |
   Testlauf, javascript Erweiterung
 |===
 
@@ -857,45 +857,45 @@ Darstellung und die Standard-Bar 'nicklist' nutzt eine 'vertical' Darstellung.
 Einige Beispiele, wie die Bar 'nicklist' dargestellt werden kann:
 
 ....
-┌──────────────────────────────────────────────────┐
-│Welcome to #test, this is a test channel          │
-│12:54:15 peter | hey!                    │@carl   │
-│12:55:01  +Max | hello                   │@jessika│
-│                                         │@maddy  │
-│                                         │%Diego  │
-│                                         │%Melody │
-│                                         │+Max    │
-│                                         │ celia  │
-│                                         │ Eva    │
-│                                         │ freddy │
-│                                         │ Harold^│
-│                                         │ henry4 │
-│                                         │ jimmy17│
-│                                         │ jodie ▼│
-│[12:55] [6] [irc/freenode] 3:#test(+n){24}        │
-│[@carl] █                                         │
-└──────────────────────────────────────────────────┘
-                filling_left_right = vertical ▲
+┌───────────────────────────────────────────────────────────────────────┐
+│Welcome to #test, this is a test channel                               │
+│12:54:15 peter | hey!                                         │@carl   │
+│12:55:01  +Max | hello                                        │@jessika│
+│                                                              │@maddy  │
+│                                                              │%Diego  │
+│                                                              │%Melody │
+│                                                              │+Max    │
+│                                                              │ celia  │
+│                                                              │ Eva    │
+│                                                              │ freddy │
+│                                                              │ Harold^│
+│                                                              │ henry4 │
+│                                                              │ jimmy17│
+│                                                              │ jodie ▼│
+│[12:55] [6] [irc/freenode] 3:#test(+n){24}                             │
+│[@carl] █                                                              │
+└───────────────────────────────────────────────────────────────────────┘
+                                     filling_left_right = vertical ▲
 
-┌──────────────────────────────────────────────────┐
-│Welcome to #test, this is a test channel          │
-│12:54:15 peter | hey!           │@carl     lee    │
-│12:55:01  +Max | hello          │@jessika  louise │
-│                                │@maddy    mario  │
-│                                │%Diego    mark   │
-│                                │%Melody   peter  │
-│                                │+Max      Rachel │
-│                                │ celia    richard│
-│                                │ Eva      sheryl │
-│                                │ freddy   Vince  │
-│                                │ Harold^  warren │
-│                                │ henry4   zack   │
-│                                │ jimmy17         │
-│                                │ jodie           │
-│[12:55] [6] [irc/freenode] 3:#test(+n){24}        │
-│[@carl] █                                         │
-└──────────────────────────────────────────────────┘
-        filling_left_right = columns_vertical ▲
+┌───────────────────────────────────────────────────────────────────────┐
+│Welcome to #test, this is a test channel                               │
+│12:54:15 peter | hey!                                │@carl     lee    │
+│12:55:01  +Max | hello                               │@jessika  louise │
+│                                                     │@maddy    mario  │
+│                                                     │%Diego    mark   │
+│                                                     │%Melody   peter  │
+│                                                     │+Max      Rachel │
+│                                                     │ celia    richard│
+│                                                     │ Eva      sheryl │
+│                                                     │ freddy   Vince  │
+│                                                     │ Harold^  warren │
+│                                                     │ henry4   zack   │
+│                                                     │ jimmy17         │
+│                                                     │ jodie           │
+│[12:55] [6] [irc/freenode] 3:#test(+n){24}                             │
+│[@carl] █                                                              │
+└───────────────────────────────────────────────────────────────────────┘
+                             filling_left_right = columns_vertical ▲
 
 ┌───────────────────────────────────────────────────────────────────────┐
 │@carl    %Diego    celia    Harold^  jodie    mario    Rachel   Vince  │

doc/en/autogen/user/weechat_commands.asciidoc

@@ -280,9 +280,10 @@ Some variables are replaced in expression, using the format ${variable}, variabl
   2. a string with chars to hide (format: "hide:char,string")
   3. a color (format: "color:xxx")
   4. an info (format: "info:name,arguments", arguments are optional)
-  5. an option (format: "file.section.option")
-  6. a local variable in buffer
-  7. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
+  5. an environment variable (format: "env:XXX")
+  6. an option (format: "file.section.option")
+  7. a local variable in buffer
+  8. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
 Format for hdata can be one of following:
   hdata.var1.var2...: start with a hdata (pointer must be known), and ask variables one after one (other hdata can be followed)
   hdata[list].var1.var2...: start with a hdata using a list, for example:
@@ -292,6 +293,7 @@ For name of hdata and variables, please look at "Plugin API reference", function
 
 Examples (simple strings):
   /eval -n ${info:version}                     ==> 0.4.3
+  /eval -n ${env:HOME}                         ==> /home/user
   /eval -n ${weechat.look.scroll_amount}       ==> 3
   /eval -n ${window}                           ==> 0x2549aa0
   /eval -n ${window.buffer}                    ==> 0x2549320

doc/en/cmdline_options.en.asciidoc

@@ -8,6 +8,8 @@
     Set path as home for WeeChat (used for configuration files, logs, user
     plugins and scripts), default value is '~/.weechat' (note: directory is
     created if not found by WeeChat).
+    If this option is not given, the environment variable WEECHAT_HOME is used
+    (if not empty).
 
 *-h*, *--help*::
     Display help.

doc/en/weechat_plugin_api.en.asciidoc

@@ -1922,14 +1922,15 @@ expanded to last):
   `test`
 
 | `${color:name}` |
-  WeeChat color code (the name of color has optional attributes) |
+  WeeChat color code (the name of color has optional attributes),
+  see function <<_color,weechat_color>> for supported formats |
   `${color:red}red text` +
   `${color:*214}bold orange text` |
   `red text` (in red) +
   `bold orange text` (in bold orange)
 
 | `${info:name}` +
-  `${indo:name,arguments}` |
+  `${info:name,arguments}` |
   Info from WeeChat or a plugin, see function
   <<_info_get,weechat_info_get>> |
   `${info:version}` +
@@ -1937,6 +1938,12 @@ expanded to last):
   `1.0` +
   `lightblue`
 
+| `${env:NAME}` +
+  (_WeeChat ≥ 1.2_) |
+  Value of the environment variable `NAME` |
+  `${env:HOME}` |
+  `/home/user`
+
 | `${sec.data.name}` |
   Value of the secured data `name` |
   `${sec.data.freenode_pass}` |
@@ -6491,7 +6498,10 @@ const char *weechat_color (const char *color_name);
 Arguments:
 
 * 'color_name': name of color, one of:
-** WeeChat option name (from weechat.color.xxx), for example 'chat_delimiters'
+** WeeChat color option name (from weechat.color.xxx), for example
+   'chat_delimiters'
+** option name (format: file.section.option), for example
+   'irc.color.message_quit' (_WeeChat ≥ 1.2_)
 ** color with optional attributes/background (see below)
 ** attribute:
 *** 'bold': set bold
@@ -8378,6 +8388,16 @@ List of signals sent by WeeChat and plugins:
   String: arguments for /quit |
   Command `/quit` issued by user
 
+| weechat | signal_sigquit +
+  _(WeeChat ≥ 1.2)_ |
+  - |
+  Signal SIGQUIT received (quit request with core dump)
+
+| weechat | signal_sigterm +
+  _(WeeChat ≥ 1.2)_ |
+  - |
+  Signal SIGTERM received (graceful termination of WeeChat process)
+
 | weechat | signal_sigwinch +
   _(WeeChat ≥ 0.4.3)_ |
   - |

doc/en/weechat_user.en.asciidoc

@@ -86,75 +86,75 @@ On OS X, you can use http://brew.sh/[Homebrew]:
 Following table shows list of packages that are required or optional to
 compile WeeChat.
 
-[width="100%",cols="5,^3,^3,^3,.^13",options="header"]
+[width="100%",cols="5,^3,^3,.^13",options="header"]
 |===
-| Package ^(1)^ | Min version | Max version | Required | Feature
+| Package ^(1)^ | Version | Required | Feature
 
-| cmake | | | *yes* |
+| cmake | | *yes* |
   Build (autotools still possible, but cmake is recommended)
 
-| pkg-config | | | *yes* |
+| pkg-config | | *yes* |
   Detect installed libraries
 
-| libncursesw5-dev ^(2)^ | | | *yes* |
+| libncursesw5-dev ^(2)^ | | *yes* |
   Ncurses interface
 
-| libcurl4-gnutls-dev | | | *yes* |
+| libcurl4-gnutls-dev | | *yes* |
   URL transfer
 
-| zlib1g-dev | | | *yes* |
+| zlib1g-dev | | *yes* |
   Compression of packets in relay plugin (weechat protocol), script plugin
 
-| libgcrypt20-dev | | | *yes* |
+| libgcrypt20-dev | | *yes* |
   Secured data, IRC SASL authentication (DH-BLOWFISH/DH-AES), script plugin
 
-| libgnutls28-dev | 2.2.0 ^(3)^ | | |
+| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | |
   SSL connection to IRC server, support of SSL in relay plugin,
   IRC SASL authentication (ECDSA-NIST256P-CHALLENGE)
 
-| gettext | | | |
+| gettext | | |
   Internationalization (translation of messages; base language is English)
 
-| ca-certificates | | | |
+| ca-certificates | | |
   Certificates for SSL connections
 
-| libaspell-dev or libenchant-dev | | | |
+| libaspell-dev or libenchant-dev | | |
   Aspell plugin
 
-| python-dev | 2.5 ^(4)^ | | |
+| python-dev | ≥ 2.5 ^(4)^ | |
   Python plugin
 
-| libperl-dev | | | |
+| libperl-dev | | |
   Perl plugin
 
-| ruby2.1-dev | 1.8 | | |
+| ruby2.1-dev | ≥ 1.8 | |
   Ruby plugin
 
-| liblua5.2-dev | | | |
+| liblua5.2-dev | | |
   Lua plugin
 
-| tcl-dev | 8.5 | | |
+| tcl-dev | ≥ 8.5 | |
   Tcl plugin
 
-| guile-2.0-dev | 2.0 | | |
+| guile-2.0-dev | ≥ 2.0 | |
   Guile (scheme) plugin
 
-| libv8-dev | | 3.24.3 | |
+| libv8-dev | ≤ 3.24.3 | |
   Javascript plugin
 
-| asciidoc | 8.5.0 | | |
+| asciidoc | ≥ 8.5.0 | |
   Build man page and documentation
 
-| source-highlight | | | |
+| source-highlight | | |
   Syntax highlight for sources in documentation
 
-| xsltproc, docbook-xml, docbook-xsl | | | |
+| xsltproc, docbook-xml, docbook-xsl | | |
   Build of man page
 
-| libcpputest-dev | 3.4 | | |
+| libcpputest-dev | ≥ 3.4 | |
   Run tests
 
-| C++ compiler | | | |
+| C++ compiler | | |
   Run tests, javascript plugin
 |===
 
@@ -841,45 +841,45 @@ default bar 'nicklist' has 'vertical' filling.
 Some examples of filling for bar 'nicklist':
 
 ....
-┌──────────────────────────────────────────────────┐
-│Welcome to #test, this is a test channel          │
-│12:54:15 peter | hey!                    │@carl   │
-│12:55:01  +Max | hello                   │@jessika│
-│                                         │@maddy  │
-│                                         │%Diego  │
-│                                         │%Melody │
-│                                         │+Max    │
-│                                         │ celia  │
-│                                         │ Eva    │
-│                                         │ freddy │
-│                                         │ Harold^│
-│                                         │ henry4 │
-│                                         │ jimmy17│
-│                                         │ jodie ▼│
-│[12:55] [6] [irc/freenode] 3:#test(+n){24}        │
-│[@carl] █                                         │
-└──────────────────────────────────────────────────┘
-                filling_left_right = vertical ▲
+┌───────────────────────────────────────────────────────────────────────┐
+│Welcome to #test, this is a test channel                               │
+│12:54:15 peter | hey!                                         │@carl   │
+│12:55:01  +Max | hello                                        │@jessika│
+│                                                              │@maddy  │
+│                                                              │%Diego  │
+│                                                              │%Melody │
+│                                                              │+Max    │
+│                                                              │ celia  │
+│                                                              │ Eva    │
+│                                                              │ freddy │
+│                                                              │ Harold^│
+│                                                              │ henry4 │
+│                                                              │ jimmy17│
+│                                                              │ jodie ▼│
+│[12:55] [6] [irc/freenode] 3:#test(+n){24}                             │
+│[@carl] █                                                              │
+└───────────────────────────────────────────────────────────────────────┘
+                                     filling_left_right = vertical ▲
 
-┌──────────────────────────────────────────────────┐
-│Welcome to #test, this is a test channel          │
-│12:54:15 peter | hey!           │@carl     lee    │
-│12:55:01  +Max | hello          │@jessika  louise │
-│                                │@maddy    mario  │
-│                                │%Diego    mark   │
-│                                │%Melody   peter  │
-│                                │+Max      Rachel │
-│                                │ celia    richard│
-│                                │ Eva      sheryl │
-│                                │ freddy   Vince  │
-│                                │ Harold^  warren │
-│                                │ henry4   zack   │
-│                                │ jimmy17         │
-│                                │ jodie           │
-│[12:55] [6] [irc/freenode] 3:#test(+n){24}        │
-│[@carl] █                                         │
-└──────────────────────────────────────────────────┘
-        filling_left_right = columns_vertical ▲
+┌───────────────────────────────────────────────────────────────────────┐
+│Welcome to #test, this is a test channel                               │
+│12:54:15 peter | hey!                                │@carl     lee    │
+│12:55:01  +Max | hello                               │@jessika  louise │
+│                                                     │@maddy    mario  │
+│                                                     │%Diego    mark   │
+│                                                     │%Melody   peter  │
+│                                                     │+Max      Rachel │
+│                                                     │ celia    richard│
+│                                                     │ Eva      sheryl │
+│                                                     │ freddy   Vince  │
+│                                                     │ Harold^  warren │
+│                                                     │ henry4   zack   │
+│                                                     │ jimmy17         │
+│                                                     │ jodie           │
+│[12:55] [6] [irc/freenode] 3:#test(+n){24}                             │
+│[@carl] █                                                              │
+└───────────────────────────────────────────────────────────────────────┘
+                             filling_left_right = columns_vertical ▲
 
 ┌───────────────────────────────────────────────────────────────────────┐
 │@carl    %Diego    celia    Harold^  jodie    mario    Rachel   Vince  │

doc/fr/autogen/user/weechat_commands.asciidoc

@@ -280,9 +280,10 @@ Des variables sont remplacées dans l'expression, en utilisant le format ${varia
   2. une chaîne avec des caractères à cacher (format : "hide:caractère,chaîne")
   3. une couleur (format : "color:xxx")
   4. une info (format : "info:nom,paramètres", les paramètres sont optionnels)
-  5. une option (format : "fichier.section.option")
-  6. une variable locale du tampon
-  7. 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.
+  5. une variable d'environnement (format : "env:XXX")
+  6. une option (format : "fichier.section.option")
+  7. une variable locale du tampon
+  8. 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 :
@@ -292,6 +293,7 @@ Pour le nom du hdata et des variables, voir la "Référence API extension", fonc
 
 Exemples (chaînes simples) :
   /eval -n ${info:version}                     ==> 0.4.3
+  /eval -n ${env:HOME}                         ==> /home/user
   /eval -n ${weechat.look.scroll_amount}       ==> 3
   /eval -n ${window}                           ==> 0x2549aa0
   /eval -n ${window.buffer}                    ==> 0x2549320

doc/fr/cmdline_options.fr.asciidoc

@@ -9,6 +9,8 @@
     (utilisé pour les fichiers de configuration, logs, extensions
     et scripts de l'utilisateur), la valeur par défaut est '~/.weechat' (note :
     le répertoire est créé s'il n'est pas trouvé par WeeChat).
+    Si cette option n'est pas donnée, la variable d'environnement WEECHAT_HOME
+    est utilisée (si non vide).
 
 *-h*, *--help*::
     Afficher l'aide.

doc/fr/weechat_plugin_api.fr.asciidoc

@@ -1962,14 +1962,15 @@ première étendue à la dernière) :
   `test`
 
 | `${color:nom}` |
-  Code couleur WeeChat (le nom de couleur a des attributs facultatifs) |
+  Code couleur WeeChat (le nom de couleur a des attributs facultatifs),
+  voir la fonction <<_color,weechat_color>> pour les formats supportés |
   `${color:red}texte rouge` +
   `${color:*214}texte orange gras` |
   `texte rouge` (en rouge) +
   `texte orange gras` (en orange gras)
 
-| `${info:name}` +
-  `${indo:name,arguments}` |
+| `${info:nom}` +
+  `${info:nom,paramètres}` |
   Info de WeeChat ou d'une extension, voir la fonction
   <<_info_get,weechat_info_get>> |
   `${info:version}` +
@@ -1977,12 +1978,18 @@ première étendue à la dernière) :
   `1.0` +
   `lightblue`
 
+| `${env:NOM}` +
+  (_WeeChat ≥ 1.2_) |
+  Valeur de la variable d'environnement `NOM` |
+  `${env:HOME}` |
+  `/home/user`
+
 | `${sec.data.nom}` |
   Valeur de la donnée sécurisée `nom` |
   `${sec.data.freenode_pass}` |
   `mon_mot_de_passe`
 
-| `${file.section.option}` |
+| `${fichier.section.option}` |
   Valeur de l'option |
   `${weechat.look.buffer_time_format}` |
   `%H:%M:%S`
@@ -6587,7 +6594,10 @@ const char *weechat_color (const char *color_name);
 Paramètres :
 
 * 'color_name' : nom de la couleur, parmi :
-** une option WeeChat (de weechat.color.xxx), par exemple 'chat_delimiters'
+** le nom d'une option de couleur WeeChat (de weechat.color.xxx), par exemple
+  'chat_delimiters'
+** le nom d'une option (format: fichier.section.option), par exemple
+   'irc.color.message_quit' (_WeeChat ≥ 1.2_)
 ** une couleur avec des attributs/fond optionnels (voir ci-dessous)
 ** un attribut :
 *** 'bold' : activer le gras
@@ -8525,6 +8535,16 @@ Liste des signaux envoyés par WeeChat et les extensions :
   Chaîne : paramètres pour le /quit |
   La commande `/quit` a été exécutée par l'utilisateur
 
+| weechat | signal_sigquit +
+  _(WeeChat ≥ 1.2)_ |
+  - |
+  Signal SIGQUIT reçu (requête pour quitter avec une copie de la mémoire)
+
+| weechat | signal_sigterm +
+  _(WeeChat ≥ 1.2)_ |
+  - |
+  Signal SIGTERM reçu (arrêt propre du processus WeeChat)
+
 | weechat | signal_sigwinch +
   _(WeeChat ≥ 0.4.3)_ |
   - |

doc/fr/weechat_user.fr.asciidoc

@@ -88,78 +88,78 @@ Sous OS X, vous pouvez utiliser http://brew.sh/[Homebrew] :
 Le tableau suivant liste les paquets qui sont requis ou optionnels pour
 compiler WeeChat.
 
-[width="100%",cols="5,^3,^3,^3,.^13",options="header"]
+[width="100%",cols="5,^3,^3,.^13",options="header"]
 |===
-| Paquet ^(1)^ | Version min | Version max | Requis | Fonctionnalité
+| Paquet ^(1)^ | Version | Requis | Fonctionnalité
 
-| cmake | | | *oui* |
+| cmake | | *oui* |
   Construction (autotools toujours possible, mais cmake est recommandé)
 
-| pkg-config | | | *oui* |
+| pkg-config | | *oui* |
   Détection des bibliothèques installées
 
-| libncursesw5-dev ^(2)^ | | | *oui* |
+| libncursesw5-dev ^(2)^ | | *oui* |
   Interface ncurses
 
-| libcurl4-gnutls-dev | | | *oui* |
+| libcurl4-gnutls-dev | | *oui* |
   Transfert d'URL
 
-| zlib1g-dev | | | *oui* |
+| zlib1g-dev | | *oui* |
   Compression des paquets dans l'extension relay (protocole weechat),
   extension script
 
-| libgcrypt20-dev | | | *oui* |
+| libgcrypt20-dev | | *oui* |
   Données sécurisées, authentification IRC SASL (DH-BLOWFISH/DH-AES),
   extension script
 
-| libgnutls28-dev | 2.2.0 ^(3)^ | | |
+| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | |
   Connexion SSL au serveur IRC, support SSL dans l'extension relay,
   authentification IRC SASL (ECDSA-NIST256P-CHALLENGE)
 
-| gettext | | | |
+| gettext | | |
   Internationalisation (traduction des messages; la langue de base est
   l'anglais)
 
-| ca-certificates | | | |
+| ca-certificates | | |
   Certificats pour les connexions SSL
 
-| libaspell-dev ou libenchant-dev | | | |
+| libaspell-dev ou libenchant-dev | | |
   Extension aspell
 
-| python-dev | 2.5 ^(4)^ | | |
+| python-dev | ≥ 2.5 ^(4)^ | |
   Extension python
 
-| libperl-dev | | | |
+| libperl-dev | | |
   Extension perl
 
-| ruby2.1-dev | 1.8 | | |
+| ruby2.1-dev | ≥ 1.8 | |
   Extension ruby
 
-| liblua5.2-dev | | | |
+| liblua5.2-dev | | |
   Extension lua
 
-| tcl-dev | 8.5 | | |
+| tcl-dev | ≥ 8.5 | |
   Extension tcl
 
-| guile-2.0-dev | 2.0 | | |
+| guile-2.0-dev | ≥ 2.0 | |
   Extension guile (scheme)
 
-| libv8-dev | | 3.24.3 | |
+| libv8-dev | ≤ 3.24.3 | |
   Extension javascript
 
-| asciidoc | 8.5.0 | | |
+| asciidoc | ≥ 8.5.0 | |
   Construction de la page man et de la documentation
 
-| source-highlight | | | |
+| source-highlight | | |
   Coloration des sources dans la documentation
 
-| xsltproc, docbook-xml, docbook-xsl | | | |
+| xsltproc, docbook-xml, docbook-xsl | | |
   Construction de la page de manuel
 
-| libcpputest-dev | 3.4 | | |
+| libcpputest-dev | ≥ 3.4 | |
   Lancement des tests
 
-| C++ compiler | | | |
+| C++ compiler | | |
   Lancement des tests, extension javascript
 |===
 
@@ -865,45 +865,45 @@ Les barres par défaut 'title', 'status' et 'input' ont un remplissage
 Quelques exemples de remplissage pour la barre 'nicklist' :
 
 ....
-┌──────────────────────────────────────────────────┐
-│Welcome to #test, this is a test channel          │
-│12:54:15 peter | hey!                    │@carl   │
-│12:55:01  +Max | hello                   │@jessika│
-│                                         │@maddy  │
-│                                         │%Diego  │
-│                                         │%Melody │
-│                                         │+Max    │
-│                                         │ celia  │
-│                                         │ Eva    │
-│                                         │ freddy │
-│                                         │ Harold^│
-│                                         │ henry4 │
-│                                         │ jimmy17│
-│                                         │ jodie ▼│
-│[12:55] [6] [irc/freenode] 3:#test(+n){24}        │
-│[@carl] █                                         │
-└──────────────────────────────────────────────────┘
-                filling_left_right = vertical ▲
+┌───────────────────────────────────────────────────────────────────────┐
+│Welcome to #test, this is a test channel                               │
+│12:54:15 peter | hey!                                         │@carl   │
+│12:55:01  +Max | hello                                        │@jessika│
+│                                                              │@maddy  │
+│                                                              │%Diego  │
+│                                                              │%Melody │
+│                                                              │+Max    │
+│                                                              │ celia  │
+│                                                              │ Eva    │
+│                                                              │ freddy │
+│                                                              │ Harold^│
+│                                                              │ henry4 │
+│                                                              │ jimmy17│
+│                                                              │ jodie ▼│
+│[12:55] [6] [irc/freenode] 3:#test(+n){24}                             │
+│[@carl] █                                                              │
+└───────────────────────────────────────────────────────────────────────┘
+                                     filling_left_right = vertical ▲
 
-┌──────────────────────────────────────────────────┐
-│Welcome to #test, this is a test channel          │
-│12:54:15 peter | hey!           │@carl     lee    │
-│12:55:01  +Max | hello          │@jessika  louise │
-│                                │@maddy    mario  │
-│                                │%Diego    mark   │
-│                                │%Melody   peter  │
-│                                │+Max      Rachel │
-│                                │ celia    richard│
-│                                │ Eva      sheryl │
-│                                │ freddy   Vince  │
-│                                │ Harold^  warren │
-│                                │ henry4   zack   │
-│                                │ jimmy17         │
-│                                │ jodie           │
-│[12:55] [6] [irc/freenode] 3:#test(+n){24}        │
-│[@carl] █                                         │
-└──────────────────────────────────────────────────┘
-        filling_left_right = columns_vertical ▲
+┌───────────────────────────────────────────────────────────────────────┐
+│Welcome to #test, this is a test channel                               │
+│12:54:15 peter | hey!                                │@carl     lee    │
+│12:55:01  +Max | hello                               │@jessika  louise │
+│                                                     │@maddy    mario  │
+│                                                     │%Diego    mark   │
+│                                                     │%Melody   peter  │
+│                                                     │+Max      Rachel │
+│                                                     │ celia    richard│
+│                                                     │ Eva      sheryl │
+│                                                     │ freddy   Vince  │
+│                                                     │ Harold^  warren │
+│                                                     │ henry4   zack   │
+│                                                     │ jimmy17         │
+│                                                     │ jodie           │
+│[12:55] [6] [irc/freenode] 3:#test(+n){24}                             │
+│[@carl] █                                                              │
+└───────────────────────────────────────────────────────────────────────┘
+                             filling_left_right = columns_vertical ▲
 
 ┌───────────────────────────────────────────────────────────────────────┐
 │@carl    %Diego    celia    Harold^  jodie    mario    Rachel   Vince  │

doc/it/autogen/user/weechat_commands.asciidoc

@@ -280,9 +280,10 @@ Some variables are replaced in expression, using the format ${variable}, variabl
   2. a string with chars to hide (format: "hide:char,string")
   3. a color (format: "color:xxx")
   4. an info (format: "info:name,arguments", arguments are optional)
-  5. an option (format: "file.section.option")
-  6. a local variable in buffer
-  7. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
+  5. an environment variable (format: "env:XXX")
+  6. an option (format: "file.section.option")
+  7. a local variable in buffer
+  8. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
 Format for hdata can be one of following:
   hdata.var1.var2...: start with a hdata (pointer must be known), and ask variables one after one (other hdata can be followed)
   hdata[list].var1.var2...: start with a hdata using a list, for example:
@@ -292,6 +293,7 @@ For name of hdata and variables, please look at "Plugin API reference", function
 
 Examples (simple strings):
   /eval -n ${info:version}                     ==> 0.4.3
+  /eval -n ${env:HOME}                         ==> /home/user
   /eval -n ${weechat.look.scroll_amount}       ==> 3
   /eval -n ${window}                           ==> 0x2549aa0
   /eval -n ${window.buffer}                    ==> 0x2549320

doc/it/cmdline_options.it.asciidoc

@@ -4,10 +4,13 @@
 *-c*, *--colors*::
     Mostra i colori prefefiniti nel terminale.
 
+// TRANSLATION MISSING
 *-d*, *--dir* '<path>'::
     Imposta una directory come home per WeeChat (utilizzata per i file di
     configurazione, log, plugin e script dell'utente), il valore predefinito
     è ~/.weechat (nota: directory viene creata se non trovata da WeeChat).
+    If this option is not given, the environment variable WEECHAT_HOME is used
+    (if not empty).
 
 *-h*, *--help*::
     Mostra l'aiuto.

doc/it/weechat_plugin_api.it.asciidoc

@@ -1990,14 +1990,15 @@ expanded to last):
   `test`
 
 | `${color:name}` |
-  WeeChat color code (the name of color has optional attributes) |
+  WeeChat color code (the name of color has optional attributes),
+  see function <<_color,weechat_color>> for supported formats |
   `${color:red}red text` +
   `${color:*214}bold orange text` |
   `red text` (in red) +
   `bold orange text` (in bold orange)
 
 | `${info:name}` +
-  `${indo:name,arguments}` |
+  `${info:name,arguments}` |
   Info from WeeChat or a plugin, see function
   <<_info_get,weechat_info_get>> |
   `${info:version}` +
@@ -2005,6 +2006,12 @@ expanded to last):
   `1.0` +
   `lightblue`
 
+| `${env:NAME}` +
+  (_WeeChat ≥ 1.2_) |
+  Value of the environment variable `NAME` |
+  `${env:HOME}` |
+  `/home/user`
+
 | `${sec.data.name}` |
   Value of the secured data `name` |
   `${sec.data.freenode_pass}` |
@@ -6614,7 +6621,12 @@ const char *weechat_color (const char *color_name);
 Argomenti:
 
 * 'color_name': nome del colore, uno di:
-** nome opzione di WeeChat (da weechat.color.xxx), ad esempio 'chat_delimiters'
+// TRANSLATION MISSING
+** WeeChat color option name (from weechat.color.xxx), for example
+   'chat_delimiters'
+// TRANSLATION MISSING
+** option name (format: file.section.option), for example
+   'irc.color.message_quit' (_WeeChat ≥ 1.2_)
 ** colore con attributi/sfondo opzionali (vedi sotto)
 ** attributo:
 *** 'bold': imposta grassetto
@@ -8613,6 +8625,18 @@ List of signals sent by WeeChat and plugins:
   String: argomenti per /quit |
   Comando `/quit` digitato dall'utente
 
+// TRANSLATION MISSING
+| weechat | signal_sigquit +
+  _(WeeChat ≥ 1.2)_ |
+  - |
+  Signal SIGQUIT received (quit request with core dump)
+
+// TRANSLATION MISSING
+| weechat | signal_sigterm +
+  _(WeeChat ≥ 1.2)_ |
+  - |
+  Signal SIGTERM received (graceful termination of WeeChat process)
+
 // TRANSLATION MISSING
 | weechat | signal_sigwinch +
   _(WeeChat ≥ 0.4.3)_ |

doc/it/weechat_user.it.asciidoc

@@ -99,84 +99,83 @@ On OS X, you can use http://brew.sh/[Homebrew]:
 La seguente tabella mostra l'elenco di pacchetti richiesti o opzionali per
 compilare WeeChat.
 
-// TRANSLATION MISSING
-[width="100%",cols="5,^3,^3,^3,.^13",options="header"]
+[width="100%",cols="5,^3,^3,.^13",options="header"]
 |===
-| Pacchetto ^(1)^ | Min version | Max version | Richiesto | Caratteristica
+| Pacchetto ^(1)^ | Versione | Richiesto | Caratteristica
 
-| cmake | | | *sì* |
+| cmake | | *sì* |
   Compilazione (ancora possibile con autotools, ma si raccomanda cmake)
 
 // TRANSLATION MISSING
-| pkg-config | | | *sì* |
+| pkg-config | | *sì* |
   Detect installed libraries
 
-| libncursesw5-dev ^(2)^ | | | *sì* |
+| libncursesw5-dev ^(2)^ | | *sì* |
   Interfaccia ncurses
 
-| libcurl4-gnutls-dev | | | *sì* |
+| libcurl4-gnutls-dev | | *sì* |
   Trasferimento URL
 
 // TRANSLATION MISSING
-| zlib1g-dev | | | *sì* |
+| zlib1g-dev | | *sì* |
   Compression of packets in relay plugin (weechat protocol), script plugin
 
 // TRANSLATION MISSING
-| libgcrypt20-dev | | | *sì* |
+| libgcrypt20-dev | | *sì* |
   Secured data, IRC SASL authentication (DH-BLOWFISH/DH-AES), script plugin
 
 // TRANSLATION MISSING
-| libgnutls28-dev | 2.2.0 ^(3)^ | | |
+| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | |
   Connessione SSL al server IRC, support of SSL in relay plugin, IRC SASL
   authentication (ECDSA-NIST256P-CHALLENGE)
 
-| gettext | | | |
+| gettext | | |
   Internazionalizzazione (traduzione dei messaggi; la lingua base è l'inglese)
 
-| ca-certificates | | | |
+| ca-certificates | | |
   Certificati per le connessioni SSL
 
-| libaspell-dev o libenchant-dev | | | |
+| libaspell-dev o libenchant-dev | | |
   Plugin aspell
 
-| python-dev | 2.5 ^(4)^ | | |
+| python-dev | ≥ 2.5 ^(4)^ | |
   Plugin python
 
-| libperl-dev | | | |
+| libperl-dev | | |
   Plugin perl
 
-| ruby2.1-dev | 1.8 | | |
+| ruby2.1-dev | ≥ 1.8 | |
   Plugin ruby
 
-| liblua5.2-dev | | | |
+| liblua5.2-dev | | |
   Plugin lua
 
-| tcl-dev | 8.5 | | |
+| tcl-dev | ≥ 8.5 | |
   Plugin tcl
 
-| guile-2.0-dev | 2.0 | | |
+| guile-2.0-dev | ≥ 2.0 | |
   Plugin guile (scheme)
 
-| libv8-dev | | 3.24.3 | |
+| libv8-dev | ≤ 3.24.3 | |
   Plugin Javascript
 
 // TRANSLATION MISSING
-| asciidoc | 8.5.0 | | |
+| asciidoc | ≥ 8.5.0 | |
   Build man page and documentation
 
-| source-highlight | | | |
+| source-highlight | | |
   Evidenziazione della sintassi per i sorgenti nella documentazione
 
 // TRANSLATION MISSING
-| xsltproc, docbook-xml, docbook-xsl | | | |
+| xsltproc, docbook-xml, docbook-xsl | | |
   Build of man page
 
 // TRANSLATION MISSING
-| libcpputest-dev | 3.4 | | |
+| libcpputest-dev | ≥ 3.4 | |
   Run tests
 
 // TRANSLATION MISSING
-| C++ compiler | | | |
+| C++ compiler | | |
   Run tests, plugin Javascript
 |===
 
@@ -890,45 +889,45 @@ default bar 'nicklist' has 'vertical' filling.
 Some examples of filling for bar 'nicklist':
 
 ....
-┌──────────────────────────────────────────────────┐
-│Welcome to #test, this is a test channel          │
-│12:54:15 peter | hey!                    │@carl   │
-│12:55:01  +Max | hello                   │@jessika│
-│                                         │@maddy  │
-│                                         │%Diego  │
-│                                         │%Melody │
-│                                         │+Max    │
-│                                         │ celia  │
-│                                         │ Eva    │
-│                                         │ freddy │
-│                                         │ Harold^│
-│                                         │ henry4 │
-│                                         │ jimmy17│
-│                                         │ jodie ▼│
-│[12:55] [6] [irc/freenode] 3:#test(+n){24}        │
-│[@carl] █                                         │
-└──────────────────────────────────────────────────┘
-                filling_left_right = vertical ▲
+┌───────────────────────────────────────────────────────────────────────┐
+│Welcome to #test, this is a test channel                               │
+│12:54:15 peter | hey!                                         │@carl   │
+│12:55:01  +Max | hello                                        │@jessika│
+│                                                              │@maddy  │
+│                                                              │%Diego  │
+│                                                              │%Melody │
+│                                                              │+Max    │
+│                                                              │ celia  │
+│                                                              │ Eva    │
+│                                                              │ freddy │
+│                                                              │ Harold^│
+│                                                              │ henry4 │
+│                                                              │ jimmy17│
+│                                                              │ jodie ▼│
+│[12:55] [6] [irc/freenode] 3:#test(+n){24}                             │
+│[@carl] █                                                              │
+└───────────────────────────────────────────────────────────────────────┘
+                                     filling_left_right = vertical ▲
 
-┌──────────────────────────────────────────────────┐
-│Welcome to #test, this is a test channel          │
-│12:54:15 peter | hey!           │@carl     lee    │
-│12:55:01  +Max | hello          │@jessika  louise │
-│                                │@maddy    mario  │
-│                                │%Diego    mark   │
-│                                │%Melody   peter  │
-│                                │+Max      Rachel │
-│                                │ celia    richard│
-│                                │ Eva      sheryl │
-│                                │ freddy   Vince  │
-│                                │ Harold^  warren │
-│                                │ henry4   zack   │
-│                                │ jimmy17         │
-│                                │ jodie           │
-│[12:55] [6] [irc/freenode] 3:#test(+n){24}        │
-│[@carl] █                                         │
-└──────────────────────────────────────────────────┘
-        filling_left_right = columns_vertical ▲
+┌───────────────────────────────────────────────────────────────────────┐
+│Welcome to #test, this is a test channel                               │
+│12:54:15 peter | hey!                                │@carl     lee    │
+│12:55:01  +Max | hello                               │@jessika  louise │
+│                                                     │@maddy    mario  │
+│                                                     │%Diego    mark   │
+│                                                     │%Melody   peter  │
+│                                                     │+Max      Rachel │
+│                                                     │ celia    richard│
+│                                                     │ Eva      sheryl │
+│                                                     │ freddy   Vince  │
+│                                                     │ Harold^  warren │
+│                                                     │ henry4   zack   │
+│                                                     │ jimmy17         │
+│                                                     │ jodie           │
+│[12:55] [6] [irc/freenode] 3:#test(+n){24}                             │
+│[@carl] █                                                              │
+└───────────────────────────────────────────────────────────────────────┘
+                             filling_left_right = columns_vertical ▲
 
 ┌───────────────────────────────────────────────────────────────────────┐
 │@carl    %Diego    celia    Harold^  jodie    mario    Rachel   Vince  │

doc/ja/autogen/user/weechat_commands.asciidoc

@@ -280,9 +280,10 @@ expression: 評価する式、フォーマット、${variable} 型のフォー
   2. 隠す文字を含む文字列 (フォーマット: "hide:char,string")
   3. 色 (フォーマット: "color:xxx")
   4. 情報 (フォーマット: "info:name,arguments"、arguments は任意)
-  5. オプション (フォーマット: "file.section.option")
-  6. バッファのローカル変数
-  7. hdata の名前/変数 (値は自動的に文字列に変換されます)、デフォルトでは "window" と "buffer" は現在のウィンドウ/バッファを指します。
+  5. 環境変数 (フォーマット: "env:XXX")
+  6. オプション (フォーマット: "file.section.option")
+  7. バッファのローカル変数
+  8. hdata の名前/変数 (値は自動的に文字列に変換されます)、デフォルトでは "window" と "buffer" は現在のウィンドウ/バッファを指します。
 hdata のフォーマットは以下の 1 つです:
   hdata.var1.var2...: hdata (ポインタは既知) で始まり、1 個ずつ変数を続ける (他の hdata を続けることも可能)
   hdata(list).var1.var2...: リストを使って hdata を始める、例:
@@ -292,6 +293,7 @@ hdata と変数の名前については、"プラグイン API リファレン
 
 例 (単純な文字列):
   /eval -n ${info:version}                     ==> 0.4.3
+  /eval -n ${env:HOME}                         ==> /home/user
   /eval -n ${weechat.look.scroll_amount}       ==> 3
   /eval -n ${window}                           ==> 0x2549aa0
   /eval -n ${window.buffer}                    ==> 0x2549320

doc/ja/cmdline_options.ja.asciidoc

@@ -8,6 +8,8 @@
     WeeChat のホームディレクトリを path に設定 (設定ファイル、ログ、
     ユーザプラグイン、スクリプトに利用される)、初期値は '~/.weechat' 。
     (注意: パスが存在しない場合は WeeChat がディレクトリを作成します)
+    このオプションを指定しなかった場合、環境変数 WEECHAT_HOME を使います
+    (空でない限り)。
 
 *-h*, *--help*::
     ヘルプを表示

doc/ja/weechat_plugin_api.ja.asciidoc

@@ -1923,14 +1923,15 @@ char *weechat_string_eval_expression (const char *expr,
   `test`
 
 | `${color:name}` |
-  WeeChat 色コード (色名部分はオプション属性をとることも可能です) |
+  WeeChat 色コード (色名部分はオプション属性をとることも可能です),
+  フォーマットを確認するには関数 <<_color,weechat_color>> をご確認ください |
   `${color:red}red text` +
   `${color:*214}bold orange text` |
   `red text` (赤色で) +
   `bold orange text` (太字オレンジ色で)
 
 | `${info:name}` +
-  `${indo:name,arguments}` |
+  `${info:name,arguments}` |
   WeeChat またはプラグインのインフォ、<<_info_get,weechat_info_get>>
   を参照 |
   `${info:version}` +
@@ -1938,6 +1939,12 @@ char *weechat_string_eval_expression (const char *expr,
   `1.0` +
   `lightblue`
 
+| `${env:NAME}` +
+  (_WeeChat バージョン 1.2 以上で利用可_) |
+  Value of the environment variable `NAME` |
+  `${env:HOME}` |
+  `/home/user`
+
 | `${sec.data.name}` |
   セキュアデータ `name` の値 |
   `${sec.data.freenode_pass}` |
@@ -6492,7 +6499,10 @@ const char *weechat_color (const char *color_name);
 引数:
 
 * 'color_name': 色の名前、以下の中から 1 つ:
-** WeeChat オプション名 (weechat.color.xxx の xxx)、例えば 'chat_delimiters'
+** WeeChat 色オプション名 (weechat.color.xxx の xxx)、例えば
+   'chat_delimiters'
+** オプション名 (フォーマット: file.section.option)、例えば
+   'irc.color.message_quit' (_WeeChat バージョン 1.2 以上で利用可_)
 ** 任意で属性や背景色を指定した色 (以下を参照)
 ** 属性:
 *** 'bold': 太字を有効
@@ -8377,6 +8387,16 @@ WeeChat とプラグインが送信するシグナルのリスト:
   String: /quit の引数 |
   ユーザがコマンド `/quit` を実行
 
+| weechat | signal_sigquit +
+  _(WeeChat バージョン 1.2 以上で利用可)_ |
+  - |
+  SIGQUIT シグナルを受信 (コアダンプ付きで終了要求)
+
+| weechat | signal_sigterm +
+  _(WeeChat バージョン 1.2 以上で利用可)_ |
+  - |
+  SIGTERM シグナルを受信 (WeeChat プロセスを正常に終了させる)
+
 | weechat | signal_sigwinch +
   _(WeeChat バージョン 0.4.3 以上で利用可)_ |
   - |

doc/ja/weechat_user.ja.asciidoc

@@ -91,74 +91,74 @@ OS X では、http://brew.sh/[Homebrew] を使ってください:
 以下の表は WeeChat
 のコンパイルに必須または任意で必要なパッケージのリストです。
 
-[width="100%",cols="5,^3,^3,3^,.^13",options="header"]
+[width="100%",cols="5,^3,^3,.^13",options="header"]
 |===
-| パッケージ ^(1)^ | 最小バージョン | 最大バージョン | 要件 | 機能
+| パッケージ ^(1)^ | バージョン | 要件 | 機能
 
-| cmake | | | *必須* |
+| cmake | | *必須* |
   ビルド (autotools でも可能ですが、cmake を推奨します)
 
-| pkg-config | | | *必須* |
+| pkg-config | | *必須* |
   インストール済みライブラリを検出
 
-| libncursesw5-dev ^(2)^ | | | *必須* |
+| libncursesw5-dev ^(2)^ | | *必須* |
   ncurses インターフェイス
 
-| libcurl4-gnutls-dev | | | *必須* |
+| libcurl4-gnutls-dev | | *必須* |
   URL 転送
 
-| zlib1g-dev | | | *必須* |
+| zlib1g-dev | | *必須* |
   relay プラグインでパケットを圧縮 (weechat プロトコル)、スクリプトプラグイン
 
-| libgcrypt20-dev | | | *必須* |
+| libgcrypt20-dev | | *必須* |
   保護データ、IRC SASL 認証 (DH-BLOWFISH/DH-AES)、スクリプトプラグイン
 
-| libgnutls28-dev | 2.2.0 ^(3)^ | | |
+| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | |
   IRC サーバへの SSL 接続、IRC SASL 認証 (ECDSA-NIST256P-CHALLENGE)
 
-| gettext | | | |
+| gettext | | |
   国際化 (メッセージの翻訳; ベース言語は英語です)
 
-| ca-certificates | | | |
+| ca-certificates | | |
   SSL 接続に必要な証明書、relay プラグインで SSL サポート
 
-| libaspell-dev または libenchant-dev | | | |
+| libaspell-dev または libenchant-dev | | |
   aspell プラグイン
 
-| python-dev | 2.5 ^(4)^ | | |
+| python-dev | ≥ 2.5 ^(4)^ | |
   python プラグイン
 
-| libperl-dev | | | |
+| libperl-dev | | |
   perl プラグイン
 
-| ruby2.1-dev | 1.8 | | |
+| ruby2.1-dev | ≥ 1.8 | |
   ruby プラグイン
 
-| liblua5.2-dev | | | |
+| liblua5.2-dev | | |
   lua プラグイン
 
-| tcl-dev | 8.5 | | |
+| tcl-dev | ≥ 8.5 | |
   tcl プラグイン
 
-| guile-2.0-dev | 2.0 | | |
+| guile-2.0-dev | ≥ 2.0 | |
   guile (scheme) プラグイン
 
-| libv8-dev | | 3.24.3 | |
+| libv8-dev | ≤ 3.24.3 | |
   javascript プラグイン
 
-| asciidoc | 8.5.0 | | |
+| asciidoc | ≥ 8.5.0 | |
   man ページと文書のビルド
 
-| source-highlight | | | |
+| source-highlight | | |
   文書中のソースに対するシンタックスハイライト
 
-| xsltproc, docbook-xml, docbook-xsl | | | |
+| xsltproc, docbook-xml, docbook-xsl | | |
   man ページのビルド
 
-| libcpputest-dev | 3.4 | | |
+| libcpputest-dev | ≥ 3.4 | |
   テストの実行
 
-| C++ コンパイラ | | | |
+| C++ コンパイラ | | |
   テスト実行、javascript プラグイン
 |===
 
@@ -844,45 +844,45 @@ WeeChat を起動したターミナルの例:
 'nicklist' バーに対するフィリングの例:
 
 ....
-┌──────────────────────────────────────────────────┐
-│Welcome to #test, this is a test channel          │
-│12:54:15 peter | hey!                    │@carl   │
-│12:55:01  +Max | hello                   │@jessika│
-│                                         │@maddy  │
-│                                         │%Diego  │
-│                                         │%Melody │
-│                                         │+Max    │
-│                                         │ celia  │
-│                                         │ Eva    │
-│                                         │ freddy │
-│                                         │ Harold^│
-│                                         │ henry4 │
-│                                         │ jimmy17│
-│                                         │ jodie ▼│
-│[12:55] [6] [irc/freenode] 3:#test(+n){24}        │
-│[@carl] █                                         │
-└──────────────────────────────────────────────────┘
-                filling_left_right = vertical ▲
+┌───────────────────────────────────────────────────────────────────────┐
+│Welcome to #test, this is a test channel                               │
+│12:54:15 peter | hey!                                         │@carl   │
+│12:55:01  +Max | hello                                        │@jessika│
+│                                                              │@maddy  │
+│                                                              │%Diego  │
+│                                                              │%Melody │
+│                                                              │+Max    │
+│                                                              │ celia  │
+│                                                              │ Eva    │
+│                                                              │ freddy │
+│                                                              │ Harold^│
+│                                                              │ henry4 │
+│                                                              │ jimmy17│
+│                                                              │ jodie ▼│
+│[12:55] [6] [irc/freenode] 3:#test(+n){24}                             │
+│[@carl] █                                                              │
+└───────────────────────────────────────────────────────────────────────┘
+                                     filling_left_right = vertical ▲
 
-┌──────────────────────────────────────────────────┐
-│Welcome to #test, this is a test channel          │
-│12:54:15 peter | hey!           │@carl     lee    │
-│12:55:01  +Max | hello          │@jessika  louise │
-│                                │@maddy    mario  │
-│                                │%Diego    mark   │
-│                                │%Melody   peter  │
-│                                │+Max      Rachel │
-│                                │ celia    richard│
-│                                │ Eva      sheryl │
-│                                │ freddy   Vince  │
-│                                │ Harold^  warren │
-│                                │ henry4   zack   │
-│                                │ jimmy17         │
-│                                │ jodie           │
-│[12:55] [6] [irc/freenode] 3:#test(+n){24}        │
-│[@carl] █                                         │
-└──────────────────────────────────────────────────┘
-        filling_left_right = columns_vertical ▲
+┌───────────────────────────────────────────────────────────────────────┐
+│Welcome to #test, this is a test channel                               │
+│12:54:15 peter | hey!                                │@carl     lee    │
+│12:55:01  +Max | hello                               │@jessika  louise │
+│                                                     │@maddy    mario  │
+│                                                     │%Diego    mark   │
+│                                                     │%Melody   peter  │
+│                                                     │+Max      Rachel │
+│                                                     │ celia    richard│
+│                                                     │ Eva      sheryl │
+│                                                     │ freddy   Vince  │
+│                                                     │ Harold^  warren │
+│                                                     │ henry4   zack   │
+│                                                     │ jimmy17         │
+│                                                     │ jodie           │
+│[12:55] [6] [irc/freenode] 3:#test(+n){24}                             │
+│[@carl] █                                                              │
+└───────────────────────────────────────────────────────────────────────┘
+                             filling_left_right = columns_vertical ▲
 
 ┌───────────────────────────────────────────────────────────────────────┐
 │@carl    %Diego    celia    Harold^  jodie    mario    Rachel   Vince  │

doc/pl/autogen/user/aspell_commands.asciidoc

@@ -12,22 +12,22 @@
          deldict
          addword [<język>] <słowo>
 
-  enable: enable aspell
- disable: disable aspell
-  toggle: toggle aspell
-listdict: show installed dictionaries
- setdict: set dictionary for current buffer (multiple dictionaries can be separated by a comma)
- deldict: delete dictionary used on current buffer
- addword: add a word in personal aspell dictionary
+  enable: włącza aspell
+ disable: wyłącza aspell
+  toggle: przełącza aspell
+listdict: pokazuje zainstalowane słowniki
+ setdict: ustawia słownik dla obecnego buforu (kilka słowników może być podanych po przecinku)
+ deldict: usuwa słownik używany w obecnym buforze
+ addword: dodaje słowo do osobistego słownika aspell
 
-Input line beginning with a '/' is not checked, except for some commands (see /set aspell.check.commands).
+Jeśli wprowadzany tekst zaczyna się od '/' nie będzie on sprawdzany, za wyjątkiem kilku komend (zobacz /set aspell.check.commands).
 
-To enable aspell on all buffers, use option "default_dict", then enable aspell, for example:
+W celu włączenia aspell dla wszystkich buforów, należy użyć opcji "default_dict", następnie włączyć aspell, na przykład:
   /set aspell.check.default_dict "en"
   /aspell enable
 
-To display a list of suggestions in a bar, use item "aspell_suggest".
+W celu wyświetlenia listy sugestii na pasku, użyj elementu "aspell_suggest".
 
-Default key to toggle aspell is alt-s.
+Domyślny skrót klawiszowy przełączający aspell to alt-s.
 ----
 

doc/pl/autogen/user/irc_commands.asciidoc

@@ -551,12 +551,12 @@ demon2: prześlij do tego demona
 [command]*`query`* wysyła prywatną wiadomość do użytkownika::
 
 ----
-/query  [-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]
+/query  [-noswitch] [-server <serwer>] <nick>[,<nick>...] [<tekst>]
 
--noswitch: do not switch to new buffer
-   server: send to this server (internal name)
+-noswitch: nie przełączaj do nowego bufora
+   serwer: wyślij do tego serwera (nazwa wewnętrzna)
      nick: nick
-     text: text to send
+     tekst: wiadomość do wysłania
 ----
 
 [[command_irc_quiet]]
@@ -683,24 +683,24 @@ powód: powód
          del|keep <serwer>]
          deloutq|jump|raw
 
-    list: list servers (without argument, this list is displayed)
-listfull: list servers with detailed info for each server
-     add: create a new server
-  server: server name, for internal and display use
-hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
-    temp: create temporary server (not saved)
-  option: set option for server (for boolean option, value can be omitted)
-nooption: set boolean option to 'off' (for example: -nossl)
-    copy: duplicate a server
-  rename: rename a server
- reorder: reorder list of servers
-    keep: keep server in config file (for temporary servers only)
-     del: delete a server
- deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
-    jump: jump to server buffer
-     raw: open buffer with raw IRC data
+    list: wyświetla listę serwerów (bez argumentu wyświetlana jest ta lista)
+listfull: wyświetla listę serwerów ze szczegółowymi informacjami dla każdego serwera
+     add: tworzy nowy serwer
+  serwer: nazwa serwera, do użytku wewnętrznego i  wyświetlania
+host: nazwa albo adres IP serwera, z opcjonalnym numerem portu (domyślnie: 6667), wiele adresów należy rozdzielić przecinkiem
+    temp: tworzy serwer tymczasowy (nie zapisany)
+  opcja: ustawia opcję dla serwera (dla opcji boolowskich wartość może zostać pominięta)
+noopcja: ustawia opcje boolowskie na 'off' (na przykład: -nossl)
+    copy: duplikuje serwer
+  rename: zmienia nazwę serwera
+ reorder: zmienia kolejność na liście serwerów
+    keep: zachowuje serwer w pliku konfiguracyjnym (tylko dla serwerów tymczasowych)
+     del: usuwa serwer
+ deloutq: usuń wiadomości z kolejki dla wszystkich serwerów (wszystkie wiadomości jakie WeeChat obecnie wysyła)
+    jump: przechodzi do bufora serwera
+     raw: otwiera bufor z nieprzetworzonymi danymi IRC
 
-Examples:
+Przykłady:
   /server listfull
   /server add freenode chat.freenode.net
   /server add freenode chat.freenode.net/6697 -ssl -autoconnect

doc/pl/autogen/user/irc_options.asciidoc

@@ -498,7 +498,7 @@
 ** wartości: 0 .. 1000000 (domyślna wartość: `25`)
 
 * [[option_irc.server_default.capabilities]] *irc.server_default.capabilities*
-** opis: `comma-separated list of client capabilities to enable for server if they are available; capabilities supported by WeeChat are: account-notify, away-notify, extended-join, multi-prefix, server-time, userhost-in-names (example: "away-notify,multi-prefix")`
+** opis: `oddzielona przecinkami lista opcji klienta do włączenia dla serwera, jeśli są dostępne; opcje wspierane przez WeeChat: account-notify, away-notify, extended-join, multi-prefix, server-time, userhost-in-names (przykład: "away-notify,multi-prefix")`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `""`)
 
@@ -573,17 +573,17 @@
 ** wartości: continue, reconnect, disconnect (domyślna wartość: `continue`)
 
 * [[option_irc.server_default.sasl_key]] *irc.server_default.sasl_key*
-** opis: `file with ECC private key for mechanism "ecdsa-nist256p-challenge" ("%h" will be replaced by WeeChat home, "~/.weechat" by default)`
+** opis: `plik z kluczem prywatnym ECC dla mechanizmu "ecdsa-nist256p-challenge" ("%h" zostanie zastąpione katalogiem domowym WeeChat, domyślnie "~/.weechat")`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `""`)
 
 * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism*
-** opis: `mechanism for SASL authentication: "plain" for plain text password, "ecdsa-nist256p-challenge" for key-based challenge authentication, "external" for authentication using client side SSL cert, "dh-blowfish" for blowfish crypted password (insecure, not recommended), "dh-aes" for AES crypted password (insecure, not recommended)`
+** opis: `mechanizm autentykacji SASL: "plain" dla hasła w czystym tekście, "ecdsa-nist256p-challenge" uwierzytelnianie na podstawie pary kluczy, "external" dla uwierzytelnienia za pomocą certyfikatu SSL po stronie klienta",  "dh-blowfish" dla hasła szyfrowanego za pomocą blowfish (mało bezpieczne, niepolecane), "dh-aes" dla hasła szyfrowanego za pomocą AES (mało bezpieczne, niepolecane)`
 ** typ: liczba
 ** wartości: plain, ecdsa-nist256p-challenge, external, dh-blowfish, dh-aes (domyślna wartość: `plain`)
 
 * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
-** opis: `password for SASL authentication; this option is not used for mechanisms "ecdsa-nist256p-challenge" and "external" (note: content is evaluated, see /help eval)`
+** opis: `hasło dla uwierzytelniania SASL; ta opcja nie jest używana dla mechanizmów "ecdsa-nist256p-challenge" oraz "external"  (uwaga: zawartość jest przetwarzana, zobacz /help eval)`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `""`)
 
@@ -593,7 +593,7 @@
 ** wartości: 1 .. 3600 (domyślna wartość: `15`)
 
 * [[option_irc.server_default.sasl_username]] *irc.server_default.sasl_username*
-** opis: `username for SASL authentication; this option is not used for mechanism "external" (note: content is evaluated, see /help eval)`
+** opis: `nazwa użytkownika dla uwierzytelniania SASL; ta opcja nie jest używana dla mechanizmów "ecdsa-nist256p-challenge" oraz "external"  (uwaga: zawartość jest przetwarzana, zobacz /help eval)`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `""`)
 
@@ -613,7 +613,7 @@
 ** wartości: 0 .. 2147483647 (domyślna wartość: `2048`)
 
 * [[option_irc.server_default.ssl_fingerprint]] *irc.server_default.ssl_fingerprint*
-** opis: `fingerprint of certificate which is trusted and accepted for the server; only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many fingerprints can be separated by commas; if this option is set, the other checks on certificates are NOT performed (option "ssl_verify")`
+** opis: `skrót certyfikatu, który jest zaufany i akceptowany dla serwera; tylko cyfry heksadecymalne są dozwolone (0-9, a-f): 64 znaki dla SHA-512, 32 znaki dla SHA-256, 20 znaków dla SHA-1 (mało bezpieczne, nie zalecane); wiele skrótów można oddzielić przecinkami; jeśli ta opcja jest ustawiona, certyfikat NIE jest dalej sprawdzany (opcja "ssl_verify")`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `""`)
 

doc/pl/autogen/user/relay_options.asciidoc

@@ -83,7 +83,7 @@
 ** wartości: 0 .. 65535 (domyślna wartość: `256`)
 
 * [[option_relay.network.allowed_ips]] *relay.network.allowed_ips*
-** opis: `POSIX extended regular expression with IPs allowed to use relay (case insensitive, use "(?-i)" at beginning to make it case sensitive), example: "^(123.45.67.89|192.160.*)$"`
+** opis: `rozszerzone wyrażenia regularne POSIX z adresami IP dozwolonymi dla pośrednika (nie wrażliwe na wielkość znaków, umieszczenie "(?-i)" na początku sprawi, że wielość znaków będzie miała znaczenie), przykład: "^(123.45.67.89|192.160.*)$"`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `""`)
 

doc/pl/autogen/user/script_options.asciidoc

@@ -193,7 +193,7 @@
 ** wartości: dowolny ciąg (domyślna wartość: `""`)
 
 * [[option_script.scripts.url]] *script.scripts.url*
-** opis: `URL for file with list of scripts; by default HTTPS is forced, see option script.scripts.url_force_https`
+** opis: `adres pliku z listą skryptów; domyśłnie wymuszany jest protokół HTTPS, zobacz opcje script.scripts.url_force_https`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `"http://weechat.org/files/plugins.xml.gz"`)
 

doc/pl/autogen/user/weechat_commands.asciidoc

@@ -17,50 +17,50 @@ wiadomość: powód nieobecności (jeśli nie podano wiadomości status nieobecn
 
 ----
 /bar  list|listfull|listitems
-      add <name> <type>[,<conditions>] <position> <size> <separator> <item1>[,<item2>...]
+      add <nazwa> <typ>[,<warunek>] <pozycja> <rozmiar> <separator> <element1>[,<element2>...]
       default [input|title|status|nicklist]
-      del <name>|-all
-      set <name> <option> <value>
-      hide|show|toggle <name>
-      scroll <name> <window> <scroll_value>
+      del <nazwa>|-all
+      set <nazwa> <opcja> <wartość>
+      hide|show|toggle <nazwa>
+      scroll <nazwa> <okno> <wartość_przewinięcia>
 
-         list: list all bars
-     listfull: list all bars (verbose)
-    listitems: list all bar items
-          add: add a new bar
-         name: name of bar (must be unique)
-         type:   root: outside windows,
-               window: inside windows, with optional conditions (see below)
-   conditions: the conditions to display the bar:
-                 active: on active window
-               inactive: on inactive windows
-               nicklist: on windows with nicklist
-               other condition: see /help weechat.bar.xxx.conditions and /help eval
-               without conditions, the bar is always displayed
-     position: bottom, top, left or right
-         size: size of bar (in chars)
-    separator: 1 for using separator (line), 0 or nothing means no separator
-    item1,...: items for this bar (items can be separated by comma (space between items) or "+" (glued items))
-      default: create a default bar (all default bars if no bar name is given)
-          del: delete a bar (or all bars with -all)
-          set: set a value for a bar property
-       option: option to change (for options list, look at /set weechat.bar.<barname>.*)
-        value: new value for option
-         hide: hide a bar
-         show: show an hidden bar
-       toggle: hide/show a bar
-       scroll: scroll bar
-       window: window number (use '*' for current window or for root bars)
- scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', '-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to scroll by % of width/height, otherwise value is number of chars)
+         list: lista wszystkich pasków
+     listfull: lista wszystkich pasków (z polami)
+    listitems: lista wszystkich elementów pasków
+          add: dodaj nowy pasek
+         nazwa: nazwa paska (musi być unikalna)
+         typ:   root: poza oknami,
+               window: wewnątrz okien, z opcjonalnymi warunkami (patrz niżej)
+    warunek: warunek(i) dla wyświetlenia paska (tylko dla typu "window"):
+                 active: w aktywnym oknie
+               inactive: w nieaktywnym oknie
+               nicklist: w oknach z listą nicków
+               inne warunki: zobacz /help weechat.bar.xxx.conditions oraz /help eval
+               bez warunku pasek jest zawsze wyświetlany
+     pozycja: dół (bottom), góra (top), lewo (left) lub prawo (right)
+         rozmiar: rozmiar paska (w znakach)
+    separator: 1 dla użycia separatora (linia), 0  - brak separatora
+    element1,...: elementy dla tego paska (elementy mogą być oddzielone przecinkiem (przerwa między elementami) lub "+" (sklejone elementy))
+      default: tworzy domyślne paski (wszystkie domyślne paski, jeśli nie podamy nazwy)
+          del: usuwa pasek (lub wszystkie z użyciem -all)
+          set: ustawia wartość dla właściwości paska
+       opcja: opcja do zmiany (listę opcji można zobaczyć dzięki /set weechat.bar.<nazwa paska>.*)
+        wartość: nowa wartość opcji
+         hide: ukrywa pasek
+         show: pokazuje ukryty pasek
+       toggle: ukrywa/pokazuje pasek
+       scroll: przewija pasek
+       okno: numer okna ('*' oznacza obecne okno lub pasek typu root)
+ wartość_przewinięcia: wartość dla przewinięcia: 'x' lub 'y' (opcjonalne), następnie '+', '-', 'b' (początek) lub 'e' (koniec), wartość (dla +/-), oraz opcjonalnie % (w celu przesunięcia % szerokości/wysokości, w przeciwnym wypadku wartość jest ilością znaków)
 
-Examples:
-  create a bar with time, buffer number + name, and completion:
+Przykłady:
+  tworzy pasek z czasem, numerem  + nazwą bufora i dopełnianiem:
     /bar add mybar root bottom 1 0 [time],buffer_number+:+buffer_name,completion
-  hide a bar:
+  ukrywa pasek:
     /bar hide mybar
-  scroll nicklist 10 lines down on current buffer:
+  przewija listę nicków a obecnym buforze o 10 linii w dół :
     /bar scroll nicklist * y+10
-  scroll to end of nicklist on current buffer:
+  przewija do końca listę nicków w obecnym buforze:
     /bar scroll nicklist * ye
 ----
 
@@ -186,30 +186,30 @@ komenda: komenda do wywołania ( '/' jest automatycznie dodawane jeśli nie wyst
          move up|down|left|right|area_up|area_down|area_left|area_right
          stop
 
-  go: move cursor to chat area, a bar (using bar name) or coordinates "x,y"
-move: move cursor with direction
-stop: stop cursor mode
+  go: przesuwa kursor do obszaru rozmowy, paska (używając nazwy paska) lub położenia "x,y"
+move: przesuwa kursor w kierunku
+stop: wyłącza tryb kursora
 
-Without argument, this command toggles cursor mode.
+Bez argumentu komenda przełącza obsługę kursora.
 
-When mouse is enabled (see /help mouse), by default a middle click will start cursor mode at this point.
+Kiedy obsługa myszy jest włączona (zobacz /help mouse), domyślnie wciśnięcie środkowego przycisku włącza tryb kursora we wskazanym punkcie.
 
-Default keys in cursor mode on chat messages:
-  m  quote message
-  q  quote prefix + message
-  Q  quote time + prefix + message
+Domyślne skróty dla trybu kursora w oknie rozmowy:
+  m  cytuj wiadomość
+  q  cytuj prefiks + wiadomość
+  Q  cytuj czas + prefiks + wiadomość
 
-Default keys in cursor mode on nicklist:
-  b  ban nick (/ban)
-  k  kick nick (/kick)
-  K  kick and ban nick (/kickban)
-  q  open query with nick (/query)
-  w  query information about user (/whois)
+Domyślne skróty dla trybu kursora na liście nicków:
+  b  zbanuj nick (/ban)
+  k  wykop nick (/kick)
+  K  wykop i zbanuj nick (/kickban)
+  q  otworz okno prywatnej rozmowy (/query)
+  w  zapytaj o informacje o użytkowniku (/whois)
 
-Examples:
-  go to nicklist:
+Przykłady:
+  przejdź do listy nicków:
     /cursor go nicklist
-  go to coordinates x=10, y=5:
+  przejdź do współrzędnych x=10, y=5:
     /cursor go 10,5
 ----
 
@@ -248,50 +248,52 @@ infolists: wyświetla informacje o infolistach
 [command]*`eval`* przetwórz wyrażenie::
 
 ----
-/eval  [-n|-s] <expression>
-       [-n] -c <expression1> <operator> <expression2>
+/eval  [-n|-s] <wyrażenie>
+       [-n] -c <wyrażenie1> <operator> <wyrażenie2>
 
-        -n: display result without sending it to buffer (debug mode)
-        -s: split expression before evaluating it (many commands can be separated by semicolons)
-        -c: evaluate as condition: use operators and parentheses, return a boolean value ("0" or "1")
-expression: expression to evaluate, variables with format ${variable} are replaced (see below); many commands can be separated by semicolons
-  operator: a logical or comparison operator:
-            - logical operators:
-                &&  boolean "and"
-                ||  boolean "or"
-            - comparison operators:
-                ==  equal
-                !=  not equal
-                <=  less or equal
-                <   less
-                >=  greater or equal
-                >   greater
-                =~  is matching POSIX extended regex
-                !~  is NOT matching POSIX extended regex
+        -n: wyświetla wynik bez wysyłania go do buforu (tryb debugowania)
+        -s: podziel wyażenie przed przetworzeniem go (wiele komend może być oddzielonych średnikami)
+        -c: przetwarza jako warunek: użyj operatorów i nawiasów, zwraca wartość logiczną ("0" lub "1")
+wyrażenie: wyrażenie do przetworzenia, zmienne o formacie ${zmienna} są zastępowane (zobacz niżej); wiele komend można oddzielić średnikami
+  operator: operator logiczny lub porównania:
+            - operatory logiczne:
+                &&  boolowskie "i"
+                ||  boolowskie "lub"
+            - operatory porównania:
+                ==  równy
+                !=  różny
+                <=  mniejszy lub równy
+                <   mniejszy
+                >=  większy lub równy
+                >   większy
+                =~  pasuje do rozszerzonego wyrażenia regularnego POSIX
+                !~  NIE pasuje do rozszerzonego wyrażenia regularnego POSIX
 
-An expression is considered as "true" if it is not NULL, not empty, and different from "0".
-The comparison is made using integers if the two expressions are valid integers.
-To force a string comparison, add double quotes around each expression, for example:
+Wyrażenie jest uznawane za "prawdziwe" jeśli nie jest NULL, nie jest puste, oraz różni się od "0".
+Porównania dokonuje się z użyciem liczb całkowitych jeśli oba wyrażenia są liczbami całkowitymi.
+W celu wymuszenia porównywania ciągów, należy umieścić każde wyrażenie w cudzysłowie, na przykład:
   50 > 100      ==> 0
   "50" > "100"  ==> 1
 
-Some variables are replaced in expression, using the format ${variable}, variable can be, by order of priority:
-  1. a string with escaped chars (format: "esc:xxx" or "\xxx")
-  2. a string with chars to hide (format: "hide:char,string")
-  3. a color (format: "color:xxx")
-  4. an info (format: "info:name,arguments", arguments are optional)
-  5. an option (format: "file.section.option")
-  6. a local variable in buffer
-  7. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
-Format for hdata can be one of following:
-  hdata.var1.var2...: start with a hdata (pointer must be known), and ask variables one after one (other hdata can be followed)
-  hdata[list].var1.var2...: start with a hdata using a list, for example:
-    ${buffer[gui_buffers].full_name}: full name of first buffer in linked list of buffers
-    ${plugin[weechat_plugins].name}: name of first plugin in linked list of plugins
-For name of hdata and variables, please look at "Plugin API reference", function "weechat_hdata_get".
+Niektóre zmienne w wyrażeniach są zamieniane, poprzez zastosowanie formatu ${zmienna}, według priorytetu zmienną może być:
+  1. ciąg z wyescapowanymi znakami (format: "esc:xxx" lub "\xxx")
+  2. ciąg ze znakami do ukrycia (format: "hide:char,string")
+  3. kolor (format color:xxx)
+  4. informacja (format: "info:nazwa,argumenty", argumenty są opcjonalne)
+  5. zmienna środowiskowa (format: "env:XXX")
+  6. opcja (format: plik.sekcja.opcja)
+  7. zmienna lokalna w buforze
+  8. nazwa hdatay/zmiennej (wartość jest automatycznie konwertowana na ciąg znaków), domyślnie "window" i "buffer" wskazują na aktualne okno/bufor.
+Format dla hdata może być jednym z poniższych:
+  hdata.zmienna1.zmienna2...: inicjuje hdata (wskaźnik musi być znany), następnie wypytuje zmienne jedna po drugiej (inne hdata mogą być następne)
+  hdata[list].zmienna1.zmienna2...: inicjuje hdata z wykorzystaniem listy, na przykład:
+    ${buffer[gui_buffers].full_name}: pełna nazwa buforu w połączonej liście buforów
+    ${plugin[weechat_plugins].name}: nazwa pierwszej wtyczki w połączonej liście wtyczek
+Nazwy hdata i zmiennych, można znaleźć w  "Opisie API wtyczek", fukcja "weechat_hdata_get".
 
-Examples (simple strings):
+Przykłady (proste ciągi):
   /eval -n ${info:version}                     ==> 0.4.3
+  /eval -n ${env:HOME}                         ==> /home/user
   /eval -n ${weechat.look.scroll_amount}       ==> 3
   /eval -n ${window}                           ==> 0x2549aa0
   /eval -n ${window.buffer}                    ==> 0x2549320
@@ -300,7 +302,7 @@ Examples (simple strings):
   /eval -n ${\t}                               ==> <tab>
   /eval -n ${hide:-,${relay.network.password}} ==> --------
 
-Examples (conditions):
+Przykłady (warunki):
   /eval -n -c ${window.buffer.number} > 2 ==> 0
   /eval -n -c ${window.win_width} > 100   ==> 1
   /eval -n -c (8 > 12) || (5 > 2)         ==> 1
@@ -321,57 +323,57 @@ Examples (conditions):
          rename <nazwa> <nowa_nazwa>
          del <nazwa>|-all
 
-   list: list all filters
- enable: enable filters (filters are enabled by default)
-disable: disable filters
- toggle: toggle filters
-   name: filter name ("@" = enable/disable all filters in current buffer)
-    add: add a filter
- rename: rename a filter
-    del: delete a filter
-   -all: delete all filters
- buffer: comma separated list of buffers where filter is active:
-         - this is full name including plugin (example: "irc.freenode.#weechat" or "irc.server.freenode")
-         - "*" means all buffers
-         - a name starting with '!' is excluded
-         - wildcard "*" is allowed
-   tags: comma separated list of tags, for example "irc_join,irc_part,irc_quit"
-         - logical "and": use "+" between tags (for example: "nick_toto+irc_action")
-         - wildcard "*" is allowed
-         - if tag starts with '!', then it is excluded and must NOT be in message
-  regex: POSIX extended regular expression to search in line
-         - use '\t' to separate prefix from message, special chars like '|' must be escaped: '\|'
-         - if regex starts with '!', then matching result is reversed (use '\!' to start with '!')
-         - two regular expressions are created: one for prefix and one for message
-         - regex are case insensitive, they can start by "(?-i)" to become case sensitive
+   list: wyświetla wszystkie filtry
+ enable: włącza filtry (filtry są domyślnie włączone)
+disable: wyłącza filtry
+ toggle: przełącza filtry
+  nazwa: nazwa filtru ("@" = włącza/wyłącza wszystkie filtry w obecnym buforze)
+    add: dodaje filtr
+ rename: zmienia nazwę filtru
+    del: usuwa filtr
+   -all: usuwa wszystkie filtry
+ bufor: oddzielona przecinkami lisa buforów, dla których filtr jest aktywny:
+         - jest to pełna nazwa zawierająca wtyczkę (przykład: "irc.freenode.#weechat" lub "irc.server.freenode")
+         - "*" oznacza wszystkie bufory
+         - nazwa zaczynająca się od '!' jest wykluczana
+         - dozwolony jest znak "*"
+   tagi: lista tagów oddzielona przecinkiem, np: "irc_join,irc_part,irc_quit"
+         - logiczne "i": użyj "+" pomiędzy tagami (na przykład: "nick_toto+irc_action")
+         - dozwolony jest znak "*"
+         - jeśli tag zaczyna się od '!', wtedy jest on wykluczony i NIE może znajdować się w wiadomości
+  regex: rozszerzone wyrażenie regularne POSIX do wyszukania w linii
+         - użyj '\t' do oddzielenia prefiksu od wiadomości, znaki specjalne jak '|' muszą zostać poprzedzone '\' np: '\|'
+         - jeśli wyrażenie zaczyna się od '!', wtedy pasujący wynik jest odwracany (użyj '\!', aby zacząć od '!')
+         - dwa wyrażenia są tworzone: jedno dla prefiksu, drugie dla wiadomości
+         - wielkość znaków nie ma znaczenia dla wyrażeń, jeśli zaczynają się od "(?-i)" wielkość znaków ma znaczenie
 
-The default key alt+'=' toggles filtering on/off.
+Domyślny skrót klawiszowy alt+'=' włącza/wyłącza filtrowanie.
 
-Tags most commonly used:
+Najczęściej używane tagi:
   no_filter, no_highlight, no_log, log0..log9 (log level),
   notify_none, notify_message, notify_private, notify_highlight,
   nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of nick),
   host_xxx (xxx is username + host in message),
   irc_xxx (xxx is command name or number, see /server raw or /debug tags),
   irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
-To see tags for lines in buffers: /debug tags
+Aby zobaczyć listę tagów w liniach buforów wykonaj: /debug tags
 
-Examples:
-  use IRC smart filter on all buffers:
+Przykłady:
+  użyj inteligentnego filtru we wszystkich buforach IRC:
     /filter add irc_smart * irc_smart_filter *
-  use IRC smart filter on all buffers except those with "#weechat" in name:
+  użyj inteligentnego filtru we wszystkich buforach IRC poza tymi zawierającymi "#weechat" w nazwie:
     /filter add irc_smart *,!*#weechat* irc_smart_filter *
-  filter all IRC join/part/quit messages:
+  filtruj wszystkie wiadomości IRC o join/part/quit:
     /filter add joinquit * irc_join,irc_part,irc_quit *
-  filter nicks displayed when joining channels or with /names:
+  filtruj nicki wyświetlane przy wejściu na kanał albo za pomocą /names:
     /filter add nicks * irc_366 *
-  filter nick "toto" on IRC channel #weechat:
+  filtruj nick "toto" na kanale IRC #weechat:
     /filter add toto irc.freenode.#weechat nick_toto *
-  filter IRC join/action messages from nick "toto":
+  filtruj wejścia/akcje IRC od użytkownika "toto":
     /filter add toto * nick_toto+irc_join,nick_toto+irc_action *
-  filter lines containing "weechat sucks" on IRC channel #weechat:
+  filtruj linie zawierające fraze "weechat sucks" na kanale IRC #weechat:
     /filter add sucks irc.freenode.#weechat * weechat sucks
-  filter lines that are strictly equal to "WeeChat sucks" on all buffers:
+  filtruj linie "WeeChat sucks" we wszystkich buforach:
     /filter add sucks2 * * (?-i)^WeeChat sucks$
 ----
 
@@ -877,10 +879,10 @@ Jest możliwe przywrócenie sesji WeeChat na innej maszynie, jeśli skopiujemy z
 ----
 /version  [-o | -ol]
 
- -o: send version to current buffer as input (English string)
--ol: send version to current buffer as input (translated string)
+ -o: wysyła wersje jako wejście do obecnego bufora (po angielsku)
+-ol: wysyła wersje jako wejście do obecnego bufora (przetłumaczony)
 
-The default alias /v can be used to execute this command on all buffers (otherwise the irc command /version is used on irc buffers).
+Domyślny alias /v może zostać użyty do wykonania tej komendy we wszystkich buforach (w przeciwnym wypadku wykonywana jest komenda /version w buforach irc).
 ----
 
 [[command_weechat_wait]]

doc/pl/autogen/user/weechat_options.asciidoc

@@ -828,17 +828,17 @@
 ** wartości: dowolny ciąg (domyślna wartość: `"|"`)
 
 * [[option_weechat.look.quote_nick_prefix]] *weechat.look.quote_nick_prefix*
-** opis: `text to display before nick when quoting a message (see /help cursor)`
+** opis: `teks wyświetlany przed nickiem podczas cytowania wiadomości (zobacz /help cursor)`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `"<"`)
 
 * [[option_weechat.look.quote_nick_suffix]] *weechat.look.quote_nick_suffix*
-** opis: `text to display after nick when quoting a message (see /help cursor)`
+** opis: `teks wyświetlany za nickiem podczas cytowania wiadomości (zobacz /help cursor)`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `">"`)
 
 * [[option_weechat.look.quote_time_format]] *weechat.look.quote_time_format*
-** opis: `time format when quoting a message (see /help cursor)`
+** opis: `format czasu podczas cytowania wiadomości (zobacz /help cursor)`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `"%H:%M:%S"`)
 
@@ -928,12 +928,12 @@
 ** wartości: dowolny ciąg (domyślna wartość: `"WeeChat ${info:version}"`)
 
 * [[option_weechat.look.word_chars_highlight]] *weechat.look.word_chars_highlight*
-** opis: `comma-separated list of chars (or range of chars) that are considered part or words for highlights; each item can be a single char, a range of chars (format: a-z), a class of wide character (for example "alnum", see man wctype); a "!" before the item makes it negative (ie the char is NOT considered part of words); the value "*" matches any char; unicode chars are allowed with the format \u1234, for example \u00A0 for unbreakable space (see /help print for supported formats)`
+** opis: `oddzielona przecinkami lista znaków (lub zakres znaków) rozważanych jako część słowa podświetlenia; każdy element może być pojedynczym znakiem, zakresem znaków (format: a-z), klasą znaków (przykład "alnum", zobacz man wctype); znak "!" przed elementem neguje go (znak NIE jest uznawany za część słowa); wartość "*" pasuje do dowolnego znaku; znaki unikodu są dozwolone w formacie \u1234, na przykład \u00A0 dla niełamliwej spacji (wspierane formaty można znaleźć w /help print)`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `"!\u00A0,-,_,|,alnum"`)
 
 * [[option_weechat.look.word_chars_input]] *weechat.look.word_chars_input*
-** opis: `comma-separated list of chars (or range of chars) that are considered part or words for command line; each item can be a single char, a range of chars (format: a-z), a class of wide character (for example "alnum", see man wctype); a "!" before the item makes it negative (ie the char is NOT considered part of words); the value "*" matches any char; unicode chars are allowed with the format \u1234, for example \u00A0 for unbreakable space (see /help print for supported formats)`
+** opis: `oddzielona przecinkami lista znaków (lub zakres znaków) rozważanych jako część słowa linii poleceń; każdy element może być pojedynczym znakiem, zakresem znaków (format: a-z), klasą znaków (przykład "alnum", zobacz man wctype); znak "!" przed elementem neguje go (znak NIE jest uznawany za część słowa); wartość "*" pasuje do dowolnego znaku; znaki unikodu są dozwolone w formacie \u1234, na przykład \u00A0 dla niełamliwej spacji (wspierane formaty można znaleźć w /help print)`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `"!\u00A0,-,_,|,alnum"`)
 

doc/pl/cmdline_options.pl.asciidoc

@@ -8,6 +8,8 @@
     Ustawia ścieżkę jako katalog domowy WeeChat (używany dla plików
     konfiguracyjnych, logów, wtyczek użytkownika i skryptów), domyślna wartość
     to '~/.weechat' (katalog zostanie utworzony jeśli nie istnieje).
+    Jeśli ta opcja nie zostanie podada, użyta zostanie zawartość zmiennej
+    WEECHAT_HOME (jeśli została ustawiona).
 
 *-h*, *--help*::
     Wyświetla pomoc.

doc/pl/weechat.1.pl.asciidoc

@@ -16,10 +16,9 @@ weechat - rozszerzalny klient rozmów
 
 == OPIS
 
-// TRANSLATION MISSING
 WeeChat (Wee Enhanced Environment for Chat) to darmowy klient rozmów, szybki
 i lekki, przeznaczony dla wielu systemów operacyjnych.
-It is highly customizable and extensible with scripts.
+Posiada dużo opcji konfiguracyjnych i dodatkowych wtyczek.
 
 == OPCJE
 
@@ -90,14 +89,11 @@ $HOME/.weechat/weechat.log::
 
 == AUTORZY
 
-// TRANSLATION MISSING
-This manpage was written by Sébastien Helleu <flashcode@flashtux.org>.
+Autorem tej strony pomocy Sébastien Helleu <flashcode@flashtux.org>.
 
-// TRANSLATION MISSING
-Translated by Krzysztof Korościk <soltys@szluug.org>.
+Tłumaczenie Krzysztof Korościk <soltys@szluug.org>.
 
-// TRANSLATION MISSING
-== COPYRIGHT
+== PRAWA AUTORSKIE
 
 WeeChat jest tworzony przez Sébastien Helleu i społeczność (pełna lista dostępna
 jest w pliku AUTHORS).

doc/pl/weechat_faq.pl.asciidoc

@@ -6,10 +6,9 @@
 :toc-placement: manual
 
 
-// TRANSLATION MISSING
-Translators:
+Tłumaczenie:
 
-* Krzysztof Korościk <soltys@szluug.org>, 2009-2014
+* Krzysztof Korościk <soltys@szluug.org>, 2009-2015
 
 [NOTE]
 Ten dokument jest napisany dla WeeChat w wersji ≥ 0.3.0, ale powinien być używany

doc/pl/weechat_quickstart.pl.asciidoc

@@ -6,10 +6,9 @@
 :max-width: 100%
 
 
-// TRANSLATION MISSING
-Translators:
+Tłumaczenie:
 
-* Krzysztof Korościk <soltys@szluug.org>, 2009-2014
+* Krzysztof Korościk <soltys@szluug.org>, 2009-2015
 
 
 [[start]]
@@ -101,8 +100,7 @@ na liście "irc" oraz inne wtyczki.
 [[create_irc_server]]
 == Tworzenie serwera IRC
 
-// TRANSLATION MISSING
-You can add an IRC server with `/server` command, for example:
+Możesz dodać serwer IRC za pomocą komendy `/server`, na przykład:
 
 ----
 /server add freenode chat.freenode.net
@@ -319,21 +317,17 @@ Wtyczki są automatycznie ładowane, kiedy zostaną wykryte (proszę spojrzeć d
 dokumentacji WeeChat, aby się dowiedzieć jak ładować/wyładowywać wtyczki lub
 skrypty).
 
-// TRANSLATION MISSING
-Many external scripts (from contributors) are available for WeeChat, you can
-download and install scripts from the repository with the `/script` command,
-for example:
+Dostępne jest wiele zewnętrznych skryptów (od społeczności), możesz je pobrać
+i zainstalować za pomocą komendy `/script`, na przykład:
 
 ----
 /script install iset.pl
 ----
 
-// TRANSLATION MISSING
-See `/help script` for more info.
+Więcej informacji można uzyskać wykonując komendę `/help script`.
 
-// TRANSLATION MISSING
-A list of scripts is available in WeeChat with `/script` or at this URL:
-https://weechat.org/scripts
+Listę skryptów dostepnych dla WeeChat można uzyskać wywołując komendę `/script`
+lub pod adresem https://weechat.org/scripts
 
 [[more_doc]]
 == Więcej dokumentacji

doc/pl/weechat_scripting.pl.asciidoc

@@ -7,10 +7,9 @@
 :max-width: 100%
 
 
-// TRANSLATION MISSING
-Translators:
+Tłumaczenie:
 
-* Krzysztof Korościk <soltys@szluug.org>, 2011-2014
+* Krzysztof Korościk <soltys@szluug.org>, 2009-2015
 
 
 Ten dokument opisuje klienta rozmów WeeChat, który jest częścią WeeChat.

doc/pl/weechat_tester.pl.asciidoc

@@ -6,10 +6,9 @@
 :max-width: 100%
 
 
-// TRANSLATION MISSING
-Translators:
+Tłumaczenie:
 
-* Krzysztof Korościk <soltys@szluug.org>, 2009-2014
+* Krzysztof Korościk <soltys@szluug.org>, 2009-2015
 
 
 [[purpose]]

doc/pl/weechat_user.pl.asciidoc

@@ -7,10 +7,9 @@
 :max-width: 100%
 
 
-// TRANSLATION MISSING
-Translators:
+Tłumaczenie:
 
-* Krzysztof Korościk <soltys@szluug.org>, 2013-2014
+* Krzysztof Korościk <soltys@szluug.org>, 2009-2015
 
 
 Ten dokument opisuje klienta rozmów WeeChat, będącego częścią WeeChat.
@@ -92,88 +91,86 @@ Na OS X możesz użyć http://brew.sh/[Homebrew]:
 Poniższa tabela przedstawia pakiety wymagane i opcjonalne do skompilowania
 WeeChat.
 
-// TRANSLATION MISSING
-[width="100%",cols="5,^3,^3,^3,.^13",options="header"]
+[width="100%",cols="5,^3,^3,.^13",options="header"]
 |===
-| Pakiet ^(1)^ | Min version | Max version | Wymagany | Opis
+| Pakiet ^(1)^ | Wersja | Wymagany | Opis
 
-| cmake | | | *tak* |
+| cmake | | *tak* |
   Kompilacja (możliwe jest użycie autotools, jednak cmake jest zalecany)
 
-| pkg-config | | | *tak* |
+| pkg-config | | *tak* |
   Wykrywa zainstalowane biblioteki
 
-| libncursesw5-dev ^(2)^ | | | *tak* |
+| libncursesw5-dev ^(2)^ | | *tak* |
   Interfejs ncurses
 
-| libcurl4-gnutls-dev | | | *tak* |
+| libcurl4-gnutls-dev | | *tak* |
   Transfer URL
 
-| zlib1g-dev | | | *tak* |
+| zlib1g-dev | | *tak* |
   Kompresja pakietów we wtyczce relay (protokół weechat), wtyczka script
 
-| libgcrypt20-dev | | | *tak* |
+| libgcrypt20-dev | | *tak* |
   Zabezpieczone dane, uwierzytelnianie IRC SASL (DH-BLOWFISH/DH-AES), wtyczka
   script
 
-| libgnutls28-dev | 2.2.0 ^(3)^ | | |
+| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | |
   Połączenia SSL z serwerami IRC, wsparcie dla SSL we wtyczce relay,
   uwierzytelnianie IRC SASL (ECDSA-NIST256P-CHALLENGE)
 
-| gettext | | | |
+| gettext | | |
   Internacjonalizacja (tłumaczenie wiadomości; język bazowy to Angielski)
 
-| ca-certificates | | | |
+| ca-certificates | | |
   Certyfikaty dla połączeń SSL
 
-| libaspell-dev or libenchant-dev | | | |
+| libaspell-dev or libenchant-dev | | |
   Wtyczka aspell
 
-| python-dev | 2.5 ^(4)^ | | |
+| python-dev | ≥ 2.5 ^(4)^ | |
   Wtyczka python
 
-| libperl-dev | | | |
+| libperl-dev | | |
   Wtyczka perl
 
-| ruby2.1-dev | 1.8 | | |
+| ruby2.1-dev | ≥ 1.8 | |
   Wtyczka ruby
 
-| liblua5.2-dev | | | |
+| liblua5.2-dev | | |
   Wtyczka lua
 
-| tcl-dev | 8.5 | | |
+| tcl-dev | ≥ 8.5 | |
   Wtyczka tcl
 
-| guile-2.0-dev | 2.0 | | |
+| guile-2.0-dev | ≥ 2.0 | |
   Wtyczka guile (scheme)
 
-| libv8-dev | | 3.24.3 | |
+| libv8-dev | ≤ 3.24.3 | |
   Wtyczka javascript
 
-| asciidoc | 8.5.0 | | |
+| asciidoc | ≥ 8.5.0 | |
   Tworzenie strony man i dokumentacji
 
-| source-highlight | | | |
+| source-highlight | | |
   Podświetlanie składni dla kodów źródłowych w dokumentacji
 
-| xsltproc, docbook-xml, docbook-xsl | | | |
+| xsltproc, docbook-xml, docbook-xsl | | |
   Tworzenie strony man
 
-| libcpputest-dev | 3.4 | | |
+| libcpputest-dev | ≥ 3.4 | |
   Uruchamianie testów
 
-| C++ compiler | | | |
+| C++ compiler | | |
   Uruchamianie testów, wtyczka javascript
 |===
 
-// TRANSLATION MISSING (note 3)
 [NOTE]
 ^(1)^ Nazwy pochodzą z dystrybucji Debian GNU/Linux, wersje i nazwy pakietów
 mogą być inne w innych dystrybucjach. +
 ^(2)^ WeeChat może być skompilowany z libncurses5-dev, ale jest to *NIE*
 zalecane (spowoduje to błędy w wyświetlaniu szerokich znaków). +
-^(3)^ Gnutls ≥ 3.0.21 is required for IRC SASL authentication with mechanism
-ECDSA-NIST256P-CHALLENGE. +
+^(3)^ Gnutls ≥ 3.0.21 jest wymagany dla uwierzytelnienia IRC SASL za pomocą
+mechanizmu ECDSA-NIST256P-CHALLENGE. +
 ^(4)^ Zalecana wersja Pythona to 2.7 (wszystkie skrypty działają z wersją 2.7,
 ale nie w wersjami ≤ 2.6 lub ≥ 3.0).
 
@@ -855,45 +852,45 @@ domyślny pasek 'nicklist' ma wypełnienie 'vertical'.
 Przykłady wypełnień paska 'nicklist':
 
 ....
-┌──────────────────────────────────────────────────┐
-│Welcome to #test, this is a test channel          │
-│12:54:15 peter | hey!                    │@carl   │
-│12:55:01  +Max | hello                   │@jessika│
-│                                         │@maddy  │
-│                                         │%Diego  │
-│                                         │%Melody │
-│                                         │+Max    │
-│                                         │ celia  │
-│                                         │ Eva    │
-│                                         │ freddy │
-│                                         │ Harold^│
-│                                         │ henry4 │
-│                                         │ jimmy17│
-│                                         │ jodie ▼│
-│[12:55] [6] [irc/freenode] 3:#test(+n){24}        │
-│[@carl] █                                         │
-└──────────────────────────────────────────────────┘
-                filling_left_right = vertical ▲
+┌───────────────────────────────────────────────────────────────────────┐
+│Welcome to #test, this is a test channel                               │
+│12:54:15 peter | hey!                                         │@carl   │
+│12:55:01  +Max | hello                                        │@jessika│
+│                                                              │@maddy  │
+│                                                              │%Diego  │
+│                                                              │%Melody │
+│                                                              │+Max    │
+│                                                              │ celia  │
+│                                                              │ Eva    │
+│                                                              │ freddy │
+│                                                              │ Harold^│
+│                                                              │ henry4 │
+│                                                              │ jimmy17│
+│                                                              │ jodie ▼│
+│[12:55] [6] [irc/freenode] 3:#test(+n){24}                             │
+│[@carl] █                                                              │
+└───────────────────────────────────────────────────────────────────────┘
+                                     filling_left_right = vertical ▲
 
-┌──────────────────────────────────────────────────┐
-│Welcome to #test, this is a test channel          │
-│12:54:15 peter | hey!           │@carl     lee    │
-│12:55:01  +Max | hello          │@jessika  louise │
-│                                │@maddy    mario  │
-│                                │%Diego    mark   │
-│                                │%Melody   peter  │
-│                                │+Max      Rachel │
-│                                │ celia    richard│
-│                                │ Eva      sheryl │
-│                                │ freddy   Vince  │
-│                                │ Harold^  warren │
-│                                │ henry4   zack   │
-│                                │ jimmy17         │
-│                                │ jodie           │
-│[12:55] [6] [irc/freenode] 3:#test(+n){24}        │
-│[@carl] █                                         │
-└──────────────────────────────────────────────────┘
-        filling_left_right = columns_vertical ▲
+┌───────────────────────────────────────────────────────────────────────┐
+│Welcome to #test, this is a test channel                               │
+│12:54:15 peter | hey!                                │@carl     lee    │
+│12:55:01  +Max | hello                               │@jessika  louise │
+│                                                     │@maddy    mario  │
+│                                                     │%Diego    mark   │
+│                                                     │%Melody   peter  │
+│                                                     │+Max      Rachel │
+│                                                     │ celia    richard│
+│                                                     │ Eva      sheryl │
+│                                                     │ freddy   Vince  │
+│                                                     │ Harold^  warren │
+│                                                     │ henry4   zack   │
+│                                                     │ jimmy17         │
+│                                                     │ jodie           │
+│[12:55] [6] [irc/freenode] 3:#test(+n){24}                             │
+│[@carl] █                                                              │
+└───────────────────────────────────────────────────────────────────────┘
+                             filling_left_right = columns_vertical ▲
 
 ┌───────────────────────────────────────────────────────────────────────┐
 │@carl    %Diego    celia    Harold^  jodie    mario    Rachel   Vince  │
@@ -2238,8 +2235,7 @@ Więcej informacji można znaleźć pod adresem: http://www.oftc.net/oftc/NickSe
 WeeChat wspiera uwierzytelnianie SASL, używając różnych mechanizmów:
 
 * 'plain': hasło w czystym tekście (domyślne)
-// TRANSLATION MISSING
-* 'ecdsa-nist256p-challenge': challenge with public/private key
+* 'ecdsa-nist256p-challenge': klucz prywatny/publiczny
 * 'external': certyfikat SSL po stronie klienta
 * 'dh-blowfish': hasło zaszyfrowane algorytmem blowfish
 * 'dh-aes': hasło zaszyfrowane algorytmem AES
@@ -2252,36 +2248,33 @@ Opcje dla serwerów to:
 
 * 'sasl_mechanism': mechanizm do użycia (zobacz wyżej)
 * 'sasl_timeout': limit czasu (w sekundach) na uwierzytelnienie
-// TRANSLATION MISSING
-* 'sasl_fail': action to perform if authentication fails
+* 'sasl_fail': akcja wykonywana jeśli uwierzytelnienie się nie powiedzie
 * 'sasl_username': nazwa użytkownika (nick)
 * 'sasl_password': hasło
-// TRANSLATION MISSING
-* 'sasl_key': file with ECc private key (for mechanism
+* 'sasl_key': plik z kluczem prywatnym ECc (dla mechanizmu
   'ecdsa-nist256p-challenge')
 
-// TRANSLATION MISSING
 [[irc_sasl_ecdsa_nist256p_challenge]]
 ===== SASL ECDSA-NIST256P-CHALLENGE
 
-You must generate a private key in order to authentify with the
-ECDSA-NIST256P-CHALLENGE mechanism (no password is required on connection).
+Musisz wygenerować klucz prywatny w celu uwierzytelnienia za pomocą mechanizmu
+ECDSA-NIST256P-CHALLENGE (hasło nie potrzebne do połączenia).
 
-You can generate the key with this command:
+Klucz można wygenerować za pomocą komendy:
 
 ----
 $ openssl ecparam -genkey -name prime256v1 >~/.weechat/ecdsa.pem
 ----
 
-Get the public key (encoded as base64) with this command:
+Klucz publiczny (zakodowany za pomocą base64) uzyskujemy wywołując komendę:
 
 ----
 $ openssl ec -noout -text -conv_form compressed -in ~/.weechat/ecdsa.pem | grep '^pub:' -A 3 | tail -n 3 | tr -d ' \n:' | xxd -r -p | base64
 ----
 
-Connect to the server, identify (for example with "nickserv identify") and set
-your public key in your account, using nickserv (replace the base64 value with
-your public key):
+Połącz się do serwera, zidentyfikuj (na przykład za pomocą "nickserv identify")
+i ustaw swój klucz publiczny dla swojego konta, za pomocą nickserva (zamień
+wartość base64 wartościa dla swojego klucza):
 
 ----
 /connect freenode
@@ -2289,15 +2282,15 @@ your public key):
 /msg nickserv set pubkey Av8k1FOGetUDq7sPMBfufSIZ5c2I/QYWgiwHtNXkVe/q
 ----
 
-Configure the SASL options in the server:
+Konfiguracja opcji SASL dla serwera:
 
 ----
 /set irc.server.freenode.sasl_mechanism ecdsa-nist256p-challenge
-/set irc.server.freenode.sasl_username "your_nickname"
+/set irc.server.freenode.sasl_username "twój_nick"
 /set irc.server.freenode.sasl_key "%h/ecdsa.pem"
 ----
 
-Reconnect to the server:
+Ponowne połączenie z serwerem:
 
 ----
 /reconnect freenode

doc/ru/cmdline_options.ru.asciidoc

@@ -4,11 +4,14 @@
 *-c*, *--colors*::
     Вывести в терминал умолчальные цвета.
 
+// TRANSLATION MISSING
 *-d*, *--dir* '<путь>'::
     Установить <путь> как домашнюю директорию для WeeChat (используется для
     конфигурационных файлов, логов, пользовательских плагинов и скриптов).
     Значение по-умолчанию: '~/.weechat' (замечание: директория будет создана,
     если WeeChat не найдет ее).
+    If this option is not given, the environment variable WEECHAT_HOME is used
+    (if not empty).
 
 *-h*, *--help*::
     Вывести справку.

po/CMakeLists.txt

@@ -18,16 +18,16 @@
 #
 
 set(PO_FILES
-  fr.po
-  es.po
   cs.po
-  hu.po
   de.po
-  ru.po
-  pl.po
+  es.po
+  fr.po
+  hu.po
   it.po
   ja.po
+  pl.po
   pt_BR.po
+  ru.po
   tr.po
   )
 

po/cs.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-04-19 11:28+0200\n"
+"POT-Creation-Date: 2015-05-07 07:02+0200\n"
 "PO-Revision-Date: 2015-03-21 08:41+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -140,6 +140,8 @@ msgid ""
 "  -a, --no-connect         disable auto-connect to servers at startup\n"
 "  -c, --colors             display default colors in terminal\n"
 "  -d, --dir <path>         set WeeChat home directory (default: ~/.weechat)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
 "  -h, --help               display this help\n"
 "  -l, --license            display WeeChat license\n"
 "  -p, --no-plugin          don't load any plugin at startup\n"
@@ -173,15 +175,15 @@ msgstr ""
 msgid "Error: missing argument for \"%s\" option\n"
 msgstr "Chyba: chybí argument pro volbu \"%s\"\n"
 
-msgid "Error: WEECHAT_HOME is undefined, check build options\n"
-msgstr ""
-
 msgid "Error: unable to get HOME directory\n"
 msgstr "Chyba: nemohu získat HOME adresář\n"
 
 msgid "Error: not enough memory for home directory\n"
 msgstr "Chyba: nedostatek paměti pro domácí adresář\n"
 
+msgid "Error: WEECHAT_HOME is undefined, check build options\n"
+msgstr ""
+
 #, c-format
 msgid "Error: home (%s) is not a directory\n"
 msgstr "Chyba: domovský adresář (%s) není adresářem\n"
@@ -190,6 +192,23 @@ msgstr "Chyba: domovský adresář (%s) není adresářem\n"
 msgid "Error: cannot create directory \"%s\"\n"
 msgstr "Chyba: nemohu vytvořit adresář \"%s\"\n"
 
+msgid ""
+"Welcome to WeeChat!\n"
+"\n"
+"If you are discovering WeeChat, it is recommended to read at least the "
+"quickstart guide, and the user's guide if you have some time; they explain "
+"main WeeChat concepts.\n"
+"All WeeChat docs are available at: https://weechat.org/doc\n"
+"\n"
+"Moreover, there is inline help with /help on all commands and options (use "
+"Tab key to complete the name).\n"
+"The command /iset (script iset.pl) can help to customize WeeChat: /script "
+"install iset.pl\n"
+"\n"
+"You can create and connect to an IRC server with /server and /connect "
+"commands (see /help server)."
+msgstr ""
+
 #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux"
 #, c-format
 msgid ""
@@ -1453,9 +1472,10 @@ msgid ""
 "  2. a string with chars to hide (format: \"hide:char,string\")\n"
 "  3. a color (format: \"color:xxx\")\n"
 "  4. an info (format: \"info:name,arguments\", arguments are optional)\n"
-"  5. an option (format: \"file.section.option\")\n"
-"  6. a local variable in buffer\n"
-"  7. a hdata name/variable (the value is automatically converted to string), "
+"  5. an environment variable (format: \"env:XXX\")\n"
+"  6. an option (format: \"file.section.option\")\n"
+"  7. a local variable in buffer\n"
+"  8. a hdata name/variable (the value is automatically converted to string), "
 "by default \"window\" and \"buffer\" point to current window/buffer.\n"
 "Format for hdata can be one of following:\n"
 "  hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
@@ -1470,6 +1490,7 @@ msgid ""
 "\n"
 "Examples (simple strings):\n"
 "  /eval -n ${info:version}                     ==> 0.4.3\n"
+"  /eval -n ${env:HOME}                         ==> /home/user\n"
 "  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
 "  /eval -n ${window}                           ==> 0x2549aa0\n"
 "  /eval -n ${window.buffer}                    ==> 0x2549320\n"
@@ -4181,24 +4202,6 @@ msgstr "Barvy Weechat (použité: %d, zbývá: %d):"
 msgid "Terminal lost, exiting WeeChat..."
 msgstr "Terminál ztracen, ukončuji WeeChat..."
 
-msgid ""
-"\n"
-"Welcome to WeeChat!\n"
-"\n"
-"If you are discovering WeeChat, it is recommended to read at least the "
-"quickstart guide, and the user's guide if you have some time; they explain "
-"main WeeChat concepts.\n"
-"All WeeChat docs are available at: https://weechat.org/doc\n"
-"\n"
-"Moreover, there is inline help with /help on all commands and options (use "
-"Tab key to complete the name).\n"
-"The command /iset (script iset.pl) can help to customize WeeChat: /script "
-"install iset.pl\n"
-"\n"
-"You can create and connect to an IRC server with /server and /connect "
-"commands (see /help server)."
-msgstr ""
-
 #, fuzzy
 msgid "Mouse is enabled"
 msgstr "1 pokud jsou filtry povoleny"
@@ -6658,6 +6661,13 @@ msgstr "čísla pro definované ignorování"
 msgid "nicks in notify list"
 msgstr "přezdívky v seznamu notifikací"
 
+#, c-format
+msgid ""
+"%sWARNING: the value \"channel\" for option \"irc.look.display_away\" will "
+"send all your away changes to the channels, which is often considered as "
+"spam; therefore you could be banned from channels, you are warned!"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"

po/de.po

@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-04-19 11:28+0200\n"
-"PO-Revision-Date: 2015-04-20 20:34+0100\n"
+"POT-Creation-Date: 2015-05-07 07:02+0200\n"
+"PO-Revision-Date: 2015-05-09 09:25+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <>\n"
 "Language: de_DE\n"
@@ -33,7 +33,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.7.5\n"
 "X-Poedit-Bookmarks: -1,-1,180,-1,-1,-1,-1,-1,-1,-1\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -141,6 +141,8 @@ msgid ""
 "  -a, --no-connect         disable auto-connect to servers at startup\n"
 "  -c, --colors             display default colors in terminal\n"
 "  -d, --dir <path>         set WeeChat home directory (default: ~/.weechat)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
 "  -h, --help               display this help\n"
 "  -l, --license            display WeeChat license\n"
 "  -p, --no-plugin          don't load any plugin at startup\n"
@@ -157,36 +159,38 @@ msgstr ""
 "  -c, --colors             zeigt die Standardfarben des Terminals an\n"
 "  -d, --dir <Pfad>         legt den Konfigurationsordner für WeeChat fest "
 "(Voreinstellung: ~/.weechat)\n"
+"                           (Umgebungsvariable WEECHAT_HOME wird überprüft "
+"falls diese Option nicht übergeben wird)\n"
 "  -h, --help               zeigt diese Hilfe an\n"
 "  -l, --license            zeigt die Lizenz von WeeChat an\n"
 "  -p, --no-plugin          unterbindet beim Programmstart das Laden von "
 "Erweiterungen\n"
 "  -r, --run-command <cmd>  führt einen oder mehrere Befehle nach dem Start "
 "aus\n"
-"                           (mehrere Befehle werden durch ein Semikolon "
-"getrennt)\n"
+"                           (mehrere Befehle können durch ein Semikolon "
+"getrennt werden)\n"
 "  -s, --no-script          Skripten werden beim Programmstart nicht geladen\n"
-"      --upgrade            führt ein WeeChat-Upgrade mittels "
-"Sitzungsdateien, die mit dem Befehl `/upgrade -quit` erstellt wurden, durch\n"
+"      --upgrade            führt ein WeeChat-Upgrade mittels Sitzungsdateien "
+"die mit dem Befehl `/upgrade -quit` erstellt wurden durch\n"
 "  -v, --version            zeigt die Version von WeeChat an\n"
 "  plugin:option            Einstellungen für Erweiterungen (siehe man "
-"weechat-curses)\n"
+"weechat)\n"
 
 #, c-format
 msgid "Error: missing argument for \"%s\" option\n"
 msgstr "Fehler: fehlendes Argument für die Einstellung \"%s\"\n"
 
-msgid "Error: WEECHAT_HOME is undefined, check build options\n"
-msgstr ""
-"Fehler: WEECHAT_HOME ist nicht definiert, bitte überprüfen Sie die build-"
-"Einstellungen\n"
-
 msgid "Error: unable to get HOME directory\n"
 msgstr "Fehler: Das HOME-Verzeichnis kann nicht ermittelt werden\n"
 
 msgid "Error: not enough memory for home directory\n"
 msgstr "Fehler: nicht genug Speicher für das HOME-Verzeichnis\n"
 
+msgid "Error: WEECHAT_HOME is undefined, check build options\n"
+msgstr ""
+"Fehler: WEECHAT_HOME ist nicht definiert, bitte überprüfen Sie die build-"
+"Einstellungen\n"
+
 #, c-format
 msgid "Error: home (%s) is not a directory\n"
 msgstr "Fehler: HOME (%s) ist kein Verzeichnis\n"
@@ -195,6 +199,40 @@ msgstr "Fehler: HOME (%s) ist kein Verzeichnis\n"
 msgid "Error: cannot create directory \"%s\"\n"
 msgstr "Fehler: Das Verzeichnis \"%s\" kann nicht anlegt werden\n"
 
+msgid ""
+"Welcome to WeeChat!\n"
+"\n"
+"If you are discovering WeeChat, it is recommended to read at least the "
+"quickstart guide, and the user's guide if you have some time; they explain "
+"main WeeChat concepts.\n"
+"All WeeChat docs are available at: https://weechat.org/doc\n"
+"\n"
+"Moreover, there is inline help with /help on all commands and options (use "
+"Tab key to complete the name).\n"
+"The command /iset (script iset.pl) can help to customize WeeChat: /script "
+"install iset.pl\n"
+"\n"
+"You can create and connect to an IRC server with /server and /connect "
+"commands (see /help server)."
+msgstr ""
+"Willkommen zu WeeChat!\n"
+"\n"
+"Wenn Du WeeChat nutzen möchtest dann solltest Du zumindest einen Blick in "
+"die Quickstart-Anleitung werfen. Wir empfehlen aber, um den vollen "
+"Funktionsumfang und das Konzept hinter WeeChat kennen zu lernen, die "
+"Benutzeranleitung zu lesen.\n"
+"Die Komplette Dokumentation findet man unter: https://weechat.org/doc\n"
+"\n"
+"Darüber hinaus ist in WeeChat eine interne Hilfe integriert die man mit /"
+"help auf alle Befehle und Optionen anwenden kann (mittels der TAB-Taste kann "
+"eine Namensvervollständigung durchgeführt werden).\n"
+"Der /iset Befehl (Skript iset.pl) kann genutzt werden um WeeChat sehr "
+"einfach und übersichtlich den eigenen Bedürfnissen anzupassen: /script "
+"install iset.pl\n"
+"\n"
+"Um einen IRC Server zu erstellen und sich mit selbigen zu Verbinden müssen "
+"die Befehle /server und /connect verwendet werden (siehe /help server)."
+
 #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux"
 #, c-format
 msgid ""
@@ -1543,9 +1581,10 @@ msgid ""
 "  2. a string with chars to hide (format: \"hide:char,string\")\n"
 "  3. a color (format: \"color:xxx\")\n"
 "  4. an info (format: \"info:name,arguments\", arguments are optional)\n"
-"  5. an option (format: \"file.section.option\")\n"
-"  6. a local variable in buffer\n"
-"  7. a hdata name/variable (the value is automatically converted to string), "
+"  5. an environment variable (format: \"env:XXX\")\n"
+"  6. an option (format: \"file.section.option\")\n"
+"  7. a local variable in buffer\n"
+"  8. a hdata name/variable (the value is automatically converted to string), "
 "by default \"window\" and \"buffer\" point to current window/buffer.\n"
 "Format for hdata can be one of following:\n"
 "  hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
@@ -1560,6 +1599,7 @@ msgid ""
 "\n"
 "Examples (simple strings):\n"
 "  /eval -n ${info:version}                     ==> 0.4.3\n"
+"  /eval -n ${env:HOME}                         ==> /home/user\n"
 "  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
 "  /eval -n ${window}                           ==> 0x2549aa0\n"
 "  /eval -n ${window.buffer}                    ==> 0x2549320\n"
@@ -1618,9 +1658,10 @@ msgstr ""
 "(Format: \"hide:Zeichen,Zeichenkette\")\n"
 "  3. eine Farbe (Format: color:xxx)\n"
 "  4. eine Info (Format: \"info:name,arguments\", Argumente sind optional)\n"
-"  5. der Name einer Einstellung (Format: file.section.option)\n"
-"  6. der Name einer lokalen Variablen eines Buffer\n"
-"  7. ein hdata Name/Variable (der Wert wird automatisch als Zeichenkette "
+"  5. eine Umgebungsvariable (Format: \"env:XXX\")\n"
+"  6. der Name einer Programmoption (Format: file.section.option)\n"
+"  7. der Name einer lokalen Variablen eines Buffer\n"
+"  8. ein hdata Name/Variable (der Wert wird automatisch als Zeichenkette "
 "konvertiert), standardmäßig wird für \"window\" und \"buffer\" das aktuelle "
 "Fenster/Buffer verwendet.\n"
 "Das Format für hdata kann wie folgt aufgebaut sein:\n"
@@ -1636,13 +1677,14 @@ msgstr ""
 "API Erweiterung\", Bereich \"weechat_hdata_get\". beschrieben\n"
 "\n"
 "Beispiele (einfache Zeichenketten):\n"
-"  /eval -n ${info:version}                 ==> 0.4.3\n"
-"  /eval -n ${weechat.look.scroll_amount}   ==> 3\n"
-"  /eval -n ${window}                       ==> 0x2549aa0\n"
-"  /eval -n ${window.buffer}                ==> 0x2549320\n"
-"  /eval -n ${window.buffer.full_name}      ==> core.weechat\n"
-"  /eval -n ${window.buffer.number}         ==> 1\n"
-"  /eval -n ${\\t}                           ==> <tab>\n"
+"  /eval -n ${info:version}                     ==> 0.4.3\n"
+"  /eval -n ${env:HOME}                         ==> /home/user\n"
+"  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
+"  /eval -n ${window}                           ==> 0x2549aa0\n"
+"  /eval -n ${window.buffer}                    ==> 0x2549320\n"
+"  /eval -n ${window.buffer.full_name}          ==> core.weechat\n"
+"  /eval -n ${window.buffer.number}             ==> 1\n"
+"  /eval -n ${\\t}                               ==> <tab>\n"
 "  /eval -n ${hide:-,${relay.network.password}} ==> --------\n"
 "\n"
 "Beispiele (Bedingungen):\n"
@@ -4936,42 +4978,6 @@ msgstr "WeeChat Farben (in Benutzung: %d; noch frei verfügbar: %d):"
 msgid "Terminal lost, exiting WeeChat..."
 msgstr "Terminal verloren, beende WeeChat..."
 
-msgid ""
-"\n"
-"Welcome to WeeChat!\n"
-"\n"
-"If you are discovering WeeChat, it is recommended to read at least the "
-"quickstart guide, and the user's guide if you have some time; they explain "
-"main WeeChat concepts.\n"
-"All WeeChat docs are available at: https://weechat.org/doc\n"
-"\n"
-"Moreover, there is inline help with /help on all commands and options (use "
-"Tab key to complete the name).\n"
-"The command /iset (script iset.pl) can help to customize WeeChat: /script "
-"install iset.pl\n"
-"\n"
-"You can create and connect to an IRC server with /server and /connect "
-"commands (see /help server)."
-msgstr ""
-"\n"
-"Willkommen zu WeeChat!\n"
-"\n"
-"Wenn Du WeeChat nutzen möchtest dann solltest Du zumindest einen Blick in "
-"die Quickstart-Anleitung werfen. Wir empfehlen aber, um den vollen "
-"Funktionsumfang und das Konzept hinter WeeChat kennen zu lernen, die "
-"Benutzeranleitung zu lesen.\n"
-"Die Komplette Dokumentation findet man unter: https://weechat.org/doc\n"
-"\n"
-"Darüber hinaus ist in WeeChat eine interne Hilfe integriert die man mit /"
-"help auf alle Befehle und Optionen anwenden kann (mittels der TAB-Taste kann "
-"eine Namensvervollständigung durchgeführt werden).\n"
-"Der /iset Befehl (Skript iset.pl) kann genutzt werden um WeeChat sehr "
-"einfach und übersichtlich den eigenen Bedürfnissen anzupassen: /script "
-"install iset.pl\n"
-"\n"
-"Um einen IRC Server zu erstellen und sich mit selbigen zu Verbinden müssen "
-"die Befehle /server und /connect verwendet werden (siehe /help server)."
-
 msgid "Mouse is enabled"
 msgstr "Maus ist aktiv"
 
@@ -7637,6 +7643,17 @@ msgstr "Anzahl für festgelegte Ignorierungen"
 msgid "nicks in notify list"
 msgstr "Nicks für die eine Benachrichtigung existiert"
 
+#, c-format
+msgid ""
+"%sWARNING: the value \"channel\" for option \"irc.look.display_away\" will "
+"send all your away changes to the channels, which is often considered as "
+"spam; therefore you could be banned from channels, you are warned!"
+msgstr ""
+"%sWARNUNG: der Wert \"channel\" für die Option \"irc.look.display_away\" "
+"sendet alle away Mitteilungen in die besuchten Channels. Dies wird häufig "
+"als SPAM interpretiert und kann dazu führen, dass man aus den besuchten "
+"Channels verbannt wird. Du bist gewarnt!"
+
 #, c-format
 msgid ""
 "%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"

po/es.po

@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-04-19 11:28+0200\n"
+"POT-Creation-Date: 2015-05-07 07:02+0200\n"
 "PO-Revision-Date: 2015-03-21 08:41+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -142,6 +142,8 @@ msgid ""
 "  -a, --no-connect         disable auto-connect to servers at startup\n"
 "  -c, --colors             display default colors in terminal\n"
 "  -d, --dir <path>         set WeeChat home directory (default: ~/.weechat)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
 "  -h, --help               display this help\n"
 "  -l, --license            display WeeChat license\n"
 "  -p, --no-plugin          don't load any plugin at startup\n"
@@ -178,16 +180,16 @@ msgstr ""
 msgid "Error: missing argument for \"%s\" option\n"
 msgstr "Error: falta un argumento para la opción \"%s\"\n"
 
-msgid "Error: WEECHAT_HOME is undefined, check build options\n"
-msgstr ""
-"Error: WEECHAT_HOME no está definido, verifica las opciones de compilación\n"
-
 msgid "Error: unable to get HOME directory\n"
 msgstr "Error: no ha sido posible obtener el directorio HOME\n"
 
 msgid "Error: not enough memory for home directory\n"
 msgstr "Error: no hay suficiente memoria para el directorio home\n"
 
+msgid "Error: WEECHAT_HOME is undefined, check build options\n"
+msgstr ""
+"Error: WEECHAT_HOME no está definido, verifica las opciones de compilación\n"
+
 #, c-format
 msgid "Error: home (%s) is not a directory\n"
 msgstr "Error: home (%s) no es un directorio\n"
@@ -196,6 +198,23 @@ msgstr "Error: home (%s) no es un directorio\n"
 msgid "Error: cannot create directory \"%s\"\n"
 msgstr "Error: no es posible crear el directorio \"%s\"\n"
 
+msgid ""
+"Welcome to WeeChat!\n"
+"\n"
+"If you are discovering WeeChat, it is recommended to read at least the "
+"quickstart guide, and the user's guide if you have some time; they explain "
+"main WeeChat concepts.\n"
+"All WeeChat docs are available at: https://weechat.org/doc\n"
+"\n"
+"Moreover, there is inline help with /help on all commands and options (use "
+"Tab key to complete the name).\n"
+"The command /iset (script iset.pl) can help to customize WeeChat: /script "
+"install iset.pl\n"
+"\n"
+"You can create and connect to an IRC server with /server and /connect "
+"commands (see /help server)."
+msgstr ""
+
 #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux"
 #, c-format
 msgid ""
@@ -1492,9 +1511,10 @@ msgid ""
 "  2. a string with chars to hide (format: \"hide:char,string\")\n"
 "  3. a color (format: \"color:xxx\")\n"
 "  4. an info (format: \"info:name,arguments\", arguments are optional)\n"
-"  5. an option (format: \"file.section.option\")\n"
-"  6. a local variable in buffer\n"
-"  7. a hdata name/variable (the value is automatically converted to string), "
+"  5. an environment variable (format: \"env:XXX\")\n"
+"  6. an option (format: \"file.section.option\")\n"
+"  7. a local variable in buffer\n"
+"  8. a hdata name/variable (the value is automatically converted to string), "
 "by default \"window\" and \"buffer\" point to current window/buffer.\n"
 "Format for hdata can be one of following:\n"
 "  hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
@@ -1509,6 +1529,7 @@ msgid ""
 "\n"
 "Examples (simple strings):\n"
 "  /eval -n ${info:version}                     ==> 0.4.3\n"
+"  /eval -n ${env:HOME}                         ==> /home/user\n"
 "  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
 "  /eval -n ${window}                           ==> 0x2549aa0\n"
 "  /eval -n ${window.buffer}                    ==> 0x2549320\n"
@@ -4401,24 +4422,6 @@ msgstr "Colores de WeeChat (en uso: %d, disponibles: %d):"
 msgid "Terminal lost, exiting WeeChat..."
 msgstr "Se perdió la terminal, cerrando WeeChat..."
 
-msgid ""
-"\n"
-"Welcome to WeeChat!\n"
-"\n"
-"If you are discovering WeeChat, it is recommended to read at least the "
-"quickstart guide, and the user's guide if you have some time; they explain "
-"main WeeChat concepts.\n"
-"All WeeChat docs are available at: https://weechat.org/doc\n"
-"\n"
-"Moreover, there is inline help with /help on all commands and options (use "
-"Tab key to complete the name).\n"
-"The command /iset (script iset.pl) can help to customize WeeChat: /script "
-"install iset.pl\n"
-"\n"
-"You can create and connect to an IRC server with /server and /connect "
-"commands (see /help server)."
-msgstr ""
-
 msgid "Mouse is enabled"
 msgstr "Ratón activado"
 
@@ -6901,6 +6904,13 @@ msgstr "números para los ignores definidos"
 msgid "nicks in notify list"
 msgstr "apodos en la lista de notificación"
 
+#, c-format
+msgid ""
+"%sWARNING: the value \"channel\" for option \"irc.look.display_away\" will "
+"send all your away changes to the channels, which is often considered as "
+"spam; therefore you could be banned from channels, you are warned!"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"

po/fr.po

@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-04-19 11:28+0200\n"
-"PO-Revision-Date: 2015-04-19 11:30+0200\n"
+"POT-Creation-Date: 2015-05-07 07:02+0200\n"
+"PO-Revision-Date: 2015-05-07 07:03+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -135,6 +135,8 @@ msgid ""
 "  -a, --no-connect         disable auto-connect to servers at startup\n"
 "  -c, --colors             display default colors in terminal\n"
 "  -d, --dir <path>         set WeeChat home directory (default: ~/.weechat)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
 "  -h, --help               display this help\n"
 "  -l, --license            display WeeChat license\n"
 "  -p, --no-plugin          don't load any plugin at startup\n"
@@ -151,6 +153,8 @@ msgstr ""
 "  -c, --colors             afficher les couleurs par défaut du terminal\n"
 "  -d, --dir <rep>          définir le répertoire de base pour WeeChat "
 "(défaut : ~/.weechat)\n"
+"                           (la variable d'environnement WEECHAT_HOME est lue "
+"si cette option n'est pas donnée)\n"
 "  -h, --help               afficher cette aide\n"
 "  -l, --license            afficher la licence WeeChat\n"
 "  -p, --no-plugin          ne charger aucune extension au démarrage\n"
@@ -167,17 +171,17 @@ msgstr ""
 msgid "Error: missing argument for \"%s\" option\n"
 msgstr "Erreur : paramètre manquant pour l'option \"%s\"\n"
 
-msgid "Error: WEECHAT_HOME is undefined, check build options\n"
-msgstr ""
-"Erreur : WEECHAT_HOME n'est pas défini, vérifiez les options de "
-"construction\n"
-
 msgid "Error: unable to get HOME directory\n"
 msgstr "Erreur : impossible de lire le répertoire personnel\n"
 
 msgid "Error: not enough memory for home directory\n"
 msgstr "Erreur : pas assez de mémoire pour le répertoire personnel\n"
 
+msgid "Error: WEECHAT_HOME is undefined, check build options\n"
+msgstr ""
+"Erreur : WEECHAT_HOME n'est pas défini, vérifiez les options de "
+"construction\n"
+
 #, c-format
 msgid "Error: home (%s) is not a directory\n"
 msgstr "Erreur : la base (%s) n'est pas un répertoire\n"
@@ -186,6 +190,37 @@ msgstr "Erreur : la base (%s) n'est pas un répertoire\n"
 msgid "Error: cannot create directory \"%s\"\n"
 msgstr "Erreur : impossible de créer le répertoire \"%s\"\n"
 
+msgid ""
+"Welcome to WeeChat!\n"
+"\n"
+"If you are discovering WeeChat, it is recommended to read at least the "
+"quickstart guide, and the user's guide if you have some time; they explain "
+"main WeeChat concepts.\n"
+"All WeeChat docs are available at: https://weechat.org/doc\n"
+"\n"
+"Moreover, there is inline help with /help on all commands and options (use "
+"Tab key to complete the name).\n"
+"The command /iset (script iset.pl) can help to customize WeeChat: /script "
+"install iset.pl\n"
+"\n"
+"You can create and connect to an IRC server with /server and /connect "
+"commands (see /help server)."
+msgstr ""
+"Bienvenue dans WeeChat !\n"
+"\n"
+"Si vous découvrez WeeChat, il est recommandé de lire au moins le guide de "
+"démarrage rapide, et le guide utilisateur si vous avez le temps ; ils "
+"expliquent les concepts principaux de WeeChat.\n"
+"Toutes les documentations sont disponibles ici : https://weechat.org/doc\n"
+"\n"
+"De plus, il y a de l'aide en ligne avec /help sur toutes les commandes et "
+"options (utilisez la touche Tab pour compléter le nom).\n"
+"La commande /iset (script iset.pl) peut aider à paramétrer WeeChat : /script "
+"install iset.pl\n"
+"\n"
+"Vous pouvez créer et vous connecter à un serveur IRC avec les commandes /"
+"server et /connect (voir /help server)."
+
 #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux"
 #, c-format
 msgid ""
@@ -1518,9 +1553,10 @@ msgid ""
 "  2. a string with chars to hide (format: \"hide:char,string\")\n"
 "  3. a color (format: \"color:xxx\")\n"
 "  4. an info (format: \"info:name,arguments\", arguments are optional)\n"
-"  5. an option (format: \"file.section.option\")\n"
-"  6. a local variable in buffer\n"
-"  7. a hdata name/variable (the value is automatically converted to string), "
+"  5. an environment variable (format: \"env:XXX\")\n"
+"  6. an option (format: \"file.section.option\")\n"
+"  7. a local variable in buffer\n"
+"  8. a hdata name/variable (the value is automatically converted to string), "
 "by default \"window\" and \"buffer\" point to current window/buffer.\n"
 "Format for hdata can be one of following:\n"
 "  hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
@@ -1535,6 +1571,7 @@ msgid ""
 "\n"
 "Examples (simple strings):\n"
 "  /eval -n ${info:version}                     ==> 0.4.3\n"
+"  /eval -n ${env:HOME}                         ==> /home/user\n"
 "  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
 "  /eval -n ${window}                           ==> 0x2549aa0\n"
 "  /eval -n ${window.buffer}                    ==> 0x2549320\n"
@@ -1594,9 +1631,10 @@ msgstr ""
 "  3. une couleur (format : \"color:xxx\")\n"
 "  4. une info (format : \"info:nom,paramètres\", les paramètres sont "
 "optionnels)\n"
-"  5. une option (format : \"fichier.section.option\")\n"
-"  6. une variable locale du tampon\n"
-"  7. un hdata/variable (la valeur est automatiquement convertie en chaîne), "
+"  5. une variable d'environnement (format : \"env:XXX\")\n"
+"  6. une option (format : \"fichier.section.option\")\n"
+"  7. une variable locale du tampon\n"
+"  8. 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"
@@ -1614,6 +1652,7 @@ msgstr ""
 "\n"
 "Exemples (chaînes simples) :\n"
 "  /eval -n ${info:version}                     ==> 0.4.3\n"
+"  /eval -n ${env:HOME}                         ==> /home/user\n"
 "  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
 "  /eval -n ${window}                           ==> 0x2549aa0\n"
 "  /eval -n ${window.buffer}                    ==> 0x2549320\n"
@@ -4829,39 +4868,6 @@ msgstr "Couleurs WeeChat (en utilisation : %d, libres : %d) :"
 msgid "Terminal lost, exiting WeeChat..."
 msgstr "Terminal perdu, sortie de WeeChat..."
 
-msgid ""
-"\n"
-"Welcome to WeeChat!\n"
-"\n"
-"If you are discovering WeeChat, it is recommended to read at least the "
-"quickstart guide, and the user's guide if you have some time; they explain "
-"main WeeChat concepts.\n"
-"All WeeChat docs are available at: https://weechat.org/doc\n"
-"\n"
-"Moreover, there is inline help with /help on all commands and options (use "
-"Tab key to complete the name).\n"
-"The command /iset (script iset.pl) can help to customize WeeChat: /script "
-"install iset.pl\n"
-"\n"
-"You can create and connect to an IRC server with /server and /connect "
-"commands (see /help server)."
-msgstr ""
-"\n"
-"Bienvenue dans WeeChat !\n"
-"\n"
-"Si vous découvrez WeeChat, il est recommandé de lire au moins le guide de "
-"démarrage rapide, et le guide utilisateur si vous avez le temps ; ils "
-"expliquent les concepts principaux de WeeChat.\n"
-"Toutes les documentations sont disponibles ici : https://weechat.org/doc\n"
-"\n"
-"De plus, il y a de l'aide en ligne avec /help sur toutes les commandes et "
-"options (utilisez la touche Tab pour compléter le nom).\n"
-"La commande /iset (script iset.pl) peut aider à paramétrer WeeChat : /script "
-"install iset.pl\n"
-"\n"
-"Vous pouvez créer et vous connecter à un serveur IRC avec les commandes /"
-"server et /connect (voir /help server)."
-
 msgid "Mouse is enabled"
 msgstr "La souris est activée"
 
@@ -7478,6 +7484,17 @@ msgstr "numéros pour les ignores définis"
 msgid "nicks in notify list"
 msgstr "pseudos dans la liste de notifications"
 
+#, c-format
+msgid ""
+"%sWARNING: the value \"channel\" for option \"irc.look.display_away\" will "
+"send all your away changes to the channels, which is often considered as "
+"spam; therefore you could be banned from channels, you are warned!"
+msgstr ""
+"%sATTENTION : la valeur \"channel\" pour l'option \"irc.look.display_away\" "
+"enverra tous vos statuts d'absence aux canaux, ce qui est souvent considéré "
+"comme du spam ; par conséquent vous pourriez être bannis de canaux, vous "
+"êtes prévenus !"
+
 #, c-format
 msgid ""
 "%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"

po/hu.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-04-19 11:28+0200\n"
+"POT-Creation-Date: 2015-05-07 07:02+0200\n"
 "PO-Revision-Date: 2015-03-21 08:41+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -144,6 +144,8 @@ msgid ""
 "  -a, --no-connect         disable auto-connect to servers at startup\n"
 "  -c, --colors             display default colors in terminal\n"
 "  -d, --dir <path>         set WeeChat home directory (default: ~/.weechat)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
 "  -h, --help               display this help\n"
 "  -l, --license            display WeeChat license\n"
 "  -p, --no-plugin          don't load any plugin at startup\n"
@@ -172,9 +174,6 @@ msgstr ""
 msgid "Error: missing argument for \"%s\" option\n"
 msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
 
-msgid "Error: WEECHAT_HOME is undefined, check build options\n"
-msgstr ""
-
 #, fuzzy
 msgid "Error: unable to get HOME directory\n"
 msgstr "%s nem sikerült a HOME könyvtárat beállítani\n"
@@ -183,6 +182,9 @@ msgstr "%s nem sikerült a HOME könyvtárat beállítani\n"
 msgid "Error: not enough memory for home directory\n"
 msgstr "%s nincs elég memória a HOME könyvtárhoz\n"
 
+msgid "Error: WEECHAT_HOME is undefined, check build options\n"
+msgstr ""
+
 #, c-format
 msgid "Error: home (%s) is not a directory\n"
 msgstr ""
@@ -191,6 +193,23 @@ msgstr ""
 msgid "Error: cannot create directory \"%s\"\n"
 msgstr "%s nem sikerült a \"%s\" könyvtárat létrehozni\n"
 
+msgid ""
+"Welcome to WeeChat!\n"
+"\n"
+"If you are discovering WeeChat, it is recommended to read at least the "
+"quickstart guide, and the user's guide if you have some time; they explain "
+"main WeeChat concepts.\n"
+"All WeeChat docs are available at: https://weechat.org/doc\n"
+"\n"
+"Moreover, there is inline help with /help on all commands and options (use "
+"Tab key to complete the name).\n"
+"The command /iset (script iset.pl) can help to customize WeeChat: /script "
+"install iset.pl\n"
+"\n"
+"You can create and connect to an IRC server with /server and /connect "
+"commands (see /help server)."
+msgstr ""
+
 #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux"
 #, c-format
 msgid ""
@@ -1384,9 +1403,10 @@ msgid ""
 "  2. a string with chars to hide (format: \"hide:char,string\")\n"
 "  3. a color (format: \"color:xxx\")\n"
 "  4. an info (format: \"info:name,arguments\", arguments are optional)\n"
-"  5. an option (format: \"file.section.option\")\n"
-"  6. a local variable in buffer\n"
-"  7. a hdata name/variable (the value is automatically converted to string), "
+"  5. an environment variable (format: \"env:XXX\")\n"
+"  6. an option (format: \"file.section.option\")\n"
+"  7. a local variable in buffer\n"
+"  8. a hdata name/variable (the value is automatically converted to string), "
 "by default \"window\" and \"buffer\" point to current window/buffer.\n"
 "Format for hdata can be one of following:\n"
 "  hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
@@ -1401,6 +1421,7 @@ msgid ""
 "\n"
 "Examples (simple strings):\n"
 "  /eval -n ${info:version}                     ==> 0.4.3\n"
+"  /eval -n ${env:HOME}                         ==> /home/user\n"
 "  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
 "  /eval -n ${window}                           ==> 0x2549aa0\n"
 "  /eval -n ${window.buffer}                    ==> 0x2549320\n"
@@ -3804,24 +3825,6 @@ msgstr ""
 msgid "Terminal lost, exiting WeeChat..."
 msgstr ""
 
-msgid ""
-"\n"
-"Welcome to WeeChat!\n"
-"\n"
-"If you are discovering WeeChat, it is recommended to read at least the "
-"quickstart guide, and the user's guide if you have some time; they explain "
-"main WeeChat concepts.\n"
-"All WeeChat docs are available at: https://weechat.org/doc\n"
-"\n"
-"Moreover, there is inline help with /help on all commands and options (use "
-"Tab key to complete the name).\n"
-"The command /iset (script iset.pl) can help to customize WeeChat: /script "
-"install iset.pl\n"
-"\n"
-"You can create and connect to an IRC server with /server and /connect "
-"commands (see /help server)."
-msgstr ""
-
 #, fuzzy
 msgid "Mouse is enabled"
 msgstr "a felhasználók le lettek tiltva"
@@ -6164,6 +6167,13 @@ msgstr ""
 msgid "nicks in notify list"
 msgstr "%s nem található ilyen mellőzés\n"
 
+#, c-format
+msgid ""
+"%sWARNING: the value \"channel\" for option \"irc.look.display_away\" will "
+"send all your away changes to the channels, which is often considered as "
+"spam; therefore you could be banned from channels, you are warned!"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"

po/it.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-04-19 11:28+0200\n"
+"POT-Creation-Date: 2015-05-07 07:02+0200\n"
 "PO-Revision-Date: 2015-03-21 08:41+0100\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -135,10 +135,13 @@ msgstr ""
 msgid "Usage: %s [option...] [plugin:option...]\n"
 msgstr "Uso: %s [opzione...] [plugin:opzione...]\n"
 
+#, fuzzy
 msgid ""
 "  -a, --no-connect         disable auto-connect to servers at startup\n"
 "  -c, --colors             display default colors in terminal\n"
 "  -d, --dir <path>         set WeeChat home directory (default: ~/.weechat)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
 "  -h, --help               display this help\n"
 "  -l, --license            display WeeChat license\n"
 "  -p, --no-plugin          don't load any plugin at startup\n"
@@ -169,16 +172,16 @@ msgstr ""
 msgid "Error: missing argument for \"%s\" option\n"
 msgstr "Errore: argomento mancante per l'opzione \"%s\"\n"
 
-msgid "Error: WEECHAT_HOME is undefined, check build options\n"
-msgstr ""
-"Errore: WEECHAT_HOME non è definito, verificare le opzioni di compilazione\n"
-
 msgid "Error: unable to get HOME directory\n"
 msgstr "Errore: impossibile aprire la directory HOME\n"
 
 msgid "Error: not enough memory for home directory\n"
 msgstr "Errore: spazio insufficiente per la directory home\n"
 
+msgid "Error: WEECHAT_HOME is undefined, check build options\n"
+msgstr ""
+"Errore: WEECHAT_HOME non è definito, verificare le opzioni di compilazione\n"
+
 #, c-format
 msgid "Error: home (%s) is not a directory\n"
 msgstr "Errore: home (%s) non è una directory\n"
@@ -187,6 +190,23 @@ msgstr "Errore: home (%s) non è una directory\n"
 msgid "Error: cannot create directory \"%s\"\n"
 msgstr "Errore: impossibile creare la directory \"%s\"\n"
 
+msgid ""
+"Welcome to WeeChat!\n"
+"\n"
+"If you are discovering WeeChat, it is recommended to read at least the "
+"quickstart guide, and the user's guide if you have some time; they explain "
+"main WeeChat concepts.\n"
+"All WeeChat docs are available at: https://weechat.org/doc\n"
+"\n"
+"Moreover, there is inline help with /help on all commands and options (use "
+"Tab key to complete the name).\n"
+"The command /iset (script iset.pl) can help to customize WeeChat: /script "
+"install iset.pl\n"
+"\n"
+"You can create and connect to an IRC server with /server and /connect "
+"commands (see /help server)."
+msgstr ""
+
 #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux"
 #, c-format
 msgid ""
@@ -1474,9 +1494,10 @@ msgid ""
 "  2. a string with chars to hide (format: \"hide:char,string\")\n"
 "  3. a color (format: \"color:xxx\")\n"
 "  4. an info (format: \"info:name,arguments\", arguments are optional)\n"
-"  5. an option (format: \"file.section.option\")\n"
-"  6. a local variable in buffer\n"
-"  7. a hdata name/variable (the value is automatically converted to string), "
+"  5. an environment variable (format: \"env:XXX\")\n"
+"  6. an option (format: \"file.section.option\")\n"
+"  7. a local variable in buffer\n"
+"  8. a hdata name/variable (the value is automatically converted to string), "
 "by default \"window\" and \"buffer\" point to current window/buffer.\n"
 "Format for hdata can be one of following:\n"
 "  hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
@@ -1491,6 +1512,7 @@ msgid ""
 "\n"
 "Examples (simple strings):\n"
 "  /eval -n ${info:version}                     ==> 0.4.3\n"
+"  /eval -n ${env:HOME}                         ==> /home/user\n"
 "  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
 "  /eval -n ${window}                           ==> 0x2549aa0\n"
 "  /eval -n ${window.buffer}                    ==> 0x2549320\n"
@@ -4532,24 +4554,6 @@ msgstr "Colori di WeeChat (in uso: %d, rimaste: %d):"
 msgid "Terminal lost, exiting WeeChat..."
 msgstr "Terminale perduto, chiusura di WeeChat..."
 
-msgid ""
-"\n"
-"Welcome to WeeChat!\n"
-"\n"
-"If you are discovering WeeChat, it is recommended to read at least the "
-"quickstart guide, and the user's guide if you have some time; they explain "
-"main WeeChat concepts.\n"
-"All WeeChat docs are available at: https://weechat.org/doc\n"
-"\n"
-"Moreover, there is inline help with /help on all commands and options (use "
-"Tab key to complete the name).\n"
-"The command /iset (script iset.pl) can help to customize WeeChat: /script "
-"install iset.pl\n"
-"\n"
-"You can create and connect to an IRC server with /server and /connect "
-"commands (see /help server)."
-msgstr ""
-
 msgid "Mouse is enabled"
 msgstr "Mouse abilitato"
 
@@ -7046,6 +7050,13 @@ msgstr "numero di ignore definiti"
 msgid "nicks in notify list"
 msgstr "nick nella lista notifiche"
 
+#, c-format
+msgid ""
+"%sWARNING: the value \"channel\" for option \"irc.look.display_away\" will "
+"send all your away changes to the channels, which is often considered as "
+"spam; therefore you could be banned from channels, you are warned!"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"

po/ja.po

@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-04-19 11:28+0200\n"
-"PO-Revision-Date: 2015-04-22 21:28+0900\n"
+"POT-Creation-Date: 2015-05-07 07:02+0200\n"
+"PO-Revision-Date: 2015-04-29 02:38+0900\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n"
 "Language: ja\n"
@@ -40,11 +40,11 @@ msgid "max chars"
 msgstr "最大文字数"
 
 msgid ""
-"a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)"
-"green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal "
-"color number or an alias; attributes are allowed before color (for text "
-"color only, not background): \"*\" for bold, \"!\" for reverse, \"/\" for "
-"italic, \"_\" for underline"
+"a WeeChat color name (default, black, (dark)gray, white, (light)red, "
+"(light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a "
+"terminal color number or an alias; attributes are allowed before color (for "
+"text color only, not background): \"*\" for bold, \"!\" for reverse, \"/\" "
+"for italic, \"_\" for underline"
 msgstr ""
 "WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、"
 "brown、yellow、(light)blue、(light)magenta、(light)cyan) 、ターミナル色番号ま"
@@ -132,6 +132,8 @@ msgid ""
 "  -a, --no-connect         disable auto-connect to servers at startup\n"
 "  -c, --colors             display default colors in terminal\n"
 "  -d, --dir <path>         set WeeChat home directory (default: ~/.weechat)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
 "  -h, --help               display this help\n"
 "  -l, --license            display WeeChat license\n"
 "  -p, --no-plugin          don't load any plugin at startup\n"
@@ -147,6 +149,8 @@ msgstr ""
 "  -c, --colors             ターミナルにデフォルトの色を表示\n"
 "  -d, --dir <path>         WeeChat ホームディレクトリを設定 (デフォルト: ~/."
 "weechat)\n"
+"                           (このオプションが設定されていない場合、"
+"WEECHAT_HOME 環境変数を読みます)\n"
 "  -h, --help               このヘルプを表示\n"
 "  -l, --license            WeeChat ライセンスを表示\n"
 "  -p, --no-plugin          起動時にプラグインをロードしない\n"
@@ -164,17 +168,17 @@ msgstr ""
 msgid "Error: missing argument for \"%s\" option\n"
 msgstr "エラー: \"%s\" オプションの引数がありません\n"
 
-msgid "Error: WEECHAT_HOME is undefined, check build options\n"
-msgstr ""
-"エラー: WEECHAT_HOME が定義されていません、ビルドオプションを確認してくださ"
-"い\n"
-
 msgid "Error: unable to get HOME directory\n"
 msgstr "エラー: HOME ディレクトリが不明です\n"
 
 msgid "Error: not enough memory for home directory\n"
 msgstr "エラー: ホームディレクトリ用のメモリが不足しています\n"
 
+msgid "Error: WEECHAT_HOME is undefined, check build options\n"
+msgstr ""
+"エラー: WEECHAT_HOME が定義されていません、ビルドオプションを確認してくださ"
+"い\n"
+
 #, c-format
 msgid "Error: home (%s) is not a directory\n"
 msgstr "エラー: ホーム (%s) はディレクトリではありません\n"
@@ -183,6 +187,37 @@ msgstr "エラー: ホーム (%s) はディレクトリではありません\n"
 msgid "Error: cannot create directory \"%s\"\n"
 msgstr "エラー: ディレクトリ \"%s\" の作成に失敗しました\n"
 
+msgid ""
+"Welcome to WeeChat!\n"
+"\n"
+"If you are discovering WeeChat, it is recommended to read at least the "
+"quickstart guide, and the user's guide if you have some time; they explain "
+"main WeeChat concepts.\n"
+"All WeeChat docs are available at: https://weechat.org/doc\n"
+"\n"
+"Moreover, there is inline help with /help on all commands and options (use "
+"Tab key to complete the name).\n"
+"The command /iset (script iset.pl) can help to customize WeeChat: /script "
+"install iset.pl\n"
+"\n"
+"You can create and connect to an IRC server with /server and /connect "
+"commands (see /help server)."
+msgstr ""
+"WeeChat にようこそ!\n"
+"\n"
+"WeeChat を初めて使うのなら、少なくともクイックスタートガイドを、時間があるな"
+"らユーザガイドを読むことをお勧めします。これらは WeeChat の主な構想を説明して"
+"います。\n"
+"WeeChat の文書は全てこのサイトから利用可能です: https://weechat.org/doc\n"
+"\n"
+"さらに、すべてのコマンドとオプションには /help から見れるインラインヘルプが用"
+"意されています (Tab キーで名前補完できます)。\n"
+"(iset.pl スクリプトの提供する) コマンド /iset は WeeChat をカスタマイズするの"
+"に便利です。このスクリプトを使えるようにするには: /script install iset.pl\n"
+"\n"
+"IRC サーバの設定を作って、サーバに接続するには /server と /connect コマンドを"
+"使ってください (/help server 参照)。"
+
 #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux"
 #, c-format
 msgid ""
@@ -1482,9 +1517,10 @@ msgid ""
 "  2. a string with chars to hide (format: \"hide:char,string\")\n"
 "  3. a color (format: \"color:xxx\")\n"
 "  4. an info (format: \"info:name,arguments\", arguments are optional)\n"
-"  5. an option (format: \"file.section.option\")\n"
-"  6. a local variable in buffer\n"
-"  7. a hdata name/variable (the value is automatically converted to string), "
+"  5. an environment variable (format: \"env:XXX\")\n"
+"  6. an option (format: \"file.section.option\")\n"
+"  7. a local variable in buffer\n"
+"  8. a hdata name/variable (the value is automatically converted to string), "
 "by default \"window\" and \"buffer\" point to current window/buffer.\n"
 "Format for hdata can be one of following:\n"
 "  hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
@@ -1499,6 +1535,7 @@ msgid ""
 "\n"
 "Examples (simple strings):\n"
 "  /eval -n ${info:version}                     ==> 0.4.3\n"
+"  /eval -n ${env:HOME}                         ==> /home/user\n"
 "  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
 "  /eval -n ${window}                           ==> 0x2549aa0\n"
 "  /eval -n ${window.buffer}                    ==> 0x2549320\n"
@@ -1553,9 +1590,10 @@ msgstr ""
 "  2. 隠す文字を含む文字列 (フォーマット: \"hide:char,string\")\n"
 "  3. 色 (フォーマット: \"color:xxx\")\n"
 "  4. 情報 (フォーマット: \"info:name,arguments\"、arguments は任意)\n"
-"  5. オプション (フォーマット: \"file.section.option\")\n"
-"  6. バッファのローカル変数\n"
-"  7. hdata の名前/変数 (値は自動的に文字列に変換されます)、デフォルトでは "
+"  5. 環境変数 (フォーマット: \"env:XXX\")\n"
+"  6. オプション (フォーマット: \"file.section.option\")\n"
+"  7. バッファのローカル変数\n"
+"  8. hdata の名前/変数 (値は自動的に文字列に変換されます)、デフォルトでは "
 "\"window\" と \"buffer\" は現在のウィンドウ/バッファを指します。\n"
 "hdata のフォーマットは以下の 1 つです:\n"
 "  hdata.var1.var2...: hdata (ポインタは既知) で始まり、1 個ずつ変数を続ける "
@@ -1570,6 +1608,7 @@ msgstr ""
 "\n"
 "例 (単純な文字列):\n"
 "  /eval -n ${info:version}                     ==> 0.4.3\n"
+"  /eval -n ${env:HOME}                         ==> /home/user\n"
 "  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
 "  /eval -n ${window}                           ==> 0x2549aa0\n"
 "  /eval -n ${window.buffer}                    ==> 0x2549320\n"
@@ -4618,39 +4657,6 @@ msgstr "WeeChat 色 (使用中: %d、残り: %d):"
 msgid "Terminal lost, exiting WeeChat..."
 msgstr "ターミナルが見つかりません、WeeChat の終了中..."
 
-msgid ""
-"\n"
-"Welcome to WeeChat!\n"
-"\n"
-"If you are discovering WeeChat, it is recommended to read at least the "
-"quickstart guide, and the user's guide if you have some time; they explain "
-"main WeeChat concepts.\n"
-"All WeeChat docs are available at: https://weechat.org/doc\n"
-"\n"
-"Moreover, there is inline help with /help on all commands and options (use "
-"Tab key to complete the name).\n"
-"The command /iset (script iset.pl) can help to customize WeeChat: /script "
-"install iset.pl\n"
-"\n"
-"You can create and connect to an IRC server with /server and /connect "
-"commands (see /help server)."
-msgstr ""
-"\n"
-"WeeChat にようこそ!\n"
-"\n"
-"WeeChat を初めて使うのなら、少なくともクイックスタートガイドを、時間があるな"
-"らユーザガイドを読むことをお勧めします。これらは WeeChat の主な構想を説明して"
-"います。\n"
-"WeeChat の文書は全てこのサイトから利用可能です: https://weechat.org/doc\n"
-"\n"
-"さらに、すべてのコマンドとオプションには /help から見れるインラインヘルプが用"
-"意されています (Tab キーで名前補完できます)。\n"
-"(iset.pl スクリプトの提供する) コマンド /iset は WeeChat をカスタマイズするの"
-"に便利です。このスクリプトを使えるようにするには: /script install iset.pl\n"
-"\n"
-"IRC サーバの設定を作って、サーバに接続するには /server と /connect コマンドを"
-"使ってください (/help server 参照)。"
-
 msgid "Mouse is enabled"
 msgstr "マウスを有効化しました"
 
@@ -6091,8 +6097,8 @@ msgstr ""
 "            - 内部サーバ名 (/server add で作成されたもの、利用推奨)\n"
 "            - ホスト名/ポート番号又は IP アドレス/ポート番号、デフォルトの"
 "ポート番号は 6667\n"
-"            - 次のフォーマットに従う URL: irc[6][s]://[nickname[:password]@]"
-"irc.example.org[:port][/#channel1][,#channel2[...]]\n"
+"            - 次のフォーマットに従う URL: irc[6][s]://[nickname[:"
+"password]@]irc.example.org[:port][/#channel1][,#channel2[...]]\n"
 "            注意: アドレス/IP/URL を指定した場合、サーバを一時的に作ります "
 "(保存しません)、/help irc.look.temporary_servers を参照してください。\n"
 "    option: サーバに関するオプション (ブール型オプションでは、value は無視さ"
@@ -7182,6 +7188,13 @@ msgstr "無視エントリの数"
 msgid "nicks in notify list"
 msgstr "通知エントリのニックネーム"
 
+#, c-format
+msgid ""
+"%sWARNING: the value \"channel\" for option \"irc.look.display_away\" will "
+"send all your away changes to the channels, which is often considered as "
+"spam; therefore you could be banned from channels, you are warned!"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"
@@ -11147,8 +11160,8 @@ msgid ""
 "Examples (you can also look at default triggers with /trigger listdefault):\n"
 "  add text attributes *bold*, _underline_ and /italic/ (only in user "
 "messages):\n"
-"    /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==\\*"
-"(\\S+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_(\\S+)_==_${color:"
+"    /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"=="
+"\\*(\\S+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_(\\S+)_==_${color:"
 "underline}${re:1}${color:-underline}_== ==/(\\S+)/==/${color:"
 "italic}${re:1}${color:-italic}/\"\n"
 "  hide nicklist bar on small terminals:\n"
@@ -11224,8 +11237,8 @@ msgstr ""
 "\n"
 "例 (/trigger listdefault でデフォルトトリガを見ることができます):\n"
 "  テキスト属性 *太字*、_下線_、/イタリック/ を追加 (ユーザメッセージのみ):\n"
-"    /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==\\*"
-"(\\S+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_(\\S+)_==_${color:"
+"    /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"=="
+"\\*(\\S+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_(\\S+)_==_${color:"
 "underline}${re:1}${color:-underline}_== ==/(\\S+)/==/${color:"
 "italic}${re:1}${color:-italic}/\"\n"
 "  狭い端末ではニックネームリストバーを隠す:\n"

po/pl.po

@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-04-19 11:28+0200\n"
-"PO-Revision-Date: 2015-03-21 08:41+0100\n"
+"POT-Creation-Date: 2015-05-07 07:02+0200\n"
+"PO-Revision-Date: 2015-05-09 14:00+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: pl\n"
@@ -136,6 +136,8 @@ msgid ""
 "  -a, --no-connect         disable auto-connect to servers at startup\n"
 "  -c, --colors             display default colors in terminal\n"
 "  -d, --dir <path>         set WeeChat home directory (default: ~/.weechat)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
 "  -h, --help               display this help\n"
 "  -l, --license            display WeeChat license\n"
 "  -p, --no-plugin          don't load any plugin at startup\n"
@@ -152,6 +154,8 @@ msgstr ""
 "  -c, --colors             wyświetla domyślne kolory w terminalu\n"
 "  -d, --dir <ścieżka>         ustawia katalog domowy  WeeChat (domyślnie: ~/."
 "weechat)\n"
+"                           (zmienna środowiskowa WEECHAT_HOME jest używana "
+"jeśli ta opcja nie jest podana)\n"
 "  -h, --help               wyświetla tą wiadomość\n"
 "  -l, --license            wyświetla licencje WeeChat\n"
 "  -p, --no-plugin          nie ładuj wtyczek przy starcie\n"
@@ -167,16 +171,16 @@ msgstr ""
 msgid "Error: missing argument for \"%s\" option\n"
 msgstr "Błąd: brak argumentu dla opcji \"%s\"\n"
 
-msgid "Error: WEECHAT_HOME is undefined, check build options\n"
-msgstr ""
-"Błąd: WEECHAT_HOME nie ma zdefiniowanej wartości , sprawdź opcje kompilacji\n"
-
 msgid "Error: unable to get HOME directory\n"
 msgstr "Błąd: nie można pozyskać katalogu domowego\n"
 
 msgid "Error: not enough memory for home directory\n"
 msgstr "Błąd: za mało miejsca dla katalogu domowego\n"
 
+msgid "Error: WEECHAT_HOME is undefined, check build options\n"
+msgstr ""
+"Błąd: WEECHAT_HOME nie ma zdefiniowanej wartości , sprawdź opcje kompilacji\n"
+
 #, c-format
 msgid "Error: home (%s) is not a directory\n"
 msgstr "Błąd: %s nie jest katalogiem\n"
@@ -185,6 +189,37 @@ msgstr "Błąd: %s nie jest katalogiem\n"
 msgid "Error: cannot create directory \"%s\"\n"
 msgstr "Błąd: nie można utworzyć katalogu \"%s\"\n"
 
+msgid ""
+"Welcome to WeeChat!\n"
+"\n"
+"If you are discovering WeeChat, it is recommended to read at least the "
+"quickstart guide, and the user's guide if you have some time; they explain "
+"main WeeChat concepts.\n"
+"All WeeChat docs are available at: https://weechat.org/doc\n"
+"\n"
+"Moreover, there is inline help with /help on all commands and options (use "
+"Tab key to complete the name).\n"
+"The command /iset (script iset.pl) can help to customize WeeChat: /script "
+"install iset.pl\n"
+"\n"
+"You can create and connect to an IRC server with /server and /connect "
+"commands (see /help server)."
+msgstr ""
+"Witaj w WeeChat!\n"
+"\n"
+"Jeśli dopiero poznajesz WeeChat, zaleca się abyś przeczytał przynajmniej "
+"szybki start i poradnik użytkownika; wyjaśnią one główne założenia WeeChat.\n"
+"Wszystkie dokumenty dotyczące WeeChat dostępne są pod adresem: https://"
+"weechat.org/doc\n"
+"\n"
+"Ponadto, dostępna jest wbudowana pomoc (komenda /help) dla wszysstkich "
+"komend i opcji (klawisz Tab dopełnia nazwy).\n"
+"Komenda /iset (skrypt iset.pl) pomaga w dostosowaniu WeeChat do swoich "
+"preferencji: /script install iset.pl\n"
+"\n"
+"Możesz dodać i połączyć się z serwerem IRC za pomocą komend /server i /"
+"connect (zobacz /help server)."
+
 #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux"
 #, c-format
 msgid ""
@@ -204,6 +239,8 @@ msgid ""
 "%sWarning: cannot set the locale; make sure $LANG and $LC_* variables are "
 "correct"
 msgstr ""
+"%sUwaga: nie można ustawić języka; upewnij się, że zmienne $LANG i $LC_* są "
+"ustawione poprawnie"
 
 #, c-format
 msgid "Signal %s received, exiting WeeChat..."
@@ -1024,7 +1061,6 @@ msgstr ""
 msgid "manage bars"
 msgstr "zarządzaj paskami"
 
-#, fuzzy
 msgid ""
 "list|listfull|listitems || add <name> <type>[,<conditions>] <position> "
 "<size> <separator> <item1>[,<item2>...] || default [input|title|status|"
@@ -1036,7 +1072,6 @@ msgstr ""
 "nicklist] || del <nazwa>|-all || set <nazwa> <opcja> <wartość> || hide|show|"
 "toggle <nazwa> || scroll <nazwa> <okno> <wartość_przewinięcia>"
 
-#, fuzzy
 msgid ""
 "         list: list all bars\n"
 "     listfull: list all bars (verbose)\n"
@@ -1363,7 +1398,6 @@ msgstr ""
 "go chat|<pasek>|<x>,<y> || move up|down|left|right|area_up|area_down|"
 "area_left|area_right || stop"
 
-#, fuzzy
 msgid ""
 "  go: move cursor to chat area, a bar (using bar name) or coordinates \"x,y"
 "\"\n"
@@ -1403,6 +1437,18 @@ msgstr ""
 "Kiedy obsługa myszy jest włączona (zobacz /help mouse), domyślnie wciśnięcie "
 "środkowego przycisku włącza tryb kursora we wskazanym punkcie.\n"
 "\n"
+"Domyślne skróty dla trybu kursora w oknie rozmowy:\n"
+"  m  cytuj wiadomość\n"
+"  q  cytuj prefiks + wiadomość\n"
+"  Q  cytuj czas + prefiks + wiadomość\n"
+"\n"
+"Domyślne skróty dla trybu kursora na liście nicków:\n"
+"  b  zbanuj nick (/ban)\n"
+"  k  wykop nick (/kick)\n"
+"  K  wykop i zbanuj nick (/kickban)\n"
+"  q  otworz okno prywatnej rozmowy (/query)\n"
+"  w  zapytaj o informacje o użytkowniku (/whois)\n"
+"\n"
 "Przykłady:\n"
 "  przejdź do listy nicków:\n"
 "    /cursor go nicklist\n"
@@ -1466,11 +1512,9 @@ msgstr ""
 msgid "evaluate expression"
 msgstr "przetwórz wyrażenie"
 
-#, fuzzy
 msgid "[-n|-s] <expression> || [-n] -c <expression1> <operator> <expression2>"
-msgstr "[-n] <wyrażenie> || [-n] -c <wyrażenie1> <operator> <wyrażenie2>"
+msgstr "[-n|-s] <wyrażenie> || [-n] -c <wyrażenie1> <operator> <wyrażenie2>"
 
-#, fuzzy
 msgid ""
 "        -n: display result without sending it to buffer (debug mode)\n"
 "        -s: split expression before evaluating it (many commands can be "
@@ -1508,9 +1552,10 @@ msgid ""
 "  2. a string with chars to hide (format: \"hide:char,string\")\n"
 "  3. a color (format: \"color:xxx\")\n"
 "  4. an info (format: \"info:name,arguments\", arguments are optional)\n"
-"  5. an option (format: \"file.section.option\")\n"
-"  6. a local variable in buffer\n"
-"  7. a hdata name/variable (the value is automatically converted to string), "
+"  5. an environment variable (format: \"env:XXX\")\n"
+"  6. an option (format: \"file.section.option\")\n"
+"  7. a local variable in buffer\n"
+"  8. a hdata name/variable (the value is automatically converted to string), "
 "by default \"window\" and \"buffer\" point to current window/buffer.\n"
 "Format for hdata can be one of following:\n"
 "  hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
@@ -1525,6 +1570,7 @@ msgid ""
 "\n"
 "Examples (simple strings):\n"
 "  /eval -n ${info:version}                     ==> 0.4.3\n"
+"  /eval -n ${env:HOME}                         ==> /home/user\n"
 "  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
 "  /eval -n ${window}                           ==> 0x2549aa0\n"
 "  /eval -n ${window.buffer}                    ==> 0x2549320\n"
@@ -1544,6 +1590,8 @@ msgid ""
 "  /eval -n -c abcd !~ abc                 ==> 0"
 msgstr ""
 "        -n: wyświetla wynik bez wysyłania go do buforu (tryb debugowania)\n"
+"        -s: podziel wyażenie przed przetworzeniem go (wiele komend może być "
+"oddzielonych średnikami)\n"
 "        -c: przetwarza jako warunek: użyj operatorów i nawiasów, zwraca "
 "wartość logiczną (\"0\" lub \"1\")\n"
 "wyrażenie: wyrażenie do przetworzenia, zmienne o formacie ${zmienna} są "
@@ -1577,9 +1625,10 @@ msgstr ""
 "  2. ciąg ze znakami do ukrycia (format: \"hide:char,string\")\n"
 "  3. kolor (format color:xxx)\n"
 "  4. informacja (format: \"info:nazwa,argumenty\", argumenty są opcjonalne)\n"
-"  5. opcja (format: plik.sekcja.opcja)\n"
-"  6. zmienna lokalna w buforze\n"
-"  7. nazwa hdatay/zmiennej (wartość jest automatycznie konwertowana na ciąg "
+"  5. zmienna środowiskowa (format: \"env:XXX\")\n"
+"  6. opcja (format: plik.sekcja.opcja)\n"
+"  7. zmienna lokalna w buforze\n"
+"  8. nazwa hdatay/zmiennej (wartość jest automatycznie konwertowana na ciąg "
 "znaków), domyślnie \"window\" i \"buffer\" wskazują na aktualne okno/bufor.\n"
 "Format dla hdata może być jednym z poniższych:\n"
 "  hdata.zmienna1.zmienna2...: inicjuje hdata (wskaźnik musi być znany), "
@@ -1594,24 +1643,25 @@ msgstr ""
 "\"weechat_hdata_get\".\n"
 "\n"
 "Przykłady (proste ciągi):\n"
-"  /eval -n ${info:version}                 ==> 0.4.3\n"
-"  /eval -n ${weechat.look.scroll_amount}   ==> 3\n"
-"  /eval -n ${window}                       ==> 0x2549aa0\n"
-"  /eval -n ${window.buffer}                ==> 0x2549320\n"
-"  /eval -n ${window.buffer.full_name}      ==> core.weechat\n"
-"  /eval -n ${window.buffer.number}         ==> 1\n"
-"  /eval -n ${\\t}                           ==> <tab>\n"
+"  /eval -n ${info:version}                     ==> 0.4.3\n"
+"  /eval -n ${env:HOME}                         ==> /home/user\n"
+"  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
+"  /eval -n ${window}                           ==> 0x2549aa0\n"
+"  /eval -n ${window.buffer}                    ==> 0x2549320\n"
+"  /eval -n ${window.buffer.full_name}          ==> core.weechat\n"
+"  /eval -n ${window.buffer.number}             ==> 1\n"
+"  /eval -n ${\\t}                               ==> <tab>\n"
 "  /eval -n ${hide:-,${relay.network.password}} ==> --------\n"
 "\n"
 "Przykłady (warunki):\n"
-"  /eval -n -c ${window.buffer.number} > 2  ==> 0\n"
-"  /eval -n -c ${window.win_width} > 100    ==> 1\n"
-"  /eval -n -c (8 > 12) || (5 > 2)          ==> 1\n"
-"  /eval -n -c (8 > 12) && (5 > 2)          ==> 0\n"
-"  /eval -n -c abcd =~ ^ABC                 ==> 1\n"
-"  /eval -n -c abcd =~ (?-i)^ABC            ==> 0\n"
-"  /eval -n -c abcd =~ (?-i)^abc            ==> 1\n"
-"  /eval -n -c abcd !~ abc                  ==> 0"
+"  /eval -n -c ${window.buffer.number} > 2 ==> 0\n"
+"  /eval -n -c ${window.win_width} > 100   ==> 1\n"
+"  /eval -n -c (8 > 12) || (5 > 2)         ==> 1\n"
+"  /eval -n -c (8 > 12) && (5 > 2)         ==> 0\n"
+"  /eval -n -c abcd =~ ^ABC                ==> 1\n"
+"  /eval -n -c abcd =~ (?-i)^ABC           ==> 0\n"
+"  /eval -n -c abcd =~ (?-i)^abc           ==> 1\n"
+"  /eval -n -c abcd !~ abc                 ==> 0"
 
 msgid ""
 "filter messages in buffers, to hide/show them according to tags or regex"
@@ -1626,7 +1676,6 @@ msgstr ""
 "list || enable|disable|toggle [<nazwa>|@] || add <nazwa> <bufor>[,"
 "<bufor>...] <tagi> <regex> || rename <nazwa> <nowa_nazwa> || del <nazwa>|-all"
 
-#, fuzzy
 msgid ""
 "   list: list all filters\n"
 " enable: enable filters (filters are enabled by default)\n"
@@ -1705,11 +1754,10 @@ msgstr ""
 " bufor: oddzielona przecinkami lisa buforów, dla których filtr jest "
 "aktywny:\n"
 "         - jest to pełna nazwa zawierająca wtyczkę (przykład: \"irc.freenode."
-"#weechat\")\n"
+"#weechat\" lub \"irc.server.freenode\")\n"
 "         - \"*\" oznacza wszystkie bufory\n"
 "         - nazwa zaczynająca się od '!' jest wykluczana\n"
-"         - nazwa może zaczynać się lub kończyć '*', aby dopasować wiele "
-"buforów\n"
+"         - dozwolony jest znak \"*\"\n"
 "   tagi: lista tagów oddzielona przecinkiem, np: \"irc_join,irc_part,irc_quit"
 "\"\n"
 "         - logiczne \"i\": użyj \"+\" pomiędzy tagami (na przykład: "
@@ -1730,13 +1778,12 @@ msgstr ""
 "Domyślny skrót klawiszowy alt+'=' włącza/wyłącza filtrowanie.\n"
 "\n"
 "Najczęściej używane tagi:\n"
-"  no_filter, no_highlight, no_log, log0..log9 (poziom logowania),\n"
+"  no_filter, no_highlight, no_log, log0..log9 (log level),\n"
 "  notify_none, notify_message, notify_private, notify_highlight,\n"
-"  nick_xxx (xxx to nick w wiadomości), prefix_nick_ccc (ccc to kolor "
-"nicka),\n"
-"  host_xxx (xxx to nazwa użytkownika + host w wiadomości),\n"
-"  irc_xxx (xxx ito nazwa komendy lub numer, zobacz /server raw lub /debug "
-"tags),\n"
+"  nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of "
+"nick),\n"
+"  host_xxx (xxx is username + host in message),\n"
+"  irc_xxx (xxx is command name or number, see /server raw or /debug tags),\n"
 "  irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, "
 "irc_smart_filter, away_info.\n"
 "Aby zobaczyć listę tagów w liniach buforów wykonaj: /debug tags\n"
@@ -1756,7 +1803,9 @@ msgstr ""
 "  filtruj wejścia/akcje IRC od użytkownika \"toto\":\n"
 "    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *\n"
 "  filtruj linie zawierające fraze \"weechat sucks\" na kanale IRC #weechat:\n"
-"    /filter add sucks irc.freenode.#weechat * weechat sucks"
+"    /filter add sucks irc.freenode.#weechat * weechat sucks\n"
+"  filtruj linie \"WeeChat sucks\" we wszystkich buforach:\n"
+"    /filter add sucks2 * * (?-i)^WeeChat sucks$"
 
 msgid "display help about commands and options"
 msgstr "wyświetl pomoc na temat komend i opcji"
@@ -2715,7 +2764,6 @@ msgstr ""
 msgid "show WeeChat version and compilation date"
 msgstr "pokazuje wersję i datę, kiedy skompilowano WeeChat"
 
-#, fuzzy
 msgid ""
 " -o: send version to current buffer as input (English string)\n"
 "-ol: send version to current buffer as input (translated string)\n"
@@ -2724,7 +2772,11 @@ msgid ""
 "(otherwise the irc command /version is used on irc buffers)."
 msgstr ""
 " -o: wysyła wersje jako wejście do obecnego bufora (po angielsku)\n"
-"-ol: wysyła wersje jako wejście do obecnego bufora (przetłumaczony)"
+"-ol: wysyła wersje jako wejście do obecnego bufora (przetłumaczony)\n"
+"\n"
+"Domyślny alias /v może zostać użyty do wykonania tej komendy we wszystkich "
+"buforach (w przeciwnym wypadku wykonywana jest komenda /version w buforach "
+"irc)."
 
 msgid "schedule a command execution in future"
 msgstr "planuje komendę do wykonania w przyszłości"
@@ -3707,17 +3759,18 @@ msgstr ""
 msgid "string displayed after prefix"
 msgstr "ciąg wyświetlany po przedrostku"
 
-#, fuzzy
 msgid "text to display before nick when quoting a message (see /help cursor)"
-msgstr "teks wyświetlany przed nickiem w prefiksie wiadomości, przykład: \"<\""
+msgstr ""
+"teks wyświetlany przed nickiem podczas cytowania wiadomości (zobacz /help "
+"cursor)"
 
-#, fuzzy
 msgid "text to display after nick when quoting a message (see /help cursor)"
 msgstr ""
-"teks wyświetlany za nickiem w prefiksie wiadomości, przykład: przykład: \">\""
+"teks wyświetlany za nickiem podczas cytowania wiadomości (zobacz /help "
+"cursor)"
 
 msgid "time format when quoting a message (see /help cursor)"
-msgstr ""
+msgstr "format czasu podczas cytowania wiadomości (zobacz /help cursor)"
 
 msgid "use a marker (line or char) on buffers to show first unread line"
 msgstr ""
@@ -3824,6 +3877,13 @@ msgid ""
 "are allowed with the format \\u1234, for example \\u00A0 for unbreakable "
 "space (see /help print for supported formats)"
 msgstr ""
+"oddzielona przecinkami lista znaków (lub zakres znaków) rozważanych jako "
+"część słowa podświetlenia; każdy element może być pojedynczym znakiem, "
+"zakresem znaków (format: a-z), klasą znaków (przykład \"alnum\", zobacz man "
+"wctype); znak \"!\" przed elementem neguje go (znak NIE jest uznawany za "
+"część słowa); wartość \"*\" pasuje do dowolnego znaku; znaki unikodu są "
+"dozwolone w formacie \\u1234, na przykład \\u00A0 dla niełamliwej spacji "
+"(wspierane formaty można znaleźć w /help print)"
 
 msgid ""
 "comma-separated list of chars (or range of chars) that are considered part "
@@ -3834,6 +3894,13 @@ msgid ""
 "are allowed with the format \\u1234, for example \\u00A0 for unbreakable "
 "space (see /help print for supported formats)"
 msgstr ""
+"oddzielona przecinkami lista znaków (lub zakres znaków) rozważanych jako "
+"część słowa linii poleceń; każdy element może być pojedynczym znakiem, "
+"zakresem znaków (format: a-z), klasą znaków (przykład \"alnum\", zobacz man "
+"wctype); znak \"!\" przed elementem neguje go (znak NIE jest uznawany za "
+"część słowa); wartość \"*\" pasuje do dowolnego znaku; znaki unikodu są "
+"dozwolone w formacie \\u1234, na przykład \\u00A0 dla niełamliwej spacji "
+"(wspierane formaty można znaleźć w /help print)"
 
 msgid "text color for '+' when scrolling bars"
 msgstr "kolor '+' przy przewijaniu pasków"
@@ -4696,24 +4763,6 @@ msgstr "Kolory WeeChat (w użyciu: %d, zostało: %d):"
 msgid "Terminal lost, exiting WeeChat..."
 msgstr "Utracono terminal, wychodzę z WeeChat..."
 
-msgid ""
-"\n"
-"Welcome to WeeChat!\n"
-"\n"
-"If you are discovering WeeChat, it is recommended to read at least the "
-"quickstart guide, and the user's guide if you have some time; they explain "
-"main WeeChat concepts.\n"
-"All WeeChat docs are available at: https://weechat.org/doc\n"
-"\n"
-"Moreover, there is inline help with /help on all commands and options (use "
-"Tab key to complete the name).\n"
-"The command /iset (script iset.pl) can help to customize WeeChat: /script "
-"install iset.pl\n"
-"\n"
-"You can create and connect to an IRC server with /server and /connect "
-"commands (see /help server)."
-msgstr ""
-
 msgid "Mouse is enabled"
 msgstr "Obsługa myszy włączona"
 
@@ -4743,7 +4792,6 @@ msgstr ""
 msgid "bar type (root, window, window_active, window_inactive)"
 msgstr "typ paska (root, window, window_active, window_inactive)"
 
-#, fuzzy
 msgid ""
 "conditions to display the bar: a simple condition: \"active\", \"inactive\", "
 "\"nicklist\" (window must be active/inactive, buffer must have a nicklist), "
@@ -4751,12 +4799,11 @@ msgid ""
 "${window.win_width} > 100\" (local variables for expression are ${active}, "
 "${inactive} and ${nicklist})"
 msgstr ""
-"warunek(i) dla wyświetlania paska (dla pasków o typie \"window\"): prosty "
-"warunek: \"active\", \"inactive\", \"nicklist\" (okna muszą być aktywne/"
-"nieaktywne, bufor musi posiadać listę nicków), lub wyrażenie z "
-"warunkiem(ami) (zobacz /help eval), jak: \"${nicklist} && ${window."
-"win_width} > 100\" (lokalne zmienne dla wyrażenia to ${active}, ${inactive} "
-"i ${nicklist})"
+"warunek(i) dla wyświetlania paska: prosty warunek: \"active\", \"inactive\", "
+"\"nicklist\" (okna muszą być aktywne/nieaktywne, bufor musi posiadać listę "
+"nicków), lub wyrażenie z warunkiem(ami) (zobacz /help eval), jak: "
+"\"${nicklist} && ${window.win_width} > 100\" (lokalne zmienne dla wyrażenia "
+"to ${active}, ${inactive} i ${nicklist})"
 
 msgid "bar position (bottom, top, left, right)"
 msgstr "pozycja paska (bottom (dół), top (góra), left (lewo), right (prawo))"
@@ -5091,7 +5138,6 @@ msgstr ""
 "enable|disable|toggle || listdict || setdict <język>[,<język>...] || deldict "
 "|| addword [<język>] <słowo>"
 
-#, fuzzy
 msgid ""
 "  enable: enable aspell\n"
 " disable: disable aspell\n"
@@ -5131,6 +5177,9 @@ msgstr ""
 "  /set aspell.check.default_dict \"en\"\n"
 "  /aspell enable\n"
 "\n"
+"W celu wyświetlenia listy sugestii na pasku, użyj elementu \"aspell_suggest"
+"\".\n"
+"\n"
 "Domyślny skrót klawiszowy przełączający aspell to alt-s."
 
 msgid "list of all languages supported by aspell"
@@ -6807,20 +6856,19 @@ msgstr ""
 msgid "send a private message to a nick"
 msgstr "wysyła prywatną wiadomość do użytkownika"
 
-#, fuzzy
 msgid "[-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]"
-msgstr "[-server <serwer>] <nick>[,<nick>...] [<tekst>]"
+msgstr "[-noswitch] [-server <serwer>] <nick>[,<nick>...] [<tekst>]"
 
-#, fuzzy
 msgid ""
 "-noswitch: do not switch to new buffer\n"
 "   server: send to this server (internal name)\n"
 "     nick: nick\n"
 "     text: text to send"
 msgstr ""
-"serwer: wyślij do tego serwera (nazwa wewnętrzna)\n"
-"  nick: nick\n"
-"  tekst: wiadomość do wysłania"
+"-noswitch: nie przełączaj do nowego bufora\n"
+"   serwer: wyślij do tego serwera (nazwa wewnętrzna)\n"
+"     nick: nick\n"
+"     tekst: wiadomość do wysłania"
 
 msgid "quiet nicks or hosts"
 msgstr "ucisza nicki albo hosty"
@@ -6948,7 +6996,6 @@ msgstr ""
 "<opcja>[=<wartość>]] [-no<opcja>]|| copy|rename <serwer> <nowa_nazwa> || "
 "reorder <serwer> [<serwer>...] || del|keep <serwer>] || deloutq|jump|raw"
 
-#, fuzzy
 msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
@@ -7005,13 +7052,12 @@ msgstr ""
 "\n"
 "Przykłady:\n"
 "  /server listfull\n"
-"  /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
-"  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
-"  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
-"  /server add freenode3 chat.freenode.net -password=moje_hasło\n"
-"  /server copy oftc oftcbis\n"
-"  /server rename oftc newoftc\n"
-"  /server reorder oftc freenode\n"
+"  /server add freenode chat.freenode.net\n"
+"  /server add freenode chat.freenode.net/6697 -ssl -autoconnect\n"
+"  /server add chatspike irc.chatspike.net/6667,irc.duckspike.net/6667\n"
+"  /server copy freenode freenode-test\n"
+"  /server rename freenode-test freenode2\n"
+"  /server reorder freenode2 freenode\n"
 "  /server del freenode\n"
 "  /server deloutq"
 
@@ -7290,6 +7336,16 @@ msgstr "numery zdefiniowanych ignorów"
 msgid "nicks in notify list"
 msgstr "nicki na liście powiadomień"
 
+#, c-format
+msgid ""
+"%sWARNING: the value \"channel\" for option \"irc.look.display_away\" will "
+"send all your away changes to the channels, which is often considered as "
+"spam; therefore you could be banned from channels, you are warned!"
+msgstr ""
+"%sUWAGA: wartość \"channel\" (kanał) dla opcji \"irc.look.display_away\" "
+"wyśle wszystkie zmiany stanu nieobecności na kanały, jest to często uznawane "
+"za spam; przez to możesz zostać zbanowany na kanale!"
+
 #, c-format
 msgid ""
 "%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"
@@ -7303,16 +7359,20 @@ msgid ""
 "%s%s: invalid priorities string, error at this position in string: \"%s\""
 msgstr "%s%s: nieprawidłowy ciąg priorytetów, błąd na pozycji: \"%s\""
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s%s: invalid fingerprint size, the number of hexadecimal digits must be one "
 "of: %s"
-msgstr "%s%s: skrót musi mieć dokładnie 40 znaków heksadecymalnych"
+msgstr ""
+"%s%s: niewłaściwy rozmiar skrótu, ilość znaków heksadecymalnych musi być "
+"jedną z: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s%s: invalid fingerprint, it must contain only hexadecimal digits (0-9, a-f)"
-msgstr "%s%s: skrót musi mieć dokładnie 40 znaków heksadecymalnych"
+msgstr ""
+"%s%s: niepoprawny skrót, może on zawierać tylko znaki heksadecymalne (0-9, a-"
+"f)"
 
 #, c-format
 msgid ""
@@ -7387,7 +7447,6 @@ msgid "size of the key used during the Diffie-Hellman Key Exchange"
 msgstr ""
 "rozmiar klucza używanego podczas połączenia Wymiany Kluczy Diffie-Hellmana"
 
-#, fuzzy
 msgid ""
 "fingerprint of certificate which is trusted and accepted for the server; "
 "only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 "
@@ -7395,10 +7454,11 @@ msgid ""
 "fingerprints can be separated by commas; if this option is set, the other "
 "checks on certificates are NOT performed (option \"ssl_verify\")"
 msgstr ""
-"skrót SHA1 certyfikatu, który jest zaufany i akceptowany dla serwera "
-"(dokładnie 40 znaków heksadecymalnych bez separatorów); wiele skrótów można "
-"oddzielić przecinkami; jeśli ta opcja jest ustawiona, certyfikat NIE jest "
-"dalej sprawdzany (opcja \"ssl_verify\")"
+"skrót certyfikatu, który jest zaufany i akceptowany dla serwera; tylko cyfry "
+"heksadecymalne są dozwolone (0-9, a-f): 64 znaki dla SHA-512, 32 znaki dla "
+"SHA-256, 20 znaków dla SHA-1 (mało bezpieczne, nie zalecane); wiele skrótów "
+"można oddzielić przecinkami; jeśli ta opcja jest ustawiona, certyfikat NIE "
+"jest dalej sprawdzany (opcja \"ssl_verify\")"
 
 msgid "check that the SSL connection is fully trusted"
 msgstr "sprawdź czy połączenie ssl jest w pełni zaufane"
@@ -7407,7 +7467,6 @@ msgid "password for server (note: content is evaluated, see /help eval)"
 msgstr "hasło dla serwera ( zawartość jest przetwarzana, zobacz /help eval)"
 
 #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
-#, fuzzy
 msgid ""
 "comma-separated list of client capabilities to enable for server if they are "
 "available; capabilities supported by WeeChat are: account-notify, away-"
@@ -7415,11 +7474,10 @@ msgid ""
 "(example: \"away-notify,multi-prefix\")"
 msgstr ""
 "oddzielona przecinkami lista opcji klienta do włączenia dla serwera, jeśli "
-"są dostępne; opcje wspierane przez WeeChat: away-notify, extended-join, "
-"multi-prefix, server-time, userhost-in-names (przykład: \"away-notify,multi-"
-"prefix\")"
+"są dostępne; opcje wspierane przez WeeChat: account-notify, away-notify, "
+"extended-join, multi-prefix, server-time, userhost-in-names (przykład: "
+"\"away-notify,multi-prefix\")"
 
-#, fuzzy
 msgid ""
 "mechanism for SASL authentication: \"plain\" for plain text password, "
 "\"ecdsa-nist256p-challenge\" for key-based challenge authentication, "
@@ -7427,35 +7485,37 @@ msgid ""
 "for blowfish crypted password (insecure, not recommended), \"dh-aes\" for "
 "AES crypted password (insecure, not recommended)"
 msgstr ""
-"mechanizm autentykacji SASL: \"plain\" dla hasła w czystym tekście, \"dh-"
-"blowfish\" dla hasła szyfrowanego za pomocą blowfish, \"dh-aes\" dla hasła "
-"szyfrowanego za pomocą AES, \"external\" dla uwierzytelnienia za pomocą "
-"certyfikatu SSL po stronie klienta"
+"mechanizm autentykacji SASL: \"plain\" dla hasła w czystym tekście, \"ecdsa-"
+"nist256p-challenge\" uwierzytelnianie na podstawie pary kluczy, \"external\" "
+"dla uwierzytelnienia za pomocą certyfikatu SSL po stronie klienta\",  \"dh-"
+"blowfish\" dla hasła szyfrowanego za pomocą blowfish (mało bezpieczne, "
+"niepolecane), \"dh-aes\" dla hasła szyfrowanego za pomocą AES (mało "
+"bezpieczne, niepolecane)"
 
-#, fuzzy
 msgid ""
 "username for SASL authentication; this option is not used for mechanism "
 "\"external\" (note: content is evaluated, see /help eval)"
 msgstr ""
-"hasło dla uwierzytelniania SASL (uwaga: zawartość jest przetwarzana, zobacz /"
-"help eval)"
+"nazwa użytkownika dla uwierzytelniania SASL; ta opcja nie jest używana dla "
+"mechanizmów \"ecdsa-nist256p-challenge\" oraz \"external\"  (uwaga: "
+"zawartość jest przetwarzana, zobacz /help eval)"
 
-#, fuzzy
 msgid ""
 "password for SASL authentication; this option is not used for mechanisms "
 "\"ecdsa-nist256p-challenge\" and \"external\" (note: content is evaluated, "
 "see /help eval)"
 msgstr ""
-"hasło dla uwierzytelniania SASL (uwaga: zawartość jest przetwarzana, zobacz /"
-"help eval)"
+"hasło dla uwierzytelniania SASL; ta opcja nie jest używana dla mechanizmów "
+"\"ecdsa-nist256p-challenge\" oraz \"external\"  (uwaga: zawartość jest "
+"przetwarzana, zobacz /help eval)"
 
-#, fuzzy
 msgid ""
 "file with ECC private key for mechanism \"ecdsa-nist256p-challenge\" (\"%h\" "
 "will be replaced by WeeChat home, \"~/.weechat\" by default)"
 msgstr ""
-"ścieżka wyszukiwania wtyczek (\"%h\" zostanie zastąpione katalogiem domowym "
-"WeeChat - domyślnie \"~/.weechat\")"
+"plik z kluczem prywatnym ECC dla mechanizmu \"ecdsa-nist256p-challenge"
+"\" (\"%h\" zostanie zastąpione katalogiem domowym WeeChat, domyślnie \"~/."
+"weechat\")"
 
 msgid "timeout (in seconds) before giving up SASL authentication"
 msgstr ""
@@ -8558,9 +8618,9 @@ msgstr "%s%s%s%s usunął temat %s%s%s"
 msgid "%sWallops from %s: %s"
 msgstr "%sWallopy od %s: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%sServer notice mask for %s%s%s is %s[%s%s%s]"
-msgstr "%sAtrybut użytkownika %s%s%s to %s[%s%s%s]"
+msgstr "%sMaska powiadomień serwera dla %s%s%s to %s[%s%s%s]"
 
 #, c-format
 msgid "%sUser mode for %s%s%s is %s[%s%s%s]"
@@ -8828,30 +8888,32 @@ msgstr ""
 msgid "%s%s: server \"%s\" not found for redirect"
 msgstr "%s%s: serwer \"%s\" nie został znaleziony dla przekierowania"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s%s: unable to read private key in file \"%s\""
-msgstr "%s%s: nie można odczytać pliku \"%s\""
+msgstr "%s%s: nie można odczytać klucza prywatnego z pliku \"%s\""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%sgnutls: invalid private key file: error %d %s"
-msgstr "%sgnutls: błędny certyfikat \"%s\", błąd: %s"
+msgstr "%sgnutls: niepoprawny plik klucza prywatnego: błąd %d %s"
 
 #, c-format
 msgid "%s%s: signing the challenge with ECC public key: %s"
-msgstr ""
+msgstr "%s%s: podpisuje wyzwanie za pomocą klucza publicnzego ECC: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%sgnutls: unable to import the private key: error %d %s"
-msgstr "%s%s: nie można utworzyć strumienia: błąd %d %s"
+msgstr "%sgnutls: nie można zaimportować klucza prywatnego: błąd %d %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%sgnutls: unable to sign the hashed data: error %d %s"
-msgstr "%s%s: nie można zinterpretować adresu: błąd %d %s"
+msgstr "%sgnutls: nie można podpisać zakodowanych danych: błąd %d %s"
 
 #, c-format
 msgid ""
 "%sgnutls: version >= 3.0.21 is required for SASL \"ecdsa-nist256p-challenge\""
 msgstr ""
+"%sgnutls: wersja >= 3.0.21 jest wymagana dla SASL \"ecdsa-nist256p-challenge"
+"\""
 
 #, c-format
 msgid "%s%s: error when allocating new server"
@@ -8988,9 +9050,9 @@ msgstr "%s%s: timeout"
 msgid "%s%s: unable to create socket"
 msgstr "%s%s: nie można utworzyć gniazda"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%sgnutls: failed to calculate certificate fingerprint (%s)"
-msgstr "%sgnutls: nie udało się wyliczyć odcisku certyfikatu"
+msgstr "%sgnutls: nie udało się wyliczyć odcisku certyfikatu (%s)"
 
 #, c-format
 msgid "%sgnutls: connected using %d-bit Diffie-Hellman shared secret exchange"
@@ -9120,9 +9182,9 @@ msgstr "%s%s: ponownie łączę się z serwerem..."
 msgid "%s%s: disconnected from server"
 msgstr "%s%s: rozłączono z serwerem"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s%s: exception: %s"
-msgstr "%s%s[%s%s%s]%s wyjątek %s%s"
+msgstr "%s%s: wyjątek %s"
 
 #, c-format
 msgid "%s%s: unable to run function \"%s\""
@@ -9666,7 +9728,7 @@ msgstr "drzewo okien"
 
 #, c-format
 msgid "Initializing plugin \"%s\" (priority: %d)"
-msgstr ""
+msgstr "Inicjalizuję wtyczkę \"%s\" (priorytet: %d)"
 
 #, c-format
 msgid "%sError: unable to initialize plugin \"%s\""
@@ -10224,16 +10286,15 @@ msgstr "kolor tła w buforze pośrednika"
 msgid "text color of selected line in relay buffer"
 msgstr "kolor tekstu zaznaczonej linii w buforze pośrednika"
 
-#, fuzzy
 msgid ""
 "POSIX extended regular expression with IPs allowed to use relay (case "
 "insensitive, use \"(?-i)\" at beginning to make it case sensitive), example: "
 "\"^(123.45.67.89|192.160.*)$\""
 msgstr ""
-"rozszerzone wyrażenia regularne POSIX ze źródłami dozwolonymi dla gniazd "
-"webowych (nie wrażliwe na wielkość znaków, umieszczenie \"(?-i)\" na "
+"rozszerzone wyrażenia regularne POSIX z adresami IP dozwolonymi dla "
+"pośrednika (nie wrażliwe na wielkość znaków, umieszczenie \"(?-i)\" na "
 "początku sprawi, że wielość znaków będzie miała znaczenie), przykład: "
-"\"^http://(www\\.)?przykład\\.(com|org)\""
+"\"^(123.45.67.89|192.160.*)$\""
 
 msgid ""
 "address for bind (if empty, connection is possible on all interfaces, use "
@@ -10965,6 +11026,8 @@ msgid ""
 "URL for file with list of scripts; by default HTTPS is forced, see option "
 "script.scripts.url_force_https"
 msgstr ""
+"adres pliku z listą skryptów; domyśłnie wymuszany jest protokół HTTPS, "
+"zobacz opcje script.scripts.url_force_https"
 
 msgid ""
 "force use of HTTPS for downloads (index and scripts); you should disable "

po/pt_BR.po

@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-04-19 11:28+0200\n"
+"POT-Creation-Date: 2015-05-07 07:02+0200\n"
 "PO-Revision-Date: 2015-03-21 08:41+0100\n"
 "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -163,10 +163,13 @@ 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"
 "  -d, --dir <path>         set WeeChat home directory (default: ~/.weechat)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
 "  -h, --help               display this help\n"
 "  -l, --license            display WeeChat license\n"
 "  -p, --no-plugin          don't load any plugin at startup\n"
@@ -201,16 +204,16 @@ msgstr ""
 msgid "Error: missing argument for \"%s\" option\n"
 msgstr "Erro: faltando argumento para opção \"%s\"\n"
 
-msgid "Error: WEECHAT_HOME is undefined, check build options\n"
-msgstr ""
-"Erro: WEECHAT_HOME não está definida, verifique as opções de compilação\n"
-
 msgid "Error: unable to get HOME directory\n"
 msgstr "Erro: não foi possível obter o diretório do usuário (HOME)\n"
 
 msgid "Error: not enough memory for home directory\n"
 msgstr "Erro: não há memória suficiente para o diretório do usuário (HOME)\n"
 
+msgid "Error: WEECHAT_HOME is undefined, check build options\n"
+msgstr ""
+"Erro: WEECHAT_HOME não está definida, verifique as opções de compilação\n"
+
 #, c-format
 msgid "Error: home (%s) is not a directory\n"
 msgstr "Erro: (%s) não é um diretório\n"
@@ -219,6 +222,23 @@ msgstr "Erro: (%s) não é um diretório\n"
 msgid "Error: cannot create directory \"%s\"\n"
 msgstr "Erro: não foi possível criar o diretório \"%s\"\n"
 
+msgid ""
+"Welcome to WeeChat!\n"
+"\n"
+"If you are discovering WeeChat, it is recommended to read at least the "
+"quickstart guide, and the user's guide if you have some time; they explain "
+"main WeeChat concepts.\n"
+"All WeeChat docs are available at: https://weechat.org/doc\n"
+"\n"
+"Moreover, there is inline help with /help on all commands and options (use "
+"Tab key to complete the name).\n"
+"The command /iset (script iset.pl) can help to customize WeeChat: /script "
+"install iset.pl\n"
+"\n"
+"You can create and connect to an IRC server with /server and /connect "
+"commands (see /help server)."
+msgstr ""
+
 #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux"
 #, c-format
 msgid ""
@@ -1536,9 +1556,10 @@ msgid ""
 "  2. a string with chars to hide (format: \"hide:char,string\")\n"
 "  3. a color (format: \"color:xxx\")\n"
 "  4. an info (format: \"info:name,arguments\", arguments are optional)\n"
-"  5. an option (format: \"file.section.option\")\n"
-"  6. a local variable in buffer\n"
-"  7. a hdata name/variable (the value is automatically converted to string), "
+"  5. an environment variable (format: \"env:XXX\")\n"
+"  6. an option (format: \"file.section.option\")\n"
+"  7. a local variable in buffer\n"
+"  8. a hdata name/variable (the value is automatically converted to string), "
 "by default \"window\" and \"buffer\" point to current window/buffer.\n"
 "Format for hdata can be one of following:\n"
 "  hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
@@ -1553,6 +1574,7 @@ msgid ""
 "\n"
 "Examples (simple strings):\n"
 "  /eval -n ${info:version}                     ==> 0.4.3\n"
+"  /eval -n ${env:HOME}                         ==> /home/user\n"
 "  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
 "  /eval -n ${window}                           ==> 0x2549aa0\n"
 "  /eval -n ${window.buffer}                    ==> 0x2549320\n"
@@ -4384,24 +4406,6 @@ msgstr "Cores do WeeChat (em uso: %d, sobram: %d):"
 msgid "Terminal lost, exiting WeeChat..."
 msgstr "Terminal perdido, saindo do WeeChat..."
 
-msgid ""
-"\n"
-"Welcome to WeeChat!\n"
-"\n"
-"If you are discovering WeeChat, it is recommended to read at least the "
-"quickstart guide, and the user's guide if you have some time; they explain "
-"main WeeChat concepts.\n"
-"All WeeChat docs are available at: https://weechat.org/doc\n"
-"\n"
-"Moreover, there is inline help with /help on all commands and options (use "
-"Tab key to complete the name).\n"
-"The command /iset (script iset.pl) can help to customize WeeChat: /script "
-"install iset.pl\n"
-"\n"
-"You can create and connect to an IRC server with /server and /connect "
-"commands (see /help server)."
-msgstr ""
-
 msgid "Mouse is enabled"
 msgstr "Mouse está habilitado"
 
@@ -6518,6 +6522,13 @@ msgstr "numéros para ignores definidos"
 msgid "nicks in notify list"
 msgstr "apelidos na lista de notificação"
 
+#, c-format
+msgid ""
+"%sWARNING: the value \"channel\" for option \"irc.look.display_away\" will "
+"send all your away changes to the channels, which is often considered as "
+"spam; therefore you could be banned from channels, you are warned!"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"

po/ru.po

@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-04-19 11:28+0200\n"
+"POT-Creation-Date: 2015-05-07 07:02+0200\n"
 "PO-Revision-Date: 2015-03-21 08:41+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -152,6 +152,8 @@ msgid ""
 "  -a, --no-connect         disable auto-connect to servers at startup\n"
 "  -c, --colors             display default colors in terminal\n"
 "  -d, --dir <path>         set WeeChat home directory (default: ~/.weechat)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
 "  -h, --help               display this help\n"
 "  -l, --license            display WeeChat license\n"
 "  -p, --no-plugin          don't load any plugin at startup\n"
@@ -181,9 +183,6 @@ msgstr ""
 msgid "Error: missing argument for \"%s\" option\n"
 msgstr "%s нет аргумента для параметра \"%s\"\n"
 
-msgid "Error: WEECHAT_HOME is undefined, check build options\n"
-msgstr "Ошибка: WEECHAT_HOME не определена, проверьте опции сборки\n"
-
 #, fuzzy
 msgid "Error: unable to get HOME directory\n"
 msgstr "%s не могу получить домашний каталог\n"
@@ -192,6 +191,9 @@ msgstr "%s не могу получить домашний каталог\n"
 msgid "Error: not enough memory for home directory\n"
 msgstr "%s недостаточно памяти для домашней директории\n"
 
+msgid "Error: WEECHAT_HOME is undefined, check build options\n"
+msgstr "Ошибка: WEECHAT_HOME не определена, проверьте опции сборки\n"
+
 #, fuzzy, c-format
 msgid "Error: home (%s) is not a directory\n"
 msgstr "%s домашний каталог (%s) не является директорией\n"
@@ -200,6 +202,23 @@ msgstr "%s домашний каталог (%s) не является дирек
 msgid "Error: cannot create directory \"%s\"\n"
 msgstr "%s не могу создать директорию \"%s\"\n"
 
+msgid ""
+"Welcome to WeeChat!\n"
+"\n"
+"If you are discovering WeeChat, it is recommended to read at least the "
+"quickstart guide, and the user's guide if you have some time; they explain "
+"main WeeChat concepts.\n"
+"All WeeChat docs are available at: https://weechat.org/doc\n"
+"\n"
+"Moreover, there is inline help with /help on all commands and options (use "
+"Tab key to complete the name).\n"
+"The command /iset (script iset.pl) can help to customize WeeChat: /script "
+"install iset.pl\n"
+"\n"
+"You can create and connect to an IRC server with /server and /connect "
+"commands (see /help server)."
+msgstr ""
+
 #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux"
 #, c-format
 msgid ""
@@ -1406,9 +1425,10 @@ msgid ""
 "  2. a string with chars to hide (format: \"hide:char,string\")\n"
 "  3. a color (format: \"color:xxx\")\n"
 "  4. an info (format: \"info:name,arguments\", arguments are optional)\n"
-"  5. an option (format: \"file.section.option\")\n"
-"  6. a local variable in buffer\n"
-"  7. a hdata name/variable (the value is automatically converted to string), "
+"  5. an environment variable (format: \"env:XXX\")\n"
+"  6. an option (format: \"file.section.option\")\n"
+"  7. a local variable in buffer\n"
+"  8. a hdata name/variable (the value is automatically converted to string), "
 "by default \"window\" and \"buffer\" point to current window/buffer.\n"
 "Format for hdata can be one of following:\n"
 "  hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
@@ -1423,6 +1443,7 @@ msgid ""
 "\n"
 "Examples (simple strings):\n"
 "  /eval -n ${info:version}                     ==> 0.4.3\n"
+"  /eval -n ${env:HOME}                         ==> /home/user\n"
 "  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
 "  /eval -n ${window}                           ==> 0x2549aa0\n"
 "  /eval -n ${window.buffer}                    ==> 0x2549320\n"
@@ -3834,24 +3855,6 @@ msgstr ""
 msgid "Terminal lost, exiting WeeChat..."
 msgstr ""
 
-msgid ""
-"\n"
-"Welcome to WeeChat!\n"
-"\n"
-"If you are discovering WeeChat, it is recommended to read at least the "
-"quickstart guide, and the user's guide if you have some time; they explain "
-"main WeeChat concepts.\n"
-"All WeeChat docs are available at: https://weechat.org/doc\n"
-"\n"
-"Moreover, there is inline help with /help on all commands and options (use "
-"Tab key to complete the name).\n"
-"The command /iset (script iset.pl) can help to customize WeeChat: /script "
-"install iset.pl\n"
-"\n"
-"You can create and connect to an IRC server with /server and /connect "
-"commands (see /help server)."
-msgstr ""
-
 #, fuzzy
 msgid "Mouse is enabled"
 msgstr "команда users отключена"
@@ -6190,6 +6193,13 @@ msgstr ""
 msgid "nicks in notify list"
 msgstr "%s игнорирования не найдены\n"
 
+#, c-format
+msgid ""
+"%sWARNING: the value \"channel\" for option \"irc.look.display_away\" will "
+"send all your away changes to the channels, which is often considered as "
+"spam; therefore you could be banned from channels, you are warned!"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"

po/tr.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-04-19 11:28+0200\n"
+"POT-Creation-Date: 2015-05-07 07:02+0200\n"
 "PO-Revision-Date: 2015-03-10 21:33+0100\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -129,6 +129,8 @@ msgid ""
 "  -a, --no-connect         disable auto-connect to servers at startup\n"
 "  -c, --colors             display default colors in terminal\n"
 "  -d, --dir <path>         set WeeChat home directory (default: ~/.weechat)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
 "  -h, --help               display this help\n"
 "  -l, --license            display WeeChat license\n"
 "  -p, --no-plugin          don't load any plugin at startup\n"
@@ -145,15 +147,15 @@ msgstr ""
 msgid "Error: missing argument for \"%s\" option\n"
 msgstr ""
 
-msgid "Error: WEECHAT_HOME is undefined, check build options\n"
-msgstr ""
-
 msgid "Error: unable to get HOME directory\n"
 msgstr ""
 
 msgid "Error: not enough memory for home directory\n"
 msgstr "Hata: ev dizini için bellek yeterli değil\n"
 
+msgid "Error: WEECHAT_HOME is undefined, check build options\n"
+msgstr ""
+
 #, c-format
 msgid "Error: home (%s) is not a directory\n"
 msgstr ""
@@ -162,6 +164,23 @@ msgstr ""
 msgid "Error: cannot create directory \"%s\"\n"
 msgstr "Hata: \"%s\" dizini oluşturulamaz\n"
 
+msgid ""
+"Welcome to WeeChat!\n"
+"\n"
+"If you are discovering WeeChat, it is recommended to read at least the "
+"quickstart guide, and the user's guide if you have some time; they explain "
+"main WeeChat concepts.\n"
+"All WeeChat docs are available at: https://weechat.org/doc\n"
+"\n"
+"Moreover, there is inline help with /help on all commands and options (use "
+"Tab key to complete the name).\n"
+"The command /iset (script iset.pl) can help to customize WeeChat: /script "
+"install iset.pl\n"
+"\n"
+"You can create and connect to an IRC server with /server and /connect "
+"commands (see /help server)."
+msgstr ""
+
 #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux"
 #, c-format
 msgid ""
@@ -1241,9 +1260,10 @@ msgid ""
 "  2. a string with chars to hide (format: \"hide:char,string\")\n"
 "  3. a color (format: \"color:xxx\")\n"
 "  4. an info (format: \"info:name,arguments\", arguments are optional)\n"
-"  5. an option (format: \"file.section.option\")\n"
-"  6. a local variable in buffer\n"
-"  7. a hdata name/variable (the value is automatically converted to string), "
+"  5. an environment variable (format: \"env:XXX\")\n"
+"  6. an option (format: \"file.section.option\")\n"
+"  7. a local variable in buffer\n"
+"  8. a hdata name/variable (the value is automatically converted to string), "
 "by default \"window\" and \"buffer\" point to current window/buffer.\n"
 "Format for hdata can be one of following:\n"
 "  hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
@@ -1258,6 +1278,7 @@ msgid ""
 "\n"
 "Examples (simple strings):\n"
 "  /eval -n ${info:version}                     ==> 0.4.3\n"
+"  /eval -n ${env:HOME}                         ==> /home/user\n"
 "  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
 "  /eval -n ${window}                           ==> 0x2549aa0\n"
 "  /eval -n ${window.buffer}                    ==> 0x2549320\n"
@@ -3436,24 +3457,6 @@ msgstr ""
 msgid "Terminal lost, exiting WeeChat..."
 msgstr ""
 
-msgid ""
-"\n"
-"Welcome to WeeChat!\n"
-"\n"
-"If you are discovering WeeChat, it is recommended to read at least the "
-"quickstart guide, and the user's guide if you have some time; they explain "
-"main WeeChat concepts.\n"
-"All WeeChat docs are available at: https://weechat.org/doc\n"
-"\n"
-"Moreover, there is inline help with /help on all commands and options (use "
-"Tab key to complete the name).\n"
-"The command /iset (script iset.pl) can help to customize WeeChat: /script "
-"install iset.pl\n"
-"\n"
-"You can create and connect to an IRC server with /server and /connect "
-"commands (see /help server)."
-msgstr ""
-
 msgid "Mouse is enabled"
 msgstr ""
 
@@ -5516,6 +5519,13 @@ msgstr ""
 msgid "nicks in notify list"
 msgstr ""
 
+#, c-format
+msgid ""
+"%sWARNING: the value \"channel\" for option \"irc.look.display_away\" will "
+"send all your away changes to the channels, which is often considered as "
+"spam; therefore you could be banned from channels, you are warned!"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"

po/weechat.pot

@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-04-19 11:28+0200\n"
+"POT-Creation-Date: 2015-05-07 07:02+0200\n"
 "PO-Revision-Date: 2014-08-16 10:27+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -126,6 +126,8 @@ msgid ""
 "  -a, --no-connect         disable auto-connect to servers at startup\n"
 "  -c, --colors             display default colors in terminal\n"
 "  -d, --dir <path>         set WeeChat home directory (default: ~/.weechat)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
 "  -h, --help               display this help\n"
 "  -l, --license            display WeeChat license\n"
 "  -p, --no-plugin          don't load any plugin at startup\n"
@@ -142,15 +144,15 @@ msgstr ""
 msgid "Error: missing argument for \"%s\" option\n"
 msgstr ""
 
-msgid "Error: WEECHAT_HOME is undefined, check build options\n"
-msgstr ""
-
 msgid "Error: unable to get HOME directory\n"
 msgstr ""
 
 msgid "Error: not enough memory for home directory\n"
 msgstr ""
 
+msgid "Error: WEECHAT_HOME is undefined, check build options\n"
+msgstr ""
+
 #, c-format
 msgid "Error: home (%s) is not a directory\n"
 msgstr ""
@@ -159,6 +161,23 @@ msgstr ""
 msgid "Error: cannot create directory \"%s\"\n"
 msgstr ""
 
+msgid ""
+"Welcome to WeeChat!\n"
+"\n"
+"If you are discovering WeeChat, it is recommended to read at least the "
+"quickstart guide, and the user's guide if you have some time; they explain "
+"main WeeChat concepts.\n"
+"All WeeChat docs are available at: https://weechat.org/doc\n"
+"\n"
+"Moreover, there is inline help with /help on all commands and options (use "
+"Tab key to complete the name).\n"
+"The command /iset (script iset.pl) can help to customize WeeChat: /script "
+"install iset.pl\n"
+"\n"
+"You can create and connect to an IRC server with /server and /connect "
+"commands (see /help server)."
+msgstr ""
+
 #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux"
 #, c-format
 msgid ""
@@ -1243,9 +1262,10 @@ msgid ""
 "  2. a string with chars to hide (format: \"hide:char,string\")\n"
 "  3. a color (format: \"color:xxx\")\n"
 "  4. an info (format: \"info:name,arguments\", arguments are optional)\n"
-"  5. an option (format: \"file.section.option\")\n"
-"  6. a local variable in buffer\n"
-"  7. a hdata name/variable (the value is automatically converted to string), "
+"  5. an environment variable (format: \"env:XXX\")\n"
+"  6. an option (format: \"file.section.option\")\n"
+"  7. a local variable in buffer\n"
+"  8. a hdata name/variable (the value is automatically converted to string), "
 "by default \"window\" and \"buffer\" point to current window/buffer.\n"
 "Format for hdata can be one of following:\n"
 "  hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
@@ -1260,6 +1280,7 @@ msgid ""
 "\n"
 "Examples (simple strings):\n"
 "  /eval -n ${info:version}                     ==> 0.4.3\n"
+"  /eval -n ${env:HOME}                         ==> /home/user\n"
 "  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
 "  /eval -n ${window}                           ==> 0x2549aa0\n"
 "  /eval -n ${window.buffer}                    ==> 0x2549320\n"
@@ -3431,24 +3452,6 @@ msgstr ""
 msgid "Terminal lost, exiting WeeChat..."
 msgstr ""
 
-msgid ""
-"\n"
-"Welcome to WeeChat!\n"
-"\n"
-"If you are discovering WeeChat, it is recommended to read at least the "
-"quickstart guide, and the user's guide if you have some time; they explain "
-"main WeeChat concepts.\n"
-"All WeeChat docs are available at: https://weechat.org/doc\n"
-"\n"
-"Moreover, there is inline help with /help on all commands and options (use "
-"Tab key to complete the name).\n"
-"The command /iset (script iset.pl) can help to customize WeeChat: /script "
-"install iset.pl\n"
-"\n"
-"You can create and connect to an IRC server with /server and /connect "
-"commands (see /help server)."
-msgstr ""
-
 msgid "Mouse is enabled"
 msgstr ""
 
@@ -5451,6 +5454,13 @@ msgstr ""
 msgid "nicks in notify list"
 msgstr ""
 
+#, c-format
+msgid ""
+"%sWARNING: the value \"channel\" for option \"irc.look.display_away\" will "
+"send all your away changes to the channels, which is often considered as "
+"spam; therefore you could be banned from channels, you are warned!"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s%s: warning: proxy \"%s\" does not exist (you can create it with command /"

src/core/wee-backtrace.c

@@ -140,7 +140,7 @@ weechat_backtrace_addr2line (int number, void *address, const char *symbol)
     (void) symbol;
 
     /* no backtrace possible, we display nothing */
-#endif
+#endif /* HAVE_BACKTRACE */
 }
 
 /*
@@ -154,7 +154,7 @@ weechat_backtrace ()
     void *trace[BACKTRACE_MAX];
     int trace_size, i;
     char **symbols;
-#endif
+#endif /* HAVE_BACKTRACE */
 
     weechat_backtrace_printf ("======= WeeChat backtrace =======");
     weechat_backtrace_printf ("(written by WeeChat %s, compiled on %s %s)",
@@ -173,7 +173,7 @@ weechat_backtrace ()
 #else
     weechat_backtrace_printf ("  No backtrace info (no debug info available "
                               "or no backtrace possible on your system).");
-#endif
+#endif /* HAVE_BACKTRACE */
 
     weechat_backtrace_printf ("======= End of  backtrace =======");
 }

src/core/wee-command.c

@@ -7195,9 +7195,10 @@ command_init ()
            "  3. a color (format: \"color:xxx\")\n"
            "  4. an info (format: \"info:name,arguments\", arguments are "
            "optional)\n"
-           "  5. an option (format: \"file.section.option\")\n"
-           "  6. a local variable in buffer\n"
-           "  7. a hdata name/variable (the value is automatically converted "
+           "  5. an environment variable (format: \"env:XXX\")\n"
+           "  6. an option (format: \"file.section.option\")\n"
+           "  7. a local variable in buffer\n"
+           "  8. a hdata name/variable (the value is automatically converted "
            "to string), by default \"window\" and \"buffer\" point to current "
            "window/buffer.\n"
            "Format for hdata can be one of following:\n"
@@ -7214,6 +7215,7 @@ command_init ()
            "\n"
            "Examples (simple strings):\n"
            "  /eval -n ${info:version}                     ==> 0.4.3\n"
+           "  /eval -n ${env:HOME}                         ==> /home/user\n"
            "  /eval -n ${weechat.look.scroll_amount}       ==> 3\n"
            "  /eval -n ${window}                           ==> 0x2549aa0\n"
            "  /eval -n ${window.buffer}                    ==> 0x2549320\n"
@@ -7404,18 +7406,20 @@ command_init ()
            "  paste_stop: stop paste (bracketed paste mode)\n"
            "\n"
            "This command is used by key bindings or plugins."),
-        "return|complete_next|complete_previous|search_text|search_switch_case|"
+        "return|complete_next|complete_previous|search_text|"
+        "search_switch_case|search_switch_regex|search_switch_where|"
         "search_previous|search_next|search_stop|delete_previous_char|"
         "delete_next_char|delete_previous_word|delete_next_word|"
         "delete_beginning_of_line|delete_end_of_line|delete_line|"
         "clipboard_paste|transpose_chars|undo|redo|move_beginning_of_line|"
-        "move_end_of_line|move_previous_char|move_next_char|move_previous_word|"
-        "move_next_word|history_previous|history_next|history_global_previous|"
-        "history_global_next|jump_smart|jump_previously_visited_buffer|"
+        "move_end_of_line|move_previous_char|move_next_char|"
+        "move_previous_word|move_next_word|history_previous|history_next|"
+        "history_global_previous|history_global_next|jump_smart|"
+        "jump_last_buffer_displayed|jump_previously_visited_buffer|"
         "jump_next_visited_buffer|hotlist_clear|grab_key|grab_key_command|"
         "grab_mouse|grab_mouse_area|set_unread|set_unread_current_buffer|"
-        "switch_active_buffer|switch_active_buffer_previous|zoom_merged_buffer|"
-        "insert|send|paste_start|paste_stop",
+        "switch_active_buffer|switch_active_buffer_previous|"
+        "zoom_merged_buffer|insert|send|paste_start|paste_stop",
         &command_input, NULL);
     hook_command (
         NULL, "key",

src/core/wee-debug.c

@@ -267,7 +267,7 @@ debug_memory ()
     gui_chat_printf (NULL,
                      _("Memory usage not available (function \"mallinfo\" not "
                        "found)"));
-#endif
+#endif /* HAVE_MALLINFO */
 }
 
 /*
@@ -533,7 +533,7 @@ debug_libs_cb (void *data, const char *signal, const char *type_data,
 #else
     gui_chat_printf (NULL, "    gcrypt: (?)%s",
                      (weechat_no_gcrypt) ? " (not initialized)" : "");
-#endif
+#endif /* GCRYPT_VERSION */
 
     /* display gnutls version */
 #ifdef HAVE_GNUTLS
@@ -544,24 +544,24 @@ debug_libs_cb (void *data, const char *signal, const char *type_data,
 #else
     gui_chat_printf (NULL, "    gnutls: (?)%s",
                      (weechat_no_gnutls) ? " (not initialized)" : "");
-#endif
+#endif /* GNUTLS_VERSION */
 #else
     gui_chat_printf (NULL, "    gnutls: (not available)");
-#endif
+#endif /* HAVE_GNUTLS */
 
     /* display curl version */
 #ifdef LIBCURL_VERSION
     gui_chat_printf (NULL, "    curl: %s", LIBCURL_VERSION);
 #else
     gui_chat_printf (NULL, "    curl: (?)");
-#endif
+#endif /* LIBCURL_VERSION */
 
     /* display zlib version */
 #ifdef ZLIB_VERSION
     gui_chat_printf (NULL, "    zlib: %s", ZLIB_VERSION);
 #else
     gui_chat_printf (NULL, "    zlib: (?)");
-#endif
+#endif /* ZLIB_VERSION */
 
     return WEECHAT_RC_OK;
 }

src/core/wee-eval.c

@@ -325,6 +325,9 @@ eval_replace_vars_cb (void *data, const char *text)
     /* 5. color code */
     if (strncmp (text, "color:", 6) == 0)
     {
+        ptr_value = gui_color_search_config (text + 6);
+        if (ptr_value)
+            return strdup (ptr_value);
         ptr_value = gui_color_get_custom (text + 6);
         return strdup ((ptr_value) ? ptr_value : "");
     }
@@ -349,7 +352,15 @@ eval_replace_vars_cb (void *data, const char *text)
         return strdup ((ptr_value) ? ptr_value : "");
     }
 
-    /* 7. option: if found, return this value */
+    /* 7. environment variable */
+    if (strncmp (text, "env:", 4) == 0)
+    {
+        ptr_value = getenv (text + 4);
+        if (ptr_value)
+            return strdup (ptr_value);
+    }
+
+    /* 8. option: if found, return this value */
     if (strncmp (text, "sec.data.", 9) == 0)
     {
         ptr_value = hashtable_get (secure_hashtable_data, text + 9);
@@ -382,7 +393,7 @@ eval_replace_vars_cb (void *data, const char *text)
         }
     }
 
-    /* 8. local variable in buffer */
+    /* 9. local variable in buffer */
     ptr_buffer = hashtable_get (pointers, "buffer");
     if (ptr_buffer)
     {
@@ -391,7 +402,7 @@ eval_replace_vars_cb (void *data, const char *text)
             return strdup (ptr_value);
     }
 
-    /* 9. hdata */
+    /* 10. hdata */
     value = NULL;
     hdata_name = NULL;
     list_name = NULL;

src/core/wee-hook.c

@@ -32,6 +32,7 @@
 #include <time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/select.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -2055,7 +2056,7 @@ hook_connect (struct t_weechat_plugin *plugin, const char *proxy,
     struct t_hook_connect *new_hook_connect;
 #ifdef HOOK_CONNECT_MAX_SOCKETS
     int i;
-#endif
+#endif /* HOOK_CONNECT_MAX_SOCKETS */
 
 #ifndef HAVE_GNUTLS
     /* make C compiler happy */
@@ -2063,7 +2064,7 @@ hook_connect (struct t_weechat_plugin *plugin, const char *proxy,
     (void) gnutls_cb;
     (void) gnutls_dhkey_size;
     (void) gnutls_priorities;
-#endif
+#endif /* HAVE_GNUTLS */
 
     if (!address || (port <= 0) || !callback)
         return NULL;
@@ -2095,7 +2096,7 @@ hook_connect (struct t_weechat_plugin *plugin, const char *proxy,
     new_hook_connect->gnutls_dhkey_size = gnutls_dhkey_size;
     new_hook_connect->gnutls_priorities = (gnutls_priorities) ?
         strdup (gnutls_priorities) : NULL;
-#endif
+#endif /* HAVE_GNUTLS */
     new_hook_connect->local_hostname = (local_hostname) ?
         strdup (local_hostname) : NULL;
     new_hook_connect->child_read = -1;
@@ -2115,7 +2116,7 @@ hook_connect (struct t_weechat_plugin *plugin, const char *proxy,
         new_hook_connect->sock_v4[i] = -1;
         new_hook_connect->sock_v6[i] = -1;
     }
-#endif
+#endif /* HOOK_CONNECT_MAX_SOCKETS */
 
     hook_add_to_list (new_hook);
 
@@ -2155,7 +2156,7 @@ hook_connect_gnutls_verify_certificates (gnutls_session_t tls_session)
 
     return rc;
 }
-#endif
+#endif /* HAVE_GNUTLS */
 
 /*
  * Sets certificates.
@@ -2171,7 +2172,7 @@ hook_connect_gnutls_set_certificates (gnutls_session_t tls_session,
                                       gnutls_retr2_st *answer)
 #else
                                       gnutls_retr_st *answer)
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x020b00 */
 {
     struct t_hook *ptr_hook;
     int rc;
@@ -2196,7 +2197,7 @@ hook_connect_gnutls_set_certificates (gnutls_session_t tls_session,
 
     return rc;
 }
-#endif
+#endif /* HAVE_GNUTLS */
 
 /*
  * Hooks a message printed by WeeChat.
@@ -3579,7 +3580,7 @@ unhook (struct t_hook *hook)
 #ifdef HAVE_GNUTLS
                 if (HOOK_CONNECT(hook, gnutls_priorities))
                     free (HOOK_CONNECT(hook, gnutls_priorities));
-#endif
+#endif /* HAVE_GNUTLS */
                 if (HOOK_CONNECT(hook, local_hostname))
                     free (HOOK_CONNECT(hook, local_hostname));
                 if (HOOK_CONNECT(hook, hook_child_timer))
@@ -3613,7 +3614,7 @@ unhook (struct t_hook *hook)
                     if (HOOK_CONNECT(hook, sock_v6[i]) != -1)
                         close (HOOK_CONNECT(hook, sock_v6[i]));
                 }
-#endif
+#endif /* HOOK_CONNECT_MAX_SOCKETS */
                 break;
             case HOOK_TYPE_PRINT:
                 if (HOOK_PRINT(hook, tags_array))
@@ -3932,7 +3933,7 @@ hook_add_to_infolist_pointer (struct t_infolist *infolist, struct t_hook *hook)
                     return 0;
                 if (!infolist_new_var_integer (ptr_item, "gnutls_dhkey_size", HOOK_CONNECT(hook, gnutls_dhkey_size)))
                     return 0;
-#endif
+#endif /* HAVE_GNUTLS */
                 if (!infolist_new_var_string (ptr_item, "local_hostname", HOOK_CONNECT(hook, local_hostname)))
                     return 0;
                 if (!infolist_new_var_integer (ptr_item, "child_read", HOOK_CONNECT(hook, child_read)))
@@ -4396,7 +4397,7 @@ hook_print_log ()
                         log_printf ("    gnutls_cb . . . . . . : 0x%lx", HOOK_CONNECT(ptr_hook, gnutls_cb));
                         log_printf ("    gnutls_dhkey_size . . : %d",    HOOK_CONNECT(ptr_hook, gnutls_dhkey_size));
                         log_printf ("    gnutls_priorities . . : '%s'",  HOOK_CONNECT(ptr_hook, gnutls_priorities));
-#endif
+#endif /* HAVE_GNUTLS */
                         log_printf ("    local_hostname. . . . : '%s'",  HOOK_CONNECT(ptr_hook, local_hostname));
                         log_printf ("    child_read. . . . . . : %d",    HOOK_CONNECT(ptr_hook, child_read));
                         log_printf ("    child_write . . . . . : %d",    HOOK_CONNECT(ptr_hook, child_write));
@@ -4415,7 +4416,7 @@ hook_print_log ()
                             log_printf ("    sock_v4[%d]. . . . . . : '%d'", HOOK_CONNECT(ptr_hook, sock_v4[i]));
                             log_printf ("    sock_v6[%d]. . . . . . : '%d'", HOOK_CONNECT(ptr_hook, sock_v6[i]));
                         }
-#endif
+#endif /* HOOK_CONNECT_MAX_SOCKETS */
                     }
                     break;
                 case HOOK_TYPE_PRINT:

src/core/wee-hook.h

@@ -249,9 +249,9 @@ typedef int (gnutls_callback_t)(void *data, gnutls_session_t tls_session,
                                 gnutls_retr2_st *answer,
 #else
                                 gnutls_retr_st *answer,
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x020b00 */
                                 int action);
-#endif
+#endif /* HAVE_GNUTLS */
 
 struct t_hook_connect
 {
@@ -267,7 +267,7 @@ struct t_hook_connect
     gnutls_callback_t *gnutls_cb;      /* GnuTLS callback during handshake  */
     int gnutls_dhkey_size;             /* Diffie Hellman Key Exchange size  */
     char *gnutls_priorities;           /* GnuTLS priorities                 */
-#endif
+#endif /* HAVE_GNUTLS */
     char *local_hostname;              /* force local hostname (optional)   */
     int child_read;                    /* to read data in pipe from child   */
     int child_write;                   /* to write data in pipe for child   */
@@ -283,7 +283,7 @@ struct t_hook_connect
 #ifdef HOOK_CONNECT_MAX_SOCKETS
     int sock_v4[HOOK_CONNECT_MAX_SOCKETS];  /* IPv4 sockets for connecting  */
     int sock_v6[HOOK_CONNECT_MAX_SOCKETS];  /* IPv6 sockets for connecting  */
-#endif
+#endif /* HOOK_CONNECT_MAX_SOCKETS */
 };
 
 /* hook print */
@@ -506,8 +506,8 @@ extern int hook_connect_gnutls_set_certificates (gnutls_session_t tls_session,
                                                  gnutls_retr2_st *answer);
 #else
                                                  gnutls_retr_st *answer);
-#endif
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x020b00 */
+#endif /* HAVE_GNUTLS */
 extern struct t_hook *hook_print (struct t_weechat_plugin *plugin,
                                   struct t_gui_buffer *buffer,
                                   const char *tags, const char *message,

src/core/wee-log.c

@@ -98,7 +98,7 @@ log_open (const char *filename, const char *mode)
             return 0;
         }
     }
-#endif
+#endif /* HAVE_FLOCK */
 
     return 1;
 }
@@ -224,7 +224,7 @@ log_close ()
     {
 #ifdef HAVE_FLOCK
         flock (fileno (weechat_log_file), LOCK_UN);
-#endif
+#endif /* HAVE_FLOCK */
         fclose (weechat_log_file);
         weechat_log_file = NULL;
     }

src/core/wee-network.c

@@ -39,6 +39,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/select.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
@@ -67,7 +68,7 @@ int network_init_gnutls_ok = 0;
 
 #ifdef HAVE_GNUTLS
 gnutls_certificate_credentials_t gnutls_xcred; /* GnuTLS client credentials */
-#endif
+#endif /* HAVE_GNUTLS */
 
 
 /*
@@ -110,7 +111,7 @@ network_set_gnutls_ca_file ()
         }
         free (ca_path);
     }
-#endif
+#endif /* HAVE_GNUTLS */
 }
 
 /*
@@ -130,14 +131,14 @@ network_init_gnutls ()
 #if LIBGNUTLS_VERSION_NUMBER >= 0x02090a /* 2.9.10 */
         gnutls_certificate_set_verify_function (gnutls_xcred,
                                                 &hook_connect_gnutls_verify_certificates);
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x02090a */
 #if LIBGNUTLS_VERSION_NUMBER >= 0x020b00 /* 2.11.0 */
         gnutls_certificate_set_retrieve_function (gnutls_xcred,
                                                   &hook_connect_gnutls_set_certificates);
 #else
         gnutls_certificate_client_set_retrieve_function (gnutls_xcred,
                                                          &hook_connect_gnutls_set_certificates);
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x020b00 */
     }
 #endif /* HAVE_GNUTLS */
 
@@ -159,7 +160,7 @@ network_end ()
             gnutls_certificate_free_credentials (gnutls_xcred);
             gnutls_global_deinit();
         }
-#endif
+#endif /* HAVE_GNUTLS */
         network_init_gnutls_ok = 0;
     }
 }
@@ -753,7 +754,7 @@ network_connect_child (struct t_hook *hook_connect)
     char msg_buf[CMSG_SPACE(sizeof (sock))];
     struct iovec iov[1];
     char iov_data[1] = { 0 };
-#endif
+#endif /* HOOK_CONNECT_MAX_SOCKETS */
     /*
      * indicates that something is wrong with whichever group of
      * servers is being tried first after connecting, so start at
@@ -800,7 +801,7 @@ network_connect_child (struct t_hook *hook_connect)
     hints.ai_socktype = SOCK_STREAM;
 #ifdef AI_ADDRCONFIG
     hints.ai_flags = AI_ADDRCONFIG;
-#endif
+#endif /* AI_ADDRCONFIG */
     if (ptr_proxy)
     {
         hints.ai_family = (CONFIG_BOOLEAN(ptr_proxy->options[PROXY_OPTION_IPV6])) ?
@@ -868,7 +869,7 @@ network_connect_child (struct t_hook *hook_connect)
         hints.ai_socktype = SOCK_STREAM;
 #ifdef AI_ADDRCONFIG
         hints.ai_flags = AI_ADDRCONFIG;
-#endif
+#endif /* AI_ADDRCONFIG */
         rc = getaddrinfo (HOOK_CONNECT(hook_connect, local_hostname),
                           NULL, &hints, &res_local);
         if (rc != 0)
@@ -1070,7 +1071,7 @@ network_connect_child (struct t_hook *hook_connect)
         sock = socket (ptr_res->ai_family,
                        ptr_res->ai_socktype,
                        ptr_res->ai_protocol);
-#endif
+#endif /* HOOK_CONNECT_MAX_SOCKETS */
         if (sock < 0)
         {
             status_str[0] = '0' + WEECHAT_HOOK_CONNECT_SOCKET_ERROR;
@@ -1201,7 +1202,7 @@ network_connect_child (struct t_hook *hook_connect)
 #else
         num_written = write (HOOK_CONNECT(hook_connect, child_write), &sock, sizeof (sock));
         (void) num_written;
-#endif
+#endif /* HOOK_CONNECT_MAX_SOCKETS */
     }
     else
     {
@@ -1313,7 +1314,7 @@ network_connect_gnutls_handshake_fd_cb (void *arg_hook_connect, int fd)
             unhook (hook_connect);
             return WEECHAT_RC_OK;
         }
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER < 0x02090a */
         unhook (HOOK_CONNECT(hook_connect, handshake_hook_fd));
         (void) (HOOK_CONNECT(hook_connect, callback))
                 (hook_connect->callback_data,
@@ -1325,7 +1326,7 @@ network_connect_gnutls_handshake_fd_cb (void *arg_hook_connect, int fd)
 
     return WEECHAT_RC_OK;
 }
-#endif
+#endif /* HAVE_GNUTLS */
 
 /*
  * Timer callback for timeout of handshake.
@@ -1356,7 +1357,7 @@ network_connect_gnutls_handshake_timer_cb (void *arg_hook_connect,
 
     return WEECHAT_RC_OK;
 }
-#endif
+#endif /* HAVE_GNUTLS */
 
 /*
  * Reads connection progress from child process.
@@ -1371,7 +1372,7 @@ network_connect_child_read_cb (void *arg_hook_connect, int fd)
     long size_msg;
 #ifdef HAVE_GNUTLS
     int rc, direction;
-#endif
+#endif /* HAVE_GNUTLS */
     int sock;
 #ifdef HOOK_CONNECT_MAX_SOCKETS
     int i;
@@ -1381,7 +1382,7 @@ network_connect_child_read_cb (void *arg_hook_connect, int fd)
     char msg_buf[CMSG_SPACE(sizeof (sock))];
     struct iovec iov[1];
     char iov_data[1];
-#endif
+#endif /* HOOK_CONNECT_MAX_SOCKETS */
 
     /* make C compiler happy */
     (void) fd;
@@ -1461,7 +1462,7 @@ network_connect_child_read_cb (void *arg_hook_connect, int fd)
                 if (HOOK_CONNECT(hook_connect, sock_v6[i]) == sock)
                     HOOK_CONNECT(hook_connect, sock_v6[i]) = -1;
             }
-#endif
+#endif /* HOOK_CONNECT_MAX_SOCKETS */
 
             HOOK_CONNECT(hook_connect, sock) = sock;
 
@@ -1545,9 +1546,9 @@ network_connect_child_read_cb (void *arg_hook_connect, int fd)
                         free (cb_ip_address);
                     return WEECHAT_RC_OK;
                 }
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER < 0x02090a */
             }
-#endif
+#endif /* HAVE_GNUTLS */
         }
         else
         {
@@ -1610,10 +1611,10 @@ network_connect_with_fork (struct t_hook *hook_connect)
     int i;
 #else
     int child_socket[2];
-#endif
+#endif /* HOOK_CONNECT_MAX_SOCKETS */
 #ifdef HAVE_GNUTLS
     const char *pos_error;
-#endif
+#endif /* HAVE_GNUTLS */
     pid_t pid;
 
 #ifdef HAVE_GNUTLS
@@ -1647,7 +1648,7 @@ network_connect_with_fork (struct t_hook *hook_connect)
         gnutls_transport_set_ptr (*HOOK_CONNECT(hook_connect, gnutls_sess),
                                   (gnutls_transport_ptr_t) ((unsigned long) HOOK_CONNECT(hook_connect, sock)));
     }
-#endif
+#endif /* HAVE_GNUTLS */
 
     /* create pipe for child process */
     if (pipe (child_pipe) < 0)
@@ -1681,7 +1682,7 @@ network_connect_with_fork (struct t_hook *hook_connect)
         HOOK_CONNECT(hook_connect, sock_v4[i]) = socket (AF_INET, SOCK_STREAM, 0);
         HOOK_CONNECT(hook_connect, sock_v6[i]) = socket (AF_INET6, SOCK_STREAM, 0);
     }
-#endif
+#endif /* HOOK_CONNECT_MAX_SOCKETS */
 
     switch (pid = fork ())
     {
@@ -1700,7 +1701,7 @@ network_connect_with_fork (struct t_hook *hook_connect)
             close (HOOK_CONNECT(hook_connect, child_read));
 #ifndef HOOK_CONNECT_MAX_SOCKETS
             close (HOOK_CONNECT(hook_connect, child_recv));
-#endif
+#endif /* HOOK_CONNECT_MAX_SOCKETS */
             network_connect_child (hook_connect);
             _exit (EXIT_SUCCESS);
     }
@@ -1711,7 +1712,7 @@ network_connect_with_fork (struct t_hook *hook_connect)
 #ifndef HOOK_CONNECT_MAX_SOCKETS
     close (HOOK_CONNECT(hook_connect, child_send));
     HOOK_CONNECT(hook_connect, child_send) = -1;
-#endif
+#endif /* HOOK_CONNECT_MAX_SOCKETS */
     HOOK_CONNECT(hook_connect, hook_child_timer) = hook_timer (hook_connect->plugin,
                                                                CONFIG_INTEGER(config_network_connection_timeout) * 1000,
                                                                0, 1,

src/core/wee-string.c

@@ -43,7 +43,7 @@
   #else
     #define ICONV_CONST
   #endif
-#endif
+#endif /* ICONV_CONST */
 
 #include "weechat.h"
 #include "wee-string.h"
@@ -2123,7 +2123,7 @@ string_iconv (int from_utf8, const char *from_code, const char *to_code,
     char *ptr_inbuf_shift;
     int done;
     size_t err, inbytesleft, outbytesleft;
-#endif
+#endif /* HAVE_ICONV */
 
     if (!string)
         return NULL;

src/core/wee-url.c

@@ -938,23 +938,23 @@ weeurl_set_proxy (CURL *curl, struct t_proxy *proxy)
             curl_easy_setopt (curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
             break;
         case PROXY_TYPE_SOCKS4:
-#if LIBCURL_VERSION_NUM < 0x070A00
+#if LIBCURL_VERSION_NUM < 0x070A00 /* 7.10.0 */
             /* proxy socks4 not supported in Curl < 7.10 */
             return;
-#endif
+#endif /* LIBCURL_VERSION_NUM < 0x070A00 */
             curl_easy_setopt (curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4);
             break;
         case PROXY_TYPE_SOCKS5:
-#if LIBCURL_VERSION_NUM < 0x070A00
+#if LIBCURL_VERSION_NUM < 0x070A00 /* 7.10.0 */
             /* proxy socks5 not supported in Curl < 7.10 */
             return;
-#endif
+#endif /* LIBCURL_VERSION_NUM < 0x070A00 */
 #if LIBCURL_VERSION_NUM >= 0x071200 /* 7.18.0 */
             curl_easy_setopt (curl, CURLOPT_PROXYTYPE,
                               CURLPROXY_SOCKS5_HOSTNAME);
 #else
             curl_easy_setopt (curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
-#endif
+#endif /* LIBCURL_VERSION_NUM >= 0x071200 */
             break;
     }
 
@@ -980,7 +980,7 @@ weeurl_set_proxy (CURL *curl, struct t_proxy *proxy)
         curl_easy_setopt (curl, CURLOPT_PROXYPASSWORD,
                           CONFIG_STRING(proxy->options[PROXY_OPTION_PASSWORD]));
     }
-#endif
+#endif /* LIBCURL_VERSION_NUM >= 0x071301 */
 }
 
 /*

src/core/wee-util.c

@@ -180,7 +180,7 @@ util_setrlimit_resource (const char *resource_name, long limit)
                      gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
                      resource_name);
 }
-#endif
+#endif /* HAVE_SYS_RESOURCE_H */
 
 /*
  * Sets resource limits using value of option "weechat.startup.sys_rlimit".
@@ -222,7 +222,7 @@ util_setrlimit ()
         }
         string_free_split (items);
     }
-#endif
+#endif /* HAVE_SYS_RESOURCE_H */
 }
 
 /*

src/core/weechat.c

@@ -137,19 +137,21 @@ weechat_display_usage (char *exec_name)
                           _("Usage: %s [option...] [plugin:option...]\n"),
                           exec_name, exec_name);
     string_iconv_fprintf (stdout, "\n");
-    string_iconv_fprintf (stdout,
-                          _("  -a, --no-connect         disable auto-connect to servers at startup\n"
-                            "  -c, --colors             display default colors in terminal\n"
-                            "  -d, --dir <path>         set WeeChat home directory (default: ~/.weechat)\n"
-                            "  -h, --help               display this help\n"
-                            "  -l, --license            display WeeChat license\n"
-                            "  -p, --no-plugin          don't load any plugin at startup\n"
-                            "  -r, --run-command <cmd>  run command(s) after startup\n"
-                            "                           (many commands can be separated by semicolons)\n"
-                            "  -s, --no-script          don't load any script at startup\n"
-                            "      --upgrade            upgrade WeeChat using session files (see /help upgrade in WeeChat)\n"
-                            "  -v, --version            display WeeChat version\n"
-                            "  plugin:option            option for plugin (see man weechat)\n"));
+    string_iconv_fprintf (
+        stdout,
+        _("  -a, --no-connect         disable auto-connect to servers at startup\n"
+          "  -c, --colors             display default colors in terminal\n"
+          "  -d, --dir <path>         set WeeChat home directory (default: ~/.weechat)\n"
+          "                           (environment variable WEECHAT_HOME is read if this option is not given)\n"
+          "  -h, --help               display this help\n"
+          "  -l, --license            display WeeChat license\n"
+          "  -p, --no-plugin          don't load any plugin at startup\n"
+          "  -r, --run-command <cmd>  run command(s) after startup\n"
+          "                           (many commands can be separated by semicolons)\n"
+          "  -s, --no-script          don't load any script at startup\n"
+          "      --upgrade            upgrade WeeChat using session files (see /help upgrade in WeeChat)\n"
+          "  -v, --version            display WeeChat version\n"
+          "  plugin:option            option for plugin (see man weechat)\n"));
     string_iconv_fprintf(stdout, "\n");
 }
 
@@ -270,6 +272,52 @@ weechat_parse_args (int argc, char *argv[])
     }
 }
 
+/*
+ * Expands and assigns given path to "weechat_home".
+ */
+
+void
+weechat_set_home_path (char *home_path)
+{
+    char *ptr_home;
+    int dir_length;
+
+    if (home_path[0] == '~')
+    {
+        /* replace leading '~' by $HOME */
+        ptr_home = getenv ("HOME");
+        if (!ptr_home)
+        {
+            string_iconv_fprintf (stderr,
+                                  _("Error: unable to get HOME directory\n"));
+            weechat_shutdown (EXIT_FAILURE, 0);
+            /* make C static analyzer happy (never executed) */
+            return;
+        }
+        dir_length = strlen (ptr_home) + strlen (home_path + 1) + 1;
+        weechat_home = malloc (dir_length);
+        if (weechat_home)
+        {
+            snprintf (weechat_home, dir_length,
+                      "%s%s", ptr_home, home_path + 1);
+        }
+    }
+    else
+    {
+        weechat_home = strdup (home_path);
+    }
+
+    if (!weechat_home)
+    {
+        string_iconv_fprintf (stderr,
+                              _("Error: not enough memory for home "
+                                "directory\n"));
+        weechat_shutdown (EXIT_FAILURE, 0);
+        /* make C static analyzer happy (never executed) */
+        return;
+    }
+}
+
 /*
  * Creates WeeChat home directory (by default ~/.weechat).
  *
@@ -280,13 +328,25 @@ weechat_parse_args (int argc, char *argv[])
 void
 weechat_create_home_dir ()
 {
-    char *ptr_home, *config_weechat_home = WEECHAT_HOME;
-    int dir_length;
+    char *ptr_weechat_home, *config_weechat_home;
     struct stat statinfo;
 
+    /*
+     * weechat_home is not set yet: look for environment variable
+     * "WEECHAT_HOME"
+     */
     if (!weechat_home)
     {
-        if (strlen (config_weechat_home) == 0)
+        ptr_weechat_home = getenv ("WEECHAT_HOME");
+        if (ptr_weechat_home && ptr_weechat_home[0])
+            weechat_set_home_path (ptr_weechat_home);
+    }
+
+    /* weechat_home is still not set: try to use compile time default */
+    if (!weechat_home)
+    {
+        config_weechat_home = WEECHAT_HOME;
+        if (!config_weechat_home[0])
         {
             string_iconv_fprintf (stderr,
                                   _("Error: WEECHAT_HOME is undefined, check "
@@ -295,41 +355,7 @@ weechat_create_home_dir ()
             /* make C static analyzer happy (never executed) */
             return;
         }
-
-        if (config_weechat_home[0] == '~')
-        {
-            /* replace leading '~' by $HOME */
-            ptr_home = getenv ("HOME");
-            if (!ptr_home)
-            {
-                string_iconv_fprintf (stderr,
-                                      _("Error: unable to get HOME directory\n"));
-                weechat_shutdown (EXIT_FAILURE, 0);
-                /* make C static analyzer happy (never executed) */
-                return;
-            }
-            dir_length = strlen (ptr_home) + strlen (config_weechat_home + 1) + 1;
-            weechat_home = malloc (dir_length);
-            if (weechat_home)
-            {
-                snprintf (weechat_home, dir_length,
-                          "%s%s", ptr_home, config_weechat_home + 1);
-            }
-        }
-        else
-        {
-            weechat_home = strdup (config_weechat_home);
-        }
-
-        if (!weechat_home)
-        {
-            string_iconv_fprintf (stderr,
-                                  _("Error: not enough memory for home "
-                                    "directory\n"));
-            weechat_shutdown (EXIT_FAILURE, 0);
-            /* make C static analyzer happy (never executed) */
-            return;
-        }
+        weechat_set_home_path (config_weechat_home);
     }
 
     /* if home already exists, it has to be a directory */
@@ -341,6 +367,8 @@ weechat_create_home_dir ()
                                   _("Error: home (%s) is not a directory\n"),
                                   weechat_home);
             weechat_shutdown (EXIT_FAILURE, 0);
+            /* make C static analyzer happy (never executed) */
+            return;
         }
     }
 
@@ -351,15 +379,17 @@ weechat_create_home_dir ()
                               _("Error: cannot create directory \"%s\"\n"),
                               weechat_home);
         weechat_shutdown (EXIT_FAILURE, 0);
+        /* make C static analyzer happy (never executed) */
+        return;
     }
 }
 
 /*
- * Displays WeeChat welcome message.
+ * Displays WeeChat startup message.
  */
 
 void
-weechat_welcome_message ()
+weechat_startup_message ()
 {
     if (CONFIG_BOOLEAN(config_startup_display_logo))
     {
@@ -385,6 +415,30 @@ weechat_welcome_message ()
         gui_chat_printf (NULL,
                          "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -");
     }
+
+    if (weechat_first_start)
+    {
+        /* message on first run (when weechat.conf is created) */
+        gui_chat_printf (NULL, "");
+        gui_chat_printf (
+            NULL,
+            _("Welcome to WeeChat!\n"
+              "\n"
+              "If you are discovering WeeChat, it is recommended to read at "
+              "least the quickstart guide, and the user's guide if you have "
+              "some time; they explain main WeeChat concepts.\n"
+              "All WeeChat docs are available at: https://weechat.org/doc\n"
+              "\n"
+              "Moreover, there is inline help with /help on all commands and "
+              "options (use Tab key to complete the name).\n"
+              "The command /iset (script iset.pl) can help to customize "
+              "WeeChat: /script install iset.pl\n"
+              "\n"
+              "You can create and connect to an IRC server with /server and "
+              "/connect commands (see /help server)."));
+        gui_chat_printf (NULL, "---");
+        gui_chat_printf (NULL, "");
+    }
 }
 
 /*
@@ -467,9 +521,16 @@ weechat_sighup ()
 void
 weechat_sigquit ()
 {
-    log_printf (_("Signal %s received, exiting WeeChat..."), "SIGQUIT");
-    (void) hook_signal_send ("quit", WEECHAT_HOOK_SIGNAL_STRING, NULL);
-    weechat_quit = 1;
+    int rc;
+
+    rc = hook_signal_send ("signal_sigquit",
+                           WEECHAT_HOOK_SIGNAL_STRING, NULL);
+    if (rc != WEECHAT_RC_OK_EAT)
+    {
+        log_printf (_("Signal %s received, exiting WeeChat..."), "SIGQUIT");
+        (void) hook_signal_send ("quit", WEECHAT_HOOK_SIGNAL_STRING, NULL);
+        weechat_quit = 1;
+    }
 }
 
 /*
@@ -479,9 +540,16 @@ weechat_sigquit ()
 void
 weechat_sigterm ()
 {
-    log_printf (_("Signal %s received, exiting WeeChat..."), "SIGTERM");
-    (void) hook_signal_send ("quit", WEECHAT_HOOK_SIGNAL_STRING, NULL);
-    weechat_quit = 1;
+    int rc;
+
+    rc = hook_signal_send ("signal_sigterm",
+                           WEECHAT_HOOK_SIGNAL_STRING, NULL);
+    if (rc != WEECHAT_RC_OK_EAT)
+    {
+        log_printf (_("Signal %s received, exiting WeeChat..."), "SIGTERM");
+        (void) hook_signal_send ("quit", WEECHAT_HOOK_SIGNAL_STRING, NULL);
+        weechat_quit = 1;
+    }
 }
 
 /*
@@ -526,13 +594,13 @@ weechat_init (int argc, char *argv[], void (*gui_init_cb)())
     bindtextdomain (PACKAGE, LOCALEDIR);
     bind_textdomain_codeset (PACKAGE, "UTF-8");
     textdomain (PACKAGE);
-#endif
+#endif /* ENABLE_NLS */
 
 #ifdef HAVE_LANGINFO_CODESET
     weechat_local_charset = strdup (nl_langinfo (CODESET));
 #else
     weechat_local_charset = strdup ("");
-#endif
+#endif /* HAVE_LANGINFO_CODESET */
     utf8_init ();
 
     /* catch signals */
@@ -573,7 +641,7 @@ weechat_init (int argc, char *argv[], void (*gui_init_cb)())
         upgrade_weechat_load ();        /* upgrade with session file        */
         weechat_upgrade_count++;        /* increase /upgrade count          */
     }
-    weechat_welcome_message ();         /* display WeeChat welcome message  */
+    weechat_startup_message ();         /* display WeeChat startup message  */
     gui_chat_print_lines_waiting_buffer (NULL); /* display lines waiting    */
     weechat_term_check ();              /* warnings about $TERM (if wrong)  */
     weechat_locale_check ();            /* warning about wrong locale       */

src/core/weechat.h

@@ -35,20 +35,20 @@
         #include <libintl.h>
     #else
         #include "../../intl/libintl.h"
-    #endif
+    #endif /* HAVE_LIBINTL_H */
     #define _(string) gettext(string)
     #define NG_(single,plural,number) ngettext(single,plural,number)
     #ifdef gettext_noop
         #define N_(string) gettext_noop(string)
     #else
         #define N_(string) (string)
-    #endif
-#endif
+    #endif /* gettext_noop */
+#endif /* defined(ENABLE_NLS) && !defined(_) */
 #if !defined(_)
     #define _(string) (string)
     #define NG_(single,plural,number) (plural)
     #define N_(string) (string)
-#endif
+#endif /* !defined(_) */
 
 
 #define WEECHAT_COPYRIGHT_DATE   "(C) 2003-2015"
@@ -81,12 +81,12 @@
 #else
     #define DIR_SEPARATOR       "/"
     #define DIR_SEPARATOR_CHAR  '/'
-#endif
+#endif /* _WIN32 */
 
 /* some systems like GNU/Hurd do not define PATH_MAX */
 #ifndef PATH_MAX
     #define PATH_MAX 4096
-#endif
+#endif /* PATH_MAX */
 
 /* internal charset */
 #define WEECHAT_INTERNAL_CHARSET "UTF-8"

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

@@ -29,6 +29,7 @@
 #include <string.h>
 #include <signal.h>
 #include <time.h>
+#include <sys/select.h>
 
 #include "../../core/weechat.h"
 #include "../../core/wee-command.h"
@@ -228,32 +229,6 @@ gui_main_init ()
     gui_window_set_bracketed_paste_mode (CONFIG_BOOLEAN(config_look_paste_bracketed));
 }
 
-/*
- * Displays a message on first WeeChat run (when weechat.conf is created).
- */
-
-void
-gui_main_welcome_message ()
-{
-    gui_chat_printf (
-        NULL,
-        _("\n"
-          "Welcome to WeeChat!\n"
-          "\n"
-          "If you are discovering WeeChat, it is recommended to read at least "
-          "the quickstart guide, and the user's guide if you have some time; "
-          "they explain main WeeChat concepts.\n"
-          "All WeeChat docs are available at: https://weechat.org/doc\n"
-          "\n"
-          "Moreover, there is inline help with /help on all commands and "
-          "options (use Tab key to complete the name).\n"
-          "The command /iset (script iset.pl) can help to customize WeeChat: "
-          "/script install iset.pl\n"
-          "\n"
-          "You can create and connect to an IRC server with /server and "
-          "/connect commands (see /help server)."));
-}
-
 /*
  * Callback for system signal SIGWINCH: refreshes screen.
  */
@@ -278,7 +253,7 @@ gui_main_debug_libs ()
                      NCURSES_VERSION, NCURSES_VERSION_PATCH);
 #else
     gui_chat_printf (NULL, "    ncurses: (?)");
-#endif
+#endif /* defined(NCURSES_VERSION) && defined(NCURSES_VERSION_PATCH) */
 }
 
 /*
@@ -401,10 +376,6 @@ gui_main_loop ()
     int max_fd;
     int ready;
 
-    /* message on first run of WeeChat */
-    if (weechat_first_start)
-        gui_main_welcome_message ();
-
     /* catch SIGWINCH signal: redraw screen */
     util_catch_signal (SIGWINCH, &gui_main_signal_sigwinch);
 

src/gui/curses/gui-curses-term.c

@@ -28,10 +28,10 @@
 #include <ncurses/term.h>
 #else
 #include <ncursesw/term.h>
-#endif
+#endif /* __sun */
 #else
 #include <term.h>
-#endif
+#endif /* HAVE_NCURSESW_CURSES_H */
 
 
 /*
@@ -50,5 +50,5 @@ gui_term_set_eat_newline_glitch (int value)
 #else
     /* make C compiler happy */
     (void) value;
-#endif
+#endif /* HAVE_EAT_NEWLINE_GLITCH */
 }

src/gui/curses/gui-curses.h

@@ -28,7 +28,7 @@
 #include <ncurses.h>
 #else
 #include <curses.h>
-#endif
+#endif /* HAVE_NCURSESW_CURSES_H */
 
 struct t_gui_buffer;
 struct t_gui_line;
@@ -39,7 +39,7 @@ struct t_gui_bar_window;
 
 #ifndef A_ITALIC /* A_ITALIC is defined in ncurses >= 5.9 patch 20130831 */
 #define A_ITALIC 0
-#endif
+#endif /* A_ITALIC */
 
 #define A_ALL_ATTR A_BOLD | A_UNDERLINE | A_REVERSE | A_ITALIC
 

src/gui/gui-bar-item.c

@@ -1784,10 +1784,10 @@ gui_bar_item_default_window_number (void *data, struct t_gui_bar_item *item,
  */
 
 char *
-gui_bar_item_default_mouse_status   (void *data, struct t_gui_bar_item *item,
-                                    struct t_gui_window *window,
-                                    struct t_gui_buffer *buffer,
-                                    struct t_hashtable *extra_info)
+gui_bar_item_default_mouse_status (void *data, struct t_gui_bar_item *item,
+                                   struct t_gui_window *window,
+                                   struct t_gui_buffer *buffer,
+                                   struct t_hashtable *extra_info)
 {
     char str_mouse[512];
 

src/gui/gui-color.c

@@ -112,6 +112,37 @@ char *gui_color_ansi[16] =
 };
 
 
+/*
+ * Returns a color code from an option, which can be a color or a string.
+ *
+ * Returns NULL if the option has a wrong type.
+ */
+
+const char *
+gui_color_from_option (struct t_config_option *option)
+{
+    if (!option)
+        return NULL;
+
+    switch (option->type)
+    {
+        case CONFIG_OPTION_TYPE_COLOR:
+            if (option->min < 0)
+            {
+                return gui_color_get_custom (
+                    gui_color_get_name (CONFIG_COLOR(option)));
+            }
+            return GUI_COLOR(option->min);
+        case CONFIG_OPTION_TYPE_STRING:
+            return gui_color_get_custom (CONFIG_STRING(option));
+        default:
+            return NULL;
+    }
+
+    /* never executed */
+    return NULL;
+}
+
 /*
  * Searches for a color with configuration option name.
  *
@@ -123,21 +154,24 @@ gui_color_search_config (const char *color_name)
 {
     struct t_config_option *ptr_option;
 
-    if (color_name)
+    if (!color_name)
+        return NULL;
+
+    /* search in weechat.conf colors (example: "chat_delimiters") */
+    for (ptr_option = weechat_config_section_color->options;
+         ptr_option; ptr_option = ptr_option->next_option)
     {
-        for (ptr_option = weechat_config_section_color->options;
-             ptr_option; ptr_option = ptr_option->next_option)
-        {
-            if (string_strcasecmp (ptr_option->name, color_name) == 0)
-            {
-                if (ptr_option->min < 0)
-                {
-                    return gui_color_get_custom (
-                        gui_color_get_name (CONFIG_COLOR(ptr_option)));
-                }
-                return GUI_COLOR(ptr_option->min);
-            }
-        }
+        if (string_strcasecmp (ptr_option->name, color_name) == 0)
+            return gui_color_from_option (ptr_option);
+    }
+
+    /* search in any configuration file (example: "irc.color.message_quit") */
+    if (strchr (color_name, '.'))
+    {
+        config_file_search_with_string (color_name, NULL, NULL, &ptr_option,
+                                        NULL);
+        if (ptr_option)
+            return gui_color_from_option (ptr_option);
     }
 
     /* color not found */

src/gui/gui-color.h

@@ -22,6 +22,8 @@
 
 #include <regex.h>
 
+struct t_config_option;
+
 /*
  * Color from configuration options.
  * When changing some colors below:
@@ -173,6 +175,7 @@ extern struct t_weelist *gui_color_list_with_alias;
 
 /* color functions */
 
+extern const char *gui_color_from_option (struct t_config_option *option);
 extern const char *gui_color_search_config (const char *color_name);
 extern int gui_color_attr_get_flag (char c);
 extern void gui_color_attr_build_string (int color, char *str_attr);

src/plugins/aspell/weechat-aspell-command.c

@@ -130,7 +130,7 @@ weechat_aspell_enchant_dict_describe_cb (const char *lang_tag,
     if (country)
         free (country);
 }
-#endif
+#endif /* USE_ENCHANT */
 
 /*
  * Displays list of aspell dictionaries installed on system.
@@ -146,7 +146,7 @@ weechat_aspell_command_speller_list_dicts ()
     AspellDictInfoList *list;
     AspellDictInfoEnumeration *elements;
     const AspellDictInfo *dict;
-#endif
+#endif /* USE_ENCHANT */
 
     weechat_printf (NULL, "");
     weechat_printf (NULL,
@@ -203,7 +203,7 @@ weechat_aspell_command_speller_list_dicts ()
 
     delete_aspell_dict_info_enumeration (elements);
     delete_aspell_config (config);
-#endif
+#endif /* USE_ENCHANT */
 }
 
 /*
@@ -245,7 +245,7 @@ weechat_aspell_command_add_word (struct t_gui_buffer *buffer, const char *dict,
     EnchantDict *new_speller, *ptr_speller;
 #else
     AspellSpeller *new_speller, *ptr_speller;
-#endif
+#endif /* USE_ENCHANT */
 
     new_speller = NULL;
 
@@ -310,7 +310,7 @@ weechat_aspell_command_add_word (struct t_gui_buffer *buffer, const char *dict,
     }
     else
         goto error;
-#endif
+#endif /* USE_ENCHANT */
 
     goto end;
 
@@ -353,7 +353,7 @@ weechat_aspell_command_cb (void *data, struct t_gui_buffer *buffer,
                         "enchant"
 #else
                         "aspell"
-#endif
+#endif /* USE_ENCHANT */
             );
         default_dict = weechat_config_string (weechat_aspell_config_check_default_dict);
         weechat_printf (NULL,

src/plugins/aspell/weechat-aspell-completion.c

@@ -74,7 +74,7 @@ weechat_aspell_completion_enchant_add_dict_cb (const char *lang_tag,
     weechat_hook_completion_list_add ((struct t_gui_completion *)user_data,
                                       lang_tag, 0, WEECHAT_LIST_POS_SORT);
 }
-#endif
+#endif /* USE_ENCHANT */
 
 /*
  * Adds aspell dictionaries (only installed dictionaries) to completion list.
@@ -91,7 +91,7 @@ weechat_aspell_completion_dicts_cb (void *data,
     AspellDictInfoList *list;
     AspellDictInfoEnumeration *elements;
     const AspellDictInfo *dict;
-#endif
+#endif /* USE_ENCHANT */
 
     /* make C compiler happy */
     (void) data;
@@ -115,7 +115,7 @@ weechat_aspell_completion_dicts_cb (void *data,
 
     delete_aspell_dict_info_enumeration (elements);
     delete_aspell_config (config);
-#endif
+#endif /* USE_ENCHANT */
 
     return WEECHAT_RC_OK;
 }

src/plugins/aspell/weechat-aspell-speller.c

@@ -81,7 +81,7 @@ weechat_aspell_speller_dict_supported (const char *lang)
     delete_aspell_config (config);
 
     return rc;
-#endif
+#endif /* USE_ENCHANT */
 }
 
 /*
@@ -127,7 +127,7 @@ weechat_aspell_speller_check_dictionaries (const char *dict_list)
 EnchantDict *
 #else
 AspellSpeller *
-#endif
+#endif /* USE_ENCHANT */
 weechat_aspell_speller_new (const char *lang)
 {
 #ifdef USE_ENCHANT
@@ -136,7 +136,7 @@ weechat_aspell_speller_new (const char *lang)
     AspellConfig *config;
     AspellCanHaveError *ret;
     AspellSpeller *new_speller;
-#endif
+#endif /* USE_ENCHANT */
     struct t_infolist *infolist;
 
     if (!lang)
@@ -163,7 +163,7 @@ weechat_aspell_speller_new (const char *lang)
     /* create a speller instance for the newly created cell */
     config = new_aspell_config();
     aspell_config_replace (config, "lang", lang);
-#endif
+#endif /* USE_ENCHANT */
 
     /* apply all options */
     infolist = weechat_infolist_get ("option", NULL, "aspell.option.*");
@@ -177,7 +177,7 @@ weechat_aspell_speller_new (const char *lang)
             aspell_config_replace (config,
                                    weechat_infolist_string (infolist, "option_name"),
                                    weechat_infolist_string (infolist, "value"));
-#endif
+#endif /* USE_ENCHANT */
         }
         weechat_infolist_free (infolist);
     }
@@ -197,14 +197,14 @@ weechat_aspell_speller_new (const char *lang)
     }
 
     new_speller = to_aspell_speller (ret);
-#endif
+#endif /* USE_ENCHANT */
 
     weechat_hashtable_set (weechat_aspell_spellers, lang, new_speller);
 
 #ifndef USE_ENCHANT
     /* free configuration */
     delete_aspell_config (config);
-#endif
+#endif /* USE_ENCHANT */
 
     return new_speller;
 }
@@ -314,7 +314,7 @@ weechat_aspell_speller_free_value_cb (struct t_hashtable *hashtable,
     EnchantDict *ptr_speller;
 #else
     AspellSpeller *ptr_speller;
-#endif
+#endif /* USE_ENCHANT */
 
     /* make C compiler happy */
     (void) hashtable;
@@ -334,7 +334,7 @@ weechat_aspell_speller_free_value_cb (struct t_hashtable *hashtable,
     ptr_speller = (AspellSpeller *)value;
     aspell_speller_save_all_word_lists (ptr_speller);
     delete_aspell_speller (ptr_speller);
-#endif
+#endif /* USE_ENCHANT */
 }
 
 /*
@@ -353,7 +353,7 @@ weechat_aspell_speller_buffer_new (struct t_gui_buffer *buffer)
     EnchantDict *ptr_speller;
 #else
     AspellSpeller *ptr_speller;
-#endif
+#endif /* USE_ENCHANT */
 
     if (!buffer)
         return NULL;
@@ -380,7 +380,7 @@ weechat_aspell_speller_buffer_new (struct t_gui_buffer *buffer)
                 malloc ((num_dicts + 1) * sizeof (EnchantDict *));
 #else
                 malloc ((num_dicts + 1) * sizeof (AspellSpeller *));
-#endif
+#endif /* USE_ENCHANT */
             if (new_speller_buffer->spellers)
             {
                 for (i = 0; i < num_dicts; i++)

src/plugins/aspell/weechat-aspell-speller.h

@@ -27,7 +27,7 @@ struct t_aspell_speller_buffer
     EnchantDict **spellers;                /* enchant spellers for buffer   */
 #else
     AspellSpeller **spellers;              /* aspell spellers for buffer    */
-#endif
+#endif /* USE_ENCHANT */
     char *modifier_string;                 /* last modifier string          */
     int input_pos;                         /* position of cursor in input   */
     char *modifier_result;                 /* last modifier result          */
@@ -42,7 +42,7 @@ extern void weechat_aspell_speller_check_dictionaries (const char *dict_list);
 extern EnchantDict *weechat_aspell_speller_new (const char *lang);
 #else
 extern AspellSpeller *weechat_aspell_speller_new (const char *lang);
-#endif
+#endif /* USE_ENCHANT */
 extern void weechat_aspell_speller_remove_unused ();
 extern struct t_aspell_speller_buffer *weechat_aspell_speller_buffer_new (struct t_gui_buffer *buffer);
 extern int weechat_aspell_speller_init ();

src/plugins/aspell/weechat-aspell.c

@@ -54,7 +54,7 @@ int aspell_enabled = 0;
 
 #ifdef USE_ENCHANT
 EnchantBroker *broker = NULL;
-#endif
+#endif /* USE_ENCHANT */
 
 /*
  * aspell supported languages, updated on 2012-07-05
@@ -483,7 +483,7 @@ weechat_aspell_check_word (struct t_aspell_speller_buffer *speller_buffer,
             if (enchant_dict_check (speller_buffer->spellers[i], word, strlen (word)) == 0)
 #else
             if (aspell_speller_check (speller_buffer->spellers[i], word, -1) == 1)
-#endif
+#endif /* USE_ENCHANT */
                 return 1;
         }
     }
@@ -513,7 +513,7 @@ weechat_aspell_get_suggestions (struct t_aspell_speller_buffer *speller_buffer,
 #else
     const AspellWordList *list;
     AspellStringEnumeration *elements;
-#endif
+#endif /* USE_ENCHANT */
 
     max_suggestions = weechat_config_integer (weechat_aspell_config_check_suggestions);
     if (max_suggestions < 0)
@@ -585,7 +585,7 @@ weechat_aspell_get_suggestions (struct t_aspell_speller_buffer *speller_buffer,
                 }
                 delete_aspell_string_enumeration (elements);
             }
-#endif
+#endif /* USE_ENCHANT */
         }
     }
 
@@ -1039,7 +1039,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
     broker = enchant_broker_init ();
     if (!broker)
         return WEECHAT_RC_ERROR;
-#endif
+#endif /* USE_ENCHANT */
 
     if (!weechat_aspell_speller_init ())
         return WEECHAT_RC_ERROR;
@@ -1095,7 +1095,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
 #ifdef USE_ENCHANT
     /* release enchant broker */
     enchant_broker_free (broker);
-#endif
+#endif /* USE_ENCHANT */
 
     return WEECHAT_RC_OK;
 }

src/plugins/aspell/weechat-aspell.h

@@ -25,7 +25,7 @@
 #include <enchant.h>
 #else
 #include <aspell.h>
-#endif
+#endif /* USE_ENCHANT */
 
 #define weechat_plugin weechat_aspell_plugin
 #define ASPELL_PLUGIN_NAME "aspell"
@@ -38,7 +38,7 @@ struct t_aspell_code
 
 #ifdef USE_ENCHANT
 extern EnchantBroker *broker;
-#endif
+#endif /* USE_ENCHANT */
 
 extern struct t_weechat_plugin *weechat_aspell_plugin;
 extern int aspell_enabled;

src/plugins/guile/weechat-guile.c

@@ -797,7 +797,7 @@ weechat_guile_signal_debug_libs_cb (void *data, const char *signal,
                     SCM_MICRO_VERSION);
 #else
     weechat_printf (NULL, "  %s: (?)", GUILE_PLUGIN_NAME);
-#endif
+#endif /* defined(SCM_MAJOR_VERSION) && defined(SCM_MINOR_VERSION) && defined(SCM_MICRO_VERSION) */
 
     return WEECHAT_RC_OK;
 }
@@ -980,7 +980,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
      * on unload (or exit)
      */
     scm_install_gmp_memory_functions = 0;
-#endif
+#endif /* HAVE_GUILE_GMP_MEMORY_FUNCTIONS */
 
     scm_init_guile ();
 

src/plugins/irc/irc-buffer.c

@@ -180,12 +180,22 @@ irc_buffer_nickcmp_cb (void *data,
                        const char *nick1,
                        const char *nick2)
 {
-    IRC_BUFFER_GET_SERVER(buffer);
+    struct t_irc_server *server;
 
-    /* make C compiler happy */
-    (void) data;
+    if (data)
+        server = (struct t_irc_server *)data;
+    else
+        irc_buffer_get_server_and_channel (buffer, &server, NULL);
 
-    return irc_server_strcasecmp (ptr_server, nick1, nick2);
+    if (server)
+    {
+        return irc_server_strcasecmp (server, nick1, nick2);
+    }
+    else
+    {
+        /* default is RFC 1459 casemapping comparison */
+        return weechat_strcasecmp_range (nick1, nick2, 29);
+    }
 }
 
 /*

src/plugins/irc/irc-channel.c

@@ -351,6 +351,8 @@ irc_channel_create_buffer (struct t_irc_server *server,
             weechat_buffer_set (ptr_buffer, "nicklist_display_groups", "0");
             weechat_buffer_set_pointer (ptr_buffer, "nickcmp_callback",
                                         &irc_buffer_nickcmp_cb);
+            weechat_buffer_set_pointer (ptr_buffer, "nickcmp_callback_data",
+                                        server);
         }
 
         /* set highlights settings on channel buffer */

src/plugins/irc/irc-command.c

@@ -2722,6 +2722,8 @@ irc_command_list (void *data, struct t_gui_buffer *buffer, int argc,
                               "(%s)"),
                             weechat_prefix ("error"), IRC_PLUGIN_NAME,
                             argv_eol[1], buf);
+                        free (ptr_server->cmd_list_regexp);
+                        ptr_server->cmd_list_regexp = NULL;
                         return WEECHAT_RC_OK;
                     }
                 }

src/plugins/irc/irc-config.c

@@ -47,6 +47,8 @@ struct t_config_section *irc_config_section_ctcp = NULL;
 struct t_config_section *irc_config_section_server_default = NULL;
 struct t_config_section *irc_config_section_server = NULL;
 
+int irc_config_loading = 0;
+
 /* IRC config, look section */
 
 struct t_config_option *irc_config_look_buffer_open_before_autojoin;
@@ -326,6 +328,31 @@ irc_config_change_look_color_nicks_in_nicklist (void *data,
     irc_nick_nicklist_set_color_all ();
 }
 
+/*
+ * Callback for changes on option "irc.look.display_away".
+ */
+
+void
+irc_config_change_look_display_away (void *data,
+                                     struct t_config_option *option)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) option;
+
+    if (!irc_config_loading
+        && (weechat_config_integer (irc_config_look_display_away) == IRC_CONFIG_DISPLAY_AWAY_CHANNEL))
+    {
+        weechat_printf (
+            NULL,
+            _("%sWARNING: the value \"channel\" for option "
+              "\"irc.look.display_away\" will send all your away changes to "
+              "the channels, which is often considered as spam; therefore you "
+              "could be banned from channels, you are warned!"),
+            weechat_prefix ("error"));
+    }
+}
+
 /*
  * Callback for changes on option "irc.look.display_join_message".
  */
@@ -1049,7 +1076,7 @@ irc_config_check_gnutls_priorities (const char *priorities)
     (void) priorities;
 
     return NULL;
-#endif
+#endif /* HAVE_GNUTLS */
 }
 
 /*
@@ -1064,10 +1091,10 @@ irc_config_server_check_value_cb (void *data,
     int index_option, proxy_found;
     const char *pos_error, *proxy_name;
     struct t_infolist *infolist;
-    #ifdef HAVE_GNUTLS
+#ifdef HAVE_GNUTLS
     char **fingerprints, *str_sizes;
     int i, j, rc, algo, length;
-    #endif
+#endif /* HAVE_GNUTLS */
 
     /* make C compiler happy */
     (void) option;
@@ -1119,7 +1146,7 @@ irc_config_server_check_value_cb (void *data,
                 }
                 break;
             case IRC_SERVER_OPTION_SSL_FINGERPRINT:
-                #ifdef HAVE_GNUTLS
+#ifdef HAVE_GNUTLS
                 if (value && value[0])
                 {
                     fingerprints = weechat_string_split (value, ",", 0, 0,
@@ -1175,7 +1202,7 @@ irc_config_server_check_value_cb (void *data,
                         }
                     }
                 }
-                #endif
+#endif /* HAVE_GNUTLS */
                 break;
         }
     }
@@ -1279,7 +1306,9 @@ irc_config_reload (void *data, struct t_config_file *config_file)
 
     irc_ignore_free_all ();
 
+    irc_config_loading = 1;
     rc = weechat_config_reload (config_file);
+    irc_config_loading = 0;
 
     ptr_server = irc_servers;
     while (ptr_server)
@@ -2409,7 +2438,8 @@ irc_config_init ()
         "display_away", "integer",
         N_("display message when (un)marking as away (off: do not display/send "
            "anything, local: display locally, channel: send action to channels)"),
-        "off|local|channel", 0, 0, "local", NULL, 0, NULL, NULL, NULL, NULL,
+        "off|local|channel", 0, 0, "local", NULL, 0, NULL, NULL,
+        &irc_config_change_look_display_away, NULL,
         NULL, NULL);
     irc_config_look_display_ctcp_blocked = weechat_config_new_option (
         irc_config_file, ptr_section,
@@ -3094,7 +3124,10 @@ irc_config_read ()
 {
     int rc;
 
+    irc_config_loading = 1;
     rc = weechat_config_read (irc_config_file);
+    irc_config_loading = 0;
+
     if (rc == WEECHAT_CONFIG_READ_OK)
     {
         irc_notify_new_for_all_servers ();
@@ -3106,6 +3139,7 @@ irc_config_read ()
         irc_config_change_network_notify_check_ison (NULL, NULL);
         irc_config_change_network_notify_check_whois (NULL, NULL);
     }
+
     return rc;
 }
 

src/plugins/irc/irc-protocol.c

@@ -1231,7 +1231,7 @@ IRC_PROTOCOL_CALLBACK(nick)
                                 old_color : IRC_COLOR_CHAT_NICK,
                                 nick,
                                 IRC_COLOR_RESET,
-                                irc_nick_color_for_msg (server, 0, ptr_nick,
+                                irc_nick_color_for_msg (server, 1, ptr_nick,
                                                         new_nick),
                                 new_nick,
                                 IRC_COLOR_RESET);

src/plugins/irc/irc-sasl.c

@@ -29,8 +29,8 @@
 #include <gnutls/gnutls.h>
 #if LIBGNUTLS_VERSION_NUMBER >= 0x020a01 /* 2.10.1 */
 #include <gnutls/abstract.h>
-#endif
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x020a01 */
+#endif /* HAVE_GNUTLS */
 
 #include "../weechat-plugin.h"
 #include "irc.h"
@@ -146,7 +146,7 @@ irc_sasl_mechanism_ecdsa_nist256p_challenge (struct t_irc_server *server,
     gnutls_ecc_curve_t curve;
     gnutls_datum_t x, y, k;
     char *pubkey, *pubkey_base64;
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x030300 */
 
     answer_base64 = NULL;
     string = NULL;
@@ -236,7 +236,7 @@ irc_sasl_mechanism_ecdsa_nist256p_challenge (struct t_irc_server *server,
             gnutls_free (y.data);
             gnutls_free (k.data);
         }
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x030300 */
 
         /* import private key in an abstract key structure */
         ret = gnutls_privkey_import_x509 (privkey, x509_privkey, 0); /* gnutls >= 2.11.0 */
@@ -308,7 +308,7 @@ irc_sasl_mechanism_ecdsa_nist256p_challenge (struct t_irc_server *server,
                     weechat_prefix ("error"));
 
     return NULL;
-#endif
+#endif /* defined(HAVE_GNUTLS) && (LIBGNUTLS_VERSION_NUMBER >= 0x030015) */
 }
 
 /*

src/plugins/irc/irc-server.c

@@ -35,7 +35,7 @@
 #else
 #include <sys/socket.h>
 #include <sys/time.h>
-#endif
+#endif /* _WIN32 */
 #include <sys/types.h>
 #include <netdb.h>
 #include <arpa/inet.h>
@@ -44,7 +44,7 @@
 #ifdef HAVE_GNUTLS
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
-#endif
+#endif /* HAVE_GNUTLS */
 
 #include "../weechat-plugin.h"
 #include "irc.h"
@@ -132,7 +132,7 @@ char *irc_fingerprint_digest_algos_name[IRC_FINGERPRINT_NUM_ALGOS] =
 { "SHA-1", "SHA-256", "SHA-512" };
 int irc_fingerprint_digest_algos_size[IRC_FINGERPRINT_NUM_ALGOS] =
 { 160, 256, 512 };
-#endif
+#endif /* HAVE_GNUTLS */
 
 
 void irc_server_reconnect (struct t_irc_server *server);
@@ -1866,7 +1866,7 @@ irc_server_send (struct t_irc_server *server, const char *buffer, int size_buf)
     if (server->ssl_connected)
         rc = gnutls_record_send (server->gnutls_sess, buffer, size_buf);
     else
-#endif
+#endif /* HAVE_GNUTLS */
         rc = send (server->sock, buffer, size_buf, 0);
 
     if (rc < 0)
@@ -1881,7 +1881,7 @@ irc_server_send (struct t_irc_server *server, const char *buffer, int size_buf)
                 rc, gnutls_strerror (rc));
         }
         else
-#endif
+#endif /* HAVE_GNUTLS */
         {
             weechat_printf (
                 server->buffer,
@@ -2744,7 +2744,7 @@ irc_server_recv_cb (void *data, int fd)
             num_read = gnutls_record_recv (server->gnutls_sess, buffer,
                                            sizeof (buffer) - 2);
         else
-#endif
+#endif /* HAVE_GNUTLS */
             num_read = recv (server->sock, buffer, sizeof (buffer) - 2, 0);
 
         if (num_read > 0)
@@ -2762,7 +2762,7 @@ irc_server_recv_cb (void *data, int fd)
                  */
                 end_recv = 0;
             }
-#endif
+#endif /* HAVE_GNUTLS */
         }
         else
         {
@@ -2788,7 +2788,7 @@ irc_server_recv_cb (void *data, int fd)
                 }
             }
             else
-#endif
+#endif /* HAVE_GNUTLS */
             {
                 if ((num_read == 0)
                     || ((errno != EAGAIN) && (errno != EWOULDBLOCK)))
@@ -3159,7 +3159,7 @@ irc_server_close_connection (struct t_irc_server *server)
                 gnutls_bye (server->gnutls_sess, GNUTLS_SHUT_WR);
             gnutls_deinit (server->gnutls_sess);
         }
-#endif
+#endif /* HAVE_GNUTLS */
     }
     if (server->sock != -1)
     {
@@ -3167,7 +3167,7 @@ irc_server_close_connection (struct t_irc_server *server)
         closesocket (server->sock);
 #else
         close (server->sock);
-#endif
+#endif /* _WIN32 */
         server->sock = -1;
     }
 
@@ -3542,7 +3542,7 @@ irc_server_connect_cb (void *data, int status, int gnutls_rc, int sock,
             }
 #else
             (void) gnutls_rc;
-#endif
+#endif /* HAVE_GNUTLS */
             irc_server_close_connection (server);
             server->current_retry++;
             irc_server_switch_address (server, 1);
@@ -3737,7 +3737,7 @@ irc_server_fingerprint_search_algo_with_size (int size)
     /* digest algorithm not found */
     return -1;
 }
-#endif
+#endif /* HAVE_GNUTLS */
 
 /*
  * Returns a string with sizes of allowed fingerprint,
@@ -3769,7 +3769,7 @@ irc_server_fingerprint_str_sizes ()
 
     return strdup (str_sizes);
 }
-#endif
+#endif /* HAVE_GNUTLS */
 
 /*
  * Compares two fingerprints: one hexadecimal (given by user), the second binary
@@ -3919,7 +3919,7 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
                             gnutls_retr2_st *answer,
 #else
                             gnutls_retr_st *answer,
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x020b00 */
                             int action)
 {
     struct t_irc_server *server;
@@ -3927,7 +3927,7 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
     gnutls_retr2_st tls_struct;
 #else
     gnutls_retr_st tls_struct;
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x020b00 */
     gnutls_x509_crt_t cert_temp;
     const gnutls_datum_t *cert_list;
     gnutls_datum_t filedatum;
@@ -3939,7 +3939,7 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
 #if LIBGNUTLS_VERSION_NUMBER >= 0x010706 /* 1.7.6 */
     gnutls_datum_t cinfo;
     int rinfo;
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x010706 */
 
     /* make C compiler happy */
     (void) req_ca;
@@ -4039,7 +4039,7 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
 #else
                 rinfo = gnutls_x509_crt_print (cert_temp,
                                                GNUTLS_CRT_PRINT_ONELINE, &cinfo);
-#endif
+#endif /*  LIBGNUTLS_VERSION_NUMBER < 0x020400 */
                 if (rinfo == 0)
                 {
                     weechat_printf (
@@ -4052,7 +4052,7 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
                         weechat_prefix ("network"), cinfo.data);
                     gnutls_free (cinfo.data);
                 }
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x010706 */
                 /* check dates, only if fingerprint is not set */
                 if (!fingerprint || !fingerprint[0])
                 {
@@ -4226,7 +4226,7 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
                         tls_struct.key_type = GNUTLS_PRIVKEY_X509;
 #else
                         tls_struct.type = GNUTLS_CRT_X509;
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x020b00 */
                         tls_struct.ncerts = 1;
                         tls_struct.deinit_all = 0;
                         tls_struct.cert.x509 = &server->tls_cert;
@@ -4241,7 +4241,7 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
                         rinfo = gnutls_x509_crt_print (server->tls_cert,
                                                        GNUTLS_CRT_PRINT_ONELINE,
                                                        &cinfo);
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER < 0x020400 */
                         if (rinfo == 0)
                         {
                             weechat_printf (
@@ -4253,7 +4253,7 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
                                 weechat_prefix ("network"), cinfo.data);
                             gnutls_free (cinfo.data);
                         }
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x010706 */
                         memcpy (answer, &tls_struct, sizeof (tls_struct));
                         free (cert_str);
                     }
@@ -4417,7 +4417,7 @@ irc_server_connect (struct t_irc_server *server)
             weechat_prefix ("error"), IRC_PLUGIN_NAME);
         return 0;
     }
-#endif
+#endif /* HAVE_GNUTLS */
     if (proxy_type)
     {
         weechat_printf (
@@ -4501,7 +4501,7 @@ irc_server_connect (struct t_irc_server *server)
         IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_LOCAL_HOSTNAME),
         &irc_server_connect_cb,
         server);
-#endif
+#endif /* HAVE_GNUTLS */
 
     /* send signal "irc_server_connecting" with server name */
     (void) weechat_hook_signal_send ("irc_server_connecting",
@@ -5206,7 +5206,7 @@ irc_server_hdata_server_cb (void *data, const char *hdata_name)
         WEECHAT_HDATA_VAR(struct t_irc_server, gnutls_sess, OTHER, 0, NULL, NULL);
         WEECHAT_HDATA_VAR(struct t_irc_server, tls_cert, OTHER, 0, NULL, NULL);
         WEECHAT_HDATA_VAR(struct t_irc_server, tls_cert_key, OTHER, 0, NULL, NULL);
-#endif
+#endif /* HAVE_GNUTLS */
         WEECHAT_HDATA_VAR(struct t_irc_server, unterminated_message, STRING, 0, NULL, NULL);
         WEECHAT_HDATA_VAR(struct t_irc_server, nicks_count, INTEGER, 0, NULL, NULL);
         WEECHAT_HDATA_VAR(struct t_irc_server, nicks_array, STRING, 0, "nicks_count", NULL);
@@ -5785,7 +5785,7 @@ irc_server_print_log ()
         weechat_log_printf ("  disconnected . . . . : %d",    ptr_server->disconnected);
 #ifdef HAVE_GNUTLS
         weechat_log_printf ("  gnutls_sess. . . . . : 0x%lx", ptr_server->gnutls_sess);
-#endif
+#endif /* HAVE_GNUTLS */
         weechat_log_printf ("  unterminated_message : '%s'",  ptr_server->unterminated_message);
         weechat_log_printf ("  nicks_count. . . . . : %d",    ptr_server->nicks_count);
         weechat_log_printf ("  nicks_array. . . . . : 0x%lx", ptr_server->nicks_array);

src/plugins/irc/irc-server.h

@@ -26,11 +26,11 @@
 
 #ifdef HAVE_GNUTLS
 #include <gnutls/gnutls.h>
-#endif
+#endif /* HAVE_GNUTLS */
 
 #ifndef NI_MAXHOST
 #define NI_MAXHOST 256
-#endif
+#endif /* NI_MAXHOST */
 
 enum t_irc_server_sasl_fail
 {
@@ -174,7 +174,7 @@ struct t_irc_server
     gnutls_session_t gnutls_sess;   /* gnutls session (only if SSL is used)  */
     gnutls_x509_crt_t tls_cert;     /* certificate used if ssl_cert is set   */
     gnutls_x509_privkey_t tls_cert_key; /* key used if ssl_cert is set       */
-#endif
+#endif /* HAVE_GNUTLS */
     char *unterminated_message;     /* beginning of a message in input buf   */
     int nicks_count;                /* number of nicknames                   */
     char **nicks_array;             /* nicknames (after split)               */
@@ -252,13 +252,13 @@ enum t_irc_fingerprint_digest_algo
     /* number of digest algorithms */
     IRC_FINGERPRINT_NUM_ALGOS,
 };
-#endif
+#endif /* HAVE_GNUTLS */
 
 extern struct t_irc_server *irc_servers;
 #ifdef HAVE_GNUTLS
 extern const int gnutls_cert_type_prio[];
 extern const int gnutls_prot_prio[];
-#endif
+#endif /* HAVE_GNUTLS */
 extern struct t_irc_message *irc_recv_msgq, *irc_msgq_last_msg;
 extern char *irc_server_sasl_fail_string[];
 extern char *irc_server_options[][2];
@@ -323,7 +323,7 @@ extern struct t_gui_buffer *irc_server_create_buffer (struct t_irc_server *serve
 #ifdef HAVE_GNUTLS
 int irc_server_fingerprint_search_algo_with_size (int size);
 char *irc_server_fingerprint_str_sizes ();
-#endif
+#endif /* HAVE_GNUTLS */
 extern int irc_server_connect (struct t_irc_server *server);
 extern void irc_server_auto_connect (int auto_connect);
 extern void irc_server_autojoin_channels ();

src/plugins/irc/irc-upgrade.c

@@ -245,6 +245,7 @@ irc_upgrade_set_buffer_callbacks ()
 {
     struct t_infolist *infolist;
     struct t_gui_buffer *ptr_buffer;
+    struct t_irc_server *ptr_server;
     const char *type;
 
     infolist = weechat_infolist_get ("buffer", NULL, NULL);
@@ -260,8 +261,17 @@ irc_upgrade_set_buffer_callbacks ()
                 type = weechat_buffer_get_string (ptr_buffer, "localvar_type");
                 if (type && (strcmp (type, "channel") == 0))
                 {
+                    ptr_server = irc_server_search (
+                        weechat_buffer_get_string (ptr_buffer,
+                                                   "localvar_server"));
                     weechat_buffer_set_pointer (ptr_buffer, "nickcmp_callback",
                                                 &irc_buffer_nickcmp_cb);
+                    if (ptr_server)
+                    {
+                        weechat_buffer_set_pointer (ptr_buffer,
+                                                    "nickcmp_callback_data",
+                                                    ptr_server);
+                    }
                 }
                 if (strcmp (weechat_infolist_string (infolist, "name"),
                             IRC_RAW_BUFFER_NAME) == 0)

src/plugins/javascript/weechat-js.h

@@ -28,10 +28,10 @@
 #define EXPORT extern "C" __declspec (dllexport)
 #else
 #define EXPORT extern "C"
-#endif
+#endif /* _WIN32 */
 #else
 #define EXPORT
-#endif
+#endif /* __cplusplus */
 
 #define weechat_plugin weechat_js_plugin
 #define JS_PLUGIN_NAME "javascript"

src/plugins/logger/logger.c

@@ -359,7 +359,7 @@ logger_get_mask_expanded (struct t_gui_buffer *buffer, const char *mask)
                                             weechat_config_string (logger_config_file_replacement_char));
 #else
     mask_decoded3 = strdup (mask_decoded2);
-#endif
+#endif /* __CYGWIN__ */
     if (!mask_decoded3)
         goto end;
 

src/plugins/lua/weechat-lua.c

@@ -294,7 +294,7 @@ weechat_lua_register_lib (lua_State *L, const char *libname,
         luaL_setfuncs (L, lua_api_funcs, 0);
 #else
     luaL_register (L, libname, lua_api_funcs);
-#endif
+#endif /* LUA_VERSION_NUM >= 502 */
 
     luaL_newmetatable (L, "weechat");
     lua_pushliteral (L, "__index");
@@ -375,7 +375,7 @@ weechat_lua_load (const char *filename)
     luaopen_math (lua_current_interpreter);
     luaopen_io (lua_current_interpreter);
     luaopen_debug (lua_current_interpreter);
-#endif
+#endif /* LUA_VERSION_NUM */
 
     weechat_lua_register_lib (lua_current_interpreter, "weechat",
                               weechat_lua_api_funcs,
@@ -385,7 +385,7 @@ weechat_lua_load (const char *filename)
     if (luaL_dostring (lua_current_interpreter, weechat_lua_code) != 0)
 #else
     if (lua_dostring (lua_current_interpreter, weechat_lua_code) != 0)
-#endif
+#endif /* LUA_VERSION_NUM */
     {
         weechat_printf (NULL,
                         weechat_gettext ("%s%s: unable to redirect stdout "
@@ -800,7 +800,7 @@ weechat_lua_signal_debug_libs_cb (void *data, const char *signal,
     weechat_printf (NULL, "  %s: %s", LUA_PLUGIN_NAME, LUA_VERSION);
 #else
     weechat_printf (NULL, "  %s: (?)", LUA_PLUGIN_NAME);
-#endif
+#endif /* LUA_VERSION */
 
     return WEECHAT_RC_OK;
 }

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

@@ -94,7 +94,7 @@
 
 #ifdef NO_PERL_MULTIPLICITY
 #undef MULTIPLICITY
-#endif
+#endif /* NO_PERL_MULTIPLICITY */
 
 extern void boot_DynaLoader (pTHX_ CV* cv);
 
@@ -169,7 +169,7 @@ API_FUNC(register)
         perl_current_script->interpreter = perl_current_interpreter;
 #else
         perl_current_script->interpreter = SvPV_nolen (eval_pv ("__PACKAGE__", TRUE));
-#endif
+#endif /* MULTIPLICITY */
     }
     else
     {

src/plugins/perl/weechat-perl.c

@@ -49,7 +49,7 @@ struct t_plugin_script *perl_registered_script = NULL;
 const char *perl_current_script_filename = NULL;
 #ifdef MULTIPLICITY
 PerlInterpreter *perl_current_interpreter = NULL;
-#endif
+#endif /* MULTIPLICITY */
 int perl_quit_or_upgrade = 0;
 
 /*
@@ -78,13 +78,13 @@ char *perl_action_autoload_list = NULL;
 
 #ifdef NO_PERL_MULTIPLICITY
 #undef MULTIPLICITY
-#endif
+#endif /* NO_PERL_MULTIPLICITY */
 
 #ifndef MULTIPLICITY
 #define PKG_NAME_PREFIX "WeechatPerlPackage"
 static PerlInterpreter *perl_main = NULL;
 int perl_num = 0;
-#endif
+#endif /* MULTIPLICITY */
 
 char *perl_args[] = { "", "-e", "0", "-w", NULL };
 int perl_args_count = 4;
@@ -93,7 +93,7 @@ char *perl_weechat_code =
 {
 #ifndef MULTIPLICITY
     "package %s;"
-#endif
+#endif /* MULTIPLICITY */
     "$SIG{__WARN__} = sub { weechat::print('', 'perl\twarning: '.$_[0]) };"
     "$SIG{__DIE__} = sub { weechat::print('', 'perl\terror: '.$_[0]) };"
     "do '%s';"
@@ -204,7 +204,7 @@ weechat_perl_exec (struct t_plugin_script *script,
     struct t_plugin_script *old_perl_current_script;
 #ifdef MULTIPLICITY
     void *old_context;
-#endif
+#endif /* MULTIPLICITY */
 
     old_perl_current_script = perl_current_script;
     perl_current_script = script;
@@ -224,7 +224,7 @@ weechat_perl_exec (struct t_plugin_script *script,
     snprintf (func, length, "%s::%s",
               (char *) ((script->interpreter) ? script->interpreter : perl_main),
               function);
-#endif
+#endif /* MULTIPLICITY */
 
     dSP;
     ENTER;
@@ -322,7 +322,7 @@ weechat_perl_exec (struct t_plugin_script *script,
     PERL_SET_CONTEXT (old_context);
 #else
     free (func);
-#endif
+#endif /* MULTIPLICITY */
 
     if (!ret_value && (mem_err == 1))
     {
@@ -353,7 +353,7 @@ weechat_perl_load (const char *filename)
     int length;
 #ifndef MULTIPLICITY
     char pkgname[64];
-#endif
+#endif /* MULTIPLICITY */
 
     temp_script.filename = NULL;
     temp_script.interpreter = NULL;
@@ -414,7 +414,7 @@ weechat_perl_load (const char *filename)
     if (!perl_code)
         return 0;
     snprintf (perl_code, length, perl_weechat_code, pkgname, filename);
-#endif
+#endif /* MULTIPLICITY */
     eval_pv (perl_code, TRUE);
     free (perl_code);
 
@@ -432,7 +432,7 @@ weechat_perl_load (const char *filename)
 #ifdef MULTIPLICITY
         perl_destruct (perl_current_interpreter);
         perl_free (perl_current_interpreter);
-#endif
+#endif /* MULTIPLICITY */
         if (perl_current_script && (perl_current_script != &temp_script))
         {
             plugin_script_remove (weechat_perl_plugin,
@@ -453,14 +453,14 @@ weechat_perl_load (const char *filename)
 #ifdef MULTIPLICITY
         perl_destruct (perl_current_interpreter);
         perl_free (perl_current_interpreter);
-#endif
+#endif /* MULTIPLICITY */
         return 0;
     }
     perl_current_script = perl_registered_script;
 
 #ifndef MULTIPLICITY
     perl_current_script->interpreter = strdup (pkgname);
-#endif
+#endif /* MULTIPLICITY */
 
     /*
      * set input/close callbacks for buffers created by this script
@@ -512,7 +512,7 @@ weechat_perl_unload (struct t_plugin_script *script)
 
 #ifdef MULTIPLICITY
     PERL_SET_CONTEXT (script->interpreter);
-#endif
+#endif /* MULTIPLICITY */
 
     if (script->shutdown_func && script->shutdown_func[0])
     {
@@ -549,7 +549,7 @@ weechat_perl_unload (struct t_plugin_script *script)
 #else
     if (interpreter)
         free (interpreter);
-#endif
+#endif /* MULTIPLICITY */
 
     (void) weechat_hook_signal_send ("perl_script_unloaded",
                                      WEECHAT_HOOK_SIGNAL_STRING, filename);
@@ -832,7 +832,7 @@ weechat_perl_signal_debug_libs_cb (void *data, const char *signal,
     weechat_printf (NULL, "  %s: %s", PERL_PLUGIN_NAME, PERL_VERSION_STRING);
 #else
     weechat_printf (NULL, "  %s: (?)", PERL_PLUGIN_NAME);
-#endif
+#endif /* PERL_VERSION_STRING */
 
     return WEECHAT_RC_OK;
 }
@@ -971,13 +971,11 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
     int a;
     char **perl_args_local;
     char *perl_env[] = {};
-#endif
-#ifdef PERL_SYS_INIT3
     a = perl_args_count;
     perl_args_local = perl_args;
     (void) perl_env;
     PERL_SYS_INIT3 (&a, (char ***)&perl_args_local, (char ***)&perl_env);
-#endif
+#endif /* PERL_SYS_INIT3 */
 
     weechat_perl_plugin = plugin;
 
@@ -996,7 +994,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
     perl_construct (perl_main);
     perl_parse (perl_main, weechat_perl_api_init, perl_args_count,
                 perl_args, NULL);
-#endif
+#endif /* MULTIPLICITY */
 
     init.callback_command = &weechat_perl_command_cb;
     init.callback_completion = &weechat_perl_completion_cb;
@@ -1042,7 +1040,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
         perl_free (perl_main);
         perl_main = NULL;
     }
-#endif
+#endif /* MULTIPLICITY */
 
 #if defined(PERL_SYS_TERM) && !defined(__FreeBSD__) && !defined(WIN32) && !defined(__CYGWIN__) && !(defined(__APPLE__) && defined(__MACH__))
     /*

src/plugins/perl/weechat-perl.h

@@ -35,7 +35,7 @@ extern struct t_plugin_script *perl_registered_script;
 extern const char *perl_current_script_filename;
 #ifdef MULTIPLICITY
 extern PerlInterpreter *perl_current_interpreter;
-#endif
+#endif /* MULTIPLICITY */
 
 extern HV *weechat_perl_hashtable_to_hash (struct t_hashtable *hashtable);
 extern struct t_hashtable *weechat_perl_hash_to_hashtable (SV *hash, int size,

src/plugins/python/weechat-python.c

@@ -84,7 +84,7 @@ static struct PyModuleDef moduleDefOutputs = {
     NULL,
     NULL
 };
-#endif
+#endif /* PY_MAJOR_VERSION >= 3 */
 
 /*
  * string used to execute action "install":
@@ -498,7 +498,7 @@ weechat_python_output (PyObject *self, PyObject *args)
 static PyObject *weechat_python_init_module_weechat ()
 #else
 void weechat_python_init_module_weechat ()
-#endif
+#endif /* PY_MAJOR_VERSION >= 3 */
 {
     PyObject *weechat_module, *weechat_dict;
 
@@ -508,7 +508,7 @@ void weechat_python_init_module_weechat ()
 #else
     /* python <= 2.x */
     weechat_module = Py_InitModule ("weechat", weechat_python_funcs);
-#endif
+#endif /* PY_MAJOR_VERSION >= 3 */
 
     if (!weechat_module)
     {
@@ -520,7 +520,7 @@ void weechat_python_init_module_weechat ()
         return NULL;
 #else
         return;
-#endif
+#endif /* PY_MAJOR_VERSION >= 3 */
     }
 
     /* define some constants */
@@ -574,7 +574,7 @@ void weechat_python_init_module_weechat ()
 
 #if PY_MAJOR_VERSION >= 3
     return weechat_module;
-#endif
+#endif /* PY_MAJOR_VERSION >= 3 */
 }
 
 /*
@@ -591,7 +591,7 @@ weechat_python_load (const char *filename)
     char *argv[] = { "__weechat_plugin__" , NULL };
 #if PY_MAJOR_VERSION >= 3
     wchar_t *wargv[] = { NULL, NULL };
-#endif
+#endif /* PY_MAJOR_VERSION >= 3 */
     FILE *fp;
     PyObject *weechat_outputs, *python_path, *path;
     const char *weechat_home;
@@ -636,7 +636,7 @@ weechat_python_load (const char *filename)
 #else
     /* python <= 2.x */
     PySys_SetArgv(1, argv);
-#endif
+#endif /* PY_MAJOR_VERSION >= 3 */
 
     if (!python_current_interpreter)
     {
@@ -667,7 +667,7 @@ weechat_python_load (const char *filename)
 #else
             /* python <= 2.x */
             path = PyBytes_FromString (str_home);
-#endif
+#endif /* PY_MAJOR_VERSION >= 3 */
             if (path != NULL)
             {
                 PyList_Insert (python_path, 0, path);
@@ -684,7 +684,7 @@ weechat_python_load (const char *filename)
     /* python <= 2.x */
     weechat_outputs = Py_InitModule("weechatOutputs",
                                     weechat_python_output_funcs);
-#endif
+#endif /* PY_MAJOR_VERSION >= 3 */
 
     if (!weechat_outputs)
     {
@@ -1149,7 +1149,7 @@ weechat_python_signal_debug_libs_cb (void *data, const char *signal,
     weechat_printf (NULL, "  %s: %s", PYTHON_PLUGIN_NAME, PY_VERSION);
 #else
     weechat_printf (NULL, "  %s: (?)", PYTHON_PLUGIN_NAME);
-#endif
+#endif /* PY_VERSION */
 
     return WEECHAT_RC_OK;
 }

src/plugins/python/weechat-python.h

@@ -32,7 +32,7 @@
 #define PyBytes_Check PyString_Check
 #define PyBytes_FromString PyString_FromString
 #define PyUnicode_FromString PyString_FromString
-#endif
+#endif /* PY_VERSION_HEX < 0x02060000 */
 
 #if PY_MAJOR_VERSION >= 3
 /* check of integer with Python >= 3.x */
@@ -40,7 +40,7 @@
 #else
 /* check of integer with Python <= 2.x */
 #define PY_INTEGER_CHECK(x) (PyInt_Check(x) || PyLong_Check(x))
-#endif
+#endif /* PY_MAJOR_VERSION >= 3 */
 
 extern struct t_weechat_plugin *weechat_python_plugin;
 

src/plugins/relay/relay-client.c

@@ -260,7 +260,7 @@ relay_client_handshake_timer_cb (void *data, int remaining_calls)
     /* handshake in progress, we will try again on next call to timer */
     return WEECHAT_RC_OK;
 }
-#endif
+#endif /* HAVE_GNUTLS */
 
 /*
  * Reads text data from a client: splits data on '\n' and keep a partial message
@@ -451,7 +451,7 @@ relay_client_recv_cb (void *arg_client, int fd)
         num_read = gnutls_record_recv (client->gnutls_sess, buffer,
                                        sizeof (buffer) - 1);
     else
-#endif
+#endif /* HAVE_GNUTLS */
         num_read = recv (client->sock, buffer, sizeof (buffer) - 1, 0);
 
     if (num_read > 0)
@@ -555,7 +555,7 @@ relay_client_recv_cb (void *arg_client, int fd)
             }
         }
         else
-#endif
+#endif /* HAVE_GNUTLS */
         {
             if ((num_read == 0)
                 || ((errno != EAGAIN) && (errno != EWOULDBLOCK)))
@@ -785,7 +785,7 @@ relay_client_send (struct t_relay_client *client, const char *data,
         if (client->ssl)
             num_sent = gnutls_record_send (client->gnutls_sess, ptr_data, data_size);
         else
-#endif
+#endif /* HAVE_GNUTLS */
             num_sent = send (client->sock, ptr_data, data_size, 0);
 
         if (num_sent >= 0)
@@ -839,7 +839,7 @@ relay_client_send (struct t_relay_client *client, const char *data,
                 }
             }
             else
-#endif
+#endif /* HAVE_GNUTLS */
             {
                 if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
                 {
@@ -917,7 +917,7 @@ relay_client_timer_cb (void *data, int remaining_calls)
                                                    ptr_client->outqueue->data_size);
                 }
                 else
-#endif
+#endif /* HAVE_GNUTLS */
                 {
                     num_sent = send (ptr_client->sock,
                                      ptr_client->outqueue->data,
@@ -1006,7 +1006,7 @@ relay_client_timer_cb (void *data, int remaining_calls)
                         }
                     }
                     else
-#endif
+#endif /* HAVE_GNUTLS */
                     {
                         if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
                         {
@@ -1052,7 +1052,7 @@ relay_client_new (int sock, const char *address, struct t_relay_server *server)
 #ifdef HAVE_GNUTLS
     int bits;
     struct t_config_option *ptr_option;
-#endif
+#endif /* HAVE_GNUTLS */
 
     new_client = malloc (sizeof (*new_client));
     if (new_client)
@@ -1064,7 +1064,7 @@ relay_client_new (int sock, const char *address, struct t_relay_server *server)
 #ifdef HAVE_GNUTLS
         new_client->hook_timer_handshake = NULL;
         new_client->gnutls_handshake_ok = 0;
-#endif
+#endif /* HAVE_GNUTLS */
         new_client->websocket = 0;
         new_client->http_headers = NULL;
         new_client->address = strdup ((address) ? address : "?");
@@ -1127,7 +1127,7 @@ relay_client_new (int sock, const char *address, struct t_relay_server *server)
 #else
                     /* default for old gnutls */
                     bits = 1024;
-#endif
+#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x020c00 */
                     gnutls_dh_params_generate2 (*relay_gnutls_dh_params, bits);
                     gnutls_certificate_set_dh_params (relay_gnutls_x509_cred,
                                                       *relay_gnutls_dh_params);
@@ -1148,7 +1148,7 @@ relay_client_new (int sock, const char *address, struct t_relay_server *server)
                                                                    &relay_client_handshake_timer_cb,
                                                                    new_client);
         }
-#endif
+#endif /* HAVE_GNUTLS */
 
         new_client->protocol_data = NULL;
         switch (new_client->protocol)
@@ -1232,7 +1232,7 @@ relay_client_new_with_infolist (struct t_infolist *infolist)
         new_client->gnutls_sess = NULL;
         new_client->hook_timer_handshake = NULL;
         new_client->gnutls_handshake_ok = 0;
-#endif
+#endif /* HAVE_GNUTLS */
         new_client->websocket = weechat_infolist_integer (infolist, "websocket");
         new_client->http_headers = NULL;
         new_client->address = strdup (weechat_infolist_string (infolist, "address"));
@@ -1330,7 +1330,7 @@ relay_client_set_status (struct t_relay_client *client,
             client->hook_timer_handshake = NULL;
         }
         client->gnutls_handshake_ok = 0;
-#endif
+#endif /* HAVE_GNUTLS */
         if (client->hook_fd)
         {
             weechat_unhook (client->hook_fd);
@@ -1376,13 +1376,13 @@ relay_client_set_status (struct t_relay_client *client,
 #ifdef HAVE_GNUTLS
             if (client->ssl && client->gnutls_handshake_ok)
                 gnutls_bye (client->gnutls_sess, GNUTLS_SHUT_WR);
-#endif
+#endif /* HAVE_GNUTLS */
             close (client->sock);
             client->sock = -1;
 #ifdef HAVE_GNUTLS
             if (client->ssl)
                 gnutls_deinit (client->gnutls_sess);
-#endif
+#endif /* HAVE_GNUTLS */
         }
     }
 
@@ -1428,7 +1428,7 @@ relay_client_free (struct t_relay_client *client)
 #ifdef HAVE_GNUTLS
     if (client->hook_timer_handshake)
         weechat_unhook (client->hook_timer_handshake);
-#endif
+#endif /* HAVE_GNUTLS */
     if (client->http_headers)
         weechat_hashtable_free (client->http_headers);
     if (client->hook_fd)
@@ -1540,7 +1540,7 @@ relay_client_add_to_infolist (struct t_infolist *infolist,
         return 0;
     if (!weechat_infolist_new_var_integer (ptr_item, "gnutls_handshake_ok", client->gnutls_handshake_ok))
         return 0;
-#endif
+#endif /* HAVE_GNUTLS */
     if (!weechat_infolist_new_var_integer (ptr_item, "websocket", client->websocket))
         return 0;
     if (!weechat_infolist_new_var_string (ptr_item, "address", client->address))
@@ -1617,7 +1617,7 @@ relay_client_print_log ()
         weechat_log_printf ("  gnutls_sess . . . . . : 0x%lx", ptr_client->gnutls_sess);
         weechat_log_printf ("  hook_timer_handshake. : 0x%lx", ptr_client->hook_timer_handshake);
         weechat_log_printf ("  gnutls_handshake_ok . : 0x%lx", ptr_client->gnutls_handshake_ok);
-#endif
+#endif /* HAVE_GNUTLS */
         weechat_log_printf ("  websocket . . . . . . : %d",   ptr_client->websocket);
         weechat_log_printf ("  http_headers. . . . . : 0x%lx (hashtable: '%s')",
                             ptr_client->http_headers,

src/plugins/relay/relay-client.h

@@ -22,7 +22,7 @@
 
 #ifdef HAVE_GNUTLS
 #include <gnutls/gnutls.h>
-#endif
+#endif /* HAVE_GNUTLS */
 
 struct t_relay_server;
 
@@ -80,7 +80,7 @@ struct t_relay_client
     gnutls_session_t gnutls_sess;      /* gnutls session (only if SSL used) */
     struct t_hook *hook_timer_handshake; /* timer for doing gnutls handshake*/
     int gnutls_handshake_ok;           /* 1 if handshake was done and OK    */
-#endif
+#endif /* HAVE_GNUTLS */
     int websocket;                     /* 0=not a ws, 1=init ws, 2=ws ready */
     struct t_hashtable *http_headers;  /* HTTP headers for websocket        */
     char *address;                     /* string with IP address            */

src/plugins/relay/relay-config.c

@@ -237,7 +237,7 @@ relay_config_check_network_ssl_priorities (void *data,
     (void) value;
 
     return 1;
-#endif
+#endif /* HAVE_GNUTLS */
 }
 
 /*
@@ -258,7 +258,7 @@ relay_config_change_network_ssl_priorities (void *data,
         gnutls_priority_deinit (*relay_gnutls_priority_cache);
         relay_network_set_priority ();
     }
-#endif
+#endif /* HAVE_GNUTLS */
 }
 
 /*
@@ -490,7 +490,7 @@ relay_config_create_option_port (void *data,
                         weechat_prefix ("error"), RELAY_PLUGIN_NAME);
         rc = WEECHAT_CONFIG_OPTION_SET_ERROR;
     }
-#endif
+#endif /* HAVE_GNUTLS */
 
     if (rc != WEECHAT_CONFIG_OPTION_SET_ERROR)
     {

src/plugins/relay/relay-network.c

@@ -23,7 +23,7 @@
 
 #ifdef HAVE_GNUTLS
 #include <gnutls/gnutls.h>
-#endif
+#endif /* HAVE_GNUTLS */
 
 #include "../weechat-plugin.h"
 #include "relay.h"
@@ -38,7 +38,7 @@ int relay_network_init_ssl_cert_key_ok = 0;
 gnutls_certificate_credentials_t relay_gnutls_x509_cred;
 gnutls_priority_t *relay_gnutls_priority_cache = NULL;
 gnutls_dh_params_t *relay_gnutls_dh_params = NULL;
-#endif
+#endif /* HAVE_GNUTLS */
 
 
 /*
@@ -100,7 +100,7 @@ relay_network_set_ssl_cert_key (int verbose)
 #else
     /* make C compiler happy */
     (void) verbose;
-#endif
+#endif /* HAVE_GNUTLS */
 }
 
 /*
@@ -122,7 +122,7 @@ relay_network_set_priority ()
         free (relay_gnutls_priority_cache);
         relay_gnutls_priority_cache = NULL;
     }
-#endif
+#endif /* HAVE_GNUTLS */
 }
 
 /*
@@ -142,7 +142,7 @@ relay_network_init ()
     relay_gnutls_priority_cache = malloc (sizeof (*relay_gnutls_priority_cache));
     if (relay_gnutls_priority_cache)
         relay_network_set_priority ();
-#endif
+#endif /* HAVE_GNUTLS */
     relay_network_init_ok = 1;
 }
 
@@ -169,7 +169,7 @@ relay_network_end ()
             relay_gnutls_dh_params = NULL;
         }
         gnutls_certificate_free_credentials (relay_gnutls_x509_cred);
-#endif
+#endif /* HAVE_GNUTLS */
         relay_network_init_ok = 0;
     }
 }

src/plugins/relay/relay-network.h

@@ -22,7 +22,7 @@
 
 #ifdef HAVE_GNUTLS
 #include <gnutls/gnutls.h>
-#endif
+#endif /* HAVE_GNUTLS */
 
 extern int relay_network_init_ok;
 extern int relay_network_init_ssl_cert_key_ok;
@@ -31,7 +31,7 @@ extern int relay_network_init_ssl_cert_key_ok;
 extern gnutls_certificate_credentials_t relay_gnutls_x509_cred;
 extern gnutls_priority_t *relay_gnutls_priority_cache;
 extern gnutls_dh_params_t *relay_gnutls_dh_params;
-#endif
+#endif /* HAVE_GNUTLS */
 
 extern void relay_network_set_ssl_cert_key (int verbose);
 extern void relay_network_set_priority ();