core: add CVE id in ChangeLog

core: force version 18.04 of Ubuntu in CI
relay: fix crash when decoding a malformed websocket frame
2026-06-13 14:44:46 +02:00 · 2021-09-07 20:33:44 +02:00 · 2021-09-04 23:14:48 +02:00 · 2021-09-04 23:09:19 +02:00 · 2021-09-04 23:06:58 +02:00 · 2021-01-31 10:07:53 +01:00
649 changed files with 5274 additions and 9059 deletions
@@ -1 +0,0 @@
-blank_issues_enabled: false
@@ -37,14 +37,12 @@ Alphabetically:
 * Dmitry Kobylin
 * Dominik Honnef
 * Dominique Martinet
-* dotflac
 * Eduardo Elias
 * Eli Schwartz
 * Elizabeth Myers (Elizacat)
 * Elián Hanisch (m4v)
 * Emanuele Giaquinta
 * emk
-* Érico Nogueira
 * Esteban I. Ruiz Moreno (Exio)
 * Evgeny Shmarnev
 * Felix Eckhofer
@@ -57,7 +55,6 @@ Alphabetically:
 * Hasan Kiran (turgay)
 * Ivan Sichmann Freitas
 * Jakub Jirutka
-* Jan Palus
 * Jason A. Donenfeld (zx2c4)
 * JD Horelick (jdhore)
 * jesopo
@@ -86,7 +83,6 @@ Alphabetically:
 * Matt Robinson
 * Matthew Horan
 * Matthew Martin
-* Matti Virkkunen
 * Max Anton Teufel
 * Maxim Baz
 * Michael Siegel
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2007-2008 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2008-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -15,38 +15,12 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 (file _ReleaseNotes.adoc_ in sources).


-[[v3.1]]
-== Version 3.1 (2021-03-07)
-
-New features::
-
-  * core: add options weechat.look.hotlist_update_on_buffer_switch and weechat.look.read_marker_update_on_buffer_switch (issue #992, issue #993)
-  * core: add option sec.crypt.passphrase_command to read passphrase from an external program on startup, remove option sec.crypt.passphrase_file (issue #141)
-  * core: improve debug in command /eval: display more verbose debug with two "-d", add indentation and colors
-  * core: add options "setvar" and "delvar" in command /buffer, rename option "localvar" to "listvar"
-  * core: add buffer local variable "completion_default_template" (evaluated) to override the value of option "weechat.completion.default_template" (issue #1600)
-  * core: add option "recreate" in command /filter
-  * core: add raw string in evaluation of expressions with "raw:xxx" (issue #1611)
-  * core: add evaluation of conditions in evaluation of expressions with "eval_cond:xxx" (issue #1582)
-  * api: add info_hashtable "secured_data"
-  * irc: add info "irc_is_message_ignored"
-  * irc: add server option "default_chantypes", used when the server does not send them in message 005 (issue #1610)
-  * trigger: add variable "${tg_trigger_name}" in command trigger evaluated strings (issue #1580)
+[[v3.0.2]]
+== Version 3.0.2 (under dev)

 Bug fixes::

-  * core: fix quoted line in cursor mode (issue #1602)
-  * core: fix wrong size of the new window after vertical split (issue #1612)
-  * core: do not remove quotes in arguments of command /eval as they can be part of the evaluated expression/condition (issue #1601)
-  * core: display an error when the buffer is not found with command /command -buffer
-  * buflist: add option buflist.look.use_items to speed up display of buflist (issue #1613)
-  * irc: add bar item "irc_nick_prefix"
-  * irc: fix separator between nick and host in bar item "irc_nick_host"
-  * irc: fix completion of commands /halfop and /dehalfop
-
-Documentation::
-
-  * do not build weechat-headless man page if headless binary is disabled (issue #1607)
+  * relay: fix crash when decoding a malformed websocket frame (CVE-2021-40516)

 [[v3.0.1]]
 == Version 3.0.1 (2021-01-31)
@@ -193,7 +167,7 @@ New features::
  * buflist: add pointer "window" in bar item evaluation
  * irc: add support of fake servers (no I/O, for testing purposes)
  * relay: accept hash of password in init command of weechat protocol with option "password_hash" (PBKDF2, SHA256, SHA512)
-  * relay: reject client with weechat protocol if password or TOTP is received in init command but not set in WeeChat (issue #1435)
+  * relay: reject client with weechat protocol if password or totp is received in init command but not set in WeeChat (issue #1435)

 Bug fixes::

@@ -244,7 +218,7 @@ New features::
  * core: add option weechat.look.nick_color_hash_salt to shuffle nick colors (issue #635)
  * core: add different icons sizes (16x16 to 512x512) (issue #1347)
  * core: add file weechat.desktop
-  * core: add reverse of string for screen in evaluation of expressions with "revscr:xxx"
+  * core: add reverse of string for screen in evaluation of expressions with "revscr:"
  * core: add length of string (number of chars and on screen) in evaluation of expressions with "length:xxx" and "lengthscr:xxx"
  * core: add calculation of expression in evaluation of expressions with "calc:xxx" (issue #997)
  * core: add optional default path (evaluated) in completion "filename"
@@ -479,7 +453,7 @@ Build::
 New features::

  * core: change default value of option weechat.look.hotlist_add_conditions to check connected relay clients via weechat protocol (issue #1206)
-  * core: add reverse of string in evaluation of expressions with "rev:xxx" (issue #1200)
+  * core: add reverse of string in evaluation of expressions with "rev:" (issue #1200)
  * core: send buffer pointer (when possible) in signal "hotlist_changed" (issue #1133)
  * core: add support of list options in curl (issue #826, issue #219)
  * core: allow merge of buffers by name in command /buffer (issue #1108, issue #1159)
@@ -674,7 +648,7 @@ New features::

  * core: add option weechat.completion.nick_case_sensitive (issue #981)
  * core: add wildcard matching operator (`+=*+` and `+!*+`) in evaluation of expressions (issue #611)
-  * core: add cut of string in evaluation of expressions with "cut:xxx" (number of chars) and "cutscr:xxx" (number of chars displayed on screen)
+  * core: add cut of string in evaluation of expressions with "cut:" (number of chars) and "cutscr:" (number of chars displayed on screen)
  * core: add ternary operator (condition) in evaluation of expressions (`${if:condition?value_if_true:value_if_false}`)
  * core: add resize of window parents with /window resize [h/v]size (task #11461, issue #893)
  * core: add hotlist pointer in buffer structure
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2006-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -114,7 +114,7 @@ $ ctest -V

 == Copyright

-Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>

 This file is part of WeeChat, the extensible chat client.

@@ -17,70 +17,6 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
 (file _ChangeLog.adoc_ in sources).


-[[v3.1]]
-== Version 3.1 (2021-03-07)
-
-[[v3.1_secure_data_passphrase_command]]
-=== External program to read secured data passphrase
-
-A new option `sec.crypt.passphrase_command` has been added to read the passphrase
-from the output of an external program (like a password manager).
-
-The option `sec.crypt.passphrase_file` has been removed, because the command
-can now read a file as well. If you used a file to read the passphrase, you
-must now setup the command like this:
-
----
-/set sec.crypt.passphrase_command "cat ~/.weechat-passphrase"
----
-
-For security reasons, it is of course highly recommended to use a password manager
-or a program to decrypt a file with your passphrase rather than using a file with
-the clear password. +
-For example with password-store (command `pass`):
-
----
-/set sec.crypt.passphrase_command "pass show weechat/passphrase"
----
-
-[[v3.1_window_splitv]]
-=== Vertical split of windows
-
-The vertical split of windows has been fixed (see issue #1612): now the new
-window has the asked size, instead of the original window.
-
-For example with this command the new window (on the right) has size 80% instead
-of 20% in previous releases:
-
----
-/window splitv 80
----
-
-[[v3.1_command_buffer_listvar]]
-=== List of buffer local variables
-
-The command `/buffer localvar` has been renamed to `/buffer listvar`.
-
-The option `localvar` is still supported to stay compatible with scripts
-calling it or referencing it in the documentation. +
-It is deprecated and will be removed in a future release.
-
-New options `setvar` and `delvar` were also added in command `/buffer`,
-see `/help buffer`.
-
-[[v3.1_buflist_option_use_items]]
-=== Buflist option buflist.look.use_items
-
-A new buflist option `buflist.look.use_items` has been added to speed up
-display of buflist, in case you use a single buflist item (the most common use case).
-
-If ever you use more than one item (item "buflist2" or even "buflist3"), you
-must adjust the value of the new option, which defaults to 1:
-
----
-/set buflist.look.use_items 2
----
-
 [[v3.0.1]]
 == Version 3.0.1 (2021-01-31)

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2005-2006 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2014-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2007 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2011-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2017 Adam Saponara <as@php.net>
-# Copyright (C) 2017-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2017-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2015-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2015-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Benoit Papillault <benoit.papillault@free.fr>
 # Copyright (C) 2005-2006 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2005-2009 Emmanuel Bouthenot <kolter@openics.org>
@@ -1,17 +1,3 @@
-weechat (3.0.1-1) unstable; urgency=medium
-
-  * New upstream release
-  * Bump Standards-Version to 4.5.1
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 03 Mar 2021 05:30:44 +0000
-
-weechat (3.0-1) unstable; urgency=medium
-
-  * New upstream release
-  * Build against Guile 3.0 (instead of 2.2) (Closes: #969680)
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Sat, 21 Nov 2020 07:34:12 +0000
-
 weechat (2.9-1) unstable; urgency=medium

  * New upstream release
@@ -4,7 +4,7 @@ Upstream-Contact: Sébastien Helleu <flashcode@flashtux.org>
 Source: https://weechat.org/

 Files: *
-Copyright: 2003-2021, Sébastien Helleu <flashcode@flashtux.org>
+Copyright: 2003-2020, Sébastien Helleu <flashcode@flashtux.org>
 License: GPL-3+

 Files: src/core/wee-command.c
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -32,21 +32,19 @@ if(ENABLE_MAN)
  add_custom_target(doc-man-weechat-cs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/cs/man1)

-  if(ENABLE_HEADLESS)
-    # man page: weechat-headless
-    add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
-      COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.cs.adoc
-      DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.cs.adoc
-      ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.cs.adoc
-      ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.cs.adoc
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      COMMENT "Building weechat-headless.1 (cs)"
-    )
-    add_custom_target(doc-man-weechat-headless-cs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/cs/man1)
-  endif()
+  # man page: weechat-headless
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.cs.adoc
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.cs.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.cs.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.cs.adoc
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Building weechat-headless.1 (cs)"
+  )
+  add_custom_target(doc-man-weechat-headless-cs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/cs/man1)
 endif()

 if(ENABLE_DOC)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -96,7 +96,7 @@ $HOME/.weechat/weechat.log::
 WeeChat je napsán Sébastienem Helleu a přispěvovateli (kompletní seznam je v
 souboru AUTHORS.adoc).

-Copyright (C) 2003-2021 {author}
+Copyright (C) 2003-2020 {author}

 WeeChat is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -32,21 +32,19 @@ if(ENABLE_MAN)
  add_custom_target(doc-man-weechat-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/de/man1)

-  if(ENABLE_HEADLESS)
-    # man page: weechat-headless
-    add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
-      COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.de.adoc
-      DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.de.adoc
-      ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.de.adoc
-      ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.de.adoc
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      COMMENT "Building weechat-headless.1 (de)"
-    )
-    add_custom_target(doc-man-weechat-headless-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/de/man1)
-  endif()
+  # man page: weechat-headless
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.de.adoc
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.de.adoc
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Building weechat-headless.1 (de)"
+  )
+  add_custom_target(doc-man-weechat-headless-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/de/man1)
 endif()

 if(ENABLE_DOC)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -120,10 +120,6 @@

 | weechat | bars_options | Einstellungen für Infobars

-| weechat | buffer_local_variable_value | Wert einer lokalen Buffervariablen
-
-| weechat | buffer_local_variables | lokale Buffervariablen
-
 | weechat | buffer_properties_get | Eigenschaften die für den Buffer gelesen werden können

 | weechat | buffer_properties_set | Eigenschaften die für den Buffer gesetzt werden können
@@ -20,8 +20,6 @@

 | irc | irc_is_channel | 1, falls die Zeichenkette ein gültiger IRC-Channelname für den Server ist | Server,Channel (Server ist optional)

-| irc | irc_is_message_ignored | 1, wenn der Nick ignoriert wird (Meldung wird nicht angezeigt) | Server,Nachricht (Nachricht ist die unverarbeitete IRC Nachricht)
-
 | irc | irc_is_nick | 1, falls die Zeichenkette ein gültiger IRC Nickname ist | Server,Nickname (Server ist optional)

 | irc | irc_nick | aktuellen Nicknamen für den Server erhalten | Servername
@@ -14,7 +14,5 @@

 | weechat | focus_info | Fokusinformationen abrufen | "x": x-Koordinate (Zeichenfolge mit Ganzzahl >= 0), "y": y-Koordinate (Zeichenfolge mit Ganzzahl >= 0) | siehe Funktion "hook_focus" in API Dokumentation

-| weechat | secured_data | schutzwürdige Daten | - | schutzwürdige Daten: Namen und Werte (Vorsicht: Dies sind vertrauliche Daten: drucken oder protokollieren Sie diese NICHT)
-
 |===
 // end::infos_hashtable[]
@@ -219,7 +219,6 @@ Beispiel:

 ----
 /dehalfop  <nick> [<nick>...]
-           * -yes

 nick: Nick oder Maske (Platzhalter "*" kann verwendet werden)
   *: entzieht allen Nicks im Channel den half-operator-Status, ausgenommen sich selber
@@ -933,7 +932,6 @@ target: Servername

 ----
 /voice  <nick> [<nick>...]
-        * -yes

 nick: Nick oder Maske (Platzhalter "*" kann verwendet werden)
   *: vergibt an alle Nicks im Channel den voice-Status
@@ -1022,7 +1020,7 @@ Anmerkung: Im Befehl können Variablen genutzt werden, die dann durch den entspr
      $n-m: Argumente von 'n' bis 'm'
        $*: alle Argumente
        $~: letztes Argument
-      $var: "var" ist eine lokale Variable für den jeweiligen Buffer (siehe /buffer listvar)
+      $var: "var" ist eine lokale Variable für den jeweiligen Buffer (siehe /buffer localvar)
            Beispiel: $nick, $channel, $server, $plugin, $name

 Beispiele:
@@ -1115,9 +1113,7 @@ Beispiele:
         renumber [<number1> [<number2> [<start>]]]
         close [<n1>[-<n2>]|<name>...]
         notify [<level>]
-         listvar [<number>|<name>]
-         setvar <name> [<value>]
-         delvar <name>
+         localvar [<number>|<name>]
         set <property> [<value>]
         get <property>
         <number>|-|+|<name>
@@ -1141,9 +1137,7 @@ renumber: Buffer werden umnummeriert (Einstellung weechat.look.buffer_auto_renum
         message: Benachrichtigung bei Nachrichten von Usern + Highlights
             all: Benachrichtigung bei allen Nachrichten
           reset: Benachrichtigung auf Standardwert zurück setzen (all)
- listvar: zeigt die lokalen Variablen für den aktuellen Buffer an
-  setvar: legt eine lokale Variable für den aktuellen Buffer an
-  delvar: löscht eine lokale Variable des aktuellen Buffers
+localvar: zeigt die lokalen Variablen für den aktuellen Buffer an
     set: setzt eine Eigenschaft für den aktuellen Buffer
     get: zeigt eine Eigenschaft für den aktuellen Buffer an
  number: wechselt von einem Buffer zu einem anderen, mögliche Optionen:
@@ -1302,11 +1296,11 @@ infolists: zeigt Information über die Infolists an

 ----
 /eval  [-n|-s] [-d] <expression>
-       [-n] [-d [-d]] -c <expression1> <operator> <expression2>
+       [-n] [-d] -c <expression1> <operator> <expression2>

        -n: gibt das Ergebnis aus, ohne dass dieses in den Buffer gesendet wird (debug Modus)
        -s: teilt Ausdrücke, bevor sie evaluiert werden (mehrere Befehle können durch Semikolon getrennt werden)
-        -d: eine Debug-Ausgabe nach Auswertung anzeigen (Nutzung von zwei -d: ausführliche Debug-Ausgabe)
+        -d: eine Debug-Ausgabe nach Auswertung anzeigen
        -c: Auswertung als Bedingung: nutzt Operatoren und runde Klammern, Rückgabewert als Boolean-Wert ("0" oder "1")
 expression: Ausdruck welcher verarbeitet werden soll. Variablen im Format ${variable} werden ersetzt (siehe unten); mehrere Befehle werden durch ein Semikolon voneinander getrennt
  operator: ein logischer oder vergleichender Operand:
@@ -1341,27 +1335,25 @@ Um einen Vergleich zwischen zwei Zeichenketten zu erzwingen, müssen die Ausdrü
  "50" > "100"  ==> 1

 Einige Variablen werden im Ausdruck mittels der Formatierung ${variable} ersetzt. Mögliche Variablen sind, nach Reihenfolge ihrer Priorität:
-  1. die Zeichenfolge selbst ohne Auswertung (Format: "raw:xxx")\n
-  2. eine evaluierte Teilzeichenkette (Format: "eval:xxx")
-  3. eine evaluierte Bedingung (Format: "eval_cond:xxx")
-  4. eine Zeichenkette mit Escapesequenzen (Format: "esc:xxx" oder "\xxx")
-  5. Zeichen, die in einer Zeichenkette nicht dargestellt werden sollen (Format: "hide:Zeichen,Zeichenkette")
-  6. eine Zeichenkette mit einer maximalen Anzahl an Zeichen (Format: "cut:+Max,Suffix,Zeichenkette")
+  1. eine evaluierte Teilzeichenkette (Format: "eval:xxx")
+  2. eine Zeichenkette mit Escapesequenzen (Format: "esc:xxx" oder "\xxx")
+  3. Zeichen, die in einer Zeichenkette nicht dargestellt werden sollen (Format: "hide:Zeichen,Zeichenkette")
+  4. eine Zeichenkette mit einer maximalen Anzahl an Zeichen (Format: "cut:+Max,Suffix,Zeichenkette")
     oder maximale Anzahl an Zeichen die auf dem Bildschirm angezeigt werden sollen (Format: "cutscr:Max,Suffix,Zeichenkette oder "cutscr:+Max,Suffix,Zeichenkette")
-  7. eine Zeichenkette umkehren (Format: "rev:xxx" oder "revscr:xxx")
-  8. eine Zeichenkette wiederholen (Format: "repeat:Anzahl,Zeichenkette")
-  9. Länge einer Zeichenkette (Format: "length:xxx" oder "lengthscr:xxx")
-  10. eine Farbe (Format: "color:xxx", siehe "Anleitung für API Erweiterung", Funktion "color")
-  11. ein Modifizierer (Format: "info:Name,Argumente", Argumente sind optional)
-  12. eine Info (Format: "Info:Name,Argumente", Argumente sind optional)
-  13. eine Basis 16/32/64 kodierte / dekodierte Zeichenfolge (Format: "base_encode:base,xxx" oder "base_decode:base,xxx")
-  14. aktuelles Datum/Uhrzeit (Format: "date" oder "date:format")
-  15. eine Umgebungsvariable (Format: "env:XXX")
-  16. ein Dreifachoperand (Format: "if:Bedingung?Wert_falls_wahr:Wert_falls_unwahr")
-  17. Ergebnis eines Ausdrucks mit Klammern und Operatoren + - * / // % ** (Format: "calc:xxx")
-  18. eine Option (Format: "file.section.option")
-  19. eine lokale Variable eines Buffers
-  20. ein(e) hdata - Name/Variable (der Wert wird automatisch in eine Zeichenkette konvertiert), standardmäßig wird für "window" und "buffer" das aktuelle Fenster/Buffer verwendet.
+  5. eine Zeichenkette umkehren (Format: "rev:xxx" oder "revscr:xxx")
+  6. eine Zeichenkette wiederholen (Format: "repeat:Anzahl,Zeichenkette")
+  7. Länge einer Zeichenkette (Format: "length:xxx" oder "lengthscr:xxx")
+  8. eine Farbe (Format: "color:xxx", siehe "Anleitung für API Erweiterung", Funktion "color")
+  9. ein Modifizierer (Format: "info:Name,Argumente", Argumente sind optional)
+  10. eine Info (Format: "Info:Name,Argumente", Argumente sind optional)
+  11. eine Basis 16/32/64 kodierte / dekodierte Zeichenfolge (Format: "base_encode:base,xxx" oder "base_decode:base,xxx")
+  12. aktuelles Datum/Uhrzeit (Format: "date" oder "date:format")
+  13. eine Umgebungsvariable (Format: "env:XXX")
+  14. ein Dreifachoperand (Format: "if:Bedingung?Wert_falls_wahr:Wert_falls_unwahr")
+  15. Ergebnis eines Ausdrucks mit Klammern und Operatoren + - * / // % ** (Format: "calc:xxx")
+  16. eine Option (Format: "file.section.option")
+  17. eine lokale Variable eines Buffers
+  18. ein(e) hdata - Name/Variable (der Wert wird automatisch in eine 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:
@@ -1372,8 +1364,6 @@ 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 ${raw:${info:version}}                ==> ${info:version}
-  /eval -n ${eval_cond:${window.win_width}>100}  ==> 1
  /eval -n ${info:version}                       ==> 0.4.3
  /eval -n ${env:HOME}                           ==> /home/user
  /eval -n ${weechat.look.scroll_amount}         ==> 3
@@ -1416,7 +1406,6 @@ Beispiele (Bedingungen):
         enable|disable|toggle [<name>|@]
         add|addreplace <name> <buffer>[,<buffer>...] <tags> <regex>
         rename <name> <new_name>
-         recreate <name>
         del <name>|-all

      list: alle Filter auflisten
@@ -1427,7 +1416,6 @@ Beispiele (Bedingungen):
       add: Filter hinzufügen
 addreplace: erzeugt neuen Filter oder ersetzt einen schon existierenden Filter
    rename: benennt einen Filter um
-  recreate: in die Eingabezeile wird die entsprechende Filtereinstellung übernommen, um diese dann editieren zu können
       del: Filter entfernen
      -all: entfernt alle Filter
    buffer: durch Kommata getrennte Liste von Buffer in denen der Filter aktiv sein soll:
@@ -1873,7 +1861,7 @@ Tastenbefehle für den secure-Buffer:
  alt+v Werte werden in Klartext angezeigt bzw. verborgen

 Wird eine Passphrase verwendet (Daten liegen verschlüsselt vor), fragt WeeChat beim Start die Passphrase ab.
-Setzt man die Umgebungsvariable "WEECHAT_PASSPHRASE", kann die Eingabeaufforderung der Passphrase beim Programmstart vermieden werden (diese Variable wird von WeeChat auch beim /upgrade verwendet). Es ist auch möglich mittels der Option sec.crypt.passphrase_command die Passphrase aus der Ausgabe eines externen Befehls, wie eines Passwort-Managers zu lesen (siehe /help sec.crypt.passphrase_command )
+Setzt man die Umgebungsvariable "WEECHAT_PASSPHRASE", kann die Eingabeaufforderung der Passphrase beim Programmstart vermieden werden (diese Variable wird von WeeChat auch beim /upgrade verwendet). Es ist auch möglich in der Option sec.crypt.passphrase_file eine Datei anzugeben die die Passphrase beinhaltet (siehe /help sec.crypt.passphrase_file)

 schutzwürdige Daten mit dem Format ${sec.data.xxx} können wie folgt genutzt werden:
  - Befehl /eval.
@@ -1884,8 +1872,6 @@ schutzwürdige Daten mit dem Format ${sec.data.xxx} können wie folgt genutzt we
 Beispiele:
  festlegen eine Passphrase:
    /secure passphrase Dies ist meine Passphrase
-  nutze Programm "pass" um die Passphrase beim Start auszulesen:
-    /set sec.crypt.passphrase_command "pass show weechat/passphrase"
  verschlüsselt freenode SASL Passwort:
    /secure set freenode meinPasswort
    /set irc.server.freenode.sasl_password "${sec.data.freenode}"
@@ -2831,17 +2817,7 @@ Im Skript-Buffer, werden folgende Statusangaben für ein Skript angezeigt:
  | | | gehalten
  | | Skript wird beim Start, von WeeChat, automatisch geladen
  | Skript ist installiert (wird aber nicht ausgeführt)
-  beliebtes Skript
-
-In der Ausgabe von /script list, wird der Status für ein Skript angegeben:
-  * ? i a H N
-  | | | | | |
-  | | | | | obsolete (neue Version verfügbar)
-  | | | | gehalten
-  | | | Skript wird beim Start, von WeeChat, automatisch geladen
-  | | Skript ist installiert (wird aber nicht ausgeführt)
-  | unbekanntes Skript (dieses Skript kann nicht heruntergeladen/aktualisiert werden)
-  beliebtes Skript
+  es wird empfohlen dieses Skript zu installieren

 Tastenbefehle die im Skript-Buffer genutzt werden können:
  alt+i  installiert Skript (physikalisch)
@@ -2972,7 +2948,7 @@ listdefault: zeigt die standardmäßig genutzten Trigger an
             modifier: Name(en) des modifier (erforderlich)
             line: Buffertyp ("formatted", "free" oder "*"), Liste von Buffermasken, Tags
             print: Buffer, Tags, Nachricht, Farben entfernen
-             command: Befehl (erforderlich), Beschreibung, Argumente, Beschreibung der Argumente, Vervollständigung (alle Argumente, außer dem Befehl werden ausgewertet, "${tg_trigger_name}" wird durch den Triggernamen ersetzt, siehe /help eval)
+             command: Befehl (erforderlich), Beschreibung, Argumente, Beschreibung der Argumente, Vervollständigung (Alle Argumente, außer dem Befehl werden ausgewertet, siehe /help eval)
             command_run: Befehl(e) (erforderlich)
             timer: Intervall (erforderlich), Anpassung an Sekunden (erforderlich), maximale Anzahl an Aufrufen
             config: Name der Einstellung (erforderlich)
@@ -3004,7 +2980,7 @@ post_action: Aktion welche nach der Abarbeitung des Triggers ausgeführt werden
    restore: stellt Trigger mit Standardwerten wieder her (funktioniert nur bei vorgegebenen Triggern)
    default: stellt die standardmäßigen Trigger wieder her
    monitor: öffnet den Trigger Monitor-Buffer, mit optionaler Filterfunktion:
-     filter: filtert Hooks/Trigger zum Anzeigen (ein Hook muss mit "@" beginnen, zum Beispiel "@signal"), mehrere Filter können durch Kommata voneinander getrennt werden; Platzhalter "*" kann im Namen des Trigger verwendet werden
+     Filter: zeigt Hooks/Trigger an (ein Hook muss mit "@" beginnen, zum Beispiel "@signal"), mehrere Filter können durch Kommata voneinander getrennt werden; Platzhalter "*" kann im Namen des Trigger verwendet werden

 Wenn ein Trigger-Callback aufgerufen wird, dann wird folgende Befehlskette ausgeführt:
  1. Überprüfung von Bedingungen; falls unwahr, beenden
@@ -16,8 +16,8 @@
 ** Werte: sha224, sha256, sha384, sha512
 ** Standardwert: `+sha256+`

-* [[option_sec.crypt.passphrase_command]] *sec.crypt.passphrase_command*
-** Beschreibung: pass:none[Auslesen der Passphrase aus der Ausgabe des angegebenen Befehls (nur die erste Zeile wird verwendet und darf kein zusätzliches Zeichen enthalten); Diese Option wird nur verwendet, wenn die Datei sec.conf gelesen wird und wenn die Umgebungsvariable "WEECHAT_PASSPHRASE" nicht festgelegt ist (die Umgebungsvariable hat eine höhere Priorität); Beispiel mit Passwortspeicher: "pass show weechat / passphrase"]
+* [[option_sec.crypt.passphrase_file]] *sec.crypt.passphrase_file*
+** Beschreibung: pass:none[Pfad zu einer Datei die die Passphrase enthält um damit schutzwürdige Daten zu ver- und entschlüsseln. Diese Einstellung findet nur Anwendung, wenn die Datei sec.conf gelesen wird. Es wird auch nur die erste Zeile eingelesen. Diese Datei wird nur verwendet, falls die Umgebungsvariable "WEECHAT_PASSPHRASE" nicht genutzt wird (die Umgebungsvariable besitzt eine höhere Priorität). Sicherheitshinweis: Es ist anzuraten dieser Datei nur für die eigene Person Leserechte zu gewähren und die Datei nicht im Heimatverzeichnis von WeeChat zu sichern (zum Beispiel im /home/ Order); Beispiel: "~/.weechat-passphrase"]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`
@@ -846,12 +846,6 @@
 ** Werte: on, off
 ** Standardwert: `+on+`

-* [[option_weechat.look.hotlist_update_on_buffer_switch]] *weechat.look.hotlist_update_on_buffer_switch*
-** Beschreibung: pass:none[Aktualisiert die Hotlist, wenn der Buffer gewechselt wird]
-** Typ: boolesch
-** Werte: on, off
-** Standardwert: `+on+`
-
 * [[option_weechat.look.input_cursor_scroll]] *weechat.look.input_cursor_scroll*
 ** Beschreibung: pass:none[Anzahl an Zeichen die nach links verschoben werden sollen, falls das Ende der Eingabezeile erreicht wird]
 ** Typ: integer
@@ -1146,12 +1140,6 @@
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+"- "+`

-* [[option_weechat.look.read_marker_update_on_buffer_switch]] *weechat.look.read_marker_update_on_buffer_switch*
-** Beschreibung: pass:none[Aktualisiert das Lesezeichen, wenn der Buffer gewechselt wird]
-** Typ: boolesch
-** Werte: on, off
-** Standardwert: `+on+`
-
 * [[option_weechat.look.save_config_on_exit]] *weechat.look.save_config_on_exit*
 ** Beschreibung: pass:none[die aktuelle Konfiguration wird beim Beenden automatisch gesichert]
 ** Typ: boolesch
@@ -1781,12 +1769,6 @@
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+"number,-active"+`
-
-* [[option_buflist.look.use_items]] *buflist.look.use_items*
-** Beschreibung: pass:none[Anzahl der Buflist-Bar-Items, die verwendet werden können; die Item-Namen sind: "buflist", "buflist2", "buflist3"; Seien Sie vorsichtig, wenn Sie mehr als ein Bar-Item verwenden, wird die Anzeige der Bufferliste verlangsamt]
-** Typ: integer
-** Werte: 1 .. 3
-** Standardwert: `+1+`
 // end::buflist_options[]

 // tag::fifo_options[]
@@ -2634,12 +2616,6 @@
 ** Werte: 1 .. 3600
 ** Standardwert: `+60+`

-* [[option_irc.server_default.default_chantypes]] *irc.server_default.default_chantypes*
-** Beschreibung: pass:none[Channel-Typ-Präfix, die verwendet werden sollen, wenn der Server diese nicht in Nachricht 005 sendet (Standard ist "#&")]
-** Typ: Zeichenkette
-** Werte: beliebige Zeichenkette
-** Standardwert: `+"#&"+`
-
 * [[option_irc.server_default.ipv6]] *irc.server_default.ipv6*
 ** Beschreibung: pass:none[bei der Kommunikation mit dem Server wird das IPv6 Protokoll genutzt (sollte IPv6 nicht verfügbar sein dann wird automatisch auf IPv4 umgeschaltet); wird die Funktion deaktiviert, dann wird ausschließlich IPv4 genutzt]
 ** Typ: boolesch
@@ -97,7 +97,7 @@ $HOME/.weechat/weechat.log::
 WeeChat wird programmiert von Sébastien Helleu und weiteren Beteiligten (eine vollständige Auflistung
 findet man in der AUTHORS.adoc Datei).

-Copyright (C) 2003-2021 {author}
+Copyright (C) 2003-2020 {author}

 WeeChat is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -249,31 +249,6 @@ Die Tasten "meta-OP" und "meta-OQ" können im Hinblick auf das jeweils genutzte
 Um die korrekten Tasten zu finden, sollte man mit kbd:[Alt+k] die gewünschte Tastenkombination einfangen.
 Siehe auch: link:weechat_user.de.html#key_bindings_command_line[Benutzerhandbuch / Tastenbelegung].

-[[customize_buflist]]
-=== Wie kann ich die Darstellung der Bufferliste anpassen, z.B. die Farbe des aktiven Buffers?
-
-Mit folgendem Befehl können alle Optionen der Buflist angezeigt werden:
-
----
-/fset buflist
----
-
-Die Hintergrundfarbe des aktiven Buffers ist standardmäßig blau. Sie können diese
-Farbe folgendermaßen ändern, z.B. in "red":
-
----
-/set buflist.format.buffer_current "${color:,red}${format_buffer}"
----
-
-[NOTE]
-Vor dem Farbnamen "red" steht ein Komma, da die Farbe als Hintergrund und nicht als Textfarbe verwendet wird. +
-Es kann auch eine beliebige numerische Farbe anstelle von "Rot" verwendet werden, z. B. "237" für Dunkelgrau.
-
-Die Buflist-Erweiterung bietet viele Optionen, zum individualisieren. Bitte lesen Sie dazu die Hilfe von jeder Option.
-
-Es gibt auch eine Wiki-Seite mit Beispielen, wie eine erweiterte Konfiguration aussehen kann:
-https://github.com/weechat/weechat/wiki/buflist
-
 [[customize_prefix]]
 === Wie kann ich die Länge eines Nicknamens begrenzen oder die Ausrichtung des Nicks im Chatbereich entfernen?

@@ -1289,10 +1264,11 @@ Beispiel:

 Es können alle _~/.weechat/*.conf_ Dateien geteilt werden.
 Hiervon ausgenommen ist die Datei _sec.conf_,
-die durch eine Passphrase verschlüsselte, sensible, Daten enthalten kann.
+die durch eine Passphrase verschlüsselte sensible Daten enthalten kann.

-Einige andere Dateien enthalten möglicherweise vertrauliche Informationen wie
-Kennwörter (sofern sie nicht mit dem Befehl `/secure` in _sec.conf_ gesichert werden).
+In einigen Dateien wie _irc.conf_ können sensible Daten,
+z.B. Passwörter für Server oder Channels im Klartext hinterlegt sein.
+(Das heißt, insofern diese nicht mit Hilfe des Befehls `/secure` verschlüsselt in der Datei _sec.conf_ gesichert wurden).

 Siehe link:weechat_user.de.html#files_and_directories[Benutzerhandbuch / Dateien und Verzeichnisse]
 für weitere Informationen über Konfigurationsdateien.
@@ -988,7 +988,7 @@ Um zu sehen welche lokalen Variablen für einen Buffer gesetzt sind führen Sie
 bitte in WeeChat folgenden Befehl aus:

 ----
-/buffer listvar
+/buffer localvar
 ----

 [[hooks]]
@@ -95,21 +95,39 @@ Unter macOS kann https://brew.sh/[Homebrew] verwendet werden:
 [[dependencies]]
 ==== Abhängigkeiten

-Die folgende Tabelle zeigt die Liste der Pakete, die zum Kompilieren von
-WeeChat *erforderlich* sind:
+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,.^15",options="header"]
+[width="100%",cols="6,^3,^3,.^13",options="header"]
 |===
-| Paket ^(1)^            | Version       | Funktion
+| Paket ^(1)^            | Version       | benötigt | Funktion
 | C compiler
-  (gcc, clang, ...)      |               | zum Erstellen der Binärdatei.
-| cmake                  | ≥ 3.0         | zum kompilieren (autotools ist möglich. CMake wird aber empfohlen).
-| pkg-config             |               | entdeckt installierte Bibliotheken.
-| libncursesw5-dev ^(2)^ |               | Ncurses Oberfläche.
-| libcurl4-gnutls-dev    |               | URL Transfer.
-| zlib1g-dev             |               | Kompression für Pakete, die mittels Relay- (WeeChat Protokoll), Script-Erweiterung übertragen werden.
-| libgcrypt20-dev        |               | Geschützte Daten, IRC SASL Authentifikation (DH-BLOWFISH/DH-AES).
-| 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).
+  (gcc, clang, ...)      |               | *ja*     | zum Erstellen der Binärdatei.
+| C++ compiler           |               |          | zum Erstellen der Binärdatei und um Test auszuführen, JavaScript Erweiterung.
+| cmake                  | ≥ 3.0         | *ja*     | zum kompilieren (autotools ist möglich. CMake wird aber empfohlen).
+| pkg-config             |               | *ja*     | entdeckt installierte Bibliotheken.
+| libncursesw5-dev ^(2)^ |               | *ja*     | Ncurses Oberfläche.
+| libcurl4-gnutls-dev    |               | *ja*     | URL Transfer.
+| zlib1g-dev             |               | *ja*     | Kompression für Pakete, die mittels Relay- (WeeChat Protokoll), Script-Erweiterung übertragen werden.
+| libgcrypt20-dev        |               | *ja*     | Geschützte Daten, IRC SASL Authentifikation (DH-BLOWFISH/DH-AES).
+| libgnutls28-dev        | ≥ 2.2.0 ^(3)^ | *ja*     | SSL Verbindung zu einem IRC Server, Unterstützung von SSL in der Relay-Erweiterung, IRC SASL Authentifikation (ECDSA-NIST256P-CHALLENGE).
+| gettext                |               |          | Internationalisierung (Übersetzung der Mitteilungen; Hauptsprache ist englisch).
+| ca-certificates        |               |          | Zertifikate für SSL Verbindungen.
+| libaspell-dev
+  ∥ libenchant-dev       |               |          | Spell Erweiterung.
+| python3-dev            | ^(4)^         |          | Python Erweiterung.
+| libperl-dev            |               |          | Perl Erweiterung.
+| ruby2.5, ruby2.5-dev   | ≥ 1.9.1       |          | Ruby Erweiterung.
+| liblua5.3-dev          |               |          | Lua Erweiterung.
+| tcl-dev                | ≥ 8.5         |          | Tcl Erweiterung.
+| guile-2.0-dev          | ≥ 2.0         |          | Guile (scheme) Erweiterung.
+| libv8-dev              | ≤ 3.24.3      |          | JavaScript Erweiterung.
+| php-dev, libphp-embed  | ≥ 7.0         |          | PHP Erweiterung.
+| libxml2-dev            |               |          | PHP Erweiterung.
+| libargon2-0-dev        |               |          | PHP Erweiterung (wenn PHP ≥ 7.2).
+| libsodium-dev          |               |          | PHP Erweiterung (wenn PHP ≥ 7.2).
+| asciidoctor            | ≥ 1.5.4       |          | zum Erstellen der man page und der Dokumentation.
+| libcpputest-dev        | ≥ 3.4         |          | zum Erstellen und um Test auszuführen.
 |===

 [NOTE]
@@ -120,36 +138,8 @@ entscheidend) zu kompilieren. Eine Kompilierung kann auch mit libncurses5-dev er
 aber dies wird *NICHT* empfohlen:
 Es können Darstellungsfehler mit breiten Zeichen auftreten. +
 ^(3)^ GnuTLS ≥ 3.0.21 wird benötigt um eine IRC SASL Authentifizierung mittels
-ECDSA-NIST256P-CHALLENGE durchzuführen.
-
-Die folgende Tabelle zeigt die Liste der Pakete, die zum Kompilieren von
-WeeChat optional sind:
-
-[width="100%",cols="5,^3,.^15",options="header"]
-|===
-| Paket                  | Version  | Funktion
-| C++ compiler           |          | zum Erstellen der Binärdatei und um Test auszuführen, JavaScript Erweiterung.
-| gettext                |          | Internationalisierung (Übersetzung der Mitteilungen; Hauptsprache ist englisch).
-| ca-certificates        |          | Zertifikate für SSL Verbindungen.
-| libaspell-dev
-  ∥ libenchant-dev       |          | Spell Erweiterung.
-| python3-dev ^(1)^      |          | Python Erweiterung.
-| libperl-dev            |          | Perl Erweiterung.
-| ruby2.5, ruby2.5-dev   | ≥ 1.9.1  | Ruby Erweiterung.
-| liblua5.3-dev          |          | Lua Erweiterung.
-| tcl-dev                | ≥ 8.5    | Tcl Erweiterung.
-| guile-2.0-dev          | ≥ 2.0    | Guile (scheme) Erweiterung.
-| libv8-dev              | ≤ 3.24.3 | JavaScript Erweiterung.
-| php-dev, libphp-embed  | ≥ 7.0    | PHP Erweiterung.
-| libxml2-dev            |          | PHP Erweiterung.
-| libargon2-0-dev        |          | PHP Erweiterung (wenn PHP ≥ 7.2).
-| libsodium-dev          |          | PHP Erweiterung (wenn PHP ≥ 7.2).
-| asciidoctor            | ≥ 1.5.4  | zum Erstellen der man page und der Dokumentation.
-| libcpputest-dev        | ≥ 3.4    | zum Erstellen und um Test auszuführen.
-|===
-
-[NOTE]
-^(1)^ standardmäßig wird Python 3.x verwendet. Wird die Option `+ENABLE_PYTHON2+` aktiviert
+ECDSA-NIST256P-CHALLENGE durchzuführen. +
+^(4)^ standardmäßig wird Python 3.x verwendet. Wird die Option `+ENABLE_PYTHON2+` aktiviert
 (siehe unten), sollte die Version 2.7 von Python genutzt werden.

 Falls eine Debian/Ubuntu basierte Distribution genutzt wird und man einen
@@ -407,10 +397,7 @@ Bei der Kompilierung mit CMake muss folgende Option gesetzt werden:
 $ cmake .. -DCMAKE_BUILD_TYPE=Debug
 ----

-[[build_debug_address_sanitizer]]
-==== Erstellen mit Debug-Optionen und Address Sanitizer
-
-Sie können zusätzlich den Adress-Sanitizer aktivieren, der bei Problemen sofort
+Sie können zusätzlich den Adressbereiniger aktivieren, der bei Problemen sofort
 zum Absturz von WeeChat führt:

 ----
@@ -419,15 +406,9 @@ $ cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_C

 [WARNING]
 Sie sollten die Adressbereinigung nur aktivieren, wenn Sie versuchen, einen
-Absturz zu provozieren. Diese Funktion wird im produktivem Einsatz nicht empfohlen.
+Absturz zu provozieren. Dies wird im produktivem Einsatz nicht empfohlen.

-Nach dem Kompilieren und Installieren müssen Sie WeeChat folgendermaßen ausführen:
-
----
-$ ASAN_OPTIONS="detect_odr_violation=0 log_path=asan.log" weechat
----
-
-Im Falle eines Absturzes befinden sich zusätzliche Informationen in der Datei, `asan.log`.
+Wird ein Binärpaket genutzt dann muss zusätzlich das Paket _weechat-dbg_ installiert werden.

 [[core_files]]
 ==== Core Dateien
@@ -568,8 +549,7 @@ Einige Umgebungsvariablen werden von WeeChat genutzt, sofern sie definiert wurde
 === Dateien und Verzeichnisse

 WeeChat schreibt standardmäßig seine Konfiguration und andere
-Daten in folgendes Verzeichnis: `~/.weechat` +
-Diese Dateien werden, mit Standardwerten, beim ersten Ausführen von WeeChat automatisch erstellt.
+Daten in folgendes Verzeichnis:  `~/.weechat`

 [[weechat_directories]]
 ==== WeeChat Verzeichnisse
@@ -627,7 +607,7 @@ Folgende Dateien befinden sich im WeeChat-Heimatverzeichnis:
 | perl.conf       | Konfiguration für _perl_-Erweiterung       | Nein.
 | php.conf        | Konfiguration für _php_-Erweiterung        | Nein.
 | python.conf     | Konfiguration für _python_-Erweiterung     | Nein.
-| relay.conf      | Konfiguration für _relay_-Erweiterung      | *Ja*: es kann das Relay-Passwort und das TOTP (Einmalkennwort) enthalten (sofern nicht in `sec.conf` gesichert), erlaubt OP Adressen/Websocket und geöffnete Ports.
+| relay.conf      | Konfiguration für _relay_-Erweiterung      | Nein.
 | ruby.conf       | Konfiguration für _ruby_-Erweiterung       | Nein.
 | script.conf     | Konfiguration für _script_-Erweiterung     | Nein.
 | spell.conf      | Konfiguration für _spell_-Erweiterung      | Nein.
@@ -693,7 +673,7 @@ Der Bildschirm setzt sich aus folgenden Bereichen zusammen:

 Die _buflist_-Bar besitzt als Standardeinträge:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Item    | Beispiel    | Beschreibung
 | buflist | `1.weechat` | Auflistung der Buffer.
@@ -701,7 +681,7 @@ Die _buflist_-Bar besitzt als Standardeinträge:

 Die _title_-Bar besitzt als Standardeinträge:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Item         | Beispiel           | Beschreibung
 | buffer_title | `Willkommen in #test` | Buffer-Titel.
@@ -709,7 +689,7 @@ Die _title_-Bar besitzt als Standardeinträge:

 Die _status_-Bar besitzt als Standardeinträge:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Item                  | Beispiel                | Beschreibung
 | time                  | `[12:55]`               | Uhrzeit.
@@ -729,7 +709,7 @@ Die _status_-Bar besitzt als Standardeinträge:

 In der _input_ Bar lautet die Standardeinstellung:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Item         | Beispiel                                      | Beschreibung
 | input_prompt | `[@Flashy(i)]`                                | Input prompt, für irc: Nick und Modi (Modus "+i" bedeutet auf freenode, unsichtbar).
@@ -741,35 +721,25 @@ In der _input_ Bar lautet die Standardeinstellung:

 In der _nicklist_ Bar lautet die Standardeinstellung:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Item            | Beispiel  | Beschreibung
 | buffer_nicklist | `@Flashy` | Liste der Nicks für den aktuellen Buffer.
 |===

-andere Items die zur Verfügung stehen (die aber nicht standardmäßig in einer Bar aktiviert sind):
+andere Items die man nutzen kann (die aber nicht standardmäßig in einer Bar aktiviert sind):

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
-| Item                         | Beispiel                 | Beschreibung
-| buffer_count                 | `10`                     | absolute Anzahl an geöffneten Buffern.
-| buffer_last_number           | `10`                     | Nummer des letzten Buffers (kann sich unterscheiden von `buffer_count` wenn Option <<option_weechat.look.buffer_auto_renumber,weechat.look.buffer_auto_renumber>> deaktiviert (`off`) ist).
-| buffer_nicklist_count_all    | `4`                      | Anzahl der sichtbaren Gruppen und Nicks in der Nickliste.
-| buffer_nicklist_count_groups | `0`                      | Anzahl der sichtbaren Gruppen in der Nickliste.
-| buffer_short_name            | `#test`                  | Kurzname des aktuellen Buffers.
-| buflist2                     | `1.weechat`              | List der Buffer, zweites Bar-Item (siehe Option <<option_buflist.look.use_items,buflist.look.use_items>>).
-| buflist3                     | `1.weechat`              | List der Buffer, drittes Bar-Item (siehe Option <<option_buflist.look.use_items,buflist.look.use_items>>).
-| fset                         | `+buflist.look.sort: …+` | Hilfstext zur aktuell ausgewählten Option im Fset-Buffer.
-| irc_channel                  | `#test`                  | aktueller IRC Channelname.
-| irc_host                     | `+user@host.com+`        | aktueller IRC Host.
-| irc_nick                     | `+Flashy+`               | aktueller IRC Nick.
-| irc_nick_host                | `+Flashy!user@host.com+` | aktueller IRC Nick und Host.
-| irc_nick_modes               | `i`                      | IRC Modi für den eigenen Nick.
-| irc_nick_prefix              | `@`                      | IRC Nick-Präfix für den Channel.
-| mouse_status                 | `M`                      | Status der Maus (keine Anzeige, falls Maus deaktiviert).
-| spell_dict                   | `de,en`                  | zeigt an welche Wörterbücher für die Rechtschreibung im aktuellen Buffer genutzt werden.
-| spell_suggest                | `Glück,Glocke,Block`     | Vorschläge für ein falsch geschriebenes Wort.
-| window_number                | `2`                      | Nummer des aktuellen Fensters.
+| Item              | Beispiel            | Beschreibung
+| spell_dict        | `de,en`             | zeigt an welche Wörterbücher für die Rechtschreibung im aktuellen Buffer genutzt werden.
+| spell_suggest     | `Glück,Glocke,Block`| Vorschläge für ein falsch geschriebenes Wort.
+| buffer_count      | `10`                | absolute Anzahl an geöffneten Buffern.
+| buffer_short_name | `#test`             | Kurzname des aktuellen Buffers.
+| irc_channel       | `#test`             | aktueller IRC Channelname.
+| irc_nick_modes    | `@`                 | IRC Modi für den eigenen Nick.
+| mouse_status      | `M`                 | Status der Maus (keine Anzeige, falls Maus deaktiviert).
+| window_number     | `2`                 | Nummer des aktuellen Fensters.
 |===

 [[command_line]]
@@ -1122,8 +1092,8 @@ Beispiele für eine vertikale und horizontale Fensteraufteilung:
                 ▲ Fenster #1 (Buffer #3)              ▲ Fenster #2 (Buffer #4)
 ....

-[[buffers]]
-=== Buffern
+[[buffers_lines]]
+=== Zeilen in Buffern

 [[lines_format]]
 ==== Format von Zeilen
@@ -1190,140 +1160,6 @@ Falls ein "notify_xxx" Tag vorhanden ist, kann die tatsächliche Benachrichtigun
 unterschiedlich sein. Wenn beispielsweise der max hotlist level für einen Nick verwendet
 wird, kann die Benachrichtigungsstufe niedriger sein als der Wert im Tag.

-[[local_variables]]
-==== lokale Variablen
-
-Lokale Variablen können für alle Buffer definiert werden.
-
-Eine lokale Variable besteht:
-
-* aus einem Namen (Zeichenkette)
-* und aus einem Wert (Zeichenkette, kann leer sein).
-
-Lokale Variablen können von WeeChat, Erweiterungen, Skripten oder manuell,
-in der Befehlszeile eines Buffers, festgelegt werden.
-
-So fügen Sie beispielsweise die lokale Variable "completion_default_template" hinzu:
-
----
-/buffer setvar completion_default_template %(my_completion)
----
-
-um sich alle lokalen Variablen des aktuellen Buffers anzeigen zu lassen:
-
----
-/buffer listvar
----
-
-So entfernen Sie die lokale Variable "completion_default_template":
-
----
-/buffer delvar completion_default_template
----
-
-Standardmäßig interpretieren WeeChat und seine Standard-Erweitertungen diese Variablen:
-
-[width="100%",cols="^2m,2,5",options="header"]
-|===
-| Name | Wert | Beschreibung
-
-| away |
-  beliebige Zeichenkette |
-  Abwesenheitsnotiz auf dem Server, wird durch IRC Erweiterung genutzt.
-
-| channel |
-  beliebige Zeichenkette |
-  Channel-Name, wird durch irc/xfer Erweiterung und dem Debug-Buffer von relay/trigger Erweiterung genutzt.
-
-| charset_modifier |
-  beliebige Zeichenkette |
-  Charset modifier für den Server-Buffer, wird durch IRC Erweiterung genutzt.
-
-| completion_default_template |
-  beliebige Zeichenkette |
-  Vorlage für die standardmäßige Vervollständigung innerhalb eines Buffers, überschreibt die Option
-  `weechat.completion.default_template`.
-
-| filter |
-  beliebige Zeichenkette |
-  Filter definiert für einige Buffer `/fset`, `/server raw` (irc) und `/script`.
-
-| host |
-  beliebige Zeichenkette |
-  eigener Host (sofern bekannt), wird durch IRC Erweiterung genutzt.
-
-| lag |
-  beliebige Zeichenkette |
-  Verzögerung auf dem Server, wird durch IRC Erweiterung genutzt.
-
-| name |
-  beliebige Zeichenkette |
-  Buffername (Vorsicht, dies ist nicht der vollständige Name des Buffers und reicht nicht aus, um einen Buffer zu identifizieren oder zu suchen).
-
-| nick |
-  beliebige Zeichenkette |
-  eigener Nick, wird durch IRC und xfer Erweiterung genutzt.
-
-| no_log |
-  `1` (oder jede andere nicht leere Zeichenkette) |
-  Wenn festgelegt, protokolliert die Logger-Erweiterung nichts für den Buffer.
-
-| plugin |
-  beliebige Zeichenkette |
-  Name der Erweiterung welche den Buffer erstellt hat (`core` für WeeChat-Buffer).
-
-| script_close_cb |
-  beliebige Zeichenkette |
-  Close callback, für diesen Buffer durch ein Skript definiert.
-
-| script_close_cb_data |
-  beliebige Zeichenkette |
-  Daten für ein Close callback, welches durch ein Skript für diesen Buffer definiert wurde.
-
-| script_input_cb |
-  beliebige Zeichenkette |
-  Input callback, für diesen Buffer durch ein Skript definiert.
-
-| script_input_cb_data |
-  beliebige Zeichenkette |
-  Daten für ein Input callback, welches durch ein Skript für diesen Buffer definiert wurde.
-
-| script_name |
-  beliebige Zeichenkette |
-  Name des Skriptes welches den Buffer erstellt hat.
-
-| server |
-  beliebige Zeichenkette |
-  Servername, wird durch IRC Erweiterung genutzt und durch den Debug-Buffer von relay/trigger Erweiterung.
-
-| spell_suggest |
-  beliebige Zeichenkette |
-  falsch geschriebenes Wort und Korrekturvorschläge (Format: "fehlerhaftes Wort:Korrekturvorschläge"), wird durch
-  spell-Erweiterung definiert.
-
-| trigger_filter |
-  beliebige Zeichenkette |
-  Trigger-Filter, wird durch Trigger-Erweiterung definiert.
-
-| type |
-  beliebige Zeichenkette, zum Beispiel:
-  `channel`,
-  `debug`,
-  `exec`,
-  `option`,
-  `private`,
-  `relay`,
-  `script`,
-  `server`,
-  `user`,
-  `xfer` |
-  Buffertyp, festgelegt von WeeChat und vielen Erweiterungen.
-
-|===
-
-[NOTE]
-Externe Erweitertungen und Skripte können andere lokale Variablen definieren und verwenden.
-
 [[bars]]
 === Bars

@@ -2257,24 +2093,11 @@ da ansonsten die Daten in Klartext gesichert werden.
 /secure passphrase Dies ist meine Passphrase
 ----

-===== Passphrase beim Programmstart
+Wenn eine Passphrase genutzt wird fragt WeeChat diese beim Programmstart
+ab (bei einem `/upgrade` ist dies nicht der Fall).

-Wenn eine Passphrase festgelegt ist, werden Sie von WeeChat aufgefordert, diese beim Start einzugeben
-(aber nicht bei `/upgrade`).
-
-Wenn Sie einen Passwortmanager verwenden, können Sie ein externes Programm ausführen, um die Passphrase zu lesen,
-anstatt sie beim Start von WeeChat manuell eingeben zu müssen. Zum Beispiel mit Passwortspeicher (Befehl `pass`):
-
----
-/set sec.crypt.passphrase_command "pass show weechat/passphrase"
----
-
-Das Programm fordert Sie möglicherweise auf, Ihren GPG-Schlüssel zu entsperren oder eine andere Passphrase
-einzugeben, um das Passwort lesen zu können. WeeChat wartet auf das Ende des Befehls, um die Passphrase in
-der Standardausgabe auszuwerten (die Passphrase muss in der ersten Zeile, ohne zusätzliches Zeichen, stehen). +
-
-Wenn die Ausgabe keine Passphrase enthält oder falsch ist, werden Sie von WeeChat aufgefordert,
-diese manuell einzugeben.
+Die Passphrase kann auch in einer Datei gesichert werden (siehe Option
+<<option_sec.crypt.passphrase_file,sec.crypt.passphrase_file>>).

 [[secured_data_encryption]]
 ===== Verschlüsselung
@@ -3318,7 +3141,7 @@ mit lokalen Buffervariablen zu füllen. Um sich die verfügbaren lokalen Variabl
 für den aktuellen Buffer anzeigen zu lassen:

 ----
-/buffer listvar
+/buffer localvar
 ----

 Masken werden in absteigender Reihenfolge abgeglichen, beginnend mit
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2008-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2008-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -674,7 +674,7 @@ class AutogenDoc():
            for info in sorted(infos[plugin]):
                _inf = infos[plugin][info]
                desc = translate(_inf['description'])
-                args_desc = translate(_inf['args_description']) or '-'
+                args_desc = translate(_inf['args_description'] or '-')
                self.write('| %s | %s | %s | %s\n',
                           escape(plugin), escape(info), escape(desc),
                           escape(args_desc))
@@ -694,7 +694,7 @@ class AutogenDoc():
            for info in sorted(infos_hashtable[plugin]):
                _inh = infos_hashtable[plugin][info]
                desc = translate(_inh['description'])
-                args_desc = translate(_inh['args_description']) or '-'
+                args_desc = translate(_inh['args_description'])
                output_desc = translate(_inh['output_description']) or '-'
                self.write('| %s | %s | %s | %s | %s\n',
                           escape(plugin), escape(info), escape(desc),
@@ -1,6 +1,6 @@
 <!--
  Custom styles for Asciidoctor
-  Copyright (C) 2016-2021 Sébastien Helleu <flashcode@flashtux.org>
+  Copyright (C) 2016-2020 Sébastien Helleu <flashcode@flashtux.org>
 -->
 <style>
 #header,#content,#footnotes,#footer {
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -32,21 +32,19 @@ if(ENABLE_MAN)
  add_custom_target(doc-man-weechat-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/man1)

-  if(ENABLE_HEADLESS)
-    # man page: weechat-headless
-    add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
-      COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.en.adoc
-      DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.en.adoc
-      ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.en.adoc
-      ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.en.adoc
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      COMMENT "Building weechat-headless.1 (en)"
-    )
-    add_custom_target(doc-man-weechat-headless-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/man1)
-  endif()
+  # man page: weechat-headless
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.en.adoc
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.en.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.en.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.en.adoc
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Building weechat-headless.1 (en)"
+  )
+  add_custom_target(doc-man-weechat-headless-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/man1)
 endif()

 if(ENABLE_DOC)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -120,10 +120,6 @@

 | weechat | bars_options | options for bars

-| weechat | buffer_local_variable_value | value of a buffer local variable
-
-| weechat | buffer_local_variables | buffer local variables
-
 | weechat | buffer_properties_get | properties that can be read on a buffer

 | weechat | buffer_properties_set | properties that can be set on a buffer
@@ -20,8 +20,6 @@

 | irc | irc_is_channel | 1 if string is a valid IRC channel name for server | server,channel (server is optional)

-| irc | irc_is_message_ignored | 1 if the nick is ignored (message is not displayed) | server,message (message is the raw IRC message)
-
 | irc | irc_is_nick | 1 if string is a valid IRC nick name | server,nickname (server is optional)

 | irc | irc_nick | get current nick on a server | server name
@@ -14,7 +14,5 @@

 | weechat | focus_info | get focus info | "x": x coordinate (string with integer >= 0), "y": y coordinate (string with integer >= 0) | see function "hook_focus" in Plugin API reference

-| weechat | secured_data | secured data | - | secured data: names and values (be careful: the values are sensitive data: do NOT print/log them anywhere)
-
 |===
 // end::infos_hashtable[]
@@ -219,7 +219,6 @@ Examples:

 ----
 /dehalfop  <nick> [<nick>...]
-           * -yes

 nick: nick or mask (wildcard "*" is allowed)
   *: remove channel half-operator status from everybody on channel except yourself
@@ -933,7 +932,6 @@ target: server name

 ----
 /voice  <nick> [<nick>...]
-        * -yes

 nick: nick or mask (wildcard "*" is allowed)
   *: give voice to everybody on channel
@@ -1022,7 +1020,7 @@ Note: in command, special variables are replaced:
      $n-m: arguments from 'n' to 'm'
        $*: all arguments
        $~: last argument
-      $var: where "var" is a local variable of buffer (see /buffer listvar)
+      $var: where "var" is a local variable of buffer (see /buffer localvar)
            examples: $nick, $channel, $server, $plugin, $name

 Examples:
@@ -1115,9 +1113,7 @@ Examples:
         renumber [<number1> [<number2> [<start>]]]
         close [<n1>[-<n2>]|<name>...]
         notify [<level>]
-         listvar [<number>|<name>]
-         setvar <name> [<value>]
-         delvar <name>
+         localvar [<number>|<name>]
         set <property> [<value>]
         get <property>
         <number>|-|+|<name>
@@ -1141,10 +1137,8 @@ renumber: renumber buffers (works only if option weechat.look.buffer_auto_renumb
            message: for messages from users + highlights
                all: all messages
              reset: reset to default value (all)
- listvar: display local variables in a buffer
-  setvar: set a local variable in the current buffer
-  delvar: delete a local variable from the current buffer
-     set: set a property in the current buffer
+localvar: display local variables for the buffer
+     set: set a property for current buffer
     get: display a property of current buffer
  number: jump to buffer by number, possible prefix:
          '+': relative jump, add number to current
@@ -1302,11 +1296,11 @@ infolists: display infos about infolists

 ----
 /eval  [-n|-s] [-d] <expression>
-       [-n] [-d [-d]] -c <expression1> <operator> <expression2>
+       [-n] [-d] -c <expression1> <operator> <expression2>

        -n: display result without sending it to buffer (debug mode)
        -s: split expression before evaluating it (many commands can be separated by semicolons)
-        -d: display debug output after evaluation (with two -d: more verbose debug)
+        -d: display debug output after evaluation
        -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:
@@ -1341,27 +1335,25 @@ To force a string comparison, you can add double quotes around each expression,
  "50" > "100"  ==> 1

 Some variables are replaced in expression, using the format ${variable}, variable can be, by order of priority:
-  1. the string itself without evaluation (format: "raw:xxx")
-  2. an evaluated sub-string (format: "eval:xxx")
-  3. an evaluated condition (format: "eval_cond:xxx")
-  4. a string with escaped chars (format: "esc:xxx" or "\xxx")
-  5. a string with chars to hide (format: "hide:char,string")
-  6. a string with max chars (format: "cut:max,suffix,string" or "cut:+max,suffix,string")
+  1. an evaluated sub-string (format: "eval:xxx")
+  2. a string with escaped chars (format: "esc:xxx" or "\xxx")
+  3. a string with chars to hide (format: "hide:char,string")
+  4. a string with max chars (format: "cut:max,suffix,string" or "cut:+max,suffix,string")
     or max chars displayed on screen (format: "cutscr:max,suffix,string" or "cutscr:+max,suffix,string")
-  7. a reversed string (format: "rev:xxx" or "revscr:xxx")
-  8. a repeated string (format: "repeat:count,string")
-  9. length of a string (format: "length:xxx" or "lengthscr:xxx")
-  10. a color (format: "color:xxx", see "Plugin API reference", function "color")
-  11. a modifier (format: "modifier:name,data,string")
-  12. an info (format: "info:name,arguments", arguments are optional)
-  13. a base 16/32/64 encoded/decoded string (format: "base_encode:base,xxx" or "base_decode:base,xxx")
-  14. current date/time (format: "date" or "date:format")
-  15. an environment variable (format: "env:XXX")
-  16. a ternary operator (format: "if:condition?value_if_true:value_if_false")
-  17. result of an expression with parentheses and operators + - * / // % ** (format: "calc:xxx")
-  18. an option (format: "file.section.option")
-  19. a local variable in buffer
-  20. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
+  5. a reversed string (format: "rev:xxx" or "revscr:xxx")
+  6. a repeated string (format: "repeat:count,string")
+  7. length of a string (format: "length:xxx" or "lengthscr:xxx")
+  8. a color (format: "color:xxx", see "Plugin API reference", function "color")
+  9. a modifier (format: "modifier:name,data,string")
+  10. an info (format: "info:name,arguments", arguments are optional)
+  11. a base 16/32/64 encoded/decoded string (format: "base_encode:base,xxx" or "base_decode:base,xxx")
+  12. current date/time (format: "date" or "date:format")
+  13. an environment variable (format: "env:XXX")
+  14. a ternary operator (format: "if:condition?value_if_true:value_if_false")
+  15. result of an expression with parentheses and operators + - * / // % ** (format: "calc:xxx")
+  16. an option (format: "file.section.option")
+  17. a local variable in buffer
+  18. 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:
@@ -1372,8 +1364,6 @@ Format for hdata can be one of following:
 For name of hdata and variables, please look at "Plugin API reference", function "weechat_hdata_get".

 Examples (simple strings):
-  /eval -n ${raw:${info:version}}                ==> ${info:version}
-  /eval -n ${eval_cond:${window.win_width}>100}  ==> 1
  /eval -n ${info:version}                       ==> 0.4.3
  /eval -n ${env:HOME}                           ==> /home/user
  /eval -n ${weechat.look.scroll_amount}         ==> 3
@@ -1416,7 +1406,6 @@ Examples (conditions):
         enable|disable|toggle [<name>|@]
         add|addreplace <name> <buffer>[,<buffer>...] <tags> <regex>
         rename <name> <new_name>
-         recreate <name>
         del <name>|-all

      list: list all filters
@@ -1427,7 +1416,6 @@ Examples (conditions):
       add: add a filter
 addreplace: add or replace an existing filter
    rename: rename a filter
-  recreate: set input with the command used to edit the filter
       del: delete a filter
      -all: delete all filters
    buffer: comma separated list of buffers where filter is active:
@@ -1873,7 +1861,7 @@ Keys on secure buffer:
  alt+v  toggle values

 When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
-It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade), or to set option sec.crypt.passphrase_command to read the passphrase from the output of an external command like a password manager (see /help sec.crypt.passphrase_command).
+It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade), or to set option sec.crypt.passphrase_file to read the passphrase from a file (see /help sec.crypt.passphrase_file).

 Secured data with format ${sec.data.xxx} can be used in:
  - command /eval
@@ -1884,8 +1872,6 @@ Secured data with format ${sec.data.xxx} can be used in:
 Examples:
  set a passphrase:
    /secure passphrase this is my passphrase
-  use program "pass" to read the passphrase on startup:
-    /set sec.crypt.passphrase_command "pass show weechat/passphrase"
  encrypt freenode SASL password:
    /secure set freenode mypassword
    /set irc.server.freenode.sasl_password "${sec.data.freenode}"
@@ -2833,16 +2819,6 @@ On script buffer, the possible status for each script are:
  | installed
  popular script

-In output of /script list, the possible status for each script are:
-  * ? i a H N
-  | | | | | |
-  | | | | | obsolete (new version available)
-  | | | | held
-  | | | autoloaded
-  | | installed
-  | unknown script (can not be downloaded/updated)
-  popular script
-
 Keys on script buffer:
  alt+i  install script
  alt+r  remove script
@@ -2972,7 +2948,7 @@ listdefault: list default triggers
             modifier: name(s) of modifier (required)
             line: buffer type ("formatted", "free" or "*"), list of buffer masks, tags
             print: buffer, tags, message, strip colors
-             command: command (required), description, arguments, description of arguments, completion (all arguments except command are evaluated, "${tg_trigger_name}" is replaced by the trigger name, see /help eval)
+             command: command (required), description, arguments, description of arguments, completion (all arguments except command are evaluated, see /help eval)
             command_run: command(s) (required)
             timer: interval (required), align on second, max calls
             config: name(s) of option (required)
@@ -16,8 +16,8 @@
 ** values: sha224, sha256, sha384, sha512
 ** default value: `+sha256+`

-* [[option_sec.crypt.passphrase_command]] *sec.crypt.passphrase_command*
-** description: pass:none[read the passphrase from the output of this system command (only the first line is used and it must not contain any extra character); this option is used only when reading file sec.conf and if the environment variable "WEECHAT_PASSPHRASE" is not set (the environment variable has higher priority); example with password-store: "pass show weechat/passphrase"]
+* [[option_sec.crypt.passphrase_file]] *sec.crypt.passphrase_file*
+** description: pass:none[path to a file containing the passphrase to encrypt/decrypt secured data; this option is used only when reading file sec.conf; only first line of file is used; this file is used only if the environment variable "WEECHAT_PASSPHRASE" is not set (the environment variable has higher priority); security note: it is recommended to keep this file readable only by you and store it outside WeeChat home (for example in your home); example: "~/.weechat-passphrase"]
 ** type: string
 ** values: any string
 ** default value: `+""+`
@@ -846,12 +846,6 @@
 ** values: on, off
 ** default value: `+on+`

-* [[option_weechat.look.hotlist_update_on_buffer_switch]] *weechat.look.hotlist_update_on_buffer_switch*
-** description: pass:none[update the hotlist when switching buffers]
-** type: boolean
-** values: on, off
-** default value: `+on+`
-
 * [[option_weechat.look.input_cursor_scroll]] *weechat.look.input_cursor_scroll*
 ** description: pass:none[number of chars displayed after end of input line when scrolling to display end of line]
 ** type: integer
@@ -1146,12 +1140,6 @@
 ** values: any string
 ** default value: `+"- "+`

-* [[option_weechat.look.read_marker_update_on_buffer_switch]] *weechat.look.read_marker_update_on_buffer_switch*
-** description: pass:none[update the read marker when switching buffers]
-** type: boolean
-** values: on, off
-** default value: `+on+`
-
 * [[option_weechat.look.save_config_on_exit]] *weechat.look.save_config_on_exit*
 ** description: pass:none[save configuration file on exit]
 ** type: boolean
@@ -1781,12 +1769,6 @@
 ** type: string
 ** values: any string
 ** default value: `+"number,-active"+`
-
-* [[option_buflist.look.use_items]] *buflist.look.use_items*
-** description: pass:none[number of buflist bar items that can be used; the item names are: "buflist", "buflist2", "buflist3"; be careful, using more than one bar item slows down the display of buffers list]
-** type: integer
-** values: 1 .. 3
-** default value: `+1+`
 // end::buflist_options[]

 // tag::fifo_options[]
@@ -2634,12 +2616,6 @@
 ** values: 1 .. 3600
 ** default value: `+60+`

-* [[option_irc.server_default.default_chantypes]] *irc.server_default.default_chantypes*
-** description: pass:none[channel type prefixes to use if the server does not send them in message 005 (default is "#&")]
-** type: string
-** values: any string
-** default value: `+"#&"+`
-
 * [[option_irc.server_default.ipv6]] *irc.server_default.ipv6*
 ** description: pass:none[use IPv6 protocol for server communication (try IPv6 then fallback to IPv4); if disabled, only IPv4 is used]
 ** type: boolean
@@ -97,7 +97,7 @@ $HOME/.weechat/weechat.log::
 WeeChat is written by Sébastien Helleu and contributors (complete list is in
 the AUTHORS.adoc file).

-Copyright (C) 2003-2021 {author}
+Copyright (C) 2003-2020 {author}

 WeeChat is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -495,7 +495,7 @@ Example in C:
 /*
 * weechat.c - core functions for WeeChat
 *
- * Copyright (C) 2021 Your Name <your@email.com>
+ * Copyright (C) 2020 Your Name <your@email.com>
 *
 * This file is part of WeeChat, the extensible chat client.
 *
@@ -1090,12 +1090,18 @@ Any patch for bug or new feature must be done on master branch, preferred way
 is a GitHub pull request. A patch can also be sent by e-mail
 (made with `git diff` or `git format-patch`).

-Format of commit message is the following (with automatic close of a GitHub issue):
+Format of commit message is the following (to close a GitHub issue):

 ----
 component: fix a problem (closes #123)
 ----

+For a Savannah bug:
+
+----
+component: fix a problem (bug #12345)
+----
+
 Where _component_ is one of following:

 * WeeChat core: _core_ (files in root directory, _po/_ and _src/_,
@@ -1108,17 +1114,20 @@ Some rules to follow:

 * Use only English.
 * Use infinitive form of verb.
-* If commit is related to a GitHub issue, write it in parenthesis after
-  the message, with this format: `(issue #123)` or `(closes #123)` to close it.
+* If commit is related to something in tracker, write it in parenthesis after
+  the message, with this format:
+** GitHub: closes #123
+** Savannah: bug #12345, task #12345, patch #12345

 Examples of commit messages:

 ----
-core: add callback "nickcmp" for nick comparison in buffers
-core: update Japanese translations
 irc: add command /unquiet (closes #36)
-python: fix crash when unloading a script without pointer to interpreter
+core: add callback "nickcmp" for nick comparison in buffers
+irc: fix freeze when reading on socket with SSL enabled (bug #35097)
 ruby: add detection of ruby version 1.9.3 in CMake
+python: fix crash when unloading a script without pointer to interpreter
+core: update Japanese translations (patch #7783)
 ----

 [[translations]]
@@ -227,34 +227,6 @@ For example to use kbd:[F1], kbd:[F2], kbd:[Alt+F1] and kbd:[Alt+F2]:
 Keys "meta-OP" and "meta-OQ" may be different in your terminal. To find key
 code press kbd:[Alt+k] then key.

-[[customize_buflist]]
-=== How can I customize the list of buffers list, like the color of the active buffer?
-
-You can browse all buflist options with the command:
-
----
-/fset buflist
----
-
-The background of the active buffer is blue by default, you can change it
-like this, for example to `red`:
-
----
-/set buflist.format.buffer_current "${color:,red}${format_buffer}"
----
-
-[NOTE]
-There's a comma before the color name "red" because it is used as the background,
-not the text color. +
-You can also use any numeric color instead of `red`,
-like `237` for dark gray.
-
-The buflist plugin provides lot of options that you can customize, please read
-the help on each option.
-
-There's also a wiki page with examples of advanced buflist configuration:
-https://github.com/weechat/weechat/wiki/buflist
-
 [[customize_prefix]]
 === How can I reduce length of nicks or remove nick alignment in chat area?

@@ -1194,8 +1166,9 @@ For example:
 You can share files _~/.weechat/*.conf_ except the file _sec.conf_ which
 contains your passwords ciphered with your passphrase.

-Some other files may contain sensitive info like passwords (if they are not
-stored in _sec.conf_ with the `/secure` command).
+Some other files like _irc.conf_ may contain sensitive info like passwords
+for servers/channels (if they are not stored in _sec.conf_ with the `/secure`
+command).

 See the link:weechat_user.en.html#files_and_directories[User's guide / Files and directories]
 for more information about configuration files.
@@ -1334,25 +1334,14 @@ Return value:
 * same return code as function `regcomp` (0 if OK, other value for error,
  see `man regcomp`)

-[NOTE]
-Regular expression _preg_ must be cleaned by calling "regfree" after use,
-if the function returned 0 (OK).
-
 C example:

 [source,C]
 ----
 regex_t my_regex;
-if (weechat_string_regcomp (&my_regex, "(?i)test", REG_EXTENDED) == 0)
-{
-    /* OK */
-    /* ... */
-    regfree (&my_regex);
-}
-else
+if (weechat_string_regcomp (&my_regex, "(?i)test", REG_EXTENDED) != 0)
 {
    /* error */
-    /* ... */
 }
 ----

@@ -2209,7 +2198,7 @@ str3 = weechat.string_input_for_buffer("//test")  # "/test"
 ==== string_eval_expression

 _WeeChat ≥ 0.4.0, updated in 0.4.2, 0.4.3, 1.0, 1.1, 1.2, 1.3, 1.6, 1.8, 2.0,
-2.2, 2.3, 2.7, 2.9 and 3.1._
+2.2, 2.3, 2.7 and 2.9._

 Evaluate an expression and return result as a string.
 Special variables with format `+${variable}+` are expanded (see table below).
@@ -2257,10 +2246,6 @@ Arguments:
 ** _regex_replace_: the replacement text to use with _regex_, to replace
   text in _expr_ (the _regex_replace_ is evaluated on each match of _regex_
   against _expr_, until no match is found)
-** _debug_: debug level (string with integer number ≥ 1), if enabled, a key
-   "debug_output" is added in hashtable _options_:
-*** _1_: enable debug
-*** _2_: enable more verbose debug

 Return value:

@@ -2524,12 +2509,6 @@ expanded to last):
 |===
 | Format | Description | Examples | Results

-| `+${raw:xxx}+` +
-  _(WeeChat ≥ 3.1)_ |
-  Raw string (not evaluated). |
-  `+${raw:${info:version}}+` |
-  `+${info:version}+`
-
 | `+${name}+` |
  Variable `name` from hashtable _extra_vars_. |
  `+${name}+` |
@@ -2542,12 +2521,6 @@ expanded to last):
  `+19:02:45+` (with colors if there are color codes in the option
  weechat.look.buffer_time_format)

-| `+${eval_cond:xxx}+` +
-  _(WeeChat ≥ 3.1)_ |
-  String to evaluate as condition. |
-  `+${eval_cond:${window.win_width} > 100}+` |
-  `+1+`
-
 | `+${esc:xxx}+` +
  `+${\xxx}+` +
  _(WeeChat ≥ 1.0)_ |
@@ -12252,14 +12225,14 @@ button has been released). +

 Extra info for bar item "buffer_nicklist":

-[width="100%",cols="^1,^1,5",options="header"]
+[width="100%",cols="1,1,5",options="header"]
 |===
-| Plugin ^(1)^ | Key      | Description
-| irc          | irc_nick | Pointer to IRC nick _(WeeChat ≥ 3.0)_.
-| irc          | irc_host | Host for nick (if known).
-| weechat      | nick     | Nick name.
-| weechat      | prefix   | Prefix for nick.
-| weechat      | group    | Group name.
+| Key      | Plugin ^(1)^ | Description
+| nick     | core         | Nick name.
+| prefix   | core         | Prefix for nick.
+| group    | core         | Group name.
+| irc_nick | irc          | Pointer to IRC nick _(WeeChat ≥ 3.0)_.
+| irc_host | irc          | Host for nick (if known).
 |===

 [NOTE]
@@ -965,7 +965,7 @@ weechat.buffer_set(buffer, "localvar_del_myvar", "")
 To see local variables of a buffer, do this command in WeeChat:

 ----
-/buffer listvar
+/buffer localvar
 ----

 [[hooks]]
@@ -89,21 +89,39 @@ On macOS, you can use https://brew.sh/[Homebrew]:
 [[dependencies]]
 ==== Dependencies

-The following table shows the list of packages that are *required* to compile
-WeeChat:
+Following table shows list of packages that are required or optional to
+compile WeeChat.

-[width="100%",cols="5,^3,.^15",options="header"]
+[width="100%",cols="6,^3,^3,.^13",options="header"]
 |===
-| Package ^(1)^          | Version       | Feature
+| Package ^(1)^          | Version       | Required | Feature
 | C compiler
-  (gcc, clang, ...)      |               | Build.
-| cmake                  | ≥ 3.0         | Build (autotools still possible, but CMake is recommended).
-| pkg-config             |               | Detect installed libraries.
-| libncursesw5-dev ^(2)^ |               | Ncurses interface.
-| libcurl4-gnutls-dev    |               | URL transfer.
-| zlib1g-dev             |               | Compression of packets in relay plugin (weechat protocol), script plugin.
-| libgcrypt20-dev        |               | Secured data, IRC SASL authentication (DH-BLOWFISH/DH-AES).
-| libgnutls28-dev        | ≥ 2.2.0 ^(3)^ | SSL connection to IRC server, support of SSL in relay plugin, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE).
+  (gcc, clang, ...)      |               | *yes*    | Build.
+| C++ compiler           |               |          | Build and run tests, JavaScript plugin.
+| cmake                  | ≥ 3.0         | *yes*    | Build (autotools still possible, but CMake is recommended).
+| pkg-config             |               | *yes*    | Detect installed libraries.
+| libncursesw5-dev ^(2)^ |               | *yes*    | Ncurses interface.
+| libcurl4-gnutls-dev    |               | *yes*    | URL transfer.
+| zlib1g-dev             |               | *yes*    | Compression of packets in relay plugin (weechat protocol), script plugin.
+| libgcrypt20-dev        |               | *yes*    | Secured data, IRC SASL authentication (DH-BLOWFISH/DH-AES).
+| libgnutls28-dev        | ≥ 2.2.0 ^(3)^ | *yes*    | SSL connection to IRC server, support of SSL in relay plugin, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE).
+| gettext                |               |          | Internationalization (translation of messages; base language is English).
+| ca-certificates        |               |          | Certificates for SSL connections.
+| libaspell-dev
+  ∥ libenchant-dev       |               |          | Spell plugin.
+| python3-dev            | ^(4)^         |          | Python plugin.
+| libperl-dev            |               |          | Perl plugin.
+| ruby2.5, ruby2.5-dev   | ≥ 1.9.1       |          | Ruby plugin.
+| liblua5.3-dev          |               |          | Lua plugin.
+| tcl-dev                | ≥ 8.5         |          | Tcl plugin.
+| guile-2.0-dev          | ≥ 2.0         |          | Guile (scheme) plugin.
+| libv8-dev              | ≤ 3.24.3      |          | JavaScript plugin.
+| php-dev, libphp-embed  | ≥ 7.0         |          | PHP plugin.
+| libxml2-dev            |               |          | PHP plugin.
+| libargon2-0-dev        |               |          | PHP plugin (if PHP ≥ 7.2).
+| libsodium-dev          |               |          | PHP plugin (if PHP ≥ 7.2).
+| asciidoctor            | ≥ 1.5.4       |          | Build man page and documentation.
+| libcpputest-dev        | ≥ 3.4         |          | Build and run tests.
 |===

 [NOTE]
@@ -113,36 +131,8 @@ names may be different in different distributions and versions. +
 important). WeeChat can compile with libncurses5-dev, but it is *NOT* recommended:
 you may experience display bugs with wide chars. +
 ^(3)^ GnuTLS ≥ 3.0.21 is required for IRC SASL authentication with mechanism
-ECDSA-NIST256P-CHALLENGE.
-
-The following table shows the list of packages that are optional to compile
-WeeChat:
-
-[width="100%",cols="5,^3,.^15",options="header"]
-|===
-| Package                | Version  | Feature
-| C++ compiler           |          | Build and run tests, JavaScript plugin.
-| gettext                |          | Internationalization (translation of messages; base language is English).
-| ca-certificates        |          | Certificates for SSL connections.
-| libaspell-dev
-  ∥ libenchant-dev       |          | Spell plugin.
-| python3-dev ^(1)^      |          | Python plugin.
-| libperl-dev            |          | Perl plugin.
-| ruby2.5, ruby2.5-dev   | ≥ 1.9.1  | Ruby plugin.
-| liblua5.3-dev          |          | Lua plugin.
-| tcl-dev                | ≥ 8.5    | Tcl plugin.
-| guile-2.0-dev          | ≥ 2.0    | Guile (scheme) plugin.
-| libv8-dev              | ≤ 3.24.3 | JavaScript plugin.
-| php-dev, libphp-embed  | ≥ 7.0    | PHP plugin.
-| libxml2-dev            |          | PHP plugin.
-| libargon2-0-dev        |          | PHP plugin (if PHP ≥ 7.2).
-| libsodium-dev          |          | PHP plugin (if PHP ≥ 7.2).
-| asciidoctor            | ≥ 1.5.4  | Build man page and documentation.
-| libcpputest-dev        | ≥ 3.4    | Build and run tests.
-|===
-
-[NOTE]
-^(1)^ By default Python 3.x is used. If you enable option `+ENABLE_PYTHON2+`
+ECDSA-NIST256P-CHALLENGE. +
+^(4)^ By default Python 3.x is used. If you enable option `+ENABLE_PYTHON2+`
 (see below), only the version 2.7 of Python is recommended.

 If you are using a Debian/Ubuntu based distribution, and if you have some
@@ -400,9 +390,6 @@ If you're compiling with CMake:
 $ cmake .. -DCMAKE_BUILD_TYPE=Debug
 ----

-[[build_debug_address_sanitizer]]
-==== Build with debug options and address sanitizer
-
 You can additionally enable the address sanitizer, which causes WeeChat to
 crash immediately in case of problem:

@@ -414,13 +401,7 @@ $ cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_C
 You should enable address sanitizer only if you're trying to cause a crash,
 this is not recommended in production.

-Then once compiled and installed, you must run WeeChat like this:
-
----
-$ ASAN_OPTIONS="detect_odr_violation=0 log_path=asan.log" weechat
----
-
-In case of crash, the backtrace is in file `asan.log`.
+If you installed a binary package, then install package _weechat-dbg_.

 [[core_files]]
 ==== Core files
@@ -559,8 +540,7 @@ Some environment variables are used by WeeChat if they are defined:
 === Files and directories

 WeeChat writes configuration files and other data in directory `~/.weechat`
-by default. +
-These files are created with default values the first time you run WeeChat.
+by default.

 [[weechat_directories]]
 ==== WeeChat directories
@@ -618,7 +598,7 @@ The files in the WeeChat home directory are:
 | perl.conf       | Configuration file for _perl_ plugin       | No.
 | php.conf        | Configuration file for _php_ plugin        | No.
 | python.conf     | Configuration file for _python_ plugin     | No.
-| relay.conf      | Configuration file for _relay_ plugin      | *Yes*: it can contain relay password and TOTP secret (if not stored in `sec.conf`), allowed IP addresses/websocket origins and opened ports.
+| relay.conf      | Configuration file for _relay_ plugin      | No.
 | ruby.conf       | Configuration file for _ruby_ plugin       | No.
 | script.conf     | Configuration file for _script_ plugin     | No.
 | tcl.conf        | Configuration file for _tcl_ plugin        | No.
@@ -687,7 +667,7 @@ The screen is divided up into the following areas:

 Bar _buflist_ has following default items:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Item    | Example     | Description
 | buflist | `1.weechat` | List of buffers.
@@ -695,7 +675,7 @@ Bar _buflist_ has following default items:

 Bar _title_ has following default items:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Item         | Example            | Description
 | buffer_title | `Welcome to #test` | Buffer title.
@@ -703,7 +683,7 @@ Bar _title_ has following default items:

 Bar _status_ has following default items:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Item                  | Example                 | Description
 | time                  | `[12:55]`               | Time.
@@ -723,7 +703,7 @@ Bar _status_ has following default items:

 Bar _input_ has following default items:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Item         | Example                                      | Description
 | input_prompt | `[@Flashy(i)]`                               | Input prompt, for irc: nick and modes (mode "+i" means invisible on freenode).
@@ -735,7 +715,7 @@ Bar _input_ has following default items:

 Bar _nicklist_ has following default items:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Item            | Example   | Description
 | buffer_nicklist | `@Flashy` | List of nicks on current buffer.
@@ -743,27 +723,17 @@ Bar _nicklist_ has following default items:

 Other items available (not used in bars by default):

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
-| Item                         | Example                  | Description
-| buffer_count                 | `10`                     | Total number of buffers opened.
-| buffer_last_number           | `10`                     | Number of the latest buffer (can be different from `buffer_count` if option <<option_weechat.look.buffer_auto_renumber,weechat.look.buffer_auto_renumber>> is `off`).
-| buffer_nicklist_count_all    | `4`                      | Number of visible groups and nicks in nicklist.
-| buffer_nicklist_count_groups | `0`                      | Number of visible groups in nicklist.
-| buffer_short_name            | `#test`                  | Current buffer short name.
-| buflist2                     | `1.weechat`              | List of buffers, second bar item (see option <<option_buflist.look.use_items,buflist.look.use_items>>).
-| buflist3                     | `1.weechat`              | List of buffers, third bar item (see option <<option_buflist.look.use_items,buflist.look.use_items>>).
-| fset                         | `+buflist.look.sort: …+` | Help on currently selected option on fset buffer.
-| irc_channel                  | `#test`                  | Current IRC channel name.
-| irc_host                     | `+user@host.com+`        | Current IRC host.
-| irc_nick                     | `+Flashy+`               | Current IRC nick.
-| irc_nick_host                | `+Flashy!user@host.com+` | Current IRC nick and host.
-| irc_nick_modes               | `i`                      | IRC modes for self nick.
-| irc_nick_prefix              | `@`                      | IRC nick prefix on channel.
-| mouse_status                 | `M`                      | Mouse status (empty if mouse is disabled).
-| spell_dict                   | `fr,en`                  | Spelling dictionaries used on current buffer.
-| spell_suggest                | `print,prone,prune`      | Spelling suggestions for word under cursor (if misspelled).
-| window_number                | `2`                      | Current window number.
+| Item              | Example             | Description
+| spell_dict        | `fr,en`             | Spelling dictionaries used on current buffer.
+| spell_suggest     | `print,prone,prune` | Spelling suggestions for word under cursor (if misspelled).
+| buffer_count      | `10`                | Total number of buffers opened.
+| buffer_short_name | `#test`             | Current buffer short name.
+| irc_channel       | `#test`             | Current IRC channel name.
+| irc_nick_modes    | `@`                 | IRC modes for self nick.
+| mouse_status      | `M`                 | Mouse status (empty if mouse is disabled).
+| window_number     | `2`                 | Current window number.
 |===

 [[command_line]]
@@ -1106,8 +1076,8 @@ Example of vertical + horizontal splits:
                 ▲ window #1 (buffer #3)               ▲ window #2 (buffer #4)
 ....

-[[buffers]]
-=== Buffers
+[[buffers_lines]]
+=== Buffers lines

 [[lines_format]]
 ==== Format of lines
@@ -1174,141 +1144,6 @@ Tags commonly used (non-exhaustive list):
 if a max hotlist level is used for a nick, the notify level can be lower than
 the value in the tag.

-[[local_variables]]
-==== Local variables
-
-Local variables can be defined in all buffers.
-
-A local variable has:
-
-* a name (string)
-* a value (string, can be empty).
-
-Local variables can be set by WeeChat, plugins, scripts, or manually on the
-command line in the buffer.
-
-For example to add the local variable "completion_default_template":
-
----
-/buffer setvar completion_default_template %(my_completion)
----
-
-To list local variables in the current buffer:
-
----
-/buffer listvar
----
-
-To remove the local variable "completion_default_template":
-
----
-/buffer delvar completion_default_template
----
-
-By default WeeChat and its default plugins interpret these variables:
-
-[width="100%",cols="^2m,2,5",options="header"]
-|===
-| Name | Value | Description
-
-| away |
-  any string |
-  Away message on the server, set by irc plugin.
-
-| channel |
-  any string |
-  Channel name, set by irc/xfer plugins and debug buffer of relay/trigger plugins.
-
-| charset_modifier |
-  any string |
-  Charset modifier for the server buffer, set by irc plugin.
-
-| completion_default_template |
-  any string |
-  Default completion template for the buffer, overriding the option
-  `weechat.completion.default_template`.
-
-| filter |
-  any string |
-  Filter defined on some buffers like `/fset`, `/server raw` (irc) and `/script`.
-
-| host |
-  any string |
-  Self host (if known), set by irc plugin.
-
-| lag |
-  any string |
-  Lag on the server, set by irc plugin.
-
-| name |
-  any string |
-  Buffer name (be careful, this is not the full name and this name is not
-  enough to identify or search a buffer).
-
-| nick |
-  any string |
-  Self nick, set by irc and xfer plugins.
-
-| no_log |
-  `1` (or any non-empty string) |
-  If set, the logger plugin does not log anything for the buffer.
-
-| plugin |
-  any string |
-  Name of plugin which created the buffer (`core` for WeeChat buffers).
-
-| script_close_cb |
-  any string |
-  Close callback defined by a script for a buffer.
-
-| script_close_cb_data |
-  any string |
-  Data for close callback defined by a script for a buffer.
-
-| script_input_cb |
-  any string |
-  Input callback defined by a script for a buffer.
-
-| script_input_cb_data |
-  any string |
-  Data for input callback defined by a script for a buffer.
-
-| script_name |
-  any string |
-  Name of the script which created the buffer.
-
-| server |
-  any string |
-  Server name, set by irc plugin and debug buffer of relay/trigger plugins.
-
-| spell_suggest |
-  any string |
-  Misspelled word and suggestions (format: "misspelled:suggestions"), set by
-  spell plugin.
-
-| trigger_filter |
-  any string |
-  Trigger filter, set by trigger plugin.
-
-| type |
-  any string, for example:
-  `channel`,
-  `debug`,
-  `exec`,
-  `option`,
-  `private`,
-  `relay`,
-  `script`,
-  `server`,
-  `user`,
-  `xfer` |
-  Type of buffer, set by WeeChat and many plugins.
-
-|===
-
-[NOTE]
-External plugins and scripts can define and use other local variables.
-
 [[bars]]
 === Bars

@@ -2219,25 +2054,11 @@ but highly recommended, otherwise data is stored as plain text in file.
 /secure passphrase this is my passphrase
 ----

-===== Passphrase on startup
+When a passphrase is set, WeeChat will ask you to enter it on startup (but not
+on `/upgrade`).

-When a passphrase is set, WeeChat will ask you to enter it on startup
-(but not on `/upgrade`).
-
-If you are using a password manager, you can run an external program to read
-the passphrase instead of having to type it manually on WeeChat startup. +
-For example with password-store (command `pass`):
-
----
-/set sec.crypt.passphrase_command "pass show weechat/passphrase"
----
-
-The program may ask you unlock your GPG key or enter another passphrase to
-read the secret. WeeChat will wait for the end of the command to read the
-passphrase on the standard output (it must be on the first line without any
-extra character). +
-If the output contains no passphrase or if it is wrong, WeeChat will then ask
-you to enter it.
+You can change this behavior and use a file with the passphrase (see option
+<<option_sec.crypt.passphrase_file,sec.crypt.passphrase_file>>).

 [[secured_data_encryption]]
 ===== Encryption
@@ -3257,7 +3078,7 @@ It is possible to define a filename mask for each buffer, and use local buffer
 variables to build filename. To see available local variables for current buffer:

 ----
-/buffer listvar
+/buffer localvar
 ----

 Masks will be matched on options in descending order of specificity on
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2012-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2012-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -32,21 +32,19 @@ if(ENABLE_MAN)
  add_custom_target(doc-man-weechat-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/fr/man1)

-  if(ENABLE_HEADLESS)
-    # man page: weechat-headless
-    add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
-      COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.fr.adoc
-      DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.fr.adoc
-      ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.fr.adoc
-      ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.fr.adoc
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      COMMENT "Building weechat-headless.1 (fr)"
-    )
-    add_custom_target(doc-man-weechat-headless-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/fr/man1)
-  endif()
+  # man page: weechat-headless
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.fr.adoc
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.fr.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.fr.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.fr.adoc
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Building weechat-headless.1 (fr)"
+  )
+  add_custom_target(doc-man-weechat-headless-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/fr/man1)
 endif()

 if(ENABLE_DOC)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -120,10 +120,6 @@

 | weechat | bars_options | options pour les barres

-| weechat | buffer_local_variable_value | valeur d'une variable locale du tampon
-
-| weechat | buffer_local_variables | variables locales du tampon
-
 | weechat | buffer_properties_get | propriétés qui peuvent être lues sur un tampon

 | weechat | buffer_properties_set | propriétés qui peuvent être changées sur un tampon
@@ -20,8 +20,6 @@

 | irc | irc_is_channel | 1 si la chaîne est un nom de canal IRC valide pour le serveur | serveur,canal (le serveur est optionnel)

-| irc | irc_is_message_ignored | 1 si le pseudo est ignoré (le message n'est pas affiché) | serveur,message (message est le message brut IRC)
-
 | irc | irc_is_nick | 1 si la chaîne est un pseudo IRC valide | serveur,pseudo (le serveur est optionnel)

 | irc | irc_nick | retourne le pseudo utilisé actuellement sur un serveur | nom de serveur
@@ -14,7 +14,5 @@

 | weechat | focus_info | obtenir l'information de focus | "x" : coordonnée x (chaîne avec un entier >= 0), "y" : coordonnée y (chaîne avec un entier >= 0) | voir la fonction hook_focus dans la Référence API extension

-| weechat | secured_data | données sécurisées | - | données sécurisées : noms et valeurs (attention : les valeurs sont des données sensibles : il ne faut PAS les afficher/logger)
-
 |===
 // end::infos_hashtable[]
@@ -219,7 +219,6 @@ Exemples :

 ----
 /dehalfop  <pseudo> [<pseudo>...]
-           * -yes

 pseudo : pseudo ou masque (le caractère joker "*" est autorisé)
     * : retirer le statut de demi-opérateur de tout le monde sur le canal excepté vous-même
@@ -933,7 +932,6 @@ pseudo : pseudo

 ----
 /voice  <pseudo> [<pseudo>...]
-        * -yes

 pseudo : pseudo ou masque (le caractère joker "*" est autorisé)
     * : donner la voix à tout le monde sur le canal
@@ -1022,7 +1020,7 @@ Note : dans la commande, les variables spéciales sont remplacées :
      $n-m : paramètres de 'n' à 'm'
        $* : tous les paramètres
        $~ : le dernier paramètre
-      $var : où "var" est une variable locale du tampon (voir /buffer listvar)
+      $var : où "var" est une variable locale du tampon (voir /buffer localvar)
             exemples : $nick, $channel, $server, $plugin, $name

 Exemples :
@@ -1115,9 +1113,7 @@ Exemples :
         renumber <nombre1> [<nombre2> [<départ>]]
         close [<n1>[-<n2>]|<nom>...]
         notify [<niveau>]
-         listvar [<nombre>|<nom>]
-         setvar <nom> [<valeur>]
-         delvar <nom>
+         localvar [<nombre>|<nom>]
         set <propriété> [<valeur>]
         get <propriété>
         <nombre>|<nom>
@@ -1141,9 +1137,7 @@ renumber : renuméroter des tampons (fonctionne seulement si l'option weechat.l
             message : pour les messages d'utilisateurs + highlights
                 all : pour tous les messages
               reset : réinitialise à valeur par défaut (all)
- listvar : afficher la liste des variables locales d'un tampon
-  setvar : modifier une variable locale du tampon courant
-  delvar : supprimer une variable locale du tampon courant
+localvar : afficher la liste des variables locales pour le tampon
     set : modifier une propriété du tampon courant
     get : afficher une propriété du tampon courant
  nombre : sauter au tampon qui a ce numéro, préfixe possible :
@@ -1301,12 +1295,12 @@ infolists : afficher des infos sur les infolists
 * `+eval+`: évaluer une expression

 ----
-/eval  [-n|-s] [-d [-d]] <expression>
+/eval  [-n|-s] [-d] <expression>
       [-n] [-d] -c <expression1> <opérateur> <expression2>

        -n : afficher le résultat sans envoyer au tampon (mode debug)
        -s : découper l'expression avant de l'évaluer (plusieurs commandes peuvent être séparées par des points-virgules)
-        -d : afficher la sortie de debug après l'évaluation (avec deux -d : mode debug plus verbeux)
+        -d : afficher la sortie de debug après l'évaluation
        -c : évaluer comme une condition : utiliser les opérateurs et les parenthèses, retourner une valeur booléenne ("0" ou "1")
 expression : expression à évaluer, les variables avec le format ${variable} sont remplacées (voir ci-dessous) ; plusieurs commandes peuvent être séparées par des points-virgules
 opérateur : un opérateur logique ou de comparaison :
@@ -1341,27 +1335,25 @@ Pour forcer une comparaison de chaînes, vous pouvez ajouter des guillemets auto
  "50" > "100"  ==> 1

 Des variables sont remplacées dans l'expression, en utilisant le format ${variable}, la variable pouvant être, par ordre de priorité :
-  1. la chaîne elle-même sans évaluation (format : "raw:xxx")
-  2. une sous-chaîne évaluée (format : "eval:xxx")
-  3. une condition évaluée (format : "eval_cond:xxx")
-  4. une chaîne avec les caractères échappés (format : "esc:xxx" ou "\xxx")
-  5. une chaîne avec des caractères à cacher (format : "hide:caractère,chaîne")
-  6. une chaîne avec un maximum de caractères (format : "cut:max,suffixe,chaîne" ou "cut:+max,suffixe,chaîne")
+  1. une sous-chaîne évaluée (format : "eval:xxx")
+  2. une chaîne avec les caractères échappés (format : "esc:xxx" ou "\xxx")
+  3. une chaîne avec des caractères à cacher (format : "hide:caractère,chaîne")
+  4. une chaîne avec un maximum de caractères (format : "cut:max,suffixe,chaîne" ou "cut:+max,suffixe,chaîne")
     ou un maximum de caractères affichés à l'écran (format : "cutscr:max,suffixe,chaîne" ou "cutscr:+max,suffixe,chaîne")
-  7. une chaîne inversée (format : "rev:xxx" ou "revscr:xxx")
-  8. une chaîne répétée (format : "repeat:nombre,chaîne")
-  9. longueur d'une chaîne (format : "length:xxx" ou "lengthscr:xxx")
-  10. une couleur (format : "color:xxx", voir la "Référence API extension", fonction "color")
-  11. un modificateur (format : "modifier:nom,données,chaîne")
-  12. une info (format : "info:nom,paramètres", les paramètres sont optionnels)
-  13. une chaîne encodée/decodée en base 16, 32 ou 64 (format : "base_encode:base,xxx" ou "base_decode:base,xxx")
-  14. la date/heure courante (format : "date" ou "date:format")
-  15. une variable d'environnement (format : "env:XXX")
-  16. un opérateur ternaire (format : "if:condition?valeur_si_vrai:valeur_si_faux")
-  17. le résultat d'une expression avec parenthèses et les opérateurs + - * / // % ** (format: "calc:xxx")
-  18. une option (format : "fichier.section.option")
-  19. une variable locale du tampon
-  20. 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 chaîne inversée (format : "rev:xxx" ou "revscr:xxx")
+  6. une chaîne répétée (format : "repeat:nombre,chaîne")
+  7. longueur d'une chaîne (format : "length:xxx" ou "lengthscr:xxx")
+  8. une couleur (format : "color:xxx", voir la "Référence API extension", fonction "color")
+  9. un modificateur (format : "modifier:nom,données,chaîne")
+  10. une info (format : "info:nom,paramètres", les paramètres sont optionnels)
+  11. une chaîne encodée/decodée en base 16, 32 ou 64 (format : "base_encode:base,xxx" ou "base_decode:base,xxx")
+  12. la date/heure courante (format : "date" ou "date:format")
+  13. une variable d'environnement (format : "env:XXX")
+  14. un opérateur ternaire (format : "if:condition?valeur_si_vrai:valeur_si_faux")
+  15. le résultat d'une expression avec parenthèses et les opérateurs + - * / // % ** (format: "calc:xxx")
+  16. une option (format : "fichier.section.option")
+  17. une variable locale du tampon
+  18. 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[liste].var1.var2... : démarrer avec un hdata en utilisant une liste, par exemple :
@@ -1372,8 +1364,6 @@ Le format du hdata peut être le suivant :
 Pour le nom du hdata et des variables, voir la "Référence API extension", fonction "weechat_hdata_get".

 Exemples (chaînes simples) :
-  /eval -n ${raw:${info:version}}                ==> ${info:version}
-  /eval -n ${eval_cond:${window.win_width}>100}  ==> 1
  /eval -n ${info:version}                       ==> 0.4.3
  /eval -n ${env:HOME}                           ==> /home/user
  /eval -n ${weechat.look.scroll_amount}         ==> 3
@@ -1416,7 +1406,6 @@ Exemples (conditions) :
         enable|disable|toggle [<nom>|@]
         add|addreplace <nom> <tampon>[,<tampon>...] <étiquettes> <regex>
         rename <nom> <nouveau_nom>
-         recreate <nom>
         del <nom>|-all

      list : lister tous les filtres
@@ -1427,7 +1416,6 @@ Exemples (conditions) :
       add : ajouter un filtre
 addreplace : ajouter ou remplacer un filtre existant
    rename : renommer un filtre
-  recreate : définir la ligne de commande utilisée pour modifier le filtre
       del : supprimer un filtre
      -all : supprimer tous les filtres
    tampon : liste des tampons, séparés par des virgules, où le filtre est actif :
@@ -1873,7 +1861,7 @@ Les touches sur le tampon des données sécurisées :
  alt+v  afficher/cacher les valeurs

 Lorsqu'une phrase de chiffrement est utilisée (données chiffrées), elle est demandée au démarrage de WeeChat.
-Il est possible de définir la variable d'environnement WEECHAT_PASSPHRASE pour éviter la demande (cette même variable est utilisée par WeeChat sur le /upgrade) ou de définir l'option sec.crypt.passphrase_command pour lire la phrase de chiffrement depuis la sortie d'une commande externe comme un coffre-fort à mots de passe (voir /help sec.crypt.passphrase_command).
+Il est possible de définir la variable d'environnement WEECHAT_PASSPHRASE pour éviter la demande (cette même variable est utilisée par WeeChat sur le /upgrade) ou de définir l'option sec.crypt.passphrase_file pour lire la phrase de chiffrement depuis un fichier (voir /help sec.crypt.passphrase_file).

 Les données sécurisées avec le format ${sec.data.xxx} peuvent être utilisées dans :
  - la commande /eval
@@ -1884,8 +1872,6 @@ Les données sécurisées avec le format ${sec.data.xxx} peuvent être utilisée
 Exemples :
  définir une phrase de chiffrement :
    /secure passphrase ceci est ma phrase de chiffrement
-  utiliser le programme "pass" pour lire la phrase de chiffrement au démarrage :
-    /set sec.crypt.passphrase_command "pass show weechat/passphrase"
  chiffrer le mot de passe freenode SASL :
    /secure set freenode motdepasse
    /set irc.server.freenode.sasl_password "${sec.data.freenode}"
@@ -2833,16 +2819,6 @@ Sur le tampon des scripts, les statuts pour chaque script sont :
  | installé
  script populaire

-Dans la sortie de /script list, les statuts pour chaque script sont :
-  * ? i a H N
-  | | | | | |
-  | | | | | obsolète (nouvelle version disponible)
-  | | | | figé
-  | | | chargé auto
-  | | installé
-  | script inconnu (ne peut pas être téléchargé/mis à jour)
-  script populaire
-
 Les touches sur le tampon des scripts :
  alt+i  installer le script
  alt+r  supprimer le script
@@ -2972,7 +2948,7 @@ listdefault : lister les triggers par défaut
              modifier : nom(s) de modificateur (obligatoire)
              line : type de tampon ("formatted", "free" ou "*"), liste de masques de tampons, étiquettes
              print : tampon, étiquettes, message, suppression des couleurs (0/1)
-              command : commande (obligatoire), description, paramètres, description des paramètres, complétion (tous les paramètres sauf la commande sont évalués, "${tg_trigger_name}" est remplacé par le nom du trigger, voir /help eval)
+              command : commande (obligatoire), description, paramètres, description des paramètres, complétion (tous les paramètres sauf la commande sont évalués, voir /help eval)
              command_run : commande(s) (obligatoire)
              timer : intervalle (obligatoire), alignement sur la seconde, nombre max d'appels
              config : nom(s) de l'option (obligatoire)
@@ -16,8 +16,8 @@
 ** valeurs: sha224, sha256, sha384, sha512
 ** valeur par défaut: `+sha256+`

-* [[option_sec.crypt.passphrase_command]] *sec.crypt.passphrase_command*
-** description: pass:none[lire la phrase de chiffrement depuis la sortie de cette commande système (seule la première ligne est utilisée et elle ne doit contenir aucun autre caractère) ; cette option est utilisée seulement pour lire le fichier sec.conf et si la variable d'environnement "WEECHAT_PASSPHRASE" n'est pas définie (la variable d'environnement a une priorité plus haute) ; exemple avec password-store : "pass show weechat/passphrase"]
+* [[option_sec.crypt.passphrase_file]] *sec.crypt.passphrase_file*
+** description: pass:none[chemin vers un fichier contenant la phrase de chiffrement pour (dé)chiffrer les données sécurisées ; cette option est utilisée seulement lors de la lecture du fichier sec.conf ; seulement la première ligne du fichier est utilisée ; ce fichier est utilisé seulement si la variable d'environnement "WEECHAT_PASSPHRASE" n'est pas définie (la variable d'environnement a une priorité plus haute) ; note de sécurité : il est recommandé de garder ce fichier en lecture seulement par vous et de le stocker en dehors du "home" WeeChat (par exemple dans votre "home") ; exemple : "~/.weechat-passphrase"]
 ** type: chaîne
 ** valeurs: toute chaîne
 ** valeur par défaut: `+""+`
@@ -846,12 +846,6 @@
 ** valeurs: on, off
 ** valeur par défaut: `+on+`

-* [[option_weechat.look.hotlist_update_on_buffer_switch]] *weechat.look.hotlist_update_on_buffer_switch*
-** description: pass:none[mettre à jour la hotlist lors du changement de tampon]
-** type: booléen
-** valeurs: on, off
-** valeur par défaut: `+on+`
-
 * [[option_weechat.look.input_cursor_scroll]] *weechat.look.input_cursor_scroll*
 ** description: pass:none[nombre de caractères affichés après la fin de la ligne de saisie lors d'un défilement pour afficher la fin de la ligne]
 ** type: entier
@@ -1146,12 +1140,6 @@
 ** valeurs: toute chaîne
 ** valeur par défaut: `+"- "+`

-* [[option_weechat.look.read_marker_update_on_buffer_switch]] *weechat.look.read_marker_update_on_buffer_switch*
-** description: pass:none[mettre à jour le marqueur de données non lues lors du changement de tampon]
-** type: booléen
-** valeurs: on, off
-** valeur par défaut: `+on+`
-
 * [[option_weechat.look.save_config_on_exit]] *weechat.look.save_config_on_exit*
 ** description: pass:none[sauvegarder la configuration en quittant]
 ** type: booléen
@@ -1781,12 +1769,6 @@
 ** type: chaîne
 ** valeurs: toute chaîne
 ** valeur par défaut: `+"number,-active"+`
-
-* [[option_buflist.look.use_items]] *buflist.look.use_items*
-** description: pass:none[nombre d'objets de barre buflist qui peuvent être utilisés ; les objets de barre sont : "buflist", "buflist2", "buflist3" ; attention, utiliser plus d'un objet de barre ralentit l'affichage de la liste des tampons]
-** type: entier
-** valeurs: 1 .. 3
-** valeur par défaut: `+1+`
 // end::buflist_options[]

 // tag::fifo_options[]
@@ -2634,12 +2616,6 @@
 ** valeurs: 1 .. 3600
 ** valeur par défaut: `+60+`

-* [[option_irc.server_default.default_chantypes]] *irc.server_default.default_chantypes*
-** description: pass:none[préfixes de types de canaux à utiliser si le serveur ne les envoie pas dans le message 005 (par défaut "#&")]
-** type: chaîne
-** valeurs: toute chaîne
-** valeur par défaut: `+"#&"+`
-
 * [[option_irc.server_default.ipv6]] *irc.server_default.ipv6*
 ** description: pass:none[utiliser le protocole IPv6 pour la communication avec le serveur (essayer IPv6 puis repli sur l'IPv4) ; si désactivé, seulement l'IPv4 est utilisé]
 ** type: booléen
@@ -99,7 +99,7 @@ $HOME/.weechat/weechat.log::
 WeeChat est écrit par Sébastien Helleu et des contributeurs (la liste complète
 est dans le fichier AUTHORS.adoc).

-Copyright (C) 2003-2021 {author}
+Copyright (C) 2003-2020 {author}

 WeeChat est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier
 sous les termes de la GNU General Public License telle que publiée par la
@@ -25,7 +25,7 @@ WeeChat (Wee Enhanced Environment for Chat) est un client de discussion libre,
 rapide et léger, conçu pour différents systèmes d'exploitation.
 Il est hautement paramétrable et extensible avec des scripts.

-La commande *weechat-headless* lance WeeChat en mode « headless » (sans interface).
+La commande *weechat-headless* lance WeeChat en mode « headless » (sans interface).
 Elle peut être utilisée pour des tests ou lancer WeeChat en daemon
 avec l'option "--daemon".

@@ -68,7 +68,7 @@ Les répertoires principaux de WeeChat sont :
 |       hook/        | Fonctions sur les "hooks".
 |    gui/            | Fonctions pour les tampons, fenêtres, ... (utilisées par toutes les interfaces).
 |       curses/      | Interface Curses.
-|          headless/ | Mode sans interface (« headless »).
+|          headless/ | Mode sans interface (« headless »).
 |          normal/   | Interface Curses.
 |    plugins/        | API extension/script.
 |       alias/       | Extension Alias.
@@ -199,7 +199,7 @@ Le cœur de WeeChat est situé dans les répertoires suivants :
 |       gui-curses-mouse.c        | Souris.
 |       gui-curses-term.c         | Fonctions pour le terminal.
 |       gui-curses-window.c       | Fenêtres.
-|       headless/                 | Mode sans interface (« headless »).
+|       headless/                 | Mode sans interface (« headless »).
 |          main.c                 | Point d'entrée pour le mode sans interface.
 |          ncurses-fake.c         | Fausse bibliothèque ncurses.
 |       normal/                   | Interface Curses.
@@ -496,7 +496,7 @@ Exemple en C :
 /*
 * weechat.c - core functions for WeeChat
 *
- * Copyright (C) 2021 Your Name <your@email.com>
+ * Copyright (C) 2020 Your Name <your@email.com>
 *
 * This file is part of WeeChat, the extensible chat client.
 *
@@ -1108,13 +1108,18 @@ Tout patch pour un bug ou une nouvelle fonctionnalité doit être effectué sur
 branche master, le format préféré étant une "pull request" sur GitHub. Un patch
 peut aussi être envoyé par e-mail (fait avec `git diff` ou `git format-patch`).

-Le format du message de commit est le suivant (avec fermeture automatique
-du bug GitHub) :
+Le format du message de commit est le suivant (pour fermer un bug GitHub) :

 ----
 component: fix a problem (closes #123)
 ----

+Pour un bug Savannah :
+
+----
+component: fix a problem (bug #12345)
+----
+
 Où _component_ est :

 * pour le cœur WeeChat : _core_ (les fichiers dans le répertoire racine, _po/_
@@ -1127,17 +1132,20 @@ Quelques règles à suivre :

 * Utilisez seulement l'anglais.
 * Utilisez des verbes à l'infinitif.
-* Si le commit est relatif à un bug GitHub, écrivez-le entre parenthèses après
-  le message, avec ce format : `(issue #123)` ou `(closes #123)` pour le fermer.
+* Si le commit est relatif au tracker, écrivez-le entre parenthèses après le
+  message, avec ce format :
+** GitHub : closes #123
+** Savannah : bug #12345, task #12345, patch #12345

 Exemples de messages de commit :

 ----
-core: add callback "nickcmp" for nick comparison in buffers
-core: update Japanese translations
 irc: add command /unquiet (closes #36)
-python: fix crash when unloading a script without pointer to interpreter
+core: add callback "nickcmp" for nick comparison in buffers
+irc: fix freeze when reading on socket with SSL enabled (bug #35097)
 ruby: add detection of ruby version 1.9.3 in CMake
+python: fix crash when unloading a script without pointer to interpreter
+core: update Japanese translations (patch #7783)
 ----

 [[translations]]
@@ -237,34 +237,6 @@ Par exemple pour utiliser kbd:[F1], kbd:[F2], kbd:[Alt+F1] et kbd:[Alt+F2] :
 Les touches "meta-OP" et "meta-OQ" peuvent être différentes dans votre terminal.
 Pour trouver le code de la touche appuyez sur kbd:[Alt+k] puis la touche.

-[[customize_buflist]]
-=== Comment puis-je configurer la liste des tampons, comme la couleur du tampon actif ?
-
-Vous pouvez afficher toutes les options buflist avec la commande :
-
----
-/fset buflist
----
-
-Le fond du tampon actif est bleu par défaut, vous pouvez le changer comme ceci,
-par exemple en rouge (`red`) :
-
----
-/set buflist.format.buffer_current "${color:,red}${format_buffer}"
----
-
-[NOTE]
-Il y a une virgule avant le nom de la couleur "red" parce qu'elle est utilisée
-comme couleur de fond et non de texte. +
-Vous pouvez aussi utiliser une couleur numérique à la place de `red`, comme
-`237` pour du gris foncé.
-
-L'extension buflist met à disposition beaucoup d'options que vous pouvez changer,
-merci de lire l'aide sur chaque option.
-
-Il y a aussi une page wiki avec des examples avancés de configuration buflist :
-https://github.com/weechat/weechat/wiki/buflist
-
 [[customize_prefix]]
 === Comment puis-je réduire la longueur des pseudos ou supprimer l'alignement des pseudos dans la zone de discussion ?

@@ -1121,7 +1093,7 @@ $ curl -O https://weechat.org/files/plugins.xml.gz
 ----

 [[spell_dictionaries]]
-=== J'ai installé des dictionnaires aspell sur mon système, comment les utiliser sans redémarrer WeeChat ?
+=== J'ai installé des dictionnaires aspell sur mon système, comment les utiliser sans redémarrer WeeChat ?

 Vous devez recharger l'extension spell :

@@ -1237,15 +1209,15 @@ Par exemple :
 ----

 [[sharing_config_files]]
-=== Je souhaite partager ma configuration de WeeChat, quels fichiers dois-je partager et que dois-je garder privé ?
+=== Je souhaite partager ma configuration de WeeChat, quels fichiers dois-je partager et que dois-je garder privé ?

 Vous pouvez partager les fichiers _~/.weechat/*.conf_ sauf le fichier
 _sec.conf_ qui contient vos mots de passes chiffrés avec votre phrase
 de chiffrement.

-Quelques autres fichiers peuvent contenir des informations sensibles comme
-des mots de passes (s'ils ne sont pas stockés dans _sec.conf_ avec la commande
-`/secure`).
+Quelques autres fichiers comme _irc.conf_ peuvent contenir des informations
+sensibles comme les mots de passes des serveurs/canaux (s'ils ne sont pas
+stockés dans _sec.conf_ avec la commande `/secure`).

 Voir le link:weechat_user.fr.html#files_and_directories[Guide utilisateur / Fichiers et répertoires]
 pour plus d'informations sur les fichiers de configuration.
@@ -1355,25 +1355,14 @@ Valeur de retour :
 * même code retour que la fonction `regcomp` (0 si ok, autre valeur pour une
  erreur, voir `man regcomp`)

-[NOTE]
-L'expression régulière _preg_ doit être nettoyée par un appel à "regfree" après
-utilisation, si la fonction a retourné 0 (OK).
-
 Exemple en C :

 [source,C]
 ----
 regex_t my_regex;
-if (weechat_string_regcomp (&my_regex, "(?i)test", REG_EXTENDED) == 0)
-{
-    /* OK */
-    /* ... */
-    regfree (&my_regex);
-}
-else
+if (weechat_string_regcomp (&my_regex, "(?i)test", REG_EXTENDED) != 0)
 {
    /* erreur */
-    /* ... */
 }
 ----

@@ -2246,7 +2235,7 @@ str3 = weechat.string_input_for_buffer("//test")  # "/test"
 ==== string_eval_expression

 _WeeChat ≥ 0.4.0, mis à jour dans la 0.4.2, 0.4.3, 1.0, 1.1, 1.2, 1.3, 1.6, 1.8,
-2.0, 2.2, 2.3, 2.7, 2.9 et 3.1._
+2.0, 2.2, 2.3, 2.7 et 2.9._

 Évaluer l'expression et retourner le résultat sous forme de chaîne.
 Les variables spéciales avec le format `+${variable}+` sont étendues (voir le
@@ -2299,10 +2288,6 @@ Paramètres :
   remplacer du texte dans _expr_ (_regex_replace_ est évalué sur chaque
   correspondance de _regex_ sur _expr_, jusqu'à ce que plus aucune
   correspondance ne soit trouvée)
-** _debug_ : niveau de debug (chaîne avec un nombre entier ≥ 1), si activé,
-   une clé "debug_output" est ajoutée dans la table de hachage _options_ :
-*** _1_ : activer le debug
-*** _2_ : activer le debug plus verbeux

 Valeur de retour :

@@ -2567,12 +2552,6 @@ première étendue à la dernière) :
 |===
 | Format | Description | Exemples | Résultats

-| `+${raw:xxx}+` +
-  _(WeeChat ≥ 3.1)_ |
-  Chaîne brute (non évaluée). |
-  `+${raw:${info:version}}+` |
-  `+${info:version}+`
-
 | `+${nom}+` |
  Variable `nom` de la table de hachage _extra_vars_. |
  `+${nom}+` |
@@ -2585,12 +2564,6 @@ première étendue à la dernière) :
  `+19:02:45+` (avec des couleurs s'il y a des codes couleur dans l'option
  weechat.look.buffer_time_format)

-| `+${eval_cond:xxx}+` +
-  _(WeeChat ≥ 3.1)_ |
-  Chaîne à évaluer comme condition. |
-  `+${eval_cond:${window.win_width} > 100}+` |
-  `+1+`
-
 | `+${esc:xxx}+` +
  `+${\xxx}+` +
  _(WeeChat ≥ 1.0)_ |
@@ -12517,14 +12490,14 @@ relâché). +

 Informations additionnelles pour l'objet de barre "buffer_nicklist" :

-[width="100%",cols="^1,^1,5",options="header"]
+[width="100%",cols="1,1,5",options="header"]
 |===
-| Extension ^(1)^ | Clé      | Description
-| irc             | irc_nick | Pointeur vers le pseudo IRC _(WeeChat ≥ 3.0)_.
-| irc             | irc_host | Nom d'hôte pour le pseudonyme (si connu).
-| weechat         | nick     | Pseudonyme.
-| weechat         | prefix   | Préfixe du pseudonyme.
-| weechat         | group    | Nom du groupe.
+| Clé      | Extension ^(1)^ | Description
+| nick     | core            | Pseudonyme.
+| prefix   | core            | Préfixe du pseudonyme.
+| group    | core            | Nom du groupe.
+| irc_nick | irc             | Pointeur vers le pseudo IRC _(WeeChat ≥ 3.0)_.
+| irc_host | irc             | Nom d'hôte pour le pseudonyme (si connu).
 |===

 [NOTE]
@@ -992,7 +992,7 @@ Pour voir les variables locales d'un tampon, exécutez cette commande dans
 WeeChat :

 ----
-/buffer listvar
+/buffer localvar
 ----

 [[hooks]]
@@ -93,20 +93,39 @@ Sous macOS, vous pouvez utiliser https://brew.sh/[Homebrew] :
 [[dependencies]]
 ==== Dépendances

-Le tableau suivant liste les paquets qui sont *requis* pour compiler WeeChat :
+Le tableau suivant liste les paquets qui sont requis ou optionnels pour
+compiler WeeChat.

-[width="100%",cols="5,^3,.^15",options="header"]
+[width="100%",cols="6,^3,^3,.^13",options="header"]
 |===
-| Paquet ^(1)^           | Version       | Fonctionnalité
+| Paquet ^(1)^           | Version       | Requis | Fonctionnalité
 | compilateur C
-  (gcc, clang, ...)      |               | Construction.
-| cmake                  | ≥ 3.0         | Construction (autotools toujours possible, mais CMake est recommandé).
-| pkg-config             |               | Détection des bibliothèques installées.
-| libncursesw5-dev ^(2)^ |               | Interface ncurses.
-| libcurl4-gnutls-dev    |               | Transfert d'URL.
-| zlib1g-dev             |               | Compression des paquets dans l'extension relay (protocole weechat), extension script.
-| libgcrypt20-dev        |               | Données sécurisées, authentification IRC SASL (DH-BLOWFISH/DH-AES).
-| libgnutls28-dev        | ≥ 2.2.0 ^(3)^ | Connexion SSL au serveur IRC, support SSL dans l'extension relay, authentification IRC SASL (ECDSA-NIST256P-CHALLENGE).
+  (gcc, clang, ...)      |               | *oui*  | Construction.
+| compilateur C++        |               |        | Construction et lancement des tests, extension JavaScript.
+| cmake                  | ≥ 3.0         | *oui*  | Construction (autotools toujours possible, mais CMake est recommandé).
+| pkg-config             |               | *oui*  | Détection des bibliothèques installées.
+| libncursesw5-dev ^(2)^ |               | *oui*  | Interface ncurses.
+| libcurl4-gnutls-dev    |               | *oui*  | Transfert d'URL.
+| zlib1g-dev             |               | *oui*  | Compression des paquets dans l'extension relay (protocole weechat), extension script.
+| libgcrypt20-dev        |               | *oui*  | Données sécurisées, authentification IRC SASL (DH-BLOWFISH/DH-AES).
+| libgnutls28-dev        | ≥ 2.2.0 ^(3)^ | *oui*  | Connexion SSL au serveur IRC, support SSL dans l'extension relay, authentification IRC SASL (ECDSA-NIST256P-CHALLENGE).
+| gettext                |               |        | Internationalisation (traduction des messages ; la langue de base est l'anglais).
+| ca-certificates        |               |        | Certificats pour les connexions SSL.
+| libaspell-dev
+  ∥ libenchant-dev       |               |        | Extension spell.
+| python3-dev            | ^(4)^         |        | Extension python.
+| libperl-dev            |               |        | Extension perl.
+| ruby2.5, ruby2.5-dev   | ≥ 1.9.1       |        | Extension ruby.
+| liblua5.3-dev          |               |        | Extension lua.
+| tcl-dev                | ≥ 8.5         |        | Extension tcl.
+| guile-2.0-dev          | ≥ 2.0         |        | Extension guile (scheme).
+| libv8-dev              | ≤ 3.24.3      |        | Extension javascript.
+| php-dev, libphp-embed  | ≥ 7.0         |        | Extension PHP.
+| libxml2-dev            |               |        | Extension PHP.
+| libargon2-0-dev        |               |        | Extension PHP (si PHP ≥ 7.2).
+| libsodium-dev          |               |        | Extension PHP (si PHP ≥ 7.2).
+| asciidoctor            | ≥ 1.5.4       |        | Construction de la page man et de la documentation.
+| libcpputest-dev        | ≥ 3.4         |        | Construction et lancement des tests.
 |===

 [NOTE]
@@ -117,35 +136,8 @@ important). WeeChat peut compiler avec libncurses5-dev, but ce n'est *PAS*
 recommandé : vous pourriez avoir des bugs d'affichage avec les caractères
 larges. +
 ^(3)^ GnuTLS ≥ 3.0.21 est requis pour l'authentification SASL avec le mécanisme
-ECDSA-NIST256P-CHALLENGE.
-
-Le tableau suivant liste les paquets qui sont optionnels pour compiler WeeChat :
-
-[width="100%",cols="5,^3,.^15",options="header"]
-|===
-| Paquet                 | Version  | Fonctionnalité
-| compilateur C++        |          | Construction et lancement des tests, extension JavaScript.
-| gettext                |          | Internationalisation (traduction des messages ; la langue de base est l'anglais).
-| ca-certificates        |          | Certificats pour les connexions SSL.
-| libaspell-dev
-  ∥ libenchant-dev       |          | Extension spell.
-| python3-dev ^(1)^      |          | Extension python.
-| libperl-dev            |          | Extension perl.
-| ruby2.5, ruby2.5-dev   | ≥ 1.9.1  | Extension ruby.
-| liblua5.3-dev          |          | Extension lua.
-| tcl-dev                | ≥ 8.5    | Extension tcl.
-| guile-2.0-dev          | ≥ 2.0    | Extension guile (scheme).
-| libv8-dev              | ≤ 3.24.3 | Extension javascript.
-| php-dev, libphp-embed  | ≥ 7.0    | Extension PHP.
-| libxml2-dev            |          | Extension PHP.
-| libargon2-0-dev        |          | Extension PHP (si PHP ≥ 7.2).
-| libsodium-dev          |          | Extension PHP (si PHP ≥ 7.2).
-| asciidoctor            | ≥ 1.5.4  | Construction de la page man et de la documentation.
-| libcpputest-dev        | ≥ 3.4    | Construction et lancement des tests.
-|===
-
-[NOTE]
-^(1)^ Par défaut Python 3.x est utilisé. Si vous activez l'option
+ECDSA-NIST256P-CHALLENGE. +
+^(4)^ Par défaut Python 3.x est utilisé. Si vous activez l'option
 `+ENABLE_PYTHON2+` (voir ci-dessous), seule la version 2.7 de Python est
 recommandée.

@@ -409,9 +401,6 @@ Si vous compilez avec CMake :
 $ cmake .. -DCMAKE_BUILD_TYPE=Debug
 ----

-[[build_debug_address_sanitizer]]
-==== Construction avec options de debug et la vérification des adresses
-
 Vous pouvez aussi activer la vérification des adresses (« address sanitizer »),
 ce qui provoquera immédiatement un plantage de WeeChat en cas de problème :

@@ -423,13 +412,8 @@ $ cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_C
 Vous ne devriez activer la vérification des adresses que si vous essayez de
 provoquer un plantage, ceci n'est pas recommandé en production.

-Une fois compilé et installé, vous devez lancer WeeChat comme ceci :
-
----
-$ ASAN_OPTIONS="detect_odr_violation=0 log_path=asan.log" weechat
----
-
-En cas de plantage, la trace est dans le fichier `asan.log`.
+Si vous avez installé un paquet binaire, alors installez le paquet
+_weechat-dbg_.

 [[core_files]]
 ==== Fichiers core
@@ -571,9 +555,7 @@ Des variables d'environnement sont utilisées par WeeChat si elles sont définie
 === Fichiers et répertoires

 WeeChat écrit ses fichiers de configuration et les autres données dans
-`~/.weechat` par défaut. +
-Ces fichiers sont créés avec les valeurs par défaut la première fois que vous
-lancez WeeChat.
+`~/.weechat` par défaut.

 [[weechat_directories]]
 ==== Répertoires de WeeChat
@@ -632,7 +614,7 @@ Les fichiers dans le répertoire principal de WeeChat sont :
 | perl.conf       | Fichier de configuration de l'extension _perl_       | Non.
 | php.conf        | Fichier de configuration de l'extension _php_        | Non.
 | python.conf     | Fichier de configuration de l'extension _python_     | Non.
-| relay.conf      | Fichier de configuration de l'extension _relay_      | *Oui* : il peut contenir le mot de passe relay et le secret TOTP (si non stockés dans `sec.conf`), les adresses IP/origines websocket autorisées et les ports ouverts.
+| relay.conf      | Fichier de configuration de l'extension _relay_      | Non.
 | ruby.conf       | Fichier de configuration de l'extension _ruby_       | Non.
 | script.conf     | Fichier de configuration de l'extension _script_     | Non.
 | tcl.conf        | Fichier de configuration de l'extension _tcl_        | Non.
@@ -702,7 +684,7 @@ L'écran est composé des zones suivantes :

 La barre _buflist_ contient les objets (items) suivants par défaut :

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Objet (item) | Exemple     | Description
 | buflist      | `1.weechat` | Liste des tampons.
@@ -710,7 +692,7 @@ La barre _buflist_ contient les objets (items) suivants par défaut :

 La barre _title_ contient les objets (items) suivants par défaut :

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Objet (item) | Exemple               | Description
 | buffer_title | `Bienvenue sur #test` | Titre du tampon.
@@ -718,7 +700,7 @@ La barre _title_ contient les objets (items) suivants par défaut :

 La barre _status_ contient les objets (items) suivants par défaut :

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Objet (item)          | Exemple                 | Description
 | time                  | `[12:55]`               | Heure.
@@ -738,7 +720,7 @@ La barre _status_ contient les objets (items) suivants par défaut :

 La barre _input_ contient les objets (items) suivants par défaut :

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Objet (item) | Exemple                                         | Description
 | input_prompt | `[@Flashy(i)]`                                  | Prompt, pour irc : pseudo et modes (le mode "+i" signifie invisible sur freenode).
@@ -750,7 +732,7 @@ La barre _input_ contient les objets (items) suivants par défaut :

 La barre _nicklist_ contient les objets (items) suivants par défaut :

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Objet (item)    | Exemple   | Description
 | buffer_nicklist | `@Flashy` | Liste des pseudos sur le tampon courant.
@@ -758,27 +740,17 @@ La barre _nicklist_ contient les objets (items) suivants par défaut :

 Autres objets (non utilisés dans des barres par défaut) :

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
-| Objet (item)                 | Exemple                  | Description
-| buffer_count                 | `10`                     | Nombre total de tampons ouverts.
-| buffer_last_number           | `10`                     | Numéro du dernier tampon (peut être différent de `buffer_count` si l'option <<option_weechat.look.buffer_auto_renumber,weechat.look.buffer_auto_renumber>> est `off`).
-| buffer_nicklist_count_all    | `4`                      | Nombre de groupes et pseudos visibles dans la liste de pseudos.
-| buffer_nicklist_count_groups | `0`                      | Nombre de groupes visibles dans la liste de pseudos.
-| buffer_short_name            | `#test`                  | Nom court du tampon courant.
-| buflist2                     | `1.weechat`              | Liste des tampons, deuxième objet de barre (voir l'option <<option_buflist.look.use_items,buflist.look.use_items>>).
-| buflist3                     | `1.weechat`              | Liste des tampons, troisième objet de barre (voir l'option <<option_buflist.look.use_items,buflist.look.use_items>>).
-| fset                         | `+buflist.look.sort: …+` | Aide sur l'option sélectionnée dans le tampon fset.
-| irc_channel                  | `#test`                  | Nom de canal IRC courant.
-| irc_host                     | `+user@host.com+`        | Hôte sur IRC.
-| irc_nick                     | `+Flashy+`               | Pseudo IRC.
-| irc_nick_host                | `+Flashy!user@host.com+` | Pseudo et hôte IRC.
-| irc_nick_modes               | `i`                      | Modes IRC pour le pseudo.
-| irc_nick_prefix              | `@`                      | Préfixe de pseudo IRC sur le canal.
-| mouse_status                 | `M`                      | Statut de la souris (vide si la souris est désactivée).
-| spell_dict                   | `fr,en`                  | Dictionnaires utilisés pour la vérification de l'orthographe sur le tampon courant.
-| spell_suggest                | `print,prone,prune`      | Suggestions pour le mot sous le curseur (si mal orthographié).
-| window_number                | `2`                      | Numéro de la fenêtre courante.
+| Objet (item)      | Exemple             | Description
+| spell_dict        | `fr,en`             | Dictionnaires utilisés pour la vérification de l'orthographe sur le tampon courant.
+| spell_suggest     | `print,prone,prune` | Suggestions pour le mot sous le curseur (si mal orthographié).
+| buffer_count      | `10`                | Nombre total de tampons ouverts.
+| buffer_short_name | `#test`             | Nom court du tampon courant.
+| irc_channel       | `#test`             | Nom de canal IRC courant.
+| irc_nick_modes    | `@`                 | Modes IRC pour le pseudo.
+| mouse_status      | `M`                 | Statut de la souris (vide si la souris est désactivée).
+| window_number     | `2`                 | Numéro de la fenêtre courante.
 |===

 [[command_line]]
@@ -1132,8 +1104,8 @@ Exemple de découpage vertical + horizontal :
                 ▲ fenêtre n°1 (tampon n°3)            ▲ fenêtre n°2 (tampon n°4)
 ....

-[[buffers]]
-=== Tampons
+[[buffers_lines]]
+=== Lignes des tampons

 [[lines_format]]
 ==== Format des lignes
@@ -1202,149 +1174,6 @@ le niveau de notification réel peut être différent, par exemple si un niveau
 maximum de hotlist est utilisé pour un pseudo, le niveau de notification peut
 être inférieur à la valeur de l'étiquette.

-[[local_variables]]
-==== Variables locales
-
-Des variables locales peuvent être définies dans les tampons.
-
-Une variable locale a :
-
-* un nom (chaîne)
-* une valeur (chaîne, peut être vide).
-
-Les variables locales peuvent être définies par WeeChat, les extensions, les
-scripts, ou manuellement sur la ligne de commande, dans le tampon.
-
-Par exemple pour ajouter la variable locale "completion_default_template" :
-
----
-/buffer setvar completion_default_template %(my_completion)
----
-
-Pour afficher les variables locales du tampon courant :
-
----
-/buffer listvar
----
-
-Pour supprimer la variable locale "completion_default_template" :
-
----
-/buffer delvar completion_default_template
----
-
-Par défaut WeeChat et ses extensions par défaut interprètent ces variables :
-
-[width="100%",cols="^2m,2,5",options="header"]
-|===
-| Nom | Valeur | Description
-
-| away |
-  toute chaîne |
-  Message d'absence sur le serveur, défini par l'extension irc.
-
-| channel |
-  toute chaîne |
-  Nom du canal, défini par les extensions irc/xfer et le tampon de debug des
-  extensions relay/trigger.
-
-| charset_modifier |
-  toute chaîne |
-  Modificateur de charset du tampon serveur, défini par l'extension irc.
-
-| completion_default_template |
-  toute chaîne |
-  Modèle de complétion par défaut pour le tampon, qui remplace l'option
-  `weechat.completion.default_template`.
-
-| filter |
-  toute chaîne |
-  Filtre défini sur certains tampons comme `/fset`, `/server raw` (irc) et
-  `/script`.
-
-| host |
-  toute chaîne |
-  Nom d'hôte personnel (si connu), défini par l'extension irc.
-
-| lag |
-  toute chaîne |
-  Lag sur le serveur, défini par l'extension irc.
-
-| name |
-  toute chaîne |
-  Nom du tampon (attention, ce n'est pas le nom complet du tampon et ce nom
-  n'est pas suffisant pour identifier ou chercher un tampon).
-
-| nick |
-  toute chaîne |
-  Pseudo personnel, défini par les extensions irc et xfer.
-
-| no_log |
-  `1` (or any non-empty string) |
-  Si défini, l'extension logger n'écrira pas le "log" du tampon sur disque.
-
-| plugin |
-  toute chaîne |
-  Nom de l'extension qui a créé le tampon (`core` pour les tampons WeeChat).
-
-| script_close_cb |
-  toute chaîne |
-  Nom de la fonction de rappel pour la fermeture,
-  défini par un script pour le tampon.
-
-| script_close_cb_data |
-  toute chaîne |
-  Données pour la fonction de rappel pour la fermeture,
-  définies par un script pour le tampon.
-
-| script_input_cb |
-  toute chaîne |
-  Nom de la fonction de rappel d'entrée,
-  défini par un script pour le tampon.
-
-| script_input_cb_data |
-  toute chaîne |
-  Données pour la fonction de rappel d'entrée,
-  définies par un script pour le tampon.
-
-| script_name |
-  toute chaîne |
-  Nom du script qui a créé le tampon.
-
-| server |
-  toute chaîne |
-  Nom du serveur, défini par l'extension irc et le tampon de debug des extensions
-  relay/trigger.
-
-| spell_suggest |
-  toute chaîne |
-  Mot mal orthographié et ses suggestions (format : "mot:suggestions"), défini
-  par l'extension spell.
-
-| trigger_filter |
-  toute chaîne |
-  Filtre trigger, défini par l'extension trigger.
-
-| type |
-  toute chaîne, par exemple :
-  `channel`,
-  `debug`,
-  `exec`,
-  `option`,
-  `private`,
-  `relay`,
-  `script`,
-  `server`,
-  `user`,
-  `xfer` |
-  Type de tampon, défini par WeeChat et plusieurs extensions.
-
-|===
-
-[NOTE]
-Les extensions et script externes peuvent définir et utiliser d'autres
-variables locales.
-
 [[bars]]
 === Barres

@@ -2293,27 +2122,12 @@ données sont stockées sous forme de texte en clair dans le fichier.
 /secure passphrase ceci est ma phrase secrète
 ----

-// TRANSLATION MISSING
-===== Passphrase on startup
-
 Lorsqu'une phrase secrète est définie, WeeChat vous demandera de la saisir lors
 du démarrage (mais pas sur `/upgrade`).

-Si vous utilisez un gestionnaire de mots de passe, vous pouvez lancer
-un programme externe pour lire la phrase de chiffrement au lieu d'avoir
-à l'entrer manuellement au démarrage de WeeChat. +
-Par exemple avec password-store (command `pass`) :
-
----
-/set sec.crypt.passphrase_command "pass show weechat/passphrase"
----
-
-Le programme peut vous demander de déverrouiller votre clé GPG ou d'entrer une
-autre phrase de chiffrement. WeeChat attendra la fin de la commande pour lire
-la phrase de chiffrement sur la sortie standard (elle doit être sur la première
-ligne et sans caractère supplémentaire). +
-Si la sortie ne contient pas de phrase de chiffrement ou si celle-ci est
-erronée, WeeChat vous demandera alors de la saisir.
+Vous pouvez modifier ce comportement et utiliser un fichier avec la phrase
+secrète (voir l'option
+<<option_sec.crypt.passphrase_file,sec.crypt.passphrase_file>>).

 [[secured_data_encryption]]
 ===== Chiffrement
@@ -3364,7 +3178,7 @@ d'utiliser les variables locales du tampon pour construire le nom de fichier.
 Pour voir les variables disponibles sur le tampon courant :

 ----
-/buffer listvar
+/buffer localvar
 ----

 Les masques seront utilisés par ordre de priorité descendante sur
@@ -3494,7 +3308,7 @@ Ce mot de passe sera utilisé pour les protocoles _irc_ et _weechat_.
 [[relay_totp]]
 ==== TOTP

-TOTP (« Time-based One-Time Password » : mot de passe à usage unique basé sur le
+TOTP (« Time-based One-Time Password » : mot de passe à usage unique basé sur le
 temps) peut être utilisé comme second facteur d'authentification pour le protocole
 _weechat_, en plus du mot de passe.

@@ -3511,7 +3325,7 @@ par exemple :
  https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2[Android],
  https://itunes.apple.com/fr/app/google-authenticator/id388497605[iOS]

-Le « secret » TOTP doit être défini dans WeeChat et dans l'application utilisée
+Le « secret » TOTP doit être défini dans WeeChat et dans l'application utilisée
 pour générer les mots de passe à usage unique.

 Il doit être une chaîne encodée en base32, avec seulement des lettres et des
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -32,21 +32,19 @@ if(ENABLE_MAN)
  add_custom_target(doc-man-weechat-it ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/it/man1)

-  if(ENABLE_HEADLESS)
-    # man page: weechat-headless
-    add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
-      COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.it.adoc
-      DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.it.adoc
-      ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.it.adoc
-      ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.it.adoc
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      COMMENT "Building weechat-headless.1 (it)"
-    )
-    add_custom_target(doc-man-weechat-headless-it ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/it/man1)
-  endif()
+  # man page: weechat-headless
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.it.adoc
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.it.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.it.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.it.adoc
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Building weechat-headless.1 (it)"
+  )
+  add_custom_target(doc-man-weechat-headless-it ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/it/man1)
 endif()

 if(ENABLE_DOC)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -120,10 +120,6 @@

 | weechat | bars_options | opzioni per le barre

-| weechat | buffer_local_variable_value | value of a buffer local variable
-
-| weechat | buffer_local_variables | buffer local variables
-
 | weechat | buffer_properties_get | proprietà che possono essere lette su un buffer

 | weechat | buffer_properties_set | proprietà che possono essere impostate su un buffer
@@ -20,8 +20,6 @@

 | irc | irc_is_channel | 1 se la stringa è il nome di un canale IRC valido per il server | server,canale (server è opzionale)

-| irc | irc_is_message_ignored | 1 if the nick is ignored (message is not displayed) | server,message (message is the raw IRC message)
-
 | irc | irc_is_nick | 1 se la stringa è un nick IRC valido | server,nickname (server is optional)

 | irc | irc_nick | ottiene nick corrente su un server | nome server
@@ -14,7 +14,5 @@

 | weechat | focus_info | get focus info | "x": x coordinate (string with integer >= 0), "y": y coordinate (string with integer >= 0) | see function "hook_focus" in Plugin API reference

-| weechat | secured_data | secured data | - | secured data: names and values (be careful: the values are sensitive data: do NOT print/log them anywhere)
-
 |===
 // end::infos_hashtable[]
@@ -219,7 +219,6 @@ Examples:

 ----
 /dehalfop  <nick> [<nick>...]
-           * -yes

 nick: nick or mask (wildcard "*" is allowed)
   *: remove channel half-operator status from everybody on channel except yourself
@@ -933,7 +932,6 @@ target: server name

 ----
 /voice  <nick> [<nick>...]
-        * -yes

 nick: nick or mask (wildcard "*" is allowed)
   *: give voice to everybody on channel
@@ -1022,7 +1020,7 @@ Note: in command, special variables are replaced:
      $n-m: arguments from 'n' to 'm'
        $*: all arguments
        $~: last argument
-      $var: where "var" is a local variable of buffer (see /buffer listvar)
+      $var: where "var" is a local variable of buffer (see /buffer localvar)
            examples: $nick, $channel, $server, $plugin, $name

 Examples:
@@ -1115,9 +1113,7 @@ Examples:
         renumber [<number1> [<number2> [<start>]]]
         close [<n1>[-<n2>]|<name>...]
         notify [<level>]
-         listvar [<number>|<name>]
-         setvar <name> [<value>]
-         delvar <name>
+         localvar [<number>|<name>]
         set <property> [<value>]
         get <property>
         <number>|-|+|<name>
@@ -1141,10 +1137,8 @@ renumber: renumber buffers (works only if option weechat.look.buffer_auto_renumb
            message: for messages from users + highlights
                all: all messages
              reset: reset to default value (all)
- listvar: display local variables in a buffer
-  setvar: set a local variable in the current buffer
-  delvar: delete a local variable from the current buffer
-     set: set a property in the current buffer
+localvar: display local variables for the buffer
+     set: set a property for current buffer
     get: display a property of current buffer
  number: jump to buffer by number, possible prefix:
          '+': relative jump, add number to current
@@ -1302,11 +1296,11 @@ infolists: display infos about infolists

 ----
 /eval  [-n|-s] [-d] <expression>
-       [-n] [-d [-d]] -c <expression1> <operator> <expression2>
+       [-n] [-d] -c <expression1> <operator> <expression2>

        -n: display result without sending it to buffer (debug mode)
        -s: split expression before evaluating it (many commands can be separated by semicolons)
-        -d: display debug output after evaluation (with two -d: more verbose debug)
+        -d: display debug output after evaluation
        -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:
@@ -1341,27 +1335,25 @@ To force a string comparison, you can add double quotes around each expression,
  "50" > "100"  ==> 1

 Some variables are replaced in expression, using the format ${variable}, variable can be, by order of priority:
-  1. the string itself without evaluation (format: "raw:xxx")
-  2. an evaluated sub-string (format: "eval:xxx")
-  3. an evaluated condition (format: "eval_cond:xxx")
-  4. a string with escaped chars (format: "esc:xxx" or "\xxx")
-  5. a string with chars to hide (format: "hide:char,string")
-  6. a string with max chars (format: "cut:max,suffix,string" or "cut:+max,suffix,string")
+  1. an evaluated sub-string (format: "eval:xxx")
+  2. a string with escaped chars (format: "esc:xxx" or "\xxx")
+  3. a string with chars to hide (format: "hide:char,string")
+  4. a string with max chars (format: "cut:max,suffix,string" or "cut:+max,suffix,string")
     or max chars displayed on screen (format: "cutscr:max,suffix,string" or "cutscr:+max,suffix,string")
-  7. a reversed string (format: "rev:xxx" or "revscr:xxx")
-  8. a repeated string (format: "repeat:count,string")
-  9. length of a string (format: "length:xxx" or "lengthscr:xxx")
-  10. a color (format: "color:xxx", see "Plugin API reference", function "color")
-  11. a modifier (format: "modifier:name,data,string")
-  12. an info (format: "info:name,arguments", arguments are optional)
-  13. a base 16/32/64 encoded/decoded string (format: "base_encode:base,xxx" or "base_decode:base,xxx")
-  14. current date/time (format: "date" or "date:format")
-  15. an environment variable (format: "env:XXX")
-  16. a ternary operator (format: "if:condition?value_if_true:value_if_false")
-  17. result of an expression with parentheses and operators + - * / // % ** (format: "calc:xxx")
-  18. an option (format: "file.section.option")
-  19. a local variable in buffer
-  20. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
+  5. a reversed string (format: "rev:xxx" or "revscr:xxx")
+  6. a repeated string (format: "repeat:count,string")
+  7. length of a string (format: "length:xxx" or "lengthscr:xxx")
+  8. a color (format: "color:xxx", see "Plugin API reference", function "color")
+  9. a modifier (format: "modifier:name,data,string")
+  10. an info (format: "info:name,arguments", arguments are optional)
+  11. a base 16/32/64 encoded/decoded string (format: "base_encode:base,xxx" or "base_decode:base,xxx")
+  12. current date/time (format: "date" or "date:format")
+  13. an environment variable (format: "env:XXX")
+  14. a ternary operator (format: "if:condition?value_if_true:value_if_false")
+  15. result of an expression with parentheses and operators + - * / // % ** (format: "calc:xxx")
+  16. an option (format: "file.section.option")
+  17. a local variable in buffer
+  18. 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:
@@ -1372,8 +1364,6 @@ Format for hdata can be one of following:
 For name of hdata and variables, please look at "Plugin API reference", function "weechat_hdata_get".

 Examples (simple strings):
-  /eval -n ${raw:${info:version}}                ==> ${info:version}
-  /eval -n ${eval_cond:${window.win_width}>100}  ==> 1
  /eval -n ${info:version}                       ==> 0.4.3
  /eval -n ${env:HOME}                           ==> /home/user
  /eval -n ${weechat.look.scroll_amount}         ==> 3
@@ -1416,7 +1406,6 @@ Examples (conditions):
         enable|disable|toggle [<name>|@]
         add|addreplace <name> <buffer>[,<buffer>...] <tags> <regex>
         rename <name> <new_name>
-         recreate <name>
         del <name>|-all

      list: list all filters
@@ -1427,7 +1416,6 @@ Examples (conditions):
       add: add a filter
 addreplace: add or replace an existing filter
    rename: rename a filter
-  recreate: set input with the command used to edit the filter
       del: delete a filter
      -all: delete all filters
    buffer: comma separated list of buffers where filter is active:
@@ -1873,7 +1861,7 @@ Keys on secure buffer:
  alt+v  toggle values

 When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
-It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade), or to set option sec.crypt.passphrase_command to read the passphrase from the output of an external command like a password manager (see /help sec.crypt.passphrase_command).
+It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade), or to set option sec.crypt.passphrase_file to read the passphrase from a file (see /help sec.crypt.passphrase_file).

 Secured data with format ${sec.data.xxx} can be used in:
  - command /eval
@@ -1884,8 +1872,6 @@ Secured data with format ${sec.data.xxx} can be used in:
 Examples:
  set a passphrase:
    /secure passphrase this is my passphrase
-  use program "pass" to read the passphrase on startup:
-    /set sec.crypt.passphrase_command "pass show weechat/passphrase"
  encrypt freenode SASL password:
    /secure set freenode mypassword
    /set irc.server.freenode.sasl_password "${sec.data.freenode}"
@@ -2833,16 +2819,6 @@ On script buffer, the possible status for each script are:
  | installed
  popular script

-In output of /script list, the possible status for each script are:
-  * ? i a H N
-  | | | | | |
-  | | | | | obsolete (new version available)
-  | | | | held
-  | | | autoloaded
-  | | installed
-  | unknown script (can not be downloaded/updated)
-  popular script
-
 Keys on script buffer:
  alt+i  install script
  alt+r  remove script
@@ -2972,7 +2948,7 @@ listdefault: list default triggers
             modifier: name(s) of modifier (required)
             line: buffer type ("formatted", "free" or "*"), list of buffer masks, tags
             print: buffer, tags, message, strip colors
-             command: command (required), description, arguments, description of arguments, completion (all arguments except command are evaluated, "${tg_trigger_name}" is replaced by the trigger name, see /help eval)
+             command: command (required), description, arguments, description of arguments, completion (all arguments except command are evaluated, see /help eval)
             command_run: command(s) (required)
             timer: interval (required), align on second, max calls
             config: name(s) of option (required)
@@ -16,8 +16,8 @@
 ** valori: sha224, sha256, sha384, sha512
 ** valore predefinito: `+sha256+`

-* [[option_sec.crypt.passphrase_command]] *sec.crypt.passphrase_command*
-** descrizione: pass:none[read the passphrase from the output of this system command (only the first line is used and it must not contain any extra character); this option is used only when reading file sec.conf and if the environment variable "WEECHAT_PASSPHRASE" is not set (the environment variable has higher priority); example with password-store: "pass show weechat/passphrase"]
+* [[option_sec.crypt.passphrase_file]] *sec.crypt.passphrase_file*
+** descrizione: pass:none[path to a file containing the passphrase to encrypt/decrypt secured data; this option is used only when reading file sec.conf; only first line of file is used; this file is used only if the environment variable "WEECHAT_PASSPHRASE" is not set (the environment variable has higher priority); security note: it is recommended to keep this file readable only by you and store it outside WeeChat home (for example in your home); example: "~/.weechat-passphrase"]
 ** tipo: stringa
 ** valori: qualsiasi stringa
 ** valore predefinito: `+""+`
@@ -846,12 +846,6 @@
 ** valori: on, off
 ** valore predefinito: `+on+`

-* [[option_weechat.look.hotlist_update_on_buffer_switch]] *weechat.look.hotlist_update_on_buffer_switch*
-** descrizione: pass:none[update the hotlist when switching buffers]
-** tipo: bool
-** valori: on, off
-** valore predefinito: `+on+`
-
 * [[option_weechat.look.input_cursor_scroll]] *weechat.look.input_cursor_scroll*
 ** descrizione: pass:none[numero di caratteri mostrati dopo la fine della riga di input quando si scorre per mostrare la fine riga]
 ** tipo: intero
@@ -1146,12 +1140,6 @@
 ** valori: qualsiasi stringa
 ** valore predefinito: `+"- "+`

-* [[option_weechat.look.read_marker_update_on_buffer_switch]] *weechat.look.read_marker_update_on_buffer_switch*
-** descrizione: pass:none[update the read marker when switching buffers]
-** tipo: bool
-** valori: on, off
-** valore predefinito: `+on+`
-
 * [[option_weechat.look.save_config_on_exit]] *weechat.look.save_config_on_exit*
 ** descrizione: pass:none[salva file di configurazione all'uscita]
 ** tipo: bool
@@ -1781,12 +1769,6 @@
 ** tipo: stringa
 ** valori: qualsiasi stringa
 ** valore predefinito: `+"number,-active"+`
-
-* [[option_buflist.look.use_items]] *buflist.look.use_items*
-** descrizione: pass:none[number of buflist bar items that can be used; the item names are: "buflist", "buflist2", "buflist3"; be careful, using more than one bar item slows down the display of buffers list]
-** tipo: intero
-** valori: 1 .. 3
-** valore predefinito: `+1+`
 // end::buflist_options[]

 // tag::fifo_options[]
@@ -2634,12 +2616,6 @@
 ** valori: 1 .. 3600
 ** valore predefinito: `+60+`

-* [[option_irc.server_default.default_chantypes]] *irc.server_default.default_chantypes*
-** descrizione: pass:none[channel type prefixes to use if the server does not send them in message 005 (default is "#&")]
-** tipo: stringa
-** valori: qualsiasi stringa
-** valore predefinito: `+"#&"+`
-
 * [[option_irc.server_default.ipv6]] *irc.server_default.ipv6*
 ** descrizione: pass:none[usa il protocollo IPv6 per le comunicazioni con il server (prova con IPv6, se non disponibile usa IPv4); se disabilitato, viene usato solo IPv4]
 ** tipo: bool
@@ -100,7 +100,7 @@ $HOME/.weechat/weechat.log::
 WeeChat is written by Sébastien Helleu and contributors (complete list is in
 the AUTHORS.adoc file).

-Copyright (C) 2003-2021 {author}
+Copyright (C) 2003-2020 {author}

 WeeChat is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -256,35 +256,6 @@ For example to use kbd:[F1], kbd:[F2], kbd:[Alt+F1] and kbd:[Alt+F2]:
 I tasti "meta-OP" e "meta-OQ" possono essere differenti nel proprio terminale.
 Per trovare il codice tasto digitare kbd:[Alt+k] poi il tast.

-// TRANSLATION MISSING
-[[customize_buflist]]
-=== How can I customize the list of buffers list, like the color of the active buffer?
-
-You can browse all buflist options with the command:
-
----
-/fset buflist
----
-
-The background of the active buffer is blue by default, you can change it
-like this, for example to `red`:
-
----
-/set buflist.format.buffer_current "${color:,red}${format_buffer}"
----
-
-[NOTE]
-There's a comma before the color name "red" because it is used as the background,
-not the text color. +
-You can also use any numeric color instead of `red`,
-like `237` for dark gray.
-
-The buflist plugin provides lot of options that you can customize, please read
-the help on each option.
-
-There's also a wiki page with examples of advanced buflist configuration:
-https://github.com/weechat/weechat/wiki/buflist
-
 [[customize_prefix]]
 === Come si può ridurre la lunghezza dei nick o rimuovere l'allineamento nella finestra di chat?

@@ -1297,9 +1268,9 @@ For example:
 You can share files _~/.weechat/*.conf_ except the file _sec.conf_ which
 contains your passwords ciphered with your passphrase.

-// TRANSLATION MISSING
-Some other files may contain sensitive info like passwords (if they are not
-stored in _sec.conf_ with the `/secure` command).
+Some other files like _irc.conf_ may contain sensitive info like passwords
+for servers/channels (if they are not stored in _sec.conf_ with the `/secure`
+command).

 See the link:weechat_user.it.html#files_and_directories[User's guide / Files and directories]
 for more information about configuration files.
@@ -1400,26 +1400,14 @@ Valore restituito:
 * same return code as function `regcomp` (0 if ok, other value for error,
  see `man regcomp`)

-[NOTE]
-// TRANSLATION MISSING
-Regular expression _preg_ must be cleaned by calling "regfree" after use,
-if the function returned 0 (OK).
-
 Esempio in C:

 [source,C]
 ----
 regex_t my_regex;
-if (weechat_string_regcomp (&my_regex, "(?i)test", REG_EXTENDED) == 0)
-{
-    /* OK */
-    /* ... */
-    regfree (&my_regex);
-}
-else
+if (weechat_string_regcomp (&my_regex, "(?i)test", REG_EXTENDED) != 0)
 {
    /* error */
-    /* ... */
 }
 ----

@@ -2306,7 +2294,7 @@ str3 = weechat.string_input_for_buffer("//test")  # "/test"

 // TRANSLATION MISSING
 _WeeChat ≥ 0.4.0, updated in 0.4.2, 0.4.3, 1.0, 1.1, 1.2, 1.3, 1.6, 1.8, 2.0,
-2.2, 2.3, 2.7, 2.9 and 3.1._
+2.2, 2.3, 2.7 and 2.9._

 // TRANSLATION MISSING
 Evaluate an expression and return result as a string.
@@ -2357,11 +2345,6 @@ Argomenti:
 ** _regex_replace_: the replacement text to use with _regex_, to replace
   text in _expr_ (the _regex_replace_ is evaluated on each match of _regex_
   against _expr_, until no match is found)
-// TRANSLATION MISSING
-** _debug_: debug level (string with integer number ≥ 1), if enabled, a key
-   "debug_output" is added in hashtable _options_:
-*** _1_: enable debug
-*** _2_: enable more verbose debug

 Valore restituito:

@@ -2636,13 +2619,6 @@ expanded to last):
 |===
 | Format | Description | Examples | Results

-// TRANSLATION MISSING
-| `+${raw:xxx}+` +
-  _(WeeChat ≥ 3.1)_ |
-  Raw string (not evaluated). |
-  `+${raw:${info:version}}+` |
-  `+${info:version}+`
-
 | `+${name}+` |
  Variable `name` from hashtable _extra_vars_. |
  `+${name}+` |
@@ -2655,12 +2631,6 @@ expanded to last):
 `+19:02:45+` (with colors if there are color codes in the option
 weechat.look.buffer_time_format)

-| `+${eval_cond:xxx}+` +
-  _(WeeChat ≥ 3.1)_ |
-  String to evaluate as condition. |
-  `+${eval_cond:${window.win_width} > 100}+` |
-  `+1+`
-
 | `+${esc:xxx}+` +
  `+${\xxx}+` +
  _(WeeChat ≥ 1.0)_ |
@@ -12756,15 +12726,15 @@ per sapere dove il pulsante del mouse è stato rilasciato). +

 Informazioni aggiuntive per l'elemento barra "buffer_nicklist":

-[width="100%",cols="^1,^1,5",options="header"]
+[width="100%",cols="1,1,5",options="header"]
 |===
-| Plugin ^(1)^ | Chiave   | Descrizione
+| Chiave   | Plugin ^(1)^ | Descrizione
+| nick     | core         | Nick.
+| prefix   | core         | Prefisso per il nick.
+| group    | core         | Nome gruppo.
 // TRANSLATION MISSING
-| irc          | irc_nick | Pointer to IRC nick _(WeeChat ≥ 3.0)_.
-| irc          | irc_host | Host per il nick (se conosciuto).
-| weechat      | nick     | Nick.
-| weechat      | prefix   | Prefisso per il nick.
-| weechat      | group    | Nome gruppo.
+| irc_nick | irc          | Pointer to IRC nick _(WeeChat ≥ 3.0)_.
+| irc_host | irc          | Host per il nick (se conosciuto).
 |===

 [NOTE]
@@ -1004,7 +1004,7 @@ Per impostare le variabili locali di un buffer, digitare questo comando
 in WeeChat:

 ----
-/buffer listvar
+/buffer localvar
 ----

 [[hooks]]
@@ -106,29 +106,52 @@ On macOS, you can use https://brew.sh/[Homebrew]:
 [[dependencies]]
 ==== Dipendenze

-// TRANSLATION MISSING
-The following table shows the list of packages that are *required* to compile
-WeeChat:
+La seguente tabella mostra l'elenco di pacchetti richiesti o opzionali per
+compilare WeeChat.

-[width="100%",cols="5,^3,.^15",options="header"]
+[width="100%",cols="6,^3,^3,.^13",options="header"]
 |===
-| Pacchetto ^(1)^        | Versione      | Caratteristica
+| Pacchetto ^(1)^        | Versione      | Richiesto | Caratteristica
 // TRANSLATION MISSING
 | C compiler
-  (gcc, clang, ...)      |               | Build.
-| cmake                  | ≥ 3.0         | Compilazione (ancora possibile con autotools, ma si raccomanda CMake).
+  (gcc, clang, ...)      |               | *sì*      | Build.
 // TRANSLATION MISSING
-| pkg-config             |               | Detect installed libraries.
-| libncursesw5-dev ^(2)^ |               | Interfaccia ncurses.
-| libcurl4-gnutls-dev    |               | Trasferimento URL.
+| C++ compiler           |               |           | Build and run tests, plugin JavaScript.
+| cmake                  | ≥ 3.0         | *sì*      | Compilazione (ancora possibile con autotools, ma si raccomanda CMake).
 // TRANSLATION MISSING
-| zlib1g-dev             |               | Compression of packets in relay plugin (weechat protocol), script plugin.
+| pkg-config             |               | *sì*      | Detect installed libraries.
+| libncursesw5-dev ^(2)^ |               | *sì*      | Interfaccia ncurses.
+| libcurl4-gnutls-dev    |               | *sì*      | Trasferimento URL.
 // TRANSLATION MISSING
-| libgcrypt20-dev        |               | Secured data, IRC SASL authentication (DH-BLOWFISH/DH-AES).
+| zlib1g-dev             |               | *sì*      | Compression of packets in relay plugin (weechat protocol), script plugin.
 // TRANSLATION MISSING
-| libgnutls28-dev        | ≥ 2.2.0 ^(3)^ | Connessione SSL al server IRC, support of SSL in relay plugin, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE).
+| libgcrypt20-dev        |               | *sì*      | Secured data, IRC SASL authentication (DH-BLOWFISH/DH-AES).
+// TRANSLATION MISSING
+| libgnutls28-dev        | ≥ 2.2.0 ^(3)^ | *sì*      | Connessione SSL al server IRC, support of SSL in relay plugin, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE).
+| gettext                |               |           | Internazionalizzazione (traduzione dei messaggi; la lingua base è l'inglese).
+| ca-certificates        |               |           | Certificati per le connessioni SSL.
+| libaspell-dev
+  ∥ libenchant-dev       |               |           | Plugin spell.
+| python3-dev            | ^(4)^         |           | Plugin python.
+| libperl-dev            |               |           | Plugin perl.
+| ruby2.5, ruby2.5-dev   | ≥ 1.9.1       |           | Plugin ruby.
+| liblua5.3-dev          |               |           | Plugin lua.
+| tcl-dev                | ≥ 8.5         |           | Plugin tcl.
+| guile-2.0-dev          | ≥ 2.0         |           | Plugin guile (scheme).
+| libv8-dev              | ≤ 3.24.3      |           | Plugin javascript.
+| php-dev, libphp-embed  | ≥ 7.0         |           | Plugin php.
+| libxml2-dev            |               |           | Plugin php.
+// TRANSLATION MISSING
+| libargon2-0-dev        |               |           | Plugin php (if PHP ≥ 7.2).
+// TRANSLATION MISSING
+| libsodium-dev          |               |           | Plugin php (if PHP ≥ 7.2).
+// TRANSLATION MISSING
+| asciidoctor            | ≥ 1.5.4       |           | Build man page and documentation.
+// TRANSLATION MISSING
+| libcpputest-dev        | ≥ 3.4         |           | Build and run tests.
 |===

+// TRANSLATION MISSING (note 3)
 [NOTE]
 ^(1)^ Il nome viene dalla distribuzione Debian GNU/Linux, nomi e versioni dei pacchetti
 potrebbero essere differenti in versioni e distribuzioni differenti. +
@@ -138,43 +161,9 @@ important). WeeChat can compile with libncurses5-dev, but it is *NOT* recommende
 you may experience display bugs with wide chars. +
 // TRANSLATION MISSING
 ^(3)^ GnuTLS ≥ 3.0.21 is required for IRC SASL authentication with mechanism
-ECDSA-NIST256P-CHALLENGE.
-
+ECDSA-NIST256P-CHALLENGE. +
 // TRANSLATION MISSING
-The following table shows the list of packages that are optional to compile
-WeeChat:
-
-[width="100%",cols="5,^3,.^15",options="header"]
-|===
-| Pacchetto              | Versione | Caratteristica
-// TRANSLATION MISSING
-| C++ compiler           |          | Build and run tests, plugin JavaScript.
-| gettext                |          | Internazionalizzazione (traduzione dei messaggi; la lingua base è l'inglese).
-| ca-certificates        |          | Certificati per le connessioni SSL.
-| libaspell-dev
-  ∥ libenchant-dev       |          | Plugin spell.
-| python3-dev ^(1)^      |          | Plugin python.
-| libperl-dev            |          | Plugin perl.
-| ruby2.5, ruby2.5-dev   | ≥ 1.9.1  | Plugin ruby.
-| liblua5.3-dev          |          | Plugin lua.
-| tcl-dev                | ≥ 8.5    | Plugin tcl.
-| guile-2.0-dev          | ≥ 2.0    | Plugin guile (scheme).
-| libv8-dev              | ≤ 3.24.3 | Plugin javascript.
-| php-dev, libphp-embed  | ≥ 7.0    | Plugin php.
-| libxml2-dev            |          | Plugin php.
-// TRANSLATION MISSING
-| libargon2-0-dev        |          | Plugin php (if PHP ≥ 7.2).
-// TRANSLATION MISSING
-| libsodium-dev          |          | Plugin php (if PHP ≥ 7.2).
-// TRANSLATION MISSING
-| asciidoctor            | ≥ 1.5.4  | Build man page and documentation.
-// TRANSLATION MISSING
-| libcpputest-dev        | ≥ 3.4    | Build and run tests.
-|===
-
-[NOTE]
-// TRANSLATION MISSING
-^(1)^ By default Python 3.x is used. If you enable option `+ENABLE_PYTHON2+` (see
+^(4)^ By default Python 3.x is used. If you enable option `+ENABLE_PYTHON2+` (see
 below), only the version 2.7 of Python is recommended.

 // TRANSLATION MISSING
@@ -445,10 +434,6 @@ Se si compila con CMake:
 $ cmake .. -DCMAKE_BUILD_TYPE=Debug
 ----

-// TRANSLATION MISSING
-[[build_debug_address_sanitizer]]
-==== Build with debug options and address sanitizer
-
 // TRANSLATION MISSING
 You can additionally enable the address sanitizer, which causes WeeChat to
 crash immediately in case of problem:
@@ -462,15 +447,7 @@ $ cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_C
 You should enable address sanitizer only if you're trying to cause a crash,
 this is not recommended in production.

-// TRANSLATION MISSING
-Then once compiled and installed, you must run WeeChat like this:
-
----
-$ ASAN_OPTIONS="detect_odr_violation=0 log_path=asan.log" weechat
----
-
-// TRANSLATION MISSING
-In case of crash, the backtrace is in file `asan.log`.
+Se è stato installato il pacchetto binario, installare il pacchetto _weechat-gdb_.

 [[core_files]]
 ==== File core
@@ -619,8 +596,7 @@ Some environment variables are used by WeeChat if they are defined:
 === Files and directories

 WeeChat writes configuration files and other data in directory `~/.weechat`
-by default. +
-These files are created with default values the first time you run WeeChat.
+by default.

 [[weechat_directories]]
 ==== WeeChat directories
@@ -678,8 +654,7 @@ The files in the WeeChat home directory are:
 | perl.conf       | Configuration file for _perl_ plugin       | No.
 | php.conf        | Configuration file for _php_ plugin        | No.
 | python.conf     | Configuration file for _python_ plugin     | No.
-// TRANSLATION MISSING
-| relay.conf      | Configuration file for _relay_ plugin      | *Yes*: it can contain relay password and TOTP secret (if not stored in `sec.conf`), allowed IP addresses/websocket origins and opened ports.
+| relay.conf      | Configuration file for _relay_ plugin      | No.
 | ruby.conf       | Configuration file for _ruby_ plugin       | No.
 | script.conf     | Configuration file for _script_ plugin     | No.
 | spell.conf      | Configuration file for _spell_ plugin      | No.
@@ -750,7 +725,7 @@ Lo schermo è composto dalle seguenti aree:

 La barra _buflist_ ha i seguenti elementi predefiniti:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Elemento | Esempio     | Descrizione
 // TRANSLATION MISSING
@@ -759,7 +734,7 @@ La barra _buflist_ ha i seguenti elementi predefiniti:

 La barra _title_ ha i seguenti elementi predefiniti:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Elemento     | Esempio            | Descrizione
 // TRANSLATION MISSING
@@ -768,7 +743,7 @@ La barra _title_ ha i seguenti elementi predefiniti:

 La barra _status_ ha i seguenti elementi predefiniti:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Elemento              | Esempio                 | Descrizione
 | time                  | `[12:55]`               | Ora.
@@ -791,7 +766,7 @@ La barra _status_ ha i seguenti elementi predefiniti:

 La barra _input_ ha i seguenti elementi predefiniti:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Elemento     | Esempio                                         | Descrizione
 // TRANSLATION MISSING
@@ -805,7 +780,7 @@ La barra _input_ ha i seguenti elementi predefiniti:

 La barra _nicklist_ ha i seguenti elementi predefiniti:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | Elemento        | Esempio   | Descrizione
 // TRANSLATION MISSING
@@ -816,27 +791,17 @@ La barra _nicklist_ ha i seguenti elementi predefiniti:
 Other items available (not used in bars by default):

 // TRANSLATION MISSING
-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
-| Item                         | Example                  | Description
-| buffer_count                 | `10`                     | Total number of buffers opened.
-| buffer_last_number           | `10`                     | Number of the latest buffer (can be different from `buffer_count` if option <<option_weechat.look.buffer_auto_renumber,weechat.look.buffer_auto_renumber>> is `off`).
-| buffer_nicklist_count_all    | `4`                      | Number of visible groups and nicks in nicklist.
-| buffer_nicklist_count_groups | `0`                      | Number of visible groups in nicklist.
-| buffer_short_name            | `#test`                  | Current buffer short name.
-| buflist2                     | `1.weechat`              | List of buffers, second bar item (see option <<option_buflist.look.use_items,buflist.look.use_items>>).
-| buflist3                     | `1.weechat`              | List of buffers, third bar item (see option <<option_buflist.look.use_items,buflist.look.use_items>>).
-| fset                         | `+buflist.look.sort: …+` | Help on currently selected option on fset buffer.
-| irc_channel                  | `#test`                  | Current IRC channel name.
-| irc_host                     | `+user@host.com+`        | Current IRC host.
-| irc_nick                     | `+Flashy+`               | Current IRC nick.
-| irc_nick_host                | `+Flashy!user@host.com+` | Current IRC nick and host.
-| irc_nick_modes               | `i`                      | IRC modes for self nick.
-| irc_nick_prefix              | `@`                      | IRC nick prefix on channel.
-| mouse_status                 | `M`                      | Mouse status (empty if mouse is disabled).
-| spell_dict                   | `fr,en`                  | Spelling dictionaries used on current buffer.
-| spell_suggest                | `print,prone,prune`      | Spelling suggestions for word under cursor (if misspelled).
-| window_number                | `2`                      | Current window number.
+| Item              | Example             | Description
+| spell_dict        | `fr,en`             | Spelling dictionaries used on current buffer.
+| spell_suggest     | `print,prone,prune` | Spelling suggestions for word under cursor (if misspelled).
+| buffer_count      | `10`                | Total number of buffers opened.
+| buffer_short_name | `#test`             | Current buffer short name.
+| irc_channel       | `#test`             | Current IRC channel name.
+| irc_nick_modes    | `@`                 | IRC modes for self nick.
+| mouse_status      | `M`                 | Mouse status (empty if mouse is disabled).
+| window_number     | `2`                 | Current window number.
 |===

 [[command_line]]
@@ -1195,8 +1160,8 @@ Esempio di split orizzontale + verticale:
 ....

 // TRANSLATION MISSING
-[[buffers]]
-=== Buffers
+[[buffers_lines]]
+=== Buffers lines

 [[lines_format]]
 ==== Format of lines
@@ -1270,142 +1235,6 @@ Tag usati di frequente (elenco non esaustivo):
 if a max hotlist level is used for a nick, the notify level can be lower than
 the value in the tag.

-// TRANSLATION MISSING
-[[local_variables]]
-==== Local variables
-
-Local variables can be defined in all buffers.
-
-A local variable has:
-
-* a name (string)
-* a value (string, can be empty).
-
-Local variables can be set by WeeChat, plugins, scripts, or manually on the
-command line in the buffer.
-
-For example to add the local variable "completion_default_template":
-
----
-/buffer setvar completion_default_template %(my_completion)
----
-
-To list local variables in the current buffer:
-
----
-/buffer listvar
----
-
-To remove the local variable "completion_default_template":
-
----
-/buffer delvar completion_default_template
----
-
-By default WeeChat and its default plugins interpret these variables:
-
-[width="100%",cols="^2m,2,5",options="header"]
-|===
-| Name | Value | Description
-
-| away |
-  any string |
-  Away message on the server, set by irc plugin.
-
-| channel |
-  any string |
-  Channel name, set by irc/xfer plugins and debug buffer of relay/trigger plugins.
-
-| charset_modifier |
-  any string |
-  Charset modifier for the server buffer, set by irc plugin.
-
-| completion_default_template |
-  any string |
-  Default completion template for the buffer, overriding the option
-  `weechat.completion.default_template`.
-
-| filter |
-  any string |
-  Filter defined on some buffers like `/fset`, `/server raw` (irc) and `/script`.
-
-| host |
-  any string |
-  Self host (if known), set by irc plugin.
-
-| lag |
-  any string |
-  Lag on the server, set by irc plugin.
-
-| name |
-  any string |
-  Buffer name (be careful, this is not the full name and this name is not
-  enough to identify or search a buffer).
-
-| nick |
-  any string |
-  Self nick, set by irc and xfer plugins.
-
-| no_log |
-  `1` (or any non-empty string) |
-  If set, the logger plugin does not log anything for the buffer.
-
-| plugin |
-  any string |
-  Name of plugin which created the buffer (`core` for WeeChat buffers).
-
-| script_close_cb |
-  any string |
-  Close callback defined by a script for a buffer.
-
-| script_close_cb_data |
-  any string |
-  Data for close callback defined by a script for a buffer.
-
-| script_input_cb |
-  any string |
-  Input callback defined by a script for a buffer.
-
-| script_input_cb_data |
-  any string |
-  Data for input callback defined by a script for a buffer.
-
-| script_name |
-  any string |
-  Name of the script which created the buffer.
-
-| server |
-  any string |
-  Server name, set by irc plugin and debug buffer of relay/trigger plugins.
-
-| spell_suggest |
-  any string |
-  Misspelled word and suggestions (format: "misspelled:suggestions"), set by
-  spell plugin.
-
-| trigger_filter |
-  any string |
-  Trigger filter, set by trigger plugin.
-
-| type |
-  any string, for example:
-  `channel`,
-  `debug`,
-  `exec`,
-  `option`,
-  `private`,
-  `relay`,
-  `script`,
-  `server`,
-  `user`,
-  `xfer` |
-  Type of buffer, set by WeeChat and many plugins.
-
-|===
-
-[NOTE]
-External plugins and scripts can define and use other local variables.
-
 // TRANSLATION MISSING
 [[bars]]
 === Bars
@@ -2383,26 +2212,11 @@ but highly recommended, otherwise data is stored as plain text in file.
 /secure passphrase this is my passphrase
 ----

-// TRANSLATION MISSING
-===== Passphrase on startup
+When a passphrase is set, WeeChat will ask you to enter it on startup (but not
+on `/upgrade`).

-When a passphrase is set, WeeChat will ask you to enter it on startup
-(but not on `/upgrade`).
-
-If you are using a password manager, you can run an external program to read
-the passphrase instead of having to type it manually on WeeChat startup. +
-For example with password-store (command `pass`):
-
----
-/set sec.crypt.passphrase_command "pass show weechat/passphrase"
----
-
-The program may ask you unlock your GPG key or enter another passphrase to
-read the secret. WeeChat will wait for the end of the command to read the
-passphrase on the standard output (it must be on the first line without any
-extra character). +
-If the output contains no passphrase or if it is wrong, WeeChat will then ask
-you to enter it.
+You can change this behavior and use a file with the passphrase (see option
+<<option_sec.crypt.passphrase_file,sec.crypt.passphrase_file>>).

 [[secured_data_encryption]]
 ===== Encryption
@@ -3504,7 +3318,7 @@ le variabili buffer locali per costruire il nome del file. To see available
 local variables for current buffer:

 ----
-/buffer listvar
+/buffer localvar
 ----

 // TRANSLATION MISSING
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -32,21 +32,19 @@ if(ENABLE_MAN)
  add_custom_target(doc-man-weechat-ja ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/ja/man1)

-  if(ENABLE_HEADLESS)
-    # man page: weechat-headless
-    add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
-      COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.ja.adoc
-      DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.ja.adoc
-      ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.ja.adoc
-      ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.ja.adoc
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      COMMENT "Building weechat-headless.1 (ja)"
-    )
-    add_custom_target(doc-man-weechat-headless-ja ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/ja/man1)
-  endif()
+  # man page: weechat-headless
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.ja.adoc
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.ja.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.ja.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.ja.adoc
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Building weechat-headless.1 (ja)"
+  )
+  add_custom_target(doc-man-weechat-headless-ja ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/ja/man1)
 endif()

 if(ENABLE_DOC)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -120,10 +120,6 @@

 | weechat | bars_options | バーのオプション

-| weechat | buffer_local_variable_value | value of a buffer local variable
-
-| weechat | buffer_local_variables | buffer local variables
-
 | weechat | buffer_properties_get | バッファから読み取り可能なプロパティ

 | weechat | buffer_properties_set | バッファに指定可能なプロパティ
@@ -20,8 +20,6 @@

 | irc | irc_is_channel | 文字列がサーバの有効な IRC チャンネル名なら 1 | サーバ、チャンネル (サーバは任意)

-| irc | irc_is_message_ignored | 1 if the nick is ignored (message is not displayed) | server,message (message is the raw IRC message)
-
 | irc | irc_is_nick | 文字列が有効な IRC ニックネームなら 1 | server,nickname (server is optional)

 | irc | irc_nick | あるサーバの現在のニックネームを取得 | サーバ名
@@ -14,7 +14,5 @@

 | weechat | focus_info | get focus info | "x": x coordinate (string with integer >= 0), "y": y coordinate (string with integer >= 0) | see function "hook_focus" in Plugin API reference

-| weechat | secured_data | secured data | - | secured data: names and values (be careful: the values are sensitive data: do NOT print/log them anywhere)
-
 |===
 // end::infos_hashtable[]
@@ -219,7 +219,6 @@ file: ファイル名 (ローカルホスト上の)

 ----
 /dehalfop  <nick> [<nick>...]
-           * -yes

 nick: ニックネームまたはマスク (ワイルドカード "*" を使うことができます)
   *: 自分以外のチャンネル参加者からチャンネルの half-operator 権を剥奪
@@ -933,7 +932,6 @@ target: サーバ名

 ----
 /voice  <nick> [<nick>...]
-        * -yes

 nick: ニックネームまたはマスク (ワイルドカード "*" を使うことができます)
   *: チャンネル参加者全員に voice 権を付与
@@ -1022,7 +1020,7 @@ Note: in command, special variables are replaced:
      $n-m: arguments from 'n' to 'm'
        $*: all arguments
        $~: last argument
-      $var: where "var" is a local variable of buffer (see /buffer listvar)
+      $var: where "var" is a local variable of buffer (see /buffer localvar)
            examples: $nick, $channel, $server, $plugin, $name

 Examples:
@@ -1115,9 +1113,7 @@ message: 離席メッセージ (メッセージが無い場合は、離席状態
         renumber [<number1> [<number2> [<start>]]]
         close [<n1>[-<n2>]|<name>...]
         notify [<level>]
-         listvar [<number>|<name>]
-         setvar <name> [<value>]
-         delvar <name>
+         localvar [<number>|<name>]
         set <property> [<value>]
         get <property>
         <number>|-|+|<name>
@@ -1141,10 +1137,8 @@ renumber: renumber buffers (works only if option weechat.look.buffer_auto_renumb
            message: for messages from users + highlights
                all: all messages
              reset: reset to default value (all)
- listvar: display local variables in a buffer
-  setvar: set a local variable in the current buffer
-  delvar: delete a local variable from the current buffer
-     set: set a property in the current buffer
+localvar: display local variables for the buffer
+     set: set a property for current buffer
     get: display a property of current buffer
  number: jump to buffer by number, possible prefix:
          '+': relative jump, add number to current
@@ -1302,11 +1296,11 @@ infolists: インフォリストに関する情報を表示

 ----
 /eval  [-n|-s] [-d] <expression>
-       [-n] [-d [-d]] -c <expression1> <operator> <expression2>
+       [-n] [-d] -c <expression1> <operator> <expression2>

        -n: display result without sending it to buffer (debug mode)
        -s: split expression before evaluating it (many commands can be separated by semicolons)
-        -d: display debug output after evaluation (with two -d: more verbose debug)
+        -d: display debug output after evaluation
        -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:
@@ -1341,27 +1335,25 @@ To force a string comparison, you can add double quotes around each expression,
  "50" > "100"  ==> 1

 Some variables are replaced in expression, using the format ${variable}, variable can be, by order of priority:
-  1. the string itself without evaluation (format: "raw:xxx")
-  2. an evaluated sub-string (format: "eval:xxx")
-  3. an evaluated condition (format: "eval_cond:xxx")
-  4. a string with escaped chars (format: "esc:xxx" or "\xxx")
-  5. a string with chars to hide (format: "hide:char,string")
-  6. a string with max chars (format: "cut:max,suffix,string" or "cut:+max,suffix,string")
+  1. an evaluated sub-string (format: "eval:xxx")
+  2. a string with escaped chars (format: "esc:xxx" or "\xxx")
+  3. a string with chars to hide (format: "hide:char,string")
+  4. a string with max chars (format: "cut:max,suffix,string" or "cut:+max,suffix,string")
     or max chars displayed on screen (format: "cutscr:max,suffix,string" or "cutscr:+max,suffix,string")
-  7. a reversed string (format: "rev:xxx" or "revscr:xxx")
-  8. a repeated string (format: "repeat:count,string")
-  9. length of a string (format: "length:xxx" or "lengthscr:xxx")
-  10. a color (format: "color:xxx", see "Plugin API reference", function "color")
-  11. a modifier (format: "modifier:name,data,string")
-  12. an info (format: "info:name,arguments", arguments are optional)
-  13. a base 16/32/64 encoded/decoded string (format: "base_encode:base,xxx" or "base_decode:base,xxx")
-  14. current date/time (format: "date" or "date:format")
-  15. an environment variable (format: "env:XXX")
-  16. a ternary operator (format: "if:condition?value_if_true:value_if_false")
-  17. result of an expression with parentheses and operators + - * / // % ** (format: "calc:xxx")
-  18. an option (format: "file.section.option")
-  19. a local variable in buffer
-  20. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
+  5. a reversed string (format: "rev:xxx" or "revscr:xxx")
+  6. a repeated string (format: "repeat:count,string")
+  7. length of a string (format: "length:xxx" or "lengthscr:xxx")
+  8. a color (format: "color:xxx", see "Plugin API reference", function "color")
+  9. a modifier (format: "modifier:name,data,string")
+  10. an info (format: "info:name,arguments", arguments are optional)
+  11. a base 16/32/64 encoded/decoded string (format: "base_encode:base,xxx" or "base_decode:base,xxx")
+  12. current date/time (format: "date" or "date:format")
+  13. an environment variable (format: "env:XXX")
+  14. a ternary operator (format: "if:condition?value_if_true:value_if_false")
+  15. result of an expression with parentheses and operators + - * / // % ** (format: "calc:xxx")
+  16. an option (format: "file.section.option")
+  17. a local variable in buffer
+  18. 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:
@@ -1372,8 +1364,6 @@ Format for hdata can be one of following:
 For name of hdata and variables, please look at "Plugin API reference", function "weechat_hdata_get".

 Examples (simple strings):
-  /eval -n ${raw:${info:version}}                ==> ${info:version}
-  /eval -n ${eval_cond:${window.win_width}>100}  ==> 1
  /eval -n ${info:version}                       ==> 0.4.3
  /eval -n ${env:HOME}                           ==> /home/user
  /eval -n ${weechat.look.scroll_amount}         ==> 3
@@ -1416,62 +1406,60 @@ Examples (conditions):
         enable|disable|toggle [<name>|@]
         add|addreplace <name> <buffer>[,<buffer>...] <tags> <regex>
         rename <name> <new_name>
-         recreate <name>
         del <name>|-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
-addreplace: add or replace an existing filter
-    rename: rename a filter
-  recreate: set input with the command used to edit the 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: 全てのフィルタをリストアップ
+    enable: フィルタを有効化 (フィルタはデフォルトで有効になっています)
+   disable: フィルタを無効化
+    toggle: フィルタの有効無効を切り替え
+      name: フィルタの名前 ("@" = 現在のバッファに設定されている全てのフィルタを有効化/無効化)
+       add: フィルタを追加
+addreplace: 既存のフィルタに追加もしくは置換
+    rename: フィルタをリネーム
+       del: フィルタを削除
+      -all: 全てのフィルタを削除
+    buffer: フィルタが有効化されているバッファのコンマ区切りリスト:
+            - これはプラグイン名を含む完全な名前です (例: "irc.freenode.#weechat" または "irc.server.freenode")
+            - "*" は全てのバッファを意味します
+            - 名前が '!' から始まるものは除外されます
+            - ワイルドカード "*" を使うことができます
+      tags: タグのコンマ区切りリスト、例えば "irc_join,irc_part,irc_quit"
+            - 論理積 "and": タグ同士を "+" でつなげてください (例: "nick_toto+irc_action")
+            - ワイルドカード "*" を使うことができます
+            - タグを '!' で始めると、そのタグが付けられたメッセージとそのタグを含むメッセージはフィルタされません
+     regex: 行単位検索の正規表現
+            - '\t' を使うと、プレフィックスをメッセージから分離できます。'|' 等の特別な文字は '\|' のようにエスケープしなければいけません
+            - 正規表現の最初に '!' が含まれる場合は、マッチ結果が反転されます (最初の '!' にマッチさせたければ、'\!' を使ってください)
+            - 2 種類の正規表現があります: 一方はプレフィックス用、他方はメッセージ用
+            - 正規表現は大文字小文字を区別しません、"(?-i)" から始まる場合は区別します

-The default key alt+'=' toggles filtering on/off globally and alt+'-' toggles filtering on/off in the current buffer.
+デフォルトではキー alt+'=' ですべてのバッファについてフィルタリングの on/off を切り替えられます。現在のバッファに限りフィルタリングを切り替えるには alt+'-' を使います。

-Tags most commonly used:
-  no_filter, no_highlight, no_log, log0..log9 (log level),
-  notify_none, notify_message, notify_private, notify_highlight,
-  self_msg, 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
+よく使われるタグ:
+  no_filter、no_highlight、no_log、log0..log9 (ログレベル)、
+  notify_none、notify_message、notify_private、notify_highlight、
+  self_msg、nick_xxx (xxx はメッセージのニックネーム部分)、prefix_nick_ccc (ccc はニックネームの色)、
+  host_xxx (xxx はメッセージのユーザ名 + ホスト名部分)、
+  irc_xxx (xxx はコマンド名または番号、/server raw または /debug tags で確認)、
+  irc_numeric、irc_error、irc_action、irc_ctcp、irc_ctcp_reply、irc_smart_filter、away_info。
+バッファ内でタグを見るには: /debug tags

-Examples:
-  use IRC smart filter on all buffers:
+例:
+  全てのバッファで IRC スマートフィルタを使用:
    /filter add irc_smart * irc_smart_filter *
-  use IRC smart filter on all buffers except those with "#weechat" in name:
+  名前に "#weechat" を含むバッファを除いた全てのバッファで IRC スマートフィルタを使用:
    /filter add irc_smart *,!*#weechat* irc_smart_filter *
-  filter all IRC join/part/quit messages:
+  全ての IRC join/part/quit メッセージをフィルタ:
    /filter add joinquit * irc_join,irc_part,irc_quit *
-  filter nicks displayed when joining channels or with /names:
+  チャンネルに入った時や /names で表示されるニックネームをフィルタ:
    /filter add nicks * irc_366 *
-  filter nick "toto" on IRC channel #weechat:
+  IRC チャンネル #weechat で "toto" を含むニックネームをフィルタ:
    /filter add toto irc.freenode.#weechat nick_toto *
-  filter IRC join/action messages from nick "toto":
+  ニックネーム "toto" からの IRC の参加/アクションメッセージをフィルタ:
    /filter add toto * nick_toto+irc_join,nick_toto+irc_action *
-  filter lines containing "weechat sucks" on IRC channel #weechat:
+  IRC チャンネル #weechat で "weechat sucks" を含む行をフィルタ:
    /filter add sucks irc.freenode.#weechat * weechat sucks
-  filter lines that are strictly equal to "WeeChat sucks" on all buffers:
+  すべてのバッファで "WeeChat sucks" と完全に一致する行をフィルタ:
    /filter add sucks2 * * (?-i)^WeeChat sucks$
 ----

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

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

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

-Keys on secure buffer:
-  alt+v  toggle values
+保護バッファ内で利用可能なキー:
+  alt+v  値を切り替えます

-When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
-It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade), or to set option sec.crypt.passphrase_command to read the passphrase from the output of an external command like a password manager (see /help sec.crypt.passphrase_command).
+パスフレーズを利用する場合 (データが暗号化されている場合)、WeeChat は起動時にパスフレーズを尋ねます。
+入力を回避するには、環境変数 "WEECHAT_PASSPHRASE" を利用するか (WeeChat は /upgrade の時に同じ変数を利用します)、sec.crypt.passphrase_file オプションを設定してファイルからパスフレーズを読み込みます (/help sec.crypt.passphrase_file を参照してください)。

-Secured data with format ${sec.data.xxx} can be used in:
-  - command /eval
-  - command line argument "--run-command"
-  - options weechat.startup.command_{before|after}_plugins
-  - other options that may contain a password or sensitive data (for example proxy, irc server and relay); see /help on the options to check if they are evaluated.
+${sec.data.xxx} の形で書かれた保護データは以下の様に利用できます:
+  - /eval コマンド
+  - コマンドライン引数 "--run-command"
+  - weechat.startup.command_{before|after}_plugins オプション
+  - パスワードや機密データを含むと思われるその他のオプション (例えば、プロキシ、irc サーバ、リレー); 保護データが評価されるかを確認するには各オプションの /help を参照してください。

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

@@ -2833,16 +2819,6 @@ On script buffer, the possible status for each script are:
  | installed
  popular script

-In output of /script list, the possible status for each script are:
-  * ? i a H N
-  | | | | | |
-  | | | | | obsolete (new version available)
-  | | | | held
-  | | | autoloaded
-  | | installed
-  | unknown script (can not be downloaded/updated)
-  popular script
-
 Keys on script buffer:
  alt+i  install script
  alt+r  remove script
@@ -2972,7 +2948,7 @@ listdefault: list default triggers
             modifier: name(s) of modifier (required)
             line: buffer type ("formatted", "free" or "*"), list of buffer masks, tags
             print: buffer, tags, message, strip colors
-             command: command (required), description, arguments, description of arguments, completion (all arguments except command are evaluated, "${tg_trigger_name}" is replaced by the trigger name, see /help eval)
+             command: command (required), description, arguments, description of arguments, completion (all arguments except command are evaluated, see /help eval)
             command_run: command(s) (required)
             timer: interval (required), align on second, max calls
             config: name(s) of option (required)
@@ -16,8 +16,8 @@
 ** 値: sha224, sha256, sha384, sha512
 ** デフォルト値: `+sha256+`

-* [[option_sec.crypt.passphrase_command]] *sec.crypt.passphrase_command*
-** 説明: pass:none[read the passphrase from the output of this system command (only the first line is used and it must not contain any extra character); this option is used only when reading file sec.conf and if the environment variable "WEECHAT_PASSPHRASE" is not set (the environment variable has higher priority); example with password-store: "pass show weechat/passphrase"]
+* [[option_sec.crypt.passphrase_file]] *sec.crypt.passphrase_file*
+** 説明: pass:none[保護データを暗号化/複合化するためのパスフレーズを保存したファイルパス; このオプションは sec.conf ファイルを読むときだけに利用されます; ファイルの 1 行目だけが利用されます; このファイルは環境変数 "WEECHAT_PASSPHRASE" が設定されていないときだけに利用されます (環境変数のほうが優先順位が高いです); セキュリティ上の注意: このファイルを自分だけが読み込める状態にし、WeeChat ホームの外 (例えば自分のホームディレクトリ) に保存しておくことを推奨します; 例: "~/.weechat-passphrase"]
 ** タイプ: 文字列
 ** 値: 未制約文字列
 ** デフォルト値: `+""+`
@@ -846,12 +846,6 @@
 ** 値: on, off
 ** デフォルト値: `+on+`

-* [[option_weechat.look.hotlist_update_on_buffer_switch]] *weechat.look.hotlist_update_on_buffer_switch*
-** 説明: pass:none[update the hotlist when switching buffers]
-** タイプ: ブール
-** 値: on, off
-** デフォルト値: `+on+`
-
 * [[option_weechat.look.input_cursor_scroll]] *weechat.look.input_cursor_scroll*
 ** 説明: pass:none[行の最後までスクロールする際に入力行の最後に続けて表示される文字の数]
 ** タイプ: 整数
@@ -1146,12 +1140,6 @@
 ** 値: 未制約文字列
 ** デフォルト値: `+"- "+`

-* [[option_weechat.look.read_marker_update_on_buffer_switch]] *weechat.look.read_marker_update_on_buffer_switch*
-** 説明: pass:none[update the read marker when switching buffers]
-** タイプ: ブール
-** 値: on, off
-** デフォルト値: `+on+`
-
 * [[option_weechat.look.save_config_on_exit]] *weechat.look.save_config_on_exit*
 ** 説明: pass:none[終了時に設定ファイルを保存]
 ** タイプ: ブール
@@ -1781,12 +1769,6 @@
 ** タイプ: 文字列
 ** 値: 未制約文字列
 ** デフォルト値: `+"number,-active"+`
-
-* [[option_buflist.look.use_items]] *buflist.look.use_items*
-** 説明: pass:none[number of buflist bar items that can be used; the item names are: "buflist", "buflist2", "buflist3"; be careful, using more than one bar item slows down the display of buffers list]
-** タイプ: 整数
-** 値: 1 .. 3
-** デフォルト値: `+1+`
 // end::buflist_options[]

 // tag::fifo_options[]
@@ -2634,12 +2616,6 @@
 ** 値: 1 .. 3600
 ** デフォルト値: `+60+`

-* [[option_irc.server_default.default_chantypes]] *irc.server_default.default_chantypes*
-** 説明: pass:none[channel type prefixes to use if the server does not send them in message 005 (default is "#&")]
-** タイプ: 文字列
-** 値: 未制約文字列
-** デフォルト値: `+"#&"+`
-
 * [[option_irc.server_default.ipv6]] *irc.server_default.ipv6*
 ** 説明: pass:none[サーバ接続に IPv6 プロトコルを利用 (IPv6 の利用に失敗したら IPv4 を利用); 無効の場合には IPv4 を利用]
 ** タイプ: ブール
@@ -97,7 +97,7 @@ $HOME/.weechat/weechat.log::
 WeeChat は Sébastien Helleu さんと貢献者によって作成されています
 (完全なリストは AUTHORS.adoc ファイルを参照してください)。

-著作権 (C) 2003-2021 {author}
+著作権 (C) 2003-2020 {author}

 WeeChat はフリーソフトウェアです。あなたはこれを、フリーソフトウェア財団によって発行された
 GNU 一般公衆利用許諾契約書 (バージョン 2 か、希望によってはそれ以降のバージョンのうちどれか)
@@ -517,7 +517,7 @@ WeeChat とプラグインの翻訳は gettext で行います、ファイルは
 /*
 * weechat.c - core functions for WeeChat
 *
- * Copyright (C) 2021 Your Name <your@email.com>
+ * Copyright (C) 2020 Your Name <your@email.com>
 *
 * This file is part of WeeChat, the extensible chat client.
 *
@@ -1111,13 +1111,18 @@ Git リポジトリはこの URL にあります: https://github.com/weechat/wee
 リクエストを使って提出することを推奨します。パッチは電子メールで送信することも可能です
 (`git diff` または `git format-patch` で作成してください)。

-// TRANSLATION MISSING
-Format of commit message is the following (with automatic close of a GitHub issue):
+コミットメッセージは以下の書式に従ってください (GitHub の issue を閉じる場合):

 ----
 component: fix a problem (closes #123)
 ----

+Savannah のバグを閉じる場合:
+
+----
+component: fix a problem (bug #12345)
+----
+
 _component_ には以下から 1 つ選んで記入してください:

 * WeeChat コア: _core_ (ルートディレクトリ、_po/_ ディレクトリ、_src/_
@@ -1129,18 +1134,19 @@ _component_ には以下から 1 つ選んで記入してください:

 * 英語を使ってください
 * 動詞の原形を使ってください
-// TRANSLATION MISSING
-* If commit is related to a GitHub issue, write it in parenthesis after
-  the message, with this format: `(issue #123)` or `(closes #123)` to close it.
+* コミットの内容がトラッカーに関するものである場合には、コミットメッセージの後にカッコで括ってその旨記載してください、書式は以下のようにしてください:
+** GitHub: closes #123
+** Savannah: bug #12345, task #12345, patch #12345

 コミットメッセージの例:

 ----
-core: add callback "nickcmp" for nick comparison in buffers
-core: update Japanese translations
 irc: add command /unquiet (closes #36)
-python: fix crash when unloading a script without pointer to interpreter
+core: add callback "nickcmp" for nick comparison in buffers
+irc: fix freeze when reading on socket with SSL enabled (bug #35097)
 ruby: add detection of ruby version 1.9.3 in CMake
+python: fix crash when unloading a script without pointer to interpreter
+core: update Japanese translations (patch #7783)
 ----

 [[translations]]
@@ -227,35 +227,6 @@ _buffers.pl_
 "meta-OP" と "meta-OQ" キーは端末によって異なります。キーコードを見つけるには
 kbd:[Alt+k] の後にキーを押してください。

-// TRANSLATION MISSING
-[[customize_buflist]]
-=== How can I customize the list of buffers list, like the color of the active buffer?
-
-You can browse all buflist options with the command:
-
----
-/fset buflist
----
-
-The background of the active buffer is blue by default, you can change it
-like this, for example to `red`:
-
----
-/set buflist.format.buffer_current "${color:,red}${format_buffer}"
----
-
-[NOTE]
-There's a comma before the color name "red" because it is used as the background,
-not the text color. +
-You can also use any numeric color instead of `red`,
-like `237` for dark gray.
-
-The buflist plugin provides lot of options that you can customize, please read
-the help on each option.
-
-There's also a wiki page with examples of advanced buflist configuration:
-https://github.com/weechat/weechat/wiki/buflist
-
 [[customize_prefix]]
 === どうすればチャットエリア内のニックネームの最大長さを短く、またはニックネーム整列機能を無効化できますか。

@@ -1197,9 +1168,9 @@ link:weechat_user.ja.html#secured_data[ユーザーズガイド / 暗号化デ
 _~/.weechat/*.conf_ ファイルは公開しても問題ありませんが、
 パスフレーズで暗号化されたパスワードが含まれる _sec.conf_ ファイルは秘密にしてください。

-// TRANSLATION MISSING
-Some other files may contain sensitive info like passwords (if they are not
-stored in _sec.conf_ with the `/secure` command).
+サーバおよびチャンネルパスワード等の機密情報を `/secure` コマンドで
+_sec.conf_ に保存していない場合、これらの情報は _irc.conf_
+などのファイルに保存されます。

 設定ファイルに関する詳しい情報はlink:weechat_user.ja.html#files_and_directories[ユーザーズガイド / ファイルとディレクトリ]を参照してください。

@@ -1344,26 +1344,14 @@ int weechat_string_regcomp (void *preg, const char *regex, int default_flags)
 * `regcomp` 関数と同じ戻り値
  (成功の場合は 0、エラーが起きた場合は 0 以外、`man regcomp` を参照)

-[NOTE]
-// TRANSLATION MISSING
-Regular expression _preg_ must be cleaned by calling "regfree" after use,
-if the function returned 0 (OK).
-
 C 言語での使用例:

 [source,C]
 ----
 regex_t my_regex;
-if (weechat_string_regcomp (&my_regex, "(?i)test", REG_EXTENDED) == 0)
-{
-    /* OK */
-    /* ... */
-    regfree (&my_regex);
-}
-else
+if (weechat_string_regcomp (&my_regex, "(?i)test", REG_EXTENDED) != 0)
 {
    /* error */
-    /* ... */
 }
 ----

@@ -2226,7 +2214,7 @@ str3 = weechat.string_input_for_buffer("//test")  # "/test"

 // TRANSLATION MISSING
 _WeeChat ≥ 0.4.0, updated in 0.4.2, 0.4.3, 1.0, 1.1, 1.2, 1.3, 1.6, 1.8, 2.0,
-2.2, 2.3, 2.7, 2.9 and 3.1._
+2.2, 2.3, 2.7 and 2.9._

 式を評価して文字列として返す。`+${variable}+`
 という書式で書かれた特殊変数は展開されます (以下の表を参照)。
@@ -2274,11 +2262,6 @@ char *weechat_string_eval_expression (const char *expr,
 ** _regex_replace_: _regex_ と一緒に使われる置換テキスト、_expr_
   に含まれるテキストを置換する (_regex_replace_ は、_expr_ 内で
   _regex_ 引数にマッチする部分が見つからなくなるまで、毎回評価されます)
-// TRANSLATION MISSING
-** _debug_: debug level (string with integer number ≥ 1), if enabled, a key
-   "debug_output" is added in hashtable _options_:
-*** _1_: enable debug
-*** _2_: enable more verbose debug

 戻り値:

@@ -2548,13 +2531,6 @@ str5 = weechat.string_eval_expression("password=abc password=def", {}, {}, optio
 |===
 | 書式 | 説明 | 例 | 結果

-// TRANSLATION MISSING
-| `+${raw:xxx}+` +
-  _(WeeChat ≥ 3.1)_ |
-  Raw string (not evaluated). |
-  `+${raw:${info:version}}+` |
-  `+${info:version}+`
-
 | `+${name}+` |
  _extra_vars_ の変数 `name` の値に展開 |
  `+${name}+` |
@@ -2567,13 +2543,6 @@ str5 = weechat.string_eval_expression("password=abc password=def", {}, {}, optio
 `+19:02:45+` (オプション weechat.look.buffer_time_format
 内に色コードが存在する場合色付き)

-// TRANSLATION MISSING
-| `+${eval_cond:xxx}+` +
-  _(WeeChat バージョン 3.1 以上で利用可)_ |
-  String to evaluate as condition. |
-  `+${eval_cond:${window.win_width} > 100}+` |
- `+1+`
-
 | `+${esc:xxx}+` +
  `+${\xxx}+` +
  _(WeeChat バージョン 1.0 以上で利用可)_ |
@@ -12268,15 +12237,15 @@ info を使う前にエリアが一致していることを確認して下さい

 バー要素 "buffer_nicklist" の追加情報:

-[width="100%",cols="^1,^1,5",options="header"]
+[width="100%",cols="1,1,5",options="header"]
 |===
-| プラグイン ^(1)^ | キー     | 説明
-| weechat          | nick     | ニックネーム
-| weechat          | prefix   | ニックネームのプレフィックス
-| weechat          | group    | グループ名
+| キー     | プラグイン ^(1)^ | 説明
+| nick     | core             | ニックネーム
+| prefix   | core             | ニックネームのプレフィックス
+| group    | core             | グループ名
 // TRANSLATION MISSING
-| irc              | irc_nick | Pointer to IRC nick _(WeeChat ≥ 3.0)_.
-| irc              | irc_host | ニックネームのホスト名 (判る場合)
+| irc_nick | irc              | Pointer to IRC nick _(WeeChat ≥ 3.0)_.
+| irc_host | irc              | ニックネームのホスト名 (判る場合)
 |===

 [NOTE]
@@ -987,7 +987,7 @@ weechat.buffer_set(buffer, "localvar_del_myvar", "")
 バッファに対するローカル変数を見るには、WeeChat で以下のコマンドを実行してください:

 ----
-/buffer listvar
+/buffer localvar
 ----

 [[hooks]]
@@ -95,22 +95,39 @@ macOS では https://brew.sh/[Homebrew] を使ってください:
 [[dependencies]]
 ==== 依存関係

-// TRANSLATION MISSING
-The following table shows the list of packages that are *required* to compile
-WeeChat:
+以下の表は WeeChat
+のコンパイルに必須または任意で必要なパッケージのリストです。

-[width="100%",cols="5,^3,.^15",options="header"]
+[width="100%",cols="6,^3,^3,.^13",options="header"]
 |===
-| パッケージ ^(1)^       | バージョン       | 機能
+| パッケージ ^(1)^       | バージョン       | 要件   | 機能
 | C コンパイラ
-  (gcc, clang, ...)      |                  | ビルド
-| cmake                  | ≥ 3.0            | ビルド (autotools でも可能ですが、CMake を推奨します)
-| pkg-config             |                  | インストール済みライブラリを検出
-| libncursesw5-dev ^(2)^ |                  | ncurses インターフェース
-| libcurl4-gnutls-dev    |                  | URL 転送
-| zlib1g-dev             |                  | relay プラグインでパケットを圧縮 (weechat プロトコル)、スクリプトプラグイン
-| libgcrypt20-dev        |                  | 保護データ、IRC SASL 認証 (DH-BLOWFISH/DH-AES)
-| libgnutls28-dev        | 2.2.0 以上 ^(3)^ | IRC サーバへの SSL 接続、IRC SASL 認証 (ECDSA-NIST256P-CHALLENGE)
+  (gcc, clang, ...)      |                  | *必須* | ビルド
+| C++ コンパイラ         |                  |        | ビルドとテストの実行、JavaScript プラグイン
+| cmake                  | ≥ 3.0            | *必須* | ビルド (autotools でも可能ですが、CMake を推奨します)
+| pkg-config             |                  | *必須* | インストール済みライブラリを検出
+| libncursesw5-dev ^(2)^ |                  | *必須* | ncurses インターフェース
+| libcurl4-gnutls-dev    |                  | *必須* | URL 転送
+| zlib1g-dev             |                  | *必須* | relay プラグインでパケットを圧縮 (weechat プロトコル)、スクリプトプラグイン
+| libgcrypt20-dev        |                  | *必須* | 保護データ、IRC SASL 認証 (DH-BLOWFISH/DH-AES)
+| libgnutls28-dev        | 2.2.0 以上 ^(3)^ | *必須* | IRC サーバへの SSL 接続、IRC SASL 認証 (ECDSA-NIST256P-CHALLENGE)
+| gettext                |                  |        | 国際化 (メッセージの翻訳; ベース言語は英語です)
+| ca-certificates        |                  |        | SSL 接続に必要な証明書、relay プラグインで SSL サポート
+| libaspell-dev
+  ∥ libenchant-dev       |                  |        | spell プラグイン
+| python3-dev            | ^(4)^            |        | python プラグイン
+| libperl-dev            |                  |        | perl プラグイン
+| ruby2.5, ruby2.5-dev   | 1.9.1 以上       |        | ruby プラグイン
+| liblua5.3-dev          |                  |        | lua プラグイン
+| tcl-dev                | 8.5 以上         |        | tcl プラグイン
+| guile-2.0-dev          | 2.0 以上         |        | guile (scheme) プラグイン
+| libv8-dev              | 3.24.3 以下      |        | javascript プラグイン
+| php-dev, libphp-embed  | 7.0 以上         |        | PHP プラグイン
+| libxml2-dev            |                  |        | PHP プラグイン
+| libargon2-0-dev        |                  |        | PHP プラグイン (PHP 7.2 以上の場合)
+| libsodium-dev          |                  |        | PHP プラグイン (PHP 7.2 以上の場合)
+| asciidoctor            | 1.5.4 以上       |        | man ページと文書のビルド
+| libcpputest-dev        | 3.4 以上         |        | ビルドとテストの実行
 |===

 [NOTE]
@@ -120,38 +137,9 @@ WeeChat:
 (*w* が重要です)。libncurses5-dev でもコンパイル可能ですが、これは推奨
 *されません* (ワイドキャラクタの表示にバグを生じるでしょう)。 +
 ^(3)^ IRC SASL 認証で ECDSA-NIST256P-CHALLENGE を使うには、GnuTLS
-バージョン 3.0.21 以上が必要です。
-
+バージョン 3.0.21 以上が必要です。 +
 // TRANSLATION MISSING
-The following table shows the list of packages that are optional to compile
-WeeChat:
-
-[width="100%",cols="5,^3,.^15",options="header"]
-|===
-| パッケージ             | バージョン  | 機能
-| C++ コンパイラ         |             | ビルドとテストの実行、JavaScript プラグイン
-| gettext                |             | 国際化 (メッセージの翻訳; ベース言語は英語です)
-| ca-certificates        |             | SSL 接続に必要な証明書、relay プラグインで SSL サポート
-| libaspell-dev
-  ∥ libenchant-dev       |             | spell プラグイン
-| python3-dev ^(1)^      |             | python プラグイン
-| libperl-dev            |             | perl プラグイン
-| ruby2.5, ruby2.5-dev   | 1.9.1 以上  | ruby プラグイン
-| liblua5.3-dev          |             | lua プラグイン
-| tcl-dev                | 8.5 以上    | tcl プラグイン
-| guile-2.0-dev          | 2.0 以上    | guile (scheme) プラグイン
-| libv8-dev              | 3.24.3 以下 | javascript プラグイン
-| php-dev, libphp-embed  | 7.0 以上    | PHP プラグイン
-| libxml2-dev            |             | PHP プラグイン
-| libargon2-0-dev        |             | PHP プラグイン (PHP 7.2 以上の場合)
-| libsodium-dev          |             | PHP プラグイン (PHP 7.2 以上の場合)
-| asciidoctor            | 1.5.4 以上  | man ページと文書のビルド
-| libcpputest-dev        | 3.4 以上    | ビルドとテストの実行
-|===
-
-[NOTE]
-// TRANSLATION MISSING
-^(1)^ By default Python 3.x is used. If you enable option `+ENABLE_PYTHON2+` (see
+^(4)^ By default Python 3.x is used. If you enable option `+ENABLE_PYTHON2+` (see
 below), only the version 2.7 of Python is recommended.

 Debian および Ubuntu
@@ -412,10 +400,6 @@ CMake でコンパイルする場合:
 $ cmake .. -DCMAKE_BUILD_TYPE=Debug
 ----

-// TRANSLATION MISSING
-[[build_debug_address_sanitizer]]
-==== Build with debug options and address sanitizer
-
 // TRANSLATION MISSING
 You can additionally enable the address sanitizer, which causes WeeChat to
 crash immediately in case of problem:
@@ -429,15 +413,7 @@ $ cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_C
 You should enable address sanitizer only if you're trying to cause a crash,
 this is not recommended in production.

-// TRANSLATION MISSING
-Then once compiled and installed, you must run WeeChat like this:
-
----
-$ ASAN_OPTIONS="detect_odr_violation=0 log_path=asan.log" weechat
----
-
-// TRANSLATION MISSING
-In case of crash, the backtrace is in file `asan.log`.
+バイナリパッケージをインストールする場合は、_weechat-dbg_ パッケージをインストールしてください。

 [[core_files]]
 ==== Core ファイル
@@ -575,9 +551,7 @@ include::includes/cmdline_options.ja.adoc[tag=debug]
 === ファイルとディレクトリ

 デフォルト状態の WeeChat は `~/.weechat`
-ディレクトリ内に設定ファイルおよびその他のデータを書き込みます。 +
-// TRANSLATION MISSING
-These files are created with default values the first time you run WeeChat.
+ディレクトリ内に設定ファイルおよびその他のデータを書き込みます。

 // TRANSLATION MISSING
 [[weechat_directories]]
@@ -638,8 +612,7 @@ WeeChat ホームディレクトリには以下のファイルが含まれます
 | perl.conf       | _perl_ プラグイン用の設定ファイル       | 保護されません
 | php.conf        | _php_ プラグイン用の設定ファイル        | 保護されません
 | python.conf     | _python_ プラグイン用の設定ファイル     | 保護されません
-// TRANSLATION MISSING
-| relay.conf      | _relay_ プラグイン用の設定ファイル      | *Yes*: it can contain relay password and TOTP secret (if not stored in `sec.conf`), allowed IP addresses/websocket origins and opened ports.
+| relay.conf      | _relay_ プラグイン用の設定ファイル      | 保護されません
 | ruby.conf       | _ruby_ プラグイン用の設定ファイル       | 保護されません
 | script.conf     | _script_ プラグイン用の設定ファイル     | 保護されません
 | spell.conf      | _spell_ プラグイン用の設定ファイル      | 保護されません
@@ -708,7 +681,7 @@ WeeChat を起動した端末の例:

 バッファリスト (_buflist_) バーは以下の初期要素を持っています:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | 要素    | 例          | 説明
 | buflist | `1.weechat` | バッファ一覧
@@ -716,7 +689,7 @@ WeeChat を起動した端末の例:

 状態 (_title_) バーは以下の初期要素を持っています:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | 要素         | 例                 | 説明
 | buffer_title | `Welcome to #test` | バッファタイトル
@@ -724,7 +697,7 @@ WeeChat を起動した端末の例:

 状態 (_status_) バーは以下の初期要素を持っています:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | 要素                  | 例                      | 説明
 | time                  | `[12:55]`               | 時刻
@@ -745,7 +718,7 @@ WeeChat を起動した端末の例:

 入力 (_input_) バーは以下の初期要素を持っています:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | 要素         | 例                                           | 説明
 | input_prompt | `[@Flashy]`                                  | 入力プロンプト、irc の場合: ニックネームとモード (freenode では "+i" モードは不可視状態を意味します)
@@ -757,7 +730,7 @@ WeeChat を起動した端末の例:

 ニックネームリスト (_nicklist_) バーは以下の初期要素を持っています:

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
 | 要素            | 例        | 説明
 | buffer_nicklist | `@Flashy` | 現在のバッファのニックネーム一覧
@@ -765,37 +738,17 @@ WeeChat を起動した端末の例:

 その他の利用可能な要素 (初期状態のバーはこれらの要素を持ちません):

-[width="100%",cols="^3,^3,9",options="header"]
+[width="100%",cols="^3,^4,10",options="header"]
 |===
-| 要素                         | 例                       | 説明
-| buffer_count                 | `10`                     | 開いているバッファの総数
-// TRANSLATION MISSING
-| buffer_last_number           | `10`                     | Number of the latest buffer (can be different from `buffer_count` if option <<option_weechat.look.buffer_auto_renumber,weechat.look.buffer_auto_renumber>> is `off`).
-// TRANSLATION MISSING
-| buffer_nicklist_count_all    | `4`                      | Number of visible groups and nicks in nicklist.
-// TRANSLATION MISSING
-| buffer_nicklist_count_groups | `0`                      | Number of visible groups in nicklist.
-| buffer_short_name            | `#test`                  | 現在のバッファの短い名前
-// TRANSLATION MISSING
-| buflist2                     | `1.weechat`              | List of buffers, second bar item (see option <<option_buflist.look.use_items,buflist.look.use_items>>).
-// TRANSLATION MISSING
-| buflist3                     | `1.weechat`              | List of buffers, third bar item (see option <<option_buflist.look.use_items,buflist.look.use_items>>).
-// TRANSLATION MISSING
-| fset                         | `+buflist.look.sort: …+` | Help on currently selected option on fset buffer.
-| irc_channel                  | `#test`                  | 現在の IRC チャンネル名
-// TRANSLATION MISSING
-| irc_host                     | `+user@host.com+`        | Current IRC host.
-// TRANSLATION MISSING
-| irc_nick                     | `+Flashy+`               | Current IRC nick.
-// TRANSLATION MISSING
-| irc_nick_host                | `+Flashy!user@host.com+` | Current IRC nick and host.
-| irc_nick_modes               | `i`                      | 自分のニックネームに対する IRC モード
-// TRANSLATION MISSING
-| irc_nick_prefix              | `@`                      | IRC nick prefix on channel.
-| mouse_status                 | `M`                      | マウスの状態 (マウスが無効化されている場合は空文字列)
-| spell_dict                   | `fr,en`                  | 現在のバッファにおけるスペリング辞書
-| spell_suggest                | `print,prone,prune`      | カーソル下の単語に対するスペリング候補 (スペルが間違っている場合)
-| window_number                | `2`                      | 現在のウィンドウ番号
+| 要素              | 例                  | 説明
+| spell_dict        | `fr,en`             | 現在のバッファにおけるスペリング辞書
+| spell_suggest     | `print,prone,prune` | カーソル下の単語に対するスペリング候補 (スペルが間違っている場合)
+| buffer_count      | `10`                | 開いているバッファの総数
+| buffer_short_name | `#test`             | 現在のバッファの短い名前
+| irc_channel       | `#test`             | 現在の IRC チャンネル名
+| irc_nick_modes    | `@`                 | 自分のニックネームに対する IRC モード
+| mouse_status      | `M`                 | マウスの状態 (マウスが無効化されている場合は空文字列)
+| window_number     | `2`                 | 現在のウィンドウ番号
 |===

 [[command_line]]
@@ -1142,9 +1095,8 @@ _window_
                 ▲ ウィンドウ #1 (バッファ #3)         ▲ ウィンドウ #2 (バッファ #4)
 ....

-// TRANSLATION MISSING
-[[buffers]]
-=== Buffers
+[[buffers_lines]]
+=== バッファの行

 [[lines_format]]
 ==== 行の書式
@@ -1216,142 +1168,6 @@ WeeChat は様々な目的で各行にタグを付けます:
 if a max hotlist level is used for a nick, the notify level can be lower than
 the value in the tag.

-// TRANSLATION MISSING
-[[local_variables]]
-==== Local variables
-
-Local variables can be defined in all buffers.
-
-A local variable has:
-
-* a name (string)
-* a value (string, can be empty).
-
-Local variables can be set by WeeChat, plugins, scripts, or manually on the
-command line in the buffer;
-
-For example to add the local variable "completion_default_template":
-
----
-/buffer setvar completion_default_template %(my_completion)
----
-
-To list local variables in the current buffer:
-
----
-/buffer listvar
----
-
-To remove the local variable "completion_default_template":
-
----
-/buffer delvar completion_default_template
----
-
-By default WeeChat and its default plugins interpret these variables:
-
-[width="100%",cols="^2m,2,5",options="header"]
-|===
-| Name | Value | Description
-
-| away |
-  any string |
-  Away message on the server, set by irc plugin.
-
-| channel |
-  any string |
-  Channel name, set by irc/xfer plugins and debug buffer of relay/trigger plugins.
-
-| charset_modifier |
-  any string |
-  Charset modifier for the server buffer, set by irc plugin.
-
-| completion_default_template |
-  any string |
-  Default completion template for the buffer, overriding the option
-  `weechat.completion.default_template`.
-
-| filter |
-  any string |
-  Filter defined on some buffers like `/fset`, `/server raw` (irc) and `/script`.
-
-| host |
-  any string |
-  Self host (if known), set by irc plugin.
-
-| lag |
-  any string |
-  Lag on the server, set by irc plugin.
-
-| name |
-  any string |
-  Buffer name (be careful, this is not the full name and this name is not
-  enough to identify or search a buffer).
-
-| nick |
-  any string |
-  Self nick, set by irc and xfer plugins.
-
-| no_log |
-  `1` (or any non-empty string) |
-  If set, the logger plugin does not log anything for the buffer.
-
-| plugin |
-  any string |
-  Name of plugin which created the buffer (`core` for WeeChat buffers).
-
-| script_close_cb |
-  any string |
-  Close callback defined by a script for a buffer.
-
-| script_close_cb_data |
-  any string |
-  Data for close callback defined by a script for a buffer.
-
-| script_input_cb |
-  any string |
-  Input callback defined by a script for a buffer.
-
-| script_input_cb_data |
-  any string |
-  Data for input callback defined by a script for a buffer.
-
-| script_name |
-  any string |
-  Name of the script which created the buffer.
-
-| server |
-  any string |
-  Server name, set by irc plugin and debug buffer of relay/trigger plugins.
-
-| spell_suggest |
-  any string |
-  Misspelled word and suggestions (format: "misspelled:suggestions"), set by
-  spell plugin.
-
-| trigger_filter |
-  any string |
-  Trigger filter, set by trigger plugin.
-
-| type |
-  any string, for example:
-  `channel`,
-  `debug`,
-  `exec`,
-  `option`,
-  `private`,
-  `relay`,
-  `script`,
-  `server`,
-  `user`,
-  `xfer` |
-  Type of buffer, set by WeeChat and many plugins.
-
-|===
-
-[NOTE]
-External plugins and scripts can define and use other local variables.
-
 [[bars]]
 === バー

@@ -2276,26 +2092,11 @@ _sec.conf_
 /secure passphrase this is my passphrase
 ----

-// TRANSLATION MISSING
-===== Passphrase on startup
+パスフレーズを設定した場合、WeeChat
+の起動時にパスフレーズの入力が求められるようになります (`/upgrade` 時には求められません)。

-When a passphrase is set, WeeChat will ask you to enter it on startup
-(but not on `/upgrade`).
-
-If you are using a password manager, you can run an external program to read
-the passphrase instead of having to type it manually on WeeChat startup. +
-For example with password-store (command `pass`):
-
----
-/set sec.crypt.passphrase_command "pass show weechat/passphrase"
----
-
-The program may ask you unlock your GPG key or enter another passphrase to
-read the secret. WeeChat will wait for the end of the command to read the
-passphrase on the standard output (it must be on the first line without any
-extra character). +
-If the output contains no passphrase or if it is wrong, WeeChat will then ask
-you to enter it.
+この挙動を変更し、パスフレーズを保存したファイルを使うことも可能です
+(<<option_sec.crypt.passphrase_file,sec.crypt.passphrase_file>> オプションを参照してください)。

 [[secured_data_encryption]]
 ===== 暗号化
@@ -3316,7 +3117,7 @@ It is possible to define a filename mask for each buffer, and use local buffer
 variables to build filename. To see available local variables for current buffer:

 ----
-/buffer listvar
+/buffer localvar
 ----

 // TRANSLATION MISSING
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2021 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2020 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -32,21 +32,19 @@ if(ENABLE_MAN)
  add_custom_target(doc-man-weechat-pl ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/pl/man1)

-  if(ENABLE_HEADLESS)
-    # man page: weechat-headless
-    add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
-      COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.pl.adoc
-      DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.pl.adoc
-      ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.pl.adoc
-      ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.pl.adoc
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      COMMENT "Building weechat-headless.1 (pl)"
-    )
-    add_custom_target(doc-man-weechat-headless-pl ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/pl/man1)
-  endif()
+  # man page: weechat-headless
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.pl.adoc
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.pl.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.pl.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.pl.adoc
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Building weechat-headless.1 (pl)"
+  )
+  add_custom_target(doc-man-weechat-headless-pl ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/pl/man1)
 endif()

 if(ENABLE_DOC)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sébastien Helleu	8b5da3c6cb	core: add CVE id in ChangeLog	2021-09-07 20:33:44 +02:00
Sébastien Helleu	e852cef92a	core: force version 18.04 of Ubuntu in CI	2021-09-04 23:14:48 +02:00
Sébastien Helleu	84e44632e5	relay: fix crash when decoding a malformed websocket frame	2021-09-04 23:09:19 +02:00
Sébastien Helleu	77bbd5f875	Version 3.0.2-dev	2021-09-04 23:06:58 +02:00
Sébastien Helleu	93f5371cf8	Version 3.0.1	2021-01-31 10:07:53 +01:00
Sébastien Helleu	9db6255a84	Revert "exec: return NULL immediately if the task id is invalid" This reverts commit `dff1bf6f0f`. (cherry picked from commit `08ebc99dea`)	2020-12-06 13:42:30 +01:00
Sébastien Helleu	03d36f13af	spell: fix refresh of bar item "spell_suggest" when the input becomes empty (issue #1586 ) When the input is empty, length of string is zero: when sending zero to function weechat_string_dyn_alloc, the function returns NULL and therefore we return immediately instead of handling the empty input, which is a valid value. The regression was introduced by the use of dynamic strings, commit: `299f74bfef` (cherry picked from commit `eb90a73fe8`)	2020-11-20 22:21:59 +01:00
Sébastien Helleu	b1fe88d5d4	spell: fix crash with IRC color codes in command line (issue #1589 ) (cherry picked from commit `ee24fac586`)	2020-11-20 22:14:22 +01:00
Sébastien Helleu	dcccfa2255	Version 3.0.1-dev	2020-11-20 22:14:12 +01:00