Merge branch 'master' of github.com:weechat/weechat

22 files changed, 340 insertions, 226 deletions

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index bf1233847..da5a02254 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -359,7 +359,7 @@ Bug fixes::
 
 Build::
 
-  * core, irc, xfer: fix compilation on Mac OS X (add link with resolv) (issue #276)
+  * core, irc, xfer: fix compilation on macOS (add link with resolv) (issue #276)
   * core: add build of xz package with make dist (cmake)
   * tests: fix compilation of tests on FreeBSD 11.0
 
@@ -812,7 +812,7 @@ Bug fixes::
   * core: fix reset of attributes in bars when "resetcolor" is used (issue #41)
   * core: fix alignment of lines in merged buffers when options weechat.look.prefix_align and weechat.look.prefix_buffer_align are set to "none" (issue #43)
   * core: quit WeeChat on signal SIGHUP, remove signal "signal_sighup"
-  * core: fix add of filter on OS X when regex for message is empty (filter regex ending with "\t")
+  * core: fix add of filter on macOS when regex for message is empty (filter regex ending with "\t")
   * core: check validity of buffer pointer when data is sent to a buffer (command/text from user and API function command())
   * core: fix crash when buffer is closed during execution of multiple commands (issue #27)
   * core: fix compilation on SmartOS (bug #40981, issue #23)
@@ -872,13 +872,13 @@ Bug fixes::
   * scripts: fix crash when a signal is received with type "int" and NULL pointer in signal_data
   * xfer: fix problem with option xfer.file.auto_accept_nicks when the server name contains dots
   * xfer: fix freeze/problems when sending empty files with DCC (issue #53)
-  * xfer: fix connection to remote host in DCC receive on Mac OS X (issue #25)
+  * xfer: fix connection to remote host in DCC receive on macOS (issue #25)
   * xfer: remove bind on xfer.network.own_ip (issue #5)
 
 Build::
 
   * core: fix cmake warning CMP0007 on "make uninstall" (bug #41528)
-  * core: use glibtoolize on Mac OS X (autotools) (issue #22)
+  * core: use glibtoolize on macOS (autotools) (issue #22)
   * ruby: add detection of Ruby 2.1
 
 Tests::
@@ -1113,7 +1113,7 @@ Bug fixes::
   * core: fix hidden lines for messages without date when option weechat.history.max_buffer_lines_minutes is set (bug #38197)
   * core: use default hash/comparison callback for keys of type integer/pointer/time in hashtable
   * api: do not display a warning by default when loading a script with a license different from GPL
-  * api: fix connection to servers with hook_connect() on OS X (bug #38496)
+  * api: fix connection to servers with hook_connect() on macOS (bug #38496)
   * api: fix bug in function string_match() when mask begins and ends with "*"
   * api: allow hashtable with keys that are not strings in function hashtable_add_to_infolist()
   * api: fix function string_mask_to_regex(): escape all special chars used in regex (bug #38398)
@@ -1149,7 +1149,7 @@ Bug fixes::
 Build::
 
   * core: install icon file (patch #7972)
-  * core: fix detection of iconv with cmake on OS X (bug #38321)
+  * core: fix detection of iconv with cmake on macOS (bug #38321)
   * guile: fix compilation with Guile 2.0
   * python: fix detection of Python on Ubuntu Raring
   * script: fix compilation on GNU/Hurd (patch #7977)
@@ -1239,7 +1239,7 @@ Build::
   * core: add git version in build, display it in "weechat-curses --help" and /version
   * core: stop cmake if gcrypt lib is not found (bug #37671)
   * guile: fix detection of Guile in configure
-  * script: fix compilation on OS X
+  * script: fix compilation on macOS
 
 [[v0.3.9.2]]
 == Version 0.3.9.2 (2012-11-18)
@@ -1395,7 +1395,7 @@ Bug fixes::
   * irc: close server buffer when server is deleted
   * irc: add search for lower case nicks in option irc.look.nick_color_force
   * logger: fix charset of lines displayed in backlog when terminal charset is different from UTF-8 (bug #36379)
-  * perl: fix crash on quit on OS X
+  * perl: fix crash on quit on macOS
   * relay: keep spaces in beginning of "input" received from client (WeeChat protocol)
   * relay: fix crash on /upgrade when client is connected using WeeChat protocol
   * relay: redirect some irc messages from clients to hide output (messages: mode, ison, list, names, topic, who, whois, whowas, time, userhost) (bug #33516)
@@ -1408,7 +1408,7 @@ Documentation::
 
 Build::
 
-  * perl: fix compilation on OS X (bug #30701)
+  * perl: fix compilation on macOS (bug #30701)
 
 [[v0.3.7]]
 == Version 0.3.7 (2012-02-26)
@@ -1492,7 +1492,7 @@ Build::
   * core: add library "pthread" in cmake file for link on OpenBSD
   * core: add WEECHAT_HOME option in cmake and configure to setup default WeeChat home (default is "~/.weechat") (task #11266)
   * core: fix compilation under OpenBSD 5.0 (lib utf8 not needed any more) (bug #34727)
-  * core: fix compilation error with "pid_t" on Mac OS X (bug #34639)
+  * core: fix compilation error with "pid_t" on macOS (bug #34639)
 
 [[v0.3.6]]
 == Version 0.3.6 (2011-10-22)
@@ -1584,7 +1584,7 @@ Bug fixes::
 
 Build::
 
-  * core: fix compilation error (INSTALLPREFIX undeclared) on OS X and when compiling with included gettext (bug #26690)
+  * core: fix compilation error (INSTALLPREFIX undeclared) on macOS and when compiling with included gettext (bug #26690)
 
 [[v0.3.5]]
 == Version 0.3.5 (2011-05-15)
@@ -1884,7 +1884,7 @@ New features::
 
 Bug fixes::
 
-  * core: fix bug with script installation on BSD/OSX (patch #6980)
+  * core: fix bug with script installation on BSD/macOS (patch #6980)
   * core: fix compilation under Cygwin (patch #6916)
   * core: fix plural form in translation files (bug #27430)
   * core: fix terminal title bug: do not reset it when option weechat.look.set_title is off (bug #27399)
@@ -2531,7 +2531,7 @@ Bug fixes::
 
 Build::
 
-  * WeeChat now OK under *BSD and Mac OS X
+  * WeeChat now OK under *BSD and macOS
 
 [[v0.1.1]]
 == Version 0.1.1 (2005-03-20)
diff --git a/README.adoc b/README.adoc
index 85548b38c..9f9a9f982 100644
--- a/README.adoc
+++ b/README.adoc
@@ -21,7 +21,7 @@ Homepage: https://weechat.org/
 == Features
 
 * *Modular chat client*: WeeChat has a lightweight core and optional https://weechat.org/files/doc/stable/weechat_user.en.html#plugins[plugins]. All plugins (including https://weechat.org/files/doc/stable/weechat_user.en.html#irc_plugin[IRC]) are independent and can be unloaded.
-* *Multi-platform*: WeeChat runs on GNU/Linux, *BSD, GNU/Hurd, Mac OS X and Windows (Bash/Ubuntu and Cygwin).
+* *Multi-platform*: WeeChat runs on GNU/Linux, *BSD, GNU/Hurd, macOS and Windows (Bash/Ubuntu and Cygwin).
 * *Multi-protocols*: WeeChat is designed to support multiple protocols by plugins, like IRC.
 * *Standards-compliant*: the IRC plugin is compliant with RFCs https://tools.ietf.org/html/rfc1459[1459], https://tools.ietf.org/html/rfc2810[2810], https://tools.ietf.org/html/rfc2811[2811], https://tools.ietf.org/html/rfc2812[2812] and https://tools.ietf.org/html/rfc2813[2813].
 * *Small, fast and very light*: the core is and should stay as light and fast as possible.
diff --git a/doc/de/weechat_faq.de.adoc b/doc/de/weechat_faq.de.adoc
index f66ed73d2..25369fe2a 100644
--- a/doc/de/weechat_faq.de.adoc
+++ b/doc/de/weechat_faq.de.adoc
@@ -38,8 +38,8 @@ Aber diese Bedeutung trifft nicht auf WeeChat zu!)
 
 WeeChat ist sehr Speicher schonend und besticht durch innovative Funktionen.
 
-Weitere Informationen gibt es auf der folgenden Internetseite:
-https://weechat.org/about/features
+// TRANSLATION MISSING
+More info on the WeeChat features page: https://weechat.org/about/features
 
 [[compilation_install]]
 == Kompilierung / Installation
@@ -53,11 +53,13 @@ https://weechat.org/about/interfaces
 [[compile_git]]
 === Ich kann WeeChat nach Cloning des git Repository nicht kompilieren - weshalb?
 
-Es wird empfohlen cmake zum kompilieren von WeeChat zu nutzen.
+Es wird empfohlen link:weechat_user.de.html#compile_with_cmake[cmake] zum
+kompilieren von WeeChat zu nutzen.
 
-Falls Du WeeChat mit Hilfe der autotools kompilieren solltest (dich also nicht
-für cmake entscheidest), stelle sicher, dass Du die neueste Version von autoconf
-und automake besitzt.
+Falls Du WeeChat mit Hilfe der
+link:weechat_user.de.html#compile_with_autotools[autotools] kompilieren solltest
+(dich also nicht für cmake entscheidest), stelle sicher, dass Du die neueste
+Version von autoconf und automake besitzt.
 
 Die zweite Möglichkeit besteht darin das "Entwickler-Paket" zu installieren, denn dies
 besitzt weniger Abhängigkeiten. Das Paket wird quasi täglich aus dem git Repository erstellt.
@@ -65,8 +67,8 @@ Beachte, dass dieses Paket nicht immer exakt mit dem git Repository übereinstim
 und daher auch weniger brauchbar sein kann. Im Gegensatz zu der Möglichkeit, dass man selbst
 das Repository klont und daraus Updates installiert.
 
-[[compile_osx]]
-=== Wie installiere ich WeeChat auf OS X?
+[[compile_macos]]
+=== Wie installiere ich WeeChat auf macOS?
 
 Wir empfehlen, dass zur Installation http://brew.sh/[Homebrew] genutzt wird.
 Hilfe erhält man mittels:
@@ -86,9 +88,10 @@ brew install weechat --with-aspell --with-curl --with-python --with-perl --with-
 
 Um Hilfe zu erhalten, nutze den `/help` Befehl. Eine Hilfe zu einem Befehl erhältst
 Du durch die Eingabe von: `/help Befehlsname`.
-Befehle sowie die Belegung der jeweiligen Tasten sind in der Dokumentation
-beschrieben. (Tipp: Mit den Tasten <Bild-hoch>/<Bild-runter> kann man seitenweise
-in den Buffern blättern)
+// TRANSLATION MISSING
+link:weechat_user.de.html#key_bindings[Keys] and
+link:weechat_user.de.html#commands_and_options[commands] are listed
+in documentation.
 
 Neuen Anwendern wird empfohlen die link:weechat_quickstart.de.html[Quickstart Anleitung] zu lesen.
 
@@ -98,9 +101,9 @@ Neuen Anwendern wird empfohlen die link:weechat_quickstart.de.html[Quickstart An
 [[charset]]
 === Bei einigen Zeichen fehlen die Akzente. Wie kann ich das beheben?
 
-Dies ist ein bekanntes Problem. Aus diesem Grund sollten die folgenden Punkte
-sorgfältig durchgelesen und *alle* aufgezeigten Lösungsmöglichkeiten überprüft
-werden:
+// TRANSLATION MISSING
+It's a common issue with a variety of causes, please read carefully and check
+*ALL* solutions below:
 
 * überprüfe, ob WeeChat mit libncursesw verlinkt ist (Warnung: Dies ist bei den
   meisten Distributionen nötig - jedoch nicht bei allen): `ldd /path/to/weechat`
@@ -120,8 +123,9 @@ werden:
 ** Solltest Du screen nutzten, prüfe ob screen im UTF-8 Modus läuft
    ("`defutf8 on`" in der Datei ~/.screenrc oder `screen -U` zum starten von
    screen)
-* überprüfe die Option _weechat.look.eat_newline_glitch_ (diese Option kann zu
-  Darstellungsfehlern führen, wenn sie aktiviert ist)
+* überprüfe die Option
+  link:weechat_user.de.html#option_weechat.look.eat_newline_glitch[_weechat.look.eat_newline_glitch_]
+  (diese Option kann zu Darstellungsfehlern führen, wenn sie aktiviert ist)
 
 [NOTE]
 Für Weechat wird die Nutzung von UTF-8 locale empfohlen. Nutzt Du jedoch ISO
@@ -170,13 +174,13 @@ Falls notwendig korrigiere den Wert Deiner TERM-Variable: `export TERM="xxx"`.
 Wird das gnome-terminal genutzt sollte unter Bearbeiten/Profileinstellungen/Kompatibilität
 die Option "Zeichen mit unbekannter Breite" auf `schmal` stehen.
 
-[[osx_display_broken]]
-=== Ich habe WeeChat unter OS X kompiliert und erhalte nur "(null)" als Textausgabe. Was läuft da schief?
+[[macos_display_broken]]
+=== Ich habe WeeChat unter macOS kompiliert und erhalte nur "(null)" als Textausgabe. Was läuft da schief?
 
 Wenn Du ncursesw selber kompiliert haben solltest dann probiere einmal die Standard ncurses aus, welche
 mit dem System ausgeliefert wird.
 
-Darüber hinaus ist es unter OS X ratsam WeeChat mittels des Homebrew package manager zu installieren.
+Darüber hinaus ist es unter macOS ratsam WeeChat mittels des Homebrew package manager zu installieren.
 
 [[buffer_vs_window]]
 === Ich habe von "Buffern" und "Fenstern" gehört - Worin besteht der Unterschied?
@@ -187,14 +191,16 @@ In einem _Buffer_ werden Textzeilen angezeigt (und noch anderen Daten).
 Ein _Fenster_ ist ein Bildschirmbereich der Buffer darstellt. Es ist möglich
 den Bildschirm in mehrere Fenster aufzuteilen.
 
-Jedes Fenster stellt einen Buffer dar. Ein Buffer kann unsichtbar sein (er wird
-in einem Fenster nicht angezeigt). Oder ein Buffer wird durch ein oder mehrere Fenster
-angezeigt.
+// TRANSLATION MISSING
+Each window displays one buffer, or a set of merged buffers.
+A buffer can be hidden (not displayed by a window) or displayed by one or more
+windows.
 
 [[buffers_list]]
 === Wie kann ich eine Liste mit den Buffern z.B. auf der linken Seite anzeigen lassen?
 
-Ab WeeChat ≥ 1.8 wird standardmäßig die "buflist" Erweiterung automatisch geladen und verwendet.
+Ab WeeChat ≥ 1.8 wird standardmäßig die link:weechat_user.de.html#buflist_plugin[buflist]
+Erweiterung automatisch geladen und verwendet.
 
 bei älteren Versionen kann das Skript _buffers.pl_ installiert werden:
 
@@ -264,7 +270,7 @@ das letzte mal betreten hat.
 
 Im Beispiel `[H: 3(1,8), 2(4)]`, handelt es sich um:
 
-* eine highlight Nachricht und 8 ungelesene Nachrichten im Buffer #3
+* 1 highlight Nachricht und 8 ungelesene Nachrichten im Buffer #3
 * 4 ungelesene Nachrichten im Buffer #2.
 
 Die Farbe des Buffers/Zählers hängt ab um welche Art von Nachrichten es
@@ -328,7 +334,10 @@ werden sollte:
 [[terminal_copy_paste]]
 === Wie kann ich einen Text kopieren und einfügen ohne das die Nickliste (Benutzerliste) mit kopiert wird?
 
-Ab WeeChat ≥ 1.0 kann ein einfacher Anzeigemodus genutzt werden (Standardtastenbelegung: kbd:[Alt+l]).
+// TRANSLATION MISSING
+Ab WeeChat ≥ 1.0 kann ein einfacher Anzeigemodus genutzt werden (Standardtastenbelegung: kbd:[Alt+l]),
+which will show just the contents of the currently selected window,
+without any formatting.
 
 Hierzu kannst Du ein Terminal nutzen welches Block-Auswahl erlaubt (wie z.B. rxvt-unicode,
 konsole, gnome-terminal, ...). Im Normalfall erfolgt die Markierung mittels der Tasten
@@ -516,7 +525,7 @@ UXTerm*metaSendsEscape: true
 Danach muss resources neu geladen werden (`xrdb -override ~/.Xresources`) oder
 man startet X neu.
 
-Sollte die Mac OS X Terminal Applikation genutzt werden, empfiehlt es sich
+Sollte die macOS Terminal Applikation genutzt werden, empfiehlt es sich
 die Option "Use option as meta key" in den Menü-Einstellungen zu aktivieren. Dadurch
 kann man die kbd:[Option] Taste als Meta-Taste verwenden.
 
@@ -623,7 +632,7 @@ einen Text im Terminal markieren oder einfügen, als sei die Mausunterstützung
 [[irc_ssl_connection]]
 === Es treten Probleme bei einer Serververbindung mittels SSL auf. Was kann ich tun?
 
-Falls Mac OS X genutzt wird muss mittels Homebrew `openssl` installiert werden.
+Falls macOS genutzt wird muss mittels Homebrew `openssl` installiert werden.
 Ein CA Datei wird mittels Zertifikaten vom Systemschlüssel geladen.
 Der Pfad zu den Zertifikaten kann in WeeChat eingestellt werden:
 
@@ -673,7 +682,7 @@ Die Option _weechat.network.gnutls_ca_file_ sollte auf die Zertifikationsdatei z
 /set weechat.network.gnutls_ca_file "/etc/ssl/certs/ca-certificates.crt"
 ----
 
-Hinweis: Falls man homebrew openssl unter OS X installiert hat, empfiehlt sich:
+Hinweis: Falls man homebrew openssl unter macOS installiert hat, empfiehlt sich:
 
 ----
 /set weechat.network.gnutls_ca_file "/usr/local/etc/openssl/cert.pem"
@@ -731,8 +740,9 @@ Der Befehl `/ignore` ist ein IRC-Befehl und beeinflusst somit nur die IRC-Buffer
 (Server und Channel).
 Durch den Befehl kann man bestimmte Nicks oder Hostnamen von Usern eines Servers oder
 von Channels ignorieren (Der Befehl wird nicht auf den Inhalt der Meldung angewandt).
+// TRANSLATION MISSING
 Zutreffende Meldungen werden, bevor sie angezeigt werden, von der IRC-Erweiterung gelöscht
-(Du wirst sie niemals zu Gesicht bekommen).
+(so you'll never see them, and can't be recovered by removing the ignore).
 
 Der Befehl `/filter` ist ein Kern-Befehl (A.d.Ü.: wird in WeeChat ausgeführt und
 nicht an den Server gesendet) und beeinflusst somit jeden Buffer.
@@ -759,8 +769,10 @@ zum anderen mit einer globalen Filterung (*alle* join/part/quit Nachrichten werd
 /filter add joinquit * irc_join,irc_part,irc_quit *
 ----
 
+// TRANSLATION MISSING
 [NOTE]
-Für weitere Hilfe: `/help filter` und `/help irc.look.smart_filter`
+Für weitere Hilfe: `/help filter`, `/help irc.look.smart_filter` and see
+link:weechat_user.de.html#irc_smart_filter_join_part_quit[Benutzeranleitung / einfacher Filter für join/part/quit Nachrichten].
 
 [[filter_irc_join_channel_messages]]
 === Wie kann ich Server-Nachrichten filtern wenn ich einen IRC Channel betrete?
@@ -887,8 +899,9 @@ Um dies zu beheben muss folgendes konfiguriert werden:
 [[install_scripts]]
 === Wie kann ich Skripten installieren? Sind Skripten kompatibel mit anderen IRC Clients?
 
-Zum installieren und verwalten von Skripten kann der Befehl `/script` genutzt werden
-(siehe `/help script` für eine Hilfe).
+// TRANSLATION MISSING
+With WeeChat ≥ 0.3.9 you can use the command `/script` to install and manage scripts
+(see `/help script` for help). For older versions there is weeget.py and script.pl.
 
 Die Skripten für WeeChat sind mit anderer IRC-Clients nicht kompatibel und vice versa.
 
@@ -911,9 +924,10 @@ danach sollte man noch mal versuchen die Datei herunter zu laden:
 /script update
 ----
 
-Tritt weiterhin der Fehler auf dann muss in WeeChat das automatische Update
-der Datei deaktiviert werden und die Datei muss manuell aus einer Shell
-herunter geladen werden (das bedeutet das man manuell für Updates zuständig ist):
+// TRANSLATION MISSING
+If you still have an error, then you must disable the automatic update of file
+in WeeChat and download the file manually outside WeeChat (that means you'll
+have to update manually the file yourself to get updates):
 
 * in WeeChat:
 
@@ -968,9 +982,10 @@ Damit WeeChat weniger Speicher benötigt, solltest Du folgende Tipps umsetzen:
 
 * nutze die aktuelle Version (man kann davon ausgehen das eine aktuelle Version
   weniger Speicherlecks besitzt, als eine vorherige Version)
+// TRANSLATION MISSING
 * lade keine Erweiterungen die Du nicht benötigst. Zum Beispiel: ASpell, Buflist,
   Fifo, Logger, Perl, Python, Ruby, Lua, Tcl, Guile, JavaScript, PHP, Xfer (wird für
-  DCC benötigst)
+  DCC benötigst). See `/help weechat.plugin.autoload`.
 * installiere ausschließlich Skripten die Du auch nutzt
 * falls man SSL *NICHT* nutzt, sollte kein Zertifikat geladen werden. In diesem
   Fall, einfach den Eintrag in folgender Option leer lassen:
@@ -1027,6 +1042,8 @@ Definiere eine Passphrase und nutze ausschließlich geschützte Daten wann immer
 es möglich ist, wie z.B. bei Passwörtern: siehe `/help secure` und nutze `/help`
 bei der entsprechenden Option (falls man geschützte Daten nutzen kann, wird es
 im Hilfstext erwähnt).
+// TRANSLATION MISSING
+See also link:weechat_user.de.html#secured_data[Benutzeranleitung / sensible Daten].
 
 Beispiel:
 
diff --git a/doc/de/weechat_user.de.adoc b/doc/de/weechat_user.de.adoc
index bac79f80e..b2b865dcd 100644
--- a/doc/de/weechat_user.de.adoc
+++ b/doc/de/weechat_user.de.adoc
@@ -43,7 +43,7 @@ wesentliche Merkmale:
   http://tools.ietf.org/html/rfc2812[2812] und
   http://tools.ietf.org/html/rfc2813[2813]
 * IRC proxy und relay für remote Schnittstellen
-* Betriebssystemunabhängig (GNU/Linux, *BSD, MacOS X, Windows und weitere)
+* Betriebssystemunabhängig (GNU/Linux, *BSD, macOS, Windows und weitere)
 * 100% GPL, freie Software
 
 Die WeeChat Homepage findet man unter: https://weechat.org/
@@ -88,7 +88,7 @@ wie man Pakete installiert.
 WeeChat kann mittels cmake oder autotools kompiliert werden (cmake sollte dabei die bevorzugte Methode sein).
 
 [NOTE]
-Unter OS X kann http://brew.sh/[Homebrew] verwendet werden:
+Unter macOS kann http://brew.sh/[Homebrew] verwendet werden:
 `brew install weechat --with-python --with-perl`
 (für Hilfe: `brew info weechat`).
 
diff --git a/doc/en/weechat_faq.en.adoc b/doc/en/weechat_faq.en.adoc
index 7762edf9a..9f728b9fe 100644
--- a/doc/en/weechat_faq.en.adoc
+++ b/doc/en/weechat_faq.en.adoc
@@ -32,13 +32,13 @@ apply to WeeChat!).
 
 Because WeeChat is very light and brings innovating features.
 
-More info on this page: https://weechat.org/about/features
+More info on the WeeChat features page: https://weechat.org/about/features
 
 [[compilation_install]]
 == Compilation / install
 
 [[gui]]
-=== I heard about many GUIs for WeeChat. How can I compile/use them?
+=== I've heard about many GUIs for WeeChat. How can I compile/use them?
 
 Some remote GUIs are available, see the remote interfaces page:
 https://weechat.org/about/interfaces
@@ -46,18 +46,19 @@ https://weechat.org/about/interfaces
 [[compile_git]]
 === I can't compile WeeChat after cloning git repository, why?
 
-The recommended way to compile WeeChat is with cmake.
+The recommended way to compile WeeChat is with
+link:weechat_user.en.html#compile_with_cmake[cmake].
 
-If you're compiling with autotools (and not cmake), check that you have latest
-version of autoconf and automake.
+If you're compiling with link:weechat_user.en.html#compile_with_autotools[autotools]
+(and not cmake), check that you have latest version of autoconf and automake.
 
 The other way is to install the "devel package", which needs less dependencies.
 This package is built almost every day using git repository. Note that this
 package may not correspond exactly to git base and that it's less convenient
 than git cloning for installing updates.
 
-[[compile_osx]]
-=== How can I install WeeChat on OS X?
+[[compile_macos]]
+=== How can I install WeeChat on macOS?
 
 It is recommended to use http://brew.sh/[Homebrew], you can get help with:
 
@@ -75,7 +76,9 @@ brew install weechat --with-aspell --with-curl --with-python --with-perl --with-
 === I've launched WeeChat, but I'm lost, what can I do?
 
 For help you can type `/help`. For help about a command, type `/help command`.
-Keys and commands are listed in documentation.
+link:weechat_user.en.html#key_bindings[Keys] and
+link:weechat_user.en.html#commands_and_options[commands] are listed
+in documentation.
 
 It's recommended for new users to read the
 link:weechat_quickstart.en.html[Quickstart guide].
@@ -86,7 +89,8 @@ link:weechat_quickstart.en.html[Quickstart guide].
 [[charset]]
 === I don't see some chars with accents, what can I do?
 
-It's common issue, please read carefully and check *ALL* solutions below:
+It's a common issue with a variety of causes, please read carefully and check
+*ALL* solutions below:
 
 * Check that weechat is linked to libncursesw (warning: needed on most
   distributions but not all): `ldd /path/to/weechat`.
@@ -104,8 +108,9 @@ It's common issue, please read carefully and check *ALL* solutions below:
    rxvt-unicode).
 ** If you are using screen, check that it is run with UTF-8 mode
    ("`defutf8 on`" in ~/.screenrc or `screen -U` to run screen).
-* Check that option _weechat.look.eat_newline_glitch_ is off (this option may
-  cause display bugs).
+* Check that option
+  link:weechat_user.en.html#option_weechat.look.eat_newline_glitch[_weechat.look.eat_newline_glitch_]
+  is off (this option may cause display bugs).
 
 [NOTE]
 UTF-8 locale is recommended for WeeChat. If you're using ISO or other
@@ -128,7 +133,7 @@ https://github.com/weechat/weechat/issues/79
 === Bars like title and status are not filled, background color stops after text, why?
 
 This may be caused by a bad value of the TERM variable in your shell (look at
-output of `echo $TERM` in your terminal).
+the output of `echo $TERM` in your terminal).
 
 Depending on where you launch WeeChat, you should have:
 
@@ -154,17 +159,17 @@ If you are using gnome-terminal, check that the option
 "Ambiguous-width characters" in menu Preferences/Profile/Compatibility
 is set to `narrow`.
 
-[[osx_display_broken]]
-=== I compiled WeeChat under OS X, and I see "(null)" everywhere on screen, what's wrong?
+[[macos_display_broken]]
+=== I compiled WeeChat under macOS, and I see "(null)" everywhere on screen, what's wrong?
 
 If you compiled ncursesw yourself, try to use standard ncurses (that comes with
 system).
 
-Moreover, under OS X, it is recommended to install WeeChat with Homebrew package
-manager.
+Moreover, under macOS, it is recommended to install WeeChat with Homebrew
+package manager.
 
 [[buffer_vs_window]]
-=== I heard about "buffers" and "windows", what's the difference?
+=== I've heard about "buffers" and "windows", what's the difference?
 
 A _buffer_ is composed by a number, a name, lines displayed (and some other
 data).
@@ -172,13 +177,15 @@ data).
 A _window_ is a screen area which displays a buffer. It is possible to split
 your screen into many windows.
 
-Each window displays one buffer. A buffer can be hidden (not displayed by a
-window) or displayed by one or more windows.
+Each window displays one buffer, or a set of merged buffers.
+A buffer can be hidden (not displayed by a window) or displayed by one or more
+windows.
 
 [[buffers_list]]
 === How to display the buffers list on the left side?
 
-With WeeChat ≥ 1.8, the plugin "buflist" is loaded and enabled by default.
+With WeeChat ≥ 1.8, the plugin link:weechat_user.en.html#buflist_plugin[buflist]
+is loaded and enabled by default.
 
 With an older version, you can install script _buffers.pl_:
 
@@ -246,7 +253,7 @@ since you visited the buffer.
 
 In the example `[H: 3(1,8), 2(4)]`, there are:
 
-* one highlight and 8 unread messages on buffer #3,
+* 1 highlight and 8 unread messages on buffer #3,
 * 4 unread messages on buffer #2.
 
 The color of the buffer/counter depends on the type of message, default colors
@@ -307,7 +314,9 @@ any bar:
 [[terminal_copy_paste]]
 === How can I copy/paste text without pasting nicklist?
 
-With WeeChat ≥ 1.0, you can use the bare display (default key: kbd:[Alt+l]).
+With WeeChat ≥ 1.0, you can use the bare display (default key: kbd:[Alt+l]),
+which will show just the contents of the currently selected window,
+without any formatting.
 
 You can use a terminal with rectangular selection (like rxvt-unicode,
 konsole, gnome-terminal, etc.). Key is usually kbd:[Ctrl] + kbd:[Alt] + mouse
@@ -402,7 +411,7 @@ If you are using screen, you can add this line to your _~/.screenrc_:
 term screen-256color
 ----
 
-If your _TERM_ variable has wrong value and that WeeChat is already running,
+If your _TERM_ variable has a wrong value and that WeeChat is already running,
 you can change it with these two commands (with WeeChat ≥ 1.0):
 
 ----
@@ -473,7 +482,7 @@ You can just disable bracketed paste mode:
 [[meta_keys]]
 === Some meta keys (alt + key) are not working, why?
 
-If you're using some terminals like xterm or uxterm, some meta keys does not
+If you're using some terminals like xterm or uxterm, some meta keys do not
 work by default. You can add a line in file _~/.Xresources_:
 
 * For xterm:
@@ -487,8 +496,8 @@ UXTerm*metaSendsEscape: true
 
 And then reload resources (`xrdb -override ~/.Xresources`) or restart X.
 
-If you are using the Mac OS X Terminal app, enable the option
-"Use option as meta key" in menu Settings/Keyboard. And then you can use the
+If you are using the macOS Terminal app, enable the option
+"Use option as meta key" in menu Settings/Keyboard after which you can use the
 kbd:[Option] key as meta key.
 
 [[customize_key_bindings]]
@@ -591,7 +600,7 @@ you have to use kbd:[Alt] instead of kbd:[Shift]).
 [[irc_ssl_connection]]
 === I have some problems when connecting to a server using SSL, what can I do?
 
-If you are using Mac OS X, you must install `openssl` from Homebrew.
+If you are using macOS, you must install `openssl` from Homebrew.
 A CA file will be bootstrapped using certificates from the system keychain.
 You can then set the path to certificates in WeeChat:
 
@@ -621,7 +630,7 @@ should be, you can specify the fingerprint (SHA-512, SHA-256 or SHA-1):
 ----
 
 [[irc_ssl_handshake_error]]
-=== When connecting to server with SSL, I see only error "TLS handshake failed", what can I do?
+=== When connecting to server with SSL, I only see the error "TLS handshake failed", what can I do?
 
 You can try a different priority string (WeeChat ≥ 0.3.5 only), replace "xxx"
 by your server name:
@@ -639,7 +648,7 @@ Set option _weechat.network.gnutls_ca_file_ to file with certificates:
 /set weechat.network.gnutls_ca_file "/etc/ssl/certs/ca-certificates.crt"
 ----
 
-Note: if you are running OS X with homebrew openssl installed, you can do:
+Note: if you are running macOS with homebrew openssl installed, you can do:
 
 ----
 /set weechat.network.gnutls_ca_file "/usr/local/etc/openssl/cert.pem"
@@ -675,16 +684,16 @@ and address by appropriate values):
 [[irc_sasl]]
 === How can I be identified before joining channels?
 
-If server supports SASL, you should use that instead of sending command for
-nickserv authentication, for example:
+If the server supports SASL, you should use that instead of sending the
+command for nickserv authentication, for example:
 
 ----
 /set irc.server.freenode.sasl_username "mynick"
 /set irc.server.freenode.sasl_password "xxxxxxx"
 ----
 
-If server does not support SASL, you can add a delay (between command and join
-of channels):
+If the server does not support SASL, you can add a delay (between command and
+join of channels):
 
 ----
 /set irc.server.freenode.command_delay 5
@@ -698,7 +707,7 @@ The `/ignore` command is an IRC command, so it applies only for IRC buffers
 It lets you ignore some nicks or hostnames of users for a server or channel
 (command will not apply on content of messages).
 Matching messages are deleted by IRC plugin before display (so you'll
-never see them).
+never see them, and can't be recovered by removing the ignore).
 
 The `/filter` command is a core command, so it applies to any buffer.
 It lets you filter some lines in buffers with tags or regular expression for
@@ -723,7 +732,8 @@ With a global filter (hide *all* join/part/quit):
 ----
 
 [NOTE]
-For help: `/help filter` and `/help irc.look.smart_filter`
+For help: `/help filter`, `/help irc.look.smart_filter` and see
+link:weechat_user.en.html#irc_smart_filter_join_part_quit[User's guide / Smart filter for join/part/quit messages].
 
 [[filter_irc_join_channel_messages]]
 === How can I filter some messages displayed when I join an IRC channel?
@@ -746,13 +756,13 @@ If you want to do that, it's probably because Bitlbee is using voice to show
 away users, and you are flooded with voice messages. Therefore, you can change
 that and let WeeChat use a special color for away nicks in nicklist.
 
-For Bitlbee ≥ 3, do that on channel _&bitlbee_:
+For Bitlbee ≥ 3, issue this on control channel _&bitlbee_:
 
 ----
 channel set show_users online,away
 ----
 
-For older version of Bitlbee, do that on channel _&bitlbee_:
+For older version of Bitlbee, issue this on control channel _&bitlbee_:
 
 ----
 set away_devoice false
@@ -805,7 +815,7 @@ Or you can add a command in "beep" trigger:
 
 With an older WeeChat, you can use a script like _beep.pl_ or _launcher.pl_.
 
-For _launcher.pl_, you have to setup command:
+For _launcher.pl_, you have to setup a command:
 
 ----
 /set plugins.var.perl.launcher.signal.weechat_highlight "/path/to/command arguments"
@@ -840,8 +850,8 @@ You must set that up:
 [[install_scripts]]
 === How can I install scripts? Are scripts compatible with other IRC clients?
 
-You can use the command `/script` to install and manage scripts
-(see `/help script` for help).
+With WeeChat ≥ 0.3.9 you can use the command `/script` to install and manage scripts
+(see `/help script` for help). For older versions there is weeget.py and script.pl.
 
 Scripts are not compatible with other IRC clients.
 
@@ -863,7 +873,7 @@ And update scripts again in WeeChat:
 /script update
 ----
 
-If you still have an error, then you must remove the automatic update of file
+If you still have an error, then you must disable the automatic update of file
 in WeeChat and download the file manually outside WeeChat (that means you'll
 have to update manually the file yourself to get updates):
 
@@ -920,7 +930,7 @@ You can try following tips to consume less memory:
   older versions).
 * Do not load some plugins if you don't use them, for example: aspell, buflist,
   fifo, logger, perl, python, ruby, lua, tcl, guile, javascript, php,
-  xfer (used for DCC).
+  xfer (used for DCC). See `/help weechat.plugin.autoload`.
 * Load only scripts that you really need.
 * Do not load certificates if SSL is *NOT* used: set empty string in option
   _weechat.network.gnutls_ca_file_.
@@ -973,6 +983,7 @@ Unload and disable auto-loading of "xfer" plugin (used for IRC DCC):
 Define a passphrase and use secured data wherever you can for sensitive data
 like passwords: see `/help secure` and `/help` on options
 (if you can use secured data, it is written in the help).
+See also link:weechat_user.en.html#secured_data[User's guide / Secured data].
 
 For example:
 
@@ -1006,7 +1017,7 @@ for more information about configuration files.
 See: https://weechat.org/about/support
 
 [[gdb_error_threads]]
-=== When I run WeeChat under gdb, there is error about threads, what can I do?
+=== When I run WeeChat under gdb, there is an error about threads, what can I do?
 
 When you run WeeChat under gdb, you may have this error:
 
@@ -1036,7 +1047,7 @@ some OS' we don't have, to test WeeChat.
 [[help_developers]]
 === I want to help WeeChat developers. What can I do?
 
-There's many tasks to do (testing, code, documentation, etc.)
+There are many tasks to do (testing, code, documentation, etc.)
 
 Please contact us via IRC or mail, look at support page:
 https://weechat.org/about/support
diff --git a/doc/en/weechat_relay_protocol.en.adoc b/doc/en/weechat_relay_protocol.en.adoc
index ac6999471..ef2a9293b 100644
--- a/doc/en/weechat_relay_protocol.en.adoc
+++ b/doc/en/weechat_relay_protocol.en.adoc
@@ -32,7 +32,7 @@ The _clients_ are connected to _relay_ like shown in this diagram:
 ....
                                               ┌──────────┐ Workstation
  ┌────────┐                               ┌───┤ client 1 │ (Linux, Windows,
- │  irc   │◄──┐  ╔═══════════╤═══════╗    │   └──────────┘ BSD, Mac OS X ...)
+ │  irc   │◄──┐  ╔═══════════╤═══════╗    │   └──────────┘ BSD, macOS ...)
  └────────┘   └──╢           │       ║◄───┘   ┌──────────┐
    ......        ║  WeeChat  │ Relay ║◄───────┤ client 2 │ Mobile device
  ┌────────┐   ┌──╢           │       ║◄───┐   └──────────┘ (Android, iPhone ...)
diff --git a/doc/en/weechat_user.en.adoc b/doc/en/weechat_user.en.adoc
index c78159737..479fdca0b 100644
--- a/doc/en/weechat_user.en.adoc
+++ b/doc/en/weechat_user.en.adoc
@@ -37,7 +37,7 @@ Main features are:
   http://tools.ietf.org/html/rfc2812[2812] and
   http://tools.ietf.org/html/rfc2813[2813]
 * IRC proxy and relay for remote interfaces
-* multi-platform (GNU/Linux, *BSD, MacOS X, Windows and other)
+* multi-platform (GNU/Linux, *BSD, macOS, Windows and other)
 * 100% GPL, free software
 
 WeeChat homepage is here: https://weechat.org/
@@ -82,7 +82,7 @@ instructions.
 WeeChat can be compiled with cmake or autotools (cmake is recommended way).
 
 [NOTE]
-On OS X, you can use http://brew.sh/[Homebrew]:
+On macOS, you can use http://brew.sh/[Homebrew]:
 `brew install weechat --with-python --with-perl`
 (for help: `brew info weechat`).
 
diff --git a/doc/fr/weechat_faq.fr.adoc b/doc/fr/weechat_faq.fr.adoc
index f7b072b6c..321d7b19a 100644
--- a/doc/fr/weechat_faq.fr.adoc
+++ b/doc/fr/weechat_faq.fr.adoc
@@ -32,7 +32,8 @@ mais elle ne s'applique pas à WeeChat !).
 
 Parce que WeeChat est très léger et apporte des fonctionnalités innovantes.
 
-Plus d'infos sur cette page : https://weechat.org/about/features
+Plus d'infos sur la page des fonctionnalités WeeChat :
+https://weechat.org/about/features
 
 [[compilation_install]]
 == Compilation / installation
@@ -46,10 +47,12 @@ distantes : https://weechat.org/about/interfaces
 [[compile_git]]
 === Je ne peux pas compiler WeeChat après avoir cloné la base git, pourquoi ?
 
-La méthode recommandée pour compiler WeeChat est d'utiliser cmake.
+La méthode recommandée pour compiler WeeChat est d'utiliser
+link:weechat_user.fr.html#compile_with_cmake[cmake].
 
-Si vous compilez avec les autotools (et non cmake), vérifiez que vous avez bien
-la dernière version d'autoconf et automake.
+Si vous compilez avec les link:weechat_user.fr.html#compile_with_autotools[autotools]
+(et non cmake), vérifiez que vous avez bien la dernière version d'autoconf et
+automake.
 
 Une autre façon de faire est de compiler le "paquet devel", qui nécessite moins
 de dépendances. Ce paquet est construit quasiment tous les jours à partir de la
@@ -57,8 +60,8 @@ base git. Notez que ce paquet peut ne pas correspondre exactement à la base
 git et qu'il est moins pratique que de cloner la base git pour installer des
 mises à jour.
 
-[[compile_osx]]
-=== Comment puis-je installer WeeChat sous OS X ?
+[[compile_macos]]
+=== Comment puis-je installer WeeChat sous macOS ?
 
 Il est recommandé d'utiliser http://brew.sh/[Homebrew], vous pouvez avoir de
 l'aide avec :
@@ -77,7 +80,9 @@ brew install weechat --with-aspell --with-curl --with-python --with-perl --with-
 === J'ai lancé WeeChat, mais je suis perdu, que puis-je faire ?
 
 Pour obtenir de l'aide tapez `/help`. Pour de l'aide sur une commande, tapez
-`/help commande`. Les touches et commandes sont listées dans la documentation.
+`/help commande`. Les link:weechat_user.fr.html#key_bindings[touches] et
+link:weechat_user.fr.html#commands_and_options[commandes] sont listées dans la
+documentation.
 
 Il est recommandé pour les nouveaux utilisateurs de lire le
 link:weechat_quickstart.fr.html[Guide de démarrage rapide].
@@ -88,8 +93,8 @@ link:weechat_quickstart.fr.html[Guide de démarrage rapide].
 [[charset]]
 === Je ne vois pas bien certains accents dans WeeChat, que faire ?
 
-C'est un problème courant, merci de lire attentivement et vérifier *TOUS* les
-points ci-dessous :
+C'est un problème courant avec beaucoup de causes possibles, merci de lire
+attentivement et vérifier *TOUS* les points ci-dessous :
 
 * Vérifiez que weechat est lié avec libncursesw (attention : nécessaire
   sur beaucoup de distributions, mais pas toutes) :
@@ -111,8 +116,9 @@ points ci-dessous :
    (un terminal conseillé pour l'UTF-8 est rxvt-unicode).
 ** Si vous utilisez screen, vérifiez qu'il est lancé en mode UTF-8
    ("`defutf8 on`" dans ~/.screenrc ou `screen -U` pour lancer screen).
-* Vérifiez que l'option _weechat.look.eat_newline_glitch_ est désactivée (cette
-  option peut causer des problèmes d'affichage).
+* Vérifiez que l'option
+  link:weechat_user.fr.html#option_weechat.look.eat_newline_glitch[_weechat.look.eat_newline_glitch_]
+  est désactivée (cette option peut causer des problèmes d'affichage).
 
 [NOTE]
 La locale UTF-8 est recommandée pour WeeChat. Si vous utilisez ISO ou une autre
@@ -162,13 +168,13 @@ Si vous utilisez gnome-terminal, vérifiez que l'option
 "Ambiguous-width characters" dans le menu Preferences/Profile/Compatibility
 est positionnée à `narrow`.
 
-[[osx_display_broken]]
-=== J'ai compilé WeeChat sous OS X, et je vois des "(null)" partout sur l'écran, pourquoi ?
+[[macos_display_broken]]
+=== J'ai compilé WeeChat sous macOS, et je vois des "(null)" partout sur l'écran, pourquoi ?
 
 Si vous avez compilé ncursesw vous-même, essayez avec le ncurses standard (celui
 fourni avec le système).
 
-De plus, sous OS X, il est recommandé d'installer WeeChat avec le gestionnaire
+De plus, sous macOS, il est recommandé d'installer WeeChat avec le gestionnaire
 de paquets Homebrew.
 
 [[buffer_vs_window]]
@@ -181,13 +187,15 @@ Une fenêtre (_window_) est une zone de l'écran affichant un tampon. Il est
 possible de découper l'écran horizontalement ou verticalement en plusieurs
 fenêtres.
 
-Chaque fenêtre affiche un tampon. Un tampon peut être caché (affiché par
-aucune fenêtre) ou affiché par une ou plusieurs fenêtres.
+Chaque fenêtre affiche un tampon ou un ensemble de tampons mélangés. Un tampon
+peut être caché (affiché par aucune fenêtre) ou affiché par une ou plusieurs
+fenêtres.
 
 [[buffers_list]]
 === Comment afficher la liste des tampons sur la gauche ?
 
-Avec WeeChat ≥ 1.8, l'extension "buflist" est chargée et activée par défaut.
+Avec WeeChat ≥ 1.8, l'extension link:weechat_user.fr.html#buflist_plugin[buflist]
+est chargée et activée par défaut.
 
 Avec une version plus ancienne, vous pouvez installer le script _buffers.pl_ :
 
@@ -255,7 +263,7 @@ depuis que vous avez visité le tampon.
 
 Dans l'exemple `[H: 3(1,8), 2(4)]`, il y a :
 
-* un highlight et 8 messages non lus sur le tampon n°3,
+* 1 highlight et 8 messages non lus sur le tampon n°3,
 * 4 messages non lus sur le tampon n°2.
 
 La couleur du tampon/compter dépend du type de message, les couleurs par défaut
@@ -319,7 +327,8 @@ barre, WeeChat recréera automatiquement la barre par défaut "input" si l'objet
 === Comment puis-je copier/coller du texte sans coller la liste des pseudos ?
 
 Avec WeeChat ≥ 1.0, vous pouvez utiliser l'affichage dépouillé (touche par
-défaut : kbd:[Alt+l]).
+défaut : kbd:[Alt+l]), qui affiche juste le contenu de la fenêtre actuellement
+sélectionnée sans aucun formatage.
 
 Vous pouvez utiliser un terminal qui propose la sélection rectangulaire (comme
 rxvt-unicode, konsole, gnome-terminal, etc.). La touche est habituellement
@@ -507,7 +516,7 @@ UXTerm*metaSendsEscape: true
 
 Puis recharger les ressources (`xrdb -override ~/.Xresources`) ou redémarrez X.
 
-Si vous utilisez l'application Terminal sous Mac OS X, activez l'option
+Si vous utilisez l'application Terminal sous macOS, activez l'option
 "Use option as meta key" dans le menu Réglages/Clavier. Vous pouvez alors
 utiliser la touche kbd:[Option] comme touche meta.
 
@@ -614,7 +623,7 @@ kbd:[Alt] au lieu de kbd:[Shift]).
 [[irc_ssl_connection]]
 === J'ai des problèmes pour me connecter au serveur avec SSL, que puis-je faire ?
 
-Si vous utilisez Mac OS X, vous devez installer `openssl` depuis Homebrew.
+Si vous utilisez macOS, vous devez installer `openssl` depuis Homebrew.
 Un fichier CA sera installé avec le le trousseau système. Vous pouvez alors
 définie le chemin vers les certificats sous WeeChat :
 
@@ -664,7 +673,7 @@ certificats :
 /set weechat.network.gnutls_ca_file "/etc/ssl/certs/ca-certificates.crt"
 ----
 
-Note : si vous êtes sous OS X avec le paquet homebrew openssl installé, vous
+Note : si vous êtes sous macOS avec le paquet homebrew openssl installé, vous
 pouvez lancer :
 
 ----
@@ -724,7 +733,8 @@ tampons IRC (serveurs et canaux).
 Elle permet d'ignorer des pseudos ou nom d'hôtes pour un serveur ou un canal
 (la commande ne s'applique pas au contenu des messages).
 Les messages correspondants sont supprimés par l'extension IRC avant affichage
-(donc vous ne les verrez jamais).
+(donc vous ne les verrez jamais et ils ne peuvent pas être récupérés en
+supprimant l'ignore).
 
 La commande `/filter` est une commande "core", donc elle s'applique à n"importe
 quel tampon.
@@ -752,7 +762,8 @@ Avec un filtre global (pour cacher *tous* les join/part/quit) :
 ----
 
 [NOTE]
-Pour l'aide : `/help filter` et `/help irc.look.smart_filter`
+Pour l'aide : `/help filter`, `/help irc.look.smart_filter` et voir
+link:weechat_user.fr.html#irc_smart_filter_join_part_quit[Guide utilisateur / Filtre intelligent pour les messages join/part/quit].
 
 [[filter_irc_join_channel_messages]]
 === Comment puis-je filtrer certains messages affichés quand je rejoins un canal IRC ?
@@ -875,8 +886,9 @@ Vous devez configurer ça :
 [[install_scripts]]
 === Comment puis-je installer des scripts ? Les scripts sont-ils compatibles avec d'autres clients IRC ?
 
-Vous pouvez utiliser la commande `/script` pour installer et gérer les scripts
-(voir `/help script` pour de l'aide).
+Avec WeeChat ≥ 0.3.9, vous pouvez utiliser la commande `/script` pour installer
+et gérer les scripts (voir `/help script` pour de l'aide). Pour les versions
+plus anciennes il y a weeget.py et script.pl.
 
 Les scripts ne sont pas compatibles avec d'autres clients IRC.
 
@@ -899,7 +911,7 @@ Et mettez à jour les scripts à nouveau dans WeeChat :
 /script update
 ----
 
-Si vous avez toujours une erreur, alors vous devez supprimer la mise à jour
+Si vous avez toujours une erreur, alors vous devez désactiver la mise à jour
 automatique du fichier dans WeeChat et télécharger le fichier manuellement
 en dehors de WeeChat (cela signifie que vous devrez mettre à jour le fichier
 vous-même pour obtenir les mises à jour) :
@@ -961,6 +973,7 @@ Vous pouvez essayer les astuces suivantes pour consommer moins de mémoire :
 * Ne pas charger les extensions si vous ne les utilisez pas, par exemple :
   aspell, buflist, fifo, logger, perl, python, ruby, lua, tcl, guile,
   javascript, php, xfer (utilisé pour les DCC).
+  Voir `/help weechat.plugin.autoload`.
 * Charger uniquement les scripts dont vous avez vraiment besoin.
 * Ne pas charger les certificats si SSL n'est *PAS* utilisé : affecter une
   chaîne vide pour l'option _weechat.network.gnutls_ca_file_.
@@ -1016,6 +1029,7 @@ Définissez une phrase de chiffrement et utilisez les données sécurisées part
 où vous le pouvez pour les données sensibles comme les mots de passe : voir
 `/help secure` et `/help` sur les options (si vous pouvez utiliser les données
 sécurisées, cela est mentionné dans l'aide).
+Voir aussi link:weechat_user.fr.html#secured_data[Guide utilisateur / Données sécurisées].
 
 Par exemple :
 
diff --git a/doc/fr/weechat_relay_protocol.fr.adoc b/doc/fr/weechat_relay_protocol.fr.adoc
index cb1800d45..110db6be9 100644
--- a/doc/fr/weechat_relay_protocol.fr.adoc
+++ b/doc/fr/weechat_relay_protocol.fr.adoc
@@ -36,7 +36,7 @@ Les _clients_ sont connectés au _relay_ comme dans le diagramme ci-dessous :
 ....
                                               ┌──────────┐ Station de travail
  ┌────────┐                               ┌───┤ client 1 │ (Linux, Windows,
- │  irc   │◄──┐  ╔═══════════╤═══════╗    │   └──────────┘ BSD, Mac OS X ...)
+ │  irc   │◄──┐  ╔═══════════╤═══════╗    │   └──────────┘ BSD, macOS ...)
  └────────┘   └──╢           │       ║◄───┘   ┌──────────┐
    ......        ║  WeeChat  │ Relay ║◄───────┤ client 2 │ Appareil mobile
  ┌────────┐   ┌──╢           │       ║◄───┐   └──────────┘ (Android, iPhone ...)
diff --git a/doc/fr/weechat_user.fr.adoc b/doc/fr/weechat_user.fr.adoc
index 1b4f42372..e5e457151 100644
--- a/doc/fr/weechat_user.fr.adoc
+++ b/doc/fr/weechat_user.fr.adoc
@@ -39,7 +39,7 @@ Ses principales fonctionnalités sont les suivantes :
   http://tools.ietf.org/html/rfc2812[2812] et
   http://tools.ietf.org/html/rfc2813[2813]
 * proxy IRC et relai pour interfaces distantes
-* multi plates-formes (GNU/Linux, *BSD, MacOS X, Windows et d'autres systèmes)
+* multi plates-formes (GNU/Linux, *BSD, macOS, Windows et d'autres systèmes)
 * 100% GPL, logiciel libre
 
 La page d'accueil de WeeChat est ici : https://weechat.org/
@@ -85,7 +85,7 @@ WeeChat peut être compilé avec cmake ou les autotools (cmake est la méthode
 recommandée).
 
 [NOTE]
-Sous OS X, vous pouvez utiliser http://brew.sh/[Homebrew] :
+Sous macOS, vous pouvez utiliser http://brew.sh/[Homebrew] :
 `brew install weechat --with-python --with-perl`
 (pour l'aide : `brew info weechat`).
 
diff --git a/doc/it/weechat_faq.it.adoc b/doc/it/weechat_faq.it.adoc
index 18f522cdf..8afd95ad4 100644
--- a/doc/it/weechat_faq.it.adoc
+++ b/doc/it/weechat_faq.it.adoc
@@ -39,7 +39,8 @@ non c'entra con WeeChat!).
 // TRANSLATION MISSING
 Because WeeChat is very light and brings innovating features.
 
-Maggiori informazioni su https://weechat.org/about/features
+// TRANSLATION MISSING
+More info on the WeeChat features page: https://weechat.org/about/features
 
 [[compilation_install]]
 == Compilazione / installazione
@@ -54,10 +55,12 @@ https://weechat.org/about/interfaces
 [[compile_git]]
 === Non è possibile compilare WeeChat dopo aver clonato il repository git, perché?
 
-Il metodo raccomandato per compilare WeeChat è utilizzando cmake.
+Il metodo raccomandato per compilare WeeChat è utilizzando
+link:weechat_user.it.html#compile_with_cmake[cmake].
 
-Se si sta compilando con autotools (e non cmake), verificare che siano installate
-le ultime versioni di autoconf e automake.
+Se si sta compilando con link:weechat_user.it.html#compile_with_autotools[autotools]
+(e non cmake), verificare che siano installate le ultime versioni di autoconf e
+automake.
 
 L'altro metodo è installare il "pacchetto di sviluppo", che richiede meno
 dipendenze. Questo pacchetto viene generato  quasi tutti i giorni utilizzando
@@ -66,8 +69,8 @@ esattamente alla base git ed è meno conveniente rispetto al clone di git
 per l'installazione degli aggiornamenti.
 
 // TRANSLATION MISSING
-[[compile_osx]]
-=== How can I install WeeChat on OS X?
+[[compile_macos]]
+=== How can I install WeeChat on macOS?
 
 // TRANSLATION MISSING
 It is recommended to use http://brew.sh/[Homebrew], you can get help with:
@@ -86,8 +89,11 @@ brew install weechat --with-aspell --with-curl --with-python --with-perl --with-
 [[lost]]
 === Ho avviato WeeChat, ma mi sono perso, cosa posso fare?
 
+// TRANSLATION MISSING
 Per l'aiuto digitare `/help`. Per l'aiuto su un comando, digitare `/help comando`.
-Tasti e comandi sono elencati nella documentazione.
+link:weechat_user.it.html#key_bindings[Keys] and
+link:weechat_user.it.html#commands_and_options[commands] are listed
+in documentation.
 
 // TRANSLATION MISSING
 It's recommended for new users to read the
@@ -99,8 +105,9 @@ link:weechat_quickstart.it.html[Quickstart guide].
 [[charset]]
 === Non riesco a vedere alcuni caratteri con gli accenti, cosa posso fare?
 
-È un problema noto, per favore leggere con attenzione e verificare *OGNI*
-soluzione tra quelle elencate:
+// TRANSLATION MISSING
+It's a common issue with a variety of causes, please read carefully and check
+*ALL* solutions below:
 
 * verificare che weechat abbia un link con libncursesw (attenzione:
   necessario su molte distribuzioni ma non tutte): `ldd /path/di/weechat`
@@ -122,8 +129,9 @@ soluzione tra quelle elencate:
     UTF-8 ("`defutf8 on` nel file ~/.screenrc` oppure `screen -U` per avviare
     screen)
 // TRANSLATION MISSING
-* check that option _weechat.look.eat_newline_glitch_ is off (this option may
-  cause display bugs)
+* check that option
+  link:weechat_user.it.html#option_weechat.look.eat_newline_glitch[_weechat.look.eat_newline_glitch_]
+  is off (this option may cause display bugs)
 
 [NOTE]
 Si raccomanda il locale UTF-8 per WeeChat. Se si utilizza ISO o un altro
@@ -178,13 +186,13 @@ If you are using gnome-terminal, check that the option
 "Ambiguous-width characters" in menu Preferences/Profile/Compatibility
 is set to `narrow`.
 
-[[osx_display_broken]]
-=== Ho compilato WeeChat su OS X, e vedo "(null)" dovunque sullo schermo, cosa non va?
+[[macos_display_broken]]
+=== Ho compilato WeeChat su macOS, e vedo "(null)" dovunque sullo schermo, cosa non va?
 
 Se ncursesw è stato compilato manualmente, utilizzare ncurses standard (incluse
 col sistema).
 
-Inoltre, su OS X, si raccomanda di installare WeeChat con il gestore pacchetti
+Inoltre, su macOS, si raccomanda di installare WeeChat con il gestore pacchetti
 Homebrew.
 
 [[buffer_vs_window]]
@@ -196,14 +204,17 @@ qualche altro dato).
 Una _finestra_ (o window) è un'aread dello schermo in cui viene visualizzato
 un buffer. È possibile dividere lo schermo in più finestre.
 
-Ogni finestra visualizza un buffer. Un buffer può essere nascosto (non visualizzato
-da una finestra) o visualizzato da una o più finestre.
+// TRANSLATION MISSING
+Each window displays one buffer, or a set of merged buffers.
+A buffer can be hidden (not displayed by a window) or displayed by one or more
+windows.
 
 // TRANSLATION MISSING
 [[buffers_list]]
 === Come si può visualizzare la lista dei buffer sulla sinistra?
 
-With WeeChat ≥ 1.8, the plugin "buflist" is loaded and enabled by default.
+With WeeChat ≥ 1.8, the plugin link:weechat_user.it.html#buflist_plugin[buflist]
+is loaded and enabled by default.
 
 With an older version, you can install script _buffers.pl_:
 
@@ -273,7 +284,7 @@ since you visited the buffer.
 
 In the example `[H: 3(1,8), 2(4)]`, there are:
 
-* one highlight and 8 unread messages on buffer #3,
+* 1 highlight and 8 unread messages on buffer #3,
 * 4 unread messages on buffer #2.
 
 The color of the buffer/counter depends on the type of message, default colors
@@ -336,7 +347,9 @@ non viene usato da un'altra barra:
 === Come posso copiare/incollare testo senza incollare la lista nick?
 
 // TRANSLATION MISSING
-With WeeChat ≥ 1.0, you can use the bare display (default key: kbd:[Alt+l]).
+With WeeChat ≥ 1.0, you can use the bare display (default key: kbd:[Alt+l]),
+which will show just the contents of the currently selected window,
+without any formatting.
 
 È possibile usare un terminale con la selezione rettangolare (come
 rxvt-unicode, konsole, gnome-terminal, ...). La combinazione tasti in
@@ -532,7 +545,7 @@ UXTerm*metaSendsEscape: true
 Al termine, ricaricare la configurazione (`xrdb -override ~/.Xresources`) o riavviare X.
 
 // TRANSLATION MISSING
-If you are using the Mac OS X Terminal app, enable the option
+If you are using the macOS Terminal app, enable the option
 "Use option as meta key" in menu Settings/Keyboard. And then you can use the
 kbd:[Option] key as meta key.
 
@@ -642,7 +655,7 @@ kbd:[Shift]).
 === Ho dei problemi nella connessione al server con SSL, cosa posso fare?
 
 // TRANSLATION MISSING
-If you are using Mac OS X, you must install `openssl` from Homebrew.
+If you are using macOS, you must install `openssl` from Homebrew.
 A CA file will be bootstrapped using certificates from the system keychain.
 You can then set the path to certificates in WeeChat:
 
@@ -692,7 +705,7 @@ Impostare l'opzione _weechat.network.gnutls_ca_file_ con il file dei certificati
 ----
 
 // TRANSLATION MISSING
-Note: if you are running OS X with homebrew openssl installed, you can do:
+Note: if you are running macOS with homebrew openssl installed, you can do:
 
 ----
 /set weechat.network.gnutls_ca_file "/usr/local/etc/openssl/cert.pem"
@@ -747,12 +760,14 @@ comando e l'ingresso nei canali):
 [[ignore_vs_filter]]
 === Qual è la differenza tra i comandi /ignore e /filter?
 
+// TRANSLATION MISSING
 Il comando `/ignore` è un comando IRC, per cui è utile solo per i buffer
 IRC (server e canali).
 Consente di ignorare alcuni nick o nomi host di utenti per un server o per
 un canale (il comando non viene applicato sul contenuto dei messaggi).
 I messaggi corrispondenti vengono eliminati dal plugin IRC prima di
-essere visualizzati (perciò non verranno mai mostrati).
+essere visualizzati (so you'll never see them, and can't be recovered by removing
+the ignore).
 
 Il comando `/filter` è un comando core, perciò funziona per qualsiasi
 buffer. Esso consente di filtrare alcune righe nei buffer mediante tag
@@ -779,7 +794,8 @@ Con un filtro globale (nasconde *tutti* entrata/uscita/abbandono):
 ----
 
 [NOTE]
-Per aiuto: `/help filter` e `/help irc.look.smart_filter`
+Per aiuto: `/help filter`, `/help irc.look.smart_filter` e
+link:weechat_user.it.html#irc_smart_filter_join_part_quit[Guida per l’Utente / Filtro smart per i messaggi di entrata/uscita/disconnessione].
 
 [[filter_irc_join_channel_messages]]
 === Come posso filtrare i messaggi visualizzati all'ingresso su un canale IRC?
@@ -905,8 +921,8 @@ Si deve impostare in questo modo:
 === How can I install scripts? Are scripts compatible with other IRC clients?
 
 // TRANSLATION MISSING
-You can use the command `/script` to install and manage scripts
-(see `/help script` for help).
+With WeeChat ≥ 0.3.9 you can use the command `/script` to install and manage scripts
+(see `/help script` for help). For older versions there is weeget.py and script.pl.
 
 Gli script non sono compatibili con altri client IRC.
 
@@ -929,7 +945,7 @@ And update scripts again in WeeChat:
 /script update
 ----
 
-If you still have an error, then you must remove the automatic update of file
+If you still have an error, then you must disable the automatic update of file
 in WeeChat and download the file manually outside WeeChat (that means you'll
 have to update manually the file yourself to get updates):
 
@@ -988,8 +1004,10 @@ Esistono diversi trucchi per ottimizzare l'uso della memoria:
 
 * utilizzare l'ultima versione stabile (si suppone che abbia meno falle di memoria
   rispetto le versioni precedenti)
+// TRANSLATION MISSING
 * non caricare alcuni plugin se non vengono utilizzati, ad esempio: aspell, buflist,
-  fifo, logger, perl, python, ruby, lua, tcl, guile, javascript, php, xfer (usato per DCC)
+  fifo, logger, perl, python, ruby, lua, tcl, guile, javascript, php, xfer (usato per DCC).
+  See `/help weechat.plugin.autoload`.
 * caricare solo gli script veramente necessari
 * non caricare i certificati se SSL *NON* viene usato: usare una stringa vuota nell'opzione
   _weechat.network.gnutls_ca_file_
@@ -1050,6 +1068,7 @@ Unload and disable auto-loading of "xfer" plugin (used for IRC DCC):
 Define a passphrase and use secured data wherever you can for sensitive data
 like passwords: see `/help secure` and `/help` on options
 (if you can use secured data, it is written in the help).
+See also link:weechat_user.it.html#secured_data[Guida per l’Utente / Secured data].
 
 For example:
 
diff --git a/doc/it/weechat_user.it.adoc b/doc/it/weechat_user.it.adoc
index afff4e5b6..bcd8a6c71 100644
--- a/doc/it/weechat_user.it.adoc
+++ b/doc/it/weechat_user.it.adoc
@@ -47,7 +47,7 @@ Le principali caratteristiche:
   http://tools.ietf.org/html/rfc2813[2813]
 // TRANSLATION MISSING
 * IRC proxy and relay for remote interfaces
-* multi-piattaforma (GNU/Linux, *BSD, MacOS X, Windows ed altre)
+* multi-piattaforma (GNU/Linux, *BSD, macOS, Windows ed altre)
 * 100% GPL, software libero
 
 La home page di WeeChat si trova qui: https://weechat.org/
@@ -98,7 +98,7 @@ WeeChat può essere compilato con cmake oppure autotools
 
 // TRANSLATION MISSING
 [NOTE]
-On OS X, you can use http://brew.sh/[Homebrew]:
+On macOS, you can use http://brew.sh/[Homebrew]:
 `brew install weechat --with-python --with-perl`
 (for help: `brew info weechat`).
 
diff --git a/doc/ja/weechat_faq.ja.adoc b/doc/ja/weechat_faq.ja.adoc
index 796ac9e96..04f9d8028 100644
--- a/doc/ja/weechat_faq.ja.adoc
+++ b/doc/ja/weechat_faq.ja.adoc
@@ -37,7 +37,8 @@ WeeChat とは関係ありませんよ!)。
 
 WeeChat は非常に軽く、革新的な機能を備えているからです。
 
-こののページに関するより詳しい情報: https://weechat.org/about/features
+// TRANSLATION MISSING
+More info on the WeeChat features page: https://weechat.org/about/features
 
 [[compilation_install]]
 == コンパイル / インストール
@@ -51,18 +52,19 @@ https://weechat.org/about/interfaces
 [[compile_git]]
 === git リポジトリをクローンした後に WeeChat をコンパイルできません。
 
-WeeChat をコンパイルするには cmake を使うことが推奨されています。
+WeeChat をコンパイルするには link:weechat_user.ja.html#compile_with_cmake[cmake]
+を使うことが推奨されています。
 
-autotools を使って (cmake を使わずに) コンパイルする場合、最新の
-autoconf と automake を使ってください。
+link:weechat_user.ja.html#compile_with_autotools[autotools] を使って (cmake を使わずに)
+コンパイルする場合、最新の autoconf と automake を使ってください。
 
 他には「開発パッケージ」をインストール方法があります。この場合、インストールするのに必要なパッケージの数が減ります。このパッケージは
 git リポジトリからほぼ毎日ビルドされます。このパッケージは厳密には
 git ベースではなく、アップデートをインストールする場合には
 git をクローンする方法よりも不便であることに注意してください。
 
-[[compile_osx]]
-=== どうすれば OS X に WeeChat をインストールできますか?
+[[compile_macos]]
+=== どうすれば macOS に WeeChat をインストールできますか?
 
 http://brew.sh/[Homebrew] を使うことをお勧めします、ヘルプを見るには:
 
@@ -79,8 +81,11 @@ brew install weechat --with-aspell --with-curl --with-python --with-perl --with-
 [[lost]]
 === WeeChat を起動しました。でも何をすればいいかわかりません。
 
+// TRANSLATION MISSING
 ヘルプを見るには、`/help` と入力してください。コマンドに関するヘルプを見るには、`/help command`
-と入力してください。キーとコマンドはドキュメント内にリストアップされています。
+link:weechat_user.ja.html#key_bindings[Keys] and
+link:weechat_user.ja.html#commands_and_options[commands] are listed
+in documentation.
 
 新しいユーザはlink:weechat_quickstart.ja.html[クイックスタートガイド]を読むことをお勧めします
 
@@ -90,7 +95,9 @@ brew install weechat --with-aspell --with-curl --with-python --with-perl --with-
 [[charset]]
 === いくつかの文字が見えません。どうすれば良いですか。
 
-これは良くある問題です。以下の内容をよく読んで、*全ての* 解決策をチェックしてください:
+// TRANSLATION MISSING
+It's a common issue with a variety of causes, please read carefully and check
+*ALL* solutions below:
 
 * weechat が libncursesw にリンクされていることの確認 (警告:
   全てではありませんが、ほとんどのディストリビューションで必要です): `ldd /path/to/weechat`
@@ -107,8 +114,8 @@ brew install weechat --with-aspell --with-curl --with-python --with-perl --with-
    rxvt-unicode を推奨)
 ** screen を使っている場合は、UTF-8 モードで起動されていることを確認
    (~/.screenrc に "`defutf8 on`" の記述があるかまたは `screen -U` のようにして起動)。
-* _weechat.look.eat_newline_glitch_ オプションが off であることを確認してください
-  (このオプションは表示上のバグを引き起こす可能性があります)
+* link:weechat_user.ja.html#option_weechat.look.eat_newline_glitch[_weechat.look.eat_newline_glitch_]
+  オプションが off であることを確認してください (このオプションは表示上のバグを引き起こす可能性があります)
 
 [NOTE]
 WeeChat は UTF-8 ロケールを推奨します。ISO
@@ -157,13 +164,13 @@ gnome-terminal
 を使っている場合、設定/プロファイル/互換性メニュー内にある「曖昧幅の文字」を
 `半角` にしてください。
 
-[[osx_display_broken]]
-=== OS X 上で WeeChat をコンパイルした場合、"(null)" という文字列が至る所に表示されます。
+[[macos_display_broken]]
+=== macOS 上で WeeChat をコンパイルした場合、"(null)" という文字列が至る所に表示されます。
 
 ncursesw を自分でコンパイルした場合は、標準の (システムに元から存在する)
 ncurses を使ってみてください。
 
-さらに OS X では、Homebrew パッケージマネージャを使って
+さらに macOS では、Homebrew パッケージマネージャを使って
 WeeChat をインストールすることをお勧めします。
 
 [[buffer_vs_window]]
@@ -175,13 +182,16 @@ _バッファ_ とは番号、名前、表示行 (とその他のデータ)
 _ウィンドウ_
 とはバッファを表示する画面エリアです。画面を複数のウィンドウに分割出来ます。
 
-それぞれのウィンドウは 1 つのバッファの内容を表示します。バッファを隠す
-(ウィンドウで表示させない) ことや 1 つ以上のウィンドウに表示させることも出来ます。
+// TRANSLATION MISSING
+Each window displays one buffer, or a set of merged buffers.
+A buffer can be hidden (not displayed by a window) or displayed by one or more
+windows.
 
 [[buffers_list]]
 === どうすれば左側にバッファリストを表示できますか。
 
-WeeChat バージョン 1.8 以上の場合、"buflist" プラグインがロードされ、デフォルトで有効化されます。
+WeeChat バージョン 1.8 以上の場合、link:weechat_user.ja.html#buflist_plugin[buflist]
+プラグインがロードされ、デフォルトで有効化されます。
 
 バージョン 1.8 よりも古い WeeChat をお使いなら、以下の方法で _buffers.pl_ スクリプトをインストールしてください:
 
@@ -307,7 +317,10 @@ WeeChat は自動的にデフォルトバー "input" を作成します:
 [[terminal_copy_paste]]
 === どうすればニックネームリストを選択せずにテキストだけをコピー/ペーストできますか。
 
-WeeChat バージョン 1.0 以上の場合、最小限表示を使うことができます (デフォルトキー: kbd:[Alt+l])。
+// TRANSLATION MISSING
+With WeeChat ≥ 1.0, you can use the bare display (default key: kbd:[Alt+l]),
+which will show just the contents of the currently selected window,
+without any formatting.
 
 矩形選択のできる端末を使ってください
 (rxvt-unicode、konsole、gnome-terminal、...)。通常、キーは
@@ -484,7 +497,7 @@ UXTerm*metaSendsEscape: true
 
 このファイルをリロードするか (`xrdb -override ~/.Xresources`) または X を再起動してください。
 
-Mac OS X のターミナル.app を使っている場合、設定メニューのキーボードから「メタキーとして option
+macOS のターミナル.app を使っている場合、設定メニューのキーボードから「メタキーとして option
 キーを使用」を有効化してください。こうすることで、kbd:[Option]
 キーをメタキーとして使うことが可能です。
 
@@ -587,7 +600,7 @@ WeeChat でマウスが利用可能な場合、kbd:[Shift]
 [[irc_ssl_connection]]
 === SSL を使うサーバへの接続中に問題が発生しました。どうすればいいですか。
 
-Mac OS X をお使いの場合、必ず Homebrew から `openssl`
+macOS をお使いの場合、必ず Homebrew から `openssl`
 をインストールしてください。こうすることでシステムの鍵束に含まれる証明書を使いつつ、CA
 ファイルを起動時に読み込ませることが可能になります。その後、WeeChat で証明書へのパスを設定してください:
 
@@ -635,7 +648,7 @@ gnutls ハンドシェイクに関するエラーの場合、Diffie-Hellman キ�
 /set weechat.network.gnutls_ca_file "/etc/ssl/certs/ca-certificates.crt"
 ----
 
-注意: OS X 上で homebrew を使って openssl をインストールした場合には、以下のコマンドを実行してください:
+注意: macOS 上で homebrew を使って openssl をインストールした場合には、以下のコマンドを実行してください:
 
 ----
 /set weechat.network.gnutls_ca_file "/usr/local/etc/openssl/cert.pem"
@@ -689,12 +702,13 @@ of channels):
 [[ignore_vs_filter]]
 === /ignore と /filter コマンドの違いは何ですか。
 
+// TRANSLATION MISSING
 `/ignore` コマンドは IRC コマンドです、このため
 IRC バッファ (サーバとチャンネル)
 にのみ有効です。これを使うことでニックネームやホスト名を基準にして、あるサーバやチャンネルにいる一部のユーザを無視できます
 (表示済みメッセージに対しては適用されません)。マッチするメッセージは
 IRC プラグインによって表示される前に削除されます
-(削除されたメッセージは見えません)。
+(so you'll never see them, and can't be recovered by removing the ignore)。
 
 `/filter`
 コマンドは core
@@ -718,8 +732,10 @@ IRC プラグインによって表示される前に削除されます
 /filter add joinquit * irc_join,irc_part,irc_quit *
 ----
 
+// TRANSLATION MISSING
 [NOTE]
-ヘルプを見るには: `/help filter` か `/help irc.look.smart_filter`
+For help: `/help filter`, `/help irc.look.smart_filter` and see
+link:weechat_user.ja.html#irc_smart_filter_join_part_quit[ユーザーズガイド / 参加/退出/終了メッセージに対するスマートフィルタ].
 
 [[filter_irc_join_channel_messages]]
 === どうすれば IRC チャンネルに参加した際に表示される一部のメッセージをフィルタできますか。
@@ -836,8 +852,9 @@ OpenBSD では、プラグインファイル名の末尾が ".so.0.0" です (Li
 [[install_scripts]]
 === どうすればスクリプトをインストールできますか。スクリプトは他の IRC クライアントと互換性がありますか。
 
-スクリプトをインストールしたり管理するにはコマンド `/script` を使ってください
-(ヘルプは `/help script` で見ることができます)。
+// TRANSLATION MISSING
+With WeeChat ≥ 0.3.9 you can use the command `/script` to install and manage scripts
+(see `/help script` for help). For older versions there is weeget.py and script.pl.
 
 スクリプトは他の IRC クライアントのものと互換性がありません。
 
@@ -859,7 +876,10 @@ $ rm ~/.weechat/script/plugins.xml.gz
 /script update
 ----
 
-それでもまだエラーが出るなら、更新を受け取るにはスクリプトリストファイルを必ず手作業で更新しなければいけないということです。これを行うには以下の手順に従ってください:
+// TRANSLATION MISSING
+If you still have an error, then you must disable the automatic update of file
+in WeeChat and download the file manually outside WeeChat (that means you'll
+have to update manually the file yourself to get updates):
 
 * WeeChat から WeeChat のファイル自動更新機能を無効化してください:
 
@@ -912,8 +932,10 @@ aspell プラグインをリロードしてください:
 
 * 最新の安定版を使う
   (古いバージョンよりもメモリリークの可能性が減ると思われます)
+// TRANSLATION MISSING
 * 使わないプラグインのロードを禁止する、例えば:
-  aspell、buflist、fifo、logger、perl、python、ruby、lua、tcl、guile、javascript、php、xfer (DCC で使用)
+  aspell、buflist、fifo、logger、perl、python、ruby、lua、tcl、guile、javascript、php、xfer (DCC で使用)。
+  See `/help weechat.plugin.autoload`.
 * 本当に必要なスクリプトだけをロード
 * SSL を *使わない* なら、証明書を読み込まないでください: オプション
   _weechat.network.gnutls_ca_file_ に空文字列を設定してください。
@@ -963,9 +985,11 @@ IRC の退出および終了メッセージを無効化します:
 /set weechat.plugin.autoload "*,!xfer"
 ----
 
+// TRANSLATION MISSING
 パスフレーズを定義してパスワードなどの保護したいデータの使用時は常にセキュアデータを使います:
 `/help secure` およびセキュアデータを使用したいオプションの `/help` を参照してください
 (セキュアデータを使うことが可能なオプションのヘルプにはこの点が明記されています)。
+See also link:weechat_user.ja.html#secured_data[ユーザーズガイド / 暗号化データ].
 
 例:
 
diff --git a/doc/ja/weechat_relay_protocol.ja.adoc b/doc/ja/weechat_relay_protocol.ja.adoc
index 172eedfc9..d64a7cc6a 100644
--- a/doc/ja/weechat_relay_protocol.ja.adoc
+++ b/doc/ja/weechat_relay_protocol.ja.adoc
@@ -39,7 +39,7 @@
 ....
                                                ┌────────────────┐ ワークステーション
  ┌────────┐                                ┌───┤ クライアント 1 │ (Linux、Windows、
- │  irc   │◄──┐  ╔═══════════╤════════╗    │   └────────────────┘ BSD、Mac OS X ...)
+ │  irc   │◄──┐  ╔═══════════╤════════╗    │   └────────────────┘ BSD、macOS ...)
  └────────┘   └──╢           │        ║◄───┘   ┌────────────────┐
    ......        ║  WeeChat  │ リレー ║◄───────┤ クライアント 2 │ 携帯デバイス
  ┌────────┐   ┌──╢           │        ║◄───┐   └────────────────┘ (Android、iPhone ...)
diff --git a/doc/ja/weechat_user.ja.adoc b/doc/ja/weechat_user.ja.adoc
index 13b30af70..31477803e 100644
--- a/doc/ja/weechat_user.ja.adoc
+++ b/doc/ja/weechat_user.ja.adoc
@@ -43,7 +43,7 @@ WeeChat (Wee Enhanced Environment for Chat)
   http://tools.ietf.org/html/rfc2812[2812]、
   http://tools.ietf.org/html/rfc2813[2813]。
 * リモートインターフェース用の IRC プロキシとリレー
-* マルチプラットフォーム (GNU/Linux、*BSD、MacOS X、Windows 等)
+* マルチプラットフォーム (GNU/Linux、*BSD、macOS、Windows 等)
 * 完全な GPL、フリーソフトウェア
 
 WeeChat のホームページ: https://weechat.org/
@@ -87,7 +87,7 @@ WeeChat をインストールするには、以下のものが必要です:
 WeeChat は cmake または autotools を使ってコンパイルできます (cmake を使うことが推奨されています)。
 
 [NOTE]
-OS X では http://brew.sh/[Homebrew] を使ってください:
+macOS では http://brew.sh/[Homebrew] を使ってください:
 `brew install weechat --with-python --with-perl`
 (ヘルプを見るには: `brew info weechat`)。
 
diff --git a/doc/pl/weechat_faq.pl.adoc b/doc/pl/weechat_faq.pl.adoc
index fac557a0b..cb3328b8e 100644
--- a/doc/pl/weechat_faq.pl.adoc
+++ b/doc/pl/weechat_faq.pl.adoc
@@ -37,7 +37,8 @@ pasuje ono do WeeChat!).
 
 Ponieważ Weechat jest bardzo lekki i posiada innowacyjne funkcje.
 
-Więcej informacji na stronie: https://weechat.org/about/features
+// TRANSLATION MISSING
+More info on the WeeChat features page: https://weechat.org/about/features
 
 [[compilation_install]]
 == Kompilacja / instalacja
@@ -51,18 +52,19 @@ https://weechat.org/about/interfaces
 [[compile_git]]
 === Nie mogę skompilować WeeChat po sklonowaniu repozytorium git, dlaczego?
 
-Zalecaną metodą kompilacji WeeChat jest użycie cmake.
+Zalecaną metodą kompilacji WeeChat jest użycie
+link:weechat_user.pl.html#compile_with_cmake[cmake].
 
-Jeśli kompilujesz używając autotools (nie cmake), upewnij się, że posiadasz
-najnowszą wersję autoconf i automake.
+Jeśli kompilujesz używając link:weechat_user.pl.html#compile_with_autotools[autotools]
+(nie cmake), upewnij się, że posiadasz najnowszą wersję autoconf i automake.
 
 Innym sposobem jest zainstalowanie "paczki deweloperskiej", która wymaga mniej
 zależności. Ten pakiet jest budowany prawie codziennie z użyciem repozytorium
 git. Ten pakiet może odpowiadać dokładnie wersji z gita i jest mniej wygodny
 przy aktualizowaniu jak klonowanie z gita.
 
-[[compile_osx]]
-=== Jak zainstalować WeeChat na OS X?
+[[compile_macos]]
+=== Jak zainstalować WeeChat na macOS?
 
 Zaleca się użycie http://brew.sh/[Homebrew], pomoc uzyskasz za pomocą komendy:
 
@@ -79,8 +81,11 @@ brew install weechat --with-aspell --with-curl --with-python --with-perl --with-
 [[lost]]
 === Uruchomiłem WeeChat, ale czuję się zagubiony, co robić?
 
+// TRANSLATION MISSING
 Dla pomocy wpisz `/help`. Aby uzyskać pomoc dla komendy wpisz `/help komenda`.
-Klawisze i komendy są wypisane w dokumentacji.
+link:weechat_user.pl.html#key_bindings[Keys] and
+link:weechat_user.pl.html#commands_and_options[commands] are listed
+in documentation.
 
 Nowym użytkowniką zaleca się przeczytanie dokumentu
 link:weechat_quickstart.pl.html[Szybki start].
@@ -91,7 +96,9 @@ link:weechat_quickstart.pl.html[Szybki start].
 [[charset]]
 === Nie widzę niektórych znaków diakrytycznych, co mogę zrobić?
 
-Jest to częsty problem, przeczytaj i sprawdź *WSZYSTKIE* poniższe rozwiązania:
+// TRANSLATION MISSING
+It's a common issue with a variety of causes, please read carefully and check
+*ALL* solutions below:
 
 * sprawdź czy weechat jest zlinkowany z libncursesw (uwaga: wymagane na
   większości dystrybucji ale nie wszystkich): `ldd /ścieżka/do/weechat`
@@ -109,8 +116,9 @@ Jest to częsty problem, przeczytaj i sprawdź *WSZYSTKIE* poniższe rozwiązani
    dla UTF-8 jest rxvt-unicode)
 ** jeśli korzystasz ze screena, sprawdź czy jest uruchomiony z trybem UTF-8
    ("`defutf8 on`" w ~/.screenrc lub `screen -U` uruchamiając screena)
-* sprawdź czy opcja _weechat.look.eat_newline_glitch_ jest wyłączona (ta opcja
-  może powodować błędy wyświetlania)
+* sprawdź czy opcja
+  link:weechat_user.pl.html#option_weechat.look.eat_newline_glitch[_weechat.look.eat_newline_glitch_]
+  jest wyłączona (ta opcja może powodować błędy wyświetlania)
 
 [NOTE]
 UTF-8 jest zalecany dla WeeChat. Jeśli korzystasz z lokalizacji ISO lub innych,
@@ -158,13 +166,13 @@ W razie potrzeby, popraw zmienna TERM: `export TERM="xxx"`.
 Jeśli używasz gnome-terminal, sprawdź czy opcja "Ambigous-width chracters"
 w menu Preferencje/Profile/Kompatybilność jest ustawiona na `narrow`.
 
-[[osx_display_broken]]
-=== Skompilowałem WeeChat pod OS X i wszędzie na ekranie widzę "(null)", co jest nie tak?
+[[macos_display_broken]]
+=== Skompilowałem WeeChat pod macOS i wszędzie na ekranie widzę "(null)", co jest nie tak?
 
 Jeśli samodzielnie skompilowałeś ncursesw, spróbuj użyć domyślnej wersji (dostarczanej
 z systemem).
 
-Ponadto, pod OS X, zaleca się instalowanie WeeChat za pomocą managera pakietów
+Ponadto, pod macOS, zaleca się instalowanie WeeChat za pomocą managera pakietów
 Homebrew.
 
 [[buffer_vs_window]]
@@ -176,13 +184,16 @@ danych).
 _okno_ jest to obszar ekranu wyświetlający bufor. Możliwe jest podzielenie
 ekranu na wiele okien.
 
-Każde okno wyświetla jeden bufor. Bufor może być ukryty (nie wyświetlany przez
-okno) lub wyświetlany w jednym lub więcej oknach.
+// TRANSLATION MISSING
+Each window displays one buffer, or a set of merged buffers.
+A buffer can be hidden (not displayed by a window) or displayed by one or more
+windows.
 
 [[buffers_list]]
 === Jak wyświetlić listę z buforami po lewej stronie?
 
-W wersji WeeChat ≥ 1.8, wtyczka "buflist" jest domyślnie włączona i załadowana.
+W wersji WeeChat ≥ 1.8, wtyczka link:weechat_user.pl.html#buflist_plugin[buflist]
+jest domyślnie włączona i załadowana.
 
 W starszych wersjach możesz zainstalować skrypt _buffers.pl_:
 
@@ -250,7 +261,8 @@ wiadomości od ostatniej wizyty w buforze.
 
 w przykładzie `[H: 3(1,8), 2(4)]`, oznacza:
 
-* jedno podświetlenie i 8 nieprzeczytanych wiadomości w buforze #3,
+// TRANSLATION MISSING
+* 1 highlight and 8 unread messages on buffer #3,
 * 4 nieprzeczytane wiadomości w buforze #2.
 
 Kolor bufora/licznika zależy od typu wiadomoci, domyślne kolory:
@@ -310,7 +322,10 @@ użyty w żadnym z pasków:
 [[terminal_copy_paste]]
 === Jak mogę kopiować/wklejać tekst bez wklejania listy nicków?
 
-W WeeChat od wersji ≥ 1.0, możesz użyć trybu niesformatowanego wyświetlania (domyślnie: kbd:[Alt+l]).
+// TRANSLATION MISSING
+W WeeChat od wersji ≥ 1.0, możesz użyć trybu niesformatowanego wyświetlania (domyślnie: kbd:[Alt+l]),
+which will show just the contents of the currently selected window,
+without any formatting.
 
 Możesz użyć terminala z prostokątnym zaznaczaniem (jak rxvt-unicode,
 konsole, gnome-terminal, ...). Klawisze to zazwyczaj kbd:[Ctrl] + kbd:[Alt] + zaznaczenie myszką.
@@ -489,7 +504,7 @@ UXTerm*metaSendsEscape: true
 
 Następnie przeładować zasoby (`xrdb -override ~/.Xresources`) lub zrestartować X.
 
-Jeśli używasz aplikacji Terminal na Mac OS X włącz opcję
+Jeśli używasz aplikacji Terminal na macOS włącz opcję
 "Use option as meta key" w menu Settings/Keyboard. Następnie możesz używać klawisza
 kbd:[Option] jako klawisza meta.
 
@@ -595,7 +610,7 @@ kbd:[Shift]).
 [[irc_ssl_connection]]
 === Mam problemy podczas połączenia z serwerem używającym SSL, co mogę zrobić?
 
-Jeśli używasz Mac OS X, musisz zainstalować `openssl` z Homebrew.
+Jeśli używasz Mac macOS, musisz zainstalować `openssl` z Homebrew.
 Plik CA zostanie wygenerowany korzystając z systemowego keychaina.
 Możez natępnie ustawić ścierzkę do certyfikatów w WeeChat:
 
@@ -643,7 +658,7 @@ Ustaw opcję _weechat.network.gnutls_ca_file_ do pliku z certyfikatami:
 /set weechat.network.gnutls_ca_file "/etc/ssl/certs/ca-certificates.crt"
 ----
 
-Uwaga: jeśli używasz OS X z openssl zainstalowanym przez homebrew, możesz wykonać:
+Uwaga: jeśli używasz macOS z openssl zainstalowanym przez homebrew, możesz wykonać:
 
 ----
 /set weechat.network.gnutls_ca_file "/usr/local/etc/openssl/cert.pem"
@@ -697,12 +712,13 @@ na kanały):
 [[ignore_vs_filter]]
 === Jaka jest różnica między komendami/ignore i /filter ?
 
+// TRANSLATION MISSING
 Komenda `/ignore` jest komendą IRC, zatem odnosi się tylko do buforów IRC
 (serwery i kanały).
 Pozwala ignorować niektóre nicki lub hosty użytkowników serwera lub kanału
 (komendy nie stosuje się do treści wiadomości).
-Pasujące wiadomości są usuwane przez wtyczkę IRC przed wyświetleniem (nigdy
-ich nie zobaczysz).
+Pasujące wiadomości są usuwane przez wtyczkę IRC przed wyświetleniem (so you'll
+never see them, and can't be recovered by removing the ignore).
 
 Komenda `/filter` jest komenda rdzenia, zatem odnosi się do dowolnego bufora.
 Pozwala filtrować niektóre linie w buforach za pomocą tagów lub wyrażeń
@@ -728,7 +744,8 @@ Za pomocą globalnego filtru (ukrywa *wszystkie* wejścia/opuszczenia/wyjścia):
 ----
 
 [NOTE]
-Więcej informacji: `/help filter` i `/help irc.look.smart_filter`
++For help: `/help filter`, `/help irc.look.smart_filter` and see
++link:weechat_user.pl.html#irc_smart_filter_join_part_quit[Poradniku użytkownika / Inteligentne filtry dla wiadomości].
 
 [[filter_irc_join_channel_messages]]
 === Jak mogę filtrować wyświetlane wiadomości podczas wejścia na kanał IRC?
@@ -846,8 +863,9 @@ Musisz ustawić:
 [[install_scripts]]
 === Jak mogę instalować skrypty? Czy są one kompatybilne z innymi klientami IRC?
 
-Możesz użyć komendy `/script` do instalowania i zarządzania skryptami
-(zobacz `/help script` po więcej informacji).
+// TRANSLATION MISSING
+With WeeChat ≥ 0.3.9 you can use the command `/script` to install and manage scripts
+(see `/help script` for help). For older versions there is weeget.py and script.pl.
 
 Skrypty nie są kompatybilne z innymi klientami IRC.
 
@@ -869,9 +887,10 @@ Następnie ponownie zaktualizuj listę sktyptów w WeeChat:
 /script update
 ----
 
-Jeśli w dalszym ciągu otrzymujesz błąd, wtedy musisz wyłączyć automatyczną aktualizacje
-pliku z listą skryptów przez WeeChat i ręcznie pobrać ten plik (oznacza to, że musisz
-ręcznie aktualizować plik do najnowszej wersji):
+// TRANSLATION MISSING
+If you still have an error, then you must disable the automatic update of file
+in WeeChat and download the file manually outside WeeChat (that means you'll
+have to update manually the file yourself to get updates):
 
 * w WeeChat:
 
@@ -925,8 +944,10 @@ W celu zmniejszenia używanej pamięci możesz zastosować się do poniższych r
 
 * używać najnowsze stabilnej wersji (powinna mieć mniej wycieków pamięci
   niż starsze wersje)
+// TRANSLATION MISSING
 * nie ładuj nieużywanych pluginów, np: aspell, buflist, fifo, logger, perl,
-  python, ruby, lua, tcl, guile, javascript, php, xfer (używana do DCC)
+  python, ruby, lua, tcl, guile, javascript, php, xfer (używana do DCC).
+  See `/help weechat.plugin.autoload`.
 * ładować tylko naprawdę używane skrypty
 * nie ładuj certyfikatów jeśli SSL *NIE* jest używany: ustaw pusty ciąg w opcji
   _weechat.network.gnutls_ca_file_
@@ -975,9 +996,11 @@ Wyładuj i wyłącz automatyczne ładowanie wtyczki "xfer" (używanej przez IRC
 /set weechat.plugin.autoload "*,!xfer"
 ----
 
+// TRANSLATION MISSING
 Zdefiniuj hasło i używaj bezpiecznych danych wszędzie gdzie możesz dla danych wrażliwych
 jak hasła: zobacz `/help secure` oraz `/help` na opcjach
 (czy możesz użyć bezpiecznych danych, jest to zaznaczone w pomocy).
+See also link:weechat_user.pl.html#secured_data[Poradniku użytkownika / Zabezpieczone dane].
 
 Na przykład:
 
diff --git a/doc/pl/weechat_user.pl.adoc b/doc/pl/weechat_user.pl.adoc
index 8ee7798a1..7fea4beb9 100644
--- a/doc/pl/weechat_user.pl.adoc
+++ b/doc/pl/weechat_user.pl.adoc
@@ -43,7 +43,7 @@ Główne cechy to:
   http://tools.ietf.org/html/rfc2812[2812] i
   http://tools.ietf.org/html/rfc2813[2813]
 * proxy IRC i pośrednik dla zdalnych interfejsów
-* wielo-platformowy (GNU/Linux, *BSD, MacOS X, Windows i inne)
+* wielo-platformowy (GNU/Linux, *BSD, macOS, Windows i inne)
 * 100% GPL, darmowe oprogramowanie
 
 Strona domowa WeeChat: https://weechat.org/
@@ -88,7 +88,7 @@ pakietów.
 WeeChat może być kompilowany za pomocą cmake lub autotools (cmake jest zalecany).
 
 [NOTE]
-Na OS X możesz użyć http://brew.sh/[Homebrew]:
+Na macOS możesz użyć http://brew.sh/[Homebrew]:
 `brew install weechat --with-python --with-perl`
 (pomoc można uzyskać za pomocą komendy: `brew info weechat`).
 
diff --git a/src/core/wee-network.c b/src/core/wee-network.c
index 8fd45d690..46e882208 100644
--- a/src/core/wee-network.c
+++ b/src/core/wee-network.c
@@ -1198,7 +1198,10 @@ network_connect_child (struct t_hook *hook_connect)
             msg.msg_control = msg_buf;
             msg.msg_controllen = sizeof (msg_buf);
 
-            /* send 1 byte of data (not required on Linux, required by BSD/OSX) */
+            /*
+             * send 1 byte of data
+             * (not required on Linux, required by BSD/macOS)
+             */
             memset (iov, 0, sizeof (iov));
             iov[0].iov_base = iov_data;
             iov[0].iov_len = 1;
@@ -1459,7 +1462,10 @@ network_connect_child_read_cb (const void *pointer, void *data, int fd)
                 msg.msg_control = msg_buf;
                 msg.msg_controllen = sizeof (msg_buf);
 
-                /* recv 1 byte of data (not required on Linux, required by BSD/OSX) */
+                /*
+                 * recv 1 byte of data
+                 * (not required on Linux, required by BSD/macOS)
+                 */
                 memset (iov, 0, sizeof (iov));
                 iov[0].iov_base = iov_data;
                 iov[0].iov_len = 1;
diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
index b2ef51417..2116bc6ea 100644
--- a/src/gui/curses/CMakeLists.txt
+++ b/src/gui/curses/CMakeLists.txt
@@ -42,7 +42,7 @@ list(APPEND EXTRA_LIBS "m")
 list(APPEND EXTRA_LIBS ${CURL_LIBRARIES})
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  # link with resolv lib on Mac OS X
+  # link with resolv lib on macOS
   list(APPEND EXTRA_LIBS "resolv")
 endif()
 
diff --git a/src/plugins/irc/CMakeLists.txt b/src/plugins/irc/CMakeLists.txt
index f205adbc5..e5a0dcb5a 100644
--- a/src/plugins/irc/CMakeLists.txt
+++ b/src/plugins/irc/CMakeLists.txt
@@ -55,7 +55,7 @@ endif()
 list(APPEND LINK_LIBS ${GCRYPT_LDFLAGS})
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  # link with resolv lib on Mac OS X
+  # link with resolv lib on macOS
   list(APPEND LINK_LIBS "resolv")
 endif()
 
diff --git a/src/plugins/perl/CMakeLists.txt b/src/plugins/perl/CMakeLists.txt
index 18eec779f..5da058fd9 100644
--- a/src/plugins/perl/CMakeLists.txt
+++ b/src/plugins/perl/CMakeLists.txt
@@ -24,7 +24,7 @@ set_target_properties(perl PROPERTIES PREFIX "")
 
 if(PERL_FOUND)
   if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    # remove "-arch xxx" on Mac OS X
+    # remove "-arch xxx" on macOS
     STRING(REGEX REPLACE "-arch ppc|-arch i386|-arch x86_64" "" PERL_CFLAGS "${PERL_CFLAGS}")
     STRING(REGEX REPLACE "-arch ppc|-arch i386|-arch x86_64" "" PERL_LFLAGS "${PERL_LFLAGS}")
   endif()
diff --git a/src/plugins/xfer/CMakeLists.txt b/src/plugins/xfer/CMakeLists.txt
index 2988ee55a..3cea48e50 100644
--- a/src/plugins/xfer/CMakeLists.txt
+++ b/src/plugins/xfer/CMakeLists.txt
@@ -36,7 +36,7 @@ set(LINK_LIBS)
 list(APPEND LINK_LIBS ${GCRYPT_LDFLAGS})
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  # link with resolv lib on Mac OS X
+  # link with resolv lib on macOS
   list(APPEND LINK_LIBS "resolv")
 endif()